Release 1.6.7

instead make the user actively choose the data source
#291

.github/workflows/release.yml

@@ -82,6 +82,6 @@ jobs:
           GITHUB_TOKEN: ${{ github.token }}
         with:
           upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_path: app/build/outputs/apk/fossAutomotive/release/app-google-automotive-release.apk
+          asset_path: app/build/outputs/apk/fossAutomotive/release/app-foss-automotive-release.apk
           asset_name: app-foss-automotive-release.apk
           asset_content_type: application/vnd.android.package-archive

app/build.gradle

@@ -21,8 +21,8 @@ android {
         minSdkVersion 21
         targetSdkVersion 33
         // NOTE: always increase versionCode by 2 since automotive flavor uses versionCode + 1
-        versionCode 190
-        versionName "1.6.5"
+        versionCode 194
+        versionName "1.6.7"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         resConfigs supportedLocales.split(',')
@@ -186,7 +186,7 @@ dependencies {
     implementation 'com.squareup.moshi:moshi-kotlin:1.15.0'
     implementation 'com.squareup.moshi:moshi-adapters:1.15.0'
     implementation 'com.markomilos.jsonapi:jsonapi-retrofit:1.1.0'
-    implementation 'io.coil-kt:coil:1.1.0'
+    implementation 'io.coil-kt:coil:2.4.0'
     implementation 'com.github.ev-map:StfalconImageViewer:5082ebd392'
     implementation "com.mikepenz:aboutlibraries-core:$about_libs_version"
     implementation "com.mikepenz:aboutlibraries:$about_libs_version"

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

@@ -105,16 +105,18 @@ class EnBwAvailabilityDetector(client: OkHttpClient, baseUrl: String? = null) :
         var markers =
             api.getMarkers(lng - coordRange, lng + coordRange, lat - coordRange, lat + coordRange)
 
-        markers = markers.flatMap {
-            if (it.grouped) {
-                api.getMarkers(
-                    it.viewPort.lowerLeftLon,
-                    it.viewPort.upperRightLon,
-                    it.viewPort.lowerLeftLat,
-                    it.viewPort.upperRightLat
-                )
-            } else {
-                listOf(it)
+        while (markers.any { it.grouped }) {
+            markers = markers.flatMap {
+                if (it.grouped) {
+                    api.getMarkers(
+                        it.viewPort.lowerLeftLon,
+                        it.viewPort.upperRightLon,
+                        it.viewPort.lowerLeftLat,
+                        it.viewPort.upperRightLat
+                    )
+                } else {
+                    listOf(it)
+                }
             }
         }
 
@@ -149,9 +151,9 @@ class EnBwAvailabilityDetector(client: OkHttpClient, baseUrl: String? = null) :
             markers = listOf(nearest)
         }
 
-        val details = markers.map {
+        val details = markers.mapNotNull { it.stationId }.map {
             // load details
-            api.getLocation(it.stationId!!)
+            api.getLocation(it)
         }
 
         val connectorStatus = details.flatMap { it.chargePoints }.flatMap { cp ->

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

@@ -235,7 +235,7 @@ interface TeslaGraphQlApi {
     data class GetNearbyChargingSitesResponse(val data: GetNearbyChargingSitesResponseData)
 
     @JsonClass(generateAdapter = true)
-    data class GetNearbyChargingSitesResponseData(val charging: GetNearbyChargingSitesResponseDataCharging)
+    data class GetNearbyChargingSitesResponseData(val charging: GetNearbyChargingSitesResponseDataCharging?)
 
     @JsonClass(generateAdapter = true)
     data class GetNearbyChargingSitesResponseDataCharging(val nearbySites: GetNearbyChargingSitesResponseDataChargingNearbySites)
@@ -518,7 +518,8 @@ class TeslaAvailabilityDetector(
         val results = api.getNearbyChargingSites(
             req,
             req.operationName
-        ).data.charging.nearbySites.sitesAndDistances
+        ).data.charging?.nearbySites?.sitesAndDistances
+            ?: throw AvailabilityDetectorException("no candidates found.")
         val result =
             results.minByOrNull { it.haversineDistanceMiles.value }
                 ?: throw AvailabilityDetectorException("no candidates found.")

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

@@ -153,6 +153,10 @@ class GoingElectricApiWrapper(
             // no connectors chosen
             return Resource.success(ChargepointList.empty())
         }
+        if (connectorsVal != null && connectorsVal.values.contains("CCS")) {
+            // see note about Tesla Supercharger CCS filter in getFilters below
+            connectorsVal.values.add("Tesla Supercharger CCS")
+        }
         val connectors = formatMultipleChoice(connectorsVal)
 
         val chargeCardsVal = filters?.getMultipleChoiceValue("chargecards")
@@ -247,6 +251,10 @@ class GoingElectricApiWrapper(
             // no connectors chosen
             return Resource.success(ChargepointList.empty())
         }
+        if (connectorsVal != null && connectorsVal.values.contains("CCS")) {
+            // see note about Tesla Supercharger CCS filter in getFilters below
+            connectorsVal.values.add("Tesla Supercharger CCS")
+        }
         val connectors = formatMultipleChoice(connectorsVal)
 
         val chargeCardsVal = filters?.getMultipleChoiceValue("chargecards")
@@ -434,9 +442,18 @@ class GoingElectricApiWrapper(
         val networks = refData.networks
         val chargeCards = refData.chargecards
 
-        val plugMap = plugs.associateWith { plug ->
-            nameForPlugType(sp, GEChargepoint.convertTypeFromGE(plug))
-        }
+        /*
+        "Tesla Supercharger CCS" is a bit peculiar - it is available as a filter, but the API
+        just returns "CCS" in the charging station details. So we cannot use it for filtering as
+        it won't work in the local database. So we join them into a single filter option.
+        If you want to find Tesla Superchargers with CCS, you can still do that using the network
+        filter.
+         */
+        val plugMap = plugs
+            .filter { it != "Tesla Supercharger CCS" }
+            .associateWith { plug ->
+                nameForPlugType(sp, GEChargepoint.convertTypeFromGE(plug))
+            }
         val networkMap = networks.associateWith { it }
         val chargecardMap = chargeCards.associate { it.id.toString() to it.name }
         val categoryMap = mapOf(

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

@@ -5,7 +5,22 @@ import androidx.room.PrimaryKey
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
 import kotlinx.parcelize.Parcelize
-import net.vonforst.evmap.model.*
+import net.vonforst.evmap.model.Address
+import net.vonforst.evmap.model.ChargeCard
+import net.vonforst.evmap.model.ChargeCardId
+import net.vonforst.evmap.model.ChargeLocation
+import net.vonforst.evmap.model.ChargeLocationCluster
+import net.vonforst.evmap.model.Chargepoint
+import net.vonforst.evmap.model.ChargepointListItem
+import net.vonforst.evmap.model.ChargepriceData
+import net.vonforst.evmap.model.ChargerPhoto
+import net.vonforst.evmap.model.Coordinate
+import net.vonforst.evmap.model.Cost
+import net.vonforst.evmap.model.FaultReport
+import net.vonforst.evmap.model.Hours
+import net.vonforst.evmap.model.OpeningHours
+import net.vonforst.evmap.model.OpeningHoursDays
+import net.vonforst.evmap.model.ReferenceData
 import java.time.Instant
 import java.time.LocalTime
 
@@ -35,7 +50,7 @@ sealed class GEChargepointListItem {
 @JsonClass(generateAdapter = true)
 data class GEChargeLocation(
     @Json(name = "ge_id") val id: Long,
-    val name: String,
+    val name: String?,
     val coordinates: GECoordinate,
     val address: GEAddress,
     val chargepoints: List<GEChargepoint>,
@@ -57,7 +72,7 @@ data class GEChargeLocation(
     override fun convert(apikey: String, isDetailed: Boolean) = ChargeLocation(
         id,
         "goingelectric",
-        name,
+        name ?: "Charging station",
         coordinates.convert(),
         address.convert(),
         chargepoints.map { it.convert() },

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

@@ -6,7 +6,15 @@ import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
 import kotlinx.parcelize.Parcelize
 import net.vonforst.evmap.max
-import net.vonforst.evmap.model.*
+import net.vonforst.evmap.model.Address
+import net.vonforst.evmap.model.ChargeLocation
+import net.vonforst.evmap.model.Chargepoint
+import net.vonforst.evmap.model.ChargepriceData
+import net.vonforst.evmap.model.ChargerPhoto
+import net.vonforst.evmap.model.Coordinate
+import net.vonforst.evmap.model.Cost
+import net.vonforst.evmap.model.FaultReport
+import net.vonforst.evmap.model.ReferenceData
 import java.time.Instant
 import java.time.ZonedDateTime
 
@@ -165,7 +173,8 @@ data class OCMConnection(
                 17L -> Chargepoint.CEE_ROT
                 28L -> Chargepoint.SCHUKO
                 8L -> Chargepoint.TESLA_ROADSTER_HPC
-                27L -> Chargepoint.SUPERCHARGER
+                27L -> Chargepoint.SUPERCHARGER  // Tesla North American plug (NACS)
+                30L -> Chargepoint.SUPERCHARGER  // European Tesla Model S/X Supercharger plug (DC on Type 2)
                 25L -> Chargepoint.TYPE_2_SOCKET
                 1036L -> Chargepoint.TYPE_2_PLUG
                 1L -> Chargepoint.TYPE_1

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

@@ -646,7 +646,7 @@ class AboutScreen(ctx: CarContext) : Screen(ctx) {
                         .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))
+                                openUrl(carContext, carContext.getString(R.string.donate_link))
                             } else {
                                 val intent = Intent(carContext, MapsActivity::class.java)
                                     .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)

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

@@ -6,7 +6,6 @@ import android.annotation.SuppressLint
 import android.content.Context
 import android.content.res.Configuration
 import android.graphics.Color
-import android.location.Geocoder
 import android.os.Bundle
 import android.text.method.KeyListener
 import android.view.*
@@ -194,6 +193,9 @@ class MapFragment : Fragment(), OnMapReadyCallback, MapsActivity.FragmentCallbac
             searchResultIcon = null
         }
 
+        binding.detailAppBar.toolbar.popupTheme =
+            com.google.android.material.R.style.ThemeOverlay_AppCompat_DayNight
+
         ViewCompat.setOnApplyWindowInsetsListener(
             binding.root
         ) { _, insets ->

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

@@ -243,9 +243,11 @@ class DataSourceSelectFragment : OnboardingPageFragment() {
                 }
             }
         }
-        when (prefs.dataSource) {
-            "goingelectric" -> binding.rgDataSource.rbGoingElectric.isChecked = true
-            "openchargemap" -> binding.rgDataSource.rbOpenChargeMap.isChecked = true
+        if (prefs.dataSourceSet) {
+            when (prefs.dataSource) {
+                "goingelectric" -> binding.rgDataSource.rbGoingElectric.isChecked = true
+                "openchargemap" -> binding.rgDataSource.rbOpenChargeMap.isChecked = true
+            }
         }
 
         binding.btnGetStarted.setOnClickListener {

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

@@ -11,7 +11,6 @@ import androidx.room.migration.Migration
 import androidx.sqlite.db.SupportSQLiteDatabase
 import co.anbora.labs.spatia.builder.SpatiaRoom
 import co.anbora.labs.spatia.geometry.GeometryConverters
-import kotlinx.coroutines.runBlocking
 import net.vonforst.evmap.api.goingelectric.GEChargeCard
 import net.vonforst.evmap.api.goingelectric.GEChargepoint
 import net.vonforst.evmap.api.openchargemap.OCMConnectionType
@@ -35,7 +34,7 @@ import net.vonforst.evmap.model.*
         OCMCountry::class,
         OCMOperator::class,
         SavedRegion::class
-    ], version = 21
+    ], version = 22
 )
 @TypeConverters(Converters::class, GeometryConverters::class)
 abstract class AppDatabase : RoomDatabase() {
@@ -75,7 +74,8 @@ 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_19, MIGRATION_20, MIGRATION_21
+                MIGRATION_17, MIGRATION_18, MIGRATION_19, MIGRATION_20, MIGRATION_21,
+                MIGRATION_22
             )
                 .addCallback(object : Callback() {
                     override fun onCreate(db: SupportSQLiteDatabase) {
@@ -452,6 +452,13 @@ abstract class AppDatabase : RoomDatabase() {
                 db.execSQL("DELETE FROM savedregion")
             }
         }
+
+        private val MIGRATION_22 = object : Migration(21, 22) {
+            override fun migrate(db: SupportSQLiteDatabase) {
+                // clear cache with this update
+                db.execSQL("DELETE FROM savedregion")
+            }
+        }
     }
 
     /**

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

@@ -151,8 +151,9 @@ class BarGraphView(context: Context, attrs: AttributeSet) : View(context, attrs)
             legendPaint.textAlign = Paint.Align.CENTER
 
             data.entries.forEachIndexed { i, (t, v) ->
+                val divisor = maxValue.toFloat().takeIf { it > 0f } ?: 1f
                 val height =
-                    zeroHeight + (graphBounds.height() - zeroHeight) * v.toFloat() / maxValue.toFloat()
+                    zeroHeight + (graphBounds.height() - zeroHeight) * v.toFloat() / divisor
                 val left = graphBounds.left + (barWidth + barMargin) * i
 
                 if (left + barWidth > graphBounds.right) return@forEachIndexed

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

@@ -27,7 +27,8 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/dialogTitle"
-        app:layout_constraintBottom_toTopOf="@id/btnCancel">
+        app:layout_constraintBottom_toTopOf="@id/btnCancel"
+        android:requiresFadingEdge="vertical">
 
         <LinearLayout
             android:layout_width="match_parent"

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

@@ -4,7 +4,8 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     xmlns:tools="http://schemas.android.com/tools"
-    android:fillViewport="true">
+    android:fillViewport="true"
+    android:requiresFadingEdge="vertical">
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
@@ -17,7 +18,7 @@
             android:layout_height="wrap_content"
             android:layout_marginStart="24dp"
             android:layout_marginEnd="24dp"
-            android:layout_marginBottom="32dp"
+            android:layout_marginBottom="16dp"
             app:layout_constraintBottom_toTopOf="@+id/dataSourceHint"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintHorizontal_bias="0.5"
@@ -28,6 +29,7 @@
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginStart="32dp"
+            android:layout_marginTop="16dp"
             android:layout_marginEnd="32dp"
             android:layout_marginBottom="16dp"
             android:gravity="center"
@@ -36,7 +38,9 @@
             app:layout_constraintBottom_toTopOf="@+id/welcomeText2"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintHorizontal_bias="0.5"
-            app:layout_constraintStart_toStartOf="parent" />
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintVertical_bias="1.0" />
 
         <TextView
             android:id="@+id/welcomeText2"
@@ -72,12 +76,12 @@
             android:layout_height="wrap_content"
             android:layout_marginStart="32dp"
             android:layout_marginEnd="32dp"
-            android:layout_marginBottom="32dp"
+            android:layout_marginBottom="24dp"
+            android:breakStrategy="balanced"
             android:gravity="center"
             android:text="@string/data_sources_hint"
             android:textAppearance="@style/TextAppearance.Material3.BodySmall"
             android:textColor="?android:textColorSecondary"
-            android:breakStrategy="balanced"
             app:layout_constraintBottom_toTopOf="@+id/cb_accept_privacy"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintHorizontal_bias="0.5"
@@ -89,14 +93,14 @@
             android:layout_height="wrap_content"
             android:layout_marginStart="24dp"
             android:layout_marginEnd="24dp"
-            android:layout_marginBottom="32dp"
+            android:layout_marginBottom="24dp"
             android:paddingStart="16dp"
             android:textAppearance="@style/TextAppearance.Material3.BodyMedium"
-            tools:text="@string/accept_privacy"
             app:layout_constraintBottom_toTopOf="@+id/btnGetStarted"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintHorizontal_bias="0.5"
-            app:layout_constraintStart_toStartOf="parent" />
+            app:layout_constraintStart_toStartOf="parent"
+            tools:text="@string/accept_privacy" />
 
     </androidx.constraintlayout.widget.ConstraintLayout>
 </ScrollView>

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

@@ -113,7 +113,7 @@
     <string name="goingelectric_forum">Forenthread bei GoingElectric.de</string>
     <string name="contact">Kontakt</string>
     <string name="menu_report_new_charger">Ladesäule melden</string>
-    <string name="edit_at_datasource">bei %s bearbeiten</string>
+    <string name="edit_at_datasource">Bei %s bearbeiten</string>
     <string name="categories">Kategorien</string>
     <string name="category_car_dealership">Autohaus</string>
     <string name="category_service_on_motorway">Autobahnraststätte</string>
@@ -348,7 +348,7 @@
     <string name="auto_settings">Einstellungen</string>
     <string name="welcome_android_auto">Android Auto-Unterstützung</string>
     <string name="welcome_android_auto_detail">Auf unterstützen Autos kannst du EVMap auch mit Android Auto nutzen. Öffne dazu einfach die EVMap-App aus dem Menü von Android Auto.</string>
-    <string name="sounds_cool">klingt cool</string>
+    <string name="sounds_cool">Klingt cool</string>
     <string name="auto_chargeprice_vehicle_unavailable">EVMap konnte das Fahrzeugmodell nicht erkennen.</string>
     <string name="auto_chargeprice_vehicle_unknown">Keins der in der App ausgewählten Fahrzeuge passt zu diesem Fahrzeug (%1$s %2$s).</string>
     <string name="auto_chargeprice_vehicle_ambiguous">Mehrere der in der App ausgewählten Fahrzeuge passen zu diesem Fahrzeug (%1$s %2$s).</string>

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

@@ -55,7 +55,7 @@
     <string name="filter_exclude_faults">Exclure les chargeurs avec des défauts signalés</string>
     <string name="charge_cards">Méthodes de paiement</string>
     <string name="goingelectric_forum">Fil de discussion du forum sur GoingElectric.de</string>
-    <string name="edit_at_datasource">modifier à %s</string>
+    <string name="edit_at_datasource">Modifier à %s</string>
     <string name="categories">Catégories</string>
     <string name="category_car_dealership">Concessionnaire automobile</string>
     <string name="category_public_authorities">Pouvoirs publics</string>
@@ -308,7 +308,7 @@
     <string name="auto_range">Autonomie</string>
     <string name="auto_speed">Vitesse</string>
     <string name="welcome_android_auto">Prise en charge d’Android Auto</string>
-    <string name="sounds_cool">ça a l\'air cool</string>
+    <string name="sounds_cool">Ça a l\'air cool</string>
     <string name="auto_chargeprice_vehicle_unknown">Aucun des véhicules sélectionnés dans l\'application ne correspond à ce véhicule (%1$s %2$s).</string>
     <string name="auto_chargeprice_vehicle_ambiguous">Plusieurs véhicules sélectionnés dans l\'application correspondent à ce véhicule (%1$s %2$s).</string>
     <string name="selecting_all">tous les éléments sélectionnés</string>

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

@@ -127,7 +127,7 @@
     <string name="category_amusement_park">Fornøyelsespark</string>
     <string name="category_cinema">Kino</string>
     <string name="category_parking_multi">Parkeringshus</string>
-    <string name="edit_at_datasource">rediger på %s</string>
+    <string name="edit_at_datasource">Rediger på %s</string>
     <string name="category_camping">Campingplass</string>
     <string name="category_service_on_motorway">Rasteplass (på motorvei)</string>
     <string name="category_shopping_mall">Kjøpesenter</string>
@@ -326,7 +326,7 @@
     <string name="welcome_android_auto_detail">Du kan også bruke EVMap inne i Android Auto på bilder som støtter dette ved å velge det i Android Auto-menyen.</string>
     <string name="settings_android_auto_chargeprice_range">Prissammenligning for laderekkevidde fordelt på pris</string>
     <string name="selecting_all">valgte alle elementene</string>
-    <string name="sounds_cool">den er grei</string>
+    <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>

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

@@ -287,7 +287,7 @@
     <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="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>
@@ -319,7 +319,7 @@
     <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="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>

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

@@ -76,7 +76,7 @@
     <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="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>
@@ -364,4 +364,6 @@
     <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>
+    <string name="reload">Recarregar</string>
+    <string name="accept_privacy"><![CDATA[Li e aceito a <a href=\"%s\">política de privacidade</a> do EVMap.]]></string>
 </resources>

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

@@ -112,7 +112,7 @@
     <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="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>

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

@@ -32,5 +32,6 @@
     </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>
+    <string name="donate_link" translatable="false">https://ev-map.app/donate/</string>
     <string name="copyright_summary">©2020–2023 Johan von Forstner and contributors</string>
 </resources>

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

@@ -113,7 +113,7 @@
     <string name="goingelectric_forum">Forum thread at GoingElectric.de</string>
     <string name="contact">Contact</string>
     <string name="menu_report_new_charger">New charger</string>
-    <string name="edit_at_datasource">edit at %s</string>
+    <string name="edit_at_datasource">Edit at %s</string>
     <string name="categories">Categories</string>
     <string name="category_car_dealership">Car Dealership</string>
     <string name="category_service_on_motorway">Service area (on motorway)</string>
@@ -348,7 +348,7 @@
     <string name="auto_settings">Settings</string>
     <string name="welcome_android_auto">Android Auto support</string>
     <string name="welcome_android_auto_detail">You can also use EVMap from within Android Auto on supported cars. Simply select the EVMap app in the Android Auto menu.</string>
-    <string name="sounds_cool">sounds cool</string>
+    <string name="sounds_cool">Sounds cool</string>
     <string name="auto_chargeprice_vehicle_unavailable">EVMap could not determine your vehicle model.</string>
     <string name="auto_chargeprice_vehicle_unknown">None of the vehicles selected in the app matches this vehicle (%1$s %2$s).</string>
     <string name="auto_chargeprice_vehicle_ambiguous">Multiple vehicles selected in the app match this vehicle (%1$s %2$s).</string>

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

@@ -73,6 +73,13 @@
         <!-- this is necessary to make sure the dialog gets "pushed up" when the keyboard appears -->
         <item name="android:windowTranslucentStatus">false</item>
         <item name="dialogCornerRadius">28dp</item>
+        <item name="alertDialogStyle">@style/MaterialAlertDialog.App</item>
+    </style>
+
+    <style name="MaterialAlertDialog.App" parent="MaterialAlertDialog.Material3">
+        <!-- reduce insets from 80dp to 24dp -->
+        <item name="backgroundInsetTop">24dp</item>
+        <item name="backgroundInsetBottom">24dp</item>
     </style>
 
     <style name="CarAppTheme">

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

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

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

@@ -0,0 +1,5 @@
+Fehler behoben:
+- GoingElectric: Filteroption "CCS" erschien doppelt
+- Korrekturen für kleine Bildschirme
+- Farbe eines Menüs im dunklen Design korrigiert
+- Abstürze behoben

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

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

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

@@ -0,0 +1,5 @@
+Bugfixes:
+- GoingElectric: filter option "CCS" appeared twice
+- Improvements for small displays
+- Fixed color of a menu in dark mode
+- Fixed crashes