add Jawg Maps sponsor logo

Migrate Mapbox -> MapLibre
Use Jawg Maps for basemap, ArcGIS for satellite maps fixes #141 refs #169, #197 hide traffic checkbox if traffic is not supported by map
2025-12-30 18:47:46 -05:00 · 2024-05-08 21:39:29 +02:00 · 2024-05-08 21:39:29 +02:00
59 changed files with 403 additions and 679 deletions
--- 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
@@ -43,14 +43,13 @@ EVMap uses and put them into the app in the form of a resource file called `apik
 `app/src/main/res/values`. You can find more information on which API keys are necessary for which
 features and how they can be obtained in our [documentation page](doc/api_keys.md).

-There are four different build flavors, `googleNormal`, `fossNormal`, `googleAutomotive`, and
-`fossAutomotive`.
+There are three different build flavors, `googleNormal`, `fossNormal` and `googleAutomotive`.

 - The `foss` variants only use OSM 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.
@@ -84,17 +83,6 @@ into new languages.
 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 href="https://fronyx.io/"><img src="https://github.com/ev-map/EVMap/blob/master/_img/powered_by_fronyx.svg" alt="Powered by Fronyx" height="68"/></a><br>
-Since September 2022, for certain charging stations, **Fronyx** provide us free access to their API
-for availability predictions.
+Since mid 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/_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
@@ -10,20 +10,21 @@ plugins {
    id("com.mikepenz.aboutlibraries.plugin")
 }

+val supportedLocales = "en,de,fr,nb-rNO,nl,pt,ro,cs"

 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 = 228
-        versionName = "1.9.5"
+        versionCode = 212
+        versionName = "1.8.2"

        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
+        resourceConfigurations += supportedLocales.split(",")
+        buildConfigField("String", "supportedLocales", "\"$supportedLocales\"")
    }

    signingConfigs {
@@ -48,21 +49,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") {
@@ -108,9 +100,6 @@ android {
        disable += listOf("NullSafeMutableLiveData")
        warning += listOf("MissingTranslation")
    }
-    androidResources {
-        generateLocaleConfig = true
-    }

    testOptions {
        unitTests {
@@ -229,22 +218,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 +225,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 +244,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 +275,22 @@ 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 = "3e6c71410f"
+    val anyMapsVersion = "c087b3e7c2"
    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")
-    }
-    implementation("org.maplibre.gl:android-sdk:10.3.2-pre3") {
-        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-maplibre:$anyMapsVersion")

    // 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 +301,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")

@@ -354,7 +316,7 @@ dependencies {
    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")

@@ -371,7 +333,7 @@ dependencies {

    // 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")
--- 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/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -41,7 +41,8 @@
        android:label="@string/app_name"
        android:roundIcon="@mipmap/ic_launcher_round"
        android:supportsRtl="true"
-        android:theme="@style/AppTheme">
+        android:theme="@style/AppTheme"
+        android:localeConfig="@xml/locales_config">

        <meta-data
            android:name="com.mapbox.ACCESS_TOKEN"
@@ -347,8 +348,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
@@ -60,7 +60,6 @@ class MapsActivity : AppCompatActivity(),

        setContentView(R.layout.activity_maps)

-        val drawerLayout = findViewById<DrawerLayout>(R.id.drawer_layout)
        appBarConfiguration = AppBarConfiguration(
            setOf(
                R.id.map,
@@ -68,7 +67,7 @@ class MapsActivity : AppCompatActivity(),
                R.id.about,
                R.id.settings
            ),
-            drawerLayout
+            findViewById<DrawerLayout>(R.id.drawer_layout)
        )
        val navHostFragment =
            supportFragmentManager.findFragmentById(R.id.nav_host_fragment) as NavHostFragment
@@ -88,17 +87,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
@@ -116,125 +104,134 @@ 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(
+                            chargerId = intent.getLongExtra(EXTRA_CHARGER_ID, 0),
+                            latLng = LatLng(
+                                intent.getDoubleExtra(EXTRA_LAT, 0.0),
+                                intent.getDoubleExtra(EXTRA_LON, 0.0)
+                            )
+                        ).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_CHARGER_ID)) {
-            deepLink = navController.createDeepLink()
-                .setDestination(R.id.map)
-                .setArguments(
-                    MapFragmentArgs(
-                        chargerId = intent.getLongExtra(EXTRA_CHARGER_ID, 0),
-                        latLng = LatLng(
-                            intent.getDoubleExtra(EXTRA_LAT, 0.0),
-                            intent.getDoubleExtra(EXTRA_LON, 0.0)
-                        )
-                    ).toBundle()
-                )
-                .createPendingIntent()
-        } 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) {
--- 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/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/auto/ChargerDetailScreen.kt
+++ b/app/src/main/java/net/vonforst/evmap/auto/ChargerDetailScreen.kt
@@ -13,7 +13,6 @@ import android.text.SpannableStringBuilder
 import android.text.Spanned
 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
@@ -550,13 +549,7 @@ class ChargerDetailScreen(ctx: CarContext, val chargerSparse: ChargeLocation) :
                CarContext.ACTION_NAVIGATE,
                Uri.parse("geo:${coord.lat},${coord.lng}")
            )
-        try {
-            carContext.startCarApp(intent)
-        } catch (e: HostException) {
-            CarToast.makeText(carContext, R.string.no_maps_app_found, CarToast.LENGTH_SHORT).show()
-        } catch (ignored: SecurityException) {
-
-        }
+        carContext.startCarApp(intent)
    }

    private fun loadCharger() {
--- 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
@@ -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)
    }
 }
--- 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/fragment/MapFragment.kt
+++ b/app/src/main/java/net/vonforst/evmap/fragment/MapFragment.kt
@@ -297,10 +297,6 @@ class MapFragment : Fragment(), OnMapReadyCallback, MapsActivity.FragmentCallbac
        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)
@@ -868,7 +864,6 @@ class MapFragment : Fragment(), OnMapReadyCallback, MapsActivity.FragmentCallbac
                        if (photo == photos[position] && imageCacheKey != null) {
                            placeholderMemoryCacheKey(imageCacheKey)
                        }
-                        allowHardware(false)
                    }
                }
                    .withTransitionFrom(view as ImageView)
@@ -1055,8 +1050,6 @@ class MapFragment : Fragment(), OnMapReadyCallback, MapsActivity.FragmentCallbac
        this.map = map
        vm.mapProjection = map.projection
        val context = this.context ?: return
-        view ?: return
-
        chargerIconGenerator = ChargerIconGenerator(context, map.bitmapDescriptorFactory)

        vm.mapTrafficSupported.value =
--- 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,37 +36,12 @@ 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")

    override fun onResume() {
        super.onResume()
-        langPref.value = getAppLocale(requireContext())
+        langPref.value = getAppLocale()
        immediateNavPref.isVisible = isGoogleMapsInstalled()
    }

--- a/app/src/main/java/net/vonforst/evmap/ui/ConfigurationUtils.kt
+++ b/app/src/main/java/net/vonforst/evmap/ui/ConfigurationUtils.kt
@@ -1,12 +1,9 @@
 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.BuildConfig
 import net.vonforst.evmap.storage.PreferenceDataSource
-import java.util.Locale
-

 fun updateNightMode(prefs: PreferenceDataSource) {
    AppCompatDelegate.setDefaultNightMode(
@@ -28,17 +25,13 @@ fun updateAppLocale(language: String) {
    )
 }

-fun getAppLocale(context: Context): String? {
+fun getAppLocale(): String? {
    val locales = AppCompatDelegate.getApplicationLocales()
    return if (locales.isEmpty) {
        "default"
    } else {
        val arr = Array(locales.size()) { locales.get(it)!!.toLanguageTag() }
-        val choices = context.configuredLocales
-        choices.getFirstMatch(arr)?.toLanguageTag()
+        LocaleListCompat.forLanguageTags(BuildConfig.supportedLocales).getFirstMatch(arr)
+            ?.toLanguageTag()
    }
-}
-
-inline fun <R> LocaleListCompat.map(transform: (Locale) -> R): List<R> = List(size()) {
-    transform(get(it)!!)
 }
--- a/app/src/main/res/layout/fragment_donate_referral.xml
+++ b/app/src/main/res/layout/fragment_donate_referral.xml
@@ -53,7 +53,6 @@
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
        android:text="@string/referral_tesla"
-        android:visibility="gone"
        app:icon="@drawable/ic_tesla" />

    <Button
--- 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/resources.properties
+++ b/app/src/main/res/resources.properties
@@ -1 +0,0 @@
-unqualifiedResLocale=en-US
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@@ -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>
@@ -349,6 +351,16 @@
    <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,5 +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>
 </resources>
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -258,6 +258,18 @@
    <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>
--- 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
@@ -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>
@@ -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>
@@ -368,8 +380,4 @@
    <string name="status_faulted">Fora de serviço</string>
    <string name="status_since">%1$s desde %2$s</string>
    <string name="status_unknown">Estado Desconhecido</string>
-    <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>
 </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
@@ -10,6 +10,14 @@
    <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
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -258,6 +258,18 @@
    <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>
--- a/app/src/main/res/xml/locales_config.xml
+++ b/app/src/main/res/xml/locales_config.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<locale-config xmlns:android="http://schemas.android.com/apk/res/android">
+    <locale android:name="en" />
+    <locale android:name="de" />
+    <locale android:name="fr" />
+    <locale android:name="nb-NO" />
+</locale-config>
--- 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_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/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,6 +24,7 @@ allprojects {
    repositories {
        google()
        mavenCentral()
+        //noinspection JcenterRepositoryObsolete
        maven { setUrl("https://jitpack.io") }
    }
 }
--- 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/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/fastlane/metadata/android/en-US/changelogs/220.txt
+++ b/fastlane/metadata/android/en-US/changelogs/220.txt
@@ -1,2 +0,0 @@
-Bugfixes:
- Restored support for devices with OpenGL ES 2.0
--- a/fastlane/metadata/android/en-US/changelogs/222.txt
+++ b/fastlane/metadata/android/en-US/changelogs/222.txt
@@ -1,2 +0,0 @@
-Bugfixes:
- Fixed crashes
--- a/fastlane/metadata/android/en-US/changelogs/224.txt
+++ b/fastlane/metadata/android/en-US/changelogs/224.txt
@@ -1,3 +0,0 @@
-Bugfixes:
- Fixed problems with OpenStreetMap
- Fixed crashes
--- a/fastlane/metadata/android/en-US/changelogs/226.txt
+++ b/fastlane/metadata/android/en-US/changelogs/226.txt
@@ -1,2 +0,0 @@
-Bugfixes:
- Fixed crashes
--- a/fastlane/metadata/android/en-US/changelogs/228.txt
+++ b/fastlane/metadata/android/en-US/changelogs/228.txt
@@ -1,2 +0,0 @@
-Bugfixes:
- Fixed crashes
--- a/fastlane/metadata/android/en-US/images/icon.png
+++ b/fastlane/metadata/android/en-US/images/icon.png
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 #Sat Aug 06 15:33:46 CEST 2022
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
Author	SHA1	Message	Date
johan12345	1a830fda5b	add Jawg Maps sponsor logo	2024-05-08 21:39:29 +02:00
johan12345	3df83f2d56	Migrate Mapbox -> MapLibre Use Jawg Maps for basemap, ArcGIS for satellite maps fixes #141 refs #169, #197 hide traffic checkbox if traffic is not supported by map	2024-05-08 21:39:29 +02:00