fix changelogs

this is a workaround for https://issuetracker.google.com/issues/260112181

.github/workflows/release.yml

@@ -31,6 +31,7 @@ jobs:
           CHARGEPRICE_API_KEY: ${{ secrets.CHARGEPRICE_API_KEY }}
           MAPBOX_API_KEY: ${{ secrets.MAPBOX_API_KEY }}
           GOOGLE_MAPS_API_KEY: ${{ secrets.GOOGLE_MAPS_API_KEY }}
+          FRONYX_API_KEY: ${{ secrets.FRONYX_API_KEY }}
           KEYSTORE_PASSWORD: ${{ secrets.KEYSTORE_PASSWORD }}
           KEYSTORE_ALIAS: ${{ secrets.KEYSTORE_ALIAS }}
           KEYSTORE_ALIAS_PASSWORD: ${{ secrets.KEYSTORE_ALIAS_PASSWORD }}

app/build.gradle

@@ -19,10 +19,10 @@ android {
     defaultConfig {
         applicationId "net.vonforst.evmap"
         minSdkVersion 21
-        targetSdkVersion 31
+        targetSdkVersion 33
         // NOTE: always increase versionCode by 2 since automotive flavor uses versionCode + 1
-        versionCode 138
-        versionName "1.4.0"
+        versionCode 148
+        versionName "1.4.3"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         resConfigs supportedLocales.split(",")
@@ -160,18 +160,18 @@ configurations {
 dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
     implementation 'androidx.appcompat:appcompat:1.6.0-rc01'
-    implementation 'androidx.core:core-ktx:1.8.0'
+    implementation 'androidx.core:core-ktx:1.9.0'
     implementation 'androidx.core:core-splashscreen:1.0.0'
-    implementation "androidx.activity:activity-ktx:1.5.1"
-    implementation "androidx.fragment:fragment-ktx:1.5.2"
+    implementation "androidx.activity:activity-ktx:1.6.1"
+    implementation "androidx.fragment:fragment-ktx:1.5.4"
     implementation 'androidx.cardview:cardview:1.0.0'
     implementation 'androidx.preference:preference-ktx:1.2.0'
-    implementation 'com.google.android.material:material:1.6.1'
+    implementation 'com.google.android.material:material:1.7.0'
     implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
     implementation 'androidx.recyclerview:recyclerview:1.2.1'
     implementation 'androidx.browser:browser:1.4.0'
     implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0'
-    implementation 'com.github.johan12345:CustomBottomSheetBehavior:8e3de307f2'
+    implementation 'com.github.johan12345:CustomBottomSheetBehavior:f4f641aab5'
     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'
@@ -210,7 +210,7 @@ dependencies {
     implementation 'com.github.johan12345:mapbox-events-android:a21c324501'
 
     // Google Places
-    googleImplementation 'com.google.android.libraries.places:places:2.6.0'
+    googleImplementation 'com.google.android.libraries.places:places:2.7.0'
     googleImplementation 'org.jetbrains.kotlinx:kotlinx-coroutines-play-services:1.6.1'
 
     // Mapbox Geocoding
@@ -254,11 +254,11 @@ dependencies {
 
     // testing for car app
     testGoogleImplementation "androidx.car.app:app-testing:$carAppVersion"
-    testGoogleImplementation 'org.robolectric:robolectric:4.8.1'
-    testGoogleImplementation 'androidx.test:core:1.4.0'
+    testGoogleImplementation 'org.robolectric:robolectric:4.9'
+    testGoogleImplementation 'androidx.test:core:1.5.0'
 
-    androidTestImplementation 'androidx.test.ext:junit:1.1.3'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
+    androidTestImplementation 'androidx.test.ext:junit:1.1.4'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.0'
 
     kapt "com.squareup.moshi:moshi-kotlin-codegen:1.13.0"
 

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

@@ -77,34 +77,44 @@ 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)
+
+                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)
+                    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)
+                        )
                     )
