Release 1.9.13

fixes #368

README.md

@@ -46,8 +46,7 @@ features and how they can be obtained in our [documentation page](doc/api_keys.m
 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.
+- The `foss` variants only use OSM data for the base map and place search. They should run on most Android devices, even those 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).
@@ -93,8 +92,4 @@ free, i.e. the background map displayed in the app if OpenStreetMap is selected
 
 <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.
+price for EVMap. This data is used in EVMap's price comparison feature.

app/build.gradle.kts

@@ -20,8 +20,8 @@ android {
         minSdk = 21
         targetSdk = 34
         // NOTE: always increase versionCode by 2 since automotive flavor uses versionCode + 1
-        versionCode = 222
-        versionName = "1.9.2"
+        versionCode = 246
+        versionName = "1.9.13"
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     }
@@ -306,6 +306,7 @@ dependencies {
     implementation("com.google.guava:guava:29.0-android")
     implementation("com.github.pengrad:mapscaleview:1.6.0")
     implementation("com.github.romandanylyk:PageIndicatorView:b1bad589b5")
+    implementation("com.github.erfansn:locale-config-x:1.0.1")
 
     // Android Auto
     val carAppVersion = "1.4.0"
@@ -314,14 +315,17 @@ dependencies {
     automotiveImplementation("androidx.car.app:app-automotive:$carAppVersion")
 
     // AnyMaps
-    val anyMapsVersion = "a5b9abca40"
+    val anyMapsVersion = "1174ef9375"
     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")
+    googleImplementation("com.google.android.gms:play-services-maps:19.0.0")
     implementation("com.github.ev-map.AnyMaps:anymaps-maplibre:$anyMapsVersion") {
         // duplicates classes from mapbox-sdk-services
         exclude("org.maplibre.gl", "android-sdk-geojson")
     }
+    implementation("org.maplibre.gl:android-sdk:10.3.3") {
+        exclude("org.maplibre.gl", "android-sdk-geojson")
+    }
 
     // Google Places
     googleImplementation("com.google.android.libraries.places:places:3.5.0")
@@ -344,10 +348,7 @@ 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.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
+    implementation("com.github.anboralabs:spatia-room:0.3.0")
 
     // billing library
     val billing_version = "7.0.0"
@@ -364,6 +365,8 @@ dependencies {
     debugImplementation("com.facebook.flipper:flipper:0.238.0")
     debugImplementation("com.facebook.soloader:soloader:0.10.5")
     debugImplementation("com.facebook.flipper:flipper-network-plugin:0.238.0")
+    debugImplementation("com.jakewharton.timber:timber:5.0.1")
+    debugImplementation("com.squareup.leakcanary:leakcanary-android:2.14")
 
     // testing
     testImplementation("junit:junit:4.13.2")

app/src/debug/java/net/vonforst/evmap/DebugInits.kt

@@ -11,6 +11,7 @@ import com.facebook.flipper.plugins.network.NetworkFlipperPlugin
 import com.facebook.flipper.plugins.sharedpreferences.SharedPreferencesFlipperPlugin
 import com.facebook.soloader.SoLoader
 import okhttp3.OkHttpClient
+import timber.log.Timber
 
 private val networkFlipperPlugin = NetworkFlipperPlugin()
 
@@ -24,6 +25,8 @@ fun addDebugInterceptors(context: Context) {
     client.addPlugin(DatabasesFlipperPlugin(context))
     client.addPlugin(SharedPreferencesFlipperPlugin(context))
     client.start()
+
+    Timber.plant(Timber.DebugTree())
 }
 
 fun OkHttpClient.Builder.addDebugInterceptors(): OkHttpClient.Builder {

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

@@ -5,7 +5,6 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import androidx.appcompat.app.AppCompatActivity
-import androidx.fragment.app.Fragment
 import androidx.navigation.fragment.findNavController
 import androidx.navigation.ui.setupWithNavController
 import com.google.android.material.transition.MaterialSharedAxis
@@ -43,7 +42,7 @@ class DonateFragment : DonateFragmentBase() {
         )
 
         binding.btnDonate.setOnClickListener {
-            (activity as? MapsActivity)?.openUrl(getString(R.string.paypal_link))
+            (activity as? MapsActivity)?.openUrl(getString(R.string.paypal_link), binding.root)
         }
 
         setupReferrals(referrals)

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

@@ -3,7 +3,11 @@ package net.vonforst.evmap
 import android.app.Activity
 import android.app.Application
 import android.os.Build
-import androidx.work.*
+import androidx.work.Configuration
+import androidx.work.Constraints
+import androidx.work.ExistingPeriodicWorkPolicy
+import androidx.work.PeriodicWorkRequestBuilder
+import androidx.work.WorkManager
 import net.vonforst.evmap.storage.CleanupCacheWorker
 import net.vonforst.evmap.storage.PreferenceDataSource
 import net.vonforst.evmap.ui.updateAppLocale
@@ -24,7 +28,7 @@ class EvMapApplication : Application(), Configuration.Provider {
 
         // Convert to new AppCompat storage for app language
         val lang = prefs.language
-        if (lang != null && lang !in listOf("", "default")) {
+        if (lang != null) {
             updateAppLocale(lang)
             prefs.language = null
         }

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

@@ -44,14 +44,11 @@ const val EXTRA_DONATE = "donate"
 
 class MapsActivity : AppCompatActivity(),
     PreferenceFragmentCompat.OnPreferenceStartFragmentCallback {
-    interface FragmentCallback {
-        fun getRootView(): View
-    }
 
     private var reenterState: Bundle? = null
     private lateinit var navController: NavController
+    private lateinit var navHostFragment: NavHostFragment
     lateinit var appBarConfiguration: AppBarConfiguration
-    var fragmentCallback: FragmentCallback? = null
     private lateinit var prefs: PreferenceDataSource
 
     override fun onCreate(savedInstanceState: Bundle?) {
@@ -60,6 +57,7 @@ class MapsActivity : AppCompatActivity(),
 
         setContentView(R.layout.activity_maps)
 
+        val drawerLayout = findViewById<DrawerLayout>(R.id.drawer_layout)
         appBarConfiguration = AppBarConfiguration(
             setOf(
                 R.id.map,
@@ -67,9 +65,9 @@ class MapsActivity : AppCompatActivity(),
                 R.id.about,
                 R.id.settings
             ),
-            findViewById<DrawerLayout>(R.id.drawer_layout)
+            drawerLayout
         )
-        val navHostFragment =
+        navHostFragment =
             supportFragmentManager.findFragmentById(R.id.nav_host_fragment) as NavHostFragment
         navController = navHostFragment.navController
         val navGraph = navController.navInflater.inflate(R.navigation.nav_graph)
@@ -87,6 +85,17 @@ class MapsActivity : AppCompatActivity(),
 
         checkPlayServices(this)
 
+        navController.setGraph(navGraph, MapFragmentArgs(appStart = true).toBundle())
+        var deepLink: PendingIntent? = null
+
+        navController.addOnDestinationChangedListener { _, destination, _ ->
+            if (destination.id == R.id.onboarding) {
+                drawerLayout.setDrawerLockMode(DrawerLayout.LOCK_MODE_LOCKED_CLOSED)
+            } else {
+                drawerLayout.setDrawerLockMode(DrawerLayout.LOCK_MODE_UNLOCKED)
+            }
+        }
+
         if (!prefs.welcomeDialogShown || !prefs.dataSourceSet) {
             if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
                 // wait for splash screen animation to finish on first start
@@ -104,137 +113,128 @@ class MapsActivity : AppCompatActivity(),
                     }
                 })
             }
-            navGraph.setStartDestination(R.id.onboarding)
-            navController.graph = navGraph
-            return
-        } else if (!prefs.privacyAccepted) {
-            navGraph.setStartDestination(R.id.onboarding)
-            navController.graph = navGraph
-            return
-        } else {
-            navGraph.setStartDestination(R.id.map)
-            navController.setGraph(navGraph, MapFragmentArgs(appStart = true).toBundle())
-            var deepLink: PendingIntent? = null
+        } else if (intent?.scheme == "geo") {
+            val query = intent.data?.query?.split("=")?.get(1)
+            val coords = getLocationFromIntent(intent)
 
-            if (intent?.scheme == "geo") {
-                val query = intent.data?.query?.split("=")?.get(1)
-                val coords = getLocationFromIntent(intent)
-
-                if (coords != null) {
-                    val lat = coords[0]
-                    val lon = coords[1]
-                    deepLink = navController.createDeepLink()
-                        .setGraph(R.navigation.nav_graph)
-                        .setDestination(R.id.map)
-                        .setArguments(MapFragmentArgs(latLng = LatLng(lat, lon)).toBundle())
-                        .createPendingIntent()
-                } else if (!query.isNullOrEmpty()) {
-                    deepLink = navController.createDeepLink()
-                        .setGraph(R.navigation.nav_graph)
-                        .setDestination(R.id.map)
-                        .setArguments(MapFragmentArgs(locationName = query).toBundle())
-                        .createPendingIntent()
-                }
-            } else if (intent?.scheme == "https" && intent?.data?.host == "www.goingelectric.de") {
-                val id = intent.data?.pathSegments?.last()?.toLongOrNull()
-                if (id != null) {
-                    if (prefs.dataSource != "goingelectric") {
-                        prefs.dataSource = "goingelectric"
-                        Toast.makeText(
-                            this,
-                            getString(
-                                R.string.data_source_switched_to,
-                                getString(R.string.data_source_goingelectric)
-                            ),
-                            Toast.LENGTH_LONG
-                        ).show()
-                    }
-                    deepLink = navController.createDeepLink()
-                        .setGraph(R.navigation.nav_graph)
-                        .setDestination(R.id.map)
-                        .setArguments(MapFragmentArgs(chargerId = id).toBundle())
-                        .createPendingIntent()
-                }
-            } else if (intent?.scheme == "https" && intent?.data?.host in listOf("openchargemap.org", "map.openchargemap.io")) {
-                val id = when (intent.data?.host) {
-                    "openchargemap.org" -> intent.data?.pathSegments?.last()?.toLongOrNull()
-                    "map.openchargemap.io" -> intent.data?.getQueryParameter("id")?.toLongOrNull()
-                    else -> null
-                }
-                if (id != null) {
-                    if (prefs.dataSource != "openchargemap") {
-                        prefs.dataSource = "openchargemap"
-                        Toast.makeText(
-                            this,
-                            getString(
-                                R.string.data_source_switched_to,
-                                getString(R.string.data_source_openchargemap)
-                            ),
-                            Toast.LENGTH_LONG
-                        ).show()
-                    }
-                    deepLink = navController.createDeepLink()
-                        .setGraph(R.navigation.nav_graph)
-                        .setDestination(R.id.map)
-                        .setArguments(MapFragmentArgs(chargerId = id).toBundle())
-                        .createPendingIntent()
-                }
-            } else if (intent.scheme == "net.vonforst.evmap") {
-                intent.data?.let {
-                    if (it.host == "find_charger") {
-                        val lat = it.getQueryParameter("latitude")?.toDouble()
-                        val lon = it.getQueryParameter("longitude")?.toDouble()
-                        val name = it.getQueryParameter("name")
-                        if (lat != null && lon != null) {
-                            deepLink = navController.createDeepLink()
-                                .setGraph(R.navigation.nav_graph)
-                                .setDestination(R.id.map)
-                                .setArguments(
-                                    MapFragmentArgs(
-                                        latLng = LatLng(lat, lon),
-                                        locationName = name
-                                    ).toBundle()
-                                )
-                                .createPendingIntent()
-                        } else if (name != null) {
-                            deepLink = navController.createDeepLink()
-                                .setGraph(R.navigation.nav_graph)
-                                .setDestination(R.id.map)
-                                .setArguments(MapFragmentArgs(locationName = name).toBundle())
-                                .createPendingIntent()
-                        }
-                    }
-                }
-            } else if (intent.hasExtra(EXTRA_CHARGER_ID)) {
+            if (coords != null) {
+                val lat = coords[0]
+                val lon = coords[1]
                 deepLink = navController.createDeepLink()
+                    .setGraph(R.navigation.nav_graph)
                     .setDestination(R.id.map)
-                    .setArguments(
-                        MapFragmentArgs(
-                            chargerId = intent.getLongExtra(EXTRA_CHARGER_ID, 0),
-                            latLng = LatLng(
-                                intent.getDoubleExtra(EXTRA_LAT, 0.0),
-                                intent.getDoubleExtra(EXTRA_LON, 0.0)
-                            )
-                        ).toBundle()
-                    )
+                    .setArguments(MapFragmentArgs(latLng = LatLng(lat, lon)).toBundle())
                     .createPendingIntent()
-            } else if (intent.hasExtra(EXTRA_FAVORITES)) {
+            } else if (!query.isNullOrEmpty()) {
                 deepLink = navController.createDeepLink()
-                    .setGraph(navGraph)
-                    .setDestination(R.id.favs)
-                    .createPendingIntent()
-            } else if (intent.hasExtra(EXTRA_DONATE)) {
-                deepLink = navController.createDeepLink()
-                    .setGraph(navGraph)
-                    .setDestination(R.id.donate)
+                    .setGraph(R.navigation.nav_graph)
+                    .setDestination(R.id.map)
+                    .setArguments(MapFragmentArgs(locationName = query).toBundle())
                     .createPendingIntent()
             }
-
-            deepLink?.send()
+        } else if (intent?.scheme == "https" && intent?.data?.host == "www.goingelectric.de") {
+            val id = intent.data?.pathSegments?.lastOrNull()?.toLongOrNull()
+            if (id != null) {
+                if (prefs.dataSource != "goingelectric") {
+                    prefs.dataSource = "goingelectric"
+                    Toast.makeText(
+                        this,
+                        getString(
+                            R.string.data_source_switched_to,
+                            getString(R.string.data_source_goingelectric)
+                        ),
+                        Toast.LENGTH_LONG
+                    ).show()
+                }
+                deepLink = navController.createDeepLink()
+                    .setGraph(R.navigation.nav_graph)
+                    .setDestination(R.id.map)
+                    .setArguments(MapFragmentArgs(chargerId = id).toBundle())
+                    .createPendingIntent()
+            }
+        } else if (intent?.scheme == "https" && intent?.data?.host in listOf(
+                "openchargemap.org",
+                "map.openchargemap.io"
+            )
+        ) {
+            val id = when (intent.data?.host) {
+                "openchargemap.org" -> intent.data?.pathSegments?.lastOrNull()?.toLongOrNull()
+                "map.openchargemap.io" -> intent.data?.getQueryParameter("id")?.toLongOrNull()
+                else -> null
+            }
+            if (id != null) {
+                if (prefs.dataSource != "openchargemap") {
+                    prefs.dataSource = "openchargemap"
+                    Toast.makeText(
+                        this,
+                        getString(
+                            R.string.data_source_switched_to,
+                            getString(R.string.data_source_openchargemap)
+                        ),
+                        Toast.LENGTH_LONG
+                    ).show()
+                }
+                deepLink = navController.createDeepLink()
+                    .setGraph(R.navigation.nav_graph)
+                    .setDestination(R.id.map)
+                    .setArguments(MapFragmentArgs(chargerId = id).toBundle())
+                    .createPendingIntent()
+            }
+        } else if (intent.scheme == "net.vonforst.evmap") {
+            intent.data?.let {
+                if (it.host == "find_charger") {
+                    val lat = it.getQueryParameter("latitude")?.toDouble()
+                    val lon = it.getQueryParameter("longitude")?.toDouble()
+                    val name = it.getQueryParameter("name")
+                    if (lat != null && lon != null) {
+                        deepLink = navController.createDeepLink()
+                            .setGraph(R.navigation.nav_graph)
+                            .setDestination(R.id.map)
+                            .setArguments(
+                                MapFragmentArgs(
+                                    latLng = LatLng(lat, lon),
+                                    locationName = name
+                                ).toBundle()
+                            )
+                            .createPendingIntent()
+                    } else if (name != null) {
+                        deepLink = navController.createDeepLink()
+                            .setGraph(R.navigation.nav_graph)
+                            .setDestination(R.id.map)
+                            .setArguments(MapFragmentArgs(locationName = name).toBundle())
+                            .createPendingIntent()
+                    }
+                }
+            }
+        } else if (intent.hasExtra(EXTRA_CHARGER_ID)) {
+            deepLink = navController.createDeepLink()
+                .setDestination(R.id.map)
+                .setArguments(
+                    MapFragmentArgs(
+                        chargerId = intent.getLongExtra(EXTRA_CHARGER_ID, 0),
+                        latLng = LatLng(
+                            intent.getDoubleExtra(EXTRA_LAT, 0.0),
+                            intent.getDoubleExtra(EXTRA_LON, 0.0)
+                        )
+                    ).toBundle()
+                )
+                .createPendingIntent()
+        } else if (intent.hasExtra(EXTRA_FAVORITES)) {
+            deepLink = navController.createDeepLink()
+                .setGraph(navGraph)
+                .setDestination(R.id.favs)
+                .createPendingIntent()
+        } else if (intent.hasExtra(EXTRA_DONATE)) {
+            deepLink = navController.createDeepLink()
+                .setGraph(navGraph)
+                .setDestination(R.id.donate)
+                .createPendingIntent()
         }
+
+        deepLink?.send()
     }
 
-    fun navigateTo(charger: ChargeLocation) {
+    fun navigateTo(charger: ChargeLocation, rootView: View) {
         // google maps navigation
         val coord = charger.coordinates
         val intent = Intent(Intent.ACTION_VIEW)
@@ -244,11 +244,11 @@ class MapsActivity : AppCompatActivity(),
             startActivity(intent)
         } else {
             // fallback: generic geo intent
-            showLocation(charger)
+            showLocation(charger, rootView)
         }
     }
 
-    fun showLocation(charger: ChargeLocation) {
+    fun showLocation(charger: ChargeLocation, rootView: View) {
         val coord = charger.coordinates
         val intent = Intent(Intent.ACTION_VIEW)
         intent.data = Uri.parse(
@@ -259,16 +259,15 @@ class MapsActivity : AppCompatActivity(),
         if (intent.resolveActivity(packageManager) != null) {
             startActivity(intent)
         } else {
-            val cb = fragmentCallback ?: return
             Snackbar.make(
-                cb.getRootView(),
+                rootView,
                 R.string.no_maps_app_found,
                 Snackbar.LENGTH_SHORT
             ).show()
         }
     }
 
-    fun openUrl(url: String, preferBrowser: Boolean = true) {
+    fun openUrl(url: String, rootView: View, preferBrowser: Boolean = true) {
         val pkg = CustomTabsClient.getPackageName(this, null)
         val intent = CustomTabsIntent.Builder()
             .setDefaultColorSchemeParams(
@@ -285,9 +284,8 @@ class MapsActivity : AppCompatActivity(),
         try {
             intent.launchUrl(this, Uri.parse(url))
         } catch (e: ActivityNotFoundException) {
-            val cb = fragmentCallback ?: return
             Snackbar.make(
-                cb.getRootView(),
+                rootView,
                 R.string.no_browser_app_found,
                 Snackbar.LENGTH_SHORT
             ).show()

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

@@ -17,6 +17,7 @@ import android.text.SpannedString
 import android.text.TextUtils
 import android.text.style.StyleSpan
 import net.vonforst.evmap.storage.PreferenceDataSource
+import java.util.Currency
 import java.util.Locale
 
 fun Bundle.optDouble(name: String): Double? {
@@ -139,4 +140,6 @@ fun PackageManager.isAppInstalled(packageName: String): Boolean {
     } catch (e: PackageManager.NameNotFoundException) {
         false
     }
-}
+}
+
+fun currencyDisplayName(code: String) = "${Currency.getInstance(code).displayName} ($code)"

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

@@ -9,7 +9,6 @@ import androidx.core.text.buildSpannedString
 import net.vonforst.evmap.R
 import net.vonforst.evmap.api.availability.tesla.Pricing
 import net.vonforst.evmap.api.availability.tesla.Rates
-import net.vonforst.evmap.api.availability.tesla.TeslaChargingOwnershipGraphQlApi
 import net.vonforst.evmap.bold
 import net.vonforst.evmap.joinToSpannedString
 import net.vonforst.evmap.model.ChargeCard

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

@@ -7,8 +7,6 @@ import kotlinx.coroutines.withContext
 import kotlinx.parcelize.Parcelize
 import net.vonforst.evmap.addDebugInterceptors
 import net.vonforst.evmap.api.RateLimitInterceptor
-import net.vonforst.evmap.api.await
-import net.vonforst.evmap.api.chargeprice.ChargepriceApi
 import net.vonforst.evmap.api.equivalentPlugTypes
 import net.vonforst.evmap.cartesianProduct
 import net.vonforst.evmap.model.ChargeLocation
@@ -18,7 +16,6 @@ import net.vonforst.evmap.viewmodel.Resource
 import okhttp3.Cache
 import okhttp3.JavaNetCookieJar
 import okhttp3.OkHttpClient
-import okhttp3.Request
 import retrofit2.HttpException
 import java.io.IOException
 import java.net.CookieManager
@@ -41,16 +38,6 @@ interface AvailabilityDetector {
 abstract class BaseAvailabilityDetector(private val client: OkHttpClient) : AvailabilityDetector {
     protected val radius = 150  // max radius in meters
 
-    protected suspend fun httpGet(url: String): String {
-        val request = Request.Builder().url(url).build()
-        val response = client.newCall(request).await()
-
-        if (!response.isSuccessful) throw IOException(response.message)
-
-        val str = response.body!!.string()
-        return str
-    }
-
     protected fun getCorrespondingChargepoint(
         cps: Iterable<Chargepoint>, type: String, power: Double
     ): Chargepoint? {

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

@@ -52,32 +52,31 @@ class TeslaGuestAvailabilityDetector(
 
         val (detailsA, guestPricing) = coroutineScope {
             val details = async {
-                api.getChargingSiteDetails(
-                    TeslaChargingGuestGraphQlApi.GetChargingSiteDetailsRequest(
-                        TeslaChargingGuestGraphQlApi.GetChargingSiteInformationVariables(
+                api.getSiteDetails(
+                    TeslaChargingGuestGraphQlApi.GetSiteDetailsRequest(
+                        TeslaChargingGuestGraphQlApi.GetSiteDetailsVariables(
                             TeslaChargingGuestGraphQlApi.Identifier(
                                 TeslaChargingGuestGraphQlApi.ChargingSiteIdentifier(
-                                    trtId
+                                    trtId, TeslaChargingGuestGraphQlApi.Experience.ADHOC
                                 )
                             ),
-                            TeslaChargingGuestGraphQlApi.Experience.ADHOC
                         )
                     )
-                ).data.site ?: throw AvailabilityDetectorException("no candidates found.")
+                ).data.chargingNetwork?.site
+                    ?: throw AvailabilityDetectorException("no candidates found.")
             }
             val guestPricing = async {
-                api.getChargingSiteDetails(
-                    TeslaChargingGuestGraphQlApi.GetChargingSiteDetailsRequest(
-                        TeslaChargingGuestGraphQlApi.GetChargingSiteInformationVariables(
+                api.getSiteDetails(
+                    TeslaChargingGuestGraphQlApi.GetSiteDetailsRequest(
+                        TeslaChargingGuestGraphQlApi.GetSiteDetailsVariables(
                             TeslaChargingGuestGraphQlApi.Identifier(
                                 TeslaChargingGuestGraphQlApi.ChargingSiteIdentifier(
-                                    trtId
+                                    trtId, TeslaChargingGuestGraphQlApi.Experience.GUEST
                                 )
                             ),
-                            TeslaChargingGuestGraphQlApi.Experience.GUEST
                         )
                     )
-                ).data.site?.pricing
+                ).data.chargingNetwork?.site?.pricing
             }
             details to guestPricing
         }
@@ -103,12 +102,9 @@ class TeslaGuestAvailabilityDetector(
             "charger has unknown connectors"
         )
 
-        val chargerDetails = details.chargersAvailable.chargerDetails
-        val chargers = details.chargers.associateBy { it.id }
-        var detailsSorted = chargerDetails
-            .sortedBy { chargers[it.id]?.labelLetter }
-            .sortedBy { chargers[it.id]?.labelNumber }
-
+        var detailsSorted = details.chargerList
+            .sortedBy { c -> c.labelLetter }
+            .sortedBy { c -> c.labelNumber }
 
         if (detailsSorted.size != scV2Connectors.sumOf { it.count } + scV3Connectors.sumOf { it.count }) {
             // apparently some connectors are missing in Tesla data
@@ -120,7 +116,7 @@ class TeslaGuestAvailabilityDetector(
                     detailsSorted + List(numMissing) {
                         TeslaChargingGuestGraphQlApi.ChargerDetail(
                             ChargerAvailability.UNKNOWN,
-                            ""
+                            "", ""
                         )
                     }
             } else {
@@ -151,7 +147,7 @@ class TeslaGuestAvailabilityDetector(
         }
 
         val statusMap = detailsMap.mapValues { it.value.map { it.availability.toStatus() } }
-        val labelsMap = detailsMap.mapValues { it.value.map { chargers[it.id]?.label } }
+        val labelsMap = detailsMap.mapValues { it.value.map { it.label } }
 
         val pricing = details.pricing.copy(memberRates = guestPricing.await()?.userRates)
 

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

@@ -1,12 +1,8 @@
 package net.vonforst.evmap.api.availability.tesla
 
 import com.squareup.moshi.Json
-import com.squareup.moshi.JsonAdapter
 import com.squareup.moshi.JsonClass
-import com.squareup.moshi.JsonReader
-import com.squareup.moshi.JsonWriter
 import com.squareup.moshi.Moshi
-import com.squareup.moshi.Types
 import okhttp3.CacheControl
 import okhttp3.OkHttpClient
 import retrofit2.Retrofit
@@ -15,7 +11,6 @@ import retrofit2.http.Body
 import retrofit2.http.GET
 import retrofit2.http.POST
 import retrofit2.http.Query
-import java.lang.reflect.Type
 import java.util.concurrent.TimeUnit
 
 interface TeslaCuaApi {
@@ -71,24 +66,22 @@ interface TeslaCuaApi {
 
 interface TeslaChargingGuestGraphQlApi {
     @POST("graphql")
-    suspend fun getChargingSiteDetails(
-        @Body request: GetChargingSiteDetailsRequest,
-        @Query("operationName") operationName: String = "getGuestChargingSiteDetails"
+    suspend fun getSiteDetails(
+        @Body request: GetSiteDetailsRequest,
+        @Query("operationName") operationName: String = "GetSiteDetails"
     ): GetChargingSiteDetailsResponse
 
     @JsonClass(generateAdapter = true)
-    data class GetChargingSiteDetailsRequest(
-        override val variables: GetChargingSiteInformationVariables,
-        override val operationName: String = "getGuestChargingSiteDetails",
+    data class GetSiteDetailsRequest(
+        override val variables: GetSiteDetailsVariables,
+        override val operationName: String = "GetSiteDetails",
         override val query: String =
-            "\n    query getGuestChargingSiteDetails(\$identifier: ChargingSiteIdentifierInput!, \$deviceLocale: String!, \$experience: ChargingExperienceEnum!) {\n  site(\n    identifier: \$identifier\n    deviceLocale: \$deviceLocale\n    experience: \$experience\n  ) {\n    activeOutages\n    address {\n      countryCode\n    }\n    chargers {\n      id\n      label\n    }\n    chargersAvailable {\n      chargerDetails {\n        id\n        availability\n      }\n    }\n    holdAmount {\n      holdAmount\n      currencyCode\n    }\n    maxPowerKw\n    name\n    programType\n    publicStallCount\n    id\n    pricing(experience: \$experience) {\n      userRates {\n        activePricebook {\n          charging {\n            uom\n            rates\n            buckets {\n              start\n              end\n            }\n            bucketUom\n            currencyCode\n            programType\n            vehicleMakeType\n            touRates {\n              enabled\n              activeRatesByTime {\n                startTime\n                endTime\n                rates\n              }\n            }\n          }\n          parking {\n            uom\n            rates\n            buckets {\n              start\n              end\n            }\n            bucketUom\n            currencyCode\n            programType\n            vehicleMakeType\n            touRates {\n              enabled\n              activeRatesByTime {\n                startTime\n                endTime\n                rates\n              }\n            }\n          }\n          congestion {\n            uom\n            rates\n            buckets {\n              start\n              end\n            }\n            bucketUom\n            currencyCode\n            programType\n            vehicleMakeType\n            touRates {\n              enabled\n              activeRatesByTime {\n                startTime\n                endTime\n                rates\n              }\n            }\n          }\n        }\n      }\n    }\n  }\n}\n    "
+            "\n    query GetSiteDetails(\$siteId: SiteIdInput!) {\n  chargingNetwork {\n    site(siteId: \$siteId) {\n      address {\n        countryCode\n      }\n      chargerList {\n        id\n        label\n        availability\n      }\n      holdAmount {\n        amount\n        currencyCode\n      }\n      maxPowerKw\n      name\n      programType\n      publicStallCount\n      trtId\n      pricing {\n        userRates {\n          activePricebook {\n            charging {\n              ...ChargingRate\n            }\n            parking {\n              ...ChargingRate\n            }\n            congestion {\n              ...ChargingRate\n            }\n          }\n        }\n      }\n    }\n  }\n}\n    \n    fragment ChargingRate on ChargingUserRate {\n  uom\n  rates\n  buckets {\n    start\n    end\n  }\n  bucketUom\n  currencyCode\n  programType\n  vehicleMakeType\n  touRates {\n    enabled\n    activeRatesByTime {\n      startTime\n      endTime\n      rates\n    }\n  }\n}\n    "
     ) : GraphQlRequest()
 
     @JsonClass(generateAdapter = true)
-    data class GetChargingSiteInformationVariables(
-        val identifier: Identifier,
-        val experience: Experience,
-        val deviceLocale: String = "de-DE",
+    data class GetSiteDetailsVariables(
+        val siteId: Identifier,
     )
 
     enum class Experience {
@@ -97,22 +90,22 @@ interface TeslaChargingGuestGraphQlApi {
 
     @JsonClass(generateAdapter = true)
     data class Identifier(
-        val siteId: ChargingSiteIdentifier
+        val byTrtId: ChargingSiteIdentifier
     )
 
     @JsonClass(generateAdapter = true)
     data class ChargingSiteIdentifier(
-        val id: Long,
-        val siteType: SiteType = SiteType.SUPERCHARGER
+        val trtId: Long,
+        val chargingExperience: Experience,
+        val programType: String = "PTSCH",
+        val locale: String = "de-DE",
     )
 
-    enum class SiteType {
-        @Json(name = "SITE_TYPE_SUPERCHARGER")
-        SUPERCHARGER
-    }
+    @JsonClass(generateAdapter = true)
+    data class GetChargingSiteDetailsResponse(val data: GetChargingSiteDetailsResponseDataNetwork)
 
     @JsonClass(generateAdapter = true)
-    data class GetChargingSiteDetailsResponse(val data: GetChargingSiteDetailsResponseData)
+    data class GetChargingSiteDetailsResponseDataNetwork(val chargingNetwork: GetChargingSiteDetailsResponseData?)
 
     @JsonClass(generateAdapter = true)
     data class GetChargingSiteDetailsResponseData(val site: ChargingSiteInformation?)
@@ -120,9 +113,8 @@ interface TeslaChargingGuestGraphQlApi {
     @JsonClass(generateAdapter = true)
     data class ChargingSiteInformation(
         val activeOutages: List<Outage>?,
-        val chargers: List<ChargerId>,
-        val chargersAvailable: ChargersAvailable,
-        val id: Long,
+        val chargerList: List<ChargerDetail>,
+        val trtId: Long,
         val maxPowerKw: Int,
         val name: String,
         val pricing: Pricing,
@@ -130,9 +122,10 @@ interface TeslaChargingGuestGraphQlApi {
     )
 
     @JsonClass(generateAdapter = true)
-    data class ChargerId(
-        val id: String,
+    data class ChargerDetail(
+        val availability: ChargerAvailability,
         val label: String?,
+        val id: String
     ) {
         val labelNumber
             get() = label?.replace(Regex("""\D"""), "")?.toInt()
@@ -140,15 +133,6 @@ interface TeslaChargingGuestGraphQlApi {
             get() = label?.replace(Regex("""\d"""), "")
     }
 
-    @JsonClass(generateAdapter = true)
-    data class ChargersAvailable(val chargerDetails: List<ChargerDetail>)
-
-    @JsonClass(generateAdapter = true)
-    data class ChargerDetail(
-        val availability: ChargerAvailability,
-        val id: String
-    )
-
     companion object {
         fun create(
             client: OkHttpClient,

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

@@ -452,7 +452,10 @@ class GoingElectricApiWrapper(
                     if (responses.map { it.isSuccessful }.all { it }
                         && plugsResponse.body()!!.status == STATUS_OK
                         && chargeCardsResponse.body()!!.status == STATUS_OK
-                        && networksResponse.body()!!.status == STATUS_OK) {
+                        && networksResponse.body()!!.status == STATUS_OK
+                        && plugsResponse.body()!!.result != null
+                        && chargeCardsResponse.body()!!.result != null
+                        && networksResponse.body()!!.result != null) {
                         Resource.success(
                             GEReferenceData(
                                 plugsResponse.body()!!.result!!,

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

@@ -254,7 +254,7 @@ data class OCMUserComment(
     @Json(name = "ID") val id: Long,
     @Json(name = "CommentTypeID") val commentTypeId: Long,
     @Json(name = "Comment") val comment: String?,
-    @Json(name = "UserName") val userName: String,
+    @Json(name = "UserName") val userName: String?,
     @Json(name = "DateCreated") val dateCreated: ZonedDateTime
 )
 

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

@@ -11,8 +11,10 @@ import android.net.Uri
 import android.text.SpannableString
 import android.text.SpannableStringBuilder
 import android.text.Spanned
+import android.util.Log
 import androidx.car.app.CarContext
 import androidx.car.app.CarToast
+import androidx.car.app.HostException
 import androidx.car.app.Screen
 import androidx.car.app.constraints.ConstraintManager
 import androidx.car.app.model.Action
@@ -49,9 +51,7 @@ import net.vonforst.evmap.api.availability.ChargeLocationStatus
 import net.vonforst.evmap.api.availability.tesla.Pricing
 import net.vonforst.evmap.api.chargeprice.ChargepriceApi
 import net.vonforst.evmap.api.createApi
-import net.vonforst.evmap.api.fronyx.FronyxApi
 import net.vonforst.evmap.api.fronyx.PredictionData
-import net.vonforst.evmap.api.fronyx.PredictionRepository
 import net.vonforst.evmap.api.iconForPlugType
 import net.vonforst.evmap.api.nameForPlugType
 import net.vonforst.evmap.api.stringProvider
@@ -74,6 +74,7 @@ import java.time.format.FormatStyle
 import kotlin.math.floor
 import kotlin.math.roundToInt
 
+private const val TAG = "ChargerDetailScreen"
 
 class ChargerDetailScreen(ctx: CarContext, val chargerSparse: ChargeLocation) : Screen(ctx) {
     var charger: ChargeLocation? = null
@@ -88,7 +89,8 @@ class ChargerDetailScreen(ctx: CarContext, val chargerSparse: ChargeLocation) :
     private val repo =
         ChargeLocationsRepository(createApi(prefs.dataSource, ctx), lifecycleScope, db, prefs)
     private val availabilityRepo = AvailabilityRepository(ctx)
-    private val predictionRepo = PredictionRepository(ctx)
+
+    //private val predictionRepo = PredictionRepository(ctx)
     private val timeFormat = DateTimeFormatter.ofLocalizedTime(FormatStyle.SHORT)
 
     private val imageSize = 128  // images should be 128dp according to docs
@@ -543,6 +545,17 @@ class ChargerDetailScreen(ctx: CarContext, val chargerSparse: ChargeLocation) :
         }
 
     private fun navigateToCharger(charger: ChargeLocation) {
+        var success = navigateCarApp(charger)
+        if (!success && BuildConfig.FLAVOR_automotive == "automotive") {
+            // on AAOS, some OEMs' navigation apps might not support
+            success = navigateRegularApp(charger)
+        }
+        if (!success) {
+            CarToast.makeText(carContext, R.string.no_maps_app_found, CarToast.LENGTH_SHORT).show()
+        }
+    }
+
+    private fun navigateCarApp(charger: ChargeLocation): Boolean {
         val coord = charger.coordinates
         val intent =
             Intent(
@@ -551,9 +564,36 @@ class ChargerDetailScreen(ctx: CarContext, val chargerSparse: ChargeLocation) :
             )
         try {
             carContext.startCarApp(intent)
-        } catch (e: UnsupportedOperationException) {
-            CarToast.makeText(carContext, R.string.no_maps_app_found, CarToast.LENGTH_SHORT).show()
+            return true
+        } catch (e: HostException) {
+            Log.w(TAG, "Could not start navigation using car app intent")
+            Log.w(TAG, intent.toString())
+            e.printStackTrace()
+        } catch (e: SecurityException) {
+            Log.w(TAG, "Could not start navigation using car app intent")
+            Log.w(TAG, intent.toString())
+            e.printStackTrace()
         }
+        return false
+    }
+
+    private fun navigateRegularApp(charger: ChargeLocation): Boolean {
+        val coord = charger.coordinates
+        val intent = Intent(Intent.ACTION_VIEW)
+        intent.data = Uri.parse(
+            "geo:${coord.lat},${coord.lng}?q=${coord.lat},${coord.lng}(${
+                Uri.encode(charger.name)
+            })"
+        )
+        intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+        if (intent.resolveActivity(carContext.packageManager) != null) {
+            carContext.startActivity(intent)
+            return true
+        } else {
+            Log.w(TAG, "Could not start navigation using regular intent")
+            Log.w(TAG, intent.toString())
+        }
+        return false
     }
 
     private fun loadCharger() {
@@ -607,12 +647,12 @@ class ChargerDetailScreen(ctx: CarContext, val chargerSparse: ChargeLocation) :
                     )
                     this@ChargerDetailScreen.photo = outImg
                 }
-                fronyxSupported = charger.chargepoints.any {
+                fronyxSupported = false /*charger.chargepoints.any {
                     FronyxApi.isChargepointSupported(
                         charger,
                         it
                     )
-                } && !availabilityRepo.isSupercharger(charger)
+                } && !availabilityRepo.isSupercharger(charger)*/
                 teslaSupported = availabilityRepo.isTeslaSupported(charger)
 
                 invalidate()
@@ -621,7 +661,7 @@ class ChargerDetailScreen(ctx: CarContext, val chargerSparse: ChargeLocation) :
 
                 invalidate()
 
-                prediction = predictionRepo.getPredictionData(charger, availability)
+                //prediction = predictionRepo.getPredictionData(charger, availability)
 
                 invalidate()
             } else {

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

@@ -4,7 +4,14 @@ 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.ItemList
+import androidx.car.app.model.Row
+import androidx.car.app.model.SearchTemplate
+import androidx.car.app.model.Template
 import androidx.core.graphics.drawable.IconCompat
 import androidx.lifecycle.lifecycleScope
 import kotlinx.coroutines.Dispatchers
@@ -45,7 +52,7 @@ abstract class MultiSelectSearchScreen<T>(ctx: CarContext) : Screen(ctx),
             } ?: run {
                 setLoading(true)
             }
-            if (isMultiSelect) {
+            if (isMultiSelect && shouldShowSelectAll) {
                 setActionStrip(ActionStrip.Builder().apply {
                     addAction(
                         Action.Builder().setIcon(

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

@@ -43,6 +43,7 @@ import net.vonforst.evmap.api.availability.tesla.TeslaOwnerApi
 import net.vonforst.evmap.api.chargeprice.ChargepriceApi
 import net.vonforst.evmap.api.chargeprice.ChargepriceCar
 import net.vonforst.evmap.api.chargeprice.ChargepriceTariff
+import net.vonforst.evmap.currencyDisplayName
 import net.vonforst.evmap.fragment.oauth.OAuthLoginFragment
 import net.vonforst.evmap.fragment.oauth.OAuthLoginFragmentArgs
 import net.vonforst.evmap.getPackageInfoCompat
@@ -215,7 +216,7 @@ class DataSettingsScreen(ctx: CarContext) : Screen(ctx) {
                         }
                     }
                 }.build())
-                addItem(
+                /*addItem(
                     Row.Builder()
                         .setTitle(carContext.getString(R.string.pref_prediction_enabled))
                         .addText(carContext.getString(R.string.pref_prediction_enabled_summary))
@@ -223,7 +224,7 @@ class DataSettingsScreen(ctx: CarContext) : Screen(ctx) {
                             prefs.predictionEnabled = it
                         }.setChecked(prefs.predictionEnabled).build())
                         .build()
-                )
+                )*/
                 addItem(Row.Builder().apply {
                     setTitle(carContext.getString(R.string.pref_tesla_account))
                     addText(
@@ -486,10 +487,9 @@ class ChargepriceSettingsScreen(ctx: CarContext) : Screen(ctx) {
                 addItem(Row.Builder().apply {
                     setTitle(carContext.getString(R.string.pref_chargeprice_currency))
 
-                    val names =
-                        carContext.resources.getStringArray(R.array.pref_chargeprice_currency_names)
                     val values =
-                        carContext.resources.getStringArray(R.array.pref_chargeprice_currency_values)
+                        carContext.resources.getStringArray(R.array.pref_chargeprice_currencies)
+                    val names = values.map(::currencyDisplayName)
                     val index = values.indexOf(prefs.chargepriceCurrency)
                     addText(if (index >= 0) names[index] else "")
 
@@ -629,8 +629,8 @@ class SelectCurrencyScreen(ctx: CarContext) : MultiSelectSearchScreen<Pair<Strin
     override fun getLabel(it: Pair<String, String>): String = it.first
 
     override suspend fun loadData(): List<Pair<String, String>> {
-        val names = carContext.resources.getStringArray(R.array.pref_chargeprice_currency_names)
-        val values = carContext.resources.getStringArray(R.array.pref_chargeprice_currency_values)
+        val values = carContext.resources.getStringArray(R.array.pref_chargeprice_currencies)
+        val names = values.map(::currencyDisplayName)
         return names.zip(values)
     }
 }
@@ -825,13 +825,24 @@ class AboutScreen(ctx: CarContext) : Screen(ctx) {
             }.build(), carContext.getString(R.string.about)))
             addSectionedList(SectionedItemList.create(ItemList.Builder().apply {
                 addItem(Row.Builder()
-                    .setTitle(carContext.getString(R.string.twitter))
-                    .addText(carContext.getString(R.string.twitter_handle))
+                    .setTitle(carContext.getString(R.string.mastodon))
+                    .addText(carContext.getString(R.string.mastodon_handle))
                     .setBrowsable(true)
                     .setOnClickListener(ParkedOnlyOnClickListener.create {
-                        openUrl(carContext, carContext.getString(R.string.twitter_url))
+                        openUrl(carContext, carContext.getString(R.string.mastodon_url))
                     }).build()
                 )
+                if (maxRows > 8) {
+                    addItem(
+                        Row.Builder()
+                            .setTitle(carContext.getString(R.string.twitter))
+                            .addText(carContext.getString(R.string.twitter_handle))
+                            .setBrowsable(true)
+                            .setOnClickListener(ParkedOnlyOnClickListener.create {
+                                openUrl(carContext, carContext.getString(R.string.twitter_url))
+                            }).build()
+                    )
+                }
                 if (maxRows > 6) {
                     addItem(Row.Builder()
                         .setTitle(carContext.getString(R.string.goingelectric_forum))
@@ -844,6 +855,19 @@ class AboutScreen(ctx: CarContext) : Screen(ctx) {
                         }).build()
                     )
                 }
+                if (maxRows > 7) {
+                    addItem(
+                        Row.Builder()
+                            .setTitle(carContext.getString(R.string.tff_forum))
+                            .setBrowsable(true)
+                            .setOnClickListener(ParkedOnlyOnClickListener.create {
+                                openUrl(
+                                    carContext,
+                                    carContext.getString(R.string.tff_forum_url)
+                                )
+                            }).build()
+                    )
+                }
             }.build(), carContext.getString(R.string.contact)))
             addSectionedList(SectionedItemList.create(ItemList.Builder().apply {
                 addItem(Row.Builder()

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

@@ -16,6 +16,7 @@ import com.mapbox.api.geocoding.v5.models.CarmenFeature
 import com.mapbox.geojson.BoundingBox
 import com.mapbox.geojson.Point
 import net.vonforst.evmap.R
+import retrofit2.HttpException
 import java.io.IOException
 
 class MapboxAutocompleteProvider(val context: Context) : AutocompleteProvider {
@@ -25,7 +26,7 @@ class MapboxAutocompleteProvider(val context: Context) : AutocompleteProvider {
     override val id = "mapbox"
 
     override fun autocomplete(query: String, location: LatLng?): List<AutocompletePlace> {
-        val result = MapboxGeocoding.builder().apply {
+        val request = MapboxGeocoding.builder().apply {
             location?.let {
                 proximity(Point.fromLngLat(location.longitude, location.latitude))
             }
@@ -33,7 +34,12 @@ class MapboxAutocompleteProvider(val context: Context) : AutocompleteProvider {
             accessToken(context.getString(R.string.mapbox_key))
             autocomplete(true)
             this.query(query)
-        }.build().executeCall()
+        }
+        val result = try {
+            request.build().executeCall()
+        } catch (e: HttpException) {
+            throw IOException(e)
+        }
         if (!result.isSuccessful) {
             throw IOException(result.message())
         }

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

@@ -100,9 +100,9 @@ class ChargepriceFragment : Fragment() {
             inflater,
             R.layout.fragment_chargeprice_header, container, false
         )
-        binding.lifecycleOwner = this
+        binding.lifecycleOwner = viewLifecycleOwner
         binding.vm = vm
-        headerBinding.lifecycleOwner = this
+        headerBinding.lifecycleOwner = viewLifecycleOwner
         headerBinding.vm = vm
 
         binding.toolbar.inflateMenu(R.menu.chargeprice)
@@ -141,7 +141,7 @@ class ChargepriceFragment : Fragment() {
 
         val chargepriceAdapter = ChargepriceAdapter().apply {
             onClickListener = {
-                (requireActivity() as MapsActivity).openUrl(it.url)
+                (requireActivity() as MapsActivity).openUrl(it.url, binding.root)
             }
         }
         val joinedAdapter = ConcatAdapter(
@@ -194,7 +194,10 @@ class ChargepriceFragment : Fragment() {
         }
 
         binding.imgChargepriceLogo.setOnClickListener {
-            (requireActivity() as MapsActivity).openUrl(ChargepriceApi.getPoiUrl(charger))
+            (requireActivity() as MapsActivity).openUrl(
+                ChargepriceApi.getPoiUrl(charger),
+                binding.root
+            )
         }
 
         binding.btnSettings.setOnClickListener {
@@ -217,7 +220,10 @@ class ChargepriceFragment : Fragment() {
         binding.toolbar.setOnMenuItemClickListener {
             when (it.itemId) {
                 R.id.menu_help -> {
-                    (activity as? MapsActivity)?.openUrl(getString(R.string.chargeprice_faq_link))
+                    (activity as? MapsActivity)?.openUrl(
+                        getString(R.string.chargeprice_faq_link),
+                        binding.root
+                    )
                     true
                 }
                 else -> false

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

@@ -14,14 +14,14 @@ import net.vonforst.evmap.api.availability.ChargeLocationStatus
 import net.vonforst.evmap.databinding.DialogConnectorDetailsBinding
 import net.vonforst.evmap.databinding.DialogConnectorDetailsHeaderBinding
 import net.vonforst.evmap.model.Chargepoint
-import net.vonforst.evmap.storage.PreferenceDataSource
 
 class ConnectorDetailsDialog(
-    val binding: DialogConnectorDetailsBinding,
+    binding: DialogConnectorDetailsBinding,
     context: Context,
     onClose: () -> Unit
 ) {
-    private val headerBinding: DialogConnectorDetailsHeaderBinding
+    private var headerBinding_: DialogConnectorDetailsHeaderBinding? = null
+    private val headerBinding get() = headerBinding_!!
     private val detailsAdapter = ConnectorDetailsAdapter()
 
     init {
@@ -30,7 +30,7 @@ class ConnectorDetailsDialog(
             layoutManager =
                 LinearLayoutManager(context, LinearLayoutManager.VERTICAL, false)
         }
-        headerBinding = DataBindingUtil.inflate(
+        headerBinding_ = DataBindingUtil.inflate(
             LayoutInflater.from(context),
             R.layout.dialog_connector_details_header, binding.list, false
         )
@@ -60,4 +60,8 @@ class ConnectorDetailsDialog(
         headerBinding.divider.visibility = if (items.isEmpty()) View.GONE else View.VISIBLE
         headerBinding.item = ConnectorAdapter.ChargepointWithAvailability(cp, cpStatus)
     }
+
+    fun onDestroy() {
+        headerBinding_ = null
+    }
 }

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

@@ -1,29 +1,26 @@
 package net.vonforst.evmap.fragment
 
+import android.content.Intent
+import android.webkit.WebResourceRequest
+import android.webkit.WebView
+import android.webkit.WebViewClient
 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))
+        referrals.referralWebView.loadUrl(getString(R.string.referral_link))
+        referrals.referralWebView.webViewClient = object : WebViewClient() {
+            override fun shouldOverrideUrlLoading(
+                view: WebView,
+                request: WebResourceRequest
+            ): Boolean {
+                Intent(Intent.ACTION_VIEW, request.url).apply {
+                    startActivity(this)
+                }
+                return true
+            }
         }
     }
 }

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

@@ -65,7 +65,7 @@ class FavoritesFragment : Fragment() {
             inflater,
             R.layout.fragment_favorites, container, false
         )
-        binding.lifecycleOwner = this
+        binding.lifecycleOwner = viewLifecycleOwner
         binding.vm = vm
 
         return binding.root

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

@@ -45,7 +45,7 @@ class FilterFragment : Fragment(), MenuProvider {
         savedInstanceState: Bundle?
     ): View {
         binding = DataBindingUtil.inflate(inflater, R.layout.fragment_filter, container, false)
-        binding.lifecycleOwner = this
+        binding.lifecycleOwner = viewLifecycleOwner
         binding.vm = vm
         vm.filterProfile.observe(viewLifecycleOwner) {}
 

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

@@ -57,7 +57,7 @@ class FilterProfilesFragment : Fragment() {
         savedInstanceState: Bundle?
     ): View {
         binding = FragmentFilterProfilesBinding.inflate(inflater, container, false)
-        binding.lifecycleOwner = this
+        binding.lifecycleOwner = viewLifecycleOwner
         binding.vm = vm
 
         return binding.root
@@ -188,9 +188,17 @@ class FilterProfilesFragment : Fragment() {
 
                 dialog.setTitle(R.string.rename)
                     .setMessage(R.string.save_profile_enter_name)
-            }, {
+            }, { newName ->
                 lifecycleScope.launch {
-                    vm.update(fp.copy(name = it))
+                    if (vm.filterProfiles.value?.find { it.name == newName } != null) {
+                        Snackbar.make(
+                            view,
+                            R.string.filterprofile_name_not_unique,
+                            Snackbar.LENGTH_LONG
+                        ).show()
+                    } else {
+                        vm.update(fp.copy(name = newName))
+                    }
                 }
             })
         })

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

@@ -55,6 +55,7 @@ import androidx.transition.TransitionManager
 import coil.load
 import coil.memory.MemoryCache
 import com.car2go.maps.AnyMap
+import com.car2go.maps.MapFactory
 import com.car2go.maps.MapFragment
 import com.car2go.maps.OnMapReadyCallback
 import com.car2go.maps.model.BitmapDescriptor
@@ -136,8 +137,9 @@ import kotlin.collections.set
 import kotlin.math.min
 
 
-class MapFragment : Fragment(), OnMapReadyCallback, MapsActivity.FragmentCallback, MenuProvider {
-    private lateinit var binding: FragmentMapBinding
+class MapFragment : Fragment(), OnMapReadyCallback, MenuProvider {
+    private var _binding: FragmentMapBinding? = null
+    private val binding get() = _binding!!
     private val vm: MapViewModel by viewModels()
     private val galleryVm: GalleryViewModel by activityViewModels()
     private var mapFragment: MapFragment? = null
@@ -211,9 +213,9 @@ class MapFragment : Fragment(), OnMapReadyCallback, MapsActivity.FragmentCallbac
         container: ViewGroup?,
         savedInstanceState: Bundle?
     ): View {
-        binding = DataBindingUtil.inflate(inflater, R.layout.fragment_map, container, false)
+        _binding = DataBindingUtil.inflate(inflater, R.layout.fragment_map, container, false)
         println(binding.detailView.sourceButton)
-        binding.lifecycleOwner = this
+        binding.lifecycleOwner = viewLifecycleOwner
         binding.vm = vm
 
         val provider = prefs.mapProvider
@@ -221,16 +223,12 @@ class MapFragment : Fragment(), OnMapReadyCallback, MapsActivity.FragmentCallbac
             mapFragment =
                 childFragmentManager.findFragmentByTag(mapFragmentTag) as MapFragment?
         }
-        if (mapFragment == null || mapFragment!!.priority[0] != provider) {
+        if (mapFragment == null || mapFragment!!.priority[0] != getMapProvider(provider)) {
             mapFragment = MapFragment()
             mapFragment!!.priority = arrayOf(
-                when (provider) {
-                    "mapbox" -> MapFragment.MAPLIBRE
-                    "google" -> MapFragment.GOOGLE
-                    else -> null
-                },
-                MapFragment.GOOGLE,
-                MapFragment.MAPLIBRE
+                getMapProvider(provider),
+                MapFactory.GOOGLE,
+                MapFactory.MAPLIBRE
             )
             childFragmentManager
                 .beginTransaction()
@@ -293,10 +291,20 @@ class MapFragment : Fragment(), OnMapReadyCallback, MapsActivity.FragmentCallbac
         return binding.root
     }
 
+    private fun getMapProvider(provider: String) = when (provider) {
+        "mapbox" -> MapFactory.MAPLIBRE
+        "google" -> MapFactory.GOOGLE
+        else -> null
+    }
+
     val bottomSheetCollapsible
         get() = resources.getBoolean(R.bool.bottom_sheet_collapsible)
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        if (!prefs.welcomeDialogShown || !prefs.dataSourceSet || !prefs.privacyAccepted) {
+            findNavController().navigate(R.id.onboarding)
+        }
+
         requireActivity().addMenuProvider(this, viewLifecycleOwner, Lifecycle.State.RESUMED)
 
         mapFragment!!.getMapAsync(this)
@@ -358,9 +366,11 @@ class MapFragment : Fragment(), OnMapReadyCallback, MapsActivity.FragmentCallbac
 
             binding.appLogo.root.animate().alpha(1f)
                 .withEndAction {
+                    if (_binding == null) return@withEndAction
                     binding.appLogo.root.animate().alpha(0f).apply {
                         startDelay = 1000
                     }.withEndAction {
+                        if (_binding == null) return@withEndAction
                         binding.appLogo.root.visibility = View.GONE
                         binding.search.visibility = View.VISIBLE
                         binding.search.alpha = 0f
@@ -384,9 +394,6 @@ class MapFragment : Fragment(), OnMapReadyCallback, MapsActivity.FragmentCallbac
 
     override fun onResume() {
         super.onResume()
-        val hostActivity = activity as? MapsActivity ?: return
-        hostActivity.fragmentCallback = this
-
         vm.reloadPrefs()
         if (requestingLocationUpdates && requireContext().checkAnyLocationPermission()
         ) {
@@ -418,7 +425,7 @@ class MapFragment : Fragment(), OnMapReadyCallback, MapsActivity.FragmentCallbac
             val charger = vm.charger.value?.data
             if (charger != null) {
                 if (lifecycle.currentState.isAtLeast(Lifecycle.State.STARTED)) {
-                    (requireActivity() as MapsActivity).navigateTo(charger)
+                    (requireActivity() as MapsActivity).navigateTo(charger, binding.root)
                 }
             }
         }
@@ -431,7 +438,7 @@ class MapFragment : Fragment(), OnMapReadyCallback, MapsActivity.FragmentCallbac
         binding.detailView.sourceButton.setOnClickListener {
             val charger = vm.charger.value?.data
             if (charger != null) {
-                (activity as? MapsActivity)?.openUrl(charger.url)
+                (activity as? MapsActivity)?.openUrl(charger.url, binding.root)
             }
         }
         binding.detailView.btnChargeprice.setOnClickListener {
@@ -444,12 +451,16 @@ class MapFragment : Fragment(), OnMapReadyCallback, MapsActivity.FragmentCallbac
                     extras
                 )
             } else {
-                (activity as? MapsActivity)?.openUrl(ChargepriceApi.getPoiUrl(charger), false)
+                (activity as? MapsActivity)?.openUrl(
+                    ChargepriceApi.getPoiUrl(charger),
+                    binding.root,
+                    false
+                )
             }
         }
         binding.detailView.btnChargerWebsite.setOnClickListener {
             val charger = vm.charger.value?.data ?: return@setOnClickListener
-            charger.chargerUrl?.let { (activity as? MapsActivity)?.openUrl(it) }
+            charger.chargerUrl?.let { (activity as? MapsActivity)?.openUrl(it, binding.root) }
         }
         binding.detailView.btnLogin.setOnClickListener {
             findNavController().safeNavigate(
@@ -457,7 +468,7 @@ class MapFragment : Fragment(), OnMapReadyCallback, MapsActivity.FragmentCallbac
             )
         }
         binding.detailView.imgPredictionSource.setOnClickListener {
-            (activity as? MapsActivity)?.openUrl(getString(R.string.fronyx_url))
+            (activity as? MapsActivity)?.openUrl(getString(R.string.fronyx_url), binding.root)
         }
         binding.detailView.btnPredictionHelp.setOnClickListener {
             MaterialAlertDialogBuilder(requireContext())
@@ -497,7 +508,7 @@ class MapFragment : Fragment(), OnMapReadyCallback, MapsActivity.FragmentCallbac
                 R.id.menu_edit -> {
                     val charger = vm.charger.value?.data
                     if (charger?.editUrl != null) {
-                        (activity as? MapsActivity)?.openUrl(charger.editUrl)
+                        (activity as? MapsActivity)?.openUrl(charger.editUrl, binding.root)
                         if (vm.apiId.value == "goingelectric") {
                             // instructions specific to GoingElectric
                             Toast.makeText(
@@ -913,10 +924,10 @@ class MapFragment : Fragment(), OnMapReadyCallback, MapsActivity.FragmentCallbac
                     if (charger != null) {
                         when (it.icon) {
                             R.drawable.ic_location, R.drawable.ic_address -> {
-                                (activity as? MapsActivity)?.showLocation(charger)
+                                (activity as? MapsActivity)?.showLocation(charger, binding.root)
                             }
                             R.drawable.ic_fault_report -> {
-                                (activity as? MapsActivity)?.openUrl(charger.url)
+                                (activity as? MapsActivity)?.openUrl(charger.url, binding.root)
                             }
 
                             R.drawable.ic_payment -> {
@@ -924,7 +935,12 @@ class MapFragment : Fragment(), OnMapReadyCallback, MapsActivity.FragmentCallbac
                             }
 
                             R.drawable.ic_network -> {
-                                charger.networkUrl?.let { (activity as? MapsActivity)?.openUrl(it) }
+                                charger.networkUrl?.let {
+                                    (activity as? MapsActivity)?.openUrl(
+                                        it,
+                                        binding.root
+                                    )
+                                }
                             }
                         }
                     }
@@ -1043,7 +1059,7 @@ class MapFragment : Fragment(), OnMapReadyCallback, MapsActivity.FragmentCallbac
             .setTitle(R.string.charge_cards)
             .setItems(names.toTypedArray()) { _, i ->
                 val card = data[i]
-                (activity as? MapsActivity)?.openUrl("https:${card.url}")
+                (activity as? MapsActivity)?.openUrl("https:${card.url}", binding.root)
             }.show()
     }
 
@@ -1051,12 +1067,14 @@ class MapFragment : Fragment(), OnMapReadyCallback, MapsActivity.FragmentCallbac
         this.map = map
         vm.mapProjection = map.projection
         val context = this.context ?: return
+        view ?: return
+
         chargerIconGenerator = ChargerIconGenerator(context, map.bitmapDescriptorFactory)
 
         vm.mapTrafficSupported.value =
             mapFragment?.let { AnyMap.Feature.TRAFFIC_LAYER in it.supportedFeatures } ?: false
 
-        if (BuildConfig.FLAVOR.contains("google") && mapFragment!!.priority[0] == MapFragment.GOOGLE) {
+        if (BuildConfig.FLAVOR.contains("google") && mapFragment!!.priority[0] == MapFactory.GOOGLE) {
             // Google Maps: icons can be generated in background thread
             lifecycleScope.launch {
                 withContext(Dispatchers.Default) {
@@ -1107,7 +1125,8 @@ class MapFragment : Fragment(), OnMapReadyCallback, MapsActivity.FragmentCallbac
             }
         }
         vm.mapPosition.observe(viewLifecycleOwner) {
-            binding.scaleView.update(map.cameraPosition.zoom, map.cameraPosition.target.latitude)
+            val target = map.cameraPosition.target ?: return@observe
+            binding.scaleView.update(map.cameraPosition.zoom, target.latitude)
         }
 
         map.setOnCameraMoveStartedListener { reason ->
@@ -1124,6 +1143,7 @@ class MapFragment : Fragment(), OnMapReadyCallback, MapsActivity.FragmentCallbac
             }
         }
         map.setOnMarkerClickListener { marker ->
+            val map = this@MapFragment.map ?: return@setOnMarkerClickListener false
             when (marker) {
                 in markers -> {
                     vm.chargerSparse.value = markers[marker]
@@ -1530,10 +1550,6 @@ class MapFragment : Fragment(), OnMapReadyCallback, MapsActivity.FragmentCallbac
         else -> false
     }
 
-    override fun getRootView(): View {
-        return binding.root
-    }
-
     @RequiresPermission(anyOf = [ACCESS_FINE_LOCATION, ACCESS_COARSE_LOCATION])
     private fun requestLocationUpdates() {
         locationEngine.requestLocationUpdates(
@@ -1583,8 +1599,19 @@ class MapFragment : Fragment(), OnMapReadyCallback, MapsActivity.FragmentCallbac
         }
     }
 
-    override fun onDestroy() {
-        super.onDestroy()
+    override fun onDestroyView() {
+        super.onDestroyView()
+        detailsDialog.onDestroy()
+        vm.mapProjection = null
+
+        map = null
+        mapFragment = null
+        _binding = null
+        vm.mapProjection = null
+        markers.clear()
+        clusterMarkers = emptyList()
+        searchResultMarker = null
+        searchResultIcon = null
         /* 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/AboutFragment.kt

@@ -78,22 +78,25 @@ class AboutFragment : PreferenceFragmentCompat() {
             }
 
             "website" -> {
-                (activity as? MapsActivity)?.openUrl(getString(R.string.website_url))
+                (activity as? MapsActivity)?.openUrl(getString(R.string.website_url), requireView())
                 true
             }
 
             "github_link" -> {
-                (activity as? MapsActivity)?.openUrl(getString(R.string.github_link))
+                (activity as? MapsActivity)?.openUrl(getString(R.string.github_link), requireView())
                 true
             }
 
             "privacy" -> {
-                (activity as? MapsActivity)?.openUrl(getString(R.string.privacy_link))
+                (activity as? MapsActivity)?.openUrl(
+                    getString(R.string.privacy_link),
+                    requireView()
+                )
                 true
             }
 
             "faq" -> {
-                (activity as? MapsActivity)?.openUrl(getString(R.string.faq_link))
+                (activity as? MapsActivity)?.openUrl(getString(R.string.faq_link), requireView())
                 true
             }
             "oss_licenses" -> {
@@ -115,12 +118,29 @@ class AboutFragment : PreferenceFragmentCompat() {
                 findNavController().safeNavigate(AboutFragmentDirections.actionAboutToGithubSponsors())
                 true
             }
+            "mastodon" -> {
+                (activity as? MapsActivity)?.openUrl(
+                    getString(R.string.mastodon_url),
+                    requireView()
+                )
+                true
+            }
             "twitter" -> {
-                (activity as? MapsActivity)?.openUrl(getString(R.string.twitter_url))
+                (activity as? MapsActivity)?.openUrl(getString(R.string.twitter_url), requireView())
                 true
             }
             "goingelectric" -> {
-                (activity as? MapsActivity)?.openUrl(getString(R.string.goingelectric_forum_url))
+                (activity as? MapsActivity)?.openUrl(
+                    getString(R.string.goingelectric_forum_url),
+                    requireView()
+                )
+                true
+            }
+            "tffforum" -> {
+                (activity as? MapsActivity)?.openUrl(
+                    getString(R.string.tff_forum_url),
+                    requireView()
+                )
                 true
             }
             else -> super.onPreferenceTreeClick(preference)

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

@@ -8,7 +8,9 @@ import android.text.style.RelativeSizeSpan
 import android.view.View
 import androidx.fragment.app.viewModels
 import androidx.preference.CheckBoxPreference
+import androidx.preference.ListPreference
 import net.vonforst.evmap.R
+import net.vonforst.evmap.currencyDisplayName
 import net.vonforst.evmap.ui.MultiSelectDialogPreference
 import net.vonforst.evmap.viewmodel.SettingsViewModel
 import net.vonforst.evmap.viewmodel.viewModelFactory
@@ -73,6 +75,11 @@ class ChargepriceSettingsFragment : BaseSettingsFragment() {
             }
         }
         updateNativeIntegrationState()
+
+        val currencyPreference = findPreference<ListPreference>("chargeprice_currency")!!
+        currencyPreference.entries = currencyPreference.entryValues.map {
+            currencyDisplayName(it.toString()).replaceFirstChar { it.uppercase() }
+        }.toTypedArray()
     }
 
     private fun updateNativeIntegrationState() {

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

@@ -9,9 +9,11 @@ import android.provider.Settings
 import androidx.preference.CheckBoxPreference
 import androidx.preference.ListPreference
 import androidx.preference.Preference
+import com.github.erfansn.localeconfigx.configuredLocales
 import net.vonforst.evmap.R
 import net.vonforst.evmap.isAppInstalled
 import net.vonforst.evmap.ui.getAppLocale
+import net.vonforst.evmap.ui.map
 import net.vonforst.evmap.ui.updateAppLocale
 import net.vonforst.evmap.ui.updateNightMode
 
@@ -23,11 +25,7 @@ class UiSettingsFragment : BaseSettingsFragment() {
     override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
         setPreferencesFromResource(R.xml.settings_ui, rootKey)
 
-        langPref = findPreference("language")!!
-        langPref.setOnPreferenceChangeListener { _, newValue ->
-            updateAppLocale(newValue as String)
-            true
-        }
+        setupLangPref()
 
         val appLinkPref = findPreference<Preference>("applink_associate")!!
         appLinkPref.isVisible = Build.VERSION.SDK_INT >= Build.VERSION_CODES.S
@@ -36,6 +34,31 @@ class UiSettingsFragment : BaseSettingsFragment() {
         immediateNavPref.isVisible = isGoogleMapsInstalled()
     }
 
+    private fun setupLangPref() {
+        langPref = findPreference("language")!!
+        val configuredLocales = requireContext().configuredLocales
+        val numLocalesByLang = configuredLocales.map { it.language }.groupingBy { it }.eachCount()
+
+        val localeNames = configuredLocales.map {
+            val name = if (numLocalesByLang[it.language]!! > 1) {
+                it.getDisplayName(it)
+            } else {
+                it.getDisplayLanguage(it)
+            }
+            name.replaceFirstChar { c -> c.uppercase(it) }
+        }
+        val localeTags = configuredLocales.map { it.toLanguageTag() }
+
+        langPref.entries =
+            (listOf(getString(R.string.pref_language_device_default)) + localeNames).toTypedArray()
+        langPref.entryValues =
+            (listOf("default") + localeTags).toTypedArray()
+        langPref.setOnPreferenceChangeListener { _, newValue ->
+            updateAppLocale(newValue as String)
+            true
+        }
+    }
+
     private fun isGoogleMapsInstalled() =
         requireContext().packageManager.isAppInstalled("com.google.android.apps.maps")
 

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

@@ -3,8 +3,9 @@ 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 com.github.erfansn.localeconfigx.configuredLocales
 import net.vonforst.evmap.storage.PreferenceDataSource
+import java.util.Locale
 
 
 fun updateNightMode(prefs: PreferenceDataSource) {
@@ -33,8 +34,11 @@ fun getAppLocale(context: Context): String? {
         "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()
+        val choices = context.configuredLocales
+        choices.getFirstMatch(arr)?.toLanguageTag()
     }
 }
+
+inline fun <R> LocaleListCompat.map(transform: (Locale) -> R): List<R> = List(size()) {
+    transform(get(it)!!)
+}

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

@@ -27,7 +27,6 @@ import net.vonforst.evmap.api.availability.ChargeLocationStatus
 import net.vonforst.evmap.api.availability.tesla.Pricing
 import net.vonforst.evmap.api.createApi
 import net.vonforst.evmap.api.fronyx.PredictionData
-import net.vonforst.evmap.api.fronyx.PredictionRepository
 import net.vonforst.evmap.api.goingelectric.GEChargepoint
 import net.vonforst.evmap.api.openchargemap.OCMConnection
 import net.vonforst.evmap.api.openchargemap.OCMReferenceData
@@ -266,13 +265,14 @@ class MapViewModel(application: Application, private val state: SavedStateHandle
         it.data?.extraData as? Pricing
     }
 
-    private val predictionRepository = PredictionRepository(application)
+    //private val predictionRepository = PredictionRepository(application)
 
     val predictionData: LiveData<PredictionData> = availability.switchMap { av ->
-        liveData {
+        /*liveData {
             val charger = charger.value?.data ?: return@liveData
             emit(predictionRepository.getPredictionData(charger, av.data, filteredConnectors.value))
-        }
+        }*/
+        MutableLiveData()
     }
 
     val myLocationEnabled: MutableLiveData<Boolean> by lazy {

app/src/main/res/layout-sw720dp/fragment_onboarding_android_auto.xml

@@ -59,8 +59,6 @@
         app:layout_constraintBottom_toTopOf="@+id/welcomeTitle"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintVertical_bias="0.7"
         app:srcCompat="@drawable/android_auto" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>

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

@@ -8,7 +8,8 @@
     android:layout_marginStart="16dp"
     android:layout_marginTop="16dp"
     android:layout_marginEnd="16dp"
-    android:layout_marginBottom="16dp">
+    android:layout_marginBottom="16dp"
+    tools:ignore="WebViewLayout">
 
     <TextView
         android:id="@+id/textView20"
@@ -18,76 +19,27 @@
         android:text="@string/referrals"
         android:textAppearance="@style/TextAppearance.Material3.TitleSmall"
         android:textColor="?colorPrimary"
-        app:layout_constraintBottom_toTopOf="@+id/textView21"
+        app:layout_constraintBottom_toTopOf="@+id/referralWebView"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintVertical_chainStyle="packed" />
+        app:layout_constraintTop_toTopOf="parent" />
 
     <TextView
         android:id="@+id/textView21"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginBottom="8dp"
         android:text="@string/referrals_info"
-        app:layout_constraintBottom_toTopOf="@+id/referral_tesla"
-        app:layout_constraintStart_toStartOf="@+id/textView20"
-        app:layout_constraintTop_toBottomOf="@+id/textView20" />
-
-    <androidx.constraintlayout.helper.widget.Flow
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:orientation="horizontal"
-        app:constraint_referenced_ids="referral_tesla,referral_juicify,referral_geldfuereauto,referral_maingau,referral_eprimo,referral_ewieeinfach"
-        app:flow_horizontalGap="16dp"
-        app:flow_horizontalStyle="packed"
-        app:flow_verticalAlign="baseline"
-        app:flow_wrapMode="chain"
+        app:layout_constraintBottom_toTopOf="@+id/referralWebView"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/textView21" />
+        app:layout_constraintTop_toBottomOf="@+id/textView20" />
 
-    <Button
-        android:id="@+id/referral_tesla"
-        style="@style/Widget.Material3.Button.TonalButton"
-        android:layout_width="wrap_content"
+    <WebView
+        android:id="@+id/referralWebView"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:text="@string/referral_tesla"
-        android:visibility="gone"
-        app:icon="@drawable/ic_tesla" />
-
-    <Button
-        android:id="@+id/referral_juicify"
-        style="@style/Widget.Material3.Button.TonalButton"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="@string/referral_juicify" />
-
-    <Button
-        android:id="@+id/referral_geldfuereauto"
-        style="@style/Widget.Material3.Button.TonalButton"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="@string/referral_geldfuereauto" />
-
-    <Button
-        android:id="@+id/referral_maingau"
-        style="@style/Widget.Material3.Button.TonalButton"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="@string/referral_maingau" />
-
-    <Button
-        android:id="@+id/referral_eprimo"
-        style="@style/Widget.Material3.Button.TonalButton"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="@string/referral_eprimo" />
-
-    <Button
-        android:id="@+id/referral_ewieeinfach"
-        style="@style/Widget.Material3.Button.TonalButton"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="@string/referral_ewieeinfach" />
+        android:layout_marginTop="8dp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/textView21" />
 </androidx.constraintlayout.widget.ConstraintLayout>

app/src/main/res/navigation/nav_graph.xml

@@ -2,6 +2,7 @@
 <navigation xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
+    app:startDestination="@id/map"
     android:id="@+id/nav_graph">
 
     <navigation

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

@@ -3,14 +3,14 @@
     <string name="no_browser_app_found">Nejprve si nainstalujte webový prohlížeč</string>
     <string name="address">Adresa</string>
     <string name="hours">Otevírací doba</string>
-    <string name="open_247"><b>Otevřeno 24/7</b></string>
-    <string name="closed"><b>Zavřeno</b></string>
-    <string name="open_closesat"><b>Otevřeno</b> · Zavírá v %s</string>
-    <string name="closed_opensat"><b>Zavřeno</b> · Otevírá v %s</string>
+    <string name="open_247"><![CDATA[<b>Otevřeno 24/7</b>]]></string>
+    <string name="closed"><![CDATA[<b>Zavřeno</b>]]></string>
+    <string name="open_closesat"><![CDATA[<b>Otevřeno</b> · Zavírá v %s]]></string>
+    <string name="closed_opensat"><![CDATA[<b>Zavřeno</b> · Otevírá v %s]]></string>
     <string name="cost">Cena</string>
-    <string name="cost_detail"><b>Nabíjení:</b> %1$s · <b>Parkování:</b> %2$s</string>
-    <string name="cost_detail_charging"><b>%s nabíjení</b></string>
-    <string name="cost_detail_parking"><b>%s parkování</b></string>
+    <string name="cost_detail"><![CDATA[<b>Nabíjení:</b> %1$s · <b>Parkování:</b> %2$s]]></string>
+    <string name="cost_detail_charging"><![CDATA[<b>%s nabíjení</b>]]></string>
+    <string name="cost_detail_parking"><![CDATA[<b>%s parkování</b>]]></string>
     <string name="charging_free">Bezplatné</string>
     <string name="charging_paid">Placené</string>
     <string name="parking_free">Bezplatné</string>
@@ -177,7 +177,7 @@
     <string name="crash_report_comment_prompt">Níže můžete přidat komentář:</string>
     <string name="powered_by_mapbox">používá službu Mapbox</string>
     <string name="pref_search_provider">Poskytovatel vyhledávání</string>
-    <string name="pref_search_provider_info">Načtení dat pro vyhledávání bývá drahé, obzvláště z Map Google. Zvažte prosím poslání finančního daru v nabídce „O aplikaci“ → „Přispět“.</string>
+    <string name="pref_search_provider_info"><![CDATA[Načtení dat pro vyhledávání bývá drahé, obzvláště z Map Google. Zvažte prosím poslání finančního daru v nabídce „O aplikaci“ → „Přispět“.]]></string>
     <string name="github_sponsors">GitHub Sponsors</string>
     <string name="donate_desc">Podpořte vývoj aplikace EVMap jednorázovým darem</string>
     <string name="github_sponsors_desc">Podpořte EVMap ve službě GitHub Sponsors</string>
@@ -199,8 +199,6 @@
     <string name="autocomplete_connection_error">Nepodařilo se načíst návrhy</string>
     <string name="pref_language_device_default">Podle zařízení</string>
     <string name="pref_darkmode_device_default">Podle zařízení</string>
-    <string name="pref_chargeprice_currency_sek">Švédská koruna (SEK)</string>
-    <string name="pref_chargeprice_currency_usd">Americký dolar (USD)</string>
     <string name="pref_provider_google_maps">Mapy Google</string>
     <string name="pref_provider_osm_mapbox">OpenStreetMap (Mapbox)</string>
     <string name="about_contributors">Přispěvatelé</string>
@@ -283,7 +281,7 @@
     <string name="loading">Načítání…</string>
     <string name="auto_multipage_goto">Stránka %d</string>
     <string name="reload">Obnovit</string>
-    <string name="accept_privacy"><![CDATA[Přečetl/a jsem si a souhlasím se <a href="%s">zásadami ochrany osobních údajů</a> aplikace EVMap.]]></string>
+    <string name="accept_privacy"><![CDATA[Přečetl/a jsem si a souhlasím se <a href=\"%s\">zásadami ochrany osobních údajů</a> aplikace EVMap.]]></string>
     <string name="referrals">Referenční odkazy</string>
     <string name="referrals_info">Pro podpoření vývojáře svým nákupem můžete také použít jeden z referenčních odkazů níže.</string>
     <string name="generic_connection_error">Nepodařilo se načíst data</string>
@@ -346,21 +344,11 @@
     <string name="chargeprice_connection_error">Nepodařilo se načíst ceny</string>
     <string name="unknown_operator">Neznámý operátor</string>
     <string name="data_source_goingelectric">GoingElectric.de</string>
-    <string name="data_source_openchargemap_desc">Celosvětové, s různou kvalitou. Popisy jsou v angličtině nebo v místním jazyce. Spravováno komunitou, v některých zemích obsahuje vládní data (např. Severní Amerika, Spojené království, Francie, Norsko).</string>
+    <string name="data_source_openchargemap_desc"><![CDATA[Celosvětové, s různou kvalitou. Popisy jsou v angličtině nebo v místním jazyce. Spravováno komunitou, v některých zemích obsahuje vládní data (např. Severní Amerika, Spojené království, Francie, Norsko).]]></string>
     <string name="privacy_link">https://ev-map.app/privacypolicy/</string>
     <string name="chargeprice_faq_link">https://ev-map.app/faq/#price-comparison-feature</string>
     <string name="pref_darkmode_always_on">vždy zapnut</string>
     <string name="pref_darkmode_always_off">vždy vypnut</string>
-    <string name="pref_chargeprice_currency_chf">Švýcarský frank (CHF)</string>
-    <string name="pref_chargeprice_currency_czk">Česká koruna (CZK)</string>
-    <string name="pref_chargeprice_currency_dkk">Dánská koruna (DKK)</string>
-    <string name="pref_chargeprice_currency_eur">Euro (EUR)</string>
-    <string name="pref_chargeprice_currency_gbp">Britská libra (GBP)</string>
-    <string name="pref_chargeprice_currency_huf">Maďarský forint (HUF)</string>
-    <string name="pref_chargeprice_currency_hrk">Chorvatská kuna (HRK)</string>
-    <string name="pref_chargeprice_currency_isk">Islandská koruna (ISK)</string>
-    <string name="pref_chargeprice_currency_nok">Norská koruna (NOK)</string>
-    <string name="pref_chargeprice_currency_pln">Polský zlotý (PLN)</string>
     <string name="chargeprice_header_other_tariffs">Ostatní plány</string>
     <string name="charger_website">Webové stránky</string>
     <string name="compass">Kompas</string>
@@ -384,4 +372,5 @@
     <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>
+    <string name="filterprofile_name_not_unique">Již existuje profil filtru s tímto názvem</string>
 </resources>

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

@@ -110,7 +110,9 @@
     <string name="and_n_others">und %d weitere</string>
     <string name="pref_map_provider">Kartenanbieter</string>
     <string name="twitter">Twitter</string>
+    <string name="mastodon">Mastodon</string>
     <string name="goingelectric_forum">Forenthread bei GoingElectric.de</string>
+    <string name="tff_forum">Forenthread im TFF-Forum</string>
     <string name="contact">Kontakt</string>
     <string name="menu_report_new_charger">Ladesäule melden</string>
     <string name="edit_at_datasource">Bei %s bearbeiten</string>
@@ -151,6 +153,7 @@
     <string name="delete">Löschen</string>
     <string name="save_as_profile">Als Profil speichern</string>
     <string name="save_profile_enter_name">Gib den Namen des Filterprofils ein:</string>
+    <string name="filterprofile_name_not_unique">Ein Filterprofil mit diesem Namen existiert bereits</string>
     <string name="filterprofiles_empty_state">Du hast keine Filterprofile gespeichert</string>
     <string name="welcome_to_evmap">Willkommen bei EVMap</string>
     <string name="welcome_1">Finde Ladestationen für Elektroautos in deiner Nähe</string>
@@ -232,7 +235,7 @@
     <string name="crash_report_comment_prompt">Du kannst unten noch einen Kommentar hinzufügen:</string>
     <string name="powered_by_mapbox">powered by Mapbox</string>
     <string name="pref_search_provider">Anbieter für Ortssuche</string>
-    <string name="pref_search_provider_info">Die Daten für die Ortssuche, vor allem von Google Maps, sind relativ teuer. Über eine Spende unter \"Über EVMap -&gt; Spenden\" würde ich mich sehr freuen.</string>
+    <string name="pref_search_provider_info"><![CDATA[Die Daten für die Ortssuche, vor allem von Google Maps, sind relativ teuer. Über eine Spende unter „Über EVMap → Spenden“ würde ich mich sehr freuen.]]></string>
     <string name="github_sponsors">GitHub Sponsors</string>
     <string name="donate_desc">Unterstütze die Weiterentwicklung von EVMap mit einer einmaligen Spende</string>
     <string name="github_sponsors_desc">Unterstütze EVMap über GitHub Sponsors</string>
@@ -240,6 +243,7 @@
     <string name="privacy_link">https://ev-map.app/de/privacypolicy/</string>
     <string name="faq_link">https://ev-map.app/de/faq/</string>
     <string name="chargeprice_faq_link">https://ev-map.app/de/faq/#preisvergleichsfunktion</string>
+    <string name="referral_link">https://ev-map.app/de/referrals/</string>
     <string name="required">erforderlich</string>
     <string name="edit_filter_profile">„%s“ bearbeiten</string>
     <string name="pref_search_delete_recent">Suchverlauf löschen</string>
@@ -258,18 +262,6 @@
     <string name="pref_darkmode_device_default">Geräteeinstellung verwenden</string>
     <string name="pref_darkmode_always_on">immer an</string>
     <string name="pref_darkmode_always_off">immer aus</string>
-    <string name="pref_chargeprice_currency_chf">Schweizer Franken (CHF)</string>
-    <string name="pref_chargeprice_currency_czk">Tschechische Krone (CZK)</string>
-    <string name="pref_chargeprice_currency_dkk">Dänische Krone (DKK)</string>
-    <string name="pref_chargeprice_currency_eur">Euro (EUR)</string>
-    <string name="pref_chargeprice_currency_gbp">Britisches Pfund (GBP)</string>
-    <string name="pref_chargeprice_currency_hrk">Kroatische Kuna (HRK)</string>
-    <string name="pref_chargeprice_currency_huf">Ungarischer Forint (HUF)</string>
-    <string name="pref_chargeprice_currency_isk">Isländische Krone (ISK)</string>
-    <string name="pref_chargeprice_currency_nok">Norwegische Krone (NOK)</string>
-    <string name="pref_chargeprice_currency_pln">Polnischer Złoty (PLN)</string>
-    <string name="pref_chargeprice_currency_sek">Schwedische Krone (SEK)</string>
-    <string name="pref_chargeprice_currency_usd">US-Dollar (USD)</string>
     <string name="pref_provider_google_maps">Google Maps</string>
     <string name="pref_provider_osm">OpenStreetMap</string>
     <string name="pref_provider_osm_mapbox">OpenStreetMap (Mapbox)</string>

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

@@ -128,9 +128,6 @@
     <string name="pref_darkmode_device_default">Utiliser le réglage de l\'appareil</string>
     <string name="pref_darkmode_always_on">toujours allumé</string>
     <string name="pref_darkmode_always_off">toujours éteint</string>
-    <string name="pref_chargeprice_currency_czk">Couronne tchèque (CZK)</string>
-    <string name="pref_chargeprice_currency_dkk">Couronne danoise (DKK)</string>
-    <string name="pref_chargeprice_currency_eur">Euro (EUR)</string>
     <string name="show_more">plus…</string>
     <string name="fav_remove">Retirer des favoris</string>
     <string name="amenities">Commodités</string>
@@ -230,9 +227,6 @@
         <item quantity="other">(seront mis en évidence dans la comparaison des prix)</item>
     </plurals>
     <string name="deleted_recent_search_results">Les résultats de recherche récents ont été supprimés</string>
-    <string name="pref_chargeprice_currency_gbp">Livre sterling (GBP)</string>
-    <string name="pref_chargeprice_currency_isk">Couronne islandaise (ISK)</string>
-    <string name="pref_chargeprice_currency_nok">Couronne norvégienne (NOK)</string>
     <string name="settings_charger_data">Stations de recharge</string>
     <string name="got_it">J\'ai compris</string>
     <string name="powered_by_mapbox">propulsé par Mapbox</string>
@@ -246,15 +240,9 @@
     <string name="settings_data_sources">Sources de données</string>
     <string name="data_sources_description">Veuillez choisir une source de données pour les stations de recharge. Vous pourrez la modifier ultérieurement dans les paramètres de l\'application.</string>
     <string name="pref_search_provider_info">Les données pour la recherche de lieux, en particulier celles de Google Maps, sont relativement coûteuses à récupérer. Veuillez envisager de faire un don via \"À propos\" -&gt; \"Faire un don\".</string>
-    <string name="pref_chargeprice_currency_hrk">Kuna croate (HRK)</string>
     <string name="help">Aide</string>
     <string name="pref_chargeprice_allow_unbalanced_load_summary">Autoriser la charge en courant alternatif monophasé de plus de 4,5 kW</string>
-    <string name="pref_chargeprice_currency_huf">Forint hongrois (HUF)</string>
-    <string name="pref_chargeprice_currency_pln">Złoty polonais (PLN)</string>
     <string name="pref_map_rotate_gestures_on">Utilisez deux doigts pour faire pivoter la carte</string>
-    <string name="pref_chargeprice_currency_chf">Franc suisse (CHF)</string>
-    <string name="pref_chargeprice_currency_usd">Dollar américain (USD)</string>
-    <string name="pref_chargeprice_currency_sek">Couronne suédoise (SEK)</string>
     <string name="cost_detail_charging"><b>Recharge %s</b></string>
     <string name="cost_detail_parking"><b>Stationnement %s</b></string>
     <string name="navigate">Naviguer vers</string>

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

@@ -84,10 +84,6 @@
     <string name="got_it">Skjønner</string>
     <string name="settings_data_sources">Datakilder</string>
     <string name="pref_search_delete_recent">Slett nylige søkeresultater</string>
-    <string name="pref_chargeprice_currency_eur">Euro (EUR)</string>
-    <string name="pref_chargeprice_currency_nok">Norske kroner (NOK)</string>
-    <string name="pref_chargeprice_currency_gbp">Britiske pund (GBP)</string>
-    <string name="pref_chargeprice_currency_sek">Svenske kroner (SEK)</string>
     <string name="realtime_data_loading">Sjekker sanntidsstatus …</string>
     <string name="realtime_data_source">Kilde for sanntidsstatus (beta): %s</string>
     <string name="realtime_data_unavailable">Sanntidsstatus utilgjengelig</string>
@@ -183,16 +179,9 @@
     <string name="deleted_recent_search_results">Nylige søkeresultater slettet</string>
     <string name="autocomplete_connection_error">Kunne ikke laste inn forslag</string>
     <string name="pref_language_device_default">Enhetsforvalg</string>
-    <string name="pref_chargeprice_currency_chf">Sveitserfranc (CHF)</string>
-    <string name="pref_chargeprice_currency_czk">Tsjekkiske kroner (CZK)</string>
-    <string name="pref_chargeprice_currency_dkk">Danske kroner (DKK)</string>
-    <string name="pref_chargeprice_currency_hrk">Kroatiske kroner (HRK)</string>
     <string name="pref_map_rotate_gestures_on">Bruk to fingre for å rotere kartet</string>
     <string name="pref_map_rotate_gestures_off">Rotasjon avslått (nord er alltid oppover)</string>
     <string name="refresh_live_data">oppdater sanntidsstatus</string>
-    <string name="pref_chargeprice_currency_isk">Islandske kroner (ISK)</string>
-    <string name="pref_chargeprice_currency_pln">Polske zloty (PLN)</string>
-    <string name="pref_chargeprice_currency_usd">Amerikanske dollar (USD)</string>
     <string name="filters_deactivated">Filtre deaktivert</string>
     <string name="pref_navigate_use_maps_off">Navigasjonsknapp åpner kartprogrammet med laderposisjon</string>
     <string name="show_more">flere …</string>
@@ -217,7 +206,6 @@
     <string name="filter_exclude_faults">Utelat ladere med rapporterte feil</string>
     <string name="plug_cee_blau">CEE blå</string>
     <string name="filter_open_247">Døgnåpent</string>
-    <string name="pref_chargeprice_currency_huf">Ungarske forint (HUF)</string>
     <string name="donation_dialog_detail">EVMap er fri programvare. Kodebidrag mottas med takk. Overvei å gi din støtte gjennom GitHub-sponsorer for å dekke løpende utgifter.</string>
     <string name="pref_chargeprice_allow_unbalanced_load_summary">Tillat enfaselading over 4.5 kW</string>
     <string name="connectors">Tilkobling</string>

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

@@ -5,7 +5,6 @@
     <string name="pref_search_provider_info">Gegevens opzoeken is duur, vooral via Google Maps. Overweeg aub om een donatie te doen via “Over” -&gt; “Doneer”.</string>
     <string name="data_source_openchargemap_desc">Werelddekkend, met variabele kwaliteit. Beschrijving in Engels of lokale taal. Onderhouden door de gebruikers. Ook open overheidswege eens in sommige landen (bv. Noord-Amerika, UK, Frankrijk, Noorwegen).</string>
     <string name="pref_darkmode_always_off">altijd uit</string>
-    <string name="pref_chargeprice_currency_eur">Euro (EUR)</string>
     <string name="chargeprice_select_car_first">Kiest eerst je voertuig model in de instellingen</string>
     <string name="chargeprice_no_compatible_connectors">Geen compatibele connectoren aan dit laadstation</string>
     <string name="license">Licentie</string>
@@ -228,17 +227,6 @@
     <string name="pref_language_device_default">Standaardtaal van toestel</string>
     <string name="pref_darkmode_device_default">Standaardinstelling van toestel</string>
     <string name="pref_darkmode_always_on">altijd aan</string>
-    <string name="pref_chargeprice_currency_chf">Zwitserse Frank (CHF)</string>
-    <string name="pref_chargeprice_currency_czk">Tsjechische koruna (CZK)</string>
-    <string name="pref_chargeprice_currency_dkk">Deense kroon (DKK)</string>
-    <string name="pref_chargeprice_currency_gbp">Britse Pond (GBP)</string>
-    <string name="pref_chargeprice_currency_hrk">Kroatische Kuna (HRK)</string>
-    <string name="pref_chargeprice_currency_huf">Hongaarse Forint (HUF)</string>
-    <string name="pref_chargeprice_currency_isk">IJslandse Kroon (ISK)</string>
-    <string name="pref_chargeprice_currency_nok">Noorse Kroon (NOK)</string>
-    <string name="pref_chargeprice_currency_pln">Poolse Złoty (PLN)</string>
-    <string name="pref_chargeprice_currency_sek">Zweedse Kroon (SEK)</string>
-    <string name="pref_chargeprice_currency_usd">Amerikaanse Dollar (USD)</string>
     <string name="pref_provider_google_maps">Google Maps</string>
     <string name="edit_filter_profile">“%s” editeren</string>
     <string name="compass">Kompas</string>

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

@@ -148,7 +148,7 @@
     <string name="pref_data_source">Fonte da informação</string>
     <string name="data_source_openchargemap">Open Charge Map</string>
     <string name="next">próximo</string>
-    <string name="data_source_openchargemap_desc">Mundial, com vários níveis de qualidade. Descrições em inglês ou língua local. Mantido pela comunidade e usa informação governamental publica em alguns países (ex: América do Norte, Reino Unido, França, Noruega, etc).</string>
+    <string name="data_source_openchargemap_desc"><![CDATA[Mundial, com vários níveis de qualidade. Descrições em inglês ou língua local. Mantido pela comunidade e usa informação governamental publica em alguns países (ex: América do Norte, Reino Unido, França, Noruega, etc).]]></string>
     <string name="get_started">Começar</string>
     <string name="lets_go">Vamos lá</string>
     <string name="crash_report_text">O EVMap encontrou um problema. Por favor envie um relatório do erro para o criador da app.</string>
@@ -160,7 +160,7 @@
     <string name="pref_map_rotate_gestures_on">Use dois dedos para girar o mapa</string>
     <string name="pref_map_rotate_gestures_off">Rotação desligada (norte sempre para cima)</string>
     <string name="refresh_live_data">atualizar estado em tempo real</string>
-    <string name="pref_search_provider_info">As pesquisas são caras, especialmente se o Google Maps for utilizado. Por favor considere doar através de \"Sobre\" → \"Doar\".</string>
+    <string name="pref_search_provider_info"><![CDATA[As pesquisas são caras, especialmente quando o Google Maps é utilizado. Por favor considere doar através de "Sobre" → "Doar".]]></string>
     <string name="github_sponsors_desc">Apoie o EVMap através do GitHub</string>
     <string name="unnamed_filter_profile">Filtro sem nome</string>
     <string name="deleted_recent_search_results">As pesquisas recentes foram eliminadas</string>
@@ -177,11 +177,6 @@
     <string name="pref_language_device_default">Língua do dispositivo</string>
     <string name="pref_darkmode_device_default">Padrão do dispositivo</string>
     <string name="pref_darkmode_always_on">Sempre ligado</string>
-    <string name="pref_chargeprice_currency_chf">Franco suíço (CHF)</string>
-    <string name="pref_chargeprice_currency_czk">Coroa checa (CZK)</string>
-    <string name="pref_chargeprice_currency_dkk">Coroa dinamarquesa (DKK)</string>
-    <string name="pref_chargeprice_currency_eur">Euro (EUR)</string>
-    <string name="pref_chargeprice_currency_gbp">Libra esterlina (GBP)</string>
     <string name="chargeprice_header_my_tariffs">Os meus planos</string>
     <string name="chargeprice_header_other_tariffs">Outros planos</string>
     <string name="developer_options">Opções de desenvolvedor</string>
@@ -210,18 +205,18 @@
     <string name="operator">Operador</string>
     <string name="network">Rede</string>
     <string name="hours">Horário de abertura</string>
-    <string name="open_247"><b>Aberto 24/7</b></string>
-    <string name="closed"><b>Fechado</b></string>
-    <string name="open_closesat"><b>Aberto</b> · Fecha às %s</string>
-    <string name="closed_opensat"><b>Fechado</b> · Abre às %s</string>
+    <string name="open_247"><![CDATA[<b>Aberto 24/7</b>]]></string>
+    <string name="closed"><![CDATA[<b>Fechado</b>]]></string>
+    <string name="open_closesat"><![CDATA[<b>Aberto</b> · Fecha às %s]]></string>
+    <string name="closed_opensat"><![CDATA[<b>Fechado</b> · Abre às %s]]></string>
     <string name="app_name">EVMap</string>
     <string name="title_activity_maps">EVMap</string>
     <string name="closed_unfmt">Fechado</string>
     <string name="holiday">Feriado</string>
     <string name="cost">Custo</string>
-    <string name="cost_detail"><b>Carregamento:</b> %1$s · <b>Parque:</b> %2$s</string>
-    <string name="cost_detail_charging"><b>Carregamento %s</b></string>
-    <string name="cost_detail_parking"><b>Parque %s</b></string>
+    <string name="cost_detail"><![CDATA[<b>Carregamento:</b> %1$s · <b>Parque:</b> %2$s]]></string>
+    <string name="cost_detail_charging"><![CDATA[<b>Carregamento %s</b>]]></string>
+    <string name="cost_detail_parking"><![CDATA[<b>Parque %s</b>]]></string>
     <string name="charging_free">Gratuito</string>
     <string name="charging_paid">Pago</string>
     <string name="parking_free">Gratuito</string>
@@ -287,13 +282,6 @@
     <string name="welcome_1">Encontre carregadores elétricos perto de si</string>
     <string name="close">Fechar</string>
     <string name="edit_filter_profile">Editar “%s”</string>
-    <string name="pref_chargeprice_currency_hrk">Cuna croata (HRK)</string>
-    <string name="pref_chargeprice_currency_huf">Florim húngaro (HUF)</string>
-    <string name="pref_chargeprice_currency_isk">Coroa islandesa (ISK)</string>
-    <string name="pref_chargeprice_currency_nok">Coroa norueguesa (NOK)</string>
-    <string name="pref_chargeprice_currency_pln">Złoty polaco (PLN)</string>
-    <string name="pref_chargeprice_currency_sek">Coroa sueca (SEK)</string>
-    <string name="pref_chargeprice_currency_usd">Dólar americano (USD)</string>
     <string name="pref_provider_google_maps">Google Maps</string>
     <string name="pref_provider_osm_mapbox">OpenStreetMap (Mapbox)</string>
     <string name="about_contributors">Contribuidores</string>
@@ -384,4 +372,5 @@
     <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>
+    <string name="filterprofile_name_not_unique">Já existe um filtro com este nome</string>
 </resources>

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

@@ -259,18 +259,6 @@
     <string name="pref_darkmode_device_default">Implicit dispozitiv</string>
     <string name="pref_darkmode_always_on">permanent</string>
     <string name="pref_darkmode_always_off">dezactivat</string>
-    <string name="pref_chargeprice_currency_chf">Franci elvetieni (CHF)</string>
-    <string name="pref_chargeprice_currency_czk">Coroane cehe (CZK)</string>
-    <string name="pref_chargeprice_currency_dkk">Coroane daneze (DKK)</string>
-    <string name="pref_chargeprice_currency_eur">Euro (EUR)</string>
-    <string name="pref_chargeprice_currency_gbp">Lire sterline (GBP)</string>
-    <string name="pref_chargeprice_currency_hrk">Croatian kuna (HRK)</string>
-    <string name="pref_chargeprice_currency_huf">Forinti maghiari (HUF)</string>
-    <string name="pref_chargeprice_currency_isk">Coroane islandeze (ISK)</string>
-    <string name="pref_chargeprice_currency_nok">Coroane norvegiene (NOK)</string>
-    <string name="pref_chargeprice_currency_pln">Zloti polonezi (PLN)</string>
-    <string name="pref_chargeprice_currency_sek">Coroane suedeze (SEK)</string>
-    <string name="pref_chargeprice_currency_usd">Dolari americani (USD)</string>
     <string name="pref_provider_google_maps">Google Maps</string>
     <string name="pref_provider_osm_mapbox">OpenStreetMap (Mapbox)</string>
     <string name="about_contributors">Contribuitori</string>

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

@@ -1,27 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string-array name="pref_language_names">
-        <item>@string/pref_language_device_default</item>
-        <item>@string/pref_language_en</item>
-        <item>@string/pref_language_de</item>
-        <item>@string/pref_language_cs</item>
-        <item>@string/pref_language_fr</item>
-        <item>@string/pref_language_nb_rNO</item>
-        <item>@string/pref_language_nl</item>
-        <item>@string/pref_language_pt</item>
-        <item>@string/pref_language_ro</item>
-    </string-array>
-    <string-array name="pref_language_values" translatable="false">
-        <item>default</item>
-        <item>en</item>
-        <item>de</item>
-        <item>cs</item>
-        <item>fr</item>
-        <item>nb-NO</item>
-        <item>nl</item>
-        <item>pt</item>
-        <item>ro</item>
-    </string-array>
     <string-array name="pref_darkmode_names">
         <item>@string/pref_darkmode_device_default</item>
         <item>@string/pref_darkmode_always_on</item>
@@ -32,21 +10,7 @@
         <item>on</item>
         <item>off</item>
     </string-array>
-    <string-array name="pref_chargeprice_currency_names">
-        <item>@string/pref_chargeprice_currency_chf</item>
-        <item>@string/pref_chargeprice_currency_czk</item>
-        <item>@string/pref_chargeprice_currency_dkk</item>
-        <item>@string/pref_chargeprice_currency_eur</item>
-        <item>@string/pref_chargeprice_currency_gbp</item>
-        <item>@string/pref_chargeprice_currency_hrk</item>
-        <item>@string/pref_chargeprice_currency_huf</item>
-        <item>@string/pref_chargeprice_currency_isk</item>
-        <item>@string/pref_chargeprice_currency_nok</item>
-        <item>@string/pref_chargeprice_currency_pln</item>
-        <item>@string/pref_chargeprice_currency_sek</item>
-        <item>@string/pref_chargeprice_currency_usd</item>
-    </string-array>
-    <string-array name="pref_chargeprice_currency_values" translatable="false">
+    <string-array name="pref_chargeprice_currencies" translatable="false">
         <item>CHF</item>
         <item>CZK</item>
         <item>DKK</item>

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

@@ -5,19 +5,14 @@
     <string name="github_link">https://github.com/ev-map/EVMap</string>
     <string name="twitter_handle">\@ev_map</string>
     <string name="twitter_url">https://twitter.com/ev_map</string>
+    <string name="mastodon_handle">\@evmap\@electroverse.tech</string>
+    <string name="mastodon_url">https://electroverse.tech/@evmap</string>
     <string name="goingelectric_forum_url"><![CDATA[https://www.goingelectric.de/forum/viewtopic.php?f=5&t=56342]]></string>
+    <string name="tff_forum_url"><![CDATA[https://tff-forum.de/t/283834]]></string>
     <string name="github_sponsors_link">https://github.com/sponsors/johan12345/</string>
     <string name="chargeprice_api_url">https://api.chargeprice.app/v1/</string>
     <string name="fronyx_url">https://fronyx.io/</string>
     <string name="website_url">https://ev-map.app</string>
-    <string name="pref_language_en">English</string>
-    <string name="pref_language_de">Deutsch</string>
-    <string name="pref_language_fr">Français</string>
-    <string name="pref_language_nb_rNO">Norsk Bokmål</string>
-    <string name="pref_language_nl">Nederlands</string>
-    <string name="pref_language_pt">Português</string>
-    <string name="pref_language_ro">Romana</string>
-    <string name="pref_language_cs">Czech</string>
     <string name="about_contributors_list">
         Danilo Bargen\n
         Altonss\n
@@ -35,17 +30,6 @@
     <string name="hide_on_scroll_fab_behavior">net.vonforst.evmap.ui.HideOnScrollFabBehavior</string>
     <string name="paypal_link" translatable="false">https://paypal.me/johan98</string>
     <string name="donate_link" translatable="false">https://ev-map.app/donate/</string>
-    <string name="tesla_referral_link" translatable="false">http://ts.la/johan94494</string>
-    <string name="juicify_referral_link" translatable="false">https://trck.juicify.green/trck/eclick/9dba357fbfed1e82fb05c7ec004ee2972ea174ce46d8ae0d</string>
-    <string name="geldfuereauto_referral_link" translatable="false">https://trck.geld-fuer-eauto.de/trck/eclick/c4713e9520bdb8842a3f1fbfa3a0669b3e58421043df78ad</string>
-    <string name="maingau_referral_link" translatable="false">https://trck.maingau-energie.de/trck/eclick/799b39cda39575dab1dcd3351abeb77b62dc33e4f9558a57</string>
-    <string name="ewieeinfach_referral_link" translatable="false">https://trck.e-wie-einfach.de/trck/eclick/fca74c186b54e7287a62102a13e073be4fc963825b85f7df</string>
-    <string name="eprimo_referral_link" translatable="false">https://netzwerk.uppr.de/trck/eclick/781768d2e779806b5e09229932662c14adddd69323594c52</string>
-    <string name="referral_juicify" translatable="false">Juicify</string>
-    <string name="referral_geldfuereauto" translatable="false">Geld für eAuto</string>
-    <string name="referral_maingau" translatable="false">Maingau</string>
-    <string name="referral_ewieeinfach" translatable="false">E wie einfach</string>
-    <string name="referral_eprimo" translatable="false">eprimo</string>
     <string name="copyright_summary">©2020–2024 Johan von Forstner and contributors</string>
     <string name="acra_backend_url" translatable="false">https://acra.muc.vonforst.net/report</string>
 </resources>

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

@@ -110,7 +110,9 @@
     <string name="and_n_others">and %d others</string>
     <string name="pref_map_provider">Map provider</string>
     <string name="twitter">Twitter</string>
+    <string name="mastodon">Mastodon</string>
     <string name="goingelectric_forum">Forum thread at GoingElectric.de</string>
+    <string name="tff_forum">Forum thread at TFF-Forum.de</string>
     <string name="contact">Contact</string>
     <string name="menu_report_new_charger">New charger</string>
     <string name="edit_at_datasource">Edit at %s</string>
@@ -151,6 +153,7 @@
     <string name="delete">Delete</string>
     <string name="save_as_profile">Save as profile</string>
     <string name="save_profile_enter_name">Enter the name of the filter profile:</string>
+    <string name="filterprofile_name_not_unique">There is already a filter profile with that name</string>
     <string name="filterprofiles_empty_state">You have no filter profiles saved</string>
     <string name="welcome_to_evmap">Welcome to EVMap</string>
     <string name="welcome_1">Find electric vehicle chargers around you</string>
@@ -240,6 +243,7 @@
     <string name="privacy_link">https://ev-map.app/privacypolicy/</string>
     <string name="faq_link">https://ev-map.app/faq/</string>
     <string name="chargeprice_faq_link">https://ev-map.app/faq/#price-comparison-feature</string>
+    <string name="referral_link">https://ev-map.app/referrals/</string>
     <string name="required">required</string>
     <string name="edit_filter_profile">Edit “%s”</string>
     <string name="pref_search_delete_recent">Delete recent search results</string>
@@ -258,18 +262,6 @@
     <string name="pref_darkmode_device_default">Device default</string>
     <string name="pref_darkmode_always_on">always on</string>
     <string name="pref_darkmode_always_off">always off</string>
-    <string name="pref_chargeprice_currency_chf">Swiss franc (CHF)</string>
-    <string name="pref_chargeprice_currency_czk">Czech koruna (CZK)</string>
-    <string name="pref_chargeprice_currency_dkk">Danish krone (DKK)</string>
-    <string name="pref_chargeprice_currency_eur">Euro (EUR)</string>
-    <string name="pref_chargeprice_currency_gbp">Pound sterling (GBP)</string>
-    <string name="pref_chargeprice_currency_hrk">Croatian kuna (HRK)</string>
-    <string name="pref_chargeprice_currency_huf">Hungarian forint (HUF)</string>
-    <string name="pref_chargeprice_currency_isk">Icelandic króna (ISK)</string>
-    <string name="pref_chargeprice_currency_nok">Norwegian krone (NOK)</string>
-    <string name="pref_chargeprice_currency_pln">Polish złoty (PLN)</string>
-    <string name="pref_chargeprice_currency_sek">Swedish krona (SEK)</string>
-    <string name="pref_chargeprice_currency_usd">US dollar (USD)</string>
     <string name="pref_provider_google_maps">Google Maps</string>
     <string name="pref_provider_osm">OpenStreetMap</string>
     <string name="pref_provider_osm_mapbox">OpenStreetMap (Mapbox)</string>

app/src/main/res/xml/about.xml

@@ -39,6 +39,10 @@
     </PreferenceCategory>
 
     <PreferenceCategory android:title="@string/contact">
+        <Preference
+            android:key="mastodon"
+            android:title="@string/mastodon"
+            android:summary="@string/mastodon_handle" />
 
         <Preference
             android:key="twitter"
@@ -49,6 +53,10 @@
             android:key="goingelectric"
             android:title="@string/goingelectric_forum" />
 
+        <Preference
+            android:key="tffforum"
+            android:title="@string/tff_forum" />
+
     </PreferenceCategory>
 
     <PreferenceCategory android:title="@string/other">

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

@@ -18,8 +18,7 @@
     <ListPreference
         android:key="chargeprice_currency"
         android:title="@string/pref_chargeprice_currency"
-        android:entries="@array/pref_chargeprice_currency_names"
-        android:entryValues="@array/pref_chargeprice_currency_values"
+        android:entryValues="@array/pref_chargeprice_currencies"
         android:defaultValue="EUR"
         app:useSimpleSummaryProvider="true" />
     <CheckBoxPreference

app/src/main/res/xml/settings_data.xml

@@ -10,11 +10,11 @@
             android:defaultValue="goingelectric"
             app:useSimpleSummaryProvider="true" />
 
-        <CheckBoxPreference
+        <!--<CheckBoxPreference
             android:key="prediction_enabled"
             android:title="@string/pref_prediction_enabled"
             android:defaultValue="true"
-            android:summary="@string/pref_prediction_enabled_summary" />
+            android:summary="@string/pref_prediction_enabled_summary" />-->
 
         <Preference
             android:key="tesla_account"

app/src/main/res/xml/settings_ui.xml

@@ -4,8 +4,6 @@
         android:key="language"
         android:persistent="false"
         android:title="@string/pref_language"
-        android:entries="@array/pref_language_names"
-        android:entryValues="@array/pref_language_values"
         android:defaultValue="default"
         android:summary="%s" />
     <ListPreference

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.4.2")
         classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion")
         classpath("com.mikepenz.aboutlibraries.plugin:aboutlibraries-plugin:$aboutLibsVersion")
         classpath("androidx.navigation:navigation-safe-args-gradle-plugin:$navVersion")
@@ -24,7 +24,6 @@ allprojects {
     repositories {
         google()
         mavenCentral()
-        //noinspection JcenterRepositoryObsolete
         maven { setUrl("https://jitpack.io") }
     }
 }

doc/api_keys.md

@@ -101,9 +101,9 @@ to switch between the two, while the `foss` flavor only includes OSM.
 
 ### 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.*
+[World Imagery basemap](https://www.arcgis.com/home/item.html?id=10df2279f9684e4a9f6a7f08febac2a9)\
+*We use this for the satellite map, as [Jawg's satellite
+style](https://blog.jawg.io/satellite-imaging/) does not have global coverage.*
 
 <details>
 <summary>How to obtain an API key</summary>
@@ -116,7 +116,7 @@ style does not have global coverage.*
 
 ### Mapbox
 
-[Geocoding API](https://docs.mapbox.com/api/search/geocoding/)
+[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>

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

@@ -0,0 +1,3 @@
+Fehler behoben:
+- Probleme mit OpenStreetMap behoben
+- Abstürze behoben

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

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

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

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

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

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

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

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

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

@@ -0,0 +1,2 @@
+Fehler behoben:
+- Anzeigefehler behoben

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

@@ -0,0 +1,3 @@
+Bugfixes:
+- Fixed problems with OpenStreetMap
+- Fixed crashes

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

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

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

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

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

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

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

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

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

@@ -0,0 +1,2 @@
+Bugfixes:
+- Fixed display errors

gradle.properties

@@ -12,7 +12,7 @@
 # org.gradle.parallel=true
 #Sun Jul 24 11:49:27 CEST 2022
 kotlin.code.style=official
-org.gradle.jvmargs=-Xmx2048M -Dkotlin.daemon.jvm.options\="-Xmx2048M"
+org.gradle.jvmargs=-Xmx4096M -Dkotlin.daemon.jvm.options\="-Xmx4096M"
 android.useAndroidX=true
 android.nonTransitiveRClass=true
 android.nonFinalResIds=true

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 #Sat Aug 06 15:33:46 CEST 2022
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME