Release 1.2.0

fixes #131

.gitattributes

@@ -1,2 +0,0 @@
-_img/screenshots/**/*.png filter=lfs diff=lfs merge=lfs -text
-fastlane/metadata/android/**/images/**/*.png filter=lfs diff=lfs merge=lfs -text

README.md

@@ -1,4 +1,4 @@
-EVMap [![Build Status](https://travis-ci.org/johan12345/EVMap.svg?branch=master)](https://travis-ci.org/johan12345/EVMap)
+EVMap [![Build Status](https://app.travis-ci.com/johan12345/EVMap.svg?branch=master)](https://app.travis-ci.com/johan12345/EVMap)
 =====
 
 <img src="https://raw.githubusercontent.com/johan12345/EVMap/master/_img/feature_graphic.svg" width=700 alt="Logo"/>
@@ -28,38 +28,22 @@ Features
 Screenshots
 -----------
 
-<img src="https://media.githubusercontent.com/media/johan12345/EVMap/master/_img/screenshots/phone/en/mapbox/01_map.png" width=250 alt="Screenshot 1"/><img src="https://media.githubusercontent.com/media/johan12345/EVMap/master/_img/screenshots/phone/en/mapbox/02_detail.png" width=250 alt="Screenshot 2"/>
+<img src="https://raw.githubusercontent.com/johan12345/EVMap/master/_img/screenshots/phone/en/mapbox/01_map.png" width=250 alt="Screenshot 1"/><img src="https://raw.githubusercontent.com/johan12345/EVMap/master/_img/screenshots/phone/en/mapbox/02_detail.png" width=250 alt="Screenshot 2"/>
 
 Development setup
 -----------------
 
-The App is developed using Android Studio.
+The App is developed using Android Studio and should pretty much work out-of-the-box when you clone
+the Git repository and open the project with Android Studio.
 
-For testing the app, you need to obtain free API Keys for the 
-[GoingElectric API](https://www.goingelectric.de/stromtankstellen/api/),
-the [Chargeprice API](https://github.com/chargeprice/chargeprice-api-docs),
-the [OpenChargeMap API](https://openchargemap.org/site/profile/appedit),
-as well as for [Google APIs](https://console.developers.google.com/)
-("Maps SDK for Android" and "Places API" need to be activated) and/or [Mapbox](https://www.mapbox.com/). These API keys need to be put into the
-app in the form of a resource file called `apikeys.xml` under `app/src/main/res/values`, with the
-following content:
+The only exception is that you need to obtain some free API keys for the different data sources that
+EVMap uses and put them into the app in the form of a resource file called `apikeys.xml` under
+`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).
 
-```xml
-<resources>
-    <string name="google_maps_key" templateMergeStrategy="preserve" translatable="false">
-        insert your Google Maps key here
-    </string>
-    <string name="mapbox_key" translatable="false">
-        insert your Mapbox key here
-    </string>
-    <string name="goingelectric_key" translatable="false">
-        insert your GoingElectric key here
-    </string>
-    <string name="chargeprice_key" translatable="false">
-        insert your Chargeprice key here
-    </string>
-    <string name="openchargemap_key" translatable="false">
-        insert your OpenChargeMap key here
-    </string>
-</resources>
-```
+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.
+
+We also have a special [documentation page](doc/android_auto.md) on how to test the Android Auto
+app.

app/build.gradle

@@ -13,8 +13,8 @@ android {
         applicationId "net.vonforst.evmap"
         minSdkVersion 21
         targetSdkVersion 31
-        versionCode 63
-        versionName "1.0.0"
+        versionCode 68
+        versionName "1.2.0"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
@@ -103,29 +103,32 @@ android {
             variant.resValue "string", "chargeprice_key", chargepriceKey
         }
     }
+
+    lintOptions {
+        disable 'NullSafeMutableLiveData'
+    }
 }
 
 dependencies {
-    implementation fileTree(dir: 'libs', include: ['*.jar'])
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
-    implementation 'androidx.appcompat:appcompat:1.3.1'
-    implementation 'androidx.core:core-ktx:1.6.0'
-    implementation 'androidx.core:core-splashscreen:1.0.0-alpha01'
-    implementation "androidx.activity:activity-ktx:1.3.1"
-    implementation "androidx.fragment:fragment-ktx:1.3.6"
+    implementation 'androidx.appcompat:appcompat:1.4.0'
+    implementation 'androidx.core:core-ktx:1.7.0'
+    implementation 'androidx.core:core-splashscreen:1.0.0-alpha02'
+    implementation "androidx.activity:activity-ktx:1.4.0"
+    implementation "androidx.fragment:fragment-ktx:1.4.0"
     implementation 'androidx.cardview:cardview:1.0.0'
     implementation 'androidx.preference:preference-ktx:1.1.1'
-    implementation 'com.google.android.material:material:1.4.0'
-    implementation 'androidx.constraintlayout:constraintlayout:2.1.0'
+    implementation 'com.google.android.material:material:1.5.0-rc01'
+    implementation 'androidx.constraintlayout:constraintlayout:2.1.1'
     implementation 'androidx.recyclerview:recyclerview:1.2.1'
-    implementation 'androidx.browser:browser:1.3.0'
+    implementation 'androidx.browser:browser:1.4.0'
     implementation 'com.github.johan12345:CustomBottomSheetBehavior:f69f532660'
     implementation 'com.squareup.retrofit2:retrofit:2.9.0'
     implementation 'com.squareup.retrofit2:converter-moshi:2.9.0'
     implementation 'com.squareup.okhttp3:okhttp:4.9.0'
     implementation 'com.squareup.okhttp3:okhttp-urlconnection:4.9.0'
-    implementation 'com.squareup.moshi:moshi-kotlin:1.12.0'
-    implementation 'com.squareup.moshi:moshi-adapters:1.12.0'
+    implementation 'com.squareup.moshi:moshi-kotlin:1.13.0'
+    implementation 'com.squareup.moshi:moshi-adapters:1.13.0'
     implementation 'moe.banana:moshi-jsonapi:3.5.0'
     implementation 'moe.banana:moshi-jsonapi-retrofit-converter:3.5.0'
     implementation 'io.coil-kt:coil:1.1.0'
@@ -140,48 +143,34 @@ dependencies {
     implementation 'com.github.romandanylyk:PageIndicatorView:b1bad589b5'
 
     // Android Auto
-    googleImplementation 'androidx.car.app:app:1.1.0-beta01'
-    googleImplementation 'androidx.car.app:app-projected:1.1.0-beta01'
+    googleImplementation 'androidx.car.app:app:1.2.0-alpha02'
+    googleImplementation 'androidx.car.app:app-projected:1.2.0-alpha02'
 
     // AnyMaps
-    def anyMapsVersion = '95ddd6c083'
+    def anyMapsVersion = '751daec281'
     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.1'
     implementation "com.github.johan12345.AnyMaps:anymaps-mapbox:$anyMapsVersion"
 
-    // Google Maps v3 Beta
-    googleImplementation 'com.google.android.libraries.maps:maps:3.1.0-beta'
-    googleImplementation name:'places-maps-sdk-3.1.0-beta', ext:'aar'
-    googleImplementation 'com.android.volley:volley:1.2.0'
-    googleImplementation 'com.google.android.gms:play-services-base:17.5.0'
-    googleImplementation 'com.google.android.gms:play-services-basement:17.5.0'
-    googleImplementation 'com.google.android.gms:play-services-gcm:17.0.0'
-    googleImplementation 'com.google.android.gms:play-services-location:17.1.0'
-    googleImplementation 'com.google.android.gms:play-services-tasks:17.2.0'
-    googleImplementation 'com.google.auto.value:auto-value-annotations:1.6.3'
-    googleImplementation 'com.google.code.gson:gson:2.8.6'
-    googleImplementation 'com.google.android.datatransport:transport-runtime:2.2.5'
-    googleImplementation 'androidx.lifecycle:lifecycle-extensions:2.2.0'
+    // Google Places
+    implementation 'com.google.android.libraries.places:places:2.5.0'
     googleImplementation 'org.jetbrains.kotlinx:kotlinx-coroutines-play-services:1.4.1'
 
-    // Mapbox places (autocomplete)
-    // forked this library and included through JitPack to fix https://github.com/mapbox/mapbox-plugins-android/issues/1011
-    implementation('com.github.johan12345.mapbox-plugins-android:mapbox-android-plugin-places-v9:922bf877f6') {
-        exclude group: 'com.mapbox.mapboxsdk', module: 'mapbox-android-accounts'
-        exclude group: 'com.mapbox.mapboxsdk', module: 'mapbox-android-telemetry'
-    }
+    // Mapbox Geocoding
+    implementation 'com.mapbox.mapboxsdk:mapbox-sdk-services:5.5.0'
 
     // navigation library
     implementation "androidx.navigation:navigation-fragment-ktx:$nav_version"
     implementation "androidx.navigation:navigation-ui-ktx:$nav_version"
 
     // viewmodel library
-    def lifecycle_version = "2.3.1"
+    def lifecycle_version = "2.4.0"
     implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycle_version"
     implementation "androidx.lifecycle:lifecycle-livedata-ktx:$lifecycle_version"
 
     // room library
-    def room_version = "2.3.0"
+    def room_version = "2.4.0"
     implementation "androidx.room:room-runtime:$room_version"
     kapt "androidx.room:room-compiler:$room_version"
     implementation "androidx.room:room-ktx:$room_version"
@@ -200,14 +189,14 @@ dependencies {
     // debug tools
     implementation 'com.facebook.stetho:stetho:1.5.1'
     implementation 'com.facebook.stetho:stetho-okhttp3:1.5.1'
-    testImplementation 'junit:junit:4.13.1'
+    testImplementation 'junit:junit:4.13.2'
     testImplementation "com.squareup.okhttp3:mockwebserver:4.9.0"
     //noinspection GradleDependency
     testImplementation 'org.json:json:20080701'
     androidTestImplementation 'androidx.test.ext:junit:1.1.3'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
 
-    kapt "com.squareup.moshi:moshi-kotlin-codegen:1.12.0"
+    kapt "com.squareup.moshi:moshi-kotlin-codegen:1.13.0"
 
     coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.5'
 }

app/src/debug/res/drawable/ic_launcher_foreground.xml

@@ -0,0 +1,107 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="108dp"
+    android:height="108dp"
+    android:viewportWidth="198.3471"
+    android:viewportHeight="198.3471">
+    <group
+        android:translateX="3.1735537"
+        android:translateY="3.1735537">
+        <group>
+            <clip-path android:pathData="M122.5,57.1c-5.8,-7.7 -15.2,-12.4 -24.7,-12.9H94c-8.1,0.5 -15.9,3.9 -21.7,9.6c-4.3,4.3 -7.4,9.7 -8.6,15.7c-1.5,7.5 -0.1,15.4 3.5,22.1c2.3,4.5 5.2,8.6 8.1,12.8c4.9,6.8 9.8,13.7 13.2,21.3c3.1,6.5 4.9,13.6 5.6,20.8c0.4,0.6 1.1,1 1.7,1.5c2.6,-1 2,-4 2.5,-6.2c1.9,-12.8 8.7,-24.2 16.1,-34.6c6.6,-9.2 14.1,-19 14.4,-30.8V74C128.5,67.9 126.3,61.9 122.5,57.1zM106.2,74.3l-12.2,21V79.5h-5.2V60.3h17.5l-7,14H106.2z" />
+            <path
+                android:pathData="M106.2,74.3h-7"
+                android:strokeAlpha="0.2"
+                android:strokeLineJoin="round"
+                android:strokeWidth="2"
+                android:fillColor="#00000000"
+                android:strokeColor="#212121"
+                android:fillAlpha="0.2" />
+        </group>
+        <group>
+            <clip-path android:pathData="M122.5,57.1c-5.8,-7.7 -15.2,-12.4 -24.7,-12.9H94c-8.1,0.5 -15.9,3.9 -21.7,9.6c-4.3,4.3 -7.4,9.7 -8.6,15.7c-1.5,7.5 -0.1,15.4 3.5,22.1c2.3,4.5 5.2,8.6 8.1,12.8c4.9,6.8 9.8,13.7 13.2,21.3c3.1,6.5 4.9,13.6 5.6,20.8c0.4,0.6 1.1,1 1.7,1.5c2.6,-1 2,-4 2.5,-6.2c1.9,-12.8 8.7,-24.2 16.1,-34.6c6.6,-9.2 14.1,-19 14.4,-30.8V74C128.5,67.9 126.3,61.9 122.5,57.1zM106.2,74.3l-12.2,21V79.5h-5.2V60.3h17.5l-7,14H106.2z" />
+            <path
+                android:pathData="M106.2,60.3c0,0 -17.5,0 -17.5,0"
+                android:strokeAlpha="0.2"
+                android:strokeLineJoin="round"
+                android:strokeWidth="2"
+                android:fillColor="#00000000"
+                android:strokeColor="#212121"
+                android:fillAlpha="0.2" />
+        </group>
+        <group>
+            <clip-path android:pathData="M122.5,57.1c-5.8,-7.7 -15.2,-12.4 -24.7,-12.9H94c-8.1,0.5 -15.9,3.9 -21.7,9.6c-4.3,4.3 -7.4,9.7 -8.6,15.7c-1.5,7.5 -0.1,15.4 3.5,22.1c2.3,4.5 5.2,8.6 8.1,12.8c4.9,6.8 9.8,13.7 13.2,21.3c3.1,6.5 4.9,13.6 5.6,20.8c0.4,0.6 1.1,1 1.7,1.5c2.6,-1 2,-4 2.5,-6.2c1.9,-12.8 8.7,-24.2 16.1,-34.6c6.6,-9.2 14.1,-19 14.4,-30.8V74C128.5,67.9 126.3,61.9 122.5,57.1zM106.2,74.3l-12.2,21V79.5h-5.2V60.3h17.5l-7,14H106.2z" />
+            <path
+                android:pathData="M93.9,79.5L88.7,79.5"
+                android:strokeAlpha="0.2"
+                android:strokeLineJoin="round"
+                android:strokeWidth="2"
+                android:fillColor="#00000000"
+                android:strokeColor="#FFFFFF"
+                android:fillAlpha="0.2" />
+        </group>
+        <group>
+            <clip-path android:pathData="M122.5,57.1c-5.8,-7.7 -15.2,-12.4 -24.7,-12.9H94c-8.1,0.5 -15.9,3.9 -21.7,9.6c-4.3,4.3 -7.4,9.7 -8.6,15.7c-1.5,7.5 -0.1,15.4 3.5,22.1c2.3,4.5 5.2,8.6 8.1,12.8c4.9,6.8 9.8,13.7 13.2,21.3c3.1,6.5 4.9,13.6 5.6,20.8c0.4,0.6 1.1,1 1.7,1.5c2.6,-1 2,-4 2.5,-6.2c1.9,-12.8 8.7,-24.2 16.1,-34.6c6.6,-9.2 14.1,-19 14.4,-30.8V74C128.5,67.9 126.3,61.9 122.5,57.1zM106.2,74.3l-12.2,21V79.5h-5.2V60.3h17.5l-7,14H106.2z" />
+            <path
+                android:strokeWidth="1"
+                android:pathData="M94,79v16.2"
+                android:strokeAlpha="0.2"
+                android:strokeLineJoin="round"
+                android:fillColor="#00000000"
+                android:strokeColor="#212121"
+                android:fillAlpha="0.2"
+                android:strokeLineCap="round" />
+        </group>
+        <group>
+            <clip-path android:pathData="M122.5,57.1c-5.8,-7.7 -15.2,-12.4 -24.7,-12.9H94c-8.1,0.5 -15.9,3.9 -21.7,9.6c-4.3,4.3 -7.4,9.7 -8.6,15.7c-1.5,7.5 -0.1,15.4 3.5,22.1c2.3,4.5 5.2,8.6 8.1,12.8c4.9,6.8 9.8,13.7 13.2,21.3c3.1,6.5 4.9,13.6 5.6,20.8c0.4,0.6 1.1,1 1.7,1.5c2.6,-1 2,-4 2.5,-6.2c1.9,-12.8 8.7,-24.2 16.1,-34.6c6.6,-9.2 14.1,-19 14.4,-30.8V74C128.5,67.9 126.3,61.9 122.5,57.1zM106.2,74.3l-12.2,21V79.5h-5.2V60.3h17.5l-7,14H106.2z" />
+            <path
+                android:strokeWidth="1"
+                android:pathData="M106.2,60.3L99.2,74.3"
+                android:strokeAlpha="0.2"
+                android:strokeLineJoin="round"
+                android:fillColor="#00000000"
+                android:strokeColor="#FFFFFF"
+                android:fillAlpha="0.2"
+                android:strokeLineCap="round" />
+        </group>
+        <group>
+            <clip-path android:pathData="M122.5,57.1c-5.8,-7.7 -15.2,-12.4 -24.7,-12.9H94c-8.1,0.5 -15.9,3.9 -21.7,9.6c-4.3,4.3 -7.4,9.7 -8.6,15.7c-1.5,7.5 -0.1,15.4 3.5,22.1c2.3,4.5 5.2,8.6 8.1,12.8c4.9,6.8 9.8,13.7 13.2,21.3c3.1,6.5 4.9,13.6 5.6,20.8c0.4,0.6 1.1,1 1.7,1.5c2.6,-1 2,-4 2.5,-6.2c1.9,-12.8 8.7,-24.2 16.1,-34.6c6.6,-9.2 14.1,-19 14.4,-30.8V74C128.5,67.9 126.3,61.9 122.5,57.1zM106.2,74.3l-12.2,21V79.5h-5.2V60.3h17.5l-7,14H106.2z" />
+            <path
+                android:strokeWidth="1"
+                android:pathData="M106.2,74.3L93.9,95.2"
+                android:strokeAlpha="0.2"
+                android:strokeLineJoin="round"
+                android:fillColor="#00000000"
+                android:strokeColor="#FFFFFF"
+                android:fillAlpha="0.2"
+                android:strokeLineCap="round" />
+        </group>
+        <path
+            android:pathData="M67.6,120.6L65.7,104l-2.9,0.3l1.9,16.6L67.6,120.6zM77.9,119.4l-1.9,-16.6l-2.9,0.3l1.9,16.6L77.9,119.4z"
+            android:fillColor="#808080" />
+        <path
+            android:pathData="M83.3,142c-0.9,1.1 -1.6,1.8 -1.7,1.9c-2.6,2.1 -4.7,2.7 -6.4,1.9c-3,-1.5 -2.8,-7.1 -2.7,-7.7l2.1,0.1c-0.1,1.6 0.2,5 1.6,5.7c0.8,0.4 2.2,-0.1 4,-1.6l0,0c0,0 5.8,-5.8 4.6,-10.4c-1.4,-5.5 5,-13.4 7.1,-16.1l0.3,-0.3l1.7,1.3l-0.3,0.4c-6.5,8 -7.2,12.1 -6.7,14.2C87.9,135.4 85.2,139.7 83.3,142z"
+            android:fillColor="#9e9e9e" />
+        <path
+            android:pathData="M61.2,120.4l0.8,6.8l6.3,4.2l8.5,-0.9l5.2,-5.5l-0.8,-6.8L61.2,120.4z"
+            android:fillColor="#9e9e9e" />
+        <path
+            android:pathData="M76.7,130.5l-8.5,0.9l1.8,7.5l6.7,-0.8L76.7,130.5L76.7,130.5zM82.8,112.5l0.7,6.2l-24.4,2.8l-0.7,-6.2L82.8,112.5z"
+            android:fillColor="#666666" />
+        <path
+            android:pathData="M101.9,44.1c-17.5,0 -31.7,14.2 -31.7,31.7c0,23.9 26.7,36.4 29.9,70.5c0.1,1 0.9,1.7 1.9,1.7s1.8,-0.7 1.9,-1.7c3.2,-34.1 29.9,-46.6 29.9,-70.5C133.6,58.2 119.4,44.1 101.9,44.1z"
+            android:fillColor="#737373" />
+        <path
+            android:pathData="M101.9,44.8c17.4,0 31.5,14 31.7,31.3c0,-0.1 0,-0.2 0,-0.3c0,-17.5 -14.2,-31.7 -31.7,-31.7S70.2,58.2 70.2,75.8c0,0.1 0,0.2 0,0.3C70.4,58.8 84.5,44.8 101.9,44.8L101.9,44.8z"
+            android:fillColor="#FFFFFF"
+            android:fillAlpha="0.2" />
+        <path
+            android:pathData="M103.8,145.5c-0.1,1 -0.9,1.7 -1.9,1.7s-1.8,-0.7 -1.9,-1.7c-3.1,-34 -29.6,-46.5 -29.8,-70.1c0,0.2 0,0.3 0,0.5c0,23.9 26.7,36.4 29.9,70.5c0.1,1 0.9,1.7 1.9,1.7s1.8,-0.7 1.9,-1.7c3.2,-34.1 29.9,-46.6 29.9,-70.5c0,-0.2 0,-0.3 0,-0.5C133.4,99 106.9,111.5 103.8,145.5L103.8,145.5z"
+            android:fillColor="#303030"
+            android:fillAlpha="0.2" />
+        <path
+            android:fillColor="#FF000000"
+            android:pathData="M94.6,60.3v19.2h5.2v15.7l12.2,-21h-7l7,-14C112.1,60.3 94.6,60.3 94.6,60.3z"
+            android:strokeAlpha="0.45"
+            android:fillAlpha="0.45" />
+    </group>
+</vector>

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

@@ -8,6 +8,7 @@ import androidx.appcompat.app.AppCompatActivity
 import androidx.fragment.app.Fragment
 import androidx.navigation.fragment.findNavController
 import androidx.navigation.ui.setupWithNavController
+import com.google.android.material.transition.MaterialSharedAxis
 import net.vonforst.evmap.MapsActivity
 import net.vonforst.evmap.R
 import net.vonforst.evmap.databinding.FragmentDonateBinding
@@ -15,11 +16,17 @@ import net.vonforst.evmap.databinding.FragmentDonateBinding
 class DonateFragment : Fragment() {
     private lateinit var binding: FragmentDonateBinding
 
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        enterTransition = MaterialSharedAxis(MaterialSharedAxis.X, true)
+        returnTransition = MaterialSharedAxis(MaterialSharedAxis.X, false)
+    }
+
     override fun onCreateView(
         inflater: LayoutInflater,
         container: ViewGroup?,
         savedInstanceState: Bundle?
-    ): View? {
+    ): View {
         binding = FragmentDonateBinding.inflate(inflater, container, false)
         return binding.root
     }
@@ -27,16 +34,13 @@ class DonateFragment : Fragment() {
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         (requireActivity() as AppCompatActivity).setSupportActionBar(binding.toolbar)
 
-        binding.btnDonate.setOnClickListener {
-            (activity as? MapsActivity)?.openUrl(getString(R.string.paypal_link))
-        }
-    }
-
-    override fun onResume() {
-        super.onResume()
         binding.toolbar.setupWithNavController(
             findNavController(),
             (requireActivity() as MapsActivity).appBarConfiguration
         )
+
+        binding.btnDonate.setOnClickListener {
+            (activity as? MapsActivity)?.openUrl(getString(R.string.paypal_link))
+        }
     }
 }

app/src/foss/res/layout/fragment_donate.xml

@@ -23,7 +23,7 @@
 
     <Button
         android:id="@+id/btnDonate"
-        style="@style/Widget.MaterialComponents.Button.Icon"
+        style="@style/Widget.Material3.Button.Icon"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="24dp"

app/src/foss/res/xml/settings_variantspecific.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<PreferenceScreen>
+
+</PreferenceScreen>

app/src/google/java/net/vonforst/evmap/Inits.kt

@@ -5,10 +5,18 @@ import android.content.Context
 import android.util.Log
 import com.google.android.gms.common.ConnectionResult
 import com.google.android.gms.common.GoogleApiAvailability
+import com.google.android.gms.maps.MapsInitializer
 import com.google.android.libraries.places.api.Places
+import net.vonforst.evmap.storage.PreferenceDataSource
+import net.vonforst.evmap.utils.LocaleContextWrapper
 
 fun init(context: Context) {
-    Places.initialize(context, context.getString(R.string.google_maps_key));
+    Places.initialize(context, context.getString(R.string.google_maps_key))
+
+    val localeContext = LocaleContextWrapper.wrap(
+        context.applicationContext, PreferenceDataSource(context).language
+    )
+    MapsInitializer.initialize(localeContext, MapsInitializer.Renderer.LATEST, null)
 }
 
 fun checkPlayServices(activity: Activity): Boolean {

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

@@ -8,6 +8,7 @@ import androidx.car.app.CarContext
 import androidx.car.app.Screen
 import androidx.car.app.Session
 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
@@ -62,6 +63,7 @@ class EVMapSession(val cas: CarAppService) : Session(), LifecycleObserver {
             locationService = null
         }
     }
+    private var serviceBound = false
 
     init {
         lifecycle.addObserver(this)
@@ -89,14 +91,12 @@ class EVMapSession(val cas: CarAppService) : Session(), LifecycleObserver {
     }
 
     private fun onCarHardwareLocationReceived(loc: CarHardwareLocation) {
-        updateLocation(loc.location.value)
+        if (loc.location.status == CarValue.STATUS_SUCCESS && loc.location.value != null) {
+            updateLocation(loc.location.value)
 
-        locationService?.let { service ->
             // we successfully received a location from the car hardware,
             // so we don't need the smartphone location anymore.
-            service.removeLocationUpdates()
-            cas.unbindService(serviceConnection)
-            locationService = null
+            unbindLocationService()
         }
     }
 
@@ -111,7 +111,7 @@ class EVMapSession(val cas: CarAppService) : Session(), LifecycleObserver {
                 ::onCarHardwareLocationReceived
             )
         }
-        cas.bindService(
+        serviceBound = cas.bindService(
             Intent(cas, CarLocationService::class.java),
             serviceConnection,
             Context.BIND_AUTO_CREATE
@@ -119,13 +119,18 @@ class EVMapSession(val cas: CarAppService) : Session(), LifecycleObserver {
     }
 
     @OnLifecycleEvent(Lifecycle.Event.ON_STOP)
-    private fun unbindLocationService() {
+    private fun onStop() {
         if (supportsCarApiLevel3(carContext)) {
             hardwareMan.carSensors.removeCarHardwareLocationListener(::onCarHardwareLocationReceived)
         }
-        locationService?.let { service ->
-            service.removeLocationUpdates()
+        unbindLocationService()
+    }
+
+    private fun unbindLocationService() {
+        locationService?.removeLocationUpdates()
+        if (serviceBound) {
             cas.unbindService(serviceConnection)
+            serviceBound = false
         }
     }
 

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

@@ -0,0 +1,19 @@
+package net.vonforst.evmap.auto
+
+/**
+ * This file lists known mappings between the vehicle model provided by Android Auto's CarInfo API
+ * and human-readable vehicle models as listed by Chargeprice in their vehicle database.
+ */
+
+private val models = mapOf(
+    "Audi" to mapOf(
+        "516 (G4x)" to "e-tron"
+    )
+)
+
+fun getVehicleModel(manufacturer: String?, model: String?) =
+    if (manufacturer != null && model != null) {
+        models[manufacturer]?.get(model) ?: model
+    } else {
+        null
+    }

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

@@ -8,20 +8,27 @@ import androidx.browser.customtabs.CustomTabsIntent
 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.hardware.CarHardwareManager
 import androidx.car.app.hardware.info.Model
 import androidx.car.app.model.*
 import androidx.core.content.ContextCompat
 import androidx.core.graphics.drawable.IconCompat
 import androidx.lifecycle.lifecycleScope
+import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
+import moe.banana.jsonapi2.HasMany
 import moe.banana.jsonapi2.HasOne
+import moe.banana.jsonapi2.JsonBuffer
+import moe.banana.jsonapi2.ResourceIdentifier
 import net.vonforst.evmap.*
 import net.vonforst.evmap.api.chargeprice.*
 import net.vonforst.evmap.model.ChargeLocation
 import net.vonforst.evmap.storage.AppDatabase
 import net.vonforst.evmap.storage.PreferenceDataSource
 import net.vonforst.evmap.ui.currency
+import java.io.IOException
 
 class ChargepriceScreen(ctx: CarContext, val charger: ChargeLocation) : Screen(ctx) {
     private val prefs = PreferenceDataSource(ctx)
@@ -31,9 +38,11 @@ class ChargepriceScreen(ctx: CarContext, val charger: ChargeLocation) : Screen(c
     }
     private var prices: List<ChargePrice>? = null
     private var meta: ChargepriceChargepointMeta? = null
-    private val maxRows = 6
+    private val maxRows = if (ctx.carAppApiLevel >= 2) {
+        ctx.constraintManager.getContentLimit(ConstraintManager.CONTENT_LIMIT_TYPE_LIST)
+    } else 6
     private var errorMessage: String? = null
-    private val batteryRange = listOf(20.0, 80.0)
+    private val batteryRange = prefs.chargepriceBatteryRangeAndroidAuto
 
     override fun onGetTemplate(): Template {
         if (prices == null) loadData()
@@ -162,99 +171,151 @@ class ChargepriceScreen(ctx: CarContext, val charger: ChargeLocation) : Screen(c
     private fun loadPrices(model: Model?) {
         val dataAdapter = getDataAdapter() ?: return
         val manufacturer = model?.manufacturer?.value
-        val modelName = model?.name?.value
+        val modelName = getVehicleModel(model?.manufacturer?.value, model?.name?.value)
         lifecycleScope.launch {
-            var vehicles = api.getVehicles().filter {
-                it.id in prefs.chargepriceMyVehicles
-            }
-            if (vehicles.isEmpty()) {
-                errorMessage = carContext.getString(R.string.chargeprice_select_car_first)
-                invalidate()
-                return@launch
-            } else if (vehicles.size > 1) {
-                if (manufacturer != null && modelName != null) {
-                    vehicles = vehicles.filter {
-                        it.brand == manufacturer && it.name.startsWith(modelName)
-                    }
-                    if (vehicles.isEmpty()) {
-                        errorMessage = carContext.getString(
-                            R.string.auto_chargeprice_vehicle_unknown,
-                            manufacturer,
-                            modelName
-                        )
-                        invalidate()
-                        return@launch
-                    } else if (vehicles.size > 1) {
-                        errorMessage = carContext.getString(
-                            R.string.auto_chargeprice_vehicle_ambiguous,
-                            manufacturer,
-                            modelName
-                        )
-                        invalidate()
-                        return@launch
-                    }
-                } else {
+            try {
+                val car = determineVehicle(manufacturer, modelName)
+                val cpStation = ChargepriceStation.fromEvmap(charger, car.compatibleEvmapConnectors)
+                val result = api.getChargePrices(ChargepriceRequest().apply {
+                    this.dataAdapter = dataAdapter
+                    station = cpStation
+                    vehicle = HasOne(car)
+                    tariffs = if (!prefs.chargepriceMyTariffsAll) {
+                        val myTariffs = prefs.chargepriceMyTariffs ?: emptySet()
+                        HasMany<ChargepriceTariff>(*myTariffs.map {
+                            ResourceIdentifier(
+                                "tariff",
+                                it
+                            )
+                        }.toTypedArray()).apply {
+                            meta = JsonBuffer.create(
+                                ChargepriceApi.moshi.adapter(ChargepriceRequestTariffMeta::class.java),
+                                ChargepriceRequestTariffMeta(ChargepriceInclude.ALWAYS)
+                            )
+                        }
+                    } else null
+                    options = ChargepriceOptions(
+                        batteryRange = batteryRange.map { it.toDouble() },
+                        providerCustomerTariffs = prefs.chargepriceShowProviderCustomerTariffs,
+                        maxMonthlyFees = if (prefs.chargepriceNoBaseFee) 0.0 else null,
+                        currency = prefs.chargepriceCurrency
+                    )
+                }, ChargepriceApi.getChargepriceLanguage())
+
+                val myTariffs = prefs.chargepriceMyTariffs
+
+                // choose the highest power chargepoint compatible with the car
+                val chargepoint = cpStation.chargePoints.filterIndexed { i, cp ->
+                    charger.chargepointsMerged[i].type in car.compatibleEvmapConnectors
+                }.maxByOrNull { it.power }
+                if (chargepoint == null) {
                     errorMessage =
-                        carContext.getString(R.string.auto_chargeprice_vehicle_unavailable)
+                        carContext.getString(R.string.chargeprice_no_compatible_connectors)
                     invalidate()
                     return@launch
                 }
-            }
-            val car = vehicles[0]
+                meta =
+                    (result.meta.get<ChargepriceMeta>(ChargepriceApi.moshi.adapter(ChargepriceMeta::class.java)) as ChargepriceMeta).chargePoints.filterIndexed { i, cp ->
+                        charger.chargepointsMerged[i].type in car.compatibleEvmapConnectors
+                    }.maxByOrNull {
+                        it.power
+                    }
 
-            val cpStation = ChargepriceStation.fromEvmap(charger, car.compatibleEvmapConnectors)
-            val result = api.getChargePrices(ChargepriceRequest().apply {
-                this.dataAdapter = dataAdapter
-                station = cpStation
-                vehicle = HasOne(car)
-                options = ChargepriceOptions(
-                    batteryRange = batteryRange,
-                    providerCustomerTariffs = prefs.chargepriceShowProviderCustomerTariffs,
-                    maxMonthlyFees = if (prefs.chargepriceNoBaseFee) 0.0 else null,
-                    currency = prefs.chargepriceCurrency
-                )
-            }, ChargepriceApi.getChargepriceLanguage())
-
-            val myTariffs = prefs.chargepriceMyTariffs
-
-            // choose the highest power chargepoint compatible with the car
-            val chargepoint = cpStation.chargePoints.filterIndexed { i, cp ->
-                charger.chargepointsMerged[i].type in car.compatibleEvmapConnectors
-            }.maxByOrNull { it.power }
-            if (chargepoint == null) {
-                errorMessage = carContext.getString(R.string.chargeprice_no_compatible_connectors)
+                prices = result.map { cp ->
+                    val filteredPrices =
+                        cp.chargepointPrices.filter {
+                            it.plug == chargepoint.plug && it.power == chargepoint.power
+                        }
+                    if (filteredPrices.isEmpty()) {
+                        null
+                    } else {
+                        cp.clone().apply {
+                            chargepointPrices = filteredPrices
+                        }
+                    }
+                }.filterNotNull()
+                    .sortedBy { it.chargepointPrices.first().price }
+                    .sortedByDescending {
+                        prefs.chargepriceMyTariffsAll ||
+                                myTariffs != null && it.tariff?.get()?.id in myTariffs
+                    }
+                invalidate()
+            } catch (e: IOException) {
+                withContext(Dispatchers.Main) {
+                    CarToast.makeText(
+                        carContext,
+                        R.string.chargeprice_connection_error,
+                        CarToast.LENGTH_LONG
+                    )
+                        .show()
+                }
+            } catch (e: NoVehicleSelectedException) {
+                errorMessage = carContext.getString(R.string.chargeprice_select_car_first)
+                invalidate()
+            } catch (e: VehicleUnknownException) {
+                errorMessage = carContext.getString(
+                    R.string.auto_chargeprice_vehicle_unknown,
+                    manufacturer,
+                    modelName
+                )
+                invalidate()
+            } catch (e: VehicleAmbiguousException) {
+                errorMessage = carContext.getString(
+                    R.string.auto_chargeprice_vehicle_ambiguous,
+                    manufacturer,
+                    modelName
+                )
+                invalidate()
+            } catch (e: VehicleUnavailableException) {
+                errorMessage =
+                    carContext.getString(R.string.auto_chargeprice_vehicle_unavailable)
                 invalidate()
-                return@launch
             }
-            meta =
-                (result.meta.get<ChargepriceMeta>(ChargepriceApi.moshi.adapter(ChargepriceMeta::class.java)) as ChargepriceMeta).chargePoints.filterIndexed { i, cp ->
-                    charger.chargepointsMerged[i].type in car.compatibleEvmapConnectors
-                }.maxByOrNull {
-                    it.power
-                }
-
-            prices = result.map { cp ->
-                val filteredPrices =
-                    cp.chargepointPrices.filter {
-                        it.plug == chargepoint.plug && it.power == chargepoint.power
-                    }
-                if (filteredPrices.isEmpty()) {
-                    null
-                } else {
-                    cp.clone().apply {
-                        chargepointPrices = filteredPrices
-                    }
-                }
-            }.filterNotNull()
-                .sortedBy { it.chargepointPrices.first().price }
-                .sortedByDescending {
-                    prefs.chargepriceMyTariffsAll ||
-                            myTariffs != null && it.tariff?.get()?.id in myTariffs
-                }
-            invalidate()
         }
     }
 
+    private class NoVehicleSelectedException : Exception()
+    private class VehicleUnknownException : Exception()
+    private class VehicleAmbiguousException : Exception()
+    private class VehicleUnavailableException : Exception()
+
+    private suspend fun determineVehicle(
+        manufacturer: String?,
+        modelName: String?
+    ): ChargepriceCar {
+        var vehicles = api.getVehicles().filter {
+            it.id in prefs.chargepriceMyVehicles
+        }
+        if (vehicles.isEmpty()) {
+            throw NoVehicleSelectedException()
+        } else if (vehicles.size > 1) {
+            if (manufacturer != null) {
+                vehicles = vehicles.filter {
+                    it.brand == manufacturer
+                }
+                if (vehicles.isEmpty()) {
+                    throw VehicleUnknownException()
+                } else if (vehicles.size > 1) {
+                    if (modelName != null) {
+                        vehicles = vehicles.filter {
+                            it.name.startsWith(modelName)
+                        }
+                        if (vehicles.isEmpty()) {
+                            throw VehicleUnknownException()
+                        } else if (vehicles.size > 1) {
+                            throw VehicleAmbiguousException()
+                        }
+                    } else {
+                        throw VehicleAmbiguousException()
+                    }
+                }
+            } else {
+                throw VehicleUnavailableException()
+            }
+        }
+        return vehicles[0]
+    }
+
     private fun getDataAdapter(): String? = when (charger.dataSource) {
         "goingelectric" -> ChargepriceApi.DATA_SOURCE_GOINGELECTRIC
         "openchargemap" -> ChargepriceApi.DATA_SOURCE_OPENCHARGEMAP

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

@@ -2,6 +2,7 @@ package net.vonforst.evmap.auto
 
 import android.content.Intent
 import android.graphics.Bitmap
+import android.graphics.Canvas
 import android.graphics.drawable.BitmapDrawable
 import android.net.Uri
 import android.text.SpannableStringBuilder
@@ -9,8 +10,11 @@ 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.core.graphics.scale
+import androidx.core.text.HtmlCompat
 import androidx.lifecycle.lifecycleScope
 import coil.imageLoader
 import coil.request.ImageRequest
@@ -50,10 +54,18 @@ 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 iconGen =
         ChargerIconGenerator(carContext, null, oversize = 1.4f, height = imageSize)
 
+    private val maxRows = if (ctx.carAppApiLevel >= 2) {
+        ctx.constraintManager.getContentLimit(ConstraintManager.CONTENT_LIMIT_TYPE_PANE)
+    } else 2
+    private val largeImageSupported =
+        ctx.carAppApiLevel >= 4  // since API 4, Row.setImage is supported
+
     init {
         referenceData.observe(this) {
             loadCharger()
@@ -66,86 +78,21 @@ class ChargerDetailScreen(ctx: CarContext, val chargerSparse: ChargeLocation) :
         return PaneTemplate.Builder(
             Pane.Builder().apply {
                 charger?.let { charger ->
-                    addRow(Row.Builder().apply {
-                        setTitle(charger.address.toString())
-
-                        val icon = iconGen.getBitmap(
-                            tint = getMarkerTint(charger),
-                            fault = charger.faultReport != null,
-                            multi = charger.isMulti()
-                        )
-                        setImage(
-                            CarIcon.Builder(IconCompat.createWithBitmap(icon)).build(),
-                            Row.IMAGE_TYPE_LARGE
-                        )
-
-                        val chargepointsText = SpannableStringBuilder()
-                        charger.chargepointsMerged.forEachIndexed { i, cp ->
-                            if (i > 0) chargepointsText.append(" · ")
-                            chargepointsText.append(
-                                "${cp.count}× ${
-                                    nameForPlugType(
-                                        carContext.stringProvider(),
-                                        cp.type
+                    if (largeImageSupported && photo != null) {
+                        setImage(CarIcon.Builder(IconCompat.createWithBitmap(photo)).build())
+                    }
+                    generateRows(charger).forEach { addRow(it) }
+                    addAction(
+                        Action.Builder()
+                            .setIcon(
+                                CarIcon.Builder(
+                                    IconCompat.createWithResource(
+                                        carContext,
+                                        R.drawable.ic_navigation
                                     )
-                                } ${cp.formatPower()}"
+                                ).build()
                             )
-                            availability?.status?.get(cp)?.let { status ->
-                                chargepointsText.append(
-                                    " (${availabilityText(status)}/${cp.count})",
-                                    ForegroundCarColorSpan.create(carAvailabilityColor(status)),
-                                    Spanned.SPAN_EXCLUSIVE_EXCLUSIVE
-                                )
-                            }
-                        }
-                        addText(chargepointsText)
-                    }.build())
-                    addRow(Row.Builder().apply {
-                        photo?.let {
-                            setImage(
-                                CarIcon.Builder(IconCompat.createWithBitmap(photo)).build(),
-                                Row.IMAGE_TYPE_LARGE
-                            )
-                        }
-                        val operatorText = StringBuilder().apply {
-                            charger.operator?.let { append(it) }
-                            charger.network?.let {
-                                if (isNotEmpty()) append(" · ")
-                                append(it)
-                            }
-                        }.ifEmpty {
-                            carContext.getString(R.string.unknown_operator)
-                        }
-                        setTitle(operatorText)
-
-                        charger.cost?.let { addText(it.getStatusText(carContext, emoji = true)) }
-                        charger.faultReport?.created?.let {
-                            addText(
-                                carContext.getString(
-                                    R.string.auto_fault_report_date,
-                                    it.atZone(ZoneId.systemDefault())
-                                        .format(DateTimeFormatter.ofLocalizedDate(FormatStyle.SHORT))
-                                )
-                            )
-                        }
-
-                        /*val types = charger.chargepoints.map { it.type }.distinct()
-                        if (types.size == 1) {
-                            setImage(
-                                CarIcon.of(IconCompat.createWithResource(carContext, iconForPlugType(types[0]))),
-                                Row.IMAGE_TYPE_ICON)
-                        }*/
-                    }.build())
-                    addAction(Action.Builder()
-                        .setIcon(
-                            CarIcon.Builder(
-                                IconCompat.createWithResource(
-                                    carContext,
-                                    R.drawable.ic_navigation
-                                )
-                            ).build()
-                        )
-                        .setTitle(carContext.getString(R.string.navigate))
+                            .setTitle(carContext.getString(R.string.navigate))
                         .setBackgroundColor(CarColor.PRIMARY)
                         .setOnClickListener {
                             navigateToCharger(charger)
@@ -197,6 +144,144 @@ class ChargerDetailScreen(ctx: CarContext, val chargerSparse: ChargeLocation) :
         }.build()
     }
 
+    private fun generateRows(charger: ChargeLocation): List<Row> {
+        val rows = mutableListOf<Row>()
+
+        // Row 1: address + chargepoints
+        rows.add(Row.Builder().apply {
+            setTitle(charger.address.toString())
+
+            if (photo == null) {
+                // show just the icon
+                val icon = iconGen.getBitmap(
+                    tint = getMarkerTint(charger),
+                    fault = charger.faultReport != null,
+                    multi = charger.isMulti()
+                )
+                setImage(
+                    CarIcon.Builder(IconCompat.createWithBitmap(icon)).build(),
+                    Row.IMAGE_TYPE_LARGE
+                )
+            } else if (!largeImageSupported) {
+                // show the photo with icon
+                setImage(
+                    CarIcon.Builder(IconCompat.createWithBitmap(photo)).build(),
+                    Row.IMAGE_TYPE_LARGE
+                )
+            }
+            addText(generateChargepointsText(charger))
+        }.build())
+        if (maxRows <= 3) {
+            // row 2: operator + cost + fault report
+            rows.add(Row.Builder().apply {
+                if (photo != null && !largeImageSupported) {
+                    setImage(
+                        CarIcon.Builder(IconCompat.createWithBitmap(photo)).build(),
+                        Row.IMAGE_TYPE_LARGE
+                    )
+                }
+                val operatorText = generateOperatorText(charger)
+                setTitle(operatorText)
+
+                charger.cost?.let { addText(it.getStatusText(carContext, emoji = true)) }
+                charger.faultReport?.let { fault ->
+                    addText(
+                        carContext.getString(
+                            R.string.auto_fault_report_date,
+                            fault.created?.atZone(ZoneId.systemDefault())
+                                ?.format(DateTimeFormatter.ofLocalizedDate(FormatStyle.SHORT))
+                        )
+                    )
+                }
+            }.build())
+        } else {
+            // row 2: operator + cost + cost description
+            rows.add(Row.Builder().apply {
+                if (photo != null && !largeImageSupported) {
+                    setImage(
+                        CarIcon.Builder(IconCompat.createWithBitmap(photo)).build(),
+                        Row.IMAGE_TYPE_LARGE
+                    )
+                }
+                val operatorText = generateOperatorText(charger)
+                setTitle(operatorText)
+                charger.cost?.let {
+                    addText(it.getStatusText(carContext, emoji = true))
+                    (it.descriptionShort ?: it.descriptionLong)?.let { addText(it) }
+                }
+            }.build())
+            // row 3: fault report (if exists)
+            charger.faultReport?.let { fault ->
+                rows.add(Row.Builder().apply {
+                    setTitle(
+                        carContext.getString(
+                            R.string.auto_fault_report_date,
+                            fault.created?.atZone(ZoneId.systemDefault())
+                                ?.format(DateTimeFormatter.ofLocalizedDate(FormatStyle.SHORT))
+                        )
+                    )
+                    fault.description?.let {
+                        addText(
+                            HtmlCompat.fromHtml(
+                                it.replace("\n", " · "),
+                                HtmlCompat.FROM_HTML_MODE_LEGACY
+                            )
+                        )
+                    }
+                }.build())
+            }
+            // row 4: opening hours + location description
+            charger.openinghours?.let { hours ->
+                rows.add(Row.Builder().apply {
+                    setTitle(hours.getStatusText(carContext))
+                    hours.description?.let { addText(it) }
+                    charger.locationDescription?.let { addText(it) }
+                }.build())
+            }
+        }
+        return rows
+    }
+
+    private fun generateChargepointsText(charger: ChargeLocation): SpannableStringBuilder {
+        val chargepointsText = SpannableStringBuilder()
+        charger.chargepointsMerged.forEachIndexed { i, cp ->
+            if (i > 0) chargepointsText.append(" · ")
+            chargepointsText.append(
+                "${cp.count}× ${
+                    nameForPlugType(
+                        carContext.stringProvider(),
+                        cp.type
+                    )
+                } ${cp.formatPower()}"
+            )
+            availability?.status?.get(cp)?.let { status ->
+                chargepointsText.append(
+                    " (${availabilityText(status)}/${cp.count})",
+                    ForegroundCarColorSpan.create(carAvailabilityColor(status)),
+                    Spanned.SPAN_EXCLUSIVE_EXCLUSIVE
+                )
+            }
+        }
+        return chargepointsText
+    }
+
+    private fun generateOperatorText(charger: ChargeLocation) =
+        if (charger.operator != null && charger.network != null) {
+            if (charger.operator.contains(charger.network)) {
+                charger.operator
+            } else if (charger.network.contains(charger.operator)) {
+                charger.network
+            } else {
+                "${charger.operator} · ${charger.network}"
+            }
+        } else if (charger.operator != null) {
+            charger.operator
+        } else if (charger.network != null) {
+            charger.network
+        } else {
+            carContext.getString(R.string.unknown_operator)
+        }
+
     private fun navigateToCharger(charger: ChargeLocation) {
         val coord = charger.coordinates
         val intent =
@@ -212,18 +297,47 @@ class ChargerDetailScreen(ctx: CarContext, val chargerSparse: ChargeLocation) :
         lifecycleScope.launch {
             val response = api.getChargepointDetail(referenceData, chargerSparse.id)
             if (response.status == Status.SUCCESS) {
-                charger = response.data!!
+                val charger = response.data!!
 
-                val photo = charger?.photos?.firstOrNull()
+                val photo = charger.photos?.firstOrNull()
                 photo?.let {
-                    val size = (carContext.resources.displayMetrics.density * 64).roundToInt()
-                    val url = photo.getUrl(size = size)
+                    val density = carContext.resources.displayMetrics.density
+                    val url = if (largeImageSupported) {
+                        photo.getUrl(
+                            width = (imageWidthLarge * density).roundToInt(),
+                            height = (imageHeightLarge * density).roundToInt()
+                        )
+                    } else {
+                        photo.getUrl(size = (imageSize * density).roundToInt())
+                    }
                     val request = ImageRequest.Builder(carContext).data(url).build()
-                    this@ChargerDetailScreen.photo =
+                    var img =
                         (carContext.imageLoader.execute(request).drawable as BitmapDrawable).bitmap
-                }
 
-                availability = charger?.let { getAvailability(it).data }
+                    // draw icon on top of image
+                    val icon = iconGen.getBitmap(
+                        tint = getMarkerTint(charger),
+                        fault = charger.faultReport != null,
+                        multi = charger.isMulti()
+                    )
+
+                    img = img.copy(Bitmap.Config.ARGB_8888, true)
+                    val iconSmall = icon.scale(
+                        (img.height * 0.4 / icon.height * icon.width).roundToInt(),
+                        (img.height * 0.4).roundToInt()
+                    )
+                    val canvas = Canvas(img)
+                    canvas.drawBitmap(
+                        iconSmall,
+                        0f,
+                        (img.height - iconSmall.height * 1.1).toFloat(),
+                        null
+                    )
+                    this@ChargerDetailScreen.photo = img
+                }
+                this@ChargerDetailScreen.charger = charger
+
+                availability = getAvailability(charger).data
 
                 invalidate()
             } else {

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

@@ -7,7 +7,9 @@ import androidx.car.app.model.*
 import androidx.core.graphics.drawable.IconCompat
 import androidx.lifecycle.LiveData
 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.storage.AppDatabase
 import net.vonforst.evmap.storage.FilterProfile
 import net.vonforst.evmap.storage.PreferenceDataSource
@@ -40,9 +42,12 @@ class FilterScreen(ctx: CarContext) : Screen(ctx) {
     }
 
     override fun onGetTemplate(): Template {
+        val filterStatus =
+            prefs.filterStatus.takeUnless { it == FILTERS_CUSTOM || it == FILTERS_FAVORITES }
+                ?: FILTERS_DISABLED
         return ListTemplate.Builder().apply {
             filterProfiles.value?.let {
-                setSingleList(buildFilterProfilesList(it.take(maxRows), prefs.filterStatus))
+                setSingleList(buildFilterProfilesList(it.take(maxRows), filterStatus))
             } ?: setLoading(true)
             setTitle(carContext.getString(R.string.menu_filter))
             setHeaderAction(Action.BACK)

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

@@ -1,5 +1,6 @@
 package net.vonforst.evmap.auto
 
+import android.content.pm.PackageManager
 import android.location.Location
 import android.text.SpannableStringBuilder
 import android.text.Spanned
@@ -7,10 +8,14 @@ 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.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.Lifecycle
 import androidx.lifecycle.MutableLiveData
+import androidx.lifecycle.OnLifecycleEvent
 import androidx.lifecycle.lifecycleScope
 import com.car2go.maps.model.LatLng
 import kotlinx.coroutines.*
@@ -22,6 +27,7 @@ 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
 import net.vonforst.evmap.ui.availabilityText
@@ -33,6 +39,7 @@ import net.vonforst.evmap.viewmodel.getFilters
 import net.vonforst.evmap.viewmodel.getReferenceData
 import java.io.IOException
 import java.time.Duration
+import java.time.Instant
 import java.time.ZonedDateTime
 import kotlin.collections.set
 import kotlin.math.roundToInt
@@ -51,7 +58,8 @@ class MapScreen(ctx: CarContext, val session: EVMapSession, val favorites: Boole
     private val maxNumUpdates = 1
 
     private var location: Location? = null
-    private var lastUpdateLocation: Location? = null
+    private var lastChargerUpdateLocation: Location? = null
+    private var lastDistanceUpdateTime: Instant? = null
     private var chargers: List<ChargeLocation>? = null
     private var prefs = PreferenceDataSource(ctx)
     private val db = AppDatabase.getInstance(carContext)
@@ -59,7 +67,8 @@ class MapScreen(ctx: CarContext, val session: EVMapSession, val favorites: Boole
         createApi(prefs.dataSource, ctx)
     }
     private val searchRadius = 5 // kilometers
-    private val updateThreshold = 2000 // meters
+    private val chargerUpdateThreshold = 2000 // meters
+    private val distanceUpdateThreshold = Duration.ofSeconds(15)
     private val availabilityUpdateThreshold = Duration.ofMinutes(1)
     private var availabilities: MutableMap<Long, Pair<ZonedDateTime, ChargeLocationStatus>> =
         HashMap()
@@ -69,12 +78,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 } ?: FILTERS_DISABLED
+        value = prefs.filterStatus.takeUnless { it == FILTERS_CUSTOM || it == FILTERS_FAVORITES }
+            ?: FILTERS_DISABLED
     }
     private val filterValues = db.filterValueDao().getFilterValues(filterStatus, prefs.dataSource)
     private val filters = api.getFilters(referenceData, carContext.stringProvider())
     private val filtersWithValue = filtersWithValue(filters, filterValues)
 
+    private val hardwareMan = ctx.getCarService(CarContext.HARDWARE_SERVICE) as CarHardwareManager
+    private var energyLevel: EnergyLevel? = null
+
     init {
         filtersWithValue.observe(this) {
             loadChargers()
@@ -139,7 +152,9 @@ class MapScreen(ctx: CarContext, val session: EVMapSession, val favorites: Boole
                             screenManager.pushForResult(FilterScreen(carContext)) {
                                 chargers = null
                                 numUpdates = 0
-                                filterStatus.value = prefs.filterStatus
+                                filterStatus.value =
+                                    prefs.filterStatus.takeUnless { it == FILTERS_CUSTOM || it == FILTERS_FAVORITES }
+                                        ?: FILTERS_DISABLED
                             }
                             session.mapScreen = null
                         }
@@ -151,7 +166,12 @@ class MapScreen(ctx: CarContext, val session: EVMapSession, val favorites: Boole
     }
 
     private fun formatCharger(charger: ChargeLocation, showCity: Boolean): Row {
-        val color = ContextCompat.getColor(carContext, getMarkerTint(charger))
+        val markerTint = if (charger.maxPower > 100) {
+            R.color.charger_100kw_dark  // slightly darker color for better contrast
+        } else {
+            getMarkerTint(charger)
+        }
+        val color = ContextCompat.getColor(carContext, markerTint)
         val place =
             Place.Builder(CarLocation.create(charger.coordinates.lat, charger.coordinates.lng))
                 .setMarker(
@@ -177,13 +197,18 @@ class MapScreen(ctx: CarContext, val session: EVMapSession, val favorites: Boole
 
             // distance
             location?.let {
-                val distance = distanceBetween(
+                val distanceMeters = distanceBetween(
                     it.latitude, it.longitude,
                     charger.coordinates.lat, charger.coordinates.lng
-                ) / 1000
+                )
                 text.append(
                     "distance",
-                    DistanceSpan.create(Distance.create(distance, Distance.UNIT_KILOMETERS)),
+                    DistanceSpan.create(
+                        roundValueToDistance(
+                            distanceMeters,
+                            energyLevel?.distanceDisplayUnit?.value
+                        )
+                    ),
                     Spanned.SPAN_EXCLUSIVE_EXCLUSIVE
                 )
             }
@@ -231,12 +256,19 @@ class MapScreen(ctx: CarContext, val session: EVMapSession, val favorites: Boole
             return
         }
 
-        invalidate()
-
-        if (lastUpdateLocation == null ||
-            location.distanceTo(lastUpdateLocation) > updateThreshold
+        val now = Instant.now()
+        if (lastDistanceUpdateTime == null ||
+            Duration.between(lastDistanceUpdateTime, now) > distanceUpdateThreshold
         ) {
-            lastUpdateLocation = location
+            lastDistanceUpdateTime = now
+            // update displayed distances
+            invalidate()
+        }
+
+        if (lastChargerUpdateLocation == null ||
+            location.distanceTo(lastChargerUpdateLocation) > chargerUpdateThreshold
+        ) {
+            lastChargerUpdateLocation = location
             // update displayed chargers
             loadChargers()
         }
@@ -312,6 +344,7 @@ class MapScreen(ctx: CarContext, val session: EVMapSession, val favorites: Boole
                 }?.awaitAll()
 
                 updateCoroutine = null
+                lastDistanceUpdateTime = Instant.now()
                 invalidate()
             } catch (e: IOException) {
                 withContext(Dispatchers.Main) {
@@ -321,4 +354,30 @@ class MapScreen(ctx: CarContext, val session: EVMapSession, val favorites: Boole
             }
         }
     }
+
+    private fun onEnergyLevelUpdated(energyLevel: EnergyLevel) {
+        this.energyLevel = energyLevel
+        invalidate()
+    }
+
+    @OnLifecycleEvent(Lifecycle.Event.ON_RESUME)
+    private fun setupListeners() {
+        if (ContextCompat.checkSelfPermission(
+                carContext,
+                "com.google.android.gms.permission.CAR_FUEL"
+            ) != PackageManager.PERMISSION_GRANTED
+        )
+            return
+
+        println("Setting up energy level listener")
+
+        val exec = ContextCompat.getMainExecutor(carContext)
+        hardwareMan.carInfo.addEnergyLevelListener(exec, ::onEnergyLevelUpdated)
+    }
+
+    @OnLifecycleEvent(Lifecycle.Event.ON_PAUSE)
+    private fun removeListeners() {
+        println("Removing energy level listener")
+        hardwareMan.carInfo.removeEnergyLevelListener(::onEnergyLevelUpdated)
+    }
 }

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

@@ -7,10 +7,12 @@ import androidx.car.app.constraints.ConstraintManager
 import androidx.car.app.hardware.common.CarUnit
 import androidx.car.app.model.CarColor
 import androidx.car.app.model.CarIcon
+import androidx.car.app.model.Distance
 import androidx.car.app.versioning.CarAppApiLevels
 import androidx.core.graphics.drawable.IconCompat
 import net.vonforst.evmap.api.availability.ChargepointStatus
 import java.util.*
+import kotlin.math.roundToInt
 
 fun carAvailabilityColor(status: List<ChargepointStatus>): CarColor {
     val unknown = status.any { it == ChargepointStatus.UNKNOWN }
@@ -34,14 +36,22 @@ val CarContext.constraintManager
 fun Bitmap.asCarIcon(): CarIcon = CarIcon.Builder(IconCompat.createWithBitmap(this)).build()
 
 private const val kmPerMile = 1.609344
+private const val ftPerMile = 5280
+private const val ydPerMile = 1760
 
 fun getDefaultDistanceUnit(): Int {
-    return when (Locale.getDefault().country) {
-        "US", "GB", "MM", "LR" -> CarUnit.MILE
-        else -> CarUnit.KILOMETER
+    return if (usesImperialUnits(Locale.getDefault())) {
+        CarUnit.MILE
+    } else {
+        CarUnit.KILOMETER
     }
 }
 
+fun usesImperialUnits(locale: Locale): Boolean {
+    return locale.country in listOf("US", "GB", "MM", "LR")
+            || locale.country == "" && locale.language == "en"
+}
+
 fun getDefaultSpeedUnit(): Int {
     return when (Locale.getDefault().country) {
         "US", "GB", "MM", "LR" -> CarUnit.MILES_PER_HOUR
@@ -72,6 +82,52 @@ fun formatCarUnitSpeed(value: Float?, unit: Int?): String {
     }
 }
 
+fun roundValueToDistance(value: Double, unit: Int? = null): Distance {
+    // value is in meters
+    when (unit ?: getDefaultDistanceUnit()) {
+        CarUnit.MILE -> {
+            // imperial system
+            val miles = value / 1000 / kmPerMile
+            val yards = miles * ydPerMile
+            val feet = miles * ftPerMile
+
+            return when (miles) {
+                in 0.0..0.1 -> if (Locale.getDefault().country == "UK") {
+                    Distance.create(roundToMultipleOf(yards, 10.0), Distance.UNIT_YARDS)
+                } else {
+                    Distance.create(roundToMultipleOf(feet, 10.0), Distance.UNIT_FEET)
+                }
+                in 0.1..10.0 -> Distance.create(
+                    roundToMultipleOf(miles, 0.1),
+                    Distance.UNIT_MILES_P1
+                )
+                else -> Distance.create(roundToMultipleOf(miles, 1.0), Distance.UNIT_MILES)
+            }
+        }
+        else -> {
+            // metric system
+            return when (value) {
+                in 0.0..999.0 -> Distance.create(
+                    roundToMultipleOf(value, 10.0),
+                    Distance.UNIT_METERS
+                )
+                in 1000.0..10000.0 -> Distance.create(
+                    roundToMultipleOf(value / 1000, 0.1),
+                    Distance.UNIT_KILOMETERS_P1
+                )
+                else -> Distance.create(
+                    roundToMultipleOf(value / 1000, 1.0),
+                    Distance.UNIT_KILOMETERS
+                )
+            }
+        }
+    }
+}
+
+private fun roundToMultipleOf(num: Double, step: Double): Double {
+    return (num / step).roundToInt() * step
+}
+
 fun getAndroidAutoVersion(ctx: Context): List<String> {
     val info = ctx.packageManager.getPackageInfo("com.google.android.projection.gearhead", 0)
     return info.versionName.split(".")

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

@@ -59,7 +59,12 @@ class VehicleDataScreen(ctx: CarContext) : Screen(ctx), LifecycleObserver {
         return GridTemplate.Builder().apply {
             setTitle(
                 if (model != null && model.manufacturer.value != null && model.name.value != null) {
-                    "${model.manufacturer.value} ${model.name.value}"
+                    "${model.manufacturer.value} ${
+                        getVehicleModel(
+                            model.manufacturer.value,
+                            model.name.value
+                        )
+                    }"
                 } else {
                     carContext.getString(R.string.auto_vehicle_data)
                 }

app/src/google/java/net/vonforst/evmap/autocomplete/GooglePlacesAutocompleteProvider.kt

@@ -7,9 +7,9 @@ import android.text.style.StyleSpan
 import com.car2go.maps.google.adapter.AnyMapAdapter
 import com.car2go.maps.util.SphericalUtil
 import com.google.android.gms.common.api.ApiException
+import com.google.android.gms.maps.model.LatLng
+import com.google.android.gms.maps.model.LatLngBounds
 import com.google.android.gms.tasks.Tasks.await
-import com.google.android.libraries.maps.model.LatLng
-import com.google.android.libraries.maps.model.LatLngBounds
 import com.google.android.libraries.places.api.Places
 import com.google.android.libraries.places.api.model.AutocompleteSessionToken
 import com.google.android.libraries.places.api.model.Place

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

@@ -12,7 +12,9 @@ import androidx.lifecycle.Observer
 import androidx.navigation.fragment.findNavController
 import androidx.navigation.ui.setupWithNavController
 import androidx.recyclerview.widget.LinearLayoutManager
+import com.google.android.material.color.MaterialColors
 import com.google.android.material.snackbar.Snackbar
+import com.google.android.material.transition.MaterialSharedAxis
 import net.vonforst.evmap.MapsActivity
 import net.vonforst.evmap.R
 import net.vonforst.evmap.adapter.DonationAdapter
@@ -23,6 +25,12 @@ class DonateFragment : Fragment() {
     private lateinit var binding: FragmentDonateBinding
     private val vm: DonateViewModel by viewModels()
 
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        enterTransition = MaterialSharedAxis(MaterialSharedAxis.X, true)
+        returnTransition = MaterialSharedAxis(MaterialSharedAxis.X, false)
+    }
+
     override fun onCreateView(
         inflater: LayoutInflater,
         container: ViewGroup?,
@@ -31,12 +39,18 @@ class DonateFragment : Fragment() {
         binding = DataBindingUtil.inflate(inflater, R.layout.fragment_donate, container, false)
         binding.lifecycleOwner = this
         binding.vm = vm
+
         return binding.root
     }
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         (requireActivity() as AppCompatActivity).setSupportActionBar(binding.toolbar)
 
+        binding.toolbar.setupWithNavController(
+            findNavController(),
+            (requireActivity() as MapsActivity).appBarConfiguration
+        )
+
         binding.productsList.apply {
             adapter = DonationAdapter().apply {
                 onClickListener = {
@@ -56,13 +70,8 @@ class DonateFragment : Fragment() {
         vm.purchaseFailed.observe(viewLifecycleOwner, Observer {
             Snackbar.make(view, R.string.donation_failed, Snackbar.LENGTH_LONG).show()
         })
-    }
 
-    override fun onResume() {
-        super.onResume()
-        binding.toolbar.setupWithNavController(
-            findNavController(),
-            (requireActivity() as MapsActivity).appBarConfiguration
-        )
+        // Workaround for AndroidX bug: https://github.com/material-components/material-components-android/issues/1984
+        view.setBackgroundColor(MaterialColors.getColor(view, android.R.attr.windowBackground))
     }
 }

app/src/google/java/net/vonforst/evmap/fragment/preference/AndroidAutoSettingsFragment.kt

@@ -0,0 +1,47 @@
+package net.vonforst.evmap.fragment.preference
+
+import android.content.SharedPreferences
+import android.os.Bundle
+import android.view.View
+import androidx.fragment.app.viewModels
+import androidx.preference.MultiSelectListPreference
+import net.vonforst.evmap.R
+import net.vonforst.evmap.ui.RangeSliderPreference
+import net.vonforst.evmap.viewmodel.SettingsViewModel
+import net.vonforst.evmap.viewmodel.viewModelFactory
+import java.text.NumberFormat
+
+class AndroidAutoSettingsFragment : BaseSettingsFragment() {
+    override val isTopLevel = false
+
+    private lateinit var rangePreference: RangeSliderPreference
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+
+        rangePreference = findPreference("chargeprice_battery_range_android_auto")!!
+        rangePreference.labelFormatter = { value: Float ->
+            val fmt = NumberFormat.getNumberInstance()
+            fmt.maximumFractionDigits = 0
+            fmt.format(value.toDouble()) + "%"
+        }
+        updateRangePreferenceSummary()
+    }
+
+    override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
+        setPreferencesFromResource(R.xml.settings_android_auto, rootKey)
+    }
+
+    override fun onSharedPreferenceChanged(sharedPreferences: SharedPreferences, key: String) {
+        when (key) {
+            "chargeprice_battery_range_android_auto_min", "chargeprice_battery_range_android_auto_max" -> {
+                updateRangePreferenceSummary()
+            }
+        }
+    }
+
+    private fun updateRangePreferenceSummary() {
+        val range = prefs.chargepriceBatteryRangeAndroidAuto
+        rangePreference.summary = getString(R.string.chargeprice_battery_range, range[0], range[1])
+    }
+}

app/src/google/res/drawable/ic_android_auto.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="#FF000000"
+        android:pathData="m22.78,17.91c0.16,0.25 0.22,0.51 0.22,0.79 0,0.38 -0.13,0.69 -0.43,0.94s-0.63,0.36 -1.01,0.36h-2.48l-6.66,-12h-0.84l-6.66,12h-2.53c-0.47,0 -0.86,-0.2 -1.17,-0.62s-0.33,-0.88 -0.05,-1.38l9.61,-16.31c0.31,-0.47 0.72,-0.69 1.22,-0.69 0.53,0 0.92,0.22 1.17,0.69zM4.78,22.31 L12,9.38 19.22,22.31 18.5,23 12,20.34 5.44,23z" />
+</vector>

app/src/google/res/layout-land/fragment_onboarding_android_auto.xml

@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <TextView
+        android:id="@+id/welcomeTitle"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="72dp"
+        android:layout_marginEnd="32dp"
+        android:layout_marginBottom="16dp"
+        android:text="@string/welcome_android_auto"
+        android:textAppearance="@style/TextAppearance.Material3.HeadlineSmall"
+        app:layout_constraintBottom_toTopOf="@+id/welcomeText"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toEndOf="@+id/img_android_auto" />
+
+    <TextView
+        android:id="@+id/welcomeText"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginEnd="32dp"
+        android:layout_marginBottom="56dp"
+        android:breakStrategy="balanced"
+        android:text="@string/welcome_android_auto_detail"
+        android:textAppearance="@style/TextAppearance.Material3.BodyMedium"
+        android:textColor="?android:textColorSecondary"
+        app:layout_constraintBottom_toTopOf="@+id/btnGetStarted"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="@+id/welcomeTitle" />
+
+    <Button
+        android:id="@+id/btnGetStarted"
+        style="@style/Widget.Material3.Button.TonalButton"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="24dp"
+        android:text="@string/sounds_cool"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintStart_toStartOf="@+id/welcomeText" />
+
+    <ImageView
+        android:id="@+id/img_android_auto"
+        android:layout_width="72dp"
+        android:layout_height="72dp"
+        android:layout_marginStart="72dp"
+        android:layout_marginBottom="28dp"
+        android:background="@drawable/circle_bg_logo"
+        android:backgroundTint="@color/android_auto_accent"
+        android:scaleType="center"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintVertical_bias="0.65"
+        app:srcCompat="@drawable/android_auto" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>

app/src/google/res/layout-sw720dp/fragment_onboarding_android_auto.xml

@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <TextView
+        android:id="@+id/welcomeTitle"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="32dp"
+        android:layout_marginEnd="32dp"
+        android:layout_marginBottom="16dp"
+        android:gravity="center"
+        android:text="@string/welcome_android_auto"
+        android:textAppearance="@style/TextAppearance.Material3.HeadlineSmall"
+        app:layout_constraintBottom_toTopOf="@+id/welcomeText"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.5"
+        app:layout_constraintStart_toStartOf="parent" />
+
+    <TextView
+        android:id="@+id/welcomeText"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="32dp"
+        android:layout_marginEnd="32dp"
+        android:layout_marginBottom="56dp"
+        android:breakStrategy="balanced"
+        android:gravity="center"
+        android:text="@string/welcome_android_auto_detail"
+        android:textAppearance="@style/TextAppearance.Material3.BodyMedium"
+        android:textColor="?android:textColorSecondary"
+        app:layout_constraintBottom_toTopOf="@+id/btnGetStarted"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.5"
+        app:layout_constraintStart_toStartOf="parent" />
+
+    <Button
+        android:id="@+id/btnGetStarted"
+        style="@style/Widget.Material3.Button.TonalButton"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="24dp"
+        android:text="@string/sounds_cool"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent" />
+
+    <ImageView
+        android:id="@+id/img_android_auto"
+        android:layout_width="72dp"
+        android:layout_height="72dp"
+        android:layout_marginTop="28dp"
+        android:layout_marginBottom="28dp"
+        android:background="@drawable/circle_bg_logo"
+        android:backgroundTint="@color/android_auto_accent"
+        android:scaleType="center"
+        app:layout_constraintBottom_toTopOf="@+id/welcomeTitle"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintVertical_bias="0.7"
+        app:srcCompat="@drawable/android_auto" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>

app/src/google/res/layout/fragment_onboarding_android_auto.xml

@@ -13,7 +13,7 @@
         android:layout_marginBottom="16dp"
         android:gravity="center"
         android:text="@string/welcome_android_auto"
-        android:textAppearance="@style/TextAppearance.MaterialComponents.Headline6"
+        android:textAppearance="@style/TextAppearance.Material3.HeadlineSmall"
         app:layout_constraintBottom_toTopOf="@+id/welcomeText"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="0.5"
@@ -29,7 +29,7 @@
         android:breakStrategy="balanced"
         android:gravity="center"
         android:text="@string/welcome_android_auto_detail"
-        android:textAppearance="@style/TextAppearance.MaterialComponents.Body2"
+        android:textAppearance="@style/TextAppearance.Material3.BodyMedium"
         android:textColor="?android:textColorSecondary"
         app:layout_constraintBottom_toTopOf="@+id/btnGetStarted"
         app:layout_constraintEnd_toEndOf="parent"
@@ -38,7 +38,7 @@
 
     <Button
         android:id="@+id/btnGetStarted"
-        style="@style/Widget.MaterialComponents.Button.OutlinedButton"
+        style="@style/Widget.Material3.Button.TonalButton"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginBottom="24dp"

app/src/google/res/layout/item_donation.xml

@@ -29,7 +29,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginEnd="8dp"
                 android:text="@{item.sku.title}"
-                android:textAppearance="@style/TextAppearance.MaterialComponents.Body1"
+                android:textAppearance="@style/TextAppearance.Material3.BodyLarge"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintEnd_toStartOf="@+id/textView21"
                 app:layout_constraintHorizontal_bias="0.0"
@@ -42,7 +42,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text="@{item.sku.price}"
-                android:textAppearance="@style/TextAppearance.MaterialComponents.Body1"
+                android:textAppearance="@style/TextAppearance.Material3.BodyLarge"
                 android:textColor="?android:textColorSecondary"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintEnd_toEndOf="parent"

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

@@ -31,6 +31,7 @@
     <string name="welcome_android_auto_detail">Auf unterstützen Autos kannst du EVMap auch mit Android Auto nutzen. Öffne dazu einfach die EVMap-App aus dem Menü von Android Auto.</string>
     <string name="sounds_cool">klingt cool</string>
     <string name="auto_chargeprice_vehicle_unavailable">EVMap konnte das Fahrzeugmodell nicht erkennen.</string>
-    <string name="auto_chargeprice_vehicle_unknown">Keins der in der App ausgewählten Fahrzeuge passt zu diesem Fahrzeug (%s %s).</string>
-    <string name="auto_chargeprice_vehicle_ambiguous">Mehrere der in der App ausgewählten Fahrzeuge passen zu diesem Fahrzeug (%s %s).</string>
+    <string name="auto_chargeprice_vehicle_unknown">Keins der in der App ausgewählten Fahrzeuge passt zu diesem Fahrzeug (%1$s %2$s).</string>
+    <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>
 </resources>

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

@@ -3,4 +3,5 @@
     <color name="gauge_active">#00e676</color>
     <color name="gauge_middle">#087f23</color>
     <color name="gauge_inactive">#9e9e9e</color>
+    <color name="charger_100kw_dark">#fdd835</color>
 </resources>

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

@@ -3,8 +3,8 @@
 
     <style name="CarAppTheme">
         <item name="carColorPrimary">@color/colorPrimary</item>
-        <item name="carColorPrimaryDark">@color/colorPrimaryVariant</item>
+        <item name="carColorPrimaryDark">@color/colorPrimaryDark</item>
         <item name="carColorSecondary">@color/colorSecondary</item>
-        <item name="carColorSecondaryDark">@color/colorSecondaryVariant</item>
+        <item name="carColorSecondaryDark">@color/colorSecondaryDark</item>
     </style>
 </resources>

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

@@ -41,6 +41,7 @@
     <string name="welcome_android_auto_detail">You can also use EVMap from within Android Auto on supported cars. Simply select the EVMap app in the Android Auto menu.</string>
     <string name="sounds_cool">sounds cool</string>
     <string name="auto_chargeprice_vehicle_unavailable">EVMap could not determine your vehicle model.</string>
-    <string name="auto_chargeprice_vehicle_unknown">None of the vehicles selected in the app matches this vehicle (%s %s).</string>
-    <string name="auto_chargeprice_vehicle_ambiguous">Mehrere der in der App ausgewählten Fahrzeuge passen zu diesem Fahrzeug (%s %s).</string>
+    <string name="auto_chargeprice_vehicle_unknown">None of the vehicles selected in the app matches this vehicle (%1$s %2$s).</string>
+    <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>
 </resources>

app/src/google/res/xml/settings_android_auto.xml

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+    <net.vonforst.evmap.ui.RangeSliderPreference
+        android:key="chargeprice_battery_range_android_auto"
+        android:title="@string/settings_android_auto_chargeprice_range"
+        android:valueFrom="0.0"
+        android:valueTo="100.0"
+        app:updatesContinuously="true"
+        android:defaultValue="20.0,80.0"
+        android:layout="@layout/preference_widget_rangeslider"
+        tools:summary="@string/chargeprice_battery_range" />
+</PreferenceScreen>

app/src/google/res/xml/settings_variantspecific.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
+    <Preference
+        android:fragment="net.vonforst.evmap.fragment.preference.AndroidAutoSettingsFragment"
+        android:title="@string/settings_android_auto"
+        android:icon="@drawable/ic_android_auto" />
+</PreferenceScreen>

app/src/main/AndroidManifest.xml

@@ -32,7 +32,7 @@
 
         <activity
             android:name=".MapsActivity"
-            android:label="@string/title_activity_maps"
+            android:label="@string/app_name"
             android:theme="@style/AppTheme.LaunchScreen"
             android:exported="true">
             <intent-filter>
@@ -256,6 +256,10 @@
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.BROWSABLE" />
             </intent-filter>
+
+            <meta-data
+                android:name="android.app.shortcuts"
+                android:resource="@xml/shortcuts" />
         </activity>
 
         <!-- Override services of the com.mapzen.android.lost library with exported:false

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

@@ -1,5 +1,6 @@
 package net.vonforst.evmap
 
+import android.app.PendingIntent
 import android.content.ActivityNotFoundException
 import android.content.Context
 import android.content.Intent
@@ -18,13 +19,18 @@ import androidx.core.view.ViewCompat
 import androidx.core.view.WindowInsetsCompat
 import androidx.drawerlayout.widget.DrawerLayout
 import androidx.navigation.NavController
-import androidx.navigation.findNavController
+import androidx.navigation.fragment.FragmentNavigator
 import androidx.navigation.ui.AppBarConfiguration
 import androidx.navigation.ui.setupWithNavController
+import androidx.preference.Preference
+import androidx.preference.PreferenceFragmentCompat
+import com.car2go.maps.model.LatLng
 import com.google.android.material.navigation.NavigationView
 import com.google.android.material.snackbar.Snackbar
-import net.vonforst.evmap.fragment.MapFragment
+import com.google.android.material.transition.MaterialSharedAxis
+import net.vonforst.evmap.fragment.MapFragmentArgs
 import net.vonforst.evmap.model.ChargeLocation
+import net.vonforst.evmap.navigation.NavHostFragment
 import net.vonforst.evmap.storage.PreferenceDataSource
 import net.vonforst.evmap.utils.LocaleContextWrapper
 import net.vonforst.evmap.utils.getLocationFromIntent
@@ -34,8 +40,10 @@ const val REQUEST_LOCATION_PERMISSION = 1
 const val EXTRA_CHARGER_ID = "chargerId"
 const val EXTRA_LAT = "lat"
 const val EXTRA_LON = "lon"
+const val EXTRA_FAVORITES = "favorites"
 
-class MapsActivity : AppCompatActivity() {
+class MapsActivity : AppCompatActivity(),
+    PreferenceFragmentCompat.OnPreferenceStartFragmentCallback {
     interface FragmentCallback {
         fun getRootView(): View
     }
@@ -60,8 +68,6 @@ class MapsActivity : AppCompatActivity() {
 
         setContentView(R.layout.activity_maps)
 
-        navController = findNavController(R.id.nav_host_fragment)
-        val navGraph = navController.navInflater.inflate(R.navigation.nav_graph)
         appBarConfiguration = AppBarConfiguration(
             setOf(
                 R.id.map,
@@ -71,6 +77,10 @@ class MapsActivity : AppCompatActivity() {
             ),
             findViewById<DrawerLayout>(R.id.drawer_layout)
         )
+        val navHostFragment =
+            supportFragmentManager.findFragmentById(R.id.nav_host_fragment) as NavHostFragment
+        navController = navHostFragment.navController
+        val navGraph = navController.navInflater.inflate(R.navigation.nav_graph)
         val navView = findViewById<NavigationView>(R.id.nav_view)
         navView.setupWithNavController(navController)
 
@@ -102,58 +112,62 @@ class MapsActivity : AppCompatActivity() {
                     }
                 })
             }
-            navGraph.startDestination = R.id.onboarding
+            navGraph.setStartDestination(R.id.onboarding)
             navController.graph = navGraph
             return
         } else {
-            navGraph.startDestination = R.id.map
-            navController.graph = navGraph
-        }
+            navGraph.setStartDestination(R.id.map)
+            navController.setGraph(navGraph, MapFragmentArgs(appStart = true).toBundle())
+            var deepLink: PendingIntent? = null
 
+            if (intent?.scheme == "geo") {
+                val query = intent.data?.query?.split("=")?.get(1)
+                val coords = getLocationFromIntent(intent)
 
-        if (intent?.scheme == "geo") {
-            val query = intent.data?.query?.split("=")?.get(1)
-            val coords = getLocationFromIntent(intent)
-
-            if (coords != null) {
-                val lat = coords[0]
-                val lon = coords[1]
-                val deepLink = navController.createDeepLink()
-                    .setGraph(R.navigation.nav_graph)
+                if (coords != null) {
+                    val lat = coords[0]
+                    val lon = coords[1]
+                    deepLink = navController.createDeepLink()
+                        .setGraph(R.navigation.nav_graph)
+                        .setDestination(R.id.map)
+                        .setArguments(MapFragmentArgs(latLng = LatLng(lat, lon)).toBundle())
+                        .createPendingIntent()
+                } else if (query != null && query.isNotEmpty()) {
+                    deepLink = navController.createDeepLink()
+                        .setGraph(R.navigation.nav_graph)
+                        .setDestination(R.id.map)
+                        .setArguments(MapFragmentArgs(locationName = query).toBundle())
+                        .createPendingIntent()
+                }
+            } else if (intent?.scheme == "https" && intent?.data?.host == "www.goingelectric.de") {
+                val id = intent.data?.pathSegments?.last()?.toLongOrNull()
+                if (id != null) {
+                    deepLink = navController.createDeepLink()
+                        .setGraph(R.navigation.nav_graph)
+                        .setDestination(R.id.map)
+                        .setArguments(MapFragmentArgs(chargerId = id).toBundle())
+                        .createPendingIntent()
+                }
+            } else if (intent.hasExtra(EXTRA_CHARGER_ID)) {
+                deepLink = navController.createDeepLink()
                     .setDestination(R.id.map)
-                    .setArguments(MapFragment.showLocation(lat, lon))
-                    .createPendingIntent()
-                deepLink.send()
-            } else if (query != null && query.isNotEmpty()) {
-                val deepLink = navController.createDeepLink()
-                    .setGraph(R.navigation.nav_graph)
-                    .setDestination(R.id.map)
-                    .setArguments(MapFragment.showLocationByName(query))
-                    .createPendingIntent()
-                deepLink.send()
-            }
-        } else if (intent?.scheme == "https" && intent?.data?.host == "www.goingelectric.de") {
-            val id = intent.data?.pathSegments?.last()?.toLongOrNull()
-            if (id != null) {
-                val deepLink = navController.createDeepLink()
-                    .setGraph(R.navigation.nav_graph)
-                    .setDestination(R.id.map)
-                    .setArguments(MapFragment.showChargerById(id))
-                    .createPendingIntent()
-                deepLink.send()
-            }
-        } else if (intent.hasExtra(EXTRA_CHARGER_ID)) {
-            navController.createDeepLink()
-                .setDestination(R.id.map)
-                .setArguments(
-                    MapFragment.showCharger(
-                        intent.getLongExtra(EXTRA_CHARGER_ID, 0),
-                        intent.getDoubleExtra(EXTRA_LAT, 0.0),
-                        intent.getDoubleExtra(EXTRA_LON, 0.0)
+                    .setArguments(
+                        MapFragmentArgs(
+                            chargerId = intent.getLongExtra(EXTRA_CHARGER_ID, 0),
+                            latLng = LatLng(
+                                intent.getDoubleExtra(EXTRA_LAT, 0.0),
+                                intent.getDoubleExtra(EXTRA_LON, 0.0)
+                            )
+                        ).toBundle()
                     )
-                )
-                .createPendingIntent()
-                .send()
+                    .createPendingIntent()
+            } else if (intent.hasExtra(EXTRA_FAVORITES)) {
+                deepLink = navController.createDeepLink()
+                    .setDestination(R.id.favs)
+                    .createPendingIntent()
+            }
+
+            deepLink?.send()
         }
     }
 
@@ -162,6 +176,7 @@ class MapsActivity : AppCompatActivity() {
         val coord = charger.coordinates
         val intent = Intent(Intent.ACTION_VIEW)
         intent.data = Uri.parse("google.navigation:q=${coord.lat},${coord.lng}")
+        intent.`package` = "com.google.android.apps.maps"
         if (prefs.navigateUseMaps && intent.resolveActivity(packageManager) != null) {
             startActivity(intent);
         } else {
@@ -173,7 +188,11 @@ class MapsActivity : AppCompatActivity() {
     fun showLocation(charger: ChargeLocation) {
         val coord = charger.coordinates
         val intent = Intent(Intent.ACTION_VIEW)
-        intent.data = Uri.parse("geo:0,0?q=${coord.lat},${coord.lng}(${charger.name})")
+        intent.data = Uri.parse(
+            "geo:${coord.lat},${coord.lng}?q=${coord.lat},${coord.lng}(${
+                Uri.encode(charger.name)
+            })"
+        )
         if (intent.resolveActivity(packageManager) != null) {
             startActivity(intent);
         } else {
@@ -213,4 +232,18 @@ class MapsActivity : AppCompatActivity() {
         }
         startActivity(intent)
     }
+
+    override fun onPreferenceStartFragment(
+        caller: PreferenceFragmentCompat,
+        pref: Preference
+    ): Boolean {
+        caller.exitTransition = MaterialSharedAxis(MaterialSharedAxis.X, true)
+        caller.reenterTransition = MaterialSharedAxis(MaterialSharedAxis.X, false)
+
+        // Identify the Navigation Destination
+        val navDestination = navController.graph
+            .find { target -> target is FragmentNavigator.Destination && pref.fragment == target.className }
+        navDestination?.let { target -> navController.navigate(target.id) }
+        return true
+    }
 }

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

@@ -144,10 +144,9 @@ class CheckableConnectorAdapter : DataBindingAdapter<Chargepoint>() {
             field = value
             checkedItem?.let {
                 if (value != null && getItem(it).type !in value) {
-                    val index = currentList.indexOfFirst {
+                    checkedItem = currentList.indexOfFirst {
                         it.type in value
-                    }
-                    checkedItem = if (index == -1) null else index
+                    }.takeIf { it != -1 }
                     onCheckedItemChangedListener?.invoke(getCheckedItem())
                 }
             }
@@ -168,7 +167,7 @@ class CheckableConnectorAdapter : DataBindingAdapter<Chargepoint>() {
         }
         root.setOnCheckedChangeListener { v: View, checked: Boolean ->
             if (checked) {
-                checkedItem = holder.bindingAdapterPosition
+                checkedItem = holder.bindingAdapterPosition.takeIf { it != -1 }
                 root.post {
                     notifyDataSetChanged()
                 }
@@ -180,7 +179,7 @@ class CheckableConnectorAdapter : DataBindingAdapter<Chargepoint>() {
     fun getCheckedItem(): Chargepoint? = checkedItem?.let { getItem(it) }
 
     fun setCheckedItem(item: Chargepoint?) {
-        checkedItem = item?.let { currentList.indexOf(item) }
+        checkedItem = item?.let { currentList.indexOf(item) }.takeIf { it != -1 }
     }
 
     var onCheckedItemChangedListener: ((Chargepoint?) -> Unit)? = null

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

@@ -73,7 +73,7 @@ fun buildDetails(
                 )
             } ?: "",
             loc.faultReport.description?.let {
-                HtmlCompat.fromHtml(it, HtmlCompat.FROM_HTML_MODE_LEGACY)
+                HtmlCompat.fromHtml(it.replace("\n", "<br>"), HtmlCompat.FROM_HTML_MODE_LEGACY)
             } ?: "",
             clickable = true
         ) else null,
@@ -84,10 +84,10 @@ fun buildDetails(
                 loc.openinghours.getStatusText(ctx)
             else
                 loc.openinghours.description ?: "",
-            if (loc.openinghours.days != null) loc.openinghours.description else null,
+            if (loc.openinghours.days != null || loc.openinghours.twentyfourSeven) loc.openinghours.description else null,
             hoursDays = loc.openinghours.days
         ) else null,
-        if (loc.cost != null) DetailsAdapter.Detail(
+        if (loc.cost != null && !loc.cost.isEmpty) DetailsAdapter.Detail(
             R.drawable.ic_cost,
             R.string.cost,
             loc.cost.getStatusText(ctx),

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

@@ -98,11 +98,12 @@ class PlaceAutocompleteAdapter(val context: Context, val location: LiveData<LatL
             init {
                 if (PreferenceDataSource(context).searchProvider == "mapbox") {
                     // set delay to 500 ms to reduce paid Mapbox API requests
-                    this.setDelayer { 500L }
+                    this.setDelayer { q -> if (isShortQuery(q)) 0L else 500L }
                 }
             }
 
             override fun publishResults(constraint: CharSequence?, results: FilterResults?) {
+                resultList = results?.values as? List<AutocompletePlace>?
                 if (results != null && results.count > 0) {
                     notifyDataSetChanged()
                 } else {
@@ -112,6 +113,7 @@ class PlaceAutocompleteAdapter(val context: Context, val location: LiveData<LatL
 
             override fun performFiltering(constraint: CharSequence?): FilterResults {
                 val query = constraint.toString()
+                var resultList: List<AutocompletePlace>? = null
                 if (constraint != null) {
                     for (provider in providers) {
                         try {
@@ -132,14 +134,13 @@ class PlaceAutocompleteAdapter(val context: Context, val location: LiveData<LatL
                             }
 
                             // if we already have enough results or the query is short, stop here
-                            if (query.length < 3 || recentResults.size >= maxItems) break
+                            if (isShortQuery(query) || recentResults.size >= maxItems) break
 
                             // then search online
                             val recentIds = recentPlaces.map { it.id }
                             resultList =
-                                (recentPlaces.map { it.asAutocompletePlace(location.value) } +
-                                        provider.autocomplete(query, location.value)
-                                            .filter { !recentIds.contains(it.id) }).take(maxItems)
+                                (resultList!! + provider.autocomplete(query, location.value)
+                                    .filter { !recentIds.contains(it.id) }).take(maxItems)
                             break
                         } catch (e: ApiUnavailableException) {
                             e.printStackTrace()
@@ -150,7 +151,7 @@ class PlaceAutocompleteAdapter(val context: Context, val location: LiveData<LatL
 
                 if (currentProvider is MapboxAutocompleteProvider && !delaySet) {
                     // set delay to 500 ms to reduce paid Mapbox API requests
-                    this.setDelayer { 500L }
+                    this.setDelayer { q -> if (isShortQuery(q)) 0L else 500L }
                 }
 
                 return resultList.asFilterResults()
@@ -167,6 +168,8 @@ class PlaceAutocompleteAdapter(val context: Context, val location: LiveData<LatL
         }
     }
 
+    private fun isShortQuery(query: CharSequence) = query.length < 3
+
     suspend fun getDetails(id: String): PlaceWithBounds {
         val provider = currentProvider!!
         val result = resultList!!.find { it.id == id }!!

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

@@ -2,7 +2,6 @@ package net.vonforst.evmap.api.availability
 
 import com.facebook.stetho.okhttp3.StethoInterceptor
 import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.withContext
 import net.vonforst.evmap.api.RateLimitInterceptor
 import net.vonforst.evmap.api.await
@@ -24,7 +23,6 @@ interface AvailabilityDetector {
     suspend fun getAvailability(location: ChargeLocation): ChargeLocationStatus
 }
 
-@ExperimentalCoroutinesApi
 abstract class BaseAvailabilityDetector(private val client: OkHttpClient) : AvailabilityDetector {
     protected val radius = 150  // max radius in meters
 
@@ -65,10 +63,20 @@ abstract class BaseAvailabilityDetector(private val client: OkHttpClient) : Avai
             connectors: Map<Long, Pair<Double, String>>,
             chargepoints: List<Chargepoint>
         ): Map<Chargepoint, Set<Long>> {
+            var chargepoints = chargepoints
+
             // iterate over each connector type
             val types = connectors.map { it.value.second }.distinct().toSet()
             val equivalentTypes = types.map { equivalentPlugTypes(it).plus(it) }.cartesianProduct()
-            val geTypes = chargepoints.map { it.type }.distinct().toSet()
+            var geTypes = chargepoints.map { it.type }.distinct().toSet()
+            if (!equivalentTypes.any { it == geTypes } && geTypes.size > 1 && geTypes.contains(
+                    Chargepoint.SCHUKO
+                )) {
+                // If charger has household plugs and other plugs, try removing the household plugs
+                // (common e.g. in Hamburg -> 2x Type 2 + 2x Schuko, but NM only lists Type 2)
+                geTypes = geTypes.filter { it != Chargepoint.SCHUKO }.toSet()
+                chargepoints = chargepoints.filter { it.type != Chargepoint.SCHUKO }
+            }
             if (!equivalentTypes.any { it == geTypes }) throw AvailabilityDetectorException("chargepoints do not match")
             return types.flatMap { type ->
                 // find connectors of this type
@@ -92,7 +100,7 @@ abstract class BaseAvailabilityDetector(private val client: OkHttpClient) : Avai
                         chargepoint to ids
                     }
                 } else if (powers.size == 1 && gePowers.size == 2
-                    && chargepoints.sumBy { it.count } == connsOfType.size
+                    && chargepoints.sumOf { it.count } == connsOfType.size
                 ) {
                     // special case: dual charger(s) with load balancing
                     // GoingElectric shows 2 different powers, NewMotion just one

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

@@ -1,6 +1,5 @@
 package net.vonforst.evmap.api.availability
 
-import kotlinx.coroutines.ExperimentalCoroutinesApi
 import net.vonforst.evmap.api.iterator
 import net.vonforst.evmap.model.ChargeLocation
 import net.vonforst.evmap.model.Chargepoint
@@ -8,12 +7,10 @@ import okhttp3.OkHttpClient
 import org.json.JSONObject
 import java.io.IOException
 
-@ExperimentalCoroutinesApi
 class ChargecloudAvailabilityDetector(
     client: OkHttpClient,
     private val operatorId: String
 ) : BaseAvailabilityDetector(client) {
-    @ExperimentalCoroutinesApi
     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"

app/src/main/java/net/vonforst/evmap/api/chargeprice/ChargepriceModel.kt

@@ -205,6 +205,9 @@ class ChargePrice : Resource(), Equatable, Cloneable {
     @field:Json(name = "charge_point_prices")
     lateinit var chargepointPrices: List<ChargepointPrice>
 
+    @field:Json(name = "branding")
+    var branding: ChargepriceBranding? = null
+
     var tariff: HasOne<ChargepriceTariff>? = null
 
 
@@ -238,6 +241,7 @@ class ChargePrice : Resource(), Equatable, Cloneable {
         if (startTime != other.startTime) return false
         if (tags != other.tags) return false
         if (chargepointPrices != other.chargepointPrices) return false
+        if (branding != other.branding) return false
 
         return true
     }
@@ -256,6 +260,7 @@ class ChargePrice : Resource(), Equatable, Cloneable {
         result = 31 * result + startTime
         result = 31 * result + tags.hashCode()
         result = 31 * result + chargepointPrices.hashCode()
+        result = 31 * result + branding.hashCode()
         return result
     }
 
@@ -274,6 +279,7 @@ class ChargePrice : Resource(), Equatable, Cloneable {
             totalMonthlyFee = this@ChargePrice.totalMonthlyFee
             url = this@ChargePrice.url
             tariff = this@ChargePrice.tariff
+            branding = this@ChargePrice.branding
         }
     }
 }
@@ -328,6 +334,12 @@ data class ChargepointPrice(
     }
 }
 
+data class ChargepriceBranding(
+    @Json(name = "background_color") val backgroundColor: String,
+    @Json(name = "text_color") val textColor: String,
+    @Json(name = "logo_url") val logoUrl: String
+)
+
 data class PriceDistribution(val kwh: Double?, val session: Double?, val minute: Double?) {
     val isOnlyKwh =
         kwh != null && kwh > 0 && (session == null || session == 0.0) && (minute == null || minute == 0.0)
@@ -339,6 +351,19 @@ data class ChargepriceMeta(
     @Json(name = "charge_points") val chargePoints: List<ChargepriceChargepointMeta>
 )
 
+enum class ChargepriceInclude {
+    @Json(name = "filter")
+    FILTER,
+    @Json(name = "always")
+    ALWAYS,
+    @Json(name = "exclusive")
+    EXCLUSIVE
+}
+
+data class ChargepriceRequestTariffMeta(
+    val include: ChargepriceInclude
+)
+
 data class ChargepriceChargepointMeta(
     val power: Double,
     val plug: String,

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

@@ -126,16 +126,21 @@ internal class HoursAdapter {
     private val regex = Regex("from (.*) till (.*)")
 
     @FromJson
-    fun fromJson(str: String): GEHours? {
+    fun fromJson(str: String): GEHours {
         if (str == "closed") {
             return GEHours(null, null)
+        } else if (str == "around the clock") {
+            return GEHours(LocalTime.MIN, LocalTime.MAX)
         } else {
             val match = regex.find(str)
             if (match != null) {
-                return GEHours(
-                    LocalTime.parse(match.groupValues[1]),
+                val start = LocalTime.parse(match.groupValues[1])
+                val end = if (match.groupValues[2] == "24:00") {
+                    LocalTime.MAX
+                } else {
                     LocalTime.parse(match.groupValues[2])
-                )
+                }
+                return GEHours(start, end)
             } else {
                 // I cannot reproduce this case, but it seems to occur once in a while
                 Log.e("GoingElectricApi", "invalid hours value: " + str)

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

@@ -402,7 +402,7 @@ class GoingElectricApiWrapper(
         val chargeCards = referenceData.chargecards
 
         val plugMap = plugs.map { plug ->
-            plug to nameForPlugType(sp, plug)
+            plug to nameForPlugType(sp, GEChargepoint.convertTypeFromGE(plug))
         }.toMap()
         val networkMap = networks.map { it to it }.toMap()
         val chargecardMap = chargeCards.map { it.id.toString() to it.name }.toMap()
@@ -448,11 +448,11 @@ class GoingElectricApiWrapper(
             MultipleChoiceFilter(
                 sp.getString(R.string.filter_connectors), "connectors",
                 plugMap,
-                commonChoices = setOf(
+                commonChoices = listOf(
                     Chargepoint.TYPE_2_UNKNOWN,
                     Chargepoint.CCS_UNKNOWN,
                     Chargepoint.CHADEMO
-                ),
+                ).map { GEChargepoint.convertTypeToGE(it)!! }.toSet(),
                 manyChoices = true
             ),
             SliderFilter(

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

@@ -87,7 +87,14 @@ data class GECost(
     @JsonObjectOrFalse @Json(name = "description_short") val descriptionShort: String?,
     @JsonObjectOrFalse @Json(name = "description_long") val descriptionLong: String?
 ) {
-    fun convert() = Cost(freecharging, freeparking, descriptionShort, descriptionLong)
+    fun convert() = Cost(
+        // In GE, freecharging = false can either mean "paid charging" or "no information
+        // available", only freecharging = true provides useful information. Therefore convert
+        // false to null. Same for freeparking.
+        if (freecharging) freecharging else null,
+        if (freeparking) freeparking else null,
+        descriptionShort, descriptionLong
+    )
 }
 
 @JsonClass(generateAdapter = true)
@@ -126,7 +133,7 @@ data class GEHours(
     val start: LocalTime?,
     val end: LocalTime?
 ) {
-    fun convert() = Hours(start, end)
+    fun convert() = if (start != null && end != null) Hours(start, end) else null
 }
 
 @JsonClass(generateAdapter = true)

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

@@ -1,9 +1,11 @@
 package net.vonforst.evmap.autocomplete
 
+import android.os.Parcelable
 import androidx.annotation.DrawableRes
 import androidx.annotation.StringRes
 import com.car2go.maps.model.LatLng
 import com.car2go.maps.model.LatLngBounds
+import kotlinx.parcelize.Parcelize
 
 interface AutocompleteProvider {
     val id: String
@@ -183,4 +185,5 @@ enum class AutocompletePlaceType {
     }
 }
 
-data class PlaceWithBounds(val latLng: LatLng, val viewport: LatLngBounds?)
+@Parcelize
+data class PlaceWithBounds(val latLng: LatLng, val viewport: LatLngBounds?) : Parcelable

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

@@ -2,39 +2,34 @@ package net.vonforst.evmap.fragment
 
 import android.annotation.SuppressLint
 import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.MotionEvent
-import android.view.View
-import android.view.ViewGroup
+import android.view.*
 import androidx.databinding.DataBindingUtil
-import androidx.fragment.app.DialogFragment
+import androidx.fragment.app.Fragment
 import androidx.fragment.app.viewModels
 import androidx.lifecycle.Observer
 import androidx.navigation.fragment.findNavController
+import androidx.navigation.fragment.navArgs
 import androidx.navigation.ui.setupWithNavController
 import androidx.recyclerview.widget.DividerItemDecoration
 import androidx.recyclerview.widget.LinearLayoutManager
+import com.google.android.material.color.MaterialColors
 import com.google.android.material.snackbar.Snackbar
+import com.google.android.material.transition.MaterialContainerTransform
 import net.vonforst.evmap.MapsActivity
 import net.vonforst.evmap.R
 import net.vonforst.evmap.adapter.ChargepriceAdapter
 import net.vonforst.evmap.adapter.CheckableChargepriceCarAdapter
 import net.vonforst.evmap.adapter.CheckableConnectorAdapter
-import net.vonforst.evmap.api.ChargepointApi
 import net.vonforst.evmap.api.chargeprice.ChargepriceCar
 import net.vonforst.evmap.api.equivalentPlugTypes
-import net.vonforst.evmap.api.goingelectric.GoingElectricApiWrapper
-import net.vonforst.evmap.api.openchargemap.OpenChargeMapApiWrapper
 import net.vonforst.evmap.databinding.FragmentChargepriceBinding
-import net.vonforst.evmap.model.ChargeLocation
 import net.vonforst.evmap.model.Chargepoint
-import net.vonforst.evmap.model.ReferenceData
 import net.vonforst.evmap.viewmodel.ChargepriceViewModel
 import net.vonforst.evmap.viewmodel.Status
 import net.vonforst.evmap.viewmodel.viewModelFactory
 import java.text.NumberFormat
 
-class ChargepriceFragment : DialogFragment() {
+class ChargepriceFragment : Fragment() {
     private lateinit var binding: FragmentChargepriceBinding
     private var connectionErrorSnackbar: Snackbar? = null
 
@@ -47,9 +42,9 @@ class ChargepriceFragment : DialogFragment() {
         }
     })
 
-    override fun onActivityCreated(savedInstanceState: Bundle?) {
-        super.onActivityCreated(savedInstanceState)
-        dialog?.window?.attributes?.windowAnimations = R.style.ChargepriceDialogAnimation
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        sharedElementEnterTransition = MaterialContainerTransform()
     }
 
     override fun onCreateView(
@@ -70,22 +65,18 @@ class ChargepriceFragment : DialogFragment() {
         return binding.root
     }
 
-    override fun onStart() {
-        super.onStart()
-
-        // dialog with 95% screen height
-        dialog?.window?.setLayout(
-            ViewGroup.LayoutParams.MATCH_PARENT,
-            (resources.displayMetrics.heightPixels * 0.95).toInt()
-        )
-    }
-
     @SuppressLint("ClickableViewAccessibility")
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
 
-        val charger = requireArguments().getParcelable<ChargeLocation>(ARG_CHARGER)!!
-        val dataSource = requireArguments().getString(ARG_DATASOURCE)!!
+        binding.toolbar.setupWithNavController(
+            findNavController(),
+            (requireActivity() as MapsActivity).appBarConfiguration
+        )
+
+        val fragmentArgs: ChargepriceFragmentArgs by navArgs()
+        val charger = fragmentArgs.charger
+        val dataSource = fragmentArgs.dataSource
         vm.charger.value = charger
         vm.dataSource.value = dataSource
         if (vm.chargepoint.value == null) {
@@ -174,8 +165,8 @@ class ChargepriceFragment : DialogFragment() {
 
         binding.toolbar.setOnMenuItemClickListener {
             when (it.itemId) {
-                R.id.menu_close -> {
-                    dismiss()
+                R.id.menu_help -> {
+                    (activity as? MapsActivity)?.openUrl(getString(R.string.chargeprice_faq_link))
                     true
                 }
                 else -> false
@@ -206,38 +197,9 @@ class ChargepriceFragment : DialogFragment() {
                 }
             }
         }
+
+        // Workaround for AndroidX bug: https://github.com/material-components/material-components-android/issues/1984
+        view.setBackgroundColor(MaterialColors.getColor(view, android.R.attr.windowBackground))
     }
 
-    override fun onResume() {
-        super.onResume()
-        binding.toolbar.setupWithNavController(
-            findNavController(),
-            (requireActivity() as MapsActivity).appBarConfiguration
-        )
-    }
-
-    companion object {
-        const val ARG_CHARGER = "charger"
-        const val ARG_DATASOURCE = "datasource"
-
-        fun showCharger(
-            charger: ChargeLocation,
-            dataSource: Class<ChargepointApi<ReferenceData>>
-        ): Bundle {
-            return Bundle().apply {
-                putParcelable(
-                    ARG_CHARGER,
-                    charger
-                )
-                putString(
-                    ARG_DATASOURCE,
-                    when (dataSource) {
-                        GoingElectricApiWrapper::class.java -> "going_electric"
-                        OpenChargeMapApiWrapper::class.java -> "open_charge_map"
-                        else -> throw IllegalArgumentException("unsupported data source")
-                    }
-                )
-            }
-        }
-    }
-}
+}

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

@@ -17,7 +17,9 @@ import androidx.recyclerview.widget.ItemTouchHelper
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 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
@@ -51,6 +53,9 @@ class FavoritesFragment : Fragment(), LostApiClient.ConnectionCallbacks {
         super.onCreate(savedInstanceState)
         locationClient = LostApiClient.Builder(requireContext())
             .addConnectionCallbacks(this).build()
+
+        enterTransition = MaterialFadeThrough()
+        exitTransition = MaterialFadeThrough()
     }
 
     override fun onCreateView(
@@ -70,6 +75,13 @@ class FavoritesFragment : Fragment(), LostApiClient.ConnectionCallbacks {
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
+        // Workaround for AndroidX bug: https://github.com/material-components/material-components-android/issues/1984
+        view.setBackgroundColor(MaterialColors.getColor(view, android.R.attr.windowBackground))
+
+        binding.toolbar.setupWithNavController(
+            findNavController(),
+            (requireActivity() as MapsActivity).appBarConfiguration
+        )
 
         adapter = FavoritesAdapter(onDelete = {
             delete(it.charger)
@@ -77,7 +89,10 @@ class FavoritesFragment : Fragment(), LostApiClient.ConnectionCallbacks {
             onClickListener = {
                 findNavController().navigate(
                     R.id.action_favs_to_map,
-                    MapFragment.showCharger(it.charger)
+                    MapFragmentArgs(
+                        chargerId = it.charger.id,
+                        latLng = LatLng(it.charger.coordinates.lat, it.charger.coordinates.lng)
+                    ).toBundle()
                 )
             }
         }
@@ -251,9 +266,5 @@ class FavoritesFragment : Fragment(), LostApiClient.ConnectionCallbacks {
 
     override fun onResume() {
         super.onResume()
-        binding.toolbar.setupWithNavController(
-            findNavController(),
-            (requireActivity() as MapsActivity).appBarConfiguration
-        )
     }
 }

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

@@ -11,6 +11,8 @@ import androidx.navigation.fragment.findNavController
 import androidx.navigation.ui.setupWithNavController
 import androidx.recyclerview.widget.DividerItemDecoration
 import androidx.recyclerview.widget.LinearLayoutManager
+import com.google.android.material.color.MaterialColors
+import com.google.android.material.transition.MaterialSharedAxis
 import kotlinx.coroutines.launch
 import net.vonforst.evmap.MapsActivity
 import net.vonforst.evmap.R
@@ -24,6 +26,12 @@ class FilterFragment : Fragment() {
     private lateinit var binding: FragmentFilterBinding
     private val vm: FilterViewModel by viewModels()
 
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        enterTransition = MaterialSharedAxis(MaterialSharedAxis.Z, true)
+        returnTransition = MaterialSharedAxis(MaterialSharedAxis.Z, false)
+    }
+
     override fun onCreateView(
         inflater: LayoutInflater,
         container: ViewGroup?,
@@ -43,6 +51,17 @@ class FilterFragment : Fragment() {
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         (requireActivity() as AppCompatActivity).setSupportActionBar(binding.toolbar)
 
+        binding.toolbar.setupWithNavController(
+            findNavController(),
+            (requireActivity() as MapsActivity).appBarConfiguration
+        )
+
+        vm.filterProfile.observe(viewLifecycleOwner) {
+            if (it != null) {
+                binding.toolbar.title = getString(R.string.edit_filter_profile, it.name)
+            }
+        }
+
         binding.filtersList.apply {
             adapter = FiltersAdapter()
             layoutManager =
@@ -57,6 +76,9 @@ class FilterFragment : Fragment() {
         binding.toolbar.setNavigationOnClickListener {
             findNavController().popBackStack()
         }
+
+        // Workaround for AndroidX bug: https://github.com/material-components/material-components-android/issues/1984
+        view.setBackgroundColor(MaterialColors.getColor(view, android.R.attr.windowBackground))
     }
 
     override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) {
@@ -108,18 +130,4 @@ class FilterFragment : Fragment() {
                 }
         }
     }
-
-    override fun onResume() {
-        super.onResume()
-        binding.toolbar.setupWithNavController(
-            findNavController(),
-            (requireActivity() as MapsActivity).appBarConfiguration
-        )
-
-        vm.filterProfile.observe(viewLifecycleOwner) {
-            if (it != null) {
-                binding.toolbar.title = getString(R.string.edit_filter_profile, it.name)
-            }
-        }
-    }
 }

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

@@ -17,7 +17,9 @@ import androidx.recyclerview.widget.DividerItemDecoration
 import androidx.recyclerview.widget.ItemTouchHelper
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
+import com.google.android.material.color.MaterialColors
 import com.google.android.material.snackbar.Snackbar
+import com.google.android.material.transition.MaterialSharedAxis
 import kotlinx.coroutines.launch
 import net.vonforst.evmap.MapsActivity
 import net.vonforst.evmap.R
@@ -43,6 +45,12 @@ class FilterProfilesFragment : Fragment() {
     private var deleteSnackbar: Snackbar? = null
     private var toDelete: FilterProfile? = null
 
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        enterTransition = MaterialSharedAxis(MaterialSharedAxis.Z, true)
+        returnTransition = MaterialSharedAxis(MaterialSharedAxis.Z, false)
+    }
+
     override fun onCreateView(
         inflater: LayoutInflater,
         container: ViewGroup?,
@@ -58,6 +66,11 @@ class FilterProfilesFragment : Fragment() {
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         (requireActivity() as AppCompatActivity).setSupportActionBar(binding.toolbar)
 
+        binding.toolbar.setupWithNavController(
+            findNavController(),
+            (requireActivity() as MapsActivity).appBarConfiguration
+        )
+
         touchHelper = ItemTouchHelper(object : ItemTouchHelper.SimpleCallback(
             ItemTouchHelper.UP or ItemTouchHelper.DOWN,
             ItemTouchHelper.RIGHT or ItemTouchHelper.LEFT
@@ -201,14 +214,9 @@ class FilterProfilesFragment : Fragment() {
         binding.toolbar.setNavigationOnClickListener {
             findNavController().popBackStack()
         }
-    }
 
-    override fun onResume() {
-        super.onResume()
-        binding.toolbar.setupWithNavController(
-            findNavController(),
-            (requireActivity() as MapsActivity).appBarConfiguration
-        )
+        // Workaround for AndroidX bug: https://github.com/material-components/material-components-android/issues/1984
+        view.setBackgroundColor(MaterialColors.getColor(view, android.R.attr.windowBackground))
     }
 
     fun delete(fp: FilterProfile) {

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

@@ -32,7 +32,9 @@ import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.Observer
 import androidx.lifecycle.lifecycleScope
 import androidx.navigation.findNavController
+import androidx.navigation.fragment.FragmentNavigatorExtras
 import androidx.navigation.fragment.findNavController
+import androidx.navigation.fragment.navArgs
 import androidx.navigation.ui.setupWithNavController
 import androidx.recyclerview.widget.DividerItemDecoration
 import androidx.recyclerview.widget.LinearLayoutManager
@@ -52,6 +54,8 @@ import com.car2go.maps.model.MarkerOptions
 import com.google.android.material.snackbar.Snackbar
 import com.google.android.material.transition.MaterialArcMotion
 import com.google.android.material.transition.MaterialContainerTransform
+import com.google.android.material.transition.MaterialFadeThrough
+import com.google.android.material.transition.MaterialSharedAxis
 import com.mahc.custombottomsheetbehavior.BottomSheetBehaviorGoogleMapsLike
 import com.mahc.custombottomsheetbehavior.BottomSheetBehaviorGoogleMapsLike.STATE_COLLAPSED
 import com.mahc.custombottomsheetbehavior.BottomSheetBehaviorGoogleMapsLike.STATE_HIDDEN
@@ -72,6 +76,7 @@ import net.vonforst.evmap.adapter.DetailsAdapter
 import net.vonforst.evmap.adapter.GalleryAdapter
 import net.vonforst.evmap.adapter.PlaceAutocompleteAdapter
 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.databinding.FragmentMapBinding
@@ -89,11 +94,6 @@ import net.vonforst.evmap.viewmodel.*
 import java.io.IOException
 
 
-const val ARG_CHARGER_ID = "chargerId"
-const val ARG_LAT = "lat"
-const val ARG_LON = "lon"
-const val ARG_LOCATION_NAME = "locationName"
-
 class MapFragment : Fragment(), OnMapReadyCallback, MapsActivity.FragmentCallback,
     LostApiClient.ConnectionCallbacks, LocationListener {
     private lateinit var binding: FragmentMapBinding
@@ -150,8 +150,13 @@ class MapFragment : Fragment(), OnMapReadyCallback, MapsActivity.FragmentCallbac
             .build()
         locationClient.connect()
         clusterIconGenerator = ClusterIconGenerator(requireContext())
+
+        enterTransition = MaterialFadeThrough()
+        exitTransition = MaterialFadeThrough()
     }
 
+    private val mapFragmentTag = "map"
+
     override fun onCreateView(
         inflater: LayoutInflater,
         container: ViewGroup?,
@@ -162,6 +167,10 @@ class MapFragment : Fragment(), OnMapReadyCallback, MapsActivity.FragmentCallbac
         binding.vm = vm
 
         val provider = prefs.mapProvider
+        if (mapFragment == null) {
+            mapFragment =
+                requireActivity().supportFragmentManager.findFragmentByTag(mapFragmentTag) as MapFragment?
+        }
         if (mapFragment == null || mapFragment!!.priority[0] != provider) {
             mapFragment = MapFragment()
             mapFragment!!.priority = arrayOf(
@@ -175,7 +184,7 @@ class MapFragment : Fragment(), OnMapReadyCallback, MapsActivity.FragmentCallbac
             )
             requireActivity().supportFragmentManager
                 .beginTransaction()
-                .replace(R.id.map, mapFragment!!)
+                .replace(R.id.map, mapFragment!!, mapFragmentTag)
                 .commit()
 
             // reset map-related stuff (map provider may have changed)
@@ -197,7 +206,11 @@ class MapFragment : Fragment(), OnMapReadyCallback, MapsActivity.FragmentCallbac
             val density = resources.displayMetrics.density
             // status bar height + toolbar height + margin
             val margin =
-                insets.systemWindowInsetTop + (48 * density).toInt() + (24 * density).toInt()
+                if (binding.toolbarContainer.layoutParams.width == ViewGroup.LayoutParams.MATCH_PARENT) {
+                    insets.systemWindowInsetTop + (48 * density).toInt() + (28 * density).toInt()
+                } else {
+                    insets.systemWindowInsetTop + (12 * density).toInt()
+                }
             binding.fabLayers.updateLayoutParams<ViewGroup.MarginLayoutParams> {
                 topMargin = margin
             }
@@ -237,6 +250,11 @@ class MapFragment : Fragment(), OnMapReadyCallback, MapsActivity.FragmentCallbac
         setupAdapters()
         (activity as? MapsActivity)?.setSupportActionBar(binding.toolbar)
 
+        binding.toolbar.setupWithNavController(
+            findNavController(),
+            (requireActivity() as MapsActivity).appBarConfiguration
+        )
+
         if (prefs.appStartCounter > 5 && !prefs.opensourceDonationsDialogShown) {
             try {
                 findNavController().navigate(R.id.action_map_to_opensource_donations)
@@ -253,6 +271,32 @@ class MapFragment : Fragment(), OnMapReadyCallback, MapsActivity.FragmentCallbac
                 // when there is already another navigation going on
             }
         }*/
+
+        val fragmentArgs: MapFragmentArgs by navArgs()
+        if (savedInstanceState == null && fragmentArgs.appStart) {
+            // logo animation after starting the app
+            binding.appLogo.root.visibility = View.VISIBLE
+            binding.appLogo.root.alpha = 0f
+            binding.search.visibility = View.GONE
+
+            binding.appLogo.root.animate().alpha(1f)
+                .withEndAction {
+                    binding.appLogo.root.animate().alpha(0f).apply {
+                        startDelay = 1000
+                    }.withEndAction {
+                        binding.appLogo.root.visibility = View.GONE
+                        binding.search.visibility = View.VISIBLE
+                        binding.search.alpha = 0f
+                        binding.search.animate().alpha(1f).start()
+                    }.start()
+                }.apply {
+                    startDelay = 100
+                }.start()
+            arguments = fragmentArgs.copy(appStart = false).toBundle()
+        } else {
+            binding.appLogo.root.visibility = View.GONE
+            binding.search.visibility = View.VISIBLE
+        }
     }
 
     override fun onResume() {
@@ -260,12 +304,6 @@ class MapFragment : Fragment(), OnMapReadyCallback, MapsActivity.FragmentCallbac
         val hostActivity = activity as? MapsActivity ?: return
         hostActivity.fragmentCallback = this
 
-        val navController = findNavController()
-        binding.toolbar.setupWithNavController(
-            navController,
-            (requireActivity() as MapsActivity).appBarConfiguration
-        )
-
         vm.reloadPrefs()
         if (requestingLocationUpdates && requireContext().checkAnyLocationPermission()
             && locationClient.isConnected
@@ -309,9 +347,17 @@ class MapFragment : Fragment(), OnMapReadyCallback, MapsActivity.FragmentCallbac
         }
         binding.detailView.btnChargeprice.setOnClickListener {
             val charger = vm.charger.value?.data ?: return@setOnClickListener
+            val dataSource = when (vm.apiType) {
+                GoingElectricApiWrapper::class.java -> "going_electric"
+                OpenChargeMapApiWrapper::class.java -> "open_charge_map"
+                else -> throw IllegalArgumentException("unsupported data source")
+            }
+            val extras =
+                FragmentNavigatorExtras(binding.detailView.btnChargeprice to getString(R.string.shared_element_chargeprice))
             findNavController().navigate(
                 R.id.action_map_to_chargepriceFragment,
-                ChargepriceFragment.showCharger(charger, vm.apiType)
+                ChargepriceFragmentArgs(charger, dataSource).toBundle(),
+                null, extras
             )
         }
         binding.detailView.topPart.setOnClickListener {
@@ -390,6 +436,7 @@ class MapFragment : Fragment(), OnMapReadyCallback, MapsActivity.FragmentCallbac
         binding.search.onFocusChangeListener = View.OnFocusChangeListener { v, hasFocus ->
             if (hasFocus) {
                 binding.search.keyListener = searchKeyListener
+                binding.search.text = binding.search.text  // workaround to fix copy/paste
             } else {
                 binding.search.keyListener = null
             }
@@ -415,38 +462,58 @@ class MapFragment : Fragment(), OnMapReadyCallback, MapsActivity.FragmentCallbac
 
     private fun openLayersMenu() {
         binding.fabLayers.tag = false
-        val materialTransform = MaterialContainerTransform().apply {
-            startView = binding.fabLayers
-            endView = binding.layersSheet
-            setPathMotion(MaterialArcMotion())
-            duration = 250
-            scrimColor = Color.TRANSPARENT
-        }
-        TransitionManager.beginDelayedTransition(binding.root, materialTransform)
-        vm.layersMenuOpen.value = true
+
+        binding.fabLayers.postDelayed({
+            val materialTransform = MaterialContainerTransform().apply {
+                startView = binding.fabLayers
+                endView = binding.layersSheet
+                setPathMotion(MaterialArcMotion())
+                duration = 250
+                scrimColor = Color.TRANSPARENT
+                addTarget(binding.layersSheet)
+                isElevationShadowEnabled = false
+            }
+            TransitionManager.beginDelayedTransition(binding.root, materialTransform)
+            vm.layersMenuOpen.value = true
+        }, 100)
     }
 
     private fun closeLayersMenu() {
         binding.fabLayers.tag = true
-        val materialTransform = MaterialContainerTransform().apply {
-            startView = binding.layersSheet
-            endView = binding.fabLayers
-            setPathMotion(MaterialArcMotion())
-            duration = 200
-            scrimColor = Color.TRANSPARENT
-        }
-        TransitionManager.beginDelayedTransition(binding.root, materialTransform)
-        vm.layersMenuOpen.value = false
+
+        binding.fabLayers.postDelayed({
+            val materialTransform = MaterialContainerTransform().apply {
+                startView = binding.layersSheet
+                endView = binding.fabLayers
+                setPathMotion(MaterialArcMotion())
+                duration = 200
+                scrimColor = Color.TRANSPARENT
+                addTarget(binding.fabLayers)
+                isElevationShadowEnabled = false
+            }
+            TransitionManager.beginDelayedTransition(binding.root, materialTransform)
+            vm.layersMenuOpen.value = false
+        }, 100)
     }
 
     private fun toggleFavorite() {
         val favs = vm.favorites.value ?: return
         val charger = vm.chargerSparse.value ?: return
-        if (favs.find { it.id == charger.id } != null) {
+        val isFav = favs.find { it.id == charger.id } != null
+        if (isFav) {
             vm.deleteFavorite(charger)
         } else {
             vm.insertFavorite(charger)
         }
+        markers.inverse[charger]?.setIcon(
+            chargerIconGenerator.getBitmapDescriptor(
+                getMarkerTint(charger, vm.filteredConnectors.value),
+                highlight = true,
+                fault = charger.faultReport != null,
+                multi = charger.isMulti(vm.filteredConnectors.value),
+                fav = !isFav
+            )
+        )
     }
 
     private fun setupObservers() {
@@ -475,6 +542,7 @@ class MapFragment : Fragment(), OnMapReadyCallback, MapsActivity.FragmentCallbac
                 if (vm.bottomSheetState.value != BottomSheetBehaviorGoogleMapsLike.STATE_ANCHOR_POINT) {
                     bottomSheetBehavior.state = STATE_COLLAPSED
                 }
+                removeSearchFocus()
                 binding.fabDirections.show()
                 detailAppBarBehavior.setToolbarTitle(it.name)
                 updateFavoriteToggle()
@@ -544,8 +612,8 @@ class MapFragment : Fragment(), OnMapReadyCallback, MapsActivity.FragmentCallbac
             updateBackPressedCallback()
         })
         vm.layersMenuOpen.observe(viewLifecycleOwner, Observer { open ->
-            binding.fabLayers.visibility = if (open) View.GONE else View.VISIBLE
-            binding.layersSheet.visibility = if (open) View.VISIBLE else View.GONE
+            binding.fabLayers.visibility = if (open) View.INVISIBLE else View.VISIBLE
+            binding.layersSheet.visibility = if (open) View.VISIBLE else View.INVISIBLE
             updateBackPressedCallback()
         })
         vm.mapType.observe(viewLifecycleOwner, Observer {
@@ -573,7 +641,8 @@ class MapFragment : Fragment(), OnMapReadyCallback, MapsActivity.FragmentCallbac
                     getMarkerTint(c, vm.filteredConnectors.value),
                     highlight = false,
                     fault = c.faultReport != null,
-                    multi = c.isMulti(vm.filteredConnectors.value)
+                    multi = c.isMulti(vm.filteredConnectors.value),
+                    fav = c.id in vm.favorites.value?.map { it.id } ?: emptyList()
                 )
             )
         }
@@ -587,7 +656,8 @@ class MapFragment : Fragment(), OnMapReadyCallback, MapsActivity.FragmentCallbac
                 getMarkerTint(charger, vm.filteredConnectors.value),
                 highlight = true,
                 fault = charger.faultReport != null,
-                multi = charger.isMulti(vm.filteredConnectors.value)
+                multi = charger.isMulti(vm.filteredConnectors.value),
+                fav = charger.id in vm.favorites.value?.map { it.id } ?: emptyList()
             )
         )
         animator.animateMarkerBounce(marker)
@@ -600,7 +670,8 @@ class MapFragment : Fragment(), OnMapReadyCallback, MapsActivity.FragmentCallbac
                         getMarkerTint(c, vm.filteredConnectors.value),
                         highlight = false,
                         fault = c.faultReport != null,
-                        multi = c.isMulti(vm.filteredConnectors.value)
+                        multi = c.isMulti(vm.filteredConnectors.value),
+                        fav = c.id in vm.favorites.value?.map { it.id } ?: emptyList()
                     )
                 )
             }
@@ -802,10 +873,10 @@ class MapFragment : Fragment(), OnMapReadyCallback, MapsActivity.FragmentCallbac
 
 
         val position = vm.mapPosition.value
-        val lat = arguments?.optDouble(ARG_LAT)
-        val lon = arguments?.optDouble(ARG_LON)
-        val chargerId = arguments?.optLong(ARG_CHARGER_ID)
-        val locationName = arguments?.getString(ARG_LOCATION_NAME)
+        val fragmentArgs: MapFragmentArgs by navArgs()
+        val locationName = fragmentArgs.locationName
+        val chargerId = fragmentArgs.chargerId
+        val latLng = fragmentArgs.latLng
 
         var positionSet = false
 
@@ -814,7 +885,7 @@ class MapFragment : Fragment(), OnMapReadyCallback, MapsActivity.FragmentCallbac
                 map.cameraUpdateFactory.newLatLngZoom(position.bounds.center, position.zoom)
             map.moveCamera(cameraUpdate)
             positionSet = true
-        } else if (chargerId != null && (lat == null || lon == null)) {
+        } else if (chargerId != 0L && latLng == null) {
             // show given charger ID
             vm.loadChargerById(chargerId)
             vm.chargerSparse.observe(
@@ -832,13 +903,12 @@ class MapFragment : Fragment(), OnMapReadyCallback, MapsActivity.FragmentCallbac
                 })
 
             positionSet = true
-        } else if (lat != null && lon != null) {
+        } else if (latLng != null) {
             // show given position
-            val latLng = LatLng(lat, lon)
             val cameraUpdate = map.cameraUpdateFactory.newLatLngZoom(latLng, 16f)
             map.moveCamera(cameraUpdate)
 
-            if (chargerId != null) {
+            if (chargerId != 0L) {
                 // show charger detail after chargers were loaded
                 vm.chargepoints.observe(
                     viewLifecycleOwner,
@@ -862,7 +932,11 @@ class MapFragment : Fragment(), OnMapReadyCallback, MapsActivity.FragmentCallbac
         } else if (locationName != null) {
             lifecycleScope.launch {
                 val address = withContext(Dispatchers.IO) {
-                    Geocoder(requireContext()).getFromLocationName(locationName, 1).getOrNull(0)
+                    try {
+                        Geocoder(requireContext()).getFromLocationName(locationName, 1).getOrNull(0)
+                    } catch (e: IOException) {
+                        null
+                    }
                 }
                 address?.let {
                     val latLng = LatLng(it.latitude, it.longitude)
@@ -895,6 +969,11 @@ class MapFragment : Fragment(), OnMapReadyCallback, MapsActivity.FragmentCallbac
         vm.mapPosition.value = MapPosition(
             map.projection.visibleRegion.latLngBounds, map.cameraPosition.zoom
         )
+
+        if (vm.searchResult.value != null) {
+            // show search result (after configuration change)
+            vm.searchResult.postValue(vm.searchResult.value)
+        }
     }
 
     @RequiresPermission(anyOf = [ACCESS_FINE_LOCATION, ACCESS_COARSE_LOCATION])
@@ -943,7 +1022,8 @@ class MapFragment : Fragment(), OnMapReadyCallback, MapsActivity.FragmentCallbac
                     getMarkerTint(charger, vm.filteredConnectors.value),
                     highlight = charger == vm.chargerSparse.value,
                     fault = charger.faultReport != null,
-                    multi = charger.isMulti(vm.filteredConnectors.value)
+                    multi = charger.isMulti(vm.filteredConnectors.value),
+                    fav = charger.id in vm.favorites.value?.map { it.id } ?: emptyList()
                 )
             )
         }
@@ -961,7 +1041,8 @@ class MapFragment : Fragment(), OnMapReadyCallback, MapsActivity.FragmentCallbac
                         val highlight = charger == vm.chargerSparse.value
                         val fault = charger.faultReport != null
                         val multi = charger.isMulti(vm.filteredConnectors.value)
-                        animator.animateMarkerDisappear(marker, tint, highlight, fault, multi)
+                        val fav = charger.id in vm.favorites.value?.map { it.id } ?: emptyList()
+                        animator.animateMarkerDisappear(marker, tint, highlight, fault, multi, fav)
                     } else {
                         animator.deleteMarker(marker)
                     }
@@ -976,6 +1057,7 @@ class MapFragment : Fragment(), OnMapReadyCallback, MapsActivity.FragmentCallbac
                     val highlight = charger == vm.chargerSparse.value
                     val fault = charger.faultReport != null
                     val multi = charger.isMulti(vm.filteredConnectors.value)
+                    val fav = charger.id in vm.favorites.value?.map { it.id } ?: emptyList()
                     val marker = map.addMarker(
                         MarkerOptions()
                             .position(LatLng(charger.coordinates.lat, charger.coordinates.lng))
@@ -986,12 +1068,13 @@ class MapFragment : Fragment(), OnMapReadyCallback, MapsActivity.FragmentCallbac
                                     255,
                                     highlight,
                                     fault,
-                                    multi
+                                    multi,
+                                    fav
                                 )
                             )
                             .anchor(0.5f, 1f)
                     )
-                    animator.animateMarkerAppear(marker, tint, highlight, fault, multi)
+                    animator.animateMarkerAppear(marker, tint, highlight, fault, multi, fav)
                     markers[marker] = charger
                 }
             }
@@ -1046,12 +1129,18 @@ class MapFragment : Fragment(), OnMapReadyCallback, MapsActivity.FragmentCallbac
         filterView?.setOnClickListener {
             var profilesMap: MutableBiMap<Long, MenuItem> = HashBiMap()
 
-            val popup = PopupMenu(requireContext(), it, Gravity.END)
+            val popup = PopupMenu(
+                ContextThemeWrapper(requireContext(), R.style.RoundedPopup),
+                it,
+                Gravity.END
+            )
             popup.menuInflater.inflate(R.menu.popup_filter, popup.menu)
             MenuCompat.setGroupDividerEnabled(popup.menu, true)
             popup.setOnMenuItemClickListener {
                 when (it.itemId) {
                     R.id.menu_edit_filters -> {
+                        exitTransition = MaterialSharedAxis(MaterialSharedAxis.Z, true)
+                        reenterTransition = MaterialSharedAxis(MaterialSharedAxis.Z, false)
                         lifecycleScope.launch {
                             vm.copyFiltersToCustom()
                             requireView().findNavController().navigate(
@@ -1061,6 +1150,8 @@ class MapFragment : Fragment(), OnMapReadyCallback, MapsActivity.FragmentCallbac
                         true
                     }
                     R.id.menu_manage_filter_profiles -> {
+                        exitTransition = MaterialSharedAxis(MaterialSharedAxis.Z, true)
+                        reenterTransition = MaterialSharedAxis(MaterialSharedAxis.Z, false)
                         requireView().findNavController().navigate(
                             R.id.action_map_to_filterProfilesFragment
                         )
@@ -1083,6 +1174,11 @@ class MapFragment : Fragment(), OnMapReadyCallback, MapsActivity.FragmentCallbac
                     R.id.menu_group_filter_profiles,
                     Menu.NONE, Menu.NONE, R.string.no_filters
                 )
+                val favoritesItem = popup.menu.add(
+                    R.id.menu_group_filter_profiles,
+                    Menu.NONE,
+                    Menu.NONE, R.string.filter_favorites
+                )
                 profiles.forEach { profile ->
                     val item = popup.menu.add(
                         R.id.menu_group_filter_profiles,
@@ -1099,11 +1195,12 @@ class MapFragment : Fragment(), OnMapReadyCallback, MapsActivity.FragmentCallbac
 
                 profilesMap[FILTERS_DISABLED] = noFiltersItem
                 profilesMap[FILTERS_CUSTOM] = customItem
+                profilesMap[FILTERS_FAVORITES] = favoritesItem
 
                 popup.menu.setGroupCheckable(R.id.menu_group_filter_profiles, true, true);
 
                 val manageFiltersItem = popup.menu.findItem(R.id.menu_manage_filter_profiles)
-                manageFiltersItem.isVisible = !profiles.isEmpty()
+                manageFiltersItem.isVisible = profiles.isNotEmpty()
 
                 vm.filterStatus.observe(viewLifecycleOwner, Observer { id ->
                     when (id) {
@@ -1115,6 +1212,10 @@ class MapFragment : Fragment(), OnMapReadyCallback, MapsActivity.FragmentCallbac
                             customItem.isVisible = true
                             customItem.isChecked = true
                         }
+                        FILTERS_FAVORITES -> {
+                            customItem.isVisible = false
+                            favoritesItem.isChecked = true
+                        }
                         else -> {
                             customItem.isVisible = false
                             val item = profilesMap[id]
@@ -1153,43 +1254,6 @@ class MapFragment : Fragment(), OnMapReadyCallback, MapsActivity.FragmentCallbac
         return binding.root
     }
 
-    companion object {
-        fun showCharger(charger: ChargeLocation): Bundle {
-            return Bundle().apply {
-                putLong(ARG_CHARGER_ID, charger.id)
-                putDouble(ARG_LAT, charger.coordinates.lat)
-                putDouble(ARG_LON, charger.coordinates.lng)
-            }
-        }
-
-        fun showLocation(lat: Double, lon: Double): Bundle {
-            return Bundle().apply {
-                putDouble(ARG_LAT, lat)
-                putDouble(ARG_LON, lon)
-            }
-        }
-
-        fun showChargerById(id: Long): Bundle {
-            return Bundle().apply {
-                putLong(ARG_CHARGER_ID, id)
-            }
-        }
-
-        fun showCharger(id: Long, lat: Double, lon: Double): Bundle {
-            return Bundle().apply {
-                putLong(ARG_CHARGER_ID, id)
-                putDouble(ARG_LAT, lat)
-                putDouble(ARG_LON, lon)
-            }
-        }
-
-        fun showLocationByName(query: String): Bundle {
-            return Bundle().apply {
-                putString(ARG_LOCATION_NAME, query)
-            }
-        }
-    }
-
     override fun onConnected() {
         val map = this.map ?: return
         val context = this.context ?: return

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

@@ -4,6 +4,7 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import android.view.WindowManager
 import androidx.appcompat.app.AppCompatDialogFragment
 import androidx.core.widget.doAfterTextChanged
 import androidx.recyclerview.widget.LinearLayoutManager
@@ -14,6 +15,7 @@ import net.vonforst.evmap.databinding.DialogMultiSelectBinding
 import java.util.*
 import kotlin.collections.HashMap
 import kotlin.collections.HashSet
+import kotlin.math.roundToInt
 
 class MultiSelectDialog : AppCompatDialogFragment() {
     companion object {
@@ -53,9 +55,13 @@ class MultiSelectDialog : AppCompatDialogFragment() {
     override fun onStart() {
         super.onStart()
 
+        val density = resources.displayMetrics.density
+        val width = resources.displayMetrics.widthPixels
+        val maxWidth = (500 * density).roundToInt()
+
         // dialog with 95% screen height
         dialog?.window?.setLayout(
-            ViewGroup.LayoutParams.MATCH_PARENT,
+            if (width < maxWidth) WindowManager.LayoutParams.MATCH_PARENT else maxWidth,
             (resources.displayMetrics.heightPixels * 0.95).toInt()
         )
     }
@@ -81,9 +87,10 @@ class MultiSelectDialog : AppCompatDialogFragment() {
             .sortedBy { it.value.toLowerCase(Locale.getDefault()) }
             .sortedBy {
                 when {
-                    selected.contains(it.key) -> 0
-                    commonChoices?.contains(it.key) == true -> 1
-                    else -> 2
+                    selected.contains(it.key) && commonChoices?.contains(it.key) == true -> 0
+                    selected.contains(it.key) -> 1
+                    commonChoices?.contains(it.key) == true -> 2
+                    else -> 3
                 }
             }
             .map { MultiSelectItem(it.key, it.value, it.key in selected) }

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

@@ -52,8 +52,17 @@ class OnboardingFragment : Fragment() {
 
             override fun onPageSelected(position: Int) {
                 binding.pageIndicatorView.selection = position
+                binding.forward?.visibility =
+                    if (position == adapter.itemCount - 1) View.INVISIBLE else View.VISIBLE
+                binding.backward?.visibility = if (position == 0) View.INVISIBLE else View.VISIBLE
             }
         })
+        binding.forward?.setOnClickListener {
+            binding.viewPager.setCurrentItem(binding.viewPager.currentItem + 1, true)
+        }
+        binding.backward?.setOnClickListener {
+            binding.viewPager.setCurrentItem(binding.viewPager.currentItem - 1, true)
+        }
 
         return binding.root
     }

app/src/main/java/net/vonforst/evmap/fragment/preference/AboutFragment.kt

@@ -1,11 +1,15 @@
-package net.vonforst.evmap.fragment
+package net.vonforst.evmap.fragment.preference
 
 import android.os.Bundle
+import android.view.View
 import androidx.appcompat.widget.Toolbar
 import androidx.navigation.fragment.findNavController
 import androidx.navigation.ui.setupWithNavController
 import androidx.preference.Preference
 import androidx.preference.PreferenceFragmentCompat
+import com.google.android.material.color.MaterialColors
+import com.google.android.material.transition.MaterialFadeThrough
+import com.google.android.material.transition.MaterialSharedAxis
 import com.mikepenz.aboutlibraries.LibsBuilder
 import net.vonforst.evmap.BuildConfig
 import net.vonforst.evmap.MapsActivity
@@ -13,14 +17,23 @@ import net.vonforst.evmap.R
 
 
 class AboutFragment : PreferenceFragmentCompat() {
-    override fun onResume() {
-        super.onResume()
-        val toolbar = requireView().findViewById(R.id.toolbar) as Toolbar
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        enterTransition = MaterialFadeThrough()
+        exitTransition = MaterialFadeThrough()
+    }
 
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+
+        val toolbar = view.findViewById<Toolbar>(R.id.toolbar)
         toolbar.setupWithNavController(
             findNavController(),
             (requireActivity() as MapsActivity).appBarConfiguration
         )
+
+        // Workaround for AndroidX bug: https://github.com/material-components/material-components-android/issues/1984
+        view.setBackgroundColor(MaterialColors.getColor(view, android.R.attr.windowBackground))
     }
 
     override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
@@ -54,6 +67,8 @@ class AboutFragment : PreferenceFragmentCompat() {
                 true
             }
             "donate" -> {
+                exitTransition = MaterialSharedAxis(MaterialSharedAxis.X, true)
+                reenterTransition = MaterialSharedAxis(MaterialSharedAxis.X, false)
                 findNavController().navigate(R.id.action_about_to_donateFragment)
                 true
             }

app/src/main/java/net/vonforst/evmap/fragment/preference/BaseSettingsFragment.kt

@@ -0,0 +1,59 @@
+package net.vonforst.evmap.fragment.preference
+
+import android.content.SharedPreferences
+import android.os.Bundle
+import android.view.View
+import androidx.appcompat.widget.Toolbar
+import androidx.navigation.fragment.findNavController
+import androidx.navigation.ui.setupWithNavController
+import androidx.preference.PreferenceFragmentCompat
+import com.google.android.material.color.MaterialColors
+import com.google.android.material.transition.MaterialFadeThrough
+import com.google.android.material.transition.MaterialSharedAxis
+import net.vonforst.evmap.MapsActivity
+import net.vonforst.evmap.R
+import net.vonforst.evmap.storage.PreferenceDataSource
+
+abstract class BaseSettingsFragment : PreferenceFragmentCompat(),
+    SharedPreferences.OnSharedPreferenceChangeListener {
+    protected lateinit var prefs: PreferenceDataSource
+    protected abstract val isTopLevel: Boolean
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+
+        if (isTopLevel) {
+            enterTransition = MaterialFadeThrough()
+            exitTransition = MaterialFadeThrough()
+        } else {
+            enterTransition = MaterialSharedAxis(MaterialSharedAxis.X, true)
+            returnTransition = MaterialSharedAxis(MaterialSharedAxis.X, false)
+        }
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+
+        val toolbar = view.findViewById<Toolbar>(R.id.toolbar)
+        toolbar.setupWithNavController(
+            findNavController(),
+            (requireActivity() as MapsActivity).appBarConfiguration
+        )
+
+        prefs = PreferenceDataSource(requireContext())
+
+        // Workaround for AndroidX bug: https://github.com/material-components/material-components-android/issues/1984
+        view.setBackgroundColor(MaterialColors.getColor(view, android.R.attr.windowBackground))
+    }
+
+    override fun onResume() {
+        super.onResume()
+        preferenceManager.sharedPreferences.registerOnSharedPreferenceChangeListener(this)
+    }
+
+    override fun onPause() {
+        preferenceManager.sharedPreferences
+            .unregisterOnSharedPreferenceChangeListener(this)
+        super.onPause()
+    }
+}

app/src/main/java/net/vonforst/evmap/fragment/preference/ChargepriceSettingsFragment.kt

@@ -1,27 +1,16 @@
-package net.vonforst.evmap.fragment
+package net.vonforst.evmap.fragment.preference
 
 import android.content.SharedPreferences
 import android.os.Bundle
 import android.view.View
-import android.widget.Toast
-import androidx.appcompat.widget.Toolbar
 import androidx.fragment.app.viewModels
-import androidx.navigation.fragment.findNavController
-import androidx.navigation.ui.setupWithNavController
 import androidx.preference.MultiSelectListPreference
-import androidx.preference.Preference
-import androidx.preference.PreferenceFragmentCompat
-import net.vonforst.evmap.MapsActivity
 import net.vonforst.evmap.R
-import net.vonforst.evmap.storage.PreferenceDataSource
-import net.vonforst.evmap.ui.updateNightMode
 import net.vonforst.evmap.viewmodel.SettingsViewModel
 import net.vonforst.evmap.viewmodel.viewModelFactory
 
-
-class SettingsFragment : PreferenceFragmentCompat(),
-    SharedPreferences.OnSharedPreferenceChangeListener {
-    private lateinit var prefs: PreferenceDataSource
+class ChargepriceSettingsFragment : BaseSettingsFragment() {
+    override val isTopLevel = false
 
     private val vm: SettingsViewModel by viewModels(factoryProducer = {
         viewModelFactory {
@@ -37,7 +26,6 @@ class SettingsFragment : PreferenceFragmentCompat(),
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
-        prefs = PreferenceDataSource(requireContext())
 
         myVehiclePreference = findPreference("chargeprice_my_vehicle")!!
         myVehiclePreference.isEnabled = false
@@ -92,68 +80,21 @@ class SettingsFragment : PreferenceFragmentCompat(),
                 "${it.brand} ${it.name}"
             }.joinToString(", ")
             myVehiclePreference.summary = summary
-            // TODO: prefs.chargepriceMyVehicleDcChargeports = it.dcChargePorts
         }
     }
 
     override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
-        setPreferencesFromResource(R.xml.settings, rootKey)
-    }
-
-    override fun onPreferenceTreeClick(preference: Preference?): Boolean {
-        return when (preference?.key) {
-            "search_delete_recent" -> {
-                Toast.makeText(context, R.string.deleted_recent_search_results, Toast.LENGTH_LONG)
-                    .show()
-                vm.deleteRecentSearchResults()
-                true
-            }
-            else -> super.onPreferenceTreeClick(preference)
-        }
+        setPreferencesFromResource(R.xml.settings_chargeprice, rootKey)
     }
 
     override fun onSharedPreferenceChanged(sharedPreferences: SharedPreferences, key: String) {
         when (key) {
-            "language" -> {
-                activity?.let {
-                    it.finish();
-                    it.startActivity(it.intent);
-                }
-            }
-            "darkmode" -> {
-                updateNightMode(prefs)
-            }
             "chargeprice_my_vehicle" -> {
                 updateMyVehiclesSummary()
             }
             "chargeprice_my_tariffs" -> {
                 updateMyTariffsSummary()
             }
-            "search_provider" -> {
-                if (prefs.searchProvider == "google") {
-                    Toast.makeText(context, R.string.pref_search_provider_info, Toast.LENGTH_LONG)
-                        .show()
-                }
-            }
         }
     }
-
-    override fun onResume() {
-        super.onResume()
-        preferenceManager.sharedPreferences.registerOnSharedPreferenceChangeListener(this)
-
-        val navController = findNavController()
-        val toolbar = requireView().findViewById(R.id.toolbar) as Toolbar
-        toolbar.setupWithNavController(
-            navController,
-            (requireActivity() as MapsActivity).appBarConfiguration
-        )
-    }
-
-    override fun onPause() {
-        preferenceManager.sharedPreferences
-            .unregisterOnSharedPreferenceChangeListener(this)
-        super.onPause()
-    }
-
 }

app/src/main/java/net/vonforst/evmap/fragment/preference/DataSettingsFragment.kt

@@ -0,0 +1,65 @@
+package net.vonforst.evmap.fragment.preference
+
+import android.content.SharedPreferences
+import android.os.Bundle
+import android.widget.TextView
+import androidx.fragment.app.viewModels
+import androidx.preference.Preference
+import com.google.android.material.snackbar.Snackbar
+import net.vonforst.evmap.R
+import net.vonforst.evmap.viewmodel.SettingsViewModel
+import net.vonforst.evmap.viewmodel.viewModelFactory
+
+class DataSettingsFragment : BaseSettingsFragment() {
+    override val isTopLevel = false
+
+    private val vm: SettingsViewModel by viewModels(factoryProducer = {
+        viewModelFactory {
+            SettingsViewModel(
+                requireActivity().application,
+                getString(R.string.chargeprice_key)
+            )
+        }
+    })
+
+    override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
+        setPreferencesFromResource(R.xml.settings_data, rootKey)
+    }
+
+    override fun onSharedPreferenceChanged(sharedPreferences: SharedPreferences, key: String) {
+        when (key) {
+            "search_provider" -> {
+                if (prefs.searchProvider == "google") {
+                    Snackbar.make(
+                        requireView(),
+                        R.string.pref_search_provider_info,
+                        Snackbar.LENGTH_INDEFINITE
+                    ).apply {
+                        setAction(R.string.ok) {}
+                        this.view.findViewById<TextView>(com.google.android.material.R.id.snackbar_text)
+                            ?.apply {
+                                maxLines = 6
+                            }
+                    }
+                        .show()
+                }
+            }
+        }
+    }
+
+    override fun onPreferenceTreeClick(preference: Preference?): Boolean {
+        return when (preference?.key) {
+            "search_delete_recent" -> {
+                Snackbar.make(
+                    requireView(),
+                    R.string.deleted_recent_search_results,
+                    Snackbar.LENGTH_LONG
+                )
+                    .show()
+                vm.deleteRecentSearchResults()
+                true
+            }
+            else -> super.onPreferenceTreeClick(preference)
+        }
+    }
+}

app/src/main/java/net/vonforst/evmap/fragment/preference/SettingsFragment.kt

@@ -0,0 +1,24 @@
+package net.vonforst.evmap.fragment.preference
+
+import android.content.SharedPreferences
+import android.os.Bundle
+import android.view.View
+import net.vonforst.evmap.R
+
+
+class SettingsFragment : BaseSettingsFragment() {
+    override val isTopLevel = true
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+    }
+
+    override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
+        addPreferencesFromResource(R.xml.settings)
+        addPreferencesFromResource(R.xml.settings_variantspecific)
+    }
+
+    override fun onSharedPreferenceChanged(sharedPreferences: SharedPreferences, key: String) {
+
+    }
+}

app/src/main/java/net/vonforst/evmap/fragment/preference/UiSettingsFragment.kt

@@ -0,0 +1,28 @@
+package net.vonforst.evmap.fragment.preference
+
+import android.content.SharedPreferences
+import android.os.Bundle
+import net.vonforst.evmap.R
+import net.vonforst.evmap.ui.updateNightMode
+
+class UiSettingsFragment : BaseSettingsFragment() {
+    override val isTopLevel = false
+
+    override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
+        setPreferencesFromResource(R.xml.settings_ui, rootKey)
+    }
+
+    override fun onSharedPreferenceChanged(sharedPreferences: SharedPreferences, key: String) {
+        when (key) {
+            "language" -> {
+                activity?.let {
+                    it.finish();
+                    it.startActivity(it.intent);
+                }
+            }
+            "darkmode" -> {
+                updateNightMode(prefs)
+            }
+        }
+    }
+}

app/src/main/java/net/vonforst/evmap/fragment/updatedialogs/OpensourceDonationsDialogFramgent.kt

@@ -10,6 +10,7 @@ import androidx.navigation.fragment.findNavController
 import net.vonforst.evmap.R
 import net.vonforst.evmap.databinding.DialogOpensourceDonationsBinding
 import net.vonforst.evmap.storage.PreferenceDataSource
+import kotlin.math.roundToInt
 
 class OpensourceDonationsDialogFramgent : AppCompatDialogFragment() {
     private lateinit var binding: DialogOpensourceDonationsBinding
@@ -43,8 +44,13 @@ class OpensourceDonationsDialogFramgent : AppCompatDialogFragment() {
 
     override fun onStart() {
         super.onStart()
+
+        val density = resources.displayMetrics.density
+        val width = resources.displayMetrics.widthPixels
+        val maxWidth = (500 * density).roundToInt()
+
         dialog?.window?.setLayout(
-            WindowManager.LayoutParams.MATCH_PARENT,
+            if (width < maxWidth) WindowManager.LayoutParams.MATCH_PARENT else maxWidth,
             WindowManager.LayoutParams.WRAP_CONTENT
         )
     }

app/src/main/java/net/vonforst/evmap/model/ChargersModel.kt

@@ -126,6 +126,9 @@ data class Cost(
     val descriptionShort: String? = null,
     val descriptionLong: String? = null
 ) : Parcelable {
+    val isEmpty: Boolean
+        get() = descriptionLong == null && descriptionShort == null && freecharging == null && freeparking == null
+
     fun getStatusText(ctx: Context, emoji: Boolean = false): CharSequence {
         if (freecharging != null && freeparking != null) {
             val charging =
@@ -137,6 +140,22 @@ data class Cost(
             } else {
                 HtmlCompat.fromHtml(ctx.getString(R.string.cost_detail, charging, parking), 0)
             }
+        } else if (freecharging != null) {
+            val charging =
+                if (freecharging) ctx.getString(R.string.free) else ctx.getString(R.string.paid)
+            return if (emoji) {
+                "⚡ $charging"
+            } else {
+                HtmlCompat.fromHtml(ctx.getString(R.string.cost_detail_charging, charging), 0)
+            }
+        } else if (freeparking != null) {
+            val parking =
+                if (freeparking) ctx.getString(R.string.free) else ctx.getString(R.string.paid)
+            return if (emoji) {
+                "\uD83C\uDD7F $parking"
+            } else {
+                HtmlCompat.fromHtml(ctx.getString(R.string.cost_detail_parking, parking), 0)
+            }
         } else if (descriptionShort != null) {
             return descriptionShort
         } else if (descriptionLong != null) {
@@ -162,9 +181,7 @@ data class OpeningHours(
             return HtmlCompat.fromHtml(ctx.getString(R.string.open_247), 0)
         } else if (days != null) {
             val hours = days.getHoursForDate(LocalDate.now())
-            if (hours.start == null || hours.end == null) {
-                return HtmlCompat.fromHtml(ctx.getString(R.string.closed), 0)
-            }
+                ?: return HtmlCompat.fromHtml(ctx.getString(R.string.closed), 0)
 
             val now = LocalTime.now()
             if (hours.start.isBefore(now) && hours.end.isAfter(now)) {
@@ -192,21 +209,21 @@ data class OpeningHours(
 
 @Parcelize
 data class OpeningHoursDays(
-    @Embedded(prefix = "mo") val monday: Hours,
-    @Embedded(prefix = "tu") val tuesday: Hours,
-    @Embedded(prefix = "we") val wednesday: Hours,
-    @Embedded(prefix = "th") val thursday: Hours,
-    @Embedded(prefix = "fr") val friday: Hours,
-    @Embedded(prefix = "sa") val saturday: Hours,
-    @Embedded(prefix = "su") val sunday: Hours,
-    @Embedded(prefix = "ho") val holiday: Hours
+    @Embedded(prefix = "mo") val monday: Hours?,
+    @Embedded(prefix = "tu") val tuesday: Hours?,
+    @Embedded(prefix = "we") val wednesday: Hours?,
+    @Embedded(prefix = "th") val thursday: Hours?,
+    @Embedded(prefix = "fr") val friday: Hours?,
+    @Embedded(prefix = "sa") val saturday: Hours?,
+    @Embedded(prefix = "su") val sunday: Hours?,
+    @Embedded(prefix = "ho") val holiday: Hours?
 ) : Parcelable {
-    fun getHoursForDate(date: LocalDate): Hours {
+    fun getHoursForDate(date: LocalDate): Hours? {
         // TODO: check for holidays
         return getHoursForDayOfWeek(date.dayOfWeek)
     }
 
-    fun getHoursForDayOfWeek(dayOfWeek: DayOfWeek?): Hours {
+    fun getHoursForDayOfWeek(dayOfWeek: DayOfWeek?): Hours? {
         @Suppress("WHEN_ENUM_CAN_BE_NULL_IN_JAVA")
         return when (dayOfWeek) {
             DayOfWeek.MONDAY -> monday
@@ -223,16 +240,12 @@ data class OpeningHoursDays(
 
 @Parcelize
 data class Hours(
-    val start: LocalTime?,
-    val end: LocalTime?
+    val start: LocalTime,
+    val end: LocalTime
 ) : Parcelable {
     override fun toString(): String {
-        if (start != null && end != null) {
-            val fmt = DateTimeFormatter.ofLocalizedTime(FormatStyle.SHORT)
-            return "${start.format(fmt)} - ${end.format(fmt)}"
-        } else {
-            return "closed"
-        }
+        val fmt = DateTimeFormatter.ofLocalizedTime(FormatStyle.SHORT)
+        return "${start.format(fmt)} - ${end.format(fmt)}"
     }
 }
 

app/src/main/java/net/vonforst/evmap/model/FiltersModel.kt

@@ -129,4 +129,5 @@ fun FilterValues.getMultipleChoiceValue(key: String) =
     this.find { it.value.key == key }?.value as MultipleChoiceFilterValue?
 
 const val FILTERS_DISABLED = -2L
-const val FILTERS_CUSTOM = -1L
+const val FILTERS_CUSTOM = -1L
+const val FILTERS_FAVORITES = -3L

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

@@ -23,4 +23,12 @@ interface ChargeLocationsDao {
 
     @Query("SELECT * FROM chargelocation")
     fun getAllChargeLocationsBlocking(): List<ChargeLocation>
+
+    @Query("SELECT * FROM chargelocation WHERE lat >= :lat1 AND lat <= :lat2 AND lng >= :lng1 AND lng <= :lng2")
+    suspend fun getChargeLocationsInBoundsAsync(
+        lat1: Double,
+        lat2: Double,
+        lng1: Double,
+        lng2: Double
+    ): List<ChargeLocation>
 }

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

@@ -54,7 +54,7 @@ abstract class FilterValueDao {
     )
 
     open fun getFilterValues(filterStatus: Long, dataSource: String): LiveData<List<FilterValue>> =
-        if (filterStatus == FILTERS_DISABLED) {
+        if (filterStatus == FILTERS_DISABLED || filterStatus == FILTERS_FAVORITES) {
             MutableLiveData(emptyList())
         } else {
             MediatorLiveData<List<FilterValue>>().apply {

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

@@ -168,6 +168,17 @@ class PreferenceDataSource(val context: Context) {
                 .apply()
         }
 
+    var chargepriceBatteryRangeAndroidAuto: List<Float>
+        get() = listOf(
+            sp.getFloat("chargeprice_battery_range_android_auto_min", 20f),
+            sp.getFloat("chargeprice_battery_range_android_auto_max", 80f),
+        )
+        set(value) {
+            sp.edit().putFloat("chargeprice_battery_range_android_auto_min", value[0])
+                .putFloat("chargeprice_battery_range_android_auto_max", value[1])
+                .apply()
+        }
+
     /** App start counter, introduced with Version 1.0.0 */
     var appStartCounter: Long
         get() = sp.getLong("app_start_counter", 0)

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

@@ -2,6 +2,10 @@ package net.vonforst.evmap.ui
 
 import android.content.Context
 import android.content.res.ColorStateList
+import android.graphics.Color
+import android.graphics.drawable.ColorDrawable
+import android.graphics.drawable.Drawable
+import android.graphics.drawable.LayerDrawable
 import android.text.SpannableString
 import android.view.View
 import android.view.ViewGroup.MarginLayoutParams
@@ -18,14 +22,12 @@ import androidx.databinding.InverseBindingListener
 import androidx.recyclerview.widget.ListAdapter
 import androidx.recyclerview.widget.RecyclerView
 import androidx.viewpager2.widget.ViewPager2
+import coil.load
 import com.google.android.material.floatingactionbutton.FloatingActionButton
 import com.google.android.material.slider.RangeSlider
-import net.vonforst.evmap.R
+import net.vonforst.evmap.*
 import net.vonforst.evmap.api.availability.ChargepointStatus
 import net.vonforst.evmap.api.iconForPlugType
-import net.vonforst.evmap.kmPerMile
-import net.vonforst.evmap.meterPerFt
-import net.vonforst.evmap.shouldUseImperialUnits
 import kotlin.math.ceil
 import kotlin.math.floor
 import kotlin.math.roundToInt
@@ -344,18 +346,68 @@ fun setImageTintList(view: ImageView, @ColorInt color: Int) {
     view.imageTintList = ColorStateList.valueOf(color)
 }
 
-@BindingAdapter("myTariffsBackground")
-fun myTariffsBackground(view: View, myTariff: Boolean) {
-    if (myTariff) {
-        view.background = ContextCompat.getDrawable(view.context, R.drawable.my_tariff_background)
-    } else {
-        view.context.obtainStyledAttributes(intArrayOf(R.attr.selectableItemBackground)).use {
-            view.background = it.getDrawable(0)
+fun tariffBackground(context: Context, myTariff: Boolean, brandingColor: String?): Drawable? {
+    when {
+        myTariff -> {
+            return ContextCompat.getDrawable(context, R.drawable.my_tariff_background)
         }
+        brandingColor != null -> {
+            val drawable = ContextCompat.getDrawable(context, R.drawable.branded_tariff_background)
+            val color = colorToTransparent(Color.parseColor(brandingColor))
+            (drawable as LayerDrawable).setDrawableByLayerId(
+                R.id.background, ColorDrawable(
+                    color
+                )
+            )
+            return drawable
+        }
+        else -> {
+            context.obtainStyledAttributes(intArrayOf(R.attr.selectableItemBackground)).use {
+                return it.getDrawable(0)
+            }
+        }
+    }
+}
+
+fun isDarkMode(context: Context) = context.isDarkMode()
+
+/**
+ * Converts an opaque color to a transparent color, assuming it was on a white background
+ * with a certain opacity targetAlpha.
+ */
+private fun colorToTransparent(color: Int, targetAlpha: Float = 31f / 255): Int {
+    if (Color.alpha(color) != 255) return color
+
+    val red = Color.red(color)
+    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()
+
+    return Color.argb((targetAlpha * 255).roundToInt(), newRed, newGreen, newBlue)
+}
+
+@BindingAdapter("imageUrl")
+fun loadImage(view: ImageView, url: String?) {
+    if (url != null) {
+        view.load(url)
+    } else {
+        view.setImageDrawable(null)
     }
 }
 
 @BindingAdapter("tooltipTextCompat")
 fun setTooltipTextCompat(view: View, text: String) {
     TooltipCompat.setTooltipText(view, text)
+}
+
+@BindingAdapter("tintNullable")
+fun setImageTint(view: ImageView, @ColorInt tint: Int?) {
+    if (tint != null) {
+        view.imageTintList = ColorStateList.valueOf(tint)
+    } else {
+        view.imageTintList = null
+    }
 }

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

@@ -55,7 +55,8 @@ class ChargerIconGenerator(
         val alpha: Int,
         val highlight: Boolean,
         val fault: Boolean,
-        val multi: Boolean
+        val multi: Boolean,
+        val fav: Boolean
     )
 
     // 230 items: (21 sizes, 5 colors, multi on/off) + highlight + fault (only with scale = 1)
@@ -66,6 +67,7 @@ class ChargerIconGenerator(
     private val highlightIcon = R.drawable.ic_map_marker_highlight
     private val highlightIconMulti = R.drawable.ic_map_marker_charging_highlight_multiple
     private val faultIcon = R.drawable.ic_map_marker_fault
+    private val favIcon = R.drawable.ic_map_marker_fav
 
     fun preloadCache() {
         // pre-generates images for scale from 0 to 255 for all possible tint colors
@@ -79,12 +81,14 @@ class ChargerIconGenerator(
         for (fault in listOf(false, true)) {
             for (highlight in listOf(false, true)) {
                 for (multi in listOf(false, true)) {
-                    for (tint in tints) {
-                        for (scale in 0..scaleResolution) {
-                            getBitmapDescriptor(
-                                tint, scale.toFloat() / scaleResolution,
-                                255, highlight, fault, multi
-                            )
+                    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
+                                )
+                            }
                         }
                     }
                 }
@@ -98,14 +102,16 @@ class ChargerIconGenerator(
         alpha: Int = 255,
         highlight: Boolean = false,
         fault: Boolean = false,
-        multi: Boolean = false
+        multi: Boolean = false,
+        fav: Boolean = false
     ): BitmapDescriptor? {
         val data = BitmapData(
             tint, (scale * scaleResolution).roundToInt(),
             alpha,
             if (scale == 1f) highlight else false,
             if (scale == 1f) fault else false,
-            multi
+            multi,
+            if (scale == 1f) fav else false
         )
         val cachedImg = cache[data]
         return if (cachedImg != null) {
@@ -124,14 +130,16 @@ class ChargerIconGenerator(
         alpha: Int = 255,
         highlight: Boolean = false,
         fault: Boolean = false,
-        multi: Boolean = false
+        multi: Boolean = false,
+        fav: Boolean = false
     ): Bitmap {
         val data = BitmapData(
             tint, (scale * scaleResolution).roundToInt(),
             alpha,
             if (scale == 1f) highlight else false,
             if (scale == 1f) fault else false,
-            multi
+            multi,
+            if (scale == 1f) fav else false,
         )
         return generateBitmap(data)
     }
@@ -200,6 +208,22 @@ class ChargerIconGenerator(
             faultDrawable.draw(canvas)
         }
 
+        if (data.fav) {
+            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
+            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()
+            )
+            favDrawable.alpha = data.alpha
+            favDrawable.draw(canvas)
+        }
+
         return bm
     }
 }

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

@@ -29,7 +29,8 @@ class MarkerAnimator(val gen: ChargerIconGenerator) {
         tint: Int,
         highlight: Boolean,
         fault: Boolean,
-        multi: Boolean
+        multi: Boolean,
+        fav: Boolean
     ) {
         animatingMarkers[marker]?.let {
             it.cancel()
@@ -47,7 +48,8 @@ class MarkerAnimator(val gen: ChargerIconGenerator) {
                         scale = scale,
                         highlight = highlight,
                         fault = fault,
-                        multi = multi
+                        multi = multi,
+                        fav = fav
                     )
                 )
             }
@@ -66,7 +68,8 @@ class MarkerAnimator(val gen: ChargerIconGenerator) {
         tint: Int,
         highlight: Boolean,
         fault: Boolean,
-        multi: Boolean
+        multi: Boolean,
+        fav: Boolean
     ) {
         animatingMarkers[marker]?.let {
             it.cancel()
@@ -84,7 +87,8 @@ class MarkerAnimator(val gen: ChargerIconGenerator) {
                         scale = scale,
                         highlight = highlight,
                         fault = fault,
-                        multi = multi
+                        multi = multi,
+                        fav = fav
                     )
                 )
             }

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

@@ -0,0 +1,117 @@
+package net.vonforst.evmap.ui
+
+import android.content.Context
+import android.util.AttributeSet
+import android.view.MotionEvent
+import androidx.preference.Preference
+import androidx.preference.PreferenceViewHolder
+import com.google.android.material.slider.RangeSlider
+import net.vonforst.evmap.R
+
+class RangeSliderPreference(context: Context, attrs: AttributeSet) : Preference(context, attrs) {
+    var valueFrom: Float = 0f
+        set(value) {
+            val v = if (value > valueTo) valueTo else value
+            if (v != valueFrom) {
+                field = v
+                notifyChanged()
+            }
+        }
+    var valueTo: Float = 100f
+        set(value) {
+            val v = if (value < valueFrom) valueFrom else value
+            if (v != valueTo) {
+                field = v
+                notifyChanged()
+            }
+        }
+    var stepSize: Float? = null
+        set(value) {
+            if (value != stepSize) {
+                field = value
+                notifyChanged()
+            }
+        }
+    var updatesContinuously: Boolean
+    var defaultValue: List<Float>
+    var labelFormatter: ((Float) -> String)? = null
+        set(value) {
+            if (value != labelFormatter) {
+                field = value
+                notifyChanged()
+            }
+        }
+
+    private lateinit var slider: RangeSlider
+    private var dragging = false
+
+    var values: List<Float>
+        get() = if ((sharedPreferences.contains(key + "_min") && sharedPreferences.contains(key + "_max"))) {
+            listOf(
+                sharedPreferences.getFloat(key + "_min", 0f),
+                sharedPreferences.getFloat(key + "_max", 0f)
+            )
+        } else defaultValue
+        set(value) {
+            sharedPreferences.edit()
+                .putFloat(key + "_min", value[0])
+                .putFloat(key + "_max", value[1])
+                .apply()
+        }
+
+    init {
+        val a = context.obtainStyledAttributes(
+            attrs, R.styleable.RangeSliderPreference
+        )
+
+        // The ordering of these two statements are important. If we want to set max first, we need
+        // to perform the same steps by changing min/max to max/min as following:
+        // mMax = a.getInt(...) and setMin(...).
+        valueFrom = a.getFloat(R.styleable.RangeSliderPreference_android_valueFrom, 0f)
+        valueTo = a.getFloat(R.styleable.RangeSliderPreference_android_valueTo, 100f)
+        stepSize =
+            a.getFloat(R.styleable.RangeSliderPreference_android_stepSize, -1f).takeIf { it != -1f }
+        updatesContinuously = a.getBoolean(
+            R.styleable.RangeSliderPreference_updatesContinuously,
+            false
+        )
+        defaultValue =
+            a.getString(R.styleable.RangeSliderPreference_android_defaultValue)?.split(",")
+                ?.map { it.toFloat() } ?: listOf(valueFrom, valueTo)
+
+        a.recycle()
+    }
+
+    override fun onBindViewHolder(holder: PreferenceViewHolder) {
+        super.onBindViewHolder(holder)
+        slider = holder.findViewById(R.id.rangeSlider) as RangeSlider
+        slider.valueFrom = valueFrom
+        slider.valueTo = valueTo
+        stepSize?.let { slider.stepSize = it }
+
+        slider.addOnChangeListener { slider, value, fromUser ->
+            if (fromUser && (updatesContinuously || !dragging)) {
+                syncValueInternal(slider)
+            }
+        }
+        slider.setOnTouchListener { v, event ->
+            when (event.actionMasked) {
+                MotionEvent.ACTION_DOWN -> dragging = true
+                MotionEvent.ACTION_UP -> dragging = false
+            }
+            false
+        }
+        slider.values = values
+        slider.isEnabled = isEnabled
+        slider.setLabelFormatter(labelFormatter)
+    }
+
+    private fun syncValueInternal(slider: RangeSlider) {
+        val newValues = slider.values
+        if (callChangeListener(newValues)) {
+            values = newValues
+        } else {
+            slider.values = values
+        }
+    }
+}

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

@@ -4,7 +4,10 @@ import android.app.Application
 import androidx.lifecycle.*
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.launch
+import moe.banana.jsonapi2.HasMany
 import moe.banana.jsonapi2.HasOne
+import moe.banana.jsonapi2.JsonBuffer
+import moe.banana.jsonapi2.ResourceIdentifier
 import net.vonforst.evmap.api.chargeprice.*
 import net.vonforst.evmap.api.equivalentPlugTypes
 import net.vonforst.evmap.model.ChargeLocation
@@ -100,7 +103,8 @@ class ChargepriceViewModel(application: Application, chargepriceApiKey: String)
                 dataSource,
                 batteryRange,
                 batteryRangeSliderDragging,
-                vehicleCompatibleConnectors
+                vehicleCompatibleConnectors,
+                myTariffs, myTariffsAll
             ).forEach {
                 addSource(it) {
                     if (!batteryRangeSliderDragging.value!!) loadPrices()
@@ -208,7 +212,9 @@ class ChargepriceViewModel(application: Application, chargepriceApiKey: String)
         val car = vehicle.value
         val compatibleConnectors = vehicleCompatibleConnectors.value
         val dataSource = dataSource.value
-        if (charger == null || car == null || compatibleConnectors == null || dataSource == null) {
+        val myTariffs = myTariffs.value
+        val myTariffsAll = myTariffsAll.value
+        if (charger == null || car == null || compatibleConnectors == null || dataSource == null || myTariffsAll == null || myTariffsAll == false && myTariffs == null) {
             chargePrices.value = Resource.error(null, null)
             return
         }
@@ -222,6 +228,19 @@ class ChargepriceViewModel(application: Application, chargepriceApiKey: String)
                     dataAdapter = dataSource
                     station = cpStation
                     vehicle = HasOne(car)
+                    tariffs = if (!myTariffsAll) {
+                        HasMany<ChargepriceTariff>(*myTariffs!!.map {
+                            ResourceIdentifier(
+                                "tariff",
+                                it
+                            )
+                        }.toTypedArray()).apply {
+                            meta = JsonBuffer.create(
+                                ChargepriceApi.moshi.adapter(ChargepriceRequestTariffMeta::class.java),
+                                ChargepriceRequestTariffMeta(ChargepriceInclude.ALWAYS)
+                            )
+                        }
+                    } else null
                     options = ChargepriceOptions(
                         batteryRange = batteryRange.value!!.map { it.toDouble() },
                         providerCustomerTariffs = prefs.chargepriceShowProviderCustomerTariffs,

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

@@ -42,7 +42,7 @@ class FilterViewModel(application: Application) : AndroidViewModel(application)
         MediatorLiveData<FilterProfile>().apply {
             addSource(filterStatus) { id ->
                 when (id) {
-                    FILTERS_CUSTOM, FILTERS_DISABLED -> value = null
+                    FILTERS_CUSTOM, FILTERS_DISABLED, FILTERS_FAVORITES -> value = null
                     else -> viewModelScope.launch {
                         value = db.filterProfileDao().getProfileById(id, prefs.dataSource)
                     }

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

@@ -1,12 +1,14 @@
 package net.vonforst.evmap.viewmodel
 
 import android.app.Application
+import android.os.Parcelable
 import androidx.lifecycle.*
 import com.car2go.maps.AnyMap
 import com.car2go.maps.model.LatLng
 import com.car2go.maps.model.LatLngBounds
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.launch
+import kotlinx.parcelize.Parcelize
 import net.vonforst.evmap.api.ChargepointApi
 import net.vonforst.evmap.api.availability.ChargeLocationStatus
 import net.vonforst.evmap.api.availability.getAvailability
@@ -23,10 +25,12 @@ 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.ui.cluster
 import net.vonforst.evmap.utils.distanceBetween
 import java.io.IOException
 
-data class MapPosition(val bounds: LatLngBounds, val zoom: Float)
+@Parcelize
+data class MapPosition(val bounds: LatLngBounds, val zoom: Float) : Parcelable
 
 internal fun getClusterDistance(zoom: Float): Int? {
     return when (zoom) {
@@ -38,7 +42,8 @@ internal fun getClusterDistance(zoom: Float): Int? {
     }
 }
 
-class MapViewModel(application: Application) : AndroidViewModel(application) {
+class MapViewModel(application: Application, private val state: SavedStateHandle) :
+    AndroidViewModel(application) {
     val apiType: Class<ChargepointApi<ReferenceData>>
         get() = api.javaClass
     val apiName: String
@@ -49,11 +54,11 @@ class MapViewModel(application: Application) : AndroidViewModel(application) {
     private var api: ChargepointApi<ReferenceData> = createApi(prefs.dataSource, application)
 
     val bottomSheetState: MutableLiveData<Int> by lazy {
-        MutableLiveData<Int>()
+        state.getLiveData("bottomSheetState")
     }
 
     val mapPosition: MutableLiveData<MapPosition> by lazy {
-        MutableLiveData<MapPosition>()
+        state.getLiveData("mapPosition")
     }
     val filterStatus: MutableLiveData<Long> by lazy {
         MutableLiveData<Long>().apply {
@@ -124,7 +129,7 @@ class MapViewModel(application: Application) : AndroidViewModel(application) {
     }
 
     val chargerSparse: MutableLiveData<ChargeLocation> by lazy {
-        MutableLiveData<ChargeLocation>()
+        state.getLiveData("chargerSparse")
     }
     val chargerDetails: MediatorLiveData<Resource<ChargeLocation>> by lazy {
         MediatorLiveData<Resource<ChargeLocation>>().apply {
@@ -222,7 +227,7 @@ class MapViewModel(application: Application) : AndroidViewModel(application) {
     }
 
     val searchResult: MutableLiveData<PlaceWithBounds> by lazy {
-        MutableLiveData<PlaceWithBounds>()
+        state.getLiveData("searchResult")
     }
 
     val mapType: MutableLiveData<AnyMap.Type> by lazy {
@@ -296,20 +301,32 @@ class MapViewModel(application: Application) : AndroidViewModel(application) {
             viewModelScope
         ) { data: Triple<MapPosition, FilterValues, ReferenceData> ->
             chargepoints.value = Resource.loading(chargepoints.value?.data)
-            filteredConnectors.value = null
-            filteredMinPower.value = null
-            filteredChargeCards.value = null
 
             val mapPosition = data.first
             val filters = data.second
             val api = api
             val refData = data.third
-            var result = api.getChargepoints(refData, mapPosition.bounds, mapPosition.zoom, filters)
-            if (result.status == Status.ERROR && result.data == null) {
-                // keep old results if new data could not be loaded
-                result = Resource.error(result.message, chargepoints.value?.data)
+
+            if (filterStatus.value == FILTERS_FAVORITES) {
+                // load favorites from local DB
+                val b = mapPosition.bounds
+                var chargers = db.chargeLocationsDao().getChargeLocationsInBoundsAsync(
+                    b.southwest.latitude,
+                    b.northeast.latitude,
+                    b.southwest.longitude,
+                    b.northeast.longitude
+                ) as List<ChargepointListItem>
+
+                val clusterDistance = getClusterDistance(mapPosition.zoom)
+                clusterDistance?.let {
+                    chargers = cluster(chargers, mapPosition.zoom, clusterDistance)
+                }
+                filteredConnectors.value = null
+                filteredMinPower.value = null
+                filteredChargeCards.value = null
+                chargepoints.value = Resource.success(chargers)
+                return@throttleLatest
             }
-            chargepoints.value = result
 
             if (api is GoingElectricApiWrapper) {
                 val chargeCardsVal = filters.getMultipleChoiceValue("chargecards")!!
@@ -333,7 +350,19 @@ class MapViewModel(application: Application) : AndroidViewModel(application) {
                         )
                     }.toSet()
                 filteredMinPower.value = filters.getSliderValue("minPower")
+            } else {
+                filteredConnectors.value = null
+                filteredMinPower.value = null
+                filteredChargeCards.value = null
             }
+
+            var result = api.getChargepoints(refData, mapPosition.bounds, mapPosition.zoom, filters)
+            if (result.status == Status.ERROR && result.data == null) {
+                // keep old results if new data could not be loaded
+                result = Resource.error(result.message, chargepoints.value?.data)
+            }
+
+            chargepoints.value = result
         }
 
     private suspend fun loadAvailability(charger: ChargeLocation) {

app/src/main/res/color/hint_text_color.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_focused="true" android:color="?android:attr/textColorSecondary" android:alpha="0.38" />
+    <item android:state_focused="false" android:color="?android:attr/textColorPrimary" />
+</selector>

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

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

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

@@ -0,0 +1,11 @@
+<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"
+    android:autoMirrored="true">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M20,11H7.83l5.59,-5.59L12,4l-8,8 8,8 1.41,-1.41L7.83,13H20v-2z" />
+</vector>