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
 -----------
@@ -42,12 +43,14 @@ EVMap uses and put them into the app in the form of a resource file called `apik
 `app/src/main/res/values`. You can find more information on which API keys are necessary for which
 features and how they can be obtained in our [documentation page](doc/api_keys.md).
 
-There are 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,cs"
 
 android {
+    useLibrary("android.car")
+
     defaultConfig {
         applicationId = "net.vonforst.evmap"
         compileSdk = 34
         minSdk = 21
         targetSdk = 34
         // NOTE: always increase versionCode by 2 since automotive flavor uses versionCode + 1
-        versionCode = 208
-        versionName = "1.8.0"
+        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.2")
-    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.11.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.7.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.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-rc02"
+    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 = "60b6d4f821"
+    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.3.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,7 +335,7 @@ 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")
 
@@ -300,10 +344,13 @@ dependencies {
     implementation("androidx.room:room-runtime:$room_version")
     kapt("androidx.room:room-compiler:$room_version")
     implementation("androidx.room:room-ktx:$room_version")
-    implementation("com.github.anboralabs:spatia-room:0.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.1.0"
+    val billing_version = "7.0.0"
     googleImplementation("com.android.billingclient:billing:$billing_version")
     googleImplementation("com.android.billingclient:billing-ktx:$billing_version")
 
@@ -320,7 +367,7 @@ dependencies {
 
     // 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.11.1")

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/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

@@ -2,5 +2,5 @@
 <resources>
     <string name="donations_info" formatted="false">Pomohla vám EVMap? Podpořte její vývoj zasláním finančního daru vývojáři.</string>
     <string name="donate_paypal">Přispět pomocí PayPalu</string>
-    <string name="data_sources_hint">Mapová data v aplikaci poskytuje služba OpenStreetMap (Mapbox).</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,12 +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))
-        }
-        referrals.referralJuicify.setOnClickListener {
-            (requireActivity() as MapsActivity).openUrl(getString(R.string.juicify_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

@@ -3,5 +3,5 @@
     <string name="donations_info" formatted="false">Pomohla vám EVMap? Podpořte její vývoj posláním finančního daru vývojáři.
 \n
 \nGoogle si z každého daru strhne 15 %.</string>
-    <string name="data_sources_hint">V nastavení můžete také pro mapová data přepínat mezi službami Mapy Google a OpenStreetMap (Mapbox).</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"
@@ -339,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/MapsActivity.kt

@@ -268,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(
@@ -280,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/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/goingelectric/GoingElectricApi.kt

@@ -12,8 +12,28 @@ 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
@@ -22,7 +42,11 @@ 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
 
@@ -123,6 +147,8 @@ interface GoingElectricApi {
     }
 }
 
+private const val STATUS_OK = "ok"
+
 class GoingElectricApiWrapper(
     val apikey: String,
     baseurl: String = "https://api.goingelectric.de",
@@ -211,11 +237,11 @@ 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) {
@@ -308,11 +334,11 @@ 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) {
@@ -393,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
                     )
                 )
@@ -423,16 +449,19 @@ 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)

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,8 +8,26 @@ 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
@@ -226,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)
         }
     }
 
@@ -390,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(),

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,7 +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.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
@@ -22,13 +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.tesla.Pricing
-import net.vonforst.evmap.api.availability.tesla.TeslaChargingOwnershipGraphQlApi
 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
@@ -131,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())
                         }
@@ -521,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() {

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

@@ -14,14 +14,30 @@ 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 kotlinx.coroutines.launch
-import net.vonforst.evmap.*
+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
@@ -29,6 +45,7 @@ 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
@@ -408,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))
@@ -437,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))
@@ -454,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))
@@ -469,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/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
@@ -57,7 +69,12 @@ import com.google.android.material.transition.MaterialContainerTransform.FADE_MO
 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
@@ -72,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
@@ -79,17 +97,35 @@ 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
@@ -119,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
@@ -188,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()
@@ -238,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.
 
@@ -399,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
@@ -628,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) {
@@ -681,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()
@@ -814,6 +864,7 @@ class MapFragment : Fragment(), OnMapReadyCallback, MapsActivity.FragmentCallbac
                         if (photo == photos[position] && imageCacheKey != null) {
                             placeholderMemoryCacheKey(imageCacheKey)
                         }
+                        allowHardware(false)
                     }
                 }
                     .withTransitionFrom(view as ImageView)
@@ -1002,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 {
@@ -1010,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()
         }
 
@@ -1351,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()
                             )
                         }
@@ -1368,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
@@ -1448,6 +1501,7 @@ class MapFragment : Fragment(), OnMapReadyCallback, MapsActivity.FragmentCallbac
                 }
             }
             popup.setTouchModal(false)
+            popupMenu = popup
             popup.show()
         }
 
@@ -1531,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/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/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())!!

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

@@ -26,9 +26,13 @@ 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
@@ -69,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
         }

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/MapViewModel.kt

@@ -3,7 +3,16 @@ 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
@@ -24,7 +33,17 @@ 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
@@ -148,13 +167,9 @@ class MapViewModel(application: Application, private val state: SavedStateHandle
         MutableLiveData<Set<Long>>()
     }
 
-    val chargerSparse: MutableLiveData<ChargeLocation?> by lazy {
-        state.getLiveData<ChargeLocation?>("chargerSparse").apply {
-            observeForever {
-                selectedChargepoint.value = null
-            }
-        }
-    }
+    val chargerSparse: MutableLiveData<ChargeLocation?> =
+        state.getLiveData<ChargeLocation?>("chargerSparse")
+
     private val triggerChargerDetailsRefresh = MutableLiveData(false)
     val chargerDetails: LiveData<Resource<ChargeLocation>> = chargerSparse.switchMap { charger ->
         triggerChargerDetailsRefresh.value = false
@@ -170,8 +185,13 @@ class MapViewModel(application: Application, private val state: SavedStateHandle
         }
     }
 
-    val selectedChargepoint: MutableLiveData<Chargepoint?> by lazy {
+    val selectedChargepoint: MutableLiveData<Chargepoint?> =
         state.getLiveData("selectedChargepoint")
+
+    init {
+        chargerSparse.observeForever {
+            selectedChargepoint.value = null
+        }
     }
 
     val charger: MediatorLiveData<Resource<ChargeLocation>> by lazy {
@@ -281,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/res/layout/detail_view.xml

@@ -158,7 +158,6 @@
                 android:textColor="@android:color/white"
                 app:backgroundTintAvailability="@{BindingAdaptersKt.flatten(filteredAvailability.data.status.values())}"
                 app:invisibleUnless="@{filteredAvailability.data != null && !expanded}"
-                app:invisibleUnlessAnimated="@{filteredAvailability.data != null && !expanded}"
                 app:layout_constraintEnd_toStartOf="@+id/guideline2"
                 app:layout_constraintTop_toTopOf="@+id/txtName"
                 tools:backgroundTint="@color/available"

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

@@ -38,7 +38,7 @@
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:orientation="horizontal"
-        app:constraint_referenced_ids="referral_tesla,referral_juicify"
+        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"
@@ -53,6 +53,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:text="@string/referral_tesla"
+        android:visibility="gone"
         app:icon="@drawable/ic_tesla" />
 
     <Button
@@ -61,4 +62,32 @@
         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/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

@@ -244,7 +244,7 @@
     <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 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>
@@ -374,4 +374,14 @@
     <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>
@@ -375,4 +376,7 @@
     <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-pt/strings.xml

@@ -374,4 +374,14 @@
     <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/donottranslate.xml

@@ -37,7 +37,15 @@
     <string name="donate_link" translatable="false">https://ev-map.app/donate/</string>
     <string name="tesla_referral_link" translatable="false">http://ts.la/johan94494</string>
     <string name="juicify_referral_link" translatable="false">https://trck.juicify.green/trck/eclick/9dba357fbfed1e82fb05c7ec004ee2972ea174ce46d8ae0d</string>
-    <string name="referral_juicify">Juicify</string>
-    <string name="copyright_summary">©2020–2023 Johan von Forstner and contributors</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>
@@ -375,4 +376,7 @@
     <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>

app/src/main/res/xml/locales_config.xml

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<locale-config xmlns:android="http://schemas.android.com/apk/res/android">
-    <locale android:name="en" />
-    <locale android:name="de" />
-    <locale android:name="fr" />
-    <locale android:name="nb-NO" />
-</locale-config>

app/src/main/res/xml/settings_chargeprice.xml

@@ -1,6 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto">
+    <CheckBoxPreference
+        android:key="chargeprice_native_integration"
+        android:title="@string/pref_chargeprice_native_integration"
+        android:summaryOn="@string/pref_chargeprice_native_integration_on"
+        android:summaryOff="@string/pref_chargeprice_native_integration_off"
+        app:defaultValue="true" />
     <net.vonforst.evmap.ui.MultiSelectDialogPreference
         android:key="chargeprice_my_vehicle"
         android:title="@string/pref_my_vehicle"

app/src/main/res/xml/shortcuts.xml

@@ -9,7 +9,7 @@
              (e.g. in the debug version). -->
         <intent
             android:action="android.intent.action.VIEW"
-            android:targetPackage="${applicationId}"
+            android:targetPackage="net.vonforst.evmap"
             android:targetClass="net.vonforst.evmap.MapsActivity">
             <extra
                 android:name="favorites"

app/src/normal/java/auto/CarInfo.kt

@@ -0,0 +1,6 @@
+import androidx.car.app.CarContext
+import androidx.car.app.hardware.CarHardwareManager
+import androidx.car.app.hardware.info.CarInfo
+
+val CarContext.patchedCarInfo: CarInfo
+    get() = (this.getCarService(CarContext.HARDWARE_SERVICE) as CarHardwareManager).carInfo

app/src/test/java/net/vonforst/evmap/api/availability/NewMotionAvailabilityDetectorTest.kt

@@ -67,7 +67,7 @@ class NewMotionAvailabilityDetectorTest {
     fun apiTest() {
         for (chargepoint in listOf(2105L, 18284L)) {
             val charger = runBlocking { api.getChargepointDetail(chargepoint).body()!! }
-                .chargelocations[0].convert("", true) as ChargeLocation
+                .chargelocations!![0].convert("", true) as ChargeLocation
             println(charger)
 
             runBlocking {

app/src/test/java/net/vonforst/evmap/api/chargeprice/ChargepriceApiTest.kt

@@ -60,7 +60,7 @@ class ChargepriceApiTest {
     fun apiTest() {
         for (chargepoint in listOf(2105L, 18284L)) {
             val charger = runBlocking { ge.getChargepointDetail(chargepoint).body()!! }
-                .chargelocations[0].convert("", true) as ChargeLocation
+                .chargelocations!![0].convert("", true) as ChargeLocation
             println(charger)
 
             runBlocking {

app/src/test/java/net/vonforst/evmap/api/goingelectric/GoingElectricApiTest.kt

@@ -63,8 +63,8 @@ class GoingElectricApiTest {
         val body = response.body()!!
         assertEquals("ok", body.status)
         assertEquals(null, body.startkey)
-        assertEquals(1, body.chargelocations.size)
-        val charger = body.chargelocations[0] as GEChargeLocation
+        assertEquals(1, body.chargelocations!!.size)
+        val charger = body.chargelocations!![0] as GEChargeLocation
         assertEquals(2105, charger.id)
     }
 
@@ -75,8 +75,8 @@ class GoingElectricApiTest {
         val body = response.body()!!
         assertEquals("ok", body.status)
         assertEquals(null, body.startkey)
-        assertEquals(1, body.chargelocations.size)
-        val charger = body.chargelocations[0] as GEChargeLocation
+        assertEquals(1, body.chargelocations!!.size)
+        val charger = body.chargelocations!![0] as GEChargeLocation
         assertEquals(34210, charger.id)
         assertEquals(LocalTime.MIN, charger.openinghours!!.days!!.monday.start)
         assertEquals(LocalTime.MAX, charger.openinghours!!.days!!.monday.end)
@@ -92,8 +92,8 @@ class GoingElectricApiTest {
         val body = response.body()!!
         assertEquals("ok", body.status)
         assertEquals(null, body.startkey)
-        assertEquals(2, body.chargelocations.size)
-        val charger = body.chargelocations[0] as GEChargeLocation
+        assertEquals(2, body.chargelocations!!.size)
+        val charger = body.chargelocations!![0] as GEChargeLocation
         assertEquals(41161, charger.id)
     }
 
@@ -106,7 +106,7 @@ class GoingElectricApiTest {
         val body = response.body()!!
         assertEquals("ok", body.status)
         assertEquals(null, body.startkey)
-        assertEquals(0, body.chargelocations.size)
+        assertEquals(0, body.chargelocations!!.size)
     }
 
     @Test
@@ -118,8 +118,8 @@ class GoingElectricApiTest {
         val body = response.body()!!
         assertEquals("ok", body.status)
         assertEquals(2, body.startkey)
-        assertEquals(2, body.chargelocations.size)
-        val charger = body.chargelocations[0] as GEChargeLocation
+        assertEquals(2, body.chargelocations!!.size)
+        val charger = body.chargelocations!![0] as GEChargeLocation
         assertEquals(41161, charger.id)
     }
 }

build.gradle.kts

@@ -1,20 +1,19 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-    val kotlinVersion by extra("1.9.10")
+    val kotlinVersion by extra("1.9.24")
     val aboutLibsVersion by extra("10.9.1")
-    val navVersion by extra("2.7.5")
+    val navVersion by extra("2.7.7")
     repositories {
         google()
         mavenCentral()
         gradlePluginPortal()
     }
     dependencies {
-        classpath("com.android.tools.build:gradle:8.2.2")
+        classpath("com.android.tools.build:gradle:8.3.2")
         classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion")
         classpath("com.mikepenz.aboutlibraries.plugin:aboutlibraries-plugin:$aboutLibsVersion")
         classpath("androidx.navigation:navigation-safe-args-gradle-plugin:$navVersion")
-        classpath("pt.jcosta.resourceplaceholders:plugin:0.7")
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

doc/api_keys.md

@@ -17,6 +17,12 @@ be put into the app in the form of a resource file called `apikeys.xml` under
    <string name="mapbox_key" translatable="false">
       insert your Mapbox key here
    </string>
+   <string name="jawg_key" translatable="false">
+      insert your Jawg Maps key here
+   </string>
+   <string name="arcgis_key" translatable="false">
+      insert your ArcGIS Maps key here
+   </string>
    <string name="goingelectric_key" translatable="false">
       insert your GoingElectric key here
    </string>
@@ -52,10 +58,12 @@ Map providers
 
 The different Map SDKs are wrapped by our [fork](https://github.com/ev-map/AnyMaps) of the
 [AnyMaps](https://github.com/sharenowTech/AnyMaps) library to provide a common API. The `google`
-build flavor of the app includes both Google Maps and Mapbox and allows the user to switch between
-the two, while the `foss` flavor only includes the Mapbox SDK.
+build flavor of the app includes both Google Maps and OpenStreetMap (vector tiles from
+[Jawg Maps](https://www.jawg.io/en/) through [MapLibre](https://maplibre.org/)) and allows the user
+to switch between the two, while the `foss` flavor only includes OSM.
 
-> ⚠️ When testing the app using the Android Emulator, we recommend using Google Maps and not Mapbox, as the latter has
+> ⚠️ When testing the app using the Android Emulator, we recommend using Google Maps and not
+> OSM/MapLibre, as the latter has
 [issues displaying the markers](https://github.com/mapbox/mapbox-gl-native/issues/10829). It works fine on real Android devices.
 
 ### Google Maps
@@ -77,9 +85,39 @@ the two, while the `foss` flavor only includes the Mapbox SDK.
 
 </details>
 
+### Jawg Maps
+
+[Dynamic Maps](https://www.jawg.io/docs/apidocs/maps/)
+
+<details>
+<summary>How to obtain an API key</summary>
+
+1. [Sign up](https://www.jawg.io/lab) for a Jawg account
+2. Under [Access Tokens](https://www.jawg.io/lab/access-tokens), copy your default access token or
+   create a new one. Do not restrict it to a specific origin (this setting is not compatible with
+   Android apps).
+
+</details>
+
+### ArcGIS
+
+[World Imagery basemap](https://www.arcgis.com/home/item.html?id=10df2279f9684e4a9f6a7f08febac2a9)
+*We use this for the satellite map, as [Jawg's](https://blog.jawg.io/satellite-imaging/) satellite
+style does not have global coverage.*
+
+<details>
+<summary>How to obtain an API key</summary>
+
+1. [Sign up](https://developers.arcgis.com/dashboard/) for an ArcGIS developer account
+2. In the dashboard, copy your default API key or create a new one. It has to have access to the
+   "Basemaps" service.
+
+</details>
+
 ### Mapbox
 
-[Maps SDK for Android](https://docs.mapbox.com/android/maps)
+[Geocoding API](https://docs.mapbox.com/api/search/geocoding/)
+*previously we also used Mapbox's Maps SDK, but this has now been switched to Jawg Maps.*
 
 <details>
 <summary>How to obtain an API key</summary>
@@ -91,7 +129,6 @@ the two, while the `foss` flavor only includes the Mapbox SDK.
 
 </details>
 
-
 Charging station databases
 --------------------------
 

fastlane/metadata/android/cs-CZ/full_description.txt

@@ -5,7 +5,7 @@ Funkce:
 - Zobrazuje všechny nabíjecí stanice z komunitou spravovaných databází GoingElectric.de a Open Charge Map.
 - Informace o dostupnosti v reálném čase (pouze v Evropě)
 - Integrované srovnání cen pomocí Chargeprice.app (pouze v Evropě)
-- Mapové podklady z OpenStreetMap (Mapbox)
+- Mapové podklady z OpenStreetMap
 - Vyhledávání míst
 - Pokročilé možnosti filtrování, včetně uložených profilů filtrů
 - Seznam oblíbených, také s informacemi o dostupnosti

fastlane/metadata/android/de-DE/changelogs/210.txt

@@ -0,0 +1,2 @@
+Fehler behoben:
+- Abstürze behoben

fastlane/metadata/android/de-DE/changelogs/212.txt

@@ -0,0 +1,6 @@
+Verbesserungen:
+- Option "Sofort navigieren" wird nur angezeigt, wenn kompatible Navigationsapp installiert ist
+
+Fehler behoben:
+- OpenChargeMap: Korrektur des Verhaltens der Kartenmarker bei Filter nach Betreiber
+- Abstürze behoben

fastlane/metadata/android/de-DE/changelogs/214.txt

@@ -0,0 +1,7 @@
+Änderungen:
+- OpenStreetMap-Karten: Wechsel der Datenquelle von Mapbox zu Jawg Maps
+
+Fehler behoben:
+- App-Shortcuts repariert
+- Anzeigefehler behoben
+- Abstürze behoben

fastlane/metadata/android/de-DE/changelogs/220.txt

@@ -0,0 +1,2 @@
+Fehler behoben:
+- Unterstützung für Geräte mit OpenGL ES 2.0 wiederhergestellt

fastlane/metadata/android/de-DE/changelogs/222.txt

@@ -0,0 +1,2 @@
+Fehler behoben:
+- Abstürze behoben

fastlane/metadata/android/de-DE/full_description.txt

@@ -5,7 +5,7 @@ Funktionen:
 - Anzeige der Stromtankstellen aus den Stromtankstellenverzeichnissen von GoingElectric.de und Open Charge Map
 - Echtzeit-Verfügbarkeitsanzeige für viele Ladesäulen (nur in Europa)
 - Integrierter Preisvergleich für die jeweilige Ladesäule mit Chargeprice.app (nur in Europa)
-- Kartendaten von OpenStreetMap (Mapbox)
+- Kartendaten von OpenStreetMap
 - Suche nach Orten
 - Erweiterte Filterfunktionen, Filterprofile speichern
 - Favoritenliste, auch mit Anzeige der Verfügbarkeit

fastlane/metadata/android/en-US/changelogs/210.txt

@@ -0,0 +1,2 @@
+Bugfixes:
+- Fixed crashes

fastlane/metadata/android/en-US/changelogs/212.txt

@@ -0,0 +1,6 @@
+Improvements:
+- Option "Immediate navigation" will only be shown if compatible navigation app is installed
+
+Bugfixes:
+- OpenChargeMap: Fixed strange map marker behavior when filtering by operator
+- Fixed crashes

fastlane/metadata/android/en-US/changelogs/214.txt

@@ -0,0 +1,7 @@
+Changes:
+- OpenStreetMap maps: Change data source from Mapbox to Jawg Maps
+
+Bugfixes:
+- Fixed app shortcuts
+- Fixed display errors
+- Fixed crashes

fastlane/metadata/android/en-US/changelogs/220.txt

@@ -0,0 +1,2 @@
+Bugfixes:
+- Restored support for devices with OpenGL ES 2.0

fastlane/metadata/android/en-US/changelogs/222.txt

@@ -0,0 +1,2 @@
+Bugfixes:
+- Fixed crashes

fastlane/metadata/android/en-US/full_description.txt

@@ -5,7 +5,7 @@ Features:
 - Shows all charging stations from the community-maintained GoingElectric.de and Open Charge Map directories
 - Realtime availability information (only in Europe)
 - Integrated price comparison using Chargeprice.app (only in Europe)
-- Map data from OpenStreetMap (Mapbox)
+- Map data from OpenStreetMap
 - Search for places
 - Advanced filtering options, including saved filter profiles
 - Favorites list, also with availability information

fastlane/metadata/android/fr/full_description.txt

@@ -5,7 +5,7 @@ Caractéristiques :
 - Affiche toutes les stations de recharge des répertoires GoingElectric.de et Open Charge Map gérés par la communauté.
 - Informations sur la disponibilité en temps réel (uniquement en Europe)
 - Comparaison des prix intégrée grâce à Chargeprice.app (uniquement en Europe)
-- Données cartographiques provenant d'OpenStreetMap (Mapbox)
+- Données cartographiques provenant d'OpenStreetMap
 - Recherche de lieux
 - Options de filtrage avancées, y compris les profils de filtrage enregistrés
 - Liste de favoris, avec également des informations sur la disponibilité

fastlane/metadata/android/nb-NO/full_description.txt

@@ -5,7 +5,7 @@ Du finner info om ladestasjoner i hele verden og sanntidsinfo for mange av dem s
 - Materiell design
 - Sanntidsinfo (kun i Europa)
 - Integrert sammenligningsinfo ved bruk av Chargeprice.app (kun i Europa)
-- Kartdata fra OpenStreetMap (Mapbox)
+- Kartdata fra OpenStreetMap
 - Søk etter steder
 - Avanserte filtreringsvalg, inkludert lagrede filterprofiler
 - Favorittliste, som også har tilgjengelighetsinfo

fastlane/metadata/android/nl-NL/full_description.txt

@@ -5,7 +5,7 @@ Kenmerken:
 - Toont alle laadpunten van de GoingElectric.de en Open Charge Map databanken
 - Real-time status (enkel in Europa)
 - Geïntegreerde prijsvergelijking via Chargeprice.app (enkel in Europe)
-- Kaartgegevens van OpenStreetMap (Mapbox)
+- Kaartgegevens van OpenStreetMap
 - Zoek naar locaties
 - Geavanceerde filtermogelijkheden, inclusief bewaarde filterprofielen
 - Lijst van favorieten, met statusinformatie

fastlane/metadata/android/pt/full_description.txt

@@ -5,7 +5,7 @@ Destaques:
 - Mostra todas as estações de carregamento dos diretórios GoingElectric.de e Open Charge Map mantidos pela comunidade
 - Informação de disponibilidade em tempo real (apenas na Europa)
 - Comparação de preços integrada usando o Chargeprice.app (apenas na Europa)
-- Informação do mapa via OpenStreetMap (Mapbox)
+- Informação do mapa via OpenStreetMap
 - Pesquise lugares
 - Opções de filtragem avançadas, incluindo filtros de pesquisa que podem ser guardados
 - Lista de favoritos, também com informações de disponibilidade

gradle.properties

@@ -14,6 +14,5 @@
 kotlin.code.style=official
 org.gradle.jvmargs=-Xmx2048M -Dkotlin.daemon.jvm.options\="-Xmx2048M"
 android.useAndroidX=true
-android.defaults.buildfeatures.buildconfig=true
 android.nonTransitiveRClass=true
 android.nonFinalResIds=true