adjust disk size

update SDK
change screenshot size
2025-12-24 15:47:44 -05:00 · 2024-05-12 22:29:49 +02:00 · 2024-05-12 18:57:02 +02:00 · 2024-05-12 15:13:11 +02:00 · 2024-05-12 14:33:45 +02:00 · 2024-05-10 17:52:28 +02:00
115 changed files with 1104 additions and 1102 deletions
--- a/.github/workflows/apikeys-ci.xml
+++ b/.github/workflows/apikeys-ci.xml
@@ -1,8 +1,6 @@
 <resources>
   <string name="google_maps_key" templateMergeStrategy="preserve" translatable="false">ci</string>
   <string name="mapbox_key" translatable="false">ci</string>
-   <string name="jawg_key" translatable="false">ci</string>
-   <string name="arcgis_key" translatable="false">ci</string>
   <string name="goingelectric_key" translatable="false">ci</string>
   <string name="chargeprice_key" translatable="false">ci</string>
   <string name="openchargemap_key" translatable="false">ci</string>
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -30,8 +30,6 @@ jobs:
          OPENCHARGEMAP_API_KEY: ${{ secrets.OPENCHARGEMAP_API_KEY }}
          CHARGEPRICE_API_KEY: ${{ secrets.CHARGEPRICE_API_KEY }}
          MAPBOX_API_KEY: ${{ secrets.MAPBOX_API_KEY }}
-          JAWG_API_KEY: ${{ secrets.JAWG_API_KEY }}
-          ARCGIS_API_KEY: ${{ secrets.ARCGIS_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 }}
--- a/.github/workflows/screenshots.yml
+++ b/.github/workflows/screenshots.yml
@@ -0,0 +1,115 @@
+on:
+  push:
+    branches:
+      - '*'
+
+name: Generate Screenshots
+
+jobs:
+
+  screenshot:
+    name: Generate screenshots
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        device:
+          - profile: pixel_6
+            api-level: 34
+            display_size: 1080x2336  # subtracted the 64px bottom navigation bar
+            type: phone
+          - profile: pixel_tablet
+            api-level: 34
+            display_size: 2560x1488  # subtracted the 64px navigation bar and 48px status bar
+            type: tenInch
+    env:
+      ANDROID_USER_HOME: /home/runner/.android
+    steps:
+      - name: Enable KVM group perms
+        run: |
+          echo 'KERNEL=="kvm", GROUP="kvm", MODE="0666", OPTIONS+="static_node=kvm"' | sudo tee /etc/udev/rules.d/99-kvm4all.rules
+          sudo udevadm control --reload-rules
+          sudo udevadm trigger --name-match=kvm
+
+      - name: Check out code
+        uses: actions/checkout@v4
+
+      - name: Retrieve debug keystore
+        env:
+          DEBUG_KEYSTORE_BASE64: ${{ secrets.DEBUG_KEYSTORE_BASE64 }}
+        run: |
+          mkdir ~/.config/.android
+          echo $DEBUG_KEYSTORE_BASE64 | base64 --decode >  ~/.config/.android/debug.keystore
+
+      - name: Set up Java environment
+        uses: actions/setup-java@v3
+        with:
+          java-version: 17
+          distribution: 'zulu'
+          cache: 'gradle'
+
+      - name: Setup Android SDK
+        run: |
+          $ANDROID_HOME/cmdline-tools/latest/bin/sdkmanager --install "cmdline-tools;latest"
+          rm -r $ANDROID_HOME/cmdline-tools/latest
+          mv $ANDROID_HOME/cmdline-tools/latest-2 $ANDROID_HOME/cmdline-tools/latest
+          $ANDROID_HOME/cmdline-tools/latest/bin/sdkmanager --version
+
+      - name: AVD cache
+        uses: actions/cache@v3
+        id: avd-cache
+        with:
+          path: |
+            ~/.android/avd/*
+            ~/.android/adb*
+          key: ${{ runner.os }}-avd-api${{ matrix.device.api-level }}-${{ matrix.device.profile }}
+
+      - name: create AVD and generate snapshot for caching
+        if: steps.avd-cache.outputs.cache-hit != 'true'
+        uses: reactivecircus/android-emulator-runner@v2
+        with:
+          api-level: ${{ matrix.device.api-level }}
+          target: google_atd
+          arch: x86_64
+          profile: ${{ matrix.device.profile }}
+          force-avd-creation: false
+          ram-size: 2048M
+          disk-size: 4096M
+          emulator-options: -no-window -gpu swiftshader_indirect -noaudio -no-boot-anim -camera-back none -no-metrics
+          disable-animations: true
+          script: echo "Generated AVD snapshot for caching."
+
+      - name: Build app
+        run: ./gradlew assembleGoogleNormalDebug assembleGoogleNormalAndroidTest
+        env:
+          GOINGELECTRIC_API_KEY: ${{ secrets.GOINGELECTRIC_API_KEY }}
+          OPENCHARGEMAP_API_KEY: ${{ secrets.OPENCHARGEMAP_API_KEY }}
+          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 }}
+
+      - name: Run emulator and generate screenshots
+        uses: reactivecircus/android-emulator-runner@v2
+        with:
+          api-level: ${{ matrix.device.api-level }}
+          target: google_atd
+          arch: x86_64
+          profile: ${{ matrix.device.profile }}
+          force-avd-creation: false
+          ram-size: 2048M
+          disk-size: 4096M
+          emulator-options: -no-snapshot-save -no-window -gpu swiftshader_indirect -noaudio -no-boot-anim -camera-back none -no-metrics
+          disable-animations: true
+          script: |
+            adb shell pm clear net.vonforst.evmap.debug || true
+            adb shell wm size ${{ matrix.device.display_size }}
+            adb logcat -c
+            
+            adb logcat *:E &            
+            fastlane screengrab --app_apk_path app/build/outputs/apk/googleNormal/debug/app-google-normal-debug.apk  --test_apk_path app/build/outputs/apk/androidTest/googleNormal/debug/app-google-normal-debug-androidTest.apk --tests_package_name=net.vonforst.evmap.debug.test --app_package_name net.vonforst.evmap.debug -p net.vonforst.evmap.screenshot --use_timestamp_suffix false --clear_previous_screenshots true --device_type=${{ matrix.device.type }} -q en-US,de-DE,fr-FR,nb-rNO,nl-NL,pt-PT,ro-RO
+
+      - name: Upload screenshots as artifacts
+        uses: actions/upload-artifact@v3
+        with:
+          name: screenshots-${{ matrix.device.profile }}-${{ matrix.device.api-level }}
+          path: fastlane/metadata/android
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -34,5 +34,3 @@ jobs:
        run: ./gradlew test${{ matrix.buildvariant }}DebugUnitTest --no-daemon
      - name: Run Android Lint
        run: ./gradlew lint${{ matrix.buildvariant }}Debug --no-daemon
-      - name: Check licenses
-        run: ./gradlew exportLibraryDefinitions --no-daemon
--- a/.gitignore
+++ b/.gitignore
@@ -12,5 +12,4 @@ apikeys.xml
 /app/**/*.apk
 /_img/connectors/*.ai
 api-7125266970515251116-798419-8e2dda660c80.json
-output-metadata.json
-licenses_*.csv
+output-metadata.json
--- a/README.md
+++ b/README.md
@@ -24,8 +24,7 @@ Features
 - Android Auto & Android Automotive OS integration
 - No ads, fully open source
 - Compatible with Android 5.0 and above
- Can use Google Maps or OpenStreetMap as map backends - the version available on F-Droid only uses
-  OSM.
+- Can use Google Maps or Mapbox (OpenStreetMap) as map backends - the version available on F-Droid only uses Mapbox.

 Screenshots
 -----------
@@ -43,13 +42,12 @@ EVMap uses and put them into the app in the form of a resource file called `apik
 `app/src/main/res/values`. You can find more information on which API keys are necessary for which
 features and how they can be obtained in our [documentation page](doc/api_keys.md).

-There are four different build flavors, `googleNormal`, `fossNormal`, `googleAutomotive`, and
-`fossAutomotive`.
-
- The `foss` variants only use OSM data for the base map and place search. They should run on most Android devices, even those without Google Play Services.
+There are three different build flavors, `googleNormal`, `fossNormal` and `googleAutomotive`.
+- 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 Android Auto may not work if the app is not
-      installed from Google Play, see https://github.com/ev-map/EVMap/issues/319).
+      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.
@@ -77,19 +75,5 @@ You can use our [Weblate page](https://hosted.weblate.org/projects/evmap/) to he
 into new languages.

 <a href="https://hosted.weblate.org/engage/evmap/">
-<img src="https://hosted.weblate.org/widgets/evmap/-/open-graph.png" width="400" alt="Translation status" />
+<img src="https://hosted.weblate.org/widgets/evmap/-/open-graph.png" width="500" alt="Translation status" />
 </a>
-
-Sponsors
--------
-
-Many users currently support the development EVMap with their donations. You can find more
-information on the [Donate page](https://ev-map.app/donate/) on the EVMap website.
-
-<a href="https://www.jawg.io"><img src="https://www.jawg.io/static/Blue@10x-9cdc4596e4e59acbd9ead55e9c28613e.png" alt="JawgMaps" height="58"/></a><br>
-Since May 2024, **JawgMaps** provides their OpenStreetMap vector map tiles service to EVMap for
-free, i.e. the background map displayed in the app if OpenStreetMap is selected as the data source.
-
-<a href="https://chargeprice.app"><img src="https://raw.githubusercontent.com/ev-map/EVMap/master/_img/powered_by_chargeprice.svg" alt="Powered by Chargeprice" height="58"/></a><br>
-Since April 2021, **Chargeprice.app** provide their price comparison API at a greatly reduced
-price for EVMap. This data is used in EVMap's price comparison feature.
--- a/_img/ic_launcher-playstore.png
+++ b/_img/ic_launcher-playstore.png
--- a/_img/ic_launcher-playstore.svg
+++ b/_img/ic_launcher-playstore.svg
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg id="Ebene_2" data-name="Ebene 2" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512">
-    <defs>
-        <style>
-            .cls-1 {
-            fill: #00e676;
-            }
-
-            .cls-1, .cls-2, .cls-3, .cls-4, .cls-5, .cls-6, .cls-7, .cls-8 {
-            stroke-width: 0px;
-            }
-
-            .cls-2 {
-            fill: rgba(255, 255, 255, .2);
-            }
-
-            .cls-3 {
-            fill: #ffb300;
-            }
-
-            .cls-4 {
-            fill: #000;
-            isolation: isolate;
-            opacity: .45;
-            }
-
-            .cls-5 {
-            fill: #fff;
-            }
-
-            .cls-6 {
-            fill: #90a4ae;
-            }
-
-            .cls-7 {
-            fill: #546e7a;
-            }
-
-            .cls-8 {
-            fill: rgba(62, 39, 35, .2);
-            }
-        </style>
-    </defs>
-    <g id="Layer_1" data-name="Layer 1">
-        <g>
-            <rect class="cls-5" width="512" height="512" />
-            <g>
-                <g>
-                    <path class="cls-3"
-                        d="M159.42,338.98l-6.43-56.15-9.81,1.01,6.43,56.15,9.81-1.01ZM194.26,334.92l-6.43-56.15-9.81,1.01,6.43,56.15,9.81-1.01Z" />
-                    <path class="cls-6"
-                        d="M212.53,411.37c-3.04,3.72-5.41,6.09-5.75,6.43-8.79,7.1-15.9,9.13-21.65,6.43-10.15-5.07-9.47-24.02-9.13-26.05l7.1.34c-.34,5.41.68,16.91,5.41,19.28,2.71,1.35,7.44-.34,13.53-5.41h0s19.62-19.62,15.56-35.18c-4.74-18.6,16.91-45.33,24.02-54.46l1.01-1.01,5.75,4.4-1.01,1.35c-21.99,27.06-24.35,40.93-22.66,48.03,3.38,13.53-5.75,28.08-12.18,35.85Z" />
-                    <path class="cls-6"
-                        d="M137.78,338.3l2.71,23,21.31,14.21,28.75-3.04,17.59-18.6-2.71-23-67.65,7.44Z" />
-                    <path class="cls-7"
-                        d="M190.21,372.47l-28.75,3.04,6.09,25.37,22.66-2.71v-25.71h0ZM210.84,311.58l2.37,20.97-82.53,9.47-2.37-20.97,82.53-9.47Z" />
-                </g>
-                <g>
-                    <g>
-                        <path class="cls-1"
-                            d="M275.45,80.22c-59.19,0-107.23,48.03-107.23,107.23,0,80.84,90.31,123.12,101.14,238.47.34,3.38,3.04,5.75,6.43,5.75s6.09-2.37,6.43-5.75c10.82-115.34,101.14-157.63,101.14-238.47-.68-59.53-48.71-107.23-107.9-107.23Z" />
-                        <path class="cls-2"
-                            d="M275.45,82.58c58.86,0,106.55,47.36,107.23,105.87v-1.01c0-59.19-48.03-107.23-107.23-107.23s-107.23,47.69-107.23,107.23v1.01c.68-58.52,48.37-105.87,107.23-105.87h0Z" />
-                        <path class="cls-8"
-                            d="M281.87,423.21c-.34,3.38-3.04,5.75-6.43,5.75s-6.09-2.37-6.43-5.75c-10.49-115.01-100.12-157.29-100.8-237.12v1.69c0,80.84,90.31,123.12,101.14,238.47.34,3.38,3.04,5.75,6.43,5.75s6.09-2.37,6.43-5.75c10.82-115.34,101.14-157.63,101.14-238.47v-1.69c-1.35,79.83-90.99,122.11-101.48,237.12h0Z" />
-                    </g>
-                    <path class="cls-4"
-                        d="M250.75,135.01v64.94h17.59v53.11l41.27-71.03h-23.68l23.68-47.36c.34.34-58.86.34-58.86.34Z" />
-                </g>
-            </g>
-        </g>
-    </g>
-</svg>
--- a/_tools/export_licenses_faurecia.py
+++ b/_tools/export_licenses_faurecia.py
@@ -1,23 +0,0 @@
-import subprocess
-import json
-
-build_types = ["fossNormalRelease", "fossAutomotiveRelease"]
-
-for build_type in build_types:
-    result = subprocess.run(["gradlew.bat", f"generateLibraryDefinitions{build_type.capitalize()}"],
-                            capture_output=True)
-
-    data = json.load(
-        open(f"app/build/generated/aboutLibraries/{build_type}/res/raw/aboutlibraries.json"))
-
-    with open(f"licenses_{build_type}.csv", "w") as f:
-        f.write("component_name;license_title;license_url;public_repository;copyrights\n")
-        for lib in data["libraries"]:
-            license = data["licenses"][lib["licenses"][0]] if len(lib["licenses"]) > 0 else None
-            license_name = license["name"] if license is not None else " "
-            license_url = license["url"] if license is not None else " "
-            copyrights = ", ".join([dev["name"] for dev in lib["developers"] if "name" in dev])
-            if copyrights == "":
-                copyrights = " "
-            repo_url = lib['scm']['url'] if 'scm' in lib else ''
-            f.write(f"{lib['name']};{license_name};{license_url};\"{copyrights}\";{repo_url}\n")
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -12,16 +12,14 @@ plugins {


 android {
-    useLibrary("android.car")
-
    defaultConfig {
        applicationId = "net.vonforst.evmap"
        compileSdk = 34
        minSdk = 21
        targetSdk = 34
        // NOTE: always increase versionCode by 2 since automotive flavor uses versionCode + 1
-        versionCode = 244
-        versionName = "1.9.12"
+        versionCode = 212
+        versionName = "1.8.2"

        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
    }
@@ -48,21 +46,12 @@ android {
            )
            signingConfig = signingConfigs.getByName("release")
        }
-        create("releaseAutomotivePackageName") {
-            // Faurecia Aptoide requires the automotive variant to use a separate package name
-            initWith(getByName("release"))
-            applicationIdSuffix = ".automotive"
-        }
        debug {
            applicationIdSuffix = ".debug"
            isDebuggable = true
        }
    }

-    sourceSets {
-        getByName("releaseAutomotivePackageName").setRoot("src/release")
-    }
-
    flavorDimensions += listOf("dependencies", "automotive")
    productFlavors {
        create("foss") {
@@ -157,28 +146,6 @@ android {
        if (mapboxKey != null) {
            resValue("string", "mapbox_key", mapboxKey)
        }
-        var jawgKey =
-            System.getenv("JAWG_API_KEY") ?: project.findProperty("JAWG_API_KEY")?.toString()
-        if (jawgKey == null && project.hasProperty("JAWG_API_KEY_ENCRYPTED")) {
-            jawgKey = decode(
-                project.findProperty("JAWG_API_KEY_ENCRYPTED").toString(),
-                "FmK.d,-f*p+rD+WK!eds"
-            )
-        }
-        if (jawgKey != null) {
-            resValue("string", "jawg_key", jawgKey)
-        }
-        var arcgisKey =
-            System.getenv("ARCGIS_API_KEY") ?: project.findProperty("ARCGIS_API_KEY")?.toString()
-        if (arcgisKey == null && project.hasProperty("ARCGIS_API_KEY_ENCRYPTED")) {
-            arcgisKey = decode(
-                project.findProperty("ARCGIS_API_KEY_ENCRYPTED").toString(),
-                "FmK.d,-f*p+rD+WK!eds"
-            )
-        }
-        if (arcgisKey != null) {
-            resValue("string", "arcgis_key", jawgKey)
-        }
        var chargepriceKey =
            System.getenv("CHARGEPRICE_API_KEY") ?: project.findProperty("CHARGEPRICE_API_KEY")
                ?.toString()
@@ -229,22 +196,6 @@ android {
    }
 }

-androidComponents {
-    beforeVariants { variantBuilder ->
-        if (variantBuilder.buildType == "releaseAutomotivePackageName"
-            && !variantBuilder.productFlavors.containsAll(
-                listOf(
-                    "automotive" to "automotive",
-                    "dependencies" to "foss"
-                )
-            )
-        ) {
-            // releaseAutomotivePackageName type is only needed for fossAutomotive
-            variantBuilder.enable = false
-        }
-    }
-}
-
 configurations {
    create("googleNormalImplementation") {}
    create("googleAutomotiveImplementation") {}
@@ -252,14 +203,10 @@ configurations {

 aboutLibraries {
    allowedLicenses = arrayOf(
-        "Apache-2.0", "mit", "BSD-2-Clause", "BSD-3-Clause", "EPL-1.0",
+        "Apache-2.0", "mit", "BSD-2-Clause",
        "asdkl",  // Android SDK
        "Dual OpenSSL and SSLeay License",  // Android NDK OpenSSL
-        "Google Maps Platform Terms of Service",  // Google Maps SDK
-        "provided without support or warranty",  // org.json
-        "Unicode/ICU License",  // icu4j
-        "Bouncy Castle Licence",  // bcprov
-        "CDDL + GPLv2 with classpath exception",  // javax.annotation-api
+        "Google Maps Platform Terms of Service"  // Google Maps SDK
    )
    strictMode = com.mikepenz.aboutlibraries.plugin.StrictMode.FAIL
 }
@@ -275,29 +222,29 @@ dependencies {
    val testGoogleImplementation by configurations

    implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlinVersion")
-    implementation("androidx.appcompat:appcompat:1.7.0")
-    implementation("androidx.core:core-ktx:1.13.1")
+    implementation("androidx.appcompat:appcompat:1.6.1")
+    implementation("androidx.core:core-ktx:1.12.0")
    implementation("androidx.core:core-splashscreen:1.0.1")
-    implementation("androidx.activity:activity-ktx:1.9.0")
-    implementation("androidx.fragment:fragment-ktx:1.7.1")
+    implementation("androidx.activity:activity-ktx:1.8.2")
+    implementation("androidx.fragment:fragment-ktx:1.6.2")
    implementation("androidx.cardview:cardview:1.0.0")
    implementation("androidx.preference:preference-ktx:1.2.1")
-    implementation("com.google.android.material:material:1.12.0")
+    implementation("com.google.android.material:material:1.11.0")
    implementation("androidx.constraintlayout:constraintlayout:2.1.4")
    implementation("androidx.recyclerview:recyclerview:1.3.2")
-    implementation("androidx.browser:browser:1.8.0")
+    implementation("androidx.browser:browser:1.7.0")
    implementation("androidx.swiperefreshlayout:swiperefreshlayout:1.1.0")
    implementation("androidx.security:security-crypto:1.1.0-alpha06")
    implementation("androidx.work:work-runtime-ktx:2.9.0")
    implementation("com.github.ev-map:CustomBottomSheetBehavior:e48f73ea7b")
    implementation("com.squareup.retrofit2:retrofit:2.9.0")
    implementation("com.squareup.retrofit2:converter-moshi:2.9.0")
-    implementation("com.squareup.okhttp3:okhttp:4.12.0")
-    implementation("com.squareup.okhttp3:okhttp-urlconnection:4.12.0")
+    implementation("com.squareup.okhttp3:okhttp:4.11.0")
+    implementation("com.squareup.okhttp3:okhttp-urlconnection:4.11.0")
    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:2.6.0")
+    implementation("io.coil-kt:coil:2.4.0")
    implementation("com.github.ev-map:StfalconImageViewer:5082ebd392")
    implementation("com.mikepenz:aboutlibraries-core:$aboutLibsVersion")
    implementation("com.mikepenz:aboutlibraries:$aboutLibsVersion")
@@ -306,29 +253,39 @@ dependencies {
    implementation("com.google.guava:guava:29.0-android")
    implementation("com.github.pengrad:mapscaleview:1.6.0")
    implementation("com.github.romandanylyk:PageIndicatorView:b1bad589b5")
-    implementation("com.github.erfansn:locale-config-x:1.0.1")

    // Android Auto
-    val carAppVersion = "1.4.0"
+    val carAppVersion = "1.4.0-rc02"
    implementation("androidx.car.app:app:$carAppVersion")
    normalImplementation("androidx.car.app:app-projected:$carAppVersion")
    automotiveImplementation("androidx.car.app:app-automotive:$carAppVersion")

    // AnyMaps
-    val anyMapsVersion = "1174ef9375"
+    val anyMapsVersion = "4854581f72"
    implementation("com.github.ev-map.AnyMaps:anymaps-base:$anyMapsVersion")
    googleImplementation("com.github.ev-map.AnyMaps:anymaps-google:$anyMapsVersion")
-    googleImplementation("com.google.android.gms:play-services-maps:19.0.0")
-    implementation("com.github.ev-map.AnyMaps:anymaps-maplibre:$anyMapsVersion") {
-        // duplicates classes from mapbox-sdk-services
-        exclude("org.maplibre.gl", "android-sdk-geojson")
+    googleImplementation("com.google.android.gms:play-services-maps:18.2.0")
+    implementation("com.github.ev-map.AnyMaps:anymaps-mapbox:$anyMapsVersion") {
+        exclude(group = "com.mapbox.mapboxsdk", module = "mapbox-android-accounts")
+        exclude(group = "com.mapbox.mapboxsdk", module = "mapbox-android-telemetry")
+        exclude(group = "com.google.android.gms", module = "play-services-location")
+        exclude(group = "com.mapbox.mapboxsdk", module = "mapbox-android-core")
    }
-    implementation("org.maplibre.gl:android-sdk:10.3.3") {
-        exclude("org.maplibre.gl", "android-sdk-geojson")
+    // original version of mapbox-android-core
+    googleImplementation("com.mapbox.mapboxsdk:mapbox-android-core:2.0.1")
+    // patched version that removes build-time dependency on GMS (-> no Google location services)
+    fossImplementation("com.github.ev-map:mapbox-events-android:a21c324501")
+
+    implementation("com.mapbox.mapboxsdk:mapbox-android-sdk") {
+        exclude(group = "com.mapbox.mapboxsdk", module = "mapbox-android-accounts")
+        exclude(group = "com.mapbox.mapboxsdk", module = "mapbox-android-telemetry")
+        version {
+            strictly("9.1.0-SNAPSHOT")
+        }
    }

    // Google Places
-    googleImplementation("com.google.android.libraries.places:places:3.5.0")
+    googleImplementation("com.google.android.libraries.places:places:3.3.0")
    googleImplementation("org.jetbrains.kotlinx:kotlinx-coroutines-play-services:1.7.3")

    // Mapbox Geocoding
@@ -339,7 +296,7 @@ dependencies {
    implementation("androidx.navigation:navigation-ui-ktx:$navVersion")

    // viewmodel library
-    val lifecycle_version = "2.8.1"
+    val lifecycle_version = "2.6.2"
    implementation("androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycle_version")
    implementation("androidx.lifecycle:lifecycle-livedata-ktx:$lifecycle_version")

@@ -348,10 +305,13 @@ dependencies {
    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.3.0")
+    implementation("com.github.anboralabs:spatia-room:0.2.9") {
+        exclude(group = "com.github.dalgarins", module = "android-spatialite")
+    }
+    implementation("com.github.EV-map:android-spatialite:e5495c83ad")  // version with minSdk increased to 21 & FORTIFY_SOURCE enabled

    // billing library
-    val billing_version = "7.0.0"
+    val billing_version = "6.1.0"
    googleImplementation("com.android.billingclient:billing:$billing_version")
    googleImplementation("com.android.billingclient:billing-ktx:$billing_version")

@@ -365,23 +325,25 @@ dependencies {
    debugImplementation("com.facebook.flipper:flipper:0.238.0")
    debugImplementation("com.facebook.soloader:soloader:0.10.5")
    debugImplementation("com.facebook.flipper:flipper-network-plugin:0.238.0")
-    debugImplementation("com.jakewharton.timber:timber:5.0.1")
-    debugImplementation("com.squareup.leakcanary:leakcanary-android:2.14")
+    debugImplementation("androidx.test.espresso:espresso-idling-resource:3.5.1")

    // testing
    testImplementation("junit:junit:4.13.2")
-    testImplementation("com.squareup.okhttp3:mockwebserver:4.12.0")
+    testImplementation("com.squareup.okhttp3:mockwebserver:4.11.0")
    //noinspection GradleDependency
    testImplementation("org.json:json:20080701")
    testImplementation("org.robolectric:robolectric:4.11.1")
    testImplementation("androidx.test:core:1.5.0")
    testImplementation("androidx.arch.core:core-testing:2.2.0")
    testImplementation("androidx.car.app:app-testing:$carAppVersion")
-    testImplementation("androidx.test:core:1.5.0")

    androidTestImplementation("androidx.test.ext:junit:1.1.5")
+    androidTestImplementation("androidx.test.uiautomator:uiautomator:2.2.0")
    androidTestImplementation("androidx.test.espresso:espresso-core:3.5.1")
+    androidTestImplementation("androidx.test.espresso:espresso-contrib:3.5.1")
+    androidTestImplementation("androidx.test:rules:1.5.0")
    androidTestImplementation("androidx.arch.core:core-testing:2.2.0")
+    androidTestImplementation("tools.fastlane:screengrab:2.1.1")

    kapt("com.squareup.moshi:moshi-kotlin-codegen:1.15.0")

--- a/app/src/androidTest/java/net/vonforst/evmap/screenshot/DataBindingIdlingResource.kt
+++ b/app/src/androidTest/java/net/vonforst/evmap/screenshot/DataBindingIdlingResource.kt
@@ -0,0 +1,112 @@
+/*
+ * Copyright (C) 2019 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package net.vonforst.evmap.screenshot
+
+import android.view.View
+import androidx.databinding.DataBindingUtil
+import androidx.databinding.ViewDataBinding
+import androidx.fragment.app.FragmentActivity
+import androidx.test.core.app.ActivityScenario
+import androidx.test.espresso.IdlingResource
+import androidx.test.ext.junit.rules.ActivityScenarioRule
+import java.util.UUID
+
+/**
+ * An espresso idling resource implementation that reports idle status for all data binding
+ * layouts. Data Binding uses a mechanism to post messages which Espresso doesn't track yet.
+ *
+ * Since this application only uses fragments, the resource only checks the fragments and their
+ * children instead of the whole view tree.
+ *
+ * Tracking bug: https://github.com/android/android-test/issues/317
+ */
+class DataBindingIdlingResource(
+    activityScenarioRule: ActivityScenarioRule<out FragmentActivity>
+) : IdlingResource {
+    // list of registered callbacks
+    private val idlingCallbacks = mutableListOf<IdlingResource.ResourceCallback>()
+
+    // give it a unique id to workaround an espresso bug where you cannot register/unregister
+    // an idling resource w/ the same name.
+    private val id = UUID.randomUUID().toString()
+
+    // holds whether isIdle is called and the result was false. We track this to avoid calling
+    // onTransitionToIdle callbacks if Espresso never thought we were idle in the first place.
+    private var wasNotIdle = false
+
+    lateinit var activity: FragmentActivity
+
+    override fun getName() = "DataBinding $id"
+
+    init {
+        monitorActivity(activityScenarioRule.scenario)
+    }
+
+    override fun isIdleNow(): Boolean {
+        val idle = !getBindings().any { it.hasPendingBindings() }
+        @Suppress("LiftReturnOrAssignment")
+        if (idle) {
+            if (wasNotIdle) {
+                // notify observers to avoid espresso race detector
+                idlingCallbacks.forEach { it.onTransitionToIdle() }
+            }
+            wasNotIdle = false
+        } else {
+            wasNotIdle = true
+            // check next frame
+            activity.findViewById<View>(android.R.id.content).postDelayed({
+                isIdleNow
+            }, 16)
+        }
+        return idle
+    }
+
+    override fun registerIdleTransitionCallback(callback: IdlingResource.ResourceCallback) {
+        idlingCallbacks.add(callback)
+    }
+
+    /**
+     * Sets the activity from an [ActivityScenario] to be used from [DataBindingIdlingResource].
+     */
+    private fun monitorActivity(
+        activityScenario: ActivityScenario<out FragmentActivity>
+    ) {
+        activityScenario.onActivity {
+            this.activity = it
+        }
+    }
+
+    /**
+     * Find all binding classes in all currently available fragments.
+     */
+    private fun getBindings(): List<ViewDataBinding> {
+        val fragments = (activity as? FragmentActivity)
+            ?.supportFragmentManager
+            ?.fragments
+
+        val bindings =
+            fragments?.mapNotNull {
+                it.view?.getBinding()
+            } ?: emptyList()
+        val childrenBindings = fragments?.flatMap { it.childFragmentManager.fragments }
+            ?.mapNotNull { it.view?.getBinding() } ?: emptyList()
+
+        return bindings + childrenBindings
+    }
+}
+
+private fun View.getBinding(): ViewDataBinding? = DataBindingUtil.getBinding(this)
--- a/app/src/androidTest/java/net/vonforst/evmap/screenshot/ScreenshotTest.kt
+++ b/app/src/androidTest/java/net/vonforst/evmap/screenshot/ScreenshotTest.kt
@@ -0,0 +1,155 @@
+package net.vonforst.evmap.screenshot
+
+import android.Manifest.permission.ACCESS_FINE_LOCATION
+import android.content.Intent
+import androidx.test.espresso.Espresso.onView
+import androidx.test.espresso.IdlingRegistry
+import androidx.test.espresso.action.ViewActions.click
+import androidx.test.espresso.action.ViewActions.pressBack
+import androidx.test.espresso.contrib.DrawerActions
+import androidx.test.espresso.contrib.NavigationViewActions
+import androidx.test.espresso.matcher.ViewMatchers.isRoot
+import androidx.test.espresso.matcher.ViewMatchers.withId
+import androidx.test.espresso.matcher.ViewMatchers.withText
+import androidx.test.ext.junit.rules.ActivityScenarioRule
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import androidx.test.platform.app.InstrumentationRegistry
+import androidx.test.rule.GrantPermissionRule
+import androidx.test.rule.GrantPermissionRule.grant
+import kotlinx.coroutines.runBlocking
+import net.vonforst.evmap.EXTRA_CHARGER_ID
+import net.vonforst.evmap.EXTRA_LAT
+import net.vonforst.evmap.EXTRA_LON
+import net.vonforst.evmap.EspressoIdlingResource
+import net.vonforst.evmap.MapsActivity
+import net.vonforst.evmap.R
+import net.vonforst.evmap.api.goingelectric.GEReferenceData
+import net.vonforst.evmap.api.goingelectric.GoingElectricApiWrapper
+import net.vonforst.evmap.model.Favorite
+import net.vonforst.evmap.storage.AppDatabase
+import net.vonforst.evmap.storage.PreferenceDataSource
+import org.junit.Before
+import org.junit.BeforeClass
+import org.junit.Rule
+import org.junit.Test
+import org.junit.runner.RunWith
+import tools.fastlane.screengrab.Screengrab
+import tools.fastlane.screengrab.locale.LocaleTestRule
+import java.time.Instant
+
+
+@RunWith(AndroidJUnit4::class)
+class ScreenshotTest {
+    companion object {
+        @JvmStatic
+        @BeforeClass
+        fun beforeAll() {
+            IdlingRegistry.getInstance().register(EspressoIdlingResource.countingIdlingResource)
+
+            Screengrab.setDefaultScreenshotStrategy { screenshotName, screenshotCallback ->
+                screenshotCallback.screenshotCaptured(
+                    screenshotName,
+                    androidx.test.core.app.takeScreenshot()
+                )
+            }
+
+            val context = InstrumentationRegistry.getInstrumentation().targetContext
+            val prefs = PreferenceDataSource(context)
+            prefs.dataSourceSet = true
+            prefs.welcomeDialogShown = true
+            prefs.privacyAccepted = true
+            prefs.opensourceDonationsDialogLastShown = Instant.now()
+            prefs.chargepriceMyVehicles = setOf("b58bc94d-d929-ad71-d95b-08b877bf76ba")
+            prefs.appStartCounter = 0
+            prefs.mapProvider = "google"
+
+            // insert favorites
+            val db = AppDatabase.getInstance(context)
+            val api = GoingElectricApiWrapper(
+                context.getString(R.string.goingelectric_key),
+                context = context
+            )
+            val ids = listOf(70774L to true, 40315L to true, 65330L to true, 62489L to false)
+            runBlocking {
+                val refData = api.getReferenceData().data as GEReferenceData
+                ids.forEachIndexed { i, (id, favorite) ->
+                    val detail = api.getChargepointDetail(refData, id).data!!
+                    db.chargeLocationsDao().insert(detail)
+                    if (db.favoritesDao().findFavorite(id, "goingelectric") == null && favorite) {
+                        db.favoritesDao().insert(
+                            Favorite(
+                                chargerId = id,
+                                chargerDataSource = "goingelectric"
+                            )
+                        )
+                    }
+                }
+            }
+        }
+    }
+
+    @get:Rule
+    val localeTestRule = LocaleTestRule()
+
+    @get:Rule
+    val activityRule: ActivityScenarioRule<MapsActivity> = ActivityScenarioRule(
+        Intent(
+            InstrumentationRegistry.getInstrumentation().targetContext,
+            MapsActivity::class.java
+        ).apply {
+            putExtra(EXTRA_CHARGER_ID, 62489L)
+            putExtra(EXTRA_LAT, 53.099512)
+            putExtra(EXTRA_LON, 9.981884)
+        })
+
+    @get:Rule
+    val permissionRule: GrantPermissionRule = grant(ACCESS_FINE_LOCATION)
+
+    @Before
+    fun setUp() {
+        IdlingRegistry.getInstance().register(DataBindingIdlingResource(activityRule))
+    }
+
+    @Test
+    fun testTakeScreenshot() {
+        Thread.sleep(15000L)
+        Screengrab.screenshot("01_map_google")
+
+        onView(withId(R.id.topPart)).perform(click())
+
+        Thread.sleep(1000L)
+        Screengrab.screenshot("02_detail")
+
+        onView(withId(R.id.btnChargeprice)).perform(click())
+        Thread.sleep(5000L)
+        Screengrab.screenshot("03_prices")
+
+        onView(isRoot()).perform(pressBack())
+        Thread.sleep(500L)
+        onView(isRoot()).perform(pressBack())
+
+        Thread.sleep(2000L)
+
+        onView(withId(R.id.menu_filter)).perform(click())
+        Thread.sleep(1000L)
+        onView(withText(R.string.menu_edit_filters)).perform(click())
+
+        Thread.sleep(1000L)
+
+        Screengrab.screenshot("05_filters")
+        onView(isRoot()).perform(pressBack())
+
+        onView(withId(R.id.drawer_layout)).perform(DrawerActions.open())
+        onView(withId(R.id.nav_view)).perform(NavigationViewActions.navigateTo(R.id.favs))
+
+        Thread.sleep(10000L)
+        Screengrab.screenshot("04_favorites")
+
+        val context = InstrumentationRegistry.getInstrumentation().targetContext
+        PreferenceDataSource(context).mapProvider = "mapbox"
+        onView(isRoot()).perform(pressBack())
+
+        Thread.sleep(5000L)
+        Screengrab.screenshot("01_map_mapbox")
+    }
+}
--- a/app/src/androidTest/java/net/vonforst/evmap/storage/SavedRegionDaoTest.kt
+++ b/app/src/androidTest/java/net/vonforst/evmap/storage/SavedRegionDaoTest.kt
@@ -1,4 +1,4 @@
-package com.johan.evmap.storage
+package net.vonforst.evmap.storage

 import android.content.Context
 import androidx.arch.core.executor.testing.InstantTaskExecutorRule
