Release 1.8.1

* Remove build config from gradle.properties

* Add build config property in build.gradle.kts

.github/FUNDING.yml

@@ -1,2 +1,2 @@
 github: johan12345
-custom: ['https://paypal.me/johan98', 'http://ts.la/johan94494']
+custom: ['https://paypal.me/johan98', 'https://ev-map.app/donate/']

app/build.gradle.kts

@@ -20,8 +20,8 @@ android {
         minSdk = 21
         targetSdk = 34
         // NOTE: always increase versionCode by 2 since automotive flavor uses versionCode + 1
-        versionCode = 208
-        versionName = "1.8.0"
+        versionCode = 210
+        versionName = "1.8.1"
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
         resourceConfigurations += supportedLocales.split(",")
@@ -95,6 +95,7 @@ android {
     buildFeatures {
         dataBinding = true
         viewBinding = true
+        buildConfig = true
     }
     lint {
         disable += listOf("NullSafeMutableLiveData")

app/src/foss/java/net/vonforst/evmap/fragment/DonateFragment.kt

@@ -12,9 +12,11 @@ import com.google.android.material.transition.MaterialSharedAxis
 import net.vonforst.evmap.MapsActivity
 import net.vonforst.evmap.R
 import net.vonforst.evmap.databinding.FragmentDonateBinding
+import net.vonforst.evmap.databinding.FragmentDonateReferralBinding
 
-class DonateFragment : Fragment() {
+class DonateFragment : DonateFragmentBase() {
     private lateinit var binding: FragmentDonateBinding
+    private lateinit var referrals: FragmentDonateReferralBinding
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
@@ -28,6 +30,7 @@ class DonateFragment : Fragment() {
         savedInstanceState: Bundle?
     ): View {
         binding = FragmentDonateBinding.inflate(inflater, container, false)
+        referrals = binding.referrals
         return binding.root
     }
 
@@ -43,8 +46,6 @@ class DonateFragment : Fragment() {
             (activity as? MapsActivity)?.openUrl(getString(R.string.paypal_link))
         }
 
-        binding.referrals.referralTesla.setOnClickListener {
-            (requireActivity() as MapsActivity).openUrl(getString(R.string.tesla_referral_link))
-        }
+        setupReferrals(referrals)
     }
 }

app/src/google/java/net/vonforst/evmap/fragment/DonateFragment.kt

@@ -6,9 +6,7 @@ import android.view.View
 import android.view.ViewGroup
 import androidx.appcompat.app.AppCompatActivity
 import androidx.databinding.DataBindingUtil
-import androidx.fragment.app.Fragment
 import androidx.fragment.app.viewModels
-import androidx.lifecycle.Observer
 import androidx.navigation.fragment.findNavController
 import androidx.navigation.ui.setupWithNavController
 import androidx.recyclerview.widget.ConcatAdapter
@@ -25,7 +23,7 @@ import net.vonforst.evmap.databinding.FragmentDonateHeaderBinding
 import net.vonforst.evmap.databinding.FragmentDonateReferralBinding
 import net.vonforst.evmap.viewmodel.DonateViewModel
 
-class DonateFragment : Fragment() {
+class DonateFragment : DonateFragmentBase() {
     private lateinit var binding: FragmentDonateBinding
     private val vm: DonateViewModel by viewModels()
     private lateinit var header: FragmentDonateHeaderBinding
@@ -86,12 +84,7 @@ class DonateFragment : Fragment() {
             Snackbar.make(view, R.string.donation_failed, Snackbar.LENGTH_LONG).show()
         }
 
-        referrals.referralTesla.setOnClickListener {
-            (requireActivity() as MapsActivity).openUrl(getString(R.string.tesla_referral_link))
-        }
-        referrals.referralJuicify.setOnClickListener {
-            (requireActivity() as MapsActivity).openUrl(getString(R.string.juicify_referral_link))
-        }
+        setupReferrals(referrals)
 
         // Workaround for AndroidX bug: https://github.com/material-components/material-components-android/issues/1984
         view.setBackgroundColor(MaterialColors.getColor(view, android.R.attr.windowBackground))

app/src/main/java/net/vonforst/evmap/Utils.kt

@@ -9,10 +9,14 @@ import android.icu.util.LocaleData
 import android.icu.util.ULocale
 import android.os.Build
 import android.os.Bundle
-import android.text.*
+import android.text.Spannable
+import android.text.SpannableString
+import android.text.SpannableStringBuilder
+import android.text.SpannedString
+import android.text.TextUtils
 import android.text.style.StyleSpan
 import net.vonforst.evmap.storage.PreferenceDataSource
-import java.util.*
+import java.util.Locale
 
 fun Bundle.optDouble(name: String): Double? {
     if (!this.containsKey(name)) return null

app/src/main/java/net/vonforst/evmap/auto/SearchSelectScreen.kt

@@ -12,6 +12,7 @@ import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import net.vonforst.evmap.R
 import okio.IOException
+import retrofit2.HttpException
 
 abstract class MultiSelectSearchScreen<T>(ctx: CarContext) : Screen(ctx),
     SearchTemplate.SearchCallback {
@@ -30,14 +31,9 @@ abstract class MultiSelectSearchScreen<T>(ctx: CarContext) : Screen(ctx),
                     filterList()
                     invalidate()
                 } catch (e: IOException) {
-                    withContext(Dispatchers.Main) {
-                        CarToast.makeText(
-                            carContext,
-                            R.string.generic_connection_error,
-                            CarToast.LENGTH_LONG
-                        ).show()
-                        screenManager.pop()
-                    }
+                    showLoadingError()
+                } catch (e: HttpException) {
+                    showLoadingError()
                 }
             }
         }
@@ -76,6 +72,17 @@ abstract class MultiSelectSearchScreen<T>(ctx: CarContext) : Screen(ctx),
         }.build()
     }
 
+    private suspend fun showLoadingError() {
+        withContext(Dispatchers.Main) {
+            CarToast.makeText(
+                carContext,
+                R.string.generic_connection_error,
+                CarToast.LENGTH_LONG
+            ).show()
+            screenManager.pop()
+        }
+    }
+
     private fun filterList() {
         currentList = fullList?.let {
             it.sortedBy { getLabel(it).lowercase() }

app/src/main/java/net/vonforst/evmap/fragment/DonateFragmentBase.kt

@@ -0,0 +1,26 @@
+package net.vonforst.evmap.fragment
+
+import androidx.fragment.app.Fragment
+import net.vonforst.evmap.MapsActivity
+import net.vonforst.evmap.R
+import net.vonforst.evmap.databinding.FragmentDonateReferralBinding
+
+abstract class DonateFragmentBase : Fragment() {
+    fun setupReferrals(referrals: FragmentDonateReferralBinding) {
+        referrals.referralTesla.setOnClickListener {
+            (requireActivity() as MapsActivity).openUrl(getString(R.string.tesla_referral_link))
+        }
+        referrals.referralJuicify.setOnClickListener {
+            (requireActivity() as MapsActivity).openUrl(getString(R.string.juicify_referral_link))
+        }
+        referrals.referralGeldfuereauto.setOnClickListener {
+            (requireActivity() as MapsActivity).openUrl(getString(R.string.geldfuereauto_referral_link))
+        }
+        referrals.referralMaingau.setOnClickListener {
+            (requireActivity() as MapsActivity).openUrl(getString(R.string.maingau_referral_link))
+        }
+        referrals.referralEwieeinfach.setOnClickListener {
+            (requireActivity() as MapsActivity).openUrl(getString(R.string.ewieeinfach_referral_link))
+        }
+    }
+}

app/src/main/java/net/vonforst/evmap/fragment/MapFragment.kt

@@ -628,6 +628,14 @@ class MapFragment : Fragment(), OnMapReadyCallback, MapsActivity.FragmentCallbac
                 ) {
                     closeLayersMenu()
                 }
+
+                if (vm.selectedChargepoint.value != null && newState in listOf(
+                        STATE_ANCHOR_POINT, STATE_COLLAPSED
+                    )
+                ) {
+                    closeConnectorDetailsDialog()
+                    vm.selectedChargepoint.value = null
+                }
             }
         })
         vm.chargerSparse.observe(viewLifecycleOwner) {

app/src/main/java/net/vonforst/evmap/viewmodel/MapViewModel.kt

@@ -170,9 +170,8 @@ class MapViewModel(application: Application, private val state: SavedStateHandle
         }
     }
 
