Release 1.3.7

fixes #207

README.md

@@ -20,7 +20,7 @@ Features
 - Advanced filtering options, including saved filter profiles
 - Favorites list, also with availability information
 - Integrated price comparison using [Chargeprice.app](https://chargeprice.app) (only in Europe)
-- Android Auto integration
+- Android Auto & Android Automotive OS integration
 - No ads, fully open source
 - Compatible with Android 5.0 and above
 - Can use Google Maps or Mapbox (OpenStreetMap) as map backends - the version available on F-Droid only uses Mapbox.
@@ -41,9 +41,13 @@ EVMap uses and put them into the app in the form of a resource file called `apik
 `app/src/main/res/values`. You can find more information on which API keys are necessary for which
 features and how they can be obtained in our [documentation page](doc/api_keys.md).
 
-There are two different build flavors, `google` and `foss`, where only the `google` variant uses
-Google Maps data and provides the Android Auto integration. The `foss` variant only uses Mapbox data
-and should run on devices without Google Play Services.
+There are three different build flavors, `googleNormal`, `fossNormal` and `googleAutomotive`.
+- The `foss` variant only uses Mapbox data and should run on most Android devices, even without Google Play Services.
+- The `google` variants also include access to Google Maps data.
+  - `googleNormal` is intended to run on smartphones and tablets, and also includes the Android Auto app for use
+     on the car display.
+  - `googleAutomotive` variant is intended to be installed directly on car infotainment systems using the
+     Google-flavored Android Automotive OS. It does not provide the usual smartphone UI.
 
 We also have a special [documentation page](doc/android_auto.md) on how to test the Android Auto
 app.

_img/appicon_notification.svg

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?><!-- Generator: Adobe Illustrator 24.3.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Ebene_1" xmlns="http://www.w3.org/2000/svg" x="0px" y="0px"
+	viewBox="0 0 120 120" style="enable-background:new 0 0 120 120;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#FFFFFF;}
+</style>
+	<g>
+	<g>
+		<path class="st0"
+			d="M27.1,88.3l-2.2-19.2l-3.3,0.3l2.2,19.2L27.1,88.3z M39,86.9l-2.2-19.2l-3.3,0.3l2.2,19.2L39,86.9z" />
+		<path class="st0" d="M45.2,113c-1,1.3-1.8,2.1-2,2.2c-3,2.4-5.4,3.1-7.4,2.2c-3.5-1.7-3.2-8.2-3.1-8.9l2.4,0.1
+			c-0.1,1.8,0.2,5.8,1.8,6.6c0.9,0.5,2.5-0.1,4.6-1.8l0,0c0,0,6.7-6.7,5.3-12c-1.6-6.4,5.8-15.5,8.2-18.6l0.3-0.3l2,1.5l-0.3,0.5
+			c-7.5,9.2-8.3,14-7.7,16.4C50.5,105.4,47.4,110.4,45.2,113z" />
+		<path class="st0" d="M19.7,88.1l0.9,7.9l7.3,4.9l9.8-1l6-6.4l-0.9-7.9L19.7,88.1z" />
+		<g>
+			<path class="st0"
+				d="M37.6,99.7l-9.8,1l2.1,8.7l7.7-0.9V99.7L37.6,99.7z M44.6,79l0.8,7.2l-28.2,3.2l-0.8-7.2L44.6,79z" />
+		</g>
+	</g>
+		<path class="st0" d="M66.7,0C46.5,0,30.1,16.4,30.1,36.6c0,27.6,30.8,42,34.5,81.4c0.1,1.2,1,2,2.2,2c1.2,0,2.1-0.8,2.2-2
+		c3.7-39.4,34.5-53.8,34.5-81.4C103.3,16.2,86.9,0,66.7,0z M78.4,34.7L64.3,59V40.8h-6V18.7c0,0,20.2,0,20.1-0.1l-8.1,16.2H78.4z" />
+</g>
+</svg>

app/build.gradle

@@ -8,9 +8,10 @@ apply plugin: 'kotlin-parcelize'
 apply plugin: 'kotlin-kapt'
 apply plugin: 'androidx.navigation.safeargs.kotlin'
 apply plugin: 'com.mikepenz.aboutlibraries.plugin'
+apply plugin: 'de.timfreiheit.resourceplaceholders'
 
 android {
-    compileSdkVersion 31
+    compileSdkVersion 32
     buildToolsVersion "30.0.3"
 
     defaultConfig {
@@ -18,8 +19,8 @@ android {
         minSdkVersion 21
         targetSdkVersion 31
         // NOTE: always increase versionCode by 2 since automotive flavor uses versionCode + 1
-        versionCode 82
-        versionName "1.3.3"
+        versionCode 98
+        versionName "1.3.7"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
@@ -94,6 +95,14 @@ android {
         disable 'NullSafeMutableLiveData'
     }
 
+    testOptions {
+        unitTests.includeAndroidResources true
+    }
+
+    resourcePlaceholders {
+        files = ['xml/shortcuts.xml']
+    }
+
     // add API keys from environment variable if not set in apikeys.xml
     applicationVariants.all { variant ->
         ext.env = System.getenv()
@@ -139,9 +148,9 @@ dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
     implementation 'androidx.appcompat:appcompat:1.4.2'
     implementation 'androidx.core:core-ktx:1.8.0'
-    implementation 'androidx.core:core-splashscreen:1.0.0-rc01'
-    implementation "androidx.activity:activity-ktx:1.4.0"
-    implementation "androidx.fragment:fragment-ktx:1.4.1"
+    implementation 'androidx.core:core-splashscreen:1.0.0'
+    implementation "androidx.activity:activity-ktx:1.5.1"
+    implementation "androidx.fragment:fragment-ktx:1.5.1"
     implementation 'androidx.cardview:cardview:1.0.0'
     implementation 'androidx.preference:preference-ktx:1.2.0'
     implementation 'com.google.android.material:material:1.6.1'
@@ -164,29 +173,33 @@ dependencies {
     implementation "com.mikepenz:aboutlibraries:$about_libs_version"
     implementation 'com.airbnb.android:lottie:4.1.0'
     implementation 'io.michaelrocks.bimap:bimap:1.1.0'
-    implementation 'com.mapzen.android:lost:3.0.2'
     implementation 'com.google.guava:guava:29.0-android'
     implementation 'com.github.pengrad:mapscaleview:1.6.0'
     implementation 'com.github.romandanylyk:PageIndicatorView:b1bad589b5'
 
     // Android Auto
-    googleImplementation 'androidx.car.app:app:1.2.0-rc01'
-    googleNormalImplementation 'androidx.car.app:app-projected:1.2.0-rc01'
-    googleAutomotiveImplementation 'androidx.car.app:app-automotive:1.2.0-rc01'
+    def carAppVersion = '1.2.0-rc01'
+    googleImplementation "androidx.car.app:app:$carAppVersion"
+    googleNormalImplementation "androidx.car.app:app-projected:$carAppVersion"
+    googleAutomotiveImplementation "androidx.car.app:app-automotive:$carAppVersion"
 
     // AnyMaps
-    def anyMapsVersion = '3c67d7a1dc'
+    def anyMapsVersion = 'f36bb3c126'
     implementation "com.github.johan12345.AnyMaps:anymaps-base:$anyMapsVersion"
     googleImplementation "com.github.johan12345.AnyMaps:anymaps-google:$anyMapsVersion"
-    googleImplementation 'com.google.android.gms:play-services-maps:18.0.2'
+    googleImplementation 'com.google.android.gms:play-services-maps:18.1.0'
     implementation("com.github.johan12345.AnyMaps:anymaps-mapbox:$anyMapsVersion") {
         exclude group: 'com.mapbox.mapboxsdk', module: 'mapbox-android-accounts'
         exclude group: 'com.mapbox.mapboxsdk', module: 'mapbox-android-telemetry'
+        exclude group: 'com.google.android.gms', module: 'play-services-location'
+        exclude group: 'com.mapbox.mapboxsdk', module: 'mapbox-android-core'
     }
+    // patched version of mapbox-android-core that removes build-time dependency on GMS
+    implementation 'com.github.johan12345:mapbox-events-android:a21c324501'
 
     // Google Places
-    implementation 'com.google.android.libraries.places:places:2.6.0'
-    googleImplementation 'org.jetbrains.kotlinx:kotlinx-coroutines-play-services:1.4.1'
+    googleImplementation 'com.google.android.libraries.places:places:2.6.0'
+    googleImplementation 'org.jetbrains.kotlinx:kotlinx-coroutines-play-services:1.6.1'
 
     // Mapbox Geocoding
     implementation 'com.mapbox.mapboxsdk:mapbox-sdk-services:5.5.0'
@@ -196,12 +209,12 @@ dependencies {
     implementation "androidx.navigation:navigation-ui-ktx:$nav_version"
 
     // viewmodel library
-    def lifecycle_version = "2.4.1"
+    def lifecycle_version = "2.5.1"
     implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycle_version"
     implementation "androidx.lifecycle:lifecycle-livedata-ktx:$lifecycle_version"
 
     // room library
-    def room_version = "2.4.2"
+    def room_version = "2.4.3"
     implementation "androidx.room:room-runtime:$room_version"
     kapt "androidx.room:room-compiler:$room_version"
     implementation "androidx.room:room-ktx:$room_version"
@@ -218,12 +231,20 @@ dependencies {
     implementation("ch.acra:acra-limiter:$acraVersion")
 
     // debug tools
-    implementation 'com.facebook.stetho:stetho:1.5.1'
-    implementation 'com.facebook.stetho:stetho-okhttp3:1.5.1'
+    implementation 'com.facebook.stetho:stetho:1.6.0'
+    implementation 'com.facebook.stetho:stetho-okhttp3:1.6.0'
+
+    // testing
     testImplementation 'junit:junit:4.13.2'
     testImplementation "com.squareup.okhttp3:mockwebserver:4.9.0"
     //noinspection GradleDependency
     testImplementation 'org.json:json:20080701'
+
+    // testing for car app
+    testGoogleImplementation "androidx.car.app:app-testing:$carAppVersion"
+    testGoogleImplementation 'org.robolectric:robolectric:4.8.1'
+    testGoogleImplementation 'androidx.test:core:1.4.0'
+
     androidTestImplementation 'androidx.test.ext:junit:1.1.3'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
 

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

@@ -8,6 +8,7 @@ import android.app.NotificationManager
 import android.content.Context
 import android.content.Intent
 import android.content.pm.ApplicationInfo
+import android.location.Criteria
 import android.location.Location
 import android.location.LocationManager
 import android.os.Build
@@ -15,6 +16,7 @@ import android.util.Log
 import androidx.annotation.RequiresPermission
 import androidx.car.app.CarContext
 import androidx.car.app.Screen
+import androidx.car.app.ScreenManager
 import androidx.car.app.Session
 import androidx.car.app.annotations.ExperimentalCarApi
 import androidx.car.app.hardware.CarHardwareManager
@@ -25,10 +27,11 @@ import androidx.car.app.validation.HostValidator
 import androidx.core.app.NotificationCompat
 import androidx.core.app.NotificationManagerCompat
 import androidx.core.content.ContextCompat
+import androidx.core.location.LocationListenerCompat
 import androidx.lifecycle.DefaultLifecycleObserver
 import androidx.lifecycle.LifecycleOwner
 import net.vonforst.evmap.R
-import net.vonforst.evmap.utils.checkAnyLocationPermission
+import net.vonforst.evmap.utils.checkFineLocationPermission
 
 
 interface LocationAwareScreen {
@@ -68,7 +71,8 @@ class CarAppService : androidx.car.app.CarAppService() {
             .setContentTitle(getString(R.string.app_name))
             .setOngoing(true)
             .setPriority(NotificationManagerCompat.IMPORTANCE_HIGH)
-            .setSmallIcon(R.mipmap.ic_launcher)
+            .setSmallIcon(R.drawable.ic_appicon_notification)
+            .setColor(ContextCompat.getColor(this, R.color.colorPrimary))
             .setTicker(getString(R.string.auto_location_service))
             .setWhen(System.currentTimeMillis())
 
@@ -112,10 +116,25 @@ class EVMapSession(val cas: CarAppService) : Session(), DefaultLifecycleObserver
     }
 
     override fun onCreateScreen(intent: Intent): Screen {
-        return MapScreen(carContext, this)
+        val mapScreen = MapScreen(carContext, this)
+
+        if (!locationPermissionGranted()) {
+            val screenManager = carContext.getCarService(ScreenManager::class.java)
+            screenManager.push(mapScreen)
+            return PermissionScreen(
+                carContext,
+                R.string.auto_location_permission_needed,
+                listOf(
+                    Manifest.permission.ACCESS_FINE_LOCATION,
+                    Manifest.permission.ACCESS_COARSE_LOCATION
+                )
+            )
+        }
+
+        return mapScreen
     }
 
-    fun locationPermissionGranted() = carContext.checkAnyLocationPermission()
+    private fun locationPermissionGranted() = carContext.checkFineLocationPermission()
 
     private fun updateLocation(location: Location?) {
         Log.d(TAG, "Received location: $location")
@@ -142,6 +161,7 @@ class EVMapSession(val cas: CarAppService) : Session(), DefaultLifecycleObserver
         requestPhoneLocationUpdates()
     }
 
+    @RequiresPermission(anyOf = [Manifest.permission.ACCESS_FINE_LOCATION])
     private fun requestCarHardwareLocationUpdates() {
         if (supportsCarApiLevel3(carContext)) {
             val exec = ContextCompat.getMainExecutor(carContext)
@@ -153,15 +173,23 @@ class EVMapSession(val cas: CarAppService) : Session(), DefaultLifecycleObserver
         }
     }
 
+    private val phoneLocationListener = LocationListenerCompat {
+        this.updateLocation(it)
+    }
+
     @RequiresPermission(anyOf = [Manifest.permission.ACCESS_COARSE_LOCATION, Manifest.permission.ACCESS_FINE_LOCATION])
     private fun requestPhoneLocationUpdates() {
-        val location = locationManager.getLastKnownLocation(LocationManager.GPS_PROVIDER)
+        val provider = locationManager.getBestProvider(Criteria().apply {
+            accuracy = Criteria.ACCURACY_FINE
+        }, true) ?: return
+
+        val location = locationManager.getLastKnownLocation(provider)
         updateLocation(location)
         locationManager.requestLocationUpdates(
-            LocationManager.GPS_PROVIDER,
+            provider,
             1000,
             1f,
-            this::updateLocation
+            phoneLocationListener
         )
     }
 
@@ -181,7 +209,7 @@ class EVMapSession(val cas: CarAppService) : Session(), DefaultLifecycleObserver
 
     @RequiresPermission(anyOf = [Manifest.permission.ACCESS_COARSE_LOCATION, Manifest.permission.ACCESS_FINE_LOCATION])
     private fun removePhoneLocationUpdates() {
-        locationManager.removeUpdates(this::updateLocation)
+        locationManager.removeUpdates(phoneLocationListener)
     }
 
     @SuppressLint("MissingPermission")

app/src/google/java/net/vonforst/evmap/auto/CarSensors.kt

@@ -0,0 +1,140 @@
+package net.vonforst.evmap.auto
+
+import android.content.Context
+import android.hardware.Sensor
+import android.hardware.SensorEvent
+import android.hardware.SensorEventListener
+import android.hardware.SensorManager
+import androidx.car.app.CarContext
+import androidx.car.app.hardware.CarHardwareManager
+import androidx.car.app.hardware.common.CarValue
+import androidx.car.app.hardware.common.OnCarDataAvailableListener
+import androidx.car.app.hardware.info.*
+import androidx.car.app.hardware.info.CarSensors.UpdateRate
+import net.vonforst.evmap.BuildConfig
+import java.util.concurrent.Executor
+
+/**
+ * CarSensors is not yet implemented for Android Automotive OS
+ * (see docs at https://developer.android.com/reference/androidx/car/app/hardware/info/CarSensors)
+ * so we provide our own implementation based on SensorManager APIs.
+ */
+val CarContext.patchedCarSensors: CarSensors
+    get() = if (BuildConfig.FLAVOR_automotive != "automotive") {
+        (this.getCarService(CarContext.HARDWARE_SERVICE) as CarHardwareManager).carSensors
+    } else {
+        CarSensorsWrapper(this)
+    }
+
+class CarSensorsWrapper(carContext: CarContext) :
+    CarSensors {
+    private val sensorManager = carContext.getSystemService(Context.SENSOR_SERVICE) as SensorManager
+    private val compassListeners: MutableMap<OnCarDataAvailableListener<Compass>, SensorEventListener> =
+        mutableMapOf()
+
+    override fun addAccelerometerListener(
+        rate: Int,
+        executor: Executor,
+        listener: OnCarDataAvailableListener<Accelerometer>
+    ) {
+        TODO("Not yet implemented")
+    }
+
+    override fun removeAccelerometerListener(listener: OnCarDataAvailableListener<Accelerometer>) {
+        TODO("Not yet implemented")
+    }
+
+    override fun addGyroscopeListener(
+        rate: Int,
+        executor: Executor,
+        listener: OnCarDataAvailableListener<Gyroscope>
+    ) {
+        TODO("Not yet implemented")
+    }
+
+    override fun removeGyroscopeListener(listener: OnCarDataAvailableListener<Gyroscope>) {
+        TODO("Not yet implemented")
+    }
+
+    override fun addCompassListener(
+        rate: Int,
+        executor: Executor,
+        listener: OnCarDataAvailableListener<Compass>
+    ) {
+        val magSensor = sensorManager.getDefaultSensor(Sensor.TYPE_MAGNETIC_FIELD)
+        val accSensor = sensorManager.getDefaultSensor(Sensor.TYPE_ACCELEROMETER)
+
+        if (magSensor == null) {
+            executor.execute {
+                listener.onCarDataAvailable(Compass(CarValue(null, 0, CarValue.STATUS_UNAVAILABLE)))
+            }
+            return
+        }
+        val sensorListener = object : SensorEventListener {
+            var magValues: FloatArray? = null
+
+            // AAOS cars may not provide an acceleration sensor, so we assume acceleration based on
+            // Earth's gravity. May not be correct when driving on other planets.
+            var accValues = floatArrayOf(0f, 0f, SensorManager.GRAVITY_EARTH)
+            val rotMatrix = FloatArray(9)
+            val orientation = FloatArray(3)
+
+            override fun onSensorChanged(event: SensorEvent) {
+                when (event.sensor) {
+                    magSensor -> magValues = event.values
+                    accSensor -> accValues = event.values
+                }
+                if (magValues == null) return
+
+                SensorManager.getRotationMatrix(rotMatrix, null, accValues, magValues)
+                SensorManager.getOrientation(rotMatrix, orientation)
+                val compassDegrees = orientation.map { Math.toDegrees(it.toDouble()).toFloat() }
+                executor.execute {
+                    listener.onCarDataAvailable(
+                        Compass(
+                            CarValue(
+                                compassDegrees,
+                                event.timestamp,
+                                CarValue.STATUS_SUCCESS
+                            )
+                        )
+                    )
+                }
+            }
+
+            override fun onAccuracyChanged(sensor: Sensor, accuracy: Int) {
+            }
+
+        }
+        compassListeners[listener] = sensorListener
+        sensorManager.registerListener(sensorListener, magSensor, mapRate(rate))
+        accSensor?.let { sensorManager.registerListener(sensorListener, it, mapRate(rate)) }
+    }
+
+    private fun mapRate(@UpdateRate rate: Int): Int {
+        return when (rate) {
+            CarSensors.UPDATE_RATE_NORMAL -> SensorManager.SENSOR_DELAY_NORMAL
+            CarSensors.UPDATE_RATE_UI -> SensorManager.SENSOR_DELAY_UI
+            CarSensors.UPDATE_RATE_FASTEST -> SensorManager.SENSOR_DELAY_FASTEST
+            else -> throw IllegalArgumentException()
+        }
+    }
+
+    override fun removeCompassListener(listener: OnCarDataAvailableListener<Compass>) {
+        compassListeners[listener]?.let {
+            sensorManager.unregisterListener(it)
+        }
+    }
+
+    override fun addCarHardwareLocationListener(
+        rate: Int,
+        executor: Executor,
+        listener: OnCarDataAvailableListener<CarHardwareLocation>
+    ) {
+        TODO("Not yet implemented")
+    }
+
+    override fun removeCarHardwareLocationListener(listener: OnCarDataAvailableListener<CarHardwareLocation>) {
+        TODO("Not yet implemented")
+    }
+}

app/src/google/java/net/vonforst/evmap/auto/ChargerDetailScreen.kt

@@ -56,8 +56,7 @@ class ChargerDetailScreen(ctx: CarContext, val chargerSparse: ChargeLocation) :
     private val referenceData = api.getReferenceData(lifecycleScope, carContext)
 
     private val imageSize = 128  // images should be 128dp according to docs
-    private val imageHeightLarge = 480  // images should be 480 x 854 dp according to docs
-    private val imageWidthLarge = 854
+    private val imageSizeLarge = 480  // images should be 480 x 480 dp according to docs
 
     private val iconGen =
         ChargerIconGenerator(carContext, null, height = imageSize)
@@ -369,10 +368,7 @@ class ChargerDetailScreen(ctx: CarContext, val chargerSparse: ChargeLocation) :
                 photo?.let {
                     val density = carContext.resources.displayMetrics.density
                     val url = if (largeImageSupported) {
-                        photo.getUrl(
-                            width = (imageWidthLarge * density).roundToInt(),
-                            height = (imageHeightLarge * density).roundToInt()
-                        )
+                        photo.getUrl(size = (imageSizeLarge * density).roundToInt())
                     } else {
                         photo.getUrl(size = (imageSize * density).roundToInt())
                     }

app/src/google/java/net/vonforst/evmap/auto/FilterScreen.kt

@@ -21,7 +21,7 @@ import net.vonforst.evmap.viewmodel.FilterViewModel
 import kotlin.math.roundToInt
 
 @androidx.car.app.annotations.ExperimentalCarApi
-class FilterScreen(ctx: CarContext) : Screen(ctx) {
+class FilterScreen(ctx: CarContext, val session: EVMapSession) : Screen(ctx) {
     private val prefs = PreferenceDataSource(ctx)
     private val db = AppDatabase.getInstance(ctx)
     val filterProfiles: LiveData<List<FilterProfile>> by lazy {
@@ -47,6 +47,30 @@ class FilterScreen(ctx: CarContext) : Screen(ctx) {
             setHeaderAction(Action.BACK)
             setActionStrip(
                 ActionStrip.Builder().apply {
+                    addAction(Action.Builder().apply {
+                        setIcon(
+                            CarIcon.Builder(
+                                IconCompat.createWithResource(
+                                    carContext,
+                                    if (prefs.placeSearchResultAndroidAuto != null) {
+                                        R.drawable.ic_search_off
+                                    } else {
+                                        R.drawable.ic_search
+                                    }
+                                )
+                            ).build()
+
+                        )
+                        setOnClickListener(ParkedOnlyOnClickListener.create {
+                            if (prefs.placeSearchResultAndroidAuto != null) {
+                                prefs.placeSearchResultAndroidAutoName = null
+                                prefs.placeSearchResultAndroidAuto = null
+                                screenManager.pop()
+                            } else {
+                                screenManager.push(PlaceSearchScreen(carContext, session))
+                            }
+                        })
+                    }.build())
                     addAction(Action.Builder().apply {
                         setIcon(
                             CarIcon.Builder(
@@ -65,42 +89,6 @@ class FilterScreen(ctx: CarContext) : Screen(ctx) {
                             }
                         })
                     }.build())
-                    if (filterStatus !in listOf(
-                            FILTERS_CUSTOM,
-                            FILTERS_FAVORITES,
-                            FILTERS_DISABLED
-                        )
-                    ) {
-                        addAction(Action.Builder().apply {
-                            setIcon(
-                                CarIcon.Builder(
-                                    IconCompat.createWithResource(
-                                        carContext,
-                                        R.drawable.ic_delete
-                                    )
-                                ).build()
-
-                            )
-                            setOnClickListener {
-                                val currentProfile =
-                                    filterProfiles.value?.find { it.id == filterStatus }
-                                        ?: return@setOnClickListener
-                                lifecycleScope.launch {
-                                    db.filterProfileDao().delete(currentProfile)
-                                    prefs.filterStatus = FILTERS_DISABLED
-                                    CarToast.makeText(
-                                        carContext,
-                                        carContext.getString(
-                                            R.string.deleted_filterprofile,
-                                            currentProfile.name
-                                        ),
-                                        CarToast.LENGTH_SHORT
-                                    ).show()
-                                    invalidate()
-                                }
-                            }
-                        }.build())
-                    }
                 }.build()
             )
         }.build()
@@ -190,33 +178,46 @@ class EditFiltersScreen(ctx: CarContext) : Screen(ctx) {
 
             setHeaderAction(Action.BACK)
             setActionStrip(ActionStrip.Builder().apply {
-                addAction(Action.Builder()
-                    .setIcon(
-                        CarIcon.Builder(
-                            IconCompat.createWithResource(
-                                carContext,
-                                R.drawable.ic_check
-                            )
-                        ).build()
-                    )
-                    .setOnClickListener {
-                        lifecycleScope.launch {
-                            vm.saveFilterValues()
-                            screenManager.popTo(MapScreen.MARKER)
+                val currentProfile = vm.filterProfile.value
+                if (currentProfile != null) {
+                    addAction(Action.Builder().apply {
+                        setIcon(
+                            CarIcon.Builder(
+                                IconCompat.createWithResource(
+                                    carContext,
+                                    R.drawable.ic_delete
+                                )
+                            ).build()
+
+                        )
+                        setOnClickListener {
+                            lifecycleScope.launch {
+                                vm.deleteCurrentProfile()
+                                CarToast.makeText(
+                                    carContext,
+                                    carContext.getString(
+                                        R.string.deleted_filterprofile,
+                                        currentProfile.name
+                                    ),
+                                    CarToast.LENGTH_SHORT
+                                ).show()
+                                invalidate()
+                                screenManager.pop()
+                            }
                         }
-                    }
-                    .build()
-                )
-                addAction(Action.Builder()
-                    .setIcon(
-                        CarIcon.Builder(
-                            IconCompat.createWithResource(
-                                carContext,
-                                R.drawable.ic_save
-                            )
-                        ).build()
-                    )
-                    .setOnClickListener {
+                    }.build())
+                }
+                addAction(
+                    Action.Builder()
+                        .setIcon(
+                            CarIcon.Builder(
+                                IconCompat.createWithResource(
+                                    carContext,
+                                    R.drawable.ic_save
+                                )
+                            ).build()
+                        )
+                        .setOnClickListener {
                         val textPromptScreen = TextPromptScreen(
                             carContext,
                             R.string.save_as_profile,
@@ -248,18 +249,21 @@ class EditFiltersScreen(ctx: CarContext) : Screen(ctx) {
                         is BooleanFilter -> {
                             setToggle(Toggle.Builder {
                                 (value as BooleanFilterValue).value = it
+                                lifecycleScope.launch { vm.saveFilterValues() }
                             }.setChecked((value as BooleanFilterValue).value).build())
                         }
                         is MultipleChoiceFilter -> {
                             setBrowsable(true)
                             setOnClickListener {
-                                screenManager.push(
+                                screenManager.pushForResult(
                                     MultipleChoiceFilterScreen(
                                         carContext,
                                         filter,
                                         value as MultipleChoiceFilterValue
                                     )
-                                )
+                                ) {
+                                    lifecycleScope.launch { vm.saveFilterValues() }
+                                }
                             }
                             addText(
                                 if ((value as MultipleChoiceFilterValue).all) {
@@ -276,13 +280,15 @@ class EditFiltersScreen(ctx: CarContext) : Screen(ctx) {
                             setBrowsable(true)
                             addText((value as SliderFilterValue).value.toString() + " " + filter.unit)
                             setOnClickListener {
-                                screenManager.push(
+                                screenManager.pushForResult(
                                     SliderFilterScreen(
                                         carContext,
                                         filter,
                                         value
                                     )
-                                )
+                                ) {
+                                    lifecycleScope.launch { vm.saveFilterValues() }
+                                }
                             }
                         }
                     }
@@ -379,7 +385,7 @@ class SliderFilterScreen(
     private fun generateSlider(): CharSequence {
         val bar = "━"
         val dot = "⬤"
-        val length = 35
+        val length = 30
 
         val position =
             ((filter.inverseMapping(value.value) - filter.min) / (filter.max - filter.min).toDouble() * length).roundToInt()

app/src/google/java/net/vonforst/evmap/auto/MapScreen.kt

@@ -1,10 +1,7 @@
 package net.vonforst.evmap.auto
 
-import android.Manifest
 import android.content.pm.PackageManager
 import android.location.Location
-import android.os.Handler
-import android.os.Looper
 import android.text.SpannableStringBuilder
 import android.text.Spanned
 import androidx.car.app.CarContext
@@ -40,6 +37,7 @@ import java.time.Duration
 import java.time.Instant
 import java.time.ZonedDateTime
 import kotlin.collections.set
+import kotlin.math.min
 import kotlin.math.roundToInt
 
 /**
@@ -48,7 +46,7 @@ import kotlin.math.roundToInt
 @androidx.car.app.annotations.ExperimentalCarApi
 class MapScreen(ctx: CarContext, val session: EVMapSession) :
     Screen(ctx), LocationAwareScreen, OnContentRefreshListener,
-    ItemList.OnItemVisibilityChangedListener {
+    ItemList.OnItemVisibilityChangedListener, DefaultLifecycleObserver {
     companion object {
         val MARKER = "map"
     }
@@ -85,7 +83,9 @@ class MapScreen(ctx: CarContext, val session: EVMapSession) :
         Transformations.map(referenceData) { api.getFilters(it, carContext.stringProvider()) }
     private val filtersWithValue = filtersWithValue(filters, filterValues)
 
-    private val hardwareMan = ctx.getCarService(CarContext.HARDWARE_SERVICE) as CarHardwareManager
+    private val hardwareMan: CarHardwareManager by lazy {
+        ctx.getCarService(CarContext.HARDWARE_SERVICE) as CarHardwareManager
+    }
     private var energyLevel: EnergyLevel? = null
     private val permissions = if (BuildConfig.FLAVOR_automotive == "automotive") {
         listOf(
@@ -99,20 +99,22 @@ class MapScreen(ctx: CarContext, val session: EVMapSession) :
         )
     }
 
+    private var searchLocation: LatLng? = null
+
     init {
-        filtersWithValue.observe(this) {
-            loadChargers()
-        }
+        lifecycle.addObserver(this)
         marker = MARKER
     }
 
     override fun onGetTemplate(): Template {
-        checkLocationPermission()
+        session.requestLocationUpdates()
 
         session.mapScreen = this
         return PlaceListMapTemplate.Builder().apply {
             setTitle(
-                carContext.getString(
+                prefs.placeSearchResultAndroidAutoName?.let {
+                    carContext.getString(R.string.auto_chargers_near_location, it)
+                } ?: carContext.getString(
                     if (filterStatus.value == FILTERS_FAVORITES) {
                         R.string.auto_favorites
                     } else {
@@ -120,8 +122,16 @@ class MapScreen(ctx: CarContext, val session: EVMapSession) :
                     }
                 )
             )
-            location?.let {
-                setAnchor(Place.Builder(CarLocation.create(it)).build())
+            searchLocation?.let {
+                setAnchor(Place.Builder(CarLocation.create(it.latitude, it.longitude)).apply {
+                    if (prefs.placeSearchResultAndroidAutoName != null) {
+                        setMarker(
+                            PlaceMarker.Builder()
+                                .setColor(CarColor.PRIMARY)
+                                .build()
+                        )
+                    }
+                }.build())
             } ?: setLoading(true)
             chargers?.take(maxRows)?.let { chargerList ->
                 val builder = ItemList.Builder()
@@ -179,8 +189,7 @@ class MapScreen(ctx: CarContext, val session: EVMapSession) :
                                     .build()
                             )
                             .setOnClickListener {
-                                screenManager.pushForResult(FilterScreen(carContext)) {
-                                    chargers = null
+                                screenManager.pushForResult(FilterScreen(carContext, session)) {
                                     filterStatus.value = prefs.filterStatus
                                 }
                                 session.mapScreen = null
@@ -191,25 +200,6 @@ class MapScreen(ctx: CarContext, val session: EVMapSession) :
         }.build()
     }
 
-    private fun checkLocationPermission() {
-        if (!session.locationPermissionGranted()) {
-            Handler(Looper.getMainLooper()).post {
-                screenManager.pushForResult(
-                    PermissionScreen(
-                        carContext,
-                        R.string.auto_location_permission_needed,
-                        listOf(
-                            Manifest.permission.ACCESS_FINE_LOCATION,
-                            Manifest.permission.ACCESS_COARSE_LOCATION
-                        )
-                    )
-                ) {
-                    session.requestLocationUpdates()
-                }
-            }
-        }
-    }
-
     private fun formatCharger(charger: ChargeLocation, showCity: Boolean): Row {
         val markerTint = if ((charger.maxPower ?: 0.0) > 100) {
             R.color.charger_100kw_dark  // slightly darker color for better contrast
@@ -287,13 +277,8 @@ class MapScreen(ctx: CarContext, val session: EVMapSession) :
             )
 
             setOnClickListener {
-                screenManager.pushForResult(ChargerDetailScreen(carContext, charger)) {
-                    if (filterStatus.value == FILTERS_FAVORITES) {
-                        // favorites list may have been updated
-                        chargers = null
-                        loadChargers()
-                    }
-                }
+                screenManager.push(ChargerDetailScreen(carContext, charger))
+                session.mapScreen = null
             }
         }.build()
     }
@@ -325,6 +310,10 @@ class MapScreen(ctx: CarContext, val session: EVMapSession) :
         val referenceData = referenceData.value ?: return
         val filters = filtersWithValue.value ?: return
 
+        val searchLocation =
+            prefs.placeSearchResultAndroidAuto ?: LatLng.fromLocation(location)
+        this.searchLocation = searchLocation
+
         updateCoroutine = lifecycleScope.launch {
             try {
                 // load chargers
@@ -339,7 +328,7 @@ class MapScreen(ctx: CarContext, val session: EVMapSession) :
                 } else {
                     val response = api.getChargepointsRadius(
                         referenceData,
-                        LatLng.fromLocation(location),
+                        searchLocation,
                         searchRadius,
                         zoom = 16f,
                         filters
@@ -350,7 +339,7 @@ class MapScreen(ctx: CarContext, val session: EVMapSession) :
                             // try again with larger radius
                             val response = api.getChargepointsRadius(
                                 referenceData,
-                                LatLng.fromLocation(location),
+                                searchLocation,
                                 searchRadius * 10,
                                 zoom = 16f,
                                 filters
@@ -374,11 +363,24 @@ class MapScreen(ctx: CarContext, val session: EVMapSession) :
     }
 
     private fun onEnergyLevelUpdated(energyLevel: EnergyLevel) {
+        val isUpdate = this.energyLevel == null
         this.energyLevel = energyLevel
-        invalidate()
+        if (isUpdate) invalidate()
+    }
+
+    override fun onStart(owner: LifecycleOwner) {
+        setupListeners()
+
+        // Reloading chargers in onStart does not seem to count towards content limit.
+        // So let's do this so the user gets fresh chargers when re-entering the app.
+        chargers = null
+        availabilities.clear()
+        invalidate()
+        filtersWithValue.observe(this) {
+            loadChargers()
+        }
     }
 
-    @OnLifecycleEvent(Lifecycle.Event.ON_RESUME)
     private fun setupListeners() {
         if (!permissions.all {
                 ContextCompat.checkSelfPermission(
@@ -388,25 +390,39 @@ class MapScreen(ctx: CarContext, val session: EVMapSession) :
             })
             return
 
-        println("Setting up energy level listener")
-
-        val exec = ContextCompat.getMainExecutor(carContext)
-        hardwareMan.carInfo.addEnergyLevelListener(exec, ::onEnergyLevelUpdated)
+        if (supportsCarApiLevel3(carContext)) {
+            println("Setting up energy level listener")
+            val exec = ContextCompat.getMainExecutor(carContext)
+            hardwareMan.carInfo.addEnergyLevelListener(exec, ::onEnergyLevelUpdated)
+        }
+    }
+
+    override fun onStop(owner: LifecycleOwner) {
+        removeListeners()
     }
 
-    @OnLifecycleEvent(Lifecycle.Event.ON_PAUSE)
     private fun removeListeners() {
-        println("Removing energy level listener")
-        hardwareMan.carInfo.removeEnergyLevelListener(::onEnergyLevelUpdated)
+        if (supportsCarApiLevel3(carContext)) {
+            println("Removing energy level listener")
+            hardwareMan.carInfo.removeEnergyLevelListener(::onEnergyLevelUpdated)
+        }
     }
 
     override fun onContentRefreshRequested() {
         loadChargers()
+        availabilities.clear()
+
+        val start = visibleStart
+        val end = visibleEnd
+        if (start != null && end != null) {
+            onItemVisibilityChanged(start, end)
+        }
     }
 
     override fun onItemVisibilityChanged(startIndex: Int, endIndex: Int) {
         // when the list is scrolled, load corresponding availabilities
-        if (startIndex == visibleStart && endIndex == visibleEnd) return
+        if (startIndex == visibleStart && endIndex == visibleEnd && !availabilities.isEmpty()) return
+        if (startIndex == -1 || endIndex == -1) return
         if (availabilityUpdateCoroutine != null) return
 
         visibleEnd = endIndex
@@ -423,7 +439,14 @@ class MapScreen(ctx: CarContext, val session: EVMapSession) :
         // update availabilities
         availabilityUpdateCoroutine = lifecycleScope.launch {
             delay(300L)
-            val tasks = chargers?.subList(startIndex, endIndex)?.mapNotNull {
+
+            val chargers = chargers ?: return@launch
+            if (chargers.isEmpty()) return@launch
+
+            val tasks = chargers.subList(
+                min(startIndex, chargers.size - 1),
+                min(endIndex, chargers.size - 1)
+            ).mapNotNull {
                 // update only if not yet stored
                 if (!availabilities.containsKey(it.id)) {
                     lifecycleScope.async {
@@ -433,7 +456,7 @@ class MapScreen(ctx: CarContext, val session: EVMapSession) :
                     }
                 } else null
             }
-            if (!tasks.isNullOrEmpty()) {
+            if (tasks.isNotEmpty()) {
                 tasks.awaitAll()
                 invalidate()
             }

app/src/google/java/net/vonforst/evmap/auto/PermissionScreen.kt

@@ -12,7 +12,8 @@ import net.vonforst.evmap.R
 class PermissionScreen(
     ctx: CarContext,
     @StringRes val message: Int,
-    val permissions: List<String>
+    val permissions: List<String>,
+    val finishApp: Boolean = true
 ) : Screen(ctx) {
     override fun onGetTemplate(): Template {
         return MessageTemplate.Builder(carContext.getString(message))
@@ -31,7 +32,13 @@ class PermissionScreen(
                 Action.Builder()
                     .setTitle(carContext.getString(R.string.cancel))
                     .setOnClickListener {
-                        carContext.finishCarApp()
+                        if (finishApp) {
+                            carContext.finishCarApp()
+                        } else {
+                            // pop twice to get away from the screen that requires the permission
+                            screenManager.pop()
+                            screenManager.pop()
+                        }
                     }
                     .build(),
             )

app/src/google/java/net/vonforst/evmap/auto/PlaceSearchScreen.kt

@@ -0,0 +1,234 @@
+package net.vonforst.evmap.auto
+
+import android.content.pm.PackageManager
+import android.location.Location
+import android.text.SpannableStringBuilder
+import android.text.Spanned
+import androidx.car.app.CarContext
+import androidx.car.app.CarToast
+import androidx.car.app.Screen
+import androidx.car.app.annotations.ExperimentalCarApi
+import androidx.car.app.constraints.ConstraintManager
+import androidx.car.app.hardware.CarHardwareManager
+import androidx.car.app.hardware.info.EnergyLevel
+import androidx.car.app.model.*
+import androidx.core.content.ContextCompat
+import androidx.core.graphics.drawable.IconCompat
+import androidx.lifecycle.DefaultLifecycleObserver
+import androidx.lifecycle.LifecycleOwner
+import androidx.lifecycle.lifecycleScope
+import com.car2go.maps.model.LatLng
+import kotlinx.coroutines.*
+import net.vonforst.evmap.BuildConfig
+import net.vonforst.evmap.R
+import net.vonforst.evmap.adapter.iconForPlaceType
+import net.vonforst.evmap.adapter.isSpecialPlace
+import net.vonforst.evmap.autocomplete.*
+import net.vonforst.evmap.storage.AppDatabase
+import net.vonforst.evmap.storage.PreferenceDataSource
+import net.vonforst.evmap.storage.RecentAutocompletePlace
+import java.io.IOException
+import java.time.Instant
+
+@ExperimentalCarApi
+class PlaceSearchScreen(ctx: CarContext, val session: EVMapSession) : Screen(ctx),
+    SearchTemplate.SearchCallback, LocationAwareScreen,
+    DefaultLifecycleObserver {
+    private val hardwareMan: CarHardwareManager by lazy {
+        ctx.getCarService(CarContext.HARDWARE_SERVICE) as CarHardwareManager
+    }
+    private var resultList: List<AutocompletePlace>? = null
+    private var recentResults = mutableListOf<RecentAutocompletePlace>()
+    private var currentProvider: AutocompleteProvider? = null
+    private val providers = getAutocompleteProviders(ctx)
+    private val recents = AppDatabase.getInstance(ctx).recentAutocompletePlaceDao()
+    private val maxItems = if (ctx.carAppApiLevel >= 2) {
+        ctx.constraintManager.getContentLimit(ConstraintManager.CONTENT_LIMIT_TYPE_LIST)
+    } else 6
+    private var location: Location? = null
+    private var energyLevel: EnergyLevel? = null
+    private var updateJob: Job? = null
+    private val prefs = PreferenceDataSource(ctx)
+
+    private val permissions = if (BuildConfig.FLAVOR_automotive == "automotive") {
+        listOf(
+            "android.car.permission.CAR_ENERGY",
+            "android.car.permission.CAR_ENERGY_PORTS",
+            "android.car.permission.READ_CAR_DISPLAY_UNITS",
+        )
+    } else {
+        listOf(
+            "com.google.android.gms.permission.CAR_FUEL"
+        )
+    }
+
+    init {
+        lifecycle.addObserver(this)
+        update("")
+    }
+
+    override fun onGetTemplate(): Template {
+        return SearchTemplate.Builder(this).apply {
+            setHeaderAction(Action.BACK)
+            setSearchHint(carContext.getString(R.string.search))
+            resultList?.let {
+                setItemList(buildItemList(it))
+            } ?: setLoading(true)
+        }.build()
+    }
+
+    private fun buildItemList(results: List<AutocompletePlace>): ItemList {
+        return ItemList.Builder().apply {
+            results.forEach { place ->
+                addItem(Row.Builder().apply {
+                    setTitle(place.primaryText)
+                    addText(place.secondaryText)
+
+                    val icon = iconForPlaceType(place.types)
+                    setImage(
+                        CarIcon.Builder(IconCompat.createWithResource(carContext, icon))
+                            .setTint(if (isSpecialPlace(place.types)) CarColor.PRIMARY else CarColor.DEFAULT)
+                            .build()
+                    )
+
+                    // distance
+                    place.distanceMeters?.let {
+                        val text = SpannableStringBuilder()
+                        text.append(
+                            "distance",
+                            DistanceSpan.create(
+                                roundValueToDistance(
+                                    it,
+                                    energyLevel?.distanceDisplayUnit?.value
+                                )
+                            ),
+                            Spanned.SPAN_EXCLUSIVE_EXCLUSIVE
+                        )
+                        addText(text)
+
+                        setOnClickListener {
+                            lifecycleScope.launch {
+                                val placeDetails = getDetails(place.id)
+                                prefs.placeSearchResultAndroidAuto = placeDetails.latLng
+                                prefs.placeSearchResultAndroidAutoName =
+                                    place.primaryText.toString()
+                                screenManager.popTo(MapScreen.MARKER)
+                            }
+                        }
+                    }
+                }.build())
+            }
+        }.build()
+    }
+
+    override fun onSearchTextChanged(searchText: String) {
+        update(searchText)
+    }
+
+    override fun onSearchSubmitted(searchText: String) {
+        update(searchText)
+    }
+
+    private fun update(searchText: String) {
+        updateJob?.cancel()
+        updateJob = lifecycleScope.launch {
+            if (prefs.searchProvider == "mapbox" && !isShortQuery(searchText)) {
+                delay(500L)
+            }
+            try {
+                loadNewList(searchText)
+            } catch (e: IOException) {
+                CarToast.makeText(
+                    carContext,
+                    R.string.autocomplete_connection_error,
+                    CarToast.LENGTH_SHORT
+                ).show()
+            }
+        }
+    }
+
+    private suspend fun loadNewList(query: String) {
+        for (provider in providers) {
+            try {
+                recentResults.clear()
+                currentProvider = provider
+
+                // first search in recent places
+                val recentPlaces = if (query.isEmpty()) {
+                    recents.getAllAsync(provider.id, limit = maxItems)
+                } else {
+                    recents.searchAsync(query, provider.id, limit = maxItems)
+                }
+                recentResults.addAll(recentPlaces)
+                resultList =
+                    recentPlaces.map { it.asAutocompletePlace(LatLng.fromLocation(location)) }
+                invalidate()
+
+                // if we already have enough results or the query is short, stop here
+                if (isShortQuery(query) || recentResults.size >= maxItems) break
+
+                // then search online
+                val recentIds = recentPlaces.map { it.id }
+                resultList = withContext(Dispatchers.IO) {
+                    (resultList!! + provider.autocomplete(query, LatLng.fromLocation(location))
+                        .filter { !recentIds.contains(it.id) }).take(maxItems)
+                }
+                invalidate()
+                break
+            } catch (e: ApiUnavailableException) {
+                e.printStackTrace()
+            }
+        }
+    }
+
+    private fun isShortQuery(query: CharSequence) = query.length < 3
+
+    override fun updateLocation(location: Location) {
+        this.location = location
+    }
+
+    override fun onResume(owner: LifecycleOwner) {
+        session.requestLocationUpdates()
+        session.mapScreen = this
+
+        if (supportsCarApiLevel3(carContext) && permissions.all {
+                ContextCompat.checkSelfPermission(
+                    carContext,
+                    it
+                ) == PackageManager.PERMISSION_GRANTED
+            }) {
+
+            println("Setting up energy level listener")
+            val exec = ContextCompat.getMainExecutor(carContext)
+            hardwareMan.carInfo.addEnergyLevelListener(exec, ::onEnergyLevelUpdated)
+        }
+    }
+
+    private fun onEnergyLevelUpdated(energyLevel: EnergyLevel) {
+        val isUpdate = this.energyLevel == null
+        this.energyLevel = energyLevel
+        if (isUpdate) invalidate()
+    }
+
+    override fun onPause(owner: LifecycleOwner) {
+        session.mapScreen = null
+
+        if (supportsCarApiLevel3(carContext)) {
+            hardwareMan.carInfo.removeEnergyLevelListener(::onEnergyLevelUpdated)
+        }
+    }
+
+    suspend fun getDetails(id: String): PlaceWithBounds {
+        val provider = currentProvider!!
+        val result = resultList!!.find { it.id == id }!!
+
+        val recentPlace = recentResults.find { it.id == id }
+        if (recentPlace != null) return recentPlace.asPlaceWithBounds()
+
+        val details = provider.getDetails(id)
+
+        recents.insert(RecentAutocompletePlace(result, details, provider.id, Instant.now()))
+
+        return details
+    }
+}

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

@@ -1,33 +1,30 @@
 package net.vonforst.evmap.auto
 
 import androidx.car.app.CarContext
+import androidx.car.app.CarToast
 import androidx.car.app.Screen
 import androidx.car.app.constraints.ConstraintManager
 import androidx.car.app.model.*
 import androidx.core.graphics.drawable.IconCompat
+import androidx.lifecycle.lifecycleScope
+import kotlinx.coroutines.launch
 import net.vonforst.evmap.R
 import net.vonforst.evmap.api.chargeprice.ChargepriceApi
 import net.vonforst.evmap.api.chargeprice.ChargepriceCar
 import net.vonforst.evmap.api.chargeprice.ChargepriceTariff
+import net.vonforst.evmap.storage.AppDatabase
 import net.vonforst.evmap.storage.PreferenceDataSource
 import kotlin.math.max
 import kotlin.math.min
 
 class SettingsScreen(ctx: CarContext) : Screen(ctx) {
-    val prefs = PreferenceDataSource(carContext)
-    val dataSourceNames = carContext.resources.getStringArray(R.array.pref_data_source_names)
-    val dataSourceValues = carContext.resources.getStringArray(R.array.pref_data_source_values)
-
     override fun onGetTemplate(): Template {
         return ListTemplate.Builder().apply {
             setTitle(carContext.getString(R.string.auto_settings))
             setHeaderAction(Action.BACK)
             setSingleList(ItemList.Builder().apply {
                 addItem(Row.Builder().apply {
-                    setTitle(carContext.getString(R.string.pref_data_source))
-                    val dataSourceId = prefs.dataSource
-                    val dataSourceDesc = dataSourceNames[dataSourceValues.indexOf(dataSourceId)]
-                    addText(dataSourceDesc)
+                    setTitle(carContext.getString(R.string.settings_data_sources))
                     setImage(
                         CarIcon.Builder(
                             IconCompat.createWithResource(
@@ -40,7 +37,7 @@ class SettingsScreen(ctx: CarContext) : Screen(ctx) {
                     )
                     setBrowsable(true)
                     setOnClickListener {
-                        screenManager.push(ChooseDataSourceScreen(carContext))
+                        screenManager.push(DataSettingsScreen(carContext))
                     }
                 }.build())
                 addItem(Row.Builder().apply {
@@ -81,31 +78,107 @@ class SettingsScreen(ctx: CarContext) : Screen(ctx) {
     }
 }
 
-class ChooseDataSourceScreen(ctx: CarContext) : Screen(ctx) {
-    val prefs = PreferenceDataSource(carContext)
+class DataSettingsScreen(ctx: CarContext) : Screen(ctx) {
+    val prefs = PreferenceDataSource(ctx)
+    val db = AppDatabase.getInstance(ctx)
     val dataSourceNames = carContext.resources.getStringArray(R.array.pref_data_source_names)
     val dataSourceValues = carContext.resources.getStringArray(R.array.pref_data_source_values)
     val dataSourceDescriptions = listOf(
         carContext.getString(R.string.data_source_goingelectric_desc),
         carContext.getString(R.string.data_source_openchargemap_desc)
     )
+    val searchProviderNames =
+        carContext.resources.getStringArray(R.array.pref_search_provider_names)
+    val searchProviderValues =
+        carContext.resources.getStringArray(R.array.pref_search_provider_values)
+
+    override fun onGetTemplate(): Template {
+        return ListTemplate.Builder().apply {
+            setTitle(carContext.getString(R.string.settings_data_sources))
+            setHeaderAction(Action.BACK)
+            setSingleList(ItemList.Builder().apply {
+                addItem(Row.Builder().apply {
+                    setTitle(carContext.getString(R.string.pref_data_source))
+                    setBrowsable(true)
+                    val dataSourceId = prefs.dataSource
+                    val dataSourceDesc = dataSourceNames[dataSourceValues.indexOf(dataSourceId)]
+                    addText(dataSourceDesc)
+                    setOnClickListener {
+                        screenManager.push(
+                            ChooseDataSourceScreen(
+                                carContext,
+                                dataSourceNames,
+                                dataSourceValues,
+                                prefs.dataSource,
+                                dataSourceDescriptions
+                            ) {
+                                prefs.dataSource = it
+                            })
+                    }
+                }.build())
+                addItem(Row.Builder().apply {
+                    setTitle(carContext.getString(R.string.pref_search_provider))
+                    setBrowsable(true)
+                    val searchProviderId = prefs.searchProvider
+                    val searchProviderDesc =
+                        searchProviderNames[searchProviderValues.indexOf(searchProviderId)]
+                    addText(searchProviderDesc)
+                    setOnClickListener {
+                        screenManager.push(
+                            ChooseDataSourceScreen(
+                                carContext,
+                                searchProviderNames,
+                                searchProviderValues,
+                                prefs.searchProvider
+                            ) {
+                                prefs.searchProvider = it
+                            })
+                    }
+                }.build())
+                addItem(Row.Builder().apply {
+                    setTitle(carContext.getString(R.string.pref_search_delete_recent))
+                    setOnClickListener {
+                        lifecycleScope.launch {
+                            db.recentAutocompletePlaceDao().deleteAll()
+                            CarToast.makeText(
+                                carContext,
+                                R.string.deleted_recent_search_results,
+                                CarToast.LENGTH_SHORT
+                            ).show()
+                        }
+                    }
+                }.build())
+            }.build())
+        }.build()
+    }
+}
+
+class ChooseDataSourceScreen(
+    ctx: CarContext,
+    val names: Array<String>,
+    val values: Array<String>,
+    val currentValue: String,
+    val descriptions: List<String>? = null,
+    val callback: (String) -> Unit
+) : Screen(ctx) {
+    val prefs = PreferenceDataSource(carContext)
 
     override fun onGetTemplate(): Template {
         return ListTemplate.Builder().apply {
             setTitle(carContext.getString(R.string.pref_data_source))
             setHeaderAction(Action.BACK)
             setSingleList(ItemList.Builder().apply {
-                for (i in dataSourceNames.indices) {
+                for (i in names.indices) {
                     addItem(Row.Builder().apply {
-                        setTitle(dataSourceNames[i])
-                        addText(dataSourceDescriptions[i])
+                        setTitle(names[i])
+                        descriptions?.let { addText(it[i]) }
                     }.build())
                 }
                 setOnSelectedListener {
-                    prefs.dataSource = dataSourceValues[it]
+                    callback(values[it])
                     screenManager.pop()
                 }
-                setSelectedIndex(dataSourceValues.indexOf(prefs.dataSource))
+                setSelectedIndex(values.indexOf(currentValue))
             }.build())
         }.build()
     }
@@ -369,6 +442,7 @@ class SelectChargingRangeScreen(ctx: CarContext) : Screen(ctx) {
 
                     val nSpacers = when {
                         maxItems % 3 == 0 -> 1
+                        maxItems == 100 -> 0  // AA has increased the limit to 100 and changed the way items are laid out
                         maxItems % 4 == 0 -> 2
                         else -> 0
                     }

app/src/google/java/net/vonforst/evmap/auto/TextPromptScreen.kt

@@ -3,31 +3,59 @@ package net.vonforst.evmap.auto
 import androidx.annotation.StringRes
 import androidx.car.app.CarContext
 import androidx.car.app.Screen
-import androidx.car.app.model.Action
-import androidx.car.app.model.InputCallback
-import androidx.car.app.model.Template
+import androidx.car.app.model.*
 import androidx.car.app.model.signin.InputSignInMethod
 import androidx.car.app.model.signin.SignInTemplate
+import net.vonforst.evmap.R
 
 class TextPromptScreen(
     ctx: CarContext,
     @StringRes val title: Int,
     @StringRes val prompt: Int,
-    val initialValue: String? = null
+    val initialValue: String? = null,
+    val cancelable: Boolean = true
 ) : Screen(ctx),
     InputCallback {
+    private var inputText = ""
+
     override fun onGetTemplate(): Template {
         val signInMethod = InputSignInMethod.Builder(this).apply {
-            initialValue?.let { setDefaultValue(it) }
+            initialValue?.let {
+                setDefaultValue(it)
+                inputText = initialValue
+            }
             setShowKeyboardByDefault(true)
         }.build()
         return SignInTemplate.Builder(signInMethod).apply {
             setHeaderAction(Action.BACK)
             setInstructions(carContext.getString(prompt))
             setTitle(carContext.getString(title))
+            if (cancelable) {
+                addAction(
+                    Action.Builder()
+                        .setTitle(carContext.getString(R.string.cancel))
+                        .setOnClickListener(ParkedOnlyOnClickListener.create {
+                            screenManager.pop()
+                        })
+                        .build()
+                )
+            }
+            addAction(
+                Action.Builder()
+                    .setTitle(carContext.getString(R.string.ok))
+                    .setBackgroundColor(CarColor.PRIMARY)
+                    .setOnClickListener(ParkedOnlyOnClickListener.create {
+                        onInputSubmitted(inputText)
+                    })
+                    .build()
+            )
         }.build()
     }
 
+    override fun onInputTextChanged(text: String) {
+        inputText = text
+    }
+
     override fun onInputSubmitted(text: String) {
         setResult(text)
         screenManager.pop()

app/src/google/java/net/vonforst/evmap/auto/VehicleDataScreen.kt

@@ -10,9 +10,8 @@ import androidx.car.app.hardware.info.*
 import androidx.car.app.model.*
 import androidx.core.content.ContextCompat
 import androidx.core.graphics.drawable.IconCompat
-import androidx.lifecycle.Lifecycle
-import androidx.lifecycle.LifecycleObserver
-import androidx.lifecycle.OnLifecycleEvent
+import androidx.lifecycle.DefaultLifecycleObserver
+import androidx.lifecycle.LifecycleOwner
 import net.vonforst.evmap.BuildConfig
 import net.vonforst.evmap.R
 import net.vonforst.evmap.ui.CompassNeedle
@@ -20,8 +19,10 @@ import net.vonforst.evmap.ui.Gauge
 import kotlin.math.min
 import kotlin.math.roundToInt
 
-class VehicleDataScreen(ctx: CarContext) : Screen(ctx), LifecycleObserver {
-    private val hardwareMan = ctx.getCarService(CarContext.HARDWARE_SERVICE) as CarHardwareManager
+class VehicleDataScreen(ctx: CarContext) : Screen(ctx), DefaultLifecycleObserver {
+    private val carInfo =
+        (ctx.getCarService(CarContext.HARDWARE_SERVICE) as CarHardwareManager).carInfo
+    private val carSensors = carContext.patchedCarSensors
     private var model: Model? = null
     private var energyLevel: EnergyLevel? = null
     private var speed: Speed? = null
@@ -57,7 +58,8 @@ class VehicleDataScreen(ctx: CarContext) : Screen(ctx), LifecycleObserver {
                     PermissionScreen(
                         carContext,
                         R.string.auto_vehicle_data_permission_needed,
-                        permissions
+                        permissions,
+                        finishApp = false
                     )
                 ) {
                     setupListeners()
@@ -225,33 +227,39 @@ class VehicleDataScreen(ctx: CarContext) : Screen(ctx), LifecycleObserver {
         invalidate()
     }
 
-    @OnLifecycleEvent(Lifecycle.Event.ON_RESUME)
+    override fun onResume(owner: LifecycleOwner) {
+        setupListeners()
+    }
+
     private fun setupListeners() {
         if (!permissionsGranted()) return
 
         println("Setting up energy level listener")
 
         val exec = ContextCompat.getMainExecutor(carContext)
-        hardwareMan.carInfo.addEnergyLevelListener(exec, ::onEnergyLevelUpdated)
-        hardwareMan.carInfo.addSpeedListener(exec, ::onSpeedUpdated)
-        hardwareMan.carSensors.addCompassListener(
+        carInfo.addEnergyLevelListener(exec, ::onEnergyLevelUpdated)
+        carInfo.addSpeedListener(exec, ::onSpeedUpdated)
+        carSensors.addCompassListener(
             CarSensors.UPDATE_RATE_NORMAL,
             exec,
             ::onCompassUpdated
         )
 
-        hardwareMan.carInfo.fetchModel(exec) {
+        carInfo.fetchModel(exec) {
             this.model = it
             invalidate()
         }
     }
 
-    @OnLifecycleEvent(Lifecycle.Event.ON_PAUSE)
+    override fun onPause(owner: LifecycleOwner) {
+        removeListeners()
+    }
+
     private fun removeListeners() {
         println("Removing energy level listener")
-        hardwareMan.carInfo.removeEnergyLevelListener(::onEnergyLevelUpdated)
-        hardwareMan.carInfo.removeSpeedListener(::onSpeedUpdated)
-        hardwareMan.carSensors.removeCompassListener(::onCompassUpdated)
+        carInfo.removeEnergyLevelListener(::onEnergyLevelUpdated)
+        carInfo.removeSpeedListener(::onSpeedUpdated)
+        carSensors.removeCompassListener(::onCompassUpdated)
     }
 
     private fun permissionsGranted(): Boolean =

app/src/google/res/drawable/ic_search_off.xml

@@ -0,0 +1,13 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M15.5,14h-0.79l-0.28,-0.27C15.41,12.59 16,11.11 16,9.5C16,5.91 13.09,3 9.5,3C6.08,3 3.28,5.64 3.03,9h2.02C5.3,6.75 7.18,5 9.5,5C11.99,5 14,7.01 14,9.5S11.99,14 9.5,14c-0.17,0 -0.33,-0.03 -0.5,-0.05v2.02C9.17,15.99 9.33,16 9.5,16c1.61,0 3.09,-0.59 4.23,-1.57L14,14.71v0.79l5,4.99L20.49,19L15.5,14z" />
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M6.47,10.82l-2.47,2.47l-2.47,-2.47l-0.71,0.71l2.47,2.47l-2.47,2.47l0.71,0.71l2.47,-2.47l2.47,2.47l0.71,-0.71l-2.47,-2.47l2.47,-2.47z" />
+</vector>

app/src/google/res/values-de/values.xml

@@ -19,6 +19,7 @@
     <string name="grant_on_phone">Auf Telefon zulassen</string>
     <string name="auto_chargers_closeby">In der Nähe</string>
     <string name="auto_favorites">Favoriten</string>
+    <string name="auto_chargers_near_location">Nahe %s</string>
     <string name="auto_fault_report_date">⚠️ Störungsmeldung (%s)</string>
     <string name="auto_no_refresh_possible">Weitere Aktualisierung nicht möglich. Bitte zurück gehen und neu starten.</string>
     <string name="auto_prices">Preise</string>

app/src/google/res/values/values.xml

@@ -29,6 +29,7 @@
     <string name="grant_on_phone">Grant on phone</string>
     <string name="auto_chargers_closeby">Nearby chargers</string>
     <string name="auto_favorites">Favorites</string>
+    <string name="auto_chargers_near_location">Near %s</string>
     <string name="auto_fault_report_date">⚠️ Fault report (%s)</string>
     <string name="auto_no_refresh_possible">Further updates not possible. Please go back and restart.</string>
     <string name="auto_prices">Pricing</string>

app/src/main/AndroidManifest.xml

@@ -261,17 +261,6 @@
                 android:name="android.app.shortcuts"
                 android:resource="@xml/shortcuts" />
         </activity>
-
-        <!-- Override services of the com.mapzen.android.lost library with exported:false
-             until https://github.com/lostzen/lost/pull/270 is merged -->
-        <service
-            android:name="com.mapzen.android.lost.internal.GeofencingIntentService"
-            android:exported="false">
-            <intent-filter>
-                <action android:name="com.mapzen.lost.action.ACTION_GEOFENCING_SERVICE" />
-            </intent-filter>
-        </service>
-
     </application>
 
 </manifest>

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

@@ -36,7 +36,6 @@ import net.vonforst.evmap.utils.LocaleContextWrapper
 import net.vonforst.evmap.utils.getLocationFromIntent
 
 
-const val REQUEST_LOCATION_PERMISSION = 1
 const val EXTRA_CHARGER_ID = "chargerId"
 const val EXTRA_LAT = "lat"
 const val EXTRA_LON = "lon"
@@ -84,10 +83,10 @@ class MapsActivity : AppCompatActivity(),
         val navView = findViewById<NavigationView>(R.id.nav_view)
         navView.setupWithNavController(navController)
 
-        val header = navView.getHeaderView(0)
-        ViewCompat.setOnApplyWindowInsetsListener(header) { v, insets ->
-            v.setPadding(0, insets.getInsets(WindowInsetsCompat.Type.statusBars()).top, 0, 0)
-            insets
+        ViewCompat.setOnApplyWindowInsetsListener(navView) { v, insets ->
+            val header = navView.getHeaderView(0)
+            header.setPadding(0, insets.getInsets(WindowInsetsCompat.Type.statusBars()).top, 0, 0)
+            WindowInsetsCompat.CONSUMED
         }
 
         prefs = PreferenceDataSource(this)
@@ -163,6 +162,7 @@ class MapsActivity : AppCompatActivity(),
                     .createPendingIntent()
             } else if (intent.hasExtra(EXTRA_FAVORITES)) {
                 deepLink = navController.createDeepLink()
+                    .setGraph(navGraph)
                     .setDestination(R.id.favs)
                     .createPendingIntent()
             }

app/src/main/java/net/vonforst/evmap/adapter/DataBindingAdapters.kt

@@ -171,7 +171,7 @@ class CheckableConnectorAdapter : DataBindingAdapter<Chargepoint>() {
                 root.post {
                     notifyDataSetChanged()
                 }
-                onCheckedItemChangedListener?.invoke(getCheckedItem()!!)
+                getCheckedItem()?.let { onCheckedItemChangedListener?.invoke(it) }
             }
         }
     }

app/src/main/java/net/vonforst/evmap/adapter/FiltersAdapter.kt

@@ -62,6 +62,8 @@ class FiltersAdapter : DataBindingAdapter<FilterWithValue<FilterValue>>() {
                     )
                 }
             }
+            is BooleanFilterValue -> {
+            }
         }
     }
 

app/src/main/java/net/vonforst/evmap/api/availability/AvailabilityDetector.kt

@@ -139,7 +139,7 @@ data class ChargeLocationStatus(
             (connectors == null || connectors.map {
                 equivalentPlugTypes(it)
             }.any { equivalent -> it.type in equivalent })
-                    && (minPower == null || (it.power != null && it.power > minPower))
+                    && (minPower == null || (it.power != null && it.power >= minPower))
         }
         return this.copy(status = statusFiltered)
     }
@@ -191,4 +191,4 @@ suspend fun getAvailability(charger: ChargeLocation): Resource<ChargeLocationSta
         }
     }
     return value ?: Resource.error(null, null)
-}
+}

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

@@ -2,7 +2,11 @@ package net.vonforst.evmap.fragment
 
 import android.annotation.SuppressLint
 import android.os.Bundle
-import android.view.*
+import android.view.LayoutInflater
+import android.view.MotionEvent
+import android.view.View
+import android.view.ViewGroup
+import androidx.appcompat.app.AlertDialog
 import androidx.databinding.DataBindingUtil
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.viewModels
@@ -24,6 +28,7 @@ import net.vonforst.evmap.api.chargeprice.ChargepriceCar
 import net.vonforst.evmap.api.equivalentPlugTypes
 import net.vonforst.evmap.databinding.FragmentChargepriceBinding
 import net.vonforst.evmap.model.Chargepoint
+import net.vonforst.evmap.storage.PreferenceDataSource
 import net.vonforst.evmap.viewmodel.ChargepriceViewModel
 import net.vonforst.evmap.viewmodel.Status
 import net.vonforst.evmap.viewmodel.viewModelFactory
@@ -45,6 +50,28 @@ class ChargepriceFragment : Fragment() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         sharedElementEnterTransition = MaterialContainerTransform()
+
+        if (savedInstanceState == null) {
+            val prefs = PreferenceDataSource(requireContext())
+            prefs.chargepriceCounter += 1
+            if ((prefs.chargepriceCounter - 30).mod(50) == 0) {
+                showDonationDialog()
+            }
+        }
+    }
+
+    private fun showDonationDialog() {
+        AlertDialog.Builder(requireContext())
+            .setTitle(R.string.chargeprice_donation_dialog_title)
+            .setMessage(R.string.chargeprice_donation_dialog_detail)
+            .setNegativeButton(R.string.ok) { di, _ ->
+                di.cancel()
+            }
+            .setPositiveButton(R.string.donate) { di, _ ->
+                di.dismiss()
+                findNavController().navigate(R.id.action_chargeprice_to_donateFragment)
+            }
+            .show()
     }
 
     override fun onCreateView(
@@ -147,7 +174,7 @@ class ChargepriceFragment : Fragment() {
         }
 
         binding.btnSettings.setOnClickListener {
-            findNavController().navigate(R.id.action_chargeprice_to_settingsFragment)
+            findNavController().navigate(R.id.action_chargeprice_to_chargepriceSettingsFragment)
         }
 
         binding.batteryRange.setLabelFormatter { value: Float ->

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

@@ -1,6 +1,9 @@
 package net.vonforst.evmap.fragment
 
+import android.content.Context
 import android.graphics.Canvas
+import android.location.Criteria
+import android.location.LocationManager
 import android.os.Bundle
 import android.view.Gravity
 import android.view.LayoutInflater
@@ -20,8 +23,6 @@ import com.car2go.maps.model.LatLng
 import com.google.android.material.color.MaterialColors
 import com.google.android.material.snackbar.Snackbar
 import com.google.android.material.transition.MaterialFadeThrough
-import com.mapzen.android.lost.api.LocationServices
-import com.mapzen.android.lost.api.LostApiClient
 import net.vonforst.evmap.MapsActivity
 import net.vonforst.evmap.R
 import net.vonforst.evmap.adapter.DataBindingAdapter
@@ -34,9 +35,9 @@ import net.vonforst.evmap.utils.checkAnyLocationPermission
 import net.vonforst.evmap.viewmodel.FavoritesViewModel
 import net.vonforst.evmap.viewmodel.viewModelFactory
 
-class FavoritesFragment : Fragment(), LostApiClient.ConnectionCallbacks {
+class FavoritesFragment : Fragment() {
     private lateinit var binding: FragmentFavoritesBinding
-    private var locationClient: LostApiClient? = null
+    private lateinit var locationManager: LocationManager
     private var toDelete: Favorite? = null
     private var deleteSnackbar: Snackbar? = null
     private lateinit var adapter: FavoritesAdapter
@@ -52,8 +53,9 @@ class FavoritesFragment : Fragment(), LostApiClient.ConnectionCallbacks {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        locationClient = LostApiClient.Builder(requireContext())
-            .addConnectionCallbacks(this).build()
+
+        locationManager =
+            requireContext().getSystemService(Context.LOCATION_SERVICE) as LocationManager
 
         enterTransition = MaterialFadeThrough()
         exitTransition = MaterialFadeThrough()
@@ -109,8 +111,6 @@ class FavoritesFragment : Fragment(), LostApiClient.ConnectionCallbacks {
         }
         createTouchHelper().attachToRecyclerView(binding.favsList)
 
-        locationClient!!.connect()
-
         binding.swipeRefresh.setOnRefreshListener {
             vm.reloadAvailability() {
                 binding.swipeRefresh.isRefreshing = false
@@ -118,27 +118,21 @@ class FavoritesFragment : Fragment(), LostApiClient.ConnectionCallbacks {
         }
     }
 
-    override fun onConnected() {
-        val context = this.context ?: return
-        if (context.checkAnyLocationPermission()) {
-            val location = LocationServices.FusedLocationApi.getLastLocation(locationClient!!)
-            if (location != null) {
-                vm.location.value = LatLng(location.latitude, location.longitude)
+    override fun onStart() {
+        super.onStart()
+
+        if (requireContext().checkAnyLocationPermission()) {
+            val provider = locationManager.getBestProvider(Criteria().apply {
+                accuracy = Criteria.ACCURACY_FINE
+            }, true) ?: return
+
+            val location = locationManager.getLastKnownLocation(provider)
+            location?.let {
+                vm.location.value = LatLng(it.latitude, it.longitude)
             }
         }
     }
 
-    override fun onConnectionSuspended() {
-
-    }
-
-    override fun onDestroy() {
-        super.onDestroy()
-        locationClient?.let {
-            if (it.isConnected) it.disconnect()
-        }
-    }
-
     fun delete(fav: FavoriteWithDetail) {
         val position =
             vm.listData.value?.indexOfFirst { it.fav.favorite.favoriteId == fav.favorite.favoriteId }

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

@@ -3,9 +3,11 @@ package net.vonforst.evmap.fragment
 import android.os.Bundle
 import android.view.*
 import androidx.appcompat.app.AppCompatActivity
+import androidx.core.view.MenuProvider
 import androidx.databinding.DataBindingUtil
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.viewModels
+import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.lifecycleScope
 import androidx.navigation.fragment.findNavController
 import androidx.navigation.ui.setupWithNavController
@@ -22,7 +24,7 @@ import net.vonforst.evmap.ui.showEditTextDialog
 import net.vonforst.evmap.viewmodel.FilterViewModel
 
 
-class FilterFragment : Fragment() {
+class FilterFragment : Fragment(), MenuProvider {
     private lateinit var binding: FragmentFilterBinding
     private val vm: FilterViewModel by viewModels()
 
@@ -40,9 +42,6 @@ class FilterFragment : Fragment() {
         binding = DataBindingUtil.inflate(inflater, R.layout.fragment_filter, container, false)
         binding.lifecycleOwner = this
         binding.vm = vm
-
-        setHasOptionsMenu(true)
-
         vm.filterProfile.observe(viewLifecycleOwner) {}
 
         return binding.root
@@ -50,6 +49,7 @@ class FilterFragment : Fragment() {
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         (requireActivity() as AppCompatActivity).setSupportActionBar(binding.toolbar)
+        requireActivity().addMenuProvider(this, viewLifecycleOwner, Lifecycle.State.RESUMED)
 
         binding.toolbar.setupWithNavController(
             findNavController(),
@@ -81,12 +81,11 @@ class FilterFragment : Fragment() {
         view.setBackgroundColor(MaterialColors.getColor(view, android.R.attr.windowBackground))
     }
 
-    override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) {
+    override fun onCreateMenu(menu: Menu, inflater: MenuInflater) {
         inflater.inflate(R.menu.filter, menu)
-        super.onCreateOptionsMenu(menu, inflater)
     }
 
-    override fun onOptionsItemSelected(item: MenuItem): Boolean {
+    override fun onMenuItemSelected(item: MenuItem): Boolean {
         return when (item.itemId) {
             R.id.menu_apply -> {
                 lifecycleScope.launch {
@@ -99,7 +98,7 @@ class FilterFragment : Fragment() {
                 saveProfile()
                 true
             }
-            else -> super.onOptionsItemSelected(item)
+            else -> false
         }
     }
 

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

@@ -4,11 +4,11 @@ import android.Manifest.permission.ACCESS_COARSE_LOCATION
 import android.Manifest.permission.ACCESS_FINE_LOCATION
 import android.annotation.SuppressLint
 import android.content.Context
-import android.content.pm.PackageManager
 import android.content.res.Configuration
 import android.graphics.Color
+import android.location.Criteria
 import android.location.Geocoder
-import android.location.Location
+import android.location.LocationManager
 import android.os.Bundle
 import android.text.method.KeyListener
 import android.view.*
@@ -18,15 +18,13 @@ import android.widget.ImageView
 import android.widget.TextView
 import android.widget.Toast
 import androidx.activity.OnBackPressedCallback
+import androidx.activity.result.contract.ActivityResultContracts
 import androidx.annotation.RequiresPermission
 import androidx.appcompat.app.AlertDialog
 import androidx.appcompat.widget.PopupMenu
-import androidx.core.app.ActivityCompat
 import androidx.core.content.ContextCompat
-import androidx.core.view.MenuCompat
-import androidx.core.view.doOnLayout
-import androidx.core.view.doOnNextLayout
-import androidx.core.view.updateLayoutParams
+import androidx.core.location.LocationListenerCompat
+import androidx.core.view.*
 import androidx.databinding.DataBindingUtil
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.activityViewModels
@@ -63,17 +61,15 @@ import com.mahc.custombottomsheetbehavior.BottomSheetBehaviorGoogleMapsLike
 import com.mahc.custombottomsheetbehavior.BottomSheetBehaviorGoogleMapsLike.STATE_COLLAPSED
 import com.mahc.custombottomsheetbehavior.BottomSheetBehaviorGoogleMapsLike.STATE_HIDDEN
 import com.mahc.custombottomsheetbehavior.MergedAppBarLayoutBehavior
-import com.mapzen.android.lost.api.LocationListener
-import com.mapzen.android.lost.api.LocationRequest
-import com.mapzen.android.lost.api.LocationServices
-import com.mapzen.android.lost.api.LostApiClient
 import com.stfalcon.imageviewer.StfalconImageViewer
 import io.michaelrocks.bimap.HashBiMap
 import io.michaelrocks.bimap.MutableBiMap
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
-import net.vonforst.evmap.*
+import net.vonforst.evmap.BuildConfig
+import net.vonforst.evmap.MapsActivity
+import net.vonforst.evmap.R
 import net.vonforst.evmap.adapter.ConnectorAdapter
 import net.vonforst.evmap.adapter.DetailsAdapter
 import net.vonforst.evmap.adapter.GalleryAdapter
@@ -82,6 +78,7 @@ import net.vonforst.evmap.api.goingelectric.GoingElectricApiWrapper
 import net.vonforst.evmap.api.openchargemap.OpenChargeMapApiWrapper
 import net.vonforst.evmap.autocomplete.ApiUnavailableException
 import net.vonforst.evmap.autocomplete.PlaceWithBounds
+import net.vonforst.evmap.bold
 import net.vonforst.evmap.databinding.FragmentMapBinding
 import net.vonforst.evmap.model.*
 import net.vonforst.evmap.storage.PreferenceDataSource
@@ -98,14 +95,13 @@ import kotlin.collections.contains
 import kotlin.collections.set
 
 
-class MapFragment : Fragment(), OnMapReadyCallback, MapsActivity.FragmentCallback,
-    LostApiClient.ConnectionCallbacks, LocationListener {
+class MapFragment : Fragment(), OnMapReadyCallback, MapsActivity.FragmentCallback, MenuProvider {
     private lateinit var binding: FragmentMapBinding
     private val vm: MapViewModel by viewModels()
     private val galleryVm: GalleryViewModel by activityViewModels()
     private var mapFragment: MapFragment? = null
     private var map: AnyMap? = null
-    private lateinit var locationClient: LostApiClient
+    private lateinit var locationManager: LocationManager
     private var requestingLocationUpdates = false
     private lateinit var bottomSheetBehavior: BottomSheetBehaviorGoogleMapsLike<View>
     private lateinit var detailAppBarBehavior: MergedAppBarLayoutBehavior
@@ -116,6 +112,7 @@ class MapFragment : Fragment(), OnMapReadyCallback, MapsActivity.FragmentCallbac
     private var searchResultIcon: BitmapDescriptor? = null
     private var connectionErrorSnackbar: Snackbar? = null
     private var previousChargepointIds: Set<Long>? = null
+    private var mapTopPadding: Int = 0
 
     private lateinit var clusterIconGenerator: ClusterIconGenerator
     private lateinit var chargerIconGenerator: ChargerIconGenerator
@@ -149,10 +146,8 @@ class MapFragment : Fragment(), OnMapReadyCallback, MapsActivity.FragmentCallbac
 
         prefs = PreferenceDataSource(requireContext())
 
-        locationClient = LostApiClient.Builder(requireContext())
-            .addConnectionCallbacks(this)
-            .build()
-        locationClient.connect()
+        locationManager =
+            requireContext().getSystemService(Context.LOCATION_SERVICE) as LocationManager
         clusterIconGenerator = ClusterIconGenerator(requireContext())
 
         enterTransition = MaterialFadeThrough()
@@ -173,7 +168,7 @@ class MapFragment : Fragment(), OnMapReadyCallback, MapsActivity.FragmentCallbac
         val provider = prefs.mapProvider
         if (mapFragment == null) {
             mapFragment =
-                requireActivity().supportFragmentManager.findFragmentByTag(mapFragmentTag) as MapFragment?
+                childFragmentManager.findFragmentByTag(mapFragmentTag) as MapFragment?
         }
         if (mapFragment == null || mapFragment!!.priority[0] != provider) {
             mapFragment = MapFragment()
@@ -186,7 +181,7 @@ class MapFragment : Fragment(), OnMapReadyCallback, MapsActivity.FragmentCallbac
                 MapFragment.GOOGLE,
                 MapFragment.MAPBOX
             )
-            requireActivity().supportFragmentManager
+            childFragmentManager
                 .beginTransaction()
                 .replace(R.id.map, mapFragment!!, mapFragmentTag)
                 .commit()
@@ -199,21 +194,23 @@ class MapFragment : Fragment(), OnMapReadyCallback, MapsActivity.FragmentCallbac
             searchResultIcon = null
         }
 
-        setHasOptionsMenu(true)
+        ViewCompat.setOnApplyWindowInsetsListener(
+            binding.root
+        ) { v, insets ->
+            ViewCompat.onApplyWindowInsets(binding.root, insets)
 
-        binding.root.setOnApplyWindowInsetsListener { _, insets ->
+            val systemWindowInsetTop = insets.getInsets(WindowInsetsCompat.Type.statusBars()).top
             binding.detailAppBar.toolbar.updateLayoutParams<ViewGroup.MarginLayoutParams> {
-                topMargin = insets.systemWindowInsetTop
+                topMargin = systemWindowInsetTop
             }
 
-            // margin of layers button
+            // margin of layers button: status bar height + toolbar height + margin
             val density = resources.displayMetrics.density
-            // status bar height + toolbar height + margin
             val margin =
                 if (binding.toolbarContainer.layoutParams.width == ViewGroup.LayoutParams.MATCH_PARENT) {
-                    insets.systemWindowInsetTop + (48 * density).toInt() + (28 * density).toInt()
+                    systemWindowInsetTop + (48 * density).toInt() + (28 * density).toInt()
                 } else {
-                    insets.systemWindowInsetTop + (12 * density).toInt()
+                    systemWindowInsetTop + (12 * density).toInt()
                 }
             binding.fabLayers.updateLayoutParams<ViewGroup.MarginLayoutParams> {
                 topMargin = margin
@@ -221,6 +218,13 @@ class MapFragment : Fragment(), OnMapReadyCallback, MapsActivity.FragmentCallbac
             binding.layersSheet.updateLayoutParams<ViewGroup.MarginLayoutParams> {
                 topMargin = margin
             }
+
+            // set map padding so that compass is not obstructed by toolbar
+            mapTopPadding = systemWindowInsetTop + (48 * density).toInt() + (16 * density).toInt()
+            // if we actually use map.setPadding here, Mapbox will re-trigger onApplyWindowInsets
+            // and cause an infinite loop. So we rely on onMapReady being called later than
+            // onApplyWindowInsets.
+
             insets
         }
 
@@ -236,6 +240,8 @@ class MapFragment : Fragment(), OnMapReadyCallback, MapsActivity.FragmentCallbac
     }
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        requireActivity().addMenuProvider(this, viewLifecycleOwner, Lifecycle.State.RESUMED)
+
         mapFragment!!.getMapAsync(this)
         bottomSheetBehavior = BottomSheetBehaviorGoogleMapsLike.from(binding.bottomSheet)
         detailAppBarBehavior = MergedAppBarLayoutBehavior.from(binding.detailAppBar)
@@ -310,19 +316,25 @@ class MapFragment : Fragment(), OnMapReadyCallback, MapsActivity.FragmentCallbac
 
         vm.reloadPrefs()
         if (requestingLocationUpdates && requireContext().checkAnyLocationPermission()
-            && locationClient.isConnected
         ) {
             requestLocationUpdates()
         }
     }
 
+    @SuppressLint("MissingPermission")
+    private val requestPermissionLauncher =
+        registerForActivityResult(ActivityResultContracts.RequestMultiplePermissions()) {
+            val context = context ?: return@registerForActivityResult
+            if (context.checkAnyLocationPermission()) {
+                enableLocation(moveTo = true, animate = true)
+            }
+        }
+
     private fun setupClickListeners() {
         binding.fabLocate.setOnClickListener {
             if (!requireContext().checkFineLocationPermission()) {
-                ActivityCompat.requestPermissions(
-                    requireActivity(),
-                    arrayOf(ACCESS_FINE_LOCATION, ACCESS_COARSE_LOCATION),
-                    REQUEST_LOCATION_PERMISSION
+                requestPermissionLauncher.launch(
+                    arrayOf(ACCESS_FINE_LOCATION, ACCESS_COARSE_LOCATION)
                 )
             }
             if (requireContext().checkAnyLocationPermission()) {
@@ -888,7 +900,7 @@ class MapFragment : Fragment(), OnMapReadyCallback, MapsActivity.FragmentCallbac
         map.setTrafficEnabled(vm.mapTrafficEnabled.value ?: false)
 
         // set padding so that compass is not obstructed by toolbar
-        map.setPadding(0, binding.toolbarContainer.height, 0, 0)
+        map.setPadding(0, mapTopPadding, 0, 0)
 
         val mode = resources.configuration.uiMode and Configuration.UI_MODE_NIGHT_MASK
         map.setMapStyle(
@@ -1007,16 +1019,16 @@ class MapFragment : Fragment(), OnMapReadyCallback, MapsActivity.FragmentCallbac
         map.uiSettings.setMyLocationButtonEnabled(false)
         if (moveTo) {
             vm.myLocationEnabled.value = true
-            if (locationClient.isConnected) {
-                moveToLastLocation(map, animate)
-                requestLocationUpdates()
-            }
+            moveToLastLocation(map, animate)
+            requestLocationUpdates()
         }
     }
 
     @RequiresPermission(anyOf = [ACCESS_FINE_LOCATION, ACCESS_COARSE_LOCATION])
     private fun moveToLastLocation(map: AnyMap, animate: Boolean) {
-        val location = LocationServices.FusedLocationApi.getLastLocation(locationClient)
+        val provider = getLocationProvider() ?: return
+
+        val location = locationManager.getLastKnownLocation(provider)
         if (location != null) {
             val latLng = LatLng(location.latitude, location.longitude)
             vm.location.value = latLng
@@ -1029,6 +1041,10 @@ class MapFragment : Fragment(), OnMapReadyCallback, MapsActivity.FragmentCallbac
         }
     }
 
+    private fun getLocationProvider() = locationManager.getBestProvider(Criteria().apply {
+        accuracy = Criteria.ACCURACY_FINE
+    }, true)
+
     @Synchronized
     private fun updateMap(chargepoints: List<ChargepointListItem>) {
         val map = this.map ?: return
@@ -1041,7 +1057,7 @@ class MapFragment : Fragment(), OnMapReadyCallback, MapsActivity.FragmentCallbac
 
         // update icons of existing markers (connector filter may have changed)
         for ((marker, charger) in markers) {
-            val highlight = charger == vm.chargerSparse.value
+            val highlight = charger.id == vm.chargerSparse.value?.id
             marker.setIcon(
                 chargerIconGenerator.getBitmapDescriptor(
                     getMarkerTint(charger, vm.filteredConnectors.value),
@@ -1065,7 +1081,7 @@ class MapFragment : Fragment(), OnMapReadyCallback, MapsActivity.FragmentCallbac
                     // animate marker if it is visible, otherwise remove immediately
                     if (bounds.contains(marker.position)) {
                         val tint = getMarkerTint(charger, vm.filteredConnectors.value)
-                        val highlight = charger == vm.chargerSparse.value
+                        val highlight = charger.id == vm.chargerSparse.value?.id
                         val fault = charger.faultReport != null
                         val multi = charger.isMulti(vm.filteredConnectors.value)
                         val fav =
@@ -1085,7 +1101,7 @@ class MapFragment : Fragment(), OnMapReadyCallback, MapsActivity.FragmentCallbac
             for (charger in chargers) {
                 if (!map1.contains(charger.id)) {
                     val tint = getMarkerTint(charger, vm.filteredConnectors.value)
-                    val highlight = charger == vm.chargerSparse.value
+                    val highlight = charger.id == vm.chargerSparse.value?.id
                     val fault = charger.faultReport != null
                     val multi = charger.isMulti(vm.filteredConnectors.value)
                     val fav = charger.id in vm.favorites.value?.map { it.charger.id } ?: emptyList()
@@ -1133,23 +1149,7 @@ class MapFragment : Fragment(), OnMapReadyCallback, MapsActivity.FragmentCallbac
         }
     }
 
-    @SuppressLint("MissingPermission")
-    override fun onRequestPermissionsResult(
-        requestCode: Int,
-        permissions: Array<out String>,
-        grantResults: IntArray
-    ) {
-        when (requestCode) {
-            REQUEST_LOCATION_PERMISSION -> {
-                if ((grantResults.isNotEmpty() && grantResults.any { it == PackageManager.PERMISSION_GRANTED })) {
-                    enableLocation(moveTo = true, animate = true)
-                }
-            }
-            else -> super.onRequestPermissionsResult(requestCode, permissions, grantResults)
-        }
-    }
-
-    override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) {
+    override fun onCreateMenu(menu: Menu, inflater: MenuInflater) {
         inflater.inflate(R.menu.map, menu)
 
         val filterItem = menu.findItem(R.id.menu_filter)
@@ -1287,42 +1287,38 @@ class MapFragment : Fragment(), OnMapReadyCallback, MapsActivity.FragmentCallbac
         }
     }
 
+
+    override fun onMenuItemSelected(menuItem: MenuItem): Boolean {
+        return false
+    }
+
     override fun getRootView(): View {
         return binding.root
     }
 
-    override fun onConnected() {
-        val map = this.map ?: return
-        val context = this.context ?: return
-        if (vm.myLocationEnabled.value == true) {
-            if (context.checkAnyLocationPermission()) {
-                moveToLastLocation(map, false)
-                requestLocationUpdates()
-            }
-        }
-    }
-
-    @RequiresPermission(ACCESS_FINE_LOCATION)
+    @RequiresPermission(anyOf = [ACCESS_FINE_LOCATION, ACCESS_COARSE_LOCATION])
     private fun requestLocationUpdates() {
-        val request: LocationRequest = LocationRequest.create()
-            .setPriority(LocationRequest.PRIORITY_HIGH_ACCURACY)
-            .setInterval(5000)
-        LocationServices.FusedLocationApi.requestLocationUpdates(locationClient, request, this)
+        val provider = getLocationProvider() ?: return
+
+        locationManager.requestLocationUpdates(
+            provider,
+            5000,
+            1f,
+            locationListener
+        )
         requestingLocationUpdates = true
     }
 
+    @SuppressLint("MissingPermission")
     private fun removeLocationUpdates() {
-        if (locationClient.isConnected) {
-            LocationServices.FusedLocationApi.removeLocationUpdates(locationClient, this)
+        if (context?.checkAnyLocationPermission() == true) {
+            locationManager.removeUpdates(locationListener)
         }
     }
 
-    override fun onConnectionSuspended() {
-    }
-
-    override fun onLocationChanged(location: Location?) {
-        val map = this.map ?: return
-        if (location == null || vm.myLocationEnabled.value == false) return
+    private val locationListener = LocationListenerCompat { location ->
+        val map = this.map ?: return@LocationListenerCompat
+        if (vm.myLocationEnabled.value == false) return@LocationListenerCompat
 
         val latLng = LatLng(location.latitude, location.longitude)
         val oldLoc = vm.location.value
@@ -1347,8 +1343,5 @@ class MapFragment : Fragment(), OnMapReadyCallback, MapsActivity.FragmentCallbac
 
     override fun onDestroy() {
         super.onDestroy()
-        if (locationClient.isConnected) {
-            locationClient.disconnect()
-        }
     }
 }

app/src/main/java/net/vonforst/evmap/navigation/NavHostFragment.kt

@@ -1,12 +1,12 @@
 package net.vonforst.evmap.navigation
 
-import androidx.navigation.NavController
+import androidx.navigation.NavHostController
 import androidx.navigation.fragment.NavHostFragment
 
 class NavHostFragment : NavHostFragment() {
-    override fun onCreateNavController(navController: NavController) {
-        super.onCreateNavController(navController)
-        navController.navigatorProvider.addNavigator(
+    override fun onCreateNavHostController(navHostController: NavHostController) {
+        super.onCreateNavHostController(navHostController)
+        navHostController.navigatorProvider.addNavigator(
             CustomNavigator(
                 requireContext()
             )

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

@@ -3,6 +3,7 @@ package net.vonforst.evmap.storage
 import android.content.Context
 import androidx.preference.PreferenceManager
 import com.car2go.maps.AnyMap
+import com.car2go.maps.model.LatLng
 import net.vonforst.evmap.R
 import net.vonforst.evmap.model.FILTERS_CUSTOM
 import net.vonforst.evmap.model.FILTERS_DISABLED
@@ -86,11 +87,14 @@ class PreferenceDataSource(val context: Context) {
             context.getString(R.string.pref_map_provider_default)
         )!!
 
-    val searchProvider: String
+    var searchProvider: String
         get() = sp.getString(
             "search_provider",
             context.getString(R.string.pref_search_provider_default)
         )!!
+        set(value) {
+            sp.edit().putString("search_provider", value).apply()
+        }
 
     var mapType: AnyMap.Type
         get() = AnyMap.Type.valueOf(sp.getString("map_type", null) ?: AnyMap.Type.NORMAL.toString())
@@ -198,9 +202,41 @@ class PreferenceDataSource(val context: Context) {
             sp.edit().putLong("app_start_counter", value).apply()
         }
 
+    /** Counter for how many times the price comparison page was opened,
+     * introduced with Version 1.3.4 **/
+    var chargepriceCounter: Long
+        get() = sp.getLong("chargeprice_counter", 0)
+        set(value) {
+            sp.edit().putLong("chargeprice_counter", value).apply()
+        }
+
     var opensourceDonationsDialogShown: Boolean
         get() = sp.getBoolean("opensource_donations_dialog_shown", false)
         set(value) {
             sp.edit().putBoolean("opensource_donations_dialog_shown", value).apply()
         }
+
+    var placeSearchResultAndroidAuto: LatLng?
+        get() = if (sp.contains("place_search_result_android_auto_lat")) {
+            LatLng(
+                Double.fromBits(sp.getLong("place_search_result_android_auto_lat", 0L)),
+                Double.fromBits(sp.getLong("place_search_result_android_auto_lng", 0L))
+            )
+        } else null
+        set(value) {
+            if (value == null) {
+                sp.edit().remove("place_search_result_android_auto_lat")
+                    .remove("place_search_result_android_auto_lng").apply()
+            } else {
+                sp.edit().putLong("place_search_result_android_auto_lat", value.latitude.toBits())
+                    .putLong("place_search_result_android_auto_lng", value.longitude.toBits())
+                    .apply()
+            }
+        }
+
+    var placeSearchResultAndroidAutoName: String?
+        get() = sp.getString("place_search_result_android_auto_name", null)
+        set(value) {
+            sp.edit().putString("place_search_result_android_auto_name", value).apply()
+        }
 }

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

@@ -65,6 +65,19 @@ abstract class RecentAutocompletePlaceDao {
         limit: Int? = null
     ): List<RecentAutocompletePlace>
 
+    @Query("SELECT * FROM recentautocompleteplace WHERE dataSource = :dataSource AND primaryText LIKE '%' || :query || '%' ORDER BY timestamp DESC LIMIT :limit")
+    abstract suspend fun searchAsync(
+        query: String,
+        dataSource: String,
+        limit: Int? = null
+    ): List<RecentAutocompletePlace>
+
     @Query("SELECT * FROM recentautocompleteplace WHERE dataSource = :dataSource ORDER BY timestamp DESC LIMIT :limit")
     abstract fun getAll(dataSource: String, limit: Int? = null): List<RecentAutocompletePlace>
+
+    @Query("SELECT * FROM recentautocompleteplace WHERE dataSource = :dataSource ORDER BY timestamp DESC LIMIT :limit")
+    abstract suspend fun getAllAsync(
+        dataSource: String,
+        limit: Int? = null
+    ): List<RecentAutocompletePlace>
 }

app/src/main/java/net/vonforst/evmap/ui/BindingAdapters.kt

@@ -389,9 +389,10 @@ private fun colorToTransparent(color: Int, targetAlpha: Float = 31f / 255): Int
     val green = Color.green(color)
     val blue = Color.blue(color)
 
-    val newRed = ((red - (1 - targetAlpha) * 255) / targetAlpha).roundToInt()
-    val newGreen = ((green - (1 - targetAlpha) * 255) / targetAlpha).roundToInt()
-    val newBlue = ((blue - (1 - targetAlpha) * 255) / targetAlpha).roundToInt()
+    val newRed = kotlin.math.max(((red - (1 - targetAlpha) * 255) / targetAlpha).roundToInt(), 0)
+    val newGreen =
+        kotlin.math.max(((green - (1 - targetAlpha) * 255) / targetAlpha).roundToInt(), 0)
+    val newBlue = kotlin.math.max(((blue - (1 - targetAlpha) * 255) / targetAlpha).roundToInt(), 0)
 
     return Color.argb((targetAlpha * 255).roundToInt(), newRed, newGreen, newBlue)
 }

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

@@ -86,4 +86,11 @@ class FilterViewModel(application: Application) : AndroidViewModel(application)
         // set selected profile
         prefs.filterStatus = profileId
     }
+
+    suspend fun deleteCurrentProfile() {
+        filterProfile.value?.let {
+            db.filterProfileDao().delete(it)
+            prefs.filterStatus = FILTERS_DISABLED
+        }
+    }
 }

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

@@ -141,17 +141,24 @@ class MapViewModel(application: Application, private val state: SavedStateHandle
     }
     val chargerDetails: MediatorLiveData<Resource<ChargeLocation>> by lazy {
         MediatorLiveData<Resource<ChargeLocation>>().apply {
+            value = state["chargerDetails"]
             listOf(chargerSparse, referenceData).forEach {
                 addSource(it) { _ ->
                     val charger = chargerSparse.value
                     val refData = referenceData.value
                     if (charger != null && refData != null) {
-                        loadChargerDetails(charger, refData)
+                        if (charger.id != value?.data?.id) {
+                            loadChargerDetails(charger, refData)
+                        }
                     } else {
                         value = null
                     }
                 }
             }
+            observeForever {
+                // persist data in case fragment gets recreated
+                state["chargerDetails"] = it
+            }
         }
     }
     val charger: MediatorLiveData<Resource<ChargeLocation>> by lazy {
@@ -311,7 +318,8 @@ class MapViewModel(application: Application, private val state: SavedStateHandle
                     }
                     minPower >= 100 -> {
                         // when only showing high-power chargers we can use large markers
-                        zoom < clusterThreshold
+                        // because the density is much lower
+                        false
                     }
                     else -> {
                         zoom < miniMarkerThreshold
@@ -434,6 +442,11 @@ class MapViewModel(application: Application, private val state: SavedStateHandle
                     chargerDetails.value = response
                     if (response.status == Status.SUCCESS) {
                         chargerSparse.value = response.data
+
+                        if (response.data != null && favorites.value?.any { it.charger.id == response.data.id } == true) {
+                            // update data of stored favorite
+                            db.chargeLocationsDao().insert(response.data)
+                        }
                     } else {
                         chargerSparse.value = null
                     }

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

@@ -1,5 +1,6 @@
 package net.vonforst.evmap.viewmodel
 
+import android.os.Parcelable
 import androidx.annotation.MainThread
 import androidx.annotation.Nullable
 import androidx.lifecycle.*
@@ -7,6 +8,8 @@ import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
+import kotlinx.parcelize.Parcelize
+import kotlinx.parcelize.RawValue
 import java.util.concurrent.atomic.AtomicBoolean
 
 
@@ -24,9 +27,13 @@ enum class Status {
 
 /**
  * A generic class that holds a value with its loading status.
- * @param <T>
-</T> */
-data class Resource<out T>(val status: Status, val data: T?, val message: String?) {
+ *
+ * Note that this class implements Parcelable for convenience, but will give a runtime error when
+ * trying to write it to a Parcel if the type parameter does not implement Parcelable.
+ */
+@Parcelize
+data class Resource<out T>(val status: Status, val data: @RawValue T?, val message: String?) :
+    Parcelable {
     companion object {
         fun <T> success(data: T?): Resource<T> {
             return Resource(Status.SUCCESS, data, null)

app/src/main/res/drawable-anydpi-v24/ic_appicon_notification.xml

@@ -0,0 +1,28 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="#FFFFFF">
+    <group
+        android:scaleX="0.184"
+        android:scaleY="0.184"
+        android:translateX="0.96"
+        android:translateY="0.96">
+        <path
+            android:pathData="M27.1,88.3l-2.2,-19.2l-3.3,0.3l2.2,19.2L27.1,88.3zM39,86.9l-2.2,-19.2l-3.3,0.3l2.2,19.2L39,86.9z"
+            android:fillColor="#FFFFFF" />
+        <path
+            android:pathData="M45.2,113c-1,1.3 -1.8,2.1 -2,2.2c-3,2.4 -5.4,3.1 -7.4,2.2c-3.5,-1.7 -3.2,-8.2 -3.1,-8.9l2.4,0.1c-0.1,1.8 0.2,5.8 1.8,6.6c0.9,0.5 2.5,-0.1 4.6,-1.8l0,0c0,0 6.7,-6.7 5.3,-12c-1.6,-6.4 5.8,-15.5 8.2,-18.6l0.3,-0.3l2,1.5l-0.3,0.5c-7.5,9.2 -8.3,14 -7.7,16.4C50.5,105.4 47.4,110.4 45.2,113z"
+            android:fillColor="#FFFFFF" />
+        <path
+            android:pathData="M19.7,88.1l0.9,7.9l7.3,4.9l9.8,-1l6,-6.4l-0.9,-7.9L19.7,88.1z"
+            android:fillColor="#FFFFFF" />
+        <path
+            android:pathData="M37.6,99.7l-9.8,1l2.1,8.7l7.7,-0.9V99.7L37.6,99.7zM44.6,79l0.8,7.2l-28.2,3.2l-0.8,-7.2L44.6,79z"
+            android:fillColor="#FFFFFF" />
+        <path
+            android:pathData="M66.7,0C46.5,0 30.1,16.4 30.1,36.6c0,27.6 30.8,42 34.5,81.4c0.1,1.2 1,2 2.2,2c1.2,0 2.1,-0.8 2.2,-2c3.7,-39.4 34.5,-53.8 34.5,-81.4C103.3,16.2 86.9,0 66.7,0zM78.4,34.7L64.3,59V40.8h-6V18.7c0,0 20.2,0 20.1,-0.1l-8.1,16.2H78.4z"
+            android:fillColor="#FFFFFF" />
+    </group>
+</vector>

app/src/main/res/drawable/my_tariff_background.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@color/chip_background" />
+    <item android:drawable="@color/my_tariff_background" />
     <item android:drawable="?selectableItemBackground" />
 </layer-list>

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

@@ -3,7 +3,8 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/drawer_layout"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
+    android:fitsSystemWindows="true">
 
     <androidx.fragment.app.FragmentContainerView
         android:id="@+id/nav_host_fragment"
@@ -18,7 +19,6 @@
         android:layout_width="wrap_content"
         android:layout_height="match_parent"
         android:layout_gravity="start"
-        android:fitsSystemWindows="true"
         app:headerLayout="@layout/nav_header"
         app:menu="@menu/drawer" />
 </androidx.drawerlayout.widget.DrawerLayout>

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

@@ -107,7 +107,7 @@
                     android:id="@+id/textView4"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:text="@{@string/chargeprice_stats(vm.chargepriceMetaForChargepoint.data.energy, BindingAdaptersKt.time((int) Math.round(vm.chargepriceMetaForChargepoint.data.duration)), vm.chargepriceMetaForChargepoint.data.power)}"
+                    android:text="@{@string/chargeprice_stats(vm.chargepriceMetaForChargepoint.data.energy, BindingAdaptersKt.time((int) Math.round(vm.chargepriceMetaForChargepoint.data.duration)), vm.chargepriceMetaForChargepoint.data.energy / vm.chargepriceMetaForChargepoint.data.duration * 60)}"
                     android:textAppearance="@style/TextAppearance.Material3.BodySmall"
                     app:invisibleUnlessAnimated="@{!vm.batteryRangeSliderDragging && vm.chargepriceMetaForChargepoint.status == Status.SUCCESS}"
                     app:layout_constraintStart_toStartOf="@+id/textView2"
@@ -242,4 +242,4 @@
         </androidx.core.widget.NestedScrollView>
 
     </LinearLayout>
-</layout>
+</layout>

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

@@ -167,7 +167,6 @@
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toStartOf="@+id/guideline5"
             app:layout_constraintTop_toTopOf="parent"
-            app:tintNullable="@{BindingAdaptersKt.isDarkMode(context) ? @android:color/white : null}"
             tools:srcCompat="@tools:sample/avatars" />
 
     </androidx.constraintlayout.widget.ConstraintLayout>

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

@@ -3,7 +3,6 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:paddingTop="24dp"
-    android:fitsSystemWindows="true"
     android:id="@+id/nav_header">
 
     <include layout="@layout/app_logo" />

app/src/main/res/navigation/nav_graph.xml

@@ -4,50 +4,54 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/nav_graph">
 
-    <fragment
+    <navigation
         android:id="@+id/map"
-        android:name="net.vonforst.evmap.fragment.MapFragment"
-        android:label=""
-        tools:layout="@layout/fragment_map">
-        <action
-            android:id="@+id/action_map_to_filterFragment"
-            app:destination="@id/filter"
-            app:exitAnim="@animator/nav_default_exit_anim"
-            app:enterAnim="@animator/nav_default_enter_anim"
-            app:popEnterAnim="@animator/nav_default_pop_enter_anim"
-            app:popExitAnim="@animator/nav_default_pop_exit_anim" />
-        <action
-            android:id="@+id/action_map_to_filterProfilesFragment"
-            app:destination="@id/filter_profiles"
-            app:exitAnim="@animator/nav_default_exit_anim"
-            app:enterAnim="@animator/nav_default_enter_anim"
-            app:popEnterAnim="@animator/nav_default_pop_enter_anim"
-            app:popExitAnim="@animator/nav_default_pop_exit_anim" />
-        <action
-            android:id="@+id/action_map_to_chargepriceFragment"
-            app:destination="@id/chargeprice" />
-        <action
-            android:id="@+id/action_map_to_opensource_donations"
-            app:destination="@id/opensource_donations" />
-        <argument
-            android:name="locationName"
-            android:defaultValue="@null"
-            app:argType="string"
-            app:nullable="true" />
-        <argument
-            android:name="chargerId"
-            android:defaultValue="0L"
-            app:argType="long" />
-        <argument
-            android:name="latLng"
-            android:defaultValue="@null"
-            app:argType="com.car2go.maps.model.LatLng"
-            app:nullable="true" />
-        <argument
-            android:name="appStart"
-            android:defaultValue="false"
-            app:argType="boolean" />
-    </fragment>
+        app:startDestination="@id/map_frag">
+        <fragment
+            android:id="@+id/map_frag"
+            android:name="net.vonforst.evmap.fragment.MapFragment"
+            android:label=""
+            tools:layout="@layout/fragment_map">
+            <action
+                android:id="@+id/action_map_to_filterFragment"
+                app:destination="@id/filter"
+                app:exitAnim="@animator/nav_default_exit_anim"
+                app:enterAnim="@animator/nav_default_enter_anim"
+                app:popEnterAnim="@animator/nav_default_pop_enter_anim"
+                app:popExitAnim="@animator/nav_default_pop_exit_anim" />
+            <action
+                android:id="@+id/action_map_to_filterProfilesFragment"
+                app:destination="@id/filter_profiles"
+                app:exitAnim="@animator/nav_default_exit_anim"
+                app:enterAnim="@animator/nav_default_enter_anim"
+                app:popEnterAnim="@animator/nav_default_pop_enter_anim"
+                app:popExitAnim="@animator/nav_default_pop_exit_anim" />
+            <action
+                android:id="@+id/action_map_to_chargepriceFragment"
+                app:destination="@id/chargeprice" />
+            <action
+                android:id="@+id/action_map_to_opensource_donations"
+                app:destination="@id/opensource_donations" />
+            <argument
+                android:name="locationName"
+                android:defaultValue="@null"
+                app:argType="string"
+                app:nullable="true" />
+            <argument
+                android:name="chargerId"
+                android:defaultValue="0L"
+                app:argType="long" />
+            <argument
+                android:name="latLng"
+                android:defaultValue="@null"
+                app:argType="com.car2go.maps.model.LatLng"
+                app:nullable="true" />
+            <argument
+                android:name="appStart"
+                android:defaultValue="false"
+                app:argType="boolean" />
+        </fragment>
+    </navigation>
     <fragment
         android:id="@+id/about"
         android:name="net.vonforst.evmap.fragment.preference.AboutFragment"
@@ -85,15 +89,19 @@
         android:name="net.vonforst.evmap.fragment.preference.AndroidAutoSettingsFragment"
         android:label="@string/settings_android_auto"
         tools:layout="@layout/fragment_preference" />
-    <fragment
+    <navigation
         android:id="@+id/favs"
-        android:name="net.vonforst.evmap.fragment.FavoritesFragment"
-        android:label="@string/menu_favs"
-        tools:layout="@layout/fragment_favorites">
-        <action
-            android:id="@+id/action_favs_to_map"
-            app:destination="@id/map" />
-    </fragment>
+        app:startDestination="@id/favs_frag">
+        <fragment
+            android:id="@+id/favs_frag"
+            android:name="net.vonforst.evmap.fragment.FavoritesFragment"
+            android:label="@string/menu_favs"
+            tools:layout="@layout/fragment_favorites">
+            <action
+                android:id="@+id/action_favs_to_map"
+                app:destination="@id/map" />
+        </fragment>
+    </navigation>
     <fragment
         android:id="@+id/filter"
         android:name="net.vonforst.evmap.fragment.FilterFragment"
@@ -110,12 +118,15 @@
         android:label="@string/chargeprice_title"
         tools:layout="@layout/fragment_chargeprice">
         <action
-            android:id="@+id/action_chargeprice_to_settingsFragment"
-            app:destination="@id/settings"
+            android:id="@+id/action_chargeprice_to_chargepriceSettingsFragment"
+            app:destination="@id/settings_chargeprice"
             app:exitAnim="@animator/nav_default_exit_anim"
             app:enterAnim="@animator/nav_default_enter_anim"
             app:popEnterAnim="@animator/nav_default_enter_anim"
             app:popExitAnim="@animator/nav_default_exit_anim" />
+        <action
+            android:id="@+id/action_chargeprice_to_donateFragment"
+            app:destination="@id/donate" />
         <argument
             android:name="charger"
             app:argType="net.vonforst.evmap.model.ChargeLocation" />
@@ -152,6 +163,8 @@
         android:label="OnboardingFragment">
         <action
             android:id="@+id/action_onboarding_to_map"
-            app:destination="@id/map" />
+            app:destination="@id/map"
+            app:popUpTo="@id/onboarding"
+            app:popUpToInclusive="true" />
     </fragment>
 </navigation>

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

@@ -158,6 +158,8 @@
     <string name="welcome_2_detail">Du kannst die Farben im Menü unter “Über EVMap → FAQ” erneut ansehen)</string>
     <string name="donation_dialog_title">Danke, dass du EVMap nutzt!</string>
     <string name="donation_dialog_detail">EVMap ist kostenlos und Open Source, ich entwickle es in meiner Freizeit. Über GitHub kann jeder zur Weiterentwicklung der App beitragen. Durch die steigende Beliebtheit der App müssen allerdings auch laufende Kosten, z.B. für den Zugriff auf die Datenquellen, gedeckt werden. Daher freue ich mich auch über Spenden in der App oder über GitHub Sponsors.</string>
+    <string name="chargeprice_donation_dialog_title">Du bist ein richtiger Sparfuchs!</string>
+    <string name="chargeprice_donation_dialog_detail">Es sieht so aus, als wenn du den Preisvergleich sehr gern nutzt. Für den Zugang zu den Preisinformationen muss der Entwickler von EVMap eine monatliche Gebühr an die Datenquelle Chargeprice.app zahlen. Um diesen Dienst weiter anbieten zu können, würde ich mich sehr über Spenden freuen.</string>
     <string name="deleted_filterprofile">„%s” gelöscht</string>
     <string name="undo">Rückgängig</string>
     <string name="rename">Umbenennen</string>
@@ -259,4 +261,5 @@
     <string name="pref_map_rotate_gestures_on">Karte kann mit Zweifingergeste rotiert werden</string>
     <string name="pref_map_rotate_gestures_off">Karte bleibt fest nach Norden ausgerichtet</string>
     <string name="refresh_live_data">Echtzeitstatus aktualisieren</string>
+    <string name="autocomplete_connection_error">Vorschläge konnten nicht geladen werden</string>
 </resources>

app/src/main/res/values-night/colors.xml

@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <color name="background">#121212</color>
+    <color name="my_tariff_background">#1FFFFFFF</color>
 </resources>

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

@@ -25,6 +25,7 @@
     <color name="chargeprice_lock">#546E7A</color>
     <color name="chargeprice_star">#00C853</color>
     <color name="chip_background">#1F000000</color>
+    <color name="my_tariff_background">#1F000000</color>
     <color name="background">#FFFFFF</color>
     <color name="pager_unselected">#1F000000</color>
 </resources>

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

@@ -157,6 +157,8 @@
     <string name="welcome_2_detail">(You can check the colors again under “About EVMap → FAQ” in the menu)</string>
     <string name="donation_dialog_title">Thank you for using EVMap!</string>
     <string name="donation_dialog_detail">EVMap is free and Open Source software that I develop in my spare time. Coding contributions on GitHub are very much appreciated. However, due to increasing popularity of the app, I also need to cover some running costs, e.g. for access to the data sources. Therefore, please consider supporting the app through a donation or via GitHub Sponsors.</string>
+    <string name="chargeprice_donation_dialog_title">You\'re a real bargain hunter!</string>
+    <string name="chargeprice_donation_dialog_detail">It seems like you like the price comparison feature a lot. To access the pricing data, the developer of EVMap needs to pay a monthly fee to the data provider Chargeprice.app. Therefore, please consider supporting EVMap through a donation.</string>
     <string name="deleted_filterprofile">Deleted “%s”</string>
     <string name="undo">Undo</string>
     <string name="rename">Rename</string>
@@ -244,4 +246,5 @@
     <string name="pref_map_rotate_gestures_on">Map can be rotated with two-finger gesture</string>
     <string name="pref_map_rotate_gestures_off">Map will be fixed to north-up</string>
     <string name="refresh_live_data">refresh real-time status</string>
+    <string name="autocomplete_connection_error">Suggestions could not be loaded</string>
 </resources>

app/src/main/res/xml/shortcuts.xml

@@ -9,7 +9,7 @@
              (e.g. in the debug version). -->
         <intent
             android:action="android.intent.action.VIEW"
-            android:targetPackage="net.vonforst.evmap"
+            android:targetPackage="${applicationId}"
             android:targetClass="net.vonforst.evmap.MapsActivity">
             <extra
                 android:name="favorites"

app/src/testGoogle/java/net/vonforst/evmap/auto/CarAppTest.kt

@@ -0,0 +1,42 @@
+package net.vonforst.evmap.auto
+
+import android.content.ComponentName
+import android.content.Intent
+import androidx.car.app.HandshakeInfo
+import androidx.car.app.testing.SessionController
+import androidx.car.app.testing.TestCarContext
+import androidx.car.app.testing.TestScreenManager
+import androidx.lifecycle.Lifecycle
+import androidx.test.core.app.ApplicationProvider
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.robolectric.Robolectric
+import org.robolectric.RobolectricTestRunner
+import org.robolectric.annotation.internal.DoNotInstrument
+
+@RunWith(RobolectricTestRunner::class)
+@DoNotInstrument
+class CarAppTest {
+    private val testCarContext =
+        TestCarContext.createCarContext(ApplicationProvider.getApplicationContext()).apply {
+            updateHandshakeInfo(HandshakeInfo("auto.testing", 1))
+        }
+
+    @Test
+    fun onCreateScreen_returnsExpectedScreen() {
+        val service = Robolectric.setupService(CarAppService::class.java)
+        val session = service.onCreateSession()
+        val controller = SessionController(
+            session, testCarContext,
+            Intent().setComponent(
+                ComponentName(testCarContext, CarAppService::class.java)
+            )
+        )
+        controller.moveToState(Lifecycle.State.CREATED)
+        val screenCreated =
+            testCarContext.getCarService(TestScreenManager::class.java).screensPushed.last()
+
+        // location permission required
+        assert(screenCreated is PermissionScreen)
+    }
+}

build.gradle

@@ -1,19 +1,20 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-    ext.kotlin_version = '1.6.21'
+    ext.kotlin_version = '1.7.10'
     ext.about_libs_version = '8.9.4'
-    ext.nav_version = '2.4.2'
+    ext.nav_version = '2.5.1'
     repositories {
         google()
         mavenCentral()
         gradlePluginPortal()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.1.3'
+        classpath 'com.android.tools.build:gradle:7.2.2'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath "com.mikepenz.aboutlibraries.plugin:aboutlibraries-plugin:$about_libs_version"
         classpath "androidx.navigation:navigation-safe-args-gradle-plugin:$nav_version"
+        classpath "de.timfreiheit.resourceplaceholders:placeholders:0.4"
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

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

@@ -0,0 +1,12 @@
+Verbesserungen:
+- Android Auto: Ortssuche hinzugefügt
+
+Fehler behoben:
+- Shortcut Favoriten: kein Wechsel zur Karte möglich
+- Favoritendaten wurden nicht bei Öffnen aktualisiert
+- Preisvergleich: Durchschnittsladeleistung falsch
+- Verfügbarkeit in kompakter Ansicht falsch (mit Filter nach Leistung)
+- Kompass hinter Pinhole
+- Abstürze behoben
+- Android Automotive: Verfügbarkeitsdaten wurden bei Refresh nicht neu geladen
+- Android Automotive: Fahrtrichtung wurde bei Fahrzeugdaten nicht angezeigt

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

@@ -0,0 +1,2 @@
+Fehler behoben:
+- OpenStreetMap/Mapbox: Karte ließ sich nicht mehr verschieben

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

@@ -0,0 +1,3 @@
+Fehler behoben:
+- Mögliche Behebung von Abstürzen unter Android Auto
+- Filterbutton war unter Android Automotive verschwunden

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

@@ -0,0 +1,6 @@
+Fehler behoben:
+- Darstellungsprobleme mit einigen hervorgehobenen Tarifen im Preisvergleich behoben
+- Verbesserungen für weitere kleine Darstellungsfehler
+- Android Auto: Richtiges Icon für dauerhafte Benachrichtigung zum Standortzugriff verwenden
+- Android Auto: Ausrichtung von +/- Buttons korrigiert
+- Android Auto: Liste der Ladestationen nach Neustart der App aktualisieren

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

@@ -0,0 +1,12 @@
+Improvements:
+- Android Auto: Added place search
+
+Bugfixes:
+- Shortcut to favorites: switching to map not possible
+- Favorite data were not updated when viewing details
+- Price comparison: incorrect average power
+- Wrong availability data in compact view (with minimum power filter)
+- Compass hidden behind pinhole
+- Crashes fixed
+- Android Automotive: Availability data not updated on refresh
+- Android Automotive: Driving direction was not shown in vehicle data

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

@@ -0,0 +1,2 @@
+Bugfixes:
+- OpenStreetMap/Mapbox: Map was not movable

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

@@ -0,0 +1,3 @@
+Bugfixes:
+- Possible fix of crashes under Android Auto
+- Filter button disappeared under Android Automotive

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

@@ -0,0 +1,6 @@
+Bugfixes:
+- Fixed visual problems with some highlighted providers in price comparison
+- Improvements for some other minor visual issues
+- Android Auto: Use proper icon for persistent notification about location access
+- Android Auto: Fix alignment of +/- buttons
+- Android Auto: Refresh chargers after going back to app

gradle.properties

@@ -1,21 +1,16 @@
-# Project-wide Gradle settings.
-# IDE (e.g. Android Studio) users:
-# Gradle settings configured through the IDE *will override*
-# any settings specified in this file.
-# For more details on how to configure your build environment visit
+## For more details on how to configure your build environment visit
 # http://www.gradle.org/docs/current/userguide/build_environment.html
+#
 # Specifies the JVM arguments used for the daemon process.
 # The setting is particularly useful for tweaking memory settings.
-org.gradle.jvmargs=-Xmx1536m
+# Default value: -Xmx1024m -XX:MaxPermSize=256m
+# org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
+#
 # When configured, Gradle will run in incubating parallel mode.
 # This option should only be used with decoupled projects. More details, visit
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
 # org.gradle.parallel=true
-# AndroidX package structure to make it clearer which packages are bundled with the
-# Android operating system, and which are packaged with your app's APK
-# https://developer.android.com/topic/libraries/support-library/androidx-rn
+#Sun Jul 24 11:49:27 CEST 2022
+kotlin.code.style=official
+org.gradle.jvmargs=-Xmx2048M -Dkotlin.daemon.jvm.options\="-Xmx2048M"
 android.useAndroidX=true
-# Automatically convert third-party libraries to use AndroidX
-android.enableJetifier=true
-# Kotlin code style for this project: "official" or "obsolete":
-kotlin.code.style=official

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Wed Dec 23 14:54:49 CET 2020
+#Sat Aug 06 15:33:46 CEST 2022
 distributionBase=GRADLE_USER_HOME
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
 distributionPath=wrapper/dists
-zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
+zipStoreBase=GRADLE_USER_HOME

gradlew

@@ -1,78 +1,129 @@
-#!/usr/bin/env sh
+#!/bin/sh
+
+#
+# Copyright <20> 2015-2021 the original authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
 
 ##############################################################################
-##
-##  Gradle start up script for UN*X
-##
+#
+#   Gradle start up script for POSIX generated by Gradle.
+#
+#   Important for running:
+#
+#   (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
+#       noncompliant, but you have some other compliant shell such as ksh or
+#       bash, then to run this script, type that shell name before the whole
+#       command line, like:
+#
+#           ksh Gradle
+#
+#       Busybox and similar reduced shells will NOT work, because this script
+#       requires all of these POSIX shell features:
+#         * functions;
+#         * expansions <20>$var<61>, <20>${var}<7D>, <20>${var:-default}<7D>, <20>${var+SET}<7D>,
+#           <20>${var#prefix}<7D>, <20>${var%suffix}<7D>, and <20>$( cmd )<29>;
+#         * compound commands having a testable exit status, especially <20>case<73>;
+#         * various built-in commands including <20>command<6E>, <20>set<65>, and <20>ulimit<69>.
+#
+#   Important for patching:
+#
+#   (2) This script targets any POSIX shell, so it avoids extensions provided
+#       by Bash, Ksh, etc; in particular arrays are avoided.
+#
+#       The "traditional" practice of packing multiple parameters into a
+#       space-separated string is a well documented source of bugs and security
+#       problems, so this is (mostly) avoided, by progressively accumulating
+#       options in "$@", and eventually passing that to Java.
+#
+#       Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
+#       and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
+#       see the in-line comments for details.
+#
+#       There are tweaks for specific operating systems such as AIX, CygWin,
+#       Darwin, MinGW, and NonStop.
+#
+#   (3) This script is generated from the Groovy template
+#       https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       within the Gradle project.
+#
+#       You can find Gradle at https://github.com/gradle/gradle/.
+#
 ##############################################################################
 
 # Attempt to set APP_HOME
+
 # Resolve links: $0 may be a link
-PRG="$0"
-# Need this for relative symlinks.
-while [ -h "$PRG" ] ; do
-    ls=`ls -ld "$PRG"`
-    link=`expr "$ls" : '.*-> \(.*\)$'`
-    if expr "$link" : '/.*' > /dev/null; then
-        PRG="$link"
-    else
-        PRG=`dirname "$PRG"`"/$link"
-    fi
+app_path=$0
+
+# Need this for daisy-chained symlinks.
+while
+    APP_HOME=${app_path%"${app_path##*/}"}  # leaves a trailing /; empty if no leading path
+    [ -h "$app_path" ]
+do
+    ls=$( ls -ld "$app_path" )
+    link=${ls#*' -> '}
+    case $link in             #(
+      /*)   app_path=$link ;; #(
+      *)    app_path=$APP_HOME$link ;;
+    esac
 done
-SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >/dev/null
-APP_HOME="`pwd -P`"
-cd "$SAVED" >/dev/null
+
+APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
 
 APP_NAME="Gradle"
-APP_BASE_NAME=`basename "$0"`
+APP_BASE_NAME=${0##*/}
 
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS=""
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
-MAX_FD="maximum"
+MAX_FD=maximum
 
 warn () {
     echo "$*"
-}
+} >&2
 
 die () {
     echo
     echo "$*"
     echo
     exit 1
-}
+} >&2
 
 # OS specific support (must be 'true' or 'false').
 cygwin=false
 msys=false
 darwin=false
 nonstop=false
-case "`uname`" in
-  CYGWIN* )
-    cygwin=true
-    ;;
-  Darwin* )
-    darwin=true
-    ;;
-  MINGW* )
-    msys=true
-    ;;
-  NONSTOP* )
-    nonstop=true
-    ;;
+case "$( uname )" in                #(
+  CYGWIN* )         cygwin=true  ;; #(
+  Darwin* )         darwin=true  ;; #(
+  MSYS* | MINGW* )  msys=true    ;; #(
+  NONSTOP* )        nonstop=true ;;
 esac
 
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 
+
 # Determine the Java command to use to start the JVM.
 if [ -n "$JAVA_HOME" ] ; then
     if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
         # IBM's JDK on AIX uses strange locations for the executables
-        JAVACMD="$JAVA_HOME/jre/sh/java"
+        JAVACMD=$JAVA_HOME/jre/sh/java
     else
-        JAVACMD="$JAVA_HOME/bin/java"
+        JAVACMD=$JAVA_HOME/bin/java
     fi
     if [ ! -x "$JAVACMD" ] ; then
         die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
@@ -81,7 +132,7 @@ Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
     fi
 else
-    JAVACMD="java"
+    JAVACMD=java
     which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
@@ -89,84 +140,95 @@ location of your Java installation."
 fi
 
 # Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
-    MAX_FD_LIMIT=`ulimit -H -n`
-    if [ $? -eq 0 ] ; then
-        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
-            MAX_FD="$MAX_FD_LIMIT"
-        fi
-        ulimit -n $MAX_FD
-        if [ $? -ne 0 ] ; then
-            warn "Could not set maximum file descriptor limit: $MAX_FD"
-        fi
-    else
-        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
-    fi
-fi
-
-# For Darwin, add options to specify how the application appears in the dock
-if $darwin; then
-    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
-fi
-
-# For Cygwin, switch paths to Windows format before running java
-if $cygwin ; then
-    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
-    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
-    JAVACMD=`cygpath --unix "$JAVACMD"`
-
-    # We build the pattern for arguments to be converted via cygpath
-    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
-    SEP=""
-    for dir in $ROOTDIRSRAW ; do
-        ROOTDIRS="$ROOTDIRS$SEP$dir"
-        SEP="|"
-    done
-    OURCYGPATTERN="(^($ROOTDIRS))"
-    # Add a user-defined pattern to the cygpath arguments
-    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
-        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
-    fi
-    # Now convert the arguments - kludge to limit ourselves to /bin/sh
-    i=0
-    for arg in "$@" ; do
-        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
-        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
-
-        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
-            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
-        else
-            eval `echo args$i`="\"$arg\""
-        fi
-        i=$((i+1))
-    done
-    case $i in
-        (0) set -- ;;
-        (1) set -- "$args0" ;;
-        (2) set -- "$args0" "$args1" ;;
-        (3) set -- "$args0" "$args1" "$args2" ;;
-        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
-        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
-        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
-        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
-        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
-        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
+    case $MAX_FD in #(
+      max*)
+        MAX_FD=$( ulimit -H -n ) ||
+            warn "Could not query maximum file descriptor limit"
+    esac
+    case $MAX_FD in  #(
+      '' | soft) :;; #(
+      *)
+        ulimit -n "$MAX_FD" ||
+            warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
 fi
 
-# Escape application args
-save () {
-    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
-    echo " "
-}
-APP_ARGS=$(save "$@")
+# Collect all arguments for the java command, stacking in reverse order:
+#   * args from the command line
+#   * the main class name
+#   * -classpath
+#   * -D...appname settings
+#   * --module-path (only if needed)
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
 
-# Collect all arguments for the java command, following the shell quoting and substitution rules
-eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if "$cygwin" || "$msys" ; then
+    APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
+    CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
 
-# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
-if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
-  cd "$(dirname "$0")"
+    JAVACMD=$( cygpath --unix "$JAVACMD" )
+
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    for arg do
+        if
+            case $arg in                                #(
+              -*)   false ;;                            # don't mess with options #(
+              /?*)  t=${arg#/} t=/${t%%/*}              # looks like a POSIX filepath
+                    [ -e "$t" ] ;;                      #(
+              *)    false ;;
+            esac
+        then
+            arg=$( cygpath --path --ignore --mixed "$arg" )
+        fi
+        # Roll the args list around exactly as many times as the number of
+        # args, so each arg winds up back in the position where it started, but
+        # possibly modified.
+        #
+        # NB: a `for` loop captures its iteration list before it begins, so
+        # changing the positional parameters here affects neither the number of
+        # iterations, nor the values presented in `arg`.
+        shift                   # remove old arg
+        set -- "$@" "$arg"      # push replacement arg
+    done
 fi
 
+# Collect all arguments for the java command;
+#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
+#     shell script including quotes and variable substitutions, so put them in
+#     double quotes to make sure that they get re-expanded; and
+#   * put everything else in single quotes, so that it's not re-expanded.
+
+set -- \
+        "-Dorg.gradle.appname=$APP_BASE_NAME" \
+        -classpath "$CLASSPATH" \
+        org.gradle.wrapper.GradleWrapperMain \
+        "$@"
+
+# Use "xargs" to parse quoted args.
+#
+# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
+#
+# In Bash we could simply go:
+#
+#   readarray ARGS < <( xargs -n1 <<<"$var" ) &&
+#   set -- "${ARGS[@]}" "$@"
+#
+# but POSIX shell has neither arrays nor command substitution, so instead we
+# post-process each arg (as a line of input to sed) to backslash-escape any
+# character that might be a shell metacharacter, then use eval to reverse
+# that process (while maintaining the separation between arguments), and wrap
+# the whole thing up as a single "set" statement.
+#
+# This will of course break if any of these variables contains a newline or
+# an unmatched quote.
+#
+
+eval "set -- $(
+        printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
+        xargs -n1 |
+        sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
+        tr '\n' ' '
+    )" '"$@"'
+
 exec "$JAVACMD" "$@"

gradlew.bat

@@ -1,3 +1,19 @@
+@rem
+@rem Copyright 2015 the original author or authors.
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
+@rem
+@rem      https://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@rem
+
 @if "%DEBUG%" == "" @echo off
 @rem ##########################################################################
 @rem
@@ -13,15 +29,18 @@ if "%DIRNAME%" == "" set DIRNAME=.
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+
 @rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS=
+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
 
 @rem Find java.exe
 if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto init
+if "%ERRORLEVEL%" == "0" goto execute
 
 echo.
 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -35,7 +54,7 @@ goto fail
 set JAVA_HOME=%JAVA_HOME:"=%
 set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
-if exist "%JAVA_EXE%" goto init
+if exist "%JAVA_EXE%" goto execute
 
 echo.
 echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
@@ -45,28 +64,14 @@ echo location of your Java installation.
 
 goto fail
 
-:init
-@rem Get command-line arguments, handling Windows variants
-
-if not "%OS%" == "Windows_NT" goto win9xME_args
-
-:win9xME_args
-@rem Slurp the command line arguments.
-set CMD_LINE_ARGS=
-set _SKIP=2
-
-:win9xME_args_slurp
-if "x%~1" == "x" goto execute
-
-set CMD_LINE_ARGS=%*
-
 :execute
 @rem Setup the command line
 
 set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
+
 @rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
 
 :end
 @rem End local scope for the variables with windows NT shell