Release 1.9.2

https://github.com/coil-kt/coil/issues/159

.github/FUNDING.yml

@@ -1,2 +1,2 @@
 github: johan12345
-custom: ['https://paypal.me/johan98', 'http://ts.la/johan94494']
+custom: ['https://paypal.me/johan98', 'https://ev-map.app/donate/']

.github/workflows/apikeys-ci.xml

@@ -1,6 +1,8 @@
 <resources>
    <string name="google_maps_key" templateMergeStrategy="preserve" translatable="false">ci</string>
    <string name="mapbox_key" translatable="false">ci</string>
+   <string name="jawg_key" translatable="false">ci</string>
+   <string name="arcgis_key" translatable="false">ci</string>
    <string name="goingelectric_key" translatable="false">ci</string>
    <string name="chargeprice_key" translatable="false">ci</string>
    <string name="openchargemap_key" translatable="false">ci</string>

.github/workflows/release.yml

@@ -14,7 +14,7 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Set up Java environment
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           java-version: 17
           distribution: 'zulu'
@@ -30,6 +30,8 @@ jobs:
           OPENCHARGEMAP_API_KEY: ${{ secrets.OPENCHARGEMAP_API_KEY }}
           CHARGEPRICE_API_KEY: ${{ secrets.CHARGEPRICE_API_KEY }}
           MAPBOX_API_KEY: ${{ secrets.MAPBOX_API_KEY }}
+          JAWG_API_KEY: ${{ secrets.JAWG_API_KEY }}
+          ARCGIS_API_KEY: ${{ secrets.ARCGIS_API_KEY }}
           GOOGLE_MAPS_API_KEY: ${{ secrets.GOOGLE_MAPS_API_KEY }}
           FRONYX_API_KEY: ${{ secrets.FRONYX_API_KEY }}
           ACRA_CRASHREPORT_CREDENTIALS: ${{ secrets.ACRA_CRASHREPORT_CREDENTIALS }}

.github/workflows/tests.yml

@@ -19,7 +19,7 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Set up Java environment
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           java-version: 17
           distribution: 'zulu'
@@ -34,3 +34,5 @@ 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

.gitignore

@@ -12,4 +12,5 @@ apikeys.xml
 /app/**/*.apk
 /_img/connectors/*.ai
 api-7125266970515251116-798419-8e2dda660c80.json
-output-metadata.json
+output-metadata.json
+licenses_*.csv

LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2020-2023 Johan von Forstner and contributors
+Copyright (c) 2020-2024 Johan von Forstner and contributors
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -24,7 +24,8 @@ Features
 - Android Auto & Android Automotive OS integration
 - No ads, fully open source
 - Compatible with Android 5.0 and above
-- Can use Google Maps or Mapbox (OpenStreetMap) as map backends - the version available on F-Droid only uses Mapbox.
+- Can use Google Maps or OpenStreetMap as map backends - the version available on F-Droid only uses
+  OSM.
 
 Screenshots
 -----------
@@ -37,17 +38,19 @@ Development setup
 The App is developed using Android Studio and should pretty much work out-of-the-box when you clone
 the Git repository and open the project with Android Studio.
 
-The only exception is that you need to obtain some free API keys for the different data sources that
+The only exception is that you need to obtain some API keys for the different data sources that
 EVMap uses and put them into the app in the form of a resource file called `apikeys.xml` under
 `app/src/main/res/values`. You can find more information on which API keys are necessary for which
 features and how they can be obtained in our [documentation page](doc/api_keys.md).
 
-There are three different build flavors, `googleNormal`, `fossNormal` and `googleAutomotive`.
-- The `foss` variants only use Mapbox data and should run on most Android devices, even without
+There are four different build flavors, `googleNormal`, `fossNormal`, `googleAutomotive`, and
+`fossAutomotive`.
+
+- 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 for that to work, the Android Auto app is
-      necessary, which in turn does require Google Play Services).
+      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).
     - `fossAutomotive` can be installed directly on
       [Android Automotive OS (AAOS)](https://source.android.com/docs/automotive/start/what_automotive)
       headunits without Google services.
@@ -75,5 +78,23 @@ You can use our [Weblate page](https://hosted.weblate.org/projects/evmap/) to he
 into new languages.
 
 <a href="https://hosted.weblate.org/engage/evmap/">
-<img src="https://hosted.weblate.org/widgets/evmap/-/open-graph.png" width="500" alt="Translation status" />
+<img src="https://hosted.weblate.org/widgets/evmap/-/open-graph.png" width="400" alt="Translation status" />
 </a>
+
+Sponsors
+--------
+
+Many users currently support the development EVMap with their donations. You can find more
+information on the [Donate page](https://ev-map.app/donate/) on the EVMap website.
+
+<a href="https://www.jawg.io"><img src="https://www.jawg.io/static/Blue@10x-9cdc4596e4e59acbd9ead55e9c28613e.png" alt="JawgMaps" height="58"/></a><br>
+Since May 2024, **JawgMaps** provides their OpenStreetMap vector map tiles service to EVMap for
+free, i.e. the background map displayed in the app if OpenStreetMap is selected as the data source.
+
+<a href="https://chargeprice.app"><img src="https://raw.githubusercontent.com/ev-map/EVMap/master/_img/powered_by_chargeprice.svg" alt="Powered by Chargeprice" height="58"/></a><br>
+Since April 2021, **Chargeprice.app** provide their price comparison API at a greatly reduced
+price for EVMap. This data is used in EVMap's price comparison feature.
+
+<a 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.

_img/ic_launcher-playstore.svg

@@ -0,0 +1,73 @@
+<?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>

_tools/export_licenses_faurecia.py

@@ -0,0 +1,23 @@
+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")

app/build.gradle.kts

@@ -8,24 +8,22 @@ plugins {
     id("kotlin-kapt")
     id("androidx.navigation.safeargs.kotlin")
     id("com.mikepenz.aboutlibraries.plugin")
-    id("pt.jcosta.resourceplaceholders")
 }
 
-val supportedLocales = "en,de,fr,nb-rNO,nl,pt,ro"
 
 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 = 206
-        versionName = "1.7.1"
+        versionCode = 222
+        versionName = "1.9.2"
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
-        resourceConfigurations += supportedLocales.split(",")
-        buildConfigField("String", "supportedLocales", "\"$supportedLocales\"")
     }
 
     signingConfigs {
@@ -50,12 +48,21 @@ 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") {
@@ -95,11 +102,15 @@ android {
     buildFeatures {
         dataBinding = true
         viewBinding = true
+        buildConfig = true
     }
     lint {
         disable += listOf("NullSafeMutableLiveData")
         warning += listOf("MissingTranslation")
     }
+    androidResources {
+        generateLocaleConfig = true
+    }
 
     testOptions {
         unitTests {
@@ -107,9 +118,6 @@ android {
         }
     }
 
-    resourcePlaceholders {
-        files("xml/shortcuts.xml")
-    }
     namespace = "net.vonforst.evmap"
 
     // add API keys from environment variable if not set in apikeys.xml
@@ -149,6 +157,28 @@ android {
         if (mapboxKey != null) {
             resValue("string", "mapbox_key", mapboxKey)
         }
+        var jawgKey =
+            System.getenv("JAWG_API_KEY") ?: project.findProperty("JAWG_API_KEY")?.toString()
+        if (jawgKey == null && project.hasProperty("JAWG_API_KEY_ENCRYPTED")) {
+            jawgKey = decode(
+                project.findProperty("JAWG_API_KEY_ENCRYPTED").toString(),
+                "FmK.d,-f*p+rD+WK!eds"
+            )
+        }
+        if (jawgKey != null) {
+            resValue("string", "jawg_key", jawgKey)
+        }
+        var arcgisKey =
+            System.getenv("ARCGIS_API_KEY") ?: project.findProperty("ARCGIS_API_KEY")?.toString()
+        if (arcgisKey == null && project.hasProperty("ARCGIS_API_KEY_ENCRYPTED")) {
+            arcgisKey = decode(
+                project.findProperty("ARCGIS_API_KEY_ENCRYPTED").toString(),
+                "FmK.d,-f*p+rD+WK!eds"
+            )
+        }
+        if (arcgisKey != null) {
+            resValue("string", "arcgis_key", jawgKey)
+        }
         var chargepriceKey =
             System.getenv("CHARGEPRICE_API_KEY") ?: project.findProperty("CHARGEPRICE_API_KEY")
                 ?.toString()
@@ -199,6 +229,22 @@ 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") {}
@@ -206,10 +252,14 @@ configurations {
 
 aboutLibraries {
     allowedLicenses = arrayOf(
-        "Apache-2.0", "mit", "BSD-2-Clause",
+        "Apache-2.0", "mit", "BSD-2-Clause", "BSD-3-Clause", "EPL-1.0",
         "asdkl",  // Android SDK
         "Dual OpenSSL and SSLeay License",  // Android NDK OpenSSL
-        "Google Maps Platform Terms of Service"  // Google Maps SDK
+        "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
     )
     strictMode = com.mikepenz.aboutlibraries.plugin.StrictMode.FAIL
 }
@@ -225,29 +275,29 @@ dependencies {
     val testGoogleImplementation by configurations
 
     implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlinVersion")
-    implementation("androidx.appcompat:appcompat:1.6.1")
-    implementation("androidx.core:core-ktx:1.12.0")
+    implementation("androidx.appcompat:appcompat:1.7.0")
+    implementation("androidx.core:core-ktx:1.13.1")
     implementation("androidx.core:core-splashscreen:1.0.1")
-    implementation("androidx.activity:activity-ktx:1.8.0")
-    implementation("androidx.fragment:fragment-ktx:1.6.2")
+    implementation("androidx.activity:activity-ktx:1.9.0")
+    implementation("androidx.fragment:fragment-ktx:1.7.1")
     implementation("androidx.cardview:cardview:1.0.0")
     implementation("androidx.preference:preference-ktx:1.2.1")
-    implementation("com.google.android.material:material:1.10.0")
+    implementation("com.google.android.material:material:1.12.0")
     implementation("androidx.constraintlayout:constraintlayout:2.1.4")
     implementation("androidx.recyclerview:recyclerview:1.3.2")
-    implementation("androidx.browser:browser:1.6.0")
+    implementation("androidx.browser:browser:1.8.0")
     implementation("androidx.swiperefreshlayout:swiperefreshlayout:1.1.0")
     implementation("androidx.security:security-crypto:1.1.0-alpha06")
-    implementation("androidx.work:work-runtime-ktx:2.8.1")
+    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.11.0")
-    implementation("com.squareup.okhttp3:okhttp-urlconnection:4.11.0")
+    implementation("com.squareup.okhttp3:okhttp:4.12.0")
+    implementation("com.squareup.okhttp3:okhttp-urlconnection:4.12.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.4.0")
+    implementation("io.coil-kt:coil:2.6.0")
     implementation("com.github.ev-map:StfalconImageViewer:5082ebd392")
     implementation("com.mikepenz:aboutlibraries-core:$aboutLibsVersion")
     implementation("com.mikepenz:aboutlibraries:$aboutLibsVersion")
@@ -258,29 +308,23 @@ dependencies {
     implementation("com.github.romandanylyk:PageIndicatorView:b1bad589b5")
 
     // Android Auto
-    val carAppVersion = "1.4.0-rc01"
+    val carAppVersion = "1.4.0"
     implementation("androidx.car.app:app:$carAppVersion")
     normalImplementation("androidx.car.app:app-projected:$carAppVersion")
     automotiveImplementation("androidx.car.app:app-automotive:$carAppVersion")
 
     // AnyMaps
-    val anyMapsVersion = "8f1226e1c5"
+    val anyMapsVersion = "a5b9abca40"
     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:18.2.0")
-    implementation("com.github.ev-map.AnyMaps:anymaps-mapbox:$anyMapsVersion") {
-        exclude(group = "com.mapbox.mapboxsdk", module = "mapbox-android-accounts")
-        exclude(group = "com.mapbox.mapboxsdk", module = "mapbox-android-telemetry")
-        exclude(group = "com.google.android.gms", module = "play-services-location")
-        exclude(group = "com.mapbox.mapboxsdk", module = "mapbox-android-core")
+    implementation("com.github.ev-map.AnyMaps:anymaps-maplibre:$anyMapsVersion") {
+        // duplicates classes from mapbox-sdk-services
+        exclude("org.maplibre.gl", "android-sdk-geojson")
     }
-    // original version of mapbox-android-core
-    googleImplementation("com.mapbox.mapboxsdk:mapbox-android-core:2.0.1")
-    // patched version that removes build-time dependency on GMS (-> no Google location services)
-    fossImplementation("com.github.ev-map:mapbox-events-android:a21c324501")
 
     // Google Places
-    googleImplementation("com.google.android.libraries.places:places:3.2.0")
+    googleImplementation("com.google.android.libraries.places:places:3.5.0")
     googleImplementation("org.jetbrains.kotlinx:kotlinx-coroutines-play-services:1.7.3")
 
     // Mapbox Geocoding
@@ -291,19 +335,22 @@ dependencies {
     implementation("androidx.navigation:navigation-ui-ktx:$navVersion")
 
     // viewmodel library
-    val lifecycle_version = "2.6.2"
+    val lifecycle_version = "2.8.1"
     implementation("androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycle_version")
     implementation("androidx.lifecycle:lifecycle-livedata-ktx:$lifecycle_version")
 
     // room library
-    val room_version = "2.6.0"
+    val room_version = "2.6.1"
     implementation("androidx.room:room-runtime:$room_version")
     kapt("androidx.room:room-compiler:$room_version")
     implementation("androidx.room:room-ktx:$room_version")
-    implementation("com.github.anboralabs:spatia-room:0.2.7")
+    implementation("com.github.anboralabs:spatia-room:0.2.9") {
+        exclude(group = "com.github.dalgarins", module = "android-spatialite")
+    }
+    implementation("com.github.EV-map:android-spatialite:e5495c83ad")  // version with minSdk increased to 21 & FORTIFY_SOURCE enabled
 
     // billing library
-    val billing_version = "6.0.1"
+    val billing_version = "7.0.0"
     googleImplementation("com.android.billingclient:billing:$billing_version")
     googleImplementation("com.android.billingclient:billing-ktx:$billing_version")
 
@@ -314,22 +361,20 @@ dependencies {
     implementation("ch.acra:acra-limiter:$acraVersion")
 
     // debug tools
-    debugImplementation("com.facebook.flipper:flipper:0.190.0")
+    debugImplementation("com.facebook.flipper:flipper:0.238.0")
     debugImplementation("com.facebook.soloader:soloader:0.10.5")
-    debugImplementation("com.facebook.flipper:flipper-network-plugin:0.190.0")
+    debugImplementation("com.facebook.flipper:flipper-network-plugin:0.238.0")
 
     // testing
     testImplementation("junit:junit:4.13.2")
-    testImplementation("com.squareup.okhttp3:mockwebserver:4.11.0")
+    testImplementation("com.squareup.okhttp3:mockwebserver:4.12.0")
     //noinspection GradleDependency
     testImplementation("org.json:json:20080701")
-    testImplementation("org.robolectric:robolectric:4.10.3")
+    testImplementation("org.robolectric:robolectric:4.11.1")
     testImplementation("androidx.test:core:1.5.0")
     testImplementation("androidx.arch.core:core-testing:2.2.0")
-
-    // testing for car app
-    testGoogleImplementation("androidx.car.app:app-testing:$carAppVersion")
-    testGoogleImplementation("androidx.test:core:1.5.0")
+    testImplementation("androidx.car.app:app-testing:$carAppVersion")
+    testImplementation("androidx.test:core:1.5.0")
 
     androidTestImplementation("androidx.test.ext:junit:1.1.5")
     androidTestImplementation("androidx.test.espresso:espresso-core:3.5.1")

app/lint.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<lint>
+    <issue id="MissingQuantity">
+        <ignore regexp=".*?Czech.*?many" />
+    </issue>
+</lint>

app/src/automotive/java/net/vonforst/evmap/auto/CarInfo.kt

@@ -0,0 +1,171 @@
+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)
+}

app/src/automotive/res/values-cs/strings.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="grant_on_phone">Povolit</string>
+    <string name="auto_location_permission_needed">Pro spuštění aplikace EVMap ve vašem autě musíte povolit přístup k vaší poloze.</string>
+</resources>

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

@@ -12,9 +12,11 @@ import com.google.android.material.transition.MaterialSharedAxis
 import net.vonforst.evmap.MapsActivity
 import net.vonforst.evmap.R
 import net.vonforst.evmap.databinding.FragmentDonateBinding
+import net.vonforst.evmap.databinding.FragmentDonateReferralBinding
 
-class DonateFragment : Fragment() {
+class DonateFragment : DonateFragmentBase() {
     private lateinit var binding: FragmentDonateBinding
+    private lateinit var referrals: FragmentDonateReferralBinding
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
@@ -28,6 +30,7 @@ class DonateFragment : Fragment() {
         savedInstanceState: Bundle?
     ): View {
         binding = FragmentDonateBinding.inflate(inflater, container, false)
+        referrals = binding.referrals
         return binding.root
     }
 
@@ -43,8 +46,6 @@ class DonateFragment : Fragment() {
             (activity as? MapsActivity)?.openUrl(getString(R.string.paypal_link))
         }
 
-        binding.referrals.referralTesla.setOnClickListener {
-            (requireActivity() as MapsActivity).openUrl(getString(R.string.tesla_referral_link))
-        }
+        setupReferrals(referrals)
     }
 }

app/src/foss/res/values-cs/strings.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="donations_info" formatted="false">Pomohla vám EVMap? Podpořte její vývoj zasláním finančního daru vývojáři.</string>
+    <string name="donate_paypal">Přispět pomocí PayPalu</string>
+    <string name="data_sources_hint">Mapová data v aplikaci poskytuje služba OpenStreetMap.</string>
+</resources>

app/src/foss/res/values-de/strings.xml

@@ -2,5 +2,5 @@
 <resources>
     <string name="donations_info" formatted="false">Findest du EVMap nützlich? Unterstütze die Weiterentwicklung der App mit einer Spende an den Entwickler.</string>
     <string name="donate_paypal">Mit PayPal spenden</string>
-    <string name="data_sources_hint">Die Kartendaten für die App stammen von OpenStreetMap (Mapbox).</string>
+    <string name="data_sources_hint">Die Kartendaten für die App stammen von OpenStreetMap.</string>
 </resources>

app/src/foss/res/values-fr/strings.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="donations_info" formatted="false">Trouvez-vous EVMap utile \? Soutenez son développement en envoyant un don au développeur.</string>
-    <string name="data_sources_hint">Les données cartographiques de l\'application sont fournies par OpenStreetMap (Mapbox).</string>
+    <string name="data_sources_hint">Les données cartographiques de l\'application sont fournies par OpenStreetMap.</string>
     <string name="donate_paypal">Faire un don avec PayPal</string>
 </resources>

app/src/foss/res/values-nb-rNO/strings.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="donate_paypal">Doner med PayPal</string>
-    <string name="data_sources_hint">Kartdata i programmet tilbys av OpenStreetMap (Mapbox).</string>
+    <string name="data_sources_hint">Kartdata i programmet tilbys av OpenStreetMap.</string>
     <string name="donations_info" formatted="false">Synes du EVMap er nyttig\? Støtt utviklingen ved å sende en slant til utvikleren.</string>
 </resources>

app/src/foss/res/values-nl/strings.xml

@@ -2,5 +2,5 @@
 <resources>
     <string name="donations_info" formatted="false">Vond je EVMap nuttig\? Je kan de ontwikkeling ondersteunen door een donatie te sturen naar de ontwikkelaar.</string>
     <string name="donate_paypal">Doneer via PayPal</string>
-    <string name="data_sources_hint">De kaartgegevens zijn afkomstig van OpenStreetMap (Mapbox).</string>
+    <string name="data_sources_hint">De kaartgegevens zijn afkomstig van OpenStreetMap.</string>
 </resources>

app/src/foss/res/values-pt/strings.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="data_sources_hint">Os dados do mapa são fornecidos pelo OpenStreetMap (Mapbox).</string>
+    <string name="data_sources_hint">Os dados do mapa são fornecidos pelo OpenStreetMap.</string>
     <string name="donate_paypal">Doar com o PayPal</string>
     <string name="donations_info" formatted="false">Acha que o EVMap é útil\? Apoie a manutenção e desenvolvimento com uma doação para o desenvolvedor da app.</string>
 </resources>

app/src/foss/res/values-ro/strings.xml

@@ -2,5 +2,5 @@
 <resources>
     <string name="donations_info" formatted="false">Crezi ca EVMap este util? Sprijina dezvoltarea printr-o donatie pentru dezvoltator.</string>
     <string name="donate_paypal">Doneaza cu PayPal</string>
-    <string name="data_sources_hint">Hartile din aplicatie sunt furnizate de OpenStreetMap (Mapbox).</string>
+    <string name="data_sources_hint">Hartile din aplicatie sunt furnizate de OpenStreetMap.</string>
 </resources>

app/src/foss/res/values/strings.xml

@@ -2,5 +2,5 @@
 <resources>
     <string name="donations_info" formatted="false">Do you find EVMap useful? Support its development by sending a donation to the developer.</string>
     <string name="donate_paypal">Donate with PayPal</string>
-    <string name="data_sources_hint">Map data in the app is provided by OpenStreetMap (Mapbox).</string>
+    <string name="data_sources_hint">Map data in the app is provided by OpenStreetMap.</string>
 </resources>

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

@@ -6,9 +6,7 @@ import android.view.View
 import android.view.ViewGroup
 import androidx.appcompat.app.AppCompatActivity
 import androidx.databinding.DataBindingUtil
-import androidx.fragment.app.Fragment
 import androidx.fragment.app.viewModels
-import androidx.lifecycle.Observer
 import androidx.navigation.fragment.findNavController
 import androidx.navigation.ui.setupWithNavController
 import androidx.recyclerview.widget.ConcatAdapter
@@ -25,7 +23,7 @@ import net.vonforst.evmap.databinding.FragmentDonateHeaderBinding
 import net.vonforst.evmap.databinding.FragmentDonateReferralBinding
 import net.vonforst.evmap.viewmodel.DonateViewModel
 
-class DonateFragment : Fragment() {
+class DonateFragment : DonateFragmentBase() {
     private lateinit var binding: FragmentDonateBinding
     private val vm: DonateViewModel by viewModels()
     private lateinit var header: FragmentDonateHeaderBinding
@@ -86,9 +84,7 @@ class DonateFragment : Fragment() {
             Snackbar.make(view, R.string.donation_failed, Snackbar.LENGTH_LONG).show()
         }
 
-        referrals.referralTesla.setOnClickListener {
-            (requireActivity() as MapsActivity).openUrl(getString(R.string.tesla_referral_link))
-        }
+        setupReferrals(referrals)
 
         // Workaround for AndroidX bug: https://github.com/material-components/material-components-android/issues/1984
         view.setBackgroundColor(MaterialColors.getColor(view, android.R.attr.windowBackground))

app/src/google/res/values-cs/strings.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="donations_info" formatted="false">Pomohla vám EVMap? Podpořte její vývoj posláním finančního daru vývojáři.
+\n
+\nGoogle si z každého daru strhne 15 %.</string>
+    <string name="data_sources_hint">V nastavení můžete také pro mapová data přepínat mezi službami Mapy Google a OpenStreetMap.</string>
+</resources>

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

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="donations_info" formatted="false">Findest du EVMap nützlich? Unterstütze die Weiterentwicklung der App mit einer Spende an den Entwickler.\n\nGoogle zieht von der Spende 15% Gebühren ab.</string>
-    <string name="data_sources_hint">In den Einstellungen kannst du auch zwischen Google Maps und OpenStreetMap (Mapbox) für die Kartendaten wechseln.</string>
+    <string name="data_sources_hint">In den Einstellungen kannst du auch zwischen Google Maps und OpenStreetMap für die Kartendaten wechseln.</string>
 </resources>

app/src/google/res/values-fr/strings.xml

@@ -3,5 +3,5 @@
     <string name="donations_info" formatted="false">Trouvez-vous EVMap utile \? Soutenez son développement en envoyant un don au développeur.
 \n
 \nGoogle prend 15% sur chaque don.</string>
-    <string name="data_sources_hint">Dans les paramètres, vous pouvez également choisir entre Google Maps et OpenStreetMap (Mapbox) pour les données cartographiques.</string>
+    <string name="data_sources_hint">Dans les paramètres, vous pouvez également choisir entre Google Maps et OpenStreetMap pour les données cartographiques.</string>
 </resources>

app/src/google/res/values-nb-rNO/strings.xml

@@ -3,5 +3,5 @@
     <string name="donations_info" formatted="false">Synes du EVMap er nyttig\? Støtt utviklingen ved å sende penger til utvikleren.
 \n
 \nGoogle tar 15% av alle donasjoner.</string>
-    <string name="data_sources_hint">I innstillingene kan du også bytte mellom Google Maps og OpenStreetMap (Mapbox) for kartdata.</string>
+    <string name="data_sources_hint">I innstillingene kan du også bytte mellom Google Maps og OpenStreetMap for kartdata.</string>
 </resources>

app/src/google/res/values-nl/strings.xml

@@ -3,5 +3,5 @@
     <string name="donations_info" formatted="false">Vind je EVMap nuttig\? Je kan de ontwikkeling steunen via een donatie aan de ontwikkelaar.
 \n
 \nGoogle houdt 15% in van elke donatie.</string>
-    <string name="data_sources_hint">In de instellingen kan je ook wisselen tussen Google Maps en OpenStreetMap (Mapbox) voor de kaartgegevens.</string>
+    <string name="data_sources_hint">In de instellingen kan je ook wisselen tussen Google Maps en OpenStreetMap voor de kaartgegevens.</string>
 </resources>

app/src/google/res/values-pt/strings.xml

@@ -3,5 +3,5 @@
     <string name="donations_info" formatted="false">Acha que o EVMap é útil\? Apoie a manutenção e desenvolvimento com uma doação para o desenvolvedor da app.
 \n
 \nA Google cobra 15% de cada doação.</string>
-    <string name="data_sources_hint">Também pode mudar entre o Google Maps e OpenStreetMap (Mapbox) nas definições da app.</string>
+    <string name="data_sources_hint">Também pode mudar entre o Google Maps e OpenStreetMap nas definições da app.</string>
 </resources>

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

@@ -2,7 +2,7 @@
 <resources>
     <string-array name="pref_map_provider_names">
         <item>@string/pref_provider_google_maps</item>
-        <item>@string/pref_provider_osm_mapbox</item>
+        <item>@string/pref_provider_osm</item>
     </string-array>
     <string-array name="pref_map_provider_values" translatable="false">
         <item>google</item>

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

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="donations_info" formatted="false">Do you find EVMap useful? Support its development by sending a donation to the developer.\n\nGoogle takes 15% off every donation.</string>
-    <string name="data_sources_hint">In the settings you can also switch between Google Maps and OpenStreetMap (Mapbox) for the map data.</string>
+    <string name="data_sources_hint">In the settings you can also switch between Google Maps and OpenStreetMap for the map data.</string>
 </resources>

app/src/main/AndroidManifest.xml

@@ -27,6 +27,7 @@
 
         <package android:name="com.google.android.projection.gearhead" />
         <package android:name="com.google.android.apps.automotive.templates.host" />
+        <package android:name="com.google.android.apps.maps" />
     </queries>
 
     <application
@@ -40,13 +41,20 @@
         android:label="@string/app_name"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
-        android:theme="@style/AppTheme"
-        android:localeConfig="@xml/locales_config">
+        android:theme="@style/AppTheme">
 
         <meta-data
             android:name="com.mapbox.ACCESS_TOKEN"
             android:value="@string/mapbox_key" />
 
+        <meta-data
+            android:name="io.jawg.ACCESS_TOKEN"
+            android:value="@string/jawg_key" />
+
+        <meta-data
+            android:name="com.arcgis.ACCESS_TOKEN"
+            android:value="@string/arcgis_key" />
+
         <activity
             android:name=".MapsActivity"
             android:label="@string/app_name"
@@ -273,6 +281,10 @@
                     android:host="openchargemap.org"
                     android:pathPattern="/site/poi/details/..*"
                     android:scheme="https" />
+                <data
+                    android:host="map.openchargemap.io"
+                    android:path="/"
+                    android:scheme="https" />
 
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.BROWSABLE" />
@@ -335,9 +347,8 @@
             android:exported="true"
             android:foregroundServiceType="location">
             <intent-filter>
-                <action
-                    android:name="androidx.car.app.CarAppService"
-                    android:category="androidx.car.app.category.POI" />
+                <action android:name="androidx.car.app.CarAppService" />
+                <category android:name="androidx.car.app.category.POI" />
             </intent-filter>
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />

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

@@ -76,7 +76,5 @@ class EvMapApplication : Application(), Configuration.Provider {
         )
     }
 
-    override fun getWorkManagerConfiguration(): Configuration {
-        return Configuration.Builder().build()
-    }
+    override val workManagerConfiguration = Configuration.Builder().build()
 }

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

@@ -155,8 +155,12 @@ class MapsActivity : AppCompatActivity(),
                         .setArguments(MapFragmentArgs(chargerId = id).toBundle())
                         .createPendingIntent()
                 }
-            } else if (intent?.scheme == "https" && intent?.data?.host == "openchargemap.org") {
-                val id = intent.data?.pathSegments?.last()?.toLongOrNull()
+            } 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"
@@ -264,7 +268,7 @@ class MapsActivity : AppCompatActivity(),
         }
     }
 
-    fun openUrl(url: String) {
+    fun openUrl(url: String, preferBrowser: Boolean = true) {
         val pkg = CustomTabsClient.getPackageName(this, null)
         val intent = CustomTabsIntent.Builder()
             .setDefaultColorSchemeParams(
@@ -276,7 +280,7 @@ class MapsActivity : AppCompatActivity(),
         pkg?.let {
             // prefer to open URL in custom tab, even if native app
             // available (such as EVMap itself)
-            intent.intent.setPackage(pkg)
+            if (preferBrowser) intent.intent.setPackage(pkg)
         }
         try {
             intent.launchUrl(this, Uri.parse(url))

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

@@ -1,6 +1,7 @@
 package net.vonforst.evmap
 
 import android.content.Context
+import android.content.pm.ApplicationInfo
 import android.content.pm.PackageInfo
 import android.content.pm.PackageManager
 import android.content.res.Configuration
@@ -9,10 +10,14 @@ import android.icu.util.LocaleData
 import android.icu.util.ULocale
 import android.os.Build
 import android.os.Bundle
-import android.text.*
+import android.text.Spannable
+import android.text.SpannableString
+import android.text.SpannableStringBuilder
+import android.text.SpannedString
+import android.text.TextUtils
 import android.text.style.StyleSpan
 import net.vonforst.evmap.storage.PreferenceDataSource
-import java.util.*
+import java.util.Locale
 
 fun Bundle.optDouble(name: String): Double? {
     if (!this.containsKey(name)) return null
@@ -117,4 +122,21 @@ fun PackageManager.getPackageInfoCompat(packageName: String, flags: Int = 0): Pa
         getPackageInfo(packageName, PackageManager.PackageInfoFlags.of(flags.toLong()))
     } else {
         @Suppress("DEPRECATION") getPackageInfo(packageName, flags)
-    }
+    }
+
+
+fun PackageManager.getApplicationInfoCompat(packageName: String, flags: Int = 0): ApplicationInfo =
+    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+        getApplicationInfo(packageName, PackageManager.ApplicationInfoFlags.of(flags.toLong()))
+    } else {
+        @Suppress("DEPRECATION") getApplicationInfo(packageName, flags)
+    }
+
+
+fun PackageManager.isAppInstalled(packageName: String): Boolean {
+    return try {
+        getApplicationInfoCompat(packageName, 0).enabled
+    } catch (e: PackageManager.NameNotFoundException) {
+        false
+    }
+}

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

@@ -1,6 +1,7 @@
 package net.vonforst.evmap.adapter
 
 import android.view.LayoutInflater
+import android.view.View
 import android.view.ViewGroup
 import androidx.databinding.DataBindingUtil
 import androidx.databinding.ViewDataBinding
@@ -21,6 +22,7 @@ import net.vonforst.evmap.databinding.ItemChargepriceVehicleChipBinding
 import net.vonforst.evmap.databinding.ItemConnectorButtonBinding
 import net.vonforst.evmap.model.Chargepoint
 import net.vonforst.evmap.ui.CheckableConstraintLayout
+import java.time.Instant
 
 interface Equatable {
     override fun equals(other: Any?): Boolean
@@ -94,7 +96,19 @@ class ConnectorAdapter : DataBindingAdapter<ConnectorAdapter.ChargepointWithAvai
     override fun getItemViewType(position: Int): Int = R.layout.item_connector
 }
 
-class ChargepriceAdapter() :
+class ConnectorDetailsAdapter : DataBindingAdapter<ConnectorDetailsAdapter.ConnectorDetails>() {
+    data class ConnectorDetails(
+        val status: ChargepointStatus?,
+        val evseId: String?,
+        val label: String?,
+        val lastChange: Instant?
+    ) :
+        Equatable
+
+    override fun getItemViewType(position: Int): Int = R.layout.dialog_connector_details_item
+}
+
+class ChargepriceAdapter :
     DataBindingAdapter<ChargePrice>() {
 
     val viewPool = RecyclerView.RecycledViewPool()

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

@@ -7,7 +7,9 @@ import android.text.style.StyleSpan
 import androidx.core.text.HtmlCompat
 import androidx.core.text.buildSpannedString
 import net.vonforst.evmap.R
-import net.vonforst.evmap.api.availability.TeslaGraphQlApi
+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
@@ -47,7 +49,7 @@ fun buildDetails(
     loc: ChargeLocation?,
     chargeCards: Map<Long, ChargeCard>?,
     filteredChargeCards: Set<Long>?,
-    teslaPricing: TeslaGraphQlApi.Pricing?,
+    teslaPricing: Pricing?,
     ctx: Context
 ): List<DetailsAdapter.Detail> {
     if (loc == null) return emptyList()
@@ -139,7 +141,7 @@ fun buildDetails(
     )
 }
 
-fun formatTeslaParkingFee(teslaPricing: TeslaGraphQlApi.Pricing, ctx: Context) =
+fun formatTeslaParkingFee(teslaPricing: Pricing, ctx: Context) =
     teslaPricing.memberRates?.activePricebook?.parking?.let { parkingFee ->
         ctx.getString(
             R.string.tesla_pricing_blocking_fee,
@@ -147,7 +149,7 @@ fun formatTeslaParkingFee(teslaPricing: TeslaGraphQlApi.Pricing, ctx: Context) =
         )
     }
 
-fun formatTeslaPricing(teslaPricing: TeslaGraphQlApi.Pricing, ctx: Context) =
+fun formatTeslaPricing(teslaPricing: Pricing, ctx: Context) =
     buildSpannedString {
         teslaPricing.memberRates?.let { memberRates ->
             append(
@@ -168,7 +170,7 @@ fun formatTeslaPricing(teslaPricing: TeslaGraphQlApi.Pricing, ctx: Context) =
         }
     }
 
-private fun formatTeslaPricingRates(rates: TeslaGraphQlApi.Rates, ctx: Context) =
+private fun formatTeslaPricingRates(rates: Rates, ctx: Context) =
     buildSpannedString {
         val timeFmt = DateTimeFormatter.ofLocalizedTime(FormatStyle.SHORT)
         if (rates.activePricebook.charging.touRates.enabled) {

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

@@ -12,7 +12,6 @@ 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
 
@@ -71,7 +70,7 @@ class GalleryAdapter(context: Context, val itemClickListener: ItemClickListener?
                     memoryKeys[item.id] = metadata.memoryCacheKey
                 }
             )
-            allowHardware(!BuildConfig.DEBUG)
+            allowHardware(false)
         }
     }
 }

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

@@ -1,17 +1,21 @@
 package net.vonforst.evmap.api.availability
 
 import android.content.Context
+import android.os.Parcelable
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
+import kotlinx.parcelize.Parcelize
 import net.vonforst.evmap.addDebugInterceptors
 import net.vonforst.evmap.api.RateLimitInterceptor
 import net.vonforst.evmap.api.await
+import net.vonforst.evmap.api.chargeprice.ChargepriceApi
 import net.vonforst.evmap.api.equivalentPlugTypes
 import net.vonforst.evmap.cartesianProduct
 import net.vonforst.evmap.model.ChargeLocation
 import net.vonforst.evmap.model.Chargepoint
 import net.vonforst.evmap.storage.EncryptedPreferenceDataStore
 import net.vonforst.evmap.viewmodel.Resource
+import okhttp3.Cache
 import okhttp3.JavaNetCookieJar
 import okhttp3.OkHttpClient
 import okhttp3.Request
@@ -19,6 +23,7 @@ import retrofit2.HttpException
 import java.io.IOException
 import java.net.CookieManager
 import java.net.CookiePolicy
+import java.time.Instant
 import java.util.concurrent.TimeUnit
 
 interface AvailabilityDetector {
@@ -136,7 +141,9 @@ data class ChargeLocationStatus(
     val status: Map<Chargepoint, List<ChargepointStatus>>,
     val source: String,
     val evseIds: Map<Chargepoint, List<String>>? = null,
+    val labels: Map<Chargepoint, List<String?>>? = null,
     val congestionHistogram: List<Double>? = null,
+    val lastChange: Map<Chargepoint, List<Instant?>>? = null,
     val extraData: Any? = null  // API-specific data
 ) {
     fun applyFilters(connectors: Set<String>?, minPower: Int?): ChargeLocationStatus {
@@ -152,59 +159,73 @@ data class ChargeLocationStatus(
     val totalChargepoints = status.map { it.key.count }.sum()
 }
 
-enum class ChargepointStatus {
+@Parcelize
+enum class ChargepointStatus : Parcelable {
     AVAILABLE, UNKNOWN, CHARGING, OCCUPIED, FAULTED
 }
 
 class AvailabilityDetectorException(message: String) : Exception(message)
 
+class NotSignedInException : IOException("not signed in")
+
 private val cookieManager = CookieManager().apply {
     setCookiePolicy(CookiePolicy.ACCEPT_ALL)
 }
 
 class AvailabilityRepository(context: Context) {
+    private val cacheSize = 5L * 1024 * 1024 // 5MB
     private val okhttp = OkHttpClient.Builder()
         .addInterceptor(RateLimitInterceptor())
         .addDebugInterceptors()
         .readTimeout(10, TimeUnit.SECONDS)
         .connectTimeout(10, TimeUnit.SECONDS)
         .cookieJar(JavaNetCookieJar(cookieManager))
+        .cache(Cache(context.cacheDir, cacheSize))
         .build()
-    private val teslaAvailabilityDetector =
-        TeslaAvailabilityDetector(okhttp, EncryptedPreferenceDataStore(context))
+    private val teslaOwnerAvailabilityDetector =
+        TeslaOwnerAvailabilityDetector(okhttp, EncryptedPreferenceDataStore(context))
     private val availabilityDetectors = listOf(
         RheinenergieAvailabilityDetector(okhttp),
-        teslaAvailabilityDetector,
+        teslaOwnerAvailabilityDetector,
+        TeslaGuestAvailabilityDetector(okhttp),
         EnBwAvailabilityDetector(okhttp),
         NewMotionAvailabilityDetector(okhttp)
     )
 
     suspend fun getAvailability(charger: ChargeLocation): Resource<ChargeLocationStatus> {
-        var value: Resource<ChargeLocationStatus>? = null
+        var result: ChargeLocationStatus? = null
+        var exception: Throwable? = null
+
         withContext(Dispatchers.IO) {
             for (ad in availabilityDetectors) {
                 if (!ad.isChargerSupported(charger)) continue
                 try {
-                    value = Resource.success(ad.getAvailability(charger))
+                    result = ad.getAvailability(charger)
                     break
                 } catch (e: IOException) {
-                    value = Resource.error(e.message, null)
+                    exception = exception.takeIf { it is NotSignedInException } ?: e
                     e.printStackTrace()
                 } catch (e: HttpException) {
-                    value = Resource.error(e.message, null)
+                    exception = exception.takeIf { it is NotSignedInException } ?: e
                     e.printStackTrace()
                 } catch (e: AvailabilityDetectorException) {
-                    value = Resource.error(e.message, null)
+                    exception = exception.takeIf { it is NotSignedInException } ?: e
+                    e.printStackTrace()
+                } catch (e: NotSignedInException) {
+                    exception = e
                     e.printStackTrace()
                 }
             }
         }
-        return value ?: Resource.error(null, null)
+        result?.let {
+            return Resource.success(it)
+        }
+        return Resource.error(exception?.message, null)
     }
 
     fun isSupercharger(charger: ChargeLocation) =
-        teslaAvailabilityDetector.isChargerSupported(charger)
+        teslaOwnerAvailabilityDetector.isChargerSupported(charger)
 
     fun isTeslaSupported(charger: ChargeLocation) =
-        teslaAvailabilityDetector.isChargerSupported(charger) && teslaAvailabilityDetector.isSignedIn()
+        teslaOwnerAvailabilityDetector.isChargerSupported(charger) && teslaOwnerAvailabilityDetector.isSignedIn()
 }

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

@@ -1,6 +1,10 @@
 package net.vonforst.evmap.api.availability
 
+import com.squareup.moshi.FromJson
 import com.squareup.moshi.JsonClass
+import com.squareup.moshi.Moshi
+import com.squareup.moshi.ToJson
+import net.vonforst.evmap.api.availability.tesla.LocalTimeAdapter
 import net.vonforst.evmap.model.ChargeLocation
 import net.vonforst.evmap.model.Chargepoint
 import net.vonforst.evmap.utils.distanceBetween
@@ -10,6 +14,8 @@ import retrofit2.converter.moshi.MoshiConverterFactory
 import retrofit2.http.GET
 import retrofit2.http.Path
 import retrofit2.http.Query
+import java.time.Instant
+import java.time.LocalTime
 
 private const val coordRange = 0.005  // range of latitude and longitude for loading the map
 private const val maxDistance = 60  // max distance between reported positions in meters
@@ -53,7 +59,8 @@ interface EnBwApi {
     data class EnBwChargePoint(
         val evseId: String?,
         val status: String,
-        val connectors: List<EnBwConnector>
+        val connectors: List<EnBwConnector>,
+        val state: EnBwState?
     )
 
     @JsonClass(generateAdapter = true)
@@ -70,6 +77,11 @@ interface EnBwApi {
         val upperRightLon: Double
     )
 
+    @JsonClass(generateAdapter = true)
+    data class EnBwState(
+        val updatedAt: Instant?
+    )
+
     companion object {
         fun create(client: OkHttpClient, baseUrl: String? = null): EnBwApi {
             val clientWithInterceptor = client.newBuilder()
@@ -85,7 +97,11 @@ interface EnBwApi {
                 }.build()
             val retrofit = Retrofit.Builder()
                 .baseUrl(baseUrl ?: "https://enbw-emp.azure-api.net/emobility-public-api/api/v1/")
-                .addConverterFactory(MoshiConverterFactory.create())
+                .addConverterFactory(
+                    MoshiConverterFactory.create(
+                        Moshi.Builder().add(InstantAdapter()).build()
+                    )
+                )
                 .client(clientWithInterceptor)
                 .build()
             return retrofit.create(EnBwApi::class.java)
@@ -93,6 +109,23 @@ interface EnBwApi {
     }
 }
 
+internal class InstantAdapter {
+    @FromJson
+    fun fromJson(value: Long?): Instant? = value?.let {
+        Instant.ofEpochMilli(it)
+    }
+
+    @ToJson
+    fun toJson(value: Instant?): Long? = value?.toEpochMilli()
+}
+
+data class EnBwStatus(
+    val conn: EnBwApi.EnBwConnector,
+    val status: String,
+    val evseId: String?,
+    val lastChange: Instant?
+)
+
 class EnBwAvailabilityDetector(client: OkHttpClient, baseUrl: String? = null) :
     BaseAvailabilityDetector(client) {
     val api = EnBwApi.create(client, baseUrl)
@@ -157,14 +190,15 @@ class EnBwAvailabilityDetector(client: OkHttpClient, baseUrl: String? = null) :
 
         val connectorStatus = details.flatMap { it.chargePoints }.flatMap { cp ->
             cp.connectors.map { connector ->
-                Triple(connector, cp.status, cp.evseId)
+                EnBwStatus(connector, cp.status, cp.evseId, cp.state?.updatedAt)
             }
         }
 
         val enbwConnectors = mutableMapOf<Long, Pair<Double, String>>()
         val enbwStatus = mutableMapOf<Long, ChargepointStatus>()
         val enbwEvseId = mutableMapOf<Long, String>()
-        connectorStatus.forEachIndexed { index, (connector, statusStr, evseId) ->
+        val enbwLastChange = mutableMapOf<Long, Instant?>()
+        connectorStatus.forEachIndexed { index, (connector, statusStr, evseId, updatedAt) ->
             val id = index.toLong()
             val power = connector.maxPowerInKw ?: 0.0
             val type = when (connector.plugTypeName) {
@@ -187,6 +221,7 @@ class EnBwAvailabilityDetector(client: OkHttpClient, baseUrl: String? = null) :
             }
             enbwConnectors[id] = power to type
             enbwStatus[id] = status
+            enbwLastChange[id] = updatedAt
             evseId?.let { enbwEvseId[id] = it }
         }
 
@@ -197,10 +232,13 @@ class EnBwAvailabilityDetector(client: OkHttpClient, baseUrl: String? = null) :
         val evseIds = if (enbwEvseId.size == enbwStatus.size) match.mapValues { entry ->
             entry.value.map { enbwEvseId[it]!! }
         } else null
+        val lastChange =
+            if (enbwLastChange.size == enbwStatus.size) match.mapValues { entry -> entry.value.map { enbwLastChange[it] } } else null
         return ChargeLocationStatus(
             chargepointStatus,
             "EnBW",
-            evseIds
+            evseIds,
+            lastChange = lastChange
         )
     }
 

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

@@ -1,6 +1,10 @@
 package net.vonforst.evmap.api.availability
 
+import androidx.car.app.model.DateTimeWithZone
+import com.squareup.moshi.FromJson
 import com.squareup.moshi.JsonClass
+import com.squareup.moshi.Moshi
+import com.squareup.moshi.ToJson
 import net.vonforst.evmap.model.ChargeLocation
 import net.vonforst.evmap.model.Chargepoint
 import net.vonforst.evmap.utils.distanceBetween
@@ -9,6 +13,11 @@ import retrofit2.Retrofit
 import retrofit2.converter.moshi.MoshiConverterFactory
 import retrofit2.http.GET
 import retrofit2.http.Path
+import java.time.Instant
+import java.time.LocalDateTime
+import java.time.ZoneOffset
+import java.time.ZonedDateTime
+import java.time.format.DateTimeParseException
 import java.util.*
 
 private const val coordRange = 0.005  // range of latitude and longitude for loading the map
@@ -42,7 +51,12 @@ interface NewMotionApi {
     )
 
     @JsonClass(generateAdapter = true)
-    data class NMEvse(val evseId: String?, val status: String, val connectors: List<NMConnector>)
+    data class NMEvse(
+        val evseId: String?,
+        val status: String,
+        val connectors: List<NMConnector>,
+        val updated: ZonedDateTime?
+    )
 
     @JsonClass(generateAdapter = true)
     data class NMConnector(
@@ -78,7 +92,11 @@ interface NewMotionApi {
         fun create(client: OkHttpClient, baseUrl: String? = null): NewMotionApi {
             val retrofit = Retrofit.Builder()
                 .baseUrl(baseUrl ?: "https://ui-map.shellrecharge.com/api/map/v2/")
-                .addConverterFactory(MoshiConverterFactory.create())
+                .addConverterFactory(
+                    MoshiConverterFactory.create(
+                        Moshi.Builder().add(ZonedDateTimeAdapter()).build()
+                    )
+                )
                 .client(client)
                 .build()
             return retrofit.create(NewMotionApi::class.java)
@@ -86,6 +104,21 @@ interface NewMotionApi {
     }
 }
 
+internal class ZonedDateTimeAdapter {
+    @FromJson
+    fun fromJson(value: String): ZonedDateTime? = ZonedDateTime.parse(value)
+
+    @ToJson
+    fun toJson(value: ZonedDateTime): String = value.toString()
+}
+
+data class NmStatus(
+    val conn: NewMotionApi.NMConnector,
+    val status: String,
+    val evseId: String?,
+    val updated: ZonedDateTime?
+)
+
 class NewMotionAvailabilityDetector(client: OkHttpClient, baseUrl: String? = null) :
     BaseAvailabilityDetector(client) {
     val api = NewMotionApi.create(client, baseUrl)
@@ -111,9 +144,9 @@ class NewMotionAvailabilityDetector(client: OkHttpClient, baseUrl: String? = nul
             throw AvailabilityDetectorException("no candidates found")
         }
 
-        if (nearest.evseCount < location.totalChargepoints) {
+        markers = if (nearest.evseCount < location.totalChargepoints) {
             // combine related stations
-            markers = markers.filter { marker ->
+            markers.filter { marker ->
                 distanceBetween(
                     marker.coordinates.latitude,
                     marker.coordinates.longitude,
@@ -122,7 +155,7 @@ class NewMotionAvailabilityDetector(client: OkHttpClient, baseUrl: String? = nul
                 ) < maxDistance
             }
         } else {
-            markers = listOf(nearest)
+            listOf(nearest)
         }
 
         // load details
@@ -135,14 +168,15 @@ class NewMotionAvailabilityDetector(client: OkHttpClient, baseUrl: String? = nul
         }
         val connectorStatus = details.flatMap { it.evses }.flatMap { evse ->
             evse.connectors.map { connector ->
-                Triple(connector, evse.status, evse.evseId)
+                NmStatus(connector, evse.status, evse.evseId, evse.updated)
             }
         }
 
         val nmConnectors = mutableMapOf<Long, Pair<Double, String>>()
         val nmStatus = mutableMapOf<Long, ChargepointStatus>()
         val nmEvseId = mutableMapOf<Long, String>()
-        connectorStatus.forEach { (connector, statusStr, evseId) ->
+        val nmUpdated = mutableMapOf<Long, ZonedDateTime>()
+        connectorStatus.forEach { (connector, statusStr, evseId, updated) ->
             val id = connector.uid
             val power = connector.electricalProperties.getPower()
             val type = when (connector.connectorType.lowercase(Locale.ROOT)) {
@@ -168,6 +202,7 @@ class NewMotionAvailabilityDetector(client: OkHttpClient, baseUrl: String? = nul
             nmConnectors.put(id, power to type)
             nmStatus.put(id, status)
             evseId?.let { nmEvseId[id] = it }
+            updated?.let { nmUpdated[id] = it }
         }
 
         val match = matchChargepoints(nmConnectors, location.chargepointsMerged)
@@ -177,10 +212,12 @@ class NewMotionAvailabilityDetector(client: OkHttpClient, baseUrl: String? = nul
         val evseIds = if (nmEvseId.size == nmStatus.size) match.mapValues { entry ->
             entry.value.map { nmEvseId[it]!! }
         } else null
+        val updated = match.mapValues { entry -> entry.value.map { nmUpdated[it]?.toInstant() } }
         return ChargeLocationStatus(
             chargepointStatus,
             "NewMotion",
-            evseIds
+            evseIds,
+            lastChange = updated
         )
     }
 

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

@@ -0,0 +1,173 @@
+package net.vonforst.evmap.api.availability
+
+import com.squareup.moshi.JsonDataException
+import kotlinx.coroutines.async
+import kotlinx.coroutines.coroutineScope
+import net.vonforst.evmap.api.availability.tesla.ChargerAvailability
+import net.vonforst.evmap.api.availability.tesla.TeslaChargingGuestGraphQlApi
+import net.vonforst.evmap.api.availability.tesla.TeslaCuaApi
+import net.vonforst.evmap.model.ChargeLocation
+import net.vonforst.evmap.model.Chargepoint
+import net.vonforst.evmap.utils.distanceBetween
+import okhttp3.OkHttpClient
+
+private const val coordRange = 0.005  // range of latitude and longitude for loading the map
+
+class TeslaGuestAvailabilityDetector(
+    client: OkHttpClient,
+    baseUrl: String? = null
+) :
+    BaseAvailabilityDetector(client) {
+
+    private var cuaApi = TeslaCuaApi.create(client, baseUrl)
+    private var api = TeslaChargingGuestGraphQlApi.create(client, baseUrl)
+
+    override suspend fun getAvailability(location: ChargeLocation): ChargeLocationStatus {
+        val results = cuaApi.getTeslaLocations()
+
+        val result =
+            results.minByOrNull {
+                if (it.latitude != null && it.longitude != null) {
+                    distanceBetween(
+                        it.latitude,
+                        it.longitude,
+                        location.coordinates.lat,
+                        location.coordinates.lng
+                    )
+                } else Double.POSITIVE_INFINITY
+            } ?: throw AvailabilityDetectorException("no candidates found.")
+
+        val resultDetails = try {
+            cuaApi.getTeslaLocation(result.locationId)
+        } catch (e: JsonDataException) {
+            // instead of a single location, this may also return an empty JSON list []. This is hard to fix with Moshi
+            if (e.message == "Expected BEGIN_OBJECT but was BEGIN_ARRAY at path \$") {
+                throw AvailabilityDetectorException("no candidates found.")
+            } else {
+                throw e
+            }
+        }
+        val trtId = resultDetails.trtId?.toLongOrNull()
+            ?: throw AvailabilityDetectorException("charger data not available through guest API")
+
+        val (detailsA, guestPricing) = coroutineScope {
+            val details = async {
+                api.getChargingSiteDetails(
+                    TeslaChargingGuestGraphQlApi.GetChargingSiteDetailsRequest(
+                        TeslaChargingGuestGraphQlApi.GetChargingSiteInformationVariables(
+                            TeslaChargingGuestGraphQlApi.Identifier(
+                                TeslaChargingGuestGraphQlApi.ChargingSiteIdentifier(
+                                    trtId
+                                )
+                            ),
+                            TeslaChargingGuestGraphQlApi.Experience.ADHOC
+                        )
+                    )
+                ).data.site ?: throw AvailabilityDetectorException("no candidates found.")
+            }
+            val guestPricing = async {
+                api.getChargingSiteDetails(
+                    TeslaChargingGuestGraphQlApi.GetChargingSiteDetailsRequest(
+                        TeslaChargingGuestGraphQlApi.GetChargingSiteInformationVariables(
+                            TeslaChargingGuestGraphQlApi.Identifier(
+                                TeslaChargingGuestGraphQlApi.ChargingSiteIdentifier(
+                                    trtId
+                                )
+                            ),
+                            TeslaChargingGuestGraphQlApi.Experience.GUEST
+                        )
+                    )
+                ).data.site?.pricing
+            }
+            details to guestPricing
+        }
+        val details = detailsA.await()
+
+        val scV2Connectors = location.chargepoints.filter { it.type == Chargepoint.SUPERCHARGER }
+        val scV2CCSConnectors = location.chargepoints.filter {
+            it.type in listOf(
+                Chargepoint.CCS_TYPE_2,
+                Chargepoint.CCS_UNKNOWN
+            ) && it.power != null && it.power <= 150
+        }
+        if (scV2CCSConnectors.sumOf { it.count } != 0 && scV2CCSConnectors.sumOf { it.count } != scV2Connectors.sumOf { it.count }) {
+            throw AvailabilityDetectorException("number of V2 connectors does not match number of V2 CCS connectors")
+        }
+        val scV3Connectors = location.chargepoints.filter {
+            it.type in listOf(
+                Chargepoint.CCS_TYPE_2,
+                Chargepoint.CCS_UNKNOWN
+            ) && it.power != null && it.power > 150
+        }
+        if (location.totalChargepoints != scV2Connectors.sumOf { it.count } + scV3Connectors.sumOf { it.count } + scV2CCSConnectors.sumOf { it.count }) throw AvailabilityDetectorException(
+            "charger has unknown connectors"
+        )
+
+        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
+            // If we have just one type of charger, we can still match
+            val numMissing =
+                scV2Connectors.sumOf { it.count } + scV3Connectors.sumOf { it.count } - detailsSorted.size
+            if ((scV2Connectors.isEmpty() || scV3Connectors.isEmpty()) && numMissing > 0) {
+                detailsSorted =
+                    detailsSorted + List(numMissing) {
+                        TeslaChargingGuestGraphQlApi.ChargerDetail(
+                            ChargerAvailability.UNKNOWN,
+                            ""
+                        )
+                    }
+            } else {
+                throw AvailabilityDetectorException("Tesla API chargepoints do not match data source")
+            }
+        }
+
+        val detailsMap =
+            mutableMapOf<Chargepoint, List<TeslaChargingGuestGraphQlApi.ChargerDetail>>()
+        var i = 0
+        for (connector in scV2Connectors) {
+            detailsMap[connector] =
+                detailsSorted.subList(i, i + connector.count)
+            i += connector.count
+        }
+        if (scV2CCSConnectors.isNotEmpty()) {
+            i = 0
+            for (connector in scV2CCSConnectors) {
+                detailsMap[connector] =
+                    detailsSorted.subList(i, i + connector.count)
+                i += connector.count
+            }
+        }
+        for (connector in scV3Connectors) {
+            detailsMap[connector] =
+                detailsSorted.subList(i, i + connector.count)
+            i += connector.count
+        }
+
+        val statusMap = detailsMap.mapValues { it.value.map { it.availability.toStatus() } }
+        val labelsMap = detailsMap.mapValues { it.value.map { chargers[it.id]?.label } }
+
+        val pricing = details.pricing.copy(memberRates = guestPricing.await()?.userRates)
+
+        return ChargeLocationStatus(
+            statusMap,
+            "Tesla",
+            labels = labelsMap,
+            extraData = pricing
+        )
+    }
+
+    override fun isChargerSupported(charger: ChargeLocation): Boolean {
+        return when (charger.dataSource) {
+            "goingelectric" -> charger.network == "Tesla Supercharger"
+            "openchargemap" -> charger.chargepriceData?.network in listOf("23", "3534")
+            else -> false
+        }
+    }
+}

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

@@ -0,0 +1,200 @@
+package net.vonforst.evmap.api.availability
+
+import net.vonforst.evmap.api.availability.tesla.ChargerAvailability
+import net.vonforst.evmap.api.availability.tesla.TeslaAuthenticationApi
+import net.vonforst.evmap.api.availability.tesla.TeslaChargingGuestGraphQlApi
+import net.vonforst.evmap.api.availability.tesla.TeslaChargingOwnershipGraphQlApi
+import net.vonforst.evmap.api.availability.tesla.asTeslaCoord
+import net.vonforst.evmap.model.ChargeLocation
+import net.vonforst.evmap.model.Chargepoint
+import okhttp3.OkHttpClient
+import java.time.Instant
+import java.util.Collections
+
+private const val coordRange = 0.005  // range of latitude and longitude for loading the map
+
+class TeslaOwnerAvailabilityDetector(
+    private val client: OkHttpClient,
+    private val tokenStore: TokenStore,
+    private val baseUrl: String? = null
+) :
+    BaseAvailabilityDetector(client) {
+
+    private val authApi = TeslaAuthenticationApi.create(client, null)
+    private var api: TeslaChargingOwnershipGraphQlApi? = null
+
+    interface TokenStore {
+        var teslaRefreshToken: String?
+        var teslaAccessToken: String?
+        var teslaAccessTokenExpiry: Long
+    }
+
+    override suspend fun getAvailability(location: ChargeLocation): ChargeLocationStatus {
+        val api = initApi()
+        val req = TeslaChargingOwnershipGraphQlApi.GetNearbyChargingSitesRequest(
+            TeslaChargingOwnershipGraphQlApi.GetNearbyChargingSitesVariables(
+                TeslaChargingOwnershipGraphQlApi.GetNearbyChargingSitesArgs(
+                    location.coordinates.asTeslaCoord(),
+                    TeslaChargingOwnershipGraphQlApi.Coordinate(
+                        location.coordinates.lat + coordRange,
+                        location.coordinates.lng - coordRange
+                    ),
+                    TeslaChargingOwnershipGraphQlApi.Coordinate(
+                        location.coordinates.lat - coordRange,
+                        location.coordinates.lng + coordRange
+                    ),
+                    TeslaChargingOwnershipGraphQlApi.OpenToNonTeslasFilterValue(false)
+                )
+            )
+        )
+        val results = api.getNearbyChargingSites(
+            req,
+            req.operationName
+        ).data.charging?.nearbySites?.sitesAndDistances
+            ?: throw AvailabilityDetectorException("no candidates found.")
+        val result =
+            results.minByOrNull { it.haversineDistanceMiles.value }
+                ?: throw AvailabilityDetectorException("no candidates found.")
+
+        val details = api.getChargingSiteInformation(
+            TeslaChargingOwnershipGraphQlApi.GetChargingSiteInformationRequest(
+                TeslaChargingOwnershipGraphQlApi.GetChargingSiteInformationVariables(
+                    TeslaChargingOwnershipGraphQlApi.ChargingSiteIdentifier(result.id.text),
+                    TeslaChargingOwnershipGraphQlApi.VehicleMakeType.NON_TESLA
+                )
+            )
+        ).data.charging.site ?: throw AvailabilityDetectorException("no candidates found.")
+
+
+        val scV2Connectors = location.chargepoints.filter { it.type == Chargepoint.SUPERCHARGER }
+        val scV2CCSConnectors = location.chargepoints.filter {
+            it.type in listOf(
+                Chargepoint.CCS_TYPE_2,
+                Chargepoint.CCS_UNKNOWN
+            ) && it.power != null && it.power <= 150
+        }
+        if (scV2CCSConnectors.sumOf { it.count } != 0 && scV2CCSConnectors.sumOf { it.count } != scV2Connectors.sumOf { it.count }) {
+            throw AvailabilityDetectorException("number of V2 connectors does not match number of V2 CCS connectors")
+        }
+        val scV3Connectors = location.chargepoints.filter {
+            it.type in listOf(
+                Chargepoint.CCS_TYPE_2,
+                Chargepoint.CCS_UNKNOWN
+            ) && it.power != null && it.power > 150
+        }
+        if (location.totalChargepoints != scV2Connectors.sumOf { it.count } + scV3Connectors.sumOf { it.count } + scV2CCSConnectors.sumOf { it.count }) throw AvailabilityDetectorException(
+            "charger has unknown connectors"
+        )
+
+        val chargerDetails = details.siteDynamic.chargerDetails
+        val chargers = details.siteStatic.chargers.associateBy { it.id }
+        var detailsSorted = chargerDetails
+            .sortedBy { c -> c.charger.labelLetter ?: chargers[c.charger.id]?.labelLetter }
+            .sortedBy { c -> c.charger.labelNumber ?: chargers[c.charger.id]?.labelNumber }
+        if (detailsSorted.size != scV2Connectors.sumOf { it.count } + scV3Connectors.sumOf { it.count }) {
+            // apparently some connectors are missing in Tesla data
+            // If we have just one type of charger, we can still match
+            val numMissing =
+                scV2Connectors.sumOf { it.count } + scV3Connectors.sumOf { it.count } - detailsSorted.size
+            if ((scV2Connectors.isEmpty() || scV3Connectors.isEmpty()) && numMissing > 0) {
+                detailsSorted =
+                    detailsSorted + List(numMissing) {
+                        TeslaChargingOwnershipGraphQlApi.ChargerDetail(
+                            ChargerAvailability.UNKNOWN,
+                            TeslaChargingOwnershipGraphQlApi.ChargerId(
+                                TeslaChargingOwnershipGraphQlApi.Text(""),
+                                null,
+                                null
+                            )
+                        )
+                    }
+            } else {
+                throw AvailabilityDetectorException("Tesla API chargepoints do not match data source")
+            }
+        }
+
+        val detailsMap =
+            emptyMap<Chargepoint, List<TeslaChargingOwnershipGraphQlApi.ChargerDetail>>().toMutableMap()
+        var i = 0
+        for (connector in scV2Connectors) {
+            detailsMap[connector] =
+                detailsSorted.subList(i, i + connector.count)
+            i += connector.count
+        }
+        if (scV2CCSConnectors.isNotEmpty()) {
+            i = 0
+            for (connector in scV2CCSConnectors) {
+                detailsMap[connector] =
+                    detailsSorted.subList(i, i + connector.count)
+                i += connector.count
+            }
+        }
+        for (connector in scV3Connectors) {
+            detailsMap[connector] =
+                detailsSorted.subList(i, i + connector.count)
+            i += connector.count
+        }
+
+        val congestionHistogram = details.congestionPriceHistogram?.let { cph ->
+            val indexOfMidnight = cph.dataAttributes.indexOfFirst { it.label == "12AM" }
+            indexOfMidnight.takeIf { it >= 0 }?.let { index ->
+                val data = cph.data.toMutableList()
+                Collections.rotate(data, -index)
+                data
+            }
+        }
+
+        val statusMap = detailsMap.mapValues { it.value.map { it.availability.toStatus() } }
+        val labelsMap = detailsMap.mapValues {
+            it.value.map {
+                it.charger.label?.value ?: chargers[it.charger.id]?.label?.value
+            }
+        }
+
+        return ChargeLocationStatus(
+            statusMap,
+            "Tesla",
+            labels = labelsMap,
+            congestionHistogram = congestionHistogram,
+            extraData = details.pricing
+        )
+    }
+
+    override fun isChargerSupported(charger: ChargeLocation): Boolean {
+        return when (charger.dataSource) {
+            "goingelectric" -> charger.network == "Tesla Supercharger"
+            "openchargemap" -> charger.chargepriceData?.network in listOf("23", "3534")
+            else -> false
+        }
+    }
+
+    private suspend fun initApi(): TeslaChargingOwnershipGraphQlApi {
+
+        return api ?: run {
+            val newApi = TeslaChargingOwnershipGraphQlApi.create(client, baseUrl) {
+                val now = Instant.now().epochSecond
+                val token =
+                    tokenStore.teslaAccessToken.takeIf { tokenStore.teslaAccessTokenExpiry > now }
+                        ?: run {
+                            val refreshToken = tokenStore.teslaRefreshToken
+                                ?: throw NotSignedInException()
+                            val response =
+                                authApi.getToken(
+                                    TeslaAuthenticationApi.RefreshTokenRequest(
+                                        refreshToken
+                                    )
+                                )
+                            tokenStore.teslaAccessToken = response.accessToken
+                            tokenStore.teslaAccessTokenExpiry = now + response.expiresIn
+                            response.accessToken
+                        }
+                token
+            }
+            api = newApi
+            newApi
+        }
+    }
+
+    fun isSignedIn() = tokenStore.teslaRefreshToken != null
+
+}

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

@@ -0,0 +1,104 @@
+package net.vonforst.evmap.api.availability.tesla
+
+import com.squareup.moshi.FromJson
+import com.squareup.moshi.Json
+import com.squareup.moshi.JsonClass
+import com.squareup.moshi.ToJson
+import net.vonforst.evmap.api.availability.ChargepointStatus
+import net.vonforst.evmap.model.Coordinate
+import java.time.LocalTime
+
+sealed class GraphQlRequest {
+    abstract val operationName: String
+    abstract val query: String
+    abstract val variables: Any?
+}
+
+fun Coordinate.asTeslaCoord() =
+    TeslaChargingOwnershipGraphQlApi.Coordinate(this.lat, this.lng)
+
+@JsonClass(generateAdapter = true)
+data class Outage(val message: String /* TODO: */)
+
+enum class ChargerAvailability {
+    @Json(name = "CHARGER_AVAILABILITY_AVAILABLE")
+    AVAILABLE,
+
+    @Json(name = "CHARGER_AVAILABILITY_OCCUPIED")
+    OCCUPIED,
+
+    @Json(name = "CHARGER_AVAILABILITY_DOWN")
+    DOWN,
+
+    @Json(name = "CHARGER_AVAILABILITY_UNKNOWN")
+    UNKNOWN;
+
+    fun toStatus() = when (this) {
+        AVAILABLE -> ChargepointStatus.AVAILABLE
+        OCCUPIED -> ChargepointStatus.OCCUPIED
+        DOWN -> ChargepointStatus.FAULTED
+        UNKNOWN -> ChargepointStatus.UNKNOWN
+    }
+}
+
+@JsonClass(generateAdapter = true)
+data class Pricing(
+    val canDisplayCombinedComparison: Boolean?,
+    val hasMSPPricing: Boolean?,
+    val hasMembershipPricing: Boolean?,
+    val memberRates: Rates?, // rates for Tesla drivers & non-Tesla drivers with subscription
+    val userRates: Rates?    // rates without subscription
+)
+
+@JsonClass(generateAdapter = true)
+data class Rates(
+    val activePricebook: Pricebook
+)
+
+@JsonClass(generateAdapter = true)
+data class Pricebook(
+    val charging: PricebookDetails,
+    val parking: PricebookDetails,
+    val priceBookID: Long?
+)
+
+@JsonClass(generateAdapter = true)
+data class PricebookDetails(
+    val bucketUom: String,  // unit of measurement for buckets (typically "kw")
+    val buckets: List<Bucket>,  // buckets of charging power (used for minute-based pricing)
+    val currencyCode: String,
+    val programType: String,
+    val rates: List<Double>,
+    val touRates: TouRates,
+    val uom: String,  // unit of measurement ("kwh" or "min")
+    val vehicleMakeType: String
+)
+
+@JsonClass(generateAdapter = true)
+data class Bucket(
+    val start: Int,
+    val end: Int
+)
+
+@JsonClass(generateAdapter = true)
+data class TouRates(
+    val activeRatesByTime: List<ActiveRatesByTime>,
+    val enabled: Boolean
+)
+
+@JsonClass(generateAdapter = true)
+data class ActiveRatesByTime(
+    val startTime: LocalTime,
+    val endTime: LocalTime,
+    val rates: List<Double>
+)
+
+internal class LocalTimeAdapter {
+    @FromJson
+    fun fromJson(value: String?): LocalTime? = value?.let {
+        if (it == "24:00") LocalTime.MAX else LocalTime.parse(it)
+    }
+
+    @ToJson
+    fun toJson(value: LocalTime?): String? = value?.toString()
+}

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