--- a/app/src/automotive/java/net/vonforst/evmap/auto/CarInfo.kt
+++ b/app/src/automotive/java/net/vonforst/evmap/auto/CarInfo.kt
@@ -1,171 +0,0 @@
-import android.car.Car
-import android.car.VehiclePropertyIds
-import android.car.VehicleUnit
-import android.car.hardware.CarPropertyValue
-import android.car.hardware.property.CarPropertyManager
-import android.car.hardware.property.CarPropertyManager.CarPropertyEventCallback
-import androidx.annotation.OptIn
-import androidx.car.app.CarContext
-import androidx.car.app.annotations.ExperimentalCarApi
-import androidx.car.app.hardware.CarHardwareManager
-import androidx.car.app.hardware.common.CarUnit
-import androidx.car.app.hardware.common.CarValue
-import androidx.car.app.hardware.common.OnCarDataAvailableListener
-import androidx.car.app.hardware.info.CarInfo
-import androidx.car.app.hardware.info.EnergyLevel
-import androidx.car.app.hardware.info.EnergyProfile
-import androidx.car.app.hardware.info.EvStatus
-import androidx.car.app.hardware.info.Mileage
-import androidx.car.app.hardware.info.Model
-import androidx.car.app.hardware.info.Speed
-import androidx.car.app.hardware.info.TollCard
-import java.util.concurrent.Executor
-
-
-val CarContext.patchedCarInfo: CarInfo
-    get() = CarInfoWrapper(this)
-
-class CarInfoWrapper(ctx: CarContext) : CarInfo {
-    private val wrapped =
-        (ctx.getCarService(CarContext.HARDWARE_SERVICE) as CarHardwareManager).carInfo
-    private val carPropertyManager = try {
-        val car = Car.createCar(ctx)
-        car.getCarManager(Car.PROPERTY_SERVICE) as CarPropertyManager
-    } catch (e: NoClassDefFoundError) {
-        null
-    }
-    private val callbacks = mutableMapOf<OnCarDataAvailableListener<*>, CarPropertyEventCallback>()
-
-    override fun fetchModel(executor: Executor, listener: OnCarDataAvailableListener<Model>) =
-        wrapped.fetchModel(executor, listener)
-
-    override fun fetchEnergyProfile(
-        executor: Executor,
-        listener: OnCarDataAvailableListener<EnergyProfile>
-    ) = wrapped.fetchEnergyProfile(executor, listener)
-
-    override fun addTollListener(
-        executor: Executor,
-        listener: OnCarDataAvailableListener<TollCard>
-    ) = wrapped.addTollListener(executor, listener)
-
-    override fun removeTollListener(listener: OnCarDataAvailableListener<TollCard>) =
-        wrapped.removeTollListener(listener)
-
-    override fun addEnergyLevelListener(
-        executor: Executor,
-        listener: OnCarDataAvailableListener<EnergyLevel>
-    ) = wrapped.addEnergyLevelListener(executor, listener)
-
-    override fun removeEnergyLevelListener(listener: OnCarDataAvailableListener<EnergyLevel>) =
-        wrapped.removeEnergyLevelListener(listener)
-
-    override fun addSpeedListener(executor: Executor, listener: OnCarDataAvailableListener<Speed>) {
-        // TODO: This is a emporary workaround until Car App Library 1.7.0 is released - previous versions would crash if the car reported an invalid speed display unit
-        carPropertyManager ?: return
-        val callback = object : CarPropertyEventCallback {
-            private var speedRaw: CarPropertyValue<Float>? = null
-            private var speedDisplay: CarPropertyValue<Float>? = null
-            private var speedUnit: CarPropertyValue<Int>? = null
-
-            override fun onChangeEvent(value: CarPropertyValue<*>?) {
-                when (value?.propertyId) {
-                    VehiclePropertyIds.PERF_VEHICLE_SPEED -> speedRaw =
-                        value as CarPropertyValue<Float>?
-
-                    VehiclePropertyIds.PERF_VEHICLE_SPEED_DISPLAY -> speedDisplay =
-                        value as CarPropertyValue<Float>?
-
-                    VehiclePropertyIds.VEHICLE_SPEED_DISPLAY_UNITS -> speedUnit =
-                        value as CarPropertyValue<Int>?
-                }
-
-                executor.execute {
-                    listener.onCarDataAvailable(Speed.Builder().apply {
-                        speedRaw?.let {
-                            setRawSpeedMetersPerSecond(
-                                CarValue(
-                                    it.value,
-                                    it.timestamp,
-                                    if (it.value != null) CarValue.STATUS_SUCCESS else CarValue.STATUS_UNKNOWN
-                                )
-                            )
-                        }
-                        speedDisplay?.let {
-                            setDisplaySpeedMetersPerSecond(
-                                CarValue(
-                                    it.value,
-                                    it.timestamp,
-                                    if (it.value != null) CarValue.STATUS_SUCCESS else CarValue.STATUS_UNKNOWN
-                                )
-                            )
-                        }
-                        speedUnit?.let {
-                            val unit = when (it.value) {
-                                VehicleUnit.METER_PER_SEC -> CarUnit.METERS_PER_SEC
-                                VehicleUnit.MILES_PER_HOUR -> CarUnit.MILES_PER_HOUR
-                                VehicleUnit.KILOMETERS_PER_HOUR -> CarUnit.KILOMETERS_PER_HOUR
-                                else -> null
-                            }
-                            setSpeedDisplayUnit(
-                                CarValue(
-                                    unit,
-                                    it.timestamp,
-                                    if (unit != null) CarValue.STATUS_SUCCESS else CarValue.STATUS_UNKNOWN
-                                )
-                            )
-                        }
-                    }.build())
-                }
-            }
-
-            override fun onErrorEvent(propertyId: Int, areaId: Int) {
-                listener.onCarDataAvailable(
-                    Speed.Builder()
-                        .setRawSpeedMetersPerSecond(CarValue(null, 0, CarValue.STATUS_UNKNOWN))
-                        .setDisplaySpeedMetersPerSecond(CarValue(null, 0, CarValue.STATUS_UNKNOWN))
-                        .setSpeedDisplayUnit(CarValue(null, 0, CarValue.STATUS_UNKNOWN))
-                        .build()
-                )
-            }
-        }
-        carPropertyManager.registerCallback(
-            callback,
-            VehiclePropertyIds.PERF_VEHICLE_SPEED,
-            CarPropertyManager.SENSOR_RATE_NORMAL
-        )
-        carPropertyManager.registerCallback(
-            callback,
-            VehiclePropertyIds.PERF_VEHICLE_SPEED_DISPLAY,
-            CarPropertyManager.SENSOR_RATE_NORMAL
-        )
-        carPropertyManager.registerCallback(
-            callback,
-            VehiclePropertyIds.VEHICLE_SPEED_DISPLAY_UNITS,
-            CarPropertyManager.SENSOR_RATE_NORMAL
-        )
-    }
-
-    override fun removeSpeedListener(listener: OnCarDataAvailableListener<Speed>) {
-        val callback = callbacks[listener] ?: return
-        carPropertyManager?.unregisterCallback(callback)
-    }
-
-    override fun addMileageListener(
-        executor: Executor,
-        listener: OnCarDataAvailableListener<Mileage>
-    ) = wrapped.addMileageListener(executor, listener)
-
-    override fun removeMileageListener(listener: OnCarDataAvailableListener<Mileage>) =
-        wrapped.removeMileageListener(listener)
-
-    @OptIn(ExperimentalCarApi::class)
-    override fun addEvStatusListener(
-        executor: Executor,
-        listener: OnCarDataAvailableListener<EvStatus>
-    ) = wrapped.addEvStatusListener(executor, listener)
-
-    @OptIn(ExperimentalCarApi::class)
-    override fun removeEvStatusListener(listener: OnCarDataAvailableListener<EvStatus>) =
-        wrapped.removeEvStatusListener(listener)
-}
--- a/app/src/automotive/res/values-nb-rNO/strings.xml
+++ b/app/src/automotive/res/values-nb-rNO/strings.xml
--- a/app/src/debug/AndroidManifest.xml
+++ b/app/src/debug/AndroidManifest.xml
@@ -1,5 +1,25 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+<manifest xmlns:tools="http://schemas.android.com/tools"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+    <!-- Permissions needed for fastlane screengrab -->
+
+    <!-- Allows unlocking your device and activating its screen so UI tests can succeed -->
+    <uses-permission android:name="android.permission.DISABLE_KEYGUARD" />
+    <uses-permission android:name="android.permission.WAKE_LOCK" />
+
+    <!-- Allows for storing and retrieving screenshots -->
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
+
+    <!-- Allows changing locales -->
+    <uses-permission
+        android:name="android.permission.CHANGE_CONFIGURATION"
+        tools:ignore="ProtectedPermissions" />
+
+    <!-- Allows changing SystemUI demo mode -->
+    <uses-permission
+        android:name="android.permission.DUMP"
+        tools:ignore="ProtectedPermissions" />

    <application>
        <activity
--- a/app/src/debug/java/net/vonforst/evmap/DebugInits.kt
+++ b/app/src/debug/java/net/vonforst/evmap/DebugInits.kt
@@ -2,6 +2,8 @@ package net.vonforst.evmap

 import android.content.Context
 import android.os.Build
+import androidx.test.espresso.IdlingRegistry
+import androidx.test.espresso.idling.CountingIdlingResource
 import com.facebook.flipper.android.AndroidFlipperClient
 import com.facebook.flipper.plugins.databases.DatabasesFlipperPlugin
 import com.facebook.flipper.plugins.inspector.DescriptorMapping
@@ -11,7 +13,6 @@ import com.facebook.flipper.plugins.network.NetworkFlipperPlugin
 import com.facebook.flipper.plugins.sharedpreferences.SharedPreferencesFlipperPlugin
 import com.facebook.soloader.SoLoader
 import okhttp3.OkHttpClient
-import timber.log.Timber

 private val networkFlipperPlugin = NetworkFlipperPlugin()

@@ -25,8 +26,6 @@ fun addDebugInterceptors(context: Context) {
    client.addPlugin(DatabasesFlipperPlugin(context))
    client.addPlugin(SharedPreferencesFlipperPlugin(context))
    client.start()
-
-    Timber.plant(Timber.DebugTree())
 }

 fun OkHttpClient.Builder.addDebugInterceptors(): OkHttpClient.Builder {
@@ -37,9 +36,29 @@ fun OkHttpClient.Builder.addDebugInterceptors(): OkHttpClient.Builder {
    } catch (e: ClassNotFoundException) {
        isRunningTest = false
    }
-    
+
    if (!isRunningTest) {
        this.addNetworkInterceptor(FlipperOkhttpInterceptor(networkFlipperPlugin))
    }
    return this
+}
+
+/**
+ * Contains a static reference to [IdlingResource], only available in the 'debug' build type.
+ */
+object EspressoIdlingResource {
+    private const val RESOURCE = "GLOBAL"
+
+    @JvmField
+    val countingIdlingResource = CountingIdlingResource(RESOURCE)
+
+    fun increment() {
+        countingIdlingResource.increment()
+    }
+
+    fun decrement() {
+        if (!countingIdlingResource.isIdleNow) {
+            countingIdlingResource.decrement()
+        }
+    }
 }