-                    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())
-                    }
-                }.build()
-                if (header != null && list.items.isNotEmpty()) {
-                    addSectionedList(SectionedItemList.create(list, header))
                 } else {
-                    setSingleList(list)
+                    val list = buildPricesList(prices)
+                    if (header != null) {
+                        addSectionedList(SectionedItemList.create(list, header))
+                    } else {
+                        setSingleList(list)
+                    }
                 }
             }
             setActionStrip(
@@ -155,6 +165,21 @@ class ChargepriceScreen(ctx: CarContext, val charger: ChargeLocation) : Screen(c
         }.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
@@ -164,19 +189,21 @@ class ChargepriceScreen(ctx: CarContext, val charger: ChargeLocation) : Screen(c
     }
 
     private fun formatPrice(price: ChargePrice): String {
+        val amount = price.chargepointPrices.first().price
+            ?: return "${carContext.getString(R.string.chargeprice_price_not_available)} (${price.chargepointPrices.first().noPriceReason})"
         val totalPrice = carContext.getString(
             R.string.charge_price_format,
-            price.chargepointPrices.first().price,
+            amount,
             currency(price.currency)
         )
-        val kwhPrice = if (price.chargepointPrices.first().price > 0f) {
+        val kwhPrice = if (amount > 0f) {
             carContext.getString(
                 if (price.chargepointPrices[0].priceDistribution.isOnlyKwh) {
                     R.string.charge_price_kwh_format
                 } else {
                     R.string.charge_price_average_format
                 },
-                price.chargepointPrices.get(0).price / meta!!.energy,
+                amount / meta!!.energy,
                 currency(price.currency)
             )
         } else null
@@ -233,7 +260,8 @@ class ChargepriceScreen(ctx: CarContext, val charger: ChargeLocation) : Screen(c
                             providerCustomerTariffs = prefs.chargepriceShowProviderCustomerTariffs,
                             maxMonthlyFees = if (prefs.chargepriceNoBaseFee) 0.0 else null,
                             currency = prefs.chargepriceCurrency,
-                            allowUnbalancedLoad = prefs.chargepriceAllowUnbalancedLoad
+                            allowUnbalancedLoad = prefs.chargepriceAllowUnbalancedLoad,
+                            showPriceUnavailable = true
                         ),
                         relationships = if (!prefs.chargepriceMyTariffsAll) {
                             val myTariffs = prefs.chargepriceMyTariffs ?: emptySet()
@@ -289,7 +317,7 @@ class ChargepriceScreen(ctx: CarContext, val charger: ChargeLocation) : Screen(c
                         )
                     }
                 }.filterNotNull()
-                    .sortedBy { it.chargepointPrices.first().price }
+                    .sortedBy { it.chargepointPrices.first().price ?: Double.MAX_VALUE }
                     .sortedByDescending {
                         prefs.chargepriceMyTariffsAll ||
                                 myTariffs != null && it.tariffId in myTariffs

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

@@ -412,6 +412,8 @@ class ChargerDetailScreen(ctx: CarContext, val chargerSparse: ChargeLocation) :
             val response = repo.getChargepointDetail(chargerSparse.id).awaitFinished()
             if (response.status == Status.SUCCESS) {
                 val charger = response.data!!
+                this@ChargerDetailScreen.charger = charger
+                invalidate()
 
                 val photo = charger.photos?.firstOrNull()
                 photo?.let {
@@ -454,7 +456,8 @@ class ChargerDetailScreen(ctx: CarContext, val chargerSparse: ChargeLocation) :
                     )
                     this@ChargerDetailScreen.photo = outImg
                 }
-                this@ChargerDetailScreen.charger = charger
+
+                invalidate()
 
                 availability = getAvailability(charger).data
 

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

@@ -1,6 +1,8 @@
 package net.vonforst.evmap.auto
 
 import android.app.Application
+import android.os.Handler
+import android.os.Looper
 import android.text.SpannableStringBuilder
 import android.text.Spanned
 import androidx.car.app.CarContext
@@ -11,6 +13,7 @@ import androidx.car.app.model.*
 import androidx.core.graphics.drawable.IconCompat
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.lifecycleScope
+import androidx.lifecycle.map
 import kotlinx.coroutines.launch
 import net.vonforst.evmap.R
 import net.vonforst.evmap.model.*
@@ -24,15 +27,24 @@ import kotlin.math.roundToInt
 class FilterScreen(ctx: CarContext, val session: EVMapSession) : Screen(ctx) {
     private val prefs = PreferenceDataSource(ctx)
     private val db = AppDatabase.getInstance(ctx)
-    val filterProfiles: LiveData<List<FilterProfile>> by lazy {
+    private val filterProfiles: LiveData<List<FilterProfile>> by lazy {
         db.filterProfileDao().getProfiles(prefs.dataSource)
     }
+
     private val maxRows = if (ctx.carAppApiLevel >= 2) {
         ctx.constraintManager.getContentLimit(ConstraintManager.CONTENT_LIMIT_TYPE_LIST)
     } else 6
 
+    private var page = 0
+
     init {
         filterProfiles.observe(this) {
+            val filterStatus = prefs.filterStatus
+            if (filterStatus in listOf(FILTERS_DISABLED, FILTERS_FAVORITES, FILTERS_CUSTOM)) {
+                page = 0
+            } else {
+                page = paginateProfiles(it).indexOfFirst { it.any { it.id == filterStatus } }
+            }
             invalidate()
         }
     }
@@ -40,10 +52,24 @@ class FilterScreen(ctx: CarContext, val session: EVMapSession) : Screen(ctx) {
     override fun onGetTemplate(): Template {
         val filterStatus = prefs.filterStatus
         return ListTemplate.Builder().apply {
+            var title = carContext.getString(R.string.menu_filter)
+
             filterProfiles.value?.let {
-                setSingleList(buildFilterProfilesList(it, filterStatus))
+                val paginatedProfiles = paginateProfiles(it)
+                setSingleList(buildFilterProfilesList(paginatedProfiles, filterStatus))
+
+                val numPages = paginatedProfiles.size
+                if (numPages > 1) {
+                    title += " " + carContext.getString(
+                        R.string.auto_multipage,
+                        page + 1,
+                        numPages
+                    )
+                }
             } ?: setLoading(true)
-            setTitle(carContext.getString(R.string.menu_filter))
+
+            setTitle(title)
+
             setHeaderAction(Action.BACK)
             setActionStrip(
                 ActionStrip.Builder().apply {
@@ -55,7 +81,6 @@ class FilterScreen(ctx: CarContext, val session: EVMapSession) : Screen(ctx) {
                                     R.drawable.ic_edit
                                 )
                             ).build()
-
                         )
                         setOnClickListener(ParkedOnlyOnClickListener.create {
                             lifecycleScope.launch {
@@ -70,47 +95,140 @@ class FilterScreen(ctx: CarContext, val session: EVMapSession) : Screen(ctx) {
         }.build()
     }
 
+    private fun paginateProfiles(filterProfiles: List<FilterProfile>): List<List<FilterProfile>> {
+        val filterStatus = prefs.filterStatus
+        val extraRows = if (FILTERS_CUSTOM == filterStatus) 3 else 2
+        return filterProfiles.paginate(
+            maxRows - extraRows,
+            maxRows - extraRows - 1,
+            maxRows - 2,
+            maxRows - 1
+        )
+    }
+
     private fun buildFilterProfilesList(
-        profiles: List<FilterProfile>,
+        paginatedProfiles: List<List<FilterProfile>>,
         filterStatus: Long
     ): ItemList {
-        val extraRows = if (FILTERS_CUSTOM == filterStatus) 3 else 2
-        val profilesToShow =
-            profiles.sortedByDescending { it.id == filterStatus }.take(maxRows - extraRows)
         return ItemList.Builder().apply {
-            addItem(Row.Builder().apply {
-                setTitle(carContext.getString(R.string.no_filters))
-            }.build())
-            addItem(Row.Builder().apply {
-                setTitle(carContext.getString(R.string.filter_favorites))
-            }.build())
-            profilesToShow.forEach {
+            if (page > 0) {
+                addItem(Row.Builder().apply {
+                    setTitle(
+                        CarText.Builder(
+                            carContext.getString(R.string.auto_multipage_goto, page)
+                        ).build()
+                    )
+                    setImage(
+                        CarIcon.Builder(
+                            IconCompat.createWithResource(
+                                carContext,
+                                R.drawable.ic_arrow_back
+                            )
+                        ).build(),
+                        Row.IMAGE_TYPE_ICON
+                    )
+                    setOnClickListener {
+                        page -= 1
+                        screenManager.pushForResult(DummyReturnScreen(carContext)) {
+                            Handler(Looper.getMainLooper()).post {
+                                invalidate()
+                            }
+                        }
+                    }
+                }.build())
+            }
+
+            if (page == 0) {
+                addItem(Row.Builder().apply {
+                    val active = filterStatus == FILTERS_DISABLED
+                    setTitle(carContext.getString(R.string.no_filters))
+                    setImage(
+                        CarIcon.Builder(
+                            IconCompat.createWithResource(
+                                carContext,
+                                R.drawable.ic_close
+                            )
+                        ).setTint(if (active) CarColor.SECONDARY else CarColor.DEFAULT)
+                            .build(),
+                        Row.IMAGE_TYPE_ICON
+                    )
+                    setOnClickListener { onItemClick(FILTERS_DISABLED) }
+                }.build())
+                addItem(Row.Builder().apply {
+                    val active = filterStatus == FILTERS_FAVORITES
+                    setTitle(carContext.getString(R.string.filter_favorites))
+                    setImage(
+                        CarIcon.Builder(
+                            IconCompat.createWithResource(
+                                carContext,
+                                R.drawable.ic_fav
+                            )
+                        ).setTint(if (active) CarColor.SECONDARY else CarColor.DEFAULT)
+                            .build(),
+                        Row.IMAGE_TYPE_ICON
+                    )
+                    setOnClickListener { onItemClick(FILTERS_FAVORITES) }
+                }.build())
+                if (FILTERS_CUSTOM == filterStatus) {
+                    addItem(Row.Builder().apply {
+                        setTitle(carContext.getString(R.string.filter_custom))
+                        setImage(
+                            CarIcon.Builder(
+                                IconCompat.createWithResource(
+                                    carContext,
+                                    R.drawable.ic_checkbox_checked
+                                )
+                            ).setTint(CarColor.PRIMARY).build(),
+                            Row.IMAGE_TYPE_ICON
+                        )
+                        setOnClickListener { onItemClick(FILTERS_CUSTOM) }
+                    }.build())
+                }
+            }
+            paginatedProfiles[page].forEach {
                 addItem(Row.Builder().apply {
                     val name =
                         it.name.ifEmpty { carContext.getString(R.string.unnamed_filter_profile) }
+                    val active = filterStatus == it.id
                     setTitle(name)
+                    setImage(
+                        if (active)
+                            CarIcon.Builder(
+                                IconCompat.createWithResource(
+                                    carContext,
+                                    R.drawable.ic_check
+                                )
+                            ).setTint(CarColor.SECONDARY).build() else emptyCarIcon,
+                        Row.IMAGE_TYPE_ICON
+                    )
+                    setOnClickListener { onItemClick(it.id) }
                 }.build())
             }
-            if (FILTERS_CUSTOM == filterStatus) {
+            if (page < paginatedProfiles.size - 1) {
                 addItem(Row.Builder().apply {
-                    setTitle(carContext.getString(R.string.filter_custom))
-                }.build())
-            }
-            setSelectedIndex(when (filterStatus) {
-                FILTERS_DISABLED -> 0
-                FILTERS_FAVORITES -> 1
-                FILTERS_CUSTOM -> profilesToShow.size + 2
-                else -> profilesToShow.indexOfFirst { it.id == filterStatus } + 2
-            })
-            setOnSelectedListener { index ->
-                onItemClick(
-                    when (index) {
-                        0 -> FILTERS_DISABLED
-                        1 -> FILTERS_FAVORITES
-                        profilesToShow.size + 2 -> FILTERS_CUSTOM
-                        else -> profilesToShow[index - 2].id
+                    setTitle(
+                        CarText.Builder(
+                            carContext.getString(R.string.auto_multipage_goto, page + 2)
+                        ).build()
+                    )
+                    setImage(
+                        CarIcon.Builder(
+                            IconCompat.createWithResource(
+                                carContext,
+                                R.drawable.ic_arrow_forward
+                            )
+                        ).build(),
+                        Row.IMAGE_TYPE_ICON
+                    )
+                    setOnClickListener {
+                        page += 1
+                        screenManager.pushForResult(DummyReturnScreen(carContext)) {
+                            Handler(Looper.getMainLooper()).post {
+                                invalidate()
+                            }
+                        }
                     }
-                )
+                }.build())
             }
         }.build()
     }
@@ -129,8 +247,13 @@ class EditFiltersScreen(ctx: CarContext) : Screen(ctx) {
         ctx.constraintManager.getContentLimit(ConstraintManager.CONTENT_LIMIT_TYPE_LIST)
     } else 6
 
+    private var page = 0
+    private var paginatedFilters = vm.filtersWithValue.map {
+        it?.paginate(maxRows, maxRows - 1, maxRows - 2, maxRows - 1)
+    }
+
     init {
-        vm.filtersWithValue.observe(this) {
+        paginatedFilters.observe(this) {
             vm.filterProfile.observe(this) {
                 invalidate()
             }
@@ -141,18 +264,28 @@ class EditFiltersScreen(ctx: CarContext) : Screen(ctx) {
         val currentProfileName = vm.filterProfile.value?.name
 
         return ListTemplate.Builder().apply {
-            vm.filtersWithValue.value?.let { filtersWithValue ->
-                setSingleList(buildFiltersList(filtersWithValue.take(maxRows)))
+            paginatedFilters.value?.let { paginatedFilters ->
+                setSingleList(buildFiltersList(paginatedFilters))
             } ?: setLoading(true)
 
-            setTitle(currentProfileName?.let {
+            var title = currentProfileName?.let {
                 carContext.getString(
                     R.string.edit_filter_profile,
-                    it
+                    it,
                 )
-            } ?: carContext.getString(R.string.menu_filter))
+            } ?: carContext.getString(R.string.menu_filter)
+            val numPages = paginatedFilters.value?.size ?: 0
+            if (numPages > 1) {
+                title += " " + carContext.getString(
+                    R.string.auto_multipage,
+                    page + 1,
+                    numPages
+                )
+            }
+            setTitle(title)
 
             setHeaderAction(Action.BACK)
+
             setActionStrip(ActionStrip.Builder().apply {
                 val currentProfile = vm.filterProfile.value
                 if (currentProfile != null) {
@@ -194,29 +327,61 @@ class EditFiltersScreen(ctx: CarContext) : Screen(ctx) {
                             ).build()
                         )
                         .setOnClickListener {
-                        val textPromptScreen = TextPromptScreen(
-                            carContext,
-                            R.string.save_as_profile,
-                            R.string.save_profile_enter_name,
-                            currentProfileName
-                        )
-                        screenManager.pushForResult(textPromptScreen) { name ->
-                            if (name == null) return@pushForResult
-                            lifecycleScope.launch {
-                                vm.saveAsProfile(name as String)
-                                screenManager.popTo(MapScreen.MARKER)
+                            val textPromptScreen = TextPromptScreen(
+                                carContext,
+                                R.string.save_as_profile,
+                                R.string.save_profile_enter_name,
+                                currentProfileName
+                            )
+                            screenManager.pushForResult(textPromptScreen) { name ->
+                                if (name == null) return@pushForResult
+                                var saveSuccess = false
+                                lifecycleScope.launch {
+                                    saveSuccess = vm.saveAsProfile(name as String)
+                                    screenManager.popTo(MapScreen.MARKER)
+                                }
+                                if (!saveSuccess) return@pushForResult
                             }
+                            invalidate()
                         }
-                    }
-                    .build()
+                        .build()
                 )
-            }.build())
+            }
+                .build())
         }.build()
     }
 
-    private fun buildFiltersList(filters: List<FilterWithValue<out FilterValue>>): ItemList {
+    private fun buildFiltersList(paginatedFilters: List<FilterValues>): ItemList {
+
         return ItemList.Builder().apply {
-            filters.forEach {
+            if (page > 0) {
+                addItem(Row.Builder().apply {
+                    setTitle(
+                        CarText.Builder(
+                            carContext.getString(R.string.auto_multipage_goto, page)
+                        ).build()
+                    )
+                    setImage(
+                        CarIcon.Builder(
+                            IconCompat.createWithResource(
+                                carContext,
+                                R.drawable.ic_arrow_back
+                            )
+                        ).build(),
+                        Row.IMAGE_TYPE_ICON
+                    )
+                    setOnClickListener {
+                        page -= 1
+                        screenManager.pushForResult(DummyReturnScreen(carContext)) {
+                            Handler(Looper.getMainLooper()).post {
+                                invalidate()
+                            }
+                        }
+                    }
+                }.build())
+            }
+
+            paginatedFilters[page].forEach {
                 val filter = it.filter
                 val value = it.value
                 addItem(Row.Builder().apply {
@@ -270,6 +435,33 @@ class EditFiltersScreen(ctx: CarContext) : Screen(ctx) {
                     }
                 }.build())
             }
+
+            if (page < paginatedFilters.size - 1) {
+                addItem(Row.Builder().apply {
+                    setTitle(
+                        CarText.Builder(
+                            carContext.getString(R.string.auto_multipage_goto, page + 2)
+                        ).build()
+                    )
+                    setImage(
+                        CarIcon.Builder(
+                            IconCompat.createWithResource(
+                                carContext,
+                                R.drawable.ic_arrow_forward
+                            )
+                        ).build(),
+                        Row.IMAGE_TYPE_ICON
+                    )
+                    setOnClickListener {
+                        page += 1
+                        screenManager.pushForResult(DummyReturnScreen(carContext)) {
+                            Handler(Looper.getMainLooper()).post {
+                                invalidate()
+                            }
+                        }
+                    }
+                }.build())
+            }
         }.build()
     }
 }

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

@@ -263,7 +263,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()

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

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

@@ -35,11 +35,13 @@ val CarContext.constraintManager
 
 fun Bitmap.asCarIcon(): CarIcon = CarIcon.Builder(IconCompat.createWithBitmap(this)).build()
 
-val emptyCarIcon = Bitmap.createBitmap(
-    1,
-    1,
-    Bitmap.Config.ARGB_8888
-).asCarIcon()
+val emptyCarIcon: CarIcon by lazy {
+    Bitmap.createBitmap(
+        1,
+        1,
+        Bitmap.Config.ARGB_8888
+    ).asCarIcon()
+}
 
 private const val kmPerMile = 1.609344
 private const val ftPerMile = 5280
@@ -134,6 +136,40 @@ private fun roundToMultipleOf(num: Double, step: Double): Double {
     return (num / step).roundToInt() * step
 }
 
+/**
+ * Paginates data based on specific limits for each page.
+ * If the data fits on a single page, this page can have a maximum size nSingle. Otherwise, the
+ * first page has maximum nFirst items, the last page nLast items, and all intermediate pages nOther
+ * items.
+ */
+fun <T> List<T>.paginate(nSingle: Int, nFirst: Int, nOther: Int, nLast: Int): List<List<T>> {
+    if (nOther > nLast) {
+        throw IllegalArgumentException("nLast has to be larger than or equal to nOther")
+    }
+    return if (size <= nSingle) {
+        listOf(this)
+    } else {
+        val result = mutableListOf<List<T>>()
+        var i = 0
+        var page = 0
+        while (true) {
+            val remaining = size - i
+            if (page == 0) {
+                result.add(subList(i, i + nFirst))
+                i += nFirst
+            } else if (remaining <= nLast) {
+                result.add(subList(i, size))
+                break
+            } else {
+                result.add(subList(i, i + nOther))
+                i += nOther
+            }
+            page++
+        }
+        result
+    }
+}
+
 fun getAndroidAutoVersion(ctx: Context): List<String> {
     val info = ctx.packageManager.getPackageInfo("com.google.android.projection.gearhead", 0)
     return info.versionName.split(".")

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

@@ -34,4 +34,6 @@
     <string name="selecting_all">alle Einträge ausgewählt</string>
     <string name="selecting_none">alle Einträge abgewählt</string>
     <string name="loading">Lade…</string>
+    <string name="auto_multipage_goto">Seite %d</string>
+    <string name="auto_multipage">(%d/%d)</string>
 </resources>

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

@@ -34,4 +34,5 @@
     <string name="auto_no_refresh_possible">D\'autres mises à jour ne sont pas possibles. Veuillez revenir en arrière et redémarrer.</string>
     <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>
 </resources>

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

@@ -34,4 +34,6 @@
     <string name="data_sources_hint">I innstillingene kan du også bytte mellom Google Maps og OpenStreetMap (Mapbox) for kartdata.</string>
     <string name="selecting_all">valgte alle elementene</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>
 </resources>

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

@@ -34,4 +34,6 @@
     <string name="selecting_all">selected all items</string>
     <string name="selecting_none">deselected all items</string>
     <string name="loading">Loading…</string>
+    <string name="auto_multipage_goto">Page %d</string>
+    <string name="auto_multipage">(%d/%d)</string>
 </resources>

app/src/main/AndroidManifest.xml

@@ -4,6 +4,7 @@
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
+    <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
 
     <queries>
         <intent>
@@ -14,6 +15,9 @@
             <action android:name="android.intent.action.VIEW" />
             <data android:scheme="google.navigation" />
         </intent>
+        <intent>
+            <action android:name="android.support.customtabs.action.CustomTabsService" />
+        </intent>
     </queries>
 
     <application
@@ -252,6 +256,10 @@
                     android:host="www.goingelectric.de"
                     android:pathPattern="/stromtankstellen/Ungarn/..*/..*/..*/"
                     android:scheme="https" />
+                <data
+                    android:host="openchargemap.org"
+                    android:pathPattern="/site/poi/details/..*"
+                    android:scheme="https" />
 
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.BROWSABLE" />

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

@@ -8,8 +8,10 @@ import android.os.Build
 import android.os.Bundle
 import android.os.SystemClock
 import android.view.View
+import android.widget.Toast
 import androidx.appcompat.app.AppCompatActivity
 import androidx.browser.customtabs.CustomTabColorSchemeParams
+import androidx.browser.customtabs.CustomTabsClient
 import androidx.browser.customtabs.CustomTabsIntent
 import androidx.core.content.ContextCompat
 import androidx.core.splashscreen.SplashScreen
@@ -131,6 +133,37 @@ class MapsActivity : AppCompatActivity(),
             } else if (intent?.scheme == "https" && intent?.data?.host == "www.goingelectric.de") {
                 val id = intent.data?.pathSegments?.last()?.toLongOrNull()
                 if (id != null) {
+                    if (prefs.dataSource != "goingelectric") {
+                        prefs.dataSource = "goingelectric"
+                        Toast.makeText(
+                            this,
+                            getString(
+                                R.string.data_source_switched_to,
+                                getString(R.string.data_source_goingelectric)
+                            ),
+                            Toast.LENGTH_LONG
+                        ).show()
+                    }
+                    deepLink = navController.createDeepLink()
+                        .setGraph(R.navigation.nav_graph)
+                        .setDestination(R.id.map)
+                        .setArguments(MapFragmentArgs(chargerId = id).toBundle())
+                        .createPendingIntent()
+                }
+            } else if (intent?.scheme == "https" && intent?.data?.host == "openchargemap.org") {
+                val id = intent.data?.pathSegments?.last()?.toLongOrNull()
+                if (id != null) {
+                    if (prefs.dataSource != "openchargemap") {
+                        prefs.dataSource = "openchargemap"
+                        Toast.makeText(
+                            this,
+                            getString(
+                                R.string.data_source_switched_to,
+                                getString(R.string.data_source_openchargemap)
+                            ),
+                            Toast.LENGTH_LONG
+                        ).show()
+                    }
                     deepLink = navController.createDeepLink()
                         .setGraph(R.navigation.nav_graph)
                         .setDestination(R.id.map)
@@ -196,6 +229,7 @@ class MapsActivity : AppCompatActivity(),
     }
 
     fun openUrl(url: String) {
+        val pkg = CustomTabsClient.getPackageName(this, null)
         val intent = CustomTabsIntent.Builder()
             .setDefaultColorSchemeParams(
                 CustomTabColorSchemeParams.Builder()
@@ -203,6 +237,11 @@ class MapsActivity : AppCompatActivity(),
                     .build()
             )
             .build()
+        pkg?.let {
+            // prefer to open URL in custom tab, even if native app
+            // available (such as EVMap itself)
+            intent.intent.setPackage(pkg)
+        }
         try {
             intent.launchUrl(this, Uri.parse(url))
         } catch (e: ActivityNotFoundException) {

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

@@ -161,6 +161,7 @@ class CheckableConnectorAdapter : DataBindingAdapter<Chargepoint>() {
         val binding = holder.binding as ItemConnectorButtonBinding
         binding.enabled = enabledConnectors?.let { item.type in it } ?: true
         val root = binding.root as CheckableConstraintLayout
+        root.setOnCheckedChangeListener { _, _ -> }
         root.isChecked = checkedItem == position
         root.setOnClickListener {
             root.isChecked = true

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

@@ -80,7 +80,9 @@ data class ChargepriceOptions(
     val currency: String? = null,
     @Json(name = "start_time") val startTime: Int? = null,
     @Json(name = "allow_unbalanced_load") val allowUnbalancedLoad: Boolean? = null,
-    @Json(name = "provider_customer_tariffs") val providerCustomerTariffs: Boolean? = null
+    @Json(name = "provider_customer_tariffs") val providerCustomerTariffs: Boolean? = null,
+    @Json(name = "show_price_unavailable") val showPriceUnavailable: Boolean? = null,
+    @Json(name = "show_all_brand_restricted_tariffs") val showAllBrandRestrictedTariffs: Boolean? = null
 )
 
 @Resource("tariff")
@@ -268,7 +270,7 @@ internal object RelationshipsParceler : Parceler<Relationships?> {
 data class ChargepointPrice(
     val power: Double,
     val plug: String,
-    val price: Double,
+    val price: Double?,
     @Json(name = "price_distribution") val priceDistribution: PriceDistribution,
     @Json(name = "blocking_fee_start") val blockingFeeStart: Int?,
     @Json(name = "no_price_reason") var noPriceReason: String?

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/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/preference/UiSettingsFragment.kt

@@ -1,8 +1,13 @@
 package net.vonforst.evmap.fragment.preference
 
+import android.content.Intent
 import android.content.SharedPreferences
+import android.net.Uri
+import android.os.Build
 import android.os.Bundle
+import android.provider.Settings
 import androidx.preference.ListPreference
+import androidx.preference.Preference
 import net.vonforst.evmap.R
 import net.vonforst.evmap.ui.getAppLocale
 import net.vonforst.evmap.ui.updateAppLocale
@@ -20,6 +25,9 @@ class UiSettingsFragment : BaseSettingsFragment() {
             updateAppLocale(newValue as String)
             true
         }
+
+        val appLinkPref = findPreference<Preference>("applink_associate")!!
+        appLinkPref.isVisible = Build.VERSION.SDK_INT >= Build.VERSION_CODES.S
     }
 
     override fun onResume() {
@@ -34,4 +42,21 @@ class UiSettingsFragment : BaseSettingsFragment() {
             }
         }
     }
+
+    override fun onPreferenceTreeClick(preference: Preference): Boolean {
+        when (preference.key) {
+            "applink_associate" -> {
+                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
+                    val context = context ?: return false
+                    val intent = Intent(
+                        Settings.ACTION_APP_OPEN_BY_DEFAULT_SETTINGS,
+                        Uri.parse("package:${context.packageName}")
+                    )
+                    context.startActivity(intent)
+                }
+                return true
+            }
+        }
+        return super.onPreferenceTreeClick(preference)
+    }
 }

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

@@ -374,7 +374,21 @@ data class Address(
     val street: String?
 ) : Parcelable {
     override fun toString(): String {
-        return "${street ?: ""}, ${postcode ?: ""} ${city ?: ""}"
+        // TODO: the order here follows a German-style format (i.e. street, postcode city).
+        // in principle this should be country-dependent (e.g. UK has postcode after city)
+        return buildString {
+            street?.let {
+                append(it)
+                append(", ")
+            }
+            postcode?.let {
+                append(it)
+                append(" ")
+            }
+            city?.let {
+                append(it)
+            }
+        }
     }
 }
 

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

@@ -82,8 +82,8 @@ class BarGraphView(context: Context, attrs: AttributeSet) : View(context, attrs)
         textSize = bubbleTextSize.toFloat()
     }
 
-    private lateinit var graphBounds: Rect
-    private lateinit var bubbleBounds: Rect
+    private var graphBounds: Rect? = null
+    private var bubbleBounds: Rect? = null
 
     override fun onSizeChanged(w: Int, h: Int, oldw: Int, oldh: Int) {
         val bottom = (paddingBottom + legendWidth).roundToInt()
@@ -127,6 +127,8 @@ class BarGraphView(context: Context, attrs: AttributeSet) : View(context, attrs)
         data: SortedMap<ZonedDateTime, Int>,
         maxValue: Int
     ) {
+        val graphBounds = graphBounds ?: return
+
         canvas.apply {
             drawLine(
                 graphBounds.left.toFloat(),
@@ -207,7 +209,10 @@ class BarGraphView(context: Context, attrs: AttributeSet) : View(context, attrs)
         if (v < maxValue) colorAvailable else colorUnavailable
 
     private fun drawBubble(canvas: Canvas, data: SortedMap<ZonedDateTime, Int>, maxValue: Int) {
+        val bubbleBounds = bubbleBounds ?: return
+        val graphBounds = graphBounds ?: return
         val data = data.toList()
+
         if (data.size <= selectedBar) return
         canvas.apply {
             val center = graphBounds.left + selectedBar * (barWidth + barMargin) + barWidth * 0.5f
@@ -273,6 +278,7 @@ class BarGraphView(context: Context, attrs: AttributeSet) : View(context, attrs)
     }
 
     override fun onTouchEvent(event: MotionEvent): Boolean {
+        val graphBounds = graphBounds ?: return super.onTouchEvent(event)
         val x = event.x.roundToInt()
         val y = event.y.roundToInt()
         if (graphBounds.contains(x, y) && event.action == MotionEvent.ACTION_DOWN) {
@@ -290,6 +296,7 @@ class BarGraphView(context: Context, attrs: AttributeSet) : View(context, attrs)
     }
 
     private fun updateSelectedBar(x: Int) {
+        val graphBounds = graphBounds ?: return
         val bar = (x - graphBounds.left) / (barWidth + barMargin)
         if (bar != selectedBar) {
             selectedBar = bar

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

@@ -166,7 +166,7 @@ class ChargepriceViewModel(
                                 )
                             }
                         }.filterNotNull()
-                            .sortedBy { it.chargepointPrices.first().price }
+                            .sortedBy { it.chargepointPrices.first().price ?: Double.MAX_VALUE }
                             .sortedByDescending {
                                 prefs.chargepriceMyTariffsAll ||
                                         myTariffs != null && it.tariffId in myTariffs
@@ -263,7 +263,8 @@ class ChargepriceViewModel(
                             providerCustomerTariffs = prefs.chargepriceShowProviderCustomerTariffs,
                             maxMonthlyFees = if (prefs.chargepriceNoBaseFee) 0.0 else null,
                             currency = prefs.chargepriceCurrency,
-                            allowUnbalancedLoad = prefs.chargepriceAllowUnbalancedLoad
+                            allowUnbalancedLoad = prefs.chargepriceAllowUnbalancedLoad,
+                            showPriceUnavailable = true
                         ),
                         relationships = if (!myTariffsAll) {
                             Relationships(

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

@@ -61,9 +61,10 @@ class FilterViewModel(application: Application) : AndroidViewModel(application)
         prefs.filterStatus = FILTERS_CUSTOM
     }
 
-    suspend fun saveAsProfile(name: String) {
+    suspend fun saveAsProfile(name: String): Boolean {
         // get or create profile
         var profileId = db.filterProfileDao().getProfileByName(name, prefs.dataSource)?.id
+
         if (profileId == null) {
             profileId = db.filterProfileDao().getNewId(prefs.dataSource)
             db.filterProfileDao().insert(FilterProfile(name, prefs.dataSource, profileId))
@@ -81,6 +82,8 @@ class FilterViewModel(application: Application) : AndroidViewModel(application)
 
         // set selected profile
         prefs.filterStatus = profileId
+
+        return true
     }
 
     suspend fun deleteCurrentProfile() {

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

@@ -6,6 +6,7 @@ import androidx.lifecycle.*
 import com.car2go.maps.AnyMap
 import com.car2go.maps.model.LatLng
 import com.car2go.maps.model.LatLngBounds
+import com.mahc.custombottomsheetbehavior.BottomSheetBehaviorGoogleMapsLike
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
@@ -71,6 +72,21 @@ class MapViewModel(application: Application, private val state: SavedStateHandle
         state.getLiveData("bottomSheetState")
     }
 
+    val bottomSheetExpanded = MediatorLiveData<Boolean>().apply {
+        addSource(bottomSheetState) {
+            when (it) {
+                BottomSheetBehaviorGoogleMapsLike.STATE_COLLAPSED,
+                BottomSheetBehaviorGoogleMapsLike.STATE_HIDDEN -> {
+                    value = false
+                }
+                BottomSheetBehaviorGoogleMapsLike.STATE_EXPANDED,
+                BottomSheetBehaviorGoogleMapsLike.STATE_ANCHOR_POINT -> {
+                    value = true
+                }
+            }
+        }
+    }.distinctUntilChanged()
+
     val mapPosition: MutableLiveData<MapPosition> by lazy {
         state.getLiveData("mapPosition")
     }
@@ -213,7 +229,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 ->
@@ -233,14 +249,13 @@ class MapViewModel(application: Application, private val state: SavedStateHandle
                                         ).any { filtered.contains(it) }
                                     } ?: true
                         }.flatMap { it.value }
-
                     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()
@@ -472,8 +487,6 @@ class MapViewModel(application: Application, private val state: SavedStateHandle
             chargepointsInternal?.let { chargepoints.removeSource(it) }
             chargepointsInternal = result
             chargepoints.addSource(result) {
-                chargepoints.value = it
-
                 val apiId = apiId.value
                 when (apiId) {
                     "going_electric" -> {
@@ -506,6 +519,8 @@ class MapViewModel(application: Application, private val state: SavedStateHandle
                         filteredChargeCards.value = null
                     }
                 }
+
+                chargepoints.value = it
             }
         }
 

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

@@ -97,15 +97,15 @@
                 android:id="@+id/txtName"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginEnd="30dp"
                 android:ellipsize="end"
                 android:hyphenationFrequency="normal"
                 android:maxLines="@{expanded ? 3 : 1}"
                 android:text="@{charger.data.name}"
                 android:textAppearance="@style/TextAppearance.Material3.BodyLarge"
                 app:layout_constrainedWidth="true"
-                app:layout_constraintEnd_toStartOf="@+id/txtAvailability"
+                app:layout_constraintEnd_toStartOf="@+id/imgFaultReport"
                 app:layout_constraintHorizontal_bias="0.0"
+                app:layout_constraintHorizontal_chainStyle="packed"
                 app:layout_constraintStart_toStartOf="@+id/guideline"
                 app:layout_constraintTop_toTopOf="parent"
                 tools:text="Parkhaus" />
@@ -379,8 +379,8 @@
                 android:layout_height="wrap_content"
                 android:layout_marginStart="8dp"
                 android:layout_marginEnd="8dp"
-                android:textAppearance="@style/TextAppearance.Material3.BodySmall"
                 android:text="@{predictionDescription}"
+                android:textAppearance="@style/TextAppearance.Material3.BodySmall"
                 app:goneUnless="@{predictionGraph != null}"
                 app:layout_constraintBaseline_toBaselineOf="@+id/textView8"
                 app:layout_constraintEnd_toStartOf="@+id/btnPredictionHelp"
@@ -422,21 +422,21 @@
                 android:layout_height="24dp"
                 android:layout_marginTop="4dp"
                 android:adjustViewBounds="true"
-                android:scaleType="fitCenter"
                 android:background="?selectableItemBackgroundBorderless"
-                app:tint="@color/logo_tint_night"
+                android:scaleType="fitCenter"
                 app:goneUnless="@{predictionGraph != null}"
                 app:layout_constraintEnd_toStartOf="@+id/guideline2"
                 app:layout_constraintTop_toBottomOf="@+id/prediction"
-                app:srcCompat="@drawable/ic_powered_by_fronyx" />
+                app:srcCompat="@drawable/ic_powered_by_fronyx"
+                app:tint="@color/logo_tint_night" />
 
             <View
                 android:id="@+id/divider1"
                 android:layout_width="match_parent"
                 android:layout_height="1dp"
                 android:layout_marginTop="8dp"
-                app:goneUnless="@{predictionGraph != null}"
                 android:background="?android:attr/listDivider"
+                app:goneUnless="@{predictionGraph != null}"
                 app:layout_constraintTop_toBottomOf="@+id/imgPredictionSource" />
 
             <ImageView
@@ -445,10 +445,11 @@
                 android:layout_height="18dp"
                 android:layout_marginStart="4dp"
                 android:layout_marginTop="2dp"
-                android:layout_marginBottom="2dp"
+                android:layout_marginEnd="8dp"
                 android:contentDescription="@string/verified"
                 app:goneUnless="@{ charger.data.verified }"
-                app:layout_constraintBottom_toBottomOf="@+id/txtName"
+                app:layout_constraintEnd_toStartOf="@+id/txtAvailability"
+                app:layout_constraintHorizontal_bias="0.0"
                 app:layout_constraintStart_toEndOf="@+id/imgFaultReport"
                 app:layout_constraintTop_toTopOf="@+id/txtName"
                 app:srcCompat="@drawable/ic_verified"
@@ -460,12 +461,11 @@
                 android:id="@+id/imgFaultReport"
                 android:layout_width="18dp"
                 android:layout_height="18dp"
-                android:layout_marginStart="4dp"
+                android:layout_marginStart="8dp"
                 android:layout_marginTop="2dp"
-                android:layout_marginBottom="2dp"
                 android:contentDescription="@string/fault_report"
                 app:goneUnless="@{ charger.data.faultReport != null }"
-                app:layout_constraintBottom_toBottomOf="@+id/txtName"
+                app:layout_constraintEnd_toStartOf="@+id/imgVerified"
                 app:layout_constraintStart_toEndOf="@+id/txtName"
                 app:layout_constraintTop_toTopOf="@+id/txtName"
                 app:srcCompat="@drawable/ic_map_marker_fault"

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

@@ -203,7 +203,7 @@
                 app:chargeCards="@{vm.chargeCardMap}"
                 app:filteredChargeCards="@{vm.filteredChargeCards}"
                 app:distance="@{vm.chargerDistance}"
-                app:expanded="@{vm.bottomSheetState != BottomSheetBehaviorGoogleMapsLike.STATE_COLLAPSED && vm.bottomSheetState != BottomSheetBehaviorGoogleMapsLike.STATE_HIDDEN}"
+                app:expanded="@{vm.bottomSheetExpanded}"
                 app:apiName="@{vm.apiName}" />
 
         </androidx.core.widget.NestedScrollView>

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

@@ -110,7 +110,7 @@
             android:layout_height="wrap_content"
             android:layout_marginStart="4dp"
             android:gravity="end"
-            android:text="@{String.format(@string/charge_price_format, item.chargepointPrices.get(0).price, BindingAdaptersKt.currency(item.currency))}"
+            android:text="@{item.chargepointPrices.get(0).price != null ? String.format(@string/charge_price_format, item.chargepointPrices.get(0).price, BindingAdaptersKt.currency(item.currency)) : @string/chargeprice_price_not_available}"
             android:textAppearance="@style/TextAppearance.AppCompat.Body1"
             app:layout_constraintBottom_toTopOf="@+id/txtAveragePrice"
             app:layout_constraintEnd_toEndOf="parent"
@@ -125,8 +125,8 @@
             android:layout_height="wrap_content"
             android:layout_marginStart="4dp"
             android:gravity="end"
-            android:text="@{String.format(item.chargepointPrices.get(0).priceDistribution.isOnlyKwh ? @string/charge_price_kwh_format : @string/charge_price_average_format, item.chargepointPrices.get(0).price / meta.energy, BindingAdaptersKt.currency(item.currency))}"
-            app:goneUnless="@{item.chargepointPrices.get(0).price > 0}"
+            android:text="@{item.chargepointPrices.get(0).price != null ? String.format(item.chargepointPrices.get(0).priceDistribution.isOnlyKwh ? @string/charge_price_kwh_format : @string/charge_price_average_format, item.chargepointPrices.get(0).price / meta.energy, BindingAdaptersKt.currency(item.currency)) : item.chargepointPrices.get(0).noPriceReason}"
+            app:goneUnless="@{item.chargepointPrices.get(0).price > 0 || item.chargepointPrices.get(0).price == null}"
             android:textAppearance="@style/TextAppearance.Material3.BodySmall"
             app:layout_constraintBottom_toTopOf="@id/txtPriceDetails"
             app:layout_constraintEnd_toEndOf="parent"

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

@@ -39,7 +39,7 @@
             android:layout_height="wrap_content"
             android:layout_marginStart="38dp"
             android:layout_marginTop="38dp"
-            android:text="@{String.format("× %d", item.chargepoint.count)}"
+            android:text="@{String.format("\u00D7 %d", item.chargepoint.count)}"
             android:textAppearance="@style/TextAppearance.Material3.BodySmall"
             app:layout_constraintStart_toStartOf="@+id/imageView"
             app:layout_constraintTop_toTopOf="@+id/imageView"

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

@@ -149,7 +149,7 @@
     <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>
@@ -196,6 +196,7 @@
     <string name="chargeprice_battery_range_to">bis</string>
     <string name="chargeprice_stats">(%1$.0f kWh, ca. %2$s, ⌀ %3$.0f kW)</string>
     <string name="chargeprice_vehicle">Fahrzeug</string>
+    <string name="chargeprice_price_not_available">Preis nicht verfügbar</string>
     <string name="edit_on_goingelectric_info">Logge dich zuerst bei GoingElectric.de ein, falls hier nur eine leere Seite erscheint</string>
     <string name="close">Schließen</string>
     <string name="chargeprice_title">Preise</string>
@@ -282,4 +283,9 @@
     <string name="pref_prediction_enabled_summary">für unterstützte Ladestationen\n(momentan nur Schnellader in Deutschland)</string>
     <string name="prediction_only">(nur %s)</string>
     <string name="prediction_dc_plugs_only">DC-Anschlüsse</string>
+    <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>
 </resources>

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

@@ -13,6 +13,14 @@
     <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="about_contributors_list">Danilo Bargen\nAltonss\nAllan Nordhøy\nLicaon_Kter\npt2121\nnautilusx</string>
+    <string name="about_contributors_list">
+        Danilo Bargen\n
+        Altonss\n
+        Allan Nordhøy\n
+        Maximilian Goldschmidt\n
+        Licaon_Kter\n
+        pt2121\n
+        nautilusx
+    </string>
     <string name="hide_on_scroll_fab_behavior">net.vonforst.evmap.ui.HideOnScrollFabBehavior</string>
 </resources>

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

@@ -195,6 +195,7 @@
     <string name="chargeprice_battery_range_to">to</string>
     <string name="chargeprice_stats">(%1$.0f kWh, approx. %2$s, ⌀ %3$.0f kW)</string>
     <string name="chargeprice_vehicle">Vehicle</string>
+    <string name="chargeprice_price_not_available">Price not available</string>
     <string name="pref_chargeprice_show_provider_customer_tariffs_summary">Utility companies sometimes offer special plans for their customers</string>
     <string name="close">Close</string>
     <string name="chargeprice_title">Prices</string>
@@ -281,4 +282,9 @@
     <string name="pref_prediction_enabled_summary">for supported chargers\n(currently only DC in Germany)</string>
     <string name="prediction_only">(%s only)</string>
     <string name="prediction_dc_plugs_only">DC plugs</string>
+    <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>
+    <string name="chargeprice_header_my_tariffs">My plans</string>
+    <string name="chargeprice_header_other_tariffs">Other plans</string>
 </resources>

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

@@ -28,4 +28,8 @@
         android:summaryOn="@string/pref_navigate_use_maps_on"
         android:summaryOff="@string/pref_navigate_use_maps_off"
         android:defaultValue="true" />
+    <Preference
+        android:key="applink_associate"
+        android:title="@string/pref_applink_associate"
+        android:summary="@string/pref_applink_associate_summary" />
 </PreferenceScreen>

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/java/net/vonforst/evmap/model/ChargersModelTest.kt

@@ -0,0 +1,21 @@
+package net.vonforst.evmap.model
+
+import org.junit.Assert.assertEquals
+import org.junit.Test
+
+class ChargersModelTest {
+    @Test
+    fun testAddressToString() {
+        assertEquals("Berlin", Address("Berlin", null, null, null).toString())
+        assertEquals("12345 Berlin", Address("Berlin", null, "12345", null).toString())
+        assertEquals(
+            "Pariser Platz 1, Berlin",
+            Address("Berlin", null, null, "Pariser Platz 1").toString()
+        )
+        assertEquals(
+            "Pariser Platz 1, 12345 Berlin",
+            Address("Berlin", null, "12345", "Pariser Platz 1").toString()
+        )
+    }
+
+}

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"
+      }
+    ]
+  }
+]

app/src/testGoogle/java/net/vonforst/evmap/auto/UtilsTest.kt

@@ -0,0 +1,40 @@
+package net.vonforst.evmap.auto
+
+import org.junit.Assert.assertEquals
+import org.junit.Test
+
+class UtilsTest {
+    @Test
+    fun testPaginate() {
+        var (nSingle, nFirst, nOther, nLast) = listOf(6, 5, 4, 5)
+        for (i in 0..30) {
+            paginateTest(i, nSingle, nFirst, nOther, nLast)
+        }
+        nSingle = 4; nFirst = 4; nOther = 6; nLast = 6
+        for (i in 0..30) {
+            paginateTest(i, nSingle, nFirst, nOther, nLast)
+        }
+    }
+
+    private fun paginateTest(
+        i: Int,
+        nSingle: Int,
+        nFirst: Int,
+        nOther: Int,
+        nLast: Int
+    ) {
+        val list = (0..i).toList()
+        val paginated = list.paginate(nSingle, nFirst, nOther, nLast)
+        assertEquals(list, paginated.flatten())
+        assert(paginated.all { it.isNotEmpty() })
+        if (paginated.size == 1) {
+            assert(paginated.first().size <= nSingle)
+        } else {
+            assert(paginated.first().size == nFirst)
+            for (j in 1 until paginated.size - 1) {
+                assert(paginated[j].size == nOther)
+            }
+            assert(paginated.last().size <= nLast)
+        }
+    }
+}

build.gradle

@@ -3,14 +3,14 @@
 buildscript {
     ext.kotlin_version = '1.7.10'
     ext.about_libs_version = '8.9.4'
-    ext.nav_version = '2.5.2'
+    ext.nav_version = '2.5.3'
     repositories {
         google()
         mavenCentral()
         gradlePluginPortal()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.3.0'
+        classpath 'com.android.tools.build:gradle:7.3.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"

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

@@ -0,0 +1,9 @@
+Verbesserungen:
+- Preisvergleich: Auch Tarife mit fehlenden Preisdaten anzeigen
+- Links von openchargemap.org können in EVMap geöffnet werden
+- Android Auto: Ladegeschwindigkeit bei der Detailansicht optimiert
+- Android Auto: Mehrseitige Ansichten für Filter und Filterprofile (falls nötig)
+
+Fehler behoben:
+- diverse kleine Darstellungsfehler behoben
+- Abstürze behoben

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

@@ -0,0 +1,2 @@
+Fehler behoben:
+- Links zur Datenquelle werden im Browser geöffnet auch wenn EVMap als Standard für Links von GoingElectric/OpenChargeMap gesetzt ist

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/en-US/changelogs/140.txt

@@ -0,0 +1,9 @@
+Improvements:
+- Price comparison: Also show plans with unknown pricing
+- Links from openchargemap.org can be opened with EVMap
+- Android Auto: Improved loading speed for detail view
+- Android Auto: Multi-page views for filters and filter profiles (if necessary)
+
+Bugfixes:
+- fixed multiple minor display bugs
+- fixed crashes

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

@@ -0,0 +1,2 @@
+Bugfixes:
+- Open links to data source in browser even if EVMap is set to open GoingElectric/OpenChargeMap links by default

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

@@ -0,0 +1,8 @@
+Improvements:
+- Faster loading of availability prediction
+- Android Auto: highlight "my plans" in price comparison
+
+Bugfixes:
+- Android Automotive: refresh button was missing
+- fixed visual bug after scrolling detail view
+- fixed crashes

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

@@ -0,0 +1,9 @@
+Improvements:
+- Faster loading of availability prediction
+- Android Auto: highlight "my plans" in price comparison
+
+Bugfixes:
+- Android Automotive: refresh button was missing
+- Android Auto: Clicking search result sometimes not working
+- fixed visual bug after scrolling detail view
+- fixed crashes