Auto: make new map screen optional for now

mainly due to bug https://issuetracker.google.com/issues/389974133

Author: johan12345

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

@@ -109,6 +109,7 @@ class CarAppService : androidx.car.app.CarAppService() {
 @ExperimentalCarApi
 class EVMapSession(val cas: CarAppService) : Session(), DefaultLifecycleObserver {
     private val TAG = "EVMapSession"
+    lateinit var intent: Intent
     var mapScreen: LocationAwareScreen? = null
         set(value) {
             field = value
@@ -132,7 +133,8 @@ class EVMapSession(val cas: CarAppService) : Session(), DefaultLifecycleObserver
     }
 
     override fun onCreateScreen(intent: Intent): Screen {
-        val mapScreen = if (supportsNewMapScreen(carContext)) {
+        this.intent = intent
+        val mapScreen = if (supportsNewMapScreen(carContext) && prefs.androidAutoNewMapScreenEnabled) {
             MapScreen(carContext, this)
         } else {
             LegacyMapScreen(carContext, this)

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

@@ -47,8 +47,13 @@ import java.io.IOException
 import java.time.Instant
 
 @ExperimentalCarApi
-class SettingsScreen(ctx: CarContext, val session: EVMapSession) : Screen(ctx) {
+class SettingsScreen(ctx: CarContext, val session: EVMapSession) : Screen(ctx), DefaultLifecycleObserver {
     val prefs = PreferenceDataSource(ctx)
+    val newMapScreenEnabledPrevious = prefs.androidAutoNewMapScreenEnabled
+
+    init {
+        lifecycle.addObserver(this)
+    }
 
     override fun onGetTemplate(): Template {
         return ListTemplate.Builder().apply {
@@ -87,7 +92,26 @@ class SettingsScreen(ctx: CarContext, val session: EVMapSession) : Screen(ctx) {
                             }
                             .build()
                     )
-                    if (carContext.carAppApiLevel < 7 || !carContext.isAppDrivenRefreshSupported) {
+                    if (supportsNewMapScreen(carContext)) {
+                        addItem(
+                            Row.Builder()
+                                .setTitle(carContext.getString(R.string.auto_use_new_map_screen))
+                                .setToggle(Toggle.Builder {
+                                    prefs.androidAutoNewMapScreenEnabled = it
+                                    invalidate()
+                                }.setChecked(prefs.androidAutoNewMapScreenEnabled).build())
+                                .setImage(
+                                    CarIcon.Builder(
+                                        IconCompat.createWithResource(
+                                            carContext,
+                                            R.drawable.ic_developer
+                                        )
+                                    ).setTint(CarColor.DEFAULT).build()
+                                )
+                                .build()
+                        )
+                    }
+                    if (!supportsNewMapScreen(carContext) || !prefs.androidAutoNewMapScreenEnabled) {
                         // this option is only supported in LegacyMapScreen
                         addItem(
                             Row.Builder()
@@ -127,6 +151,15 @@ class SettingsScreen(ctx: CarContext, val session: EVMapSession) : Screen(ctx) {
             }.build())
         }.build()
     }
+
+    override fun onStop(owner: LifecycleOwner) {
+        if (newMapScreenEnabledPrevious != prefs.androidAutoNewMapScreenEnabled) {
+            val newMapScreen = session.onCreateScreen(session.intent)
+            val oldMapScreen = screenManager.screenStack.last()
+            screenManager.push(newMapScreen)
+            screenManager.remove(oldMapScreen)
+        }
+    }
 }
 
 @ExperimentalCarApi

app/src/main/java/net/vonforst/evmap/storage/PreferenceDataSource.kt

@@ -12,6 +12,7 @@ import net.vonforst.evmap.autocomplete.PlaceWithBounds
 import net.vonforst.evmap.model.FILTERS_CUSTOM
 import net.vonforst.evmap.model.FILTERS_DISABLED
 import java.time.Instant
+import androidx.core.content.edit
 
 class PreferenceDataSource(val context: Context) {
     val sp = PreferenceManager.getDefaultSharedPreferences(context)
@@ -254,6 +255,12 @@ class PreferenceDataSource(val context: Context) {
         set(value) {
             sp.edit().putBoolean("android_auto_compass_enabled", value).apply()
         }
+
+    var androidAutoNewMapScreenEnabled: Boolean
+        get() = sp.getBoolean("android_auto_new_map_screen_enabled", false)
+        set(value) {
+            sp.edit { putBoolean("android_auto_new_map_screen_enabled", value) }
+        }
 }
 
 fun SharedPreferences.getLatLng(key: String): LatLng? =

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

@@ -388,4 +388,5 @@
     <string name="accessibility_residents">Bewohner</string>
     <string name="chargeprice_removal_2025_dialog_title">Sorry!</string>
     <string name="chargeprice_removal_2025_dialog_detail">Die Kosten für den Zugriff auf Chargeprice-Daten sind stark gestiegen und können nicht mehr durch Spenden gedeckt werden. Daher kann EVMap diese Daten nicht mehr direkt anzeigen. Hier öffnet sich nun die Chargeprice-Website. Eine alternative Lösung ist in Arbeit, wird aber Zeit brauchen und anfangs nur eingeschränkt funktionieren. Danke für eure Geduld und Unterstützung!</string>
+    <string name="auto_use_new_map_screen">Neue Kartendarstellung (beta)</string>
 </resources>

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

@@ -388,4 +388,5 @@
     <string name="accessibility_residents">Residents</string>
     <string name="chargeprice_removal_2025_dialog_title">Sorry!</string>
     <string name="chargeprice_removal_2025_dialog_detail">Costs for Chargeprice data access have risen sharply and can’t be covered by donations, so EVMap can no longer show this data directly. For now, this opens the Chargeprice website. An alternative solution is being developed, but it’ll take time and may start with limited features. Thanks for your patience and support!</string>
+    <string name="auto_use_new_map_screen">New map screen (beta)</string>
 </resources>