@@ -0,0 +1,169 @@
+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
+import retrofit2.converter.moshi.MoshiConverterFactory
+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 {
+    @GET("tesla-locations")
+    suspend fun getTeslaLocations(
+        @Query("translate") translate: String = "en_US",
+        @Query("usetrt") usetrt: Boolean = true,
+    ): List<TeslaLocation>
+
+    @GET("tesla-location")
+    suspend fun getTeslaLocation(
+        @Query("id") id: String,
+        @Query("translate") translate: String = "en_US",
+        @Query("usetrt") usetrt: Boolean = true
+    ): TeslaLocation
+
+    @JsonClass(generateAdapter = true)
+    data class TeslaLocation(
+        val latitude: Double?,
+        val longitude: Double?,
+        @Json(name = "location_id") val locationId: String,
+        val title: String?,
+        @Json(name = "location_type") val locationType: List<String>,
+        val trtId: String?
+    )
+
+    companion object {
+        fun create(
+            client: OkHttpClient,
+            baseUrl: String? = null
+        ): TeslaCuaApi {
+            val clientWithInterceptor = client.newBuilder()
+                .addInterceptor { chain ->
+                    // increase cache duration to 24h (useful for the large getTeslaLocations request)
+                    val request = chain.request().newBuilder()
+                        .cacheControl(CacheControl.Builder().maxStale(24, TimeUnit.HOURS).build())
+                        .build()
+                    chain.proceed(request)
+                }.build()
+            val retrofit = Retrofit.Builder()
+                .baseUrl(baseUrl ?: "https://www.tesla.com/cua-api/")
+                .addConverterFactory(
+                    MoshiConverterFactory.create(
+                        Moshi.Builder().add(LocalTimeAdapter()).build()
+                    )
+                )
+                .client(clientWithInterceptor)
+                .build()
+            return retrofit.create(TeslaCuaApi::class.java)
+        }
+    }
+}
+
+interface TeslaChargingGuestGraphQlApi {
+    @POST("graphql")
+    suspend fun getChargingSiteDetails(
+        @Body request: GetChargingSiteDetailsRequest,
+        @Query("operationName") operationName: String = "getGuestChargingSiteDetails"
+    ): GetChargingSiteDetailsResponse
+
+    @JsonClass(generateAdapter = true)
+    data class GetChargingSiteDetailsRequest(
+        override val variables: GetChargingSiteInformationVariables,
+        override val operationName: String = "getGuestChargingSiteDetails",
+        override val query: String =
+            "\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 GetChargingSiteInformationVariables(
+        val identifier: Identifier,
+        val experience: Experience,
+        val deviceLocale: String = "de-DE",
+    )
+
+    enum class Experience {
+        ADHOC, GUEST
+    }
+
+    @JsonClass(generateAdapter = true)
+    data class Identifier(
+        val siteId: ChargingSiteIdentifier
+    )
+
+    @JsonClass(generateAdapter = true)
+    data class ChargingSiteIdentifier(
+        val id: Long,
+        val siteType: SiteType = SiteType.SUPERCHARGER
+    )
+
+    enum class SiteType {
+        @Json(name = "SITE_TYPE_SUPERCHARGER")
+        SUPERCHARGER
+    }
+
+    @JsonClass(generateAdapter = true)
+    data class GetChargingSiteDetailsResponse(val data: GetChargingSiteDetailsResponseData)
+
+    @JsonClass(generateAdapter = true)
+    data class GetChargingSiteDetailsResponseData(val site: ChargingSiteInformation?)
+
+    @JsonClass(generateAdapter = true)
+    data class ChargingSiteInformation(
+        val activeOutages: List<Outage>?,
+        val chargers: List<ChargerId>,
+        val chargersAvailable: ChargersAvailable,
+        val id: Long,
+        val maxPowerKw: Int,
+        val name: String,
+        val pricing: Pricing,
+        val publicStallCount: Int
+    )
+
+    @JsonClass(generateAdapter = true)
+    data class ChargerId(
+        val id: String,
+        val label: String?,
+    ) {
+        val labelNumber
+            get() = label?.replace(Regex("""\D"""), "")?.toInt()
+        val labelLetter
+            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,
+            baseUrl: String? = null
+        ): TeslaChargingGuestGraphQlApi {
+            val retrofit = Retrofit.Builder()
+                .baseUrl(baseUrl ?: "https://www.tesla.com/de_DE/charging/guest/api/")
+                .addConverterFactory(
+                    MoshiConverterFactory.create(
+                        Moshi.Builder().add(LocalTimeAdapter()).build()
+                    )
+                )
+                .client(client)
+                .build()
+            return retrofit.create(TeslaChargingGuestGraphQlApi::class.java)
+        }
+    }
+}

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

@@ -1,17 +1,12 @@
-package net.vonforst.evmap.api.availability
+package net.vonforst.evmap.api.availability.tesla
 
 import android.net.Uri
 import android.util.Base64
-import com.squareup.moshi.FromJson
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
 import com.squareup.moshi.Moshi
-import com.squareup.moshi.ToJson
 import com.squareup.moshi.adapters.PolymorphicJsonAdapterFactory
 import kotlinx.coroutines.runBlocking
-import net.vonforst.evmap.model.ChargeLocation
-import net.vonforst.evmap.model.Chargepoint
-import net.vonforst.evmap.model.Coordinate
 import okhttp3.OkHttpClient
 import retrofit2.Retrofit
 import retrofit2.converter.moshi.MoshiConverterFactory
@@ -19,14 +14,9 @@ import retrofit2.http.Body
 import retrofit2.http.GET
 import retrofit2.http.POST
 import retrofit2.http.Query
-import java.io.IOException
 import java.security.MessageDigest
 import java.security.SecureRandom
-import java.time.Instant
 import java.time.LocalTime
-import java.util.Collections
-
-private const val coordRange = 0.005  // range of latitude and longitude for loading the map
 
 interface TeslaAuthenticationApi {
     @POST("oauth2/v3/token")
@@ -157,7 +147,7 @@ interface TeslaOwnerApi {
     }
 }
 
