Release 1.8.2

Currently translated at 100.0% (366 of 366 strings)

Translated using Weblate (Czech)

Currently translated at 100.0% (366 of 366 strings)

Co-authored-by: Fjuro <fjuro@alius.cz>
Co-authored-by: Hosted Weblate <hosted@weblate.org>
Translate-URL: https://hosted.weblate.org/projects/evmap/android/cs/
Translation: EVMap/Android

.github/FUNDING.yml

@@ -1,2 +1,2 @@
 github: johan12345
-custom: ['https://paypal.me/johan98', 'http://ts.la/johan94494']
+custom: ['https://paypal.me/johan98', 'https://ev-map.app/donate/']

.github/workflows/release.yml

@@ -14,7 +14,7 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Set up Java environment
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           java-version: 17
           distribution: 'zulu'

.github/workflows/tests.yml

@@ -19,7 +19,7 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Set up Java environment
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           java-version: 17
           distribution: 'zulu'

app/build.gradle.kts

@@ -20,8 +20,8 @@ android {
         minSdk = 21
         targetSdk = 34
         // NOTE: always increase versionCode by 2 since automotive flavor uses versionCode + 1
-        versionCode = 208
-        versionName = "1.8.0"
+        versionCode = 212
+        versionName = "1.8.2"
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
         resourceConfigurations += supportedLocales.split(",")
@@ -95,6 +95,7 @@ android {
     buildFeatures {
         dataBinding = true
         viewBinding = true
+        buildConfig = true
     }
     lint {
         disable += listOf("NullSafeMutableLiveData")
@@ -264,7 +265,7 @@ dependencies {
     automotiveImplementation("androidx.car.app:app-automotive:$carAppVersion")
 
     // AnyMaps
-    val anyMapsVersion = "60b6d4f821"
+    val anyMapsVersion = "4854581f72"
     implementation("com.github.ev-map.AnyMaps:anymaps-base:$anyMapsVersion")
     googleImplementation("com.github.ev-map.AnyMaps:anymaps-google:$anyMapsVersion")
     googleImplementation("com.google.android.gms:play-services-maps:18.2.0")
@@ -279,6 +280,14 @@ dependencies {
     // patched version that removes build-time dependency on GMS (-> no Google location services)
     fossImplementation("com.github.ev-map:mapbox-events-android:a21c324501")
 
+    implementation("com.mapbox.mapboxsdk:mapbox-android-sdk") {
+        exclude(group = "com.mapbox.mapboxsdk", module = "mapbox-android-accounts")
+        exclude(group = "com.mapbox.mapboxsdk", module = "mapbox-android-telemetry")
+        version {
+            strictly("9.1.0-SNAPSHOT")
+        }
+    }
+
     // Google Places
     googleImplementation("com.google.android.libraries.places:places:3.3.0")
     googleImplementation("org.jetbrains.kotlinx:kotlinx-coroutines-play-services:1.7.3")
@@ -300,7 +309,10 @@ dependencies {
     implementation("androidx.room:room-runtime:$room_version")
     kapt("androidx.room:room-compiler:$room_version")
     implementation("androidx.room:room-ktx:$room_version")
-    implementation("com.github.anboralabs:spatia-room:0.2.7")
+    implementation("com.github.anboralabs:spatia-room:0.2.9") {
+        exclude(group = "com.github.dalgarins", module = "android-spatialite")
+    }
+    implementation("com.github.EV-map:android-spatialite:e5495c83ad")  // version with minSdk increased to 21 & FORTIFY_SOURCE enabled
 
     // billing library
     val billing_version = "6.1.0"

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

@@ -12,9 +12,11 @@ import com.google.android.material.transition.MaterialSharedAxis
 import net.vonforst.evmap.MapsActivity
 import net.vonforst.evmap.R
 import net.vonforst.evmap.databinding.FragmentDonateBinding
+import net.vonforst.evmap.databinding.FragmentDonateReferralBinding
 
-class DonateFragment : Fragment() {
+class DonateFragment : DonateFragmentBase() {
     private lateinit var binding: FragmentDonateBinding
+    private lateinit var referrals: FragmentDonateReferralBinding
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
@@ -28,6 +30,7 @@ class DonateFragment : Fragment() {
         savedInstanceState: Bundle?
     ): View {
         binding = FragmentDonateBinding.inflate(inflater, container, false)
+        referrals = binding.referrals
         return binding.root
     }
 
@@ -43,8 +46,6 @@ class DonateFragment : Fragment() {
             (activity as? MapsActivity)?.openUrl(getString(R.string.paypal_link))
         }
 
-        binding.referrals.referralTesla.setOnClickListener {
-            (requireActivity() as MapsActivity).openUrl(getString(R.string.tesla_referral_link))
-        }
+        setupReferrals(referrals)
     }
 }

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

@@ -6,9 +6,7 @@ import android.view.View
 import android.view.ViewGroup
 import androidx.appcompat.app.AppCompatActivity
 import androidx.databinding.DataBindingUtil
-import androidx.fragment.app.Fragment
 import androidx.fragment.app.viewModels
-import androidx.lifecycle.Observer
 import androidx.navigation.fragment.findNavController
 import androidx.navigation.ui.setupWithNavController
 import androidx.recyclerview.widget.ConcatAdapter
@@ -25,7 +23,7 @@ import net.vonforst.evmap.databinding.FragmentDonateHeaderBinding
 import net.vonforst.evmap.databinding.FragmentDonateReferralBinding
 import net.vonforst.evmap.viewmodel.DonateViewModel
 
-class DonateFragment : Fragment() {
+class DonateFragment : DonateFragmentBase() {
     private lateinit var binding: FragmentDonateBinding
     private val vm: DonateViewModel by viewModels()
     private lateinit var header: FragmentDonateHeaderBinding
@@ -86,12 +84,7 @@ class DonateFragment : Fragment() {
             Snackbar.make(view, R.string.donation_failed, Snackbar.LENGTH_LONG).show()
         }
 
-        referrals.referralTesla.setOnClickListener {
-            (requireActivity() as MapsActivity).openUrl(getString(R.string.tesla_referral_link))
-        }
-        referrals.referralJuicify.setOnClickListener {
-            (requireActivity() as MapsActivity).openUrl(getString(R.string.juicify_referral_link))
-        }
+        setupReferrals(referrals)
 
         // Workaround for AndroidX bug: https://github.com/material-components/material-components-android/issues/1984
         view.setBackgroundColor(MaterialColors.getColor(view, android.R.attr.windowBackground))

app/src/main/AndroidManifest.xml

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

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

@@ -268,7 +268,7 @@ class MapsActivity : AppCompatActivity(),
         }
     }
 
-    fun openUrl(url: String) {
+    fun openUrl(url: String, preferBrowser: Boolean = true) {
         val pkg = CustomTabsClient.getPackageName(this, null)
         val intent = CustomTabsIntent.Builder()
             .setDefaultColorSchemeParams(
@@ -280,7 +280,7 @@ class MapsActivity : AppCompatActivity(),
         pkg?.let {
             // prefer to open URL in custom tab, even if native app
             // available (such as EVMap itself)
-            intent.intent.setPackage(pkg)
+            if (preferBrowser) intent.intent.setPackage(pkg)
         }
         try {
             intent.launchUrl(this, Uri.parse(url))

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

@@ -1,6 +1,7 @@
 package net.vonforst.evmap
 
 import android.content.Context
+import android.content.pm.ApplicationInfo
 import android.content.pm.PackageInfo
 import android.content.pm.PackageManager
 import android.content.res.Configuration
@@ -9,10 +10,14 @@ import android.icu.util.LocaleData
 import android.icu.util.ULocale
 import android.os.Build
 import android.os.Bundle
-import android.text.*
+import android.text.Spannable
+import android.text.SpannableString
+import android.text.SpannableStringBuilder
+import android.text.SpannedString
+import android.text.TextUtils
 import android.text.style.StyleSpan
 import net.vonforst.evmap.storage.PreferenceDataSource
-import java.util.*
+import java.util.Locale
 
 fun Bundle.optDouble(name: String): Double? {
     if (!this.containsKey(name)) return null
@@ -117,4 +122,21 @@ fun PackageManager.getPackageInfoCompat(packageName: String, flags: Int = 0): Pa
         getPackageInfo(packageName, PackageManager.PackageInfoFlags.of(flags.toLong()))
     } else {
         @Suppress("DEPRECATION") getPackageInfo(packageName, flags)
-    }
+    }
+
+
+fun PackageManager.getApplicationInfoCompat(packageName: String, flags: Int = 0): ApplicationInfo =
+    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+        getApplicationInfo(packageName, PackageManager.ApplicationInfoFlags.of(flags.toLong()))
+    } else {
+        @Suppress("DEPRECATION") getApplicationInfo(packageName, flags)
+    }
+
+
+fun PackageManager.isAppInstalled(packageName: String): Boolean {
+    return try {
+        getApplicationInfoCompat(packageName, 0).enabled
+    } catch (e: PackageManager.NameNotFoundException) {
+        false
+    }
+}

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

@@ -12,8 +12,28 @@ import kotlinx.coroutines.withContext
 import net.vonforst.evmap.BuildConfig
 import net.vonforst.evmap.R
 import net.vonforst.evmap.addDebugInterceptors
-import net.vonforst.evmap.api.*
-import net.vonforst.evmap.model.*
+import net.vonforst.evmap.api.ChargepointApi
+import net.vonforst.evmap.api.ChargepointList
+import net.vonforst.evmap.api.FiltersSQLQuery
+import net.vonforst.evmap.api.StringProvider
+import net.vonforst.evmap.api.mapPower
+import net.vonforst.evmap.api.mapPowerInverse
+import net.vonforst.evmap.api.nameForPlugType
+import net.vonforst.evmap.api.powerSteps
+import net.vonforst.evmap.model.BooleanFilter
+import net.vonforst.evmap.model.ChargeLocation
+import net.vonforst.evmap.model.Chargepoint
+import net.vonforst.evmap.model.ChargepointListItem
+import net.vonforst.evmap.model.Filter
+import net.vonforst.evmap.model.FilterValue
+import net.vonforst.evmap.model.FilterValues
+import net.vonforst.evmap.model.MultipleChoiceFilter
+import net.vonforst.evmap.model.MultipleChoiceFilterValue
+import net.vonforst.evmap.model.ReferenceData
+import net.vonforst.evmap.model.SliderFilter
+import net.vonforst.evmap.model.getBooleanValue
+import net.vonforst.evmap.model.getMultipleChoiceValue
+import net.vonforst.evmap.model.getSliderValue
 import net.vonforst.evmap.viewmodel.Resource
 import net.vonforst.evmap.viewmodel.getClusterDistance
 import okhttp3.Cache
@@ -22,7 +42,11 @@ import retrofit2.HttpException
 import retrofit2.Response
 import retrofit2.Retrofit
 import retrofit2.converter.moshi.MoshiConverterFactory
-import retrofit2.http.*
+import retrofit2.http.Field
+import retrofit2.http.FormUrlEncoded
+import retrofit2.http.GET
+import retrofit2.http.POST
+import retrofit2.http.Query
 import java.io.IOException
 import java.time.Duration
 
@@ -123,6 +147,8 @@ interface GoingElectricApi {
     }
 }
 
+private const val STATUS_OK = "ok"
+
 class GoingElectricApiWrapper(
     val apikey: String,
     baseurl: String = "https://api.goingelectric.de",
@@ -211,11 +237,11 @@ class GoingElectricApiWrapper(
                     categories = categories,
                     startkey = startkey
                 )
-                if (!response.isSuccessful || response.body()!!.status != "ok") {
+                if (!response.isSuccessful || response.body()!!.status != STATUS_OK) {
                     return Resource.error(response.message(), null)
                 } else {
                     val body = response.body()!!
-                    data.addAll(body.chargelocations)
+                    data.addAll(body.chargelocations!!)
                     startkey = body.startkey
                 }
             } catch (e: IOException) {
@@ -308,11 +334,11 @@ class GoingElectricApiWrapper(
                     categories = categories,
                     startkey = startkey
                 )
-                if (!response.isSuccessful || response.body()!!.status != "ok") {
+                if (!response.isSuccessful || response.body()!!.status != STATUS_OK) {
                     return Resource.error(response.message(), null)
                 } else {
                     val body = response.body()!!
-                    data.addAll(body.chargelocations)
+                    data.addAll(body.chargelocations!!)
                     startkey = body.startkey
                 }
             } catch (e: IOException) {
@@ -393,9 +419,9 @@ class GoingElectricApiWrapper(
     ): Resource<ChargeLocation> {
         try {
             val response = api.getChargepointDetail(id)
-            return if (response.isSuccessful && response.body()!!.status == "ok" && response.body()!!.chargelocations.size == 1) {
+            return if (response.isSuccessful && response.body()!!.status == STATUS_OK && response.body()!!.chargelocations!!.size == 1) {
                 Resource.success(
-                    (response.body()!!.chargelocations[0] as GEChargeLocation).convert(
+                    (response.body()!!.chargelocations!![0] as GEChargeLocation).convert(
                         apikey, true
                     )
                 )
@@ -423,16 +449,19 @@ class GoingElectricApiWrapper(
 
                     val responses = listOf(plugsResponse, chargeCardsResponse, networksResponse)
 
-                    if (responses.map { it.isSuccessful }.all { it }) {
+                    if (responses.map { it.isSuccessful }.all { it }
+                        && plugsResponse.body()!!.status == STATUS_OK
+                        && chargeCardsResponse.body()!!.status == STATUS_OK
+                        && networksResponse.body()!!.status == STATUS_OK) {
                         Resource.success(
                             GEReferenceData(
-                                plugsResponse.body()!!.result,
-                                networksResponse.body()!!.result,
-                                chargeCardsResponse.body()!!.result
+                                plugsResponse.body()!!.result!!,
+                                networksResponse.body()!!.result!!,
+                                chargeCardsResponse.body()!!.result!!
                             )
                         )
                     } else {
-                        Resource.error(responses.find { !it.isSuccessful }!!.message(), null)
+                        Resource.error(responses.find { !it.isSuccessful }?.message(), null)
                     }
                 } catch (e: IOException) {
                     Resource.error(e.message, null)

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

@@ -27,20 +27,20 @@ import java.time.LocalTime
 @JsonClass(generateAdapter = true)
 data class GEChargepointList(
     val status: String,
-    val chargelocations: List<GEChargepointListItem>,
+    val chargelocations: List<GEChargepointListItem>?,
     @JsonObjectOrFalse val startkey: Int?
 )
 
 @JsonClass(generateAdapter = true)
 data class GEStringList(
     val status: String,
-    val result: List<String>
+    val result: List<String>?
 )
 
 @JsonClass(generateAdapter = true)
 data class GEChargeCardList(
     val status: String,
-    val result: List<GEChargeCard>
+    val result: List<GEChargeCard>?
 )
 
 sealed class GEChargepointListItem {

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

@@ -8,8 +8,26 @@ import com.squareup.moshi.Moshi
 import net.vonforst.evmap.BuildConfig
 import net.vonforst.evmap.R
 import net.vonforst.evmap.addDebugInterceptors
-import net.vonforst.evmap.api.*
-import net.vonforst.evmap.model.*
+import net.vonforst.evmap.api.ChargepointApi
+import net.vonforst.evmap.api.ChargepointList
+import net.vonforst.evmap.api.FiltersSQLQuery
+import net.vonforst.evmap.api.StringProvider
+import net.vonforst.evmap.api.mapPower
+import net.vonforst.evmap.api.mapPowerInverse
+import net.vonforst.evmap.api.powerSteps
+import net.vonforst.evmap.model.BooleanFilter
+import net.vonforst.evmap.model.ChargeLocation
+import net.vonforst.evmap.model.ChargepointListItem
+import net.vonforst.evmap.model.Filter
+import net.vonforst.evmap.model.FilterValue
+import net.vonforst.evmap.model.FilterValues
+import net.vonforst.evmap.model.MultipleChoiceFilter
+import net.vonforst.evmap.model.MultipleChoiceFilterValue
+import net.vonforst.evmap.model.ReferenceData
+import net.vonforst.evmap.model.SliderFilter
+import net.vonforst.evmap.model.getBooleanValue
+import net.vonforst.evmap.model.getMultipleChoiceValue
+import net.vonforst.evmap.model.getSliderValue
 import net.vonforst.evmap.viewmodel.Resource
 import okhttp3.Cache
 import okhttp3.OkHttpClient
@@ -390,9 +408,7 @@ class OpenChargeMapApiWrapper(
     }
 
     override fun filteringInSQLRequiresDetails(filters: FilterValues): Boolean {
-        val operators = filters.getMultipleChoiceValue("operators")
-        return (operators != null && !operators.all)
-        // TODO: it would be possible to implement this without requiring details if we extended the data structure to also save the operator ID in the DB
+        return false
     }
 
 }

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

@@ -63,7 +63,7 @@ data class OCMChargepoint(
         Coordinate(addressInfo.latitude, addressInfo.longitude),
         addressInfo.toAddress(refData),
         connections.map { it.convert(refData) },
-        operatorInfo?.title,
+        operatorInfo?.title ?: refData.operators.find { it.id == operatorId }?.title,
         "https://map.openchargemap.io/?id=$id",
         "https://map.openchargemap.io/?id=$id",
         convertFaultReport(),

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

@@ -1,7 +1,11 @@
 package net.vonforst.evmap.auto
 
 import android.content.Intent
-import android.graphics.*
+import android.graphics.Bitmap
+import android.graphics.Canvas
+import android.graphics.Color
+import android.graphics.Matrix
+import android.graphics.RectF
 import android.graphics.drawable.BitmapDrawable
 import android.net.Uri
 import android.text.SpannableString
@@ -11,7 +15,17 @@ import androidx.car.app.CarContext
 import androidx.car.app.CarToast
 import androidx.car.app.Screen
 import androidx.car.app.constraints.ConstraintManager
-import androidx.car.app.model.*
+import androidx.car.app.model.Action
+import androidx.car.app.model.ActionStrip
+import androidx.car.app.model.CarColor
+import androidx.car.app.model.CarIcon
+import androidx.car.app.model.CarIconSpan
+import androidx.car.app.model.ForegroundCarColorSpan
+import androidx.car.app.model.Pane
+import androidx.car.app.model.PaneTemplate
+import androidx.car.app.model.ParkedOnlyOnClickListener
+import androidx.car.app.model.Row
+import androidx.car.app.model.Template
 import androidx.core.graphics.drawable.IconCompat
 import androidx.core.graphics.scale
 import androidx.core.text.HtmlCompat
@@ -22,13 +36,17 @@ import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
-import net.vonforst.evmap.*
+import net.vonforst.evmap.BuildConfig
+import net.vonforst.evmap.EXTRA_CHARGER_ID
+import net.vonforst.evmap.EXTRA_LAT
+import net.vonforst.evmap.EXTRA_LON
+import net.vonforst.evmap.MapsActivity
+import net.vonforst.evmap.R
 import net.vonforst.evmap.adapter.formatTeslaParkingFee
 import net.vonforst.evmap.adapter.formatTeslaPricing
 import net.vonforst.evmap.api.availability.AvailabilityRepository
 import net.vonforst.evmap.api.availability.ChargeLocationStatus
 import net.vonforst.evmap.api.availability.tesla.Pricing
-import net.vonforst.evmap.api.availability.tesla.TeslaChargingOwnershipGraphQlApi
 import net.vonforst.evmap.api.chargeprice.ChargepriceApi
 import net.vonforst.evmap.api.createApi
 import net.vonforst.evmap.api.fronyx.FronyxApi
@@ -41,6 +59,7 @@ import net.vonforst.evmap.model.ChargeLocation
 import net.vonforst.evmap.model.Cost
 import net.vonforst.evmap.model.FaultReport
 import net.vonforst.evmap.model.Favorite
+import net.vonforst.evmap.plus
 import net.vonforst.evmap.storage.AppDatabase
 import net.vonforst.evmap.storage.ChargeLocationsRepository
 import net.vonforst.evmap.storage.PreferenceDataSource
@@ -131,7 +150,16 @@ class ChargerDetailScreen(ctx: CarContext, val chargerSparse: ChargeLocation) :
                                     )
                                     .setTitle(carContext.getString(R.string.auto_prices))
                                 .setOnClickListener {
-                                    screenManager.push(ChargepriceScreen(carContext, charger))
+                                    if (prefs.chargepriceNativeIntegration) {
+                                        screenManager.push(ChargepriceScreen(carContext, charger))
+                                    } else {
+                                        val intent = Intent(
+                                            Intent.ACTION_VIEW,
+                                            Uri.parse(ChargepriceApi.getPoiUrl(charger))
+                                        )
+                                            .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+                                        carContext.startActivity(intent)
+                                    }
                                 }
                                 .build())
                         }

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

@@ -12,6 +12,7 @@ import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import net.vonforst.evmap.R
 import okio.IOException
+import retrofit2.HttpException
 
 abstract class MultiSelectSearchScreen<T>(ctx: CarContext) : Screen(ctx),
     SearchTemplate.SearchCallback {
@@ -30,14 +31,9 @@ abstract class MultiSelectSearchScreen<T>(ctx: CarContext) : Screen(ctx),
                     filterList()
                     invalidate()
                 } catch (e: IOException) {
-                    withContext(Dispatchers.Main) {
-                        CarToast.makeText(
-                            carContext,
-                            R.string.generic_connection_error,
-                            CarToast.LENGTH_LONG
-                        ).show()
-                        screenManager.pop()
-                    }
+                    showLoadingError()
+                } catch (e: HttpException) {
+                    showLoadingError()
                 }
             }
         }
@@ -76,6 +72,17 @@ abstract class MultiSelectSearchScreen<T>(ctx: CarContext) : Screen(ctx),
         }.build()
     }
 
+    private suspend fun showLoadingError() {
+        withContext(Dispatchers.Main) {
+            CarToast.makeText(
+                carContext,
+                R.string.generic_connection_error,
+                CarToast.LENGTH_LONG
+            ).show()
+            screenManager.pop()
+        }
+    }
+
     private fun filterList() {
         currentList = fullList?.let {
             it.sortedBy { getLabel(it).lowercase() }

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

@@ -14,14 +14,30 @@ import androidx.car.app.CarToast
 import androidx.car.app.Screen
 import androidx.car.app.annotations.ExperimentalCarApi
 import androidx.car.app.constraints.ConstraintManager
-import androidx.car.app.model.*
+import androidx.car.app.model.Action
+import androidx.car.app.model.CarColor
+import androidx.car.app.model.CarIcon
+import androidx.car.app.model.GridItem
+import androidx.car.app.model.GridTemplate
+import androidx.car.app.model.ItemList
+import androidx.car.app.model.ListTemplate
+import androidx.car.app.model.MessageTemplate
+import androidx.car.app.model.ParkedOnlyOnClickListener
+import androidx.car.app.model.Row
+import androidx.car.app.model.SectionedItemList
+import androidx.car.app.model.Template
+import androidx.car.app.model.Toggle
 import androidx.core.content.IntentCompat
 import androidx.core.graphics.drawable.IconCompat
 import androidx.core.text.HtmlCompat
 import androidx.lifecycle.lifecycleScope
 import androidx.localbroadcastmanager.content.LocalBroadcastManager
 import kotlinx.coroutines.launch
-import net.vonforst.evmap.*
+import net.vonforst.evmap.BuildConfig
+import net.vonforst.evmap.EXTRA_DONATE
+import net.vonforst.evmap.MapsActivity
+import net.vonforst.evmap.R
+import net.vonforst.evmap.addDebugInterceptors
 import net.vonforst.evmap.api.availability.tesla.TeslaAuthenticationApi
 import net.vonforst.evmap.api.availability.tesla.TeslaOwnerApi
 import net.vonforst.evmap.api.chargeprice.ChargepriceApi
@@ -29,6 +45,7 @@ import net.vonforst.evmap.api.chargeprice.ChargepriceCar
 import net.vonforst.evmap.api.chargeprice.ChargepriceTariff
 import net.vonforst.evmap.fragment.oauth.OAuthLoginFragment
 import net.vonforst.evmap.fragment.oauth.OAuthLoginFragmentArgs
+import net.vonforst.evmap.getPackageInfoCompat
 import net.vonforst.evmap.storage.AppDatabase
 import net.vonforst.evmap.storage.EncryptedPreferenceDataStore
 import net.vonforst.evmap.storage.PreferenceDataSource
@@ -408,12 +425,21 @@ class ChargepriceSettingsScreen(ctx: CarContext) : Screen(ctx) {
             setTitle(carContext.getString(R.string.settings_chargeprice))
             setHeaderAction(Action.BACK)
             setSingleList(ItemList.Builder().apply {
+                addItem(Row.Builder().apply {
+                    setTitle(carContext.getString(R.string.pref_chargeprice_native_integration))
+                    addText(carContext.getString(if (prefs.chargepriceNativeIntegration) R.string.pref_chargeprice_native_integration_on else R.string.pref_chargeprice_native_integration_off))
+                    setToggle(Toggle.Builder {
+                        prefs.chargepriceNativeIntegration = it
+                        invalidate()
+                    }.setChecked(prefs.chargepriceNativeIntegration).build())
+                }.build())
                 addItem(Row.Builder().apply {
                     setTitle(carContext.getString(R.string.pref_my_vehicle))
                     setBrowsable(true)
                     setOnClickListener {
                         screenManager.push(SelectVehiclesScreen(carContext))
                     }
+                    setEnabled(prefs.chargepriceNativeIntegration)
                 }.build())
                 addItem(Row.Builder().apply {
                     setTitle(carContext.getString(R.string.pref_my_tariffs))
@@ -437,6 +463,7 @@ class ChargepriceSettingsScreen(ctx: CarContext) : Screen(ctx) {
                             )
                         }
                     )
+                    setEnabled(prefs.chargepriceNativeIntegration)
                 }.build())
                 addItem(Row.Builder().apply {
                     setTitle(carContext.getString(R.string.settings_android_auto_chargeprice_range))
@@ -454,6 +481,7 @@ class ChargepriceSettingsScreen(ctx: CarContext) : Screen(ctx) {
                     setOnClickListener {
                         screenManager.push(SelectChargingRangeScreen(carContext))
                     }
+                    setEnabled(prefs.chargepriceNativeIntegration)
                 }.build())
                 addItem(Row.Builder().apply {
                     setTitle(carContext.getString(R.string.pref_chargeprice_currency))
@@ -469,27 +497,31 @@ class ChargepriceSettingsScreen(ctx: CarContext) : Screen(ctx) {
                     setOnClickListener {
                         screenManager.push(SelectCurrencyScreen(carContext))
                     }
+                    setEnabled(prefs.chargepriceNativeIntegration)
                 }.build())
                 addItem(Row.Builder().apply {
                     setTitle(carContext.getString(R.string.pref_chargeprice_no_base_fee))
                     setToggle(Toggle.Builder {
                         prefs.chargepriceNoBaseFee = it
                     }.setChecked(prefs.chargepriceNoBaseFee).build())
-                }.build())
-                addItem(Row.Builder().apply {
-                    setTitle(carContext.getString(R.string.pref_chargeprice_show_provider_customer_tariffs))
-                    addText(carContext.getString(R.string.pref_chargeprice_show_provider_customer_tariffs_summary))
-                    setToggle(Toggle.Builder {
-                        prefs.chargepriceShowProviderCustomerTariffs = it
-                    }.setChecked(prefs.chargepriceShowProviderCustomerTariffs).build())
+                    setEnabled(prefs.chargepriceNativeIntegration)
                 }.build())
                 if (maxRows > 6) {
+                    addItem(Row.Builder().apply {
+                        setTitle(carContext.getString(R.string.pref_chargeprice_show_provider_customer_tariffs))
+                        addText(carContext.getString(R.string.pref_chargeprice_show_provider_customer_tariffs_summary))
+                        setToggle(Toggle.Builder {
+                            prefs.chargepriceShowProviderCustomerTariffs = it
+                        }.setChecked(prefs.chargepriceShowProviderCustomerTariffs).build())
+                        setEnabled(prefs.chargepriceNativeIntegration)
+                    }.build())
                     addItem(Row.Builder().apply {
                         setTitle(carContext.getString(R.string.pref_chargeprice_allow_unbalanced_load))
                         addText(carContext.getString(R.string.pref_chargeprice_allow_unbalanced_load_summary))
                         setToggle(Toggle.Builder {
                             prefs.chargepriceAllowUnbalancedLoad = it
                         }.setChecked(prefs.chargepriceAllowUnbalancedLoad).build())
+                        setEnabled(prefs.chargepriceNativeIntegration)
                     }.build())
                 }
             }.build())

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

@@ -0,0 +1,29 @@
+package net.vonforst.evmap.fragment
+
+import androidx.fragment.app.Fragment
+import net.vonforst.evmap.MapsActivity
+import net.vonforst.evmap.R
+import net.vonforst.evmap.databinding.FragmentDonateReferralBinding
+
+abstract class DonateFragmentBase : Fragment() {
+    fun setupReferrals(referrals: FragmentDonateReferralBinding) {
+        referrals.referralTesla.setOnClickListener {
+            (requireActivity() as MapsActivity).openUrl(getString(R.string.tesla_referral_link))
+        }
+        referrals.referralJuicify.setOnClickListener {
+            (requireActivity() as MapsActivity).openUrl(getString(R.string.juicify_referral_link))
+        }
+        referrals.referralGeldfuereauto.setOnClickListener {
+            (requireActivity() as MapsActivity).openUrl(getString(R.string.geldfuereauto_referral_link))
+        }
+        referrals.referralMaingau.setOnClickListener {
+            (requireActivity() as MapsActivity).openUrl(getString(R.string.maingau_referral_link))
+        }
+        referrals.referralEwieeinfach.setOnClickListener {
+            (requireActivity() as MapsActivity).openUrl(getString(R.string.ewieeinfach_referral_link))
+        }
+        referrals.referralEprimo.setOnClickListener {
+            (requireActivity() as MapsActivity).openUrl(getString(R.string.eprimo_referral_link))
+        }
+    }
+}

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

@@ -11,7 +11,14 @@ import android.graphics.Color
 import android.os.Build
 import android.os.Bundle
 import android.text.method.KeyListener
-import android.view.*
+import android.view.ContextThemeWrapper
+import android.view.Gravity
+import android.view.LayoutInflater
+import android.view.Menu
+import android.view.MenuInflater
+import android.view.MenuItem
+import android.view.View
+import android.view.ViewGroup
 import android.view.inputmethod.InputMethodManager
 import android.widget.AdapterView
 import android.widget.ImageView
@@ -23,7 +30,13 @@ import androidx.annotation.RequiresPermission
 import androidx.appcompat.widget.PopupMenu
 import androidx.core.content.ContextCompat
 import androidx.core.location.LocationListenerCompat
-import androidx.core.view.*
+import androidx.core.view.MenuCompat
+import androidx.core.view.MenuProvider
+import androidx.core.view.ViewCompat
+import androidx.core.view.WindowInsetsCompat
+import androidx.core.view.doOnLayout
+import androidx.core.view.doOnNextLayout
+import androidx.core.view.updateLayoutParams
 import androidx.databinding.DataBindingUtil
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.activityViewModels
@@ -57,7 +70,12 @@ import com.google.android.material.transition.MaterialContainerTransform.FADE_MO
 import com.google.android.material.transition.MaterialFadeThrough
 import com.google.android.material.transition.MaterialSharedAxis
 import com.mahc.custombottomsheetbehavior.BottomSheetBehaviorGoogleMapsLike
-import com.mahc.custombottomsheetbehavior.BottomSheetBehaviorGoogleMapsLike.*
+import com.mahc.custombottomsheetbehavior.BottomSheetBehaviorGoogleMapsLike.BottomSheetCallback
+import com.mahc.custombottomsheetbehavior.BottomSheetBehaviorGoogleMapsLike.STATE_ANCHOR_POINT
+import com.mahc.custombottomsheetbehavior.BottomSheetBehaviorGoogleMapsLike.STATE_COLLAPSED
+import com.mahc.custombottomsheetbehavior.BottomSheetBehaviorGoogleMapsLike.STATE_HIDDEN
+import com.mahc.custombottomsheetbehavior.BottomSheetBehaviorGoogleMapsLike.STATE_SETTLING
+import com.mahc.custombottomsheetbehavior.BottomSheetBehaviorGoogleMapsLike.from
 import com.mahc.custombottomsheetbehavior.MergedAppBarLayoutBehavior
 import com.stfalcon.imageviewer.StfalconImageViewer
 import io.michaelrocks.bimap.HashBiMap
@@ -72,6 +90,7 @@ import net.vonforst.evmap.adapter.ConnectorAdapter
 import net.vonforst.evmap.adapter.DetailsAdapter
 import net.vonforst.evmap.adapter.GalleryAdapter
 import net.vonforst.evmap.adapter.PlaceAutocompleteAdapter
+import net.vonforst.evmap.api.chargeprice.ChargepriceApi
 import net.vonforst.evmap.autocomplete.ApiUnavailableException
 import net.vonforst.evmap.autocomplete.PlaceWithBounds
 import net.vonforst.evmap.bold
@@ -79,17 +98,34 @@ import net.vonforst.evmap.databinding.FragmentMapBinding
 import net.vonforst.evmap.location.FusionEngine
 import net.vonforst.evmap.location.LocationEngine
 import net.vonforst.evmap.location.Priority
-import net.vonforst.evmap.model.*
+import net.vonforst.evmap.model.ChargeLocation
+import net.vonforst.evmap.model.ChargeLocationCluster
+import net.vonforst.evmap.model.ChargepointListItem
+import net.vonforst.evmap.model.ChargerPhoto
+import net.vonforst.evmap.model.FILTERS_CUSTOM
+import net.vonforst.evmap.model.FILTERS_DISABLED
+import net.vonforst.evmap.model.FILTERS_FAVORITES
 import net.vonforst.evmap.navigation.safeNavigate
 import net.vonforst.evmap.shouldUseImperialUnits
 import net.vonforst.evmap.storage.PreferenceDataSource
-import net.vonforst.evmap.ui.*
+import net.vonforst.evmap.ui.ChargerIconGenerator
+import net.vonforst.evmap.ui.ClusterIconGenerator
+import net.vonforst.evmap.ui.MarkerAnimator
+import net.vonforst.evmap.ui.chargerZ
+import net.vonforst.evmap.ui.clusterZ
+import net.vonforst.evmap.ui.getMarkerTint
+import net.vonforst.evmap.ui.placeSearchZ
+import net.vonforst.evmap.ui.setTouchModal
 import net.vonforst.evmap.utils.boundingBox
 import net.vonforst.evmap.utils.checkAnyLocationPermission
 import net.vonforst.evmap.utils.checkFineLocationPermission
 import net.vonforst.evmap.utils.distanceBetween
 import net.vonforst.evmap.utils.formatDecimal
-import net.vonforst.evmap.viewmodel.*
+import net.vonforst.evmap.viewmodel.GalleryViewModel
+import net.vonforst.evmap.viewmodel.MapPosition
+import net.vonforst.evmap.viewmodel.MapViewModel
+import net.vonforst.evmap.viewmodel.Resource
+import net.vonforst.evmap.viewmodel.Status
 import java.io.IOException
 import java.time.Duration
 import java.time.Instant
@@ -399,12 +435,16 @@ class MapFragment : Fragment(), OnMapReadyCallback, MapsActivity.FragmentCallbac
         }
         binding.detailView.btnChargeprice.setOnClickListener {
             val charger = vm.charger.value?.data ?: return@setOnClickListener
-            val extras =
-                FragmentNavigatorExtras(binding.detailView.btnChargeprice to getString(R.string.shared_element_chargeprice))
-            findNavController().safeNavigate(
-                MapFragmentDirections.actionMapToChargepriceFragment(charger),
-                extras
-            )
+            if (prefs.chargepriceNativeIntegration) {
+                val extras =
+                    FragmentNavigatorExtras(binding.detailView.btnChargeprice to getString(R.string.shared_element_chargeprice))
+                findNavController().safeNavigate(
+                    MapFragmentDirections.actionMapToChargepriceFragment(charger),
+                    extras
+                )
+            } else {
+                (activity as? MapsActivity)?.openUrl(ChargepriceApi.getPoiUrl(charger), false)
+            }
         }
         binding.detailView.btnChargerWebsite.setOnClickListener {
             val charger = vm.charger.value?.data ?: return@setOnClickListener
@@ -628,6 +668,14 @@ class MapFragment : Fragment(), OnMapReadyCallback, MapsActivity.FragmentCallbac
                 ) {
                     closeLayersMenu()
                 }
+
+                if (vm.selectedChargepoint.value != null && newState in listOf(
+                        STATE_ANCHOR_POINT, STATE_COLLAPSED
+                    )
+                ) {
+                    closeConnectorDetailsDialog()
+                    vm.selectedChargepoint.value = null
+                }
             }
         })
         vm.chargerSparse.observe(viewLifecycleOwner) {

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

@@ -7,6 +7,7 @@ import android.text.Spanned
 import android.text.style.RelativeSizeSpan
 import android.view.View
 import androidx.fragment.app.viewModels
+import androidx.preference.CheckBoxPreference
 import net.vonforst.evmap.R
 import net.vonforst.evmap.ui.MultiSelectDialogPreference
 import net.vonforst.evmap.viewmodel.SettingsViewModel
@@ -28,9 +29,11 @@ class ChargepriceSettingsFragment : BaseSettingsFragment() {
 
     private lateinit var myVehiclePreference: MultiSelectDialogPreference
     private lateinit var myTariffsPreference: MultiSelectDialogPreference
+    private lateinit var nativeIntegrationPreference: CheckBoxPreference
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
+        nativeIntegrationPreference = findPreference("chargeprice_native_integration")!!
 
         myVehiclePreference = findPreference("chargeprice_my_vehicle")!!
         myVehiclePreference.isEnabled = false
@@ -48,7 +51,7 @@ class ChargepriceSettingsFragment : BaseSettingsFragment() {
                         )
                     }
                 }.toTypedArray()
-                myVehiclePreference.isEnabled = true
+                myVehiclePreference.isEnabled = nativeIntegrationPreference.isChecked
                 updateMyVehiclesSummary()
             }
         }
@@ -65,10 +68,28 @@ class ChargepriceSettingsFragment : BaseSettingsFragment() {
                         it.name
                     }
                 }.toTypedArray()
-                myTariffsPreference.isEnabled = true
+                myTariffsPreference.isEnabled = nativeIntegrationPreference.isChecked
                 updateMyTariffsSummary()
             }
         }
+        updateNativeIntegrationState()
+    }
+
+    private fun updateNativeIntegrationState() {
+        for (i in 0 until preferenceScreen.preferenceCount) {
+            val pref = preferenceScreen.getPreference(i)
+            if (pref == nativeIntegrationPreference) {
+                continue
+            } else if (pref == myTariffsPreference) {
+                pref.isEnabled =
+                    nativeIntegrationPreference.isChecked && vm.tariffs.value?.data != null
+            } else if (pref == myVehiclePreference) {
+                pref.isEnabled =
+                    nativeIntegrationPreference.isChecked && vm.tariffs.value?.data != null
+            } else {
+                pref.isEnabled = nativeIntegrationPreference.isChecked
+            }
+        }
     }
 
     private fun updateMyTariffsSummary() {
@@ -110,6 +131,10 @@ class ChargepriceSettingsFragment : BaseSettingsFragment() {
             "chargeprice_my_tariffs" -> {
                 updateMyTariffsSummary()
             }
+
+            "chargeprice_native_integration" -> {
+                updateNativeIntegrationState()
+            }
         }
     }
 }

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

@@ -6,9 +6,11 @@ import android.net.Uri
 import android.os.Build
 import android.os.Bundle
 import android.provider.Settings
+import androidx.preference.CheckBoxPreference
 import androidx.preference.ListPreference
 import androidx.preference.Preference
 import net.vonforst.evmap.R
+import net.vonforst.evmap.isAppInstalled
 import net.vonforst.evmap.ui.getAppLocale
 import net.vonforst.evmap.ui.updateAppLocale
 import net.vonforst.evmap.ui.updateNightMode
@@ -16,6 +18,7 @@ import net.vonforst.evmap.ui.updateNightMode
 class UiSettingsFragment : BaseSettingsFragment() {
     override val isTopLevel = false
     lateinit var langPref: ListPreference
+    lateinit var immediateNavPref: CheckBoxPreference
 
     override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
         setPreferencesFromResource(R.xml.settings_ui, rootKey)
@@ -28,11 +31,18 @@ class UiSettingsFragment : BaseSettingsFragment() {
 
         val appLinkPref = findPreference<Preference>("applink_associate")!!
         appLinkPref.isVisible = Build.VERSION.SDK_INT >= Build.VERSION_CODES.S
+
+        immediateNavPref = findPreference("navigate_use_maps")!!
+        immediateNavPref.isVisible = isGoogleMapsInstalled()
     }
 
+    private fun isGoogleMapsInstalled() =
+        requireContext().packageManager.isAppInstalled("com.google.android.apps.maps")
+
     override fun onResume() {
         super.onResume()
         langPref.value = getAppLocale()
+        immediateNavPref.isVisible = isGoogleMapsInstalled()
     }
 
     override fun onSharedPreferenceChanged(sharedPreferences: SharedPreferences, key: String?) {

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

@@ -147,6 +147,12 @@ class PreferenceDataSource(val context: Context) {
             sp.edit().putBoolean("update_0.6.0_androidauto_dialog_shown", value).apply()
         }
 
+    var chargepriceNativeIntegration: Boolean
+        get() = sp.getBoolean("chargeprice_native_integration", true)
+        set(value) {
+            sp.edit().putBoolean("chargeprice_native_integration", value).apply()
+        }
+
     var chargepriceMyVehicles: Set<String>
         get() = try {
             sp.getStringSet("chargeprice_my_vehicle", emptySet())!!

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

@@ -148,13 +148,9 @@ class MapViewModel(application: Application, private val state: SavedStateHandle
         MutableLiveData<Set<Long>>()
     }
 
-    val chargerSparse: MutableLiveData<ChargeLocation?> by lazy {
-        state.getLiveData<ChargeLocation?>("chargerSparse").apply {
-            observeForever {
-                selectedChargepoint.value = null
-            }
-        }
-    }
+    val chargerSparse: MutableLiveData<ChargeLocation?> =
+        state.getLiveData<ChargeLocation?>("chargerSparse")
+
     private val triggerChargerDetailsRefresh = MutableLiveData(false)
     val chargerDetails: LiveData<Resource<ChargeLocation>> = chargerSparse.switchMap { charger ->
         triggerChargerDetailsRefresh.value = false
@@ -170,8 +166,13 @@ class MapViewModel(application: Application, private val state: SavedStateHandle
         }
     }
 
-    val selectedChargepoint: MutableLiveData<Chargepoint?> by lazy {
+    val selectedChargepoint: MutableLiveData<Chargepoint?> =
         state.getLiveData("selectedChargepoint")
+
+    init {
+        chargerSparse.observeForever {
+            selectedChargepoint.value = null
+        }
     }
 
     val charger: MediatorLiveData<Resource<ChargeLocation>> by lazy {

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

@@ -38,7 +38,7 @@
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:orientation="horizontal"
-        app:constraint_referenced_ids="referral_tesla,referral_juicify"
+        app:constraint_referenced_ids="referral_tesla,referral_juicify,referral_geldfuereauto,referral_maingau,referral_eprimo,referral_ewieeinfach"
         app:flow_horizontalGap="16dp"
         app:flow_horizontalStyle="packed"
         app:flow_verticalAlign="baseline"
@@ -61,4 +61,32 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:text="@string/referral_juicify" />
+
+    <Button
+        android:id="@+id/referral_geldfuereauto"
+        style="@style/Widget.Material3.Button.TonalButton"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/referral_geldfuereauto" />
+
+    <Button
+        android:id="@+id/referral_maingau"
+        style="@style/Widget.Material3.Button.TonalButton"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/referral_maingau" />
+
+    <Button
+        android:id="@+id/referral_eprimo"
+        style="@style/Widget.Material3.Button.TonalButton"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/referral_eprimo" />
+
+    <Button
+        android:id="@+id/referral_ewieeinfach"
+        style="@style/Widget.Material3.Button.TonalButton"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/referral_ewieeinfach" />
 </androidx.constraintlayout.widget.ConstraintLayout>

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

@@ -244,7 +244,7 @@
     <string name="average_utilization">Průměrné využití</string>
     <string name="website">Webové stránky</string>
     <string name="pref_map_scale">Zobrazit ovládání přiblížení mapy</string>
-    <string name="pref_map_scale_meters_and_miles">Míle a metry na ovládání přiblížení mapy</string>
+    <string name="pref_map_scale_meters_and_miles">Míle a metry na ukazateli měřítka</string>
     <string name="pref_units">Jednotky</string>
     <string name="pref_units_metric">Metrické</string>
     <string name="pref_units_imperial">Imperiální</string>
@@ -374,4 +374,13 @@
     <string name="auto_chargeprice_vehicle_ambiguous">Několik vozidel vybraných v aplikaci se shoduje s tímto vozidlem (%1$s %2$s).</string>
     <string name="auto_multipage">(%1$d/%2$d)</string>
     <string name="referral_tesla">Tesla</string>
+    <string name="status_available">Dostupná</string>
+    <string name="status_occupied">Obsazená</string>
+    <string name="status_charging">Nabíjení</string>
+    <string name="status_faulted">Mimo provoz</string>
+    <string name="status_unknown">Stav neznámý</string>
+    <string name="status_since">%1$s od %2$s</string>
+    <string name="pref_chargeprice_native_integration">Porovnání cen v EVMap</string>
+    <string name="pref_chargeprice_native_integration_on">Data o cenách budou zobrazena přímo v EVMap</string>
+    <string name="pref_chargeprice_native_integration_off">Tlačítko porovnání cen bude odkazovat na aplikaci nebo web Chargeprice</string>
 </resources>

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

@@ -375,4 +375,7 @@
     <string name="status_unknown">Status unbekannt</string>
     <string name="status_since">%1$s seit %2$s</string>
     <string name="charger_name">Ladestationsname</string>
+    <string name="pref_chargeprice_native_integration">Preisvergleich in EVMap</string>
+    <string name="pref_chargeprice_native_integration_on">Preise werden direkt in EVMap angezeigt</string>
+    <string name="pref_chargeprice_native_integration_off">Preisvergleich verlinkt auf die App oder Website von Chargeprice</string>
 </resources>

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

@@ -374,4 +374,10 @@
     <string name="powered_by_fronyx">previsão feita por fronyx</string>
     <string name="copied">Informação copiada</string>
     <string name="charger_name">Nome do carregador</string>
+    <string name="status_available">Disponível</string>
+    <string name="status_occupied">Ocupado</string>
+    <string name="status_charging">Carregando</string>
+    <string name="status_faulted">Fora de serviço</string>
+    <string name="status_since">%1$s desde %2$s</string>
+    <string name="status_unknown">Estado Desconhecido</string>
 </resources>

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

@@ -37,7 +37,15 @@
     <string name="donate_link" translatable="false">https://ev-map.app/donate/</string>
     <string name="tesla_referral_link" translatable="false">http://ts.la/johan94494</string>
     <string name="juicify_referral_link" translatable="false">https://trck.juicify.green/trck/eclick/9dba357fbfed1e82fb05c7ec004ee2972ea174ce46d8ae0d</string>
-    <string name="referral_juicify">Juicify</string>
+    <string name="geldfuereauto_referral_link" translatable="false">https://trck.geld-fuer-eauto.de/trck/eclick/c4713e9520bdb8842a3f1fbfa3a0669b3e58421043df78ad</string>
+    <string name="maingau_referral_link" translatable="false">https://trck.maingau-energie.de/trck/eclick/799b39cda39575dab1dcd3351abeb77b62dc33e4f9558a57</string>
+    <string name="ewieeinfach_referral_link" translatable="false">https://trck.e-wie-einfach.de/trck/eclick/fca74c186b54e7287a62102a13e073be4fc963825b85f7df</string>
+    <string name="eprimo_referral_link" translatable="false">https://netzwerk.uppr.de/trck/eclick/781768d2e779806b5e09229932662c14adddd69323594c52</string>
+    <string name="referral_juicify" translatable="false">Juicify</string>
+    <string name="referral_geldfuereauto" translatable="false">Geld für eAuto</string>
+    <string name="referral_maingau" translatable="false">Maingau</string>
+    <string name="referral_ewieeinfach" translatable="false">E wie einfach</string>
+    <string name="referral_eprimo" translatable="false">eprimo</string>
     <string name="copyright_summary">©2020–2023 Johan von Forstner and contributors</string>
     <string name="acra_backend_url" translatable="false">https://acra.muc.vonforst.net/report</string>
 </resources>

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

@@ -375,4 +375,7 @@
     <string name="status_unknown">Status Unknown</string>
     <string name="status_since">%1$s since %2$s</string>
     <string name="charger_name">Charger name</string>
+    <string name="pref_chargeprice_native_integration">Price comparison within EVMap</string>
+    <string name="pref_chargeprice_native_integration_on">Pricing data will be shown directly in EVMap</string>
+    <string name="pref_chargeprice_native_integration_off">Price comparison button will refer to the Chargeprice app or website</string>
 </resources>

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

@@ -1,6 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto">
+    <CheckBoxPreference
+        android:key="chargeprice_native_integration"
+        android:title="@string/pref_chargeprice_native_integration"
+        android:summaryOn="@string/pref_chargeprice_native_integration_on"
+        android:summaryOff="@string/pref_chargeprice_native_integration_off"
+        app:defaultValue="true" />
     <net.vonforst.evmap.ui.MultiSelectDialogPreference
         android:key="chargeprice_my_vehicle"
         android:title="@string/pref_my_vehicle"

build.gradle.kts

@@ -27,6 +27,9 @@ allprojects {
         mavenCentral()
         //noinspection JcenterRepositoryObsolete
         maven { setUrl("https://jitpack.io") }
+        maven {
+            setUrl("https://raw.githubusercontent.com/ev-map/mapbox-gl-native-android/mvn")
+        }
     }
 }
 

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

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

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

@@ -0,0 +1,6 @@
+Verbesserungen:
+- Option "Sofort navigieren" wird nur angezeigt, wenn kompatible Navigationsapp installiert ist
+
+Fehler behoben:
+- OpenChargeMap: Korrektur des Verhaltens der Kartenmarker bei Filter nach Betreiber
+- Abstürze behoben

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

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

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

@@ -0,0 +1,6 @@
+Improvements:
+- Option "Immediate navigation" will only be shown if compatible navigation app is installed
+
+Bugfixes:
+- OpenChargeMap: Fixed strange map marker behavior when filtering by operator
+- Fixed crashes

gradle.properties

@@ -14,6 +14,5 @@
 kotlin.code.style=official
 org.gradle.jvmargs=-Xmx2048M -Dkotlin.daemon.jvm.options\="-Xmx2048M"
 android.useAndroidX=true
-android.defaults.buildfeatures.buildconfig=true
 android.nonTransitiveRClass=true
 android.nonFinalResIds=true