add Jawg Maps sponsor logo

Use Jawg Maps for basemap, ArcGIS for satellite maps

fixes #141
refs #169, #197

hide traffic checkbox if traffic is not supported by map

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.

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

app/build.gradle.kts

@@ -10,6 +10,7 @@ plugins {
     id("com.mikepenz.aboutlibraries.plugin")
 }
 
+val supportedLocales = "en,de,fr,nb-rNO,nl,pt,ro,cs"
 
 android {
     defaultConfig {
@@ -18,10 +19,12 @@ android {
         minSdk = 21
         targetSdk = 34
         // NOTE: always increase versionCode by 2 since automotive flavor uses versionCode + 1
-        versionCode = 214
-        versionName = "1.9.0"
+        versionCode = 212
+        versionName = "1.8.2"
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
+        resourceConfigurations += supportedLocales.split(",")
+        buildConfigField("String", "supportedLocales", "\"$supportedLocales\"")
     }
 
     signingConfigs {
@@ -46,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") {
@@ -106,9 +100,6 @@ android {
         disable += listOf("NullSafeMutableLiveData")
         warning += listOf("MissingTranslation")
     }
-    androidResources {
-        generateLocaleConfig = true
-    }
 
     testOptions {
         unitTests {
@@ -227,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") {}
@@ -302,7 +277,7 @@ dependencies {
     implementation("com.github.romandanylyk:PageIndicatorView:b1bad589b5")
 
     // Android Auto
-    val carAppVersion = "1.7.0-alpha02"
+    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")

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"

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()
     }
 

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()
     }
-}
+}

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

app/src/main/res/resources.properties

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

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

@@ -380,7 +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>
 </resources>

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>

build.gradle.kts

@@ -10,7 +10,7 @@ buildscript {
         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")

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

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