-interface TeslaGraphQlApi {
+interface TeslaChargingOwnershipGraphQlApi {
     @POST("/graphql")
     suspend fun getNearbyChargingSites(
         @Body request: GetNearbyChargingSitesRequest,
@@ -238,12 +228,6 @@ interface TeslaGraphQlApi {
         TESLA, NON_TESLA
     }
 
-    sealed class GraphQlRequest {
-        abstract val operationName: String
-        abstract val query: String
-        abstract val variables: Any?
-    }
-
     @JsonClass(generateAdapter = true)
     data class GetNearbyChargingSitesResponse(val data: GetNearbyChargingSitesResponseData)
 
@@ -271,15 +255,6 @@ interface TeslaGraphQlApi {
         // TODO: siteType, accessType
     )
 
-    @JsonClass(generateAdapter = true)
-    data class Outage(val message: String /* TODO: */)
-
-    @JsonClass(generateAdapter = true)
-    data class Value<T : Any>(val value: T)
-
-    @JsonClass(generateAdapter = true)
-    data class Text(val text: String)
-
     @JsonClass(generateAdapter = true)
     data class GetChargingSiteInformationResponse(val data: GetChargingSiteInformationResponseData)
 
@@ -307,12 +282,6 @@ interface TeslaGraphQlApi {
         val waitEstimateBucket: WaitEstimateBucket
     )
 
-    @JsonClass(generateAdapter = true)
-    data class ChargerDetail(
-        val availability: ChargerAvailability,
-        val charger: ChargerId
-    )
-
     @JsonClass(generateAdapter = true)
     data class ChargerId(
         val id: Text,
@@ -325,6 +294,12 @@ interface TeslaGraphQlApi {
             get() = label?.value?.replace(Regex("""\d"""), "")
     }
 
+    @JsonClass(generateAdapter = true)
+    data class ChargerDetail(
+        val availability: ChargerAvailability,
+        val charger: ChargerId
+    )
+
     @JsonClass(generateAdapter = true)
     data class SiteStatic(
         val accessCode: Value<String>?,
@@ -342,58 +317,6 @@ interface TeslaGraphQlApi {
         // TODO: siteType, accessType, address, amenities, timeZone
     )
 
-    @JsonClass(generateAdapter = true)
-    data class Pricing(
-        val canDisplayCombinedComparison: Boolean,
-        val hasMSPPricing: Boolean,
-        val hasMembershipPricing: Boolean,
-        val memberRates: Rates?, // rates for Tesla drivers & non-Tesla drivers with subscription
-        val userRates: Rates?    // rates without subscription
-    )
-
-    @JsonClass(generateAdapter = true)
-    data class Rates(
-        val activePricebook: Pricebook
-    )
-
-    @JsonClass(generateAdapter = true)
-    data class Pricebook(
-        val charging: PricebookDetails,
-        val parking: PricebookDetails,
-        val priceBookID: Long
-    )
-
-    @JsonClass(generateAdapter = true)
-    data class PricebookDetails(
-        val bucketUom: String,  // unit of measurement for buckets (typically "kw")
-        val buckets: List<Bucket>,  // buckets of charging power (used for minute-based pricing)
-        val currencyCode: String,
-        val programType: String,
-        val rates: List<Double>,
-        val touRates: TouRates,
-        val uom: String,  // unit of measurement ("kwh" or "min")
-        val vehicleMakeType: String
-    )
-
-    @JsonClass(generateAdapter = true)
-    data class Bucket(
-        val start: Int,
-        val end: Int
-    )
-
-    @JsonClass(generateAdapter = true)
-    data class TouRates(
-        val activeRatesByTime: List<ActiveRatesByTime>,
-        val enabled: Boolean
-    )
-
-    @JsonClass(generateAdapter = true)
-    data class ActiveRatesByTime(
-        val startTime: LocalTime,
-        val endTime: LocalTime,
-        val rates: List<Double>
-    )
-
     @JsonClass(generateAdapter = true)
     data class CongestionPriceHistogram(
         val data: List<Double>,
@@ -406,25 +329,11 @@ interface TeslaGraphQlApi {
         val label: String  // "1AM", "2AM", etc.
     )
 
-    enum class ChargerAvailability {
-        @Json(name = "CHARGER_AVAILABILITY_AVAILABLE")
-        AVAILABLE,
+    @JsonClass(generateAdapter = true)
+    data class Value<T : Any>(val value: T)
 
-        @Json(name = "CHARGER_AVAILABILITY_OCCUPIED")
-        OCCUPIED,
-
-        @Json(name = "CHARGER_AVAILABILITY_DOWN")
-        DOWN,
-        @Json(name = "CHARGER_AVAILABILITY_UNKNOWN")
-        UNKNOWN;
-
-        fun toStatus() = when (this) {
-            AVAILABLE -> ChargepointStatus.AVAILABLE
-            OCCUPIED -> ChargepointStatus.OCCUPIED
-            DOWN -> ChargepointStatus.FAULTED
-            UNKNOWN -> ChargepointStatus.UNKNOWN
-        }
-    }
+    @JsonClass(generateAdapter = true)
+    data class Text(val text: String)
 
     enum class WaitEstimateBucket {
         @Json(name = "WAIT_ESTIMATE_BUCKET_NO_WAIT")
@@ -457,7 +366,7 @@ interface TeslaGraphQlApi {
             client: OkHttpClient,
             baseUrl: String? = null,
             token: suspend () -> String
-        ): TeslaGraphQlApi {
+        ): TeslaChargingOwnershipGraphQlApi {
             val clientWithInterceptor = client.newBuilder()
                 .addInterceptor { chain ->
                     val t = runBlocking { token() }
@@ -479,193 +388,7 @@ interface TeslaGraphQlApi {
                 )
                 .client(clientWithInterceptor)
                 .build()
-            return retrofit.create(TeslaGraphQlApi::class.java)
+            return retrofit.create(TeslaChargingOwnershipGraphQlApi::class.java)
         }
     }
-}
-
-internal class LocalTimeAdapter {
-    @FromJson
-    fun fromJson(value: String?): LocalTime? = value?.let {
-        if (it == "24:00") LocalTime.MAX else LocalTime.parse(it)
-    }
-
-    @ToJson
-    fun toJson(value: LocalTime?): String? = value?.toString()
-}
-
-fun Coordinate.asTeslaCoord() =
-    TeslaGraphQlApi.Coordinate(this.lat, this.lng)
-
-class TeslaAvailabilityDetector(
-    private val client: OkHttpClient,
-    private val tokenStore: TokenStore,
-    private val baseUrl: String? = null
-) :
-    BaseAvailabilityDetector(client) {
-
-    private val authApi = TeslaAuthenticationApi.create(client, null)
-    private var api: TeslaGraphQlApi? = null
-
-    interface TokenStore {
-        var teslaRefreshToken: String?
-        var teslaAccessToken: String?
-        var teslaAccessTokenExpiry: Long
-    }
-
-    override suspend fun getAvailability(location: ChargeLocation): ChargeLocationStatus {
-        val api = initApi()
-        val req = TeslaGraphQlApi.GetNearbyChargingSitesRequest(
-            TeslaGraphQlApi.GetNearbyChargingSitesVariables(
-                TeslaGraphQlApi.GetNearbyChargingSitesArgs(
-                    location.coordinates.asTeslaCoord(),
-                    TeslaGraphQlApi.Coordinate(
-                        location.coordinates.lat + coordRange,
-                        location.coordinates.lng - coordRange
-                    ),
-                    TeslaGraphQlApi.Coordinate(
-                        location.coordinates.lat - coordRange,
-                        location.coordinates.lng + coordRange
-                    ),
-                    TeslaGraphQlApi.OpenToNonTeslasFilterValue(false)
-                )
-            )
-        )
-        val results = api.getNearbyChargingSites(
-            req,
-            req.operationName
-        ).data.charging?.nearbySites?.sitesAndDistances
-            ?: throw AvailabilityDetectorException("no candidates found.")
-        val result =
-            results.minByOrNull { it.haversineDistanceMiles.value }
-                ?: throw AvailabilityDetectorException("no candidates found.")
-
-        val details = api.getChargingSiteInformation(
-            TeslaGraphQlApi.GetChargingSiteInformationRequest(
-                TeslaGraphQlApi.GetChargingSiteInformationVariables(
-                    TeslaGraphQlApi.ChargingSiteIdentifier(result.id.text),
-                    TeslaGraphQlApi.VehicleMakeType.NON_TESLA
-                )
-            )
-        ).data.charging.site ?: throw AvailabilityDetectorException("no candidates found.")
-
-
-        val scV2Connectors = location.chargepoints.filter { it.type == Chargepoint.SUPERCHARGER }
-        val scV2CCSConnectors = location.chargepoints.filter {
-            it.type in listOf(
-                Chargepoint.CCS_TYPE_2,
-                Chargepoint.CCS_UNKNOWN
-            ) && it.power != null && it.power <= 150
-        }
-        if (scV2CCSConnectors.sumOf { it.count } != 0 && scV2CCSConnectors.sumOf { it.count } != scV2Connectors.sumOf { it.count }) {
-            throw AvailabilityDetectorException("number of V2 connectors does not match number of V2 CCS connectors")
-        }
-        val scV3Connectors = location.chargepoints.filter {
-            it.type in listOf(
-                Chargepoint.CCS_TYPE_2,
-                Chargepoint.CCS_UNKNOWN
-            ) && it.power != null && it.power > 150
-        }
-        if (location.totalChargepoints != scV2Connectors.sumOf { it.count } + scV3Connectors.sumOf { it.count } + scV2CCSConnectors.sumOf { it.count }) throw AvailabilityDetectorException(
-            "charger has unknown connectors"
-        )
-
-        var statusSorted = details.siteDynamic.chargerDetails
-            .sortedBy { c ->
-                c.charger.labelLetter
-                    ?: details.siteStatic.chargers.find { it.id == c.charger.id }?.labelLetter
-            }
-            .sortedBy { c ->
-                c.charger.labelNumber
-                    ?: details.siteStatic.chargers.find { it.id == c.charger.id }?.labelNumber
-            }
-            .map { it.availability }
-        if (statusSorted.size != scV2Connectors.sumOf { it.count } + scV3Connectors.sumOf { it.count }) {
-            // apparently some connectors are missing in Tesla data
-            // If we have just one type of charger, we can still match
-            val numMissing =
-                scV2Connectors.sumOf { it.count } + scV3Connectors.sumOf { it.count } - statusSorted.size
-            if (scV2Connectors.isEmpty() || scV3Connectors.isEmpty() && numMissing > 0) {
-                statusSorted =
-                    statusSorted + List(numMissing) { TeslaGraphQlApi.ChargerAvailability.UNKNOWN }
-            } else {
-                throw AvailabilityDetectorException("Tesla API chargepoints do not match data source")
-            }
-        }
-
-        val statusMap = emptyMap<Chargepoint, List<ChargepointStatus>>().toMutableMap()
-        var i = 0
-        for (connector in scV2Connectors) {
-            statusMap[connector] =
-                statusSorted.subList(i, i + connector.count).map { it.toStatus() }
-            i += connector.count
-        }
-        if (scV2CCSConnectors.isNotEmpty()) {
-            i = 0
-            for (connector in scV2CCSConnectors) {
-                statusMap[connector] =
-                    statusSorted.subList(i, i + connector.count).map { it.toStatus() }
-                i += connector.count
-            }
-        }
-        for (connector in scV3Connectors) {
-            statusMap[connector] =
-                statusSorted.subList(i, i + connector.count).map { it.toStatus() }
-            i += connector.count
-        }
-
-        val congestionHistogram = details.congestionPriceHistogram?.let { cph ->
-            val indexOfMidnight = cph.dataAttributes.indexOfFirst { it.label == "12AM" }
-            indexOfMidnight.takeIf { it >= 0 }?.let { index ->
-                val data = cph.data.toMutableList()
-                Collections.rotate(data, -index)
-                data
-            }
-        }
-
-        return ChargeLocationStatus(
-            statusMap,
-            "Tesla",
-            congestionHistogram = congestionHistogram,
-            extraData = details.pricing
-        )
-    }
-
-    override fun isChargerSupported(charger: ChargeLocation): Boolean {
-        return when (charger.dataSource) {
-            "goingelectric" -> charger.network == "Tesla Supercharger"
-            "openchargemap" -> charger.chargepriceData?.network in listOf("23", "3534")
-            else -> false
-        }
-    }
-
-    private suspend fun initApi(): TeslaGraphQlApi {
-
-        return api ?: run {
-            val newApi = TeslaGraphQlApi.create(client, baseUrl) {
-                val now = Instant.now().epochSecond
-                val token =
-                    tokenStore.teslaAccessToken.takeIf { tokenStore.teslaAccessTokenExpiry > now }
-                        ?: run {
-                            val refreshToken = tokenStore.teslaRefreshToken
-                                ?: throw IOException("not signed in")
-                            val response =
-                                authApi.getToken(
-                                    TeslaAuthenticationApi.RefreshTokenRequest(
-                                        refreshToken
-                                    )
-                                )
-                            tokenStore.teslaAccessToken = response.accessToken
-                            tokenStore.teslaAccessTokenExpiry = now + response.expiresIn
-                            response.accessToken
-                        }
-                token
-            }
-            api = newApi
-            newApi
-        }
-    }
-
-    fun isSignedIn() = tokenStore.teslaRefreshToken != null
-
 }

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

@@ -12,16 +12,41 @@ import kotlinx.coroutines.withContext
 import net.vonforst.evmap.BuildConfig
 import net.vonforst.evmap.R
 import net.vonforst.evmap.addDebugInterceptors
-import net.vonforst.evmap.api.*
-import net.vonforst.evmap.model.*
+import net.vonforst.evmap.api.ChargepointApi
+import net.vonforst.evmap.api.ChargepointList
+import net.vonforst.evmap.api.FiltersSQLQuery
+import net.vonforst.evmap.api.StringProvider
+import net.vonforst.evmap.api.mapPower
+import net.vonforst.evmap.api.mapPowerInverse
+import net.vonforst.evmap.api.nameForPlugType
+import net.vonforst.evmap.api.powerSteps
+import net.vonforst.evmap.model.BooleanFilter
+import net.vonforst.evmap.model.ChargeLocation
+import net.vonforst.evmap.model.Chargepoint
+import net.vonforst.evmap.model.ChargepointListItem
+import net.vonforst.evmap.model.Filter
+import net.vonforst.evmap.model.FilterValue
+import net.vonforst.evmap.model.FilterValues
+import net.vonforst.evmap.model.MultipleChoiceFilter
+import net.vonforst.evmap.model.MultipleChoiceFilterValue
+import net.vonforst.evmap.model.ReferenceData
+import net.vonforst.evmap.model.SliderFilter
+import net.vonforst.evmap.model.getBooleanValue
+import net.vonforst.evmap.model.getMultipleChoiceValue
+import net.vonforst.evmap.model.getSliderValue
 import net.vonforst.evmap.viewmodel.Resource
 import net.vonforst.evmap.viewmodel.getClusterDistance
 import okhttp3.Cache
 import okhttp3.OkHttpClient
+import retrofit2.HttpException
 import retrofit2.Response
 import retrofit2.Retrofit
 import retrofit2.converter.moshi.MoshiConverterFactory
-import retrofit2.http.*
+import retrofit2.http.Field
+import retrofit2.http.FormUrlEncoded
+import retrofit2.http.GET
+import retrofit2.http.POST
+import retrofit2.http.Query
 import java.io.IOException
 import java.time.Duration
 
@@ -122,6 +147,8 @@ interface GoingElectricApi {
     }
 }
 
+private const val STATUS_OK = "ok"
+
 class GoingElectricApiWrapper(
     val apikey: String,
     baseurl: String = "https://api.goingelectric.de",
@@ -210,15 +237,17 @@ class GoingElectricApiWrapper(
                     categories = categories,
                     startkey = startkey
                 )
-                if (!response.isSuccessful || response.body()!!.status != "ok") {
+                if (!response.isSuccessful || response.body()!!.status != STATUS_OK) {
                     return Resource.error(response.message(), null)
                 } else {
                     val body = response.body()!!
-                    data.addAll(body.chargelocations)
+                    data.addAll(body.chargelocations!!)
                     startkey = body.startkey
                 }
             } catch (e: IOException) {
                 return Resource.error(e.message, null)
+            } catch (e: HttpException) {
+                return Resource.error(e.message, null)
             }
         } while (startkey != null && startkey < 10000)
 
@@ -305,15 +334,17 @@ class GoingElectricApiWrapper(
                     categories = categories,
                     startkey = startkey
                 )
-                if (!response.isSuccessful || response.body()!!.status != "ok") {
+                if (!response.isSuccessful || response.body()!!.status != STATUS_OK) {
                     return Resource.error(response.message(), null)
                 } else {
                     val body = response.body()!!
-                    data.addAll(body.chargelocations)
+                    data.addAll(body.chargelocations!!)
                     startkey = body.startkey
                 }
             } catch (e: IOException) {
                 return Resource.error(e.message, null)
+            } catch (e: HttpException) {
+                return Resource.error(e.message, null)
             }
         } while (startkey != null && startkey < 10000)
 
@@ -388,9 +419,9 @@ class GoingElectricApiWrapper(
     ): Resource<ChargeLocation> {
         try {
             val response = api.getChargepointDetail(id)
-            return if (response.isSuccessful && response.body()!!.status == "ok" && response.body()!!.chargelocations.size == 1) {
+            return if (response.isSuccessful && response.body()!!.status == STATUS_OK && response.body()!!.chargelocations!!.size == 1) {
                 Resource.success(
-                    (response.body()!!.chargelocations[0] as GEChargeLocation).convert(
+                    (response.body()!!.chargelocations!![0] as GEChargeLocation).convert(
                         apikey, true
                     )
                 )
@@ -399,6 +430,8 @@ class GoingElectricApiWrapper(
             }
         } catch (e: IOException) {
             return Resource.error(e.message, null)
+        } catch (e: HttpException) {
+            return Resource.error(e.message, null)
         }
     }
 
@@ -416,19 +449,24 @@ class GoingElectricApiWrapper(
 
                     val responses = listOf(plugsResponse, chargeCardsResponse, networksResponse)
 
-                    if (responses.map { it.isSuccessful }.all { it }) {
+                    if (responses.map { it.isSuccessful }.all { it }
+                        && plugsResponse.body()!!.status == STATUS_OK
+                        && chargeCardsResponse.body()!!.status == STATUS_OK
+                        && networksResponse.body()!!.status == STATUS_OK) {
                         Resource.success(
                             GEReferenceData(
-                                plugsResponse.body()!!.result,
-                                networksResponse.body()!!.result,
-                                chargeCardsResponse.body()!!.result
+                                plugsResponse.body()!!.result!!,
+                                networksResponse.body()!!.result!!,
+                                chargeCardsResponse.body()!!.result!!
                             )
                         )
                     } else {
-                        Resource.error(responses.find { !it.isSuccessful }!!.message(), null)
+                        Resource.error(responses.find { !it.isSuccessful }?.message(), null)
                     }
                 } catch (e: IOException) {
                     Resource.error(e.message, null)
+                } catch (e: HttpException) {
+                    Resource.error(e.message, null)
                 }
             }
         }

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

@@ -27,20 +27,20 @@ import java.time.LocalTime
 @JsonClass(generateAdapter = true)
 data class GEChargepointList(
     val status: String,
-    val chargelocations: List<GEChargepointListItem>,
+    val chargelocations: List<GEChargepointListItem>?,
     @JsonObjectOrFalse val startkey: Int?
 )
 
 @JsonClass(generateAdapter = true)
 data class GEStringList(
     val status: String,
-    val result: List<String>
+    val result: List<String>?
 )
 
 @JsonClass(generateAdapter = true)
 data class GEChargeCardList(
     val status: String,
-    val result: List<GEChargeCard>
+    val result: List<GEChargeCard>?
 )
 
 sealed class GEChargepointListItem {

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

@@ -8,11 +8,30 @@ import com.squareup.moshi.Moshi
 import net.vonforst.evmap.BuildConfig
 import net.vonforst.evmap.R
 import net.vonforst.evmap.addDebugInterceptors
-import net.vonforst.evmap.api.*
-import net.vonforst.evmap.model.*
+import net.vonforst.evmap.api.ChargepointApi
+import net.vonforst.evmap.api.ChargepointList
+import net.vonforst.evmap.api.FiltersSQLQuery
+import net.vonforst.evmap.api.StringProvider
+import net.vonforst.evmap.api.mapPower
+import net.vonforst.evmap.api.mapPowerInverse
+import net.vonforst.evmap.api.powerSteps
+import net.vonforst.evmap.model.BooleanFilter
+import net.vonforst.evmap.model.ChargeLocation
+import net.vonforst.evmap.model.ChargepointListItem
+import net.vonforst.evmap.model.Filter
+import net.vonforst.evmap.model.FilterValue
+import net.vonforst.evmap.model.FilterValues
+import net.vonforst.evmap.model.MultipleChoiceFilter
+import net.vonforst.evmap.model.MultipleChoiceFilterValue
+import net.vonforst.evmap.model.ReferenceData
+import net.vonforst.evmap.model.SliderFilter
+import net.vonforst.evmap.model.getBooleanValue
+import net.vonforst.evmap.model.getMultipleChoiceValue
+import net.vonforst.evmap.model.getSliderValue
 import net.vonforst.evmap.viewmodel.Resource
 import okhttp3.Cache
 import okhttp3.OkHttpClient
+import retrofit2.HttpException
 import retrofit2.Response
 import retrofit2.Retrofit
 import retrofit2.converter.moshi.MoshiConverterFactory
@@ -168,6 +187,8 @@ class OpenChargeMapApiWrapper(
             return Resource.success(ChargepointList(result, data.size < maxResults))
         } catch (e: IOException) {
             return Resource.error(e.message, null)
+        } catch (e: HttpException) {
+            return Resource.error(e.message, null)
         }
     }
 
@@ -223,6 +244,8 @@ 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)
         }
     }
 
@@ -259,6 +282,8 @@ class OpenChargeMapApiWrapper(
             }
         } catch (e: IOException) {
             return Resource.error(e.message, null)
+        } catch (e: HttpException) {
+            return Resource.error(e.message, null)
         }
     }
 
@@ -272,6 +297,8 @@ class OpenChargeMapApiWrapper(
             }
         } catch (e: IOException) {
             return Resource.error(e.message, null)
+        } catch (e: HttpException) {
+            return Resource.error(e.message, null)
         }
     }
 
@@ -383,9 +410,7 @@ class OpenChargeMapApiWrapper(
     }
 
     override fun filteringInSQLRequiresDetails(filters: FilterValues): Boolean {
-        val operators = filters.getMultipleChoiceValue("operators")
-        return (operators != null && !operators.all)
-        // TODO: it would be possible to implement this without requiring details if we extended the data structure to also save the operator ID in the DB
+        return false
     }
 
 }

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

@@ -63,7 +63,7 @@ data class OCMChargepoint(
         Coordinate(addressInfo.latitude, addressInfo.longitude),
         addressInfo.toAddress(refData),
         connections.map { it.convert(refData) },
-        operatorInfo?.title,
+        operatorInfo?.title ?: refData.operators.find { it.id == operatorId }?.title,
         "https://map.openchargemap.io/?id=$id",
         "https://map.openchargemap.io/?id=$id",
         convertFaultReport(),
@@ -159,7 +159,9 @@ data class OCMConnection(
     fun convert(refData: OCMReferenceData) = Chargepoint(
         convertConnectionTypeFromOCM(connectionTypeId, refData),
         power,
-        quantity ?: 1
+        quantity ?: 1,
+        voltage?.toDouble(),
+        amps?.toDouble()
     )
 
     companion object {

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

@@ -28,6 +28,7 @@ import net.vonforst.evmap.storage.AppDatabase
 import net.vonforst.evmap.storage.PreferenceDataSource
 import net.vonforst.evmap.ui.currency
 import net.vonforst.evmap.ui.time
+import retrofit2.HttpException
 import java.io.IOException
 import kotlin.math.roundToInt
 
@@ -303,6 +304,15 @@ class ChargepriceScreen(ctx: CarContext, val charger: ChargeLocation) : Screen(c
                     )
                         .show()
                 }
+            } catch (e: HttpException) {
+                withContext(Dispatchers.Main) {
+                    CarToast.makeText(
+                        carContext,
+                        R.string.chargeprice_connection_error,
+                        CarToast.LENGTH_LONG
+                    )
+                        .show()
+                }
             } catch (e: NoVehicleSelectedException) {
                 errorMessage = carContext.getString(R.string.chargeprice_select_car_first)
                 invalidate()

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

@@ -1,7 +1,11 @@
 package net.vonforst.evmap.auto
 
 import android.content.Intent
-import android.graphics.*
+import android.graphics.Bitmap
+import android.graphics.Canvas
+import android.graphics.Color
+import android.graphics.Matrix
+import android.graphics.RectF
 import android.graphics.drawable.BitmapDrawable
 import android.net.Uri
 import android.text.SpannableString
@@ -11,8 +15,17 @@ import androidx.car.app.CarContext
 import androidx.car.app.CarToast
 import androidx.car.app.Screen
 import androidx.car.app.constraints.ConstraintManager
-import androidx.car.app.model.*
-import androidx.core.content.ContextCompat
+import androidx.car.app.model.Action
+import androidx.car.app.model.ActionStrip
+import androidx.car.app.model.CarColor
+import androidx.car.app.model.CarIcon
+import androidx.car.app.model.CarIconSpan
+import androidx.car.app.model.ForegroundCarColorSpan
+import androidx.car.app.model.Pane
+import androidx.car.app.model.PaneTemplate
+import androidx.car.app.model.ParkedOnlyOnClickListener
+import androidx.car.app.model.Row
+import androidx.car.app.model.Template
 import androidx.core.graphics.drawable.IconCompat
 import androidx.core.graphics.scale
 import androidx.core.text.HtmlCompat
@@ -23,12 +36,17 @@ import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
-import net.vonforst.evmap.*
+import net.vonforst.evmap.BuildConfig
+import net.vonforst.evmap.EXTRA_CHARGER_ID
+import net.vonforst.evmap.EXTRA_LAT
+import net.vonforst.evmap.EXTRA_LON
+import net.vonforst.evmap.MapsActivity
+import net.vonforst.evmap.R
 import net.vonforst.evmap.adapter.formatTeslaParkingFee
 import net.vonforst.evmap.adapter.formatTeslaPricing
 import net.vonforst.evmap.api.availability.AvailabilityRepository
 import net.vonforst.evmap.api.availability.ChargeLocationStatus
-import net.vonforst.evmap.api.availability.TeslaGraphQlApi
+import net.vonforst.evmap.api.availability.tesla.Pricing
 import net.vonforst.evmap.api.chargeprice.ChargepriceApi
 import net.vonforst.evmap.api.createApi
 import net.vonforst.evmap.api.fronyx.FronyxApi
@@ -41,6 +59,7 @@ import net.vonforst.evmap.model.ChargeLocation
 import net.vonforst.evmap.model.Cost
 import net.vonforst.evmap.model.FaultReport
 import net.vonforst.evmap.model.Favorite
+import net.vonforst.evmap.plus
 import net.vonforst.evmap.storage.AppDatabase
 import net.vonforst.evmap.storage.ChargeLocationsRepository
 import net.vonforst.evmap.storage.PreferenceDataSource
@@ -52,7 +71,6 @@ import net.vonforst.evmap.viewmodel.awaitFinished
 import java.time.ZoneId
 import java.time.format.DateTimeFormatter
 import java.time.format.FormatStyle
-import kotlin.math.ceil
 import kotlin.math.floor
 import kotlin.math.roundToInt
 
@@ -132,7 +150,16 @@ class ChargerDetailScreen(ctx: CarContext, val chargerSparse: ChargeLocation) :
                                     )
                                     .setTitle(carContext.getString(R.string.auto_prices))
                                 .setOnClickListener {
-                                    screenManager.push(ChargepriceScreen(carContext, charger))
+                                    if (prefs.chargepriceNativeIntegration) {
+                                        screenManager.push(ChargepriceScreen(carContext, charger))
+                                    } else {
+                                        val intent = Intent(
+                                            Intent.ACTION_VIEW,
+                                            Uri.parse(ChargepriceApi.getPoiUrl(charger))
+                                        )
+                                            .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+                                        carContext.startActivity(intent)
+                                    }
                                 }
                                 .build())
                         }
@@ -330,7 +357,7 @@ class ChargerDetailScreen(ctx: CarContext, val chargerSparse: ChargeLocation) :
             }.build())
         }
         if (rows.count() < maxRows && teslaSupported) {
-            val teslaPricing = availability?.extraData as? TeslaGraphQlApi.Pricing
+            val teslaPricing = availability?.extraData as? Pricing
             rows.add(3, Row.Builder().apply {
                 setTitle(carContext.getString(R.string.cost))
                 teslaPricing?.let {
@@ -522,7 +549,11 @@ class ChargerDetailScreen(ctx: CarContext, val chargerSparse: ChargeLocation) :
                 CarContext.ACTION_NAVIGATE,
                 Uri.parse("geo:${coord.lat},${coord.lng}")
             )
-        carContext.startCarApp(intent)
+        try {
+            carContext.startCarApp(intent)
+        } catch (e: UnsupportedOperationException) {
+            CarToast.makeText(carContext, R.string.no_maps_app_found, CarToast.LENGTH_SHORT).show()
+        }
     }
 
     private fun loadCharger() {
@@ -543,7 +574,7 @@ class ChargerDetailScreen(ctx: CarContext, val chargerSparse: ChargeLocation) :
                     val url = photo.getUrl(size = size)
                     val request = ImageRequest.Builder(carContext).data(url).build()
                     val img =
-                        (carContext.imageLoader.execute(request).drawable as BitmapDrawable).bitmap
+                        (carContext.imageLoader.execute(request).drawable as? BitmapDrawable)?.bitmap ?: return@let
 
                     // draw icon on top of image
                     val icon = iconGen.getBitmap(

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

@@ -45,6 +45,7 @@ import net.vonforst.evmap.utils.headingDiff
 import net.vonforst.evmap.viewmodel.Status
 import net.vonforst.evmap.viewmodel.awaitFinished
 import net.vonforst.evmap.viewmodel.filtersWithValue
+import retrofit2.HttpException
 import java.io.IOException
 import java.time.Duration
 import java.time.Instant
@@ -502,6 +503,9 @@ class MapScreen(ctx: CarContext, val session: EVMapSession) :
             } catch (e: IOException) {
                 loadingError = true
                 invalidate()
+            } catch (e: HttpException) {
+                loadingError = true
+                invalidate()
             }
         }
     }

app/src/main/java/net/vonforst/evmap/auto/SearchSelectScreen.kt

@@ -12,6 +12,7 @@ import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import net.vonforst.evmap.R
 import okio.IOException
+import retrofit2.HttpException
 
 abstract class MultiSelectSearchScreen<T>(ctx: CarContext) : Screen(ctx),
     SearchTemplate.SearchCallback {
@@ -30,14 +31,9 @@ abstract class MultiSelectSearchScreen<T>(ctx: CarContext) : Screen(ctx),
                     filterList()
                     invalidate()
                 } catch (e: IOException) {
-                    withContext(Dispatchers.Main) {
-                        CarToast.makeText(
-                            carContext,
-                            R.string.generic_connection_error,
-                            CarToast.LENGTH_LONG
-                        ).show()
-                        screenManager.pop()
-                    }
+                    showLoadingError()
+                } catch (e: HttpException) {
+                    showLoadingError()
                 }
             }
         }
@@ -76,6 +72,17 @@ abstract class MultiSelectSearchScreen<T>(ctx: CarContext) : Screen(ctx),
         }.build()
     }
 
