add Jawg Maps sponsor logo

Migrate Mapbox -> MapLibre
Use Jawg Maps for basemap, ArcGIS for satellite maps fixes #141 refs #169, #197 hide traffic checkbox if traffic is not supported by map
2026-02-19 07:39:32 -05:00 · 2024-05-08 21:39:29 +02:00 · 2024-05-08 21:39:29 +02:00
32 changed files with 61 additions and 427 deletions
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -34,5 +34,3 @@ jobs:
        run: ./gradlew test${{ matrix.buildvariant }}DebugUnitTest --no-daemon
      - name: Run Android Lint
        run: ./gradlew lint${{ matrix.buildvariant }}Debug --no-daemon
-      - name: Check licenses
-        run: ./gradlew exportLibraryDefinitions --no-daemon
--- a/.gitignore
+++ b/.gitignore
@@ -12,5 +12,4 @@ apikeys.xml
 /app/**/*.apk
 /_img/connectors/*.ai
 api-7125266970515251116-798419-8e2dda660c80.json
-output-metadata.json
-licenses_*.csv
+output-metadata.json
--- a/README.md
+++ b/README.md
@@ -43,14 +43,13 @@ EVMap uses and put them into the app in the form of a resource file called `apik
 `app/src/main/res/values`. You can find more information on which API keys are necessary for which
 features and how they can be obtained in our [documentation page](doc/api_keys.md).

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

 - The `foss` variants only use OSM data and should run on most Android devices, even without
  Google Play Services.
    - `fossNormal` is intended to run on smartphones and tablets, and also includes the Android
-      Auto app for use on the car display (however Android Auto may not work if the app is not
-      installed from Google Play, see https://github.com/ev-map/EVMap/issues/319).
+      Auto app for use on the car display (however for that to work, the Android Auto app is
+      necessary, which in turn does require Google Play Services).
    - `fossAutomotive` can be installed directly on
      [Android Automotive OS (AAOS)](https://source.android.com/docs/automotive/start/what_automotive)
      headunits without Google services.
@@ -84,17 +83,6 @@ into new languages.
 Sponsors
 --------

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

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

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

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

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

-    sourceSets {
-        getByName("releaseAutomotivePackageName").setRoot("src/release")
-    }
-
    flavorDimensions += listOf("dependencies", "automotive")
    productFlavors {
        create("foss") {
@@ -108,9 +100,6 @@ android {
        disable += listOf("NullSafeMutableLiveData")
        warning += listOf("MissingTranslation")
    }
-    androidResources {
-        generateLocaleConfig = true
-    }

    testOptions {
        unitTests {
@@ -229,22 +218,6 @@ android {
    }
 }

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

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

    implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlinVersion")
-    implementation("androidx.appcompat:appcompat:1.7.0")
-    implementation("androidx.core:core-ktx:1.13.1")
+    implementation("androidx.appcompat:appcompat:1.6.1")
+    implementation("androidx.core:core-ktx:1.12.0")
    implementation("androidx.core:core-splashscreen:1.0.1")
-    implementation("androidx.activity:activity-ktx:1.9.0")
-    implementation("androidx.fragment:fragment-ktx:1.7.1")
+    implementation("androidx.activity:activity-ktx:1.8.2")
+    implementation("androidx.fragment:fragment-ktx:1.6.2")
    implementation("androidx.cardview:cardview:1.0.0")
    implementation("androidx.preference:preference-ktx:1.2.1")
-    implementation("com.google.android.material:material:1.12.0")
+    implementation("com.google.android.material:material:1.11.0")
    implementation("androidx.constraintlayout:constraintlayout:2.1.4")
    implementation("androidx.recyclerview:recyclerview:1.3.2")
-    implementation("androidx.browser:browser:1.8.0")
+    implementation("androidx.browser:browser:1.7.0")
    implementation("androidx.swiperefreshlayout:swiperefreshlayout:1.1.0")
    implementation("androidx.security:security-crypto:1.1.0-alpha06")
    implementation("androidx.work:work-runtime-ktx:2.9.0")
    implementation("com.github.ev-map:CustomBottomSheetBehavior:e48f73ea7b")
    implementation("com.squareup.retrofit2:retrofit:2.9.0")
    implementation("com.squareup.retrofit2:converter-moshi:2.9.0")
-    implementation("com.squareup.okhttp3:okhttp:4.12.0")
-    implementation("com.squareup.okhttp3:okhttp-urlconnection:4.12.0")
+    implementation("com.squareup.okhttp3:okhttp:4.11.0")
+    implementation("com.squareup.okhttp3:okhttp-urlconnection:4.11.0")
    implementation("com.squareup.moshi:moshi-kotlin:1.15.0")
    implementation("com.squareup.moshi:moshi-adapters:1.15.0")
    implementation("com.markomilos.jsonapi:jsonapi-retrofit:1.1.0")
-    implementation("io.coil-kt:coil:2.6.0")
+    implementation("io.coil-kt:coil:2.4.0")
    implementation("com.github.ev-map:StfalconImageViewer:5082ebd392")
    implementation("com.mikepenz:aboutlibraries-core:$aboutLibsVersion")
    implementation("com.mikepenz:aboutlibraries:$aboutLibsVersion")
@@ -308,23 +277,20 @@ dependencies {
    implementation("com.github.romandanylyk:PageIndicatorView:b1bad589b5")

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

    // AnyMaps
-    val anyMapsVersion = "a5b9abca40"
+    val anyMapsVersion = "c087b3e7c2"
    implementation("com.github.ev-map.AnyMaps:anymaps-base:$anyMapsVersion")
    googleImplementation("com.github.ev-map.AnyMaps:anymaps-google:$anyMapsVersion")
    googleImplementation("com.google.android.gms:play-services-maps:18.2.0")
-    implementation("com.github.ev-map.AnyMaps:anymaps-maplibre:$anyMapsVersion") {
-        // duplicates classes from mapbox-sdk-services
-        exclude("org.maplibre.gl", "android-sdk-geojson")
-    }
+    implementation("com.github.ev-map.AnyMaps:anymaps-maplibre:$anyMapsVersion")

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

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

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

@@ -350,7 +316,7 @@ dependencies {
    implementation("com.github.EV-map:android-spatialite:e5495c83ad")  // version with minSdk increased to 21 & FORTIFY_SOURCE enabled

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

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

    // testing
    testImplementation("junit:junit:4.13.2")
-    testImplementation("com.squareup.okhttp3:mockwebserver:4.12.0")
+    testImplementation("com.squareup.okhttp3:mockwebserver:4.11.0")
    //noinspection GradleDependency
    testImplementation("org.json:json:20080701")
    testImplementation("org.robolectric:robolectric:4.11.1")
--- a/app/src/automotive/java/net/vonforst/evmap/auto/CarInfo.kt
+++ b/app/src/automotive/java/net/vonforst/evmap/auto/CarInfo.kt
@@ -1,171 +0,0 @@
-import android.car.Car
-import android.car.VehiclePropertyIds
-import android.car.VehicleUnit
-import android.car.hardware.CarPropertyValue
-import android.car.hardware.property.CarPropertyManager
-import android.car.hardware.property.CarPropertyManager.CarPropertyEventCallback
-import androidx.annotation.OptIn
-import androidx.car.app.CarContext
-import androidx.car.app.annotations.ExperimentalCarApi
-import androidx.car.app.hardware.CarHardwareManager
-import androidx.car.app.hardware.common.CarUnit
-import androidx.car.app.hardware.common.CarValue
-import androidx.car.app.hardware.common.OnCarDataAvailableListener
-import androidx.car.app.hardware.info.CarInfo
-import androidx.car.app.hardware.info.EnergyLevel
-import androidx.car.app.hardware.info.EnergyProfile
-import androidx.car.app.hardware.info.EvStatus
-import androidx.car.app.hardware.info.Mileage
-import androidx.car.app.hardware.info.Model
-import androidx.car.app.hardware.info.Speed
-import androidx.car.app.hardware.info.TollCard
-import java.util.concurrent.Executor
-
-
-val CarContext.patchedCarInfo: CarInfo
-    get() = CarInfoWrapper(this)
-
-class CarInfoWrapper(ctx: CarContext) : CarInfo {
-    private val wrapped =
-        (ctx.getCarService(CarContext.HARDWARE_SERVICE) as CarHardwareManager).carInfo
-    private val carPropertyManager = try {
-        val car = Car.createCar(ctx)
-        car.getCarManager(Car.PROPERTY_SERVICE) as CarPropertyManager
-    } catch (e: NoClassDefFoundError) {
-        null
-    }
-    private val callbacks = mutableMapOf<OnCarDataAvailableListener<*>, CarPropertyEventCallback>()
-
-    override fun fetchModel(executor: Executor, listener: OnCarDataAvailableListener<Model>) =
-        wrapped.fetchModel(executor, listener)
-
-    override fun fetchEnergyProfile(
-        executor: Executor,
-        listener: OnCarDataAvailableListener<EnergyProfile>
-    ) = wrapped.fetchEnergyProfile(executor, listener)
-
-    override fun addTollListener(
-        executor: Executor,
-        listener: OnCarDataAvailableListener<TollCard>
-    ) = wrapped.addTollListener(executor, listener)
-
-    override fun removeTollListener(listener: OnCarDataAvailableListener<TollCard>) =
-        wrapped.removeTollListener(listener)
-
-    override fun addEnergyLevelListener(
-        executor: Executor,
-        listener: OnCarDataAvailableListener<EnergyLevel>
-    ) = wrapped.addEnergyLevelListener(executor, listener)
-
-    override fun removeEnergyLevelListener(listener: OnCarDataAvailableListener<EnergyLevel>) =
-        wrapped.removeEnergyLevelListener(listener)
-
-    override fun addSpeedListener(executor: Executor, listener: OnCarDataAvailableListener<Speed>) {
-        // TODO: This is a emporary workaround until Car App Library 1.7.0 is released - previous versions would crash if the car reported an invalid speed display unit
-        carPropertyManager ?: return
-        val callback = object : CarPropertyEventCallback {
-            private var speedRaw: CarPropertyValue<Float>? = null
-            private var speedDisplay: CarPropertyValue<Float>? = null
-            private var speedUnit: CarPropertyValue<Int>? = null
-
-            override fun onChangeEvent(value: CarPropertyValue<*>?) {
-                when (value?.propertyId) {
-                    VehiclePropertyIds.PERF_VEHICLE_SPEED -> speedRaw =
-                        value as CarPropertyValue<Float>?
-
-                    VehiclePropertyIds.PERF_VEHICLE_SPEED_DISPLAY -> speedDisplay =
-                        value as CarPropertyValue<Float>?
-
-                    VehiclePropertyIds.VEHICLE_SPEED_DISPLAY_UNITS -> speedUnit =
-                        value as CarPropertyValue<Int>?
-                }
-
-                executor.execute {
-                    listener.onCarDataAvailable(Speed.Builder().apply {
-                        speedRaw?.let {
-                            setRawSpeedMetersPerSecond(
-                                CarValue(
-                                    it.value,
-                                    it.timestamp,
-                                    if (it.value != null) CarValue.STATUS_SUCCESS else CarValue.STATUS_UNKNOWN
-                                )
-                            )
-                        }
-                        speedDisplay?.let {
-                            setDisplaySpeedMetersPerSecond(
-                                CarValue(
-                                    it.value,
-                                    it.timestamp,
-                                    if (it.value != null) CarValue.STATUS_SUCCESS else CarValue.STATUS_UNKNOWN
-                                )
-                            )
-                        }
-                        speedUnit?.let {
-                            val unit = when (it.value) {
-                                VehicleUnit.METER_PER_SEC -> CarUnit.METERS_PER_SEC
-                                VehicleUnit.MILES_PER_HOUR -> CarUnit.MILES_PER_HOUR
-                                VehicleUnit.KILOMETERS_PER_HOUR -> CarUnit.KILOMETERS_PER_HOUR
-                                else -> null
-                            }
-                            setSpeedDisplayUnit(
-                                CarValue(
-                                    unit,
-                                    it.timestamp,
-                                    if (unit != null) CarValue.STATUS_SUCCESS else CarValue.STATUS_UNKNOWN
-                                )
-                            )
-                        }
-                    }.build())
-                }
-            }
-
-            override fun onErrorEvent(propertyId: Int, areaId: Int) {
-                listener.onCarDataAvailable(
-                    Speed.Builder()
-                        .setRawSpeedMetersPerSecond(CarValue(null, 0, CarValue.STATUS_UNKNOWN))
-                        .setDisplaySpeedMetersPerSecond(CarValue(null, 0, CarValue.STATUS_UNKNOWN))
-                        .setSpeedDisplayUnit(CarValue(null, 0, CarValue.STATUS_UNKNOWN))
-                        .build()
-                )
-            }
-        }
-        carPropertyManager.registerCallback(
-            callback,
-            VehiclePropertyIds.PERF_VEHICLE_SPEED,
-            CarPropertyManager.SENSOR_RATE_NORMAL
-        )
-        carPropertyManager.registerCallback(
-            callback,
-            VehiclePropertyIds.PERF_VEHICLE_SPEED_DISPLAY,
-            CarPropertyManager.SENSOR_RATE_NORMAL
-        )
-        carPropertyManager.registerCallback(
-            callback,
-            VehiclePropertyIds.VEHICLE_SPEED_DISPLAY_UNITS,
-            CarPropertyManager.SENSOR_RATE_NORMAL
-        )
-    }
-
-    override fun removeSpeedListener(listener: OnCarDataAvailableListener<Speed>) {
-        val callback = callbacks[listener] ?: return
-        carPropertyManager?.unregisterCallback(callback)
-    }
-
-    override fun addMileageListener(
-        executor: Executor,
-        listener: OnCarDataAvailableListener<Mileage>
-    ) = wrapped.addMileageListener(executor, listener)
-
-    override fun removeMileageListener(listener: OnCarDataAvailableListener<Mileage>) =
-        wrapped.removeMileageListener(listener)
-
-    @OptIn(ExperimentalCarApi::class)
-    override fun addEvStatusListener(
-        executor: Executor,
-        listener: OnCarDataAvailableListener<EvStatus>
-    ) = wrapped.addEvStatusListener(executor, listener)
-
-    @OptIn(ExperimentalCarApi::class)
-    override fun removeEvStatusListener(listener: OnCarDataAvailableListener<EvStatus>) =
-        wrapped.removeEvStatusListener(listener)
-}
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -41,7 +41,8 @@
        android:label="@string/app_name"
        android:roundIcon="@mipmap/ic_launcher_round"
        android:supportsRtl="true"
-        android:theme="@style/AppTheme">
+        android:theme="@style/AppTheme"
+        android:localeConfig="@xml/locales_config">

        <meta-data
            android:name="com.mapbox.ACCESS_TOKEN"
@@ -347,8 +348,9 @@
            android:exported="true"
            android:foregroundServiceType="location">
            <intent-filter>
-                <action android:name="androidx.car.app.CarAppService" />
-                <category android:name="androidx.car.app.category.POI" />
+                <action
+                    android:name="androidx.car.app.CarAppService"
+                    android:category="androidx.car.app.category.POI" />
            </intent-filter>
            <intent-filter>
                <action android:name="android.intent.action.VIEW" />
--- a/app/src/main/java/net/vonforst/evmap/adapter/GalleryAdapter.kt
+++ b/app/src/main/java/net/vonforst/evmap/adapter/GalleryAdapter.kt
@@ -12,6 +12,7 @@ import androidx.recyclerview.widget.ListAdapter
 import androidx.recyclerview.widget.RecyclerView
 import coil.load
 import coil.memory.MemoryCache
+import net.vonforst.evmap.BuildConfig
 import net.vonforst.evmap.R
 import net.vonforst.evmap.model.ChargerPhoto

@@ -70,7 +71,7 @@ class GalleryAdapter(context: Context, val itemClickListener: ItemClickListener?
                    memoryKeys[item.id] = metadata.memoryCacheKey
                }
            )
-            allowHardware(false)
+            allowHardware(!BuildConfig.DEBUG)
        }
    }
 }
--- a/app/src/main/java/net/vonforst/evmap/api/openchargemap/OpenChargeMapApi.kt
+++ b/app/src/main/java/net/vonforst/evmap/api/openchargemap/OpenChargeMapApi.kt
@@ -244,8 +244,6 @@ class OpenChargeMapApiWrapper(
            return Resource.success(ChargepointList(result, data.size < 499))
        } catch (e: IOException) {
            return Resource.error(e.message, null)
-        } catch (e: HttpException) {
-            return Resource.error(e.message, null)
        }
    }

--- a/app/src/main/java/net/vonforst/evmap/auto/ChargerDetailScreen.kt
+++ b/app/src/main/java/net/vonforst/evmap/auto/ChargerDetailScreen.kt
@@ -549,11 +549,7 @@ class ChargerDetailScreen(ctx: CarContext, val chargerSparse: ChargeLocation) :
                CarContext.ACTION_NAVIGATE,
                Uri.parse("geo:${coord.lat},${coord.lng}")
            )
-        try {
-            carContext.startCarApp(intent)
-        } catch (e: UnsupportedOperationException) {
-            CarToast.makeText(carContext, R.string.no_maps_app_found, CarToast.LENGTH_SHORT).show()
-        }
+        carContext.startCarApp(intent)
    }

    private fun loadCharger() {
--- a/app/src/main/java/net/vonforst/evmap/auto/Utils.kt
+++ b/app/src/main/java/net/vonforst/evmap/auto/Utils.kt
@@ -14,11 +14,7 @@ import androidx.car.app.CarToast
 import androidx.car.app.Screen
 import androidx.car.app.constraints.ConstraintManager
 import androidx.car.app.hardware.common.CarUnit
-import androidx.car.app.model.CarColor
-import androidx.car.app.model.CarIcon
-import androidx.car.app.model.Distance
-import androidx.car.app.model.MessageTemplate
-import androidx.car.app.model.Template
+import androidx.car.app.model.*
 import androidx.car.app.versioning.CarAppApiLevels
 import androidx.core.content.ContextCompat
 import androidx.core.graphics.drawable.IconCompat
@@ -30,7 +26,7 @@ import net.vonforst.evmap.getPackageInfoCompat
 import net.vonforst.evmap.kmPerMile
 import net.vonforst.evmap.shouldUseImperialUnits
 import net.vonforst.evmap.ydPerMile
-import java.util.Locale
+import java.util.*
 import kotlin.math.roundToInt

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

@androidx.car.app.annotations.ExperimentalCarApi
 class VehicleDataScreen(ctx: CarContext, val session: EVMapSession) : Screen(ctx),
    LocationAwareScreen, DefaultLifecycleObserver {
-    private val carInfo = carContext.patchedCarInfo
+    private val carInfo =
+        (ctx.getCarService(CarContext.HARDWARE_SERVICE) as CarHardwareManager).carInfo
    private val carSensors = carContext.patchedCarSensors
    private var model: Model? = null
    private var energyLevel: EnergyLevel? = null
--- a/app/src/main/java/net/vonforst/evmap/fragment/MapFragment.kt
+++ b/app/src/main/java/net/vonforst/evmap/fragment/MapFragment.kt
@@ -864,7 +864,6 @@ class MapFragment : Fragment(), OnMapReadyCallback, MapsActivity.FragmentCallbac
                        if (photo == photos[position] && imageCacheKey != null) {
                            placeholderMemoryCacheKey(imageCacheKey)
                        }
-                        allowHardware(false)
                    }
                }
                    .withTransitionFrom(view as ImageView)
--- a/app/src/main/java/net/vonforst/evmap/fragment/preference/UiSettingsFragment.kt
+++ b/app/src/main/java/net/vonforst/evmap/fragment/preference/UiSettingsFragment.kt
@@ -41,7 +41,7 @@ class UiSettingsFragment : BaseSettingsFragment() {

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

--- a/app/src/main/java/net/vonforst/evmap/ui/ConfigurationUtils.kt
+++ b/app/src/main/java/net/vonforst/evmap/ui/ConfigurationUtils.kt
@@ -1,12 +1,10 @@
 package net.vonforst.evmap.ui

-import android.content.Context
 import androidx.appcompat.app.AppCompatDelegate
 import androidx.core.os.LocaleListCompat
-import net.vonforst.evmap.R
+import net.vonforst.evmap.BuildConfig
 import net.vonforst.evmap.storage.PreferenceDataSource

-
 fun updateNightMode(prefs: PreferenceDataSource) {
    AppCompatDelegate.setDefaultNightMode(
        when (prefs.darkmode) {
@@ -27,14 +25,13 @@ fun updateAppLocale(language: String) {
    )
 }

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

    <Button
--- a/app/src/main/res/resources.properties
+++ b/app/src/main/res/resources.properties
@@ -1 +0,0 @@
-unqualifiedResLocale=en-US
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@@ -383,5 +383,4 @@
    <string name="pref_chargeprice_native_integration">Porovnání cen v EVMap</string>
    <string name="pref_chargeprice_native_integration_on">Data o cenách budou zobrazena přímo v EVMap</string>
    <string name="pref_chargeprice_native_integration_off">Tlačítko porovnání cen bude odkazovat na aplikaci nebo web Chargeprice</string>
-    <string name="pref_provider_osm">OpenStreetMap</string>
 </resources>
--- a/app/src/main/res/values-pt/strings.xml
+++ b/app/src/main/res/values-pt/strings.xml
@@ -380,8 +380,4 @@
    <string name="status_faulted">Fora de serviço</string>
    <string name="status_since">%1$s desde %2$s</string>
    <string name="status_unknown">Estado Desconhecido</string>
-    <string name="pref_chargeprice_native_integration">Comparação de preços no EVMap</string>
-    <string name="pref_chargeprice_native_integration_on">Os preços serão exibidos diretamente no EVMap</string>
-    <string name="pref_chargeprice_native_integration_off">O botão de comparação de preços abrirá a app ou site do Chargeprice</string>
-    <string name="pref_provider_osm">OpenStreetMap</string>
 </resources>
--- a/app/src/main/res/xml/locales_config.xml
+++ b/app/src/main/res/xml/locales_config.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<locale-config xmlns:android="http://schemas.android.com/apk/res/android">
+    <locale android:name="en" />
+    <locale android:name="de" />
+    <locale android:name="fr" />
+    <locale android:name="nb-NO" />
+</locale-config>
--- a/app/src/normal/java/auto/CarInfo.kt
+++ b/app/src/normal/java/auto/CarInfo.kt
@@ -1,6 +0,0 @@
-import androidx.car.app.CarContext
-import androidx.car.app.hardware.CarHardwareManager
-import androidx.car.app.hardware.info.CarInfo
-
-val CarContext.patchedCarInfo: CarInfo
-    get() = (this.getCarService(CarContext.HARDWARE_SERVICE) as CarHardwareManager).carInfo
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -1,16 +1,16 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.

 buildscript {
-    val kotlinVersion by extra("1.9.24")
+    val kotlinVersion by extra("1.9.10")
    val aboutLibsVersion by extra("10.9.1")
-    val navVersion by extra("2.7.7")
+    val navVersion by extra("2.7.5")
    repositories {
        google()
        mavenCentral()
        gradlePluginPortal()
    }
    dependencies {
-        classpath("com.android.tools.build:gradle:8.3.2")
+        classpath("com.android.tools.build:gradle:8.2.2")
        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion")
        classpath("com.mikepenz.aboutlibraries.plugin:aboutlibraries-plugin:$aboutLibsVersion")
        classpath("androidx.navigation:navigation-safe-args-gradle-plugin:$navVersion")
--- a/fastlane/metadata/android/de-DE/changelogs/214.txt
+++ b/fastlane/metadata/android/de-DE/changelogs/214.txt
@@ -1,7 +0,0 @@
-Änderungen:
- OpenStreetMap-Karten: Wechsel der Datenquelle von Mapbox zu Jawg Maps
-
-Fehler behoben:
- App-Shortcuts repariert
- Anzeigefehler behoben
- Abstürze behoben
--- a/fastlane/metadata/android/de-DE/changelogs/220.txt
+++ b/fastlane/metadata/android/de-DE/changelogs/220.txt
@@ -1,2 +0,0 @@
-Fehler behoben:
- Unterstützung für Geräte mit OpenGL ES 2.0 wiederhergestellt
--- a/fastlane/metadata/android/de-DE/changelogs/222.txt
+++ b/fastlane/metadata/android/de-DE/changelogs/222.txt
@@ -1,2 +0,0 @@
-Fehler behoben:
- Abstürze behoben
--- a/fastlane/metadata/android/de-DE/images/icon.png
+++ b/fastlane/metadata/android/de-DE/images/icon.png
--- a/fastlane/metadata/android/en-US/changelogs/214.txt
+++ b/fastlane/metadata/android/en-US/changelogs/214.txt
@@ -1,7 +0,0 @@
-Changes:
- OpenStreetMap maps: Change data source from Mapbox to Jawg Maps
-
-Bugfixes:
- Fixed app shortcuts
- Fixed display errors
- Fixed crashes
--- a/fastlane/metadata/android/en-US/changelogs/220.txt
+++ b/fastlane/metadata/android/en-US/changelogs/220.txt
@@ -1,2 +0,0 @@
-Bugfixes:
- Restored support for devices with OpenGL ES 2.0
--- a/fastlane/metadata/android/en-US/changelogs/222.txt
+++ b/fastlane/metadata/android/en-US/changelogs/222.txt
@@ -1,2 +0,0 @@
-Bugfixes:
- Fixed crashes
--- a/fastlane/metadata/android/en-US/images/icon.png
+++ b/fastlane/metadata/android/en-US/images/icon.png
Author	SHA1	Message	Date
johan12345	1a830fda5b	add Jawg Maps sponsor logo	2024-05-08 21:39:29 +02:00
johan12345	3df83f2d56	Migrate Mapbox -> MapLibre Use Jawg Maps for basemap, ArcGIS for satellite maps fixes #141 refs #169, #197 hide traffic checkbox if traffic is not supported by map	2024-05-08 21:39:29 +02:00