Release 1.3.7

fixes #207

Gemfile.lock

@@ -113,7 +113,7 @@ GEM
     http-cookie (1.0.3)
       domain_name (~> 0.5)
     httpclient (2.8.3)
-    jmespath (1.4.0)
+    jmespath (1.6.1)
     json (2.3.1)
     jwt (2.2.1)
     memoist (0.16.2)

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 74
-        versionName "1.3.0"
+        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()
@@ -137,17 +146,18 @@ configurations {
 
 dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
-    implementation 'androidx.appcompat:appcompat:1.4.1'
-    implementation 'androidx.core:core-ktx:1.7.0'
-    implementation 'androidx.core:core-splashscreen:1.0.0-beta01'
-    implementation "androidx.activity:activity-ktx:1.4.0"
-    implementation "androidx.fragment:fragment-ktx:1.4.1"
+    implementation 'androidx.appcompat:appcompat:1.4.2'
+    implementation 'androidx.core:core-ktx:1.8.0'
+    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.5.0'
-    implementation 'androidx.constraintlayout:constraintlayout:2.1.3'
+    implementation 'com.google.android.material:material:1.6.1'
+    implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
     implementation 'androidx.recyclerview:recyclerview:1.2.1'
     implementation 'androidx.browser:browser:1.4.0'
+    implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0'
     implementation 'com.github.johan12345:CustomBottomSheetBehavior:f69f532660'
     implementation 'com.squareup.retrofit2:retrofit:2.9.0'
     implementation 'com.squareup.retrofit2:converter-moshi:2.9.0'
@@ -163,26 +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 = '751daec281'
+    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'
-    implementation "com.github.johan12345.AnyMaps:anymaps-mapbox:$anyMapsVersion"
+    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.5.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'
@@ -192,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"
@@ -214,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/foss/res/values-de/values.xml

@@ -9,7 +9,7 @@
     <string-array name="pref_search_provider_values" tranlatable="false">
         <item>mapbox</item>
     </string-array>
-    <string name="donations_info" formatted="false">Findest du EVMap nützlich? Unterstütze die Weiterentwicklung der App mit einer Spende an den Entwickler.\n\nGoogle zieht von der Spende 30% Gebühren ab.</string>
+    <string name="donations_info" formatted="false">Findest du EVMap nützlich? Unterstütze die Weiterentwicklung der App mit einer Spende an den Entwickler.</string>
     <string name="donate_paypal">Mit PayPal spenden</string>
     <string name="data_sources_hint">Die Kartendaten für die App stammen von OpenStreetMap (Mapbox).</string>
 </resources>

app/src/google/AndroidManifest.xml

@@ -39,14 +39,8 @@
             <intent-filter>
                 <action
                     android:name="androidx.car.app.CarAppService"
-                    android:category="androidx.car.app.category.CHARGING" />
+                    android:category="androidx.car.app.category.POI" />
             </intent-filter>
         </service>
-
-        <service
-            android:name=".auto.CarLocationService"
-            android:foregroundServiceType="location"
-            android:enabled="true"
-            android:exported="false" />
     </application>
 </manifest>

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

@@ -1,30 +1,84 @@
 package net.vonforst.evmap.auto
 
-import android.content.*
+import android.Manifest
+import android.annotation.SuppressLint
+import android.app.Notification
+import android.app.NotificationChannel
+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.os.IBinder
+import android.location.LocationManager
+import android.os.Build
+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
 import androidx.car.app.hardware.common.CarValue
 import androidx.car.app.hardware.info.CarHardwareLocation
 import androidx.car.app.hardware.info.CarSensors
 import androidx.car.app.validation.HostValidator
+import androidx.core.app.NotificationCompat
+import androidx.core.app.NotificationManagerCompat
 import androidx.core.content.ContextCompat
-import androidx.lifecycle.Lifecycle
-import androidx.lifecycle.LifecycleObserver
-import androidx.lifecycle.OnLifecycleEvent
-import androidx.localbroadcastmanager.content.LocalBroadcastManager
-import net.vonforst.evmap.utils.checkAnyLocationPermission
+import androidx.core.location.LocationListenerCompat
+import androidx.lifecycle.DefaultLifecycleObserver
+import androidx.lifecycle.LifecycleOwner
+import net.vonforst.evmap.R
+import net.vonforst.evmap.utils.checkFineLocationPermission
 
 
 interface LocationAwareScreen {
     fun updateLocation(location: Location)
 }
 
+@ExperimentalCarApi
 class CarAppService : androidx.car.app.CarAppService() {
+    private val CHANNEL_ID = "car_location"
+    private val NOTIFICATION_ID = 1000
+
+    override fun onCreate() {
+        super.onCreate()
+
+        // we want to run as a foreground service to make sure we can use location
+        createNotificationChannel()
+        startForeground(NOTIFICATION_ID, getNotification())
+    }
+
+    private fun createNotificationChannel() {
+        val notificationManager = getSystemService(NOTIFICATION_SERVICE) as NotificationManager
+        // Android O requires a Notification Channel.
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+            val name: CharSequence = getString(R.string.app_name)
+            // Create the channel for the notification
+            val mChannel =
+                NotificationChannel(CHANNEL_ID, name, NotificationManager.IMPORTANCE_DEFAULT)
+
+            // Set the Notification Channel for the Notification Manager.
+            notificationManager.createNotificationChannel(mChannel)
+        }
+    }
+
+    private fun getNotification(): Notification {
+        val builder: NotificationCompat.Builder = NotificationCompat.Builder(this, CHANNEL_ID)
+            .setContentText(getString(R.string.auto_location_service))
+            .setContentTitle(getString(R.string.app_name))
+            .setOngoing(true)
+            .setPriority(NotificationManagerCompat.IMPORTANCE_HIGH)
+            .setSmallIcon(R.drawable.ic_appicon_notification)
+            .setColor(ContextCompat.getColor(this, R.color.colorPrimary))
+            .setTicker(getString(R.string.auto_location_service))
+            .setWhen(System.currentTimeMillis())
+
+        return builder.build()
+    }
+
     override fun createHostValidator(): HostValidator {
         return if (applicationInfo.flags and ApplicationInfo.FLAG_DEBUGGABLE != 0) {
             HostValidator.ALLOW_ALL_HOSTS_VALIDATOR
@@ -40,49 +94,50 @@ class CarAppService : androidx.car.app.CarAppService() {
     }
 }
 
-class EVMapSession(val cas: CarAppService) : Session(), LifecycleObserver {
+@ExperimentalCarApi
+class EVMapSession(val cas: CarAppService) : Session(), DefaultLifecycleObserver {
+    private val TAG = "EVMapSession"
     var mapScreen: LocationAwareScreen? = null
         set(value) {
             field = value
             location?.let { value?.updateLocation(it) }
         }
     private var location: Location? = null
-    private var locationService: CarLocationService? = null
+    private val locationManager: LocationManager by lazy {
+        carContext.getSystemService(Context.LOCATION_SERVICE) as LocationManager
+    }
+
     private val hardwareMan: CarHardwareManager by lazy {
         carContext.getCarService(CarContext.HARDWARE_SERVICE) as CarHardwareManager
     }
 
-    private val serviceConnection = object : ServiceConnection {
-        override fun onServiceConnected(name: ComponentName, ibinder: IBinder) {
-            val binder: CarLocationService.LocalBinder = ibinder as CarLocationService.LocalBinder
-            locationService = binder.service
-            locationService?.requestLocationUpdates()
-        }
-
-        override fun onServiceDisconnected(name: ComponentName?) {
-            locationService = null
-        }
-    }
-    private var serviceBound = false
-
     init {
         lifecycle.addObserver(this)
     }
 
     override fun onCreateScreen(intent: Intent): Screen {
-        return WelcomeScreen(carContext, this)
-    }
+        val mapScreen = MapScreen(carContext, this)
 
-    fun locationPermissionGranted() = carContext.checkAnyLocationPermission()
-
-    private val locationReceiver = object : BroadcastReceiver() {
-        override fun onReceive(context: Context, intent: Intent) {
-            val location = intent.getParcelableExtra(CarLocationService.EXTRA_LOCATION) as Location?
-            updateLocation(location)
+        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
     }
 
+    private fun locationPermissionGranted() = carContext.checkFineLocationPermission()
+
     private fun updateLocation(location: Location?) {
+        Log.d(TAG, "Received location: $location")
         val mapScreen = mapScreen
         if (location != null && mapScreen != null) {
             mapScreen.updateLocation(location)
@@ -90,19 +145,24 @@ class EVMapSession(val cas: CarAppService) : Session(), LifecycleObserver {
         this.location = location
     }
 
-    private fun onCarHardwareLocationReceived(loc: CarHardwareLocation) {
-        if (loc.location.status == CarValue.STATUS_SUCCESS && loc.location.value != null) {
-            updateLocation(loc.location.value)
-
-            // we successfully received a location from the car hardware,
-            // so we don't need the smartphone location anymore.
-            unbindLocationService()
-        }
+    override fun onStart(owner: LifecycleOwner) {
+        requestLocationUpdates()
     }
 
-    @OnLifecycleEvent(Lifecycle.Event.ON_START)
-    fun bindLocationService() {
+    override fun onStop(owner: LifecycleOwner) {
+        removeLocationUpdates()
+    }
+
+    @SuppressLint("MissingPermission")
+    fun requestLocationUpdates() {
         if (!locationPermissionGranted()) return
+        Log.i(TAG, "Requesting location updates")
+        requestCarHardwareLocationUpdates()
+        requestPhoneLocationUpdates()
+    }
+
+    @RequiresPermission(anyOf = [Manifest.permission.ACCESS_FINE_LOCATION])
+    private fun requestCarHardwareLocationUpdates() {
         if (supportsCarApiLevel3(carContext)) {
             val exec = ContextCompat.getMainExecutor(carContext)
             hardwareMan.carSensors.addCarHardwareLocationListener(
@@ -111,40 +171,56 @@ class EVMapSession(val cas: CarAppService) : Session(), LifecycleObserver {
                 ::onCarHardwareLocationReceived
             )
         }
-        serviceBound = cas.bindService(
-            Intent(cas, CarLocationService::class.java),
-            serviceConnection,
-            Context.BIND_AUTO_CREATE
+    }
+
+    private val phoneLocationListener = LocationListenerCompat {
+        this.updateLocation(it)
+    }
+
+    @RequiresPermission(anyOf = [Manifest.permission.ACCESS_COARSE_LOCATION, Manifest.permission.ACCESS_FINE_LOCATION])
+    private fun requestPhoneLocationUpdates() {
+        val provider = locationManager.getBestProvider(Criteria().apply {
+            accuracy = Criteria.ACCURACY_FINE
+        }, true) ?: return
+
+        val location = locationManager.getLastKnownLocation(provider)
+        updateLocation(location)
+        locationManager.requestLocationUpdates(
+            provider,
+            1000,
+            1f,
+            phoneLocationListener
         )
     }
 
-    @OnLifecycleEvent(Lifecycle.Event.ON_STOP)
-    private fun onStop() {
+
+    @SuppressLint("MissingPermission")
+    private fun removeLocationUpdates() {
+        if (!locationPermissionGranted()) return
+        removeCarHardwareLocationUpdates()
+        removePhoneLocationUpdates()
+    }
+
+    private fun removeCarHardwareLocationUpdates() {
         if (supportsCarApiLevel3(carContext)) {
             hardwareMan.carSensors.removeCarHardwareLocationListener(::onCarHardwareLocationReceived)
         }
-        unbindLocationService()
     }
 
-    private fun unbindLocationService() {
-        locationService?.removeLocationUpdates()
-        if (serviceBound) {
-            cas.unbindService(serviceConnection)
-            serviceBound = false
+    @RequiresPermission(anyOf = [Manifest.permission.ACCESS_COARSE_LOCATION, Manifest.permission.ACCESS_FINE_LOCATION])
+    private fun removePhoneLocationUpdates() {
+        locationManager.removeUpdates(phoneLocationListener)
+    }
+
+    @SuppressLint("MissingPermission")
+    private fun onCarHardwareLocationReceived(loc: CarHardwareLocation) {
+        if (loc.location.status == CarValue.STATUS_SUCCESS && loc.location.value != null) {
+            updateLocation(loc.location.value)
+
+            // we successfully received a location from the car hardware,
+            // so we don't need the smartphone location anymore.
+            removePhoneLocationUpdates()
         }
     }
-
-    @OnLifecycleEvent(Lifecycle.Event.ON_RESUME)
-    private fun registerBroadcastReceiver() {
-        LocalBroadcastManager.getInstance(cas).registerReceiver(
-            locationReceiver,
-            IntentFilter(CarLocationService.ACTION_BROADCAST)
-        );
-    }
-
-    @OnLifecycleEvent(Lifecycle.Event.ON_PAUSE)
-    private fun unregisterBroadcastReceiver() {
-        LocalBroadcastManager.getInstance(cas).unregisterReceiver(locationReceiver)
-    }
 }
 

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

@@ -1,163 +0,0 @@
-package net.vonforst.evmap.auto
-
-import android.app.Notification
-import android.app.NotificationChannel
-import android.app.NotificationManager
-import android.app.Service
-import android.content.Intent
-import android.location.Location
-import android.os.*
-import android.util.Log
-import androidx.core.app.NotificationCompat
-import androidx.core.app.NotificationManagerCompat
-import androidx.localbroadcastmanager.content.LocalBroadcastManager
-import com.google.android.gms.location.*
-import net.vonforst.evmap.BuildConfig
-import net.vonforst.evmap.R
-
-
-class CarLocationService : Service() {
-    private lateinit var serviceHandler: Handler
-    private lateinit var locationRequest: LocationRequest
-    private lateinit var notificationManager: NotificationManager
-    private lateinit var locationCallback: LocationCallback
-    private lateinit var fusedLocationClient: FusedLocationProviderClient
-    private val binder: IBinder = LocalBinder(this)
-    private var location: Location? = null
-
-    private val UPDATE_INTERVAL_IN_MILLISECONDS = 10000L
-    private val FASTEST_UPDATE_INTERVAL_IN_MILLISECONDS = UPDATE_INTERVAL_IN_MILLISECONDS / 2
-
-    private val CHANNEL_ID = "car_location"
-    private val NOTIFICATION_ID = 1000
-    private val TAG = "CarLocationService"
-
-    companion object {
-        const val ACTION_BROADCAST: String = BuildConfig.APPLICATION_ID + ".car_location_broadcast"
-        const val EXTRA_LOCATION: String = BuildConfig.APPLICATION_ID + ".location"
-    }
-
-    override fun onCreate() {
-        fusedLocationClient = LocationServices.getFusedLocationProviderClient(this)
-        locationCallback = object : LocationCallback() {
-            override fun onLocationResult(locationResult: LocationResult) {
-                super.onLocationResult(locationResult)
-                onNewLocation(locationResult.lastLocation)
-            }
-        }
-        createLocationRequest()
-        getLastLocation()
-        val handlerThread = HandlerThread(TAG)
-        handlerThread.start()
-        serviceHandler = Handler(handlerThread.looper)
-        notificationManager = getSystemService(NOTIFICATION_SERVICE) as NotificationManager
-
-        // Android O requires a Notification Channel.
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-            val name: CharSequence = getString(R.string.app_name)
-            // Create the channel for the notification
-            val mChannel =
-                NotificationChannel(CHANNEL_ID, name, NotificationManager.IMPORTANCE_DEFAULT)
-
-            // Set the Notification Channel for the Notification Manager.
-            notificationManager.createNotificationChannel(mChannel)
-        }
-
-        startForeground(NOTIFICATION_ID, getNotification())
-    }
-
-    /**
-     * Returns the [NotificationCompat] used as part of the foreground service.
-     */
-    private fun getNotification(): Notification {
-        val builder: NotificationCompat.Builder = NotificationCompat.Builder(this, CHANNEL_ID)
-            .setContentText(getString(R.string.auto_location_service))
-            .setContentTitle(getString(R.string.app_name))
-            .setOngoing(true)
-            .setPriority(NotificationManagerCompat.IMPORTANCE_HIGH)
-            .setSmallIcon(R.mipmap.ic_launcher)
-            .setTicker(getString(R.string.auto_location_service))
-            .setWhen(System.currentTimeMillis())
-
-        return builder.build()
-    }
-
-    override fun onBind(intent: Intent?): IBinder {
-        return binder
-    }
-
-    private fun createLocationRequest() {
-        locationRequest = LocationRequest()
-        locationRequest.interval = UPDATE_INTERVAL_IN_MILLISECONDS
-        locationRequest.fastestInterval = FASTEST_UPDATE_INTERVAL_IN_MILLISECONDS
-        locationRequest.priority = LocationRequest.PRIORITY_HIGH_ACCURACY
-    }
-
-    private fun onNewLocation(location: Location) {
-        Log.i(TAG, "New location: $location")
-        this.location = location
-
-        // Notify anyone listening for broadcasts about the new location.
-        val intent = Intent(ACTION_BROADCAST)
-        intent.putExtra(EXTRA_LOCATION, location)
-        LocalBroadcastManager.getInstance(applicationContext).sendBroadcast(intent)
-    }
-
-    private fun getLastLocation() {
-        try {
-            fusedLocationClient.lastLocation
-                .addOnCompleteListener { task ->
-                    if (task.isSuccessful && task.result != null) {
-                        location = task.result
-                    } else {
-                        Log.w(TAG, "Failed to get location.")
-                    }
-                }
-        } catch (unlikely: SecurityException) {
-            Log.e(TAG, "Lost location permission.$unlikely")
-        }
-    }
-
-    /**
-     * Makes a request for location updates. Note that in this sample we merely log the
-     * [SecurityException].
-     */
-    fun requestLocationUpdates() {
-        Log.i(TAG, "Requesting location updates")
-        startService(Intent(applicationContext, CarLocationService::class.java))
-        try {
-            fusedLocationClient.requestLocationUpdates(
-                locationRequest,
-                locationCallback, Looper.myLooper()
-            )
-        } catch (unlikely: SecurityException) {
-            Log.e(TAG, "Lost location permission. Could not request updates. $unlikely")
-        }
-    }
-
-    /**
-     * Removes location updates. Note that in this sample we merely log the
-     * [SecurityException].
-     */
-    fun removeLocationUpdates() {
-        Log.i(TAG, "Removing location updates")
-        try {
-            fusedLocationClient.removeLocationUpdates(locationCallback)
-            stopSelf()
-        } catch (unlikely: SecurityException) {
-            Log.e(TAG, "Lost location permission. Could not remove updates. $unlikely")
-        }
-    }
-
-    override fun onStartCommand(intent: Intent, flags: Int, startId: Int): Int {
-        Log.i(TAG, "Service started")
-        // Tells the system to not try to recreate the service after it has been killed.
-        return START_NOT_STICKY
-    }
-
-    override fun onDestroy() {
-        serviceHandler.removeCallbacksAndMessages(null)
-    }
-
-    class LocalBinder(val service: CarLocationService) : Binder()
-}

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,11 +56,10 @@ 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, oversize = 1.4f, height = imageSize)
+        ChargerIconGenerator(carContext, null, height = imageSize)
 
     private val maxRows = if (ctx.carAppApiLevel >= 2) {
         ctx.constraintManager.getContentLimit(ConstraintManager.CONTENT_LIMIT_TYPE_PANE)
@@ -83,8 +82,10 @@ class ChargerDetailScreen(ctx: CarContext, val chargerSparse: ChargeLocation) :
         return PaneTemplate.Builder(
             Pane.Builder().apply {
                 charger?.let { charger ->
-                    if (largeImageSupported && photo != null) {
-                        setImage(CarIcon.Builder(IconCompat.createWithBitmap(photo)).build())
+                    if (largeImageSupported) {
+                        photo?.let {
+                            setImage(CarIcon.Builder(IconCompat.createWithBitmap(it)).build())
+                        }
                     }
                     generateRows(charger).forEach { addRow(it) }
                     addAction(
@@ -205,6 +206,7 @@ class ChargerDetailScreen(ctx: CarContext, val chargerSparse: ChargeLocation) :
 
     private fun generateRows(charger: ChargeLocation): List<Row> {
         val rows = mutableListOf<Row>()
+        val photo = photo
 
         // Row 1: address + chargepoints
         rows.add(Row.Builder().apply {
@@ -266,7 +268,7 @@ class ChargerDetailScreen(ctx: CarContext, val chargerSparse: ChargeLocation) :
                 setTitle(operatorText)
                 charger.cost?.let {
                     addText(it.getStatusText(carContext, emoji = true))
-                    (it.descriptionShort ?: it.descriptionLong)?.let { addText(it) }
+                    it.getDetailText()?.let { addText(it) }
                 }
             }.build())
             // row 3: fault report (if exists)
@@ -366,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

@@ -1,27 +1,35 @@
 package net.vonforst.evmap.auto
 
+import android.app.Application
+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.constraints.ConstraintManager
 import androidx.car.app.model.*
 import androidx.core.graphics.drawable.IconCompat
 import androidx.lifecycle.LiveData
+import androidx.lifecycle.lifecycleScope
+import kotlinx.coroutines.launch
 import net.vonforst.evmap.R
-import net.vonforst.evmap.model.FILTERS_CUSTOM
-import net.vonforst.evmap.model.FILTERS_DISABLED
-import net.vonforst.evmap.model.FILTERS_FAVORITES
+import net.vonforst.evmap.model.*
 import net.vonforst.evmap.storage.AppDatabase
 import net.vonforst.evmap.storage.FilterProfile
 import net.vonforst.evmap.storage.PreferenceDataSource
+import net.vonforst.evmap.viewmodel.FilterViewModel
+import kotlin.math.roundToInt
 
-class FilterScreen(ctx: CarContext) : Screen(ctx) {
+@androidx.car.app.annotations.ExperimentalCarApi
+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 {
         db.filterProfileDao().getProfiles(prefs.dataSource)
     }
-    private val maxRows = 6
-    private val checkIcon =
-        CarIcon.Builder(IconCompat.createWithResource(carContext, R.drawable.ic_check)).build()
+    private val maxRows = if (ctx.carAppApiLevel >= 2) {
+        ctx.constraintManager.getContentLimit(ConstraintManager.CONTENT_LIMIT_TYPE_LIST)
+    } else 6
 
     init {
         filterProfiles.observe(this) {
@@ -30,15 +38,59 @@ class FilterScreen(ctx: CarContext) : Screen(ctx) {
     }
 
     override fun onGetTemplate(): Template {
-        val filterStatus =
-            prefs.filterStatus.takeUnless { it == FILTERS_CUSTOM || it == FILTERS_FAVORITES }
-                ?: FILTERS_DISABLED
+        val filterStatus = prefs.filterStatus
         return ListTemplate.Builder().apply {
             filterProfiles.value?.let {
-                setSingleList(buildFilterProfilesList(it.take(maxRows), filterStatus))
+                setSingleList(buildFilterProfilesList(it, filterStatus))
             } ?: setLoading(true)
             setTitle(carContext.getString(R.string.menu_filter))
             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(
+                                IconCompat.createWithResource(
+                                    carContext,
+                                    R.drawable.ic_edit
+                                )
+                            ).build()
+
+                        )
+                        setOnClickListener(ParkedOnlyOnClickListener.create {
+                            lifecycleScope.launch {
+                                db.filterValueDao()
+                                    .copyFiltersToCustom(filterStatus, prefs.dataSource)
+                                screenManager.push(EditFiltersScreen(carContext))
+                            }
+                        })
+                    }.build())
+                }.build()
+            )
         }.build()
     }
 
@@ -46,36 +98,325 @@ class FilterScreen(ctx: CarContext) : Screen(ctx) {
         profiles: List<FilterProfile>,
         filterStatus: Long
     ): ItemList {
+        val extraRows = if (FILTERS_CUSTOM == filterStatus) 3 else 2
+        val profilesToShow =
+            profiles.sortedByDescending { it.id == filterStatus }.take(maxRows - extraRows)
         return ItemList.Builder().apply {
             addItem(Row.Builder().apply {
                 setTitle(carContext.getString(R.string.no_filters))
-                if (FILTERS_DISABLED == filterStatus) {
-                    setImage(checkIcon)
-                } else {
-                    setImage(emptyCarIcon)
-                }
-                setOnClickListener {
-                    prefs.filterStatus = FILTERS_DISABLED
-                    screenManager.pop()
-                }
             }.build())
-            profiles.forEach {
+            addItem(Row.Builder().apply {
+                setTitle(carContext.getString(R.string.filter_favorites))
+            }.build())
+            profilesToShow.forEach {
                 addItem(Row.Builder().apply {
                     val name =
                         it.name.ifEmpty { carContext.getString(R.string.unnamed_filter_profile) }
                     setTitle(name)
-                    if (it.id == filterStatus) {
-                        setImage(checkIcon)
-                    } else {
-                        setImage(emptyCarIcon)
+                }.build())
+            }
+            if (FILTERS_CUSTOM == filterStatus) {
+                addItem(Row.Builder().apply {
+                    setTitle(carContext.getString(R.string.filter_custom))
+                }.build())
+            }
+            setSelectedIndex(when (filterStatus) {
+                FILTERS_DISABLED -> 0
+                FILTERS_FAVORITES -> 1
+                FILTERS_CUSTOM -> profilesToShow.size + 2
+                else -> profilesToShow.indexOfFirst { it.id == filterStatus } + 2
+            })
+            setOnSelectedListener { index ->
+                onItemClick(
+                    when (index) {
+                        0 -> FILTERS_DISABLED
+                        1 -> FILTERS_FAVORITES
+                        profilesToShow.size + 2 -> FILTERS_CUSTOM
+                        else -> profilesToShow[index - 2].id
                     }
-                    setOnClickListener {
-                        prefs.filterStatus = it.id
-                        screenManager.pop()
+                )
+            }
+        }.build()
+    }
+
+    private fun onItemClick(id: Long) {
+        prefs.filterStatus = id
+        screenManager.pop()
+    }
+}
+
+@androidx.car.app.annotations.ExperimentalCarApi
+class EditFiltersScreen(ctx: CarContext) : Screen(ctx) {
+    private val vm = FilterViewModel(carContext.applicationContext as Application)
+
+    private val maxRows = if (ctx.carAppApiLevel >= 2) {
+        ctx.constraintManager.getContentLimit(ConstraintManager.CONTENT_LIMIT_TYPE_LIST)
+    } else 6
+
+    init {
+        vm.filtersWithValue.observe(this) {
+            vm.filterProfile.observe(this) {
+                invalidate()
+            }
+        }
+    }
+
+    override fun onGetTemplate(): Template {
+        val currentProfileName = vm.filterProfile.value?.name
+
+        return ListTemplate.Builder().apply {
+            vm.filtersWithValue.value?.let { filtersWithValue ->
+                setSingleList(buildFiltersList(filtersWithValue.take(maxRows)))
+            } ?: setLoading(true)
+
+            setTitle(currentProfileName?.let {
+                carContext.getString(
+                    R.string.edit_filter_profile,
+                    it
+                )
+            } ?: carContext.getString(R.string.menu_filter))
+
+            setHeaderAction(Action.BACK)
+            setActionStrip(ActionStrip.Builder().apply {
+                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 {
+                        val textPromptScreen = TextPromptScreen(
+                            carContext,
+                            R.string.save_as_profile,
+                            R.string.save_profile_enter_name,
+                            currentProfileName
+                        )
+                        screenManager.pushForResult(textPromptScreen) { name ->
+                            if (name == null) return@pushForResult
+                            lifecycleScope.launch {
+                                vm.saveAsProfile(name as String)
+                                screenManager.popTo(MapScreen.MARKER)
+                            }
+                        }
+                    }
+                    .build()
+                )
+            }.build())
+        }.build()
+    }
+
+    private fun buildFiltersList(filters: List<FilterWithValue<out FilterValue>>): ItemList {
+        return ItemList.Builder().apply {
+            filters.forEach {
+                val filter = it.filter
+                val value = it.value
+                addItem(Row.Builder().apply {
+                    setTitle(filter.name)
+                    when (filter) {
+                        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.pushForResult(
+                                    MultipleChoiceFilterScreen(
+                                        carContext,
+                                        filter,
+                                        value as MultipleChoiceFilterValue
+                                    )
+                                ) {
+                                    lifecycleScope.launch { vm.saveFilterValues() }
+                                }
+                            }
+                            addText(
+                                if ((value as MultipleChoiceFilterValue).all) {
+                                    carContext.getString(R.string.all_selected)
+                                } else {
+                                    carContext.getString(
+                                        R.string.number_selected,
+                                        value.values.size
+                                    )
+                                }
+                            )
+                        }
+                        is SliderFilter -> {
+                            setBrowsable(true)
+                            addText((value as SliderFilterValue).value.toString() + " " + filter.unit)
+                            setOnClickListener {
+                                screenManager.pushForResult(
+                                    SliderFilterScreen(
+                                        carContext,
+                                        filter,
+                                        value
+                                    )
+                                ) {
+                                    lifecycleScope.launch { vm.saveFilterValues() }
+                                }
+                            }
+                        }
                     }
                 }.build())
             }
-            setNoItemsMessage(carContext.getString(R.string.filterprofiles_empty_state))
         }.build()
     }
+}
+
+class MultipleChoiceFilterScreen(
+    ctx: CarContext,
+    val filter: MultipleChoiceFilter,
+    val value: MultipleChoiceFilterValue
+) : MultiSelectSearchScreen<Pair<String, String>>(ctx) {
+    override val isMultiSelect = true
+    override val shouldShowSelectAll = true
+
+    override fun isSelected(it: Pair<String, String>): Boolean =
+        value.all || value.values.contains(it.first)
+
+    override fun toggleSelected(item: Pair<String, String>) {
+        if (isSelected(item)) {
+            val values = if (value.all) filter.choices.keys else value.values
+            value.values = values.minus(item.first).toMutableSet()
+            value.all = false
+        } else {
+            value.values.add(item.first)
+            if (value.values == filter.choices.keys) {
+                value.all = true
+            }
+        }
+    }
+
+    override fun selectAll() {
+        value.all = true
+        super.selectAll()
+    }
+
+    override fun selectNone() {
+        value.all = false
+        value.values = mutableSetOf()
+        super.selectNone()
+    }
+
+    override fun getLabel(it: Pair<String, String>): String = it.second
+
+    override suspend fun loadData(): List<Pair<String, String>> {
+        return filter.choices.entries.map { it.toPair() }
+    }
+}
+
+
+class SliderFilterScreen(
+    ctx: CarContext,
+    val filter: SliderFilter,
+    val value: SliderFilterValue
+) : Screen(ctx) {
+    override fun onGetTemplate(): Template {
+        return PaneTemplate.Builder(
+            Pane.Builder().apply {
+                addRow(Row.Builder().apply {
+                    setTitle(filter.name)
+                    addText(value.value.toString() + " " + filter.unit)
+                    addText(generateSlider())
+                }.build())
+                addAction(Action.Builder().apply {
+                    setIcon(
+                        CarIcon.Builder(
+                            IconCompat.createWithResource(
+                                carContext,
+                                R.drawable.ic_remove
+                            )
+                        ).build()
+                    )
+                    setOnClickListener(::decrease)
+                }.build())
+                addAction(Action.Builder().apply {
+                    setIcon(
+                        CarIcon.Builder(
+                            IconCompat.createWithResource(
+                                carContext,
+                                R.drawable.ic_add
+                            )
+                        ).build()
+                    )
+                    setOnClickListener(::increase)
+                }.build())
+            }.build()
+        ).apply {
+            setHeaderAction(Action.BACK)
+        }.build()
+    }
+
+    private fun generateSlider(): CharSequence {
+        val bar = "━"
+        val dot = "⬤"
+        val length = 30
+
+        val position =
+            ((filter.inverseMapping(value.value) - filter.min) / (filter.max - filter.min).toDouble() * length).roundToInt()
+
+        val text = SpannableStringBuilder()
+        text.append(
+            bar.repeat(position),
+            ForegroundCarColorSpan.create(CarColor.SECONDARY),
+            Spanned.SPAN_EXCLUSIVE_EXCLUSIVE
+        )
+        text.append(
+            dot,
+            ForegroundCarColorSpan.create(CarColor.SECONDARY),
+            Spanned.SPAN_EXCLUSIVE_EXCLUSIVE
+        )
+        text.append(bar.repeat(length - position))
+
+        return text
+    }
+
+    private fun increase() {
+        var valueInternal = filter.inverseMapping(value.value)
+        if (valueInternal < filter.max) valueInternal += 1
+        value.value = filter.mapping(valueInternal)
+        invalidate()
+    }
+
+    private fun decrease() {
+        var valueInternal = filter.inverseMapping(value.value)
+        if (valueInternal > filter.min) valueInternal -= 1
+        value.value = filter.mapping(valueInternal)
+        invalidate()
+    }
 }

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

@@ -23,8 +23,6 @@ import net.vonforst.evmap.api.availability.getAvailability
 import net.vonforst.evmap.api.createApi
 import net.vonforst.evmap.api.stringProvider
 import net.vonforst.evmap.model.ChargeLocation
-import net.vonforst.evmap.model.FILTERS_CUSTOM
-import net.vonforst.evmap.model.FILTERS_DISABLED
 import net.vonforst.evmap.model.FILTERS_FAVORITES
 import net.vonforst.evmap.storage.AppDatabase
 import net.vonforst.evmap.storage.PreferenceDataSource
@@ -39,15 +37,20 @@ import java.time.Duration
 import java.time.Instant
 import java.time.ZonedDateTime
 import kotlin.collections.set
+import kotlin.math.min
 import kotlin.math.roundToInt
 
 /**
  * Main map screen showing either nearby chargers or favorites
  */
 @androidx.car.app.annotations.ExperimentalCarApi
-class MapScreen(ctx: CarContext, val session: EVMapSession, val favorites: Boolean = false) :
+class MapScreen(ctx: CarContext, val session: EVMapSession) :
     Screen(ctx), LocationAwareScreen, OnContentRefreshListener,
-    ItemList.OnItemVisibilityChangedListener {
+    ItemList.OnItemVisibilityChangedListener, DefaultLifecycleObserver {
+    companion object {
+        val MARKER = "map"
+    }
+
     private var updateCoroutine: Job? = null
     private var availabilityUpdateCoroutine: Job? = null
 
@@ -73,15 +76,16 @@ class MapScreen(ctx: CarContext, val session: EVMapSession, val favorites: Boole
 
     private val referenceData = api.getReferenceData(lifecycleScope, carContext)
     private val filterStatus = MutableLiveData<Long>().apply {
-        value = prefs.filterStatus.takeUnless { it == FILTERS_CUSTOM || it == FILTERS_FAVORITES }
-            ?: FILTERS_DISABLED
+        value = prefs.filterStatus
     }
     private val filterValues = db.filterValueDao().getFilterValues(filterStatus, prefs.dataSource)
     private val filters =
         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(
@@ -95,26 +99,39 @@ class MapScreen(ctx: CarContext, val session: EVMapSession, val favorites: Boole
         )
     }
 
+    private var searchLocation: LatLng? = null
+
     init {
-        filtersWithValue.observe(this) {
-            loadChargers()
-        }
+        lifecycle.addObserver(this)
+        marker = MARKER
     }
 
     override fun onGetTemplate(): Template {
+        session.requestLocationUpdates()
+
         session.mapScreen = this
         return PlaceListMapTemplate.Builder().apply {
             setTitle(
-                carContext.getString(
-                    if (favorites) {
+                prefs.placeSearchResultAndroidAutoName?.let {
+                    carContext.getString(R.string.auto_chargers_near_location, it)
+                } ?: carContext.getString(
+                    if (filterStatus.value == FILTERS_FAVORITES) {
                         R.string.auto_favorites
                     } else {
                         R.string.auto_chargers_closeby
                     }
                 )
             )
-            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()
@@ -125,7 +142,7 @@ class MapScreen(ctx: CarContext, val session: EVMapSession, val favorites: Boole
                 }
                 builder.setNoItemsMessage(
                     carContext.getString(
-                        if (favorites) {
+                        if (filterStatus.value == FILTERS_FAVORITES) {
                             R.string.auto_no_favorites_found
                         } else {
                             R.string.auto_no_chargers_found
@@ -136,38 +153,49 @@ class MapScreen(ctx: CarContext, val session: EVMapSession, val favorites: Boole
                 setItemList(builder.build())
             } ?: setLoading(true)
             setCurrentLocationEnabled(true)
-            setHeaderAction(Action.BACK)
-            if (!favorites) {
-                val filtersCount = filtersWithValue.value?.count {
+            setHeaderAction(Action.APP_ICON)
+            val filtersCount = if (filterStatus.value == FILTERS_FAVORITES) 1 else {
+                filtersWithValue.value?.count {
                     !it.value.hasSameValueAs(it.filter.defaultValue())
                 }
+            }
 
-                setActionStrip(
-                    ActionStrip.Builder()
-                        .addAction(
-                            Action.Builder()
-                                .setIcon(
-                                    CarIcon.Builder(
-                                        IconCompat.createWithResource(
-                                            carContext,
-                                            R.drawable.ic_filter
-                                        )
-                                    )
-                                        .setTint(if (filtersCount != null && filtersCount > 0) CarColor.SECONDARY else CarColor.DEFAULT)
-                                        .build()
+            setActionStrip(
+                ActionStrip.Builder()
+                    .addAction(Action.Builder()
+                        .setIcon(
+                            CarIcon.Builder(
+                                IconCompat.createWithResource(
+                                    carContext,
+                                    R.drawable.ic_settings
+                                )
+                            ).setTint(CarColor.DEFAULT).build()
                         )
                         .setOnClickListener {
-                            screenManager.pushForResult(FilterScreen(carContext)) {
-                                chargers = null
-                                filterStatus.value =
-                                    prefs.filterStatus.takeUnless { it == FILTERS_CUSTOM || it == FILTERS_FAVORITES }
-                                        ?: FILTERS_DISABLED
-                            }
+                            screenManager.push(SettingsScreen(carContext))
                             session.mapScreen = null
                         }
                         .build())
+                    .addAction(
+                        Action.Builder()
+                            .setIcon(
+                                CarIcon.Builder(
+                                    IconCompat.createWithResource(
+                                        carContext,
+                                        R.drawable.ic_filter
+                                    )
+                                )
+                                    .setTint(if (filtersCount != null && filtersCount > 0) CarColor.SECONDARY else CarColor.DEFAULT)
+                                    .build()
+                            )
+                            .setOnClickListener {
+                                screenManager.pushForResult(FilterScreen(carContext, session)) {
+                                    filterStatus.value = prefs.filterStatus
+                                }
+                                session.mapScreen = null
+                            }
+                            .build())
                     .build())
-            }
             setOnContentRefreshListener(this@MapScreen)
         }.build()
     }
@@ -249,13 +277,8 @@ class MapScreen(ctx: CarContext, val session: EVMapSession, val favorites: Boole
             )
 
             setOnClickListener {
-                screenManager.pushForResult(ChargerDetailScreen(carContext, charger)) {
-                    if (favorites) {
-                        // favorites list may have been updated
-                        chargers = null
-                        loadChargers()
-                    }
-                }
+                screenManager.push(ChargerDetailScreen(carContext, charger))
+                session.mapScreen = null
             }
         }.build()
     }
@@ -287,10 +310,14 @@ class MapScreen(ctx: CarContext, val session: EVMapSession, val favorites: Boole
         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
-                if (favorites) {
+                if (filterStatus.value == FILTERS_FAVORITES) {
                     chargers =
                         db.favoritesDao().getAllFavoritesAsync().map { it.charger }.sortedBy {
                             distanceBetween(
@@ -301,7 +328,7 @@ class MapScreen(ctx: CarContext, val session: EVMapSession, val favorites: Boole
                 } else {
                     val response = api.getChargepointsRadius(
                         referenceData,
-                        LatLng.fromLocation(location),
+                        searchLocation,
                         searchRadius,
                         zoom = 16f,
                         filters
@@ -312,7 +339,7 @@ class MapScreen(ctx: CarContext, val session: EVMapSession, val favorites: Boole
                             // try again with larger radius
                             val response = api.getChargepointsRadius(
                                 referenceData,
-                                LatLng.fromLocation(location),
+                                searchLocation,
                                 searchRadius * 10,
                                 zoom = 16f,
                                 filters
@@ -336,11 +363,24 @@ class MapScreen(ctx: CarContext, val session: EVMapSession, val favorites: Boole
     }
 
     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(
@@ -350,25 +390,39 @@ class MapScreen(ctx: CarContext, val session: EVMapSession, val favorites: Boole
             })
             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
@@ -385,7 +439,14 @@ class MapScreen(ctx: CarContext, val session: EVMapSession, val favorites: Boole
         // 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 {
@@ -395,7 +456,7 @@ class MapScreen(ctx: CarContext, val session: EVMapSession, val favorites: Boole
                     }
                 } 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/SearchSelectScreen.kt

@@ -1,11 +1,14 @@
 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
 
 abstract class MultiSelectSearchScreen<T>(ctx: CarContext) : Screen(ctx),
     SearchTemplate.SearchCallback {
@@ -16,6 +19,7 @@ abstract class MultiSelectSearchScreen<T>(ctx: CarContext) : Screen(ctx),
         ctx.constraintManager.getContentLimit(ConstraintManager.CONTENT_LIMIT_TYPE_LIST)
     } else 6
     protected abstract val isMultiSelect: Boolean
+    protected abstract val shouldShowSelectAll: Boolean
 
     override fun onGetTemplate(): Template {
         if (fullList == null) {
@@ -33,6 +37,30 @@ abstract class MultiSelectSearchScreen<T>(ctx: CarContext) : Screen(ctx),
             } ?: run {
                 setLoading(true)
             }
+            if (isMultiSelect) {
+                setActionStrip(ActionStrip.Builder().apply {
+                    addAction(
+                        Action.Builder().setIcon(
+                            CarIcon.Builder(
+                                IconCompat.createWithResource(
+                                    carContext,
+                                    R.drawable.ic_select_all
+                                )
+                            ).build()
+                        ).setOnClickListener(::selectAll).build()
+                    )
+                    addAction(
+                        Action.Builder().setIcon(
+                            CarIcon.Builder(
+                                IconCompat.createWithResource(
+                                    carContext,
+                                    R.drawable.ic_select_none
+                                )
+                            ).build()
+                        ).setOnClickListener(::selectNone).build()
+                    )
+                }.build())
+            }
         }.build()
     }
 
@@ -45,18 +73,22 @@ abstract class MultiSelectSearchScreen<T>(ctx: CarContext) : Screen(ctx),
         } ?: emptyList()
     }
 
+    private val checkedIcon =
+        CarIcon.Builder(IconCompat.createWithResource(carContext, R.drawable.ic_checkbox_checked))
+            .setTint(CarColor.PRIMARY)
+            .build()
+    private val uncheckedIcon =
+        CarIcon.Builder(IconCompat.createWithResource(carContext, R.drawable.ic_checkbox_unchecked))
+            .setTint(CarColor.PRIMARY)
+            .build()
+
     private fun buildItemList(): ItemList {
         return ItemList.Builder().apply {
             currentList.forEach { item ->
                 addItem(
                     Row.Builder()
-                        .setTitle(
-                            if (isSelected(item)) {
-                                "☑  " + getLabel(item)
-                            } else {
-                                "☐  " + getLabel(item)
-                            }
-                        )
+                        .setTitle(getLabel(item))
+                        .setImage(if (isSelected(item)) checkedIcon else uncheckedIcon)
                         .setOnClickListener {
                             toggleSelected(item)
                             if (isMultiSelect) {
@@ -86,6 +118,16 @@ abstract class MultiSelectSearchScreen<T>(ctx: CarContext) : Screen(ctx),
 
     abstract fun toggleSelected(item: T)
 
+    open fun selectAll() {
+        CarToast.makeText(carContext, R.string.selecting_all, CarToast.LENGTH_SHORT).show()
+        invalidate()
+    }
+
+    open fun selectNone() {
+        CarToast.makeText(carContext, R.string.selecting_none, CarToast.LENGTH_SHORT).show()
+        invalidate()
+    }
+
     abstract fun isSelected(it: T): Boolean
 
     abstract fun getLabel(it: T): String

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 {
@@ -60,36 +57,128 @@ class SettingsScreen(ctx: CarContext) : Screen(ctx) {
                         screenManager.push(ChargepriceSettingsScreen(carContext))
                     }
                 }.build())
+                if (supportsCarApiLevel3(carContext)) {
+                    addItem(
+                        Row.Builder()
+                            .setTitle(carContext.getString(R.string.auto_vehicle_data))
+                            .setImage(
+                                CarIcon.Builder(
+                                    IconCompat.createWithResource(carContext, R.drawable.ic_car)
+                                ).setTint(CarColor.DEFAULT).build()
+                            )
+                            .setBrowsable(true)
+                            .setOnClickListener {
+                                screenManager.push(VehicleDataScreen(carContext))
+                            }
+                            .build()
+                    )
+                }
             }.build())
         }.build()
     }
 }
 
-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()
     }
@@ -119,6 +208,19 @@ class ChargepriceSettingsScreen(ctx: CarContext) : Screen(ctx) {
                     setOnClickListener {
                         screenManager.push(SelectTariffsScreen(carContext))
                     }
+                    addText(
+                        if (prefs.chargepriceMyTariffsAll) {
+                            carContext.getString(R.string.chargeprice_all_tariffs_selected)
+                        } else {
+                            val n = prefs.chargepriceMyTariffs?.size ?: 0
+                            carContext.resources
+                                .getQuantityString(
+                                    R.plurals.chargeprice_some_tariffs_selected,
+                                    n,
+                                    n
+                                ) + "\n" + carContext.getString(R.string.pref_my_tariffs_summary)
+                        }
+                    )
                 }.build())
                 addItem(Row.Builder().apply {
                     setTitle(carContext.getString(R.string.settings_android_auto_chargeprice_range))
@@ -183,6 +285,7 @@ class SelectVehiclesScreen(ctx: CarContext) : MultiSelectSearchScreen<Chargepric
     private val prefs = PreferenceDataSource(carContext)
     private var api = ChargepriceApi.create(carContext.getString(R.string.chargeprice_key))
     override val isMultiSelect = true
+    override val shouldShowSelectAll = false
 
     override fun isSelected(it: ChargepriceCar): Boolean {
         return prefs.chargepriceMyVehicles.contains(it.id)
@@ -207,6 +310,7 @@ class SelectTariffsScreen(ctx: CarContext) : MultiSelectSearchScreen<Chargeprice
     private val prefs = PreferenceDataSource(carContext)
     private var api = ChargepriceApi.create(carContext.getString(R.string.chargeprice_key))
     override val isMultiSelect = true
+    override val shouldShowSelectAll = true
 
     override fun isSelected(it: ChargepriceTariff): Boolean {
         return prefs.chargepriceMyTariffsAll or (prefs.chargepriceMyTariffs?.contains(it.id)
@@ -221,11 +325,26 @@ class SelectTariffsScreen(ctx: CarContext) : MultiSelectSearchScreen<Chargeprice
         }
         if (isSelected(item)) {
             prefs.chargepriceMyTariffs = tariffs.minus(item.id)
+            prefs.chargepriceMyTariffsAll = false
         } else {
             prefs.chargepriceMyTariffs = tariffs.plus(item.id)
+            if (prefs.chargepriceMyTariffs == fullList!!.map { it.id }.toSet()) {
+                prefs.chargepriceMyTariffsAll = true
+            }
         }
     }
 
+    override fun selectAll() {
+        prefs.chargepriceMyTariffsAll = true
+        super.selectAll()
+    }
+
+    override fun selectNone() {
+        prefs.chargepriceMyTariffsAll = false
+        prefs.chargepriceMyTariffs = emptySet()
+        super.selectNone()
+    }
+
     override fun getLabel(it: ChargepriceTariff): String {
         return if (!it.name.lowercase().startsWith(it.provider.lowercase())) {
             "${it.provider} ${it.name}"
@@ -242,6 +361,7 @@ class SelectTariffsScreen(ctx: CarContext) : MultiSelectSearchScreen<Chargeprice
 class SelectCurrencyScreen(ctx: CarContext) : MultiSelectSearchScreen<Pair<String, String>>(ctx) {
     private val prefs = PreferenceDataSource(carContext)
     override val isMultiSelect = false
+    override val shouldShowSelectAll = false
 
     override fun isSelected(it: Pair<String, String>): Boolean =
         prefs.chargepriceCurrency == it.second
@@ -322,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

@@ -0,0 +1,63 @@
+package net.vonforst.evmap.auto
+
+import androidx.annotation.StringRes
+import androidx.car.app.CarContext
+import androidx.car.app.Screen
+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 cancelable: Boolean = true
+) : Screen(ctx),
+    InputCallback {
+    private var inputText = ""
+
+    override fun onGetTemplate(): Template {
+        val signInMethod = InputSignInMethod.Builder(this).apply {
+            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/java/net/vonforst/evmap/auto/WelcomeScreen.kt

@@ -1,140 +0,0 @@
-package net.vonforst.evmap.auto
-
-import android.Manifest
-import android.location.Location
-import android.os.Handler
-import android.os.Looper
-import androidx.car.app.CarContext
-import androidx.car.app.Screen
-import androidx.car.app.model.*
-import androidx.core.graphics.drawable.IconCompat
-import net.vonforst.evmap.R
-
-/**
- * Welcome screen with selection between favorites and nearby chargers
- */
-class WelcomeScreen(ctx: CarContext, val session: EVMapSession) : Screen(ctx), LocationAwareScreen {
-    private var location: Location? = null
-
-    @androidx.car.app.annotations.ExperimentalCarApi
-    override fun onGetTemplate(): Template {
-        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.bindLocationService()
-                }
-            }
-        }
-
-        session.mapScreen = this
-        return PlaceListMapTemplate.Builder().apply {
-            setTitle(carContext.getString(R.string.app_name))
-            if (!session.locationPermissionGranted()) {
-                setLoading(true)
-            } else {
-                location?.let {
-                    setAnchor(Place.Builder(CarLocation.create(it)).build())
-                }
-                setItemList(ItemList.Builder().apply {
-                    addItem(
-                        Row.Builder()
-                            .setTitle(carContext.getString(R.string.auto_chargers_closeby))
-                            .setImage(
-                                CarIcon.Builder(
-                                    IconCompat.createWithResource(
-                                        carContext,
-                                        R.drawable.ic_address
-                                    )
-                                )
-                                    .setTint(CarColor.DEFAULT).build()
-                            )
-                            .setBrowsable(true)
-                            .setOnClickListener {
-                                screenManager.push(
-                                    MapScreen(
-                                        carContext,
-                                        session,
-                                        favorites = false
-                                    )
-                                )
-                            }
-                            .build())
-                    addItem(
-                        Row.Builder()
-                            .setTitle(carContext.getString(R.string.auto_favorites))
-                            .setImage(
-                                CarIcon.Builder(
-                                    IconCompat.createWithResource(
-                                        carContext,
-                                        R.drawable.ic_fav
-                                    )
-                                )
-                                    .setTint(CarColor.DEFAULT).build()
-                            )
-                            .setBrowsable(true)
-                            .setOnClickListener {
-                                screenManager.push(MapScreen(carContext, session, favorites = true))
-                            }
-                            .build())
-                    if (supportsCarApiLevel3(carContext)) {
-                        addItem(
-                            Row.Builder()
-                                .setTitle(carContext.getString(R.string.auto_vehicle_data))
-                                .setImage(
-                                    CarIcon.Builder(
-                                        IconCompat.createWithResource(carContext, R.drawable.ic_car)
-                                    ).setTint(CarColor.DEFAULT).build()
-                                )
-                                .setBrowsable(true)
-                                .setOnClickListener {
-                                    session.mapScreen = null
-                                    screenManager.push(VehicleDataScreen(carContext))
-                                }
-                                .build()
-                        )
-                    }
-                    addItem(
-                        Row.Builder()
-                            .setTitle(carContext.getString(R.string.auto_settings))
-                            .setImage(
-                                CarIcon.Builder(
-                                    IconCompat.createWithResource(
-                                        carContext,
-                                        R.drawable.ic_settings
-                                    )
-                                ).setTint(CarColor.DEFAULT).build()
-                            )
-                            .setBrowsable(true)
-                            .setOnClickListener(ParkedOnlyOnClickListener.create {
-                                session.mapScreen = null
-                                screenManager.push(SettingsScreen(carContext))
-                            })
-                            .build()
-                    )
-                }.build())
-                setCurrentLocationEnabled(true)
-            }
-            setHeaderAction(Action.APP_ICON)
-            build()
-        }.build()
-    }
-
-    override fun updateLocation(location: Location) {
-        if (location.latitude == this.location?.latitude
-            && location.longitude == this.location?.longitude
-        ) {
-            return
-        }
-        this.location = location
-        invalidate()
-    }
-}

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

@@ -0,0 +1,10 @@
+<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="M19,3L5,3c-1.11,0 -2,0.9 -2,2v14c0,1.1 0.89,2 2,2h14c1.11,0 2,-0.9 2,-2L21,5c0,-1.1 -0.89,-2 -2,-2zM10,17l-5,-5 1.41,-1.41L10,14.17l7.59,-7.59L19,8l-9,9z" />
+</vector>

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

@@ -0,0 +1,10 @@
+<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="M19,5v14H5V5h14m0,-2H5c-1.1,0 -2,0.9 -2,2v14c0,1.1 0.9,2 2,2h14c1.1,0 2,-0.9 2,-2V5c0,-1.1 -0.9,-2 -2,-2z" />
+</vector>

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>
@@ -37,4 +38,6 @@
     <string name="auto_chargeprice_vehicle_ambiguous">Mehrere der in der App ausgewählten Fahrzeuge passen zu diesem Fahrzeug (%1$s %2$s).</string>
     <string name="settings_android_auto_chargeprice_range">Ladebereich für Preisvergleich</string>
     <string name="data_sources_hint">In den Einstellungen kannst du auch zwischen Google Maps und OpenStreetMap (Mapbox) für die Kartendaten wechseln.</string>
+    <string name="selecting_all">alle Einträge ausgewählt</string>
+    <string name="selecting_none">alle Einträge abgewählt</string>
 </resources>

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>
@@ -47,4 +48,6 @@
     <string name="auto_chargeprice_vehicle_ambiguous">Mehrere der in der App ausgewählten Fahrzeuge passen zu diesem Fahrzeug (%1$s %2$s).</string>
     <string name="settings_android_auto_chargeprice_range">Charging range for price comparison</string>
     <string name="data_sources_hint">In the settings you can also switch between Google Maps and OpenStreetMap (Mapbox) for the map data.</string>
+    <string name="selecting_all">selected all items</string>
+    <string name="selecting_none">deselected all items</string>
 </resources>

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/DetailsAdapter.kt

@@ -91,7 +91,7 @@ fun buildDetails(
             R.drawable.ic_cost,
             R.string.cost,
             loc.cost.getStatusText(ctx),
-            loc.cost.descriptionLong ?: loc.cost.descriptionShort
+            loc.cost.getDetailText()
         )
         else null,
         if (loc.chargecards != null && loc.chargecards.isNotEmpty() || loc.barrierFree == true)

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

@@ -21,7 +21,14 @@ import java.util.concurrent.TimeUnit
 
 interface AvailabilityDetector {
     suspend fun getAvailability(location: ChargeLocation): ChargeLocationStatus
-    fun isCountrySupported(country: String, dataSource: String): Boolean
+
+    /**
+     * Get a rough estimate whether this charger is supported by this provider.
+     *
+     * This might be done by checking supported countries, or even by matching the operator
+     * for operator-specific availability detectors.
+     */
+    fun isChargerSupported(charger: ChargeLocation): Boolean
 }
 
 abstract class BaseAvailabilityDetector(private val client: OkHttpClient) : AvailabilityDetector {
@@ -132,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)
     }
@@ -158,26 +165,16 @@ private val okhttp = OkHttpClient.Builder()
     .cookieJar(JavaNetCookieJar(cookieManager))
     .build()
 val availabilityDetectors = listOf(
+    RheinenergieAvailabilityDetector(okhttp),
     EnBwAvailabilityDetector(okhttp),
     NewMotionAvailabilityDetector(okhttp)
-    /*ChargecloudAvailabilityDetector(
-        okhttp,
-        "606a0da0dfdd338ee4134605653d4fd8"
-    ), // Maingau
-    ChargecloudAvailabilityDetector(
-        okhttp,
-        "6336fe713f2eb7fa04b97ff6651b76f8"
-    )  // SW Kiel*/
 )
 
 suspend fun getAvailability(charger: ChargeLocation): Resource<ChargeLocationStatus> {
     var value: Resource<ChargeLocationStatus>? = null
-    val country = charger.chargepriceData?.country
-        ?: charger.address?.country
-        ?: return Resource.error(null, null)
     withContext(Dispatchers.IO) {
         for (ad in availabilityDetectors) {
-            if (!ad.isCountrySupported(country, charger.dataSource)) continue
+            if (!ad.isChargerSupported(charger)) continue
             try {
                 value = Resource.success(ad.getAvailability(charger))
                 break
@@ -194,4 +191,4 @@ suspend fun getAvailability(charger: ChargeLocation): Resource<ChargeLocationSta
         }
     }
     return value ?: Resource.error(null, null)
-}
+}

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

@@ -1,87 +1,110 @@
 package net.vonforst.evmap.api.availability
 
-import net.vonforst.evmap.api.iterator
+import com.squareup.moshi.Json
+import com.squareup.moshi.JsonClass
 import net.vonforst.evmap.model.ChargeLocation
 import net.vonforst.evmap.model.Chargepoint
 import okhttp3.OkHttpClient
-import org.json.JSONObject
-import java.io.IOException
+import retrofit2.Retrofit
+import retrofit2.converter.moshi.MoshiConverterFactory
+import retrofit2.http.GET
+import retrofit2.http.Query
 
-class ChargecloudAvailabilityDetector(
-    client: OkHttpClient,
-    private val operatorId: String
-) : BaseAvailabilityDetector(client) {
-    override suspend fun getAvailability(location: ChargeLocation): ChargeLocationStatus {
-        val url =
-            "https://app.chargecloud.de/emobility:ocpi/$operatorId/app/2.0/locations?latitude=${location.coordinates.lat}&longitude=${location.coordinates.lng}&radius=$radius&offset=0&limit=10"
-        val json = JSONObject(httpGet(url))
+interface ChargecloudApi {
+    @GET("locations")
+    suspend fun getData(
+        @Query("latitude") latitude: Double,
+        @Query("longitude") longitude: Double,
+        @Query("radius") radius: Int,
+        @Query("offset") offset: Int = 0,
+        @Query("limit") limit: Int = 10
+    ): ChargecloudResponse
 
-        val statusMessage = json.getString("status_message")
-        if (statusMessage != "Success") throw IOException(statusMessage)
+    @JsonClass(generateAdapter = true)
+    data class ChargecloudResponse(
+        val data: List<ChargecloudLocation>
+    )
 
-        val data = json.getJSONArray("data")
-        if (data.length() > 1) throw AvailabilityDetectorException(
-            "found multiple candidates."
-        )
-        if (data.length() == 0) throw AvailabilityDetectorException(
-            "no candidates found."
-        )
+    @JsonClass(generateAdapter = true)
+    data class ChargecloudLocation(
+        val coordinates: ChargecloudCoordinates,
+        val evses: List<ChargecloudEvse>,
+        @Json(name = "distance_in_m") val distanceInM: String
+    )
 
-        val evses = data.getJSONObject(0).getJSONArray("evses")
-        val chargepointStatus = mutableMapOf<Chargepoint, List<ChargepointStatus>>()
-        evses.iterator<JSONObject>().forEach { evse ->
-            evse.getJSONArray("connectors").iterator<JSONObject>().forEach connector@{ connector ->
-                val type = getType(connector.getString("standard"))
-                val power = connector.getDouble("max_power")
-                val status = ChargepointStatus.valueOf(connector.getString("status"))
+    @JsonClass(generateAdapter = true)
+    data class ChargecloudCoordinates(val latitude: Double, val longitude: Double)
 
-                var chargepoint = getCorrespondingChargepoint(chargepointStatus.keys, type, power)
-                val statusList: List<ChargepointStatus>
-                if (chargepoint == null) {
-                    // find corresponding chargepoint from goingelectric to get correct power
-                    val geChargepoint =
-                        getCorrespondingChargepoint(location.chargepointsMerged, type, power)
-                            ?: throw AvailabilityDetectorException(
-                                "Chargepoints from chargecloud API and goingelectric do not match."
-                            )
-                    chargepoint = Chargepoint(
-                        type,
-                        geChargepoint.power,
-                        1
-                    )
-                    statusList = listOf(status)
-                } else {
-                    val previousStatus = chargepointStatus[chargepoint]!!
-                    statusList = previousStatus + listOf(status)
-                    chargepointStatus.remove(chargepoint)
-                    chargepoint =
-                        Chargepoint(
-                            chargepoint.type,
-                            chargepoint.power,
-                            chargepoint.count + 1
-                        )
-                }
+    @JsonClass(generateAdapter = true)
+    data class ChargecloudEvse(
+        val id: String,
+        val status: String,
+        val connectors: List<ChargecloudConnector>
+    )
 
-                chargepointStatus[chargepoint] = statusList
-            }
-        }
+    @JsonClass(generateAdapter = true)
+    data class ChargecloudConnector(
+        val id: Long,
+        val standard: String,
+        @Json(name = "max_power") val maxPower: Double,
+        val status: String
+    )
 
-
-
-        if (chargepointStatus.keys == location.chargepointsMerged.toSet()) {
-            return ChargeLocationStatus(
-                chargepointStatus,
-                "chargecloud.de"
-            )
-        } else {
-            throw AvailabilityDetectorException(
-                "Chargepoints from chargecloud API and goingelectric do not match."
-            )
+    companion object {
+        fun create(client: OkHttpClient, baseUrl: String? = null): ChargecloudApi {
+            val retrofit = Retrofit.Builder()
+                .baseUrl(baseUrl)
+                .addConverterFactory(MoshiConverterFactory.create())
+                .client(client)
+                .build()
+            return retrofit.create(ChargecloudApi::class.java)
         }
     }
+}
 
-    override fun isCountrySupported(country: String, dataSource: String): Boolean {
-        TODO("Not yet implemented")
+abstract class ChargecloudAvailabilityDetector(
+    client: OkHttpClient
+) : BaseAvailabilityDetector(client) {
+    protected abstract val operatorId: String
+
+    private val api: ChargecloudApi by lazy {
+        val baseUrl = "https://app.chargecloud.de/emobility:ocpi/$operatorId/app/2.0/"
+        ChargecloudApi.create(client, baseUrl)
+    }
+
+    override suspend fun getAvailability(location: ChargeLocation): ChargeLocationStatus {
+        val data = api.getData(location.coordinates.lat, location.coordinates.lng, radius)
+
+        val nearest = data.data.minByOrNull { it.distanceInM.toDouble() }
+            ?: throw AvailabilityDetectorException("no candidates found.")
+
+        val chargecloudConnectors = mutableMapOf<Long, Pair<Double, String>>()
+        val chargecloudStatus = mutableMapOf<Long, ChargepointStatus>()
+
+        nearest.evses.flatMap { it.connectors }.forEach {
+            val id = it.id
+            val power = it.maxPower
+            val type = getType(it.standard)
+            val status = when (it.status) {
+                "OUTOFORDER" -> ChargepointStatus.FAULTED
+                "AVAILABLE" -> ChargepointStatus.AVAILABLE
+                "CHARGING" -> ChargepointStatus.CHARGING
+                "UNKNOWN" -> ChargepointStatus.UNKNOWN
+                else -> ChargepointStatus.UNKNOWN
+            }
+            chargecloudConnectors.put(id, power to type)
+            chargecloudStatus.put(id, status)
+        }
+
+        val match = matchChargepoints(chargecloudConnectors, location.chargepointsMerged)
+        val chargepointStatus = match.mapValues { entry ->
+            entry.value.map { chargecloudStatus[it]!! }
+        }
+
+        return ChargeLocationStatus(
+            chargepointStatus,
+            "chargecloud.de"
+        )
     }
 
     private fun getType(string: String): String {
@@ -90,7 +113,24 @@ class ChargecloudAvailabilityDetector(
             "DOMESTIC_F" -> Chargepoint.SCHUKO
             "IEC_62196_T2_COMBO" -> Chargepoint.CCS_TYPE_2
             "CHADEMO" -> Chargepoint.CHADEMO
-            else -> throw IllegalArgumentException("unrecognized type $string")
+            else -> "unknown"
         }
     }
-}
+}
+
+class RheinenergieAvailabilityDetector(client: OkHttpClient) :
+    ChargecloudAvailabilityDetector(client) {
+    override val operatorId = "c4ce9bb82a86766833df8a4818fa1b5c"
+
+    override fun isChargerSupported(charger: ChargeLocation): Boolean {
+        val network = charger.chargepriceData?.network ?: charger.network ?: return false
+        return when (charger.dataSource) {
+            "goingelectric" -> network == "RheinEnergie"
+            "openchargemap" -> network == "72"
+            else -> false
+        }
+    }
+}
+
+// "606a0da0dfdd338ee4134605653d4fd8" Maingau
+// "6336fe713f2eb7fa04b97ff6651b76f8" SW Kiel*/

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

@@ -12,7 +12,7 @@ import retrofit2.http.Path
 import retrofit2.http.Query
 
 private const val coordRange = 0.005  // range of latitude and longitude for loading the map
-private const val maxDistance = 15  // max distance between reported positions in meters
+private const val maxDistance = 40  // max distance between reported positions in meters
 
 interface EnBwApi {
     @GET("chargestations?grouping=false")
@@ -59,7 +59,7 @@ interface EnBwApi {
     @JsonClass(generateAdapter = true)
     data class EnBwConnector(
         val plugTypeName: String,
-        val maxPowerInKw: Double,
+        val maxPowerInKw: Double?,
     )
 
     @JsonClass(generateAdapter = true)
@@ -118,8 +118,6 @@ class EnBwAvailabilityDetector(client: OkHttpClient, baseUrl: String? = null) :
             }
         }
 
-        println(markers)
-
         val nearest = markers.minByOrNull { marker ->
             distanceBetween(marker.lat, marker.lon, lat, lng)
         } ?: throw AvailabilityDetectorException("no candidates found.")
@@ -162,7 +160,7 @@ class EnBwAvailabilityDetector(client: OkHttpClient, baseUrl: String? = null) :
         val enbwStatus = mutableMapOf<Long, ChargepointStatus>()
         connectorStatus.forEachIndexed { index, (connector, statusStr) ->
             val id = index.toLong()
-            val power = connector.maxPowerInKw
+            val power = connector.maxPowerInKw ?: 0.0
             val type = when (connector.plugTypeName) {
                 "Typ 3A" -> Chargepoint.TYPE_3
                 "Typ 2" -> Chargepoint.TYPE_2_UNKNOWN
@@ -175,6 +173,7 @@ class EnBwAvailabilityDetector(client: OkHttpClient, baseUrl: String? = null) :
             }
             val status = when (statusStr) {
                 "UNAVAILABLE" -> ChargepointStatus.FAULTED
+                "OUT_OF_SERVICE" -> ChargepointStatus.FAULTED
                 "AVAILABLE" -> ChargepointStatus.AVAILABLE
                 "OCCUPIED" -> ChargepointStatus.CHARGING
                 "UNSPECIFIED" -> ChargepointStatus.UNKNOWN
@@ -194,8 +193,10 @@ class EnBwAvailabilityDetector(client: OkHttpClient, baseUrl: String? = null) :
         )
     }
 
-    override fun isCountrySupported(country: String, dataSource: String): Boolean =
-        when (dataSource) {
+    override fun isChargerSupported(charger: ChargeLocation): Boolean {
+        val country = charger.chargepriceData?.country
+            ?: charger.address?.country ?: return false
+        return when (charger.dataSource) {
             // list of countries as of 2021/06/30, according to
             // https://www.electrive.net/2021/06/30/enbw-expandiert-mit-ladenetz-in-drei-weitere-laender/
             "goingelectric" -> country in listOf(
@@ -222,4 +223,5 @@ class EnBwAvailabilityDetector(client: OkHttpClient, baseUrl: String? = null) :
             )
             else -> false
         }
+    }
 }

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

@@ -11,8 +11,8 @@ import retrofit2.http.GET
 import retrofit2.http.Path
 import java.util.*
 
-private const val coordRange = 0.1  // range of latitude and longitude for loading the map
-private const val maxDistance = 15  // max distance between reported positions in meters
+private const val coordRange = 0.005  // range of latitude and longitude for loading the map
+private const val maxDistance = 40  // max distance between reported positions in meters
 
 interface NewMotionApi {
     @GET("markers/{lngMin}/{lngMax}/{latMin}/{latMax}")
@@ -173,7 +173,7 @@ class NewMotionAvailabilityDetector(client: OkHttpClient, baseUrl: String? = nul
         )
     }
 
-    override fun isCountrySupported(country: String, dataSource: String): Boolean {
+    override fun isChargerSupported(charger: ChargeLocation): Boolean {
         // NewMotion is our fallback
         return true
     }

app/src/main/java/net/vonforst/evmap/api/goingelectric/GoingElectricApi.kt

@@ -21,50 +21,51 @@ import okhttp3.OkHttpClient
 import retrofit2.Response
 import retrofit2.Retrofit
 import retrofit2.converter.moshi.MoshiConverterFactory
-import retrofit2.http.GET
-import retrofit2.http.Query
+import retrofit2.http.*
 import java.io.IOException
 
 interface GoingElectricApi {
-    @GET("chargepoints/")
+    @FormUrlEncoded
+    @POST("chargepoints/")
     suspend fun getChargepoints(
-        @Query("sw_lat") sw_lat: Double, @Query("sw_lng") sw_lng: Double,
-        @Query("ne_lat") ne_lat: Double, @Query("ne_lng") ne_lng: Double,
-        @Query("zoom") zoom: Float,
-        @Query("clustering") clustering: Boolean = false,
-        @Query("cluster_distance") clusterDistance: Int? = null,
-        @Query("freecharging") freecharging: Boolean = false,
-        @Query("freeparking") freeparking: Boolean = false,
-        @Query("min_power") minPower: Int = 0,
-        @Query("plugs") plugs: String? = null,
-        @Query("chargecards") chargecards: String? = null,
-        @Query("networks") networks: String? = null,
-        @Query("categories") categories: String? = null,
-        @Query("startkey") startkey: Int? = null,
-        @Query("open_twentyfourseven") open247: Boolean = false,
-        @Query("barrierfree") barrierfree: Boolean = false,
-        @Query("exclude_faults") excludeFaults: Boolean = false
+        @Field("sw_lat") sw_lat: Double, @Field("sw_lng") sw_lng: Double,
+        @Field("ne_lat") ne_lat: Double, @Field("ne_lng") ne_lng: Double,
+        @Field("zoom") zoom: Float,
+        @Field("clustering") clustering: Boolean = false,
+        @Field("cluster_distance") clusterDistance: Int? = null,
+        @Field("freecharging") freecharging: Boolean = false,
+        @Field("freeparking") freeparking: Boolean = false,
+        @Field("min_power") minPower: Int = 0,
+        @Field("plugs") plugs: String? = null,
+        @Field("chargecards") chargecards: String? = null,
+        @Field("networks") networks: String? = null,
+        @Field("categories") categories: String? = null,
+        @Field("startkey") startkey: Int? = null,
+        @Field("open_twentyfourseven") open247: Boolean = false,
+        @Field("barrierfree") barrierfree: Boolean = false,
+        @Field("exclude_faults") excludeFaults: Boolean = false
     ): Response<GEChargepointList>
 
-    @GET("chargepoints/")
+    @FormUrlEncoded
+    @POST("chargepoints/")
     suspend fun getChargepointsRadius(
-        @Query("lat") lat: Double, @Query("lng") lng: Double,
-        @Query("radius") radius: Int,
-        @Query("zoom") zoom: Float,
-        @Query("orderby") orderby: String = "distance",
-        @Query("clustering") clustering: Boolean = false,
-        @Query("cluster_distance") clusterDistance: Int? = null,
-        @Query("freecharging") freecharging: Boolean = false,
-        @Query("freeparking") freeparking: Boolean = false,
-        @Query("min_power") minPower: Int = 0,
-        @Query("plugs") plugs: String? = null,
-        @Query("chargecards") chargecards: String? = null,
-        @Query("networks") networks: String? = null,
-        @Query("categories") categories: String? = null,
-        @Query("startkey") startkey: Int? = null,
-        @Query("open_twentyfourseven") open247: Boolean = false,
-        @Query("barrierfree") barrierfree: Boolean = false,
-        @Query("exclude_faults") excludeFaults: Boolean = false
+        @Field("lat") lat: Double, @Field("lng") lng: Double,
+        @Field("radius") radius: Int,
+        @Field("zoom") zoom: Float,
+        @Field("orderby") orderby: String = "distance",
+        @Field("clustering") clustering: Boolean = false,
+        @Field("cluster_distance") clusterDistance: Int? = null,
+        @Field("freecharging") freecharging: Boolean = false,
+        @Field("freeparking") freeparking: Boolean = false,
+        @Field("min_power") minPower: Int = 0,
+        @Field("plugs") plugs: String? = null,
+        @Field("chargecards") chargecards: String? = null,
+        @Field("networks") networks: String? = null,
+        @Field("categories") categories: String? = null,
+        @Field("startkey") startkey: Int? = null,
+        @Field("open_twentyfourseven") open247: Boolean = false,
+        @Field("barrierfree") barrierfree: Boolean = false,
+        @Field("exclude_faults") excludeFaults: Boolean = false
     ): Response<GEChargepointList>
 
     @GET("chargepoints/")
@@ -125,6 +126,7 @@ class GoingElectricApiWrapper(
     baseurl: String = "https://api.goingelectric.de",
     context: Context? = null
 ) : ChargepointApi<GEReferenceData> {
+    private val clusterThreshold = 11f
     val api = GoingElectricApi.create(apikey, baseurl, context)
 
     override fun getName() = "GoingElectric.de"
@@ -172,7 +174,7 @@ class GoingElectricApiWrapper(
         val categories = formatMultipleChoice(categoriesVal)
 
         // do not use clustering if filters need to be applied locally.
-        val useClustering = zoom < 13
+        val useClustering = zoom < clusterThreshold
         val geClusteringAvailable = minConnectors == null || minConnectors <= 1
         val useGeClustering = useClustering && geClusteringAvailable
         val clusterDistance = if (useClustering) getClusterDistance(zoom) else null
@@ -266,7 +268,7 @@ class GoingElectricApiWrapper(
         val categories = formatMultipleChoice(categoriesVal)
 
         // do not use clustering if filters need to be applied locally.
-        val useClustering = zoom < 13
+        val useClustering = zoom < clusterThreshold
         val geClusteringAvailable = minConnectors == null || minConnectors <= 1
         val useGeClustering = useClustering && geClusteringAvailable
         val clusterDistance = if (useClustering) getClusterDistance(zoom) else null
@@ -329,7 +331,7 @@ class GoingElectricApiWrapper(
         }.map { it.convert(apikey, false) }
 
         // apply clustering
-        val useClustering = zoom < 13
+        val useClustering = zoom < clusterThreshold
         val geClusteringAvailable = minConnectors == null || minConnectors <= 1
         val clusterDistance = if (useClustering) getClusterDistance(zoom) else null
         if (!geClusteringAvailable && useClustering) {

app/src/main/java/net/vonforst/evmap/api/openchargemap/OpenChargeMapApi.kt

@@ -105,6 +105,7 @@ class OpenChargeMapApiWrapper(
     baseurl: String = "https://api.openchargemap.io/v3/",
     context: Context? = null
 ) : ChargepointApi<OCMReferenceData> {
+    private val clusterThreshold = 11
     val api = OpenChargeMapApi.create(apikey, baseurl, context)
 
     override fun getName() = "OpenChargeMap.org"
@@ -238,7 +239,7 @@ class OpenChargeMapApiWrapper(
         }.map { it.convert(referenceData, false) }.distinct() as List<ChargepointListItem>
 
         // apply clustering
-        val useClustering = zoom < 13
+        val useClustering = zoom < clusterThreshold
         if (useClustering) {
             val clusterDistance = getClusterDistance(zoom)
             Dispatchers.IO.run {

app/src/main/java/net/vonforst/evmap/autocomplete/MapboxAutocompleteProvider.kt

@@ -29,7 +29,7 @@ class MapboxAutocompleteProvider(val context: Context) : AutocompleteProvider {
             location?.let {
                 proximity(Point.fromLngLat(location.longitude, location.latitude))
             }
-            languages(ConfigurationCompat.getLocales(context.resources.configuration)[0].language)
+            languages(ConfigurationCompat.getLocales(context.resources.configuration)[0]?.language)
             accessToken(context.getString(R.string.mapbox_key))
             autocomplete(true)
             this.query(query)

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,27 +111,25 @@ class FavoritesFragment : Fragment(), LostApiClient.ConnectionCallbacks {
         }
         createTouchHelper().attachToRecyclerView(binding.favsList)
 
-        locationClient!!.connect()
-    }
-
-    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)
+        binding.swipeRefresh.setOnRefreshListener {
+            vm.reloadAvailability() {
+                binding.swipeRefresh.isRefreshing = false
             }
         }
     }
 
-    override fun onConnectionSuspended() {
+    override fun onStart() {
+        super.onStart()
 
-    }
+        if (requireContext().checkAnyLocationPermission()) {
+            val provider = locationManager.getBestProvider(Criteria().apply {
+                accuracy = Criteria.ACCURACY_FINE
+            }, true) ?: return
 
-    override fun onDestroy() {
-        super.onDestroy()
-        locationClient?.let {
-            if (it.isConnected) it.disconnect()
+            val location = locationManager.getLastKnownLocation(provider)
+            location?.let {
+                vm.location.value = LatLng(it.latitude, it.longitude)
+            }
         }
     }
 

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,11 +18,12 @@ 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.location.LocationListenerCompat
 import androidx.core.view.*
 import androidx.databinding.DataBindingUtil
 import androidx.fragment.app.Fragment
@@ -60,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
@@ -79,29 +78,30 @@ 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
-import net.vonforst.evmap.ui.ChargerIconGenerator
-import net.vonforst.evmap.ui.ClusterIconGenerator
-import net.vonforst.evmap.ui.MarkerAnimator
-import net.vonforst.evmap.ui.getMarkerTint
+import net.vonforst.evmap.ui.*
 import net.vonforst.evmap.utils.boundingBox
 import net.vonforst.evmap.utils.checkAnyLocationPermission
 import net.vonforst.evmap.utils.checkFineLocationPermission
 import net.vonforst.evmap.utils.distanceBetween
 import net.vonforst.evmap.viewmodel.*
 import java.io.IOException
+import kotlin.collections.component1
+import kotlin.collections.component2
+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
@@ -112,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
@@ -145,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()
@@ -169,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()
@@ -182,7 +181,7 @@ class MapFragment : Fragment(), OnMapReadyCallback, MapsActivity.FragmentCallbac
                 MapFragment.GOOGLE,
                 MapFragment.MAPBOX
             )
-            requireActivity().supportFragmentManager
+            childFragmentManager
                 .beginTransaction()
                 .replace(R.id.map, mapFragment!!, mapFragmentTag)
                 .commit()
@@ -195,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
@@ -217,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
         }
 
@@ -232,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)
@@ -306,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()) {
@@ -398,6 +414,9 @@ class MapFragment : Fragment(), OnMapReadyCallback, MapsActivity.FragmentCallbac
                 else -> false
             }
         }
+        binding.detailView.btnRefreshLiveData.setOnClickListener {
+            vm.reloadAvailability()
+        }
     }
 
     var searchKeyListener: KeyListener? = null
@@ -511,7 +530,8 @@ class MapFragment : Fragment(), OnMapReadyCallback, MapsActivity.FragmentCallbac
                 highlight = true,
                 fault = charger.faultReport != null,
                 multi = charger.isMulti(vm.filteredConnectors.value),
-                fav = fav == null
+                fav = fav == null,
+                mini = vm.useMiniMarkers.value == true
             )
         )
     }
@@ -578,6 +598,9 @@ class MapFragment : Fragment(), OnMapReadyCallback, MapsActivity.FragmentCallbac
                 updateMap(chargepoints)
             }
         })
+        vm.useMiniMarkers.observe(viewLifecycleOwner) {
+            vm.chargepoints.value?.data?.let { updateMap(it) }
+        }
         vm.favorites.observe(viewLifecycleOwner, Observer {
             updateFavoriteToggle()
         })
@@ -601,6 +624,7 @@ class MapFragment : Fragment(), OnMapReadyCallback, MapsActivity.FragmentCallbac
                 }
                 searchResultMarker = map.addMarker(
                     MarkerOptions()
+                        .z(placeSearchZ)
                         .position(place.latLng)
                         .icon(searchResultIcon)
                         .anchor(0.5f, 1f)
@@ -642,7 +666,8 @@ class MapFragment : Fragment(), OnMapReadyCallback, MapsActivity.FragmentCallbac
                     highlight = false,
                     fault = c.faultReport != null,
                     multi = c.isMulti(vm.filteredConnectors.value),
-                    fav = c.id in vm.favorites.value?.map { it.charger.id } ?: emptyList()
+                    fav = c.id in vm.favorites.value?.map { it.charger.id } ?: emptyList(),
+                    mini = vm.useMiniMarkers.value == true
                 )
             )
         }
@@ -657,10 +682,11 @@ class MapFragment : Fragment(), OnMapReadyCallback, MapsActivity.FragmentCallbac
                 highlight = true,
                 fault = charger.faultReport != null,
                 multi = charger.isMulti(vm.filteredConnectors.value),
-                fav = charger.id in vm.favorites.value?.map { it.charger.id } ?: emptyList()
+                fav = charger.id in vm.favorites.value?.map { it.charger.id } ?: emptyList(),
+                mini = vm.useMiniMarkers.value == true
             )
         )
-        animator.animateMarkerBounce(marker)
+        animator.animateMarkerBounce(marker, vm.useMiniMarkers.value == true)
 
         // un-highlight all other markers
         markers.forEach { (m, c) ->
@@ -671,7 +697,8 @@ class MapFragment : Fragment(), OnMapReadyCallback, MapsActivity.FragmentCallbac
                         highlight = false,
                         fault = c.faultReport != null,
                         multi = c.isMulti(vm.filteredConnectors.value),
-                        fav = c.id in vm.favorites.value?.map { it.charger.id } ?: emptyList()
+                        fav = c.id in vm.favorites.value?.map { it.charger.id } ?: emptyList(),
+                        mini = vm.useMiniMarkers.value == true
                     )
                 )
             }
@@ -793,9 +820,10 @@ class MapFragment : Fragment(), OnMapReadyCallback, MapsActivity.FragmentCallbac
 
     override fun onMapReady(map: AnyMap) {
         this.map = map
-        chargerIconGenerator = ChargerIconGenerator(requireContext(), map.bitmapDescriptorFactory)
+        val context = this.context ?: return
+        chargerIconGenerator = ChargerIconGenerator(context, map.bitmapDescriptorFactory)
 
-        if (BuildConfig.FLAVOR == "google" && mapFragment!!.priority[0] == MapFragment.GOOGLE) {
+        if (BuildConfig.FLAVOR.contains("google") && mapFragment!!.priority[0] == MapFragment.GOOGLE) {
             // Google Maps: icons can be generated in background thread
             lifecycleScope.launch {
                 withContext(Dispatchers.IO) {
@@ -811,17 +839,25 @@ class MapFragment : Fragment(), OnMapReadyCallback, MapsActivity.FragmentCallbac
 
         animator = MarkerAnimator(chargerIconGenerator)
         map.uiSettings.setTiltGesturesEnabled(false)
+        map.uiSettings.setRotateGesturesEnabled(prefs.mapRotateGesturesEnabled)
         map.setIndoorEnabled(false)
         map.uiSettings.setIndoorLevelPickerEnabled(false)
+
         map.setOnCameraIdleListener {
             vm.mapPosition.value = MapPosition(
                 map.projection.visibleRegion.latLngBounds, map.cameraPosition.zoom
             )
-            binding.scaleView.update(map.cameraPosition.zoom, map.cameraPosition.target.latitude)
+            vm.reloadChargepoints()
         }
         map.setOnCameraMoveListener {
+            vm.mapPosition.value = MapPosition(
+                map.projection.visibleRegion.latLngBounds, map.cameraPosition.zoom
+            )
+        }
+        vm.mapPosition.observe(viewLifecycleOwner) {
             binding.scaleView.update(map.cameraPosition.zoom, map.cameraPosition.target.latitude)
         }
+
         map.setOnCameraMoveStartedListener { reason ->
             if (reason == AnyMap.OnCameraMoveStartedListener.REASON_GESTURE) {
                 if (vm.myLocationEnabled.value == true) {
@@ -864,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(
@@ -955,7 +991,7 @@ class MapFragment : Fragment(), OnMapReadyCallback, MapsActivity.FragmentCallbac
                 }
             }
         }
-        if (context?.checkAnyLocationPermission() ?: false) {
+        if (context.checkAnyLocationPermission()) {
             enableLocation(!positionSet, false)
             positionSet = true
         }
@@ -983,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
@@ -1005,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
@@ -1017,15 +1057,18 @@ class MapFragment : Fragment(), OnMapReadyCallback, MapsActivity.FragmentCallbac
 
         // update icons of existing markers (connector filter may have changed)
         for ((marker, charger) in markers) {
+            val highlight = charger.id == vm.chargerSparse.value?.id
             marker.setIcon(
                 chargerIconGenerator.getBitmapDescriptor(
                     getMarkerTint(charger, vm.filteredConnectors.value),
-                    highlight = charger == vm.chargerSparse.value,
+                    highlight = highlight,
                     fault = charger.faultReport != null,
                     multi = charger.isMulti(vm.filteredConnectors.value),
-                    fav = charger.id in vm.favorites.value?.map { it.charger.id } ?: emptyList()
+                    fav = charger.id in vm.favorites.value?.map { it.charger.id } ?: emptyList(),
+                    mini = vm.useMiniMarkers.value == true
                 )
             )
+            marker.setAnchor(0.5f, if (vm.useMiniMarkers.value == true) 0.5f else 1f)
         }
 
         if (chargers.toSet() != markers.values) {
@@ -1038,12 +1081,15 @@ 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 =
                             charger.id in vm.favorites.value?.map { it.charger.id } ?: emptyList()
-                        animator.animateMarkerDisappear(marker, tint, highlight, fault, multi, fav)
+                        animator.animateMarkerDisappear(
+                            marker, tint, highlight, fault, multi, fav,
+                            vm.useMiniMarkers.value == true
+                        )
                     } else {
                         animator.deleteMarker(marker)
                     }
@@ -1055,13 +1101,14 @@ 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()
                     val marker = map.addMarker(
                         MarkerOptions()
                             .position(LatLng(charger.coordinates.lat, charger.coordinates.lng))
+                            .z(chargerZ)
                             .icon(
                                 chargerIconGenerator.getBitmapDescriptor(
                                     tint,
@@ -1070,12 +1117,16 @@ class MapFragment : Fragment(), OnMapReadyCallback, MapsActivity.FragmentCallbac
                                     highlight,
                                     fault,
                                     multi,
-                                    fav
+                                    fav,
+                                    vm.useMiniMarkers.value == true
                                 )
                             )
-                            .anchor(0.5f, 1f)
+                            .anchor(0.5f, if (vm.useMiniMarkers.value == true) 0.5f else 1f)
+                    )
+                    animator.animateMarkerAppear(
+                        marker, tint, highlight, fault, multi, fav,
+                        vm.useMiniMarkers.value == true
                     )
-                    animator.animateMarkerAppear(marker, tint, highlight, fault, multi, fav)
                     markers[marker] = charger
                 }
             }
@@ -1085,6 +1136,7 @@ class MapFragment : Fragment(), OnMapReadyCallback, MapsActivity.FragmentCallbac
             map.addMarker(
                 MarkerOptions()
                     .position(LatLng(cluster.coordinates.lat, cluster.coordinates.lng))
+                    .z(clusterZ)
                     .icon(
                         map.bitmapDescriptorFactory.fromBitmap(
                             clusterIconGenerator.makeIcon(
@@ -1097,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)
@@ -1251,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
@@ -1311,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/model/ChargersModel.kt

@@ -199,6 +199,18 @@ data class Cost(
             return ""
         }
     }
+
+    fun getDetailText(): CharSequence? {
+        return if (freecharging == null && freeparking == null) {
+            if (descriptionShort != null && descriptionLong != descriptionShort) {
+                descriptionLong
+            } else {
+                null
+            }
+        } else {
+            descriptionLong ?: descriptionShort
+        }
+    }
 }
 
 @Parcelize
@@ -215,26 +227,63 @@ data class OpeningHours(
         if (twentyfourSeven) {
             return HtmlCompat.fromHtml(ctx.getString(R.string.open_247), 0)
         } else if (days != null) {
-            val hours = days.getHoursForDate(LocalDate.now())
-                ?: return HtmlCompat.fromHtml(ctx.getString(R.string.closed), 0)
+            val today = LocalDate.now()
+            val hours = days.getHoursForDate(today)
+            val nextDayHours = days.getHoursForDate(today.plusDays(1))
+            val previousDayHours = days.getHoursForDate(today.minusDays(1))
 
             val now = LocalTime.now()
-            if (hours.start.isBefore(now) && hours.end.isAfter(now)) {
+            val fmt = DateTimeFormatter.ofLocalizedTime(FormatStyle.SHORT)
+
+            if (previousDayHours != null && previousDayHours.end.isBefore(previousDayHours.start) && previousDayHours.end.isAfter(
+                    now
+                )
+            ) {
+                // previous day has opening hours that go past midnight
                 return HtmlCompat.fromHtml(
                     ctx.getString(
                         R.string.open_closesat,
-                        hours.end.toString()
+                        previousDayHours.end.format(fmt)
                     ), 0
                 )
-            } else if (hours.end.isBefore(now)) {
-                return HtmlCompat.fromHtml(ctx.getString(R.string.closed), 0)
-            } else {
+            } else if (hours != null && hours.start.isBefore(hours.end)
+                && hours.start.isBefore(now) && hours.end.isAfter(now)
+            ) {
+                // current day has opening hours that do not go past midnight
+                return HtmlCompat.fromHtml(
+                    ctx.getString(
+                        R.string.open_closesat,
+                        hours.end.format(fmt)
+                    ), 0
+                )
+            } else if (hours != null && hours.end.isBefore(hours.start)
+                && hours.start.isBefore(now)
+            ) {
+                // current day has opening hours that go past midnight
+                return HtmlCompat.fromHtml(
+                    ctx.getString(
+                        R.string.open_closesat,
+                        hours.end.format(fmt)
+                    ), 0
+                )
+            } else if (hours != null && !hours.start.isBefore(now)) {
+                // currently closed, will still open on this day
                 return HtmlCompat.fromHtml(
                     ctx.getString(
                         R.string.closed_opensat,
-                        hours.start.toString()
+                        hours.start.format(fmt)
                     ), 0
                 )
+            } else if (nextDayHours != null) {
+                // currently closed, will open next day
+                return HtmlCompat.fromHtml(
+                    ctx.getString(
+                        R.string.closed_opensat,
+                        nextDayHours.start.format(fmt)
+                    ), 0
+                )
+            } else {
+                return HtmlCompat.fromHtml(ctx.getString(R.string.closed), 0)
             }
         } else {
             return ""

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/FilterValueDao.kt

@@ -4,6 +4,7 @@ import androidx.lifecycle.LiveData
 import androidx.lifecycle.MediatorLiveData
 import androidx.lifecycle.MutableLiveData
 import androidx.room.*
+import net.vonforst.evmap.await
 import net.vonforst.evmap.model.*
 
 @Dao
@@ -92,4 +93,15 @@ abstract class FilterValueDao {
         deleteSliderFilterValuesForProfile(profile, dataSource)
     }
 
+    @Transaction
+    open suspend fun copyFiltersToCustom(filterStatus: Long, dataSource: String) {
+        if (filterStatus == FILTERS_CUSTOM) return
+
+        deleteFilterValuesForProfile(FILTERS_CUSTOM, dataSource)
+        val values = getFilterValues(filterStatus, dataSource).await().onEach {
+            it.profile = FILTERS_CUSTOM
+        }
+        insert(*values.toTypedArray())
+    }
+
 }

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
@@ -29,6 +30,12 @@ class PreferenceDataSource(val context: Context) {
             sp.edit().putBoolean("navigate_use_maps", value).apply()
         }
 
+    var mapRotateGesturesEnabled: Boolean
+        get() = sp.getBoolean("map_rotate_gestures_enabled", true)
+        set(value) {
+            sp.edit().putBoolean("map_rotate_gestures_enabled", value).apply()
+        }
+
     var lastGeReferenceDataUpdate: Instant
         get() = Instant.ofEpochMilli(sp.getLong("last_ge_reference_data_update", 0L))
         set(value) {
@@ -80,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())
@@ -192,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/ui/IconGenerators.kt

@@ -46,8 +46,9 @@ class ChargerIconGenerator(
     val context: Context,
     val factory: BitmapDescriptorFactory?,
     val scaleResolution: Int = 20,
-    val oversize: Float = 1.4f, // increase to add padding for fault icon or scale > 1
-    val height: Int = 44
+    val scaleResolutionMini: Int = 10,
+    val oversize: Float = 1f, // increase to add padding for scale > 1
+    val height: Int = 48
 ) {
     private data class BitmapData(
         val tint: Int,
@@ -56,16 +57,21 @@ class ChargerIconGenerator(
         val highlight: Boolean,
         val fault: Boolean,
         val multi: Boolean,
-        val fav: Boolean
+        val fav: Boolean,
+        val mini: Boolean
     )
 
-    // 230 items: (21 sizes, 5 colors, multi on/off) + highlight + fault (only with scale = 1)
-    private val cacheSize = (scaleResolution + 3) * 5 * 2;
+    // 340 items:
+    // large: (21 sizes, 5 colors, multi on/off) + highlight + fault + fav (only with scale = 1)
+    // mini: (11 sizes, 5 colors) + highlight (only with scale = 1)
+    private val cacheSize = (scaleResolution + 8) * 5 * 2 + (scaleResolutionMini + 2) * 5;
     private val cache = LruCache<BitmapData, BitmapDescriptor>(cacheSize)
     private val icon = R.drawable.ic_map_marker_charging
     private val multiIcon = R.drawable.ic_map_marker_charging_multiple
-    private val highlightIcon = R.drawable.ic_map_marker_highlight
+    private val miniIcon = R.drawable.ic_map_marker_charging_mini
+    private val highlightIcon = R.drawable.ic_map_marker_charging_highlight
     private val highlightIconMulti = R.drawable.ic_map_marker_charging_highlight_multiple
+    private val highlightIconMini = R.drawable.ic_map_marker_charging_highlight_mini
     private val faultIcon = R.drawable.ic_map_marker_fault
     private val favIcon = R.drawable.ic_map_marker_fav
 
@@ -82,12 +88,15 @@ class ChargerIconGenerator(
             for (highlight in listOf(false, true)) {
                 for (multi in listOf(false, true)) {
                     for (fav in listOf(false, true)) {
-                        for (tint in tints) {
-                            for (scale in 0..scaleResolution) {
-                                getBitmapDescriptor(
-                                    tint, scale.toFloat() / scaleResolution,
-                                    255, highlight, fault, multi, fav
-                                )
+                        for (mini in listOf(false, true)) {
+                            for (tint in tints) {
+                                val scaleRes = if (mini) scaleResolutionMini else scaleResolution
+                                for (scale in 0..scaleRes) {
+                                    getBitmapDescriptor(
+                                        tint, scale.toFloat() / scaleRes,
+                                        255, highlight, fault, multi, fav, mini
+                                    )
+                                }
                             }
                         }
                     }
@@ -103,16 +112,10 @@ class ChargerIconGenerator(
         highlight: Boolean = false,
         fault: Boolean = false,
         multi: Boolean = false,
-        fav: Boolean = false
+        fav: Boolean = false,
+        mini: Boolean = false
     ): BitmapDescriptor? {
-        val data = BitmapData(
-            tint, (scale * scaleResolution).roundToInt(),
-            alpha,
-            if (scale == 1f) highlight else false,
-            if (scale == 1f) fault else false,
-            multi,
-            if (scale == 1f) fav else false
-        )
+        val data = createBitmapData(tint, scale, alpha, highlight, fault, multi, fav, mini)
         val cachedImg = cache[data]
         return if (cachedImg != null) {
             cachedImg
@@ -124,6 +127,26 @@ class ChargerIconGenerator(
         }
     }
 
+    private fun createBitmapData(
+        tint: Int,
+        scale: Float,
+        alpha: Int,
+        highlight: Boolean,
+        fault: Boolean,
+        multi: Boolean,
+        fav: Boolean,
+        mini: Boolean
+    ) = BitmapData(
+        tint,
+        (scale * (if (mini) scaleResolutionMini else scaleResolution)).roundToInt(),
+        alpha,
+        if (scale == 1f) highlight else false,
+        if (scale == 1f && !mini) fault else false,
+        if (!mini) multi else false,
+        if (scale == 1f && !mini) fav else false,
+        mini
+    )
+
     fun getBitmap(
         @ColorRes tint: Int,
         scale: Float = 1f,
@@ -131,94 +154,99 @@ class ChargerIconGenerator(
         highlight: Boolean = false,
         fault: Boolean = false,
         multi: Boolean = false,
-        fav: Boolean = false
+        fav: Boolean = false,
+        mini: Boolean = false
     ): Bitmap {
-        val data = BitmapData(
-            tint, (scale * scaleResolution).roundToInt(),
-            alpha,
-            if (scale == 1f) highlight else false,
-            if (scale == 1f) fault else false,
-            multi,
-            if (scale == 1f) fav else false,
-        )
+        val data = createBitmapData(tint, scale, alpha, highlight, fault, multi, fav, mini)
         return generateBitmap(data)
     }
 
     private fun generateBitmap(data: BitmapData): Bitmap {
-        val icon = if (data.multi) multiIcon else icon
+        val icon = if (data.mini) miniIcon else if (data.multi) multiIcon else icon
         val vd: Drawable = ContextCompat.getDrawable(context, icon)!!
 
-        DrawableCompat.setTint(vd, ContextCompat.getColor(context, data.tint));
-        DrawableCompat.setTintMode(vd, PorterDuff.Mode.MULTIPLY);
+        DrawableCompat.setTint(vd, ContextCompat.getColor(context, data.tint))
+        DrawableCompat.setTintMode(vd, PorterDuff.Mode.MULTIPLY)
 
         val density = context.resources.displayMetrics.density
-        val width =
-            (height.toFloat() * density / vd.intrinsicHeight * vd.intrinsicWidth).roundToInt()
-        val height = (height * density).roundToInt()
+        val (markerWidth, markerHeight) = if (data.mini) {
+            vd.intrinsicWidth to vd.intrinsicHeight
+        } else {
+            (height.toFloat() * density / vd.intrinsicHeight * vd.intrinsicWidth).roundToInt() to
+                    (height * density).roundToInt()
+        }
+        val (extraIconSize, extraIconShift) = if (data.mini) 0 to 0 else {
+            (0.75 * markerWidth).roundToInt() to (0.25 * markerWidth).roundToInt()
+        }
 
-        val leftPadding = width * (oversize - 1) / 2
-        val topPadding = height * (oversize - 1)
+        val totalWidth = markerWidth + 2 * extraIconShift
+        val totalHeight = markerHeight + extraIconShift
+
+        val (leftPadding, topPadding) = if (!data.mini) {
+            ((totalWidth) * (oversize - 1) / 2).roundToInt() + extraIconShift to
+                    ((totalHeight) * (oversize - 1)).roundToInt() + extraIconShift
+        } else {
+            0 to 0
+        }
         vd.setBounds(
-            leftPadding.toInt(), topPadding.toInt(),
-            leftPadding.toInt() + width,
-            topPadding.toInt() + height
+            leftPadding, topPadding,
+            leftPadding + markerWidth,
+            topPadding + markerHeight
         )
         vd.alpha = data.alpha
 
         val bm = Bitmap.createBitmap(
-            (width * oversize).toInt(), (height * oversize).toInt(),
+            (totalWidth * oversize).roundToInt(), (totalHeight * oversize).roundToInt(),
             Bitmap.Config.ARGB_8888
         )
         val canvas = Canvas(bm)
 
-        val scale = data.scale.toFloat() / scaleResolution
-        canvas.scale(
-            scale,
-            scale,
-            leftPadding + width / 2f,
-            topPadding + height.toFloat()
-        )
+        val scale = data.scale.toFloat() / if (data.mini) scaleResolutionMini else scaleResolution
+        val (originX, originY) = if (data.mini) {
+            canvas.width / 2f to
+                    canvas.height / 2f
+        } else {
+            canvas.width / 2f to
+                    canvas.height.toFloat()
+        }
+        canvas.scale(scale, scale, originX, originY)
 
         vd.draw(canvas)
 
         if (data.highlight) {
-            val hIcon = if (data.multi) highlightIconMulti else highlightIcon
+            val hIcon =
+                if (data.mini) highlightIconMini else if (data.multi) highlightIconMulti else highlightIcon
             val highlightDrawable = ContextCompat.getDrawable(context, hIcon)!!
             highlightDrawable.setBounds(
-                leftPadding.toInt(), topPadding.toInt(),
-                leftPadding.toInt() + width,
-                topPadding.toInt() + height
+                leftPadding, topPadding,
+                leftPadding + markerWidth,
+                topPadding + markerHeight
             )
             highlightDrawable.alpha = data.alpha
             highlightDrawable.draw(canvas)
         }
 
-        if (data.fault) {
+        if (data.fault && !data.mini) {
             val faultDrawable = ContextCompat.getDrawable(context, faultIcon)!!
-            val faultSize = 0.75
-            val faultShift = 0.25
-            val base = width
             faultDrawable.setBounds(
-                (leftPadding.toInt() + base * (1 - faultSize + faultShift)).toInt(),
-                (topPadding.toInt() - base * faultShift).toInt(),
-                (leftPadding.toInt() + base * (1 + faultShift)).toInt(),
-                (topPadding.toInt() + base * (faultSize - faultShift)).toInt()
+                leftPadding + markerWidth + extraIconShift - extraIconSize,
+                topPadding - extraIconShift,
+                leftPadding + markerWidth + extraIconShift,
+                topPadding + extraIconSize - extraIconShift
             )
             faultDrawable.alpha = data.alpha
             faultDrawable.draw(canvas)
         }
 
-        if (data.fav) {
+        if (data.fav && !data.mini) {
             val favDrawable = ContextCompat.getDrawable(context, favIcon)!!
-            val favSize = 0.75
-            val favShiftY = 0.25
-            val favShiftX = if (data.fault) -0.5 else 0.25
-            val base = width
+            val favShiftY = extraIconShift
+            val favShiftX = if (data.fault) extraIconShift - extraIconSize else extraIconShift
             favDrawable.setBounds(
-                (leftPadding.toInt() + base * (1 - favSize + favShiftX)).toInt(),
-                (topPadding.toInt() - base * favShiftY).toInt(),
-                (leftPadding.toInt() + base * (1 + favShiftX)).toInt(),
-                (topPadding.toInt() + base * (favSize - favShiftY)).toInt()
+                leftPadding + markerWidth - extraIconSize + favShiftX,
+                topPadding - favShiftY,
+                leftPadding + markerWidth + favShiftX,
+                topPadding + extraIconSize - favShiftY
             )
             favDrawable.alpha = data.alpha
             favDrawable.draw(canvas)

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

@@ -25,6 +25,10 @@ fun getMarkerTint(
     }
 }
 
+val chargerZ = 1
+val clusterZ = chargerZ + 1
+val placeSearchZ = clusterZ + 1
+
 class MarkerAnimator(val gen: ChargerIconGenerator) {
     private val animatingMarkers = hashMapOf<Marker, ValueAnimator>()
 
@@ -34,7 +38,8 @@ class MarkerAnimator(val gen: ChargerIconGenerator) {
         highlight: Boolean,
         fault: Boolean,
         multi: Boolean,
-        fav: Boolean
+        fav: Boolean,
+        mini: Boolean
     ) {
         animatingMarkers[marker]?.let {
             it.cancel()
@@ -53,7 +58,8 @@ class MarkerAnimator(val gen: ChargerIconGenerator) {
                         highlight = highlight,
                         fault = fault,
                         multi = multi,
-                        fav = fav
+                        fav = fav,
+                        mini = mini
                     )
                 )
             }
@@ -73,7 +79,8 @@ class MarkerAnimator(val gen: ChargerIconGenerator) {
         highlight: Boolean,
         fault: Boolean,
         multi: Boolean,
-        fav: Boolean
+        fav: Boolean,
+        mini: Boolean
     ) {
         animatingMarkers[marker]?.let {
             it.cancel()
@@ -92,7 +99,8 @@ class MarkerAnimator(val gen: ChargerIconGenerator) {
                         highlight = highlight,
                         fault = fault,
                         multi = multi,
-                        fav = fav
+                        fav = fav,
+                        mini = mini
                     )
                 )
             }
@@ -116,7 +124,7 @@ class MarkerAnimator(val gen: ChargerIconGenerator) {
         marker.remove()
     }
 
-    fun animateMarkerBounce(marker: Marker) {
+    fun animateMarkerBounce(marker: Marker, mini: Boolean) {
         animatingMarkers[marker]?.let {
             it.cancel()
             animatingMarkers.remove(marker)
@@ -127,7 +135,7 @@ class MarkerAnimator(val gen: ChargerIconGenerator) {
             interpolator = BounceInterpolator()
             addUpdateListener { state ->
                 val t = max(1f - state.animatedValue as Float, 0f) / 2
-                marker.setAnchor(0.5f, 1.0f + t)
+                marker.setAnchor(0.5f, (if (mini) 0.5f else 1.0f) + t)
             }
             addListener(onEnd = {
                 animatingMarkers.remove(marker)

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

@@ -32,21 +32,7 @@ class FavoritesViewModel(application: Application, geApiKey: String) :
         MediatorLiveData<Map<Long, Resource<ChargeLocationStatus>>>().apply {
             addSource(favorites) { favorites ->
                 if (favorites != null) {
-                    val chargers = favorites.map { it.charger }
-                    viewModelScope.launch {
-                        val data = hashMapOf<Long, Resource<ChargeLocationStatus>>()
-                        chargers.forEach { charger ->
-                            data[charger.id] = Resource.loading(null)
-                        }
-                        availability.value = data
-
-                        chargers.map { charger ->
-                            async {
-                                data[charger.id] = getAvailability(charger)
-                                availability.value = data
-                            }
-                        }.awaitAll()
-                    }
+                    reloadAvailability()
                 } else {
                     value = null
                 }
@@ -54,6 +40,27 @@ class FavoritesViewModel(application: Application, geApiKey: String) :
         }
     }
 
+    fun reloadAvailability(callback: (() -> Unit)? = null) {
+        val favorites = favorites.value ?: return
+        val chargers = favorites.map { it.charger }
+
+        viewModelScope.launch {
+            val data = hashMapOf<Long, Resource<ChargeLocationStatus>>()
+            chargers.forEach { charger ->
+                data[charger.id] = Resource.loading(null)
+            }
+            availability.value = data
+
+            chargers.map { charger ->
+                async {
+                    data[charger.id] = getAvailability(charger)
+                    availability.value = data
+                }
+            }.awaitAll()
+            callback?.invoke()
+        }
+    }
+
     val listData: MediatorLiveData<List<FavoritesListItem>> by lazy {
         MediatorLiveData<List<FavoritesListItem>>().apply {
             val callback = { _: Any ->

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

@@ -35,9 +35,7 @@ data class MapPosition(val bounds: LatLngBounds, val zoom: Float) : Parcelable
 internal fun getClusterDistance(zoom: Float): Int? {
     return when (zoom) {
         in 0.0..7.0 -> 100
-        in 7.0..11.5 -> 75
-        in 11.5..12.5 -> 60
-        in 12.5..13.0 -> 45
+        in 7.0..11.0 -> 75
         else -> null
     }
 }
@@ -119,7 +117,9 @@ class MapViewModel(application: Application, private val state: SavedStateHandle
         MediatorLiveData<Resource<List<ChargepointListItem>>>()
             .apply {
                 value = Resource.loading(emptyList())
-                listOf(mapPosition, filtersWithValue, referenceData).forEach {
+                // this is not automatically updated with mapPosition, as we only want to update
+                // when map is idle.
+                listOf(filtersWithValue, referenceData).forEach {
                     addSource(it) {
                         reloadChargepoints()
                     }
@@ -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 {
@@ -270,15 +277,7 @@ class MapViewModel(application: Application, private val state: SavedStateHandle
     }
 
     suspend fun copyFiltersToCustom() {
-        if (filterStatus.value == FILTERS_CUSTOM) return
-
-        db.filterValueDao().deleteFilterValuesForProfile(FILTERS_CUSTOM, prefs.dataSource)
-        filterValues.value?.map {
-            it.profile = FILTERS_CUSTOM
-            it
-        }?.let {
-            db.filterValueDao().insert(*it.toTypedArray())
-        }
+        filterStatus.value?.let { db.filterValueDao().copyFiltersToCustom(it, prefs.dataSource) }
     }
 
     fun setMapType(type: AnyMap.Type) {
@@ -306,6 +305,30 @@ class MapViewModel(application: Application, private val state: SavedStateHandle
         chargepointLoader(Triple(pos, filters, referenceData))
     }
 
+    private val miniMarkerThreshold = 13f
+    private val clusterThreshold = 11f
+    val useMiniMarkers: LiveData<Boolean> = MediatorLiveData<Boolean>().apply {
+        for (source in listOf(filteredMinPower, mapPosition)) {
+            addSource(source) {
+                val minPower = filteredMinPower.value ?: 0
+                val zoom = mapPosition.value?.zoom
+                value = when {
+                    zoom == null -> {
+                        false
+                    }
+                    minPower >= 100 -> {
+                        // when only showing high-power chargers we can use large markers
+                        // because the density is much lower
+                        false
+                    }
+                    else -> {
+                        zoom < miniMarkerThreshold
+                    }
+                }
+            }
+        }
+    }.distinctUntilChanged()
+
     private var chargepointLoader =
         throttleLatest(
             500L,
@@ -350,7 +373,7 @@ class MapViewModel(application: Application, private val state: SavedStateHandle
                     if (connectorsVal.all) null else connectorsVal.values.map {
                         GEChargepoint.convertTypeFromGE(it)
                     }.toSet()
-                filteredMinPower.value = filters.getSliderValue("minPower")
+                filteredMinPower.value = filters.getSliderValue("min_power")
             } else if (api is OpenChargeMapApiWrapper) {
                 val connectorsVal = filters.getMultipleChoiceValue("connectors")!!
                 filteredConnectors.value =
@@ -360,7 +383,7 @@ class MapViewModel(application: Application, private val state: SavedStateHandle
                             refData as OCMReferenceData
                         )
                     }.toSet()
-                filteredMinPower.value = filters.getSliderValue("minPower")
+                filteredMinPower.value = filters.getSliderValue("min_power")
             } else {
                 filteredConnectors.value = null
                 filteredMinPower.value = null
@@ -381,6 +404,13 @@ class MapViewModel(application: Application, private val state: SavedStateHandle
         availability.value = getAvailability(charger)
     }
 
+    fun reloadAvailability() {
+        val charger = chargerSparse.value ?: return
+        viewModelScope.launch {
+            loadAvailability(charger)
+        }
+    }
+
     private var chargerLoadingTask: Job? = null
 
     private fun loadChargerDetails(charger: ChargeLocation, referenceData: ReferenceData) {
@@ -388,7 +418,12 @@ class MapViewModel(application: Application, private val state: SavedStateHandle
         chargerLoadingTask?.cancel()
         chargerLoadingTask = viewModelScope.launch {
             try {
-                chargerDetails.value = api.value!!.getChargepointDetail(referenceData, charger.id)
+                val chargerDetail = api.value!!.getChargepointDetail(referenceData, charger.id)
+                chargerDetails.value = chargerDetail
+                if (favorites.value?.any { it.charger.id == chargerDetail.data?.id } == true) {
+                    // update data of stored favorite
+                    db.chargeLocationsDao().insert(charger)
+                }
             } catch (e: IOException) {
                 chargerDetails.value = Resource.error(e.message, null)
                 e.printStackTrace()
@@ -407,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/ic_map_marker_charging_highlight_mini.xml

@@ -0,0 +1,9 @@
+<vector android:viewportHeight="24"
+    android:viewportWidth="24"
+    android:width="16dp"
+    android:height="16dp"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M12,12m-4,0a4,4 0,1 1,8 0a4,4 0,1 1,-8 0" />
+</vector>

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

@@ -0,0 +1,12 @@
+<vector android:viewportHeight="24"
+    android:viewportWidth="24"
+    android:width="16dp"
+    android:height="16dp"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+    <path
+        android:fillColor="#dddddd"
+        android:pathData="M12,12m-8.5,0a8.5,8.5 0,1 1,17 0a8.5,8.5 0,1 1,-17 0" />
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M12,12m-7.5,0a7.5,7.5 0,1 1,15 0a7.5,7.5 0,1 1,-15 0" />
+</vector>

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

@@ -0,0 +1,10 @@
+<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="M17.65,6.35C16.2,4.9 14.21,4 12,4c-4.42,0 -7.99,3.58 -7.99,8s3.57,8 7.99,8c3.73,0 6.84,-2.55 7.73,-6h-2.08c-0.82,2.33 -3.04,4 -5.65,4 -3.31,0 -6,-2.69 -6,-6s2.69,-6 6,-6c1.66,0 3.14,0.69 4.22,1.78L13,11h7V4l-2.35,2.35z" />
+</vector>

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

@@ -0,0 +1,10 @@
+<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="M18,7l-1.41,-1.41 -6.34,6.34 1.41,1.41L18,7zM22.24,5.59L11.66,16.17 7.48,12l-1.41,1.41L11.66,19l12,-12 -1.42,-1.41zM0.41,13.41L6,19l1.41,-1.41L1.83,12 0.41,13.41z" />
+</vector>

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

@@ -0,0 +1,10 @@
+<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="M1.79,12l5.58,5.59L5.96,19 0.37,13.41 1.79,12zM2.24,4.22L12.9,14.89l-1.28,1.28L7.44,12l-1.41,1.41L11.62,19l2.69,-2.69 4.89,4.89 1.41,-1.41L3.65,2.81 2.24,4.22zM17.14,13.49L23.62,7 22.2,5.59l-6.48,6.48 1.42,1.42zM17.96,7l-1.41,-1.41 -3.65,3.66 1.41,1.41L17.96,7z" />
+</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/detail_view.xml

@@ -82,6 +82,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginEnd="30dp"
                 android:ellipsize="end"
+                android:hyphenationFrequency="normal"
                 android:maxLines="@{expanded ? 3 : 1}"
                 android:text="@{charger.data.name}"
                 android:textAppearance="@style/TextAppearance.Material3.BodyLarge"
@@ -134,9 +135,9 @@
                 android:text="@{String.format("%s/%d", BindingAdaptersKt.availabilityText(BindingAdaptersKt.flatten(filteredAvailability.data.status.values())), filteredAvailability.data.totalChargepoints)}"
                 android:textAppearance="@style/TextAppearance.Material3.BodySmall"
                 android:textColor="@android:color/white"
-                app:backgroundTintAvailability="@{BindingAdaptersKt.flatten(availability.data.status.values())}"
-                app:invisibleUnlessAnimated="@{availability.data != null && !expanded}"
-                app:invisibleUnless="@{availability.data != null}"
+                app:backgroundTintAvailability="@{BindingAdaptersKt.flatten(filteredAvailability.data.status.values())}"
+                app:invisibleUnlessAnimated="@{filteredAvailability.data != null && !expanded}"
+                app:invisibleUnless="@{filteredAvailability.data != null && !expanded}"
                 app:layout_constraintEnd_toStartOf="@+id/guideline2"
                 app:layout_constraintTop_toTopOf="@+id/txtName"
                 tools:backgroundTint="@color/available"
@@ -292,10 +293,11 @@
                 android:id="@+id/textView13"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
+                android:layout_marginEnd="8dp"
                 android:gravity="right|end"
                 android:text="@{availability.status == Status.SUCCESS ? @string/realtime_data_source(availability.data.source) : availability.status == Status.LOADING ? @string/realtime_data_loading : @string/realtime_data_unavailable}"
                 android:textAppearance="@style/TextAppearance.Material3.BodySmall"
-                app:layout_constraintEnd_toStartOf="@+id/guideline2"
+                app:layout_constraintEnd_toStartOf="@+id/btnRefreshLiveData"
                 app:layout_constraintStart_toStartOf="@+id/guideline"
                 app:layout_constraintTop_toBottomOf="@+id/connectors"
                 tools:text="Echtzeitdaten nicht verfügbar" />
@@ -375,6 +377,18 @@
                 app:layout_constraintBottom_toBottomOf="parent"
                 tools:text="The data is provided under the National Oman Open Data LicensE (NOODLE), Version 3.14, and may be used for any purpose whatsoever." />
 
+            <Button
+                android:id="@+id/btnRefreshLiveData"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                style="@style/Widget.App.Button.OutlinedButton.IconOnly.Small"
+                android:contentDescription="@string/refresh_live_data"
+                android:enabled="@{availability.status != Status.LOADING}"
+                app:icon="@drawable/ic_refresh"
+                app:layout_constraintBottom_toBottomOf="@+id/textView13"
+                app:layout_constraintEnd_toStartOf="@+id/guideline2"
+                app:layout_constraintTop_toBottomOf="@+id/connectors" />
+
         </androidx.constraintlayout.widget.ConstraintLayout>
 
     </androidx.cardview.widget.CardView>

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/fragment_favorites.xml

@@ -33,16 +33,21 @@
 
         </com.google.android.material.appbar.AppBarLayout>
 
-
-        <androidx.recyclerview.widget.RecyclerView
-            android:id="@+id/favs_list"
+        <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
+            android:id="@+id/swipe_refresh"
             android:layout_width="0dp"
             android:layout_height="0dp"
-            app:data="@{vm.listData}"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/toolbar_container" />
+            app:layout_constraintTop_toBottomOf="@+id/toolbar_container">
+
+            <androidx.recyclerview.widget.RecyclerView
+                android:id="@+id/favs_list"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                app:data="@{vm.listData}" />
+        </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
 
         <com.airbnb.lottie.LottieAnimationView
             android:id="@+id/animation_view"

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/item_favorite.xml

@@ -50,13 +50,18 @@
 
             <TextView
                 android:id="@+id/textView15"
-                android:layout_width="wrap_content"
+                android:layout_width="0dp"
                 android:layout_height="wrap_content"
+                android:layout_marginEnd="16dp"
                 android:text="@{item.charger.name}"
                 android:textAppearance="@style/TextAppearance.Material3.BodyLarge"
+                android:maxLines="2"
+                android:ellipsize="end"
+                android:hyphenationFrequency="normal"
+                app:layout_constraintEnd_toStartOf="@+id/textView16"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="parent"
-                tools:text="Parkhaus" />
+                tools:text="Nikola-Tesla-Parkhaus mit extra langem Namen, der auf mehrere Zeilen umbricht" />
 
         <TextView
             android:id="@+id/textView2"
@@ -110,7 +115,7 @@
                 android:textAppearance="@style/TextAppearance.AppCompat.Body1"
                 android:textColor="@android:color/white"
                 app:backgroundTintAvailability="@{item.available.data}"
-                app:goneUnless="@{item.available.status == Status.SUCCESS}"
+                app:invisibleUnless="@{item.available.status == Status.SUCCESS}"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintEnd_toStartOf="@id/btnDelete"
                 tools:backgroundTint="@color/available"

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="MapFragment"
-        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>
@@ -255,4 +257,9 @@
     <string name="settings_android_auto">Android Auto</string>
     <string name="pref_chargeprice_allow_unbalanced_load">Schieflast erlauben</string>
     <string name="pref_chargeprice_allow_unbalanced_load_summary"><![CDATA[Erlaubt das Laden mit >4.5 kW an AC-Stationen für Autos mit 1-phasigem Lader]]></string>
+    <string name="pref_map_rotate_gestures_enabled">Kartenrotation erlauben</string>
+    <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>
@@ -240,4 +242,9 @@
     <string name="settings_android_auto">Android Auto</string>
     <string name="pref_chargeprice_allow_unbalanced_load">Enable unbalanced load</string>
     <string name="pref_chargeprice_allow_unbalanced_load_summary"><![CDATA[Allow charging with >4.5 kW at AC stations for cars with single-phase charger]]></string>
+    <string name="pref_map_rotate_gestures_enabled">Enable map rotation</string>
+    <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/values/styles.xml

@@ -56,4 +56,15 @@
         <item name="android:minHeight">48dp</item>
     </style>
 
+    <style name="Widget.App.Button.OutlinedButton.IconOnly.Small" parent="Widget.Material3.Button.OutlinedButton">
+        <item name="iconPadding">0dp</item>
+        <item name="android:insetTop">0dp</item>
+        <item name="android:insetBottom">0dp</item>
+        <item name="android:paddingLeft">7dp</item>
+        <item name="android:paddingRight">7dp</item>
+        <item name="android:minWidth">30dp</item>
+        <item name="android:minHeight">30dp</item>
+        <item name="iconTint">?android:textColorSecondary</item>
+    </style>
+
 </resources>

app/src/main/res/xml/settings_ui.xml

@@ -15,6 +15,12 @@
         android:entryValues="@array/pref_darkmode_values"
         android:defaultValue="default"
         android:summary="@string/pref_darkmode_summary" />
+    <CheckBoxPreference
+        android:key="map_rotate_gestures_enabled"
+        android:title="@string/pref_map_rotate_gestures_enabled"
+        android:summaryOn="@string/pref_map_rotate_gestures_on"
+        android:summaryOff="@string/pref_map_rotate_gestures_off"
+        android:defaultValue="true" />
     <CheckBoxPreference
         android:key="navigate_use_maps"
         android:title="@string/pref_navigate_use_maps"

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/test/java/net/vonforst/evmap/api/availability/NewMotionAvailabilityDetectorTest.kt

@@ -43,8 +43,8 @@ class NewMotionAvailabilityDetectorTest {
                     "nm/markers" -> {
                         val urlTail = segments.subList(2, segments.size).joinToString("/")
                         val id = when (urlTail) {
-                            "9.47108/9.67108/54.4116/54.6116" -> 2105
-                            "9.444284/9.644283999999999/54.376699/54.576699000000005" -> 18284
+                            "9.56608/9.576080000000001/54.5066/54.516600000000004" -> 2105
+                            "9.539283999999999/9.549284/54.471699/54.481699000000006" -> 18284
                             else -> -1
                         }
                         return okResponse("/newmotion/$id/markers.json")

app/src/test/java/net/vonforst/evmap/api/goingelectric/GoingElectricApiTest.kt

@@ -3,6 +3,7 @@ package net.vonforst.evmap.api.goingelectric
 import kotlinx.coroutines.runBlocking
 import net.vonforst.evmap.notFoundResponse
 import net.vonforst.evmap.okResponse
+import okhttp3.HttpUrl.Companion.toHttpUrl
 import okhttp3.mockwebserver.Dispatcher
 import okhttp3.mockwebserver.MockResponse
 import okhttp3.mockwebserver.MockWebServer
@@ -33,10 +34,13 @@ class GoingElectricApiTest {
                         if (id != null) {
                             return okResponse("/chargers/$id.json")
                         } else {
+                            val body = request.body.readUtf8()
+                            val bodyQuery = "http://host?$body".toHttpUrl()
+
                             val freeparking =
-                                request.requestUrl!!.queryParameter("freeparking")!!.toBoolean()
+                                bodyQuery.queryParameter("freeparking")!!.toBoolean()
                             val freecharging =
-                                request.requestUrl!!.queryParameter("freecharging")!!.toBoolean()
+                                bodyQuery.queryParameter("freecharging")!!.toBoolean()
                             return if (freeparking && freecharging) {
                                 okResponse("/chargers/list-empty.json")
                             } else if (freecharging) {

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.5.31'
+    ext.kotlin_version = '1.7.10'
     ext.about_libs_version = '8.9.4'
-    ext.nav_version = '2.4.1'
+    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/78.txt

@@ -0,0 +1,6 @@
+Verbesserungen:
+- Neue Einstellung zum Deaktivieren der Kartenrotation
+
+Fehler behoben:
+- Fehler bei Filter nach vielen Verbünden behoben (GoingElectric)
+- geringfügige Verbesserung bei Echtzeitdaten

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

@@ -0,0 +1,10 @@
+Verbesserungen:
+- Button um Echtzeitdaten neu zu laden
+
+Fehler behoben:
+- Verfügbarkeit bei defekten Ladestationen wurde als "unbekannt" angezeigt
+- Kostenbeschreibung wurde in manchen Fällen doppelt angezeigt
+- Falsche Darstellung von Öffnungszeiten nach Mitternacht
+- Gespeicherte Details von Favoriten wurden bei Änderungen nicht aktualisiert
+- ggf. falsche Farbe für Echtzeitstatus bei Filter nach Anschlüssen
+- Absturz behoben

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

@@ -0,0 +1,10 @@
+Verbesserungen:
+- Neue Mini-Marker zur Vermeidung von Clustering bei bestimmten Zoomstufen
+- Livedaten für Ladestationen in Köln
+- Android Auto: App startet direkt mit Anzeige der nahe gelegenen Ladestationen (Umschaltung zu Favoriten via Filtermenü)
+- Android Auto: Möglichkeit zum Bearbeiten der Filtereinstellungen auf dem Fahrzeugbildschirm
+
+Fehler behoben:
+- Android Auto: Ladetarifauswahl funktionierte nicht
+- Abstürze behoben
+- Text auf Spendenseite in F-Droid-Version korrigiert

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/de-DE/full_description.txt

@@ -13,4 +13,6 @@ Funktionen:
 
 EVMap ist ein Open-Source-Projekt und unter https://github.com/johan12345/EVMap zu finden.
 
-Die App ist kein offizielles Angebot von GoingElectric.de oder Open Charge Map, sondern nutzt die öffentlichen APIs dieser Seiten.
+Die App ist kein offizielles Angebot von GoingElectric.de oder Open Charge Map, sondern nutzt die öffentlichen APIs dieser Seiten.
+
+Eine Liste der benötigten Berechtigungen mit Beschreibung gibt es unter diesem Link: https://evmap.vonforst.net/de/permissions.html

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

@@ -0,0 +1,6 @@
+Improvements:
+- New option to disable map rotation
+
+Bugfixes:
+- Fixed bug when filtering for many networks (GoingElectric)
+- Minor improvements for realtime data

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

@@ -0,0 +1,10 @@
+Improvements:
+- Added button to reload live availability
+
+Bugfixes:
+- Availability of some broken chargers was shown as "unknown"
+- Cost description was sometimes shown twice
+- Incorrect handling of opening hours after midnight
+- Saved details of favorite chargers were not updated after changes
+- When filtering for specific connectors, realtime status may have had incorrect color
+- Fixed crash

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

@@ -0,0 +1,8 @@
+Improvements:
+- New mini markers to avoid clustering at some zoom levels
+- Android Auto: App launches directly with nearby chargers (switch to favorites now via filter menu)
+- Android Auto: Ability to create and edit filter profiles on the car screen
+
+Bugfixes:
+- Android Auto: Selecting charging plans did not work
+- Fixed crashes

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