+    private suspend fun showLoadingError() {
+        withContext(Dispatchers.Main) {
+            CarToast.makeText(
+                carContext,
+                R.string.generic_connection_error,
+                CarToast.LENGTH_LONG
+            ).show()
+            screenManager.pop()
+        }
+    }
+
     private fun filterList() {
         currentList = fullList?.let {
             it.sortedBy { getLabel(it).lowercase() }

app/src/main/java/net/vonforst/evmap/auto/SettingsScreens.kt

@@ -8,31 +8,44 @@ import android.content.pm.PackageManager.NameNotFoundException
 import android.hardware.Sensor
 import android.hardware.SensorManager
 import android.net.Uri
-import android.os.Bundle
-import android.os.IInterface
-import android.text.Html
 import androidx.annotation.StringRes
 import androidx.car.app.CarContext
 import androidx.car.app.CarToast
 import androidx.car.app.Screen
 import androidx.car.app.annotations.ExperimentalCarApi
 import androidx.car.app.constraints.ConstraintManager
-import androidx.car.app.model.*
+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.ListTemplate
+import androidx.car.app.model.MessageTemplate
+import androidx.car.app.model.ParkedOnlyOnClickListener
+import androidx.car.app.model.Row
+import androidx.car.app.model.SectionedItemList
+import androidx.car.app.model.Template
+import androidx.car.app.model.Toggle
 import androidx.core.content.IntentCompat
 import androidx.core.graphics.drawable.IconCompat
 import androidx.core.text.HtmlCompat
 import androidx.lifecycle.lifecycleScope
 import androidx.localbroadcastmanager.content.LocalBroadcastManager
-import com.google.android.material.snackbar.Snackbar
 import kotlinx.coroutines.launch
-import net.vonforst.evmap.*
-import net.vonforst.evmap.api.availability.TeslaAuthenticationApi
-import net.vonforst.evmap.api.availability.TeslaOwnerApi
+import net.vonforst.evmap.BuildConfig
+import net.vonforst.evmap.EXTRA_DONATE
+import net.vonforst.evmap.MapsActivity
+import net.vonforst.evmap.R
+import net.vonforst.evmap.addDebugInterceptors
+import net.vonforst.evmap.api.availability.tesla.TeslaAuthenticationApi
+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.fragment.oauth.OAuthLoginFragment
 import net.vonforst.evmap.fragment.oauth.OAuthLoginFragmentArgs
+import net.vonforst.evmap.getPackageInfoCompat
 import net.vonforst.evmap.storage.AppDatabase
 import net.vonforst.evmap.storage.EncryptedPreferenceDataStore
 import net.vonforst.evmap.storage.PreferenceDataSource
@@ -412,12 +425,21 @@ class ChargepriceSettingsScreen(ctx: CarContext) : Screen(ctx) {
             setTitle(carContext.getString(R.string.settings_chargeprice))
             setHeaderAction(Action.BACK)
             setSingleList(ItemList.Builder().apply {
+                addItem(Row.Builder().apply {
+                    setTitle(carContext.getString(R.string.pref_chargeprice_native_integration))
+                    addText(carContext.getString(if (prefs.chargepriceNativeIntegration) R.string.pref_chargeprice_native_integration_on else R.string.pref_chargeprice_native_integration_off))
+                    setToggle(Toggle.Builder {
+                        prefs.chargepriceNativeIntegration = it
+                        invalidate()
+                    }.setChecked(prefs.chargepriceNativeIntegration).build())
+                }.build())
                 addItem(Row.Builder().apply {
                     setTitle(carContext.getString(R.string.pref_my_vehicle))
                     setBrowsable(true)
                     setOnClickListener {
                         screenManager.push(SelectVehiclesScreen(carContext))
                     }
+                    setEnabled(prefs.chargepriceNativeIntegration)
                 }.build())
                 addItem(Row.Builder().apply {
                     setTitle(carContext.getString(R.string.pref_my_tariffs))
@@ -441,6 +463,7 @@ class ChargepriceSettingsScreen(ctx: CarContext) : Screen(ctx) {
                             )
                         }
                     )
+                    setEnabled(prefs.chargepriceNativeIntegration)
                 }.build())
                 addItem(Row.Builder().apply {
                     setTitle(carContext.getString(R.string.settings_android_auto_chargeprice_range))
@@ -458,6 +481,7 @@ class ChargepriceSettingsScreen(ctx: CarContext) : Screen(ctx) {
                     setOnClickListener {
                         screenManager.push(SelectChargingRangeScreen(carContext))
                     }
+                    setEnabled(prefs.chargepriceNativeIntegration)
                 }.build())
                 addItem(Row.Builder().apply {
                     setTitle(carContext.getString(R.string.pref_chargeprice_currency))
@@ -473,27 +497,31 @@ class ChargepriceSettingsScreen(ctx: CarContext) : Screen(ctx) {
                     setOnClickListener {
                         screenManager.push(SelectCurrencyScreen(carContext))
                     }
+                    setEnabled(prefs.chargepriceNativeIntegration)
                 }.build())
                 addItem(Row.Builder().apply {
                     setTitle(carContext.getString(R.string.pref_chargeprice_no_base_fee))
                     setToggle(Toggle.Builder {
                         prefs.chargepriceNoBaseFee = it
                     }.setChecked(prefs.chargepriceNoBaseFee).build())
-                }.build())
-                addItem(Row.Builder().apply {
-                    setTitle(carContext.getString(R.string.pref_chargeprice_show_provider_customer_tariffs))
-                    addText(carContext.getString(R.string.pref_chargeprice_show_provider_customer_tariffs_summary))
-                    setToggle(Toggle.Builder {
-                        prefs.chargepriceShowProviderCustomerTariffs = it
-                    }.setChecked(prefs.chargepriceShowProviderCustomerTariffs).build())
+                    setEnabled(prefs.chargepriceNativeIntegration)
                 }.build())
                 if (maxRows > 6) {
+                    addItem(Row.Builder().apply {
+                        setTitle(carContext.getString(R.string.pref_chargeprice_show_provider_customer_tariffs))
+                        addText(carContext.getString(R.string.pref_chargeprice_show_provider_customer_tariffs_summary))
+                        setToggle(Toggle.Builder {
+                            prefs.chargepriceShowProviderCustomerTariffs = it
+                        }.setChecked(prefs.chargepriceShowProviderCustomerTariffs).build())
+                        setEnabled(prefs.chargepriceNativeIntegration)
+                    }.build())
                     addItem(Row.Builder().apply {
                         setTitle(carContext.getString(R.string.pref_chargeprice_allow_unbalanced_load))
                         addText(carContext.getString(R.string.pref_chargeprice_allow_unbalanced_load_summary))
                         setToggle(Toggle.Builder {
                             prefs.chargepriceAllowUnbalancedLoad = it
                         }.setChecked(prefs.chargepriceAllowUnbalancedLoad).build())
+                        setEnabled(prefs.chargepriceNativeIntegration)
                     }.build())
                 }
             }.build())

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

@@ -14,7 +14,11 @@ 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.*
+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.versioning.CarAppApiLevels
 import androidx.core.content.ContextCompat
 import androidx.core.graphics.drawable.IconCompat
@@ -26,7 +30,7 @@ import net.vonforst.evmap.getPackageInfoCompat
 import net.vonforst.evmap.kmPerMile
 import net.vonforst.evmap.shouldUseImperialUnits
 import net.vonforst.evmap.ydPerMile
-import java.util.*
+import java.util.Locale
 import kotlin.math.roundToInt
 
 fun carAvailabilityColor(status: List<ChargepointStatus>): CarColor {
@@ -207,7 +211,9 @@ 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
-            if (version[0] < "6" || version[0] == "6" && version[1] < "7") {
+            val major = version[0].toIntOrNull() ?: return false
+            val minor = version[1].toIntOrNull() ?: return false
+            if (major < 6 || major < 6 && minor < 7) {
                 return false
             }
         }

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

@@ -6,9 +6,18 @@ import android.os.Handler
 import android.os.Looper
 import androidx.car.app.CarContext
 import androidx.car.app.Screen
-import androidx.car.app.hardware.CarHardwareManager
-import androidx.car.app.hardware.info.*
-import androidx.car.app.model.*
+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.core.content.ContextCompat
 import androidx.core.graphics.drawable.IconCompat
 import androidx.lifecycle.DefaultLifecycleObserver
@@ -18,14 +27,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 =
-        (ctx.getCarService(CarContext.HARDWARE_SERVICE) as CarHardwareManager).carInfo
+    private val carInfo = carContext.patchedCarInfo
     private val carSensors = carContext.patchedCarSensors
     private var model: Model? = null
     private var energyLevel: EnergyLevel? = null

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

@@ -113,8 +113,7 @@ class MapboxAutocompleteProvider(val context: Context) : AutocompleteProvider {
 
     override fun getAttributionString(): Int = R.string.powered_by_mapbox
 
-    override fun getAttributionImage(dark: Boolean): Int =
-        if (dark) com.mapbox.mapboxsdk.R.drawable.mapbox_logo_icon else R.drawable.mapbox_logo
+    override fun getAttributionImage(dark: Boolean): Int = R.drawable.mapbox_logo
 }
 
 private fun BoundingBox.toLatLngBounds(): LatLngBounds {

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

@@ -62,7 +62,7 @@ class ChargepriceFragment : Fragment() {
         if (savedInstanceState == null) {
             val prefs = PreferenceDataSource(requireContext())
             prefs.chargepriceCounter += 1
-            if ((prefs.chargepriceCounter - 30).mod(50) == 0) {
+            if ((prefs.chargepriceCounter).mod(30) == 0) {
                 showDonationDialog()
             }
         }

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

@@ -0,0 +1,63 @@
+package net.vonforst.evmap.fragment
+
+import android.content.Context
+import android.view.LayoutInflater
+import android.view.View
+import androidx.databinding.DataBindingUtil
+import androidx.recyclerview.widget.ConcatAdapter
+import androidx.recyclerview.widget.LinearLayoutManager
+import net.vonforst.evmap.R
+import net.vonforst.evmap.adapter.ConnectorAdapter
+import net.vonforst.evmap.adapter.ConnectorDetailsAdapter
+import net.vonforst.evmap.adapter.SingleViewAdapter
+import net.vonforst.evmap.api.availability.ChargeLocationStatus
+import net.vonforst.evmap.databinding.DialogConnectorDetailsBinding
+import net.vonforst.evmap.databinding.DialogConnectorDetailsHeaderBinding
+import net.vonforst.evmap.model.Chargepoint
+import net.vonforst.evmap.storage.PreferenceDataSource
+
+class ConnectorDetailsDialog(
+    val binding: DialogConnectorDetailsBinding,
+    context: Context,
+    onClose: () -> Unit
+) {
+    private val headerBinding: DialogConnectorDetailsHeaderBinding
+    private val detailsAdapter = ConnectorDetailsAdapter()
+
+    init {
+        binding.list.apply {
+            itemAnimator = null
+            layoutManager =
+                LinearLayoutManager(context, LinearLayoutManager.VERTICAL, false)
+        }
+        headerBinding = DataBindingUtil.inflate(
+            LayoutInflater.from(context),
+            R.layout.dialog_connector_details_header, binding.list, false
+        )
+        binding.list.adapter = ConcatAdapter(
+            SingleViewAdapter(headerBinding.root),
+            detailsAdapter
+        )
+        binding.btnClose.setOnClickListener {
+            onClose()
+        }
+    }
+
+    fun setData(cp: Chargepoint, status: ChargeLocationStatus?) {
+        val cpStatus = status?.status?.get(cp)
+        val items = if (status != null) {
+            List(cp.count) { i ->
+                ConnectorDetailsAdapter.ConnectorDetails(
+                    cpStatus?.get(i),
+                    status.evseIds?.get(cp)?.get(i),
+                    status.labels?.get(cp)?.get(i),
+                    status.lastChange?.get(cp)?.get(i)
+                )
+            }.sortedBy { it.evseId ?: it.label }
+        } else emptyList()
+        detailsAdapter.submitList(items)
+
+        headerBinding.divider.visibility = if (items.isEmpty()) View.GONE else View.VISIBLE
+        headerBinding.item = ConnectorAdapter.ChargepointWithAvailability(cp, cpStatus)
+    }
+}

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

@@ -0,0 +1,29 @@
+package net.vonforst.evmap.fragment
+
+import androidx.fragment.app.Fragment
+import net.vonforst.evmap.MapsActivity
+import net.vonforst.evmap.R
+import net.vonforst.evmap.databinding.FragmentDonateReferralBinding
+
+abstract class DonateFragmentBase : Fragment() {
+    fun setupReferrals(referrals: FragmentDonateReferralBinding) {
+        referrals.referralTesla.setOnClickListener {
+            (requireActivity() as MapsActivity).openUrl(getString(R.string.tesla_referral_link))
+        }
+        referrals.referralJuicify.setOnClickListener {
+            (requireActivity() as MapsActivity).openUrl(getString(R.string.juicify_referral_link))
+        }
+        referrals.referralGeldfuereauto.setOnClickListener {
+            (requireActivity() as MapsActivity).openUrl(getString(R.string.geldfuereauto_referral_link))
+        }
+        referrals.referralMaingau.setOnClickListener {
+            (requireActivity() as MapsActivity).openUrl(getString(R.string.maingau_referral_link))
+        }
+        referrals.referralEwieeinfach.setOnClickListener {
+            (requireActivity() as MapsActivity).openUrl(getString(R.string.ewieeinfach_referral_link))
+        }
+        referrals.referralEprimo.setOnClickListener {
+            (requireActivity() as MapsActivity).openUrl(getString(R.string.eprimo_referral_link))
+        }
+    }
+}

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

@@ -1,7 +1,12 @@
 package net.vonforst.evmap.fragment
 
 import android.os.Bundle
-import android.view.*
+import android.view.LayoutInflater
+import android.view.Menu
+import android.view.MenuInflater
+import android.view.MenuItem
+import android.view.View
+import android.view.ViewGroup
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.view.MenuProvider
 import androidx.databinding.DataBindingUtil
@@ -108,31 +113,19 @@ class FilterFragment : Fragment(), MenuProvider {
         }
     }
 
-    private fun saveProfile(error: Boolean = false) {
-        showEditTextDialog(requireContext()) { dialog, input ->
+    private fun saveProfile() {
+        showEditTextDialog(requireContext(), { dialog, input ->
             vm.filterProfile.value?.let { profile ->
                 input.setText(profile.name)
             }
 
-            if (error) {
-                input.error = getString(R.string.required)
-            }
-
             dialog.setTitle(R.string.save_as_profile)
                 .setMessage(R.string.save_profile_enter_name)
-                .setPositiveButton(R.string.ok) { _, _ ->
-                    if (input.text.isBlank()) {
-                        saveProfile(true)
-                    } else {
-                        lifecycleScope.launch {
-                            vm.saveAsProfile(input.text.toString())
-                            findNavController().popBackStack()
-                        }
-                    }
-                }
-                .setNegativeButton(R.string.cancel) { _, _ ->
-
-                }
-        }
+        }, {
+            lifecycleScope.launch {
+                vm.saveAsProfile(it)
+                findNavController().popBackStack()
+            }
+        })
     }
 }

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

@@ -183,20 +183,16 @@ class FilterProfilesFragment : Fragment() {
         adapter = FilterProfilesAdapter(touchHelper, onDelete = { fp ->
             delete(fp)
         }, onRename = { fp ->
-            showEditTextDialog(requireContext()) { dialog, input ->
+            showEditTextDialog(requireContext(), { dialog, input ->
                 input.setText(fp.name)
 
                 dialog.setTitle(R.string.rename)
                     .setMessage(R.string.save_profile_enter_name)
-                    .setPositiveButton(R.string.ok) { _, _ ->
-                        lifecycleScope.launch {
-                            vm.update(fp.copy(name = input.text.toString()))
-                        }
-                    }
-                    .setNegativeButton(R.string.cancel) { _, _ ->
-
-                    }
-            }
+            }, {
+                lifecycleScope.launch {
+                    vm.update(fp.copy(name = it))
+                }
+            })
         })
         binding.filterProfilesList.apply {
             this.adapter = this@FilterProfilesFragment.adapter

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

@@ -11,7 +11,14 @@ import android.graphics.Color
 import android.os.Build
 import android.os.Bundle
 import android.text.method.KeyListener
-import android.view.*
+import android.view.ContextThemeWrapper
+import android.view.Gravity
+import android.view.LayoutInflater
+import android.view.Menu
+import android.view.MenuInflater
+import android.view.MenuItem
+import android.view.View
+import android.view.ViewGroup
 import android.view.inputmethod.InputMethodManager
 import android.widget.AdapterView
 import android.widget.ImageView
@@ -23,7 +30,13 @@ import androidx.annotation.RequiresPermission
 import androidx.appcompat.widget.PopupMenu
 import androidx.core.content.ContextCompat
 import androidx.core.location.LocationListenerCompat
-import androidx.core.view.*
+import androidx.core.view.MenuCompat
+import androidx.core.view.MenuProvider
+import androidx.core.view.ViewCompat
+import androidx.core.view.WindowInsetsCompat
+import androidx.core.view.doOnLayout
+import androidx.core.view.doOnNextLayout
+import androidx.core.view.updateLayoutParams
 import androidx.databinding.DataBindingUtil
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.activityViewModels
@@ -31,7 +44,6 @@ import androidx.fragment.app.viewModels
 import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.Observer
 import androidx.lifecycle.lifecycleScope
-import androidx.navigation.findNavController
 import androidx.navigation.fragment.FragmentNavigatorExtras
 import androidx.navigation.fragment.findNavController
 import androidx.navigation.fragment.navArgs
@@ -53,10 +65,16 @@ import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import com.google.android.material.snackbar.Snackbar
 import com.google.android.material.transition.MaterialArcMotion
 import com.google.android.material.transition.MaterialContainerTransform
+import com.google.android.material.transition.MaterialContainerTransform.FADE_MODE_CROSS
 import com.google.android.material.transition.MaterialFadeThrough
 import com.google.android.material.transition.MaterialSharedAxis
 import com.mahc.custombottomsheetbehavior.BottomSheetBehaviorGoogleMapsLike
-import com.mahc.custombottomsheetbehavior.BottomSheetBehaviorGoogleMapsLike.*
+import com.mahc.custombottomsheetbehavior.BottomSheetBehaviorGoogleMapsLike.BottomSheetCallback
+import com.mahc.custombottomsheetbehavior.BottomSheetBehaviorGoogleMapsLike.STATE_ANCHOR_POINT
+import com.mahc.custombottomsheetbehavior.BottomSheetBehaviorGoogleMapsLike.STATE_COLLAPSED
+import com.mahc.custombottomsheetbehavior.BottomSheetBehaviorGoogleMapsLike.STATE_HIDDEN
+import com.mahc.custombottomsheetbehavior.BottomSheetBehaviorGoogleMapsLike.STATE_SETTLING
+import com.mahc.custombottomsheetbehavior.BottomSheetBehaviorGoogleMapsLike.from
 import com.mahc.custombottomsheetbehavior.MergedAppBarLayoutBehavior
 import com.stfalcon.imageviewer.StfalconImageViewer
 import io.michaelrocks.bimap.HashBiMap
@@ -71,6 +89,7 @@ import net.vonforst.evmap.adapter.ConnectorAdapter
 import net.vonforst.evmap.adapter.DetailsAdapter
 import net.vonforst.evmap.adapter.GalleryAdapter
 import net.vonforst.evmap.adapter.PlaceAutocompleteAdapter
+import net.vonforst.evmap.api.chargeprice.ChargepriceApi
 import net.vonforst.evmap.autocomplete.ApiUnavailableException
 import net.vonforst.evmap.autocomplete.PlaceWithBounds
 import net.vonforst.evmap.bold
@@ -78,18 +97,38 @@ import net.vonforst.evmap.databinding.FragmentMapBinding
 import net.vonforst.evmap.location.FusionEngine
 import net.vonforst.evmap.location.LocationEngine
 import net.vonforst.evmap.location.Priority
-import net.vonforst.evmap.model.*
+import net.vonforst.evmap.model.ChargeLocation
+import net.vonforst.evmap.model.ChargeLocationCluster
+import net.vonforst.evmap.model.ChargepointListItem
+import net.vonforst.evmap.model.ChargerPhoto
+import net.vonforst.evmap.model.FILTERS_CUSTOM
+import net.vonforst.evmap.model.FILTERS_DISABLED
+import net.vonforst.evmap.model.FILTERS_FAVORITES
 import net.vonforst.evmap.navigation.safeNavigate
 import net.vonforst.evmap.shouldUseImperialUnits
 import net.vonforst.evmap.storage.PreferenceDataSource
-import net.vonforst.evmap.ui.*
+import net.vonforst.evmap.ui.ChargerIconGenerator
+import net.vonforst.evmap.ui.ClusterIconGenerator
+import net.vonforst.evmap.ui.HideOnScrollFabBehavior
+import net.vonforst.evmap.ui.MarkerAnimator
+import net.vonforst.evmap.ui.chargerZ
+import net.vonforst.evmap.ui.clusterZ
+import net.vonforst.evmap.ui.getMarkerTint
+import net.vonforst.evmap.ui.placeSearchZ
+import net.vonforst.evmap.ui.setTouchModal
 import net.vonforst.evmap.utils.boundingBox
 import net.vonforst.evmap.utils.checkAnyLocationPermission
 import net.vonforst.evmap.utils.checkFineLocationPermission
 import net.vonforst.evmap.utils.distanceBetween
 import net.vonforst.evmap.utils.formatDecimal
-import net.vonforst.evmap.viewmodel.*
+import net.vonforst.evmap.viewmodel.GalleryViewModel
+import net.vonforst.evmap.viewmodel.MapPosition
+import net.vonforst.evmap.viewmodel.MapViewModel
+import net.vonforst.evmap.viewmodel.Resource
+import net.vonforst.evmap.viewmodel.Status
 import java.io.IOException
+import java.time.Duration
+import java.time.Instant
 import kotlin.collections.component1
 import kotlin.collections.component2
 import kotlin.collections.contains
@@ -107,6 +146,7 @@ class MapFragment : Fragment(), OnMapReadyCallback, MapsActivity.FragmentCallbac
     private var requestingLocationUpdates = false
     private lateinit var bottomSheetBehavior: BottomSheetBehaviorGoogleMapsLike<View>
     private lateinit var detailAppBarBehavior: MergedAppBarLayoutBehavior
+    private lateinit var detailsDialog: ConnectorDetailsDialog
     private lateinit var prefs: PreferenceDataSource
     private var markers: MutableBiMap<Marker, ChargeLocation> = HashBiMap()
     private var clusterMarkers: List<Marker> = emptyList()
@@ -115,6 +155,7 @@ class MapFragment : Fragment(), OnMapReadyCallback, MapsActivity.FragmentCallbac
     private var connectionErrorSnackbar: Snackbar? = null
     private var previousChargepointIds: Set<Long>? = null
     private var mapTopPadding: Int = 0
+    private var popupMenu: PopupMenu? = null
 
     private lateinit var clusterIconGenerator: ClusterIconGenerator
     private lateinit var chargerIconGenerator: ChargerIconGenerator
@@ -128,6 +169,12 @@ class MapFragment : Fragment(), OnMapReadyCallback, MapsActivity.FragmentCallbac
                 return
             }
 
+            if (vm.selectedChargepoint.value != null) {
+                closeConnectorDetailsDialog()
+                vm.selectedChargepoint.value = null
+                return
+            }
+
             if (binding.search.hasFocus()) {
                 removeSearchFocus()
             }
@@ -178,12 +225,12 @@ class MapFragment : Fragment(), OnMapReadyCallback, MapsActivity.FragmentCallbac
             mapFragment = MapFragment()
             mapFragment!!.priority = arrayOf(
                 when (provider) {
-                    "mapbox" -> MapFragment.MAPBOX
+                    "mapbox" -> MapFragment.MAPLIBRE
                     "google" -> MapFragment.GOOGLE
                     else -> null
                 },
                 MapFragment.GOOGLE,
-                MapFragment.MAPBOX
+                MapFragment.MAPLIBRE
             )
             childFragmentManager
                 .beginTransaction()
@@ -228,7 +275,7 @@ class MapFragment : Fragment(), OnMapReadyCallback, MapsActivity.FragmentCallbac
 
             // set map padding so that compass is not obstructed by toolbar
             mapTopPadding = systemWindowInsetTop + (48 * density).toInt() + (16 * density).toInt()
-            // if we actually use map.setPadding here, Mapbox will re-trigger onApplyWindowInsets
+            // if we actually use map.setPadding here, MapLibre will re-trigger onApplyWindowInsets
             // and cause an infinite loop. So we rely on onMapReady being called later than
             // onApplyWindowInsets.
 
@@ -266,8 +313,10 @@ class MapFragment : Fragment(), OnMapReadyCallback, MapsActivity.FragmentCallbac
 
         binding.detailView.topPart.doOnNextLayout {
             bottomSheetBehavior.peekHeight = binding.detailView.topPart.bottom
+            vm.bottomSheetState.value?.let { bottomSheetBehavior.state = it }
         }
         bottomSheetBehavior.isCollapsible = bottomSheetCollapsible
+        binding.detailView.connectorDetails
 
         setupObservers()
         setupClickListeners()
@@ -279,7 +328,11 @@ class MapFragment : Fragment(), OnMapReadyCallback, MapsActivity.FragmentCallbac
             (requireActivity() as MapsActivity).appBarConfiguration
         )
 
-        if (prefs.appStartCounter > 5 && !prefs.opensourceDonationsDialogShown) {
+        if (prefs.appStartCounter > 5 && Duration.between(
+                prefs.opensourceDonationsDialogLastShown,
+                Instant.now()
+            ) > Duration.ofDays(30)
+        ) {
             try {
                 findNavController().safeNavigate(MapFragmentDirections.actionMapToOpensourceDonations())
             } catch (ignored: IllegalArgumentException) {
@@ -321,6 +374,12 @@ class MapFragment : Fragment(), OnMapReadyCallback, MapsActivity.FragmentCallbac
             binding.appLogo.root.visibility = View.GONE
             binding.search.visibility = View.VISIBLE
         }
+
+        detailsDialog =
+            ConnectorDetailsDialog(binding.detailView.connectorDetails, requireContext()) {
+                closeConnectorDetailsDialog()
+                vm.selectedChargepoint.value = null
+            }
     }
 
     override fun onResume() {
@@ -377,12 +436,16 @@ class MapFragment : Fragment(), OnMapReadyCallback, MapsActivity.FragmentCallbac
         }
         binding.detailView.btnChargeprice.setOnClickListener {
             val charger = vm.charger.value?.data ?: return@setOnClickListener
-            val extras =
-                FragmentNavigatorExtras(binding.detailView.btnChargeprice to getString(R.string.shared_element_chargeprice))
-            findNavController().safeNavigate(
-                MapFragmentDirections.actionMapToChargepriceFragment(charger),
-                extras
-            )
+            if (prefs.chargepriceNativeIntegration) {
+                val extras =
+                    FragmentNavigatorExtras(binding.detailView.btnChargeprice to getString(R.string.shared_element_chargeprice))
+                findNavController().safeNavigate(
+                    MapFragmentDirections.actionMapToChargepriceFragment(charger),
+                    extras
+                )
+            } else {
+                (activity as? MapsActivity)?.openUrl(ChargepriceApi.getPoiUrl(charger), false)
+            }
         }
         binding.detailView.btnChargerWebsite.setOnClickListener {
             val charger = vm.charger.value?.data ?: return@setOnClickListener
@@ -405,6 +468,11 @@ class MapFragment : Fragment(), OnMapReadyCallback, MapsActivity.FragmentCallbac
         binding.detailView.topPart.setOnClickListener {
             bottomSheetBehavior.state = STATE_ANCHOR_POINT
         }
+        binding.detailView.topPart.setOnLongClickListener {
+            val charger = vm.charger.value?.data ?: return@setOnLongClickListener false
+            copyToClipboard(ClipData.newPlainText(getString(R.string.charger_name), charger.name))
+            return@setOnLongClickListener true
+        }
         setupSearchAutocomplete()
         binding.detailAppBar.toolbar.setNavigationOnClickListener {
             if (bottomSheetCollapsible) {
@@ -601,6 +669,14 @@ class MapFragment : Fragment(), OnMapReadyCallback, MapsActivity.FragmentCallbac
                 ) {
                     closeLayersMenu()
                 }
+
+                if (vm.selectedChargepoint.value != null && newState in listOf(
+                        STATE_ANCHOR_POINT, STATE_COLLAPSED
+                    )
+                ) {
+                    closeConnectorDetailsDialog()
+                    vm.selectedChargepoint.value = null
+                }
             }
         })
         vm.chargerSparse.observe(viewLifecycleOwner) {
@@ -654,6 +730,7 @@ class MapFragment : Fragment(), OnMapReadyCallback, MapsActivity.FragmentCallbac
             displaySearchResult(place, moveCamera = true)
         }
         vm.layersMenuOpen.observe(viewLifecycleOwner) { open ->
+            HideOnScrollFabBehavior.from(binding.fabLayers)?.hidden = open
             binding.fabLayers.visibility = if (open) View.INVISIBLE else View.VISIBLE
             binding.layersSheet.visibility = if (open) View.VISIBLE else View.INVISIBLE
             updateBackPressedCallback()
@@ -664,6 +741,14 @@ class MapFragment : Fragment(), OnMapReadyCallback, MapsActivity.FragmentCallbac
         vm.mapTrafficEnabled.observe(viewLifecycleOwner) {
             map?.setTrafficEnabled(it)
         }
+        vm.selectedChargepoint.observe(viewLifecycleOwner) {
+            binding.detailView.connectorDetailsCard.visibility =
+                if (it != null) View.VISIBLE else View.INVISIBLE
+            if (it != null) {
+                detailsDialog.setData(it, vm.availability.value?.data)
+            }
+            updateBackPressedCallback()
+        }
 
         updateBackPressedCallback()
     }
@@ -708,6 +793,7 @@ class MapFragment : Fragment(), OnMapReadyCallback, MapsActivity.FragmentCallbac
                     || vm.searchResult.value != null
                     || (vm.layersMenuOpen.value ?: false)
                     || binding.search.hasFocus()
+                    || vm.selectedChargepoint.value != null
     }
 
     private fun unhighlightAllMarkers() {
@@ -778,6 +864,7 @@ class MapFragment : Fragment(), OnMapReadyCallback, MapsActivity.FragmentCallbac
                         if (photo == photos[position] && imageCacheKey != null) {
                             placeholderMemoryCacheKey(imageCacheKey)
                         }
+                        allowHardware(false)
                     }
                 }
                     .withTransitionFrom(view as ImageView)
@@ -808,7 +895,12 @@ class MapFragment : Fragment(), OnMapReadyCallback, MapsActivity.FragmentCallbac
         }
 
         binding.detailView.connectors.apply {
-            adapter = ConnectorAdapter()
+            adapter = ConnectorAdapter().apply {
+                onClickListener = {
+                    vm.selectedChargepoint.value = it.chargepoint
+                    openConnectorDetailsDialog()
+                }
+            }
             itemAnimator = null
             layoutManager =
                 LinearLayoutManager(context, LinearLayoutManager.HORIZONTAL, false)
@@ -839,50 +931,26 @@ class MapFragment : Fragment(), OnMapReadyCallback, MapsActivity.FragmentCallbac
                 }
                 onLongClickListener = {
                     val charger = vm.chargerDetails.value?.data
-                    val clipboardManager =
-                        requireContext().getSystemService(Context.CLIPBOARD_SERVICE) as ClipboardManager
                     if (charger != null) {
                         when (it.icon) {
                             R.drawable.ic_address -> {
                                 if (charger.address != null) {
-                                    val clip = ClipData.newPlainText(
+                                    copyToClipboard(ClipData.newPlainText(
                                         getString(R.string.address),
                                         charger.address.toString()
-                                    )
-                                    clipboardManager.setPrimaryClip(clip)
-
-                                    if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.S_V2) {
-                                        Snackbar.make(
-                                            requireView(),
-                                            R.string.copied,
-                                            Toast.LENGTH_SHORT
-                                        )
-                                            .show()
-                                    }
+                                    ))
                                     true
                                 } else {
                                     false
                                 }
                             }
-
                             R.drawable.ic_location -> {
-                                val clip = ClipData.newPlainText(
+                                copyToClipboard(ClipData.newPlainText(
                                     getString(R.string.coordinates),
                                     charger.coordinates.formatDecimal()
-                                )
-                                clipboardManager.setPrimaryClip(clip)
-
-                                if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.S_V2) {
-                                    Snackbar.make(
-                                        requireView(),
-                                        R.string.copied,
-                                        Toast.LENGTH_SHORT
-                                    )
-                                        .show()
-                                }
+                                ))
                                 true
                             }
-
                             else -> false
                         }
                     } else {
@@ -902,6 +970,59 @@ class MapFragment : Fragment(), OnMapReadyCallback, MapsActivity.FragmentCallbac
         }
     }
 
+    private fun copyToClipboard(clip: ClipData) {
+        val clipboardManager =
+            requireContext().getSystemService(Context.CLIPBOARD_SERVICE) as ClipboardManager
+        clipboardManager.setPrimaryClip(clip)
+
+        if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.S_V2) {
+            Snackbar.make(
+                requireView(),
+                R.string.copied,
+                Toast.LENGTH_SHORT
+            )
+                .show()
+        }
+    }
+
+    private fun openConnectorDetailsDialog() {
+        val chargepoints = vm.chargerDetails.value?.data?.chargepointsMerged ?: return
+        val chargepoint = vm.selectedChargepoint.value ?: return
+        val index = chargepoints.indexOf(chargepoint).takeIf { it >= 0 } ?: return
+        val vh = binding.detailView.connectors.findViewHolderForAdapterPosition(index) ?: return
+
+        val materialTransform = MaterialContainerTransform().apply {
+            startView = vh.itemView
+            endView = binding.detailView.connectorDetailsCard
+            setPathMotion(MaterialArcMotion())
+            duration = 250
+            scrimColor = Color.TRANSPARENT
+            addTarget(binding.detailView.connectorDetailsCard)
+            isElevationShadowEnabled = false
+            fadeMode = FADE_MODE_CROSS
+        }
+        TransitionManager.beginDelayedTransition(binding.root, materialTransform)
+    }
+
+    private fun closeConnectorDetailsDialog() {
+        val chargepoints = vm.chargerDetails.value?.data?.chargepointsMerged ?: return
+        val chargepoint = vm.selectedChargepoint.value ?: return
+        val index = chargepoints.indexOf(chargepoint).takeIf { it >= 0 } ?: return
+        val vh = binding.detailView.connectors.findViewHolderForAdapterPosition(index) ?: return
+
+        val materialTransform = MaterialContainerTransform().apply {
+            startView = binding.detailView.connectorDetailsCard
+            endView = vh.itemView
+            setPathMotion(MaterialArcMotion())
+            duration = 200
+            scrimColor = Color.TRANSPARENT
+            addTarget(vh.itemView)
+            isElevationShadowEnabled = false
+            fadeMode = FADE_MODE_CROSS
+        }
+        TransitionManager.beginDelayedTransition(binding.root, materialTransform)
+    }
+
     private fun showPaymentMethodsDialog(charger: ChargeLocation) {
         val activity = activity ?: return
         val chargecardData = vm.chargeCardMap.value ?: return
@@ -932,6 +1053,9 @@ class MapFragment : Fragment(), OnMapReadyCallback, MapsActivity.FragmentCallbac
         val context = this.context ?: return
         chargerIconGenerator = ChargerIconGenerator(context, map.bitmapDescriptorFactory)
 
+        vm.mapTrafficSupported.value =
+            mapFragment?.let { AnyMap.Feature.TRAFFIC_LAYER in it.supportedFeatures } ?: false
+
         if (BuildConfig.FLAVOR.contains("google") && mapFragment!!.priority[0] == MapFragment.GOOGLE) {
             // Google Maps: icons can be generated in background thread
             lifecycleScope.launch {
@@ -940,7 +1064,7 @@ class MapFragment : Fragment(), OnMapReadyCallback, MapsActivity.FragmentCallbac
                 }
             }
         } else {
-            // Mapbox: needs to be run on main thread
+            // MapLibre: needs to be run on main thread
             chargerIconGenerator.preloadCache()
         }
 
