Release 1.7.0

Android Auto: fix crash on Android 14 due to missing permission
update car app library
2025-12-25 08:07:46 -05:00 · 2023-09-23 18:31:10 +02:00 · 2023-09-23 18:23:39 +02:00 · 2023-09-21 19:24:33 +02:00 · 2023-09-20 19:56:03 +02:00 · 2023-09-16 23:09:42 +02:00
137 changed files with 2036 additions and 897 deletions
--- a/.github/FUNDING.yml
+++ b/.github/FUNDING.yml
@@ -1,2 +1,2 @@
 github: johan12345
-custom: 'https://paypal.me/johan98'
+custom: ['https://paypal.me/johan98', 'http://ts.la/johan94494']
--- a/.github/workflows/apikeys-ci.xml
+++ b/.github/workflows/apikeys-ci.xml
@@ -5,4 +5,5 @@
   <string name="chargeprice_key" translatable="false">ci</string>
   <string name="openchargemap_key" translatable="false">ci</string>
   <string name="fronyx_key" translatable="false">ci</string>
+   <string name="acra_credentials" translatable="false">ci:ci</string>
 </resources>
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -32,6 +32,7 @@ jobs:
          MAPBOX_API_KEY: ${{ secrets.MAPBOX_API_KEY }}
          GOOGLE_MAPS_API_KEY: ${{ secrets.GOOGLE_MAPS_API_KEY }}
          FRONYX_API_KEY: ${{ secrets.FRONYX_API_KEY }}
+          ACRA_CRASHREPORT_CREDENTIALS: ${{ secrets.ACRA_CRASHREPORT_CREDENTIALS }}
          KEYSTORE_PASSWORD: ${{ secrets.KEYSTORE_PASSWORD }}
          KEYSTORE_ALIAS: ${{ secrets.KEYSTORE_ALIAS }}
          KEYSTORE_ALIAS_PASSWORD: ${{ secrets.KEYSTORE_ALIAS_PASSWORD }}
@@ -76,3 +77,12 @@ jobs:
          asset_path: app/build/outputs/apk/googleAutomotive/release/app-google-automotive-release.apk
          asset_name: app-google-automotive-release.apk
          asset_content_type: application/vnd.android.package-archive
+      - name: upload Foss Automotive artifact
+        uses: actions/upload-release-asset@v1
+        env:
+          GITHUB_TOKEN: ${{ github.token }}
+        with:
+          upload_url: ${{ steps.create_release.outputs.upload_url }}
+          asset_path: app/build/outputs/apk/fossAutomotive/release/app-foss-automotive-release.apk
+          asset_name: app-foss-automotive-release.apk
+          asset_content_type: application/vnd.android.package-archive
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -13,7 +13,7 @@ jobs:
    runs-on: ubuntu-latest
    strategy:
      matrix:
-        buildvariant: [ FossNormal, GoogleNormal, GoogleAutomotive ]
+        buildvariant: [ FossNormal, FossAutomotive, GoogleNormal, GoogleAutomotive ]
    steps:
      - name: Check out code
        uses: actions/checkout@v2