-    val selectedChargepoint: MutableLiveData<Chargepoint?> by lazy {
+    val selectedChargepoint: MutableLiveData<Chargepoint?> =
         state.getLiveData("selectedChargepoint")
-    }
 
     val charger: MediatorLiveData<Resource<ChargeLocation>> by lazy {
         MediatorLiveData<Resource<ChargeLocation>>().apply {

app/src/main/res/layout/fragment_donate_referral.xml

@@ -38,7 +38,7 @@
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:orientation="horizontal"
-        app:constraint_referenced_ids="referral_tesla,referral_juicify"
+        app:constraint_referenced_ids="referral_tesla,referral_juicify,referral_geldfuereauto,referral_maingau,referral_ewieeinfach"
         app:flow_horizontalGap="16dp"
         app:flow_horizontalStyle="packed"
         app:flow_verticalAlign="baseline"
@@ -61,4 +61,25 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:text="@string/referral_juicify" />
+
+    <Button
+        android:id="@+id/referral_geldfuereauto"
+        style="@style/Widget.Material3.Button.TonalButton"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/referral_geldfuereauto" />
+
+    <Button
+        android:id="@+id/referral_maingau"
+        style="@style/Widget.Material3.Button.TonalButton"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/referral_maingau" />
+
+    <Button
+        android:id="@+id/referral_ewieeinfach"
+        style="@style/Widget.Material3.Button.TonalButton"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/referral_ewieeinfach" />
 </androidx.constraintlayout.widget.ConstraintLayout>

app/src/main/res/values-cs/strings.xml

@@ -374,4 +374,10 @@
     <string name="auto_chargeprice_vehicle_ambiguous">Několik vozidel vybraných v aplikaci se shoduje s tímto vozidlem (%1$s %2$s).</string>
     <string name="auto_multipage">(%1$d/%2$d)</string>
     <string name="referral_tesla">Tesla</string>
+    <string name="status_available">Dostupná</string>
+    <string name="status_occupied">Obsazená</string>
+    <string name="status_charging">Nabíjení</string>
+    <string name="status_faulted">Mimo provoz</string>
+    <string name="status_unknown">Stav neznámý</string>
+    <string name="status_since">%1$s od %2$s</string>
 </resources>

app/src/main/res/values/donottranslate.xml

@@ -37,7 +37,13 @@
     <string name="donate_link" translatable="false">https://ev-map.app/donate/</string>
     <string name="tesla_referral_link" translatable="false">http://ts.la/johan94494</string>
     <string name="juicify_referral_link" translatable="false">https://trck.juicify.green/trck/eclick/9dba357fbfed1e82fb05c7ec004ee2972ea174ce46d8ae0d</string>
-    <string name="referral_juicify">Juicify</string>
+    <string name="geldfuereauto_referral_link" translatable="false">https://trck.geld-fuer-eauto.de/trck/eclick/c4713e9520bdb8842a3f1fbfa3a0669b3e58421043df78ad</string>
+    <string name="maingau_referral_link" translatable="false">https://trck.maingau-energie.de/trck/eclick/799b39cda39575dab1dcd3351abeb77b62dc33e4f9558a57</string>
+    <string name="ewieeinfach_referral_link" translatable="false">https://trck.e-wie-einfach.de/trck/eclick/fca74c186b54e7287a62102a13e073be4fc963825b85f7df</string>
+    <string name="referral_juicify" translatable="false">Juicify</string>
+    <string name="referral_geldfuereauto" translatable="false">Geld für eAuto</string>
+    <string name="referral_maingau" translatable="false">Maingau</string>
+    <string name="referral_ewieeinfach" translatable="false">E wie einfach</string>
     <string name="copyright_summary">©2020–2023 Johan von Forstner and contributors</string>
     <string name="acra_backend_url" translatable="false">https://acra.muc.vonforst.net/report</string>
 </resources>

fastlane/metadata/android/de-DE/changelogs/210.txt

@@ -0,0 +1,2 @@
+Fehler behoben:
+- Abstürze behoben

fastlane/metadata/android/en-US/changelogs/210.txt

@@ -0,0 +1,2 @@
+Bugfixes:
+- Fixed crashes

gradle.properties

@@ -14,6 +14,5 @@
 kotlin.code.style=official
 org.gradle.jvmargs=-Xmx2048M -Dkotlin.daemon.jvm.options\="-Xmx2048M"
 android.useAndroidX=true
-android.defaults.buildfeatures.buildconfig=true
 android.nonTransitiveRClass=true
 android.nonFinalResIds=true