@@ -1281,14 +1405,13 @@ class MapFragment : Fragment(), OnMapReadyCallback, MapsActivity.FragmentCallbac
             MenuCompat.setGroupDividerEnabled(popup.menu, true)
             popup.setForceShowIcon(true)
             popup.setOnMenuItemClickListener {
-                val navController = requireView().findNavController()
                 when (it.itemId) {
                     R.id.menu_edit_filters -> {
                         exitTransition = MaterialSharedAxis(MaterialSharedAxis.Z, true)
                         reenterTransition = MaterialSharedAxis(MaterialSharedAxis.Z, false)
                         lifecycleScope.launch {
                             vm.copyFiltersToCustom()
-                            navController.safeNavigate(
+                            findNavController().safeNavigate(
                                 MapFragmentDirections.actionMapToFilterFragment()
                             )
                         }
@@ -1298,7 +1421,7 @@ class MapFragment : Fragment(), OnMapReadyCallback, MapsActivity.FragmentCallbac
                     R.id.menu_manage_filter_profiles -> {
                         exitTransition = MaterialSharedAxis(MaterialSharedAxis.Z, true)
                         reenterTransition = MaterialSharedAxis(MaterialSharedAxis.Z, false)
-                        navController.safeNavigate(
+                        findNavController().safeNavigate(
                             MapFragmentDirections.actionMapToFilterProfilesFragment()
                         )
                         true
@@ -1378,6 +1501,7 @@ class MapFragment : Fragment(), OnMapReadyCallback, MapsActivity.FragmentCallbac
                 }
             }
             popup.setTouchModal(false)
+            popupMenu = popup
             popup.show()
         }
 
@@ -1461,5 +1585,8 @@ class MapFragment : Fragment(), OnMapReadyCallback, MapsActivity.FragmentCallbac
 
     override fun onDestroy() {
         super.onDestroy()
+        /* if we don't dismiss the popup menu, it will be recreated in some cases
+        (split-screen mode) and then have references to a destroyed fragment. */
+        popupMenu?.dismiss()
     }
 }

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

@@ -7,6 +7,7 @@ import android.text.Spanned
 import android.text.style.RelativeSizeSpan
 import android.view.View
 import androidx.fragment.app.viewModels
+import androidx.preference.CheckBoxPreference
 import net.vonforst.evmap.R
 import net.vonforst.evmap.ui.MultiSelectDialogPreference
 import net.vonforst.evmap.viewmodel.SettingsViewModel
@@ -28,9 +29,11 @@ class ChargepriceSettingsFragment : BaseSettingsFragment() {
 
     private lateinit var myVehiclePreference: MultiSelectDialogPreference
     private lateinit var myTariffsPreference: MultiSelectDialogPreference
+    private lateinit var nativeIntegrationPreference: CheckBoxPreference
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
+        nativeIntegrationPreference = findPreference("chargeprice_native_integration")!!
 
         myVehiclePreference = findPreference("chargeprice_my_vehicle")!!
         myVehiclePreference.isEnabled = false
@@ -48,7 +51,7 @@ class ChargepriceSettingsFragment : BaseSettingsFragment() {
                         )
                     }
                 }.toTypedArray()
-                myVehiclePreference.isEnabled = true
+                myVehiclePreference.isEnabled = nativeIntegrationPreference.isChecked
                 updateMyVehiclesSummary()
             }
         }
@@ -65,10 +68,28 @@ class ChargepriceSettingsFragment : BaseSettingsFragment() {
                         it.name
                     }
                 }.toTypedArray()
-                myTariffsPreference.isEnabled = true
+                myTariffsPreference.isEnabled = nativeIntegrationPreference.isChecked
                 updateMyTariffsSummary()
             }
         }
+        updateNativeIntegrationState()
+    }
+
+    private fun updateNativeIntegrationState() {
+        for (i in 0 until preferenceScreen.preferenceCount) {
+            val pref = preferenceScreen.getPreference(i)
+            if (pref == nativeIntegrationPreference) {
+                continue
+            } else if (pref == myTariffsPreference) {
+                pref.isEnabled =
+                    nativeIntegrationPreference.isChecked && vm.tariffs.value?.data != null
+            } else if (pref == myVehiclePreference) {
+                pref.isEnabled =
+                    nativeIntegrationPreference.isChecked && vm.tariffs.value?.data != null
+            } else {
+                pref.isEnabled = nativeIntegrationPreference.isChecked
+            }
+        }
     }
 
     private fun updateMyTariffsSummary() {
@@ -110,6 +131,10 @@ class ChargepriceSettingsFragment : BaseSettingsFragment() {
             "chargeprice_my_tariffs" -> {
                 updateMyTariffsSummary()
             }
+
+            "chargeprice_native_integration" -> {
+                updateNativeIntegrationState()
+            }
         }
     }
 }

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

@@ -15,8 +15,8 @@ import com.google.android.material.snackbar.Snackbar
 import kotlinx.coroutines.launch
 import net.vonforst.evmap.R
 import net.vonforst.evmap.addDebugInterceptors
-import net.vonforst.evmap.api.availability.TeslaAuthenticationApi
-import net.vonforst.evmap.api.availability.TeslaOwnerApi
+import net.vonforst.evmap.api.availability.tesla.TeslaAuthenticationApi
+import net.vonforst.evmap.api.availability.tesla.TeslaOwnerApi
 import net.vonforst.evmap.fragment.oauth.OAuthLoginFragmentArgs
 import net.vonforst.evmap.viewmodel.SettingsViewModel
 import net.vonforst.evmap.viewmodel.viewModelFactory

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

@@ -6,9 +6,11 @@ import android.net.Uri
 import android.os.Build
 import android.os.Bundle
 import android.provider.Settings
+import androidx.preference.CheckBoxPreference
 import androidx.preference.ListPreference
 import androidx.preference.Preference
 import net.vonforst.evmap.R
+import net.vonforst.evmap.isAppInstalled
 import net.vonforst.evmap.ui.getAppLocale
 import net.vonforst.evmap.ui.updateAppLocale
 import net.vonforst.evmap.ui.updateNightMode