--- a/README.md
+++ b/README.md
@@ -43,13 +43,27 @@ EVMap uses and put them into the app in the form of a resource file called `apik
 features and how they can be obtained in our [documentation page](doc/api_keys.md).

 There are three different build flavors, `googleNormal`, `fossNormal` and `googleAutomotive`.
- The `foss` variant only uses Mapbox data and should run on most Android devices, even without
+- The `foss` variants only use Mapbox data and should run on most Android devices, even without
  Google Play Services.
+    - `fossNormal` is intended to run on smartphones and tablets, and also includes the Android
+      Auto app for use on the car display (however for that to work, the Android Auto app is
+      necessary, which in turn does require Google Play Services).
+    - `fossAutomotive` can be installed directly on
+      [Android Automotive OS (AAOS)](https://source.android.com/docs/automotive/start/what_automotive)
+      headunits without Google services.
+      It does not provide the usual smartphone UI, and requires an implementation of the
+      [AOSP template app host](https://source.android.com/docs/automotive/hmi/aosp_host)
+      to be installed. If you are an OEM and would like to distribute EVMap to your AAOS vehicles,
+      please [get in touch](mailto:evmap@vonforst.net).
 - The `google` variants also include access to Google Maps data.
    - `googleNormal` is intended to run on smartphones and tablets, and also includes the Android
      Auto app for use on the car display.
-    - `googleAutomotive` variant is intended to be installed directly on car infotainment systems
-      using the Google-flavored Android Automotive OS. It does not provide the usual smartphone UI.
+    - `googleAutomotive` can be installed directly on car infotainment systems running the
+      Google-flavored Android Automotive OS (Google Automotive Services /
+      ["Google built-in"](https://built-in.google/cars/)).
+      It does not provide the usual smartphone UI, and requires the
+      [Google Automotive App Host](https://play.google.com/store/apps/details?id=com.google.android.apps.automotive.templates.host)
+      to run, which should be preinstalled on those cars and can be updated through the Play Store.

 We also have a special [documentation page](doc/android_auto.md) on how to test the Android Auto
 app.
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -13,16 +13,14 @@ apply plugin: 'pt.jcosta.resourceplaceholders'
 def supportedLocales = "en,de,fr,nb-rNO,nl,pt,ro"

 android {
-    compileSdkVersion 33
-    buildToolsVersion "30.0.3"
-
    defaultConfig {
        applicationId "net.vonforst.evmap"
+        compileSdk 34
        minSdkVersion 21
-        targetSdkVersion 33
+        targetSdkVersion 34
        // NOTE: always increase versionCode by 2 since automotive flavor uses versionCode + 1
-        versionCode 186
-        versionName "1.6.3"
+        versionCode 202
+        versionName "1.7.0"

        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
        resConfigs supportedLocales.split(',')
@@ -73,13 +71,6 @@ android {
            minSdkVersion 29
        }
    }
-    variantFilter { variant ->
-        def names = variant.flavors*.name
-        // Android Automotive OS app is always based on Google variant
-        if (names.contains("automotive") && !names.contains("google")) {
-            setIgnore(true)
-        }
-    }

    compileOptions {
        coreLibraryDesugaringEnabled true
@@ -154,6 +145,13 @@ android {
        if (fronyxKey != null) {
            variant.resValue "string", "fronyx_key", fronyxKey
        }
+        def acraKey = env.ACRA_CRASHREPORT_CREDENTIALS ?: project.findProperty("ACRA_CRASHREPORT_CREDENTIALS")
+        if (acraKey == null && project.hasProperty("ACRA_CRASHREPORT_CREDENTIALS_ENCRYPTED")) {
+            acraKey = decode(project.findProperty("ACRA_CRASHREPORT_CREDENTIALS_ENCRYPTED"), "FmK.d,-f*p+rD+WK!eds")
+        }
+        if (acraKey != null) {
+            variant.resValue "string", "acra_credentials", acraKey
+        }
    }

    packagingOptions {
@@ -172,16 +170,16 @@ configurations {
 dependencies {
    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
    implementation 'androidx.appcompat:appcompat:1.6.1'
-    implementation 'androidx.core:core-ktx:1.10.1'
+    implementation 'androidx.core:core-ktx:1.12.0'
    implementation 'androidx.core:core-splashscreen:1.0.1'
    implementation "androidx.activity:activity-ktx:1.7.2"
-    implementation "androidx.fragment:fragment-ktx:1.5.7"
+    implementation "androidx.fragment:fragment-ktx:1.6.1"
    implementation 'androidx.cardview:cardview:1.0.0'
-    implementation 'androidx.preference:preference-ktx:1.2.0'
+    implementation 'androidx.preference:preference-ktx:1.2.1'
    implementation 'com.google.android.material:material:1.9.0'
    implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
-    implementation 'androidx.recyclerview:recyclerview:1.3.0'
-    implementation 'androidx.browser:browser:1.5.0'
+    implementation 'androidx.recyclerview:recyclerview:1.3.1'
+    implementation 'androidx.browser:browser:1.6.0'
    implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0'
    implementation 'androidx.security:security-crypto:1.1.0-alpha06'
    implementation "androidx.work:work-runtime-ktx:2.8.1"
@@ -193,7 +191,7 @@ dependencies {
    implementation 'com.squareup.moshi:moshi-kotlin:1.15.0'
    implementation 'com.squareup.moshi:moshi-adapters:1.15.0'
    implementation 'com.markomilos.jsonapi:jsonapi-retrofit:1.1.0'
-    implementation 'io.coil-kt:coil:1.1.0'
+    implementation 'io.coil-kt:coil:2.4.0'
    implementation 'com.github.ev-map:StfalconImageViewer:5082ebd392'
    implementation "com.mikepenz:aboutlibraries-core:$about_libs_version"
    implementation "com.mikepenz:aboutlibraries:$about_libs_version"
@@ -204,10 +202,10 @@ dependencies {
    implementation 'com.github.romandanylyk:PageIndicatorView:b1bad589b5'

    // Android Auto
-    def carAppVersion = '1.3.0-rc01'
-    googleImplementation "androidx.car.app:app:$carAppVersion"
-    googleNormalImplementation "androidx.car.app:app-projected:$carAppVersion"
-    googleAutomotiveImplementation "androidx.car.app:app-automotive:$carAppVersion"
+    def carAppVersion = '1.4.0-beta02'
+    implementation "androidx.car.app:app:$carAppVersion"
+    normalImplementation "androidx.car.app:app-projected:$carAppVersion"
+    automotiveImplementation "androidx.car.app:app-automotive:$carAppVersion"

    // AnyMaps
    def anyMapsVersion = '8f1226e1c5'
@@ -226,8 +224,8 @@ dependencies {
    fossImplementation 'com.github.ev-map:mapbox-events-android:a21c324501'

    // Google Places
-    googleImplementation 'com.google.android.libraries.places:places:3.1.0'
-    googleImplementation 'org.jetbrains.kotlinx:kotlinx-coroutines-play-services:1.6.4'
+    googleImplementation 'com.google.android.libraries.places:places:3.2.0'
+    googleImplementation 'org.jetbrains.kotlinx:kotlinx-coroutines-play-services:1.7.1'

    // Mapbox Geocoding
    implementation 'com.mapbox.mapboxsdk:mapbox-sdk-services:5.5.0'
@@ -237,25 +235,25 @@ dependencies {
    implementation "androidx.navigation:navigation-ui-ktx:$nav_version"

    // viewmodel library
-    def lifecycle_version = "2.6.1"
+    def lifecycle_version = "2.6.2"
    implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycle_version"
    implementation "androidx.lifecycle:lifecycle-livedata-ktx:$lifecycle_version"

    // room library
-    def room_version = "2.5.1"
+    def room_version = "2.6.0-beta01"
    implementation "androidx.room:room-runtime:$room_version"
    kapt "androidx.room:room-compiler:$room_version"
    implementation "androidx.room:room-ktx:$room_version"
    implementation 'com.github.anboralabs:spatia-room:0.2.7'

    // billing library
-    def billing_version = "6.0.0"
+    def billing_version = "6.0.1"
    googleImplementation "com.android.billingclient:billing:$billing_version"
    googleImplementation "com.android.billingclient:billing-ktx:$billing_version"

    // ACRA (crash reporting)
-    def acraVersion = "5.8.4"
-    implementation("ch.acra:acra-mail:$acraVersion")
+    def acraVersion = "5.11.1"
+    implementation("ch.acra:acra-http:$acraVersion")
    implementation("ch.acra:acra-dialog:$acraVersion")
    implementation("ch.acra:acra-limiter:$acraVersion")

@@ -269,13 +267,12 @@ dependencies {
    testImplementation "com.squareup.okhttp3:mockwebserver:4.11.0"
    //noinspection GradleDependency
    testImplementation 'org.json:json:20080701'
-    testImplementation 'org.robolectric:robolectric:4.9.2'
+    testImplementation 'org.robolectric:robolectric:4.10.3'
    testImplementation 'androidx.test:core:1.5.0'
    testImplementation 'androidx.arch.core:core-testing:2.2.0'

    // testing for car app
    testGoogleImplementation "androidx.car.app:app-testing:$carAppVersion"
-    testGoogleImplementation 'org.robolectric:robolectric:4.9.2'
    testGoogleImplementation 'androidx.test:core:1.5.0'

    androidTestImplementation 'androidx.test.ext:junit:1.1.5'
--- a/app/src/googleAutomotive/AndroidManifest.xml
+++ b/app/src/googleAutomotive/AndroidManifest.xml
--- a/app/src/googleAutomotive/res/values-de/strings.xml
+++ b/app/src/googleAutomotive/res/values-de/strings.xml
--- a/app/src/googleAutomotive/res/values-fr/strings.xml
+++ b/app/src/googleAutomotive/res/values-fr/strings.xml
--- a/app/src/googleAutomotive/res/values-nb-rNO/strings.xml
+++ b/app/src/googleAutomotive/res/values-nb-rNO/strings.xml
--- a/app/src/googleAutomotive/res/values-nl/strings.xml
+++ b/app/src/googleAutomotive/res/values-nl/strings.xml
--- a/app/src/googleAutomotive/res/values-pt/strings.xml
+++ b/app/src/googleAutomotive/res/values-pt/strings.xml
--- a/app/src/googleAutomotive/res/values-ro/strings.xml
+++ b/app/src/googleAutomotive/res/values-ro/strings.xml
--- a/app/src/googleAutomotive/res/values/strings.xml
+++ b/app/src/googleAutomotive/res/values/strings.xml
--- a/app/src/foss/java/net/vonforst/evmap/fragment/DonateFragment.kt
+++ b/app/src/foss/java/net/vonforst/evmap/fragment/DonateFragment.kt
@@ -42,5 +42,9 @@ class DonateFragment : Fragment() {
        binding.btnDonate.setOnClickListener {
            (activity as? MapsActivity)?.openUrl(getString(R.string.paypal_link))
        }
+
+        binding.referrals.referralTesla.setOnClickListener {
+            (requireActivity() as MapsActivity).openUrl(getString(R.string.tesla_referral_link))
+        }
    }
 }
--- a/app/src/foss/java/net/vonforst/evmap/fragment/OnboardingFragment.kt
+++ b/app/src/foss/java/net/vonforst/evmap/fragment/OnboardingFragment.kt
@@ -1,16 +0,0 @@
-package net.vonforst.evmap.fragment
-
-import androidx.fragment.app.Fragment
-import androidx.viewpager2.adapter.FragmentStateAdapter
-
-class OnboardingViewPagerAdapter(fragment: Fragment) :
-    FragmentStateAdapter(fragment) {
-    override fun getItemCount(): Int = 3
-
-    override fun createFragment(position: Int): Fragment = when (position) {
-        0 -> WelcomeFragment()
-        1 -> IconsFragment()
-        2 -> DataSourceSelectFragment()
-        else -> throw IllegalArgumentException()
-    }
-}
--- a/app/src/foss/res/layout/fragment_donate.xml
+++ b/app/src/foss/res/layout/fragment_donate.xml
@@ -1,18 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
    xmlns:app="http://schemas.android.com/apk/res-auto"
    android:id="@+id/linearLayout2"
    android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
+    android:orientation="vertical">

    <com.google.android.material.appbar.AppBarLayout
        android:id="@+id/toolbar_container"
-        android:layout_width="0dp"
+        android:layout_width="match_parent"
        android:layout_height="wrap_content"
-        android:fitsSystemWindows="true"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent">
+        android:fitsSystemWindows="true">

        <androidx.appcompat.widget.Toolbar
            android:id="@+id/toolbar"
@@ -21,31 +19,55 @@

    </com.google.android.material.appbar.AppBarLayout>

-    <Button
-        android:id="@+id/btnDonate"
-        style="@style/Widget.Material3.Button.Icon"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="24dp"
-        android:text="@string/donate_paypal"
-        app:icon="@drawable/ic_paypal"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/textView20" />
+    <ScrollView
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">

-    <TextView
-        android:id="@+id/textView20"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="16dp"
-        android:layout_marginTop="16dp"
-        android:layout_marginEnd="16dp"
-        android:text="@string/donations_info"
-        app:layout_constraintBottom_toTopOf="@+id/btnDonate"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.5"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/toolbar_container"
-        app:layout_constraintVertical_chainStyle="packed" />
-</androidx.constraintlayout.widget.ConstraintLayout>
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:layout_height="wrap_content"
+            android:layout_width="match_parent">
+
+            <Button
+                android:id="@+id/btnDonate"
+                style="@style/Widget.Material3.Button.Icon"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="8dp"
+                android:layout_marginStart="16dp"
+                android:text="@string/donate_paypal"
+                app:icon="@drawable/ic_paypal"
+                app:layout_constraintBottom_toTopOf="@id/referrals"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/textView20" />
+
+            <TextView
+                android:id="@+id/textView20"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="16dp"
+                android:layout_marginTop="16dp"
+                android:layout_marginEnd="16dp"
+                android:text="@string/donations_info"
+                app:layout_constraintBottom_toTopOf="@+id/btnDonate"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintHorizontal_bias="0.5"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent"
+                app:layout_constraintVertical_chainStyle="packed" />
+
+            <include
+                android:id="@+id/referrals"
+                layout="@layout/fragment_donate_referral"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="16dp"
+                android:layout_marginTop="36dp"
+                android:layout_marginEnd="16dp"
+                android:layout_marginBottom="16dp"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/btnDonate" />
+        </androidx.constraintlayout.widget.ConstraintLayout>
+    </ScrollView>
+</LinearLayout>
--- a/app/src/google/AndroidManifest.xml
+++ b/app/src/google/AndroidManifest.xml
@@ -1,53 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools">
-
-    <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
-    <uses-permission android:name="androidx.car.app.MAP_TEMPLATES" />
-    <uses-permission android:name="com.google.android.gms.permission.CAR_FUEL" />
-    <uses-permission android:name="com.google.android.gms.permission.CAR_SPEED" />
-
-    <uses-sdk tools:overrideLibrary="androidx.car.app,androidx.car.app.projected" />
-
-    <queries>
-        <package android:name="com.google.android.projection.gearhead" />
-        <package android:name="com.google.android.apps.automotive.templates.host" />
-    </queries>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">

    <application>
        <meta-data
            android:name="com.google.android.geo.API_KEY"
            android:value="@string/google_maps_key" />
-
-        <meta-data
-            android:name="com.google.android.gms.car.application"
-            android:resource="@xml/automotive_app_desc" />
-
-        <meta-data
-            android:name="androidx.car.app.theme"
-            android:resource="@style/CarAppTheme" />
-
-        <meta-data
-            android:name="androidx.car.app.minCarApiLevel"
-            android:value="1" />
-
-        <service
-            android:name=".auto.CarAppService"
-            android:label="@string/app_name"
-            android:icon="@mipmap/ic_launcher"
-            android:exported="true">
-            <intent-filter>
-                <action
-                    android:name="androidx.car.app.CarAppService"
-                    android:category="androidx.car.app.category.POI" />
-            </intent-filter>
-            <intent-filter>
-                <action android:name="android.intent.action.VIEW" />
-                <data android:scheme="net.vonforst.evmap" />
-
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.BROWSABLE" />
-            </intent-filter>
-        </service>
    </application>
 </manifest>
--- a/app/src/google/java/net/vonforst/evmap/fragment/DonateFragment.kt
+++ b/app/src/google/java/net/vonforst/evmap/fragment/DonateFragment.kt
@@ -11,6 +11,7 @@ import androidx.fragment.app.viewModels
 import androidx.lifecycle.Observer
 import androidx.navigation.fragment.findNavController
 import androidx.navigation.ui.setupWithNavController
+import androidx.recyclerview.widget.ConcatAdapter
 import androidx.recyclerview.widget.LinearLayoutManager
 import com.google.android.material.color.MaterialColors
 import com.google.android.material.snackbar.Snackbar
@@ -18,12 +19,17 @@ import com.google.android.material.transition.MaterialSharedAxis
 import net.vonforst.evmap.MapsActivity
 import net.vonforst.evmap.R
 import net.vonforst.evmap.adapter.DonationAdapter
+import net.vonforst.evmap.adapter.SingleViewAdapter
 import net.vonforst.evmap.databinding.FragmentDonateBinding
+import net.vonforst.evmap.databinding.FragmentDonateHeaderBinding
+import net.vonforst.evmap.databinding.FragmentDonateReferralBinding
 import net.vonforst.evmap.viewmodel.DonateViewModel

 class DonateFragment : Fragment() {
    private lateinit var binding: FragmentDonateBinding
    private val vm: DonateViewModel by viewModels()
+    private lateinit var header: FragmentDonateHeaderBinding
+    private lateinit var referrals: FragmentDonateReferralBinding

    override fun onCreate(savedInstanceState: Bundle?) {
        super.onCreate(savedInstanceState)
@@ -40,6 +46,9 @@ class DonateFragment : Fragment() {
        binding.lifecycleOwner = this
        binding.vm = vm

+        header = FragmentDonateHeaderBinding.inflate(inflater, container, false)
+        referrals = FragmentDonateReferralBinding.inflate(inflater, container, false)
+
        return binding.root
    }

@@ -51,25 +60,35 @@ class DonateFragment : Fragment() {
            (requireActivity() as MapsActivity).appBarConfiguration
        )

-        binding.productsList.apply {
-            adapter = DonationAdapter().apply {
-                onClickListener = {
-                    vm.startPurchase(it, requireActivity())
-                }
+        val donationAdapter = DonationAdapter().apply {
+            onClickListener = {
+                vm.startPurchase(it, requireActivity())
            }
+        }
+        binding.productsList.apply {
+            val joinedAdapter = ConcatAdapter(
+                SingleViewAdapter(header.root),
+                donationAdapter,
+                SingleViewAdapter(referrals.root)
+            )
+            adapter = joinedAdapter
            layoutManager = LinearLayoutManager(context)
        }

        vm.products.observe(viewLifecycleOwner) {
-            print(it)
+            donationAdapter.submitList(it.data)
        }

-        vm.purchaseSuccessful.observe(viewLifecycleOwner, Observer {
+        vm.purchaseSuccessful.observe(viewLifecycleOwner) {
            Snackbar.make(view, R.string.donation_successful, Snackbar.LENGTH_LONG).show()
-        })
-        vm.purchaseFailed.observe(viewLifecycleOwner, Observer {
+        }
+        vm.purchaseFailed.observe(viewLifecycleOwner) {
            Snackbar.make(view, R.string.donation_failed, Snackbar.LENGTH_LONG).show()
-        })
+        }
+
+        referrals.referralTesla.setOnClickListener {
+            (requireActivity() as MapsActivity).openUrl(getString(R.string.tesla_referral_link))
+        }

        // Workaround for AndroidX bug: https://github.com/material-components/material-components-android/issues/1984
        view.setBackgroundColor(MaterialColors.getColor(view, android.R.attr.windowBackground))
--- a/app/src/google/java/net/vonforst/evmap/fragment/OnboardingFragment.kt
+++ b/app/src/google/java/net/vonforst/evmap/fragment/OnboardingFragment.kt
@@ -1,69 +0,0 @@
-package net.vonforst.evmap.fragment
-
-import android.animation.AnimatorSet
-import android.animation.ObjectAnimator
-import android.annotation.SuppressLint
-import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import android.view.animation.DecelerateInterpolator
-import androidx.fragment.app.Fragment
-import androidx.viewpager2.adapter.FragmentStateAdapter
-import net.vonforst.evmap.databinding.FragmentOnboardingAndroidAutoBinding
-
-class OnboardingViewPagerAdapter(fragment: Fragment) :
-    FragmentStateAdapter(fragment) {
-    override fun getItemCount(): Int = 4
-
-    override fun createFragment(position: Int): Fragment = when (position) {
-        0 -> WelcomeFragment()
-        1 -> IconsFragment()
-        2 -> AndroidAutoFragment()
-        3 -> DataSourceSelectFragment()
-        else -> throw IllegalArgumentException()
-    }
-}
-
-class AndroidAutoFragment : OnboardingPageFragment() {
-    private lateinit var binding: FragmentOnboardingAndroidAutoBinding
-
-    override fun onCreateView(
-        inflater: LayoutInflater,
-        container: ViewGroup?,
-        savedInstanceState: Bundle?
-    ): View {
-        binding = FragmentOnboardingAndroidAutoBinding.inflate(inflater, container, false)
-
-        binding.btnGetStarted.setOnClickListener {
-            parent.goToNext()
-        }
-        binding.imgAndroidAuto.alpha = 0f
-
-        return binding.root
-    }
-
-    @SuppressLint("Recycle")
-    override fun onResume() {
-        super.onResume()
-
-        val animators =
-            listOf(
-                ObjectAnimator.ofFloat(binding.imgAndroidAuto, "translationY", -20f, 0f).apply {
-                    interpolator = DecelerateInterpolator()
-                },
-                ObjectAnimator.ofFloat(binding.imgAndroidAuto, "alpha", 0f, 1f).apply {
-                    interpolator = DecelerateInterpolator()
-                }
-            )
-        AnimatorSet().apply {
-            playTogether(animators)
-            start()
-        }
-    }
-
-    override fun onPause() {
-        super.onPause()
-        binding.imgAndroidAuto.alpha = 0f
-    }
-}
--- a/app/src/google/res/layout/fragment_donate.xml
+++ b/app/src/google/res/layout/fragment_donate.xml
@@ -35,29 +35,16 @@

        </com.google.android.material.appbar.AppBarLayout>

-        <TextView
-            android:id="@+id/textView20"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="16dp"
-            android:layout_marginTop="16dp"
-            android:layout_marginEnd="16dp"
-            android:text="@string/donations_info"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/toolbar_container" />
-
        <androidx.recyclerview.widget.RecyclerView
            android:id="@+id/products_list"
            android:layout_width="0dp"
            android:layout_height="0dp"
-            android:layout_marginTop="16dp"
-            app:data="@{vm.products.data}"
            app:layout_constraintBottom_toBottomOf="parent"
            app:layout_constraintEnd_toEndOf="parent"
            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/textView20"
-            tools:listitem="@layout/item_donation" />
+            app:layout_constraintTop_toBottomOf="@id/toolbar_container"
+            tools:itemCount="1"
+            tools:listitem="@layout/fragment_donate_preview" />

        <ProgressBar
            android:id="@+id/progressBar3"
--- a/app/src/google/res/layout/fragment_donate_header.xml
+++ b/app/src/google/res/layout/fragment_donate_header.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<TextView android:id="@+id/textView20"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_marginStart="16dp"
+    android:layout_marginTop="16dp"
+    android:layout_marginEnd="16dp"
+    android:layout_marginBottom="16dp"
+    android:text="@string/donations_info"
+    xmlns:android="http://schemas.android.com/apk/res/android" />
--- a/app/src/google/res/layout/fragment_donate_preview.xml
+++ b/app/src/google/res/layout/fragment_donate_preview.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <include layout="@layout/fragment_donate_header" />
+
+    <include layout="@layout/item_donation" />
+
+    <include layout="@layout/item_donation" />
+
+    <include layout="@layout/item_donation" />
+
+    <include layout="@layout/fragment_donate_referral" />
+</LinearLayout>
--- a/app/src/google/res/values-de/strings.xml
+++ b/app/src/google/res/values-de/strings.xml
@@ -1,39 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
    <string name="donations_info" formatted="false">Findest du EVMap nützlich? Unterstütze die Weiterentwicklung der App mit einer Spende an den Entwickler.\n\nGoogle zieht von der Spende 15% Gebühren ab.</string>
-    <string name="auto_location_service">EVMap läuft unter Android Auto und nutzt dafür deinen Standort.</string>
-    <string name="auto_no_chargers_found">Keine Ladestationen in der Nähe gefunden</string>
-    <string name="auto_no_favorites_found">Keine Favoriten gefunden</string>
-    <string name="open_in_app">In App öffnen</string>
-    <string name="opened_on_phone">Auf dem Telefon geöffnet</string>
-    <string name="auto_location_permission_needed">Um EVMap auf Android Auto zu nutzen, braucht die App Zugriff auf deinen Standort.</string>
-    <string name="auto_vehicle_data_permission_needed">Für diese Funktion benötigt EVMap Zugriff auf Daten deines Fahrzeugs.</string>
-    <string name="grant_on_phone">Auf Telefon zulassen</string>
-    <string name="auto_chargers_closeby">In der Nähe</string>
-    <string name="auto_favorites">Favoriten</string>
-    <string name="auto_chargers_near_location">Nahe %s</string>
-    <string name="auto_fault_report_date">⚠️ Störungsmeldung (%s)</string>
-    <string name="auto_no_refresh_possible">Weitere Aktualisierung nicht möglich. Bitte zurück gehen und neu starten.</string>
-    <string name="auto_prices">Preise</string>
-    <string name="auto_vehicle_data">Fahrzeugdaten</string>
-    <string name="auto_charging_level">Ladezustand</string>
-    <string name="auto_no_data">Nicht verfügbar</string>
-    <string name="auto_range">Reichweite</string>
-    <string name="auto_speed">Geschwindigkeit</string>
-    <string name="auto_heading">Fahrtrichtung</string>
-    <string name="auto_settings">Einstellungen</string>
-    <string name="welcome_android_auto">Android Auto-Unterstützung</string>
-    <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 (%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="auto_chargers_ahead">Nur Ladestationen in Fahrtrichtung</string>
-    <string name="settings_android_auto_chargeprice_range">Ladebereich für Preisvergleich</string>
    <string name="data_sources_hint">In den Einstellungen kannst du auch zwischen Google Maps und OpenStreetMap (Mapbox) für die Kartendaten wechseln.</string>
-    <string name="selecting_all">alle Einträge ausgewählt</string>
-    <string name="selecting_none">alle Einträge abgewählt</string>
-    <string name="loading">Lade…</string>
-    <string name="auto_multipage_goto">Seite %d</string>
-    <string name="auto_multipage">(%d/%d)</string>
 </resources>
--- a/app/src/google/res/values-fr/strings.xml
+++ b/app/src/google/res/values-fr/strings.xml
@@ -3,38 +3,5 @@
    <string name="donations_info" formatted="false">Trouvez-vous EVMap utile \? Soutenez son développement en envoyant un don au développeur.
 \n
 \nGoogle prend 15% sur chaque don.</string>
-    <string name="auto_location_service">EVMap fonctionne sur Android Auto et utilise votre position.</string>
-    <string name="open_in_app">Ouvrir dans l\'application</string>
-    <string name="opened_on_phone">Ouvert sur le téléphone</string>
-    <string name="auto_location_permission_needed">Pour exécuter EVMap sur Android Auto, vous devez autoriser l\'accès à votre emplacement.</string>
-    <string name="grant_on_phone">Grant au téléphone</string>
-    <string name="auto_prices">Prix</string>
-    <string name="auto_vehicle_data">Données sur le véhicule</string>
-    <string name="auto_range">Autonomie</string>
-    <string name="auto_speed">Vitesse</string>
-    <string name="welcome_android_auto">Prise en charge d’Android Auto</string>
-    <string name="sounds_cool">ça a l\'air cool</string>
-    <string name="auto_chargeprice_vehicle_unknown">Aucun des véhicules sélectionnés dans l\'application ne correspond à ce véhicule (%1$s %2$s).</string>
-    <string name="auto_chargeprice_vehicle_ambiguous">Plusieurs véhicules sélectionnés dans l\'application correspondent à ce véhicule (%1$s %2$s).</string>
-    <string name="selecting_all">tous les éléments sélectionnés</string>
    <string name="data_sources_hint">Dans les paramètres, vous pouvez également choisir entre Google Maps et OpenStreetMap (Mapbox) pour les données cartographiques.</string>
-    <string name="auto_chargeprice_vehicle_unavailable">EVMap n\'a pas pu déterminer le modèle de votre véhicule.</string>
-    <string name="auto_no_chargers_found">Aucun chargeur à proximité n\'a été trouvé</string>
-    <string name="auto_no_favorites_found">Pas de favoris trouvés</string>
-    <string name="auto_charging_level">Niveau de charge</string>
-    <string name="auto_chargers_closeby">Chargeurs à proximité</string>
-    <string name="auto_chargers_near_location">Près de %s</string>
-    <string name="auto_fault_report_date">⚠️ Rapport d\'anomalie (%s)</string>
-    <string name="auto_no_data">Indisponible</string>
-    <string name="auto_settings">Paramètres</string>
-    <string name="selecting_none">désélectionner tous les éléments</string>
-    <string name="auto_vehicle_data_permission_needed">Pour cette fonction, EVMap doit avoir accès aux données de votre véhicule.</string>
-    <string name="auto_heading">Direction</string>
-    <string name="auto_favorites">Favoris</string>
-    <string name="auto_no_refresh_possible">D\'autres mises à jour ne sont pas possibles. Veuillez revenir en arrière et redémarrer.</string>
-    <string name="settings_android_auto_chargeprice_range">Plage de charge pour la comparaison des prix</string>
-    <string name="welcome_android_auto_detail">Vous pouvez également utiliser EVMap à partir d\'Android Auto sur les voitures prises en charge. Il suffit de sélectionner l\'application EVMap dans le menu Android Auto.</string>
-    <string name="loading">Chargement…</string>
-    <string name="auto_multipage_goto">Page %d</string>
-    <string name="auto_multipage">(%d/%d)</string>
 </resources>
--- a/app/src/google/res/values-nb-rNO/strings.xml
+++ b/app/src/google/res/values-nb-rNO/strings.xml
@@ -3,39 +3,5 @@
    <string name="donations_info" formatted="false">Synes du EVMap er nyttig\? Støtt utviklingen ved å sende penger til utvikleren.
 \n
 \nGoogle tar 15% av alle donasjoner.</string>
-    <string name="auto_favorites">Favoritter</string>
-    <string name="auto_charging_level">Ladingsnivå</string>
-    <string name="auto_chargeprice_vehicle_unavailable">EVMap kunne ikke fastsette kjøretøymodellen.</string>
-    <string name="selecting_none">fravalgte alle elementer</string>
-    <string name="grant_on_phone">Innvilg på mobilenheten</string>
-    <string name="auto_chargers_closeby">Ladere i nærheten</string>
-    <string name="auto_prices">Pris</string>
-    <string name="auto_no_chargers_found">Ingen ladere i nærheten</string>
-    <string name="auto_no_favorites_found">Fant ikke noen favoritter</string>
-    <string name="open_in_app">Åpne i programmet</string>
-    <string name="auto_location_service">EVMap kjører på Android Auto og bruker posisjonen din.</string>
-    <string name="auto_heading">Fartsretning</string>
-    <string name="opened_on_phone">Åpnet på mobilenheten</string>
-    <string name="auto_location_permission_needed">Innvilg posisjonstilgang for å bruke EVMap på Android Auto.</string>
-    <string name="auto_chargers_near_location">Nær %s</string>
-    <string name="auto_fault_report_date">⚠️ Feilrapport (%s)</string>
-    <string name="auto_vehicle_data">Kjøretøydata</string>
-    <string name="auto_no_data">Utilgjengelig</string>
-    <string name="auto_speed">Hastighet</string>
-    <string name="auto_settings">Innstillinger</string>
-    <string name="auto_chargeprice_vehicle_unknown">Ingen av kjøretøyene valgt i programmet samsvarer med dette kjøretøyet (%1$s %2$s).</string>
-    <string name="welcome_android_auto">Android Auto-støtte</string>
-    <string name="auto_chargeprice_vehicle_ambiguous">Flere kjøretøy valgt i programmet samsvarer med dette kjøretøyet (%1$s %2$s).</string>
-    <string name="auto_vehicle_data_permission_needed">EvMap trenger tilgang til kjøretøydata for å bruke denne funksjonen.</string>
-    <string name="auto_no_refresh_possible">Videre oppdateringer er ikke mulig. Gå tilbake og start på ny.</string>
-    <string name="auto_range">Rekkevidde</string>
-    <string name="welcome_android_auto_detail">Du kan også bruke EVMap inne i Android Auto på bilder som støtter dette ved å velge det i Android Auto-menyen.</string>
-    <string name="settings_android_auto_chargeprice_range">Prissammenligning for laderekkevidde fordelt på pris</string>
    <string name="data_sources_hint">I innstillingene kan du også bytte mellom Google Maps og OpenStreetMap (Mapbox) for kartdata.</string>
-    <string name="selecting_all">valgte alle elementene</string>
-    <string name="sounds_cool">den er grei</string>
-    <string name="auto_chargers_ahead">Kun ladere i kjøreretningen</string>
-    <string name="loading">Laster inn …</string>
-    <string name="auto_multipage_goto">Side %d</string>
-    <string name="auto_multipage">(%d/%d)</string>
 </resources>
--- a/app/src/google/res/values-nl/strings.xml
+++ b/app/src/google/res/values-nl/strings.xml
@@ -1,41 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="auto_chargeprice_vehicle_ambiguous">Meerdere voertuigen geselecteerd in de app komen overeen met dit voertuig (%1$s %2$s).</string>
    <string name="donations_info" formatted="false">Vind je EVMap nuttig\? Je kan de ontwikkeling steunen via een donatie aan de ontwikkelaar.
 \n
 \nGoogle houdt 15% in van elke donatie.</string>
-    <string name="auto_location_service">EVMap draait op Android Auto en gebruikt jouw locatie.</string>
-    <string name="auto_no_chargers_found">Geen laadpunten gevonden in de omgeving</string>
-    <string name="auto_no_favorites_found">Geen favorieten gevonden</string>
-    <string name="open_in_app">Open in de app</string>
-    <string name="opened_on_phone">Geopend op de telefoon</string>
-    <string name="auto_location_permission_needed">Om EVMap op Android Auto te gebruiken, moet je toegang geven tot je locatie.</string>
-    <string name="auto_vehicle_data_permission_needed">Voor deze functie heeft EVMap toegang nodig tot de gegevens van je voertuig.</string>
-    <string name="grant_on_phone">Geef toestemming op telefoon</string>
-    <string name="auto_chargers_closeby">Oplaadpunten in de buurt</string>
-    <string name="auto_favorites">Favorieten</string>
-    <string name="auto_chargers_near_location">Nabij %s</string>
-    <string name="auto_fault_report_date">⚠️ Foutrapport (%s)</string>
-    <string name="auto_no_refresh_possible">Verdere updates zijn niet mogelijk. Ga terug en herbegin.</string>
-    <string name="auto_prices">Prijzen</string>
-    <string name="auto_vehicle_data">Voertuiggegevens</string>
-    <string name="auto_charging_level">Laadniveau (SoC)</string>
-    <string name="auto_no_data">Niet beschikbaar</string>
-    <string name="auto_range">Reikwijdte</string>
-    <string name="auto_speed">Snelheid</string>
-    <string name="auto_heading">Richting</string>
-    <string name="auto_settings">Instellingen</string>
-    <string name="welcome_android_auto">Android Auto support</string>
-    <string name="welcome_android_auto_detail">Je kan EVMap ook gebruiken in Android Auto op ondersteunde voertuigen. Selecteer gewoon de EVMap app in het Android Auto menu.</string>
-    <string name="sounds_cool">klinkt cool</string>
-    <string name="auto_chargeprice_vehicle_unavailable">EVMap kon je voertuigtype niet bepalen.</string>
-    <string name="auto_chargers_ahead">Alleen laadpunten in rijrichting</string>
-    <string name="settings_android_auto_chargeprice_range">Laadbereik voor prijsvergelijking</string>
    <string name="data_sources_hint">In de instellingen kan je ook wisselen tussen Google Maps en OpenStreetMap (Mapbox) voor de kaartgegevens.</string>
-    <string name="selecting_all">alle items geselecteerd</string>
-    <string name="selecting_none">alle items gedeselecteerd</string>
-    <string name="loading">Laden…</string>
-    <string name="auto_multipage_goto">Pagina %d</string>
-    <string name="auto_multipage">(%d/%d)</string>
-    <string name="auto_chargeprice_vehicle_unknown">Geen enkel voertuig geselecteerd in de app komt overeen met dit voertuig (%1$s %2$s).</string>
 </resources>
--- a/app/src/google/res/values-pt/strings.xml
+++ b/app/src/google/res/values-pt/strings.xml
@@ -1,41 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="auto_no_chargers_found">Não foram encontrados carregadores próximo de si</string>
-    <string name="auto_no_favorites_found">Nenhum favorito encontrado</string>
-    <string name="opened_on_phone">Aberto no telefone</string>
-    <string name="auto_location_permission_needed">Para usar o EVMap no Android Auto, permita o acesso à sua localização.</string>
-    <string name="open_in_app">Abrir na app</string>
-    <string name="auto_vehicle_data_permission_needed">Para esta funcionalidade, o EVMap precisa de aceder aos dados do seu veículo.</string>
-    <string name="auto_chargers_closeby">Carregadores próximos</string>
-    <string name="grant_on_phone">Conceda permissões no telefone</string>
-    <string name="auto_chargers_near_location">Perto de %s</string>
-    <string name="auto_favorites">Favoritos</string>
-    <string name="auto_chargeprice_vehicle_ambiguous">Vários veículos selecionados na app correspondem a este veículo (%1$s %2$s).</string>
-    <string name="selecting_none">todos os items desmarcados</string>
-    <string name="data_sources_hint">Também pode mudar entre o Google Maps e OpenStreetMap (Mapbox) nas definições da app.</string>
-    <string name="selecting_all">todos os items selecionados</string>
-    <string name="loading">Carregando…</string>
-    <string name="auto_multipage_goto">Página %d</string>
-    <string name="auto_multipage">(%d/%d)</string>
-    <string name="settings_android_auto_chargeprice_range">Escala de carregamento para comparação de preços</string>
    <string name="donations_info" formatted="false">Acha que o EVMap é útil\? Apoie a manutenção e desenvolvimento com uma doação para o desenvolvedor da app.
 \n
 \nA Google cobra 15% de cada doação.</string>
-    <string name="auto_location_service">O EVMap está a funcionar no Android Auto e usando a sua localização.</string>
-    <string name="auto_fault_report_date">⚠️ Problemas (%s)</string>
-    <string name="auto_no_refresh_possible">Não é possível atualizar. Por favor volte atrás e reinicie.</string>
-    <string name="auto_prices">Preços</string>
-    <string name="auto_vehicle_data">Dados do veículo</string>
-    <string name="auto_charging_level">Nível de carregamento</string>
-    <string name="auto_no_data">Não disponível</string>
-    <string name="auto_speed">Velocidade</string>
-    <string name="auto_heading">Direção</string>
-    <string name="auto_settings">Definições</string>
-    <string name="welcome_android_auto">Suporte para Android Auto</string>
-    <string name="auto_range">Alcance</string>
-    <string name="welcome_android_auto_detail">Também pode usar o EVMap no Android Auto em carros compatíveis. Basta selecionar a app EVMap no menu do Android Auto.</string>
-    <string name="auto_chargeprice_vehicle_unavailable">O EVMap não pôde determinar o modelo do seu veículo.</string>
-    <string name="auto_chargeprice_vehicle_unknown">Nenhum dos veículos selecionados na app corresponde a este veículo (%1$s %2$s).</string>
-    <string name="auto_chargers_ahead">Apenas carregadores na direção do destino</string>
-    <string name="sounds_cool">Continuar</string>
+    <string name="data_sources_hint">Também pode mudar entre o Google Maps e OpenStreetMap (Mapbox) nas definições da app.</string>
 </resources>
--- a/app/src/google/res/values/colors.xml
+++ b/app/src/google/res/values/colors.xml
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <color name="gauge_active">#00e676</color>
-    <color name="gauge_middle">#087f23</color>
-    <color name="gauge_inactive">#9e9e9e</color>
-    <color name="charger_100kw_dark">#FBC02D</color>
-</resources>
--- a/app/src/google/res/values/strings.xml
+++ b/app/src/google/res/values/strings.xml
@@ -1,39 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
    <string name="donations_info" formatted="false">Do you find EVMap useful? Support its development by sending a donation to the developer.\n\nGoogle takes 15% off every donation.</string>
-    <string name="auto_location_service">EVMap is running on Android Auto and using your location.</string>
-    <string name="auto_no_chargers_found">No nearby chargers found</string>
-    <string name="auto_no_favorites_found">No favorites found</string>
-    <string name="open_in_app">Open in app</string>
-    <string name="opened_on_phone">Opened on phone</string>
-    <string name="auto_location_permission_needed">To run EVMap on Android Auto, you need to grant access to your location.</string>
-    <string name="auto_vehicle_data_permission_needed">For this feature, EVMap needs access to your vehicle data.</string>
-    <string name="grant_on_phone">Grant on phone</string>
-    <string name="auto_chargers_closeby">Nearby chargers</string>
-    <string name="auto_favorites">Favorites</string>
-    <string name="auto_chargers_near_location">Near %s</string>
-    <string name="auto_fault_report_date">⚠️ Fault report (%s)</string>
-    <string name="auto_no_refresh_possible">Further updates not possible. Please go back and restart.</string>
-    <string name="auto_prices">Pricing</string>
-    <string name="auto_vehicle_data">Vehicle data</string>
-    <string name="auto_charging_level">Charging level</string>
-    <string name="auto_no_data">Unavailable</string>
-    <string name="auto_range">Range</string>
-    <string name="auto_speed">Speed</string>
-    <string name="auto_heading">Heading</string>
-    <string name="auto_settings">Settings</string>
-    <string name="welcome_android_auto">Android Auto support</string>
-    <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 (%1$s %2$s).</string>
-    <string name="auto_chargeprice_vehicle_ambiguous">Multiple vehicles selected in the app match this vehicle (%1$s %2$s).</string>
-    <string name="auto_chargers_ahead">Only chargers along driving direction</string>
-    <string name="settings_android_auto_chargeprice_range">Charging range for price comparison</string>
    <string name="data_sources_hint">In the settings you can also switch between Google Maps and OpenStreetMap (Mapbox) for the map data.</string>
-    <string name="selecting_all">selected all items</string>
-    <string name="selecting_none">deselected all items</string>
-    <string name="loading">Loading…</string>
-    <string name="auto_multipage_goto">Page %d</string>
-    <string name="auto_multipage">(%d/%d)</string>
 </resources>
--- a/app/src/google/res/values/styles.xml
+++ b/app/src/google/res/values/styles.xml
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-
-    <style name="CarAppTheme">
-        <item name="carColorPrimary">@color/colorPrimary</item>
-        <item name="carColorPrimaryDark">@color/colorPrimaryDark</item>
-        <item name="carColorSecondary">@color/colorSecondary</item>
-        <item name="carColorSecondaryDark">@color/colorSecondaryDark</item>
-    </style>
-</resources>
--- a/app/src/google/res/xml/settings_variantspecific.xml
+++ b/app/src/google/res/xml/settings_variantspecific.xml
@@ -1,7 +1,4 @@
 <?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>
+
 </PreferenceScreen>
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -6,6 +6,11 @@
    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
    <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE_LOCATION" />
+    <uses-permission android:name="androidx.car.app.MAP_TEMPLATES" />
+    <uses-permission android:name="com.google.android.gms.permission.CAR_FUEL" />
+    <uses-permission android:name="com.google.android.gms.permission.CAR_SPEED" />

    <queries>
        <intent>
@@ -19,6 +24,9 @@
        <intent>
            <action android:name="android.support.customtabs.action.CustomTabsService" />
        </intent>
+
+        <package android:name="com.google.android.projection.gearhead" />
+        <package android:name="com.google.android.apps.automotive.templates.host" />
    </queries>

    <application
@@ -282,6 +290,10 @@
                android:resource="@xml/shortcuts" />
        </activity>

+        <activity android:name=".auto.OAuthLoginActivity">
+
+        </activity>
+
        <service
            android:name="androidx.appcompat.app.AppLocalesMetadataHolderService"
            android:enabled="false"
@@ -302,6 +314,39 @@
                android:value="androidx.startup"
                tools:node="remove" />
        </provider>
+
+        <!-- Configuration for Android Auto app -->
+        <meta-data
+            android:name="com.google.android.gms.car.application"
+            android:resource="@xml/automotive_app_desc" />
+
+        <meta-data
+            android:name="androidx.car.app.theme"
+            android:resource="@style/CarAppTheme" />
+
+        <meta-data
+            android:name="androidx.car.app.minCarApiLevel"
+            android:value="1" />
+
+        <service
+            android:name=".auto.CarAppService"
+            android:label="@string/app_name"
+            android:icon="@mipmap/ic_launcher"
+            android:exported="true"
+            android:foregroundServiceType="location">
+            <intent-filter>
+                <action
+                    android:name="androidx.car.app.CarAppService"
+                    android:category="androidx.car.app.category.POI" />
+            </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+                <data android:scheme="net.vonforst.evmap" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+            </intent-filter>
+        </service>
    </application>

 </manifest>
--- a/app/src/main/java/net/vonforst/evmap/EvMapApplication.kt
+++ b/app/src/main/java/net/vonforst/evmap/EvMapApplication.kt
@@ -1,5 +1,6 @@
 package net.vonforst.evmap

+import android.app.Activity
 import android.app.Application
 import android.os.Build
 import androidx.work.*
@@ -8,10 +9,11 @@ import net.vonforst.evmap.storage.PreferenceDataSource
 import net.vonforst.evmap.ui.updateAppLocale
 import net.vonforst.evmap.ui.updateNightMode
 import org.acra.config.dialog
+import org.acra.config.httpSender
 import org.acra.config.limiter
-import org.acra.config.mailSender
 import org.acra.data.StringFormat
 import org.acra.ktx.initAcra
+import org.acra.sender.HttpSender
 import java.time.Duration

 class EvMapApplication : Application(), Configuration.Provider {
@@ -33,10 +35,15 @@ class EvMapApplication : Application(), Configuration.Provider {
        if (!BuildConfig.DEBUG) {
            initAcra {
                buildConfigClass = BuildConfig::class.java
-                reportFormat = StringFormat.KEY_VALUE_LIST

-                mailSender {
-                    mailTo = "evmap+crashreport@vonforst.net"
+                // Vehicles often don't have an email app, so use HTTP to send instead
+                reportFormat = StringFormat.JSON
+                httpSender {
+                    uri = getString(R.string.acra_backend_url)
+                    val creds = getString(R.string.acra_credentials).split(":")
+                    basicAuthLogin = creds[0]
+                    basicAuthPassword = creds[1]
+                    httpMethod = HttpSender.Method.POST
                }

                dialog {
@@ -45,6 +52,10 @@ class EvMapApplication : Application(), Configuration.Provider {
                    commentPrompt = getString(R.string.crash_report_comment_prompt)
                    resIcon = R.drawable.ic_launcher_foreground
                    resTheme = R.style.AppTheme
+                    if (BuildConfig.FLAVOR_automotive == "automotive") {
+                        reportDialogClass =
+                            Class.forName("androidx.car.app.activity.CarAppActivity") as Class<out Activity>?
+                    }
                }

                limiter {
--- a/app/src/main/java/net/vonforst/evmap/MapsActivity.kt
+++ b/app/src/main/java/net/vonforst/evmap/MapsActivity.kt
@@ -107,6 +107,10 @@ class MapsActivity : AppCompatActivity(),
            navGraph.setStartDestination(R.id.onboarding)
            navController.graph = navGraph
            return
+        } else if (!prefs.privacyAccepted) {
+            navGraph.setStartDestination(R.id.onboarding)
+            navController.graph = navGraph
+            return
        } else {
            navGraph.setStartDestination(R.id.map)
            navController.setGraph(navGraph, MapFragmentArgs(appStart = true).toBundle())
--- a/app/src/main/java/net/vonforst/evmap/Utils.kt
+++ b/app/src/main/java/net/vonforst/evmap/Utils.kt
@@ -5,10 +5,13 @@ import android.content.pm.PackageInfo
 import android.content.pm.PackageManager
 import android.content.res.Configuration
 import android.graphics.Typeface
+import android.icu.util.LocaleData
+import android.icu.util.ULocale
 import android.os.Build
 import android.os.Bundle
 import android.text.*
 import android.text.style.StyleSpan
+import net.vonforst.evmap.storage.PreferenceDataSource
 import java.util.*

 fun Bundle.optDouble(name: String): Double? {
@@ -88,9 +91,25 @@ fun Context.isDarkMode() =

 const val kmPerMile = 1.609344
 const val meterPerFt = 0.3048
+const val ftPerMile = 5280
+const val ydPerMile = 1760
+
+fun shouldUseImperialUnits(ctx: Context): Boolean {
+    val prefs = PreferenceDataSource(ctx)
+    return when (prefs.units) {
+        "metric" -> false
+        "imperial" -> true
+        else -> if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
+            when (LocaleData.getMeasurementSystem(ULocale.getDefault())) {
+                LocaleData.MeasurementSystem.US, LocaleData.MeasurementSystem.UK -> true
+                LocaleData.MeasurementSystem.SI -> false
+                else -> false
+            }
+        } else {
+            return Locale.getDefault().country in listOf("US", "GB", "MM", "LR")
+        }
+    }

-fun shouldUseImperialUnits(): Boolean {
-    return Locale.getDefault().country in listOf("US", "GB", "MM", "LR")
 }

 fun PackageManager.getPackageInfoCompat(packageName: String, flags: Int = 0): PackageInfo =
--- a/app/src/main/java/net/vonforst/evmap/adapter/DetailsAdapter.kt
+++ b/app/src/main/java/net/vonforst/evmap/adapter/DetailsAdapter.kt
@@ -139,7 +139,7 @@ fun buildDetails(
    )
 }

-private fun formatTeslaParkingFee(teslaPricing: TeslaGraphQlApi.Pricing, ctx: Context) =
+fun formatTeslaParkingFee(teslaPricing: TeslaGraphQlApi.Pricing, ctx: Context) =
    teslaPricing.memberRates?.activePricebook?.parking?.let { parkingFee ->
        ctx.getString(
            R.string.tesla_pricing_blocking_fee,
@@ -147,7 +147,7 @@ private fun formatTeslaParkingFee(teslaPricing: TeslaGraphQlApi.Pricing, ctx: Co
        )
    }

-private fun formatTeslaPricing(teslaPricing: TeslaGraphQlApi.Pricing, ctx: Context) =
+fun formatTeslaPricing(teslaPricing: TeslaGraphQlApi.Pricing, ctx: Context) =
    buildSpannedString {
        teslaPricing.memberRates?.let { memberRates ->
            append(
--- a/app/src/main/java/net/vonforst/evmap/api/availability/AvailabilityDetector.kt
+++ b/app/src/main/java/net/vonforst/evmap/api/availability/AvailabilityDetector.kt
@@ -170,9 +170,11 @@ class AvailabilityRepository(context: Context) {
        .connectTimeout(10, TimeUnit.SECONDS)
        .cookieJar(JavaNetCookieJar(cookieManager))
        .build()
+    private val teslaAvailabilityDetector =
+        TeslaAvailabilityDetector(okhttp, EncryptedPreferenceDataStore(context))
    private val availabilityDetectors = listOf(
        RheinenergieAvailabilityDetector(okhttp),
-        TeslaAvailabilityDetector(okhttp, EncryptedPreferenceDataStore(context)),
+        teslaAvailabilityDetector,
        EnBwAvailabilityDetector(okhttp),
        NewMotionAvailabilityDetector(okhttp)
    )
@@ -199,4 +201,10 @@ class AvailabilityRepository(context: Context) {
        }
        return value ?: Resource.error(null, null)
    }
+
+    fun isSupercharger(charger: ChargeLocation) =
+        teslaAvailabilityDetector.isChargerSupported(charger)
+
+    fun isTeslaSupported(charger: ChargeLocation) =
+        teslaAvailabilityDetector.isChargerSupported(charger) && teslaAvailabilityDetector.isSignedIn()
 }
--- a/app/src/main/java/net/vonforst/evmap/api/availability/EnBwAvailabilityDetector.kt
+++ b/app/src/main/java/net/vonforst/evmap/api/availability/EnBwAvailabilityDetector.kt
@@ -12,7 +12,7 @@ import retrofit2.http.Path
 import retrofit2.http.Query

 private const val coordRange = 0.005  // range of latitude and longitude for loading the map
-private const val maxDistance = 40  // max distance between reported positions in meters
+private const val maxDistance = 60  // max distance between reported positions in meters

 interface EnBwApi {
    @GET("chargestations?grouping=false")
@@ -117,6 +117,7 @@ class EnBwAvailabilityDetector(client: OkHttpClient, baseUrl: String? = null) :
                listOf(it)
            }
        }
+        if (markers.any { it.grouped }) throw AvailabilityDetectorException("markers still grouped")

        val nearest = markers.minByOrNull { marker ->
            distanceBetween(marker.lat, marker.lon, lat, lng)
@@ -132,22 +133,26 @@ class EnBwAvailabilityDetector(client: OkHttpClient, baseUrl: String? = null) :
            throw AvailabilityDetectorException("no candidates found")
        }

-        // combine related stations
-        markers = markers.filter { marker ->
-            distanceBetween(
-                marker.lat,
-                marker.lon,
-                nearest.lat,
-                nearest.lon
-            ) < maxDistance
+        if (nearest.numberOfChargePoints < location.totalChargepoints) {
+            // combine related stations
+            markers = markers.filter { marker ->
+                distanceBetween(
+                    marker.lat,
+                    marker.lon,
+                    nearest.lat,
+                    nearest.lon
+                ) < maxDistance
+            }.filter {
+                // only include stations from same operator
+                it.operator == nearest.operator && it.stationId != null
+            }
+        } else {
+            markers = listOf(nearest)
        }

-        val details = markers.filter {
-            // only include stations from same operator
-            it.operator == nearest.operator && it.stationId != null
-        }.map {
+        val details = markers.mapNotNull { it.stationId }.map {
            // load details
-            api.getLocation(it.stationId!!)
+            api.getLocation(it)
        }

        val connectorStatus = details.flatMap { it.chargePoints }.flatMap { cp ->
--- a/app/src/main/java/net/vonforst/evmap/api/availability/NewMotionAvailabilityDetector.kt
+++ b/app/src/main/java/net/vonforst/evmap/api/availability/NewMotionAvailabilityDetector.kt
@@ -12,7 +12,7 @@ import retrofit2.http.Path
 import java.util.*

 private const val coordRange = 0.005  // range of latitude and longitude for loading the map
-private const val maxDistance = 40  // max distance between reported positions in meters
+private const val maxDistance = 60  // max distance between reported positions in meters

 interface NewMotionApi {
    @GET("markers/{lngMin}/{lngMax}/{latMin}/{latMax}/{zoom}")
@@ -28,7 +28,7 @@ interface NewMotionApi {
    suspend fun getLocation(@Path("id") id: Long): NMLocation

    @JsonClass(generateAdapter = true)
-    data class NMMarker(val coordinates: NMCoordinates, val locationUid: Long)
+    data class NMMarker(val coordinates: NMCoordinates, val locationUid: Long, val evseCount: Int)

    @JsonClass(generateAdapter = true)
    data class NMCoordinates(val latitude: Double, val longitude: Double)
@@ -111,14 +111,18 @@ class NewMotionAvailabilityDetector(client: OkHttpClient, baseUrl: String? = nul
            throw AvailabilityDetectorException("no candidates found")
        }

-        // combine related stations
-        markers = markers.filter { marker ->
-            distanceBetween(
-                marker.coordinates.latitude,
-                marker.coordinates.longitude,
-                nearest.coordinates.latitude,
-                nearest.coordinates.longitude
-            ) < maxDistance
+        if (nearest.evseCount < location.totalChargepoints) {
+            // combine related stations
+            markers = markers.filter { marker ->
+                distanceBetween(
+                    marker.coordinates.latitude,
+                    marker.coordinates.longitude,
+                    nearest.coordinates.latitude,
+                    nearest.coordinates.longitude
+                ) < maxDistance
+            }
+        } else {
+            markers = listOf(nearest)
        }

        // load details
--- a/app/src/main/java/net/vonforst/evmap/api/availability/TeslaAvailabilityDetector.kt
+++ b/app/src/main/java/net/vonforst/evmap/api/availability/TeslaAvailabilityDetector.kt
@@ -1,5 +1,6 @@
 package net.vonforst.evmap.api.availability

+import android.net.Uri
 import android.util.Base64
 import com.squareup.moshi.FromJson
 import com.squareup.moshi.Json
@@ -102,6 +103,18 @@ interface TeslaAuthenticationApi {
                Base64.URL_SAFE or Base64.NO_WRAP or Base64.NO_PADDING
            )
        }
+
+        fun buildSignInUri(codeChallenge: String): Uri =
+            Uri.parse("https://auth.tesla.com/oauth2/v3/authorize").buildUpon()
+                .appendQueryParameter("client_id", "ownerapi")
+                .appendQueryParameter("code_challenge", codeChallenge)
+                .appendQueryParameter("code_challenge_method", "S256")
+                .appendQueryParameter("redirect_uri", "https://auth.tesla.com/void/callback")
+                .appendQueryParameter("response_type", "code")
+                .appendQueryParameter("scope", "openid email offline_access")
+                .appendQueryParameter("state", "123").build()
+
+        val resultUrlPrefix = "https://auth.tesla.com/void/callback"
    }
 }

@@ -235,7 +248,7 @@ interface TeslaGraphQlApi {
    data class GetNearbyChargingSitesResponse(val data: GetNearbyChargingSitesResponseData)

    @JsonClass(generateAdapter = true)
-    data class GetNearbyChargingSitesResponseData(val charging: GetNearbyChargingSitesResponseDataCharging)
+    data class GetNearbyChargingSitesResponseData(val charging: GetNearbyChargingSitesResponseDataCharging?)

    @JsonClass(generateAdapter = true)
    data class GetNearbyChargingSitesResponseDataCharging(val nearbySites: GetNearbyChargingSitesResponseDataChargingNearbySites)
@@ -518,7 +531,8 @@ class TeslaAvailabilityDetector(
        val results = api.getNearbyChargingSites(
            req,
            req.operationName
-        ).data.charging.nearbySites.sitesAndDistances
+        ).data.charging?.nearbySites?.sitesAndDistances
+            ?: throw AvailabilityDetectorException("no candidates found.")
        val result =
            results.minByOrNull { it.haversineDistanceMiles.value }
                ?: throw AvailabilityDetectorException("no candidates found.")
@@ -540,6 +554,9 @@ class TeslaAvailabilityDetector(
                Chargepoint.CCS_UNKNOWN
            ) && it.power != null && it.power <= 150
        }
+        if (scV2CCSConnectors.sumOf { it.count } != 0 && scV2CCSConnectors.sumOf { it.count } != scV2Connectors.sumOf { it.count }) {
+            throw AvailabilityDetectorException("number of V2 connectors does not match number of V2 CCS connectors")
+        }
        val scV3Connectors = location.chargepoints.filter {
            it.type in listOf(
                Chargepoint.CCS_TYPE_2,
@@ -550,27 +567,39 @@ class TeslaAvailabilityDetector(
            "charger has unknown connectors"
        )

-        val statusSorted = details.siteDynamic.chargerDetails.sortedBy { it.charger.labelLetter }
-            .sortedBy { it.charger.labelNumber }
+        var statusSorted = details.siteDynamic.chargerDetails.sortedBy { it.charger.labelLetter }
+            .sortedBy { it.charger.labelNumber }.map { it.availability }
+        if (statusSorted.size != scV2Connectors.sumOf { it.count } + scV3Connectors.sumOf { it.count }) {
+            // apparently some connectors are missing in Tesla data
+            // If we have just one type of charger, we can still match
+            val numMissing =
+                scV2Connectors.sumOf { it.count } + scV3Connectors.sumOf { it.count } - statusSorted.size
+            if (scV2Connectors.isEmpty() || scV3Connectors.isEmpty() && numMissing > 0) {
+                statusSorted =
+                    statusSorted + List(numMissing) { TeslaGraphQlApi.ChargerAvailability.UNKNOWN }
+            } else {
+                throw AvailabilityDetectorException("Tesla API chargepoints do not match data source")
+            }
+        }

        val statusMap = emptyMap<Chargepoint, List<ChargepointStatus>>().toMutableMap()
        var i = 0
        for (connector in scV2Connectors) {
            statusMap[connector] =
-                statusSorted.subList(i, i + connector.count).map { it.availability.toStatus() }
+                statusSorted.subList(i, i + connector.count).map { it.toStatus() }
            i += connector.count
        }
        if (scV2CCSConnectors.isNotEmpty()) {
            i = 0
            for (connector in scV2CCSConnectors) {
                statusMap[connector] =
-                    statusSorted.subList(i, i + connector.count).map { it.availability.toStatus() }
+                    statusSorted.subList(i, i + connector.count).map { it.toStatus() }
                i += connector.count
            }
        }
        for (connector in scV3Connectors) {
            statusMap[connector] =
-                statusSorted.subList(i, i + connector.count).map { it.availability.toStatus() }
+                statusSorted.subList(i, i + connector.count).map { it.toStatus() }
            i += connector.count
        }

@@ -626,4 +655,6 @@ class TeslaAvailabilityDetector(
        }
    }

+    fun isSignedIn() = tokenStore.teslaRefreshToken != null
+
 }
--- a/app/src/main/java/net/vonforst/evmap/api/fronyx/PredictionRepository.kt
+++ b/app/src/main/java/net/vonforst/evmap/api/fronyx/PredictionRepository.kt
@@ -0,0 +1,188 @@
+package net.vonforst.evmap.api.fronyx
+
+import android.content.Context
+import com.squareup.moshi.JsonDataException
+import net.vonforst.evmap.R
+import net.vonforst.evmap.api.availability.AvailabilityDetectorException
+import net.vonforst.evmap.api.availability.AvailabilityRepository
+import net.vonforst.evmap.api.availability.ChargeLocationStatus
+import net.vonforst.evmap.api.equivalentPlugTypes
+import net.vonforst.evmap.api.nameForPlugType
+import net.vonforst.evmap.api.stringProvider
+import net.vonforst.evmap.model.ChargeLocation
+import net.vonforst.evmap.model.Chargepoint
+import net.vonforst.evmap.storage.PreferenceDataSource
+import net.vonforst.evmap.viewmodel.Resource
+import retrofit2.HttpException
+import java.io.IOException
+import java.time.LocalDate
+import java.time.LocalTime
+import java.time.ZoneId
+import java.time.ZonedDateTime
+
+data class PredictionData(
+    val predictionGraph: Map<ZonedDateTime, Double>?,
+    val maxValue: Double,
+    val predictedChargepoints: List<Chargepoint>,
+    val isPercentage: Boolean,
+    val description: String?
+)
+
+class PredictionRepository(private val context: Context) {
+    private val predictionApi = FronyxApi(context.getString(R.string.fronyx_key))
+    private val prefs = PreferenceDataSource(context)
+
+    suspend fun getPredictionData(
+        charger: ChargeLocation,
+        availability: ChargeLocationStatus?,
+        filteredConnectors: Set<String>? = null
+    ): PredictionData {
+        val fronyxPrediction = availability?.evseIds?.let { evseIds ->
+            getFronyxPrediction(charger, evseIds, filteredConnectors)
+        }?.data
+        val graph = buildPredictionGraph(availability, fronyxPrediction)
+        val predictedChargepoints = getPredictedChargepoints(charger, filteredConnectors)
+        val maxValue = getPredictionMaxValue(availability, fronyxPrediction, predictedChargepoints)
+        val isPercentage = predictionIsPercentage(availability, fronyxPrediction)
+        val description = getDescription(charger, predictedChargepoints)
+        return PredictionData(
+            graph, maxValue, predictedChargepoints, isPercentage, description
+        )
+    }
+
+    private suspend fun getFronyxPrediction(
+        charger: ChargeLocation,
+        evseIds: Map<Chargepoint, List<String>>,
+        filteredConnectors: Set<String>?
+    ): Resource<List<FronyxEvseIdResponse>> {
+        if (!prefs.predictionEnabled) return Resource.success(null)
+
+        val allEvseIds =
+            evseIds.filterKeys {
+                FronyxApi.isChargepointSupported(charger, it) &&
+                        filteredConnectors?.let { filtered ->
+                            equivalentPlugTypes(
+                                it.type
+                            ).any { filtered.contains(it) }
+                        } ?: true
+            }.flatMap { it.value }
+        if (allEvseIds.isEmpty()) {
+            return Resource.success(emptyList())
+        }
+        try {
+            val result = predictionApi.getPredictionsForEvseIds(allEvseIds)
+            if (result.size == allEvseIds.size) {
+                return Resource.success(result)
+            } else {
+                return Resource.error("not all EVSEIDs found", null)
+            }
+        } catch (e: IOException) {
+            e.printStackTrace()
+            return Resource.error(e.message, null)
+        } catch (e: HttpException) {
+            e.printStackTrace()
+            return Resource.error(e.message, null)
+        } catch (e: AvailabilityDetectorException) {
+            e.printStackTrace()
+            return Resource.error(e.message, null)
+        } catch (e: JsonDataException) {
+            // malformed JSON response from fronyx API
+            e.printStackTrace()
+            return Resource.error(e.message, null)
+        }
+    }
+
+    private fun buildPredictionGraph(
+        availability: ChargeLocationStatus?,
+        prediction: List<FronyxEvseIdResponse>?
+    ): Map<ZonedDateTime, Double>? {
+        val congestionHistogram = availability?.congestionHistogram
+        return if (congestionHistogram != null && prediction == null) {
+            congestionHistogram.mapIndexed { i, value ->
+                LocalTime.of(i, 0).atDate(LocalDate.now())
+                    .atZone(ZoneId.systemDefault()) to value
+            }.toMap()
+        } else {
+            prediction?.let { responses ->
+                if (responses.isEmpty()) {
+                    null
+                } else {
+                    val evseIds = responses.map { it.evseId }
+                    val groupByTimestamp = responses.flatMap { response ->
+                        response.predictions.map {
+                            Triple(
+                                it.timestamp,
+                                response.evseId,
+                                it.status
+                            )
+                        }
+                    }
+                        .groupBy { it.first }  // group by timestamp
+                        .mapValues { it.value.map { it.second to it.third } }  // only keep EVSEID and status
+                        .filterValues { it.map { it.first } == evseIds }  // remove values where status is not given for all EVSEs
+                        .filterKeys { it > ZonedDateTime.now() }  // only show predictions in the future
+
+                    groupByTimestamp.mapValues {
+                        it.value.count {
+                            it.second == FronyxStatus.UNAVAILABLE
+                        }.toDouble()
+                    }.ifEmpty { null }
+                }
+            }
+        }
+    }
+
+    private fun getPredictedChargepoints(
+        charger: ChargeLocation,
+        filteredConnectors: Set<String>?
+    ) =
+        charger.chargepoints.filter {
+            FronyxApi.isChargepointSupported(charger, it) &&
+                    filteredConnectors?.let { filtered ->
+                        equivalentPlugTypes(it.type).any {
+                            filtered.contains(
+                                it
+                            )
+                        }
+                    } ?: true
+        }
+
+    private fun getPredictionMaxValue(
+        availability: ChargeLocationStatus?,
+        prediction: List<FronyxEvseIdResponse>?,
+        predictedChargepoints: List<Chargepoint>
+    ): Double = if (availability?.congestionHistogram != null && prediction == null) {
+        1.0
+    } else {
+        predictedChargepoints.sumOf { it.count }.toDouble()
+    }
+
+    private fun predictionIsPercentage(
+        availability: ChargeLocationStatus?,
+        prediction: List<FronyxEvseIdResponse>?
+    ) =
+        availability?.congestionHistogram != null && prediction == null
+
+
+    private fun getDescription(
+        charger: ChargeLocation,
+        predictedChargepoints: List<Chargepoint>
+    ): String? {
+        val allChargepoints = charger.chargepoints
+
+        val predictedChargepointTypes = predictedChargepoints.map { it.type }.distinct()
+        return if (allChargepoints == predictedChargepoints) {
+            null
+        } else if (predictedChargepointTypes.size == 1) {
+            context.getString(
+                R.string.prediction_only,
+                nameForPlugType(context.stringProvider(), predictedChargepointTypes[0])
+            )
+        } else {
+            context.getString(
+                R.string.prediction_only,
+                context.getString(R.string.prediction_dc_plugs_only)
+            )
+        }
+    }
+}
--- a/app/src/main/java/net/vonforst/evmap/api/goingelectric/GoingElectricApi.kt
+++ b/app/src/main/java/net/vonforst/evmap/api/goingelectric/GoingElectricApi.kt
@@ -153,6 +153,10 @@ class GoingElectricApiWrapper(
            // no connectors chosen
            return Resource.success(ChargepointList.empty())
        }
+        if (connectorsVal != null && connectorsVal.values.contains("CCS")) {
+            // see note about Tesla Supercharger CCS filter in getFilters below
+            connectorsVal.values.add("Tesla Supercharger CCS")
+        }
        val connectors = formatMultipleChoice(connectorsVal)

        val chargeCardsVal = filters?.getMultipleChoiceValue("chargecards")
@@ -247,6 +251,10 @@ class GoingElectricApiWrapper(
            // no connectors chosen
            return Resource.success(ChargepointList.empty())
        }
+        if (connectorsVal != null && connectorsVal.values.contains("CCS")) {
+            // see note about Tesla Supercharger CCS filter in getFilters below
+            connectorsVal.values.add("Tesla Supercharger CCS")
+        }
        val connectors = formatMultipleChoice(connectorsVal)

        val chargeCardsVal = filters?.getMultipleChoiceValue("chargecards")
@@ -434,9 +442,18 @@ class GoingElectricApiWrapper(
        val networks = refData.networks
        val chargeCards = refData.chargecards

-        val plugMap = plugs.associateWith { plug ->
-            nameForPlugType(sp, GEChargepoint.convertTypeFromGE(plug))
-        }
+        /*
+        "Tesla Supercharger CCS" is a bit peculiar - it is available as a filter, but the API
+        just returns "CCS" in the charging station details. So we cannot use it for filtering as
+        it won't work in the local database. So we join them into a single filter option.
+        If you want to find Tesla Superchargers with CCS, you can still do that using the network
+        filter.
+         */
+        val plugMap = plugs
+            .filter { it != "Tesla Supercharger CCS" }
+            .associateWith { plug ->
+                nameForPlugType(sp, GEChargepoint.convertTypeFromGE(plug))
+            }
        val networkMap = networks.associateWith { it }
        val chargecardMap = chargeCards.associate { it.id.toString() to it.name }
        val categoryMap = mapOf(
@@ -595,7 +612,7 @@ class GoingElectricApiWrapper(

        val minConnectors = filters.getSliderValue("min_connectors")
        if (minConnectors != null && minConnectors > 1) {
-            result.append(" GROUP BY ChargeLocation.id HAVING COUNT(1) >= ${minConnectors}")
+            result.append(" GROUP BY ChargeLocation.id HAVING SUM(json_extract(cp.value, '$.count')) >= ${minConnectors}")
            requiresChargepointQuery = true
        }

--- a/app/src/main/java/net/vonforst/evmap/api/goingelectric/GoingElectricModel.kt
+++ b/app/src/main/java/net/vonforst/evmap/api/goingelectric/GoingElectricModel.kt
@@ -5,7 +5,22 @@ import androidx.room.PrimaryKey
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
 import kotlinx.parcelize.Parcelize
-import net.vonforst.evmap.model.*
+import net.vonforst.evmap.model.Address
+import net.vonforst.evmap.model.ChargeCard
+import net.vonforst.evmap.model.ChargeCardId
+import net.vonforst.evmap.model.ChargeLocation
+import net.vonforst.evmap.model.ChargeLocationCluster
+import net.vonforst.evmap.model.Chargepoint
+import net.vonforst.evmap.model.ChargepointListItem
+import net.vonforst.evmap.model.ChargepriceData
+import net.vonforst.evmap.model.ChargerPhoto
+import net.vonforst.evmap.model.Coordinate
+import net.vonforst.evmap.model.Cost
+import net.vonforst.evmap.model.FaultReport
+import net.vonforst.evmap.model.Hours
+import net.vonforst.evmap.model.OpeningHours
+import net.vonforst.evmap.model.OpeningHoursDays
+import net.vonforst.evmap.model.ReferenceData
 import java.time.Instant
 import java.time.LocalTime

@@ -35,7 +50,7 @@ sealed class GEChargepointListItem {
@JsonClass(generateAdapter = true)
 data class GEChargeLocation(
    @Json(name = "ge_id") val id: Long,
-    val name: String,
+    val name: String?,
    val coordinates: GECoordinate,
    val address: GEAddress,
    val chargepoints: List<GEChargepoint>,
@@ -57,7 +72,7 @@ data class GEChargeLocation(
    override fun convert(apikey: String, isDetailed: Boolean) = ChargeLocation(
        id,
        "goingelectric",
-        name,
+        name ?: "Charging station",
        coordinates.convert(),
        address.convert(),
        chargepoints.map { it.convert() },
--- a/app/src/main/java/net/vonforst/evmap/api/openchargemap/OpenChargeMapApi.kt
+++ b/app/src/main/java/net/vonforst/evmap/api/openchargemap/OpenChargeMapApi.kt
@@ -375,7 +375,7 @@ class OpenChargeMapApiWrapper(

        val minConnectors = filters.getSliderValue("min_connectors")
        if (minConnectors != null && minConnectors > 1) {
-            result.append(" GROUP BY ChargeLocation.id HAVING COUNT(1) >= ${minConnectors}")
+            result.append(" GROUP BY ChargeLocation.id HAVING SUM(json_extract(cp.value, '$.count')) >= ${minConnectors}")
            requiresChargepointQuery = true
        }

--- a/app/src/main/java/net/vonforst/evmap/api/openchargemap/OpenChargeMapModel.kt
+++ b/app/src/main/java/net/vonforst/evmap/api/openchargemap/OpenChargeMapModel.kt
@@ -6,7 +6,15 @@ import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
 import kotlinx.parcelize.Parcelize
 import net.vonforst.evmap.max
-import net.vonforst.evmap.model.*
+import net.vonforst.evmap.model.Address
+import net.vonforst.evmap.model.ChargeLocation
+import net.vonforst.evmap.model.Chargepoint
+import net.vonforst.evmap.model.ChargepriceData
+import net.vonforst.evmap.model.ChargerPhoto
+import net.vonforst.evmap.model.Coordinate
+import net.vonforst.evmap.model.Cost
+import net.vonforst.evmap.model.FaultReport
+import net.vonforst.evmap.model.ReferenceData
 import java.time.Instant
 import java.time.ZonedDateTime

@@ -165,7 +173,8 @@ data class OCMConnection(
                17L -> Chargepoint.CEE_ROT
                28L -> Chargepoint.SCHUKO
                8L -> Chargepoint.TESLA_ROADSTER_HPC
-                27L -> Chargepoint.SUPERCHARGER
+                27L -> Chargepoint.SUPERCHARGER  // Tesla North American plug (NACS)
+                30L -> Chargepoint.SUPERCHARGER  // European Tesla Model S/X Supercharger plug (DC on Type 2)
                25L -> Chargepoint.TYPE_2_SOCKET
                1036L -> Chargepoint.TYPE_2_PLUG
                1L -> Chargepoint.TYPE_1
--- a/app/src/google/java/net/vonforst/evmap/auto/CarAppService.kt
+++ b/app/src/google/java/net/vonforst/evmap/auto/CarAppService.kt
@@ -34,6 +34,7 @@ import net.vonforst.evmap.location.LocationEngine
 import net.vonforst.evmap.location.Priority
 import net.vonforst.evmap.storage.PreferenceDataSource
 import net.vonforst.evmap.utils.checkFineLocationPermission
+import org.acra.interaction.DialogInteraction


 interface LocationAwareScreen {
@@ -44,13 +45,15 @@ interface LocationAwareScreen {
 class CarAppService : androidx.car.app.CarAppService() {
    private val CHANNEL_ID = "car_location"
    private val NOTIFICATION_ID = 1000
+    private var foregroundStarted = false

-    override fun onCreate() {
-        super.onCreate()
-
+    fun ensureForegroundService() {
        // we want to run as a foreground service to make sure we can use location
-        createNotificationChannel()
-        startForeground(NOTIFICATION_ID, getNotification())
+        if (!foregroundStarted) {
+            createNotificationChannel()
+            startForeground(NOTIFICATION_ID, getNotification())
+            foregroundStarted = true
+        }
    }

    private fun createNotificationChannel() {
@@ -122,11 +125,13 @@ class EVMapSession(val cas: CarAppService) : Session(), DefaultLifecycleObserver
    }

    override fun onCreateScreen(intent: Intent): Screen {
-        handleActionsIntent(intent)

        val mapScreen = MapScreen(carContext, this)
        val screens = mutableListOf<Screen>(mapScreen)

+        handleActionsIntent(intent)?.let {
+            screens.add(it)
+        }
        if (!prefs.dataSourceSet) {
            screens.add(
                ChooseDataSourceScreen(
@@ -149,6 +154,14 @@ class EVMapSession(val cas: CarAppService) : Session(), DefaultLifecycleObserver
                )
            )
        }
+        if (!prefs.privacyAccepted) {
+            screens.add(
+                AcceptPrivacyScreen(carContext)
+            )
+        }
+        handleACRAIntent(intent)?.let {
+            screens.add(it)
+        }

        if (screens.size > 1) {
            val screenManager = carContext.getCarService(ScreenManager::class.java)
@@ -160,7 +173,13 @@ class EVMapSession(val cas: CarAppService) : Session(), DefaultLifecycleObserver
        return screens.last()
    }

-    private fun handleActionsIntent(intent: Intent): Boolean {
+    private fun handleACRAIntent(intent: Intent): Screen? {
+        return if (intent.hasExtra(DialogInteraction.EXTRA_REPORT_CONFIG)) {
+            CrashReportScreen(carContext, intent)
+        } else null
+    }
+
+    private fun handleActionsIntent(intent: Intent): Screen? {
        intent.data?.let {
            if (it.host == "find_charger") {
                val lat = it.getQueryParameter("latitude")?.toDouble()
@@ -169,15 +188,14 @@ class EVMapSession(val cas: CarAppService) : Session(), DefaultLifecycleObserver
                if (lat != null && lon != null) {
                    prefs.placeSearchResultAndroidAuto = LatLng(lat, lon)
                    prefs.placeSearchResultAndroidAutoName = name ?: "%.4f,%.4f".format(lat, lon)
-                    return true
+                    return null
                } else if (name != null) {
-                    val screenManager = carContext.getCarService(ScreenManager::class.java)
-                    screenManager.push(PlaceSearchScreen(carContext, this, name))
-                    return true
+                    val screen = PlaceSearchScreen(carContext, this, name)
+                    return screen
                }
            }
        }
-        return false
+        return null
    }

    override fun onNewIntent(intent: Intent) {
@@ -206,6 +224,7 @@ class EVMapSession(val cas: CarAppService) : Session(), DefaultLifecycleObserver
    @SuppressLint("MissingPermission")
    fun requestLocationUpdates() {
        if (!locationPermissionGranted()) return
+        cas.ensureForegroundService()
        Log.i(TAG, "Requesting location updates")
        requestCarHardwareLocationUpdates()
        requestPhoneLocationUpdates()
--- a/app/src/google/java/net/vonforst/evmap/auto/CarModels.kt
+++ b/app/src/google/java/net/vonforst/evmap/auto/CarModels.kt
@@ -5,6 +5,11 @@ package net.vonforst.evmap.auto
 * and human-readable vehicle models as listed by Chargeprice in their vehicle database.
 */

+private val brands = mapOf(
+    "Saic" to "MG",  // Seen on MG 4
+    "Google" to "Hyundai"  // useful for debugging on the DHU. Delete in case there's ever a Google car ;)
+)
+
 private val models = mapOf(
    "Audi" to mapOf(
        "516 (G4x)" to "e-tron"
@@ -19,4 +24,11 @@ fun getVehicleModel(manufacturer: String?, model: String?) =
        models[manufacturer]?.get(model) ?: model
    } else {
        null
+    }
+
+fun getVehicleBrand(manufacturer: String?) =
+    if (manufacturer != null) {
+        brands[manufacturer] ?: manufacturer
+    } else {
+        null
    }
--- a/app/src/google/java/net/vonforst/evmap/auto/CarSensors.kt
+++ b/app/src/google/java/net/vonforst/evmap/auto/CarSensors.kt
--- a/app/src/google/java/net/vonforst/evmap/auto/ChargepriceScreen.kt
+++ b/app/src/google/java/net/vonforst/evmap/auto/ChargepriceScreen.kt
@@ -207,7 +207,7 @@ class ChargepriceScreen(ctx: CarContext, val charger: ChargeLocation) : Screen(c

    private fun loadPrices(model: Model?) {
        val dataAdapter = ChargepriceApi.getDataAdapter(charger)
-        val manufacturer = model?.manufacturer?.value
+        val manufacturer = getVehicleBrand(model?.manufacturer?.value)
        val modelName = getVehicleModel(model?.manufacturer?.value, model?.name?.value)
        lifecycleScope.launch {
            try {
@@ -345,7 +345,7 @@ class ChargepriceScreen(ctx: CarContext, val charger: ChargeLocation) : Screen(c
        } else if (vehicles.size > 1) {
            if (manufacturer != null) {
                vehicles = vehicles.filter {
-                    it.brand == manufacturer
+                    it.brand.lowercase() == getVehicleBrand(manufacturer)?.lowercase()
                }
                if (vehicles.isEmpty()) {
                    throw VehicleUnknownException()
--- a/app/src/google/java/net/vonforst/evmap/auto/ChargerDetailScreen.kt
+++ b/app/src/google/java/net/vonforst/evmap/auto/ChargerDetailScreen.kt
@@ -12,6 +12,7 @@ import androidx.car.app.CarToast
 import androidx.car.app.Screen
 import androidx.car.app.constraints.ConstraintManager
 import androidx.car.app.model.*
+import androidx.core.content.ContextCompat
 import androidx.core.graphics.drawable.IconCompat
 import androidx.core.graphics.scale
 import androidx.core.text.HtmlCompat
@@ -23,10 +24,16 @@ import kotlinx.coroutines.Job
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import net.vonforst.evmap.*
+import net.vonforst.evmap.adapter.formatTeslaParkingFee
+import net.vonforst.evmap.adapter.formatTeslaPricing
 import net.vonforst.evmap.api.availability.AvailabilityRepository
 import net.vonforst.evmap.api.availability.ChargeLocationStatus
+import net.vonforst.evmap.api.availability.TeslaGraphQlApi
 import net.vonforst.evmap.api.chargeprice.ChargepriceApi
 import net.vonforst.evmap.api.createApi
+import net.vonforst.evmap.api.fronyx.FronyxApi
+import net.vonforst.evmap.api.fronyx.PredictionData
+import net.vonforst.evmap.api.fronyx.PredictionRepository
 import net.vonforst.evmap.api.iconForPlugType
 import net.vonforst.evmap.api.nameForPlugType
 import net.vonforst.evmap.api.stringProvider
@@ -45,6 +52,8 @@ import net.vonforst.evmap.viewmodel.awaitFinished
 import java.time.ZoneId
 import java.time.format.DateTimeFormatter
 import java.time.format.FormatStyle
+import kotlin.math.ceil
+import kotlin.math.floor
 import kotlin.math.roundToInt


@@ -52,12 +61,17 @@ class ChargerDetailScreen(ctx: CarContext, val chargerSparse: ChargeLocation) :
    var charger: ChargeLocation? = null
    var photo: Bitmap? = null
    private var availability: ChargeLocationStatus? = null
+    private var prediction: PredictionData? = null
+    private var fronyxSupported = false
+    private var teslaSupported = false

    val prefs = PreferenceDataSource(ctx)
    private val db = AppDatabase.getInstance(carContext)
    private val repo =
        ChargeLocationsRepository(createApi(prefs.dataSource, ctx), lifecycleScope, db, prefs)
    private val availabilityRepo = AvailabilityRepository(ctx)
+    private val predictionRepo = PredictionRepository(ctx)
+    private val timeFormat = DateTimeFormatter.ofLocalizedTime(FormatStyle.SHORT)

    private val imageSize = 128  // images should be 128dp according to docs
    private val imageSizeLarge = 480  // images should be 480 x 480 dp according to docs
@@ -290,9 +304,106 @@ class ChargerDetailScreen(ctx: CarContext, val chargerSparse: ChargeLocation) :
                }.build())
            }
        }
+        if (rows.count() < maxRows && charger.generalInformation != null) {
+            rows.add(Row.Builder().apply {
+                setTitle(carContext.getString(R.string.general_info))
+                addText(charger.generalInformation)
+            }.build())
+        }
+        if (rows.count() < maxRows && charger.amenities != null) {
+            rows.add(Row.Builder().apply {
+                setTitle(carContext.getString(R.string.amenities))
+                addText(charger.amenities)
+            }.build())
+        }
+        if (rows.count() < maxRows && ((fronyxSupported && prefs.predictionEnabled) || teslaSupported)) {
+            rows.add(1, Row.Builder().apply {
+                setTitle(
+                    if (fronyxSupported) {
+                        carContext.getString(R.string.utilization_prediction) + " (" + carContext.getString(
+                            R.string.powered_by_fronyx
+                        ) + ")"
+                    } else carContext.getString(R.string.average_utilization)
+                )
+                generatePredictionGraph()?.let { addText(it) }
+                    ?: addText(carContext.getString(if (prediction != null) R.string.auto_no_data else R.string.loading))
+            }.build())
+        }
+        if (rows.count() < maxRows && teslaSupported) {
+            val teslaPricing = availability?.extraData as? TeslaGraphQlApi.Pricing
+            rows.add(3, Row.Builder().apply {
+                setTitle(carContext.getString(R.string.cost))
+                teslaPricing?.let {
+                    var text = formatTeslaPricing(teslaPricing, carContext) as CharSequence
+                    formatTeslaParkingFee(teslaPricing, carContext)?.let { text += "\n\n" + it }
+                    addText(text)
+                } ?: {
+                    addText(carContext.getString(if (prediction != null) R.string.auto_no_data else R.string.loading))
+                }
+            }.build())
+        }
        return rows
    }

+    private fun generatePredictionGraph(): CharSequence? {
+        val predictionData = prediction ?: return null
+        val graphData = predictionData.predictionGraph?.toList() ?: return null
+        val maxValue = predictionData.maxValue
+
+        val maxWidth = if (BuildConfig.FLAVOR_automotive == "automotive") 25 else 18
+        val step = maxOf(graphData.size.toFloat() / maxWidth, 1f)
+        val values = graphData.map { it.second }
+
+        val graph = buildGraph(values, step, maxValue, predictionData.isPercentage)
+
+        val measurer = TextMeasurer(carContext)
+        val width = measurer.measureText(graph)
+
+        val startTime = timeFormat.format(graphData[0].first)
+        val endTime = timeFormat.format(graphData.last().first)
+
+        val baseWidth = measurer.measureText(startTime + endTime)
+        val spaceWidth = measurer.measureText(" ")
+        val numSpaces = floor((width - baseWidth) / spaceWidth).toInt()
+        val legend = startTime + " ".repeat(numSpaces) + endTime
+
+        return graph + "\n" + legend
+    }
+
+    private fun buildGraph(
+        values: List<Double>,
+        step: Float,
+        maxValue: Double,
+        isPercentage: Boolean
+    ): CharSequence {
+        val sparklines = "▁▂▃▄▅▆▇█"
+        val graph = SpannableStringBuilder()
+        var i = 0f
+        while (i.roundToInt() < values.size) {
+            val v = values[i.roundToInt()]
+            val fraction = v / maxValue
+            val sparkline = sparklines[(fraction * (sparklines.length - 1)).roundToInt()].toString()
+
+            val color = if (isPercentage) {
+                when (v) {
+                    in 0.0..0.5 -> CarColor.GREEN
+                    in 0.5..0.8 -> CarColor.YELLOW
+                    else -> CarColor.RED
+                }
+            } else {
+                if (v < maxValue) CarColor.GREEN else CarColor.RED
+            }
+
+            graph.append(
+                sparkline,
+                ForegroundCarColorSpan.create(color),
+                Spanned.SPAN_EXCLUSIVE_EXCLUSIVE
+            )
+            i += step
+        }
+        return graph
+    }
+
    private fun generateCostStatusText(cost: Cost): CharSequence {
        val string = SpannableString(cost.getStatusText(carContext, emoji = true))
        // replace emoji with CarIcon
@@ -371,8 +482,10 @@ class ChargerDetailScreen(ctx: CarContext, val chargerSparse: ChargeLocation) :
                } else {
                    append(nameForPlugType(carContext.stringProvider(), cp.type))
                }
-                append(" ")
-                append(cp.formatPower())
+                cp.formatPower()?.let {
+                    append(" ")
+                    append(it)
+                }
            }
            availability?.status?.get(cp)?.let { status ->
                chargepointsText.append(
@@ -463,12 +576,23 @@ class ChargerDetailScreen(ctx: CarContext, val chargerSparse: ChargeLocation) :
                    )
                    this@ChargerDetailScreen.photo = outImg
                }
+                fronyxSupported = charger.chargepoints.any {
+                    FronyxApi.isChargepointSupported(
+                        charger,
+                        it
+                    )
+                } && !availabilityRepo.isSupercharger(charger)
+                teslaSupported = availabilityRepo.isTeslaSupported(charger)

                invalidate()

                availability = availabilityRepo.getAvailability(charger).data

                invalidate()
+
+                prediction = predictionRepo.getPredictionData(charger, availability)
+
+                invalidate()
            } else {
                withContext(Dispatchers.Main) {
                    CarToast.makeText(carContext, R.string.connection_error, CarToast.LENGTH_LONG)
--- a/app/src/main/java/net/vonforst/evmap/auto/CrashReportScreen.kt
+++ b/app/src/main/java/net/vonforst/evmap/auto/CrashReportScreen.kt
@@ -0,0 +1,45 @@
+package net.vonforst.evmap.auto
+
+import android.content.Intent
+import androidx.car.app.CarContext
+import androidx.car.app.Screen
+import androidx.car.app.model.Action
+import androidx.car.app.model.CarColor
+import androidx.car.app.model.CarIcon
+import androidx.car.app.model.MessageTemplate
+import androidx.car.app.model.Template
+import net.vonforst.evmap.R
+import org.acra.dialog.CrashReportDialogHelper
+
+/**
+ * ACRA-compatible crash reporting screen for the Car App Library
+ *
+ * only used on Android Automotive OS
+ */
+class CrashReportScreen(ctx: CarContext, intent: Intent) : Screen(ctx) {
+    val helper = CrashReportDialogHelper(ctx, intent)
+    override fun onGetTemplate(): Template {
+        return MessageTemplate.Builder(carContext.getString(R.string.crash_report_text)).apply {
+            setHeaderAction(Action.APP_ICON)
+            setTitle(carContext.getString(R.string.app_name))
+            addAction(
+                Action.Builder()
+                    .setTitle(carContext.getString(R.string.ok))
+                    .setFlags(Action.FLAG_PRIMARY)
+                    .setBackgroundColor(CarColor.PRIMARY)
+                    .setOnClickListener {
+                        helper.sendCrash(null, null)
+                        screenManager.pop()
+                    }.build()
+            )
+            addAction(
+                Action.Builder()
+                    .setTitle(carContext.getString(R.string.cancel))
+                    .setOnClickListener {
+                        helper.cancelReports()
+                        screenManager.pop()
+                    }.build()
+            )
+        }.build()
+    }
+}
--- a/app/src/google/java/net/vonforst/evmap/auto/FilterScreen.kt
+++ b/app/src/google/java/net/vonforst/evmap/auto/FilterScreen.kt
@@ -41,7 +41,9 @@ class FilterScreen(ctx: CarContext, val session: EVMapSession) : Screen(ctx) {
            if (filterStatus in listOf(FILTERS_DISABLED, FILTERS_FAVORITES, FILTERS_CUSTOM)) {
                page = 0
            } else {
-                page = paginateProfiles(it).indexOfFirst { it.any { it.id == filterStatus } }
+                val index =
+                    paginateProfiles(it).indexOfFirst { it.any { it.id == filterStatus } }
+                page = index.takeUnless { it == -1 } ?: 0
            }
            invalidate()
        }
@@ -204,6 +206,37 @@ class FilterScreen(ctx: CarContext, val session: EVMapSession) : Screen(ctx) {
                        Row.IMAGE_TYPE_ICON
                    )
                    setOnClickListener { onItemClick(it.id) }
+                    if (carContext.carAppApiLevel >= 6) {
+                        // Delete action
+                        addAction(Action.Builder().apply {
+                            setIcon(
+                                CarIcon.Builder(
+                                    IconCompat.createWithResource(
+                                        carContext,
+                                        R.drawable.ic_delete
+                                    )
+                                ).build()
+
+                            )
+                            setOnClickListener {
+                                lifecycleScope.launch {
+                                    db.filterProfileDao().delete(it)
+                                    if (prefs.filterStatus == it.id) {
+                                        prefs.filterStatus = FILTERS_DISABLED
+                                    }
+                                    CarToast.makeText(
+                                        carContext,
+                                        carContext.getString(
+                                            R.string.deleted_filterprofile,
+                                            it.name
+                                        ),
+                                        CarToast.LENGTH_SHORT
+                                    ).show()
+                                    invalidate()
+                                }
+                            }
+                        }.build())
+                    }
                }.build())
            }
            if (page < paginatedProfiles.size - 1) {
@@ -293,7 +326,8 @@ class EditFiltersScreen(ctx: CarContext) : Screen(ctx) {

            setActionStrip(ActionStrip.Builder().apply {
                val currentProfile = vm.filterProfile.value
-                if (currentProfile != null) {
+                if (currentProfile != null && carContext.carAppApiLevel < 6) {
+                    // Delete action (when row actions are not available)
                    addAction(Action.Builder().apply {
                        setIcon(
                            CarIcon.Builder(
--- a/app/src/google/java/net/vonforst/evmap/auto/MapScreen.kt
+++ b/app/src/google/java/net/vonforst/evmap/auto/MapScreen.kt
@@ -4,6 +4,7 @@ import android.content.pm.PackageManager
 import android.location.Location
 import android.os.Handler
 import android.os.Looper
+import android.text.SpannableString
 import android.text.SpannableStringBuilder
 import android.text.Spanned
 import androidx.car.app.CarContext
@@ -35,6 +36,7 @@ import net.vonforst.evmap.model.FilterWithValue
 import net.vonforst.evmap.storage.AppDatabase
 import net.vonforst.evmap.storage.ChargeLocationsRepository
 import net.vonforst.evmap.storage.PreferenceDataSource
+import net.vonforst.evmap.ui.ChargerIconGenerator
 import net.vonforst.evmap.ui.availabilityText
 import net.vonforst.evmap.ui.getMarkerTint
 import net.vonforst.evmap.utils.bearingBetween
@@ -73,6 +75,7 @@ class MapScreen(ctx: CarContext, val session: EVMapSession) :
    private var lastDistanceUpdateTime: Instant? = null
    private var lastChargersUpdateTime: Instant? = null
    private var chargers: List<ChargeLocation>? = null
+    private var isFavorite: List<Boolean>? = null
    private var loadingError = false
    private var locationError = false
    private var prefs = PreferenceDataSource(ctx)
@@ -114,6 +117,9 @@ class MapScreen(ctx: CarContext, val session: EVMapSession) :

    private var searchLocation: LatLng? = null

+    private val iconGen =
+        ChargerIconGenerator(carContext, null, height = 96)
+
    init {
        lifecycle.addObserver(this)
        marker = MARKER
@@ -154,8 +160,8 @@ class MapScreen(ctx: CarContext, val session: EVMapSession) :
                val builder = ItemList.Builder()
                // only show the city if not all chargers are in the same city
                val showCity = chargerList.map { it.address?.city }.distinct().size > 1
-                chargerList.forEach { charger ->
-                    builder.addItem(formatCharger(charger, showCity))
+                chargerList.forEachIndexed { i, charger ->
+                    builder.addItem(formatCharger(charger, showCity, isFavorite?.get(i) ?: false))
                }
                builder.setNoItemsMessage(
                    carContext.getString(
@@ -231,10 +237,12 @@ class MapScreen(ctx: CarContext, val session: EVMapSession) :
                                if (!supportsRefresh) {
                                    screenManager.pushForResult(DummyReturnScreen(carContext)) {
                                        chargers = null
+                                        isFavorite = null
                                        loadChargers()
                                    }
                                } else {
                                    chargers = null
+                                    isFavorite = null
                                    loadChargers()
                                }
                            } else {
@@ -245,6 +253,7 @@ class MapScreen(ctx: CarContext, val session: EVMapSession) :
                                    )
                                ) {
                                    chargers = null
+                                    isFavorite = null
                                    loadChargers()
                                }
                                session.mapScreen = null
@@ -277,13 +286,18 @@ class MapScreen(ctx: CarContext, val session: EVMapSession) :
        }.build()
    }

-    private fun formatCharger(charger: ChargeLocation, showCity: Boolean): Row {
-        val markerTint = if ((charger.maxPower ?: 0.0) > 100) {
+    private fun formatCharger(
+        charger: ChargeLocation,
+        showCity: Boolean,
+        isFavorite: Boolean
+    ): Row {
+        val markerTint = getMarkerTint(charger)
+        val backgroundTint = if ((charger.maxPower ?: 0.0) > 100) {
            R.color.charger_100kw_dark  // slightly darker color for better contrast
        } else {
-            getMarkerTint(charger)
+            markerTint
        }
-        val color = ContextCompat.getColor(carContext, markerTint)
+        val color = ContextCompat.getColor(carContext, backgroundTint)
        val place =
            Place.Builder(CarLocation.create(charger.coordinates.lat, charger.coordinates.lng))
                .setMarker(
@@ -293,16 +307,32 @@ class MapScreen(ctx: CarContext, val session: EVMapSession) :
                )
                .build()

+        val icon = iconGen.getBitmap(
+            markerTint,
+            fault = charger.faultReport != null,
+            multi = charger.isMulti(),
+            fav = isFavorite
+        )
+        val iconSpan =
+            CarIconSpan.create(CarIcon.Builder(IconCompat.createWithBitmap(icon)).build())
+
        return Row.Builder().apply {
            // only show the city if not all chargers are in the same city (-> showCity == true)
            // and the city is not already contained in the charger name
+            val title = SpannableStringBuilder().apply {
+                append(" ", iconSpan, SpannableString.SPAN_INCLUSIVE_EXCLUSIVE)
+                append(" ")
+                append(charger.name)
+            }
            if (showCity && charger.address?.city != null && charger.address.city !in charger.name) {
-                setTitle(
-                    CarText.Builder("${charger.name} · ${charger.address.city}")
-                    .addVariant(charger.name)
-                    .build())
+                val titleWithCity = SpannableStringBuilder().apply {
+                    append("", iconSpan, SpannableString.SPAN_INCLUSIVE_EXCLUSIVE)
+                    append(" ")
+                    append("${charger.name} · ${charger.address.city}")
+                }
+                setTitle(CarText.Builder(titleWithCity).addVariant(title).build())
            } else {
-                setTitle(charger.name)
+                setTitle(title)
            }

            val text = SpannableStringBuilder()
@@ -318,7 +348,8 @@ class MapScreen(ctx: CarContext, val session: EVMapSession) :
                    DistanceSpan.create(
                        roundValueToDistance(
                            distanceMeters,
-                            energyLevel?.distanceDisplayUnit?.value
+                            energyLevel?.distanceDisplayUnit?.value,
+                            carContext
                        )
                    ),
                    Spanned.SPAN_EXCLUSIVE_EXCLUSIVE
@@ -416,15 +447,19 @@ class MapScreen(ctx: CarContext, val session: EVMapSession) :
                val filters = repo.getFiltersAsync(carContext.stringProvider())
                filtersWithValue = filtersWithValue(filters, filterValues)

+                val apiId = repo.api.value!!.id
+
                // load chargers
                if (filterStatus == FILTERS_FAVORITES) {
-                    chargers =
+                    val chargers =
                        db.favoritesDao().getAllFavoritesAsync().map { it.charger }.sortedBy {
                            distanceBetween(
                                location.latitude, location.longitude,
                                it.coordinates.lat, it.coordinates.lng
                            )
                        }
+                    this@MapScreen.chargers = chargers
+                    isFavorite = List(chargers.size) { true }
                } else {
                    // try multiple search radii until we have enough chargers
                    var chargers: List<ChargeLocation>? = null
@@ -453,7 +488,11 @@ class MapScreen(ctx: CarContext, val session: EVMapSession) :
                            break
                        }
                    }
+                    val isFavorite = chargers?.map {
+                        db.favoritesDao().findFavorite(it.id, apiId) != null
+                    }
                    this@MapScreen.chargers = chargers
+                    this@MapScreen.isFavorite = isFavorite
                }

                updateCoroutine = null
--- a/app/src/main/java/net/vonforst/evmap/auto/OAuthLoginActivity.kt
+++ b/app/src/main/java/net/vonforst/evmap/auto/OAuthLoginActivity.kt
@@ -0,0 +1,31 @@
+package net.vonforst.evmap.auto
+
+import android.content.BroadcastReceiver
+import android.content.Context
+import android.content.Intent
+import android.content.IntentFilter
+import android.os.Bundle
+import androidx.appcompat.app.AppCompatActivity
+import androidx.fragment.app.add
+import androidx.fragment.app.commit
+import androidx.localbroadcastmanager.content.LocalBroadcastManager
+import net.vonforst.evmap.R
+import net.vonforst.evmap.fragment.oauth.OAuthLoginFragment
+
+class OAuthLoginActivity : AppCompatActivity(R.layout.activity_oauth_login) {
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        if (savedInstanceState == null) {
+            supportFragmentManager.commit {
+                setReorderingAllowed(true)
+                add<OAuthLoginFragment>(R.id.fragment_container_view, args = intent.extras)
+            }
+        }
+
+        LocalBroadcastManager.getInstance(this).registerReceiver(object : BroadcastReceiver() {
+            override fun onReceive(ctx: Context, intent: Intent) {
+                finish()
+            }
+        }, IntentFilter(OAuthLoginFragment.ACTION_OAUTH_RESULT))
+    }
+}
--- a/app/src/google/java/net/vonforst/evmap/auto/PermissionScreen.kt
+++ b/app/src/google/java/net/vonforst/evmap/auto/PermissionScreen.kt
@@ -23,6 +23,7 @@ class PermissionScreen(
                Action.Builder()
                    .setTitle(carContext.getString(R.string.grant_on_phone))
                    .setBackgroundColor(CarColor.PRIMARY)
+                    .setFlags(Action.FLAG_PRIMARY)
                    .setOnClickListener(ParkedOnlyOnClickListener.create {
                        requestPermissions()
                    })
--- a/app/src/google/java/net/vonforst/evmap/auto/PlaceSearchScreen.kt
+++ b/app/src/google/java/net/vonforst/evmap/auto/PlaceSearchScreen.kt
@@ -105,7 +105,8 @@ class PlaceSearchScreen(
                            DistanceSpan.create(
                                roundValueToDistance(
                                    it,
-                                    energyLevel?.distanceDisplayUnit?.value
+                                    energyLevel?.distanceDisplayUnit?.value,
+                                    carContext
                                )
                            ),
                            Spanned.SPAN_EXCLUSIVE_EXCLUSIVE
--- a/app/src/google/java/net/vonforst/evmap/auto/SearchSelectScreen.kt
+++ b/app/src/google/java/net/vonforst/evmap/auto/SearchSelectScreen.kt
@@ -7,8 +7,11 @@ import androidx.car.app.constraints.ConstraintManager
 import androidx.car.app.model.*
 import androidx.core.graphics.drawable.IconCompat
 import androidx.lifecycle.lifecycleScope
+import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
 import net.vonforst.evmap.R
+import okio.IOException

 abstract class MultiSelectSearchScreen<T>(ctx: CarContext) : Screen(ctx),
    SearchTemplate.SearchCallback {
@@ -22,9 +25,20 @@ abstract class MultiSelectSearchScreen<T>(ctx: CarContext) : Screen(ctx),
    override fun onGetTemplate(): Template {
        if (fullList == null) {
            lifecycleScope.launch {
-                fullList = loadData()
-                filterList()
-                invalidate()
+                try {
+                    fullList = loadData()
+                    filterList()
+                    invalidate()
+                } catch (e: IOException) {
+                    withContext(Dispatchers.Main) {
+                        CarToast.makeText(
+                            carContext,
+                            R.string.generic_connection_error,
+                            CarToast.LENGTH_LONG
+                        ).show()
+                        screenManager.pop()
+                    }
+                }
            }
        }

--- a/app/src/google/java/net/vonforst/evmap/auto/SettingsScreens.kt
+++ b/app/src/google/java/net/vonforst/evmap/auto/SettingsScreens.kt
@@ -1,10 +1,16 @@
 package net.vonforst.evmap.auto

+import android.content.BroadcastReceiver
 import android.content.Context
 import android.content.Intent
+import android.content.IntentFilter
 import android.content.pm.PackageManager.NameNotFoundException
 import android.hardware.Sensor
 import android.hardware.SensorManager
+import android.net.Uri
+import android.os.Bundle
+import android.os.IInterface
+import android.text.Html
 import androidx.annotation.StringRes
 import androidx.car.app.CarContext
 import androidx.car.app.CarToast
@@ -12,15 +18,27 @@ import androidx.car.app.Screen
 import androidx.car.app.annotations.ExperimentalCarApi
 import androidx.car.app.constraints.ConstraintManager
 import androidx.car.app.model.*
+import androidx.core.content.IntentCompat
 import androidx.core.graphics.drawable.IconCompat
+import androidx.core.text.HtmlCompat
 import androidx.lifecycle.lifecycleScope
+import androidx.localbroadcastmanager.content.LocalBroadcastManager
+import com.google.android.material.snackbar.Snackbar
 import kotlinx.coroutines.launch
 import net.vonforst.evmap.*
+import net.vonforst.evmap.api.availability.TeslaAuthenticationApi
+import net.vonforst.evmap.api.availability.TeslaOwnerApi
 import net.vonforst.evmap.api.chargeprice.ChargepriceApi
 import net.vonforst.evmap.api.chargeprice.ChargepriceCar
 import net.vonforst.evmap.api.chargeprice.ChargepriceTariff
+import net.vonforst.evmap.fragment.oauth.OAuthLoginFragment
+import net.vonforst.evmap.fragment.oauth.OAuthLoginFragmentArgs
 import net.vonforst.evmap.storage.AppDatabase
+import net.vonforst.evmap.storage.EncryptedPreferenceDataStore
 import net.vonforst.evmap.storage.PreferenceDataSource
+import okhttp3.OkHttpClient
+import java.io.IOException
+import java.time.Instant
 import kotlin.math.max
 import kotlin.math.min

@@ -123,6 +141,7 @@ class SettingsScreen(ctx: CarContext, val session: EVMapSession) : Screen(ctx) {

 class DataSettingsScreen(ctx: CarContext) : Screen(ctx) {
    val prefs = PreferenceDataSource(ctx)
+    val encryptedPrefs = EncryptedPreferenceDataStore(ctx)
    val db = AppDatabase.getInstance(ctx)

    val dataSourceNames = carContext.resources.getStringArray(R.array.pref_data_source_names)
@@ -132,6 +151,8 @@ class DataSettingsScreen(ctx: CarContext) : Screen(ctx) {
    val searchProviderValues =
        carContext.resources.getStringArray(R.array.pref_search_provider_values)

+    var teslaLoggingIn = false
+
    override fun onGetTemplate(): Template {
        return ListTemplate.Builder().apply {
            setTitle(carContext.getString(R.string.settings_data_sources))
@@ -181,9 +202,122 @@ class DataSettingsScreen(ctx: CarContext) : Screen(ctx) {
                        }
                    }
                }.build())
+                addItem(
+                    Row.Builder()
+                        .setTitle(carContext.getString(R.string.pref_prediction_enabled))
+                        .addText(carContext.getString(R.string.pref_prediction_enabled_summary))
+                        .setToggle(Toggle.Builder {
+                            prefs.predictionEnabled = it
+                        }.setChecked(prefs.predictionEnabled).build())
+                        .build()
+                )
+                addItem(Row.Builder().apply {
+                    setTitle(carContext.getString(R.string.pref_tesla_account))
+                    addText(
+                        if (encryptedPrefs.teslaRefreshToken != null) {
+                            carContext.getString(
+                                R.string.pref_tesla_account_enabled,
+                                encryptedPrefs.teslaEmail
+                            )
+                        } else if (teslaLoggingIn) {
+                            carContext.getString(R.string.logging_in)
+                        } else {
+                            carContext.getString(R.string.pref_tesla_account_disabled)
+                        }
+                    )
+                    if (encryptedPrefs.teslaRefreshToken != null) {
+                        setOnClickListener {
+                            teslaLogout()
+                        }
+                    } else {
+                        setOnClickListener(ParkedOnlyOnClickListener.create {
+                            teslaLogin()
+                        })
+                    }
+                }.build())
            }.build())
        }.build()
    }
+
+    private fun teslaLogin() {
+        val codeVerifier = TeslaAuthenticationApi.generateCodeVerifier()
+        val codeChallenge = TeslaAuthenticationApi.generateCodeChallenge(codeVerifier)
+        val uri = TeslaAuthenticationApi.buildSignInUri(codeChallenge)
+
+        val args = OAuthLoginFragmentArgs(
+            uri.toString(),
+            TeslaAuthenticationApi.resultUrlPrefix,
+            "#000000"
+        ).toBundle()
+        val intent = Intent(carContext, OAuthLoginActivity::class.java)
+            .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+            .putExtras(args)
+
+        LocalBroadcastManager.getInstance(carContext)
+            .registerReceiver(object : BroadcastReceiver() {
+                override fun onReceive(ctx: Context, intent: Intent) {
+                    val url = IntentCompat.getParcelableExtra(
+                        intent,
+                        OAuthLoginFragment.EXTRA_URL,
+                        Uri::class.java
+                    )
+                    teslaGetAccessToken(url!!, codeVerifier)
+                }
+            }, IntentFilter(OAuthLoginFragment.ACTION_OAUTH_RESULT))
+
+        carContext.startActivity(intent)
+
+        if (BuildConfig.FLAVOR_automotive != "automotive") {
+            CarToast.makeText(
+                carContext,
+                R.string.opened_on_phone,
+                CarToast.LENGTH_LONG
+            ).show()
+        }
+    }
+
+    private fun teslaGetAccessToken(url: Uri, codeVerifier: String) {
+        teslaLoggingIn = true
+        invalidate()
+
+        val code = url.getQueryParameter("code") ?: return
+        val okhttp = OkHttpClient.Builder().addDebugInterceptors().build()
+        val request = TeslaAuthenticationApi.AuthCodeRequest(code, codeVerifier)
+        lifecycleScope.launch {
+            try {
+                val time = Instant.now().epochSecond
+                val response =
+                    TeslaAuthenticationApi.create(okhttp).getToken(request)
+                val userResponse =
+                    TeslaOwnerApi.create(okhttp, response.accessToken).getUserInfo()
+
+                encryptedPrefs.teslaEmail = userResponse.response.email
+                encryptedPrefs.teslaAccessToken = response.accessToken
+                encryptedPrefs.teslaAccessTokenExpiry = time + response.expiresIn
+                encryptedPrefs.teslaRefreshToken = response.refreshToken
+            } catch (e: IOException) {
+                CarToast.makeText(
+                    carContext,
+                    R.string.generic_connection_error,
+                    CarToast.LENGTH_SHORT
+                ).show()
+            } finally {
+                teslaLoggingIn = false
+            }
+            invalidate()
+        }
+    }
+
+    private fun teslaLogout() {
+        // sign out
+        encryptedPrefs.teslaRefreshToken = null
+        encryptedPrefs.teslaAccessToken = null
+        encryptedPrefs.teslaAccessTokenExpiry = -1
+        encryptedPrefs.teslaEmail = null
+        CarToast.makeText(carContext, R.string.logged_out, CarToast.LENGTH_SHORT).show()
+
+        invalidate()
+    }
 }

 class ChooseDataSourceScreen(
@@ -646,7 +780,7 @@ class AboutScreen(ctx: CarContext) : Screen(ctx) {
                        .setOnClickListener(ParkedOnlyOnClickListener.create {
                            if (BuildConfig.FLAVOR_automotive == "automotive") {
                                // we can't open the donation page on the phone in this case
-                                openUrl(carContext, carContext.getString(R.string.paypal_link))
+                                openUrl(carContext, carContext.getString(R.string.donate_link))
                            } else {
                                val intent = Intent(carContext, MapsActivity::class.java)
                                    .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
@@ -703,6 +837,34 @@ class AboutScreen(ctx: CarContext) : Screen(ctx) {
    }
 }

+class AcceptPrivacyScreen(ctx: CarContext) : Screen(ctx) {
+    val prefs = PreferenceDataSource(ctx)
+    override fun onGetTemplate(): Template {
+        val textWithoutLink = HtmlCompat.fromHtml(
+            carContext.getString(R.string.accept_privacy),
+            HtmlCompat.FROM_HTML_MODE_LEGACY
+        ).toString()
+        return MessageTemplate.Builder(textWithoutLink).apply {
+            setTitle(carContext.getString(R.string.privacy))
+            addAction(Action.Builder()
+                .setTitle(carContext.getString(R.string.ok))
+                .setFlags(Action.FLAG_PRIMARY)
+                .setBackgroundColor(CarColor.PRIMARY)
+                .setOnClickListener {
+                    prefs.privacyAccepted = true
+                    screenManager.pop()
+                }.build()
+            )
+            addAction(Action.Builder()
+                .setTitle(carContext.getString(R.string.privacy))
+                .setOnClickListener(ParkedOnlyOnClickListener.create {
+                    openUrl(carContext, carContext.getString(R.string.privacy_link))
+                }).build()
+            )
+        }.build()
+    }
+}
+
 class DeveloperOptionsScreen(ctx: CarContext) : Screen(ctx) {
    val prefs = PreferenceDataSource(ctx)

--- a/app/src/google/java/net/vonforst/evmap/auto/TextPromptScreen.kt
+++ b/app/src/google/java/net/vonforst/evmap/auto/TextPromptScreen.kt
--- a/app/src/google/java/net/vonforst/evmap/auto/Utils.kt
+++ b/app/src/google/java/net/vonforst/evmap/auto/Utils.kt
@@ -4,7 +4,9 @@ import android.content.ActivityNotFoundException
 import android.content.Context
 import android.content.Intent
 import android.graphics.Bitmap
+import android.graphics.Typeface
 import android.net.Uri
+import android.text.TextPaint
 import androidx.browser.customtabs.CustomTabColorSchemeParams
 import androidx.browser.customtabs.CustomTabsIntent
 import androidx.car.app.CarContext
@@ -19,7 +21,11 @@ import androidx.core.graphics.drawable.IconCompat
 import net.vonforst.evmap.BuildConfig
 import net.vonforst.evmap.R
 import net.vonforst.evmap.api.availability.ChargepointStatus
+import net.vonforst.evmap.ftPerMile
 import net.vonforst.evmap.getPackageInfoCompat
+import net.vonforst.evmap.kmPerMile
+import net.vonforst.evmap.shouldUseImperialUnits
+import net.vonforst.evmap.ydPerMile
 import java.util.*
 import kotlin.math.roundToInt

@@ -69,33 +75,26 @@ val emptyCarIcon: CarIcon by lazy {
    ).asCarIcon()
 }

-private const val kmPerMile = 1.609344
-private const val ftPerMile = 5280
-private const val ydPerMile = 1760

-fun getDefaultDistanceUnit(): Int {
-    return if (usesImperialUnits(Locale.getDefault())) {
+fun getDefaultDistanceUnit(ctx: Context): Int {
+    return if (shouldUseImperialUnits(ctx)) {
        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
-        else -> CarUnit.KILOMETERS_PER_HOUR
+fun getDefaultSpeedUnit(ctx: Context): Int {
+    return if (shouldUseImperialUnits(ctx)) {
+        CarUnit.MILES_PER_HOUR
+    } else {
+        CarUnit.KILOMETERS_PER_HOUR
    }
 }

-fun formatCarUnitDistance(value: Float?, unit: Int?): String {
+fun formatCarUnitDistance(value: Float?, unit: Int?, ctx: Context): String {
    if (value == null) return ""
-    return when (unit ?: getDefaultDistanceUnit()) {
+    return when (unit ?: getDefaultDistanceUnit(ctx)) {
        // distance units: base unit is meters
        CarUnit.METER -> "%.0f m".format(value)
        CarUnit.KILOMETER -> "%.1f km".format(value / 1000)
@@ -105,9 +104,9 @@ fun formatCarUnitDistance(value: Float?, unit: Int?): String {
    }
 }

-fun formatCarUnitSpeed(value: Float?, unit: Int?): String {
+fun formatCarUnitSpeed(value: Float?, unit: Int?, ctx: Context): String {
    if (value == null) return ""
-    return when (unit ?: getDefaultSpeedUnit()) {
+    return when (unit ?: getDefaultSpeedUnit(ctx)) {
        // speed units: base unit is meters per second
        CarUnit.METERS_PER_SEC -> "%.0f m/s".format(value)
        CarUnit.KILOMETERS_PER_HOUR -> "%.0f km/h".format(value * 3.6)
@@ -116,9 +115,9 @@ fun formatCarUnitSpeed(value: Float?, unit: Int?): String {
    }
 }

-fun roundValueToDistance(value: Double, unit: Int? = null): Distance {
+fun roundValueToDistance(value: Double, unit: Int? = null, ctx: Context): Distance {
    // value is in meters
-    when (unit ?: getDefaultDistanceUnit()) {
+    when (unit ?: getDefaultDistanceUnit(ctx)) {
        CarUnit.MILE -> {
            // imperial system
            val miles = value / 1000 / kmPerMile
@@ -261,4 +260,17 @@ class DummyReturnScreen(ctx: CarContext) : Screen(ctx) {
            .build()
    }

+}
+
+class TextMeasurer(ctx: CarContext) {
+    val textPaint = TextPaint()
+
+    init {
+        textPaint.textSize = ctx.resources.displayMetrics.density * 24
+        textPaint.typeface = Typeface.DEFAULT
+    }
+
+    fun measureText(text: CharSequence): Float {
+        return textPaint.measureText(text, 0, text.length)
+    }
 }
--- a/app/src/google/java/net/vonforst/evmap/auto/VehicleDataScreen.kt
+++ b/app/src/google/java/net/vonforst/evmap/auto/VehicleDataScreen.kt
@@ -84,7 +84,7 @@ class VehicleDataScreen(ctx: CarContext, val session: EVMapSession) : Screen(ctx
        return GridTemplate.Builder().apply {
            setTitle(
                if (model != null && model.manufacturer.value != null && model.name.value != null) {
-                    "${model.manufacturer.value} ${
+                    "${getVehicleBrand(model.manufacturer.value)} ${
                        getVehicleModel(
                            model.manufacturer.value,
                            model.name.value
@@ -139,7 +139,8 @@ class VehicleDataScreen(ctx: CarContext, val session: EVMapSession) : Screen(ctx
                                setText(
                                    formatCarUnitDistance(
                                        energyLevel.rangeRemainingMeters.value,
-                                        energyLevel.distanceDisplayUnit.value
+                                        energyLevel.distanceDisplayUnit.value,
+                                        carContext
                                    )
                                )
                                setImage(
@@ -173,7 +174,8 @@ class VehicleDataScreen(ctx: CarContext, val session: EVMapSession) : Screen(ctx
                                    setText(
                                        formatCarUnitSpeed(
                                            rawSpeed,
-                                            speed.speedDisplayUnit.value
+                                            speed.speedDisplayUnit.value,
+                                            carContext
                                        )
                                    )
                                    setImage(
@@ -183,7 +185,8 @@ class VehicleDataScreen(ctx: CarContext, val session: EVMapSession) : Screen(ctx
                                    setText(
                                        formatCarUnitSpeed(
                                            speed.displaySpeedMetersPerSecond.value,
-                                            speed.speedDisplayUnit.value
+                                            speed.speedDisplayUnit.value,
+                                            carContext
                                        )
                                    )
                                    setImage(
--- a/app/src/main/java/net/vonforst/evmap/fragment/ChargepriceFragment.kt
+++ b/app/src/main/java/net/vonforst/evmap/fragment/ChargepriceFragment.kt
@@ -32,6 +32,7 @@ import net.vonforst.evmap.api.equivalentPlugTypes
 import net.vonforst.evmap.databinding.FragmentChargepriceBinding
 import net.vonforst.evmap.databinding.FragmentChargepriceHeaderBinding
 import net.vonforst.evmap.model.Chargepoint
+import net.vonforst.evmap.navigation.safeNavigate
 import net.vonforst.evmap.storage.PreferenceDataSource
 import net.vonforst.evmap.viewmodel.ChargepriceViewModel
 import net.vonforst.evmap.viewmodel.Status
@@ -81,7 +82,7 @@ class ChargepriceFragment : Fragment() {
            }
            .setPositiveButton(R.string.donate) { di, _ ->
                di.dismiss()
-                findNavController().navigate(R.id.action_chargeprice_to_donateFragment)
+                findNavController().safeNavigate(ChargepriceFragmentDirections.actionChargepriceToDonateFragment())
            }
            .show()
    }
@@ -197,7 +198,7 @@ class ChargepriceFragment : Fragment() {
        }

        binding.btnSettings.setOnClickListener {
-            findNavController().navigate(R.id.action_chargeprice_to_chargepriceSettingsFragment)
+            findNavController().safeNavigate(ChargepriceFragmentDirections.actionChargepriceToChargepriceSettingsFragment())
        }

        headerBinding.batteryRange.setLabelFormatter { value: Float ->
--- a/app/src/main/java/net/vonforst/evmap/fragment/MapFragment.kt
+++ b/app/src/main/java/net/vonforst/evmap/fragment/MapFragment.kt
@@ -6,7 +6,6 @@ import android.annotation.SuppressLint
 import android.content.Context
 import android.content.res.Configuration
 import android.graphics.Color
-import android.location.Geocoder
 import android.os.Bundle
 import android.text.method.KeyListener
 import android.view.*
@@ -78,6 +77,8 @@ import net.vonforst.evmap.location.FusionEngine
 import net.vonforst.evmap.location.LocationEngine
 import net.vonforst.evmap.location.Priority
 import net.vonforst.evmap.model.*
+import net.vonforst.evmap.navigation.safeNavigate
+import net.vonforst.evmap.shouldUseImperialUnits
 import net.vonforst.evmap.storage.PreferenceDataSource
 import net.vonforst.evmap.ui.*
 import net.vonforst.evmap.utils.boundingBox
@@ -194,6 +195,9 @@ class MapFragment : Fragment(), OnMapReadyCallback, MapsActivity.FragmentCallbac
            searchResultIcon = null
        }

+        binding.detailAppBar.toolbar.popupTheme =
+            com.google.android.material.R.style.ThemeOverlay_AppCompat_DayNight
+
        ViewCompat.setOnApplyWindowInsetsListener(
            binding.root
        ) { _, insets ->
@@ -251,8 +255,11 @@ class MapFragment : Fragment(), OnMapReadyCallback, MapsActivity.FragmentCallbac

        binding.detailAppBar.toolbar.inflateMenu(R.menu.detail)
        favToggle = binding.detailAppBar.toolbar.menu.findItem(R.id.menu_fav)
-        binding.detailAppBar.toolbar.menu.findItem(R.id.menu_edit).title =
-            getString(R.string.edit_at_datasource, vm.apiName)
+
+        vm.apiName.observe(viewLifecycleOwner) {
+            binding.detailAppBar.toolbar.menu.findItem(R.id.menu_edit).title =
+                getString(R.string.edit_at_datasource, it)
+        }

        binding.detailView.topPart.doOnNextLayout {
            bottomSheetBehavior.peekHeight = binding.detailView.topPart.bottom
@@ -271,7 +278,7 @@ class MapFragment : Fragment(), OnMapReadyCallback, MapsActivity.FragmentCallbac

        if (prefs.appStartCounter > 5 && !prefs.opensourceDonationsDialogShown) {
            try {
-                findNavController().navigate(R.id.action_map_to_opensource_donations)
+                findNavController().safeNavigate(MapFragmentDirections.actionMapToOpensourceDonations())
            } catch (ignored: IllegalArgumentException) {
                // when there is already another navigation going on
            } catch (ignored: IllegalStateException) {
@@ -280,7 +287,7 @@ class MapFragment : Fragment(), OnMapReadyCallback, MapsActivity.FragmentCallbac
        }
        /*if (!prefs.update060AndroidAutoDialogShown) {
            try {
-                navController.navigate(R.id.action_map_to_update_060_androidauto)
+                navController.safeNavigate(MapFragmentDirections.actionMapToUpdate060AndroidAuto())
            } catch (ignored: IllegalArgumentException) {
                // when there is already another navigation going on
            }
@@ -369,10 +376,9 @@ class MapFragment : Fragment(), OnMapReadyCallback, MapsActivity.FragmentCallbac
            val charger = vm.charger.value?.data ?: return@setOnClickListener
            val extras =
                FragmentNavigatorExtras(binding.detailView.btnChargeprice to getString(R.string.shared_element_chargeprice))
-            findNavController().navigate(
-                R.id.action_map_to_chargepriceFragment,
-                ChargepriceFragmentArgs(charger).toBundle(),
-                null, extras
+            findNavController().safeNavigate(
+                MapFragmentDirections.actionMapToChargepriceFragment(charger),
+                extras
            )
        }
        binding.detailView.btnChargerWebsite.setOnClickListener {
@@ -380,9 +386,8 @@ class MapFragment : Fragment(), OnMapReadyCallback, MapsActivity.FragmentCallbac
            charger.chargerUrl?.let { (activity as? MapsActivity)?.openUrl(it) }
        }
        binding.detailView.btnLogin.setOnClickListener {
-            findNavController().navigate(
-                R.id.settings_data,
-                DataSettingsFragmentArgs(true).toBundle()
+            findNavController().safeNavigate(
+                MapFragmentDirections.actionMapToDataSettings(true)
            )
        }
        binding.detailView.imgPredictionSource.setOnClickListener {
@@ -433,6 +438,12 @@ class MapFragment : Fragment(), OnMapReadyCallback, MapsActivity.FragmentCallbac
                    }
                    true
                }
+
+                R.id.menu_reload -> {
+                    vm.reloadChargerDetails()
+                    true
+                }
+
                else -> false
            }
        }
@@ -867,7 +878,7 @@ class MapFragment : Fragment(), OnMapReadyCallback, MapsActivity.FragmentCallbac
        if (BuildConfig.FLAVOR.contains("google") && mapFragment!!.priority[0] == MapFragment.GOOGLE) {
            // Google Maps: icons can be generated in background thread
            lifecycleScope.launch {
-                withContext(Dispatchers.IO) {
+                withContext(Dispatchers.Default) {
                    chargerIconGenerator.preloadCache()
                }
            }
@@ -899,23 +910,19 @@ class MapFragment : Fragment(), OnMapReadyCallback, MapsActivity.FragmentCallbac
        }

        binding.scaleView.apply {
-            when (prefs.mapScale) {
-                "both" -> {
-                    visibility = View.VISIBLE
+            if (prefs.showMapScale) {
+                visibility = View.VISIBLE
+                if (prefs.mapScaleMetersAndMiles) {
                    metersAndMiles()
+                } else {
+                    if (shouldUseImperialUnits(requireContext())) {
+                        milesOnly()
+                    } else {
+                        metersOnly()
+                    }
                }
-
-                "meters" -> {
-                    visibility = View.VISIBLE
-                    metersOnly()
-                }
-
-                "miles" -> {
-                    visibility = View.VISIBLE
-                    milesOnly()
-                }
-
-                "off" -> visibility = View.GONE
+            } else {
+                visibility = View.GONE
            }
        }
        vm.mapPosition.observe(viewLifecycleOwner) {
@@ -1035,7 +1042,7 @@ class MapFragment : Fragment(), OnMapReadyCallback, MapsActivity.FragmentCallbac
            binding.search.requestFocus()
            binding.search.setSelection(locationName.length)
        }
-        if (context.checkAnyLocationPermission()) {
+        if (context.checkAnyLocationPermission() && prefs.currentMapMyLocationEnabled) {
            enableLocation(!positionSet, false)
            positionSet = true
        }
@@ -1223,8 +1230,8 @@ class MapFragment : Fragment(), OnMapReadyCallback, MapsActivity.FragmentCallbac
                        reenterTransition = MaterialSharedAxis(MaterialSharedAxis.Z, false)
                        lifecycleScope.launch {
                            vm.copyFiltersToCustom()
-                            requireView().findNavController().navigate(
-                                R.id.action_map_to_filterFragment
+                            requireView().findNavController().safeNavigate(
+                                MapFragmentDirections.actionMapToFilterFragment()
                            )
                        }
                        true
@@ -1232,8 +1239,8 @@ class MapFragment : Fragment(), OnMapReadyCallback, MapsActivity.FragmentCallbac
                    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
+                        requireView().findNavController().safeNavigate(
+                            MapFragmentDirections.actionMapToFilterProfilesFragment()
                        )
                        true
                    }
@@ -1335,8 +1342,13 @@ class MapFragment : Fragment(), OnMapReadyCallback, MapsActivity.FragmentCallbac
    }


-    override fun onMenuItemSelected(menuItem: MenuItem): Boolean {
-        return false
+    override fun onMenuItemSelected(menuItem: MenuItem) = when (menuItem.itemId) {
+        R.id.menu_reload -> {
+            vm.reloadChargepoints(true)
+            true
+        }
+
+        else -> false
    }

    override fun getRootView(): View {
@@ -1387,6 +1399,9 @@ class MapFragment : Fragment(), OnMapReadyCallback, MapsActivity.FragmentCallbac
            prefs.currentMapLocation = it.bounds.center
            prefs.currentMapZoom = it.zoom
        }
+        vm.myLocationEnabled.value?.let {
+            prefs.currentMapMyLocationEnabled = it
+        }
    }

    override fun onDestroy() {
--- a/app/src/main/java/net/vonforst/evmap/fragment/OnboardingFragment.kt
+++ b/app/src/main/java/net/vonforst/evmap/fragment/OnboardingFragment.kt
@@ -6,28 +6,35 @@ import android.annotation.SuppressLint
 import android.content.Context
 import android.graphics.drawable.AnimatedVectorDrawable
 import android.os.Bundle
+import android.text.Html
+import android.text.method.LinkMovementMethod
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.view.animation.DecelerateInterpolator
 import android.widget.ImageView
+import androidx.core.content.ContextCompat
 import androidx.fragment.app.Fragment
 import androidx.navigation.fragment.findNavController
+import androidx.viewpager2.adapter.FragmentStateAdapter
 import androidx.viewpager2.widget.ViewPager2
 import net.vonforst.evmap.R
 import net.vonforst.evmap.databinding.*
 import net.vonforst.evmap.model.FILTERS_DISABLED
+import net.vonforst.evmap.navigation.safeNavigate
 import net.vonforst.evmap.storage.PreferenceDataSource

 class OnboardingFragment : Fragment() {
    private lateinit var binding: FragmentOnboardingBinding
    private lateinit var adapter: OnboardingViewPagerAdapter
+    private lateinit var prefs: PreferenceDataSource

    override fun onCreateView(
        inflater: LayoutInflater,
        container: ViewGroup?,
        savedInstanceState: Bundle?
    ): View {
+        prefs = PreferenceDataSource(requireContext())
        binding = FragmentOnboardingBinding.inflate(inflater)

        adapter = OnboardingViewPagerAdapter(this)
@@ -67,15 +74,35 @@ class OnboardingFragment : Fragment() {
        return binding.root
    }

+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        if (prefs.welcomeDialogShown) {
+            // skip to last page for selecting data source or accepting the privacy policy
+            binding.viewPager.currentItem = adapter.itemCount - 1
+        }
+    }
+
    fun goToNext() {
        if (binding.viewPager.currentItem == adapter.itemCount - 1) {
-            findNavController().navigate(R.id.action_onboarding_to_map)
+            findNavController().safeNavigate(OnboardingFragmentDirections.actionOnboardingToMap())
        } else {
            binding.viewPager.setCurrentItem(binding.viewPager.currentItem + 1, true)
        }
    }
 }

+class OnboardingViewPagerAdapter(fragment: Fragment) :
+    FragmentStateAdapter(fragment) {
+    override fun getItemCount(): Int = 4
+
+    override fun createFragment(position: Int): Fragment = when (position) {
+        0 -> WelcomeFragment()
+        1 -> IconsFragment()
+        2 -> AndroidAutoFragment()
+        3 -> DataSourceSelectFragment()
+        else -> throw IllegalArgumentException()
+    }
+}
+
 abstract class OnboardingPageFragment : Fragment() {
    lateinit var parent: OnboardingFragment

@@ -182,7 +209,9 @@ class DataSourceSelectFragment : OnboardingPageFragment() {
            binding.rgDataSource.rbGoingElectric,
            binding.rgDataSource.textView27,
            binding.rgDataSource.rbOpenChargeMap,
-            binding.rgDataSource.textView28
+            binding.rgDataSource.textView28,
+            binding.dataSourceHint,
+            binding.cbAcceptPrivacy
        )

    override fun onCreateView(
@@ -196,6 +225,10 @@ class DataSourceSelectFragment : OnboardingPageFragment() {
    }

    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        binding.cbAcceptPrivacy.text =
+            Html.fromHtml(getString(R.string.accept_privacy, getString(R.string.privacy_link)))
+        binding.cbAcceptPrivacy.linksClickable = true
+        binding.cbAcceptPrivacy.movementMethod = LinkMovementMethod.getInstance()
        binding.btnGetStarted.visibility = View.INVISIBLE

        for (rb in listOf(
@@ -211,8 +244,24 @@ class DataSourceSelectFragment : OnboardingPageFragment() {
                }
            }
        }
+        if (prefs.dataSourceSet) {
+            when (prefs.dataSource) {
+                "goingelectric" -> binding.rgDataSource.rbGoingElectric.isChecked = true
+                "openchargemap" -> binding.rgDataSource.rbOpenChargeMap.isChecked = true
+            }
+        }

        binding.btnGetStarted.setOnClickListener {
+            if (!binding.cbAcceptPrivacy.isChecked) {
+                binding.cbAcceptPrivacy.setTextColor(
+                    ContextCompat.getColor(
+                        requireContext(),
+                        R.color.delete_red
+                    )
+                )
+                return@setOnClickListener
+            }
+
            val result = if (binding.rgDataSource.rbGoingElectric.isChecked) {
                "goingelectric"
            } else if (binding.rgDataSource.rbOpenChargeMap.isChecked) {
@@ -221,6 +270,7 @@ class DataSourceSelectFragment : OnboardingPageFragment() {
                return@setOnClickListener
            }
            prefs.dataSource = result
+            prefs.privacyAccepted = true
            prefs.filterStatus = FILTERS_DISABLED
            prefs.dataSourceSet = true
            prefs.welcomeDialogShown = true
@@ -254,4 +304,47 @@ class DataSourceSelectFragment : OnboardingPageFragment() {
        super.onPause()
        animatedItems.forEach { it.alpha = 0f }
    }
+}
+
+class AndroidAutoFragment : OnboardingPageFragment() {
+    private lateinit var binding: FragmentOnboardingAndroidAutoBinding
+
+    override fun onCreateView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View {
+        binding = FragmentOnboardingAndroidAutoBinding.inflate(inflater, container, false)
+
+        binding.btnGetStarted.setOnClickListener {
+            parent.goToNext()
+        }
+        binding.imgAndroidAuto.alpha = 0f
+
+        return binding.root
+    }
+
+    @SuppressLint("Recycle")
+    override fun onResume() {
+        super.onResume()
+
+        val animators =
+            listOf(
+                ObjectAnimator.ofFloat(binding.imgAndroidAuto, "translationY", -20f, 0f).apply {
+                    interpolator = DecelerateInterpolator()
+                },
+                ObjectAnimator.ofFloat(binding.imgAndroidAuto, "alpha", 0f, 1f).apply {
+                    interpolator = DecelerateInterpolator()
+                }
+            )
+        AnimatorSet().apply {
+            playTogether(animators)
+            start()
+        }
+    }
+
+    override fun onPause() {
+        super.onPause()
+        binding.imgAndroidAuto.alpha = 0f
+    }
 }
--- a/app/src/main/java/net/vonforst/evmap/fragment/oauth/OAuthLoginFragment.kt
+++ b/app/src/main/java/net/vonforst/evmap/fragment/oauth/OAuthLoginFragment.kt
@@ -1,6 +1,7 @@
 package net.vonforst.evmap.fragment.oauth

 import android.annotation.SuppressLint
+import android.content.Intent
 import android.graphics.Bitmap
 import android.graphics.Color
 import android.net.Uri
@@ -13,17 +14,25 @@ import android.webkit.CookieManager
 import android.webkit.WebResourceRequest
 import android.webkit.WebView
 import android.webkit.WebViewClient
+import androidx.appcompat.content.res.AppCompatResources
 import androidx.appcompat.widget.Toolbar
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.setFragmentResult
+import androidx.localbroadcastmanager.content.LocalBroadcastManager
 import androidx.navigation.fragment.findNavController
 import androidx.navigation.ui.setupWithNavController
 import com.google.android.material.progressindicator.LinearProgressIndicator
 import com.google.android.material.transition.MaterialSharedAxis
 import net.vonforst.evmap.MapsActivity
 import net.vonforst.evmap.R
+import java.lang.IllegalStateException

 class OAuthLoginFragment : Fragment() {
+    companion object {
+        val ACTION_OAUTH_RESULT = "oauth_result"
+        val EXTRA_URL = "url"
+    }
+
    private lateinit var webView: WebView

    override fun onCreate(savedInstanceState: Bundle?) {
@@ -43,10 +52,24 @@ class OAuthLoginFragment : Fragment() {
        super.onViewCreated(view, savedInstanceState)

        val toolbar = view.findViewById<Toolbar>(R.id.toolbar)
-        toolbar.setupWithNavController(
-            findNavController(),
-            (requireActivity() as MapsActivity).appBarConfiguration
-        )
+        val navController = try {
+            findNavController()
+        } catch (e: IllegalStateException) {
+            null
+            // standalone in OAuthLoginActivity
+        }
+
+        if (navController != null) {
+            toolbar.setupWithNavController(
+                navController,
+                (requireActivity() as MapsActivity).appBarConfiguration
+            )
+        } else {
+            toolbar.title = getString(R.string.login)
+            toolbar.navigationIcon =
+                AppCompatResources.getDrawable(requireContext(), R.drawable.ic_arrow_back)
+            toolbar.setNavigationOnClickListener { requireActivity().onBackPressed() }
+        }

        val args = OAuthLoginFragmentArgs.fromBundle(requireArguments())
        val uri = Uri.parse(args.url)
@@ -68,7 +91,12 @@ class OAuthLoginFragment : Fragment() {
                    val result = Bundle()
                    result.putString("url", url.toString())
                    setFragmentResult(args.url, result)
-                    findNavController().popBackStack()
+                    context?.let {
+                        LocalBroadcastManager.getInstance(it).sendBroadcast(
+                            Intent(ACTION_OAUTH_RESULT).putExtra(EXTRA_URL, url)
+                        )
+                    }
+                    navController?.popBackStack()
                }

                return url.host != uri.host
--- a/app/src/main/java/net/vonforst/evmap/fragment/preference/AboutFragment.kt
+++ b/app/src/main/java/net/vonforst/evmap/fragment/preference/AboutFragment.kt
@@ -16,6 +16,7 @@ import com.mikepenz.aboutlibraries.LibsBuilder
 import net.vonforst.evmap.BuildConfig
 import net.vonforst.evmap.MapsActivity
 import net.vonforst.evmap.R
+import net.vonforst.evmap.navigation.safeNavigate
 import net.vonforst.evmap.storage.PreferenceDataSource


@@ -108,11 +109,11 @@ class AboutFragment : PreferenceFragmentCompat() {
            "donate" -> {
                exitTransition = MaterialSharedAxis(MaterialSharedAxis.X, true)
                reenterTransition = MaterialSharedAxis(MaterialSharedAxis.X, false)
-                findNavController().navigate(R.id.action_about_to_donateFragment)
+                findNavController().safeNavigate(AboutFragmentDirections.actionAboutToDonateFragment())
                true
            }
            "github_sponsors" -> {
-                findNavController().navigate(R.id.action_about_to_github_sponsors)
+                findNavController().safeNavigate(AboutFragmentDirections.actionAboutToGithubSponsors())
                true
            }
            "twitter" -> {
--- a/app/src/google/java/net/vonforst/evmap/fragment/preference/AndroidAutoSettingsFragment.kt
+++ b/app/src/google/java/net/vonforst/evmap/fragment/preference/AndroidAutoSettingsFragment.kt
@@ -28,7 +28,7 @@ class AndroidAutoSettingsFragment : BaseSettingsFragment() {
        setPreferencesFromResource(R.xml.settings_android_auto, rootKey)
    }

-    override fun onSharedPreferenceChanged(sharedPreferences: SharedPreferences, key: String) {
+    override fun onSharedPreferenceChanged(sharedPreferences: SharedPreferences, key: String?) {
        when (key) {
            "chargeprice_battery_range_android_auto_min", "chargeprice_battery_range_android_auto_max" -> {
                updateRangePreferenceSummary()
--- a/app/src/main/java/net/vonforst/evmap/fragment/preference/ChargepriceSettingsFragment.kt
+++ b/app/src/main/java/net/vonforst/evmap/fragment/preference/ChargepriceSettingsFragment.kt
@@ -101,11 +101,12 @@ class ChargepriceSettingsFragment : BaseSettingsFragment() {
        setPreferencesFromResource(R.xml.settings_chargeprice, rootKey)
    }

-    override fun onSharedPreferenceChanged(sharedPreferences: SharedPreferences, key: String) {
+    override fun onSharedPreferenceChanged(sharedPreferences: SharedPreferences, key: String?) {
        when (key) {
            "chargeprice_my_vehicle" -> {
                updateMyVehiclesSummary()
            }
+
            "chargeprice_my_tariffs" -> {
                updateMyTariffsSummary()
            }
--- a/app/src/main/java/net/vonforst/evmap/fragment/preference/DataSettingsFragment.kt
+++ b/app/src/main/java/net/vonforst/evmap/fragment/preference/DataSettingsFragment.kt
@@ -86,7 +86,7 @@ class DataSettingsFragment : BaseSettingsFragment() {
            }
    }

-    override fun onSharedPreferenceChanged(sharedPreferences: SharedPreferences, key: String) {
+    override fun onSharedPreferenceChanged(sharedPreferences: SharedPreferences, key: String?) {
        when (key) {
            "search_provider" -> {
                if (prefs.searchProvider == "google") {
@@ -141,18 +141,11 @@ class DataSettingsFragment : BaseSettingsFragment() {
    private fun teslaLogin() {
        val codeVerifier = TeslaAuthenticationApi.generateCodeVerifier()
        val codeChallenge = TeslaAuthenticationApi.generateCodeChallenge(codeVerifier)
-        val uri = Uri.parse("https://auth.tesla.com/oauth2/v3/authorize").buildUpon()
-            .appendQueryParameter("client_id", "ownerapi")
-            .appendQueryParameter("code_challenge", codeChallenge)
-            .appendQueryParameter("code_challenge_method", "S256")
-            .appendQueryParameter("redirect_uri", "https://auth.tesla.com/void/callback")
-            .appendQueryParameter("response_type", "code")
-            .appendQueryParameter("scope", "openid email offline_access")
-            .appendQueryParameter("state", "123").build()
+        val uri = TeslaAuthenticationApi.buildSignInUri(codeChallenge)

        val args = OAuthLoginFragmentArgs(
            uri.toString(),
-            "https://auth.tesla.com/void/callback",
+            TeslaAuthenticationApi.resultUrlPrefix,
            "#000000"
        ).toBundle()

@@ -184,7 +177,8 @@ class DataSettingsFragment : BaseSettingsFragment() {
                encryptedPrefs.teslaRefreshToken = response.refreshToken
            } catch (e: IOException) {
                view?.let {
-                    Snackbar.make(it, R.string.connection_error, Snackbar.LENGTH_SHORT).show()
+                    Snackbar.make(it, R.string.generic_connection_error, Snackbar.LENGTH_SHORT)
+                        .show()
                }
            }
            refreshTeslaAccountStatus()
--- a/app/src/main/java/net/vonforst/evmap/fragment/preference/DeveloperSettingsFragment.kt
+++ b/app/src/main/java/net/vonforst/evmap/fragment/preference/DeveloperSettingsFragment.kt
@@ -25,7 +25,7 @@ class DeveloperSettingsFragment : BaseSettingsFragment() {
        setPreferencesFromResource(R.xml.settings_developer, rootKey)
    }

-    override fun onSharedPreferenceChanged(sharedPreferences: SharedPreferences, key: String) {
+    override fun onSharedPreferenceChanged(sharedPreferences: SharedPreferences, key: String?) {

    }

--- a/app/src/main/java/net/vonforst/evmap/fragment/preference/SettingsFragment.kt
+++ b/app/src/main/java/net/vonforst/evmap/fragment/preference/SettingsFragment.kt
@@ -20,7 +20,7 @@ class SettingsFragment : BaseSettingsFragment() {
        findPreference<Preference>("developer_options")?.isVisible = prefs.developerModeEnabled
    }

-    override fun onSharedPreferenceChanged(sharedPreferences: SharedPreferences, key: String) {
+    override fun onSharedPreferenceChanged(sharedPreferences: SharedPreferences, key: String?) {

    }
 }
--- a/app/src/main/java/net/vonforst/evmap/fragment/preference/UiSettingsFragment.kt
+++ b/app/src/main/java/net/vonforst/evmap/fragment/preference/UiSettingsFragment.kt
@@ -35,7 +35,7 @@ class UiSettingsFragment : BaseSettingsFragment() {
        langPref.value = getAppLocale()
    }

-    override fun onSharedPreferenceChanged(sharedPreferences: SharedPreferences, key: String) {
+    override fun onSharedPreferenceChanged(sharedPreferences: SharedPreferences, key: String?) {
        when (key) {
            "darkmode" -> {
                updateNightMode(prefs)
--- a/app/src/main/java/net/vonforst/evmap/fragment/updatedialogs/OpensourceDonationsDialogFragment.kt
+++ b/app/src/main/java/net/vonforst/evmap/fragment/updatedialogs/OpensourceDonationsDialogFragment.kt
@@ -7,6 +7,7 @@ import android.view.ViewGroup
 import androidx.navigation.fragment.findNavController
 import net.vonforst.evmap.R
 import net.vonforst.evmap.databinding.DialogOpensourceDonationsBinding
+import net.vonforst.evmap.navigation.safeNavigate
 import net.vonforst.evmap.storage.PreferenceDataSource
 import net.vonforst.evmap.ui.MaterialDialogFragment

@@ -30,11 +31,11 @@ class OpensourceDonationsDialogFragment : MaterialDialogFragment() {
        }
        binding.btnDonate.setOnClickListener {
            prefs.opensourceDonationsDialogShown = true
-            findNavController().navigate(R.id.action_opensource_donations_to_donate)
+            findNavController().safeNavigate(OpensourceDonationsDialogFragmentDirections.actionOpensourceDonationsToDonate())
        }
        binding.btnGithubSponsors.setOnClickListener {
            prefs.opensourceDonationsDialogShown = true
-            findNavController().navigate(R.id.action_opensource_donations_to_github_sponsors)
+            findNavController().safeNavigate(OpensourceDonationsDialogFragmentDirections.actionOpensourceDonationsToGithubSponsors())
        }
    }

--- a/app/src/main/java/net/vonforst/evmap/navigation/SafeNavigate.kt
+++ b/app/src/main/java/net/vonforst/evmap/navigation/SafeNavigate.kt
@@ -0,0 +1,17 @@
+package net.vonforst.evmap.navigation
+
+import androidx.navigation.NavController
+import androidx.navigation.NavDirections
+import androidx.navigation.Navigator
+
+fun NavController.safeNavigate(
+    direction: NavDirections,
+    navigatorExtras: Navigator.Extras? = null
+) {
+    currentDestination?.getAction(direction.actionId) ?: return
+    if (navigatorExtras != null) {
+        navigate(direction, navigatorExtras)
+    } else {
+        navigate(direction)
+    }
+}
--- a/app/src/main/java/net/vonforst/evmap/storage/ChargeLocationsDao.kt
+++ b/app/src/main/java/net/vonforst/evmap/storage/ChargeLocationsDao.kt
@@ -142,7 +142,8 @@ class ChargeLocationsRepository(
    fun getChargepoints(
        bounds: LatLngBounds,
        zoom: Float,
-        filters: FilterValues?
+        filters: FilterValues?,
+        overrideCache: Boolean = false
    ): LiveData<Resource<List<ChargepointListItem>>> {
        val api = api.value!!

@@ -200,7 +201,11 @@ class ChargeLocationsRepository(
                }
            }
        }
-        return CacheLiveData(dbResult, apiResult, savedRegionResult).distinctUntilChanged()
+        return if (overrideCache) {
+            apiResult
+        } else {
+            CacheLiveData(dbResult, apiResult, savedRegionResult).distinctUntilChanged()
+        }
    }

    fun getChargepointsRadius(
@@ -290,10 +295,14 @@ class ChargeLocationsRepository(
        chargers: List<ChargeLocation>,
        zoom: Float
    ): List<ChargepointListItem> {
+        /* in very crowded places (good example: central London on OpenChargeMap without filters)
+           we have to cluster even at pretty high zoom levels to make sure the map does not get
+           laggy. Otherwise, only cluster at zoom levels <= 11. */
+        val useClustering = chargers.size > 500 || zoom <= 11f
        val clusterDistance = getClusterDistance(zoom)

-        val chargersClustered = if (clusterDistance != null) {
-            Dispatchers.IO.run {
+        val chargersClustered = if (useClustering && clusterDistance != null) {
+            Dispatchers.Default.run {
                cluster(chargers, zoom, clusterDistance)
            }
        } else chargers
@@ -301,7 +310,8 @@ class ChargeLocationsRepository(
    }

    fun getChargepointDetail(
-        id: Long
+        id: Long,
+        overrideCache: Boolean = false
    ): LiveData<Resource<ChargeLocation>> {
        val dbResult = chargeLocationsDao.getChargeLocationById(
            id,
@@ -317,7 +327,11 @@ class ChargeLocationsRepository(
                chargeLocationsDao.insert(result.data!!)
            }
        }
-        return PreferCacheLiveData(dbResult, apiResult, cacheSoftLimit)
+        return if (overrideCache) {
+            apiResult
+        } else {
+            PreferCacheLiveData(dbResult, apiResult, cacheSoftLimit)
+        }
    }

    fun getFilters(sp: StringProvider) = MediatorLiveData<List<Filter<FilterValue>>>().apply {
--- a/app/src/main/java/net/vonforst/evmap/storage/Database.kt
+++ b/app/src/main/java/net/vonforst/evmap/storage/Database.kt
@@ -11,7 +11,6 @@ import androidx.room.migration.Migration
 import androidx.sqlite.db.SupportSQLiteDatabase
 import co.anbora.labs.spatia.builder.SpatiaRoom
 import co.anbora.labs.spatia.geometry.GeometryConverters
-import kotlinx.coroutines.runBlocking
 import net.vonforst.evmap.api.goingelectric.GEChargeCard
 import net.vonforst.evmap.api.goingelectric.GEChargepoint
 import net.vonforst.evmap.api.openchargemap.OCMConnectionType
@@ -35,7 +34,7 @@ import net.vonforst.evmap.model.*
        OCMCountry::class,
        OCMOperator::class,
        SavedRegion::class
-    ], version = 21
+    ], version = 22
 )
@TypeConverters(Converters::class, GeometryConverters::class)
 abstract class AppDatabase : RoomDatabase() {
@@ -75,7 +74,8 @@ abstract class AppDatabase : RoomDatabase() {
                MIGRATION_2, MIGRATION_3, MIGRATION_4, MIGRATION_5, MIGRATION_6,
                MIGRATION_7, MIGRATION_8, MIGRATION_9, MIGRATION_10, MIGRATION_11,
                MIGRATION_12, MIGRATION_13, MIGRATION_14, MIGRATION_15, MIGRATION_16,
-                MIGRATION_17, MIGRATION_18, MIGRATION_19, MIGRATION_20, MIGRATION_21
+                MIGRATION_17, MIGRATION_18, MIGRATION_19, MIGRATION_20, MIGRATION_21,
+                MIGRATION_22
            )
                .addCallback(object : Callback() {
                    override fun onCreate(db: SupportSQLiteDatabase) {
@@ -452,6 +452,13 @@ abstract class AppDatabase : RoomDatabase() {
                db.execSQL("DELETE FROM savedregion")
            }
        }
+
+        private val MIGRATION_22 = object : Migration(21, 22) {
+            override fun migrate(db: SupportSQLiteDatabase) {
+                // clear cache with this update
+                db.execSQL("DELETE FROM savedregion")
+            }
+        }
    }

    /**
--- a/app/src/main/java/net/vonforst/evmap/storage/PreferenceDataSource.kt
+++ b/app/src/main/java/net/vonforst/evmap/storage/PreferenceDataSource.kt
@@ -14,6 +14,24 @@ import java.time.Instant
 class PreferenceDataSource(val context: Context) {
    val sp = PreferenceManager.getDefaultSharedPreferences(context)

+    init {
+        if (sp.contains("map_scale")) {
+            // migration
+            val mapScale = sp.getString("map_scale", null)
+            sp.edit().putBoolean("map_scale_show", mapScale != "off")
+                .putBoolean("map_scale_meters_and_miles", mapScale == "both")
+                .putString(
+                    "units", when (mapScale) {
+                        "meters" -> "metric"
+                        "miles" -> "imperial"
+                        else -> "default"
+                    }
+                )
+                .remove("map_scale")
+                .apply()
+        }
+    }
+
    var dataSource: String
        get() = sp.getString("data_source", "goingelectric")!!
        set(value) {
@@ -243,8 +261,11 @@ class PreferenceDataSource(val context: Context) {
            sp.edit().putBoolean("show_chargers_ahead_android_auto", value).apply()
        }

-    val predictionEnabled: Boolean
+    var predictionEnabled: Boolean
        get() = sp.getBoolean("prediction_enabled", true)
+        set(value) {
+            sp.edit().putBoolean("prediction_enabled", value).apply()
+        }

    var developerModeEnabled: Boolean
        get() = sp.getBoolean("dev_mode_enabled", false)
@@ -252,8 +273,14 @@ class PreferenceDataSource(val context: Context) {
            sp.edit().putBoolean("dev_mode_enabled", value).apply()
        }

-    val mapScale: String
-        get() = sp.getString("map_scale", null) ?: "both"
+    val showMapScale: Boolean
+        get() = sp.getBoolean("map_scale_show", true)
+
+    val mapScaleMetersAndMiles: Boolean
+        get() = sp.getBoolean("map_scale_meters_and_miles", true)
+
+    val units: String
+        get() = sp.getString("units", null) ?: "default"

    var currentMapLocation: LatLng
        get() = sp.getLatLng("current_map_location") ?: LatLng(50.113388, 9.252536)
@@ -266,6 +293,18 @@ class PreferenceDataSource(val context: Context) {
        set(value) {
            sp.edit().putFloat("current_map_zoom", value).apply()
        }
+
+    var currentMapMyLocationEnabled: Boolean
+        get() = sp.getBoolean("current_map_my_location_enabled", false)
+        set(value) {
+            sp.edit().putBoolean("current_map_my_location_enabled", value).apply()
+        }
+
+    var privacyAccepted: Boolean
+        get() = sp.getBoolean("privacy_accepted", false)
+        set(value) {
+            sp.edit().putBoolean("privacy_accepted", value).apply()
+        }
 }

 fun SharedPreferences.getLatLng(key: String): LatLng? =
--- a/app/src/main/java/net/vonforst/evmap/ui/BarGraphView.kt
+++ b/app/src/main/java/net/vonforst/evmap/ui/BarGraphView.kt
@@ -151,8 +151,9 @@ class BarGraphView(context: Context, attrs: AttributeSet) : View(context, attrs)
            legendPaint.textAlign = Paint.Align.CENTER

            data.entries.forEachIndexed { i, (t, v) ->
+                val divisor = maxValue.toFloat().takeIf { it > 0f } ?: 1f
                val height =
-                    zeroHeight + (graphBounds.height() - zeroHeight) * v.toFloat() / maxValue.toFloat()
+                    zeroHeight + (graphBounds.height() - zeroHeight) * v.toFloat() / divisor
                val left = graphBounds.left + (barWidth + barMargin) * i

                if (left + barWidth > graphBounds.right) return@forEachIndexed
--- a/app/src/main/java/net/vonforst/evmap/ui/BindingAdapters.kt
+++ b/app/src/main/java/net/vonforst/evmap/ui/BindingAdapters.kt
@@ -309,9 +309,9 @@ fun time(value: Int): String {
    else "%d:%02d h".format(h, min)
 }

-fun distance(meters: Number?): String? {
+fun distance(meters: Number?, ctx: Context): String? {
    if (meters == null) return null
-    if (shouldUseImperialUnits()) {
+    if (shouldUseImperialUnits(ctx)) {
        val ft = meters.toDouble() / meterPerFt
        val mi = meters.toDouble() / 1e3 / kmPerMile
        return when {
--- a/app/src/google/java/net/vonforst/evmap/ui/CompassNeedle.kt
+++ b/app/src/google/java/net/vonforst/evmap/ui/CompassNeedle.kt
--- a/app/src/google/java/net/vonforst/evmap/ui/Gauge.kt
+++ b/app/src/google/java/net/vonforst/evmap/ui/Gauge.kt
--- a/app/src/main/java/net/vonforst/evmap/viewmodel/MapViewModel.kt
+++ b/app/src/main/java/net/vonforst/evmap/viewmodel/MapViewModel.kt
@@ -24,6 +24,8 @@ import net.vonforst.evmap.api.equivalentPlugTypes
 import net.vonforst.evmap.api.fronyx.FronyxApi
 import net.vonforst.evmap.api.fronyx.FronyxEvseIdResponse
 import net.vonforst.evmap.api.fronyx.FronyxStatus
+import net.vonforst.evmap.api.fronyx.PredictionData
+import net.vonforst.evmap.api.fronyx.PredictionRepository
 import net.vonforst.evmap.api.goingelectric.GEChargepoint
 import net.vonforst.evmap.api.nameForPlugType
 import net.vonforst.evmap.api.openchargemap.OCMConnection
@@ -53,6 +55,7 @@ internal fun getClusterDistance(zoom: Float): Int? {
    return when (zoom) {
        in 0.0..7.0 -> 100
        in 7.0..11.0 -> 75
+        in 11.0..15.0 -> 75
        else -> null
    }
 }
@@ -162,9 +165,13 @@ class MapViewModel(application: Application, private val state: SavedStateHandle
    val chargerSparse: MutableLiveData<ChargeLocation?> by lazy {
        state.getLiveData("chargerSparse")
    }
+    private val triggerChargerDetailsRefresh = MutableLiveData(false)
    val chargerDetails: LiveData<Resource<ChargeLocation>> = chargerSparse.switchMap { charger ->
-        charger?.id?.let {
-            repo.getChargepointDetail(it)
+        triggerChargerDetailsRefresh.value = false
+        triggerChargerDetailsRefresh.switchMap { overrideCache ->
+            charger?.id?.let {
+                repo.getChargepointDetail(it, overrideCache)
+            }
        }
    }.apply {
        observeForever { chargerDetail ->
@@ -206,7 +213,7 @@ class MapViewModel(application: Application, private val state: SavedStateHandle
    val location: MutableLiveData<LatLng> by lazy {
        MutableLiveData<LatLng>()
    }
-    private val triggerAvailabilityRefresh = MutableLiveData<Boolean>(true)
+    private val triggerAvailabilityRefresh = MutableLiveData(true)
    val availability: LiveData<Resource<ChargeLocationStatus>> by lazy {
        chargerSparse.switchMap { charger ->
            charger?.let {
@@ -245,155 +252,12 @@ class MapViewModel(application: Application, private val state: SavedStateHandle
        it.data?.extraData as? TeslaGraphQlApi.Pricing
    }

-    val predictionApi = FronyxApi(application.getString(R.string.fronyx_key))
+    private val predictionRepository = PredictionRepository(application)

-    val prediction: LiveData<Resource<List<FronyxEvseIdResponse>>> by lazy {
-        availability.switchMap { av ->
-            if (!prefs.predictionEnabled) return@switchMap null
-
-            av.data?.evseIds?.let { evseIds ->
-                liveData {
-                    emit(Resource.loading(null))
-
-                    val charger = charger.value?.data ?: return@liveData
-                    val allEvseIds =
-                        evseIds.filterKeys {
-                            FronyxApi.isChargepointSupported(charger, it) &&
-                                    filteredConnectors.value?.let { filtered ->
-                                        equivalentPlugTypes(
-                                            it.type
-                                        ).any { filtered.contains(it) }
-                                    } ?: true
-                        }.flatMap { it.value }
-                    if (allEvseIds.isEmpty()) {
-                        emit(Resource.success(emptyList()))
-                        return@liveData
-                    }
-                    try {
-                        val result = predictionApi.getPredictionsForEvseIds(allEvseIds)
-                        if (result.size == allEvseIds.size) {
-                            emit(Resource.success(result))
-                        } else {
-                            emit(Resource.error("not all EVSEIDs found", null))
-                        }
-                    } catch (e: IOException) {
-                        emit(Resource.error(e.message, null))
-                        e.printStackTrace()
-                    } catch (e: HttpException) {
-                        emit(Resource.error(e.message, null))
-                        e.printStackTrace()
-                    } catch (e: AvailabilityDetectorException) {
-                        emit(Resource.error(e.message, null))
-                        e.printStackTrace()
-                    } catch (e: JsonDataException) {
-                        // malformed JSON response from fronyx API
-                        emit(Resource.error(e.message, null))
-                        e.printStackTrace()
-                    }
-                }
-            } ?: liveData { emit(Resource.success(null)) }
-        }
-    }
-
-    val predictionGraph: LiveData<Map<ZonedDateTime, Double>?> =
-        MediatorLiveData<Map<ZonedDateTime, Double>?>().apply {
-            listOf(prediction, availability).forEach {
-                addSource(it) {
-                    val congestionHistogram = availability.value?.data?.congestionHistogram
-                    val prediction = prediction.value?.data
-                    value = if (congestionHistogram != null && prediction == null) {
-                        congestionHistogram.mapIndexed { i, value ->
-                            LocalTime.of(i, 0).atDate(LocalDate.now())
-                                .atZone(ZoneId.systemDefault()) to value
-                        }.toMap()
-                    } else {
-                        prediction?.let { responses ->
-                            if (responses.isEmpty()) {
-                                null
-                            } else {
-                                val evseIds = responses.map { it.evseId }
-                                val groupByTimestamp = responses.flatMap { response ->
-                                    response.predictions.map {
-                                        Triple(
-                                            it.timestamp,
-                                            response.evseId,
-                                            it.status
-                                        )
-                                    }
-                                }
-                                    .groupBy { it.first }  // group by timestamp
-                                    .mapValues { it.value.map { it.second to it.third } }  // only keep EVSEID and status
-                                    .filterValues { it.map { it.first } == evseIds }  // remove values where status is not given for all EVSEs
-                                    .filterKeys { it > ZonedDateTime.now() }  // only show predictions in the future
-
-                                groupByTimestamp.mapValues {
-                                    it.value.count {
-                                        it.second == FronyxStatus.UNAVAILABLE
-                                    }.toDouble()
-                                }.ifEmpty { null }
-                            }
-                        }
-                    }
-            }
-        }
-    }
-
-    private val predictedChargepoints = charger.map {
-        it.data?.let { charger ->
-            charger.chargepoints.filter {
-                FronyxApi.isChargepointSupported(charger, it) &&
-                        filteredConnectors.value?.let { filtered ->
-                            equivalentPlugTypes(it.type).any {
-                                filtered.contains(
-                                    it
-                                )
-                            }
-                        } ?: true
-            }
-        }
-    }
-
-    val predictionMaxValue: LiveData<Double> = MediatorLiveData<Double>().apply {
-        listOf(prediction, availability).forEach {
-            addSource(it) {
-                value =
-                    if (availability.value?.data?.congestionHistogram != null && prediction.value?.data == null) {
-                        1.0
-                    } else {
-                        (predictedChargepoints.value?.sumOf { it.count } ?: 0).toDouble()
-                    }
-            }
-        }
-    }
-
-    val predictionIsPercentage: LiveData<Boolean> = MediatorLiveData<Boolean>().apply {
-        listOf(prediction, availability).forEach {
-            addSource(it) {
-                value =
-                    availability.value?.data?.congestionHistogram != null && prediction.value?.data == null
-            }
-        }
-    }
-
-    val predictionDescription: LiveData<String?> by lazy {
-        predictedChargepoints.map { predictedChargepoints ->
-            if (predictedChargepoints == null) return@map null
-            val allChargepoints = charger.value?.data?.chargepoints ?: return@map null
-
-            val predictedChargepointTypes = predictedChargepoints.map { it.type }.distinct()
-            if (allChargepoints == predictedChargepoints) {
-                null
-            } else if (predictedChargepointTypes.size == 1) {
-                application.getString(
-                    R.string.prediction_only,
-                    nameForPlugType(application.stringProvider(), predictedChargepointTypes[0])
-                )
-            } else {
-                application.getString(
-                    R.string.prediction_only,
-                    application.getString(R.string.prediction_dc_plugs_only)
-                )
-            }
+    val predictionData: LiveData<PredictionData> = availability.switchMap { av ->
+        liveData {
+            val charger = charger.value?.data ?: return@liveData
+            emit(predictionRepository.getPredictionData(charger, av.data, filteredConnectors.value))
        }
    }

@@ -479,10 +343,10 @@ class MapViewModel(application: Application, private val state: SavedStateHandle
        }
    }

-    fun reloadChargepoints() {
+    fun reloadChargepoints(overrideCache: Boolean = false) {
        val pos = mapPosition.value ?: return
        val filters = filtersWithValue.value ?: return
-        chargepointLoader(pos to filters)
+        chargepointLoader(Triple(pos, filters, overrideCache))
    }

    private val miniMarkerThreshold = 13f
@@ -514,11 +378,10 @@ class MapViewModel(application: Application, private val state: SavedStateHandle
        throttleLatest(
            500L,
            viewModelScope
-        ) { data: Pair<MapPosition, FilterValues> ->
+        ) { data: Triple<MapPosition, FilterValues, Boolean> ->
            chargepoints.value = Resource.loading(chargepoints.value?.data)

-            val mapPosition = data.first
-            val filters = data.second
+            val (mapPosition, filters, overrideCache) = data

            val bounds = extendBounds(mapPosition.bounds)
            if (filterStatus.value == FILTERS_FAVORITES) {
@@ -541,7 +404,7 @@ class MapViewModel(application: Application, private val state: SavedStateHandle
                return@throttleLatest
            }

-            val result = repo.getChargepoints(bounds, mapPosition.zoom, filters)
+            val result = repo.getChargepoints(bounds, mapPosition.zoom, filters, overrideCache)
            chargepointsInternal?.let { chargepoints.removeSource(it) }
            chargepointsInternal = result
            chargepoints.addSource(result) {
@@ -602,6 +465,10 @@ class MapViewModel(application: Application, private val state: SavedStateHandle
        triggerAvailabilityRefresh.value = true
    }

+    fun reloadChargerDetails() {
+        triggerChargerDetailsRefresh.value = true
+    }
+
    fun loadChargerById(chargerId: Long) {
        chargerSparse.value = null
        repo.getChargepointDetail(chargerId).observeForever { response ->
--- a/app/src/google/res/drawable/ic_android_auto.xml
+++ b/app/src/google/res/drawable/ic_android_auto.xml
--- a/app/src/google/res/drawable/ic_car.xml
+++ b/app/src/google/res/drawable/ic_car.xml
--- a/app/src/google/res/drawable/ic_checkbox_checked.xml
+++ b/app/src/google/res/drawable/ic_checkbox_checked.xml
--- a/app/src/google/res/drawable/ic_checkbox_unchecked.xml
+++ b/app/src/google/res/drawable/ic_checkbox_unchecked.xml
--- a/app/src/google/res/drawable/ic_search_off.xml
+++ b/app/src/google/res/drawable/ic_search_off.xml
--- a/app/src/google/res/layout-land/fragment_onboarding_android_auto.xml
+++ b/app/src/google/res/layout-land/fragment_onboarding_android_auto.xml
--- a/app/src/main/res/layout-land/fragment_onboarding_data_source.xml
+++ b/app/src/main/res/layout-land/fragment_onboarding_data_source.xml
@@ -2,7 +2,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">
+    android:layout_height="match_parent"
+    xmlns:tools="http://schemas.android.com/tools">

    <ScrollView
        android:id="@+id/scroll"
@@ -43,11 +44,39 @@
        android:layout_height="wrap_content"
        android:layout_marginStart="32dp"
        android:layout_marginEnd="32dp"
-        android:layout_marginBottom="28dp"
+        android:layout_marginBottom="8dp"
        android:breakStrategy="balanced"
        android:text="@string/data_sources_description"
        android:textAppearance="@style/TextAppearance.Material3.BodyMedium"
        android:textColor="?android:textColorSecondary"
+        app:layout_constraintBottom_toTopOf="@+id/dataSourceHint"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toEndOf="@+id/scroll" />
+
+    <TextView
+        android:id="@+id/dataSourceHint"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="32dp"
+        android:layout_marginEnd="32dp"
+        android:layout_marginBottom="16dp"
+        android:breakStrategy="balanced"
+        android:text="@string/data_sources_hint"
+        android:textAppearance="@style/TextAppearance.Material3.BodySmall"
+        android:textColor="?android:textColorSecondary"
+        app:layout_constraintBottom_toTopOf="@+id/cb_accept_privacy"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toEndOf="@+id/scroll" />
+
+    <CheckBox
+        android:id="@+id/cb_accept_privacy"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="24dp"
+        android:layout_marginEnd="24dp"
+        android:layout_marginBottom="16dp"
+        android:textAppearance="@style/TextAppearance.Material3.BodyMedium"
+        tools:text="@string/accept_privacy"
        app:layout_constraintBottom_toTopOf="@+id/btnGetStarted"
        app:layout_constraintEnd_toEndOf="parent"
        app:layout_constraintStart_toEndOf="@+id/scroll" />
@@ -58,7 +87,7 @@
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
        android:layout_marginStart="32dp"
-        android:layout_marginBottom="24dp"
+        android:layout_marginBottom="16dp"
        android:text="@string/lets_go"
        app:layout_constraintBottom_toBottomOf="parent"
        app:layout_constraintStart_toEndOf="@+id/scroll" />
--- a/app/src/google/res/layout-sw720dp/fragment_onboarding_android_auto.xml
+++ b/app/src/google/res/layout-sw720dp/fragment_onboarding_android_auto.xml
--- a/app/src/main/res/layout-sw720dp/fragment_onboarding_data_source.xml
+++ b/app/src/main/res/layout-sw720dp/fragment_onboarding_data_source.xml
@@ -3,6 +3,7 @@
    xmlns:app="http://schemas.android.com/apk/res-auto"
    android:layout_width="match_parent"
    android:layout_height="match_parent"
+    xmlns:tools="http://schemas.android.com/tools"
    android:fillViewport="true">

    <androidx.constraintlayout.widget.ConstraintLayout
@@ -16,8 +17,8 @@
            android:layout_height="wrap_content"
            android:layout_marginStart="24dp"
            android:layout_marginEnd="24dp"
-            android:layout_marginBottom="56dp"
-            app:layout_constraintBottom_toTopOf="@+id/btnGetStarted"
+            android:layout_marginBottom="32dp"
+            app:layout_constraintBottom_toTopOf="@+id/dataSourceHint"
            app:layout_constraintEnd_toEndOf="parent"
            app:layout_constraintHorizontal_bias="0.5"
            app:layout_constraintStart_toStartOf="parent" />
@@ -54,6 +55,37 @@
            app:layout_constraintHorizontal_bias="0.5"
            app:layout_constraintStart_toStartOf="parent" />

+        <TextView
+            android:id="@+id/dataSourceHint"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="32dp"
+            android:layout_marginEnd="32dp"
+            android:layout_marginBottom="32dp"
+            android:gravity="center"
+            android:text="@string/data_sources_hint"
+            android:textAppearance="@style/TextAppearance.Material3.BodySmall"
+            android:textColor="?android:textColorSecondary"
+            android:breakStrategy="balanced"
+            app:layout_constraintBottom_toTopOf="@+id/cb_accept_privacy"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0.5"
+            app:layout_constraintStart_toStartOf="parent" />
+
+        <CheckBox
+            android:id="@+id/cb_accept_privacy"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="24dp"
+            android:layout_marginEnd="24dp"
+            android:layout_marginBottom="32dp"
+            android:textAppearance="@style/TextAppearance.Material3.BodyMedium"
+            tools:text="@string/accept_privacy"
+            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"
--- a/app/src/main/res/layout/activity_oauth_login.xml
+++ b/app/src/main/res/layout/activity_oauth_login.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.fragment.app.FragmentContainerView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/fragment_container_view"
+    android:layout_height="match_parent"
+    android:layout_width="match_parent"
+    android:fitsSystemWindows="true" />
--- a/app/src/main/res/layout/detail_view.xml
+++ b/app/src/main/res/layout/detail_view.xml
@@ -37,6 +37,8 @@

        <import type="java.time.Duration" />

+        <import type="net.vonforst.evmap.api.fronyx.PredictionData" />
+
        <variable
            name="charger"
            type="Resource&lt;ChargeLocation&gt;" />
@@ -50,20 +52,8 @@
            type="Resource&lt;ChargeLocationStatus&gt;" />

        <variable
-            name="predictionGraph"
-            type="Map&lt;ZonedDateTime, Double&gt;" />
-
-        <variable
-            name="predictionMaxValue"
-            type="Double" />
-
-        <variable
-            name="predictionIsPercentage"
-            type="Boolean" />
-
-        <variable
-            name="predictionDescription"
-            type="String" />
+            name="predictionData"
+            type="PredictionData" />

        <variable
            name="filteredAvailability"
@@ -147,7 +137,7 @@
                android:gravity="end"
                android:maxLines="1"
                android:minWidth="50dp"
-                android:text="@{BindingAdaptersKt.distance(distance)}"
+                android:text="@{BindingAdaptersKt.distance(distance, context)}"
                android:textAppearance="@style/TextAppearance.Material3.BodySmall"
                app:layout_constraintBottom_toBottomOf="@+id/txtConnectors"
                app:layout_constraintEnd_toStartOf="@+id/guideline2"
@@ -367,11 +357,11 @@
                android:layout_width="wrap_content"
                android:layout_height="wrap_content"
                android:layout_marginTop="8dp"
-                android:text="@{predictionIsPercentage ? @string/average_utilization : @string/utilization_prediction}"
+                android:text="@{predictionData.isPercentage ? @string/average_utilization : @string/utilization_prediction}"
                tools:text="@string/utilization_prediction"
                android:textAppearance="@style/TextAppearance.Material3.TitleSmall"
                android:textColor="?colorPrimary"
-                app:goneUnless="@{predictionGraph != null}"
+                app:goneUnless="@{predictionData.predictionGraph != null}"
                app:layout_constraintStart_toStartOf="@+id/guideline"
                app:layout_constraintTop_toBottomOf="@+id/divider2" />

@@ -381,9 +371,9 @@
                android:layout_height="wrap_content"
                android:layout_marginStart="8dp"
                android:layout_marginEnd="8dp"
-                android:text="@{predictionDescription}"
+                android:text="@{predictionData.description}"
                android:textAppearance="@style/TextAppearance.Material3.BodySmall"
-                app:goneUnless="@{predictionGraph != null &amp;&amp; !predictionIsPercentage}"
+                app:goneUnless="@{predictionData.predictionGraph != null &amp;&amp; !predictionData.isPercentage}"
                app:layout_constraintBaseline_toBaselineOf="@+id/textView8"
                app:layout_constraintEnd_toStartOf="@+id/btnPredictionHelp"
                app:layout_constraintStart_toEndOf="@+id/textView8"
@@ -395,7 +385,7 @@
                android:layout_width="wrap_content"
                android:layout_height="wrap_content"
                android:contentDescription="@string/help"
-                app:goneUnless="@{predictionGraph != null &amp;&amp; !predictionIsPercentage}"
+                app:goneUnless="@{predictionData.predictionGraph != null &amp;&amp; !predictionData.isPercentage}"
                app:icon="@drawable/ic_help"
                app:iconTint="?android:textColorSecondary"
                app:layout_constraintBottom_toBottomOf="@+id/textView8"
@@ -407,13 +397,13 @@
                android:layout_width="0dp"
                android:layout_height="100dp"
                android:layout_marginTop="8dp"
-                app:data="@{predictionGraph}"
-                app:goneUnless="@{predictionGraph != null}"
+                app:data="@{predictionData.predictionGraph}"
+                app:goneUnless="@{predictionData.predictionGraph != null}"
                app:layout_constraintEnd_toStartOf="@+id/guideline2"
                app:layout_constraintStart_toStartOf="@+id/guideline"
                app:layout_constraintTop_toBottomOf="@+id/textView8"
-                app:maxValue="@{predictionMaxValue}"
-                app:isPercentage="@{predictionIsPercentage}"
+                app:maxValue="@{predictionData.maxValue}"
+                app:isPercentage="@{predictionData.isPercentage}"
                tools:itemCount="3"
                tools:layoutManager="LinearLayoutManager"
                tools:listitem="@layout/item_connector"
@@ -427,7 +417,7 @@
                android:adjustViewBounds="true"
                android:background="?selectableItemBackgroundBorderless"
                android:scaleType="fitCenter"
-                app:goneUnless="@{predictionGraph != null &amp;&amp; !predictionIsPercentage}"
+                app:goneUnless="@{predictionData.predictionGraph != null &amp;&amp; !predictionData.isPercentage}"
                app:layout_constraintEnd_toStartOf="@+id/guideline2"
                app:layout_constraintTop_toBottomOf="@+id/prediction"
                app:srcCompat="@drawable/ic_powered_by_fronyx"
@@ -439,7 +429,7 @@
                android:layout_height="1dp"
                android:layout_marginTop="8dp"
                android:background="?android:attr/listDivider"
-                app:goneUnless="@{predictionGraph != null}"
+                app:goneUnless="@{predictionData.predictionGraph != null}"
                app:layout_constraintTop_toBottomOf="@+id/imgPredictionSource" />

            <ImageView
--- a/app/src/main/res/layout/dialog_data_source_select.xml
+++ b/app/src/main/res/layout/dialog_data_source_select.xml
@@ -27,7 +27,8 @@
        app:layout_constraintEnd_toEndOf="parent"
        app:layout_constraintStart_toStartOf="parent"
        app:layout_constraintTop_toBottomOf="@+id/dialogTitle"
-        app:layout_constraintBottom_toTopOf="@id/btnCancel">
+        app:layout_constraintBottom_toTopOf="@id/btnCancel"
+        android:requiresFadingEdge="vertical">

        <LinearLayout
            android:layout_width="match_parent"
--- a/app/src/main/res/layout/fragment_donate_referral.xml
+++ b/app/src/main/res/layout/fragment_donate_referral.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_marginStart="16dp"
+    android:layout_marginTop="16dp"
+    android:layout_marginEnd="16dp"
+    android:layout_marginBottom="16dp"
+    android:orientation="vertical">
+
+    <TextView
+        android:id="@+id/textView20"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="4dp"
+        android:text="@string/referrals"
+        android:textAppearance="@style/TextAppearance.Material3.TitleSmall"
+        android:textColor="?colorPrimary" />
+
+    <TextView
+        android:id="@+id/textView21"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="8dp"
+        android:text="@string/referrals_info" />
+
+    <Button
+        android:id="@+id/referral_tesla"
+        style="@style/Widget.Material3.Button.TonalButton"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/referral_tesla"
+        app:icon="@drawable/ic_tesla" />
+</LinearLayout>
--- a/app/src/main/res/layout/fragment_map.xml
+++ b/app/src/main/res/layout/fragment_map.xml
@@ -197,10 +197,7 @@
                app:charger="@{vm.charger}"
                app:availability="@{vm.availability}"
                app:filteredAvailability="@{vm.filteredAvailability}"
-                app:predictionGraph="@{vm.predictionGraph}"
-                app:predictionMaxValue="@{vm.predictionMaxValue}"
-                app:predictionIsPercentage="@{vm.predictionIsPercentage}"
-                app:predictionDescription="@{vm.predictionDescription}"
+                app:predictionData="@{vm.predictionData}"
                app:chargeCards="@{vm.chargeCardMap}"
                app:filteredChargeCards="@{vm.filteredChargeCards}"
                app:distance="@{vm.chargerDistance}"
--- a/app/src/google/res/layout/fragment_onboarding_android_auto.xml
+++ b/app/src/google/res/layout/fragment_onboarding_android_auto.xml
--- a/app/src/main/res/layout/fragment_onboarding_data_source.xml
+++ b/app/src/main/res/layout/fragment_onboarding_data_source.xml
@@ -3,7 +3,9 @@
    xmlns:app="http://schemas.android.com/apk/res-auto"
    android:layout_width="match_parent"
    android:layout_height="match_parent"
-    android:fillViewport="true">
+    xmlns:tools="http://schemas.android.com/tools"
+    android:fillViewport="true"
+    android:requiresFadingEdge="vertical">

    <androidx.constraintlayout.widget.ConstraintLayout
        android:layout_width="match_parent"
@@ -16,7 +18,7 @@
            android:layout_height="wrap_content"
            android:layout_marginStart="24dp"
            android:layout_marginEnd="24dp"
-            android:layout_marginBottom="32dp"
+            android:layout_marginBottom="16dp"
            app:layout_constraintBottom_toTopOf="@+id/dataSourceHint"
            app:layout_constraintEnd_toEndOf="parent"
            app:layout_constraintHorizontal_bias="0.5"
@@ -27,6 +29,7 @@
            android:layout_width="0dp"
            android:layout_height="wrap_content"
            android:layout_marginStart="32dp"
+            android:layout_marginTop="16dp"
            android:layout_marginEnd="32dp"
            android:layout_marginBottom="16dp"
            android:gravity="center"
@@ -35,7 +38,9 @@
            app:layout_constraintBottom_toTopOf="@+id/welcomeText2"
            app:layout_constraintEnd_toEndOf="parent"
            app:layout_constraintHorizontal_bias="0.5"
-            app:layout_constraintStart_toStartOf="parent" />
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintVertical_bias="1.0" />

        <TextView
            android:id="@+id/welcomeText2"
@@ -71,16 +76,31 @@
            android:layout_height="wrap_content"
            android:layout_marginStart="32dp"
            android:layout_marginEnd="32dp"
-            android:layout_marginBottom="32dp"
+            android:layout_marginBottom="24dp"
+            android:breakStrategy="balanced"
            android:gravity="center"
            android:text="@string/data_sources_hint"
            android:textAppearance="@style/TextAppearance.Material3.BodySmall"
            android:textColor="?android:textColorSecondary"
-            android:breakStrategy="balanced"
-            app:layout_constraintBottom_toTopOf="@+id/btnGetStarted"
+            app:layout_constraintBottom_toTopOf="@+id/cb_accept_privacy"
            app:layout_constraintEnd_toEndOf="parent"
            app:layout_constraintHorizontal_bias="0.5"
            app:layout_constraintStart_toStartOf="parent" />

+        <CheckBox
+            android:id="@+id/cb_accept_privacy"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="24dp"
+            android:layout_marginEnd="24dp"
+            android:layout_marginBottom="24dp"
+            android:paddingStart="16dp"
+            android:textAppearance="@style/TextAppearance.Material3.BodyMedium"
+            app:layout_constraintBottom_toTopOf="@+id/btnGetStarted"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0.5"
+            app:layout_constraintStart_toStartOf="parent"
+            tools:text="@string/accept_privacy" />
+
    </androidx.constraintlayout.widget.ConstraintLayout>
 </ScrollView>
--- a/app/src/main/res/layout/item_autocomplete_result.xml
+++ b/app/src/main/res/layout/item_autocomplete_result.xml
@@ -62,7 +62,7 @@
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
            android:layout_marginTop="4dp"
-            android:text="@{BindingAdaptersKt.distance(item.distanceMeters)}"
+            android:text="@{BindingAdaptersKt.distance(item.distanceMeters, context)}"
            android:textAppearance="@style/TextAppearance.Material3.BodySmall"
            app:goneUnless="@{item.distanceMeters != null}"
            app:layout_constraintEnd_toEndOf="@+id/icon"
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
johan12345	1134499532	Release 1.7.0	2023-09-23 18:31:10 +02:00
johan12345	0417ade802	Android Auto: fix crash on Android 14 due to missing permission	2023-09-23 18:23:39 +02:00
johan12345	8fafabf6a8	update car app library	2023-09-21 19:24:33 +02:00
Hosted Weblate	1b3c35e94f	Translated using Weblate (Portuguese) Currently translated at 100.0% (355 of 355 strings) Co-authored-by: Celso Azevedo <mail@celsoazevedo.com> Translate-URL: https://hosted.weblate.org/projects/evmap/android/pt/ Translation: EVMap/Android	2023-09-20 19:56:03 +02:00
Hosted Weblate	23a3adc500	Translated using Weblate (German) Currently translated at 99.7% (354 of 355 strings) Co-authored-by: Johan von Forstner <johan.forstner@gmail.com> Translate-URL: https://hosted.weblate.org/projects/evmap/android/de/ Translation: EVMap/Android	2023-09-16 23:09:42 +02:00
Hosted Weblate	16c2dcc938	Translated using Weblate (Norwegian Bokmål) Currently translated at 80.2% (284 of 354 strings) Co-authored-by: Allan Nordhøy <epost@anotheragency.no> Translate-URL: https://hosted.weblate.org/projects/evmap/android/nb_NO/ Translation: EVMap/Android	2023-09-16 23:04:37 +02:00
Hosted Weblate	f322974e52	Translated using Weblate (Portuguese) Currently translated at 100.0% (354 of 354 strings) Co-authored-by: Celso Azevedo <mail@celsoazevedo.com> Translate-URL: https://hosted.weblate.org/projects/evmap/android/pt/ Translation: EVMap/Android	2023-09-16 23:04:37 +02:00
Hosted Weblate	50ae2123e9	Translated using Weblate (English) Currently translated at 100.0% (354 of 354 strings) Co-authored-by: Allan Nordhøy <epost@anotheragency.no> Translate-URL: https://hosted.weblate.org/projects/evmap/android/en/ Translation: EVMap/Android	2023-09-16 23:04:36 +02:00
johan12345	72894399f6	adjustments for Android Auto	2023-09-16 22:59:10 +02:00
johan12345	77014d754f	implement Tesla Supercharger cost in AA/AAOS	2023-09-16 22:59:10 +02:00
johan12345	66dbd6426f	implement Tesla Login for Android Auto/AAOS	2023-09-16 22:59:10 +02:00
johan12345	e4127f4a56	improve prediction graph generation	2023-09-16 22:59:10 +02:00
johan12345	f9bf8b80f7	Android Auto/AAOS: Add availability prediction	2023-09-16 22:59:10 +02:00
johan12345	67eeb47d5f	update dependencies	2023-09-16 13:01:55 +02:00
johan12345	3c6a7cd536	make navController.navigate() calls safe https://nezspencer.medium.com/navigation-components-a-fix-for-navigation-action-cannot-be-found-in-the-current-destination-95b63e16152e	2023-09-16 12:57:34 +02:00
Hosted Weblate	31e3509369	Translated using Weblate (Portuguese) Currently translated at 100.0% (353 of 353 strings) Co-authored-by: Celso Azevedo <mail@celsoazevedo.com> Translate-URL: https://hosted.weblate.org/projects/evmap/android/pt/ Translation: EVMap/Android	2023-09-15 22:01:35 +02:00
johan12345	b03f765216	SearchSelectScreen: catch IOExceptions	2023-09-15 21:45:20 +02:00
johan12345	9222dec613	Release 1.6.9	2023-09-14 20:26:08 +02:00
johan12345	71c36fbc8f	MapFragment: Change default map location behavior Only jump back to current location on app restart if we were previously looking at the current location (and have location permission enabled). Otherwise stay at the last viewed location. This seems to be the same as what e.g. the Google Maps app does. #191	2023-09-14 20:16:41 +02:00
johan12345	830477e664	Automotive FilterScreen: fix possible crash when profile is deleted	2023-09-13 22:44:23 +02:00
johan12345	3ce91a9c50	ChargerDetailScreen: fix nullability issue	2023-09-10 12:39:19 +02:00
johan12345	a3b2b94b25	ACRA: switch -normal build variants to use HTTP sending as well	2023-09-06 21:51:50 +02:00
johan12345	a7770e1c1b	fix Github Actions build	2023-09-03 18:34:24 +02:00
johan12345	fcd51307cb	Release 1.6.8	2023-09-03 18:11:57 +02:00
johan12345	ba4a9c29b2	ACRA: keep key-value format for email reports	2023-09-03 18:11:24 +02:00
johan12345	3463177ad2	EnBW: avoid endless loop introduced by `d636cde7`	2023-09-02 23:25:42 +02:00
johan12345	09deaf5080	AA/AAOS: add general info & amenities (if room available)	2023-09-02 22:27:45 +02:00
johan12345	23f429bbea	disable CarAppTest due to Robolectric incompatibility	2023-09-02 22:16:35 +02:00
johan12345	1184d3b6cc	AA/AAOS FilterScreen: add delete button to rows	2023-09-02 22:09:07 +02:00
johan12345	c95a60807b	Upgrade SDK to 34 & dependencies	2023-09-02 22:01:47 +02:00
johan12345	4b8cf82843	update Android Gradle plugin	2023-09-02 21:20:32 +02:00
johan12345	f33b9e8117	Merge branch 'rework-acra'	2023-09-02 17:39:46 +02:00
johan12345	cbc3040807	Rework units configuration units (imperial or metric) can be configured globally, this applies to distances within the app, vehicle data, and the map scale bar fixes #293	2023-09-02 17:39:37 +02:00
johan12345	92619ea95e	ACRA: switch from email to HTTP sending for automotive flavor	2023-09-02 16:47:56 +02:00
johan12345	a7007284ff	ACRA: introduce AAOS-friendly crash reporting screen	2023-09-02 16:38:02 +02:00
johan12345	7fce566052	add referral link to donate page	2023-08-27 19:53:32 +02:00
Johan von Forstner	0c44b4b074	Update FUNDING.yml	2023-08-27 19:52:48 +02:00
johan12345	a652d96f74	fix CarAppTest	2023-08-27 19:12:55 +02:00
johan12345	8a9b3ad948	Android Auto/Automotive: Make users explicitly accept the privacy policy	2023-08-27 19:05:04 +02:00
Johan von Forstner	c48f33e265	Release 1.6.7	2023-08-21 19:26:30 +02:00
johan12345	8ba4897026	Android Automotive: update donate link	2023-08-21 19:22:45 +02:00
Johan von Forstner	42916d71ca	Onboarding: Do not select GoingElectric by default instead make the user actively choose the data source #291	2023-08-03 16:47:20 +02:00
Johan von Forstner	5ca7524e8b	OpenChargeMap: Map "Tesla Model S/X" plug to Chargepoint.SUPERCHARGER #6	2023-08-03 16:34:10 +02:00
Johan von Forstner	c37f72a26b	reduce vertical padding around dialogs #292	2023-08-02 20:46:16 +02:00
Johan von Forstner	6f0113c50d	adjustments to data source selection screen for smaller screens	2023-08-02 19:58:05 +02:00
Johan von Forstner	f99ea7ca9e	Fix formatting of Portuguese string	2023-08-02 16:21:02 +02:00
Johan von Forstner	788db0c10f	fix popup menu theme in dark mode see #287	2023-08-02 16:09:48 +02:00
Hosted Weblate	db2213a50f	Translated using Weblate (Portuguese) Currently translated at 100.0% (349 of 349 strings) Co-authored-by: Celso Azevedo <mail@celsoazevedo.com> Translate-URL: https://hosted.weblate.org/projects/evmap/android/pt/ Translation: EVMap/Android	2023-08-02 16:08:45 +02:00
Johan von Forstner	ace4126035	more uppercase consistency	2023-08-02 15:45:47 +02:00
Johan von Forstner	d5d6e4f314	GoingElectric: nullability fix	2023-08-01 20:23:54 +02:00
Johan von Forstner	55999d15e6	upper/lower case consistency as mentioned in comment in #287	2023-07-30 20:01:11 +02:00
Johan von Forstner	b61ca609d3	GoingElectric: fix "Tesla Supercharger CCS" filter "Tesla Supercharger CCS" is a bit peculiar - it is available as a filter, but the API just returns "CCS" in the charging station details. So we cannot use it for filtering as it won't work in the local database. So we join them into a single filter option. If you want to find Tesla Superchargers with CCS, you can still do that using the network filter.	2023-07-27 10:16:22 +02:00
johan12345	b0afad2144	fix nullability issue in TeslaAvailabilityDetector	2023-07-19 20:59:47 +02:00
johan12345	94842954e3	Release 1.6.6	2023-07-16 11:23:10 +02:00
johan12345	1bee5f7e13	upgrade Coil to 2.4.0	2023-07-16 11:22:02 +02:00
johan12345	d636cde70e	EnBwAvailabilityDetector: zoom in until no markers are grouped	2023-07-14 19:25:53 +02:00
johan12345	2a4497fe7a	fix NPE in EnBwAvailabilityDetector	2023-07-14 19:23:57 +02:00
johan12345	10e3287d82	fix division by zero error	2023-07-14 18:48:26 +02:00
Johan von Forstner	a0f7a389c8	CI: fix file name	2023-07-13 21:52:45 +02:00
johan12345	1cabb8dccf	Release 1.6.5	2023-07-13 21:35:08 +02:00
johan12345	85079bb888	fix SQL query for minConnectors filter	2023-07-13 21:20:05 +02:00
johan12345	10bfc21f54	add padding for privacy policy checkbox	2023-07-13 21:11:43 +02:00
johan12345	ae33fce637	add fossAutomotive variant to CI	2023-07-02 17:45:17 +02:00
johan12345	773d57b9a9	update explanations of variants refs #281	2023-07-02 17:45:07 +02:00
Johan von Forstner	022f570322	add checkbox to accept privacy policy during onboarding	2023-07-01 22:01:35 +02:00
johan12345	a6c2b30325	Android Auto: Show the charger icon in the result row fixes #284	2023-07-01 21:32:24 +02:00
johan12345	2210e65e5c	Add reload button in detail view fixes #287	2023-07-01 21:10:11 +02:00
johan12345	024e3cef35	add menu item to manually reload map content #287	2023-07-01 19:50:31 +02:00
johan12345	687ef2ec0f	add vehicle brand look-up table for Android Auto fixes #289	2023-07-01 19:40:57 +02:00
johan12345	9e61dce7be	enable fossAutomotive variant refs #281	2023-07-01 12:16:41 +02:00
johan12345	aad7a320d0	make Android Auto app also available in foss build The only Google dependency it references is the Car App Library, which is open source. GMS is not imported by the Android Auto app. Of course it won't actually be usable on devices without the Android Auto app, which itself requires GMS. preparation for #281	2023-07-01 12:16:41 +02:00
johan12345	96df684b80	remove unneeded overrideLibrary in manifest	2023-07-01 12:16:41 +02:00
Johan von Forstner	7903c027c7	AvailabilityDetector: Further increase max merging distance to 60m	2023-06-22 17:10:48 +02:00
johan12345	06801c1898	Release 1.6.4	2023-06-17 17:59:30 +02:00
johan12345	c946b0fcd3	TeslaAvailabilityDetector: fix cases when number of chargepoints does not match	2023-06-17 17:38:33 +02:00
johan12345	dd4fcc7550	Run clustering on Dispatchers.Default, not Dispatchers.IO	2023-06-16 23:08:01 +02:00
johan12345	2ce82b961b	Introduce clustering up to zoom level 15 in very crowded places (>500 chargers within view) refs #285	2023-06-16 22:50:14 +02:00