Release 1.4.10

Added translation using Weblate (Romanian)

Co-authored-by: Hosted Weblate <hosted@weblate.org>
Co-authored-by: Johan von Forstner <johan.forstner@gmail.com>
Co-authored-by: Weblate <noreply@weblate.org>

README.md

@@ -1,7 +1,7 @@
-EVMap [![Build Status](https://github.com/johan12345/EVMap/actions/workflows/tests.yml/badge.svg)](https://github.com/johan12345/EVMap/actions)
+EVMap [![Build Status](https://github.com/ev-map/EVMap/actions/workflows/tests.yml/badge.svg)](https://github.com/ev-map/EVMap/actions)
 =====
 
-<img src="https://raw.githubusercontent.com/johan12345/EVMap/master/_img/feature_graphic.svg" width=700 alt="Logo"/>
+<img src="https://raw.githubusercontent.com/ev-map/EVMap/master/_img/feature_graphic.svg" width=700 alt="Logo"/>
 
 Android app to find electric vehicle charging stations.
 
@@ -28,7 +28,7 @@ Features
 Screenshots
 -----------
 
-<img src="https://raw.githubusercontent.com/johan12345/EVMap/master/_img/screenshots/phone/en/mapbox/01_map.png" width=250 alt="Screenshot 1"/><img src="https://raw.githubusercontent.com/johan12345/EVMap/master/_img/screenshots/phone/en/mapbox/02_detail.png" width=250 alt="Screenshot 2"/>
+<img src="https://raw.githubusercontent.com/ev-map/EVMap/master/_img/screenshots/phone/en/mapbox/01_map.png" width=250 alt="Screenshot 1"/><img src="https://raw.githubusercontent.com/ev-map/EVMap/master/_img/screenshots/phone/en/mapbox/02_detail.png" width=250 alt="Screenshot 2"/>
 
 Development setup
 -----------------

app/build.gradle

@@ -8,9 +8,8 @@ apply plugin: 'kotlin-parcelize'
 apply plugin: 'kotlin-kapt'
 apply plugin: 'androidx.navigation.safeargs.kotlin'
 apply plugin: 'com.mikepenz.aboutlibraries.plugin'
-apply plugin: 'de.timfreiheit.resourceplaceholders'
 
-def supportedLocales = "en,de,fr,nb-rNO"
+def supportedLocales = "en,de,fr,nb-rNO,nl,pt,ro"
 
 android {
     compileSdkVersion 33
@@ -21,11 +20,11 @@ android {
         minSdkVersion 21
         targetSdkVersion 33
         // NOTE: always increase versionCode by 2 since automotive flavor uses versionCode + 1
-        versionCode 142
-        versionName "1.4.2"
+        versionCode 168
+        versionName "1.4.10"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
-        resConfigs supportedLocales.split(",")
+        resConfigs supportedLocales.split(',')
         buildConfigField("String", "supportedLocales", '"' + supportedLocales + '"')
     }
 
@@ -104,9 +103,6 @@ android {
         unitTests.includeAndroidResources true
     }
 
-    resourcePlaceholders {
-        files = ['xml/shortcuts.xml']
-    }
     namespace 'net.vonforst.evmap'
 
     // add API keys from environment variable if not set in apikeys.xml
@@ -159,19 +155,19 @@ configurations {
 
 dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
-    implementation 'androidx.appcompat:appcompat:1.6.0-rc01'
+    implementation 'androidx.appcompat:appcompat:1.6.1'
     implementation 'androidx.core:core-ktx:1.9.0'
     implementation 'androidx.core:core-splashscreen:1.0.0'
     implementation "androidx.activity:activity-ktx:1.6.1"
-    implementation "androidx.fragment:fragment-ktx:1.5.4"
+    implementation "androidx.fragment:fragment-ktx:1.5.5"
     implementation 'androidx.cardview:cardview:1.0.0'
     implementation 'androidx.preference:preference-ktx:1.2.0'
-    implementation 'com.google.android.material:material:1.7.0'
+    implementation 'com.google.android.material:material:1.8.0'
     implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
     implementation 'androidx.recyclerview:recyclerview:1.2.1'
-    implementation 'androidx.browser:browser:1.4.0'
+    implementation 'androidx.browser:browser:1.5.0'
     implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0'
-    implementation 'com.github.johan12345:CustomBottomSheetBehavior:3529a5a9f1'
+    implementation 'com.github.ev-map:CustomBottomSheetBehavior:e48f73ea7b'
     implementation 'com.squareup.retrofit2:retrofit:2.9.0'
     implementation 'com.squareup.retrofit2:converter-moshi:2.9.0'
     implementation 'com.squareup.okhttp3:okhttp:4.9.0'
@@ -180,7 +176,7 @@ dependencies {
     implementation 'com.squareup.moshi:moshi-adapters:1.13.0'
     implementation 'com.markomilos.jsonapi:jsonapi-retrofit:1.1.0'
     implementation 'io.coil-kt:coil:1.1.0'
-    implementation 'com.github.johan12345:StfalconImageViewer:5082ebd392'
+    implementation 'com.github.ev-map:StfalconImageViewer:5082ebd392'
     implementation "com.mikepenz:aboutlibraries-core:$about_libs_version"
     implementation "com.mikepenz:aboutlibraries:$about_libs_version"
     implementation 'com.airbnb.android:lottie:4.1.0'
@@ -190,28 +186,30 @@ dependencies {
     implementation 'com.github.romandanylyk:PageIndicatorView:b1bad589b5'
 
     // Android Auto
-    def carAppVersion = '1.3.0-beta01'
+    def carAppVersion = '1.3.0-rc01'
     googleImplementation "androidx.car.app:app:$carAppVersion"
     googleNormalImplementation "androidx.car.app:app-projected:$carAppVersion"
     googleAutomotiveImplementation "androidx.car.app:app-automotive:$carAppVersion"
 
     // AnyMaps
-    def anyMapsVersion = 'a9b3dd7d99'
-    implementation "com.github.johan12345.AnyMaps:anymaps-base:$anyMapsVersion"
-    googleImplementation "com.github.johan12345.AnyMaps:anymaps-google:$anyMapsVersion"
+    def anyMapsVersion = '7fdcf50fc4'
+    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.1.0'
-    implementation("com.github.johan12345.AnyMaps:anymaps-mapbox:$anyMapsVersion") {
+    implementation("com.github.ev-map.AnyMaps:anymaps-mapbox:$anyMapsVersion") {
         exclude group: 'com.mapbox.mapboxsdk', module: 'mapbox-android-accounts'
         exclude group: 'com.mapbox.mapboxsdk', module: 'mapbox-android-telemetry'
         exclude group: 'com.google.android.gms', module: 'play-services-location'
         exclude group: 'com.mapbox.mapboxsdk', module: 'mapbox-android-core'
     }
-    // patched version of mapbox-android-core that removes build-time dependency on GMS
-    implementation 'com.github.johan12345:mapbox-events-android:a21c324501'
+    // original version of mapbox-android-core
+    googleImplementation 'com.mapbox.mapboxsdk:mapbox-android-core:2.0.1'
+    // patched version that removes build-time dependency on GMS (-> no Google location services)
+    fossImplementation 'com.github.ev-map:mapbox-events-android:a21c324501'
 
     // Google Places
-    googleImplementation 'com.google.android.libraries.places:places:2.7.0'
-    googleImplementation 'org.jetbrains.kotlinx:kotlinx-coroutines-play-services:1.6.1'
+    googleImplementation 'com.google.android.libraries.places:places:3.0.0'
+    googleImplementation 'org.jetbrains.kotlinx:kotlinx-coroutines-play-services:1.6.4'
 
     // Mapbox Geocoding
     implementation 'com.mapbox.mapboxsdk:mapbox-sdk-services:5.5.0'
@@ -226,13 +224,13 @@ dependencies {
     implementation "androidx.lifecycle:lifecycle-livedata-ktx:$lifecycle_version"
 
     // room library
-    def room_version = "2.4.3"
+    def room_version = "2.5.0"
     implementation "androidx.room:room-runtime:$room_version"
     kapt "androidx.room:room-compiler:$room_version"
     implementation "androidx.room:room-ktx:$room_version"
 
     // billing library
-    def billing_version = "4.1.0"
+    def billing_version = "5.1.0"
     googleImplementation "com.android.billingclient:billing:$billing_version"
     googleImplementation "com.android.billingclient:billing-ktx:$billing_version"
 
@@ -257,12 +255,12 @@ dependencies {
     testGoogleImplementation 'org.robolectric:robolectric:4.9'
     testGoogleImplementation 'androidx.test:core:1.5.0'
 
-    androidTestImplementation 'androidx.test.ext:junit:1.1.4'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.0'
+    androidTestImplementation 'androidx.test.ext:junit:1.1.5'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
 
     kapt "com.squareup.moshi:moshi-kotlin-codegen:1.13.0"
 
-    coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.2.2'
+    coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.0.2'
 }
 
 private static String decode(String s, String key) {

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

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

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

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

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

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

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

@@ -2,5 +2,4 @@
 <resources>
     <string name="pref_search_provider_default" translatable="false">mapbox</string>
     <string name="pref_map_provider_default" translatable="false">mapbox</string>
-    <string name="paypal_link" translatable="false">https://paypal.me/johan98</string>
 </resources>

app/src/google/AndroidManifest.xml

@@ -11,6 +11,7 @@
 
     <queries>
         <package android:name="com.google.android.projection.gearhead" />
+        <package android:name="com.google.android.apps.automotive.templates.host" />
     </queries>
 
     <application>

app/src/google/java/net/vonforst/evmap/auto/CarModels.kt

@@ -8,6 +8,9 @@ package net.vonforst.evmap.auto
 private val models = mapOf(
     "Audi" to mapOf(
         "516 (G4x)" to "e-tron"
+    ),
+    "Renault" to mapOf(
+        "BCB" to "Megane E-Tech"
     )
 )
 

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

@@ -1,10 +1,5 @@
 package net.vonforst.evmap.auto
 
-import android.content.ActivityNotFoundException
-import android.content.Intent
-import android.net.Uri
-import androidx.browser.customtabs.CustomTabColorSchemeParams
-import androidx.browser.customtabs.CustomTabsIntent
 import androidx.car.app.CarContext
 import androidx.car.app.CarToast
 import androidx.car.app.Screen
@@ -22,7 +17,6 @@ import jsonapi.ResourceIdentifier
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
-import net.vonforst.evmap.BuildConfig
 import net.vonforst.evmap.R
 import net.vonforst.evmap.api.chargeprice.*
 import net.vonforst.evmap.api.equivalentPlugTypes
@@ -49,9 +43,7 @@ class ChargepriceScreen(ctx: CarContext, val charger: ChargeLocation) : Screen(c
     private var prices: List<ChargePrice>? = null
     private var meta: ChargepriceChargepointMeta? = null
     private var chargepoint: Chargepoint? = null
-    private val maxRows = if (ctx.carAppApiLevel >= 2) {
-        ctx.constraintManager.getContentLimit(ConstraintManager.CONTENT_LIMIT_TYPE_LIST)
-    } else 6
+    private val maxRows = ctx.getContentLimit(ConstraintManager.CONTENT_LIMIT_TYPE_LIST)
     private var errorMessage: String? = null
     private val batteryRange = prefs.chargepriceBatteryRangeAndroidAuto
 
@@ -77,34 +69,54 @@ class ChargepriceScreen(ctx: CarContext, val charger: ChargeLocation) : Screen(c
                                 carContext.stringProvider(),
                                 chargepoint.type
                             )
-                        } ${chargepoint.formatPower()} " + carContext.getString(
-                            R.string.chargeprice_stats,
-                            meta.energy,
-                            time(meta.duration.roundToInt()),
-                            meta.energy / meta.duration * 60
-                        )
+                        } ${chargepoint.formatPower()} ${
+                            carContext.getString(
+                                R.string.chargeprice_stats,
+                                meta.energy,
+                                time(meta.duration.roundToInt()),
+                                meta.energy / meta.duration * 60
+                            )
+                        }"
                     }
                 }
                 val myTariffs = prefs.chargepriceMyTariffs
                 val myTariffsAll = prefs.chargepriceMyTariffsAll
-                val list = ItemList.Builder().apply {
-                    setNoItemsMessage(
-                        errorMessage ?: carContext.getString(R.string.chargeprice_no_tariffs_found)
-                    )
-                    prices?.take(maxRows)?.forEach { price ->
-                        addItem(Row.Builder().apply {
-                            setTitle(formatProvider(price))
-                            addText(formatPrice(price))
-                            if (carContext.carAppApiLevel >= 5) {
-                                setEnabled(myTariffsAll || myTariffs != null && price.tariffId in myTariffs)
-                            }
-                        }.build())
+
+                val prices = prices?.take(maxRows)
+                if (prices != null && prices.isNotEmpty() && !myTariffsAll && myTariffs != null) {
+                    val (myPrices, otherPrices) = prices.partition { price -> price.tariffId in myTariffs }
+                    val myPricesList = buildPricesList(myPrices)
+                    val otherPricesList = buildPricesList(otherPrices)
+                    if (myPricesList.items.isNotEmpty() && otherPricesList.items.isNotEmpty()) {
+                        addSectionedList(
+                            SectionedItemList.create(
+                                myPricesList,
+                                (header?.let { it + "\n" } ?: "") +
+                                        carContext.getString(R.string.chargeprice_header_my_tariffs)
+                            )
+                        )
+                        addSectionedList(
+                            SectionedItemList.create(
+                                otherPricesList,
+                                carContext.getString(R.string.chargeprice_header_other_tariffs)
+                            )
+                        )
+                    } else {
+                        val list =
+                            if (myPricesList.items.isNotEmpty()) myPricesList else otherPricesList
+                        if (header != null) {
+                            addSectionedList(SectionedItemList.create(list, header))
+                        } else {
+                            setSingleList(list)
+                        }
                     }
-                }.build()
-                if (header != null && list.items.isNotEmpty()) {
-                    addSectionedList(SectionedItemList.create(list, header))
                 } else {
-                    setSingleList(list)
+                    val list = buildPricesList(prices)
+                    if (header != null && list.items.isNotEmpty()) {
+                        addSectionedList(SectionedItemList.create(list, header))
+                    } else {
+                        setSingleList(list)
+                    }
                 }
             }
             setActionStrip(
@@ -117,44 +129,28 @@ class ChargepriceScreen(ctx: CarContext, val charger: ChargeLocation) : Screen(c
                             )
                         ).build()
                     ).setOnClickListener {
-                        val intent = CustomTabsIntent.Builder()
-                            .setDefaultColorSchemeParams(
-                                CustomTabColorSchemeParams.Builder()
-                                    .setToolbarColor(
-                                        ContextCompat.getColor(
-                                            carContext,
-                                            R.color.colorPrimary
-                                        )
-                                    )
-                                    .build()
-                            )
-                            .build().intent
-                        intent.data =
-                            Uri.parse(ChargepriceApi.getPoiUrl(charger))
-                        intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
-                        try {
-                            carContext.startActivity(intent)
-                            if (BuildConfig.FLAVOR_automotive != "automotive") {
-                                // only show the toast "opened on phone" if we're running on a phone
-                                CarToast.makeText(
-                                    carContext,
-                                    R.string.opened_on_phone,
-                                    CarToast.LENGTH_LONG
-                                ).show()
-                            }
-                        } catch (e: ActivityNotFoundException) {
-                            CarToast.makeText(
-                                carContext,
-                                R.string.no_browser_app_found,
-                                CarToast.LENGTH_LONG
-                            ).show()
-                        }
+                        openUrl(carContext, ChargepriceApi.getPoiUrl(charger))
                     }.build()
                 ).build()
             )
         }.build()
     }
 
+    private fun buildPricesList(prices: List<ChargePrice>?): ItemList {
+        return ItemList.Builder().apply {
+            setNoItemsMessage(
+                errorMessage
+                    ?: carContext.getString(R.string.chargeprice_no_tariffs_found)
+            )
+            prices?.forEach { price ->
+                addItem(Row.Builder().apply {
+                    setTitle(formatProvider(price))
+                    addText(formatPrice(price))
+                }.build())
+            }
+        }.build()
+    }
+
     private fun formatProvider(price: ChargePrice): String {
         if (!price.tariffName.startsWith(price.provider)) {
             return price.provider + " " + price.tariffName
@@ -210,7 +206,7 @@ class ChargepriceScreen(ctx: CarContext, val charger: ChargeLocation) : Screen(c
     }
 
     private fun loadPrices(model: Model?) {
-        val dataAdapter = ChargepriceApi.getDataAdapter(charger) ?: return
+        val dataAdapter = ChargepriceApi.getDataAdapter(charger)
         val manufacturer = model?.manufacturer?.value
         val modelName = getVehicleModel(model?.manufacturer?.value, model?.name?.value)
         lifecycleScope.launch {
@@ -356,7 +352,7 @@ class ChargepriceScreen(ctx: CarContext, val charger: ChargeLocation) : Screen(c
                 } else if (vehicles.size > 1) {
                     if (modelName != null) {
                         vehicles = vehicles.filter {
-                            it.name.startsWith(modelName)
+                            it.name.lowercase().startsWith(modelName.lowercase())
                         }
                         if (vehicles.isEmpty()) {
                             throw VehicleUnknownException()

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

@@ -64,9 +64,7 @@ class ChargerDetailScreen(ctx: CarContext, val chargerSparse: ChargeLocation) :
     private val iconGen =
         ChargerIconGenerator(carContext, null, height = imageSize)
 
-    private val maxRows = if (ctx.carAppApiLevel >= 2) {
-        ctx.constraintManager.getContentLimit(ConstraintManager.CONTENT_LIMIT_TYPE_PANE)
-    } else 2
+    private val maxRows = ctx.getContentLimit(ConstraintManager.CONTENT_LIMIT_TYPE_PANE)
     private val largeImageSupported =
         ctx.carAppApiLevel >= 4  // since API 4, Row.setImage is supported
 
@@ -350,23 +348,31 @@ class ChargerDetailScreen(ctx: CarContext, val chargerSparse: ChargeLocation) :
     private fun generateChargepointsText(charger: ChargeLocation): SpannableStringBuilder {
         val chargepointsText = SpannableStringBuilder()
         charger.chargepointsMerged.forEachIndexed { i, cp ->
-            if (i > 0) chargepointsText.append(" · ")
-            chargepointsText.append(
-                "${cp.count}× "
-            ).append(
-                nameForPlugType(carContext.stringProvider(), cp.type),
-                CarIconSpan.create(
-                    CarIcon.Builder(
-                        IconCompat.createWithResource(
-                            carContext,
-                            iconForPlugType(cp.type)
-                        )
-                    ).setTint(
-                        CarColor.createCustom(Color.WHITE, Color.BLACK)
-                    ).build()
-                ),
-                Spanned.SPAN_INCLUSIVE_EXCLUSIVE
-            ).append(" ").append(cp.formatPower())
+            chargepointsText.apply {
+                if (i > 0) append(" · ")
+                append("${cp.count}× ")
+                val plugIcon = iconForPlugType(cp.type)
+                if (plugIcon != 0) {
+                    append(
+                        nameForPlugType(carContext.stringProvider(), cp.type),
+                        CarIconSpan.create(
+                            CarIcon.Builder(
+                                IconCompat.createWithResource(
+                                    carContext,
+                                    plugIcon
+                                )
+                            ).setTint(
+                                CarColor.createCustom(Color.WHITE, Color.BLACK)
+                            ).build()
+                        ),
+                        Spanned.SPAN_INCLUSIVE_EXCLUSIVE
+                    )
+                } else {
+                    append(nameForPlugType(carContext.stringProvider(), cp.type))
+                }
+                append(" ")
+                append(cp.formatPower())
+            }
             availability?.status?.get(cp)?.let { status ->
                 chargepointsText.append(
                     " (${availabilityText(status)}/${cp.count})",

app/src/google/java/net/vonforst/evmap/auto/FilterScreen.kt

@@ -31,10 +31,8 @@ class FilterScreen(ctx: CarContext, val session: EVMapSession) : Screen(ctx) {
         db.filterProfileDao().getProfiles(prefs.dataSource)
     }
 
-    private val maxRows = if (ctx.carAppApiLevel >= 2) {
-        ctx.constraintManager.getContentLimit(ConstraintManager.CONTENT_LIMIT_TYPE_LIST)
-    } else 6
-
+    private val maxRows = ctx.getContentLimit(ConstraintManager.CONTENT_LIMIT_TYPE_LIST)
+    private val supportsRefresh = ctx.isAppDrivenRefreshSupported
     private var page = 0
 
     init {
@@ -129,10 +127,14 @@ class FilterScreen(ctx: CarContext, val session: EVMapSession) : Screen(ctx) {
                     )
                     setOnClickListener {
                         page -= 1
-                        screenManager.pushForResult(DummyReturnScreen(carContext)) {
-                            Handler(Looper.getMainLooper()).post {
-                                invalidate()
+                        if (!supportsRefresh) {
+                            screenManager.pushForResult(DummyReturnScreen(carContext)) {
+                                Handler(Looper.getMainLooper()).post {
+                                    invalidate()
+                                }
                             }
+                        } else {
+                            invalidate()
                         }
                     }
                 }.build())
@@ -222,10 +224,14 @@ class FilterScreen(ctx: CarContext, val session: EVMapSession) : Screen(ctx) {
                     )
                     setOnClickListener {
                         page += 1
-                        screenManager.pushForResult(DummyReturnScreen(carContext)) {
-                            Handler(Looper.getMainLooper()).post {
-                                invalidate()
+                        if (!supportsRefresh) {
+                            screenManager.pushForResult(DummyReturnScreen(carContext)) {
+                                Handler(Looper.getMainLooper()).post {
+                                    invalidate()
+                                }
                             }
+                        } else {
+                            invalidate()
                         }
                     }
                 }.build())
@@ -243,9 +249,8 @@ class FilterScreen(ctx: CarContext, val session: EVMapSession) : Screen(ctx) {
 class EditFiltersScreen(ctx: CarContext) : Screen(ctx) {
     private val vm = FilterViewModel(carContext.applicationContext as Application)
 
-    private val maxRows = if (ctx.carAppApiLevel >= 2) {
-        ctx.constraintManager.getContentLimit(ConstraintManager.CONTENT_LIMIT_TYPE_LIST)
-    } else 6
+    private val maxRows = ctx.getContentLimit(ConstraintManager.CONTENT_LIMIT_TYPE_LIST)
+    private val supportsRefresh = ctx.isAppDrivenRefreshSupported
 
     private var page = 0
     private var paginatedFilters = vm.filtersWithValue.map {
@@ -372,10 +377,14 @@ class EditFiltersScreen(ctx: CarContext) : Screen(ctx) {
                     )
                     setOnClickListener {
                         page -= 1
-                        screenManager.pushForResult(DummyReturnScreen(carContext)) {
-                            Handler(Looper.getMainLooper()).post {
-                                invalidate()
+                        if (!supportsRefresh) {
+                            screenManager.pushForResult(DummyReturnScreen(carContext)) {
+                                Handler(Looper.getMainLooper()).post {
+                                    invalidate()
+                                }
                             }
+                        } else {
+                            invalidate()
                         }
                     }
                 }.build())
@@ -454,10 +463,14 @@ class EditFiltersScreen(ctx: CarContext) : Screen(ctx) {
                     )
                     setOnClickListener {
                         page += 1
-                        screenManager.pushForResult(DummyReturnScreen(carContext)) {
-                            Handler(Looper.getMainLooper()).post {
-                                invalidate()
+                        if (!supportsRefresh) {
+                            screenManager.pushForResult(DummyReturnScreen(carContext)) {
+                                Handler(Looper.getMainLooper()).post {
+                                    invalidate()
+                                }
                             }
+                        } else {
+                            invalidate()
                         }
                     }
                 }.build())

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

@@ -71,6 +71,7 @@ class MapScreen(ctx: CarContext, val session: EVMapSession) :
 
     private var location: Location? = null
     private var lastDistanceUpdateTime: Instant? = null
+    private var lastChargersUpdateTime: Instant? = null
     private var chargers: List<ChargeLocation>? = null
     private var loadingError = false
     private var locationError = false
@@ -81,14 +82,13 @@ class MapScreen(ctx: CarContext, val session: EVMapSession) :
     private val searchRadius = 5 // kilometers
     private val distanceUpdateThreshold = Duration.ofSeconds(15)
     private val availabilityUpdateThreshold = Duration.ofMinutes(1)
+    private val chargersUpdateThresholdDistance = 500  // meters
+    private val chargersUpdateThresholdTime = Duration.ofSeconds(30)
     private var availabilities: MutableMap<Long, Pair<ZonedDateTime, ChargeLocationStatus?>> =
         HashMap()
-    private val maxRows = if (ctx.carAppApiLevel >= 2) {
-        min(
-            ctx.constraintManager.getContentLimit(ConstraintManager.CONTENT_LIMIT_TYPE_PLACE_LIST),
-            25
-        )
-    } else 6
+    private val maxRows =
+        min(ctx.getContentLimit(ConstraintManager.CONTENT_LIMIT_TYPE_PLACE_LIST), 25)
+    private val supportsRefresh = ctx.isAppDrivenRefreshSupported
 
     private var filterStatus = prefs.filterStatus
     private var filtersWithValue: List<FilterWithValue<FilterValue>>? = null
@@ -205,7 +205,7 @@ class MapScreen(ctx: CarContext, val session: EVMapSession) :
                             ).setTint(CarColor.DEFAULT).build()
                         )
                         .setOnClickListener {
-                            screenManager.push(SettingsScreen(carContext))
+                            screenManager.push(SettingsScreen(carContext, session))
                             session.mapScreen = null
                         }
                         .build())
@@ -223,11 +223,16 @@ class MapScreen(ctx: CarContext, val session: EVMapSession) :
                             ).build()
 
                         )
-                        setOnClickListener(ParkedOnlyOnClickListener.create {
+                        setOnClickListener {
                             if (prefs.placeSearchResultAndroidAuto != null) {
                                 prefs.placeSearchResultAndroidAutoName = null
                                 prefs.placeSearchResultAndroidAuto = null
-                                screenManager.pushForResult(DummyReturnScreen(carContext)) {
+                                if (!supportsRefresh) {
+                                    screenManager.pushForResult(DummyReturnScreen(carContext)) {
+                                        chargers = null
+                                        loadChargers()
+                                    }
+                                } else {
                                     chargers = null
                                     loadChargers()
                                 }
@@ -243,7 +248,7 @@ class MapScreen(ctx: CarContext, val session: EVMapSession) :
                                 }
                                 session.mapScreen = null
                             }
-                        })
+                        }
                     }.build())
                     .addAction(
                         Action.Builder()
@@ -263,7 +268,9 @@ class MapScreen(ctx: CarContext, val session: EVMapSession) :
                             }
                             .build())
                     .build())
-            if (carContext.carAppApiLevel >= 5) {
+            if (carContext.carAppApiLevel >= 5 ||
+                (BuildConfig.FLAVOR_automotive == "automotive" && carContext.carAppApiLevel >= 4)
+            ) {
                 setOnContentRefreshListener(this@MapScreen)
             }
         }.build()
@@ -328,7 +335,7 @@ class MapScreen(ctx: CarContext, val session: EVMapSession) :
             availabilities[charger.id]?.second?.let { av ->
                 val status = av.status.values.flatten()
                 val available = availabilityText(status)
-                val total = charger.chargepoints.sumBy { it.count }
+                val total = charger.chargepoints.sumOf { it.count }
 
                 if (text.isNotEmpty()) text.append(" · ")
                 text.append(
@@ -362,6 +369,7 @@ class MapScreen(ctx: CarContext, val session: EVMapSession) :
         this.location = location
         if (previousLocation == null) {
             loadChargers()
+            return
         }
 
         val now = Instant.now()
@@ -372,6 +380,23 @@ class MapScreen(ctx: CarContext, val session: EVMapSession) :
             // update displayed distances
             invalidate()
         }
+
+        // if chargers are searched around current location, consider app-driven refresh
+        val searchLocation =
+            if (prefs.placeSearchResultAndroidAuto == null) searchLocation else null
+        val distance = searchLocation?.let {
+            distanceBetween(
+                it.latitude, it.longitude, location.latitude, location.longitude
+            )
+        } ?: 0.0
+        if (supportsRefresh && (lastChargersUpdateTime == null ||
+                    Duration.between(
+                        lastChargersUpdateTime,
+                        now
+                    ) > chargersUpdateThresholdTime) && (distance > chargersUpdateThresholdDistance)
+        ) {
+            onContentRefreshRequested()
+        }
     }
 
     private fun loadChargers() {
@@ -411,13 +436,17 @@ class MapScreen(ctx: CarContext, val session: EVMapSession) :
                         ).awaitFinished()
                         if (response.status == Status.ERROR) {
                             loadingError = true
+                            this@MapScreen.chargers = null
                             invalidate()
                             return@launch
                         }
-                        chargers = headingFilter(
-                            response.data?.filterIsInstance(ChargeLocation::class.java),
-                            searchLocation
-                        )
+                        chargers = response.data?.filterIsInstance(ChargeLocation::class.java)
+                        if (prefs.placeSearchResultAndroidAutoName == null) {
+                            chargers = headingFilter(
+                                chargers,
+                                searchLocation
+                            )
+                        }
                         if (chargers == null || chargers.size >= maxRows) {
                             break
                         }
@@ -426,6 +455,7 @@ class MapScreen(ctx: CarContext, val session: EVMapSession) :
                 }
 
                 updateCoroutine = null
+                lastChargersUpdateTime = Instant.now()
                 lastDistanceUpdateTime = Instant.now()
                 invalidate()
             } catch (e: IOException) {
@@ -441,8 +471,12 @@ class MapScreen(ctx: CarContext, val session: EVMapSession) :
     private fun headingFilter(
         chargers: List<ChargeLocation>?,
         searchLocation: LatLng
-    ): List<ChargeLocation>? =
-        heading?.orientations?.value?.get(0)?.let { heading ->
+    ): List<ChargeLocation>? {
+        // use compass heading if available, otherwise fall back to GPS
+        val location = location
+        val heading = heading?.orientations?.value?.get(0)
+            ?: if (location?.hasBearing() == true) location.bearing else null
+        return heading?.let {
             if (!prefs.showChargersAheadAndroidAuto) return@let chargers
 
             chargers?.filter {
@@ -456,6 +490,7 @@ class MapScreen(ctx: CarContext, val session: EVMapSession) :
                 abs(diff) < 30
             }
         } ?: chargers
+    }
 
     private fun onEnergyLevelUpdated(energyLevel: EnergyLevel) {
         val isUpdate = this.energyLevel == null

app/src/google/java/net/vonforst/evmap/auto/PermissionScreen.kt

@@ -46,7 +46,7 @@ class PermissionScreen(
     }
 
     private fun requestPermissions() {
-        carContext.requestPermissions(permissions) { granted, rejected ->
+        carContext.requestPermissions(permissions) { granted, _ ->
             if (granted.containsAll(permissions)) {
                 screenManager.pop()
             } else {

app/src/google/java/net/vonforst/evmap/auto/PlaceSearchScreen.kt

@@ -105,15 +105,15 @@ class PlaceSearchScreen(ctx: CarContext, val session: EVMapSession) : Screen(ctx
                             Spanned.SPAN_EXCLUSIVE_EXCLUSIVE
                         )
                         addText(text)
+                    }
 
-                        setOnClickListener {
-                            lifecycleScope.launch {
-                                val placeDetails = getDetails(place.id)
-                                prefs.placeSearchResultAndroidAuto = placeDetails.latLng
-                                prefs.placeSearchResultAndroidAutoName =
-                                    place.primaryText.toString()
-                                screenManager.popTo(MapScreen.MARKER)
-                            }
+                    setOnClickListener {
+                        lifecycleScope.launch {
+                            val placeDetails = getDetails(place.id)
+                            prefs.placeSearchResultAndroidAuto = placeDetails.latLng
+                            prefs.placeSearchResultAndroidAutoName =
+                                place.primaryText.toString()
+                            screenManager.popTo(MapScreen.MARKER)
                         }
                     }
                 }.build())
@@ -148,6 +148,7 @@ class PlaceSearchScreen(ctx: CarContext, val session: EVMapSession) : Screen(ctx
     }
 
     private suspend fun loadNewList(query: String) {
+        val location = location?.let { LatLng.fromLocation(it) }
         for (provider in providers) {
             try {
                 recentResults.clear()
@@ -161,7 +162,7 @@ class PlaceSearchScreen(ctx: CarContext, val session: EVMapSession) : Screen(ctx
                 }
                 recentResults.addAll(recentPlaces)
                 resultList =
-                    recentPlaces.map { it.asAutocompletePlace(LatLng.fromLocation(location)) }
+                    recentPlaces.map { it.asAutocompletePlace(location) }
                 invalidate()
 
                 // if we already have enough results or the query is short, stop here
@@ -170,7 +171,7 @@ class PlaceSearchScreen(ctx: CarContext, val session: EVMapSession) : Screen(ctx
                 // then search online
                 val recentIds = recentPlaces.map { it.id }
                 resultList = withContext(Dispatchers.IO) {
-                    (resultList!! + provider.autocomplete(query, LatLng.fromLocation(location))
+                    (resultList!! + provider.autocomplete(query, location)
                         .filter { !recentIds.contains(it.id) }).take(maxItems)
                 }
                 invalidate()

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

@@ -15,9 +15,7 @@ abstract class MultiSelectSearchScreen<T>(ctx: CarContext) : Screen(ctx),
     protected var fullList: List<T>? = null
     private var currentList: List<T> = emptyList()
     private var query: String = ""
-    private val maxRows = if (ctx.carAppApiLevel >= 2) {
-        ctx.constraintManager.getContentLimit(ConstraintManager.CONTENT_LIMIT_TYPE_LIST)
-    } else 6
+    private val maxRows = ctx.getContentLimit(ConstraintManager.CONTENT_LIMIT_TYPE_LIST)
     protected abstract val isMultiSelect: Boolean
     protected abstract val shouldShowSelectAll: Boolean
 
@@ -88,6 +86,7 @@ abstract class MultiSelectSearchScreen<T>(ctx: CarContext) : Screen(ctx),
                 addItem(
                     Row.Builder()
                         .setTitle(getLabel(item))
+                        .apply { getDetails(item)?.let { addText(it) } }
                         .setImage(if (isSelected(item)) checkedIcon else uncheckedIcon)
                         .setOnClickListener {
                             toggleSelected(item)
@@ -132,5 +131,7 @@ abstract class MultiSelectSearchScreen<T>(ctx: CarContext) : Screen(ctx),
 
     abstract fun getLabel(it: T): String
 
+    open fun getDetails(it: T): String? = null
+
     abstract suspend fun loadData(): List<T>
 }

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

@@ -1,15 +1,21 @@
 package net.vonforst.evmap.auto
 
+import android.content.Context
+import android.content.Intent
+import android.content.pm.PackageManager.NameNotFoundException
+import android.hardware.Sensor
+import android.hardware.SensorManager
 import androidx.annotation.StringRes
 import androidx.car.app.CarContext
 import androidx.car.app.CarToast
 import androidx.car.app.Screen
+import androidx.car.app.annotations.ExperimentalCarApi
 import androidx.car.app.constraints.ConstraintManager
 import androidx.car.app.model.*
 import androidx.core.graphics.drawable.IconCompat
 import androidx.lifecycle.lifecycleScope
 import kotlinx.coroutines.launch
-import net.vonforst.evmap.R
+import net.vonforst.evmap.*
 import net.vonforst.evmap.api.chargeprice.ChargepriceApi
 import net.vonforst.evmap.api.chargeprice.ChargepriceCar
 import net.vonforst.evmap.api.chargeprice.ChargepriceTariff
@@ -18,7 +24,8 @@ import net.vonforst.evmap.storage.PreferenceDataSource
 import kotlin.math.max
 import kotlin.math.min
 
-class SettingsScreen(ctx: CarContext) : Screen(ctx) {
+@ExperimentalCarApi
+class SettingsScreen(ctx: CarContext, val session: EVMapSession) : Screen(ctx) {
     val prefs = PreferenceDataSource(ctx)
 
     override fun onGetTemplate(): Template {
@@ -71,7 +78,7 @@ class SettingsScreen(ctx: CarContext) : Screen(ctx) {
                             )
                             .setBrowsable(true)
                             .setOnClickListener {
-                                screenManager.push(VehicleDataScreen(carContext))
+                                screenManager.push(VehicleDataScreen(carContext, session))
                             }
                             .build()
                     )
@@ -81,9 +88,34 @@ class SettingsScreen(ctx: CarContext) : Screen(ctx) {
                             .setToggle(Toggle.Builder {
                                 prefs.showChargersAheadAndroidAuto = it
                             }.setChecked(prefs.showChargersAheadAndroidAuto).build())
+                            .setImage(
+                                CarIcon.Builder(
+                                    IconCompat.createWithResource(
+                                        carContext,
+                                        R.drawable.ic_navigation
+                                    )
+                                ).setTint(CarColor.DEFAULT).build()
+                            )
                             .build()
                     )
                 }
+                addItem(
+                    Row.Builder()
+                        .setTitle(carContext.getString(R.string.about))
+                        .setImage(
+                            CarIcon.Builder(
+                                IconCompat.createWithResource(
+                                    carContext,
+                                    R.drawable.ic_about
+                                )
+                            ).setTint(CarColor.DEFAULT).build()
+                        )
+                        .setBrowsable(true)
+                        .setOnClickListener {
+                            screenManager.push(AboutScreen(carContext))
+                        }
+                        .build()
+                )
             }.build())
         }.build()
     }
@@ -239,9 +271,7 @@ class ChooseDataSourceScreen(
 
 class ChargepriceSettingsScreen(ctx: CarContext) : Screen(ctx) {
     val prefs = PreferenceDataSource(carContext)
-    private val maxRows = if (ctx.carAppApiLevel >= 2) {
-        ctx.constraintManager.getContentLimit(ConstraintManager.CONTENT_LIMIT_TYPE_LIST)
-    } else 6
+    private val maxRows = ctx.getContentLimit(ConstraintManager.CONTENT_LIMIT_TYPE_LIST)
 
     override fun onGetTemplate(): Template {
         return ListTemplate.Builder().apply {
@@ -360,6 +390,8 @@ class SelectVehiclesScreen(ctx: CarContext) : MultiSelectSearchScreen<Chargepric
 
     override fun getLabel(it: ChargepriceCar) = "${it.brand} ${it.name}"
 
+    override fun getDetails(it: ChargepriceCar) = it.formatSpecs()
+
     override suspend fun loadData(): List<ChargepriceCar> {
         return api.getVehicles()
     }
@@ -556,4 +588,165 @@ class SelectChargingRangeScreen(ctx: CarContext) : Screen(ctx) {
             )
         }.build()
     }
+}
+
+class AboutScreen(ctx: CarContext) : Screen(ctx) {
+    val prefs = PreferenceDataSource(ctx)
+    var developerOptionsCounter = 0
+    private val maxRows = ctx.getContentLimit(ConstraintManager.CONTENT_LIMIT_TYPE_LIST)
+
+    override fun onGetTemplate(): Template {
+        return ListTemplate.Builder().apply {
+            setTitle(carContext.getString(R.string.about))
+            setHeaderAction(Action.BACK)
+            addSectionedList(SectionedItemList.create(ItemList.Builder().apply {
+                addItem(
+                    Row.Builder()
+                        .setTitle(carContext.getString(R.string.version))
+                        .addText(BuildConfig.VERSION_NAME)
+                        .addText(
+                            carContext.getString(R.string.copyright) + " " + carContext.getString(
+                                R.string.copyright_summary
+                            )
+                        )
+                        .setBrowsable(prefs.developerModeEnabled)
+                        .setOnClickListener {
+                            if (!prefs.developerModeEnabled) {
+                                developerOptionsCounter += 1
+                                if (developerOptionsCounter >= 7) {
+                                    prefs.developerModeEnabled = true
+                                    invalidate()
+                                    CarToast.makeText(
+                                        carContext,
+                                        carContext.getString(R.string.developer_mode_enabled),
+                                        CarToast.LENGTH_SHORT
+                                    ).show()
+                                }
+                            } else {
+                                screenManager.pushForResult(DeveloperOptionsScreen(carContext)) {
+                                    developerOptionsCounter = 0
+                                    invalidate()
+                                }
+                            }
+                        }.build()
+                )
+                addItem(
+                    Row.Builder()
+                        .setTitle(carContext.getString(R.string.faq))
+                        .setBrowsable(true)
+                        .setOnClickListener(ParkedOnlyOnClickListener.create {
+                            openUrl(carContext, carContext.getString(R.string.faq_link))
+                        }).build()
+                )
+                addItem(
+                    Row.Builder()
+                        .setTitle(carContext.getString(R.string.donate))
+                        .addText(carContext.getString(R.string.donate_desc))
+                        .setBrowsable(true)
+                        .setOnClickListener(ParkedOnlyOnClickListener.create {
+                            if (BuildConfig.FLAVOR_automotive == "automotive") {
+                                // we can't open the donation page on the phone in this case
+                                openUrl(carContext, carContext.getString(R.string.paypal_link))
+                            } else {
+                                val intent = Intent(carContext, MapsActivity::class.java)
+                                    .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+                                    .putExtra(EXTRA_DONATE, true)
+                                carContext.startActivity(intent)
+                                CarToast.makeText(
+                                    carContext,
+                                    R.string.opened_on_phone,
+                                    CarToast.LENGTH_LONG
+                                ).show()
+                            }
+                        }).build()
+                )
+            }.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))
+                    .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))
+                        .setBrowsable(true)
+                        .setOnClickListener(ParkedOnlyOnClickListener.create {
+                            openUrl(
+                                carContext,
+                                carContext.getString(R.string.goingelectric_forum_url)
+                            )
+                        }).build()
+                    )
+                }
+            }.build(), carContext.getString(R.string.contact)))
+            addSectionedList(SectionedItemList.create(ItemList.Builder().apply {
+                addItem(Row.Builder()
+                    .setTitle(carContext.getString(R.string.github_link_title))
+                    .setBrowsable(true)
+                    .setOnClickListener(ParkedOnlyOnClickListener.create {
+                        openUrl(carContext, carContext.getString(R.string.github_link))
+                    }).build()
+                )
+                addItem(Row.Builder()
+                    .setTitle(carContext.getString(R.string.privacy))
+                    .setBrowsable(true)
+                    .setOnClickListener(ParkedOnlyOnClickListener.create {
+                        openUrl(carContext, carContext.getString(R.string.privacy_link))
+                    }).build()
+                )
+            }.build(), carContext.getString(R.string.other)))
+        }.build()
+    }
+}
+
+class DeveloperOptionsScreen(ctx: CarContext) : Screen(ctx) {
+    val prefs = PreferenceDataSource(ctx)
+
+    override fun onGetTemplate(): Template {
+        return ListTemplate.Builder().apply {
+            setTitle(carContext.getString(R.string.developer_options))
+            setHeaderAction(Action.BACK)
+            setSingleList(ItemList.Builder().apply {
+                addItem(
+                    Row.Builder().apply {
+                        setTitle("Car app API Level: ${carContext.carAppApiLevel}")
+                        val hostPackage = carContext.hostInfo?.packageName
+                        val hostVersion = hostPackage?.let {
+                            try {
+                                carContext.packageManager.getPackageInfoCompat(it).versionName
+                            } catch (e: NameNotFoundException) {
+                                null
+                            }
+                        }
+                        addText("$hostPackage $hostVersion")
+                        if (BuildConfig.FLAVOR_automotive == "automotive") {
+                            addText(
+                                "Sensor list: ${
+                                    (carContext.getSystemService(Context.SENSOR_SERVICE) as SensorManager).getSensorList(
+                                        Sensor.TYPE_ALL
+                                    ).map { it.type }.joinToString(",")
+                                }"
+                            )
+                        }
+                    }.build()
+                )
+                addItem(Row.Builder().apply {
+                    setTitle(carContext.getString(R.string.disable_developer_mode))
+                    setOnClickListener {
+                        prefs.developerModeEnabled = false
+                        CarToast.makeText(
+                            carContext,
+                            carContext.getString(R.string.developer_mode_disabled),
+                            CarToast.LENGTH_SHORT
+                        ).show()
+                        screenManager.pop()
+                    }
+                }.build())
+            }.build())
+        }.build()
+    }
 }

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

@@ -1,16 +1,25 @@
 package net.vonforst.evmap.auto
 
+import android.content.ActivityNotFoundException
 import android.content.Context
+import android.content.Intent
 import android.graphics.Bitmap
+import android.net.Uri
+import androidx.browser.customtabs.CustomTabColorSchemeParams
+import androidx.browser.customtabs.CustomTabsIntent
 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.hardware.common.CarUnit
 import androidx.car.app.model.*
 import androidx.car.app.versioning.CarAppApiLevels
+import androidx.core.content.ContextCompat
 import androidx.core.graphics.drawable.IconCompat
+import net.vonforst.evmap.BuildConfig
 import net.vonforst.evmap.R
 import net.vonforst.evmap.api.availability.ChargepointStatus
+import net.vonforst.evmap.getPackageInfoCompat
 import java.util.*
 import kotlin.math.roundToInt
 
@@ -33,6 +42,23 @@ fun carAvailabilityColor(status: List<ChargepointStatus>): CarColor {
 val CarContext.constraintManager
     get() = getCarService(CarContext.CONSTRAINT_SERVICE) as ConstraintManager
 
+fun CarContext.getContentLimit(id: Int) = if (carAppApiLevel >= 2) {
+    constraintManager.getContentLimit(id)
+} else {
+    when (id) {
+        ConstraintManager.CONTENT_LIMIT_TYPE_GRID -> 6
+        ConstraintManager.CONTENT_LIMIT_TYPE_LIST -> 6
+        ConstraintManager.CONTENT_LIMIT_TYPE_PANE -> 4
+        ConstraintManager.CONTENT_LIMIT_TYPE_PLACE_LIST -> 6
+        ConstraintManager.CONTENT_LIMIT_TYPE_ROUTE_LIST -> 3
+        else -> throw IllegalArgumentException("unknown limit ID")
+    }
+}
+
+val CarContext.isAppDrivenRefreshSupported
+    @androidx.car.app.annotations.ExperimentalCarApi
+    get() = if (carAppApiLevel >= 6) constraintManager.isAppDrivenRefreshEnabled else false
+
 fun Bitmap.asCarIcon(): CarIcon = CarIcon.Builder(IconCompat.createWithBitmap(this)).build()
 
 val emptyCarIcon: CarIcon by lazy {
@@ -171,7 +197,7 @@ fun <T> List<T>.paginate(nSingle: Int, nFirst: Int, nOther: Int, nLast: Int): Li
 }
 
 fun getAndroidAutoVersion(ctx: Context): List<String> {
-    val info = ctx.packageManager.getPackageInfo("com.google.android.projection.gearhead", 0)
+    val info = ctx.packageManager.getPackageInfoCompat("com.google.android.projection.gearhead", 0)
     return info.versionName.split(".")
 }
 
@@ -190,6 +216,40 @@ fun supportsCarApiLevel3(ctx: CarContext): Boolean {
     return true
 }
 
+fun openUrl(carContext: CarContext, url: String) {
+    val intent = CustomTabsIntent.Builder()
+        .setDefaultColorSchemeParams(
+            CustomTabColorSchemeParams.Builder()
+                .setToolbarColor(
+                    ContextCompat.getColor(
+                        carContext,
+                        R.color.colorPrimary
+                    )
+                )
+                .build()
+        )
+        .build().intent
+    intent.data = Uri.parse(url)
+    intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+    try {
+        carContext.startActivity(intent)
+        if (BuildConfig.FLAVOR_automotive != "automotive") {
+            // only show the toast "opened on phone" if we're running on a phone
+            CarToast.makeText(
+                carContext,
+                R.string.opened_on_phone,
+                CarToast.LENGTH_LONG
+            ).show()
+        }
+    } catch (e: ActivityNotFoundException) {
+        CarToast.makeText(
+            carContext,
+            R.string.no_browser_app_found,
+            CarToast.LENGTH_LONG
+        ).show()
+    }
+}
+
 class DummyReturnScreen(ctx: CarContext) : Screen(ctx) {
     /*
     Dummy screen to get around template refresh limitations.

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

@@ -1,6 +1,7 @@
 package net.vonforst.evmap.auto
 
 import android.content.pm.PackageManager
+import android.location.Location
 import android.os.Handler
 import android.os.Looper
 import androidx.car.app.CarContext
@@ -16,10 +17,13 @@ import net.vonforst.evmap.BuildConfig
 import net.vonforst.evmap.R
 import net.vonforst.evmap.ui.CompassNeedle
 import net.vonforst.evmap.ui.Gauge
+import net.vonforst.evmap.utils.formatDecimal
 import kotlin.math.min
 import kotlin.math.roundToInt
 
-class VehicleDataScreen(ctx: CarContext) : Screen(ctx), DefaultLifecycleObserver {
+@androidx.car.app.annotations.ExperimentalCarApi
+class VehicleDataScreen(ctx: CarContext, val session: EVMapSession) : Screen(ctx),
+    LocationAwareScreen, DefaultLifecycleObserver {
     private val carInfo =
         (ctx.getCarService(CarContext.HARDWARE_SERVICE) as CarHardwareManager).carInfo
     private val carSensors = carContext.patchedCarSensors
@@ -27,6 +31,7 @@ class VehicleDataScreen(ctx: CarContext) : Screen(ctx), DefaultLifecycleObserver
     private var energyLevel: EnergyLevel? = null
     private var speed: Speed? = null
     private var heading: Compass? = null
+    private var location: Location? = null
     private var gauge = Gauge((ctx.resources.displayMetrics.density * 128).roundToInt(), ctx)
     private var compass =
         CompassNeedle((ctx.resources.displayMetrics.density * 128).roundToInt(), ctx)
@@ -70,7 +75,11 @@ class VehicleDataScreen(ctx: CarContext) : Screen(ctx), DefaultLifecycleObserver
         val energyLevel = energyLevel
         val model = model
         val speed = speed
-        val heading = heading
+        val location = location
+
+        val compassHeading = heading?.orientations?.value?.get(0)
+        val gpsHeading = if (location?.hasBearing() == true) location.bearing else null
+        val heading = compassHeading ?: gpsHeading
 
         return GridTemplate.Builder().apply {
             setTitle(
@@ -192,17 +201,30 @@ class VehicleDataScreen(ctx: CarContext) : Screen(ctx), DefaultLifecycleObserver
                             if (heading == null) {
                                 setLoading(true)
                             } else {
-                                val heading = heading.orientations.value
-                                if (heading != null) {
-                                    setText(
-                                        "${heading[0].roundToInt()}°"
+                                val headingSource =
+                                    if (compassHeading != null) carContext.getString(R.string.compass) else carContext.getString(
+                                        R.string.gps
                                     )
-
-                                } else {
-                                    setText(carContext.getString(R.string.auto_no_data))
-                                }
+                                setText("${heading.roundToInt()}° ($headingSource)")
                                 setImage(
-                                    compass.draw(heading?.get(0)).asCarIcon()
+                                    compass.draw(heading).asCarIcon()
+                                )
+                            }
+                        }.build())
+                        addItem(GridItem.Builder().apply {
+                            setTitle(carContext.getString(R.string.coordinates))
+                            if (location == null) {
+                                setLoading(true)
+                            } else {
+                                val dms = location.formatDecimal(4)
+                                setText(dms)
+                                setImage(
+                                    CarIcon.Builder(
+                                        IconCompat.createWithResource(
+                                            carContext,
+                                            R.drawable.ic_location
+                                        )
+                                    ).setTint(CarColor.DEFAULT).build()
                                 )
                             }
                         }.build())
@@ -229,6 +251,7 @@ class VehicleDataScreen(ctx: CarContext) : Screen(ctx), DefaultLifecycleObserver
 
     override fun onResume(owner: LifecycleOwner) {
         setupListeners()
+        session.mapScreen = this
     }
 
     private fun setupListeners() {
@@ -253,6 +276,7 @@ class VehicleDataScreen(ctx: CarContext) : Screen(ctx), DefaultLifecycleObserver
 
     override fun onPause(owner: LifecycleOwner) {
         removeListeners()
+        session.mapScreen = null
     }
 
     private fun removeListeners() {
@@ -269,4 +293,8 @@ class VehicleDataScreen(ctx: CarContext) : Screen(ctx), DefaultLifecycleObserver
                 it
             ) == PackageManager.PERMISSION_GRANTED
         }
+
+    override fun updateLocation(location: Location) {
+        this.location = location
+    }
 }

app/src/google/java/net/vonforst/evmap/autocomplete/GooglePlacesAutocompleteProvider.kt

@@ -7,6 +7,7 @@ import android.text.style.StyleSpan
 import com.car2go.maps.google.adapter.AnyMapAdapter
 import com.car2go.maps.util.SphericalUtil
 import com.google.android.gms.common.api.ApiException
+import com.google.android.gms.common.api.CommonStatusCodes
 import com.google.android.gms.maps.model.LatLng
 import com.google.android.gms.maps.model.LatLngBounds
 import com.google.android.gms.tasks.Tasks.await
@@ -19,6 +20,7 @@ import com.google.android.libraries.places.api.net.FindAutocompletePredictionsRe
 import com.google.android.libraries.places.api.net.PlacesStatusCodes
 import kotlinx.coroutines.tasks.await
 import net.vonforst.evmap.R
+import java.io.IOException
 import java.util.concurrent.ExecutionException
 import kotlin.math.sqrt
 
@@ -58,6 +60,13 @@ class GooglePlacesAutocompleteProvider(val context: Context) : AutocompleteProvi
             if (cause is ApiException) {
                 if (cause.statusCode == PlacesStatusCodes.OVER_QUERY_LIMIT) {
                     throw ApiUnavailableException()
+                } else if (cause.statusCode in listOf(
+                        CommonStatusCodes.NETWORK_ERROR,
+                        CommonStatusCodes.TIMEOUT, CommonStatusCodes.RECONNECTION_TIMED_OUT,
+                        CommonStatusCodes.RECONNECTION_TIMED_OUT_DURING_UPDATE
+                    )
+                ) {
+                    throw IOException(cause)
                 }
             }
             throw e

app/src/google/java/net/vonforst/evmap/viewmodel/DonateViewModel.kt

@@ -5,6 +5,7 @@ import android.app.Application
 import androidx.lifecycle.AndroidViewModel
 import androidx.lifecycle.MutableLiveData
 import com.android.billingclient.api.*
+import com.android.billingclient.api.BillingClient.ProductType
 import net.vonforst.evmap.BuildConfig
 import net.vonforst.evmap.adapter.Equatable
 
@@ -14,6 +15,12 @@ class DonateViewModel(application: Application) : AndroidViewModel(application),
         .setListener(this)
         .enablePendingPurchases()
         .build()
+    
+    val products: MutableLiveData<Resource<List<DonationItem>>> by lazy {
+        MutableLiveData<Resource<List<DonationItem>>>().apply {
+            value = Resource.loading(null)
+        }
+    }
 
     init {
         billingClient.startConnection(object : BillingClientStateListener {
@@ -24,10 +31,15 @@ class DonateViewModel(application: Application) : AndroidViewModel(application),
                 loadProducts()
 
                 // consume pending purchases
-                val purchases = billingClient.queryPurchases(BillingClient.SkuType.INAPP)
-                purchases.purchasesList?.forEach {
-                    if (!it.isAcknowledged) {
-                        consumePurchase(it.purchaseToken, false)
+                billingClient.queryPurchasesAsync(
+                    QueryPurchasesParams.newBuilder()
+                        .setProductType(ProductType.INAPP)
+                        .build()
+                ) { _, purchasesList ->
+                    purchasesList.forEach {
+                        if (!it.isAcknowledged) {
+                            consumePurchase(it.purchaseToken, false)
+                        }
                     }
                 }
             }
@@ -36,26 +48,26 @@ class DonateViewModel(application: Application) : AndroidViewModel(application),
     }
 
     private fun loadProducts() {
-        val params = SkuDetailsParams.newBuilder()
-            .setType(BillingClient.SkuType.INAPP)
-            .setSkusList(
-                listOf(
-                    "donate_1_eur", "donate_2_eur", "donate_5_eur", "donate_10_eur"
-                ) +
-                        if (BuildConfig.DEBUG) {
-                            listOf(
-                                "android.test.purchased", "android.test.canceled",
-                                "android.test.item_unavailable"
-                            )
-                        } else {
-                            emptyList()
-                        }
+        val productIds = listOf(
+            "donate_1_eur", "donate_2_eur", "donate_5_eur", "donate_10_eur"
+        ) + if (BuildConfig.DEBUG) {
+            listOf(
+                "android.test.purchased", "android.test.canceled",
+                "android.test.item_unavailable"
             )
+        } else {
+            emptyList()
+        }
+        val params = QueryProductDetailsParams.newBuilder()
+            .setProductList(productIds.map {
+                QueryProductDetailsParams.Product.newBuilder().setProductType(ProductType.INAPP)
+                    .setProductId(it).build()
+            })
             .build()
-        billingClient.querySkuDetailsAsync(params) { result, details ->
-            if (result.responseCode == BillingClient.BillingResponseCode.OK && details != null) {
+        billingClient.queryProductDetailsAsync(params) { result, details ->
+            if (result.responseCode == BillingClient.BillingResponseCode.OK) {
                 products.postValue(Resource.success(details
-                    .sortedBy { it.priceAmountMicros }
+                    .sortedBy { it.oneTimePurchaseOfferDetails!!.priceAmountMicros }
                     .map { DonationItem(it) }
                 ))
             } else {
@@ -64,12 +76,6 @@ class DonateViewModel(application: Application) : AndroidViewModel(application),
         }
     }
 
-    val products: MutableLiveData<Resource<List<DonationItem>>> by lazy {
-        MutableLiveData<Resource<List<DonationItem>>>().apply {
-            value = Resource.loading(null)
-        }
-    }
-
     val purchaseSuccessful = SingleLiveEvent<Nothing>()
     val purchaseFailed = SingleLiveEvent<Nothing>()
 
@@ -97,7 +103,13 @@ class DonateViewModel(application: Application) : AndroidViewModel(application),
 
     fun startPurchase(it: DonationItem, activity: Activity) {
         val flowParams = BillingFlowParams.newBuilder()
-            .setSkuDetails(it.sku)
+            .setProductDetailsParamsList(
+                listOf(
+                    BillingFlowParams.ProductDetailsParams.newBuilder()
+                        .setProductDetails(it.product)
+                        .build()
+                )
+            )
             .build()
         val response = billingClient.launchBillingFlow(activity, flowParams)
         if (response.responseCode != BillingClient.BillingResponseCode.OK) {
@@ -110,4 +122,4 @@ class DonateViewModel(application: Application) : AndroidViewModel(application),
     }
 }
 
-data class DonationItem(val sku: SkuDetails) : Equatable
+data class DonationItem(val product: ProductDetails) : Equatable

app/src/google/res/layout/item_donation.xml

@@ -28,7 +28,7 @@
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_marginEnd="8dp"
-                android:text="@{item.sku.title}"
+                android:text="@{item.product.title}"
                 android:textAppearance="@style/TextAppearance.Material3.BodyLarge"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintEnd_toStartOf="@+id/textView21"
@@ -41,7 +41,7 @@
                 android:id="@+id/textView21"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="@{item.sku.price}"
+                android:text="@{item.product.oneTimePurchaseOfferDetails.formattedPrice}"
                 android:textAppearance="@style/TextAppearance.Material3.BodyLarge"
                 android:textColor="?android:textColorSecondary"
                 app:layout_constraintBottom_toBottomOf="parent"

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

@@ -35,4 +35,6 @@
     <string name="settings_android_auto_chargeprice_range">Plage de charge pour la comparaison des prix</string>
     <string name="welcome_android_auto_detail">Vous pouvez également utiliser EVMap à partir d\'Android Auto sur les voitures prises en charge. Il suffit de sélectionner l\'application EVMap dans le menu Android Auto.</string>
     <string name="loading">Chargement…</string>
+    <string name="auto_multipage_goto">Page %d</string>
+    <string name="auto_multipage">(%d/%d)</string>
 </resources>

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

@@ -36,4 +36,6 @@
     <string name="sounds_cool">den er grei</string>
     <string name="auto_chargers_ahead">Kun ladere i kjøreretningen</string>
     <string name="loading">Laster inn …</string>
+    <string name="auto_multipage_goto">Side %d</string>
+    <string name="auto_multipage">(%d/%d)</string>
 </resources>

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

@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="auto_chargeprice_vehicle_ambiguous">Meerdere voertuigen geselecteerd in de app komen overeen met dit voertuig (%1$s %2$s).</string>
+    <string name="donations_info" formatted="false">Vind je EVMap nuttig\? Je kan de ontwikkeling steunen via een donatie aan de ontwikkelaar.
+\n
+\nGoogle houdt 15% in van elke donatie.</string>
+    <string name="auto_location_service">EVMap draait op Android Auto en gebruikt jouw locatie.</string>
+    <string name="auto_no_chargers_found">Geen laadpunten gevonden in de omgeving</string>
+    <string name="auto_no_favorites_found">Geen favorieten gevonden</string>
+    <string name="open_in_app">Open in de app</string>
+    <string name="opened_on_phone">Geopend op de telefoon</string>
+    <string name="auto_location_permission_needed">Om EVMap op Android Auto te gebruiken, moet je toegang geven tot je locatie.</string>
+    <string name="auto_vehicle_data_permission_needed">Voor deze functie heeft EVMap toegang nodig tot de gegevens van je voertuig.</string>
+    <string name="grant_on_phone">Geef toestemming op telefoon</string>
+    <string name="auto_chargers_closeby">Oplaadpunten in de buurt</string>
+    <string name="auto_favorites">Favorieten</string>
+    <string name="auto_chargers_near_location">Nabij %s</string>
+    <string name="auto_fault_report_date">⚠️ Foutrapport (%s)</string>
+    <string name="auto_no_refresh_possible">Verdere updates zijn niet mogelijk. Ga terug en herbegin.</string>
+    <string name="auto_prices">Prijzen</string>
+    <string name="auto_vehicle_data">Voertuiggegevens</string>
+    <string name="auto_charging_level">Laadniveau (SoC)</string>
+    <string name="auto_no_data">Niet beschikbaar</string>
+    <string name="auto_range">Reikwijdte</string>
+    <string name="auto_speed">Snelheid</string>
+    <string name="auto_heading">Richting</string>
+    <string name="auto_settings">Instellingen</string>
+    <string name="welcome_android_auto">Android Auto support</string>
+    <string name="welcome_android_auto_detail">Je kan EVMap ook gebruiken in Android Auto op ondersteunde voertuigen. Selecteer gewoon de EVMap app in het Android Auto menu.</string>
+    <string name="sounds_cool">klinkt cool</string>
+    <string name="auto_chargeprice_vehicle_unavailable">EVMap kon je voertuigtype niet bepalen.</string>
+    <string name="auto_chargers_ahead">Alleen laadpunten in rijrichting</string>
+    <string name="settings_android_auto_chargeprice_range">Laadbereik voor prijsvergelijking</string>
+    <string name="data_sources_hint">In de instellingen kan je ook wisselen tussen Google Maps en OpenStreetMap (Mapbox) voor de kaartgegevens.</string>
+    <string name="selecting_all">alle items geselecteerd</string>
+    <string name="selecting_none">alle items gedeselecteerd</string>
+    <string name="loading">Laden…</string>
+    <string name="auto_multipage_goto">Pagina %d</string>
+    <string name="auto_multipage">(%d/%d)</string>
+    <string name="auto_chargeprice_vehicle_unknown">Geen enkel voertuig geselecteerd in de app komt overeen met dit voertuig (%1$s %2$s).</string>
+</resources>

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

@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="auto_no_chargers_found">Não foram encontrados carregadores próximo de si</string>
+    <string name="auto_no_favorites_found">Nenhum favorito encontrado</string>
+    <string name="opened_on_phone">Aberto no telefone</string>
+    <string name="auto_location_permission_needed">Para usar o EVMap no Android Auto, permita o acesso à sua localização.</string>
+    <string name="open_in_app">Abrir na app</string>
+    <string name="auto_vehicle_data_permission_needed">Para esta funcionalidade, o EVMap precisa de aceder aos dados do seu veículo.</string>
+    <string name="auto_chargers_closeby">Carregadores próximos</string>
+    <string name="grant_on_phone">Conceda permissões no telefone</string>
+    <string name="auto_chargers_near_location">Perto de %s</string>
+    <string name="auto_favorites">Favoritos</string>
+    <string name="auto_chargeprice_vehicle_ambiguous">Vários veículos selecionados na app correspondem a este veículo (%1$s %2$s).</string>
+    <string name="selecting_none">todos os items desmarcados</string>
+    <string name="data_sources_hint">Também pode mudar entre o Google Maps e OpenStreetMap (Mapbox) nas definições da app.</string>
+    <string name="selecting_all">todos os items selecionados</string>
+    <string name="loading">Carregando…</string>
+    <string name="auto_multipage_goto">Página %d</string>
+    <string name="auto_multipage">(%d/%d)</string>
+    <string name="settings_android_auto_chargeprice_range">Escala de carregamento para comparação de preços</string>
+    <string name="donations_info" formatted="false">Acha que o EVMap é útil\? Apoie a manutenção e desenvolvimento com uma doação para o desenvolvedor da app.
+\n
+\nA Google cobra 15% de cada doação.</string>
+    <string name="auto_location_service">O EVMap está a funcionar no Android Auto e usando a sua localização.</string>
+    <string name="auto_fault_report_date">⚠️ Problemas (%s)</string>
+    <string name="auto_no_refresh_possible">Não é possível atualizar. Por favor volte atrás e reinicie.</string>
+    <string name="auto_prices">Preços</string>
+    <string name="auto_vehicle_data">Dados do veículo</string>
+    <string name="auto_charging_level">Nível de carregamento</string>
+    <string name="auto_no_data">Não disponível</string>
+    <string name="auto_speed">Velocidade</string>
+    <string name="auto_heading">Direção</string>
+    <string name="auto_settings">Definições</string>
+    <string name="welcome_android_auto">Suporte para Android Auto</string>
+    <string name="auto_range">Alcance</string>
+    <string name="welcome_android_auto_detail">Também pode usar o EVMap no Android Auto em carros compatíveis. Basta selecionar a app EVMap no menu do Android Auto.</string>
+    <string name="auto_chargeprice_vehicle_unavailable">O EVMap não pôde determinar o modelo do seu veículo.</string>
+    <string name="auto_chargeprice_vehicle_unknown">Nenhum dos veículos selecionados na app corresponde a este veículo (%1$s %2$s).</string>
+    <string name="auto_chargers_ahead">Apenas carregadores na direção do destino</string>
+    <string name="sounds_cool">Continuar</string>
+</resources>

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

@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources></resources>

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

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="grant_on_phone">Toestaan</string>
+    <string name="auto_location_permission_needed">Om EVmap te gebruiken in je wagen, moet je toegang geven tot je locatie.</string>
+</resources>

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

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="grant_on_phone">Permitir</string>
+    <string name="auto_location_permission_needed">Para usar o EVMap no seu carro, permita o acesso à sua localização.</string>
+</resources>

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

@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources></resources>

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

@@ -40,6 +40,7 @@ const val EXTRA_CHARGER_ID = "chargerId"
 const val EXTRA_LAT = "lat"
 const val EXTRA_LON = "lon"
 const val EXTRA_FAVORITES = "favorites"
+const val EXTRA_DONATE = "donate"
 
 class MapsActivity : AppCompatActivity(),
     PreferenceFragmentCompat.OnPreferenceStartFragmentCallback {
@@ -75,7 +76,7 @@ class MapsActivity : AppCompatActivity(),
         val navView = findViewById<NavigationView>(R.id.nav_view)
         navView.setupWithNavController(navController)
 
-        ViewCompat.setOnApplyWindowInsetsListener(navView) { v, insets ->
+        ViewCompat.setOnApplyWindowInsetsListener(navView) { _, insets ->
             val header = navView.getHeaderView(0)
             header.setPadding(0, insets.getInsets(WindowInsetsCompat.Type.statusBars()).top, 0, 0)
             insets
@@ -188,6 +189,11 @@ class MapsActivity : AppCompatActivity(),
                     .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()

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

@@ -1,8 +1,11 @@
 package net.vonforst.evmap
 
 import android.content.Context
+import android.content.pm.PackageInfo
+import android.content.pm.PackageManager
 import android.content.res.Configuration
 import android.graphics.Typeface
+import android.os.Build
 import android.os.Bundle
 import android.text.*
 import android.text.style.StyleSpan
@@ -72,7 +75,7 @@ fun max(a: Int?, b: Int?): Int? {
      * otherwise the non-null value or null
      */
     return if (a != null && b != null) {
-        max(a, b)
+        kotlin.math.max(a, b)
     } else {
         a ?: b
     }
@@ -88,4 +91,11 @@ const val meterPerFt = 0.3048
 
 fun shouldUseImperialUnits(): Boolean {
     return Locale.getDefault().country in listOf("US", "GB", "MM", "LR")
-}
+}
+
+fun PackageManager.getPackageInfoCompat(packageName: String, flags: Int = 0): PackageInfo =
+    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+        getPackageInfo(packageName, PackageManager.PackageInfoFlags.of(flags.toLong()))
+    } else {
+        @Suppress("DEPRECATION") getPackageInfo(packageName, flags)
+    }

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

@@ -1,7 +1,6 @@
 package net.vonforst.evmap.adapter
 
 import android.view.LayoutInflater
-import android.view.View
 import android.view.ViewGroup
 import androidx.databinding.DataBindingUtil
 import androidx.databinding.ViewDataBinding
@@ -166,7 +165,7 @@ class CheckableConnectorAdapter : DataBindingAdapter<Chargepoint>() {
         root.setOnClickListener {
             root.isChecked = true
         }
-        root.setOnCheckedChangeListener { v: View, checked: Boolean ->
+        root.setOnCheckedChangeListener { _, checked: Boolean ->
             if (checked) {
                 checkedItem = holder.bindingAdapterPosition.takeIf { it != -1 }
                 root.post {
@@ -205,7 +204,7 @@ class CheckableChargepriceCarAdapter : DataBindingAdapter<ChargepriceCar>() {
         root.setOnClickListener {
             root.isChecked = true
         }
-        root.setOnCheckedChangeListener { v: View, checked: Boolean ->
+        root.setOnCheckedChangeListener { _, checked: Boolean ->
             if (checked && item != checkedItem) {
                 checkedItem = item
                 root.post {

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

@@ -10,6 +10,8 @@ import net.vonforst.evmap.model.ChargeCardId
 import net.vonforst.evmap.model.ChargeLocation
 import net.vonforst.evmap.model.OpeningHoursDays
 import net.vonforst.evmap.plus
+import net.vonforst.evmap.utils.formatDMS
+import net.vonforst.evmap.utils.formatDecimal
 import java.time.ZoneId
 import java.time.format.DateTimeFormatter
 import java.time.format.FormatStyle
@@ -59,7 +61,8 @@ fun buildDetails(
         if (loc.network != null) DetailsAdapter.Detail(
             R.drawable.ic_network,
             R.string.network,
-            loc.network
+            loc.network,
+            clickable = loc.networkUrl != null
         ) else null,
         if (loc.faultReport != null) DetailsAdapter.Detail(
             R.drawable.ic_fault_report,

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

@@ -25,7 +25,7 @@ class FilterProfilesAdapter(
         super.bind(holder, item)
 
         val binding = holder.binding as ItemFilterProfileBinding
-        binding.handle.setOnTouchListener { v, event ->
+        binding.handle.setOnTouchListener { _, event ->
             if (event?.action == MotionEvent.ACTION_DOWN) {
                 dragHelper.startDrag(holder)
             }

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

@@ -5,14 +5,13 @@ import android.content.Context
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import android.view.ViewTreeObserver.OnGlobalLayoutListener
 import android.widget.ImageView
 import androidx.recyclerview.widget.DiffUtil
 import androidx.recyclerview.widget.ListAdapter
 import androidx.recyclerview.widget.RecyclerView
 import coil.load
 import coil.memory.MemoryCache
-import coil.size.OriginalSize
-import coil.size.SizeResolver
 import net.vonforst.evmap.R
 import net.vonforst.evmap.model.ChargerPhoto
 
@@ -37,27 +36,42 @@ class GalleryAdapter(context: Context, val itemClickListener: ItemClickListener?
     }
 
     override fun onBindViewHolder(holder: ViewHolder, position: Int) {
-        val id = getItem(position).id
-        val url = getItem(position).getUrl(height = holder.view.height)
+        val item = getItem(position)
 
-        holder.view.load(
-            url
-        ) {
-            size(SizeResolver(OriginalSize))
-            allowHardware(false)
-            listener(
-                onSuccess = { _, metadata ->
-                    memoryKeys[id] = metadata.memoryCacheKey
+        if (holder.view.height == 0) {
+            holder.view.viewTreeObserver.addOnGlobalLayoutListener(object : OnGlobalLayoutListener {
+                override fun onGlobalLayout() {
+                    holder.view.viewTreeObserver.removeOnGlobalLayoutListener(this)
+                    loadImage(item, holder)
                 }
-            )
+            })
+        } else {
+            loadImage(item, holder)
         }
 
         if (itemClickListener != null) {
             holder.view.setOnClickListener {
-                itemClickListener.onItemClick(holder.view, position, memoryKeys[id])
+                itemClickListener.onItemClick(holder.view, position, memoryKeys[item.id])
             }
         }
     }
+
+    private fun loadImage(
+        item: ChargerPhoto,
+        holder: ViewHolder
+    ) {
+        val url = item.getUrl(height = holder.view.height)
+
+        holder.view.load(
+            url
+        ) {
+            listener(
+                onSuccess = { _, metadata ->
+                    memoryKeys[item.id] = metadata.memoryCacheKey
+                }
+            )
+        }
+    }
 }
 
 class ChargerPhotoDiffCallback : DiffUtil.ItemCallback<ChargerPhoto>() {

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

@@ -71,19 +71,19 @@ abstract class BaseAvailabilityDetector(private val client: OkHttpClient) : Avai
             connectors: Map<Long, Pair<Double, String>>,
             chargepoints: List<Chargepoint>
         ): Map<Chargepoint, Set<Long>> {
-            var chargepoints = chargepoints
+            var cpts = chargepoints
 
             // iterate over each connector type
             val types = connectors.map { it.value.second }.distinct().toSet()
             val equivalentTypes = types.map { equivalentPlugTypes(it).plus(it) }.cartesianProduct()
-            var geTypes = chargepoints.map { it.type }.distinct().toSet()
+            var geTypes = cpts.map { it.type }.distinct().toSet()
             if (!equivalentTypes.any { it == geTypes } && geTypes.size > 1 && geTypes.contains(
                     Chargepoint.SCHUKO
                 )) {
                 // If charger has household plugs and other plugs, try removing the household plugs
                 // (common e.g. in Hamburg -> 2x Type 2 + 2x Schuko, but NM only lists Type 2)
                 geTypes = geTypes.filter { it != Chargepoint.SCHUKO }.toSet()
-                chargepoints = chargepoints.filter { it.type != Chargepoint.SCHUKO }
+                cpts = cpts.filter { it.type != Chargepoint.SCHUKO }
             }
             if (!equivalentTypes.any { it == geTypes }) throw AvailabilityDetectorException("chargepoints do not match")
             return types.flatMap { type ->
@@ -93,14 +93,14 @@ abstract class BaseAvailabilityDetector(private val client: OkHttpClient) : Avai
                 val powers = connsOfType.map { it.value.first }.distinct().sorted()
                 // find corresponding powers in GE data
                 val gePowers =
-                    chargepoints.filter { equivalentPlugTypes(it.type).any { it == type } }
+                    cpts.filter { equivalentPlugTypes(it.type).any { it == type } }
                         .mapNotNull { it.power }.distinct().sorted()
 
                 // if the distinct number of powers is the same, try to match.
                 if (powers.size == gePowers.size) {
                     gePowers.zip(powers).map { (gePower, power) ->
                         val chargepoint =
-                            chargepoints.find { equivalentPlugTypes(it.type).any { it == type } && it.power == gePower }!!
+                            cpts.find { equivalentPlugTypes(it.type).any { it == type } && it.power == gePower }!!
                         val ids = connsOfType.filter { it.value.first == power }.keys
                         if (chargepoint.count != ids.size) {
                             throw AvailabilityDetectorException("chargepoints do not match")
@@ -108,7 +108,7 @@ abstract class BaseAvailabilityDetector(private val client: OkHttpClient) : Avai
                         chargepoint to ids
                     }
                 } else if (powers.size == 1 && gePowers.size == 2
-                    && chargepoints.sumOf { it.count } == connsOfType.size
+                    && cpts.sumOf { it.count } == connsOfType.size
                 ) {
                     // special case: dual charger(s) with load balancing
                     // GoingElectric shows 2 different powers, NewMotion just one
@@ -116,7 +116,7 @@ abstract class BaseAvailabilityDetector(private val client: OkHttpClient) : Avai
                     var i = 0
                     gePowers.map { gePower ->
                         val chargepoint =
-                            chargepoints.find { it.type in equivalentPlugTypes(type) && it.power == gePower }!!
+                            cpts.find { it.type in equivalentPlugTypes(type) && it.power == gePower }!!
                         val ids = allIds.subList(i, i + chargepoint.count).toSet()
                         i += chargepoint.count
                         chargepoint to ids

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

@@ -51,7 +51,7 @@ interface ChargecloudApi {
     )
 
     companion object {
-        fun create(client: OkHttpClient, baseUrl: String? = null): ChargecloudApi {
+        fun create(client: OkHttpClient, baseUrl: String): ChargecloudApi {
             val retrofit = Retrofit.Builder()
                 .baseUrl(baseUrl)
                 .addConverterFactory(MoshiConverterFactory.create())

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

@@ -203,29 +203,45 @@ class EnBwAvailabilityDetector(client: OkHttpClient, baseUrl: String? = null) :
         val country = charger.chargepriceData?.country
             ?: charger.address?.country ?: return false
         return when (charger.dataSource) {
-            // list of countries as of 2021/06/30, according to
-            // https://www.electrive.net/2021/06/30/enbw-expandiert-mit-ladenetz-in-drei-weitere-laender/
+            // list of countries as of 2023/04/14, according to
+            // https://www.enbw.com/elektromobilitaet/produkte/ladetarife
             "goingelectric" -> country in listOf(
                 "Deutschland",
                 "Österreich",
                 "Schweiz",
-                "Frankreich",
                 "Belgien",
-                "Niederlande",
-                "Luxemburg",
-                "Liechtenstein",
+                "Dänemark",
+                "Frankreich",
                 "Italien",
+                "Kroatien",
+                "Liechtenstein",
+                "Luxemburg",
+                "Niederlande",
+                "Polen",
+                "Schweden",
+                "Slowakei",
+                "Slowenien",
+                "Spanien",
+                "Tschechien"
             )
             "openchargemap" -> country in listOf(
                 "DE",
                 "AT",
                 "CH",
-                "FR",
                 "BE",
-                "NE",
-                "LU",
+                "DK",
+                "FR",
+                "IT",
+                "HR",
                 "LI",
-                "IT"
+                "LU",
+                "NE",
+                "PL",
+                "SE",
+                "SK",
+                "SI",
+                "ES",
+                "CZ"
             )
             else -> false
         }

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

@@ -140,7 +140,7 @@ class NewMotionAvailabilityDetector(client: OkHttpClient, baseUrl: String? = nul
         connectorStatus.forEach { (connector, statusStr, evseId) ->
             val id = connector.uid
             val power = connector.electricalProperties.getPower()
-            val type = when (connector.connectorType.toLowerCase(Locale.ROOT)) {
+            val type = when (connector.connectorType.lowercase(Locale.ROOT)) {
                 "type3" -> Chargepoint.TYPE_3
                 "type2" -> Chargepoint.TYPE_2_UNKNOWN
                 "type1" -> Chargepoint.TYPE_1

app/src/main/java/net/vonforst/evmap/api/chargeprice/ChargepriceApi.kt

@@ -163,7 +163,7 @@ interface ChargepriceApi {
                 "Spanien",
                 "Großbritannien",
                 "Irland",
-                // additional countries found 2022/09/17, https://github.com/johan12345/EVMap/issues/234
+                // additional countries found 2022/09/17, https://github.com/ev-map/EVMap/issues/234
                 "Finnland",
                 "Lettland",
                 "Litauen",
@@ -202,7 +202,7 @@ interface ChargepriceApi {
                 "ES",
                 "GB",
                 "IE",
-                // additional countries found 2022/09/17, https://github.com/johan12345/EVMap/issues/234
+                // additional countries found 2022/09/17, https://github.com/ev-map/EVMap/issues/234
                 "FI",
                 "LV",
                 "LT",

app/src/main/java/net/vonforst/evmap/api/chargeprice/ChargepriceModel.kt

@@ -114,8 +114,26 @@ data class ChargepriceCar(
     val brand: String,
 
     @Json(name = "dc_charge_ports")
-    val dcChargePorts: List<String>
+    val dcChargePorts: List<String>,
+
+    @Json(name = "usable_battery_size")
+    val usableBatterySize: Float,
+
+    @Json(name = "ac_max_power")
+    val acMaxPower: Float,
+
+    @Json(name = "dc_max_power")
+    val dcMaxPower: Float?
 ) : Equatable, Parcelable {
+    fun formatSpecs(): String = buildString {
+        append("%.0f kWh".format(usableBatterySize))
+        append(" | ")
+        append("AC %.0f kW".format(acMaxPower))
+        dcMaxPower?.let {
+            append(" | ")
+            append("DC %.0f kW".format(it))
+        }
+    }
 
     companion object {
         private val acConnectors = listOf(

app/src/main/java/net/vonforst/evmap/api/fronyx/FronyxApiRetrofit.kt

@@ -14,13 +14,18 @@ import retrofit2.http.GET
 import retrofit2.http.Path
 import retrofit2.http.Query
 
-interface FronyxApi {
+private interface FronyxApiRetrofit {
     @GET("predictions/evse-id/{evseId}")
     suspend fun getPredictionsForEvseId(
         @Path("evseId") evseId: String,
         @Query("timeframe") timeframe: Int? = null
     ): FronyxEvseIdResponse
 
+    @GET("predictions/evses")
+    suspend fun getPredictionsForEvseIds(
+        @Query("evseIds", encoded = true) evseIds: String  // comma-separated
+    ): List<FronyxEvseIdResponse>
+
     companion object {
         private val cacheSize = 1L * 1024 * 1024 // 1MB
 
@@ -32,7 +37,7 @@ interface FronyxApi {
             apikey: String,
             baseurl: String = "https://api.fronyx.io/api/",
             context: Context? = null
-        ): FronyxApi {
+        ): FronyxApiRetrofit {
             val client = OkHttpClient.Builder().apply {
                 addInterceptor { chain ->
                     // add API key to every request
@@ -56,9 +61,28 @@ interface FronyxApi {
                 .addConverterFactory(MoshiConverterFactory.create(moshi))
                 .client(client)
                 .build()
-            return retrofit.create(FronyxApi::class.java)
+            return retrofit.create(FronyxApiRetrofit::class.java)
         }
+    }
+}
 
+class FronyxApi(
+    apikey: String,
+    baseurl: String = "https://api.fronyx.io/api/",
+    context: Context? = null
+) {
+    private val api = FronyxApiRetrofit.create(apikey, baseurl, context)
+
+    suspend fun getPredictionsForEvseId(
+        evseId: String,
+        timeframe: Int? = null
+    ): FronyxEvseIdResponse = api.getPredictionsForEvseId(evseId, timeframe)
+
+    suspend fun getPredictionsForEvseIds(
+        evseIds: List<String>
+    ): List<FronyxEvseIdResponse> = api.getPredictionsForEvseIds(evseIds.joinToString(","))
+
+    companion object {
         /**
          * Checks if a chargepoint is supported by Fronyx.
          *

app/src/main/java/net/vonforst/evmap/api/fronyx/FronyxModel.kt

@@ -6,7 +6,8 @@ import java.time.ZonedDateTime
 @JsonClass(generateAdapter = true)
 data class FronyxEvseIdResponse(
     val evseId: String,
-    val predictions: List<FronyxPrediction>
+    val predictions: List<FronyxPrediction>,
+    val locationId: String?
 )
 
 @JsonClass(generateAdapter = true)

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

@@ -5,6 +5,7 @@ import com.squareup.moshi.*
 import java.lang.reflect.Type
 import java.time.Instant
 import java.time.LocalTime
+import java.time.format.DateTimeParseException
 
 
 internal class ChargepointListItemJsonAdapterFactory : JsonAdapter.Factory {
@@ -71,10 +72,10 @@ internal class JsonObjectOrFalseAdapter<T> private constructor(
     private val clazz: Class<*>
 ) : JsonAdapter<T>() {
 
-    class Factory() : JsonAdapter.Factory {
+    class Factory : JsonAdapter.Factory {
         override fun create(
             type: Type,
-            annotations: Set<Annotation>?,
+            annotations: Set<Annotation>,
             moshi: Moshi
         ): JsonAdapter<Any>? {
             val clazz = Types.getRawType(type)
@@ -138,7 +139,12 @@ internal class HoursAdapter {
                 val end = if (match.groupValues[2] == "24:00") {
                     LocalTime.MAX
                 } else {
-                    LocalTime.parse(match.groupValues[2])
+                    try {
+                        LocalTime.parse(match.groupValues[2])
+                    } catch (e: DateTimeParseException) {
+                        // got a rare bug report where the value is 24:0000
+                        LocalTime.MIN
+                    }
                 }
                 return GEHours(start, end)
             } else {

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

@@ -399,10 +399,10 @@ class GoingElectricApiWrapper(
         referenceData: ReferenceData,
         sp: StringProvider
     ): List<Filter<FilterValue>> {
-        val referenceData = referenceData as GEReferenceData
-        val plugs = referenceData.plugs
-        val networks = referenceData.networks
-        val chargeCards = referenceData.chargecards
+        val refData = referenceData as GEReferenceData
+        val plugs = refData.plugs
+        val networks = refData.networks
+        val chargeCards = refData.chargecards
 
         val plugMap = plugs.map { plug ->
             plug to nameForPlugType(sp, GEChargepoint.convertTypeFromGE(plug))

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

@@ -77,6 +77,8 @@ data class GEChargeLocation(
         cost?.convert(),
         null,
         ChargepriceData(address.country, network, chargepoints.map { it.type }),
+        null,
+        null,
         Instant.now(),
         isDetailed
     )
@@ -147,7 +149,7 @@ data class GEChargerPhoto(val id: String) {
 @JsonClass(generateAdapter = true)
 class GEChargerPhotoAdapter(override val id: String, val apikey: String) :
     ChargerPhoto(id) {
-    override fun getUrl(height: Int?, width: Int?, size: Int?): String {
+    override fun getUrl(height: Int?, width: Int?, size: Int?, allowOriginal: Boolean): String {
         return "https://api.goingelectric.de/chargepoints/photo/?key=${apikey}&id=$id" +
                 when {
                     size != null -> "&size=$size"

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

@@ -120,7 +120,7 @@ class OpenChargeMapApiWrapper(
         zoom: Float,
         filters: FilterValues?,
     ): Resource<List<ChargepointListItem>> {
-        val referenceData = referenceData as OCMReferenceData
+        val refData = referenceData as OCMReferenceData
 
         val minPower = filters?.getSliderValue("min_power")?.toDouble()
         val minConnectors = filters?.getSliderValue("min_connectors")
@@ -133,7 +133,7 @@ class OpenChargeMapApiWrapper(
         }
         val connectors = formatMultipleChoice(connectorsVal)
 
-        val operatorsVal = filters?.getMultipleChoiceValue("operators")!!
+        val operatorsVal = filters?.getMultipleChoiceValue("operators")
         if (operatorsVal != null && operatorsVal.values.isEmpty() && !operatorsVal.all) {
             // no operators chosen
             return Resource.success(emptyList())
@@ -148,8 +148,7 @@ class OpenChargeMapApiWrapper(
                 ),
                 minPower = minPower,
                 plugs = connectors,
-                operators = operators,
-                statusType = if (excludeFaults == true) noFaultStatuses.joinToString(",") else null
+                operators = operators
             )
             if (!response.isSuccessful) {
                 return Resource.error(response.message(), null)
@@ -160,7 +159,8 @@ class OpenChargeMapApiWrapper(
                 minPower,
                 connectorsVal,
                 minConnectors,
-                referenceData,
+                excludeFaults,
+                refData,
                 zoom
             )
             return Resource.success(result)
@@ -176,7 +176,7 @@ class OpenChargeMapApiWrapper(
         zoom: Float,
         filters: FilterValues?
     ): Resource<List<ChargepointListItem>> {
-        val referenceData = referenceData as OCMReferenceData
+        val refData = referenceData as OCMReferenceData
 
         val minPower = filters?.getSliderValue("min_power")?.toDouble()
         val minConnectors = filters?.getSliderValue("min_connectors")
@@ -202,8 +202,7 @@ class OpenChargeMapApiWrapper(
                 radius.toDouble(),
                 minPower = minPower,
                 plugs = connectors,
-                operators = operators,
-                statusType = if (excludeFaults == true) noFaultStatuses.joinToString(",") else null
+                operators = operators
             )
             if (!response.isSuccessful) {
                 return Resource.error(response.message(), null)
@@ -214,7 +213,8 @@ class OpenChargeMapApiWrapper(
                 minPower,
                 connectorsVal,
                 minConnectors,
-                referenceData,
+                excludeFaults,
+                refData,
                 zoom
             )
             return Resource.success(result)
@@ -228,6 +228,7 @@ class OpenChargeMapApiWrapper(
         minPower: Double?,
         connectorsVal: MultipleChoiceFilterValue?,
         minConnectors: Int?,
+        excludeFaults: Boolean?,
         referenceData: OCMReferenceData,
         zoom: Float
     ): List<ChargepointListItem> {
@@ -237,6 +238,8 @@ class OpenChargeMapApiWrapper(
                 .filter { it.power == null || it.power >= (minPower ?: 0.0) }
                 .filter { if (connectorsVal != null && !connectorsVal.all) it.connectionTypeId in connectorsVal.values.map { it.toLong() } else true }
                 .sumOf { it.quantity ?: 1 } >= (minConnectors ?: 0)
+        }.filter {
+            it.statusTypeId == null || (it.statusTypeId !in removedStatuses && if (excludeFaults == true) it.statusTypeId !in faultStatuses else true)
         }.map { it.convert(referenceData, false) }.distinct() as List<ChargepointListItem>
 
         // apply clustering
@@ -254,11 +257,11 @@ class OpenChargeMapApiWrapper(
         referenceData: ReferenceData,
         id: Long
     ): Resource<ChargeLocation> {
-        val referenceData = referenceData as OCMReferenceData
+        val refData = referenceData as OCMReferenceData
         try {
             val response = api.getChargepointDetail(id)
             if (response.isSuccessful && response.body()?.size == 1) {
-                return Resource.success(response.body()!![0].convert(referenceData, true))
+                return Resource.success(response.body()!![0].convert(refData, true))
             } else {
                 return Resource.error(response.message(), null)
             }
@@ -284,10 +287,10 @@ class OpenChargeMapApiWrapper(
         referenceData: ReferenceData,
         sp: StringProvider
     ): List<Filter<FilterValue>> {
-        val referenceData = referenceData as OCMReferenceData
+        val refData = referenceData as OCMReferenceData
 
-        val operatorsMap = referenceData.operators.map { it.id.toString() to it.title }.toMap()
-        val plugMap = referenceData.connectionTypes.map { it.id.toString() to it.title }.toMap()
+        val operatorsMap = refData.operators.map { it.id.toString() to it.title }.toMap()
+        val plugMap = refData.connectionTypes.map { it.id.toString() to it.title }.toMap()
 
         return listOf(
             // supported by OCM API

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

@@ -11,12 +11,15 @@ import java.time.Instant
 import java.time.ZonedDateTime
 
 // Unknown, Currently Available, Currently In Use, Operational
-val noFaultStatuses = listOf(0, 10, 20, 50)
+val noFaultStatuses = listOf(0L, 10L, 20L, 50L)
 
-// Temporarily Unavailable, Partly Operational, Not Operational, Planned For Future Date, Removed (Decommissioned)
-val faultStatuses = listOf(30L, 75L, 100L, 150L, 200L)
+// Temporarily Unavailable, Partly Operational, Not Operational, Planned For Future Date
+val faultStatuses = listOf(30L, 75L, 100L, 150L)
 val faultReportCommentType = 1000L
 
+// Removed (Decommissioned), Removed (Duplicate Listing)
+val removedStatuses = listOf(200L, 210L)
+
 data class OCMBoundingBox(
     val sw_lat: Double, val sw_lng: Double,
     val ne_lat: Double, val ne_lng: Double
@@ -71,10 +74,16 @@ data class OCMChargepoint(
             addressInfo.countryISOCode(refData),
             operatorId?.toString(),
             connections.map { "${it.connectionTypeId},${it.currentTypeId}" }),
+        operatorInfo?.websiteUrl,
+        if (operatorInfo?.websiteUrl?.withoutTrailingSlash() != addressInfo.relatedUrl?.withoutTrailingSlash()) addressInfo.relatedUrl else null,
         Instant.now(),
         isDetailed
     )
 
+    private fun String.withoutTrailingSlash(): String {
+        return this.replace(Regex("/$"), "")
+    }
+
     private fun convertFaultReport(): FaultReport? {
         if (statusTypeId in faultStatuses || connections.any { it.statusTypeId in faultStatuses }) {
             if (userComments != null) {
@@ -251,14 +260,13 @@ class OCMChargerPhotoAdapter(
     val largeUrl: String,
     val thumbUrl: String
 ) : ChargerPhoto(id) {
-    override fun getUrl(height: Int?, width: Int?, size: Int?): String {
+    override fun getUrl(height: Int?, width: Int?, size: Int?, allowOriginal: Boolean): String {
         val maxSize = size ?: max(height, width)
         val mediumUrl = thumbUrl.replace(".thmb.", ".medi.")
         return when (maxSize) {
-            0 -> mediumUrl
-            in 1..100 -> thumbUrl
+            in 0..100 -> thumbUrl
             in 101..400 -> mediumUrl
-            else -> largeUrl
+            else -> if (allowOriginal) largeUrl else mediumUrl
         }
     }
 }

app/src/main/java/net/vonforst/evmap/api/openstreetmap/OpenStreetMapModel.kt

@@ -105,6 +105,8 @@ data class OSMChargingStation(
         getCost(),
         "© OpenStreetMap contributors",
         null,
+        null,
+        null,
         dataFetchTimestamp,
         true,
     )

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

@@ -167,7 +167,7 @@ class ChargepriceFragment : Fragment() {
             chargepriceAdapter.myTariffsAll = it
         }
         vm.chargePricesForChargepoint.observe(viewLifecycleOwner) {
-            chargepriceAdapter.submitList(it.data)
+            it?.data?.let { chargepriceAdapter.submitList(it) }
         }
 
         val connectorsAdapter = CheckableConnectorAdapter()

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

@@ -44,8 +44,7 @@ class FavoritesFragment : Fragment() {
     private val vm: FavoritesViewModel by viewModels(factoryProducer = {
         viewModelFactory {
             FavoritesViewModel(
-                requireActivity().application,
-                getString(R.string.goingelectric_key)
+                requireActivity().application
             )
         }
     })

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

@@ -98,6 +98,12 @@ class FilterFragment : Fragment(), MenuProvider {
                 saveProfile()
                 true
             }
+            R.id.menu_reset -> {
+                lifecycleScope.launch {
+                    vm.resetValues()
+                }
+                true
+            }
             else -> false
         }
     }
@@ -114,7 +120,7 @@ class FilterFragment : Fragment(), MenuProvider {
 
             dialog.setTitle(R.string.save_as_profile)
                 .setMessage(R.string.save_profile_enter_name)
-                .setPositiveButton(R.string.ok) { di, button ->
+                .setPositiveButton(R.string.ok) { _, _ ->
                     if (input.text.isBlank()) {
                         saveProfile(true)
                     } else {
@@ -124,7 +130,7 @@ class FilterFragment : Fragment(), MenuProvider {
                         }
                     }
                 }
-                .setNegativeButton(R.string.cancel) { di, button ->
+                .setNegativeButton(R.string.cancel) { _, _ ->
 
                 }
         }

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

@@ -188,12 +188,12 @@ class FilterProfilesFragment : Fragment() {
 
                 dialog.setTitle(R.string.rename)
                     .setMessage(R.string.save_profile_enter_name)
-                    .setPositiveButton(R.string.ok) { di, button ->
+                    .setPositiveButton(R.string.ok) { _, _ ->
                         lifecycleScope.launch {
                             vm.update(fp.copy(name = input.text.toString()))
                         }
                     }
-                    .setNegativeButton(R.string.cancel) { di, button ->
+                    .setNegativeButton(R.string.cancel) { _, _ ->
 
                     }
             }

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

@@ -91,6 +91,7 @@ import kotlin.collections.component1
 import kotlin.collections.component2
 import kotlin.collections.contains
 import kotlin.collections.set
+import kotlin.math.min
 
 
 class MapFragment : Fragment(), OnMapReadyCallback, MapsActivity.FragmentCallback, MenuProvider {
@@ -197,7 +198,7 @@ class MapFragment : Fragment(), OnMapReadyCallback, MapsActivity.FragmentCallbac
 
         ViewCompat.setOnApplyWindowInsetsListener(
             binding.root
-        ) { v, insets ->
+        ) { _, insets ->
             ViewCompat.onApplyWindowInsets(binding.root, insets)
 
             val systemWindowInsetTop = insets.getInsets(WindowInsetsCompat.Type.statusBars()).top
@@ -376,6 +377,10 @@ class MapFragment : Fragment(), OnMapReadyCallback, MapsActivity.FragmentCallbac
                 null, extras
             )
         }
+        binding.detailView.btnChargerWebsite.setOnClickListener {
+            val charger = vm.charger.value?.data ?: return@setOnClickListener
+            charger.chargerUrl?.let { (activity as? MapsActivity)?.openUrl(it) }
+        }
         binding.detailView.imgPredictionSource.setOnClickListener {
             (activity as? MapsActivity)?.openUrl(getString(R.string.fronyx_url))
         }
@@ -465,7 +470,7 @@ class MapFragment : Fragment(), OnMapReadyCallback, MapsActivity.FragmentCallbac
                     }
                 )
             }
-        binding.search.onFocusChangeListener = View.OnFocusChangeListener { v, hasFocus ->
+        binding.search.onFocusChangeListener = View.OnFocusChangeListener { _, hasFocus ->
             if (hasFocus) {
                 binding.search.keyListener = searchKeyListener
                 binding.search.text = binding.search.text  // workaround to fix copy/paste
@@ -553,7 +558,17 @@ class MapFragment : Fragment(), OnMapReadyCallback, MapsActivity.FragmentCallbac
         bottomSheetBehavior.addBottomSheetCallback(object :
             BottomSheetBehaviorGoogleMapsLike.BottomSheetCallback() {
             override fun onSlide(bottomSheet: View, slideOffset: Float) {
-
+                if (bottomSheetBehavior.state == STATE_HIDDEN) {
+                    map?.setPadding(0, mapTopPadding, 0, 0)
+                } else {
+                    val height = binding.root.height - bottomSheet.top
+                    map?.setPadding(
+                        0,
+                        mapTopPadding,
+                        0,
+                        min(bottomSheetBehavior.peekHeight, height)
+                    )
+                }
             }
 
             override fun onStateChanged(bottomSheet: View, newState: Int) {
@@ -561,9 +576,9 @@ class MapFragment : Fragment(), OnMapReadyCallback, MapsActivity.FragmentCallbac
                 updateBackPressedCallback()
 
                 if (vm.layersMenuOpen.value!! && newState !in listOf(
-                        BottomSheetBehaviorGoogleMapsLike.STATE_SETTLING,
-                        BottomSheetBehaviorGoogleMapsLike.STATE_HIDDEN,
-                        BottomSheetBehaviorGoogleMapsLike.STATE_COLLAPSED
+                        STATE_SETTLING,
+                        STATE_HIDDEN,
+                        STATE_COLLAPSED
                     )
                 ) {
                     closeLayersMenu()
@@ -742,12 +757,10 @@ class MapFragment : Fragment(), OnMapReadyCallback, MapsActivity.FragmentCallbac
                 val photos = vm.charger.value?.data?.photos ?: return
 
                 viewer = StfalconImageViewer.Builder(context, photos) { imageView, photo ->
-                    imageView.load(photo.getUrl(size = 1000)) {
+                    imageView.load(photo.getUrl(size = 1000, allowOriginal = true)) {
                         if (photo == photos[position] && imageCacheKey != null) {
                             placeholderMemoryCacheKey(imageCacheKey)
                         }
-                        size(SizeResolver(OriginalSize))
-                        allowHardware(false)
                     }
                 }
                     .withTransitionFrom(view as ImageView)
@@ -799,6 +812,9 @@ class MapFragment : Fragment(), OnMapReadyCallback, MapsActivity.FragmentCallbac
                             R.drawable.ic_payment -> {
                                 showPaymentMethodsDialog(charger)
                             }
+                            R.drawable.ic_network -> {
+                                charger.networkUrl?.let { (activity as? MapsActivity)?.openUrl(it) }
+                            }
                         }
                     }
                 }
@@ -1189,6 +1205,7 @@ class MapFragment : Fragment(), OnMapReadyCallback, MapsActivity.FragmentCallbac
             )
             popup.menuInflater.inflate(R.menu.popup_filter, popup.menu)
             MenuCompat.setGroupDividerEnabled(popup.menu, true)
+            popup.setForceShowIcon(true)
             popup.setOnMenuItemClickListener {
                 when (it.itemId) {
                     R.id.menu_edit_filters -> {

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

@@ -17,7 +17,7 @@ class MultiSelectDialog : MaterialDialogFragment() {
     companion object {
         fun getInstance(
             title: String,
-            data: Map<String, String>,
+            data: Map<String, CharSequence>,
             selected: Set<String>,
             commonChoices: Set<String>?,
             showAllButton: Boolean = true
@@ -55,7 +55,7 @@ class MultiSelectDialog : MaterialDialogFragment() {
 
     override fun initView(view: View, savedInstanceState: Bundle?) {
         val args = requireArguments()
-        val data = args.getSerializable("data") as HashMap<String, String>
+        val data = args.getSerializable("data") as HashMap<String, CharSequence>
         val selected = args.getSerializable("selected") as HashSet<String>
         val title = args.getString("title")
         val commonChoices = if (args.containsKey("commonChoices")) {
@@ -71,7 +71,7 @@ class MultiSelectDialog : MaterialDialogFragment() {
         binding.btnAll.visibility = if (showAllButton) View.VISIBLE else View.INVISIBLE
 
         items = data.entries.toList()
-            .sortedBy { it.value.toLowerCase(Locale.getDefault()) }
+            .sortedBy { it.value.toString().lowercase(Locale.getDefault()) }
             .sortedBy {
                 when {
                     selected.contains(it.key) && commonChoices?.contains(it.key) == true -> 0
@@ -117,7 +117,7 @@ private fun search(
 ): List<MultiSelectItem> {
     return items.filter { item ->
         // search for string within name
-        text.toLowerCase(Locale.getDefault()) in item.name.toLowerCase(Locale.getDefault())
+        text.lowercase(Locale.getDefault()) in item.name.toString().lowercase(Locale.getDefault())
     }
 }
 
@@ -125,4 +125,5 @@ class Adapter() : DataBindingAdapter<MultiSelectItem>({ it.key }) {
     override fun getItemViewType(position: Int) = R.layout.dialog_multi_select_item
 }
 
-data class MultiSelectItem(val key: String, val name: String, var selected: Boolean) : Equatable
+data class MultiSelectItem(val key: String, val name: CharSequence, var selected: Boolean) :
+    Equatable

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

@@ -2,13 +2,19 @@ package net.vonforst.evmap.fragment.preference
 
 import android.content.SharedPreferences
 import android.os.Bundle
+import android.text.SpannableStringBuilder
+import android.text.Spanned
+import android.text.style.ImageSpan
+import android.text.style.RelativeSizeSpan
 import android.view.View
+import androidx.appcompat.content.res.AppCompatResources
 import androidx.fragment.app.viewModels
-import androidx.preference.MultiSelectListPreference
 import net.vonforst.evmap.R
+import net.vonforst.evmap.ui.MultiSelectDialogPreference
 import net.vonforst.evmap.viewmodel.SettingsViewModel
 import net.vonforst.evmap.viewmodel.viewModelFactory
 
+
 class ChargepriceSettingsFragment : BaseSettingsFragment() {
     override val isTopLevel = false
 
@@ -22,8 +28,8 @@ class ChargepriceSettingsFragment : BaseSettingsFragment() {
         }
     })
 
-    private lateinit var myVehiclePreference: MultiSelectListPreference
-    private lateinit var myTariffsPreference: MultiSelectListPreference
+    private lateinit var myVehiclePreference: MultiSelectDialogPreference
+    private lateinit var myTariffsPreference: MultiSelectDialogPreference
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
@@ -34,8 +40,16 @@ class ChargepriceSettingsFragment : BaseSettingsFragment() {
             res.data?.let { cars ->
                 val sortedCars = cars.sortedBy { it.brand }
                 myVehiclePreference.entryValues = sortedCars.map { it.id }.toTypedArray()
-                myVehiclePreference.entries =
-                    sortedCars.map { "${it.brand} ${it.name}" }.toTypedArray()
+                myVehiclePreference.entries = sortedCars.map {
+                    SpannableStringBuilder().apply {
+                        appendLine("${it.brand} ${it.name}")
+                        append(
+                            it.formatSpecs(),
+                            RelativeSizeSpan(0.86f),
+                            Spanned.SPAN_INCLUSIVE_EXCLUSIVE
+                        )
+                    }
+                }.toTypedArray()
                 myVehiclePreference.isEnabled = true
                 updateMyVehiclesSummary()
             }

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

@@ -19,8 +19,6 @@ import java.time.LocalTime
 import java.time.format.DateTimeFormatter
 import java.time.format.FormatStyle
 import java.util.*
-import kotlin.math.abs
-import kotlin.math.floor
 
 sealed class ChargepointListItem
 
@@ -64,8 +62,8 @@ data class ChargeLocation(
     @Embedded val address: Address?,
     val chargepoints: List<Chargepoint>,
     val network: String?,
-    val url: String,
-    val editUrl: String?,
+    val url: String,  // URL of this charger at the data source
+    val editUrl: String?,  // URL to edit this charger at the data source
     @Embedded(prefix = "fault_report_") val faultReport: FaultReport?,
     val verified: Boolean,
     val barrierFree: Boolean?,
@@ -80,6 +78,8 @@ data class ChargeLocation(
     @Embedded val cost: Cost?,
     val license: String?,
     @Embedded(prefix = "chargeprice") val chargepriceData: ChargepriceData?,
+    val networkUrl: String?,  // Website of the network
+    val chargerUrl: String?,  // Website for this specific charging site. Might be an ad-hoc payment page.
     val timeRetrieved: Instant,
     val isDetailed: Boolean
 ) : ChargepointListItem(), Equatable, Parcelable {
@@ -113,7 +113,7 @@ data class ChargeLocation(
 
         // check if there is more than one plug for any connector type
         val chargepointsPerConnector =
-            connectors.map { conn -> chargepoints.filter { it.type == conn }.sumBy { it.count } }
+            connectors.map { conn -> chargepoints.filter { it.type == conn }.sumOf { it.count } }
         return chargepointsPerConnector.any { it > 1 }
     }
 
@@ -129,13 +129,13 @@ data class ChargeLocation(
             return variants.map { variant ->
                 val count = chargepoints
                     .filter { it.type == variant.type && it.power == variant.power }
-                    .sumBy { it.count }
+                    .sumOf { it.count }
                 Chargepoint(variant.type, variant.power, count)
             }
         }
 
     val totalChargepoints: Int
-        get() = chargepoints.sumBy { it.count }
+        get() = chargepoints.sumOf { it.count }
 
     fun formatChargepoints(sp: StringProvider): String {
         return chargepointsMerged.map {
@@ -334,7 +334,19 @@ data class Hours(
 }
 
 abstract class ChargerPhoto(open val id: String) : Parcelable {
-    abstract fun getUrl(height: Int? = null, width: Int? = null, size: Int? = null): String
+    /**
+     * Gets a URL of the image corresponding to a given size.
+     *
+     * If the data source supports accessing the image in its original (potentially unlimited) size,
+     * this size will only be returned if allowOriginal is set to true. Otherwise, only scaled
+     * versions of the images will be returned.
+     */
+    abstract fun getUrl(
+        height: Int? = null,
+        width: Int? = null,
+        size: Int? = null,
+        allowOriginal: Boolean = false
+    ): String
 }
 
 data class ChargeLocationCluster(
@@ -343,28 +355,7 @@ data class ChargeLocationCluster(
 ) : ChargepointListItem()
 
 @Parcelize
-data class Coordinate(val lat: Double, val lng: Double) : Parcelable {
-    fun formatDMS(): String {
-        return "${dms(lat, false)}, ${dms(lng, true)}"
-    }
-
-    private fun dms(value: Double, lon: Boolean): String {
-        val hemisphere = if (lon) {
-            if (value >= 0) "E" else "W"
-        } else {
-            if (value >= 0) "N" else "S"
-        }
-        val d = abs(value)
-        val degrees = floor(d).toInt()
-        val minutes = floor((d - degrees) * 60).toInt()
-        val seconds = ((d - degrees) * 60 - minutes) * 60
-        return "%d°%02d'%02.1f\"%s".format(Locale.ENGLISH, degrees, minutes, seconds, hemisphere)
-    }
-
-    fun formatDecimal(): String {
-        return "%.6f, %.6f".format(Locale.ENGLISH, lat, lng)
-    }
-}
+data class Coordinate(val lat: Double, val lng: Double) : Parcelable
 
 @Parcelize
 data class Address(

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

@@ -32,7 +32,7 @@ import net.vonforst.evmap.model.*
         OCMConnectionType::class,
         OCMCountry::class,
         OCMOperator::class
-    ], version = 18
+    ], version = 19
 )
 @TypeConverters(Converters::class)
 abstract class AppDatabase : RoomDatabase() {
@@ -56,7 +56,7 @@ abstract class AppDatabase : RoomDatabase() {
                     MIGRATION_2, MIGRATION_3, MIGRATION_4, MIGRATION_5, MIGRATION_6,
                     MIGRATION_7, MIGRATION_8, MIGRATION_9, MIGRATION_10, MIGRATION_11,
                     MIGRATION_12, MIGRATION_13, MIGRATION_14, MIGRATION_15, MIGRATION_16,
-                    MIGRATION_17, MIGRATION_18
+                    MIGRATION_17, MIGRATION_18, MIGRATION_19
                 )
                 .addCallback(object : Callback() {
                     override fun onCreate(db: SupportSQLiteDatabase) {
@@ -376,5 +376,12 @@ abstract class AppDatabase : RoomDatabase() {
             }
 
         }
+
+        private val MIGRATION_19 = object : Migration(18, 19) {
+            override fun migrate(db: SupportSQLiteDatabase) {
+                db.execSQL("ALTER TABLE `ChargeLocation` ADD `networkUrl` TEXT")
+                db.execSQL("ALTER TABLE `ChargeLocation` ADD `chargerUrl` TEXT")
+            }
+        }
     }
 }

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

@@ -1,29 +1,49 @@
 package net.vonforst.evmap.storage
 
-import androidx.lifecycle.liveData
+import androidx.lifecycle.LiveData
+import androidx.lifecycle.MediatorLiveData
+import androidx.lifecycle.MutableLiveData
 import androidx.room.*
 import net.vonforst.evmap.model.*
 
 @Dao
 abstract class FilterValueDao {
     @Query("SELECT * FROM booleanfiltervalue WHERE profile = :profile AND dataSource = :dataSource")
-    protected abstract suspend fun getBooleanFilterValues(
+    protected abstract suspend fun getBooleanFilterValuesAsync(
         profile: Long,
         dataSource: String
     ): List<BooleanFilterValue>
 
     @Query("SELECT * FROM multiplechoicefiltervalue WHERE profile = :profile AND dataSource = :dataSource")
-    protected abstract suspend fun getMultipleChoiceFilterValues(
+    protected abstract suspend fun getMultipleChoiceFilterValuesAsync(
         profile: Long,
         dataSource: String
     ): List<MultipleChoiceFilterValue>
 
     @Query("SELECT * FROM sliderfiltervalue WHERE profile = :profile AND dataSource = :dataSource")
-    protected abstract suspend fun getSliderFilterValues(
+    protected abstract suspend fun getSliderFilterValuesAsync(
         profile: Long,
         dataSource: String
     ): List<SliderFilterValue>
 
+    @Query("SELECT * FROM booleanfiltervalue WHERE profile = :profile AND dataSource = :dataSource")
+    protected abstract fun getBooleanFilterValues(
+        profile: Long,
+        dataSource: String
+    ): LiveData<List<BooleanFilterValue>>
+
+    @Query("SELECT * FROM multiplechoicefiltervalue WHERE profile = :profile AND dataSource = :dataSource")
+    protected abstract fun getMultipleChoiceFilterValues(
+        profile: Long,
+        dataSource: String
+    ): LiveData<List<MultipleChoiceFilterValue>>
+
+    @Query("SELECT * FROM sliderfiltervalue WHERE profile = :profile AND dataSource = :dataSource")
+    protected abstract fun getSliderFilterValues(
+        profile: Long,
+        dataSource: String
+    ): LiveData<List<SliderFilterValue>>
+
     @Insert(onConflict = OnConflictStrategy.REPLACE)
     protected abstract suspend fun insert(vararg values: BooleanFilterValue)
 
@@ -58,15 +78,32 @@ abstract class FilterValueDao {
         if (filterStatus == FILTERS_DISABLED || filterStatus == FILTERS_FAVORITES) {
             emptyList()
         } else {
-            getBooleanFilterValues(filterStatus, dataSource) +
-                    getMultipleChoiceFilterValues(filterStatus, dataSource) +
-                    getSliderFilterValues(filterStatus, dataSource)
+            getBooleanFilterValuesAsync(filterStatus, dataSource) +
+                    getMultipleChoiceFilterValuesAsync(filterStatus, dataSource) +
+                    getSliderFilterValuesAsync(filterStatus, dataSource)
         }
 
-    open fun getFilterValues(filterStatus: Long, dataSource: String) = liveData {
-        emit(null)
-        emit(getFilterValuesAsync(filterStatus, dataSource))
-    }
+    open fun getFilterValues(filterStatus: Long, dataSource: String): LiveData<List<FilterValue>?> =
+        if (filterStatus == FILTERS_DISABLED || filterStatus == FILTERS_FAVORITES) {
+            MutableLiveData(emptyList())
+        } else {
+            MediatorLiveData<List<FilterValue>?>().apply {
+                value = null
+                val sources = listOf(
+                    getBooleanFilterValues(filterStatus, dataSource),
+                    getMultipleChoiceFilterValues(filterStatus, dataSource),
+                    getSliderFilterValues(filterStatus, dataSource)
+                )
+                for (source in sources) {
+                    addSource(source) {
+                        val values = sources.map { it.value }
+                        if (values.all { it != null }) {
+                            value = values.filterNotNull().flatten()
+                        }
+                    }
+                }
+            }
+        }
 
     @Transaction
     open suspend fun insert(vararg values: FilterValue) {

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

@@ -255,4 +255,10 @@ class PreferenceDataSource(val context: Context) {
 
     val predictionEnabled: Boolean
         get() = sp.getBoolean("prediction_enabled", true)
+
+    var developerModeEnabled: Boolean
+        get() = sp.getBoolean("dev_mode_enabled", false)
+        set(value) {
+            sp.edit().putBoolean("dev_mode_enabled", value).apply()
+        }
 }

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

@@ -211,12 +211,12 @@ class BarGraphView(context: Context, attrs: AttributeSet) : View(context, attrs)
     private fun drawBubble(canvas: Canvas, data: SortedMap<ZonedDateTime, Int>, maxValue: Int) {
         val bubbleBounds = bubbleBounds ?: return
         val graphBounds = graphBounds ?: return
-        val data = data.toList()
+        val d = data.toList()
 
-        if (data.size <= selectedBar) return
+        if (d.size <= selectedBar) return
         canvas.apply {
             val center = graphBounds.left + selectedBar * (barWidth + barMargin) + barWidth * 0.5f
-            val (t, v) = data[selectedBar]
+            val (t, v) = d[selectedBar]
             val tformat = context.getString(
                 R.string.prediction_time_colon,
                 t.withZoneSameInstant(ZoneId.systemDefault()).format(timeFormat)

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

@@ -121,6 +121,7 @@ private fun activeTint(
 }
 
 @BindingAdapter("data")
+@Suppress("UNCHECKED_CAST")
 fun <T> setRecyclerViewData(recyclerView: RecyclerView, items: List<T>?) {
     if (recyclerView.adapter is ListAdapter<*, *>) {
         (recyclerView.adapter as ListAdapter<T, *>).submitList(items)
@@ -128,6 +129,7 @@ fun <T> setRecyclerViewData(recyclerView: RecyclerView, items: List<T>?) {
 }
 
 @BindingAdapter("data")
+@Suppress("UNCHECKED_CAST")
 fun <T> setRecyclerViewData(recyclerView: ViewPager2, items: List<T>?) {
     if (recyclerView.adapter is ListAdapter<*, *>) {
         (recyclerView.adapter as ListAdapter<T, *>).submitList(items)
@@ -325,10 +327,10 @@ fun distance(meters: Number?): String? {
     }
 }
 
-@InverseBindingAdapter(attribute = "app:values")
+@InverseBindingAdapter(attribute = "values")
 fun getRangeSliderValue(slider: RangeSlider) = slider.values
 
-@BindingAdapter("app:valuesAttrChanged")
+@BindingAdapter("valuesAttrChanged")
 fun setRangeSliderListeners(slider: RangeSlider, attrChange: InverseBindingListener) {
     slider.addOnChangeListener { _, _, _ ->
         attrChange.onChange()
@@ -348,7 +350,7 @@ fun colorEnabled(ctx: Context, enabled: Boolean): Int {
     return color
 }
 
-@BindingAdapter("app:tint")
+@BindingAdapter("tint")
 fun setImageTintList(view: ImageView, @ColorInt color: Int) {
     view.imageTintList = ColorStateList.valueOf(color)
 }

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

@@ -38,7 +38,7 @@ class MultiSelectDialogPreference(ctx: Context, attrs: AttributeSet) :
         val dialog =
             MultiSelectDialog.getInstance(
                 title.toString(),
-                entryValues.map { it.toString() }.zip(entries.map { it.toString() }).toMap(),
+                entryValues.map { it.toString() }.zip(entries).toMap(),
                 if (all) entryValues.map { it.toString() }.toSet() else values,
                 emptySet(),
                 showAllButton

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

@@ -89,12 +89,12 @@ class RangeSliderPreference(context: Context, attrs: AttributeSet) : Preference(
         slider.valueTo = valueTo
         stepSize?.let { slider.stepSize = it }
 
-        slider.addOnChangeListener { slider, value, fromUser ->
+        slider.addOnChangeListener { slider, _, fromUser ->
             if (fromUser && (updatesContinuously || !dragging)) {
                 syncValueInternal(slider)
             }
         }
-        slider.setOnTouchListener { v, event ->
+        slider.setOnTouchListener { _, event ->
             when (event.actionMasked) {
                 MotionEvent.ACTION_DOWN -> dragging = true
                 MotionEvent.ACTION_UP -> dragging = false

app/src/main/java/net/vonforst/evmap/utils/LocationUtils.kt

@@ -8,6 +8,8 @@ import android.location.Location
 import androidx.core.content.ContextCompat
 import com.car2go.maps.model.LatLng
 import com.car2go.maps.model.LatLngBounds
+import net.vonforst.evmap.model.Coordinate
+import java.util.*
 import kotlin.math.*
 
 /**
@@ -48,7 +50,7 @@ fun distanceBetween(
 
 
 fun bearingBetween(startLat: Double, startLng: Double, endLat: Double, endLng: Double): Double {
-    val dLon = Math.toRadians(-endLng) - Math.toRadians(-startLng)
+    val dLon = Math.toRadians(endLng) - Math.toRadians(startLng)
     val originLat = Math.toRadians(startLat)
     val destinationLat = Math.toRadians(endLat)
 
@@ -111,4 +113,33 @@ fun Context.checkAnyLocationPermission() = ContextCompat.checkSelfPermission(
 fun Context.checkFineLocationPermission() = ContextCompat.checkSelfPermission(
     this,
     Manifest.permission.ACCESS_FINE_LOCATION
-) == PackageManager.PERMISSION_GRANTED
+) == PackageManager.PERMISSION_GRANTED
+
+fun Coordinate.formatDMS(): String {
+    return "${dms(lat, false)}, ${dms(lng, true)}"
+}
+
+fun Location.formatDMS(): String {
+    return "${dms(latitude, false)}, ${dms(longitude, true)}"
+}
+
+private fun dms(value: Double, lon: Boolean): String {
+    val hemisphere = if (lon) {
+        if (value >= 0) "E" else "W"
+    } else {
+        if (value >= 0) "N" else "S"
+    }
+    val d = abs(value)
+    val degrees = floor(d).toInt()
+    val minutes = floor((d - degrees) * 60).toInt()
+    val seconds = ((d - degrees) * 60 - minutes) * 60
+    return "%d°%02d'%02.1f\"%s".format(Locale.ENGLISH, degrees, minutes, seconds, hemisphere)
+}
+
+fun Coordinate.formatDecimal(accuracy: Int = 6): String {
+    return "%.${accuracy}f, %.${accuracy}f".format(Locale.ENGLISH, lat, lng)
+}
+
+fun Location.formatDecimal(accuracy: Int = 6): String {
+    return "%.${accuracy}f, %.${accuracy}f".format(Locale.ENGLISH, latitude, longitude)
+}

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

@@ -16,7 +16,7 @@ import net.vonforst.evmap.model.FavoriteWithDetail
 import net.vonforst.evmap.storage.AppDatabase
 import net.vonforst.evmap.utils.distanceBetween
 
-class FavoritesViewModel(application: Application, geApiKey: String) :
+class FavoritesViewModel(application: Application) :
     AndroidViewModel(application) {
     private var db = AppDatabase.getInstance(application)
 
@@ -69,7 +69,7 @@ class FavoritesViewModel(application: Application, geApiKey: String) :
                     FavoritesListItem(
                         favorite,
                         totalAvailable(charger.id),
-                        charger.chargepoints.sumBy { it.count },
+                        charger.chargepoints.sumOf { it.count },
                         location.value.let { loc ->
                             if (loc == null) null else {
                                 distanceBetween(

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

@@ -92,4 +92,8 @@ class FilterViewModel(application: Application) : AndroidViewModel(application)
             prefs.filterStatus = FILTERS_DISABLED
         }
     }
+
+    suspend fun resetValues() {
+        db.filterValueDao().deleteFilterValuesForProfile(FILTERS_CUSTOM, prefs.dataSource)
+    }
 }

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

@@ -7,6 +7,7 @@ import com.car2go.maps.AnyMap
 import com.car2go.maps.model.LatLng
 import com.car2go.maps.model.LatLngBounds
 import com.mahc.custombottomsheetbehavior.BottomSheetBehaviorGoogleMapsLike
+import com.squareup.moshi.JsonDataException
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
@@ -229,7 +230,7 @@ class MapViewModel(application: Application, private val state: SavedStateHandle
         }
     }
 
-    val predictionApi = FronyxApi.create(application.getString(R.string.fronyx_key))
+    val predictionApi = FronyxApi(application.getString(R.string.fronyx_key))
 
     val prediction: LiveData<Resource<List<FronyxEvseIdResponse>>> by lazy {
         availability.switchMap { av ->
@@ -249,14 +250,17 @@ class MapViewModel(application: Application, private val state: SavedStateHandle
                                         ).any { filtered.contains(it) }
                                     } ?: true
                         }.flatMap { it.value }
-
+                    if (allEvseIds.isEmpty()) {
+                        emit(Resource.success(emptyList()))
+                        return@liveData
+                    }
                     try {
-                        val result = allEvseIds.map {
-                            predictionApi.getPredictionsForEvseId(it)
+                        val result = predictionApi.getPredictionsForEvseIds(allEvseIds)
+                        if (result.size == allEvseIds.size) {
+                            emit(Resource.success(result))
+                        } else {
+                            emit(Resource.error("not all EVSEIDs found", null))
                         }
-
-                        emit(Resource.success(result))
-                        println(result)
                     } catch (e: IOException) {
                         emit(Resource.error(e.message, null))
                         e.printStackTrace()
@@ -266,6 +270,10 @@ class MapViewModel(application: Application, private val state: SavedStateHandle
                     } catch (e: AvailabilityDetectorException) {
                         emit(Resource.error(e.message, null))
                         e.printStackTrace()
+                    } catch (e: JsonDataException) {
+                        // malformed JSON response from fronyx API
+                        emit(Resource.error(e.message, null))
+                        e.printStackTrace()
                     }
                 }
             } ?: liveData { emit(Resource.success(null)) }

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

@@ -13,7 +13,7 @@ import java.util.concurrent.atomic.AtomicBoolean
 @Suppress("UNCHECKED_CAST")
 inline fun <VM : ViewModel> viewModelFactory(crossinline f: () -> VM) =
     object : ViewModelProvider.Factory {
-        override fun <T : ViewModel> create(aClass: Class<T>): T = f() as T
+        override fun <T : ViewModel> create(modelClass: Class<T>): T = f() as T
     }
 
 @Suppress("UNCHECKED_CAST")
@@ -106,7 +106,8 @@ fun <T> throttleLatest(
     }
 }
 
-public suspend fun <T> LiveData<T>.await(): T {
+@ExperimentalCoroutinesApi
+suspend fun <T> LiveData<T>.await(): T {
     return suspendCancellableCoroutine { continuation ->
         val observer = object : Observer<T> {
             override fun onChanged(value: T?) {
@@ -124,7 +125,8 @@ public suspend fun <T> LiveData<T>.await(): T {
     }
 }
 
-public suspend fun <T> LiveData<Resource<T>>.awaitFinished(): Resource<T> {
+@ExperimentalCoroutinesApi
+suspend fun <T> LiveData<Resource<T>>.awaitFinished(): Resource<T> {
     return suspendCancellableCoroutine { continuation ->
         val observer = object : Observer<Resource<T>> {
             override fun onChanged(value: Resource<T>) {

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

@@ -0,0 +1,10 @@
+<vector android:height="24dp"
+    android:tint="?attr/colorControlNormal"
+    android:viewportHeight="24"
+    android:viewportWidth="24"
+    android:width="24dp"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M10.83,8H21V6H8.83L10.83,8zM15.83,13H18v-2h-4.17L15.83,13zM14,16.83V18h-4v-2h3.17l-3,-3H6v-2h2.17l-3,-3H3V6h0.17L1.39,4.22l1.41,-1.41l18.38,18.38l-1.41,1.41L14,16.83z" />
+</vector>

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

@@ -0,0 +1,10 @@
+<vector android:height="24dp"
+    android:tint="#000000"
+    android:viewportHeight="24"
+    android:viewportWidth="24"
+    android:width="24dp"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M3.9,12c0,-1.71 1.39,-3.1 3.1,-3.1h4L11,7L7,7c-2.76,0 -5,2.24 -5,5s2.24,5 5,5h4v-1.9L7,15.1c-1.71,0 -3.1,-1.39 -3.1,-3.1zM8,13h8v-2L8,11v2zM17,7h-4v1.9h4c1.71,0 3.1,1.39 3.1,3.1s-1.39,3.1 -3.1,3.1h-4L13,17h4c2.76,0 5,-2.24 5,-5s-2.24,-5 -5,-5z" />
+</vector>

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

@@ -0,0 +1,10 @@
+<vector android:height="24dp"
+    android:tint="?attr/colorControlNormal"
+    android:viewportHeight="24"
+    android:viewportWidth="24"
+    android:width="24dp"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M3,10h11v2H3V10zM3,8h11V6H3V8zM3,16h7v-2H3V16zM18.01,12.87l0.71,-0.71c0.39,-0.39 1.02,-0.39 1.41,0l0.71,0.71c0.39,0.39 0.39,1.02 0,1.41l-0.71,0.71L18.01,12.87zM17.3,13.58l-5.3,5.3V21h2.12l5.3,-5.3L17.3,13.58z" />
+</vector>

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

@@ -330,20 +330,6 @@
                 app:layout_constraintStart_toStartOf="@+id/guideline"
                 app:layout_constraintTop_toTopOf="@+id/txtName" />
 
-            <Button
-                android:id="@+id/btnChargeprice"
-                style="@style/Widget.Material3.Button.TonalButton"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="8dp"
-                android:text="@string/go_to_chargeprice"
-                android:transitionName="@string/shared_element_chargeprice"
-                app:goneUnless="@{charger.data != null &amp;&amp; ChargepriceApi.isChargerSupported(charger.data)}"
-                app:icon="@drawable/ic_chargeprice"
-                app:layout_constraintEnd_toStartOf="@+id/guideline2"
-                app:layout_constraintStart_toStartOf="@+id/guideline"
-                app:layout_constraintTop_toBottomOf="@+id/divider1" />
-
             <View
                 android:id="@+id/divider2"
                 android:layout_width="match_parent"
@@ -359,7 +345,7 @@
                 android:layout_marginTop="8dp"
                 android:background="?android:attr/listDivider"
                 app:goneUnless="@{charger.data != null &amp;&amp; ChargepriceApi.isChargerSupported(charger.data)}"
-                app:layout_constraintTop_toBottomOf="@+id/btnChargeprice" />
+                app:layout_constraintTop_toBottomOf="@+id/buttonsScroller" />
 
             <TextView
                 android:id="@+id/textView8"
@@ -501,6 +487,45 @@
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintTop_toTopOf="@+id/textView7" />
 
+            <HorizontalScrollView
+                android:id="@+id/buttonsScroller"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="8dp"
+                app:layout_constraintEnd_toStartOf="@+id/guideline2"
+                app:layout_constraintStart_toStartOf="@+id/guideline"
+                app:layout_constraintTop_toBottomOf="@+id/divider1"
+                app:layout_constrainedWidth="true"
+                android:fillViewport="true">
+
+                <LinearLayout
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:orientation="horizontal">
+
+                    <Button
+                        android:id="@+id/btnChargeprice"
+                        style="@style/Widget.Material3.Button.TonalButton"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="@string/go_to_chargeprice"
+                        android:transitionName="@string/shared_element_chargeprice"
+                        app:goneUnless="@{charger.data != null &amp;&amp; ChargepriceApi.isChargerSupported(charger.data)}"
+                        app:icon="@drawable/ic_chargeprice" />
+
+                    <Button
+                        android:id="@+id/btnChargerWebsite"
+                        style="@style/Widget.Material3.Button.OutlinedButton"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginStart="8dp"
+                        android:text="@string/charger_website"
+                        app:goneUnless="@{charger.data != null &amp;&amp; charger.data.chargerUrl != null}"
+                        app:icon="@drawable/ic_link" />
+
+                </LinearLayout>
+            </HorizontalScrollView>
+
         </androidx.constraintlayout.widget.ConstraintLayout>
 
     </com.google.android.material.card.MaterialCardView>

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

@@ -230,6 +230,7 @@
             android:theme="@style/ThemeOverlay.Material3.Dark.ActionBar" />
 
         <com.google.android.material.floatingactionbutton.FloatingActionButton
+            style="@style/Widget.Material3.FloatingActionButton.Small.Surface"
             android:id="@+id/fab_layers"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -239,9 +240,7 @@
             android:layout_marginEnd="20dp"
             android:layout_marginTop="@dimen/layers_fab_top_padding"
             app:tint="?android:colorControlNormal"
-            app:backgroundTint="?android:colorBackground"
             app:borderWidth="0dp"
-            app:fabSize="mini"
             app:srcCompat="@drawable/ic_layers"
             app:layout_behavior="@string/hide_on_scroll_fab_behavior"
             android:theme="@style/NoElevationOverlay" />

app/src/main/res/menu/filter.xml

@@ -1,6 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto">
+    <item
+        android:id="@+id/menu_reset"
+        android:title="@string/menu_reset"
+        android:icon="@drawable/ic_filter_no"
+        app:showAsAction="ifRoom" />
+
     <item
         android:id="@+id/menu_save_profile"
         android:title="@string/menu_save_profile"

app/src/main/res/menu/popup_filter.xml

@@ -8,9 +8,11 @@
     <item
         android:id="@+id/menu_edit_filters"
         android:title="@string/menu_edit_filters"
-        android:menuCategory="secondary" />
+        android:menuCategory="secondary"
+        android:icon="@drawable/ic_edit" />
     <item
         android:id="@+id/menu_manage_filter_profiles"
         android:title="@string/menu_manage_filter_profiles"
-        android:menuCategory="secondary" />
+        android:menuCategory="secondary"
+        android:icon="@drawable/ic_manage_filter_profiles" />
 </menu>

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

@@ -42,7 +42,7 @@
     <string name="settings_ui">Oberfläche</string>
     <string name="settings_map">Karte</string>
     <string name="copyright">Copyright</string>
-    <string name="copyright_summary">©2020–2022 Johan von Forstner</string>
+    <string name="copyright_summary">©2020–2023 Johan von Forstner</string>
     <string name="other">Sonstiges</string>
     <string name="privacy">Datenschutzerklärung</string>
     <string name="fav_add">Als Favorit speichern</string>
@@ -143,13 +143,14 @@
     <string name="category_caravan_site">Wohnmobilstellplatz</string>
     <string name="menu_apply">Filter anwenden</string>
     <string name="menu_save_profile">Als Profil speichern</string>
+    <string name="menu_reset">Filter zurücksetzen</string>
     <string name="no_filters">Keine Filter</string>
     <string name="filter_custom">Verändertes Filterprofil</string>
     <string name="filter_favorites">Favoriten</string>
     <string name="reorder">Reihenfolge ändern</string>
     <string name="delete">Löschen</string>
     <string name="save_as_profile">Als Profil speichern</string>
-    <string name="save_profile_enter_name">Geben Sie den Namen des Filterprofils ein:</string>
+    <string name="save_profile_enter_name">Gib den Namen des Filterprofils ein:</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>
@@ -157,7 +158,7 @@
     <string name="welcome_2">Die Farbe einer Ladestation zeigt dir die maximale Ladeleistung</string>
     <string name="welcome_2_detail">Die Farben kannst du unter “Über EVMap → Häufig gestellte Fragen” erneut ansehen</string>
     <string name="donation_dialog_title">Danke, dass du EVMap nutzt!</string>
-    <string name="donation_dialog_detail">EVMap ist kostenlos und Open Source. Über GitHub kann jeder zur Weiterentwicklung der App beitragen. Um die laufenden Kosten für den für die Datenquellen zu decken, freue ich mich auch über Spenden in der App oder über GitHub Sponsors.</string>
+    <string name="donation_dialog_detail">EVMap ist kostenlos und Open Source. Über GitHub kann jeder zur Weiterentwicklung der App beitragen. Um die laufenden Kosten für die Datenquellen zu decken, freut sich der Entwickler über Spenden mit einem Betrag deiner Wahl.</string>
     <string name="chargeprice_donation_dialog_title">Du bist ein richtiger Sparfuchs!</string>
     <string name="chargeprice_donation_dialog_detail">Anscheinend nutzt du den Preisvergleich sehr gern. Mit einer Spende für EVMap kannst du helfen, die Kosten für den Datenzugriff zu decken.</string>
     <string name="deleted_filterprofile">„%s” gelöscht</string>
@@ -286,4 +287,13 @@
     <string name="data_source_switched_to">Datenquelle zu %s umgeschaltet</string>
     <string name="pref_applink_associate">Unterstützte Links öffnen</string>
     <string name="pref_applink_associate_summary">von goingelectric.de und openchargemap.org</string>
+    <string name="chargeprice_header_my_tariffs">Meine Tarife</string>
+    <string name="chargeprice_header_other_tariffs">Andere Tarife</string>
+    <string name="developer_mode_enabled">Entwicklermodus aktiviert</string>
+    <string name="developer_options">Entwicklereinstellungen</string>
+    <string name="disable_developer_mode">Entwicklermodus deaktivieren</string>
+    <string name="developer_mode_disabled">Entwicklermodus deaktiviert</string>
+    <string name="gps">GPS</string>
+    <string name="compass">Kompass</string>
+    <string name="charger_website">Website</string>
 </resources>

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

@@ -154,7 +154,7 @@
     <string name="fault_report_date">Rapport d\'anomalie (dernière mise à jour : %s)</string>
     <string name="menu_report_new_charger">Nouveau chargeur</string>
     <string name="filter_connectors">Connecteurs</string>
-    <string name="copyright_summary">©2020-2022 Johan von Forstner</string>
+    <string name="copyright_summary">©2020–2023 Johan von Forstner</string>
     <string name="other">Autre</string>
     <string name="pref_navigate_use_maps_off">Le bouton de navigation lance l’application de cartes à l’emplacement du chargeur</string>
     <string name="settings_map">Carte</string>
@@ -273,4 +273,30 @@
     <string name="charging_free">gratuite</string>
     <string name="about_contributors">Contributeurs</string>
     <string name="about_contributors_text">Merci à tous les contributeurs pour leur contribution au codage et à la traduction d\'EVMap :</string>
+    <string name="location_error">Localisation non détectée. Veuillez vérifier les paramètres du système</string>
+    <string name="developer_mode_enabled">Mode développeur activé</string>
+    <string name="pref_prediction_enabled">Afficher les prévisions d\'utilisation</string>
+    <string name="pref_prediction_enabled_summary">pour les chargeurs pris en charge
+\n(actuellement seulement chargeurs rapides en Allemagne)</string>
+    <string name="pref_applink_associate">Ouvrir les liens pris en charge</string>
+    <string name="pref_applink_associate_summary">de goingelectric.de et openchargemap.org</string>
+    <string name="chargeprice_header_my_tariffs">Mes tarifs</string>
+    <string name="chargeprice_header_other_tariffs">Autres tarifs</string>
+    <string name="disable_developer_mode">Désactiver le mode développeur</string>
+    <string name="developer_mode_disabled">Mode développeur désactivé</string>
+    <string name="gps">GPS</string>
+    <string name="compass">Boussole</string>
+    <string name="prediction_dc_plugs_only">Prises DC</string>
+    <string name="data_source_switched_to">Source de données basculée vers %s</string>
+    <string name="menu_reset">Réinitialiser le filtre</string>
+    <string name="chargeprice_price_not_available">Prix non disponible</string>
+    <string name="utilization_prediction">Prévision d\'utilisation</string>
+    <string name="prediction_help">La prédiction est basée sur des facteurs tels que le jour de la semaine, l\'heure de la journée et l\'utilisation passée, ce qui vous permet d\'éviter les chargeurs surchargés. Pas de garantie.</string>
+    <plurals name="prediction_number_available">
+        <item quantity="one">%1$d/%2$d disponible</item>
+        <item quantity="many">%1$d/%2$d disponibles</item>
+        <item quantity="other">%1$d/%2$d disponibles</item>
+    </plurals>
+    <string name="developer_options">Paramètres développeur</string>
+    <string name="prediction_time_colon">%s :</string>
 </resources>

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

@@ -93,7 +93,7 @@
     <string name="realtime_data_unavailable">Sanntidsstatus utilgjengelig</string>
     <string name="other">Andre</string>
     <string name="cost_detail"><b>Lading:</b> %1$s · <b>Parkering:</b> %2$s</string>
-    <string name="copyright_summary">©2020–2022 Johan von Forstner</string>
+    <string name="copyright_summary">©2020–2023 Johan von Forstner</string>
     <string name="pref_navigate_use_maps_on">Navigasjonsnkappen starter ruteveiledning på Google Maps</string>
     <string name="filter_free_parking">Kun ladere med gratis parkering</string>
     <string name="filter_min_power">Min. effekt</string>
@@ -284,4 +284,16 @@
     <string name="pref_prediction_enabled">Vis bruksprognoser</string>
     <string name="pref_prediction_enabled_summary">for støttede ladere
 \n(foreløpig kun for likestrøm i Tyskland)</string>
+    <string name="chargeprice_price_not_available">Pris ikke tilgjengelig</string>
+    <string name="developer_mode_disabled">Utviklermodus avslått</string>
+    <string name="gps">GPS</string>
+    <string name="compass">Kompass</string>
+    <string name="pref_applink_associate">Åpne støttede lenker</string>
+    <string name="pref_applink_associate_summary">fra goingelectric.de og openchargemap.org</string>
+    <string name="chargeprice_header_other_tariffs">Andre ladeabonnementer</string>
+    <string name="disable_developer_mode">Skru av utviklermodus</string>
+    <string name="chargeprice_header_my_tariffs">Mine ladeabonnementer</string>
+    <string name="developer_options">Utvikleralternativer</string>
+    <string name="data_source_switched_to">Datakilde byttet til %s</string>
+    <string name="developer_mode_enabled">Utviklermodus påslått</string>
 </resources>

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

@@ -0,0 +1,299 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="data_source_goingelectric_desc">Ideaal in Duitstalige landen. Beschrijvingen in het Duits. Onderhouden door de gebruikersgemeenschap.</string>
+    <string name="crash_report_text">EVMap is afgebroken. Stuur een crash rapport naar de ontwikkelaar.</string>
+    <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>
+    <string name="data_sources_description">Kies een gegevensbron voor laadstations. Dit kan later worden aangepast in de app-instellingen.</string>
+    <string name="category_church">Kerk</string>
+    <string name="welcome_2">Elk laadpunt heeft een kleur die het maximale laadvermogen weergeeft</string>
+    <string name="donation_dialog_detail">EVMap is open source en gratis. Via GitHub kan iedereen bijdragen aan de app. Om de vaste kosten te helpen dragen, kan je overwegen een donatie te schenken aan de ontwikkelaar.</string>
+    <string name="charging_barrierfree">Te gebruiken zonder registratie</string>
+    <string name="verified_desc">Laadpunt is minstens 1x bevestigd als werkend door een lid van de %s gemeenschap</string>
+    <string name="chargeprice_no_tariffs_found">Geen tarieven voor dit laadpunt op Chargeprice.app</string>
+    <string name="category_hospital">Ziekenhuis</string>
+    <string name="title_activity_maps">EVMap</string>
+    <string name="connectors">Connectoren</string>
+    <string name="no_browser_app_found">Installeer eerst een web browser</string>
+    <string name="address">Adres</string>
+    <string name="operator">Operator</string>
+    <string name="network">Netwerk</string>
+    <string name="open_247"><b>24/7 open</b></string>
+    <string name="closed"><b>Gesloten</b></string>
+    <string name="open_closesat"><b>Open</b> · Sluit om %s</string>
+    <string name="closed_opensat"><b>Gesloten</b> · Opent om %s</string>
+    <string name="closed_unfmt">Gesloten</string>
+    <string name="holiday">Feestdag</string>
+    <string name="cost">Kostprijs</string>
+    <string name="cost_detail"><b>Laden:</b> %1$s · <b>Parkeren:</b> %2$s</string>
+    <string name="cost_detail_charging"><b>%s laden</b></string>
+    <string name="cost_detail_parking"><b>%s parkeren</b></string>
+    <string name="charging_free">Gratis</string>
+    <string name="parking_free">Gratis</string>
+    <string name="amenities">Voorzieningen</string>
+    <string name="general_info">Algemene informatie</string>
+    <string name="realtime_data_unavailable">Real-time status niet beschikbaar</string>
+    <string name="realtime_data_loading">Real-time status opvragen…</string>
+    <string name="source">Bron: %s</string>
+    <string name="search">Zoek</string>
+    <string name="menu_map">Kaart</string>
+    <string name="menu_favs">Favorieten</string>
+    <string name="menu_filter">Filter</string>
+    <string name="not_implemented">nog niet geïmplementeerd</string>
+    <string name="about">Over</string>
+    <string name="version">Versie</string>
+    <string name="github_link_title">Broncode</string>
+    <string name="oss_licenses">Licenties</string>
+    <string name="settings">Instellingen</string>
+    <string name="settings_ui">Interface</string>
+    <string name="settings_map">Kaart</string>
+    <string name="copyright">Copyright</string>
+    <string name="copyright_summary">©2020–2023 Johan von Forstner</string>
+    <string name="other">Andere</string>
+    <string name="privacy">Privacy</string>
+    <string name="pref_navigate_use_maps_off">Navigatieknop opent de kaart app met de locatie van het laadstation</string>
+    <string name="coordinates">Coördinaten</string>
+    <string name="share">Deel</string>
+    <string name="filter_free">Allen gratis laadpunten</string>
+    <string name="filter_min_power">Minimaal vermogen</string>
+    <string name="filter_free_parking">Alleen laadpunten met gratis parking</string>
+    <string name="filter_min_connectors">Minimaal aantal connecteren</string>
+    <string name="filter_connectors">Connectoren</string>
+    <string name="plug_type_3">Type 3A</string>
+    <string name="plug_schuko">Schuko</string>
+    <string name="plug_chademo">CHAdeMO</string>
+    <string name="plug_cee_rot">CEE Red</string>
+    <string name="plug_roadster_hpc">Tesla Roadster (2008) HPC</string>
+    <string name="all">allemaal</string>
+    <string name="none">geen</string>
+    <string name="show_more">meer…</string>
+    <string name="favorites_empty_state">Opgeslagen laadpunten verschijnen hier</string>
+    <string name="donate">Doneer</string>
+    <string name="donation_successful">Dank u ❤️</string>
+    <string name="donation_failed">Er ging iets mis 😕</string>
+    <string name="map_type_normal">Default</string>
+    <string name="map_type_satellite">Satelliet</string>
+    <string name="map_type_terrain">Terrein</string>
+    <string name="map_traffic">Verkeer</string>
+    <string name="faq">Veelgestelde vragen</string>
+    <string name="menu_filters_active">Actieve filters</string>
+    <string name="filters_activated">Filters geactiveerd</string>
+    <string name="filters_deactivated">Filters gedeactiveerd</string>
+    <string name="menu_edit_filters">Pas filters aan</string>
+    <string name="menu_manage_filter_profiles">Beheer filterprofielen</string>
+    <string name="go_to_chargeprice">Vergelijk prijzen</string>
+    <string name="fault_report">Foutenrapport</string>
+    <string name="fault_report_date">Foutenrapport (laatste update: %s)</string>
+    <string name="filter_networks">Netwerken</string>
+    <string name="filter_operators">Operatoren</string>
+    <string name="filter_chargecards">Betaalmethoden</string>
+    <string name="all_selected">Alle geselecteerd</string>
+    <string name="number_selected">%d geselecteerd</string>
+    <string name="edit">aanpassen</string>
+    <string name="cancel">Afbreken</string>
+    <string name="ok">OK</string>
+    <string name="pref_language">App-taal</string>
+    <string name="pref_darkmode">Donkere modus</string>
+    <string name="connection_error">Laadstations konden niet worden geladen</string>
+    <string name="location_error">Kon locatie niet bepalen. Controleer de instellingen</string>
+    <string name="retry">Opnieuw</string>
+    <string name="filter_open_247">24/7 beschikbaar</string>
+    <string name="filter_barrierfree">Te gebruiken zonder registratie</string>
+    <string name="filter_exclude_faults">Sluit laadstations uit met gerapporteerde fouten</string>
+    <string name="categories">Categorieën</string>
+    <string name="category_car_dealership">Autoverdeler</string>
+    <string name="category_service_on_motorway">Herstelzone (op snelweg)</string>
+    <string name="category_service_off_motorway">Herstelzone (niet langs de snelweg)</string>
+    <string name="category_railway_station">Treinstation</string>
+    <string name="category_shopping_mall">Winkelcentrum</string>
+    <string name="category_holiday_home">Vakantiewoning</string>
+    <string name="category_airport">Luchthaven</string>
+    <string name="category_amusement_park">Attractiepark</string>
+    <string name="category_hotel">Hotel</string>
+    <string name="category_cinema">Bioscoop</string>
+    <string name="category_museum">Museum</string>
+    <string name="category_parking_multi">Parkeergarage</string>
+    <string name="category_parking">Parking</string>
+    <string name="category_private_charger">Privé-laadpunt</string>
+    <string name="category_rest_area">Rustplaats</string>
+    <string name="category_restaurant">Restaurant</string>
+    <string name="category_swimming_pool">Zwembad</string>
+    <string name="category_supermarket">Supermarkt</string>
+    <string name="category_petrol_station">Benzinestation</string>
+    <string name="category_parking_underground">Ondergrondse parking</string>
+    <string name="category_zoo">Zoo</string>
+    <string name="category_caravan_site">Staanplaats voor caravans</string>
+    <string name="menu_apply">Pas filters toe</string>
+    <string name="menu_save_profile">Bewaar als profiel</string>
+    <string name="menu_reset">Reset filters</string>
+    <string name="no_filters">Geen filters</string>
+    <string name="filter_custom">Aangepaste filter</string>
+    <string name="filter_favorites">Favorieten</string>
+    <string name="reorder">herorden</string>
+    <string name="delete">Verwijder</string>
+    <string name="save_as_profile">Bewaar als profiel</string>
+    <string name="save_profile_enter_name">Geef de naam van het filterprofiel:</string>
+    <string name="filterprofiles_empty_state">Je hebt geen bewaarde filterprofielen</string>
+    <string name="welcome_to_evmap">Welkom bij EVMap</string>
+    <string name="welcome_1">Zoek EV laadpunten in je omgeving</string>
+    <string name="welcome_2_title">Een kwestie van power</string>
+    <string name="welcome_2_detail">Dit vind je ook in “Over” → “Veelgestelde vragen”</string>
+    <string name="donation_dialog_title">Bedankt om EVMap te gebruiken</string>
+    <string name="chargeprice_donation_dialog_title">Jij bent een echte koopjeszoeker!</string>
+    <string name="chargeprice_donation_dialog_detail">Blijkbaar maak je dankbaar gebruik van de prijsvergelijkingen. Met een donatie kan je de kosten voor deze data helpen dragen.</string>
+    <string name="deleted_filterprofile">“%s” verwijderd</string>
+    <string name="undo">Ongedaan maken</string>
+    <string name="rename">Hernoem</string>
+    <plurals name="charge_cards_compatible_num">
+        <item quantity="one">%d compatibele betaalmethode</item>
+        <item quantity="other">%d compatibele betaalmethodes</item>
+    </plurals>
+    <string name="navigate">Navigeer naar hier</string>
+    <string name="verified">geverifieerd</string>
+    <string name="charge_price_format">%1$.2f %2$s</string>
+    <string name="charge_price_average_format">⌀ %1$.2f %2$s/kWh</string>
+    <string name="charge_price_kwh_format">%1$.2f %2$s/kWh</string>
+    <string name="chargeprice_select_connector">Kies connector</string>
+    <string name="chargeprice_provider_customer_tariff">Alleen voor eigen klanten</string>
+    <string name="edit_on_goingelectric_info">Log aub in op GoingElectric.de als deze pagina leeg is</string>
+    <string name="percent_format">%.0f%%</string>
+    <string name="chargeprice_session_fee">kostprijs  sessie</string>
+    <string name="chargeprice_per_kwh">per kWh</string>
+    <string name="chargeprice_per_minute">per min</string>
+    <string name="chargeprice_blocking_fee">Kostprijs blokkeren &gt;%s</string>
+    <string name="powered_by_chargeprice">powered by Chargeprice</string>
+    <string name="settings_chargeprice">Prijsvergelijking</string>
+    <string name="pref_my_vehicle">Mijn voertuigen</string>
+    <string name="pref_chargeprice_no_base_fee">Sluit plannen uit met maandelijkse kost</string>
+    <string name="pref_chargeprice_show_provider_customer_tariffs">Neem plannen op die enkel voor klanten gelden</string>
+    <string name="chargeprice_battery_range_from">Laden vanaf</string>
+    <string name="chargeprice_battery_range_to">tot</string>
+    <string name="chargeprice_vehicle">Voertuig</string>
+    <string name="chargeprice_price_not_available">Prijs niet beschikbaar</string>
+    <string name="pref_chargeprice_show_provider_customer_tariffs_summary">Sommige energieleveranciers bieden speciale plannen voor hun klanten</string>
+    <string name="close">Sluiten</string>
+    <string name="chargeprice_title">Prijzen</string>
+    <string name="chargeprice_connection_error">Kon prijzen niet laden</string>
+    <string name="pref_chargeprice_currency">Valuta</string>
+    <string name="pref_my_tariffs">Mijn laadplannen</string>
+    <plurals name="pref_my_tariffs_summary">
+        <item quantity="one">(wordt aangeduid in de prijsvergelijking)</item>
+        <item quantity="other">(worden aangeduid in de prijsvergelijking)</item>
+    </plurals>
+    <string name="chargeprice_all_tariffs_selected">alle plannen geselecteerd</string>
+    <string name="settings_charger_data">Laadstations</string>
+    <string name="pref_data_source">Databron</string>
+    <plurals name="chargeprice_some_tariffs_selected">
+        <item quantity="one">%d plan geselecteerd</item>
+        <item quantity="other">%d plannen geselecteerd</item>
+    </plurals>
+    <string name="unknown_operator">Onbekende operator</string>
+    <string name="data_source_goingelectric">GoingElectric.de</string>
+    <string name="data_source_openchargemap">OpenChargeMap</string>
+    <string name="chargeprice_base_fee">Abonnementskost: %1$.2f %2$s/maand</string>
+    <string name="chargeprice_min_spend">Minimale kost: %1$.2f %2$s/maand</string>
+    <string name="chargeprice_battery_range">Laden van %1$.0f%% tot %2$.0f%%</string>
+    <string name="chargeprice_stats">(%1$.0f kWh, ca. %2$s, ⌀ %3$.0f kW)</string>
+    <string name="next">volgende</string>
+    <string name="get_started">Starten</string>
+    <string name="got_it">Begrepen</string>
+    <string name="lets_go">Laten we beginnen</string>
+    <string name="crash_report_comment_prompt">Je kan hieronder commentaar geven:</string>
+    <string name="powered_by_mapbox">powered by Mapbox</string>
+    <string name="pref_search_provider">Zoekprovider</string>
+    <string name="donate_desc">Ondersteun de EVMap ontwikkeling via een eenmalige donatie</string>
+    <string name="github_sponsors_desc">Ondersteun EVMap op GitHub Spinsors</string>
+    <string name="github_sponsors">GitHub Sponsors</string>
+    <string name="unnamed_filter_profile">Naamloos filterprofiel</string>
+    <string name="privacy_link">https://evmap.vonforst.net/en/privacy.html</string>
+    <string name="faq_link">https://evmap.vonforst.net/en/faq.html</string>
+    <string name="chargeprice_faq_link">https://evmap.vonforst.net/en/chargeprice_faq.html</string>
+    <string name="required">verplicht</string>
+    <string name="pref_search_delete_recent">Verwijder recente zoekresultaten</string>
+    <string name="deleted_recent_search_results">Recente zoekresultaten zijn verwijderd</string>
+    <string name="settings_data_sources">Gegevensbronnen</string>
+    <string name="help">Help</string>
+    <string name="settings_android_auto">Android Auto</string>
+    <string name="pref_chargeprice_allow_unbalanced_load">Ongebalanceerd laden toelaten</string>
+    <string name="pref_chargeprice_allow_unbalanced_load_summary">Eenfasig AC laden toelaten met meer dan 4.5 kW</string>
+    <string name="pref_map_rotate_gestures_enabled">Kaartrotatie</string>
+    <string name="pref_map_rotate_gestures_on">Gebruik twee vingers om de kaart te draaien</string>
+    <string name="pref_map_rotate_gestures_off">Rotatie afzetten (noorden naar boven)</string>
+    <string name="refresh_live_data">vernieuw de real-time status</string>
+    <string name="autocomplete_connection_error">Suggesties konden niet worden geladen</string>
+    <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>
+    <string name="gps">GPS</string>
+    <string name="pref_provider_osm_mapbox">OpenStreetMap (Mapbox)</string>
+    <string name="about_contributors">Bijdragers</string>
+    <string name="about_contributors_text">Dank aan iedereen die heeft bijgedragen aan de code en vertaling van EVMap:</string>
+    <string name="utilization_prediction">Voorspeld verbruik</string>
+    <string name="prediction_help">De voorspelling is gebaseerd op factoren zoals weekdag, tijdstip en gebruik in het verleden, zodat je zwaar bezette laders kan vermijden. Geen garantie, uiteraard.</string>
+    <string name="prediction_time_colon">%s:</string>
+    <string name="pref_prediction_enabled">Toon voorspeld gebruik</string>
+    <string name="pref_prediction_enabled_summary">voor ondersteunde laders 
+\n(momenteel enkel DC in Duitsland)</string>
+    <string name="prediction_only">(enkel %s)</string>
+    <string name="prediction_dc_plugs_only">DC aansluitingen</string>
+    <string name="data_source_switched_to">Gegevensbron gewijzigd naar %s</string>
+    <string name="pref_applink_associate">Open ondersteunde links</string>
+    <string name="pref_applink_associate_summary">van going electric.de en openchargemap.org</string>
+    <string name="chargeprice_header_my_tariffs">Mijn plannen</string>
+    <string name="chargeprice_header_other_tariffs">Andere plannen</string>
+    <string name="developer_mode_enabled">Ontwillekaarsmodus geactiveerd</string>
+    <string name="developer_options">Ontwikkelaarsopties</string>
+    <string name="disable_developer_mode">Ontwikkelaarsmodus uitzetten</string>
+    <string name="developer_mode_disabled">Ontwikkelaarsmodus uitgezet</string>
+    <plurals name="prediction_number_available">
+        <item quantity="one">%1$d/%2$d beschkbaar</item>
+        <item quantity="other">%1$d/%2$d beschikbaar</item>
+    </plurals>
+    <string name="app_name">EVMap</string>
+    <string name="no_maps_app_found">Installeer eerst een navigatie-app</string>
+    <string name="hours">Openingsuren</string>
+    <string name="charging_paid">Betalend</string>
+    <string name="parking_paid">Betalend</string>
+    <string name="realtime_data_source">Real-time status bron (beta): %s</string>
+    <string name="pref_navigate_use_maps">Onmiddellijke navigatie</string>
+    <string name="fav_remove">Verwijder uit favorieten</string>
+    <string name="pref_navigate_use_maps_on">Navigatieknop start routebegeleiding met Google Maps</string>
+    <string name="fav_add">Bewaar als favoriet</string>
+    <string name="goingelectric_forum">Forumthread op GoingElectric.de</string>
+    <string name="plug_type_2">Type 2</string>
+    <string name="plug_supercharger">Tesla Supercharger</string>
+    <string name="plug_cee_blau">CEE Blue</string>
+    <string name="plug_ccs">CCS</string>
+    <string name="plug_type_1">Type 1</string>
+    <string name="menu_report_new_charger">Nieuw laadpunt</string>
+    <string name="show_less">minder…</string>
+    <string name="map_type">Kaarttype</string>
+    <string name="map_details">Kaartdetails</string>
+    <string name="edit_at_datasource">aanpassen op %s</string>
+    <string name="charge_cards">Betaalmethoden</string>
+    <string name="pref_map_provider">Kaartaanbieder</string>
+    <string name="twitter">Twitter</string>
+    <string name="contact">Contact</string>
+    <string name="and_n_others">en %d andere</string>
+    <string name="category_camping">Kampeerplaats</string>
+    <string name="category_public_authorities">Publieke instanties</string>
+</resources>

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

@@ -0,0 +1,299 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools">
+    <string name="copyright_summary">©2020–2023 Johan von Forstner</string>
+    <string name="menu_reset">Repor filtros</string>
+    <string name="filter_custom">Filtro modificado</string>
+    <string name="filter_favorites">Favoritos</string>
+    <string name="reorder">reordenar</string>
+    <string name="delete">Apagar</string>
+    <string name="welcome_2_detail">Também pode encontrar esta informação em \"Sobre\" → \"Questões frequentes\"</string>
+    <string name="chargeprice_donation_dialog_title">Você é um verdadeiro caçador de pechinchas!</string>
+    <string name="donation_dialog_title">Obrigado por usar o EVMap</string>
+    <string name="deleted_filterprofile">“%s” removido</string>
+    <string name="undo">Refazer</string>
+    <string name="rename">Renomear</string>
+    <string name="chargeprice_donation_dialog_detail">Você faz grande uso da comparação de preços. Ajude a cobrir os custos de acesso à informação apoiando o EVMap com uma doação.</string>
+    <string name="verified">verificado</string>
+    <string name="chargeprice_select_connector">Escolhe o conector</string>
+    <string name="verified_desc">O carregador foi marcado como funcional por um membro da comunidade %s</string>
+    <string name="charge_price_format">%2$s%1$.2f</string>
+    <string name="charge_price_average_format">⌀ %2$s%1$.2f/kWh</string>
+    <string name="charge_price_kwh_format">%2$s%1$.2f/kWh</string>
+    <string name="percent_format">%.0f%%</string>
+    <string name="pref_my_vehicle">Os meus veículos</string>
+    <string name="pref_chargeprice_show_provider_customer_tariffs_summary">As empresas de serviços públicos às vezes oferecem planos especiais para os seus clientes</string>
+    <plurals name="chargeprice_some_tariffs_selected">
+        <item quantity="one">%d plano selecionado</item>
+        <item quantity="other">%d planos selecionados</item>
+    </plurals>
+    <string name="data_sources_description">Escolha uma fonte de informação para as estações de carregamento. Pode alterar mais tarde nas definições da app.</string>
+    <string name="about_contributors_text">Obrigado a todos os contribuidores de código e traduções para o EVMap:</string>
+    <string name="utilization_prediction">Previsão de utilização</string>
+    <string name="prediction_time_colon">%s:</string>
+    <string name="pref_applink_associate_summary">de goingelectric.de e openchargemap.org</string>
+    <string name="none">nenhum</string>
+    <string name="donate">Doar</string>
+    <string name="show_less">menos…</string>
+    <string name="all">todos</string>
+    <string name="show_more">mais…</string>
+    <string name="filters_deactivated">Filtros desativados</string>
+    <string name="favorites_empty_state">Carregadores guardados aparecem aqui</string>
+    <string name="donation_successful">Obrigado ❤️</string>
+    <string name="category_car_dealership">Stand de carros</string>
+    <string name="map_traffic">Trânsito</string>
+    <string name="faq">Questões frequentes</string>
+    <string name="menu_filters_active">Filtros ativos</string>
+    <string name="menu_edit_filters">Editar filtros</string>
+    <string name="filters_activated">Filtros ativados</string>
+    <string name="menu_manage_filter_profiles">Gerir perfis de filtros</string>
+    <string name="go_to_chargeprice">Comparar preços</string>
+    <string name="filter_operators">Operadores</string>
+    <string name="location_error">Localização não encontrada. Verifique se a app tem permissão para usar aceder à sua localização</string>
+    <string name="filter_networks">Redes</string>
+    <string name="fault_report">Com problemas</string>
+    <string name="number_selected">%d selecionados</string>
+    <string name="cancel">Cancelar</string>
+    <string name="ok">OK</string>
+    <string name="filter_barrierfree">Não necessita de registo</string>
+    <string name="fault_report_date">Com problemas (atualizado: %s)</string>
+    <string name="filter_chargecards">Formas de pagamento</string>
+    <string name="pref_language">Língua da app</string>
+    <string name="all_selected">Todos selecionados</string>
+    <string name="edit">editar</string>
+    <string name="pref_darkmode">Modo escuro</string>
+    <string name="connection_error">Não foi possível carregar a lista de carregadores</string>
+    <string name="retry">Tentar novamente</string>
+    <string name="filter_open_247">Disponível 24/7</string>
+    <string name="filter_exclude_faults">Excluir carregadores com relatos de falhas</string>
+    <string name="charge_cards">Formas de pagamento</string>
+    <string name="and_n_others">e %d outros</string>
+    <string name="goingelectric_forum">Tópico no fórum GoingElectric.de</string>
+    <string name="contact">Contato</string>
+    <string name="menu_report_new_charger">Novo carregador</string>
+    <string name="category_holiday_home">Casa de férias</string>
+    <string name="pref_map_provider">Provedor do mapa</string>
+    <string name="twitter">Twitter</string>
+    <string name="category_public_authorities">Autoridades públicas</string>
+    <string name="category_private_charger">Carregador privado</string>
+    <string name="category_rest_area">Área de descanso</string>
+    <string name="edit_at_datasource">editado em %s</string>
+    <string name="categories">Categorias</string>
+    <string name="category_service_on_motorway">Área de serviço (autoestrada)</string>
+    <string name="category_service_off_motorway">Área de serviço (fora da autoestrada)</string>
+    <string name="category_railway_station">Estação de comboio</string>
+    <string name="category_shopping_mall">Centro comercial</string>
+    <string name="category_amusement_park">Parque de diversões</string>
+    <string name="category_airport">Aeroporto</string>
+    <string name="category_parking_multi">Garagem de estacionamento</string>
+    <string name="category_camping">Parque de campismo</string>
+    <string name="category_cinema">Cinema</string>
+    <string name="category_hotel">Hotel</string>
+    <string name="category_church">Igreja</string>
+    <string name="category_hospital">Hospital</string>
+    <string name="category_museum">Museu</string>
+    <string name="category_parking">Parque de estacionamento</string>
+    <string name="category_restaurant">Restaurante</string>
+    <string name="save_profile_enter_name">Insira o nome do perfil com este filtro:</string>
+    <string name="save_as_profile">Guardar como perfil</string>
+    <string name="filterprofiles_empty_state">Não existem filtros guardados</string>
+    <string name="welcome_2">Cada cor corresponde à uma potência máxima</string>
+    <string name="welcome_to_evmap">Bem-vindo ao EVMap</string>
+    <string name="pref_darkmode_always_off">sempre desligado</string>
+    <string name="welcome_2_title">Escolha a potência</string>
+    <string name="navigate">Navegar</string>
+    <string name="donation_dialog_detail">O EVMap é gratuito e de código aberto. Contribuições de código no GitHub são bem-vindas. Para ajudar a cobrir os custos de operação, por favor considere fazer uma doação ao criador da app.</string>
+    <string name="charging_barrierfree">Não necessita de registo</string>
+    <plurals name="charge_cards_compatible_num">
+        <item quantity="one">%d forma de pagamento compatível</item>
+        <item quantity="other">%d formas de pagamento compatíveis</item>
+    </plurals>
+    <string name="chargeprice_session_fee">custo da sessão</string>
+    <string name="edit_on_goingelectric_info">Por favor faça o login em GoingElectric.de se esta página estiver vazia</string>
+    <string name="chargeprice_blocking_fee">Taxa de bloqueio %s</string>
+    <string name="chargeprice_per_kwh">por kWh</string>
+    <string name="chargeprice_per_minute">por minuto</string>
+    <string name="pref_chargeprice_no_base_fee">Excluir planos com taxas mensais</string>
+    <string name="chargeprice_no_tariffs_found">O Chargeprice.app não encontrou planos de carregamento para este carregador</string>
+    <string name="chargeprice_min_spend">Gasto mínimo: %2$s%1$.2f/mês</string>
+    <string name="powered_by_chargeprice">informação da Chargeprice</string>
+    <string name="chargeprice_base_fee">Taxa base: %2$s%1$.2f/mês</string>
+    <string name="settings_chargeprice">Comparação de preços</string>
+    <string name="chargeprice_provider_customer_tariff">Apenas para clientes com subscrição</string>
+    <string name="chargeprice_battery_range">Carregar de %1$.0f%% até %2$.0f%%</string>
+    <string name="chargeprice_battery_range_from">Carregar de</string>
+    <string name="pref_chargeprice_show_provider_customer_tariffs">Incluir planos de subscrição</string>
+    <string name="chargeprice_select_car_first">Por favor escolha o modelo do seu carro nas definições primeiro</string>
+    <string name="chargeprice_battery_range_to">até</string>
+    <string name="chargeprice_stats">(%1$.0f kWh, %2$s aprox., ⌀ %3$.0f kW)</string>
+    <string name="chargeprice_connection_error">Não foi possível carregar os preços</string>
+    <string name="chargeprice_vehicle">Veículo</string>
+    <string name="chargeprice_title">Preços</string>
+    <string name="chargeprice_no_compatible_connectors">Não existem conectores compatíveis nesta estação de carregamento</string>
+    <string name="pref_chargeprice_currency">Moeda</string>
+    <string name="got_it">Continuar</string>
+    <string name="chargeprice_price_not_available">Preço não disponível</string>
+    <string name="pref_my_tariffs">Os meus planos de carregamento</string>
+    <plurals name="pref_my_tariffs_summary">
+        <item quantity="one" tools:ignore="ImpliedQuantity">(será destacado na comparação de preços)</item>
+        <item quantity="other">(serão destacados na comparação de preços)</item>
+    </plurals>
+    <string name="data_source_goingelectric">GoingElectric.de</string>
+    <string name="chargeprice_all_tariffs_selected">todos os planos selecionados</string>
+    <string name="license">Licença</string>
+    <string name="unknown_operator">Operador desconhecido</string>
+    <string name="settings_charger_data">Estações de carregamento</string>
+    <string name="data_source_goingelectric_desc">Boa escolha para países de lingua alemã. Descrições em alemão. Mantido pela comunidade.</string>
+    <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 lingua 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>
+    <string name="crash_report_comment_prompt">Pode adicionar um comentário abaixo:</string>
+    <string name="pref_search_provider">Fornecedor da pesquisa</string>
+    <string name="powered_by_mapbox">via Mapbox</string>
+    <string name="github_sponsors">Patrocinadores no GitHub</string>
+    <string name="donate_desc">Apoie o desenvolvimento do EVMap com uma única doação</string>
+    <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 quando o Google Maps é usado. Por favor considere doar através de \"Sobre\" → \"Doar\".</string>
+    <string name="github_sponsors_desc">Apoie o EVMap no GitHub Sponsors</string>
+    <string name="unnamed_filter_profile">Filtro sem nome</string>
+    <string name="deleted_recent_search_results">As pesquisas recentes foram eliminadas</string>
+    <string name="help">Ajuda</string>
+    <string name="privacy_link">https://evmap.vonforst.net/en/privacy.html</string>
+    <string name="faq_link">https://evmap.vonforst.net/en/faq.html</string>
+    <string name="chargeprice_faq_link">https://evmap.vonforst.net/en/chargeprice_faq.html</string>
+    <string name="pref_search_delete_recent">Apagar pesquisas recentes</string>
+    <string name="required">obrigatório</string>
+    <string name="settings_data_sources">Fontes de informação</string>
+    <string name="settings_android_auto">Android Auto</string>
+    <string name="pref_map_rotate_gestures_enabled">Rotação do mapa</string>
+    <string name="autocomplete_connection_error">Não foi possível carregar as sugestões</string>
+    <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>
+    <string name="prediction_help">A previsão é baseada em fatores como dia da semana, hora do dia e uso anterior para que você evite carregadores superlotados. Sem garantias de estar correta.</string>
+    <string name="disable_developer_mode">Desativar o modo de desenvolvedor</string>
+    <string name="compass">Compasso</string>
+    <plurals name="prediction_number_available">
+        <item quantity="one">%1$d/%2$d disponível</item>
+        <item quantity="other">%1$d/%2$d disponíveis</item>
+    </plurals>
+    <string name="pref_prediction_enabled">Mostrar previsões de utilização</string>
+    <string name="developer_mode_enabled">Modo de desenvolvedor ativado</string>
+    <string name="pref_prediction_enabled_summary">para carregadores suportados
+\n(atualmente apenas CC/DC na Alemanha)</string>
+    <string name="prediction_only">(apenas %s)</string>
+    <string name="prediction_dc_plugs_only">Conectores CC/DC</string>
+    <string name="pref_applink_associate">Abrir links suportados</string>
+    <string name="data_source_switched_to">Fonte de dados alterada para %s</string>
+    <string name="developer_mode_disabled">Modo de desenvolvedor desativado</string>
+    <string name="gps">GPS</string>
+    <string name="no_maps_app_found">Instale a app de navegação primeiro</string>
+    <string name="no_browser_app_found">Instale um navegador web primeiro</string>
+    <string name="connectors">Conectores</string>
+    <string name="address">Endereço</string>
+    <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="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="charging_free">Gratuito</string>
+    <string name="charging_paid">Pago</string>
+    <string name="parking_free">Gratuito</string>
+    <string name="parking_paid">Pago</string>
+    <string name="amenities">Facilidades</string>
+    <string name="general_info">Informação geral</string>
+    <string name="realtime_data_unavailable">Estado em tempo real não disponível</string>
+    <string name="realtime_data_loading">Verificado estado em tempo real…</string>
+    <string name="realtime_data_source">Fonte do estado em tempo real (beta) %s</string>
+    <string name="source">Fonte: %s</string>
+    <string name="search">Pesquisa</string>
+    <string name="menu_map">Mapa</string>
+    <string name="menu_favs">Favoritos</string>
+    <string name="menu_filter">Filtro</string>
+    <string name="not_implemented">ainda não implementado</string>
+    <string name="about">Sobre</string>
+    <string name="version">Versão</string>
+    <string name="github_link_title">Código-fonte</string>
+    <string name="oss_licenses">Licenças</string>
+    <string name="settings_ui">Interface</string>
+    <string name="settings_map">Mapa</string>
+    <string name="copyright">Direitos de autor</string>
+    <string name="other">Outro</string>
+    <string name="privacy">Privacidade</string>
+    <string name="settings">Definições</string>
+    <string name="fav_add">Guardar como favorito</string>
+    <string name="fav_remove">Remover dos favoritos</string>
+    <string name="pref_navigate_use_maps">Navegar agora</string>
+    <string name="pref_navigate_use_maps_on">O botão de navegação inicia a navegação com o Google Maps</string>
+    <string name="pref_navigate_use_maps_off">O botão de navegação abre a app dos mapas com a localização do carregador</string>
+    <string name="coordinates">Coordenadas</string>
+    <string name="share">Partilhar</string>
+    <string name="filter_free">Apenas carregadores gratuitos</string>
+    <string name="filter_min_power">Potência minima</string>
+    <string name="filter_free_parking">Apenas carregadores com parque gratuito</string>
+    <string name="filter_min_connectors">Número mínimo de conectores</string>
+    <string name="filter_connectors">Conectores</string>
+    <string name="plug_type_1">Tipo 1</string>
+    <string name="plug_type_2">Tipo 2</string>
+    <string name="plug_type_3">Tipo 3A</string>
+    <string name="plug_ccs">CCS</string>
+    <string name="plug_schuko">Schuko</string>
+    <string name="plug_chademo">CHAdeMO</string>
+    <string name="plug_cee_blau">CEE Azul</string>
+    <string name="plug_cee_rot">CEE Vermelho</string>
+    <string name="plug_roadster_hpc">Tesla Roadster (2008) HPC</string>
+    <string name="plug_supercharger">Supercarregador Tesla</string>
+    <string name="donation_failed">Algo correu mal 😕</string>
+    <string name="map_type_satellite">Satélite</string>
+    <string name="map_type_terrain">Terreno</string>
+    <string name="map_type">Tipo de mapa</string>
+    <string name="map_details">Detalhes do mapa</string>
+    <string name="map_type_normal">Padrão</string>
+    <string name="category_swimming_pool">Piscina</string>
+    <string name="category_supermarket">Supermercado</string>
+    <string name="category_petrol_station">Posto de combustível</string>
+    <string name="category_parking_underground">Parque de estacionamento subterrâneo</string>
+    <string name="category_zoo">Zoo</string>
+    <string name="category_caravan_site">Caravanas</string>
+    <string name="menu_apply">Aplicar filtros</string>
+    <string name="menu_save_profile">Guardar como perfil</string>
+    <string name="no_filters">Sem filtros</string>
+    <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>
+    <string name="pref_chargeprice_allow_unbalanced_load">Permitir carga não balanceada</string>
+    <string name="pref_chargeprice_allow_unbalanced_load_summary">Permitir carregamento CA/AC monofásico (1 fase) com mais de 4.5 kW</string>
+</resources>

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

@@ -0,0 +1,302 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="app_name">EVMap</string>
+    <string name="title_activity_maps">EVMap</string>
+    <string name="connectors">Conectori</string>
+    <string name="no_maps_app_found">Instalati o aplicatie de navigatie</string>
+    <string name="no_browser_app_found">Instalati un browser web</string>
+    <string name="address">Adresa</string>
+    <string name="operator">Operator</string>
+    <string name="network">Retea</string>
+    <string name="hours">Program</string>
+    <string name="open_247"><![CDATA[<b>Deschis nonstop</b>]]></string>
+    <string name="closed"><![CDATA[<b>Inchis</b>]]></string>
+    <string name="open_closesat"><![CDATA[<b>Deschis</b> · Inchide la %s]]></string>
+    <string name="closed_opensat"><![CDATA[<b>Inchis</b> · Deschide la %s]]></string>
+    <string name="closed_unfmt">Inchis</string>
+    <string name="holiday">Sarbatoare</string>
+    <string name="cost">Cost</string>
+    <string name="cost_detail"><![CDATA[<b>Incarcare:</b> %1$s · <b>Parcare:</b> %2$s]]></string>
+    <string name="cost_detail_charging"><![CDATA[<b>%s incarcare</b>]]></string>
+    <string name="cost_detail_parking"><![CDATA[<b>%s parcare</b>]]></string>
+    <string name="charging_free">Gratuit</string>
+    <string name="charging_paid">Cu plata</string>
+    <string name="parking_free">Gratuit</string>
+    <string name="parking_paid">Cu plata</string>
+    <string name="amenities">Facilitati</string>
+    <string name="general_info">Informatii generale</string>
+    <string name="realtime_data_unavailable">Stare in tip real indisponibila</string>
+    <string name="realtime_data_loading">Verificare stare in timp real…</string>
+    <string name="realtime_data_source">Sursa verificare in timp real (beta): %s</string>
+    <string name="source">Sursa: %s</string>
+    <string name="search">Cautare</string>
+    <string name="menu_map">Harta</string>
+    <string name="menu_favs">Favorite</string>
+    <string name="menu_filter">Fitru</string>
+    <string name="not_implemented">indisponibil momentan</string>
+    <string name="about">Despre </string>
+    <string name="version">Versiune</string>
+    <string name="github_link_title">Cod sursa</string>
+    <string name="oss_licenses">Licente</string>
+    <string name="settings">Setari</string>
+    <string name="settings_ui">Interfata</string>
+    <string name="settings_map">Harta</string>
+    <string name="copyright">Copyright</string>
+    <string name="copyright_summary">©2020–2023 Johan von Forstner</string>
+    <string name="other">Altele</string>
+    <string name="privacy">Confidentialitate</string>
+    <string name="fav_add">Salveaza ca favorit</string>
+    <string name="fav_remove">Sterge din favorite</string>
+    <string name="pref_navigate_use_maps">Indicatii navigare</string>
+    <string name="pref_navigate_use_maps_on">Butonul de navigare porneste cu Google Maps</string>
+    <string name="pref_navigate_use_maps_off">Butonul de navigare deschide aplicatia de harti cu locatia statiei</string>
+    <string name="coordinates">Coordonate</string>
+    <string name="share">Distribuie</string>
+    <string name="filter_free">Doar statii gratuite</string>
+    <string name="filter_min_power">Putere minima</string>
+    <string name="filter_free_parking">Doar statii cu parcare gratuita</string>
+    <string name="filter_min_connectors">Numar minim de conectori</string>
+    <string name="filter_connectors">Conectori</string>
+    <string name="plug_type_1">Type 1</string>
+    <string name="plug_type_2">Type 2</string>
+    <string name="plug_type_3">Type 3A</string>
+    <string name="plug_ccs">CCS</string>
+    <string name="plug_schuko">Schuko</string>
+    <string name="plug_chademo">CHAdeMO</string>
+    <string name="plug_supercharger">Tesla Supercharger</string>
+    <string name="plug_cee_blau">CEE Blue</string>
+    <string name="plug_cee_rot">CEE Red</string>
+    <string name="plug_roadster_hpc">Tesla Roadster (2008) HPC</string>
+    <string name="all">toate</string>
+    <string name="none">niciunul</string>
+    <string name="show_more">mai mult…</string>
+    <string name="show_less">mai putin…</string>
+    <string name="favorites_empty_state">Statiile salvate apar aici</string>
+    <string name="donate">Doneaza</string>
+    <string name="donation_successful">Multumesc ❤️</string>
+    <string name="donation_failed">A aparut o eroare 😕</string>
+    <string name="map_type_normal">Implicit</string>
+    <string name="map_type_satellite">Satelit</string>
+    <string name="map_type_terrain">Teren</string>
+    <string name="map_type">Tip harta</string>
+    <string name="map_details">Detalii harta</string>
+    <string name="map_traffic">Trafic</string>
+    <string name="faq">Intrebari frecvente</string>
+    <string name="menu_filters_active">Filtre active</string>
+    <string name="filters_activated">Filtre activate</string>
+    <string name="filters_deactivated">Filtre dezactivate</string>
+    <string name="menu_edit_filters">Modificare filtre</string>
+    <string name="menu_manage_filter_profiles">Modifica profile filtre</string>
+    <string name="go_to_chargeprice">Compara preturi</string>
+    <string name="fault_report">Raport defectiune</string>
+    <string name="fault_report_date">raport defectiune (ultima actualizare: %s)</string>
+    <string name="filter_networks">Retele</string>
+    <string name="filter_operators">Operatori</string>
+    <string name="filter_chargecards">Metode de plata</string>
+    <string name="all_selected">Selectate toate</string>
+    <string name="number_selected">%d selectate</string>
+    <string name="edit">modifica</string>
+    <string name="cancel">Anulare</string>
+    <string name="ok">OK</string>
+    <string name="pref_language">Limba aplicatie</string>
+    <string name="pref_darkmode">Mod intunecat</string>
+    <string name="connection_error">Eroare conexiune</string>
+    <string name="location_error">Locatia nu a putut fi detectata. Verificati setarile</string>
+    <string name="retry">Reincearca</string>
+    <string name="filter_open_247">Disponibile nonstop</string>
+    <string name="filter_barrierfree">Disponibile fara inregistrare</string>
+    <string name="filter_exclude_faults">Exclude statiile raportate defecte</string>
+    <string name="charge_cards">Metode de plata</string>
+    <string name="and_n_others">si %d altele</string>
+    <string name="pref_map_provider">Furnizor harta</string>
+    <string name="twitter">Twitter</string>
+    <string name="goingelectric_forum">Forum conversatii pe GoingElectric.de</string>
+    <string name="contact">Contact</string>
+    <string name="menu_report_new_charger">Statie noua</string>
+    <string name="edit_at_datasource">modificat la %s</string>
+    <string name="categories">Categorii</string>
+    <string name="category_car_dealership">Reprezentanta auto</string>
+    <string name="category_service_on_motorway">Zona servicii (autostrada)</string>
+    <string name="category_service_off_motorway">Zona servicii (in afara autostrazii)</string>
+    <string name="category_railway_station">Statie tren</string>
+    <string name="category_public_authorities">Autoritati locale</string>
+    <string name="category_camping">Camping</string>
+    <string name="category_shopping_mall">Mall</string>
+    <string name="category_holiday_home">Casa de vacanta</string>
+    <string name="category_airport">Aerport</string>
+    <string name="category_amusement_park">Parc de distractii</string>
+    <string name="category_hotel">Hotel</string>
+    <string name="category_cinema">Cinema</string>
+    <string name="category_church">Biserica</string>
+    <string name="category_hospital">Spital</string>
+    <string name="category_museum">Museu</string>
+    <string name="category_parking_multi">Parcare etajata</string>
+    <string name="category_parking">Parcare</string>
+    <string name="category_private_charger">Statie de incarcare privata</string>
+    <string name="category_rest_area">Zona de odihna</string>
+    <string name="category_restaurant">Restaurant</string>
+    <string name="category_swimming_pool">Piscina</string>
+    <string name="category_supermarket">Supermarket</string>
+    <string name="category_petrol_station">Benzinarie</string>
+    <string name="category_parking_underground">Parcare subterana</string>
+    <string name="category_zoo">Gradina Zoo</string>
+    <string name="category_caravan_site">Camping rulote</string>
+    <string name="menu_apply">Aplica filtre</string>
+    <string name="menu_save_profile">Salveaza profil</string>
+    <string name="menu_reset">Sterge setari filtre</string>
+    <string name="no_filters">Fara filtre</string>
+    <string name="filter_custom">Filtre personalizate</string>
+    <string name="filter_favorites">Favorite</string>
+    <string name="reorder">reordonare</string>
+    <string name="delete">Sterge</string>
+    <string name="save_as_profile">Salveaza ca profil</string>
+    <string name="save_profile_enter_name">Completati nume profil:</string>
+    <string name="filterprofiles_empty_state">Nu sunt profile salvate</string>
+    <string name="welcome_to_evmap">Bine ati venit la EVMap</string>
+    <string name="welcome_1">Cauta statii de incarcare in apropiere</string>
+    <string name="welcome_2_title">Esti mereu la curent</string>
+    <string name="welcome_2">Fiecare culoare a statiei corespunde puterii maxime de incarcare</string>
+    <string name="welcome_2_detail">Puteti gasi si in sectiunea “Despre” → “Intrebari frecvente”</string>
+    <string name="donation_dialog_title">Multumim ca utilizati EVMap</string>
+    <string name="donation_dialog_detail">EVMap este libera si gratuita. Contributiile pe GitHub sunt apreciate. Pentru a acoperi costurile pentru acces la date, va rugam sa donati orice suma pentru dezvoltator.</string>
+    <string name="chargeprice_donation_dialog_title">Stii sa cauti ofertele cele mai bune!</string>
+    <string name="chargeprice_donation_dialog_detail">Stii sa folosesti optiunea de comparare preturi. Puteti ajuta pentru a acoperi costurile pentru accesul la aceste date donand pentru EVMap.</string>
+    <string name="deleted_filterprofile">“%s” a fost sters</string>
+    <string name="undo">Anuleaza</string>
+    <string name="rename">Redenumeste</string>
+    <string name="charging_barrierfree">Utilizabile fara inregistrare</string>
+    <plurals name="charge_cards_compatible_num">
+        <item quantity="one">%d metoda de plata compatibila</item>
+        <item quantity="other">%d metode de plata compatibile</item>
+        <item quantity="few">%d metode de plata compatibile</item>
+    </plurals>
+    <string name="navigate">Navigare</string>
+    <string name="verified">verificat</string>
+    <string name="verified_desc">Statia de incarcare a fost confirmata functionala de un mebru din comunitatea %s</string>
+    <string name="charge_price_format">%2$s%1$.2f</string>
+    <string name="charge_price_average_format">⌀ %2$s%1$.2f/kWh</string>
+    <string name="charge_price_kwh_format">%2$s%1$.2f/kWh</string>
+    <string name="chargeprice_select_connector">Alege conector</string>
+    <string name="chargeprice_provider_customer_tariff">Doar pentru clienti</string>
+    <string name="edit_on_goingelectric_info">Va rugam autentificati-va la GoingElectric.de daca pagina e goala</string>
+    <string name="percent_format">%.0f%%</string>
+    <string name="chargeprice_session_fee">taxa sesiune</string>
+    <string name="chargeprice_per_kwh">pe kWh</string>
+    <string name="chargeprice_per_minute">pe min</string>
+    <string name="chargeprice_blocking_fee">Taxa blocare &gt;%s</string>
+    <string name="chargeprice_no_tariffs_found">Fara pret pentru aceasta statie in Chargeprice.app</string>
+    <string name="powered_by_chargeprice">oferit de Chargeprice</string>
+    <string name="chargeprice_base_fee">Pret de baza: %2$s%1$.2f/luna</string>
+    <string name="chargeprice_min_spend">Suma minima: %2$s%1$.2f/luna</string>
+    <string name="settings_chargeprice">Comparatie preturi</string>
+    <string name="pref_my_vehicle">Masinile mele</string>
+    <string name="pref_chargeprice_no_base_fee">Exclude abonamente cu plata lunara</string>
+    <string name="pref_chargeprice_show_provider_customer_tariffs">Include abonament clienti</string>
+    <string name="chargeprice_select_car_first">Configurati modelul masinii in setari</string>
+    <string name="chargeprice_battery_range">Incarcare de la %1$.0f%% la %2$.0f%%</string>
+    <string name="chargeprice_battery_range_from">Incarcare de la</string>
+    <string name="chargeprice_battery_range_to">la</string>
+    <string name="chargeprice_stats">(%1$.0f kWh, aprox. %2$s, ⌀ %3$.0f kW)</string>
+    <string name="chargeprice_vehicle">Masina</string>
+    <string name="chargeprice_price_not_available">Pret indisponibil</string>
+    <string name="pref_chargeprice_show_provider_customer_tariffs_summary">Furnizorii de utilitati ofera uneori abonamente speciale pentru clientii lor</string>
+    <string name="close">Inchidere</string>
+    <string name="chargeprice_title">Preturi</string>
+    <string name="chargeprice_connection_error">Preturi nu au putut fi incarcate</string>
+    <string name="chargeprice_no_compatible_connectors">Nu sunt conectori compatibili la aceasta statie</string>
+    <string name="pref_chargeprice_currency">Moneda</string>
+    <string name="pref_my_tariffs">Abonamentele mele</string>
+    <plurals name="pref_my_tariffs_summary">
+        <item quantity="one">(va fi evidentiat in comparatia preturilor)</item>
+        <item quantity="other">(vor fi evidentiate in comparatia preturilor)</item>
+        <item quantity="few">(vor fi evidentiate in comparatia preturilor)</item>
+    </plurals>
+    <string name="chargeprice_all_tariffs_selected">toate abonamentele selectate</string>
+    <string name="license">Licenta</string>
+    <string name="settings_charger_data">Statii de incarcare</string>
+    <string name="pref_data_source">Sursa date</string>
+    <plurals name="chargeprice_some_tariffs_selected">
+        <item quantity="one">%d abonament selectat</item>
+        <item quantity="other">%d abonamente selectate</item>
+        <item quantity="few">%d abonamente selectate</item>
+    </plurals>
+    <string name="unknown_operator">Operator necunoscut</string>
+    <string name="data_sources_description">Alegeti o sursa pentru statiile de incarcare. Puteti modifica ulterior in setarile aplicatiei.</string>
+    <string name="data_source_goingelectric">GoingElectric.de</string>
+    <string name="data_source_openchargemap">Open Charge Map</string>
+    <string name="data_source_goingelectric_desc">Recomandat in tarile vorbitaore de limba germana. Descrieri in limba germana. Actualizat de comunitate.</string>
+    <string name="data_source_openchargemap_desc"><![CDATA[International, calitate variata. Descrieri in engleza sau in limba locala. Actualizat de comunitate si de autoritati in unele tari (ex. America de Nord, UK, Franta, Norvegia).]]></string>
+    <string name="next">urmatorul</string>
+    <string name="get_started">Incepe</string>
+    <string name="got_it">Am inteles</string>
+    <string name="lets_go">Sa incepem</string>
+    <string name="crash_report_text">Eroare EVMap. Trimiteti raportul de eroare la dezvoltator.</string>
+    <string name="crash_report_comment_prompt">Puteti adauga un comentariu aici:</string>
+    <string name="powered_by_mapbox">furnizat de Mapbox</string>
+    <string name="pref_search_provider">Furnizor cautare</string>
+    <string name="pref_search_provider_info"><![CDATA[Datele de cautare sunt costisitoare, in special de la Google Maps. Va rugam sa luati in considerare o donatie in sectiunea “Despre” → “Doneaza”.]]></string>
+    <string name="github_sponsors">Sponsori GitHub</string>
+    <string name="donate_desc">Sprijina dezvoltarea EVMap\'s cu o donatie</string>
+    <string name="github_sponsors_desc">Sprijina EVMap pe GitHub</string>
+    <string name="unnamed_filter_profile">Profile filtre fara nume</string>
+    <string name="privacy_link">https://evmap.vonforst.net/en/privacy.html</string>
+    <string name="faq_link">https://evmap.vonforst.net/en/faq.html</string>
+    <string name="chargeprice_faq_link">https://evmap.vonforst.net/en/chargeprice_faq.html</string>
+    <string name="required">obligatoriu</string>
+    <string name="edit_filter_profile">Modifica “%s”</string>
+    <string name="pref_search_delete_recent">Sterge rezultate cautare recenta</string>
+    <string name="deleted_recent_search_results">Rezultate cautare recenta au fost sterse</string>
+    <string name="settings_data_sources">Surse date</string>
+    <string name="help">Ajutor</string>
+    <string name="settings_android_auto">Android Auto</string>
+    <string name="pref_chargeprice_allow_unbalanced_load">Include incarcare nebalansata</string>
+    <string name="pref_chargeprice_allow_unbalanced_load_summary">Include incarcare monofazata AC cu mai mult de 4.5 kW</string>
+    <string name="pref_map_rotate_gestures_enabled">Rotire harta</string>
+    <string name="pref_map_rotate_gestures_on">Foloseste doua degete pentru a roti harta</string>
+    <string name="pref_map_rotate_gestures_off">Rotire dezactivata (nordul mereu sus)</string>
+    <string name="refresh_live_data">actualizare stare in timp real</string>
+    <string name="autocomplete_connection_error">Sugestiile nu au putut fi incarcate</string>
+    <string name="pref_language_device_default">Implicit dispozitiv</string>
+    <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>
+    <string name="about_contributors_text">Multumiri contribuitorilor pentru cod si traduceri pentru EVMap:</string>
+    <string name="utilization_prediction">Estimare utilizare</string>
+    <string name="prediction_help">Estimarea se bazeaza pe diversi factori cum ar fi ziua saptamanii, ora, utilizarile anterioare, astfel incat sa se evite supra aglomerarea. Fara garantie.</string>
+    <string name="prediction_time_colon">%s:</string>
+    <plurals name="prediction_number_available">
+        <item quantity="one">%1$d/%2$d disponibil</item>
+        <item quantity="other">%1$d/%2$d disponibile</item>
+        <item quantity="few">%1$d/%2$d disponibile</item>
+    </plurals>
+    <string name="pref_prediction_enabled">Arata estimare utilizare</string>
+    <string name="pref_prediction_enabled_summary">pentru statiile de incarcare suportate\n(momentan doar DC in Germania)</string>
+    <string name="prediction_only">(doar %s)</string>
+    <string name="prediction_dc_plugs_only">prize DC</string>
+    <string name="data_source_switched_to">Sursa date schimbat la %s</string>
+    <string name="pref_applink_associate">Linkuri suportate</string>
+    <string name="pref_applink_associate_summary">de la goingelectric.de si openchargemap.org</string>
+    <string name="chargeprice_header_my_tariffs">Abonamentele mele</string>
+    <string name="chargeprice_header_other_tariffs">Alte abonamente</string>
+    <string name="developer_mode_enabled">Activat mod dezvoltator</string>
+    <string name="developer_options">Optiuni dezvoltator</string>
+    <string name="disable_developer_mode">Dezactivare mod dezvoltator</string>
+    <string name="developer_mode_disabled">Mod dezvoltator dezactivat</string>
+    <string name="gps">GPS</string>
+    <string name="compass">Busola</string>
+</resources>

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

@@ -6,6 +6,9 @@
         <item>@string/pref_language_de</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>
@@ -13,6 +16,9 @@
         <item>de</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>

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

@@ -2,7 +2,7 @@
 <resources>
     <string name="shared_element_picture">picture</string>
     <string name="shared_element_chargeprice">chargeprice</string>
-    <string name="github_link">https://github.com/johan12345/EVMap</string>
+    <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="goingelectric_forum_url"><![CDATA[https://www.goingelectric.de/forum/viewtopic.php?f=5&t=56342]]></string>
@@ -13,14 +13,21 @@
     <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="about_contributors_list">
         Danilo Bargen\n
         Altonss\n
         Allan Nordhøy\n
         Maximilian Goldschmidt\n
+        Wim Lamotte\n
         Licaon_Kter\n
+        Celso Azevedo\n
         pt2121\n
-        nautilusx
+        nautilusx\n
+        Bobby Galati
     </string>
     <string name="hide_on_scroll_fab_behavior">net.vonforst.evmap.ui.HideOnScrollFabBehavior</string>
+    <string name="paypal_link" translatable="false">https://paypal.me/johan98</string>
 </resources>

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

@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="app_name">EVMap</string>
     <string name="title_activity_maps">EVMap</string>
@@ -41,7 +42,7 @@
     <string name="settings_ui">Interface</string>
     <string name="settings_map">Map</string>
     <string name="copyright">Copyright</string>
-    <string name="copyright_summary">©2020–2022 Johan von Forstner</string>
+    <string name="copyright_summary">©2020–2023 Johan von Forstner</string>
     <string name="other">Other</string>
     <string name="privacy">Privacy</string>
     <string name="fav_add">Save as favorite</string>
@@ -142,6 +143,7 @@
     <string name="category_caravan_site">Caravan site</string>
     <string name="menu_apply">Apply filters</string>
     <string name="menu_save_profile">Save as profile</string>
+    <string name="menu_reset">Reset filter settings</string>
     <string name="no_filters">No filters</string>
     <string name="filter_custom">Modified filter</string>
     <string name="filter_favorites">Favorites</string>
@@ -156,7 +158,7 @@
     <string name="welcome_2">Each charger\'s color corresponds to its max charging power</string>
     <string name="welcome_2_detail">This can also be seen in “About” → “Frequently Asked Questions”</string>
     <string name="donation_dialog_title">Thank you for using EVMap</string>
-    <string name="donation_dialog_detail">EVMap is libre and free of charge. Code contributions on GitHub are much appreciated. To help cover the running costs for data access, please consider donating an amount of your choice to the developer.</string>
+    <string name="donation_dialog_detail">EVMap is open source and free of charge. Code contributions on GitHub are much appreciated. To help cover the running costs for data access, please consider donating an amount of your choice to the developer.</string>
     <string name="chargeprice_donation_dialog_title">You\'re a real bargain hunter!</string>
     <string name="chargeprice_donation_dialog_detail">You make great use of the price comparison feature. Please help cover the costs for this data by supporting EVMap with a donation.</string>
     <string name="deleted_filterprofile">Deleted “%s”</string>
@@ -180,7 +182,7 @@
     <string name="chargeprice_session_fee">session fee</string>
     <string name="chargeprice_per_kwh">per kWh</string>
     <string name="chargeprice_per_minute">per min</string>
-    <string name="chargeprice_blocking_fee">Blocking fee >%s</string>
+    <string name="chargeprice_blocking_fee">Blocking fee &gt;%s</string>
     <string name="chargeprice_no_tariffs_found">No charging plans for this charger on Chargeprice.app</string>
     <string name="powered_by_chargeprice">powered by Chargeprice</string>
     <string name="chargeprice_base_fee">Base fee: %2$s%1$.2f/month</string>
@@ -285,4 +287,13 @@
     <string name="data_source_switched_to">Data source switched to %s</string>
     <string name="pref_applink_associate">Open supported links</string>
     <string name="pref_applink_associate_summary">from goingelectric.de and openchargemap.org</string>
-</resources>
+    <string name="chargeprice_header_my_tariffs">My plans</string>
+    <string name="chargeprice_header_other_tariffs">Other plans</string>
+    <string name="developer_mode_enabled">Developer mode enabled</string>
+    <string name="developer_options">Developer options</string>
+    <string name="disable_developer_mode">Disable developer mode</string>
+    <string name="developer_mode_disabled">Developer mode disabled</string>
+    <string name="gps">GPS</string>
+    <string name="compass">Compass</string>
+    <string name="charger_website">Website</string>
+</resources>

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

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

app/src/test/java/net/vonforst/evmap/api/fronyx/FronyxApiTest.kt

@@ -20,7 +20,7 @@ class FronyxApiTest {
         webServer.start()
 
         val apikey = ""
-        fronyx = FronyxApi.create(
+        fronyx = FronyxApi(
             apikey,
             webServer.url("/").toString()
         )
@@ -36,6 +36,14 @@ class FronyxApiTest {
                         val id = segments[2]
                         return okResponse("/fronyx/${id.replace("*", "_")}.json")
                     }
+                    "predictions/evses" -> {
+                        val ids = request.requestUrl!!.queryParameter("evseIds")!!.split(",")
+                        return okResponse(
+                            "/fronyx/${
+                                ids.map { it.replace("*", "_") }.joinToString(",")
+                            }.json"
+                        )
+                    }
                     else -> return notFoundResponse
                 }
             }
@@ -43,7 +51,7 @@ class FronyxApiTest {
     }
 
     @Test
-    fun apiTest() {
+    fun apiTestSingle() {
         val evseId = "DE*ION*E202102"
 
         runBlocking {
@@ -57,4 +65,25 @@ class FronyxApiTest {
             assertEquals(FronyxStatus.AVAILABLE, result.predictions[0].status)
         }
     }
+
+    @Test
+    fun apiTestMultiple() {
+        val evseIds = listOf("DE*ION*E202101", "DE*ION*E202102")
+
+        runBlocking {
+            val results = fronyx.getPredictionsForEvseIds(evseIds)
+            results.forEachIndexed { i, result ->
+                assertEquals(result.evseId, evseIds[i])
+                assertEquals(25, result.predictions.size)
+                assertEquals(
+                    ZonedDateTime.of(2022, 11, 16, 18, 0, 0, 0, ZoneOffset.UTC),
+                    result.predictions[0].timestamp
+                )
+                assertEquals(
+                    if (i == 0) FronyxStatus.UNAVAILABLE else FronyxStatus.AVAILABLE,
+                    result.predictions[0].status
+                )
+            }
+        }
+    }
 }

app/src/test/resources/fronyx/DE_ION_E202101,DE_ION_E202102.json

@@ -0,0 +1,214 @@
+[
+  {
+    "evseId": "DE*ION*E202101",
+    "locationId": "DE-ION-03e2876e-0fd0-4e9d-abc1-d2caa1473947",
+    "predictions": [
+      {
+        "timestamp": "2022-11-16T18:00:00.000Z",
+        "status": "UNAVAILABLE"
+      },
+      {
+        "timestamp": "2022-11-16T18:15:00.000Z",
+        "status": "UNAVAILABLE"
+      },
+      {
+        "timestamp": "2022-11-16T18:30:00.000Z",
+        "status": "UNAVAILABLE"
+      },
+      {
+        "timestamp": "2022-11-16T18:45:00.000Z",
+        "status": "UNAVAILABLE"
+      },
+      {
+        "timestamp": "2022-11-16T19:00:00.000Z",
+        "status": "UNAVAILABLE"
+      },
+      {
+        "timestamp": "2022-11-16T19:15:00.000Z",
+        "status": "UNAVAILABLE"
+      },
+      {
+        "timestamp": "2022-11-16T19:30:00.000Z",
+        "status": "UNAVAILABLE"
+      },
+      {
+        "timestamp": "2022-11-16T19:45:00.000Z",
+        "status": "UNAVAILABLE"
+      },
+      {
+        "timestamp": "2022-11-16T20:00:00.000Z",
+        "status": "UNAVAILABLE"
+      },
+      {
+        "timestamp": "2022-11-16T20:15:00.000Z",
+        "status": "UNAVAILABLE"
+      },
+      {
+        "timestamp": "2022-11-16T20:30:00.000Z",
+        "status": "UNAVAILABLE"
+      },
+      {
+        "timestamp": "2022-11-16T20:45:00.000Z",
+        "status": "UNAVAILABLE"
+      },
+      {
+        "timestamp": "2022-11-16T21:00:00.000Z",
+        "status": "UNAVAILABLE"
+      },
+      {
+        "timestamp": "2022-11-16T21:15:00.000Z",
+        "status": "UNAVAILABLE"
+      },
+      {
+        "timestamp": "2022-11-16T21:30:00.000Z",
+        "status": "UNAVAILABLE"
+      },
+      {
+        "timestamp": "2022-11-16T21:45:00.000Z",
+        "status": "UNAVAILABLE"
+      },
+      {
+        "timestamp": "2022-11-16T22:00:00.000Z",
+        "status": "UNAVAILABLE"
+      },
+      {
+        "timestamp": "2022-11-16T22:15:00.000Z",
+        "status": "UNAVAILABLE"
+      },
+      {
+        "timestamp": "2022-11-16T22:30:00.000Z",
+        "status": "UNAVAILABLE"
+      },
+      {
+        "timestamp": "2022-11-16T22:45:00.000Z",
+        "status": "UNAVAILABLE"
+      },
+      {
+        "timestamp": "2022-11-16T23:00:00.000Z",
+        "status": "UNAVAILABLE"
+      },
+      {
+        "timestamp": "2022-11-16T23:15:00.000Z",
+        "status": "UNAVAILABLE"
+      },
+      {
+        "timestamp": "2022-11-16T23:30:00.000Z",
+        "status": "UNAVAILABLE"
+      },
+      {
+        "timestamp": "2022-11-16T23:45:00.000Z",
+        "status": "UNAVAILABLE"
+      },
+      {
+        "timestamp": "2022-11-17T00:00:00.000Z",
+        "status": "UNAVAILABLE"
+      }
+    ]
+  },
+  {
+    "evseId": "DE*ION*E202102",
+    "locationId": "DE-ION-03e2876e-0fd0-4e9d-abc1-d2caa1473947",
+    "predictions": [
+      {
+        "timestamp": "2022-11-16T18:00:00.000Z",
+        "status": "AVAILABLE"
+      },
+      {
+        "timestamp": "2022-11-16T18:15:00.000Z",
+        "status": "AVAILABLE"
+      },
+      {
+        "timestamp": "2022-11-16T18:30:00.000Z",
+        "status": "UNAVAILABLE"
+      },
+      {
+        "timestamp": "2022-11-16T18:45:00.000Z",
+        "status": "UNAVAILABLE"
+      },
+      {
+        "timestamp": "2022-11-16T19:00:00.000Z",
+        "status": "UNAVAILABLE"
+      },
+      {
+        "timestamp": "2022-11-16T19:15:00.000Z",
+        "status": "UNAVAILABLE"
+      },
+      {
+        "timestamp": "2022-11-16T19:30:00.000Z",
+        "status": "UNAVAILABLE"
+      },
+      {
+        "timestamp": "2022-11-16T19:45:00.000Z",
+        "status": "UNAVAILABLE"
+      },
+      {
+        "timestamp": "2022-11-16T20:00:00.000Z",
+        "status": "UNAVAILABLE"
+      },
+      {
+        "timestamp": "2022-11-16T20:15:00.000Z",
+        "status": "UNAVAILABLE"
+      },
+      {
+        "timestamp": "2022-11-16T20:30:00.000Z",
+        "status": "UNAVAILABLE"
+      },
+      {
+        "timestamp": "2022-11-16T20:45:00.000Z",
+        "status": "UNAVAILABLE"
+      },
+      {
+        "timestamp": "2022-11-16T21:00:00.000Z",
+        "status": "UNAVAILABLE"
+      },
+      {
+        "timestamp": "2022-11-16T21:15:00.000Z",
+        "status": "AVAILABLE"
+      },
+      {
+        "timestamp": "2022-11-16T21:30:00.000Z",
+        "status": "AVAILABLE"
+      },
+      {
+        "timestamp": "2022-11-16T21:45:00.000Z",
+        "status": "AVAILABLE"
+      },
+      {
+        "timestamp": "2022-11-16T22:00:00.000Z",
+        "status": "AVAILABLE"
+      },
+      {
+        "timestamp": "2022-11-16T22:15:00.000Z",
+        "status": "AVAILABLE"
+      },
+      {
+        "timestamp": "2022-11-16T22:30:00.000Z",
+        "status": "AVAILABLE"
+      },
+      {
+        "timestamp": "2022-11-16T22:45:00.000Z",
+        "status": "AVAILABLE"
+      },
+      {
+        "timestamp": "2022-11-16T23:00:00.000Z",
+        "status": "AVAILABLE"
+      },
+      {
+        "timestamp": "2022-11-16T23:15:00.000Z",
+        "status": "AVAILABLE"
+      },
+      {
+        "timestamp": "2022-11-16T23:30:00.000Z",
+        "status": "AVAILABLE"
+      },
+      {
+        "timestamp": "2022-11-16T23:45:00.000Z",
+        "status": "AVAILABLE"
+      },
+      {
+        "timestamp": "2022-11-17T00:00:00.000Z",
+        "status": "AVAILABLE"
+      }
+    ]
+  }
+]

build.gradle

@@ -1,7 +1,7 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-    ext.kotlin_version = '1.7.10'
+    ext.kotlin_version = '1.7.21'
     ext.about_libs_version = '8.9.4'
     ext.nav_version = '2.5.3'
     repositories {
@@ -10,11 +10,10 @@ buildscript {
         gradlePluginPortal()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.3.1'
+        classpath 'com.android.tools.build:gradle:7.4.1'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath "com.mikepenz.aboutlibraries.plugin:aboutlibraries-plugin:$about_libs_version"
         classpath "androidx.navigation:navigation-safe-args-gradle-plugin:$nav_version"
-        classpath "de.timfreiheit.resourceplaceholders:placeholders:0.4"
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

doc/api_keys.md

@@ -47,7 +47,7 @@ Below you find a list of all the services and how to obtain the API keys.
 Map providers
 -------------
 
-The different Map SDKs are wrapped by our [fork](https://github.com/johan12345/AnyMaps) of the
+The different Map SDKs are wrapped by our [fork](https://github.com/ev-map/AnyMaps) of the
 [AnyMaps](https://github.com/sharenowTech/AnyMaps) library to provide a common API. The `google`
 build flavor of the app includes both Google Maps and Mapbox and allows the user to switch between
 the two, while the `foss` flavor only includes the Mapbox SDK.
@@ -118,7 +118,7 @@ in German.
    - website (*Webseite*, optional)
    - phone number (*Telefonnummer*, optional)
    - name of the app (*Name der App*): EVMap
-   - app website (*Webseite der App*): https://github.com/johan12345/EVMap
+   - app website (*Webseite der App*): https://github.com/ev-map/EVMap
    - description (*kurze Beschreibung der App*): please explain that you would like to contribute to
      the development of EVMap and therefore need access to the GoingElectric.de API.
    - Referrer (*Herkunft*): leave this field blank!
@@ -137,7 +137,7 @@ in German.
 1. [Sign up](https://openchargemap.org/site/loginprovider/register) for an account at OpenChargeMap
 2. Go to the [My Apps](https://openchargemap.org/site/profile/applications) page and click
    *Register an application*
-3. Enter the name of the app (EVMap) and website (https://github.com/johan12345/EVMap), and in the
+3. Enter the name of the app (EVMap) and website (https://github.com/ev-map/EVMap), and in the
    description field describe that you would like to contribute to the development of EVMap and
    therefore need access to the OpenChargeMap API. Do not tick the *List App in Public Showcase*
    box. Then, click *save*.
@@ -160,7 +160,7 @@ Since February 2022, the Chargeprice API is no longer available for free to new
 you can use their
 [staging API](https://github.com/chargeprice/chargeprice-api-docs/blob/master/test_the_api.md)
 for free to test the Chargeprice features. This is already
-[configured](https://github.com/johan12345/EVMap/blob/master/app/src/debug/res/values/donottranslate.xml)
+[configured](https://github.com/ev-map/EVMap/blob/master/app/src/debug/res/values/donottranslate.xml)
 by default for the debug version of the app, so you can leave the `chargeprice_key` field in your
 new `app/src/main/res/values/apikeys.xml` file blank. Note that the staging API contains only a
 limited dataset, so it only outputs prices for certain charge point operators and payment plans (see

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

@@ -0,0 +1,8 @@
+Verbesserungen:
+- Laden der Verfügbarkeitsprognosen beschleunigt
+- Android Auto: "Meine Tarife" im Preisvergleich hervorheben
+
+Fehler behoben:
+- Android Automotive: Aktualisieren-Button fehlte
+- Darstellungsfehler nach dem Scrollen der Detailansicht behoben
+- Abstürze behoben

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

@@ -0,0 +1,9 @@
+Verbesserungen:
+- Laden der Verfügbarkeitsprognosen beschleunigt
+- Android Auto: "Meine Tarife" im Preisvergleich hervorheben
+
+Fehler behoben:
+- Android Automotive: Aktualisieren-Button fehlte
+- Android Auto: Klick auf Suchergebnis funktioniert manchmal nicht
+- Darstellungsfehler nach dem Scrollen der Detailansicht behoben
+- Abstürze behoben

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

@@ -0,0 +1,5 @@
+Verbesserungen:
+- Android Auto: Suchbutton während der Fahrt freigeschaltet (ggf. ohne Tastatur)
+
+Fehler behoben:
+- Abstürze behoben

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

@@ -0,0 +1,7 @@
+Verbesserungen:
+- Neuer Knopf zum Zurücksetzen der Filtereinstellungen
+- Filtermenü mit neuen Icons
+- Übersetzungen aktualisiert
+
+Fehler behoben:
+- Abstürze behoben

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

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

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

@@ -0,0 +1,5 @@
+Verbesserungen:
+- Neue Übersetzung: Niederländisch
+
+Fehler behoben:
+- Abstürze behoben

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

@@ -0,0 +1,2 @@
+Fehler behoben:
+- Unnötige HTTP-Requests entfernt

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

@@ -0,0 +1,7 @@
+Verbesserungen:
+- Fahrzeugauswahl für Preisvergleich: Details der Fahrzeuge hinzugefügt
+- Übersetzungen aktualisiert
+
+Fehler behoben:
+- Abstürze behoben
+- Open Charge Map: Laden von Bildern verbessert

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

@@ -0,0 +1,7 @@
+Verbesserungen:
+- Neue Übersetzungen: Portugiesisch, Rumänisch
+- Open Charge Map: Links zu Betreiber hinzugefügt
+
+Fehler behoben:
+- Open Charge Map: Gelöschte Ladestationen nicht anzeigen
+- Open Charge Map: Filter "Störung ausschließen" korrigiert

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

@@ -11,7 +11,7 @@ Funktionen:
 - Favoritenliste, auch mit Anzeige der Verfügbarkeit
 - Keine nervige Werbung
 
-EVMap ist ein Open-Source-Projekt und unter https://github.com/johan12345/EVMap zu finden.
+EVMap ist ein Open-Source-Projekt und unter https://github.com/ev-map/EVMap zu finden.
 
 Die App ist kein offizielles Angebot von GoingElectric.de oder Open Charge Map, sondern nutzt die öffentlichen APIs dieser Seiten.