@@ -16,6 +18,7 @@ import net.vonforst.evmap.ui.updateNightMode
 class UiSettingsFragment : BaseSettingsFragment() {
     override val isTopLevel = false
     lateinit var langPref: ListPreference
+    lateinit var immediateNavPref: CheckBoxPreference
 
     override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
         setPreferencesFromResource(R.xml.settings_ui, rootKey)
@@ -28,11 +31,18 @@ class UiSettingsFragment : BaseSettingsFragment() {
 
         val appLinkPref = findPreference<Preference>("applink_associate")!!
         appLinkPref.isVisible = Build.VERSION.SDK_INT >= Build.VERSION_CODES.S
+
+        immediateNavPref = findPreference("navigate_use_maps")!!
+        immediateNavPref.isVisible = isGoogleMapsInstalled()
     }
 
+    private fun isGoogleMapsInstalled() =
+        requireContext().packageManager.isAppInstalled("com.google.android.apps.maps")
+
     override fun onResume() {
         super.onResume()
-        langPref.value = getAppLocale()
+        langPref.value = getAppLocale(requireContext())
+        immediateNavPref.isVisible = isGoogleMapsInstalled()
     }
 
     override fun onSharedPreferenceChanged(sharedPreferences: SharedPreferences, key: String?) {

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

@@ -10,6 +10,7 @@ import net.vonforst.evmap.databinding.DialogOpensourceDonationsBinding
 import net.vonforst.evmap.navigation.safeNavigate
 import net.vonforst.evmap.storage.PreferenceDataSource
 import net.vonforst.evmap.ui.MaterialDialogFragment
+import java.time.Instant
 
 class OpensourceDonationsDialogFragment : MaterialDialogFragment() {
     private lateinit var binding: DialogOpensourceDonationsBinding
@@ -26,15 +27,15 @@ class OpensourceDonationsDialogFragment : MaterialDialogFragment() {
     override fun initView(view: View, savedInstanceState: Bundle?) {
         val prefs = PreferenceDataSource(requireContext())
         binding.btnOk.setOnClickListener {
-            prefs.opensourceDonationsDialogShown = true
+            prefs.opensourceDonationsDialogLastShown = Instant.now()
             dismiss()
         }
         binding.btnDonate.setOnClickListener {
-            prefs.opensourceDonationsDialogShown = true
+            prefs.opensourceDonationsDialogLastShown = Instant.now()
             findNavController().safeNavigate(OpensourceDonationsDialogFragmentDirections.actionOpensourceDonationsToDonate())
         }
         binding.btnGithubSponsors.setOnClickListener {
-            prefs.opensourceDonationsDialogShown = true
+            prefs.opensourceDonationsDialogLastShown = Instant.now()
             findNavController().safeNavigate(OpensourceDonationsDialogFragmentDirections.actionOpensourceDonationsToGithubSponsors())
         }
     }

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

@@ -18,7 +18,7 @@ import java.time.LocalDate
 import java.time.LocalTime
 import java.time.format.DateTimeFormatter
 import java.time.format.FormatStyle
-import java.util.*
+import kotlin.math.abs
 
 sealed class ChargepointListItem
 
@@ -127,10 +127,13 @@ data class ChargeLocation(
         get() {
             val variants = chargepoints.distinctBy { it.power to it.type }
             return variants.map { variant ->
-                val count = chargepoints
+                val filtered = chargepoints
                     .filter { it.type == variant.type && it.power == variant.power }
-                    .sumOf { it.count }
-                Chargepoint(variant.type, variant.power, count)
+                val count = filtered.sumOf { it.count }
+                Chargepoint(variant.type, variant.power, count,
+                    filtered.map { it.voltage }.distinct().singleOrNull(),
+                    filtered.map { it.current }.distinct().singleOrNull()
+                )
             }
         }
 
@@ -390,24 +393,29 @@ data class Address(
 @Parcelize
 @JsonClass(generateAdapter = true)
 data class Chargepoint(
-    // The chargepoint type (use one of the constants in the companion object)
+    // The connector type (use one of the constants in the companion object if applicable)
     val type: String,
     // Power in kW (or null if unknown)
     val power: Double?,
     // How many instances of this plug/socket are available?
     val count: Int,
+    // Max current in A (or null if unknown)
+    val current: Double? = null,
+    // Max voltage in V (or null if unknown).
+    // note that for DC chargers: current * voltage may be larger than power
+    // (each of the three can be separately limited)
+    val voltage: Double? = null
 ) : Equatable, Parcelable {
     fun hasKnownPower(): Boolean = power != null
+    fun hasKnownVoltageAndCurrent(): Boolean = voltage != null && current != null
 
     /**
      * If chargepoint power is defined, format it into a string.
      * Otherwise, return null.
      */
     fun formatPower(): String? {
-        if (power == null) {
-            return null
-        }
-        val powerFmt = if (power - power.toInt() == 0.0) {
+        if (power == null) return null
+        val powerFmt = if (abs(power - power.toInt()) < 0.1) {
             "%.0f".format(power)
         } else {
             "%.1f".format(power)
@@ -415,6 +423,12 @@ data class Chargepoint(
         return "$powerFmt kW"
     }
 
+    fun formatVoltageAndCurrent(): String? {
+        if (current == null || voltage == null) return null
+
+        return "%.0f V · %.0f A".format(voltage, current)
+    }
+
     companion object {
         const val TYPE_1 = "Type 1"
         const val TYPE_2_UNKNOWN = "Type 2 (either plug or socket)"

app/src/main/java/net/vonforst/evmap/navigation/CustomNavigator.kt

@@ -1,10 +1,12 @@
 package net.vonforst.evmap.navigation
 
 import android.app.Activity
+import android.content.ActivityNotFoundException
 import android.content.Context
 import android.net.Uri
 import android.os.Bundle
 import android.util.AttributeSet
+import android.widget.Toast
 import androidx.browser.customtabs.CustomTabColorSchemeParams
 import androidx.browser.customtabs.CustomTabsIntent
 import androidx.core.content.ContextCompat
@@ -52,7 +54,15 @@ class CustomNavigator(
                     .build()
             )
             .build()
-        intent.launchUrl(context, Uri.parse(url))
+        try {
+            intent.launchUrl(context, Uri.parse(url))
+        } catch (e: ActivityNotFoundException) {
+            Toast.makeText(
+                context,
+                R.string.no_browser_app_found,
+                Toast.LENGTH_SHORT
+            ).show()
+        }
     }
 
     override fun popBackStack() = true // Managed by Chrome Custom Tabs

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

@@ -3,13 +3,13 @@ package net.vonforst.evmap.storage
 import android.content.Context
 import androidx.security.crypto.EncryptedSharedPreferences
 import androidx.security.crypto.MasterKey
-import net.vonforst.evmap.api.availability.TeslaAvailabilityDetector
+import net.vonforst.evmap.api.availability.TeslaOwnerAvailabilityDetector
 
 /**
  * Encrypted data storage for sensitive data such as API access tokens.
  * This will not be included in backups.
  */
-class EncryptedPreferenceDataStore(context: Context) : TeslaAvailabilityDetector.TokenStore {
+class EncryptedPreferenceDataStore(context: Context) : TeslaOwnerAvailabilityDetector.TokenStore {
     val sp = EncryptedSharedPreferences.create(
         context,
         "encrypted_prefs",

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

@@ -147,6 +147,12 @@ class PreferenceDataSource(val context: Context) {
             sp.edit().putBoolean("update_0.6.0_androidauto_dialog_shown", value).apply()
         }
 
+    var chargepriceNativeIntegration: Boolean
+        get() = sp.getBoolean("chargeprice_native_integration", true)
+        set(value) {
+            sp.edit().putBoolean("chargeprice_native_integration", value).apply()
+        }
+
     var chargepriceMyVehicles: Set<String>
         get() = try {
             sp.getStringSet("chargeprice_my_vehicle", emptySet())!!
@@ -237,10 +243,11 @@ class PreferenceDataSource(val context: Context) {
             sp.edit().putLong("chargeprice_counter", value).apply()
         }
 
-    var opensourceDonationsDialogShown: Boolean
-        get() = sp.getBoolean("opensource_donations_dialog_shown", false)
+    var opensourceDonationsDialogLastShown: Instant
+        get() = Instant.ofEpochMilli(sp.getLong("opensource_donations_dialog_last_shown", 0L))
         set(value) {
-            sp.edit().putBoolean("opensource_donations_dialog_shown", value).apply()
+            sp.edit().putLong("opensource_donations_dialog_last_shown", value.toEpochMilli())
+                .apply()
         }
 
     var placeSearchResultAndroidAuto: LatLng?

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

@@ -7,6 +7,7 @@ import android.graphics.drawable.ColorDrawable
 import android.graphics.drawable.Drawable
 import android.graphics.drawable.LayerDrawable
 import android.text.SpannableString
+import android.text.format.DateUtils
 import android.view.View
 import android.view.ViewGroup.MarginLayoutParams
 import android.widget.ImageView
@@ -25,9 +26,14 @@ import androidx.viewpager2.widget.ViewPager2
 import coil.load
 import com.google.android.material.floatingactionbutton.FloatingActionButton
 import com.google.android.material.slider.RangeSlider
-import net.vonforst.evmap.*
+import net.vonforst.evmap.R
 import net.vonforst.evmap.api.availability.ChargepointStatus
 import net.vonforst.evmap.api.iconForPlugType
+import net.vonforst.evmap.isDarkMode
+import net.vonforst.evmap.kmPerMile
+import net.vonforst.evmap.meterPerFt
+import net.vonforst.evmap.shouldUseImperialUnits
+import java.time.Instant
 import kotlin.math.ceil
 import kotlin.math.floor
 import kotlin.math.roundToInt
@@ -67,7 +73,7 @@ fun invisibleUnlessAnimated(view: View, oldValue: Boolean, newValue: Boolean) {
     if (oldValue == newValue) {
         if (!newValue && view.visibility == View.VISIBLE && view.alpha == 1f) {
             // view is initially invisible
-            view.visibility = View.GONE
+            view.visibility = View.INVISIBLE
         } else {
             return
         }
@@ -137,8 +143,8 @@ fun <T> setRecyclerViewData(recyclerView: ViewPager2, items: List<T>?) {
 }
 
 @BindingAdapter("connectorIcon")
-fun getConnectorItem(view: ImageView, type: String) {
-    view.setImageResource(iconForPlugType(type))
+fun getConnectorItem(view: ImageView, type: String?) {
+    view.setImageResource(type?.let { iconForPlugType(it) } ?: 0)
 }
 
 @BindingAdapter("srcCompat")
@@ -156,11 +162,21 @@ fun setImageTintAvailability(view: ImageView, available: List<ChargepointStatus>
     view.imageTintList = ColorStateList.valueOf(availabilityColor(available, view.context))
 }
 
+@BindingAdapter("tintAvailability")
+fun setImageTintAvailability(view: ImageView, available: ChargepointStatus?) {
+    view.imageTintList = ColorStateList.valueOf(availabilityColor(available, view.context))
+}
+
 @BindingAdapter("textColorAvailability")
 fun setTextColorAvailability(view: TextView, available: List<ChargepointStatus>?) {
     view.setTextColor(availabilityColor(available, view.context))
 }
 
+@BindingAdapter("textColorAvailability")
+fun setTextColorAvailability(view: TextView, available: ChargepointStatus?) {
+    view.setTextColor(availabilityColor(available, view.context))
+}
+
 @BindingAdapter("backgroundTintAvailability")
 fun setBackgroundTintAvailability(view: View, available: List<ChargepointStatus>?) {
     view.backgroundTintList = ColorStateList.valueOf(availabilityColor(available, view.context))
@@ -269,6 +285,25 @@ private fun availabilityColor(
     ta.getColor(0, 0)
 }
 
+private fun availabilityColor(
+    status: ChargepointStatus?,
+    context: Context
+): Int = when (status) {
+    ChargepointStatus.UNKNOWN -> ContextCompat.getColor(context, R.color.unknown)
+    ChargepointStatus.AVAILABLE -> ContextCompat.getColor(context, R.color.available)
+    ChargepointStatus.FAULTED -> ContextCompat.getColor(context, R.color.unavailable)
+    ChargepointStatus.OCCUPIED, ChargepointStatus.CHARGING -> ContextCompat.getColor(
+        context,
+        R.color.charging
+    )
+
+    null -> {
+        val ta =
+            context.theme.obtainStyledAttributes(intArrayOf(androidx.appcompat.R.attr.colorControlNormal))
+        ta.getColor(0, 0)
+    }
+}
+
 fun availabilityText(status: List<ChargepointStatus>?): String? {
     if (status == null) return null
 
@@ -281,6 +316,29 @@ fun availabilityText(status: List<ChargepointStatus>?): String? {
     } else available.toString()
 }
 
+fun availabilityText(status: ChargepointStatus?, lastChange: Instant?, context: Context): String? {
+    if (status == null) return null
+
+    val statusText = when (status) {
+        ChargepointStatus.UNKNOWN -> context.getString(R.string.status_unknown)
+        ChargepointStatus.AVAILABLE -> context.getString(R.string.status_available)
+        ChargepointStatus.CHARGING -> context.getString(R.string.status_charging)
+        ChargepointStatus.OCCUPIED -> context.getString(R.string.status_occupied)
+        ChargepointStatus.FAULTED -> context.getString(R.string.status_faulted)
+    }
+
+    return if (lastChange != null) {
+        val relativeTime = DateUtils.getRelativeTimeSpanString(
+            lastChange.toEpochMilli(),
+            Instant.now().toEpochMilli(),
+            0
+        ).toString()
+        return context.getString(R.string.status_since, statusText, relativeTime)
+    } else {
+        statusText
+    }
+}
+
 fun flatten(it: Iterable<Iterable<ChargepointStatus>>?): List<ChargepointStatus>? {
     return it?.flatten()
 }

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

@@ -1,10 +1,12 @@
 package net.vonforst.evmap.ui
 
+import android.content.Context
 import androidx.appcompat.app.AppCompatDelegate
 import androidx.core.os.LocaleListCompat
-import net.vonforst.evmap.BuildConfig
+import net.vonforst.evmap.R
 import net.vonforst.evmap.storage.PreferenceDataSource
 
+
 fun updateNightMode(prefs: PreferenceDataSource) {
     AppCompatDelegate.setDefaultNightMode(
         when (prefs.darkmode) {
@@ -25,13 +27,14 @@ fun updateAppLocale(language: String) {
     )
 }
 
-fun getAppLocale(): String? {
+fun getAppLocale(context: Context): String? {
     val locales = AppCompatDelegate.getApplicationLocales()
     return if (locales.isEmpty) {
         "default"
     } else {
         val arr = Array(locales.size()) { locales.get(it)!!.toLanguageTag() }
-        LocaleListCompat.forLanguageTags(BuildConfig.supportedLocales).getFirstMatch(arr)
-            ?.toLanguageTag()
+        val choices =
+            context.resources.getStringArray(R.array.pref_language_values).joinToString(",")
+        LocaleListCompat.forLanguageTags(choices).getFirstMatch(arr)?.toLanguageTag()
     }
-}
+}

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

@@ -10,50 +10,60 @@ import android.view.ViewGroup
 import android.view.WindowManager
 import android.view.inputmethod.EditorInfo
 import android.widget.EditText
-import android.widget.FrameLayout
 import androidx.appcompat.app.AlertDialog
 import androidx.appcompat.app.AppCompatDialogFragment
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
+import com.google.android.material.textfield.TextInputLayout
+import net.vonforst.evmap.R
 import kotlin.math.roundToInt
 
-private fun dialogEditText(ctx: Context): Pair<View, EditText> {
-    val container = FrameLayout(ctx)
-    container.setPadding(
-        (16 * ctx.resources.displayMetrics.density).toInt(), 0,
-        (16 * ctx.resources.displayMetrics.density).toInt(), 0
-    )
-    val input = EditText(ctx)
-    input.isSingleLine = true
-    container.addView(input)
-    return container to input
+private fun dialogEditText(ctx: Context): Pair<TextInputLayout, EditText> {
+    val view = LayoutInflater.from(ctx).inflate(R.layout.dialog_textinput, null)
+    return view as TextInputLayout to view.findViewById(R.id.input)
 }
 
 fun showEditTextDialog(
     ctx: Context,
-    customize: (MaterialAlertDialogBuilder, EditText) -> Unit
+    customize: (MaterialAlertDialogBuilder, EditText) -> Unit,
+    okAction: (String) -> Unit
 ): AlertDialog {
     val (container, input) = dialogEditText(ctx)
     val dialogBuilder = MaterialAlertDialogBuilder(ctx)
         .setView(container)
+        .setPositiveButton(R.string.ok) { _, _ -> }
+        .setNegativeButton(R.string.cancel) { _, _ -> }
 
     customize(dialogBuilder, input)
 
     val dialog = dialogBuilder.show()
     dialog.window?.setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_ALWAYS_VISIBLE)
 
+    val okButton = dialog.getButton(DialogInterface.BUTTON_POSITIVE)
+
     // focus and show keyboard
     input.requestFocus()
     input.setOnEditorActionListener { _, actionId, _ ->
         if (actionId == EditorInfo.IME_ACTION_DONE) {
             val text = input.text
-            val button = dialog.getButton(DialogInterface.BUTTON_POSITIVE)
-            if (text != null && button != null) {
-                button.performClick()
+            if (text != null && okButton != null) {
+                okButton.performClick()
                 return@setOnEditorActionListener true
             }
         }
         false
     }
+
+    okButton?.setOnClickListener {
+        if (input.text.isBlank()) {
+            container.isErrorEnabled = true
+            container.error = ctx.getString(R.string.required)
+        } else {
+            container.isErrorEnabled = false
+            okAction(input.text.toString())
+            dialog.dismiss()
+        }
+    }
+
     return dialog
 }
 

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

@@ -12,6 +12,13 @@ import com.mahc.custombottomsheetbehavior.BottomSheetBehaviorGoogleMapsLike
 
 class HideOnScrollFabBehavior(context: Context, attrs: AttributeSet) :
     FloatingActionButton.Behavior(context, attrs) {
+    var hidden: Boolean = false
+
+    companion object {
+        fun from(view: View): HideOnScrollFabBehavior? {
+            return ((view.layoutParams as? CoordinatorLayout.LayoutParams)?.behavior as? HideOnScrollFabBehavior)
+        }
+    }
 
     override fun onStartNestedScroll(
         coordinatorLayout: CoordinatorLayout,
@@ -61,13 +68,13 @@ class HideOnScrollFabBehavior(context: Context, attrs: AttributeSet) :
         child: FloatingActionButton,
         dependency: View
     ): Boolean {
-        val behavior = BottomSheetBehaviorGoogleMapsLike.from<View>(dependency)
+        val behavior = BottomSheetBehaviorGoogleMapsLike.from(dependency)
         when (behavior.state) {
             BottomSheetBehaviorGoogleMapsLike.STATE_SETTLING -> {
 
             }
             BottomSheetBehaviorGoogleMapsLike.STATE_HIDDEN -> {
-                child.show()
+                if (!hidden) child.show()
             }
             else -> {
                 child.hide()
@@ -103,7 +110,7 @@ class HideOnScrollFabBehavior(context: Context, attrs: AttributeSet) :
             child.hide()
         } else if (dyConsumed < 0 && child.visibility != View.VISIBLE) {
             // User scrolled up and the FAB is currently not visible -> show the FAB
-            child.show()
+            if (!hidden) child.show()
         }
     }
 }

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

@@ -55,6 +55,8 @@ class ChargepriceViewModel(
                             })
                         } catch (e: IOException) {
                             Resource.error(e.message, null)
+                        } catch (e: HttpException) {
+                            Resource.error(e.message, null)
                         }
                     }
                 }

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

@@ -3,36 +3,47 @@ package net.vonforst.evmap.viewmodel
 import android.app.Application
 import android.graphics.Point
 import android.os.Parcelable
-import androidx.lifecycle.*
+import androidx.lifecycle.AndroidViewModel
+import androidx.lifecycle.LiveData
+import androidx.lifecycle.MediatorLiveData
+import androidx.lifecycle.MutableLiveData
+import androidx.lifecycle.SavedStateHandle
+import androidx.lifecycle.distinctUntilChanged
+import androidx.lifecycle.liveData
+import androidx.lifecycle.map
+import androidx.lifecycle.switchMap
+import androidx.lifecycle.viewModelScope
 import com.car2go.maps.AnyMap
 import com.car2go.maps.Projection
 import com.car2go.maps.model.LatLng
 import com.car2go.maps.model.LatLngBounds
 import com.mahc.custombottomsheetbehavior.BottomSheetBehaviorGoogleMapsLike
-import com.squareup.moshi.JsonDataException
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import kotlinx.parcelize.Parcelize
-import net.vonforst.evmap.R
-import net.vonforst.evmap.api.availability.AvailabilityDetectorException
 import net.vonforst.evmap.api.availability.AvailabilityRepository
 import net.vonforst.evmap.api.availability.ChargeLocationStatus
-import net.vonforst.evmap.api.availability.TeslaGraphQlApi
+import net.vonforst.evmap.api.availability.tesla.Pricing
 import net.vonforst.evmap.api.createApi
-import net.vonforst.evmap.api.equivalentPlugTypes
-import net.vonforst.evmap.api.fronyx.FronyxApi
-import net.vonforst.evmap.api.fronyx.FronyxEvseIdResponse
-import net.vonforst.evmap.api.fronyx.FronyxStatus
 import net.vonforst.evmap.api.fronyx.PredictionData
 import net.vonforst.evmap.api.fronyx.PredictionRepository
 import net.vonforst.evmap.api.goingelectric.GEChargepoint
-import net.vonforst.evmap.api.nameForPlugType
 import net.vonforst.evmap.api.openchargemap.OCMConnection
 import net.vonforst.evmap.api.openchargemap.OCMReferenceData
 import net.vonforst.evmap.api.stringProvider
 import net.vonforst.evmap.autocomplete.PlaceWithBounds
-import net.vonforst.evmap.model.*
+import net.vonforst.evmap.model.ChargeLocation
+import net.vonforst.evmap.model.Chargepoint
+import net.vonforst.evmap.model.ChargepointListItem
+import net.vonforst.evmap.model.FILTERS_DISABLED
+import net.vonforst.evmap.model.FILTERS_FAVORITES
+import net.vonforst.evmap.model.Favorite
+import net.vonforst.evmap.model.FavoriteWithDetail
+import net.vonforst.evmap.model.FilterValue
+import net.vonforst.evmap.model.FilterValues
+import net.vonforst.evmap.model.getMultipleChoiceValue
+import net.vonforst.evmap.model.getSliderValue
 import net.vonforst.evmap.storage.AppDatabase
 import net.vonforst.evmap.storage.ChargeLocationsRepository
 import net.vonforst.evmap.storage.EncryptedPreferenceDataStore
@@ -40,12 +51,6 @@ import net.vonforst.evmap.storage.FilterProfile
 import net.vonforst.evmap.storage.PreferenceDataSource
 import net.vonforst.evmap.ui.cluster
 import net.vonforst.evmap.utils.distanceBetween
-import retrofit2.HttpException
-import java.io.IOException
-import java.time.LocalDate
-import java.time.LocalTime
-import java.time.ZoneId
-import java.time.ZonedDateTime
 import kotlin.math.roundToInt
 
 @Parcelize
@@ -162,9 +167,9 @@ class MapViewModel(application: Application, private val state: SavedStateHandle
         MutableLiveData<Set<Long>>()
     }
 
-    val chargerSparse: MutableLiveData<ChargeLocation?> by lazy {
-        state.getLiveData("chargerSparse")
-    }
+    val chargerSparse: MutableLiveData<ChargeLocation?> =
+        state.getLiveData<ChargeLocation?>("chargerSparse")
+
     private val triggerChargerDetailsRefresh = MutableLiveData(false)
     val chargerDetails: LiveData<Resource<ChargeLocation>> = chargerSparse.switchMap { charger ->
         triggerChargerDetailsRefresh.value = false
@@ -180,6 +185,15 @@ class MapViewModel(application: Application, private val state: SavedStateHandle
         }
     }
 
+    val selectedChargepoint: MutableLiveData<Chargepoint?> =
+        state.getLiveData("selectedChargepoint")
+
+    init {
+        chargerSparse.observeForever {
+            selectedChargepoint.value = null
+        }
+    }
+
     val charger: MediatorLiveData<Resource<ChargeLocation>> by lazy {
         MediatorLiveData<Resource<ChargeLocation>>().apply {
             addSource(chargerDetails) {
@@ -249,7 +263,7 @@ class MapViewModel(application: Application, private val state: SavedStateHandle
     }
 
     val teslaPricing = availability.map {
-        it.data?.extraData as? TeslaGraphQlApi.Pricing
+        it.data?.extraData as? Pricing
     }
 
     private val predictionRepository = PredictionRepository(application)
@@ -287,6 +301,12 @@ class MapViewModel(application: Application, private val state: SavedStateHandle
         }
     }
 
+    val mapTrafficSupported: MutableLiveData<Boolean> by lazy {
+        MutableLiveData<Boolean>().apply {
+            value = false
+        }
+    }
+
     val mapTrafficEnabled: MutableLiveData<Boolean> by lazy {
         MutableLiveData<Boolean>().apply {
             value = prefs.mapTrafficEnabled

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

@@ -11,6 +11,7 @@ import net.vonforst.evmap.api.chargeprice.ChargepriceCar
 import net.vonforst.evmap.api.chargeprice.ChargepriceTariff
 import net.vonforst.evmap.storage.AppDatabase
 import net.vonforst.evmap.storage.PreferenceDataSource
+import retrofit2.HttpException
 import java.io.IOException
 
 class SettingsViewModel(
@@ -58,6 +59,8 @@ class SettingsViewModel(
                 vehicles.value = Resource.success(result)
             } catch (e: IOException) {
                 vehicles.value = Resource.error(e.message, null)
+            } catch (e: HttpException) {
+                vehicles.value = Resource.error(e.message, null)
             }
         }
     }
@@ -69,6 +72,8 @@ class SettingsViewModel(
                 tariffs.value = Resource.success(result)
             } catch (e: IOException) {
                 tariffs.value = Resource.error(e.message, null)
+            } catch (e: HttpException) {
+                tariffs.value = Resource.error(e.message, null)
             }
         }
     }

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

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <shape android:shape="oval">
+            <solid android:color="#FFFFFFFF" />
+            <size
+                android:height="12dp"
+                android:width="12dp" />
+        </shape>
+    </item>
+</layer-list>

app/src/main/res/layout/detail_view.xml

@@ -61,7 +61,7 @@
 
         <variable
             name="teslaPricing"
-            type="net.vonforst.evmap.api.availability.TeslaGraphQlApi.Pricing" />
+            type="net.vonforst.evmap.api.availability.tesla.Pricing" />
 
         <variable
             name="chargeCards"
@@ -158,7 +158,6 @@
                 android:textColor="@android:color/white"
                 app:backgroundTintAvailability="@{BindingAdaptersKt.flatten(filteredAvailability.data.status.values())}"
                 app:invisibleUnless="@{filteredAvailability.data != null &amp;&amp; !expanded}"
-                app:invisibleUnlessAnimated="@{filteredAvailability.data != null &amp;&amp; !expanded}"
                 app:layout_constraintEnd_toStartOf="@+id/guideline2"
                 app:layout_constraintTop_toTopOf="@+id/txtName"
                 tools:backgroundTint="@color/available"
@@ -560,6 +559,24 @@
                 app:layout_constraintBottom_toBottomOf="@+id/textView13"
                 app:layout_constraintEnd_toStartOf="@+id/guideline2"
                 app:layout_constraintTop_toTopOf="@+id/textView13" />
+            <com.google.android.material.card.MaterialCardView
+                style="?attr/materialCardViewElevatedStyle"
+                android:id="@+id/connector_details_card"
+                app:layout_constraintStart_toStartOf="@+id/guideline"
+                app:layout_constraintEnd_toStartOf="@+id/guideline2"
+                app:layout_constraintTop_toTopOf="@id/connectors"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                app:cardCornerRadius="24dp"
+                android:layout_marginBottom="@dimen/detail_corner_radius_negative"
+                android:paddingBottom="@dimen/detail_corner_radius"
+                app:cardElevation="6dp"
+                android:visibility="gone">
+
+                <include
+                    layout="@layout/dialog_connector_details"
+                    android:id="@+id/connector_details" />
+            </com.google.android.material.card.MaterialCardView>
 
         </androidx.constraintlayout.widget.ConstraintLayout>
 

app/src/main/res/layout/dialog_connector_details.xml

@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content">
+
+    <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/list"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:paddingTop="8dp"
+        android:paddingBottom="8dp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.0"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:itemCount="1"
+        tools:listitem="@layout/dialog_connector_details_preview" />
+
+    <ImageButton
+        android:id="@+id/btnClose"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="12dp"
+        android:layout_marginEnd="12dp"
+        android:background="?attr/selectableItemBackgroundBorderless"
+        android:contentDescription="@string/close"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:srcCompat="@drawable/ic_close"
+        app:tint="?colorControlNormal" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>

app/src/main/res/layout/dialog_connector_details_header.xml

@@ -0,0 +1,115 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <data>
+
+        <import type="net.vonforst.evmap.adapter.ConnectorAdapter.ChargepointWithAvailability" />
+
+        <import type="net.vonforst.evmap.ui.BindingAdaptersKt" />
+
+        <import type="net.vonforst.evmap.api.UtilsKt" />
+
+        <import type="net.vonforst.evmap.api.ChargepointApiKt" />
+
+        <variable
+            name="item"
+            type="ChargepointWithAvailability" />
+    </data>
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:minHeight="?attr/listPreferredItemHeightSmall"
+        android:layout_marginStart="?attr/dialogPreferredPadding"
+        android:layout_marginEnd="?attr/dialogPreferredPadding">
+
+        <ImageView
+            android:id="@+id/imageView"
+            android:layout_width="48dp"
+            android:layout_height="48dp"
+            android:layout_marginTop="8dp"
+            android:layout_marginBottom="16dp"
+            android:contentDescription="@{item.chargepoint.type}"
+            android:tintMode="src_in"
+            app:connectorIcon="@{item.chargepoint.type}"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintBottom_toTopOf="@+id/divider"
+            app:tintAvailability="@{item.status}"
+            tools:srcCompat="@drawable/ic_connector_typ2"
+            tools:tint="@color/available" />
+
+        <TextView
+            android:id="@+id/textView5"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="38dp"
+            android:layout_marginTop="38dp"
+            android:text="@{String.format(&quot;\u00D7 %d&quot;, item.chargepoint.count)}"
+            android:textAppearance="@style/TextAppearance.Material3.BodySmall"
+            app:goneUnless="@{item.status == null}"
+            app:layout_constraintStart_toStartOf="@+id/imageView"
+            app:layout_constraintTop_toTopOf="@+id/imageView"
+            tools:text="×99"
+            tools:visibility="gone" />
+
+        <TextView
+            android:id="@+id/textView7"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="30dp"
+            android:layout_marginTop="30dp"
+            android:background="@drawable/rounded_rect"
+            android:padding="2dp"
+            android:text="@{String.format(&quot;%s/%d&quot;, BindingAdaptersKt.availabilityText(item.status), item.chargepoint.count)}"
+            android:textAppearance="@style/TextAppearance.Material3.BodySmall"
+            android:textColor="@android:color/white"
+            app:backgroundTintAvailability="@{item.status}"
+            app:goneUnless="@{item.status != null}"
+            app:layout_constraintStart_toStartOf="@+id/imageView"
+            app:layout_constraintTop_toTopOf="@+id/imageView"
+            tools:backgroundTint="@color/available"
+            tools:text="80/99" />
+
+        <TextView
+            android:id="@+id/textView6"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="36dp"
+            android:layout_marginTop="4dp"
+            android:text="@{item != null ? UtilsKt.nameForPlugType(ChargepointApiKt.stringProvider(context), item.chargepoint.type) + &quot; · &quot; + item.chargepoint.formatPower() : null}"
+            android:textAppearance="@style/TextAppearance.Material3.BodyMedium"
+            app:goneUnless="@{item.chargepoint.hasKnownPower()}"
+            app:layout_constraintBottom_toTopOf="@id/textView8"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toEndOf="@+id/imageView"
+            app:layout_constraintTop_toTopOf="@id/imageView"
+            tools:text="CCS · 350 kW" />
+
+        <TextView
+            android:id="@+id/textView8"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="2dp"
+            android:text="@{item.chargepoint.formatVoltageAndCurrent()}"
+            android:textAppearance="@style/TextAppearance.Material3.BodySmall"
+            app:goneUnless="@{item.chargepoint.hasKnownVoltageAndCurrent()}"
+            app:layout_constraintBottom_toBottomOf="@+id/imageView"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="@+id/textView6"
+            app:layout_constraintTop_toBottomOf="@id/textView6"
+            tools:text="1000 V · 500 A" />
+
+        <View
+            android:id="@+id/divider"
+            android:layout_width="match_parent"
+            android:layout_height="1dp"
+            android:layout_marginBottom="4dp"
+            android:background="?android:attr/listDivider"
+            app:layout_constraintTop_toBottomOf="@+id/imageView"
+            app:layout_constraintBottom_toBottomOf="parent" />
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+</layout>

app/src/main/res/layout/dialog_connector_details_item.xml

@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <data>
+
+        <import type="net.vonforst.evmap.adapter.ConnectorDetailsAdapter.ConnectorDetails" />
+
+        <import type="net.vonforst.evmap.ui.BindingAdaptersKt" />
+        <import type="java.time.Instant" />
+
+        <variable
+            name="item"
+            type="ConnectorDetails" />
+    </data>
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:minHeight="?attr/listPreferredItemHeightSmall"
+        android:layout_marginStart="?attr/dialogPreferredPadding"
+        android:layout_marginEnd="?attr/dialogPreferredPadding">
+
+        <ImageView
+            android:id="@+id/imageView"
+            android:layout_width="24dp"
+            android:layout_height="24dp"
+            android:contentDescription="@{BindingAdaptersKt.availabilityText(item.status, (Instant) null, context)}"
+            android:scaleType="center"
+            android:tintMode="src_in"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            app:tintAvailability="@{item.status}"
+            app:srcCompat="@drawable/circle"
+            tools:tint="@color/available" />
+
+        <TextView
+            android:id="@+id/txtEvseid"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="24dp"
+            android:layout_marginTop="8dp"
+            android:layout_marginEnd="16dp"
+            android:layout_marginBottom="14dp"
+            android:text="@{(item.label != null &amp;&amp; item.evseId != null) ? item.label + &quot; · &quot; + item.evseId : (item.label ?? item.evseId)}"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toEndOf="@+id/imageView"
+            app:layout_constraintTop_toTopOf="parent"
+            tools:text="SK*IOY*E222901" />
+
+        <TextView
+            android:id="@+id/txtStatus"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="2dp"
+            android:layout_marginEnd="16dp"
+            android:layout_marginBottom="8dp"
+            android:text="@{BindingAdaptersKt.availabilityText(item.status, item.lastChange, context)}"
+            android:textAppearance="@style/TextAppearance.Material3.BodySmall"
+            app:goneUnless="@{item.status != null}"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="@+id/txtEvseid"
+            app:layout_constraintTop_toBottomOf="@+id/txtEvseid"
+            tools:text="Available" />
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+</layout>

app/src/main/res/layout/dialog_connector_details_preview.xml

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <include layout="@layout/dialog_connector_details_header" />
+
+    <include layout="@layout/dialog_connector_details_item" />
+
+    <include layout="@layout/dialog_connector_details_item" />
+
+    <include layout="@layout/dialog_connector_details_item" />
+
+    <include layout="@layout/dialog_connector_details_item" />
+
+    <include layout="@layout/dialog_connector_details_item" />
+</LinearLayout>

app/src/main/res/layout/dialog_textinput.xml

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<com.google.android.material.textfield.TextInputLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:paddingLeft="16dp"
+    android:paddingRight="16dp">
+
+    <com.google.android.material.textfield.TextInputEditText
+        android:id="@+id/input"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:maxLines="1" />
+
+</com.google.android.material.textfield.TextInputLayout>

app/src/main/res/layout/fragment_donate_referral.xml

@@ -1,29 +1,51 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout 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"
+    android:id="@+id/linearLayout7"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_marginStart="16dp"
     android:layout_marginTop="16dp"
     android:layout_marginEnd="16dp"
-    android:layout_marginBottom="16dp"
-    android:orientation="vertical">
+    android:layout_marginBottom="16dp">
 
     <TextView
         android:id="@+id/textView20"
-        android:layout_width="match_parent"
+        android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginBottom="4dp"
         android:text="@string/referrals"
         android:textAppearance="@style/TextAppearance.Material3.TitleSmall"
-        android:textColor="?colorPrimary" />
+        android:textColor="?colorPrimary"
+        app:layout_constraintBottom_toTopOf="@+id/textView21"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintVertical_chainStyle="packed" />
 
     <TextView
         android:id="@+id/textView21"
-        android:layout_width="match_parent"
+        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginBottom="8dp"
-        android:text="@string/referrals_info" />
+        android:text="@string/referrals_info"
+        app:layout_constraintBottom_toTopOf="@+id/referral_tesla"
+        app:layout_constraintStart_toStartOf="@+id/textView20"
+        app:layout_constraintTop_toBottomOf="@+id/textView20" />
+
+    <androidx.constraintlayout.helper.widget.Flow
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        app:constraint_referenced_ids="referral_tesla,referral_juicify,referral_geldfuereauto,referral_maingau,referral_eprimo,referral_ewieeinfach"
+        app:flow_horizontalGap="16dp"
+        app:flow_horizontalStyle="packed"
+        app:flow_verticalAlign="baseline"
+        app:flow_wrapMode="chain"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/textView21" />
 
     <Button
         android:id="@+id/referral_tesla"
@@ -31,5 +53,41 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:text="@string/referral_tesla"
+        android:visibility="gone"
         app:icon="@drawable/ic_tesla" />
-</LinearLayout>
+
+    <Button
+        android:id="@+id/referral_juicify"
+        style="@style/Widget.Material3.Button.TonalButton"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/referral_juicify" />
+
+    <Button
+        android:id="@+id/referral_geldfuereauto"
+        style="@style/Widget.Material3.Button.TonalButton"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/referral_geldfuereauto" />
+
+    <Button
+        android:id="@+id/referral_maingau"
+        style="@style/Widget.Material3.Button.TonalButton"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/referral_maingau" />
+
+    <Button
+        android:id="@+id/referral_eprimo"
+        style="@style/Widget.Material3.Button.TonalButton"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/referral_eprimo" />
+
+    <Button
+        android:id="@+id/referral_ewieeinfach"
+        style="@style/Widget.Material3.Button.TonalButton"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/referral_ewieeinfach" />
+</androidx.constraintlayout.widget.ConstraintLayout>

app/src/main/res/layout/fragment_map.xml

@@ -238,7 +238,8 @@
             android:layout_gravity="top|end"
             android:layout_marginEnd="20dp"
             android:layout_marginTop="@dimen/layers_fab_top_padding"
-            app:tint="?android:colorControlNormal"
+            app:tint="?colorControlNormal"
+            app:backgroundTint="?android:colorBackground"
             app:borderWidth="0dp"
             app:srcCompat="@drawable/ic_layers"
             app:layout_behavior="@string/hide_on_scroll_fab_behavior"
@@ -261,4 +262,4 @@
                 app:vm="@{vm}" />
         </androidx.cardview.widget.CardView>
     </androidx.coordinatorlayout.widget.CoordinatorLayout>
-</layout>
+</layout>

app/src/main/res/layout/item_connector.xml

@@ -14,7 +14,8 @@
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="wrap_content"
-        android:layout_height="wrap_content">
+        android:layout_height="wrap_content"
+        android:background="?selectableItemBackgroundBorderless">
 
         <ImageView
             android:id="@+id/imageView"

app/src/main/res/layout/map_layers.xml

@@ -80,6 +80,7 @@
             android:layout_marginEnd="16dp"
             android:text="@string/map_details"
             android:textAppearance="@style/TextAppearance.Material3.TitleSmall"
+            app:goneUnless="@{vm.mapTrafficSupported}"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintHorizontal_bias="0.0"
             app:layout_constraintStart_toStartOf="parent"
@@ -94,6 +95,7 @@
             android:layout_marginEnd="16dp"
             android:text="@string/map_traffic"
             android:checked="@={vm.mapTrafficEnabled}"
+            app:goneUnless="@{vm.mapTrafficSupported}"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/textView23" />

app/src/main/res/resources.properties

@@ -0,0 +1 @@
+unqualifiedResLocale=en-US

app/src/main/res/values-cs/strings.xml

@@ -0,0 +1,387 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="no_browser_app_found">Nejprve si nainstalujte webový prohlížeč</string>
+    <string name="address">Adresa</string>
+    <string name="hours">Otevírací doba</string>
+    <string name="open_247"><b>Otevřeno 24/7</b></string>
+    <string name="closed"><b>Zavřeno</b></string>
+    <string name="open_closesat"><b>Otevřeno</b> · Zavírá v %s</string>
+    <string name="closed_opensat"><b>Zavřeno</b> · Otevírá v %s</string>
+    <string name="cost">Cena</string>
+    <string name="cost_detail"><b>Nabíjení:</b> %1$s · <b>Parkování:</b> %2$s</string>
+    <string name="cost_detail_charging"><b>%s nabíjení</b></string>
+    <string name="cost_detail_parking"><b>%s parkování</b></string>
+    <string name="charging_free">Bezplatné</string>
+    <string name="charging_paid">Placené</string>
+    <string name="parking_free">Bezplatné</string>
+    <string name="parking_paid">Placené</string>
+    <string name="amenities">Vybavení</string>
+    <string name="general_info">Obecné informace</string>
+    <string name="realtime_data_unavailable">Aktuální stav není dostupný</string>
+    <string name="realtime_data_login_needed">Pro data v reálném čase je vyžadován účet Tesla</string>
+    <string name="realtime_data_loading">Kontrola aktuálního stavu…</string>
+    <string name="realtime_data_source">Zdroj aktuálního stavu (beta): %s</string>
+    <string name="source">Zdroj: %s</string>
+    <string name="menu_map">Mapa</string>
+    <string name="menu_favs">Oblíbené</string>
+    <string name="menu_filter">Filtr</string>
+    <string name="about">O aplikaci</string>
+    <string name="version">Verze</string>
+    <string name="github_link_title">Zdrojový kód</string>
+    <string name="settings">Nastavení</string>
+    <string name="settings_ui">Rozhraní</string>
+    <string name="settings_map">Mapa</string>
+    <string name="copyright">Copyright</string>
+    <string name="other">Ostatní</string>
+    <string name="privacy">Soukromí</string>
+    <string name="fav_add">Uložit jako oblíbené</string>
+    <string name="connectors">Konektory</string>
+    <string name="pref_navigate_use_maps_on">Navigační tlačítko spustí navigaci pomocí Map Google</string>
+    <string name="coordinates">Souřadnice</string>
+    <string name="share">Sdílet</string>
+    <string name="filter_min_power">Minimální výkon</string>
+    <string name="filter_free_parking">Pouze nabíječky s bezplatným parkováním</string>
+    <string name="filter_min_connectors">Minimální počet konektorů</string>
+    <string name="filter_connectors">Konektory</string>
+    <string name="plug_type_1">Typ 1</string>
+    <string name="plug_ccs">CCS</string>
+    <string name="plug_schuko">Schuko</string>
+    <string name="plug_chademo">CHAdeMO</string>
+    <string name="plug_supercharger">Tesla Supercharger</string>
+    <string name="plug_cee_blau">CEE modrý</string>
+    <string name="plug_cee_rot">CEE červený</string>
+    <string name="plug_roadster_hpc">Tesla Roadster (2008) HPC</string>
+    <string name="all">všechny</string>
+    <string name="show_more">více…</string>
+    <string name="show_less">méně…</string>
+    <string name="favorites_empty_state">Tady se zobrazí uložené nabíječky</string>
+    <string name="donate">Přispět</string>
+    <string name="donation_successful">Děkujeme ❤️</string>
+    <string name="donation_failed">Něco se pokazilo 😕</string>
+    <string name="map_type_normal">Výchozí</string>
+    <string name="map_type_satellite">Satelitní</string>
+    <string name="map_details">Podrobnosti mapy</string>
+    <string name="map_traffic">Doprava</string>
+    <string name="faq">Často kladené dotazy</string>
+    <string name="filters_activated">Filtry aktivovány</string>
+    <string name="menu_manage_filter_profiles">Správa profilů filtrů</string>
+    <string name="go_to_chargeprice">Porovnat ceny</string>
+    <string name="fault_report">Zpráva o závadě</string>
+    <string name="fault_report_date">Zpráva o závadě (poslední aktualizace: %s)</string>
+    <string name="filter_networks">Sítě</string>
+    <string name="filter_operators">Operátoři</string>
+    <string name="filter_chargecards">Platební metody</string>
+    <string name="all_selected">Vybrány všechny</string>
+    <string name="number_selected">Vybráno %d</string>
+    <string name="edit">upravit</string>
+    <string name="cancel">Zrušit</string>
+    <string name="ok">OK</string>
+    <string name="pref_language">Jazyk aplikace</string>
+    <string name="pref_darkmode">Tmavý režim</string>
+    <string name="filter_barrierfree">Použitelné bez registrace</string>
+    <string name="filter_exclude_faults">Vyloučit nabíječky se zprávou o závadě</string>
+    <string name="charge_cards">Platební metody</string>
+    <string name="goingelectric_forum">Vlákno na fóru GoingElectric.de</string>
+    <string name="contact">Kontakt</string>
+    <string name="menu_report_new_charger">Nová nabíječka</string>
+    <string name="edit_at_datasource">Upravit na %s</string>
+    <string name="categories">Kategorie</string>
+    <string name="category_car_dealership">Prodejna automobilů</string>
+    <string name="category_service_on_motorway">Služební oblast (na dálnici)</string>
+    <string name="category_service_off_motorway">Služební oblast (mimo dálnici)</string>
+    <string name="category_railway_station">Železniční stanice</string>
+    <string name="category_public_authorities">Orgány veřejné správy</string>
+    <string name="category_camping">Kemp</string>
+    <string name="category_shopping_mall">Nákupní středisko</string>
+    <string name="category_church">Kostel</string>
+    <string name="category_hospital">Nemocnice</string>
+    <string name="category_museum">Muzeum</string>
+    <string name="category_parking_multi">Parkovací garáž</string>
+    <string name="category_parking">Parkoviště</string>
+    <string name="category_private_charger">Soukromá nabíječka</string>
+    <string name="category_rest_area">Odpočívadlo</string>
+    <string name="category_restaurant">Restaurace</string>
+    <string name="category_swimming_pool">Bazén</string>
+    <string name="category_supermarket">Supermarket</string>
+    <string name="category_petrol_station">Čerpací stanice</string>
+    <string name="category_parking_underground">Podzemní parkoviště</string>
+    <string name="category_zoo">Zoo</string>
+    <string name="category_caravan_site">Kemp pro karavany</string>
+    <string name="menu_apply">Použít filtry</string>
+    <string name="menu_save_profile">Uložit jako profil</string>
+    <string name="menu_reset">Obnovit nastavení filtrů</string>
+    <string name="no_filters">Žádné filtry</string>
+    <string name="filter_custom">Upravený filtr</string>
+    <string name="filter_favorites">Oblíbené</string>
+    <string name="reorder">změnit pořadí</string>
+    <string name="delete">Odstranit</string>
+    <string name="save_profile_enter_name">Zadejte název profilu filtrů:</string>
+    <string name="filterprofiles_empty_state">Nemáte uložené žádné profily filtrů</string>
+    <string name="welcome_to_evmap">Vítejte v aplikaci EVMap</string>
+    <string name="welcome_1">Najděte nabíječky elektromobilů v okolí</string>
+    <string name="welcome_2_title">Potřebujete dobít baterky?</string>
+    <string name="welcome_2_detail">Tyto informace naleznete také na stránce „O aplikaci“ → „Často kladené dotazy“</string>
+    <string name="chargeprice_donation_dialog_title">Máte rádi výhodné nabídky!</string>
+    <string name="chargeprice_donation_dialog_detail">Hodně využiváte možnost porovnávání cen. Pomozte nám pokrýt náklady na tato data podpořením EVMap peněžním darem.</string>
+    <string name="deleted_item">Odstraněno „%s“</string>
+    <string name="undo">Vrátit zpět</string>
+    <string name="rename">Přejmenovat</string>
+    <string name="charging_barrierfree">Použitelné bez registrace</string>
+    <string name="navigate">Navigace</string>
+    <string name="charge_price_format">%1$.2f %2$s</string>
+    <string name="charge_price_average_format">⌀ %1$.2f %2$s/kWh</string>
+    <string name="charge_price_kwh_format">%1$.2f %2$s/kWh</string>
+    <string name="charge_price_minute_format">%1$.2f %2$s/min</string>
+    <string name="chargeprice_select_connector">Zvolte konektor</string>
+    <string name="chargeprice_provider_customer_tariff">Pouze pro přihlášené zákazníky</string>
+    <string name="edit_on_goingelectric_info">Pokud je tato stránka prázdná, přihlaste se prosím na GoingElectric.de</string>
+    <string name="percent_format">%.0f%%</string>
+    <string name="chargeprice_session_fee">poplatek za využití</string>
+    <string name="chargeprice_per_kwh">za kWh</string>
+    <string name="chargeprice_per_minute">za min</string>
+    <string name="chargeprice_no_tariffs_found">Tato nabíječka nemá ve službě Chargeprice.app žádné nabíjecí plány</string>
+    <string name="powered_by_chargeprice">používá službu Chargeprice</string>
+    <string name="chargeprice_base_fee">Základní poplatek: %1$.2f %2$s/měsíc</string>
+    <string name="chargeprice_min_spend">Minimální útrata: %1$.2f %2$s/měsíc</string>
+    <string name="settings_chargeprice">Porovnání cen</string>
+    <string name="pref_my_vehicle">Moje vozidla</string>
+    <string name="pref_chargeprice_no_base_fee">Vyloučit plány s měsíčními poplatky</string>
+    <string name="pref_chargeprice_show_provider_customer_tariffs">Zahrnout zákaznické plány</string>
+    <string name="chargeprice_select_car_first">Nejprve prosím v nastavení vyberte váš model auta</string>
+    <string name="chargeprice_battery_range">Nabíjení od %1$.0f%% do %2$.0f%%</string>
+    <string name="chargeprice_battery_range_from">Nabíjení od</string>
+    <string name="chargeprice_stats">(%1$.0f kWh, cca. %2$s, ⌀ %3$.0f kW)</string>
+    <string name="chargeprice_vehicle">Vozidlo</string>
+    <string name="chargeprice_price_not_available">Cena není dostupná</string>
+    <string name="close">Zavřít</string>
+    <string name="chargeprice_no_compatible_connectors">Tato nabíjecí stanice nemá žádné kompatibilní konektory</string>
+    <string name="chargeprice_blocking_fee">Blokovací poplatek&gt;%s</string>
+    <string name="pref_my_tariffs">Mé nabíjecí plány</string>
+    <string name="chargeprice_all_tariffs_selected">vybrány všechny plány</string>
+    <string name="license">Licence</string>
+    <string name="settings_charger_data">Nabíjecí stanice</string>
+    <string name="pref_data_source">Zdroj dat</string>
+    <plurals name="chargeprice_some_tariffs_selected">
+        <item quantity="one">Vybrán %d plán</item>
+        <item quantity="few">Vybrány %d plány</item>
+        <item quantity="other">Vybráno %d plánů</item>
+    </plurals>
+    <string name="data_sources_description">Vyberte prosím zdroj dat pro nabíjecí stanice. Můžete jej později změnit v nastavení aplikace.</string>
+    <string name="data_source_openchargemap">Open Charge Map</string>
+    <string name="data_source_goingelectric_desc">Funguje dobře v německy mluvících zemích. Popisy jsou v němčině. Spravováno komunitou.</string>
+    <string name="next">další</string>
+    <string name="get_started">Začínáme</string>
+    <string name="got_it">Chápu</string>
+    <string name="lets_go">Jdeme na to</string>
+    <string name="crash_report_text">Aplikace EVMap havarovala. Odešlete prosím hlášení o pádu vývojáři.</string>
+    <string name="crash_report_comment_prompt">Níže můžete přidat komentář:</string>
+    <string name="powered_by_mapbox">používá službu Mapbox</string>
+    <string name="pref_search_provider">Poskytovatel vyhledávání</string>
+    <string name="pref_search_provider_info">Načtení dat pro vyhledávání bývá drahé, obzvláště z Map Google. Zvažte prosím poslání finančního daru v nabídce „O aplikaci“ → „Přispět“.</string>
+    <string name="github_sponsors">GitHub Sponsors</string>
+    <string name="donate_desc">Podpořte vývoj aplikace EVMap jednorázovým darem</string>
+    <string name="github_sponsors_desc">Podpořte EVMap ve službě GitHub Sponsors</string>
+    <string name="unnamed_filter_profile">Nepojmenovaný profil filtrů</string>
+    <string name="faq_link">https://ev-map.app/faq/</string>
+    <string name="required">vyžadováno</string>
+    <string name="edit_filter_profile">Upravit filtr „%s“</string>
+    <string name="pref_search_delete_recent">Smazat nedávné výsledky vyhledávání</string>
+    <string name="deleted_recent_search_results">Nedávné výsledky vyhledávání byly smazány</string>
+    <string name="settings_data_sources">Zdroje dat</string>
+    <string name="help">Nápověda</string>
+    <string name="settings_android_auto">Android Auto</string>
+    <string name="pref_chargeprice_allow_unbalanced_load">Povolit nevyvážené zatížení</string>
+    <string name="pref_chargeprice_allow_unbalanced_load_summary">Povolit jednofázové nabíjení střídavým proudem o výkonu vyšším než 4,5 kW</string>
+    <string name="pref_map_rotate_gestures_enabled">Otočení mapy</string>
+    <string name="pref_map_rotate_gestures_on">Použijte dva prsty pro otočení mapy</string>
+    <string name="pref_map_rotate_gestures_off">Rotace vypnuta (sever vždy nahoře)</string>
+    <string name="refresh_live_data">stav obnovení v reálném čase</string>
+    <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>
+    <string name="about_contributors_text">Děkujeme všem přispěvatelům za jejich výpomoc s kódem a překlady aplikace EVMap:</string>
+    <string name="utilization_prediction">Předpověď využití</string>
+    <string name="powered_by_fronyx">používá službu fronyx</string>
+    <string name="prediction_help">Předpověď je založena na faktorech, jako je den v týdnu, denní doba a předchozí využití, takže se můžete vyhnout přeplněným nabíječkám. Bez záruky.</string>
+    <string name="prediction_time_colon">%s:</string>
+    <plurals name="prediction_number_available">
+        <item quantity="one">Dostupná %1$d/%2$d</item>
+        <item quantity="few">Dostupné %1$d/%2$d</item>
+        <item quantity="other">Dostupných %1$d/%2$d</item>
+    </plurals>
+    <string name="pref_prediction_enabled">Zobrazit předpověď využití</string>
+    <string name="prediction_only">(pouze %s)</string>
+    <string name="pref_prediction_enabled_summary">pro podporované nabíječky
+\n(v současné době pouze stejnosměrné v Německu)</string>
+    <string name="prediction_dc_plugs_only">Zástrčky se stejnosměrným proudem</string>
+    <string name="data_source_switched_to">Zdroj dat změněn na %s</string>
+    <string name="pref_applink_associate">Otevírat podporované odkazy</string>
+    <string name="pref_applink_associate_summary">z goingelectric.de a openchargemap.org</string>
+    <string name="chargeprice_header_my_tariffs">Moje plány</string>
+    <string name="developer_mode_enabled">Vývojářský režim aktivován</string>
+    <string name="developer_options">Vývojářské možnosti</string>
+    <string name="disable_developer_mode">Zakázat vývojářský režim</string>
+    <string name="developer_mode_disabled">Vývojářský režim deaktivován</string>
+    <string name="gps">GPS</string>
+    <string name="location_status">Stav poskytovatele polohy</string>
+    <string name="pref_tesla_account">Účet Tesla</string>
+    <string name="pref_tesla_account_enabled">Přihlášeni jako %s</string>
+    <string name="pref_tesla_account_disabled">Přihlaste se pro zobrazení dat pro Tesla Superchargers v reálném čase. Není potřeba vozidlo Tesla</string>
+    <string name="logging_in">Přihlašování…</string>
+    <string name="log_out">Odhlásit se</string>
+    <string name="logged_out">Odhlášeni</string>
+    <string name="login">Přihlásit se</string>
+    <string name="login_error">Přihlášení se nezdařilo</string>
+    <string name="tesla_pricing_owners">Pouze vozidla Tesla:</string>
+    <string name="tesla_pricing_others">Ostatní zákazníci:</string>
+    <string name="tesla_pricing_other_times">Ostatní časy:</string>
+    <string name="tesla_pricing_blocking_fee">Blokovací poplatek: %s</string>
+    <string name="average_utilization">Průměrné využití</string>
+    <string name="website">Webové stránky</string>
+    <string name="pref_map_scale">Zobrazit ovládání přiblížení mapy</string>
+    <string name="pref_map_scale_meters_and_miles">Míle a metry na ukazateli měřítka</string>
+    <string name="pref_units">Jednotky</string>
+    <string name="pref_units_metric">Metrické</string>
+    <string name="pref_units_imperial">Imperiální</string>
+    <string name="data_retrieved_at">Data obdržena %s</string>
+    <string name="settings_caching">Mezipaměť</string>
+    <string name="settings_cache_count">Velikost mezipaměti</string>
+    <string name="settings_cache_clear">Vymazat mezipaměť</string>
+    <string name="settings_cache_clear_summary">Vymaže všechny nabíječky v mezipaměti kromě oblíbených</string>
+    <string name="settings_cache_count_summary">%1$d nabíječek v mezipaměti, %2$.1f MB</string>
+    <string name="auto_no_chargers_found">V okolí nebyly nalezeny žádné nabíječky</string>
+    <string name="auto_no_favorites_found">Nebyly nalezeny žádné oblíbené</string>
+    <string name="opened_on_phone">Otevřeno na telefonu</string>
+    <string name="grant_on_phone">Udělit na telefonu</string>
+    <string name="auto_chargers_closeby">Nabíječky v okolí</string>
+    <string name="auto_favorites">Oblíbené</string>
+    <string name="auto_chargers_near_location">Poblíž %s</string>
+    <string name="auto_fault_report_date">⚠️ Zpráva o závadě (%s)</string>
+    <string name="auto_no_refresh_possible">Další aktualizace nejsou možné. Vraťte se prosím zpět a restartujte aplikaci.</string>
+    <string name="auto_prices">Ceník</string>
+    <string name="auto_vehicle_data">Data vozidla</string>
+    <string name="auto_charging_level">Úroveň nabití</string>
+    <string name="auto_no_data">Nedostupné</string>
+    <string name="auto_range">Rozsah</string>
+    <string name="auto_speed">Rychlost</string>
+    <string name="auto_heading">Hlavička</string>
+    <string name="auto_settings">Nastavení</string>
+    <string name="welcome_android_auto">Podpora Android Auto</string>
+    <string name="welcome_android_auto_detail">EVMap můžete používat i z vašeho vozidla Android Auto u podporovaných aut. Stačí vybrat aplikaci EVMap v nabídce Android Auto.</string>
+    <string name="sounds_cool">To zní dobře</string>
+    <string name="auto_chargeprice_vehicle_unavailable">Aplikace EVMap nedokázala zjistit model vašeho vozidla.</string>
+    <string name="auto_chargeprice_vehicle_unknown">Žádné z vybraných vozidel v aplikaci se neshoduje s tímto vozidlem (%1$s %2$s).</string>
+    <string name="auto_chargers_ahead">Pouze nabíječky v okolí směru jízdy</string>
+    <string name="settings_android_auto_chargeprice_range">Rozsah nabíjení pro porovnání cen</string>
+    <string name="selecting_all">vybrány všechny položky</string>
+    <string name="selecting_none">zrušit výběr všech položek</string>
+    <string name="loading">Načítání…</string>
+    <string name="auto_multipage_goto">Stránka %d</string>
+    <string name="reload">Obnovit</string>
+    <string name="accept_privacy"><![CDATA[Přečetl/a jsem si a souhlasím se <a href="%s">zásadami ochrany osobních údajů</a> aplikace EVMap.]]></string>
+    <string name="referrals">Referenční odkazy</string>
+    <string name="referrals_info">Pro podpoření vývojáře svým nákupem můžete také použít jeden z referenčních odkazů níže.</string>
+    <string name="generic_connection_error">Nepodařilo se načíst data</string>
+    <string name="copied">Zkopírováno do schránky</string>
+    <string name="charger_name">Název nabíječky</string>
+    <string name="closed_unfmt">Zavřeno</string>
+    <string name="holiday">Svátek</string>
+    <string name="app_name">EVMap</string>
+    <string name="title_activity_maps">EVMap</string>
+    <string name="search">Vyhledávání</string>
+    <string name="fav_remove">Odebrat z oblíbených</string>
+    <string name="pref_navigate_use_maps">Okamžitá navigace</string>
+    <string name="plug_type_2">Typ 2</string>
+    <string name="connection_error">Nepodařilo se načíst nabíjecí stanice</string>
+    <string name="filter_open_247">Dostupné 24/7</string>
+    <string name="and_n_others">a %d dalších</string>
+    <string name="no_maps_app_found">Nejprve si nainstalujte navigační aplikaci</string>
+    <string name="operator">Operátor</string>
+    <string name="network">Síť</string>
+    <string name="not_implemented">zatím není implementováno</string>
+    <string name="pref_navigate_use_maps_off">Navigační tlačítko otevře aplikaci map s umístěním nabíječky</string>
+    <string name="plug_type_3">Typ 3A</string>
+    <string name="map_type_terrain">Terén</string>
+    <string name="map_type">Typ mapy</string>
+    <string name="location_error">Nepodařilo se zjistit polohu. Zkontrolujte prosím nastavení systému</string>
+    <string name="pref_map_provider">Poskytovatel mapy</string>
+    <string name="oss_licenses">Licence</string>
+    <string name="filter_free">Pouze bezplatné nabíječky</string>
+    <string name="none">žádné</string>
+    <string name="menu_filters_active">Aktivní filtry</string>
+    <string name="retry">Zkusit znovu</string>
+    <string name="twitter">Twitter</string>
+    <string name="filters_deactivated">Filtry deaktivovány</string>
+    <string name="menu_edit_filters">Upravit filtry</string>
+    <string name="category_holiday_home">Rekreační dům</string>
+    <string name="category_airport">Letiště</string>
+    <string name="category_amusement_park">Zábavní park</string>
+    <string name="category_cinema">Kino</string>
+    <string name="category_hotel">Hotel</string>
+    <string name="welcome_2">Barva každé nabíječky odpovídá jejímu maximálnímu nabíjecímu výkonu</string>
+    <plurals name="charge_cards_compatible_num">
+        <item quantity="one">%d kompatibilní platební metoda</item>
+        <item quantity="few">%d kompatibilní platební metody</item>
+        <item quantity="other">%d kompatibilních platebních metod</item>
+    </plurals>
+    <string name="verified">ověřeno</string>
+    <string name="verified_desc">Funkčnost nabíječky byla potvrzena členem komunity %s</string>
+    <string name="donation_dialog_title">Děkujeme, že používáte EVMap</string>
+    <string name="save_as_profile">Uložit jako profil</string>
+    <string name="donation_dialog_detail">EVMap je bezplatná open-source aplikace. Příspěvky do kódu na GitHubu jsou velmi vítány. Abyste pomohli pokrýt provozní náklady na přístup k datům, zvažte prosím možnost darovat vývojáři částku dle vlastního výběru.</string>
+    <string name="pref_chargeprice_currency">Měna</string>
+    <string name="chargeprice_battery_range_to">do</string>
+    <plurals name="pref_my_tariffs_summary">
+        <item quantity="one">(bude zvýrazněno v porovnání cen)</item>
+        <item quantity="few">(budou zvýrazněna v porovnání cen)</item>
+        <item quantity="other">(bude zvýrazněno v porovnání cen)</item>
+    </plurals>
+    <string name="pref_chargeprice_show_provider_customer_tariffs_summary">Společnosti poskytující veřejné služby někdy nabízejí speciální plány pro své zákazníky</string>
+    <string name="chargeprice_title">Ceny</string>
+    <string name="chargeprice_connection_error">Nepodařilo se načíst ceny</string>
+    <string name="unknown_operator">Neznámý operátor</string>
+    <string name="data_source_goingelectric">GoingElectric.de</string>
+    <string name="data_source_openchargemap_desc">Celosvětové, s různou kvalitou. Popisy jsou v angličtině nebo v místním jazyce. Spravováno komunitou, v některých zemích obsahuje vládní data (např. Severní Amerika, Spojené království, Francie, Norsko).</string>
+    <string name="privacy_link">https://ev-map.app/privacypolicy/</string>
+    <string name="chargeprice_faq_link">https://ev-map.app/faq/#price-comparison-feature</string>
+    <string name="pref_darkmode_always_on">vždy zapnut</string>
+    <string name="pref_darkmode_always_off">vždy vypnut</string>
+    <string name="pref_chargeprice_currency_chf">Švýcarský frank (CHF)</string>
+    <string name="pref_chargeprice_currency_czk">Česká koruna (CZK)</string>
+    <string name="pref_chargeprice_currency_dkk">Dánská koruna (DKK)</string>
+    <string name="pref_chargeprice_currency_eur">Euro (EUR)</string>
+    <string name="pref_chargeprice_currency_gbp">Britská libra (GBP)</string>
+    <string name="pref_chargeprice_currency_huf">Maďarský forint (HUF)</string>
+    <string name="pref_chargeprice_currency_hrk">Chorvatská kuna (HRK)</string>
+    <string name="pref_chargeprice_currency_isk">Islandská koruna (ISK)</string>
+    <string name="pref_chargeprice_currency_nok">Norská koruna (NOK)</string>
+    <string name="pref_chargeprice_currency_pln">Polský zlotý (PLN)</string>
+    <string name="chargeprice_header_other_tariffs">Ostatní plány</string>
+    <string name="charger_website">Webové stránky</string>
+    <string name="compass">Kompas</string>
+    <string name="tesla_pricing_members">Vozidla Tesla a členové:</string>
+    <string name="pricing_up_to">až %s</string>
+    <string name="pref_units_default">Podle zařízení</string>
+    <string name="auto_location_service">EVMap běží na Android Auto a používá vaši polohu.</string>
+    <string name="open_in_app">Otevřít v aplikaci</string>
+    <string name="auto_location_permission_needed">Pro spuštění aplikace EVMap na Android Auto musíte udělit přístup ke své poloze.</string>
+    <string name="auto_vehicle_data_permission_needed">Pro použití této funkce potřebuje aplikace EVMap přístup k datům vašeho vozidla.</string>
+    <string name="auto_chargeprice_vehicle_ambiguous">Několik vozidel vybraných v aplikaci se shoduje s tímto vozidlem (%1$s %2$s).</string>
+    <string name="auto_multipage">(%1$d/%2$d)</string>
+    <string name="referral_tesla">Tesla</string>
+    <string name="status_available">Dostupná</string>
+    <string name="status_occupied">Obsazená</string>
+    <string name="status_charging">Nabíjení</string>
+    <string name="status_faulted">Mimo provoz</string>
+    <string name="status_unknown">Stav neznámý</string>
+    <string name="status_since">%1$s od %2$s</string>
+    <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>

app/src/main/res/values-de/strings.xml

@@ -271,6 +271,7 @@
     <string name="pref_chargeprice_currency_sek">Schwedische Krone (SEK)</string>
     <string name="pref_chargeprice_currency_usd">US-Dollar (USD)</string>
     <string name="pref_provider_google_maps">Google Maps</string>
+    <string name="pref_provider_osm">OpenStreetMap</string>
     <string name="pref_provider_osm_mapbox">OpenStreetMap (Mapbox)</string>
     <string name="about_contributors">Mitwirkende</string>
     <string name="about_contributors_text">Dank an alle Mitwirkenden für ihre Beiträge von Code und Übersetzungen für EVMap:</string>
@@ -368,4 +369,14 @@
     <string name="referral_tesla">Tesla</string>
     <string name="generic_connection_error">Daten konnten nicht geladen werden</string>
     <string name="copied">In Zwischenablage kopiert</string>
+    <string name="status_available">Verfügbar</string>
+    <string name="status_occupied">Besetzt</string>
+    <string name="status_charging">Lädt</string>
+    <string name="status_faulted">Defekt</string>
+    <string name="status_unknown">Status unbekannt</string>
+    <string name="status_since">%1$s seit %2$s</string>
+    <string name="charger_name">Ladestationsname</string>
+    <string name="pref_chargeprice_native_integration">Preisvergleich in EVMap</string>
+    <string name="pref_chargeprice_native_integration_on">Preise werden direkt in EVMap angezeigt</string>
+    <string name="pref_chargeprice_native_integration_off">Preisvergleich verlinkt auf die App oder Website von Chargeprice</string>
 </resources>

app/src/main/res/values-fr/strings.xml

@@ -331,4 +331,46 @@
     <string name="loading">Chargement…</string>
     <string name="auto_multipage_goto">Page %d</string>
     <string name="auto_multipage">(%1$d/%2$d)</string>
+    <string name="tesla_pricing_other_times">Autres horaires :</string>
+    <string name="settings_cache_clear_summary">Supprime tous les chargeurs mis en cache, sauf les favoris</string>
+    <string name="tesla_pricing_owners">Véhicules Tesla uniquement :</string>
+    <string name="settings_cache_clear">Effacer le cache</string>
+    <string name="charge_price_minute_format">%1$.2f %2$s/min</string>
+    <string name="settings_cache_count_summary">%1$d chargeurs mis en cache, %2$.1f MB</string>
+    <string name="average_utilization">Utilisation moyenne</string>
+    <string name="website">Site web</string>
+    <string name="pref_tesla_account_disabled">Connectez-vous pour voir les données en temps réel pour les Superchargeurs Tesla. Pas de véhicule Tesla nécessaire</string>
+    <string name="pref_tesla_account_enabled">Connecté en tant que %s</string>
+    <string name="login_error">Connexion échouée</string>
+    <string name="tesla_pricing_blocking_fee">Frais de blocage : %s</string>
+    <string name="pref_map_scale">Afficher l\'échelle de la carte</string>
+    <string name="data_retrieved_at">Données récupérées %s</string>
+    <string name="prediction_only">(%s seulement)</string>
+    <string name="pref_units">Unités</string>
+    <string name="referrals_info">Vous pouvez également utiliser l\'un des liens d\'affiliation ci-dessous pour soutenir le développeur avec votre achat.</string>
+    <string name="powered_by_fronyx">propulsé par fronyx</string>
+    <string name="log_out">Déconnexion</string>
+    <string name="logging_in">Connexion…</string>
+    <string name="location_status">Statut du fournisseur de localisation</string>
+    <string name="pref_units_imperial">Impérial</string>
+    <string name="copied">Copié dans le presse-papiers</string>
+    <string name="settings_caching">Caching</string>
+    <string name="realtime_data_login_needed">Compte Tesla nécessaire pour les données en temps réel</string>
+    <string name="generic_connection_error">Impossible de charger les données</string>
+    <string name="logged_out">Déconnecté</string>
+    <string name="tesla_pricing_members">Véhicules Tesla &amp; membres :</string>
+    <string name="pref_units_metric">Métrique</string>
+    <string name="pricing_up_to">jusqu\'à %s</string>
+    <string name="pref_tesla_account">Compte Tesla</string>
+    <string name="reload">Actualiser</string>
+    <string name="charger_website">Site web</string>
+    <string name="tesla_pricing_others">Autres clients :</string>
+    <string name="referral_tesla">Tesla</string>
+    <string name="pref_units_default">Réglage par défaut de l\'appareil</string>
+    <string name="pref_map_scale_meters_and_miles">Milles et mètres sur l\'échelle de la carte</string>
+    <string name="login">Se connecter</string>
+    <string name="auto_chargers_ahead">Uniquement les stations de recharge dans le sens de la marche</string>
+    <string name="referrals">Liens d\'affiliation</string>
+    <string name="settings_cache_count">Taille du cache</string>
+    <string name="accept_privacy"><![CDATA[J\'ai lu et accepté la politique de confidentialité <a href=\"%s\"> d\'EVMap</a>.]]></string>
 </resources>

app/src/main/res/values-pt/strings.xml

@@ -360,7 +360,7 @@
     <string name="auto_chargeprice_vehicle_unknown">Nenhum dos veículos selecionados na app corresponde a este veículo (%1$s %2$s).</string>
     <string name="auto_chargers_ahead">Apenas carregadores na direção do destino</string>
     <string name="sounds_cool">Continuar</string>
-    <string name="reload">Recarregar</string>
+    <string name="reload">Atualizar informação</string>
     <string name="accept_privacy"><![CDATA[Li e aceito a <a href=\"%s\">política de privacidade</a> do EVMap.]]></string>
     <string name="referrals">Links de afiliado</string>
     <string name="referral_tesla">Tesla</string>
@@ -372,4 +372,16 @@
     <string name="referrals_info">Também pode usar um dos seguintes links de afiliado para apoiar o desenvolvedor da app com a sua compra.</string>
     <string name="generic_connection_error">Não foi possível carregar a informação</string>
     <string name="powered_by_fronyx">previsão feita por fronyx</string>
+    <string name="copied">Informação copiada</string>
+    <string name="charger_name">Nome do carregador</string>
+    <string name="status_available">Disponível</string>
+    <string name="status_occupied">Ocupado</string>
+    <string name="status_charging">Carregando</string>
+    <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>

app/src/main/res/values/arrays.xml

@@ -4,6 +4,7 @@
         <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>
@@ -14,6 +15,7 @@
         <item>default</item>
         <item>en</item>
         <item>de</item>
+        <item>cs</item>
         <item>fr</item>
         <item>nb-NO</item>
         <item>nl</item>

app/src/main/res/values/donottranslate.xml

@@ -17,6 +17,7 @@
     <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
@@ -35,6 +36,16 @@
     <string name="paypal_link" translatable="false">https://paypal.me/johan98</string>
     <string name="donate_link" translatable="false">https://ev-map.app/donate/</string>
     <string name="tesla_referral_link" translatable="false">http://ts.la/johan94494</string>
-    <string name="copyright_summary">©2020–2023 Johan von Forstner and contributors</string>
+    <string name="juicify_referral_link" translatable="false">https://trck.juicify.green/trck/eclick/9dba357fbfed1e82fb05c7ec004ee2972ea174ce46d8ae0d</string>
+    <string name="geldfuereauto_referral_link" translatable="false">https://trck.geld-fuer-eauto.de/trck/eclick/c4713e9520bdb8842a3f1fbfa3a0669b3e58421043df78ad</string>
+    <string name="maingau_referral_link" translatable="false">https://trck.maingau-energie.de/trck/eclick/799b39cda39575dab1dcd3351abeb77b62dc33e4f9558a57</string>
+    <string name="ewieeinfach_referral_link" translatable="false">https://trck.e-wie-einfach.de/trck/eclick/fca74c186b54e7287a62102a13e073be4fc963825b85f7df</string>
+    <string name="eprimo_referral_link" translatable="false">https://netzwerk.uppr.de/trck/eclick/781768d2e779806b5e09229932662c14adddd69323594c52</string>
+    <string name="referral_juicify" translatable="false">Juicify</string>
+    <string name="referral_geldfuereauto" translatable="false">Geld für eAuto</string>
+    <string name="referral_maingau" translatable="false">Maingau</string>
+    <string name="referral_ewieeinfach" translatable="false">E wie einfach</string>
+    <string name="referral_eprimo" translatable="false">eprimo</string>
+    <string name="copyright_summary">©2020–2024 Johan von Forstner and contributors</string>
     <string name="acra_backend_url" translatable="false">https://acra.muc.vonforst.net/report</string>
-</resources>
+</resources>

app/src/main/res/values/strings.xml

@@ -271,6 +271,7 @@
     <string name="pref_chargeprice_currency_sek">Swedish krona (SEK)</string>
     <string name="pref_chargeprice_currency_usd">US dollar (USD)</string>
     <string name="pref_provider_google_maps">Google Maps</string>
+    <string name="pref_provider_osm">OpenStreetMap</string>
     <string name="pref_provider_osm_mapbox">OpenStreetMap (Mapbox)</string>
     <string name="about_contributors">Contributors</string>
     <string name="about_contributors_text">Thanks to all contributors for their coding and translation contributions to EVMap:</string>
@@ -368,4 +369,14 @@
     <string name="referral_tesla">Tesla</string>
     <string name="generic_connection_error">Could not load data</string>
     <string name="copied">Copied to clipboard</string>
+    <string name="status_available">Available</string>
+    <string name="status_occupied">Occupied</string>
+    <string name="status_charging">Charging</string>
+    <string name="status_faulted">Out of order</string>
+    <string name="status_unknown">Status Unknown</string>
+    <string name="status_since">%1$s since %2$s</string>
+    <string name="charger_name">Charger name</string>
+    <string name="pref_chargeprice_native_integration">Price comparison within EVMap</string>
+    <string name="pref_chargeprice_native_integration_on">Pricing data will be shown directly in EVMap</string>
+    <string name="pref_chargeprice_native_integration_off">Price comparison button will refer to the Chargeprice app or website</string>
 </resources>

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

@@ -15,6 +15,7 @@
         <item name="preferenceTheme">@style/AppTheme.Preference</item>
         <item name="alertDialogTheme">@style/AppTheme.AlertDialog</item>
         <item name="materialAlertDialogTheme">@style/AppTheme.AlertDialog</item>
+        <item name="snackbarButtonStyle">@style/Button.TextButton.Snackbar.App</item>
     </style>
 
     <style name="AppTheme.Preference" parent="@style/PreferenceThemeOverlay">
@@ -82,6 +83,10 @@
         <item name="backgroundInsetBottom">24dp</item>
     </style>
 
+    <style name="Button.TextButton.Snackbar.App" parent="Widget.Material3.Button.TextButton.Snackbar">
+        <item name="android:textColor">@color/colorPrimary</item>
+    </style>
+
     <style name="CarAppTheme">
         <item name="carColorPrimary">@color/colorPrimary</item>
         <item name="carColorPrimaryDark">@color/colorPrimaryDark</item>