--- a/app/src/foss/java/net/vonforst/evmap/fragment/DonateFragment.kt
+++ b/app/src/foss/java/net/vonforst/evmap/fragment/DonateFragment.kt
@@ -5,6 +5,7 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import androidx.appcompat.app.AppCompatActivity
+import androidx.fragment.app.Fragment
 import androidx.navigation.fragment.findNavController
 import androidx.navigation.ui.setupWithNavController
 import com.google.android.material.transition.MaterialSharedAxis
@@ -42,7 +43,7 @@ class DonateFragment : DonateFragmentBase() {
        )

        binding.btnDonate.setOnClickListener {
-            (activity as? MapsActivity)?.openUrl(getString(R.string.paypal_link), binding.root)
+            (activity as? MapsActivity)?.openUrl(getString(R.string.paypal_link))
        }

        setupReferrals(referrals)
--- a/app/src/foss/res/values-cs/strings.xml
+++ b/app/src/foss/res/values-cs/strings.xml
@@ -2,5 +2,5 @@
 <resources>
    <string name="donations_info" formatted="false">Pomohla vám EVMap? Podpořte její vývoj zasláním finančního daru vývojáři.</string>
    <string name="donate_paypal">Přispět pomocí PayPalu</string>
-    <string name="data_sources_hint">Mapová data v aplikaci poskytuje služba OpenStreetMap.</string>
+    <string name="data_sources_hint">Mapová data v aplikaci poskytuje služba OpenStreetMap (Mapbox).</string>
 </resources>
--- a/app/src/foss/res/values-de/strings.xml
+++ b/app/src/foss/res/values-de/strings.xml
@@ -2,5 +2,5 @@
 <resources>
    <string name="donations_info" formatted="false">Findest du EVMap nützlich? Unterstütze die Weiterentwicklung der App mit einer Spende an den Entwickler.</string>
    <string name="donate_paypal">Mit PayPal spenden</string>
-    <string name="data_sources_hint">Die Kartendaten für die App stammen von OpenStreetMap.</string>
+    <string name="data_sources_hint">Die Kartendaten für die App stammen von OpenStreetMap (Mapbox).</string>
 </resources>
--- a/app/src/foss/res/values-fr/strings.xml
+++ b/app/src/foss/res/values-fr/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
    <string name="donations_info" formatted="false">Trouvez-vous EVMap utile \? Soutenez son développement en envoyant un don au développeur.</string>
-    <string name="data_sources_hint">Les données cartographiques de l\'application sont fournies par OpenStreetMap.</string>
+    <string name="data_sources_hint">Les données cartographiques de l\'application sont fournies par OpenStreetMap (Mapbox).</string>
    <string name="donate_paypal">Faire un don avec PayPal</string>
 </resources>
--- a/app/src/foss/res/values-nb-rNO/strings.xml
+++ b/app/src/foss/res/values-nb-rNO/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
    <string name="donate_paypal">Doner med PayPal</string>
-    <string name="data_sources_hint">Kartdata i programmet tilbys av OpenStreetMap.</string>
+    <string name="data_sources_hint">Kartdata i programmet tilbys av OpenStreetMap (Mapbox).</string>
    <string name="donations_info" formatted="false">Synes du EVMap er nyttig\? Støtt utviklingen ved å sende en slant til utvikleren.</string>
 </resources>
--- a/app/src/foss/res/values-nl/strings.xml
+++ b/app/src/foss/res/values-nl/strings.xml
@@ -2,5 +2,5 @@
 <resources>
    <string name="donations_info" formatted="false">Vond je EVMap nuttig\? Je kan de ontwikkeling ondersteunen door een donatie te sturen naar de ontwikkelaar.</string>
    <string name="donate_paypal">Doneer via PayPal</string>
-    <string name="data_sources_hint">De kaartgegevens zijn afkomstig van OpenStreetMap.</string>
+    <string name="data_sources_hint">De kaartgegevens zijn afkomstig van OpenStreetMap (Mapbox).</string>
 </resources>
--- a/app/src/foss/res/values-pt/strings.xml
+++ b/app/src/foss/res/values-pt/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="data_sources_hint">Os dados do mapa são fornecidos pelo OpenStreetMap.</string>
+    <string name="data_sources_hint">Os dados do mapa são fornecidos pelo OpenStreetMap (Mapbox).</string>
    <string name="donate_paypal">Doar com o PayPal</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.</string>
 </resources>
--- a/app/src/foss/res/values-ro/strings.xml
+++ b/app/src/foss/res/values-ro/strings.xml
@@ -2,5 +2,5 @@
 <resources>
    <string name="donations_info" formatted="false">Crezi ca EVMap este util? Sprijina dezvoltarea printr-o donatie pentru dezvoltator.</string>
    <string name="donate_paypal">Doneaza cu PayPal</string>
-    <string name="data_sources_hint">Hartile din aplicatie sunt furnizate de OpenStreetMap.</string>
+    <string name="data_sources_hint">Hartile din aplicatie sunt furnizate de OpenStreetMap (Mapbox).</string>
 </resources>
--- a/app/src/foss/res/values/strings.xml
+++ b/app/src/foss/res/values/strings.xml
@@ -2,5 +2,5 @@
 <resources>
    <string name="donations_info" formatted="false">Do you find EVMap useful? Support its development by sending a donation to the developer.</string>
    <string name="donate_paypal">Donate with PayPal</string>
-    <string name="data_sources_hint">Map data in the app is provided by OpenStreetMap.</string>
+    <string name="data_sources_hint">Map data in the app is provided by OpenStreetMap (Mapbox).</string>
 </resources>
--- a/app/src/google/res/values-cs/strings.xml
+++ b/app/src/google/res/values-cs/strings.xml
@@ -3,5 +3,5 @@
    <string name="donations_info" formatted="false">Pomohla vám EVMap? Podpořte její vývoj posláním finančního daru vývojáři.
 \n
 \nGoogle si z každého daru strhne 15 %.</string>
-    <string name="data_sources_hint">V nastavení můžete také pro mapová data přepínat mezi službami Mapy Google a OpenStreetMap.</string>
+    <string name="data_sources_hint">V nastavení můžete také pro mapová data přepínat mezi službami Mapy Google a OpenStreetMap (Mapbox).</string>
 </resources>
--- a/app/src/google/res/values-de/strings.xml
+++ b/app/src/google/res/values-de/strings.xml
@@ -1,5 +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="data_sources_hint">In den Einstellungen kannst du auch zwischen Google Maps und OpenStreetMap für die Kartendaten wechseln.</string>
+    <string name="data_sources_hint">In den Einstellungen kannst du auch zwischen Google Maps und OpenStreetMap (Mapbox) für die Kartendaten wechseln.</string>
 </resources>
--- a/app/src/google/res/values-fr/strings.xml
+++ b/app/src/google/res/values-fr/strings.xml
@@ -3,5 +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="data_sources_hint">Dans les paramètres, vous pouvez également choisir entre Google Maps et OpenStreetMap pour les données cartographiques.</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>
 </resources>
--- a/app/src/google/res/values-nb-rNO/strings.xml
+++ b/app/src/google/res/values-nb-rNO/strings.xml
@@ -3,5 +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="data_sources_hint">I innstillingene kan du også bytte mellom Google Maps og OpenStreetMap for kartdata.</string>
+    <string name="data_sources_hint">I innstillingene kan du også bytte mellom Google Maps og OpenStreetMap (Mapbox) for kartdata.</string>
 </resources>
--- a/app/src/google/res/values-nl/strings.xml
+++ b/app/src/google/res/values-nl/strings.xml
@@ -3,5 +3,5 @@
    <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="data_sources_hint">In de instellingen kan je ook wisselen tussen Google Maps en OpenStreetMap voor de kaartgegevens.</string>
+    <string name="data_sources_hint">In de instellingen kan je ook wisselen tussen Google Maps en OpenStreetMap (Mapbox) voor de kaartgegevens.</string>
 </resources>
--- a/app/src/google/res/values-pt/strings.xml
+++ b/app/src/google/res/values-pt/strings.xml
@@ -3,5 +3,5 @@
    <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="data_sources_hint">Também pode mudar entre o Google Maps e OpenStreetMap nas definições da app.</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/arrays.xml
+++ b/app/src/google/res/values/arrays.xml
@@ -2,7 +2,7 @@
 <resources>
    <string-array name="pref_map_provider_names">
        <item>@string/pref_provider_google_maps</item>
-        <item>@string/pref_provider_osm</item>
+        <item>@string/pref_provider_osm_mapbox</item>
    </string-array>
    <string-array name="pref_map_provider_values" translatable="false">
        <item>google</item>
--- a/app/src/google/res/values/strings.xml
+++ b/app/src/google/res/values/strings.xml
@@ -1,5 +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="data_sources_hint">In the settings you can also switch between Google Maps and OpenStreetMap for the map data.</string>
+    <string name="data_sources_hint">In the settings you can also switch between Google Maps and OpenStreetMap (Mapbox) for the map data.</string>
 </resources>
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -47,14 +47,6 @@
            android:name="com.mapbox.ACCESS_TOKEN"
            android:value="@string/mapbox_key" />

-        <meta-data
-            android:name="io.jawg.ACCESS_TOKEN"
-            android:value="@string/jawg_key" />
-
-        <meta-data
-            android:name="com.arcgis.ACCESS_TOKEN"
-            android:value="@string/arcgis_key" />
-
        <activity
            android:name=".MapsActivity"
            android:label="@string/app_name"
@@ -347,8 +339,9 @@
            android:exported="true"
            android:foregroundServiceType="location">
            <intent-filter>
-                <action android:name="androidx.car.app.CarAppService" />
-                <category android:name="androidx.car.app.category.POI" />
+                <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" />
--- a/app/src/main/java/net/vonforst/evmap/EvMapApplication.kt
+++ b/app/src/main/java/net/vonforst/evmap/EvMapApplication.kt
@@ -3,11 +3,7 @@ package net.vonforst.evmap
 import android.app.Activity
 import android.app.Application
 import android.os.Build
-import androidx.work.Configuration
-import androidx.work.Constraints
-import androidx.work.ExistingPeriodicWorkPolicy
-import androidx.work.PeriodicWorkRequestBuilder
-import androidx.work.WorkManager
+import androidx.work.*
 import net.vonforst.evmap.storage.CleanupCacheWorker
 import net.vonforst.evmap.storage.PreferenceDataSource
 import net.vonforst.evmap.ui.updateAppLocale
@@ -28,7 +24,7 @@ class EvMapApplication : Application(), Configuration.Provider {

        // Convert to new AppCompat storage for app language
        val lang = prefs.language
-        if (lang != null) {
+        if (lang != null && lang !in listOf("", "default")) {
            updateAppLocale(lang)
            prefs.language = null
        }
--- a/app/src/main/java/net/vonforst/evmap/MapsActivity.kt
+++ b/app/src/main/java/net/vonforst/evmap/MapsActivity.kt
@@ -1,5 +1,6 @@
 package net.vonforst.evmap

+import android.app.ActivityOptions
 import android.app.PendingIntent
 import android.content.ActivityNotFoundException
 import android.content.Intent
@@ -44,11 +45,14 @@ const val EXTRA_DONATE = "donate"

 class MapsActivity : AppCompatActivity(),
    PreferenceFragmentCompat.OnPreferenceStartFragmentCallback {
+    interface FragmentCallback {
+        fun getRootView(): View
+    }

    private var reenterState: Bundle? = null
    private lateinit var navController: NavController
-    private lateinit var navHostFragment: NavHostFragment
    lateinit var appBarConfiguration: AppBarConfiguration
+    var fragmentCallback: FragmentCallback? = null
    private lateinit var prefs: PreferenceDataSource

    override fun onCreate(savedInstanceState: Bundle?) {
@@ -57,7 +61,6 @@ class MapsActivity : AppCompatActivity(),

        setContentView(R.layout.activity_maps)

-        val drawerLayout = findViewById<DrawerLayout>(R.id.drawer_layout)
        appBarConfiguration = AppBarConfiguration(
            setOf(
                R.id.map,
@@ -65,9 +68,9 @@ class MapsActivity : AppCompatActivity(),
                R.id.about,
                R.id.settings
            ),
-            drawerLayout
+            findViewById<DrawerLayout>(R.id.drawer_layout)
        )
-        navHostFragment =
+        val navHostFragment =
            supportFragmentManager.findFragmentById(R.id.nav_host_fragment) as NavHostFragment
        navController = navHostFragment.navController
        val navGraph = navController.navInflater.inflate(R.navigation.nav_graph)
@@ -85,17 +88,6 @@ class MapsActivity : AppCompatActivity(),

        checkPlayServices(this)

-        navController.setGraph(navGraph, MapFragmentArgs(appStart = true).toBundle())
-        var deepLink: PendingIntent? = null
-
-        navController.addOnDestinationChangedListener { _, destination, _ ->
-            if (destination.id == R.id.onboarding) {
-                drawerLayout.setDrawerLockMode(DrawerLayout.LOCK_MODE_LOCKED_CLOSED)
-            } else {
-                drawerLayout.setDrawerLockMode(DrawerLayout.LOCK_MODE_UNLOCKED)
-            }
-        }
-
        if (!prefs.welcomeDialogShown || !prefs.dataSourceSet) {
            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
                // wait for splash screen animation to finish on first start
@@ -113,104 +105,110 @@ class MapsActivity : AppCompatActivity(),
                    }
                })
            }
-        } else if (intent?.scheme == "geo") {
-            val query = intent.data?.query?.split("=")?.get(1)
-            val coords = getLocationFromIntent(intent)
+            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())
+            var deepLink: PendingIntent? = null

-            if (coords != null) {
-                val lat = coords[0]
-                val lon = coords[1]
-                deepLink = navController.createDeepLink()
-                    .setGraph(R.navigation.nav_graph)
-                    .setDestination(R.id.map)
-                    .setArguments(MapFragmentArgs(latLng = LatLng(lat, lon)).toBundle())
-                    .createPendingIntent()
-            } else if (!query.isNullOrEmpty()) {
-                deepLink = navController.createDeepLink()
-                    .setGraph(R.navigation.nav_graph)
-                    .setDestination(R.id.map)
-                    .setArguments(MapFragmentArgs(locationName = query).toBundle())
-                    .createPendingIntent()
-            }
-        } else if (intent?.scheme == "https" && intent?.data?.host == "www.goingelectric.de") {
-            val id = intent.data?.pathSegments?.lastOrNull()?.toLongOrNull()
-            if (id != null) {
-                if (prefs.dataSource != "goingelectric") {
-                    prefs.dataSource = "goingelectric"
-                    Toast.makeText(
-                        this,
-                        getString(
-                            R.string.data_source_switched_to,
-                            getString(R.string.data_source_goingelectric)
-                        ),
-                        Toast.LENGTH_LONG
-                    ).show()
+            if (intent?.scheme == "geo") {
+                val query = intent.data?.query?.split("=")?.get(1)
+                val coords = getLocationFromIntent(intent)
+
+                if (coords != null) {
+                    val lat = coords[0]
+                    val lon = coords[1]
+                    deepLink = navController.createDeepLink()
+                        .setGraph(R.navigation.nav_graph)
+                        .setDestination(R.id.map)
+                        .setArguments(MapFragmentArgs(latLng = LatLng(lat, lon)).toBundle())
+                        .createPendingIntent()
+                } else if (!query.isNullOrEmpty()) {
+                    deepLink = navController.createDeepLink()
+                        .setGraph(R.navigation.nav_graph)
+                        .setDestination(R.id.map)
+                        .setArguments(MapFragmentArgs(locationName = query).toBundle())
+                        .createPendingIntent()
                }
-                deepLink = navController.createDeepLink()
-                    .setGraph(R.navigation.nav_graph)
-                    .setDestination(R.id.map)
-                    .setArguments(MapFragmentArgs(chargerId = id).toBundle())
-                    .createPendingIntent()
-            }
-        } else if (intent?.scheme == "https" && intent?.data?.host in listOf(
-                "openchargemap.org",
-                "map.openchargemap.io"
-            )
-        ) {
-            val id = when (intent.data?.host) {
-                "openchargemap.org" -> intent.data?.pathSegments?.lastOrNull()?.toLongOrNull()
-                "map.openchargemap.io" -> intent.data?.getQueryParameter("id")?.toLongOrNull()
-                else -> null
-            }
-            if (id != null) {
-                if (prefs.dataSource != "openchargemap") {
-                    prefs.dataSource = "openchargemap"
-                    Toast.makeText(
-                        this,
-                        getString(
-                            R.string.data_source_switched_to,
-                            getString(R.string.data_source_openchargemap)
-                        ),
-                        Toast.LENGTH_LONG
-                    ).show()
+            } else if (intent?.scheme == "https" && intent?.data?.host == "www.goingelectric.de") {
+                val id = intent.data?.pathSegments?.last()?.toLongOrNull()
+                if (id != null) {
+                    if (prefs.dataSource != "goingelectric") {
+                        prefs.dataSource = "goingelectric"
+                        Toast.makeText(
+                            this,
+                            getString(
+                                R.string.data_source_switched_to,
+                                getString(R.string.data_source_goingelectric)
+                            ),
+                            Toast.LENGTH_LONG
+                        ).show()
+                    }
+                    deepLink = navController.createDeepLink()
+                        .setGraph(R.navigation.nav_graph)
+                        .setDestination(R.id.map)
+                        .setArguments(MapFragmentArgs(chargerId = id).toBundle())
+                        .createPendingIntent()
                }
-                deepLink = navController.createDeepLink()
-                    .setGraph(R.navigation.nav_graph)
-                    .setDestination(R.id.map)
-                    .setArguments(MapFragmentArgs(chargerId = id).toBundle())
-                    .createPendingIntent()
-            }
-        } else if (intent.scheme == "net.vonforst.evmap") {
-            intent.data?.let {
-                if (it.host == "find_charger") {
-                    val lat = it.getQueryParameter("latitude")?.toDouble()
-                    val lon = it.getQueryParameter("longitude")?.toDouble()
-                    val name = it.getQueryParameter("name")
-                    if (lat != null && lon != null) {
-                        deepLink = navController.createDeepLink()
-                            .setGraph(R.navigation.nav_graph)
-                            .setDestination(R.id.map)
-                            .setArguments(
-                                MapFragmentArgs(
-                                    latLng = LatLng(lat, lon),
-                                    locationName = name
-                                ).toBundle()
-                            )
-                            .createPendingIntent()
-                    } else if (name != null) {
-                        deepLink = navController.createDeepLink()
-                            .setGraph(R.navigation.nav_graph)
-                            .setDestination(R.id.map)
-                            .setArguments(MapFragmentArgs(locationName = name).toBundle())
-                            .createPendingIntent()
+            } else if (intent?.scheme == "https" && intent?.data?.host in listOf("openchargemap.org", "map.openchargemap.io")) {
+                val id = when (intent.data?.host) {
+                    "openchargemap.org" -> intent.data?.pathSegments?.last()?.toLongOrNull()
+                    "map.openchargemap.io" -> intent.data?.getQueryParameter("id")?.toLongOrNull()
+                    else -> null
+                }
+                if (id != null) {
+                    if (prefs.dataSource != "openchargemap") {
+                        prefs.dataSource = "openchargemap"
+                        Toast.makeText(
+                            this,
+                            getString(
+                                R.string.data_source_switched_to,
+                                getString(R.string.data_source_openchargemap)
+                            ),
+                            Toast.LENGTH_LONG
+                        ).show()
+                    }
+                    deepLink = navController.createDeepLink()
+                        .setGraph(R.navigation.nav_graph)
+                        .setDestination(R.id.map)
+                        .setArguments(MapFragmentArgs(chargerId = id).toBundle())
+                        .createPendingIntent()
+                }
+            } else if (intent.scheme == "net.vonforst.evmap") {
+                intent.data?.let {
+                    if (it.host == "find_charger") {
+                        val lat = it.getQueryParameter("latitude")?.toDouble()
+                        val lon = it.getQueryParameter("longitude")?.toDouble()
+                        val name = it.getQueryParameter("name")
+                        if (lat != null && lon != null) {
+                            deepLink = navController.createDeepLink()
+                                .setGraph(R.navigation.nav_graph)
+                                .setDestination(R.id.map)
+                                .setArguments(
+                                    MapFragmentArgs(
+                                        latLng = LatLng(lat, lon),
+                                        locationName = name
+                                    ).toBundle()
+                                )
+                                .createPendingIntent()
+                        } else if (name != null) {
+                            deepLink = navController.createDeepLink()
+                                .setGraph(R.navigation.nav_graph)
+                                .setDestination(R.id.map)
+                                .setArguments(MapFragmentArgs(locationName = name).toBundle())
+                                .createPendingIntent()
+                        }
                    }
                }
-            }
-        } else if (intent.hasExtra(EXTRA_CHARGER_ID)) {
-            deepLink = navController.createDeepLink()
-                .setDestination(R.id.map)
-                .setArguments(
-                    MapFragmentArgs(
+            } else if (intent.hasExtra(EXTRA_CHARGER_ID)) {
+                navController.navigate(
+                    R.id.map, MapFragmentArgs(
                        chargerId = intent.getLongExtra(EXTRA_CHARGER_ID, 0),
                        latLng = LatLng(
                            intent.getDoubleExtra(EXTRA_LAT, 0.0),
@@ -218,23 +216,23 @@ class MapsActivity : AppCompatActivity(),
                        )
                    ).toBundle()
                )
-                .createPendingIntent()
-        } else if (intent.hasExtra(EXTRA_FAVORITES)) {
-            deepLink = navController.createDeepLink()
-                .setGraph(navGraph)
-                .setDestination(R.id.favs)
-                .createPendingIntent()
-        } else if (intent.hasExtra(EXTRA_DONATE)) {
-            deepLink = navController.createDeepLink()
-                .setGraph(navGraph)
-                .setDestination(R.id.donate)
-                .createPendingIntent()
-        }
+            } else if (intent.hasExtra(EXTRA_FAVORITES)) {
+                deepLink = navController.createDeepLink()
+                    .setGraph(navGraph)
+                    .setDestination(R.id.favs)
+                    .createPendingIntent()
+            } else if (intent.hasExtra(EXTRA_DONATE)) {
+                deepLink = navController.createDeepLink()
+                    .setGraph(navGraph)
+                    .setDestination(R.id.donate)
+                    .createPendingIntent()
+            }

-        deepLink?.send()
+            deepLink?.send()
+        }
    }

-    fun navigateTo(charger: ChargeLocation, rootView: View) {
+    fun navigateTo(charger: ChargeLocation) {
        // google maps navigation
        val coord = charger.coordinates
        val intent = Intent(Intent.ACTION_VIEW)
@@ -244,11 +242,11 @@ class MapsActivity : AppCompatActivity(),
            startActivity(intent)
        } else {
            // fallback: generic geo intent
-            showLocation(charger, rootView)
+            showLocation(charger)
        }
    }

-    fun showLocation(charger: ChargeLocation, rootView: View) {
+    fun showLocation(charger: ChargeLocation) {
        val coord = charger.coordinates
        val intent = Intent(Intent.ACTION_VIEW)
        intent.data = Uri.parse(
@@ -259,15 +257,16 @@ class MapsActivity : AppCompatActivity(),
        if (intent.resolveActivity(packageManager) != null) {
            startActivity(intent)
        } else {
+            val cb = fragmentCallback ?: return
            Snackbar.make(
-                rootView,
+                cb.getRootView(),
                R.string.no_maps_app_found,
                Snackbar.LENGTH_SHORT
            ).show()
        }
    }

-    fun openUrl(url: String, rootView: View, preferBrowser: Boolean = true) {
+    fun openUrl(url: String, preferBrowser: Boolean = true) {
        val pkg = CustomTabsClient.getPackageName(this, null)
        val intent = CustomTabsIntent.Builder()
            .setDefaultColorSchemeParams(
@@ -284,8 +283,9 @@ class MapsActivity : AppCompatActivity(),
        try {
            intent.launchUrl(this, Uri.parse(url))
        } catch (e: ActivityNotFoundException) {
+            val cb = fragmentCallback ?: return
            Snackbar.make(
-                rootView,
+                cb.getRootView(),
                R.string.no_browser_app_found,
                Snackbar.LENGTH_SHORT
            ).show()
--- a/app/src/main/java/net/vonforst/evmap/Utils.kt
+++ b/app/src/main/java/net/vonforst/evmap/Utils.kt
@@ -17,7 +17,6 @@ import android.text.SpannedString
 import android.text.TextUtils
 import android.text.style.StyleSpan
 import net.vonforst.evmap.storage.PreferenceDataSource
-import java.util.Currency
 import java.util.Locale

 fun Bundle.optDouble(name: String): Double? {
@@ -140,6 +139,4 @@ fun PackageManager.isAppInstalled(packageName: String): Boolean {
    } catch (e: PackageManager.NameNotFoundException) {
        false
    }
-}
-
-fun currencyDisplayName(code: String) = "${Currency.getInstance(code).displayName} ($code)"
+}
--- a/app/src/main/java/net/vonforst/evmap/adapter/DetailsAdapter.kt
+++ b/app/src/main/java/net/vonforst/evmap/adapter/DetailsAdapter.kt
@@ -9,6 +9,7 @@ import androidx.core.text.buildSpannedString
 import net.vonforst.evmap.R
 import net.vonforst.evmap.api.availability.tesla.Pricing
 import net.vonforst.evmap.api.availability.tesla.Rates
+import net.vonforst.evmap.api.availability.tesla.TeslaChargingOwnershipGraphQlApi
 import net.vonforst.evmap.bold
 import net.vonforst.evmap.joinToSpannedString
 import net.vonforst.evmap.model.ChargeCard
--- a/app/src/main/java/net/vonforst/evmap/adapter/GalleryAdapter.kt
+++ b/app/src/main/java/net/vonforst/evmap/adapter/GalleryAdapter.kt
@@ -12,6 +12,7 @@ import androidx.recyclerview.widget.ListAdapter
 import androidx.recyclerview.widget.RecyclerView
 import coil.load
 import coil.memory.MemoryCache
+import net.vonforst.evmap.BuildConfig
 import net.vonforst.evmap.R
 import net.vonforst.evmap.model.ChargerPhoto

@@ -70,7 +71,7 @@ class GalleryAdapter(context: Context, val itemClickListener: ItemClickListener?
                    memoryKeys[item.id] = metadata.memoryCacheKey
                }
            )
-            allowHardware(false)
+            allowHardware(!BuildConfig.DEBUG)
        }
    }
 }
--- a/app/src/main/java/net/vonforst/evmap/api/availability/AvailabilityDetector.kt
+++ b/app/src/main/java/net/vonforst/evmap/api/availability/AvailabilityDetector.kt
@@ -7,6 +7,8 @@ import kotlinx.coroutines.withContext
 import kotlinx.parcelize.Parcelize
 import net.vonforst.evmap.addDebugInterceptors
 import net.vonforst.evmap.api.RateLimitInterceptor
+import net.vonforst.evmap.api.await
+import net.vonforst.evmap.api.chargeprice.ChargepriceApi
 import net.vonforst.evmap.api.equivalentPlugTypes
 import net.vonforst.evmap.cartesianProduct
 import net.vonforst.evmap.model.ChargeLocation
@@ -16,6 +18,7 @@ import net.vonforst.evmap.viewmodel.Resource
 import okhttp3.Cache
 import okhttp3.JavaNetCookieJar
 import okhttp3.OkHttpClient
+import okhttp3.Request
 import retrofit2.HttpException
 import java.io.IOException
 import java.net.CookieManager
@@ -38,6 +41,16 @@ interface AvailabilityDetector {
 abstract class BaseAvailabilityDetector(private val client: OkHttpClient) : AvailabilityDetector {
    protected val radius = 150  // max radius in meters

+    protected suspend fun httpGet(url: String): String {
+        val request = Request.Builder().url(url).build()
+        val response = client.newCall(request).await()
+
+        if (!response.isSuccessful) throw IOException(response.message)
+
+        val str = response.body!!.string()
+        return str
+    }
+
    protected fun getCorrespondingChargepoint(
        cps: Iterable<Chargepoint>, type: String, power: Double
    ): Chargepoint? {
--- a/app/src/main/java/net/vonforst/evmap/api/availability/TeslaGuestAvailabilityDetector.kt
+++ b/app/src/main/java/net/vonforst/evmap/api/availability/TeslaGuestAvailabilityDetector.kt
@@ -52,31 +52,32 @@ class TeslaGuestAvailabilityDetector(

        val (detailsA, guestPricing) = coroutineScope {
            val details = async {
-                api.getSiteDetails(
-                    TeslaChargingGuestGraphQlApi.GetSiteDetailsRequest(
-                        TeslaChargingGuestGraphQlApi.GetSiteDetailsVariables(
+                api.getChargingSiteDetails(
+                    TeslaChargingGuestGraphQlApi.GetChargingSiteDetailsRequest(
+                        TeslaChargingGuestGraphQlApi.GetChargingSiteInformationVariables(
                            TeslaChargingGuestGraphQlApi.Identifier(
                                TeslaChargingGuestGraphQlApi.ChargingSiteIdentifier(
-                                    trtId, TeslaChargingGuestGraphQlApi.Experience.ADHOC
+                                    trtId
                                )
                            ),
+                            TeslaChargingGuestGraphQlApi.Experience.ADHOC
                        )
                    )
-                ).data.chargingNetwork?.site
-                    ?: throw AvailabilityDetectorException("no candidates found.")
+                ).data.site ?: throw AvailabilityDetectorException("no candidates found.")
            }
            val guestPricing = async {
-                api.getSiteDetails(
-                    TeslaChargingGuestGraphQlApi.GetSiteDetailsRequest(
-                        TeslaChargingGuestGraphQlApi.GetSiteDetailsVariables(
+                api.getChargingSiteDetails(
+                    TeslaChargingGuestGraphQlApi.GetChargingSiteDetailsRequest(
+                        TeslaChargingGuestGraphQlApi.GetChargingSiteInformationVariables(
                            TeslaChargingGuestGraphQlApi.Identifier(
                                TeslaChargingGuestGraphQlApi.ChargingSiteIdentifier(
-                                    trtId, TeslaChargingGuestGraphQlApi.Experience.GUEST
+                                    trtId
                                )
                            ),
+                            TeslaChargingGuestGraphQlApi.Experience.GUEST
                        )
                    )
-                ).data.chargingNetwork?.site?.pricing
+                ).data.site?.pricing
            }
            details to guestPricing
        }
@@ -102,9 +103,12 @@ class TeslaGuestAvailabilityDetector(
            "charger has unknown connectors"
        )

-        var detailsSorted = details.chargerList
-            .sortedBy { c -> c.labelLetter }
-            .sortedBy { c -> c.labelNumber }
+        val chargerDetails = details.chargersAvailable.chargerDetails
+        val chargers = details.chargers.associateBy { it.id }
+        var detailsSorted = chargerDetails
+            .sortedBy { chargers[it.id]?.labelLetter }
+            .sortedBy { chargers[it.id]?.labelNumber }
+

        if (detailsSorted.size != scV2Connectors.sumOf { it.count } + scV3Connectors.sumOf { it.count }) {
            // apparently some connectors are missing in Tesla data
@@ -116,7 +120,7 @@ class TeslaGuestAvailabilityDetector(
                    detailsSorted + List(numMissing) {
                        TeslaChargingGuestGraphQlApi.ChargerDetail(
                            ChargerAvailability.UNKNOWN,
-                            "", ""
+                            ""
                        )
                    }
            } else {
@@ -147,7 +151,7 @@ class TeslaGuestAvailabilityDetector(
        }

        val statusMap = detailsMap.mapValues { it.value.map { it.availability.toStatus() } }
-        val labelsMap = detailsMap.mapValues { it.value.map { it.label } }
+        val labelsMap = detailsMap.mapValues { it.value.map { chargers[it.id]?.label } }

        val pricing = details.pricing.copy(memberRates = guestPricing.await()?.userRates)

--- a/app/src/main/java/net/vonforst/evmap/api/availability/tesla/TeslaGuestApi.kt
+++ b/app/src/main/java/net/vonforst/evmap/api/availability/tesla/TeslaGuestApi.kt
@@ -1,8 +1,12 @@
 package net.vonforst.evmap.api.availability.tesla

 import com.squareup.moshi.Json
+import com.squareup.moshi.JsonAdapter
 import com.squareup.moshi.JsonClass
+import com.squareup.moshi.JsonReader
+import com.squareup.moshi.JsonWriter
 import com.squareup.moshi.Moshi
+import com.squareup.moshi.Types
 import okhttp3.CacheControl
 import okhttp3.OkHttpClient
 import retrofit2.Retrofit
@@ -11,6 +15,7 @@ import retrofit2.http.Body
 import retrofit2.http.GET
 import retrofit2.http.POST
 import retrofit2.http.Query
+import java.lang.reflect.Type
 import java.util.concurrent.TimeUnit

 interface TeslaCuaApi {
@@ -66,22 +71,24 @@ interface TeslaCuaApi {

 interface TeslaChargingGuestGraphQlApi {
    @POST("graphql")
-    suspend fun getSiteDetails(
-        @Body request: GetSiteDetailsRequest,
-        @Query("operationName") operationName: String = "GetSiteDetails"
+    suspend fun getChargingSiteDetails(
+        @Body request: GetChargingSiteDetailsRequest,
+        @Query("operationName") operationName: String = "getGuestChargingSiteDetails"
    ): GetChargingSiteDetailsResponse

    @JsonClass(generateAdapter = true)
-    data class GetSiteDetailsRequest(
-        override val variables: GetSiteDetailsVariables,
-        override val operationName: String = "GetSiteDetails",
+    data class GetChargingSiteDetailsRequest(
+        override val variables: GetChargingSiteInformationVariables,
+        override val operationName: String = "getGuestChargingSiteDetails",
        override val query: String =
-            "\n    query GetSiteDetails(\$siteId: SiteIdInput!) {\n  chargingNetwork {\n    site(siteId: \$siteId) {\n      address {\n        countryCode\n      }\n      chargerList {\n        id\n        label\n        availability\n      }\n      holdAmount {\n        amount\n        currencyCode\n      }\n      maxPowerKw\n      name\n      programType\n      publicStallCount\n      trtId\n      pricing {\n        userRates {\n          activePricebook {\n            charging {\n              ...ChargingRate\n            }\n            parking {\n              ...ChargingRate\n            }\n            congestion {\n              ...ChargingRate\n            }\n          }\n        }\n      }\n    }\n  }\n}\n    \n    fragment ChargingRate on ChargingUserRate {\n  uom\n  rates\n  buckets {\n    start\n    end\n  }\n  bucketUom\n  currencyCode\n  programType\n  vehicleMakeType\n  touRates {\n    enabled\n    activeRatesByTime {\n      startTime\n      endTime\n      rates\n    }\n  }\n}\n    "
+            "\n    query getGuestChargingSiteDetails(\$identifier: ChargingSiteIdentifierInput!, \$deviceLocale: String!, \$experience: ChargingExperienceEnum!) {\n  site(\n    identifier: \$identifier\n    deviceLocale: \$deviceLocale\n    experience: \$experience\n  ) {\n    activeOutages\n    address {\n      countryCode\n    }\n    chargers {\n      id\n      label\n    }\n    chargersAvailable {\n      chargerDetails {\n        id\n        availability\n      }\n    }\n    holdAmount {\n      holdAmount\n      currencyCode\n    }\n    maxPowerKw\n    name\n    programType\n    publicStallCount\n    id\n    pricing(experience: \$experience) {\n      userRates {\n        activePricebook {\n          charging {\n            uom\n            rates\n            buckets {\n              start\n              end\n            }\n            bucketUom\n            currencyCode\n            programType\n            vehicleMakeType\n            touRates {\n              enabled\n              activeRatesByTime {\n                startTime\n                endTime\n                rates\n              }\n            }\n          }\n          parking {\n            uom\n            rates\n            buckets {\n              start\n              end\n            }\n            bucketUom\n            currencyCode\n            programType\n            vehicleMakeType\n            touRates {\n              enabled\n              activeRatesByTime {\n                startTime\n                endTime\n                rates\n              }\n            }\n          }\n          congestion {\n            uom\n            rates\n            buckets {\n              start\n              end\n            }\n            bucketUom\n            currencyCode\n            programType\n            vehicleMakeType\n            touRates {\n              enabled\n              activeRatesByTime {\n                startTime\n                endTime\n                rates\n              }\n            }\n          }\n        }\n      }\n    }\n  }\n}\n    "
    ) : GraphQlRequest()

    @JsonClass(generateAdapter = true)
-    data class GetSiteDetailsVariables(
-        val siteId: Identifier,
+    data class GetChargingSiteInformationVariables(
+        val identifier: Identifier,
+        val experience: Experience,
+        val deviceLocale: String = "de-DE",
    )

    enum class Experience {
@@ -90,22 +97,22 @@ interface TeslaChargingGuestGraphQlApi {

    @JsonClass(generateAdapter = true)
    data class Identifier(
-        val byTrtId: ChargingSiteIdentifier
+        val siteId: ChargingSiteIdentifier
    )

    @JsonClass(generateAdapter = true)
    data class ChargingSiteIdentifier(
-        val trtId: Long,
-        val chargingExperience: Experience,
-        val programType: String = "PTSCH",
-        val locale: String = "de-DE",
+        val id: Long,
+        val siteType: SiteType = SiteType.SUPERCHARGER
    )

-    @JsonClass(generateAdapter = true)
-    data class GetChargingSiteDetailsResponse(val data: GetChargingSiteDetailsResponseDataNetwork)
+    enum class SiteType {
+        @Json(name = "SITE_TYPE_SUPERCHARGER")
+        SUPERCHARGER
+    }

    @JsonClass(generateAdapter = true)
-    data class GetChargingSiteDetailsResponseDataNetwork(val chargingNetwork: GetChargingSiteDetailsResponseData?)
+    data class GetChargingSiteDetailsResponse(val data: GetChargingSiteDetailsResponseData)

    @JsonClass(generateAdapter = true)
    data class GetChargingSiteDetailsResponseData(val site: ChargingSiteInformation?)
@@ -113,8 +120,9 @@ interface TeslaChargingGuestGraphQlApi {
    @JsonClass(generateAdapter = true)
    data class ChargingSiteInformation(
        val activeOutages: List<Outage>?,
-        val chargerList: List<ChargerDetail>,
-        val trtId: Long,
+        val chargers: List<ChargerId>,
+        val chargersAvailable: ChargersAvailable,
+        val id: Long,
        val maxPowerKw: Int,
        val name: String,
        val pricing: Pricing,
@@ -122,10 +130,9 @@ interface TeslaChargingGuestGraphQlApi {
    )

    @JsonClass(generateAdapter = true)
-    data class ChargerDetail(
-        val availability: ChargerAvailability,
+    data class ChargerId(
+        val id: String,
        val label: String?,
-        val id: String
    ) {
        val labelNumber
            get() = label?.replace(Regex("""\D"""), "")?.toInt()
@@ -133,6 +140,15 @@ interface TeslaChargingGuestGraphQlApi {
            get() = label?.replace(Regex("""\d"""), "")
    }

+    @JsonClass(generateAdapter = true)
+    data class ChargersAvailable(val chargerDetails: List<ChargerDetail>)
+
+    @JsonClass(generateAdapter = true)
+    data class ChargerDetail(
+        val availability: ChargerAvailability,
+        val id: String
+    )
+
    companion object {
        fun create(
            client: OkHttpClient,
--- a/app/src/main/java/net/vonforst/evmap/api/goingelectric/GoingElectricApi.kt
+++ b/app/src/main/java/net/vonforst/evmap/api/goingelectric/GoingElectricApi.kt
@@ -452,10 +452,7 @@ class GoingElectricApiWrapper(
                    if (responses.map { it.isSuccessful }.all { it }
                        && plugsResponse.body()!!.status == STATUS_OK
                        && chargeCardsResponse.body()!!.status == STATUS_OK
-                        && networksResponse.body()!!.status == STATUS_OK
-                        && plugsResponse.body()!!.result != null
-                        && chargeCardsResponse.body()!!.result != null
-                        && networksResponse.body()!!.result != null) {
+                        && networksResponse.body()!!.status == STATUS_OK) {
                        Resource.success(
                            GEReferenceData(
                                plugsResponse.body()!!.result!!,
--- a/app/src/main/java/net/vonforst/evmap/api/openchargemap/OpenChargeMapApi.kt
+++ b/app/src/main/java/net/vonforst/evmap/api/openchargemap/OpenChargeMapApi.kt
@@ -244,8 +244,6 @@ class OpenChargeMapApiWrapper(
            return Resource.success(ChargepointList(result, data.size < 499))
        } catch (e: IOException) {
            return Resource.error(e.message, null)
-        } catch (e: HttpException) {
-            return Resource.error(e.message, null)
        }
    }

--- a/app/src/main/java/net/vonforst/evmap/api/openchargemap/OpenChargeMapModel.kt
+++ b/app/src/main/java/net/vonforst/evmap/api/openchargemap/OpenChargeMapModel.kt
@@ -254,7 +254,7 @@ data class OCMUserComment(
    @Json(name = "ID") val id: Long,
    @Json(name = "CommentTypeID") val commentTypeId: Long,
    @Json(name = "Comment") val comment: String?,
-    @Json(name = "UserName") val userName: String?,
+    @Json(name = "UserName") val userName: String,
    @Json(name = "DateCreated") val dateCreated: ZonedDateTime
 )

--- a/app/src/main/java/net/vonforst/evmap/auto/ChargerDetailScreen.kt
+++ b/app/src/main/java/net/vonforst/evmap/auto/ChargerDetailScreen.kt
@@ -11,10 +11,8 @@ import android.net.Uri
 import android.text.SpannableString
 import android.text.SpannableStringBuilder
 import android.text.Spanned
-import android.util.Log
 import androidx.car.app.CarContext
 import androidx.car.app.CarToast
-import androidx.car.app.HostException
 import androidx.car.app.Screen
 import androidx.car.app.constraints.ConstraintManager
 import androidx.car.app.model.Action
@@ -51,7 +49,9 @@ import net.vonforst.evmap.api.availability.ChargeLocationStatus
 import net.vonforst.evmap.api.availability.tesla.Pricing
 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
@@ -74,7 +74,6 @@ import java.time.format.FormatStyle
 import kotlin.math.floor
 import kotlin.math.roundToInt

-private const val TAG = "ChargerDetailScreen"

 class ChargerDetailScreen(ctx: CarContext, val chargerSparse: ChargeLocation) : Screen(ctx) {
    var charger: ChargeLocation? = null
@@ -89,8 +88,7 @@ class ChargerDetailScreen(ctx: CarContext, val chargerSparse: ChargeLocation) :
    private val repo =
        ChargeLocationsRepository(createApi(prefs.dataSource, ctx), lifecycleScope, db, prefs)
    private val availabilityRepo = AvailabilityRepository(ctx)
-
-    //private val predictionRepo = PredictionRepository(ctx)
+    private val predictionRepo = PredictionRepository(ctx)
    private val timeFormat = DateTimeFormatter.ofLocalizedTime(FormatStyle.SHORT)

    private val imageSize = 128  // images should be 128dp according to docs
@@ -545,55 +543,13 @@ class ChargerDetailScreen(ctx: CarContext, val chargerSparse: ChargeLocation) :
        }

    private fun navigateToCharger(charger: ChargeLocation) {
-        var success = navigateCarApp(charger)
-        if (!success && BuildConfig.FLAVOR_automotive == "automotive") {
-            // on AAOS, some OEMs' navigation apps might not support
-            success = navigateRegularApp(charger)
-        }
-        if (!success) {
-            CarToast.makeText(carContext, R.string.no_maps_app_found, CarToast.LENGTH_SHORT).show()
-        }
-    }
-
-    private fun navigateCarApp(charger: ChargeLocation): Boolean {
        val coord = charger.coordinates
        val intent =
            Intent(
                CarContext.ACTION_NAVIGATE,
                Uri.parse("geo:${coord.lat},${coord.lng}")
            )
-        try {
-            carContext.startCarApp(intent)
-            return true
-        } catch (e: HostException) {
-            Log.w(TAG, "Could not start navigation using car app intent")
-            Log.w(TAG, intent.toString())
-            e.printStackTrace()
-        } catch (e: SecurityException) {
-            Log.w(TAG, "Could not start navigation using car app intent")
-            Log.w(TAG, intent.toString())
-            e.printStackTrace()
-        }
-        return false
-    }
-
-    private fun navigateRegularApp(charger: ChargeLocation): Boolean {
-        val coord = charger.coordinates
-        val intent = Intent(Intent.ACTION_VIEW)
-        intent.data = Uri.parse(
-            "geo:${coord.lat},${coord.lng}?q=${coord.lat},${coord.lng}(${
-                Uri.encode(charger.name)
-            })"
-        )
-        intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
-        if (intent.resolveActivity(carContext.packageManager) != null) {
-            carContext.startActivity(intent)
-            return true
-        } else {
-            Log.w(TAG, "Could not start navigation using regular intent")
-            Log.w(TAG, intent.toString())
-        }
-        return false
+        carContext.startCarApp(intent)
    }

    private fun loadCharger() {
@@ -647,12 +603,12 @@ class ChargerDetailScreen(ctx: CarContext, val chargerSparse: ChargeLocation) :
                    )
                    this@ChargerDetailScreen.photo = outImg
                }
-                fronyxSupported = false /*charger.chargepoints.any {
+                fronyxSupported = charger.chargepoints.any {
                    FronyxApi.isChargepointSupported(
                        charger,
                        it
                    )
-                } && !availabilityRepo.isSupercharger(charger)*/
+                } && !availabilityRepo.isSupercharger(charger)
                teslaSupported = availabilityRepo.isTeslaSupported(charger)

                invalidate()
@@ -661,7 +617,7 @@ class ChargerDetailScreen(ctx: CarContext, val chargerSparse: ChargeLocation) :

                invalidate()

-                //prediction = predictionRepo.getPredictionData(charger, availability)
+                prediction = predictionRepo.getPredictionData(charger, availability)

                invalidate()
            } else {
--- a/app/src/main/java/net/vonforst/evmap/auto/SearchSelectScreen.kt
+++ b/app/src/main/java/net/vonforst/evmap/auto/SearchSelectScreen.kt
@@ -4,14 +4,7 @@ import androidx.car.app.CarContext
 import androidx.car.app.CarToast
 import androidx.car.app.Screen
 import androidx.car.app.constraints.ConstraintManager
-import androidx.car.app.model.Action
-import androidx.car.app.model.ActionStrip
-import androidx.car.app.model.CarColor
-import androidx.car.app.model.CarIcon
-import androidx.car.app.model.ItemList
-import androidx.car.app.model.Row
-import androidx.car.app.model.SearchTemplate
-import androidx.car.app.model.Template
+import androidx.car.app.model.*
 import androidx.core.graphics.drawable.IconCompat
 import androidx.lifecycle.lifecycleScope
 import kotlinx.coroutines.Dispatchers
@@ -52,7 +45,7 @@ abstract class MultiSelectSearchScreen<T>(ctx: CarContext) : Screen(ctx),
            } ?: run {
                setLoading(true)
            }
-            if (isMultiSelect && shouldShowSelectAll) {
+            if (isMultiSelect) {
                setActionStrip(ActionStrip.Builder().apply {
                    addAction(
                        Action.Builder().setIcon(
--- a/app/src/main/java/net/vonforst/evmap/auto/SettingsScreens.kt
+++ b/app/src/main/java/net/vonforst/evmap/auto/SettingsScreens.kt
@@ -43,7 +43,6 @@ import net.vonforst.evmap.api.availability.tesla.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.currencyDisplayName
 import net.vonforst.evmap.fragment.oauth.OAuthLoginFragment
 import net.vonforst.evmap.fragment.oauth.OAuthLoginFragmentArgs
 import net.vonforst.evmap.getPackageInfoCompat
@@ -216,7 +215,7 @@ class DataSettingsScreen(ctx: CarContext) : Screen(ctx) {
                        }
                    }
                }.build())
-                /*addItem(
+                addItem(
                    Row.Builder()
                        .setTitle(carContext.getString(R.string.pref_prediction_enabled))
                        .addText(carContext.getString(R.string.pref_prediction_enabled_summary))
@@ -224,7 +223,7 @@ class DataSettingsScreen(ctx: CarContext) : Screen(ctx) {
                            prefs.predictionEnabled = it
                        }.setChecked(prefs.predictionEnabled).build())
                        .build()
-                )*/
+                )
                addItem(Row.Builder().apply {
                    setTitle(carContext.getString(R.string.pref_tesla_account))
                    addText(
@@ -487,9 +486,10 @@ class ChargepriceSettingsScreen(ctx: CarContext) : Screen(ctx) {
                addItem(Row.Builder().apply {
                    setTitle(carContext.getString(R.string.pref_chargeprice_currency))

+                    val names =
+                        carContext.resources.getStringArray(R.array.pref_chargeprice_currency_names)
                    val values =
-                        carContext.resources.getStringArray(R.array.pref_chargeprice_currencies)
-                    val names = values.map(::currencyDisplayName)
+                        carContext.resources.getStringArray(R.array.pref_chargeprice_currency_values)
                    val index = values.indexOf(prefs.chargepriceCurrency)
                    addText(if (index >= 0) names[index] else "")

@@ -629,8 +629,8 @@ class SelectCurrencyScreen(ctx: CarContext) : MultiSelectSearchScreen<Pair<Strin
    override fun getLabel(it: Pair<String, String>): String = it.first

    override suspend fun loadData(): List<Pair<String, String>> {
-        val values = carContext.resources.getStringArray(R.array.pref_chargeprice_currencies)
-        val names = values.map(::currencyDisplayName)
+        val names = carContext.resources.getStringArray(R.array.pref_chargeprice_currency_names)
+        val values = carContext.resources.getStringArray(R.array.pref_chargeprice_currency_values)
        return names.zip(values)
    }
 }
@@ -825,24 +825,13 @@ class AboutScreen(ctx: CarContext) : Screen(ctx) {
            }.build(), carContext.getString(R.string.about)))
            addSectionedList(SectionedItemList.create(ItemList.Builder().apply {
                addItem(Row.Builder()
-                    .setTitle(carContext.getString(R.string.mastodon))
-                    .addText(carContext.getString(R.string.mastodon_handle))
+                    .setTitle(carContext.getString(R.string.twitter))
+                    .addText(carContext.getString(R.string.twitter_handle))
                    .setBrowsable(true)
                    .setOnClickListener(ParkedOnlyOnClickListener.create {
-                        openUrl(carContext, carContext.getString(R.string.mastodon_url))
+                        openUrl(carContext, carContext.getString(R.string.twitter_url))
                    }).build()
                )
-                if (maxRows > 8) {
-                    addItem(
-                        Row.Builder()
-                            .setTitle(carContext.getString(R.string.twitter))
-                            .addText(carContext.getString(R.string.twitter_handle))
-                            .setBrowsable(true)
-                            .setOnClickListener(ParkedOnlyOnClickListener.create {
-                                openUrl(carContext, carContext.getString(R.string.twitter_url))
-                            }).build()
-                    )
-                }
                if (maxRows > 6) {
                    addItem(Row.Builder()
                        .setTitle(carContext.getString(R.string.goingelectric_forum))
@@ -855,19 +844,6 @@ class AboutScreen(ctx: CarContext) : Screen(ctx) {
                        }).build()
                    )
                }
-                if (maxRows > 7) {
-                    addItem(
-                        Row.Builder()
-                            .setTitle(carContext.getString(R.string.tff_forum))
-                            .setBrowsable(true)
-                            .setOnClickListener(ParkedOnlyOnClickListener.create {
-                                openUrl(
-                                    carContext,
-                                    carContext.getString(R.string.tff_forum_url)
-                                )
-                            }).build()
-                    )
-                }
            }.build(), carContext.getString(R.string.contact)))
            addSectionedList(SectionedItemList.create(ItemList.Builder().apply {
                addItem(Row.Builder()
--- a/app/src/main/java/net/vonforst/evmap/auto/Utils.kt
+++ b/app/src/main/java/net/vonforst/evmap/auto/Utils.kt
@@ -14,11 +14,7 @@ import androidx.car.app.CarToast
 import androidx.car.app.Screen
 import androidx.car.app.constraints.ConstraintManager
 import androidx.car.app.hardware.common.CarUnit
-import androidx.car.app.model.CarColor
-import androidx.car.app.model.CarIcon
-import androidx.car.app.model.Distance
-import androidx.car.app.model.MessageTemplate
-import androidx.car.app.model.Template
+import androidx.car.app.model.*
 import androidx.car.app.versioning.CarAppApiLevels
 import androidx.core.content.ContextCompat
 import androidx.core.graphics.drawable.IconCompat
@@ -30,7 +26,7 @@ import net.vonforst.evmap.getPackageInfoCompat
 import net.vonforst.evmap.kmPerMile
 import net.vonforst.evmap.shouldUseImperialUnits
 import net.vonforst.evmap.ydPerMile
-import java.util.Locale
+import java.util.*
 import kotlin.math.roundToInt

 fun carAvailabilityColor(status: List<ChargepointStatus>): CarColor {
@@ -211,9 +207,7 @@ fun supportsCarApiLevel3(ctx: CarContext): Boolean {
            val version = getAndroidAutoVersion(ctx)
            // Android Auto 6.7 is required. 6.6 reports supporting API Level 3,
            // but crashes when using it. See: https://issuetracker.google.com/issues/199509584
-            val major = version[0].toIntOrNull() ?: return false
-            val minor = version[1].toIntOrNull() ?: return false
-            if (major < 6 || major < 6 && minor < 7) {
+            if (version[0] < "6" || version[0] == "6" && version[1] < "7") {
                return false
            }
        }
--- a/app/src/main/java/net/vonforst/evmap/auto/VehicleDataScreen.kt
+++ b/app/src/main/java/net/vonforst/evmap/auto/VehicleDataScreen.kt
@@ -6,18 +6,9 @@ import android.os.Handler
 import android.os.Looper
 import androidx.car.app.CarContext
 import androidx.car.app.Screen
-import androidx.car.app.hardware.info.CarSensors
-import androidx.car.app.hardware.info.Compass
-import androidx.car.app.hardware.info.EnergyLevel
-import androidx.car.app.hardware.info.Model
-import androidx.car.app.hardware.info.Speed
-import androidx.car.app.model.Action
-import androidx.car.app.model.CarColor
-import androidx.car.app.model.CarIcon
-import androidx.car.app.model.GridItem
-import androidx.car.app.model.GridTemplate
-import androidx.car.app.model.ItemList
-import androidx.car.app.model.Template
+import androidx.car.app.hardware.CarHardwareManager
+import androidx.car.app.hardware.info.*
+import androidx.car.app.model.*
 import androidx.core.content.ContextCompat
 import androidx.core.graphics.drawable.IconCompat
 import androidx.lifecycle.DefaultLifecycleObserver
@@ -27,14 +18,14 @@ import net.vonforst.evmap.R
 import net.vonforst.evmap.ui.CompassNeedle
 import net.vonforst.evmap.ui.Gauge
 import net.vonforst.evmap.utils.formatDecimal
-import patchedCarInfo
 import kotlin.math.min
 import kotlin.math.roundToInt

@androidx.car.app.annotations.ExperimentalCarApi
 class VehicleDataScreen(ctx: CarContext, val session: EVMapSession) : Screen(ctx),
    LocationAwareScreen, DefaultLifecycleObserver {
-    private val carInfo = carContext.patchedCarInfo
+    private val carInfo =
+        (ctx.getCarService(CarContext.HARDWARE_SERVICE) as CarHardwareManager).carInfo
    private val carSensors = carContext.patchedCarSensors
    private var model: Model? = null
    private var energyLevel: EnergyLevel? = null
--- a/app/src/main/java/net/vonforst/evmap/autocomplete/MapboxAutocompleteProvider.kt
+++ b/app/src/main/java/net/vonforst/evmap/autocomplete/MapboxAutocompleteProvider.kt
@@ -16,7 +16,6 @@ import com.mapbox.api.geocoding.v5.models.CarmenFeature
 import com.mapbox.geojson.BoundingBox
 import com.mapbox.geojson.Point
 import net.vonforst.evmap.R
-import retrofit2.HttpException
 import java.io.IOException

 class MapboxAutocompleteProvider(val context: Context) : AutocompleteProvider {
@@ -26,7 +25,7 @@ class MapboxAutocompleteProvider(val context: Context) : AutocompleteProvider {
    override val id = "mapbox"

    override fun autocomplete(query: String, location: LatLng?): List<AutocompletePlace> {
-        val request = MapboxGeocoding.builder().apply {
+        val result = MapboxGeocoding.builder().apply {
            location?.let {
                proximity(Point.fromLngLat(location.longitude, location.latitude))
            }
@@ -34,12 +33,7 @@ class MapboxAutocompleteProvider(val context: Context) : AutocompleteProvider {
            accessToken(context.getString(R.string.mapbox_key))
            autocomplete(true)
            this.query(query)
-        }
-        val result = try {
-            request.build().executeCall()
-        } catch (e: HttpException) {
-            throw IOException(e)
-        }
+        }.build().executeCall()
        if (!result.isSuccessful) {
            throw IOException(result.message())
        }
@@ -119,7 +113,8 @@ class MapboxAutocompleteProvider(val context: Context) : AutocompleteProvider {

    override fun getAttributionString(): Int = R.string.powered_by_mapbox

-    override fun getAttributionImage(dark: Boolean): Int = R.drawable.mapbox_logo
+    override fun getAttributionImage(dark: Boolean): Int =
+        if (dark) com.mapbox.mapboxsdk.R.drawable.mapbox_logo_icon else R.drawable.mapbox_logo
 }

 private fun BoundingBox.toLatLngBounds(): LatLngBounds {
--- a/app/src/main/java/net/vonforst/evmap/fragment/ChargepriceFragment.kt
+++ b/app/src/main/java/net/vonforst/evmap/fragment/ChargepriceFragment.kt
@@ -100,9 +100,9 @@ class ChargepriceFragment : Fragment() {
            inflater,
            R.layout.fragment_chargeprice_header, container, false
        )
-        binding.lifecycleOwner = viewLifecycleOwner
+        binding.lifecycleOwner = this
        binding.vm = vm
-        headerBinding.lifecycleOwner = viewLifecycleOwner
+        headerBinding.lifecycleOwner = this
        headerBinding.vm = vm

        binding.toolbar.inflateMenu(R.menu.chargeprice)
@@ -141,7 +141,7 @@ class ChargepriceFragment : Fragment() {

        val chargepriceAdapter = ChargepriceAdapter().apply {
            onClickListener = {
-                (requireActivity() as MapsActivity).openUrl(it.url, binding.root)
+                (requireActivity() as MapsActivity).openUrl(it.url)
            }
        }
        val joinedAdapter = ConcatAdapter(
@@ -194,10 +194,7 @@ class ChargepriceFragment : Fragment() {
        }

        binding.imgChargepriceLogo.setOnClickListener {
-            (requireActivity() as MapsActivity).openUrl(
-                ChargepriceApi.getPoiUrl(charger),
-                binding.root
-            )
+            (requireActivity() as MapsActivity).openUrl(ChargepriceApi.getPoiUrl(charger))
        }

        binding.btnSettings.setOnClickListener {
@@ -220,10 +217,7 @@ class ChargepriceFragment : Fragment() {
        binding.toolbar.setOnMenuItemClickListener {
            when (it.itemId) {
                R.id.menu_help -> {
-                    (activity as? MapsActivity)?.openUrl(
-                        getString(R.string.chargeprice_faq_link),
-                        binding.root
-                    )
+                    (activity as? MapsActivity)?.openUrl(getString(R.string.chargeprice_faq_link))
                    true
                }
                else -> false
--- a/app/src/main/java/net/vonforst/evmap/fragment/ConnectorDetailsDialog.kt
+++ b/app/src/main/java/net/vonforst/evmap/fragment/ConnectorDetailsDialog.kt
@@ -14,14 +14,14 @@ import net.vonforst.evmap.api.availability.ChargeLocationStatus
 import net.vonforst.evmap.databinding.DialogConnectorDetailsBinding
 import net.vonforst.evmap.databinding.DialogConnectorDetailsHeaderBinding
 import net.vonforst.evmap.model.Chargepoint
+import net.vonforst.evmap.storage.PreferenceDataSource

 class ConnectorDetailsDialog(
-    binding: DialogConnectorDetailsBinding,
+    val binding: DialogConnectorDetailsBinding,
    context: Context,
    onClose: () -> Unit
 ) {
-    private var headerBinding_: DialogConnectorDetailsHeaderBinding? = null
-    private val headerBinding get() = headerBinding_!!
+    private val headerBinding: DialogConnectorDetailsHeaderBinding
    private val detailsAdapter = ConnectorDetailsAdapter()

    init {
@@ -30,7 +30,7 @@ class ConnectorDetailsDialog(
            layoutManager =
                LinearLayoutManager(context, LinearLayoutManager.VERTICAL, false)
        }
-        headerBinding_ = DataBindingUtil.inflate(
+        headerBinding = DataBindingUtil.inflate(
            LayoutInflater.from(context),
            R.layout.dialog_connector_details_header, binding.list, false
        )
@@ -60,8 +60,4 @@ class ConnectorDetailsDialog(
        headerBinding.divider.visibility = if (items.isEmpty()) View.GONE else View.VISIBLE
        headerBinding.item = ConnectorAdapter.ChargepointWithAvailability(cp, cpStatus)
    }
-
-    fun onDestroy() {
-        headerBinding_ = null
-    }
 }
--- a/app/src/main/java/net/vonforst/evmap/fragment/DonateFragmentBase.kt
+++ b/app/src/main/java/net/vonforst/evmap/fragment/DonateFragmentBase.kt
@@ -1,26 +1,29 @@
 package net.vonforst.evmap.fragment

-import android.content.Intent
-import android.webkit.WebResourceRequest
-import android.webkit.WebView
-import android.webkit.WebViewClient
 import androidx.fragment.app.Fragment
+import net.vonforst.evmap.MapsActivity
 import net.vonforst.evmap.R
 import net.vonforst.evmap.databinding.FragmentDonateReferralBinding

 abstract class DonateFragmentBase : Fragment() {
    fun setupReferrals(referrals: FragmentDonateReferralBinding) {
-        referrals.referralWebView.loadUrl(getString(R.string.referral_link))
-        referrals.referralWebView.webViewClient = object : WebViewClient() {
-            override fun shouldOverrideUrlLoading(
-                view: WebView,
-                request: WebResourceRequest
-            ): Boolean {
-                Intent(Intent.ACTION_VIEW, request.url).apply {
-                    startActivity(this)
-                }
-                return true
-            }
+        referrals.referralTesla.setOnClickListener {
+            (requireActivity() as MapsActivity).openUrl(getString(R.string.tesla_referral_link))
+        }
+        referrals.referralJuicify.setOnClickListener {
+            (requireActivity() as MapsActivity).openUrl(getString(R.string.juicify_referral_link))
+        }
+        referrals.referralGeldfuereauto.setOnClickListener {
+            (requireActivity() as MapsActivity).openUrl(getString(R.string.geldfuereauto_referral_link))
+        }
+        referrals.referralMaingau.setOnClickListener {
+            (requireActivity() as MapsActivity).openUrl(getString(R.string.maingau_referral_link))
+        }
+        referrals.referralEwieeinfach.setOnClickListener {
+            (requireActivity() as MapsActivity).openUrl(getString(R.string.ewieeinfach_referral_link))
+        }
+        referrals.referralEprimo.setOnClickListener {
+            (requireActivity() as MapsActivity).openUrl(getString(R.string.eprimo_referral_link))
        }
    }
 }
--- a/app/src/main/java/net/vonforst/evmap/fragment/FavoritesFragment.kt
+++ b/app/src/main/java/net/vonforst/evmap/fragment/FavoritesFragment.kt
@@ -65,7 +65,7 @@ class FavoritesFragment : Fragment() {
            inflater,
            R.layout.fragment_favorites, container, false
        )
-        binding.lifecycleOwner = viewLifecycleOwner
+        binding.lifecycleOwner = this
        binding.vm = vm

        return binding.root
--- a/app/src/main/java/net/vonforst/evmap/fragment/FilterFragment.kt
+++ b/app/src/main/java/net/vonforst/evmap/fragment/FilterFragment.kt
@@ -45,7 +45,7 @@ class FilterFragment : Fragment(), MenuProvider {
        savedInstanceState: Bundle?
    ): View {
        binding = DataBindingUtil.inflate(inflater, R.layout.fragment_filter, container, false)
-        binding.lifecycleOwner = viewLifecycleOwner
+        binding.lifecycleOwner = this
        binding.vm = vm
        vm.filterProfile.observe(viewLifecycleOwner) {}

--- a/app/src/main/java/net/vonforst/evmap/fragment/FilterProfilesFragment.kt
+++ b/app/src/main/java/net/vonforst/evmap/fragment/FilterProfilesFragment.kt
@@ -57,7 +57,7 @@ class FilterProfilesFragment : Fragment() {
        savedInstanceState: Bundle?
    ): View {
        binding = FragmentFilterProfilesBinding.inflate(inflater, container, false)
-        binding.lifecycleOwner = viewLifecycleOwner
+        binding.lifecycleOwner = this
        binding.vm = vm

        return binding.root
@@ -188,17 +188,9 @@ class FilterProfilesFragment : Fragment() {

                dialog.setTitle(R.string.rename)
                    .setMessage(R.string.save_profile_enter_name)
-            }, { newName ->
+            }, {
                lifecycleScope.launch {
-                    if (vm.filterProfiles.value?.find { it.name == newName } != null) {
-                        Snackbar.make(
-                            view,
-                            R.string.filterprofile_name_not_unique,
-                            Snackbar.LENGTH_LONG
-                        ).show()
-                    } else {
-                        vm.update(fp.copy(name = newName))
-                    }
+                    vm.update(fp.copy(name = it))
                }
            })
        })
--- a/app/src/main/java/net/vonforst/evmap/fragment/MapFragment.kt
+++ b/app/src/main/java/net/vonforst/evmap/fragment/MapFragment.kt
@@ -55,7 +55,6 @@ import androidx.transition.TransitionManager
 import coil.load
 import coil.memory.MemoryCache
 import com.car2go.maps.AnyMap
-import com.car2go.maps.MapFactory
 import com.car2go.maps.MapFragment
 import com.car2go.maps.OnMapReadyCallback
 import com.car2go.maps.model.BitmapDescriptor
@@ -137,9 +136,8 @@ import kotlin.collections.set
 import kotlin.math.min


-class MapFragment : Fragment(), OnMapReadyCallback, MenuProvider {
-    private var _binding: FragmentMapBinding? = null
-    private val binding get() = _binding!!
+class MapFragment : Fragment(), OnMapReadyCallback, MapsActivity.FragmentCallback, MenuProvider {
+    private lateinit var binding: FragmentMapBinding
    private val vm: MapViewModel by viewModels()
    private val galleryVm: GalleryViewModel by activityViewModels()
    private var mapFragment: MapFragment? = null
@@ -213,9 +211,9 @@ class MapFragment : Fragment(), OnMapReadyCallback, MenuProvider {
        container: ViewGroup?,
        savedInstanceState: Bundle?
    ): View {
-        _binding = DataBindingUtil.inflate(inflater, R.layout.fragment_map, container, false)
+        binding = DataBindingUtil.inflate(inflater, R.layout.fragment_map, container, false)
        println(binding.detailView.sourceButton)
-        binding.lifecycleOwner = viewLifecycleOwner
+        binding.lifecycleOwner = this
        binding.vm = vm

        val provider = prefs.mapProvider
@@ -223,12 +221,16 @@ class MapFragment : Fragment(), OnMapReadyCallback, MenuProvider {
            mapFragment =
                childFragmentManager.findFragmentByTag(mapFragmentTag) as MapFragment?
        }
-        if (mapFragment == null || mapFragment!!.priority[0] != getMapProvider(provider)) {
+        if (mapFragment == null || mapFragment!!.priority[0] != provider) {
            mapFragment = MapFragment()
            mapFragment!!.priority = arrayOf(
-                getMapProvider(provider),
-                MapFactory.GOOGLE,
-                MapFactory.MAPLIBRE
+                when (provider) {
+                    "mapbox" -> MapFragment.MAPBOX
+                    "google" -> MapFragment.GOOGLE
+                    else -> null
+                },
+                MapFragment.GOOGLE,
+                MapFragment.MAPBOX
            )
            childFragmentManager
                .beginTransaction()
@@ -273,7 +275,7 @@ class MapFragment : Fragment(), OnMapReadyCallback, MenuProvider {

            // set map padding so that compass is not obstructed by toolbar
            mapTopPadding = systemWindowInsetTop + (48 * density).toInt() + (16 * density).toInt()
-            // if we actually use map.setPadding here, MapLibre will re-trigger onApplyWindowInsets
+            // if we actually use map.setPadding here, Mapbox will re-trigger onApplyWindowInsets
            // and cause an infinite loop. So we rely on onMapReady being called later than
            // onApplyWindowInsets.

@@ -291,20 +293,10 @@ class MapFragment : Fragment(), OnMapReadyCallback, MenuProvider {
        return binding.root
    }

-    private fun getMapProvider(provider: String) = when (provider) {
-        "mapbox" -> MapFactory.MAPLIBRE
-        "google" -> MapFactory.GOOGLE
-        else -> null
-    }
-
    val bottomSheetCollapsible
        get() = resources.getBoolean(R.bool.bottom_sheet_collapsible)

    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        if (!prefs.welcomeDialogShown || !prefs.dataSourceSet || !prefs.privacyAccepted) {
-            findNavController().navigate(R.id.onboarding)
-        }
-
        requireActivity().addMenuProvider(this, viewLifecycleOwner, Lifecycle.State.RESUMED)

        mapFragment!!.getMapAsync(this)
@@ -366,11 +358,9 @@ class MapFragment : Fragment(), OnMapReadyCallback, MenuProvider {

            binding.appLogo.root.animate().alpha(1f)
                .withEndAction {
-                    if (_binding == null) return@withEndAction
                    binding.appLogo.root.animate().alpha(0f).apply {
                        startDelay = 1000
                    }.withEndAction {
-                        if (_binding == null) return@withEndAction
                        binding.appLogo.root.visibility = View.GONE
                        binding.search.visibility = View.VISIBLE
                        binding.search.alpha = 0f
@@ -394,6 +384,9 @@ class MapFragment : Fragment(), OnMapReadyCallback, MenuProvider {

    override fun onResume() {
        super.onResume()
+        val hostActivity = activity as? MapsActivity ?: return
+        hostActivity.fragmentCallback = this
+
        vm.reloadPrefs()
        if (requestingLocationUpdates && requireContext().checkAnyLocationPermission()
        ) {
@@ -425,7 +418,7 @@ class MapFragment : Fragment(), OnMapReadyCallback, MenuProvider {
            val charger = vm.charger.value?.data
            if (charger != null) {
                if (lifecycle.currentState.isAtLeast(Lifecycle.State.STARTED)) {
-                    (requireActivity() as MapsActivity).navigateTo(charger, binding.root)
+                    (requireActivity() as MapsActivity).navigateTo(charger)
                }
            }
        }
@@ -438,7 +431,7 @@ class MapFragment : Fragment(), OnMapReadyCallback, MenuProvider {
        binding.detailView.sourceButton.setOnClickListener {
            val charger = vm.charger.value?.data
            if (charger != null) {
-                (activity as? MapsActivity)?.openUrl(charger.url, binding.root)
+                (activity as? MapsActivity)?.openUrl(charger.url)
            }
        }
        binding.detailView.btnChargeprice.setOnClickListener {
@@ -451,16 +444,12 @@ class MapFragment : Fragment(), OnMapReadyCallback, MenuProvider {
                    extras
                )
            } else {
-                (activity as? MapsActivity)?.openUrl(
-                    ChargepriceApi.getPoiUrl(charger),
-                    binding.root,
-                    false
-                )
+                (activity as? MapsActivity)?.openUrl(ChargepriceApi.getPoiUrl(charger), false)
            }
        }
        binding.detailView.btnChargerWebsite.setOnClickListener {
            val charger = vm.charger.value?.data ?: return@setOnClickListener
-            charger.chargerUrl?.let { (activity as? MapsActivity)?.openUrl(it, binding.root) }
+            charger.chargerUrl?.let { (activity as? MapsActivity)?.openUrl(it) }
        }
        binding.detailView.btnLogin.setOnClickListener {
            findNavController().safeNavigate(
@@ -468,7 +457,7 @@ class MapFragment : Fragment(), OnMapReadyCallback, MenuProvider {
            )
        }
        binding.detailView.imgPredictionSource.setOnClickListener {
-            (activity as? MapsActivity)?.openUrl(getString(R.string.fronyx_url), binding.root)
+            (activity as? MapsActivity)?.openUrl(getString(R.string.fronyx_url))
        }
        binding.detailView.btnPredictionHelp.setOnClickListener {
            MaterialAlertDialogBuilder(requireContext())
@@ -508,7 +497,7 @@ class MapFragment : Fragment(), OnMapReadyCallback, MenuProvider {
                R.id.menu_edit -> {
                    val charger = vm.charger.value?.data
                    if (charger?.editUrl != null) {
-                        (activity as? MapsActivity)?.openUrl(charger.editUrl, binding.root)
+                        (activity as? MapsActivity)?.openUrl(charger.editUrl)
                        if (vm.apiId.value == "goingelectric") {
                            // instructions specific to GoingElectric
                            Toast.makeText(
@@ -875,7 +864,6 @@ class MapFragment : Fragment(), OnMapReadyCallback, MenuProvider {
                        if (photo == photos[position] && imageCacheKey != null) {
                            placeholderMemoryCacheKey(imageCacheKey)
                        }
-                        allowHardware(false)
                    }
                }
                    .withTransitionFrom(view as ImageView)
@@ -924,10 +912,10 @@ class MapFragment : Fragment(), OnMapReadyCallback, MenuProvider {
                    if (charger != null) {
                        when (it.icon) {
                            R.drawable.ic_location, R.drawable.ic_address -> {
-                                (activity as? MapsActivity)?.showLocation(charger, binding.root)
+                                (activity as? MapsActivity)?.showLocation(charger)
                            }
                            R.drawable.ic_fault_report -> {
-                                (activity as? MapsActivity)?.openUrl(charger.url, binding.root)
+                                (activity as? MapsActivity)?.openUrl(charger.url)
                            }

                            R.drawable.ic_payment -> {
@@ -935,12 +923,7 @@ class MapFragment : Fragment(), OnMapReadyCallback, MenuProvider {
                            }

                            R.drawable.ic_network -> {
-                                charger.networkUrl?.let {
-                                    (activity as? MapsActivity)?.openUrl(
-                                        it,
-                                        binding.root
-                                    )
-                                }
+                                charger.networkUrl?.let { (activity as? MapsActivity)?.openUrl(it) }
                            }
                        }
                    }
@@ -1059,7 +1042,7 @@ class MapFragment : Fragment(), OnMapReadyCallback, MenuProvider {
            .setTitle(R.string.charge_cards)
            .setItems(names.toTypedArray()) { _, i ->
                val card = data[i]
-                (activity as? MapsActivity)?.openUrl("https:${card.url}", binding.root)
+                (activity as? MapsActivity)?.openUrl("https:${card.url}")
            }.show()
    }

@@ -1067,14 +1050,9 @@ class MapFragment : Fragment(), OnMapReadyCallback, MenuProvider {
        this.map = map
        vm.mapProjection = map.projection
        val context = this.context ?: return
-        view ?: return
-
        chargerIconGenerator = ChargerIconGenerator(context, map.bitmapDescriptorFactory)

-        vm.mapTrafficSupported.value =
-            mapFragment?.let { AnyMap.Feature.TRAFFIC_LAYER in it.supportedFeatures } ?: false
-
-        if (BuildConfig.FLAVOR.contains("google") && mapFragment!!.priority[0] == MapFactory.GOOGLE) {
+        if (BuildConfig.FLAVOR.contains("google") && mapFragment!!.priority[0] == MapFragment.GOOGLE) {
            // Google Maps: icons can be generated in background thread
            lifecycleScope.launch {
                withContext(Dispatchers.Default) {
@@ -1082,7 +1060,7 @@ class MapFragment : Fragment(), OnMapReadyCallback, MenuProvider {
                }
            }
        } else {
-            // MapLibre: needs to be run on main thread
+            // Mapbox: needs to be run on main thread
            chargerIconGenerator.preloadCache()
        }

@@ -1125,8 +1103,7 @@ class MapFragment : Fragment(), OnMapReadyCallback, MenuProvider {
            }
        }
        vm.mapPosition.observe(viewLifecycleOwner) {
-            val target = map.cameraPosition.target ?: return@observe
-            binding.scaleView.update(map.cameraPosition.zoom, target.latitude)
+            binding.scaleView.update(map.cameraPosition.zoom, map.cameraPosition.target.latitude)
        }

        map.setOnCameraMoveStartedListener { reason ->
@@ -1143,7 +1120,6 @@ class MapFragment : Fragment(), OnMapReadyCallback, MenuProvider {
            }
        }
        map.setOnMarkerClickListener { marker ->
-            val map = this@MapFragment.map ?: return@setOnMarkerClickListener false
            when (marker) {
                in markers -> {
                    vm.chargerSparse.value = markers[marker]
@@ -1550,6 +1526,10 @@ class MapFragment : Fragment(), OnMapReadyCallback, MenuProvider {
        else -> false
    }

+    override fun getRootView(): View {
+        return binding.root
+    }
+
    @RequiresPermission(anyOf = [ACCESS_FINE_LOCATION, ACCESS_COARSE_LOCATION])
    private fun requestLocationUpdates() {
        locationEngine.requestLocationUpdates(
@@ -1599,15 +1579,8 @@ class MapFragment : Fragment(), OnMapReadyCallback, MenuProvider {
        }
    }

-    override fun onDestroyView() {
-        super.onDestroyView()
-        detailsDialog.onDestroy()
-        vm.mapProjection = null
-
-        map = null
-        mapFragment = null
-        _binding = null
-        vm.mapProjection = null
+    override fun onDestroy() {
+        super.onDestroy()
        /* if we don't dismiss the popup menu, it will be recreated in some cases
        (split-screen mode) and then have references to a destroyed fragment. */
        popupMenu?.dismiss()
--- a/app/src/main/java/net/vonforst/evmap/fragment/preference/AboutFragment.kt
+++ b/app/src/main/java/net/vonforst/evmap/fragment/preference/AboutFragment.kt
@@ -78,25 +78,22 @@ class AboutFragment : PreferenceFragmentCompat() {
            }

            "website" -> {
-                (activity as? MapsActivity)?.openUrl(getString(R.string.website_url), requireView())
+                (activity as? MapsActivity)?.openUrl(getString(R.string.website_url))
                true
            }

            "github_link" -> {
-                (activity as? MapsActivity)?.openUrl(getString(R.string.github_link), requireView())
+                (activity as? MapsActivity)?.openUrl(getString(R.string.github_link))
                true
            }

            "privacy" -> {
-                (activity as? MapsActivity)?.openUrl(
-                    getString(R.string.privacy_link),
-                    requireView()
-                )
+                (activity as? MapsActivity)?.openUrl(getString(R.string.privacy_link))
                true
            }

            "faq" -> {
-                (activity as? MapsActivity)?.openUrl(getString(R.string.faq_link), requireView())
+                (activity as? MapsActivity)?.openUrl(getString(R.string.faq_link))
                true
            }
            "oss_licenses" -> {
@@ -118,29 +115,12 @@ class AboutFragment : PreferenceFragmentCompat() {
                findNavController().safeNavigate(AboutFragmentDirections.actionAboutToGithubSponsors())
                true
            }
-            "mastodon" -> {
-                (activity as? MapsActivity)?.openUrl(
-                    getString(R.string.mastodon_url),
-                    requireView()
-                )
-                true
-            }
            "twitter" -> {
-                (activity as? MapsActivity)?.openUrl(getString(R.string.twitter_url), requireView())
+                (activity as? MapsActivity)?.openUrl(getString(R.string.twitter_url))
                true
            }
            "goingelectric" -> {
-                (activity as? MapsActivity)?.openUrl(
-                    getString(R.string.goingelectric_forum_url),
-                    requireView()
-                )
-                true
-            }
-            "tffforum" -> {
-                (activity as? MapsActivity)?.openUrl(
-                    getString(R.string.tff_forum_url),
-                    requireView()
-                )
+                (activity as? MapsActivity)?.openUrl(getString(R.string.goingelectric_forum_url))
                true
            }
            else -> super.onPreferenceTreeClick(preference)
--- a/app/src/main/java/net/vonforst/evmap/fragment/preference/ChargepriceSettingsFragment.kt
+++ b/app/src/main/java/net/vonforst/evmap/fragment/preference/ChargepriceSettingsFragment.kt
@@ -8,9 +8,7 @@ import android.text.style.RelativeSizeSpan
 import android.view.View
 import androidx.fragment.app.viewModels
 import androidx.preference.CheckBoxPreference
-import androidx.preference.ListPreference
 import net.vonforst.evmap.R
-import net.vonforst.evmap.currencyDisplayName
 import net.vonforst.evmap.ui.MultiSelectDialogPreference
 import net.vonforst.evmap.viewmodel.SettingsViewModel
 import net.vonforst.evmap.viewmodel.viewModelFactory
@@ -75,11 +73,6 @@ class ChargepriceSettingsFragment : BaseSettingsFragment() {
            }
        }
        updateNativeIntegrationState()
-
-        val currencyPreference = findPreference<ListPreference>("chargeprice_currency")!!
-        currencyPreference.entries = currencyPreference.entryValues.map {
-            currencyDisplayName(it.toString()).replaceFirstChar { it.uppercase() }
-        }.toTypedArray()
    }

    private fun updateNativeIntegrationState() {
--- a/app/src/main/java/net/vonforst/evmap/fragment/preference/UiSettingsFragment.kt
+++ b/app/src/main/java/net/vonforst/evmap/fragment/preference/UiSettingsFragment.kt
@@ -9,11 +9,9 @@ import android.provider.Settings
 import androidx.preference.CheckBoxPreference
 import androidx.preference.ListPreference
 import androidx.preference.Preference
-import com.github.erfansn.localeconfigx.configuredLocales
 import net.vonforst.evmap.R
 import net.vonforst.evmap.isAppInstalled
 import net.vonforst.evmap.ui.getAppLocale
-import net.vonforst.evmap.ui.map
 import net.vonforst.evmap.ui.updateAppLocale
 import net.vonforst.evmap.ui.updateNightMode

@@ -25,7 +23,11 @@ class UiSettingsFragment : BaseSettingsFragment() {
    override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
        setPreferencesFromResource(R.xml.settings_ui, rootKey)

-        setupLangPref()
+        langPref = findPreference("language")!!
+        langPref.setOnPreferenceChangeListener { _, newValue ->
+            updateAppLocale(newValue as String)
+            true
+        }

        val appLinkPref = findPreference<Preference>("applink_associate")!!
        appLinkPref.isVisible = Build.VERSION.SDK_INT >= Build.VERSION_CODES.S
@@ -34,31 +36,6 @@ class UiSettingsFragment : BaseSettingsFragment() {
        immediateNavPref.isVisible = isGoogleMapsInstalled()
    }

-    private fun setupLangPref() {
-        langPref = findPreference("language")!!
-        val configuredLocales = requireContext().configuredLocales
-        val numLocalesByLang = configuredLocales.map { it.language }.groupingBy { it }.eachCount()
-
-        val localeNames = configuredLocales.map {
-            val name = if (numLocalesByLang[it.language]!! > 1) {
-                it.getDisplayName(it)
-            } else {
-                it.getDisplayLanguage(it)
-            }
-            name.replaceFirstChar { c -> c.uppercase(it) }
-        }
-        val localeTags = configuredLocales.map { it.toLanguageTag() }
-
-        langPref.entries =
-            (listOf(getString(R.string.pref_language_device_default)) + localeNames).toTypedArray()
-        langPref.entryValues =
-            (listOf("default") + localeTags).toTypedArray()
-        langPref.setOnPreferenceChangeListener { _, newValue ->
-            updateAppLocale(newValue as String)
-            true
-        }
-    }
-
    private fun isGoogleMapsInstalled() =
        requireContext().packageManager.isAppInstalled("com.google.android.apps.maps")

--- a/app/src/main/java/net/vonforst/evmap/storage/PreferenceDataSource.kt
+++ b/app/src/main/java/net/vonforst/evmap/storage/PreferenceDataSource.kt
@@ -108,11 +108,14 @@ class PreferenceDataSource(val context: Context) {
    val darkmode: String
        get() = sp.getString("darkmode", "default")!!

-    val mapProvider: String
+    var mapProvider: String
        get() = sp.getString(
            "map_provider",
            context.getString(R.string.pref_map_provider_default)
        )!!
+        set(value) {
+            sp.edit().putString("map_provider", value).apply()
+        }

    var searchProvider: String
        get() = sp.getString(
--- a/app/src/main/java/net/vonforst/evmap/ui/ConfigurationUtils.kt
+++ b/app/src/main/java/net/vonforst/evmap/ui/ConfigurationUtils.kt
@@ -3,9 +3,8 @@ package net.vonforst.evmap.ui
 import android.content.Context
 import androidx.appcompat.app.AppCompatDelegate
 import androidx.core.os.LocaleListCompat
-import com.github.erfansn.localeconfigx.configuredLocales
+import net.vonforst.evmap.R
 import net.vonforst.evmap.storage.PreferenceDataSource
-import java.util.Locale


 fun updateNightMode(prefs: PreferenceDataSource) {
@@ -34,11 +33,8 @@ fun getAppLocale(context: Context): String? {
        "default"
    } else {
        val arr = Array(locales.size()) { locales.get(it)!!.toLanguageTag() }
-        val choices = context.configuredLocales
-        choices.getFirstMatch(arr)?.toLanguageTag()
+        val choices =
+            context.resources.getStringArray(R.array.pref_language_values).joinToString(",")
+        LocaleListCompat.forLanguageTags(choices).getFirstMatch(arr)?.toLanguageTag()
    }
 }
-
-inline fun <R> LocaleListCompat.map(transform: (Locale) -> R): List<R> = List(size()) {
-    transform(get(it)!!)
-}
--- a/app/src/main/java/net/vonforst/evmap/viewmodel/ChargepriceViewModel.kt
+++ b/app/src/main/java/net/vonforst/evmap/viewmodel/ChargepriceViewModel.kt
@@ -8,6 +8,7 @@ import jsonapi.Relationships
 import jsonapi.ResourceIdentifier
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.launch
+import net.vonforst.evmap.EspressoIdlingResource
 import net.vonforst.evmap.api.chargeprice.*
 import net.vonforst.evmap.api.equivalentPlugTypes
 import net.vonforst.evmap.model.ChargeLocation
@@ -48,6 +49,7 @@ class ChargepriceViewModel(
                } else {
                    value = Resource.loading(null)
                    viewModelScope.launch {
+                        EspressoIdlingResource.increment()
                        value = try {
                            val result = api.getVehicles()
                            Resource.success(result.filter {
@@ -57,6 +59,8 @@ class ChargepriceViewModel(
                            Resource.error(e.message, null)
                        } catch (e: HttpException) {
                            Resource.error(e.message, null)
+                        } finally {
+                            EspressoIdlingResource.decrement()
                        }
                    }
                }
@@ -253,6 +257,7 @@ class ChargepriceViewModel(

        loadPricesJob?.cancel()
        loadPricesJob = viewModelScope.launch {
+            EspressoIdlingResource.increment()
            try {
                val result = api.getChargePrices(
                    ChargepriceRequest(
@@ -295,6 +300,8 @@ class ChargepriceViewModel(
            } catch (e: HttpException) {
                chargePrices.value = Resource.error(e.message, null)
                chargePriceMeta.value = Resource.error(e.message, null)
+            } finally {
+                EspressoIdlingResource.decrement()
            }
        }
    }
--- a/app/src/main/java/net/vonforst/evmap/viewmodel/MapViewModel.kt
+++ b/app/src/main/java/net/vonforst/evmap/viewmodel/MapViewModel.kt
@@ -3,16 +3,7 @@ package net.vonforst.evmap.viewmodel
 import android.app.Application
 import android.graphics.Point
 import android.os.Parcelable
-import androidx.lifecycle.AndroidViewModel
-import androidx.lifecycle.LiveData
-import androidx.lifecycle.MediatorLiveData
-import androidx.lifecycle.MutableLiveData
-import androidx.lifecycle.SavedStateHandle
-import androidx.lifecycle.distinctUntilChanged
-import androidx.lifecycle.liveData
-import androidx.lifecycle.map
-import androidx.lifecycle.switchMap
-import androidx.lifecycle.viewModelScope
+import androidx.lifecycle.*
 import com.car2go.maps.AnyMap
 import com.car2go.maps.Projection
 import com.car2go.maps.model.LatLng
@@ -27,22 +18,13 @@ import net.vonforst.evmap.api.availability.ChargeLocationStatus
 import net.vonforst.evmap.api.availability.tesla.Pricing
 import net.vonforst.evmap.api.createApi
 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.openchargemap.OCMConnection
 import net.vonforst.evmap.api.openchargemap.OCMReferenceData
 import net.vonforst.evmap.api.stringProvider
 import net.vonforst.evmap.autocomplete.PlaceWithBounds
-import net.vonforst.evmap.model.ChargeLocation
-import net.vonforst.evmap.model.Chargepoint
-import net.vonforst.evmap.model.ChargepointListItem
-import net.vonforst.evmap.model.FILTERS_DISABLED
-import net.vonforst.evmap.model.FILTERS_FAVORITES
-import net.vonforst.evmap.model.Favorite
-import net.vonforst.evmap.model.FavoriteWithDetail
-import net.vonforst.evmap.model.FilterValue
-import net.vonforst.evmap.model.FilterValues
-import net.vonforst.evmap.model.getMultipleChoiceValue
-import net.vonforst.evmap.model.getSliderValue
+import net.vonforst.evmap.model.*
 import net.vonforst.evmap.storage.AppDatabase
 import net.vonforst.evmap.storage.ChargeLocationsRepository
 import net.vonforst.evmap.storage.EncryptedPreferenceDataStore
@@ -265,14 +247,13 @@ class MapViewModel(application: Application, private val state: SavedStateHandle
        it.data?.extraData as? Pricing
    }

-    //private val predictionRepository = PredictionRepository(application)
+    private val predictionRepository = PredictionRepository(application)

    val predictionData: LiveData<PredictionData> = availability.switchMap { av ->
-        /*liveData {
+        liveData {
            val charger = charger.value?.data ?: return@liveData
            emit(predictionRepository.getPredictionData(charger, av.data, filteredConnectors.value))
-        }*/
-        MutableLiveData()
+        }
    }

    val myLocationEnabled: MutableLiveData<Boolean> by lazy {
@@ -301,12 +282,6 @@ class MapViewModel(application: Application, private val state: SavedStateHandle
        }
    }

-    val mapTrafficSupported: MutableLiveData<Boolean> by lazy {
-        MutableLiveData<Boolean>().apply {
-            value = false
-        }
-    }
-
    val mapTrafficEnabled: MutableLiveData<Boolean> by lazy {
        MutableLiveData<Boolean>().apply {
            value = prefs.mapTrafficEnabled
--- a/app/src/main/res/layout-sw720dp/fragment_onboarding_android_auto.xml
+++ b/app/src/main/res/layout-sw720dp/fragment_onboarding_android_auto.xml
@@ -59,6 +59,8 @@
        app:layout_constraintBottom_toTopOf="@+id/welcomeTitle"
        app:layout_constraintEnd_toEndOf="parent"
        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintVertical_bias="0.7"
        app:srcCompat="@drawable/android_auto" />

 </androidx.constraintlayout.widget.ConstraintLayout>
--- a/app/src/main/res/layout/fragment_donate_referral.xml
+++ b/app/src/main/res/layout/fragment_donate_referral.xml
@@ -8,8 +8,7 @@
    android:layout_marginStart="16dp"
    android:layout_marginTop="16dp"
    android:layout_marginEnd="16dp"
-    android:layout_marginBottom="16dp"
-    tools:ignore="WebViewLayout">
+    android:layout_marginBottom="16dp">

    <TextView
        android:id="@+id/textView20"
@@ -19,27 +18,75 @@
        android:text="@string/referrals"
        android:textAppearance="@style/TextAppearance.Material3.TitleSmall"
        android:textColor="?colorPrimary"
-        app:layout_constraintBottom_toTopOf="@+id/referralWebView"
+        app:layout_constraintBottom_toTopOf="@+id/textView21"
        app:layout_constraintEnd_toEndOf="parent"
        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintVertical_chainStyle="packed" />

    <TextView
        android:id="@+id/textView21"
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
+        android:layout_marginBottom="8dp"
        android:text="@string/referrals_info"
-        app:layout_constraintBottom_toTopOf="@+id/referralWebView"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintBottom_toTopOf="@+id/referral_tesla"
+        app:layout_constraintStart_toStartOf="@+id/textView20"
        app:layout_constraintTop_toBottomOf="@+id/textView20" />

-    <WebView
-        android:id="@+id/referralWebView"
-        android:layout_width="match_parent"
+    <androidx.constraintlayout.helper.widget.Flow
+        android:layout_width="0dp"
        android:layout_height="wrap_content"
-        android:layout_marginTop="8dp"
+        android:orientation="horizontal"
+        app:constraint_referenced_ids="referral_tesla,referral_juicify,referral_geldfuereauto,referral_maingau,referral_eprimo,referral_ewieeinfach"
+        app:flow_horizontalGap="16dp"
+        app:flow_horizontalStyle="packed"
+        app:flow_verticalAlign="baseline"
+        app:flow_wrapMode="chain"
        app:layout_constraintEnd_toEndOf="parent"
        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/textView21" />
+        app:layout_constraintTop_toBottomOf="@+id/textView21" />
+
+    <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" />
+
+    <Button
+        android:id="@+id/referral_juicify"
+        style="@style/Widget.Material3.Button.TonalButton"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/referral_juicify" />
+
+    <Button
+        android:id="@+id/referral_geldfuereauto"
+        style="@style/Widget.Material3.Button.TonalButton"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/referral_geldfuereauto" />
+
+    <Button
+        android:id="@+id/referral_maingau"
+        style="@style/Widget.Material3.Button.TonalButton"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/referral_maingau" />
+
+    <Button
+        android:id="@+id/referral_eprimo"
+        style="@style/Widget.Material3.Button.TonalButton"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/referral_eprimo" />
+
+    <Button
+        android:id="@+id/referral_ewieeinfach"
+        style="@style/Widget.Material3.Button.TonalButton"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/referral_ewieeinfach" />
 </androidx.constraintlayout.widget.ConstraintLayout>
--- a/app/src/main/res/layout/map_layers.xml
+++ b/app/src/main/res/layout/map_layers.xml
@@ -80,7 +80,6 @@
            android:layout_marginEnd="16dp"
            android:text="@string/map_details"
            android:textAppearance="@style/TextAppearance.Material3.TitleSmall"
-            app:goneUnless="@{vm.mapTrafficSupported}"
            app:layout_constraintEnd_toEndOf="parent"
            app:layout_constraintHorizontal_bias="0.0"
            app:layout_constraintStart_toStartOf="parent"
@@ -95,7 +94,6 @@
            android:layout_marginEnd="16dp"
            android:text="@string/map_traffic"
            android:checked="@={vm.mapTrafficEnabled}"
-            app:goneUnless="@{vm.mapTrafficSupported}"
            app:layout_constraintEnd_toEndOf="parent"
            app:layout_constraintStart_toStartOf="parent"
            app:layout_constraintTop_toBottomOf="@+id/textView23" />
--- a/app/src/main/res/navigation/nav_graph.xml
+++ b/app/src/main/res/navigation/nav_graph.xml
@@ -2,7 +2,6 @@
 <navigation xmlns:android="http://schemas.android.com/apk/res/android"
    xmlns:app="http://schemas.android.com/apk/res-auto"
    xmlns:tools="http://schemas.android.com/tools"
-    app:startDestination="@id/map"
    android:id="@+id/nav_graph">

    <navigation
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@@ -3,14 +3,14 @@
    <string name="no_browser_app_found">Nejprve si nainstalujte webový prohlížeč</string>
    <string name="address">Adresa</string>
    <string name="hours">Otevírací doba</string>
-    <string name="open_247"><![CDATA[<b>Otevřeno 24/7</b>]]></string>
-    <string name="closed"><![CDATA[<b>Zavřeno</b>]]></string>
-    <string name="open_closesat"><![CDATA[<b>Otevřeno</b> · Zavírá v %s]]></string>
-    <string name="closed_opensat"><![CDATA[<b>Zavřeno</b> · Otevírá v %s]]></string>
+    <string name="open_247"><b>Otevřeno 24/7</b></string>
+    <string name="closed"><b>Zavřeno</b></string>
+    <string name="open_closesat"><b>Otevřeno</b> · Zavírá v %s</string>
+    <string name="closed_opensat"><b>Zavřeno</b> · Otevírá v %s</string>
    <string name="cost">Cena</string>
-    <string name="cost_detail"><![CDATA[<b>Nabíjení:</b> %1$s · <b>Parkování:</b> %2$s]]></string>
-    <string name="cost_detail_charging"><![CDATA[<b>%s nabíjení</b>]]></string>
-    <string name="cost_detail_parking"><![CDATA[<b>%s parkování</b>]]></string>
+    <string name="cost_detail"><b>Nabíjení:</b> %1$s · <b>Parkování:</b> %2$s</string>
+    <string name="cost_detail_charging"><b>%s nabíjení</b></string>
+    <string name="cost_detail_parking"><b>%s parkování</b></string>
    <string name="charging_free">Bezplatné</string>
    <string name="charging_paid">Placené</string>
    <string name="parking_free">Bezplatné</string>
@@ -177,7 +177,7 @@
    <string name="crash_report_comment_prompt">Níže můžete přidat komentář:</string>
    <string name="powered_by_mapbox">používá službu Mapbox</string>
    <string name="pref_search_provider">Poskytovatel vyhledávání</string>
-    <string name="pref_search_provider_info"><![CDATA[Načtení dat pro vyhledávání bývá drahé, obzvláště z Map Google. Zvažte prosím poslání finančního daru v nabídce „O aplikaci“ → „Přispět“.]]></string>
+    <string name="pref_search_provider_info">Načtení dat pro vyhledávání bývá drahé, obzvláště z Map Google. Zvažte prosím poslání finančního daru v nabídce „O aplikaci“ → „Přispět“.</string>
    <string name="github_sponsors">GitHub Sponsors</string>
    <string name="donate_desc">Podpořte vývoj aplikace EVMap jednorázovým darem</string>
    <string name="github_sponsors_desc">Podpořte EVMap ve službě GitHub Sponsors</string>
@@ -199,6 +199,8 @@
    <string name="autocomplete_connection_error">Nepodařilo se načíst návrhy</string>
    <string name="pref_language_device_default">Podle zařízení</string>
    <string name="pref_darkmode_device_default">Podle zařízení</string>
+    <string name="pref_chargeprice_currency_sek">Švédská koruna (SEK)</string>
+    <string name="pref_chargeprice_currency_usd">Americký dolar (USD)</string>
    <string name="pref_provider_google_maps">Mapy Google</string>
    <string name="pref_provider_osm_mapbox">OpenStreetMap (Mapbox)</string>
    <string name="about_contributors">Přispěvatelé</string>
@@ -281,7 +283,7 @@
    <string name="loading">Načítání…</string>
    <string name="auto_multipage_goto">Stránka %d</string>
    <string name="reload">Obnovit</string>
-    <string name="accept_privacy"><![CDATA[Přečetl/a jsem si a souhlasím se <a href=\"%s\">zásadami ochrany osobních údajů</a> aplikace EVMap.]]></string>
+    <string name="accept_privacy"><![CDATA[Přečetl/a jsem si a souhlasím se <a href="%s">zásadami ochrany osobních údajů</a> aplikace EVMap.]]></string>
    <string name="referrals">Referenční odkazy</string>
    <string name="referrals_info">Pro podpoření vývojáře svým nákupem můžete také použít jeden z referenčních odkazů níže.</string>
    <string name="generic_connection_error">Nepodařilo se načíst data</string>
@@ -344,11 +346,21 @@
    <string name="chargeprice_connection_error">Nepodařilo se načíst ceny</string>
    <string name="unknown_operator">Neznámý operátor</string>
    <string name="data_source_goingelectric">GoingElectric.de</string>
-    <string name="data_source_openchargemap_desc"><![CDATA[Celosvětové, s různou kvalitou. Popisy jsou v angličtině nebo v místním jazyce. Spravováno komunitou, v některých zemích obsahuje vládní data (např. Severní Amerika, Spojené království, Francie, Norsko).]]></string>
+    <string name="data_source_openchargemap_desc">Celosvětové, s různou kvalitou. Popisy jsou v angličtině nebo v místním jazyce. Spravováno komunitou, v některých zemích obsahuje vládní data (např. Severní Amerika, Spojené království, Francie, Norsko).</string>
    <string name="privacy_link">https://ev-map.app/privacypolicy/</string>
    <string name="chargeprice_faq_link">https://ev-map.app/faq/#price-comparison-feature</string>
    <string name="pref_darkmode_always_on">vždy zapnut</string>
    <string name="pref_darkmode_always_off">vždy vypnut</string>
+    <string name="pref_chargeprice_currency_chf">Švýcarský frank (CHF)</string>
+    <string name="pref_chargeprice_currency_czk">Česká koruna (CZK)</string>
+    <string name="pref_chargeprice_currency_dkk">Dánská koruna (DKK)</string>
+    <string name="pref_chargeprice_currency_eur">Euro (EUR)</string>
+    <string name="pref_chargeprice_currency_gbp">Britská libra (GBP)</string>
+    <string name="pref_chargeprice_currency_huf">Maďarský forint (HUF)</string>
+    <string name="pref_chargeprice_currency_hrk">Chorvatská kuna (HRK)</string>
+    <string name="pref_chargeprice_currency_isk">Islandská koruna (ISK)</string>
+    <string name="pref_chargeprice_currency_nok">Norská koruna (NOK)</string>
+    <string name="pref_chargeprice_currency_pln">Polský zlotý (PLN)</string>
    <string name="chargeprice_header_other_tariffs">Ostatní plány</string>
    <string name="charger_website">Webové stránky</string>
    <string name="compass">Kompas</string>
@@ -371,6 +383,4 @@
    <string name="pref_chargeprice_native_integration">Porovnání cen v EVMap</string>
    <string name="pref_chargeprice_native_integration_on">Data o cenách budou zobrazena přímo v EVMap</string>
    <string name="pref_chargeprice_native_integration_off">Tlačítko porovnání cen bude odkazovat na aplikaci nebo web Chargeprice</string>
-    <string name="pref_provider_osm">OpenStreetMap</string>
-    <string name="filterprofile_name_not_unique">Již existuje profil filtru s tímto názvem</string>
 </resources>
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -110,9 +110,7 @@
    <string name="and_n_others">und %d weitere</string>
    <string name="pref_map_provider">Kartenanbieter</string>
    <string name="twitter">Twitter</string>
-    <string name="mastodon">Mastodon</string>
    <string name="goingelectric_forum">Forenthread bei GoingElectric.de</string>
-    <string name="tff_forum">Forenthread im TFF-Forum</string>
    <string name="contact">Kontakt</string>
    <string name="menu_report_new_charger">Ladesäule melden</string>
    <string name="edit_at_datasource">Bei %s bearbeiten</string>
@@ -153,7 +151,6 @@
    <string name="delete">Löschen</string>
    <string name="save_as_profile">Als Profil speichern</string>
    <string name="save_profile_enter_name">Gib den Namen des Filterprofils ein:</string>
-    <string name="filterprofile_name_not_unique">Ein Filterprofil mit diesem Namen existiert bereits</string>
    <string name="filterprofiles_empty_state">Du hast keine Filterprofile gespeichert</string>
    <string name="welcome_to_evmap">Willkommen bei EVMap</string>
    <string name="welcome_1">Finde Ladestationen für Elektroautos in deiner Nähe</string>
@@ -235,7 +232,7 @@
    <string name="crash_report_comment_prompt">Du kannst unten noch einen Kommentar hinzufügen:</string>
    <string name="powered_by_mapbox">powered by Mapbox</string>
    <string name="pref_search_provider">Anbieter für Ortssuche</string>
-    <string name="pref_search_provider_info"><![CDATA[Die Daten für die Ortssuche, vor allem von Google Maps, sind relativ teuer. Über eine Spende unter „Über EVMap → Spenden“ würde ich mich sehr freuen.]]></string>
+    <string name="pref_search_provider_info">Die Daten für die Ortssuche, vor allem von Google Maps, sind relativ teuer. Über eine Spende unter \"Über EVMap -&gt; Spenden\" würde ich mich sehr freuen.</string>
    <string name="github_sponsors">GitHub Sponsors</string>
    <string name="donate_desc">Unterstütze die Weiterentwicklung von EVMap mit einer einmaligen Spende</string>
    <string name="github_sponsors_desc">Unterstütze EVMap über GitHub Sponsors</string>
@@ -243,7 +240,6 @@
    <string name="privacy_link">https://ev-map.app/de/privacypolicy/</string>
    <string name="faq_link">https://ev-map.app/de/faq/</string>
    <string name="chargeprice_faq_link">https://ev-map.app/de/faq/#preisvergleichsfunktion</string>
-    <string name="referral_link">https://ev-map.app/de/referrals/</string>
    <string name="required">erforderlich</string>
    <string name="edit_filter_profile">„%s“ bearbeiten</string>
    <string name="pref_search_delete_recent">Suchverlauf löschen</string>
@@ -262,8 +258,19 @@
    <string name="pref_darkmode_device_default">Geräteeinstellung verwenden</string>
    <string name="pref_darkmode_always_on">immer an</string>
    <string name="pref_darkmode_always_off">immer aus</string>
+    <string name="pref_chargeprice_currency_chf">Schweizer Franken (CHF)</string>
+    <string name="pref_chargeprice_currency_czk">Tschechische Krone (CZK)</string>
+    <string name="pref_chargeprice_currency_dkk">Dänische Krone (DKK)</string>
+    <string name="pref_chargeprice_currency_eur">Euro (EUR)</string>
+    <string name="pref_chargeprice_currency_gbp">Britisches Pfund (GBP)</string>
+    <string name="pref_chargeprice_currency_hrk">Kroatische Kuna (HRK)</string>
+    <string name="pref_chargeprice_currency_huf">Ungarischer Forint (HUF)</string>
+    <string name="pref_chargeprice_currency_isk">Isländische Krone (ISK)</string>
+    <string name="pref_chargeprice_currency_nok">Norwegische Krone (NOK)</string>
+    <string name="pref_chargeprice_currency_pln">Polnischer Złoty (PLN)</string>
+    <string name="pref_chargeprice_currency_sek">Schwedische Krone (SEK)</string>
+    <string name="pref_chargeprice_currency_usd">US-Dollar (USD)</string>
    <string name="pref_provider_google_maps">Google Maps</string>
-    <string name="pref_provider_osm">OpenStreetMap</string>
    <string name="pref_provider_osm_mapbox">OpenStreetMap (Mapbox)</string>
    <string name="about_contributors">Mitwirkende</string>
    <string name="about_contributors_text">Dank an alle Mitwirkenden für ihre Beiträge von Code und Übersetzungen für EVMap:</string>
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -128,6 +128,9 @@
    <string name="pref_darkmode_device_default">Utiliser le réglage de l\'appareil</string>
    <string name="pref_darkmode_always_on">toujours allumé</string>
    <string name="pref_darkmode_always_off">toujours éteint</string>
+    <string name="pref_chargeprice_currency_czk">Couronne tchèque (CZK)</string>
+    <string name="pref_chargeprice_currency_dkk">Couronne danoise (DKK)</string>
+    <string name="pref_chargeprice_currency_eur">Euro (EUR)</string>
    <string name="show_more">plus…</string>
    <string name="fav_remove">Retirer des favoris</string>
    <string name="amenities">Commodités</string>
@@ -227,6 +230,9 @@
        <item quantity="other">(seront mis en évidence dans la comparaison des prix)</item>
    </plurals>
    <string name="deleted_recent_search_results">Les résultats de recherche récents ont été supprimés</string>
+    <string name="pref_chargeprice_currency_gbp">Livre sterling (GBP)</string>
+    <string name="pref_chargeprice_currency_isk">Couronne islandaise (ISK)</string>
+    <string name="pref_chargeprice_currency_nok">Couronne norvégienne (NOK)</string>
    <string name="settings_charger_data">Stations de recharge</string>
    <string name="got_it">J\'ai compris</string>
    <string name="powered_by_mapbox">propulsé par Mapbox</string>
@@ -240,9 +246,15 @@
    <string name="settings_data_sources">Sources de données</string>
    <string name="data_sources_description">Veuillez choisir une source de données pour les stations de recharge. Vous pourrez la modifier ultérieurement dans les paramètres de l\'application.</string>
    <string name="pref_search_provider_info">Les données pour la recherche de lieux, en particulier celles de Google Maps, sont relativement coûteuses à récupérer. Veuillez envisager de faire un don via \"À propos\" -&gt; \"Faire un don\".</string>
+    <string name="pref_chargeprice_currency_hrk">Kuna croate (HRK)</string>
    <string name="help">Aide</string>
    <string name="pref_chargeprice_allow_unbalanced_load_summary">Autoriser la charge en courant alternatif monophasé de plus de 4,5 kW</string>
+    <string name="pref_chargeprice_currency_huf">Forint hongrois (HUF)</string>
+    <string name="pref_chargeprice_currency_pln">Złoty polonais (PLN)</string>
    <string name="pref_map_rotate_gestures_on">Utilisez deux doigts pour faire pivoter la carte</string>
+    <string name="pref_chargeprice_currency_chf">Franc suisse (CHF)</string>
+    <string name="pref_chargeprice_currency_usd">Dollar américain (USD)</string>
+    <string name="pref_chargeprice_currency_sek">Couronne suédoise (SEK)</string>
    <string name="cost_detail_charging"><b>Recharge %s</b></string>
    <string name="cost_detail_parking"><b>Stationnement %s</b></string>
    <string name="navigate">Naviguer vers</string>
--- a/app/src/main/res/values-nb-rNO/strings.xml
+++ b/app/src/main/res/values-nb-rNO/strings.xml
@@ -84,6 +84,10 @@
    <string name="got_it">Skjønner</string>
    <string name="settings_data_sources">Datakilder</string>
    <string name="pref_search_delete_recent">Slett nylige søkeresultater</string>
+    <string name="pref_chargeprice_currency_eur">Euro (EUR)</string>
+    <string name="pref_chargeprice_currency_nok">Norske kroner (NOK)</string>
+    <string name="pref_chargeprice_currency_gbp">Britiske pund (GBP)</string>
+    <string name="pref_chargeprice_currency_sek">Svenske kroner (SEK)</string>
    <string name="realtime_data_loading">Sjekker sanntidsstatus …</string>
    <string name="realtime_data_source">Kilde for sanntidsstatus (beta): %s</string>
    <string name="realtime_data_unavailable">Sanntidsstatus utilgjengelig</string>
@@ -179,9 +183,16 @@
    <string name="deleted_recent_search_results">Nylige søkeresultater slettet</string>
    <string name="autocomplete_connection_error">Kunne ikke laste inn forslag</string>
    <string name="pref_language_device_default">Enhetsforvalg</string>
+    <string name="pref_chargeprice_currency_chf">Sveitserfranc (CHF)</string>
+    <string name="pref_chargeprice_currency_czk">Tsjekkiske kroner (CZK)</string>
+    <string name="pref_chargeprice_currency_dkk">Danske kroner (DKK)</string>
+    <string name="pref_chargeprice_currency_hrk">Kroatiske kroner (HRK)</string>
    <string name="pref_map_rotate_gestures_on">Bruk to fingre for å rotere kartet</string>
    <string name="pref_map_rotate_gestures_off">Rotasjon avslått (nord er alltid oppover)</string>
    <string name="refresh_live_data">oppdater sanntidsstatus</string>
+    <string name="pref_chargeprice_currency_isk">Islandske kroner (ISK)</string>
+    <string name="pref_chargeprice_currency_pln">Polske zloty (PLN)</string>
+    <string name="pref_chargeprice_currency_usd">Amerikanske dollar (USD)</string>
    <string name="filters_deactivated">Filtre deaktivert</string>
    <string name="pref_navigate_use_maps_off">Navigasjonsknapp åpner kartprogrammet med laderposisjon</string>
    <string name="show_more">flere …</string>
@@ -206,6 +217,7 @@
    <string name="filter_exclude_faults">Utelat ladere med rapporterte feil</string>
    <string name="plug_cee_blau">CEE blå</string>
    <string name="filter_open_247">Døgnåpent</string>
+    <string name="pref_chargeprice_currency_huf">Ungarske forint (HUF)</string>
    <string name="donation_dialog_detail">EVMap er fri programvare. Kodebidrag mottas med takk. Overvei å gi din støtte gjennom GitHub-sponsorer for å dekke løpende utgifter.</string>
    <string name="pref_chargeprice_allow_unbalanced_load_summary">Tillat enfaselading over 4.5 kW</string>
    <string name="connectors">Tilkobling</string>
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -5,6 +5,7 @@
    <string name="pref_search_provider_info">Gegevens opzoeken is duur, vooral via Google Maps. Overweeg aub om een donatie te doen via “Over” -&gt; “Doneer”.</string>
    <string name="data_source_openchargemap_desc">Werelddekkend, met variabele kwaliteit. Beschrijving in Engels of lokale taal. Onderhouden door de gebruikers. Ook open overheidswege eens in sommige landen (bv. Noord-Amerika, UK, Frankrijk, Noorwegen).</string>
    <string name="pref_darkmode_always_off">altijd uit</string>
+    <string name="pref_chargeprice_currency_eur">Euro (EUR)</string>
    <string name="chargeprice_select_car_first">Kiest eerst je voertuig model in de instellingen</string>
    <string name="chargeprice_no_compatible_connectors">Geen compatibele connectoren aan dit laadstation</string>
    <string name="license">Licentie</string>
@@ -227,6 +228,17 @@
    <string name="pref_language_device_default">Standaardtaal van toestel</string>
    <string name="pref_darkmode_device_default">Standaardinstelling van toestel</string>
    <string name="pref_darkmode_always_on">altijd aan</string>
+    <string name="pref_chargeprice_currency_chf">Zwitserse Frank (CHF)</string>
+    <string name="pref_chargeprice_currency_czk">Tsjechische koruna (CZK)</string>
+    <string name="pref_chargeprice_currency_dkk">Deense kroon (DKK)</string>
+    <string name="pref_chargeprice_currency_gbp">Britse Pond (GBP)</string>
+    <string name="pref_chargeprice_currency_hrk">Kroatische Kuna (HRK)</string>
+    <string name="pref_chargeprice_currency_huf">Hongaarse Forint (HUF)</string>
+    <string name="pref_chargeprice_currency_isk">IJslandse Kroon (ISK)</string>
+    <string name="pref_chargeprice_currency_nok">Noorse Kroon (NOK)</string>
+    <string name="pref_chargeprice_currency_pln">Poolse Złoty (PLN)</string>
+    <string name="pref_chargeprice_currency_sek">Zweedse Kroon (SEK)</string>
+    <string name="pref_chargeprice_currency_usd">Amerikaanse Dollar (USD)</string>
    <string name="pref_provider_google_maps">Google Maps</string>
    <string name="edit_filter_profile">“%s” editeren</string>
    <string name="compass">Kompas</string>
--- a/app/src/main/res/values-pt/strings.xml
+++ b/app/src/main/res/values-pt/strings.xml
@@ -148,7 +148,7 @@
    <string name="pref_data_source">Fonte da informação</string>
    <string name="data_source_openchargemap">Open Charge Map</string>
    <string name="next">próximo</string>
-    <string name="data_source_openchargemap_desc"><![CDATA[Mundial, com vários níveis de qualidade. Descrições em inglês ou língua local. Mantido pela comunidade e usa informação governamental publica em alguns países (ex: América do Norte, Reino Unido, França, Noruega, etc).]]></string>
+    <string name="data_source_openchargemap_desc">Mundial, com vários níveis de qualidade. Descrições em inglês ou língua local. Mantido pela comunidade e usa informação governamental publica em alguns países (ex: América do Norte, Reino Unido, França, Noruega, etc).</string>
    <string name="get_started">Começar</string>
    <string name="lets_go">Vamos lá</string>
    <string name="crash_report_text">O EVMap encontrou um problema. Por favor envie um relatório do erro para o criador da app.</string>
@@ -160,7 +160,7 @@
    <string name="pref_map_rotate_gestures_on">Use dois dedos para girar o mapa</string>
    <string name="pref_map_rotate_gestures_off">Rotação desligada (norte sempre para cima)</string>
    <string name="refresh_live_data">atualizar estado em tempo real</string>
-    <string name="pref_search_provider_info"><![CDATA[As pesquisas são caras, especialmente quando o Google Maps é utilizado. Por favor considere doar através de "Sobre" → "Doar".]]></string>
+    <string name="pref_search_provider_info">As pesquisas são caras, especialmente se o Google Maps for utilizado. Por favor considere doar através de \"Sobre\" → \"Doar\".</string>
    <string name="github_sponsors_desc">Apoie o EVMap através do GitHub</string>
    <string name="unnamed_filter_profile">Filtro sem nome</string>
    <string name="deleted_recent_search_results">As pesquisas recentes foram eliminadas</string>
@@ -177,6 +177,11 @@
    <string name="pref_language_device_default">Língua do dispositivo</string>
    <string name="pref_darkmode_device_default">Padrão do dispositivo</string>
    <string name="pref_darkmode_always_on">Sempre ligado</string>
+    <string name="pref_chargeprice_currency_chf">Franco suíço (CHF)</string>
+    <string name="pref_chargeprice_currency_czk">Coroa checa (CZK)</string>
+    <string name="pref_chargeprice_currency_dkk">Coroa dinamarquesa (DKK)</string>
+    <string name="pref_chargeprice_currency_eur">Euro (EUR)</string>
+    <string name="pref_chargeprice_currency_gbp">Libra esterlina (GBP)</string>
    <string name="chargeprice_header_my_tariffs">Os meus planos</string>
    <string name="chargeprice_header_other_tariffs">Outros planos</string>
    <string name="developer_options">Opções de desenvolvedor</string>
@@ -205,18 +210,18 @@
    <string name="operator">Operador</string>
    <string name="network">Rede</string>
    <string name="hours">Horário de abertura</string>
-    <string name="open_247"><![CDATA[<b>Aberto 24/7</b>]]></string>
-    <string name="closed"><![CDATA[<b>Fechado</b>]]></string>
-    <string name="open_closesat"><![CDATA[<b>Aberto</b> · Fecha às %s]]></string>
-    <string name="closed_opensat"><![CDATA[<b>Fechado</b> · Abre às %s]]></string>
+    <string name="open_247"><b>Aberto 24/7</b></string>
+    <string name="closed"><b>Fechado</b></string>
+    <string name="open_closesat"><b>Aberto</b> · Fecha às %s</string>
+    <string name="closed_opensat"><b>Fechado</b> · Abre às %s</string>
    <string name="app_name">EVMap</string>
    <string name="title_activity_maps">EVMap</string>
    <string name="closed_unfmt">Fechado</string>
    <string name="holiday">Feriado</string>
    <string name="cost">Custo</string>
-    <string name="cost_detail"><![CDATA[<b>Carregamento:</b> %1$s · <b>Parque:</b> %2$s]]></string>
-    <string name="cost_detail_charging"><![CDATA[<b>Carregamento %s</b>]]></string>
-    <string name="cost_detail_parking"><![CDATA[<b>Parque %s</b>]]></string>
+    <string name="cost_detail"><b>Carregamento:</b> %1$s · <b>Parque:</b> %2$s</string>
+    <string name="cost_detail_charging"><b>Carregamento %s</b></string>
+    <string name="cost_detail_parking"><b>Parque %s</b></string>
    <string name="charging_free">Gratuito</string>
    <string name="charging_paid">Pago</string>
    <string name="parking_free">Gratuito</string>
@@ -282,6 +287,13 @@
    <string name="welcome_1">Encontre carregadores elétricos perto de si</string>
    <string name="close">Fechar</string>
    <string name="edit_filter_profile">Editar “%s”</string>
+    <string name="pref_chargeprice_currency_hrk">Cuna croata (HRK)</string>
+    <string name="pref_chargeprice_currency_huf">Florim húngaro (HUF)</string>
+    <string name="pref_chargeprice_currency_isk">Coroa islandesa (ISK)</string>
+    <string name="pref_chargeprice_currency_nok">Coroa norueguesa (NOK)</string>
+    <string name="pref_chargeprice_currency_pln">Złoty polaco (PLN)</string>
+    <string name="pref_chargeprice_currency_sek">Coroa sueca (SEK)</string>
+    <string name="pref_chargeprice_currency_usd">Dólar americano (USD)</string>
    <string name="pref_provider_google_maps">Google Maps</string>
    <string name="pref_provider_osm_mapbox">OpenStreetMap (Mapbox)</string>
    <string name="about_contributors">Contribuidores</string>
@@ -371,6 +383,4 @@
    <string name="pref_chargeprice_native_integration">Comparação de preços no EVMap</string>
    <string name="pref_chargeprice_native_integration_on">Os preços serão exibidos diretamente no EVMap</string>
    <string name="pref_chargeprice_native_integration_off">O botão de comparação de preços abrirá a app ou site do Chargeprice</string>
-    <string name="pref_provider_osm">OpenStreetMap</string>
-    <string name="filterprofile_name_not_unique">Já existe um filtro com este nome</string>
 </resources>
--- a/app/src/main/res/values-ro/strings.xml
+++ b/app/src/main/res/values-ro/strings.xml
@@ -259,6 +259,18 @@
    <string name="pref_darkmode_device_default">Implicit dispozitiv</string>
    <string name="pref_darkmode_always_on">permanent</string>
    <string name="pref_darkmode_always_off">dezactivat</string>
+    <string name="pref_chargeprice_currency_chf">Franci elvetieni (CHF)</string>
+    <string name="pref_chargeprice_currency_czk">Coroane cehe (CZK)</string>
+    <string name="pref_chargeprice_currency_dkk">Coroane daneze (DKK)</string>
+    <string name="pref_chargeprice_currency_eur">Euro (EUR)</string>
+    <string name="pref_chargeprice_currency_gbp">Lire sterline (GBP)</string>
+    <string name="pref_chargeprice_currency_hrk">Croatian kuna (HRK)</string>
+    <string name="pref_chargeprice_currency_huf">Forinti maghiari (HUF)</string>
+    <string name="pref_chargeprice_currency_isk">Coroane islandeze (ISK)</string>
+    <string name="pref_chargeprice_currency_nok">Coroane norvegiene (NOK)</string>
+    <string name="pref_chargeprice_currency_pln">Zloti polonezi (PLN)</string>
+    <string name="pref_chargeprice_currency_sek">Coroane suedeze (SEK)</string>
+    <string name="pref_chargeprice_currency_usd">Dolari americani (USD)</string>
    <string name="pref_provider_google_maps">Google Maps</string>
    <string name="pref_provider_osm_mapbox">OpenStreetMap (Mapbox)</string>
    <string name="about_contributors">Contribuitori</string>
--- a/app/src/main/res/values/arrays.xml
+++ b/app/src/main/res/values/arrays.xml
@@ -1,5 +1,27 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+    <string-array name="pref_language_names">
+        <item>@string/pref_language_device_default</item>
+        <item>@string/pref_language_en</item>
+        <item>@string/pref_language_de</item>
+        <item>@string/pref_language_cs</item>
+        <item>@string/pref_language_fr</item>
+        <item>@string/pref_language_nb_rNO</item>
+        <item>@string/pref_language_nl</item>
+        <item>@string/pref_language_pt</item>
+        <item>@string/pref_language_ro</item>
+    </string-array>
+    <string-array name="pref_language_values" translatable="false">
+        <item>default</item>
+        <item>en</item>
+        <item>de</item>
+        <item>cs</item>
+        <item>fr</item>
+        <item>nb-NO</item>
+        <item>nl</item>
+        <item>pt</item>
+        <item>ro</item>
+    </string-array>
    <string-array name="pref_darkmode_names">
        <item>@string/pref_darkmode_device_default</item>
        <item>@string/pref_darkmode_always_on</item>
@@ -10,7 +32,21 @@
        <item>on</item>
        <item>off</item>
    </string-array>
-    <string-array name="pref_chargeprice_currencies" translatable="false">
+    <string-array name="pref_chargeprice_currency_names">
+        <item>@string/pref_chargeprice_currency_chf</item>
+        <item>@string/pref_chargeprice_currency_czk</item>
+        <item>@string/pref_chargeprice_currency_dkk</item>
+        <item>@string/pref_chargeprice_currency_eur</item>
+        <item>@string/pref_chargeprice_currency_gbp</item>
+        <item>@string/pref_chargeprice_currency_hrk</item>
+        <item>@string/pref_chargeprice_currency_huf</item>
+        <item>@string/pref_chargeprice_currency_isk</item>
+        <item>@string/pref_chargeprice_currency_nok</item>
+        <item>@string/pref_chargeprice_currency_pln</item>
+        <item>@string/pref_chargeprice_currency_sek</item>
+        <item>@string/pref_chargeprice_currency_usd</item>
+    </string-array>
+    <string-array name="pref_chargeprice_currency_values" translatable="false">
        <item>CHF</item>
        <item>CZK</item>
        <item>DKK</item>
--- a/app/src/main/res/values/donottranslate.xml
+++ b/app/src/main/res/values/donottranslate.xml
@@ -5,14 +5,19 @@
    <string name="github_link">https://github.com/ev-map/EVMap</string>
    <string name="twitter_handle">\@ev_map</string>
    <string name="twitter_url">https://twitter.com/ev_map</string>
-    <string name="mastodon_handle">\@evmap\@electroverse.tech</string>
-    <string name="mastodon_url">https://electroverse.tech/@evmap</string>
    <string name="goingelectric_forum_url"><![CDATA[https://www.goingelectric.de/forum/viewtopic.php?f=5&t=56342]]></string>
-    <string name="tff_forum_url"><![CDATA[https://tff-forum.de/t/283834]]></string>
    <string name="github_sponsors_link">https://github.com/sponsors/johan12345/</string>
    <string name="chargeprice_api_url">https://api.chargeprice.app/v1/</string>
    <string name="fronyx_url">https://fronyx.io/</string>
    <string name="website_url">https://ev-map.app</string>
+    <string name="pref_language_en">English</string>
+    <string name="pref_language_de">Deutsch</string>
+    <string name="pref_language_fr">Français</string>
+    <string name="pref_language_nb_rNO">Norsk Bokmål</string>
+    <string name="pref_language_nl">Nederlands</string>
+    <string name="pref_language_pt">Português</string>
+    <string name="pref_language_ro">Romana</string>
+    <string name="pref_language_cs">Czech</string>
    <string name="about_contributors_list">
        Danilo Bargen\n
        Altonss\n
@@ -30,6 +35,17 @@
    <string name="hide_on_scroll_fab_behavior">net.vonforst.evmap.ui.HideOnScrollFabBehavior</string>
    <string name="paypal_link" translatable="false">https://paypal.me/johan98</string>
    <string name="donate_link" translatable="false">https://ev-map.app/donate/</string>
+    <string name="tesla_referral_link" translatable="false">http://ts.la/johan94494</string>
+    <string name="juicify_referral_link" translatable="false">https://trck.juicify.green/trck/eclick/9dba357fbfed1e82fb05c7ec004ee2972ea174ce46d8ae0d</string>
+    <string name="geldfuereauto_referral_link" translatable="false">https://trck.geld-fuer-eauto.de/trck/eclick/c4713e9520bdb8842a3f1fbfa3a0669b3e58421043df78ad</string>
+    <string name="maingau_referral_link" translatable="false">https://trck.maingau-energie.de/trck/eclick/799b39cda39575dab1dcd3351abeb77b62dc33e4f9558a57</string>
+    <string name="ewieeinfach_referral_link" translatable="false">https://trck.e-wie-einfach.de/trck/eclick/fca74c186b54e7287a62102a13e073be4fc963825b85f7df</string>
+    <string name="eprimo_referral_link" translatable="false">https://netzwerk.uppr.de/trck/eclick/781768d2e779806b5e09229932662c14adddd69323594c52</string>
+    <string name="referral_juicify" translatable="false">Juicify</string>
+    <string name="referral_geldfuereauto" translatable="false">Geld für eAuto</string>
+    <string name="referral_maingau" translatable="false">Maingau</string>
+    <string name="referral_ewieeinfach" translatable="false">E wie einfach</string>
+    <string name="referral_eprimo" translatable="false">eprimo</string>
    <string name="copyright_summary">©2020–2024 Johan von Forstner and contributors</string>
    <string name="acra_backend_url" translatable="false">https://acra.muc.vonforst.net/report</string>
 </resources>
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -110,9 +110,7 @@
    <string name="and_n_others">and %d others</string>
    <string name="pref_map_provider">Map provider</string>
    <string name="twitter">Twitter</string>
-    <string name="mastodon">Mastodon</string>
    <string name="goingelectric_forum">Forum thread at GoingElectric.de</string>
-    <string name="tff_forum">Forum thread at TFF-Forum.de</string>
    <string name="contact">Contact</string>
    <string name="menu_report_new_charger">New charger</string>
    <string name="edit_at_datasource">Edit at %s</string>
@@ -153,7 +151,6 @@
    <string name="delete">Delete</string>
    <string name="save_as_profile">Save as profile</string>
    <string name="save_profile_enter_name">Enter the name of the filter profile:</string>
-    <string name="filterprofile_name_not_unique">There is already a filter profile with that name</string>
    <string name="filterprofiles_empty_state">You have no filter profiles saved</string>
    <string name="welcome_to_evmap">Welcome to EVMap</string>
    <string name="welcome_1">Find electric vehicle chargers around you</string>
@@ -243,7 +240,6 @@
    <string name="privacy_link">https://ev-map.app/privacypolicy/</string>
    <string name="faq_link">https://ev-map.app/faq/</string>
    <string name="chargeprice_faq_link">https://ev-map.app/faq/#price-comparison-feature</string>
-    <string name="referral_link">https://ev-map.app/referrals/</string>
    <string name="required">required</string>
    <string name="edit_filter_profile">Edit “%s”</string>
    <string name="pref_search_delete_recent">Delete recent search results</string>
@@ -262,8 +258,19 @@
    <string name="pref_darkmode_device_default">Device default</string>
    <string name="pref_darkmode_always_on">always on</string>
    <string name="pref_darkmode_always_off">always off</string>
+    <string name="pref_chargeprice_currency_chf">Swiss franc (CHF)</string>
+    <string name="pref_chargeprice_currency_czk">Czech koruna (CZK)</string>
+    <string name="pref_chargeprice_currency_dkk">Danish krone (DKK)</string>
+    <string name="pref_chargeprice_currency_eur">Euro (EUR)</string>
+    <string name="pref_chargeprice_currency_gbp">Pound sterling (GBP)</string>
+    <string name="pref_chargeprice_currency_hrk">Croatian kuna (HRK)</string>
+    <string name="pref_chargeprice_currency_huf">Hungarian forint (HUF)</string>
+    <string name="pref_chargeprice_currency_isk">Icelandic króna (ISK)</string>
+    <string name="pref_chargeprice_currency_nok">Norwegian krone (NOK)</string>
+    <string name="pref_chargeprice_currency_pln">Polish złoty (PLN)</string>
+    <string name="pref_chargeprice_currency_sek">Swedish krona (SEK)</string>
+    <string name="pref_chargeprice_currency_usd">US dollar (USD)</string>
    <string name="pref_provider_google_maps">Google Maps</string>
-    <string name="pref_provider_osm">OpenStreetMap</string>
    <string name="pref_provider_osm_mapbox">OpenStreetMap (Mapbox)</string>
    <string name="about_contributors">Contributors</string>
    <string name="about_contributors_text">Thanks to all contributors for their coding and translation contributions to EVMap:</string>
--- a/app/src/main/res/xml/about.xml
+++ b/app/src/main/res/xml/about.xml
@@ -39,10 +39,6 @@
    </PreferenceCategory>

    <PreferenceCategory android:title="@string/contact">
-        <Preference
-            android:key="mastodon"
-            android:title="@string/mastodon"
-            android:summary="@string/mastodon_handle" />

        <Preference
            android:key="twitter"
@@ -53,10 +49,6 @@
            android:key="goingelectric"
            android:title="@string/goingelectric_forum" />

-        <Preference
-            android:key="tffforum"
-            android:title="@string/tff_forum" />
-
    </PreferenceCategory>

    <PreferenceCategory android:title="@string/other">
--- a/app/src/main/res/xml/settings_chargeprice.xml
+++ b/app/src/main/res/xml/settings_chargeprice.xml
@@ -18,7 +18,8 @@
    <ListPreference
        android:key="chargeprice_currency"
        android:title="@string/pref_chargeprice_currency"
-        android:entryValues="@array/pref_chargeprice_currencies"
+        android:entries="@array/pref_chargeprice_currency_names"
+        android:entryValues="@array/pref_chargeprice_currency_values"
        android:defaultValue="EUR"
        app:useSimpleSummaryProvider="true" />
    <CheckBoxPreference
--- a/app/src/main/res/xml/settings_data.xml
+++ b/app/src/main/res/xml/settings_data.xml
@@ -10,11 +10,11 @@
            android:defaultValue="goingelectric"
            app:useSimpleSummaryProvider="true" />

-        <!--<CheckBoxPreference
+        <CheckBoxPreference
            android:key="prediction_enabled"
            android:title="@string/pref_prediction_enabled"
            android:defaultValue="true"
-            android:summary="@string/pref_prediction_enabled_summary" />-->
+            android:summary="@string/pref_prediction_enabled_summary" />

        <Preference
            android:key="tesla_account"
--- a/app/src/main/res/xml/settings_ui.xml
+++ b/app/src/main/res/xml/settings_ui.xml
@@ -4,6 +4,8 @@
        android:key="language"
        android:persistent="false"
        android:title="@string/pref_language"
+        android:entries="@array/pref_language_names"
+        android:entryValues="@array/pref_language_values"
        android:defaultValue="default"
        android:summary="%s" />
    <ListPreference
--- a/app/src/normal/java/auto/CarInfo.kt
+++ b/app/src/normal/java/auto/CarInfo.kt
@@ -1,6 +0,0 @@
-import androidx.car.app.CarContext
-import androidx.car.app.hardware.CarHardwareManager
-import androidx.car.app.hardware.info.CarInfo
-
-val CarContext.patchedCarInfo: CarInfo
-    get() = (this.getCarService(CarContext.HARDWARE_SERVICE) as CarHardwareManager).carInfo
--- a/app/src/release/java/net/vonforst/evmap/DebugInits.kt
+++ b/app/src/release/java/net/vonforst/evmap/DebugInits.kt
@@ -7,4 +7,10 @@ fun addDebugInterceptors(context: Context) {

 }

-fun OkHttpClient.Builder.addDebugInterceptors(): OkHttpClient.Builder = this
+fun OkHttpClient.Builder.addDebugInterceptors(): OkHttpClient.Builder = this
+
+object EspressoIdlingResource {
+    fun increment() {}
+
+    fun decrement() {}
+}
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -1,16 +1,16 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.

 buildscript {
-    val kotlinVersion by extra("1.9.24")
+    val kotlinVersion by extra("1.9.10")
    val aboutLibsVersion by extra("10.9.1")
-    val navVersion by extra("2.7.7")
+    val navVersion by extra("2.7.5")
    repositories {
        google()
        mavenCentral()
        gradlePluginPortal()
    }
    dependencies {
-        classpath("com.android.tools.build:gradle:8.4.2")
+        classpath("com.android.tools.build:gradle:8.2.2")
        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion")
        classpath("com.mikepenz.aboutlibraries.plugin:aboutlibraries-plugin:$aboutLibsVersion")
        classpath("androidx.navigation:navigation-safe-args-gradle-plugin:$navVersion")
@@ -24,7 +24,11 @@ allprojects {
    repositories {
        google()
        mavenCentral()
+        //noinspection JcenterRepositoryObsolete
        maven { setUrl("https://jitpack.io") }
+        maven {
+            setUrl("https://raw.githubusercontent.com/ev-map/mapbox-gl-native-android/mvn")
+        }
    }
 }

--- a/doc/api_keys.md
+++ b/doc/api_keys.md
@@ -17,12 +17,6 @@ be put into the app in the form of a resource file called `apikeys.xml` under
   <string name="mapbox_key" translatable="false">
      insert your Mapbox key here
   </string>
-   <string name="jawg_key" translatable="false">
-      insert your Jawg Maps key here
-   </string>
-   <string name="arcgis_key" translatable="false">
-      insert your ArcGIS Maps key here
-   </string>
   <string name="goingelectric_key" translatable="false">
      insert your GoingElectric key here
   </string>
@@ -58,12 +52,10 @@ Map providers

 The different Map SDKs are wrapped by our [fork](https://github.com/ev-map/AnyMaps) of the
 [AnyMaps](https://github.com/sharenowTech/AnyMaps) library to provide a common API. The `google`
-build flavor of the app includes both Google Maps and OpenStreetMap (vector tiles from
-[Jawg Maps](https://www.jawg.io/en/) through [MapLibre](https://maplibre.org/)) and allows the user
-to switch between the two, while the `foss` flavor only includes OSM.
+build flavor of the app includes both Google Maps and Mapbox and allows the user to switch between
+the two, while the `foss` flavor only includes the Mapbox SDK.

-> ⚠️ When testing the app using the Android Emulator, we recommend using Google Maps and not
-> OSM/MapLibre, as the latter has
+> ⚠️ When testing the app using the Android Emulator, we recommend using Google Maps and not Mapbox, as the latter has
 [issues displaying the markers](https://github.com/mapbox/mapbox-gl-native/issues/10829). It works fine on real Android devices.

 ### Google Maps
@@ -85,39 +77,9 @@ to switch between the two, while the `foss` flavor only includes OSM.

 </details>

-### Jawg Maps
-
-[Dynamic Maps](https://www.jawg.io/docs/apidocs/maps/)
-
-<details>
-<summary>How to obtain an API key</summary>
-
-1. [Sign up](https://www.jawg.io/lab) for a Jawg account
-2. Under [Access Tokens](https://www.jawg.io/lab/access-tokens), copy your default access token or
-   create a new one. Do not restrict it to a specific origin (this setting is not compatible with
-   Android apps).
-
-</details>
-
-### ArcGIS
-
-[World Imagery basemap](https://www.arcgis.com/home/item.html?id=10df2279f9684e4a9f6a7f08febac2a9)\
-*We use this for the satellite map, as [Jawg's satellite
-style](https://blog.jawg.io/satellite-imaging/) does not have global coverage.*
-
-<details>
-<summary>How to obtain an API key</summary>
-
-1. [Sign up](https://developers.arcgis.com/dashboard/) for an ArcGIS developer account
-2. In the dashboard, copy your default API key or create a new one. It has to have access to the
-   "Basemaps" service.
-
-</details>
-
 ### Mapbox

-[Geocoding API](https://docs.mapbox.com/api/search/geocoding/)\
-*previously we also used Mapbox's Maps SDK, but this has now been switched to Jawg Maps.*
+[Maps SDK for Android](https://docs.mapbox.com/android/maps)

 <details>
 <summary>How to obtain an API key</summary>
@@ -129,6 +91,7 @@ style](https://blog.jawg.io/satellite-imaging/) does not have global coverage.*

 </details>

+
 Charging station databases
 --------------------------

--- a/fastlane/metadata/android/cs-CZ/full_description.txt
+++ b/fastlane/metadata/android/cs-CZ/full_description.txt
@@ -5,7 +5,7 @@ Funkce:
 - Zobrazuje všechny nabíjecí stanice z komunitou spravovaných databází GoingElectric.de a Open Charge Map.
 - Informace o dostupnosti v reálném čase (pouze v Evropě)
 - Integrované srovnání cen pomocí Chargeprice.app (pouze v Evropě)
- Mapové podklady z OpenStreetMap
+- Mapové podklady z OpenStreetMap (Mapbox)
 - Vyhledávání míst
 - Pokročilé možnosti filtrování, včetně uložených profilů filtrů
 - Seznam oblíbených, také s informacemi o dostupnosti
--- a/fastlane/metadata/android/de-DE/changelogs/214.txt
+++ b/fastlane/metadata/android/de-DE/changelogs/214.txt
@@ -1,7 +0,0 @@
-Änderungen:
- OpenStreetMap-Karten: Wechsel der Datenquelle von Mapbox zu Jawg Maps
-
-Fehler behoben:
- App-Shortcuts repariert
- Anzeigefehler behoben
- Abstürze behoben
--- a/fastlane/metadata/android/de-DE/changelogs/220.txt
+++ b/fastlane/metadata/android/de-DE/changelogs/220.txt
@@ -1,2 +0,0 @@
-Fehler behoben:
- Unterstützung für Geräte mit OpenGL ES 2.0 wiederhergestellt
--- a/fastlane/metadata/android/de-DE/changelogs/222.txt
+++ b/fastlane/metadata/android/de-DE/changelogs/222.txt
@@ -1,2 +0,0 @@
-Fehler behoben:
- Abstürze behoben
--- a/fastlane/metadata/android/de-DE/changelogs/224.txt
+++ b/fastlane/metadata/android/de-DE/changelogs/224.txt
@@ -1,3 +0,0 @@
-Fehler behoben:
- Probleme mit OpenStreetMap behoben
- Abstürze behoben
--- a/fastlane/metadata/android/de-DE/changelogs/226.txt
+++ b/fastlane/metadata/android/de-DE/changelogs/226.txt
@@ -1,2 +0,0 @@
-Fehler behoben:
- Abstürze behoben
--- a/fastlane/metadata/android/de-DE/changelogs/228.txt
+++ b/fastlane/metadata/android/de-DE/changelogs/228.txt
@@ -1,2 +0,0 @@
-Fehler behoben:
- Abstürze behoben
--- a/fastlane/metadata/android/de-DE/changelogs/230.txt
+++ b/fastlane/metadata/android/de-DE/changelogs/230.txt
@@ -1,2 +0,0 @@
-Fehler behoben:
- Abstürze behoben
--- a/fastlane/metadata/android/de-DE/changelogs/244.txt
+++ b/fastlane/metadata/android/de-DE/changelogs/244.txt
@@ -1,2 +0,0 @@
-Fehler behoben:
- Abstürze behoben
--- a/fastlane/metadata/android/de-DE/full_description.txt
+++ b/fastlane/metadata/android/de-DE/full_description.txt
@@ -5,7 +5,7 @@ Funktionen:
 - Anzeige der Stromtankstellen aus den Stromtankstellenverzeichnissen von GoingElectric.de und Open Charge Map
 - Echtzeit-Verfügbarkeitsanzeige für viele Ladesäulen (nur in Europa)
 - Integrierter Preisvergleich für die jeweilige Ladesäule mit Chargeprice.app (nur in Europa)
- Kartendaten von OpenStreetMap
+- Kartendaten von OpenStreetMap (Mapbox)
 - Suche nach Orten
 - Erweiterte Filterfunktionen, Filterprofile speichern
 - Favoritenliste, auch mit Anzeige der Verfügbarkeit
--- a/fastlane/metadata/android/de-DE/images/icon.png
+++ b/fastlane/metadata/android/de-DE/images/icon.png
--- a/fastlane/metadata/android/en-US/changelogs/214.txt
+++ b/fastlane/metadata/android/en-US/changelogs/214.txt
@@ -1,7 +0,0 @@
-Changes:
- OpenStreetMap maps: Change data source from Mapbox to Jawg Maps
-
-Bugfixes:
- Fixed app shortcuts
- Fixed display errors
- Fixed crashes
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
johan12345	2e1e22a44b	adjust disk size	2024-05-12 22:29:49 +02:00
johan12345	d638a88f4d	update SDK	2024-05-12 18:57:02 +02:00
johan12345	b9c08a8e75	change screenshot size	2024-05-12 15:13:11 +02:00
johan12345	ab2a77d25a	remove CleanStatusBar (not needed on ATD)	2024-05-12 14:33:45 +02:00
johan12345	e0ddc9f734	use androidx takeScreenshot	2024-05-10 17:52:28 +02:00
johan12345	168fa244d3	fix name of output file	2024-05-10 00:08:25 +02:00
johan12345	76388ccc6e	no emulator metrics	2024-05-09 23:37:16 +02:00
johan12345	76aac7dae4	use ATD system image	2024-05-09 23:35:02 +02:00
johan12345	ee8b586079	implement automatic screenshot generation	2024-05-09 23:17:09 +02:00