Release 1.0.0-beta04

if car hardware location is not available

.gitattributes

@@ -0,0 +1,2 @@
+_img/screenshots/**/*.png filter=lfs diff=lfs merge=lfs -text
+fastlane/metadata/android/**/images/**/*.png filter=lfs diff=lfs merge=lfs -text

README.md

@@ -28,7 +28,7 @@ Features
 Screenshots
 -----------
 
-<img src="https://raw.githubusercontent.com/johan12345/EVMap/master/_img/screenshots/phone/01_main.png" width=250 alt="Screenshot 1"/><img src="https://raw.githubusercontent.com/johan12345/EVMap/master/_img/screenshots/phone/02_detail.png" width=250 alt="Screenshot 2"/>
+<img src="https://media.githubusercontent.com/media/johan12345/EVMap/master/_img/screenshots/phone/en/mapbox/01_map.png" width=250 alt="Screenshot 1"/><img src="https://media.githubusercontent.com/media/johan12345/EVMap/master/_img/screenshots/phone/en/mapbox/02_detail.png" width=250 alt="Screenshot 2"/>
 
 Development setup
 -----------------

_img/screenshots/android_auto/de/11_android_auto_map.png

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:0731d286fe0dd41c068cba6b32b55c6560c2ce9e04f89837a91af4fb76c57861
+size 198603

_img/screenshots/android_auto/de/12_android_auto_detail.png

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:63e95826a0206522c83ec61084715866076b19dd6d29812e7b50abb0ca248a58
+size 95959

_img/screenshots/android_auto/de/13_android_auto_prices.png

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:649ec77837aa0322583a83fbd675f62b771032aa3690a7de7bb5e4b4e97da31e
+size 90238

_img/screenshots/android_auto/de/14_vehicle_data.png

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:dc3f077c912439554cd2e5bea86621985c50721aaa7ac445bc7d6cfb5b47bde8
+size 46030

_img/screenshots/android_auto/en/11_android_auto_map.png

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:11de773f36770cbd0249dee34f965d1b6568d53bb73cc8671824be2bc82b294e
+size 248261

_img/screenshots/android_auto/en/12_android_auto_detail.png

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:575eb7389a2334e579457ab3aa939ce300862d4df137384cd68b9d279915930a
+size 91867

_img/screenshots/android_auto/en/13_android_auto_prices.png

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:db0d2ca1156283aa0ae81a958994fe6224d91d8002bf50fbf362bcd56efd56eb
+size 90128

_img/screenshots/android_auto/en/14_vehicle_data.png

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:bb0fe97239d8421babbf81a6828e37f154443c42472465c9e723f38eeff0cc2e
+size 42451

_img/screenshots/phone/de/google/01_map.png

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e3c7ec5fad1b3c9ee419c4fd3f0f3595bfe20f8a169d96e7b1f1305bf3f1e51b
+size 1111142

_img/screenshots/phone/de/google/02_detail.png

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:2b82858437977781d4e33d7943a00f8bb42e5c2198a9d757346eb5bc1dc4aa4e
+size 995603

_img/screenshots/phone/de/google/03_prices.png

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:2d9427caf64d0603f4ab24c90e7fb5469c3af880cb2eeeba2fc572ce5ca8aab7
+size 360777

_img/screenshots/phone/de/google/04_favorites.png

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:1f62adf4c68e939a8963f124c291ec7441ea05aa9b17835226a0a23555cd89ce
+size 83183

_img/screenshots/phone/de/google/05_filters.png

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:6ca6b6505c2b4401dfbca5add2fe6e092e77d917cc6ca1b6264f7b764dd5ff8c
+size 115657

_img/screenshots/phone/de/mapbox/01_map.png

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:4fec0a34114d957c75fe02cb7e972a752c704b41a162fcd61018fb94b2f51499
+size 895589

_img/screenshots/phone/de/mapbox/02_detail.png

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:2d96236006f8a71429080ead33352b51cdc24dac997e13bb21cac9be33c88f01
+size 857431

_img/screenshots/phone/de/mapbox/03_prices.png

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:4f1561eeceaaf11dfc513b3e94fdb87e33363aca6afdff99ed9058bb2549ea59
+size 348799

_img/screenshots/phone/de/mapbox/04_favorites.png

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:94c75119d726f2926f788266e2bf1d2572079cdeb24a7721eec90b38d94b7d57
+size 96031

_img/screenshots/phone/de/mapbox/05_filters.png

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:498c57fade7895b6c714088c489d829d44da75d8f69b8ecab6c8f998f74411b5
+size 137330

_img/screenshots/phone/en/google/01_map.png

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:92778f3df0ba65e46ddc2ea79dff544d45eee3b029d01b519b55a1c29c2cfb6b
+size 1096287

_img/screenshots/phone/en/google/02_detail.png

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:4f68bddaf0d4922934a6c28c8542c9ef4942930fadb0b2d4a70e5a5000b3a66a
+size 995021

_img/screenshots/phone/en/google/03_prices.png

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:bff00f4f84431c9e2d90a123abcc5b25938f188b47d46d07bc7015f622f794f4
+size 351111

_img/screenshots/phone/en/google/04_favorites.png

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:5bfb430a70fd66b2bf71dd48a2ce47419f9b2a269490235f062f6b6ec683bc47
+size 85445

_img/screenshots/phone/en/google/05_filters.png

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:7527bf765e8132223ca35021de4e4f5335fd220726d205da12d667fbd348772c
+size 108988

_img/screenshots/phone/en/mapbox/01_map.png

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:aaa0032bd567bd9f6257bf17ca72915f973d676102c66d532d12309bc901cb5e
+size 884287

_img/screenshots/phone/en/mapbox/02_detail.png

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:170fc47f88b2515f0b7d1c9b8e87c3fb905324ec32f6e25937f2fc241fbe1bbb
+size 857298

_img/screenshots/phone/en/mapbox/03_prices.png

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:aaf780abbad2388002fc9afc9d6b1534061be9a6bab96bd3c166b3317d5332ff
+size 338280

_img/screenshots/phone/en/mapbox/04_favorites.png

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:f5b58726094bb4f0d29229b729a3c369bf9f9b5ad7a9f355dbf20430b656e2ad
+size 97536

_img/screenshots/phone/en/mapbox/05_filters.png

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:3b12d10d0eef40fabc9221bdc45460c7fe607ff9b254e59ecf92123413f3f22c
+size 124451

app/build.gradle

@@ -6,15 +6,15 @@ apply plugin: 'androidx.navigation.safeargs.kotlin'
 apply plugin: 'com.mikepenz.aboutlibraries.plugin'
 
 android {
-    compileSdkVersion 30
+    compileSdkVersion 31
     buildToolsVersion "30.0.3"
 
     defaultConfig {
         applicationId "net.vonforst.evmap"
         minSdkVersion 21
-        targetSdkVersion 30
-        versionCode 57
-        versionName "0.9.1"
+        targetSdkVersion 31
+        versionCode 62
+        versionName "1.0.0-beta04"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
@@ -89,6 +89,9 @@ android {
             variant.resValue "string", "google_maps_key", googleMapsKey
         }
         def mapboxKey = env.MAPBOX_API_KEY ?: project.findProperty("MAPBOX_API_KEY")
+        if (mapboxKey == null && project.hasProperty("MAPBOX_API_KEY_ENCRYPTED")) {
+            mapboxKey = decode(project.findProperty("MAPBOX_API_KEY_ENCRYPTED"), "FmK.d,-f*p+rD+WK!eds")
+        }
         if (mapboxKey != null) {
             variant.resValue "string", "mapbox_key", mapboxKey
         }
@@ -105,15 +108,16 @@ android {
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
-    implementation 'androidx.appcompat:appcompat:1.3.0'
-    implementation 'androidx.core:core-ktx:1.5.0'
-    implementation "androidx.activity:activity-ktx:1.2.3"
-    implementation "androidx.fragment:fragment-ktx:1.3.4"
+    implementation 'androidx.appcompat:appcompat:1.3.1'
+    implementation 'androidx.core:core-ktx:1.6.0'
+    implementation 'androidx.core:core-splashscreen:1.0.0-alpha01'
+    implementation "androidx.activity:activity-ktx:1.3.1"
+    implementation "androidx.fragment:fragment-ktx:1.3.6"
     implementation 'androidx.cardview:cardview:1.0.0'
     implementation 'androidx.preference:preference-ktx:1.1.1'
-    implementation 'com.google.android.material:material:1.3.0'
+    implementation 'com.google.android.material:material:1.4.0'
     implementation 'androidx.constraintlayout:constraintlayout:2.1.0'
-    implementation 'androidx.recyclerview:recyclerview:1.2.0'
+    implementation 'androidx.recyclerview:recyclerview:1.2.1'
     implementation 'androidx.browser:browser:1.3.0'
     implementation 'com.github.johan12345:CustomBottomSheetBehavior:f69f532660'
     implementation 'com.squareup.retrofit2:retrofit:2.9.0'
@@ -128,7 +132,7 @@ dependencies {
     implementation 'com.github.johan12345:StfalconImageViewer:5082ebd392'
     implementation "com.mikepenz:aboutlibraries-core:$about_libs_version"
     implementation "com.mikepenz:aboutlibraries:$about_libs_version"
-    implementation 'com.airbnb.android:lottie:3.4.0'
+    implementation 'com.airbnb.android:lottie:4.1.0'
     implementation 'io.michaelrocks.bimap:bimap:1.1.0'
     implementation 'com.mapzen.android:lost:3.0.2'
     implementation 'com.google.guava:guava:29.0-android'
@@ -136,7 +140,8 @@ dependencies {
     implementation 'com.github.romandanylyk:PageIndicatorView:b1bad589b5'
 
     // Android Auto
-    googleImplementation 'androidx.car.app:app:1.0.0'
+    googleImplementation 'androidx.car.app:app:1.1.0-beta01'
+    googleImplementation 'androidx.car.app:app-projected:1.1.0-beta01'
 
     // AnyMaps
     def anyMapsVersion = '95ddd6c083'
@@ -195,12 +200,12 @@ dependencies {
     // debug tools
     implementation 'com.facebook.stetho:stetho:1.5.1'
     implementation 'com.facebook.stetho:stetho-okhttp3:1.5.1'
-    testImplementation 'junit:junit:4.13'
+    testImplementation 'junit:junit:4.13.1'
     testImplementation "com.squareup.okhttp3:mockwebserver:4.9.0"
     //noinspection GradleDependency
     testImplementation 'org.json:json:20080701'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.2'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
+    androidTestImplementation 'androidx.test.ext:junit:1.1.3'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
 
     kapt "com.squareup.moshi:moshi-kotlin-codegen:1.12.0"
 

app/src/google/AndroidManifest.xml

@@ -5,8 +5,14 @@
 
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
     <uses-permission android:name="androidx.car.app.MAP_TEMPLATES" />
+    <uses-permission android:name="com.google.android.gms.permission.CAR_FUEL" />
+    <uses-permission android:name="com.google.android.gms.permission.CAR_SPEED" />
 
-    <uses-sdk tools:overrideLibrary="androidx.car.app" />
+    <uses-sdk tools:overrideLibrary="androidx.car.app,androidx.car.app.projected" />
+
+    <queries>
+        <package android:name="com.google.android.projection.gearhead" />
+    </queries>
 
     <application>
         <meta-data
@@ -21,6 +27,10 @@
             android:name="androidx.car.app.theme"
             android:resource="@style/CarAppTheme" />
 
+        <meta-data
+            android:name="androidx.car.app.minCarApiLevel"
+            android:value="1" />
+
         <service
             android:name=".auto.CarAppService"
             android:label="@string/app_name"
@@ -36,8 +46,7 @@
         <service
             android:name=".auto.CarLocationService"
             android:foregroundServiceType="location"
-            android:enabled="true" />
-
-        <activity android:name=".auto.PermissionActivity" />
+            android:enabled="true"
+            android:exported="false" />
     </application>
 </manifest>

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

@@ -1,27 +1,28 @@
 package net.vonforst.evmap.auto
 
-import android.Manifest
 import android.content.*
 import android.content.pm.ApplicationInfo
-import android.content.pm.PackageManager
 import android.location.Location
 import android.os.IBinder
+import androidx.car.app.CarContext
 import androidx.car.app.Screen
 import androidx.car.app.Session
-import androidx.car.app.model.*
+import androidx.car.app.hardware.CarHardwareManager
+import androidx.car.app.hardware.info.CarHardwareLocation
+import androidx.car.app.hardware.info.CarSensors
 import androidx.car.app.validation.HostValidator
 import androidx.core.content.ContextCompat
-import androidx.lifecycle.*
+import androidx.lifecycle.Lifecycle
+import androidx.lifecycle.LifecycleObserver
+import androidx.lifecycle.OnLifecycleEvent
 import androidx.localbroadcastmanager.content.LocalBroadcastManager
-import kotlinx.coroutines.*
-import net.vonforst.evmap.*
+import net.vonforst.evmap.utils.checkAnyLocationPermission
 
 
 interface LocationAwareScreen {
     fun updateLocation(location: Location)
 }
 
-@androidx.car.app.annotations.ExperimentalCarApi
 class CarAppService : androidx.car.app.CarAppService() {
     override fun createHostValidator(): HostValidator {
         return if (applicationInfo.flags and ApplicationInfo.FLAG_DEBUGGABLE != 0) {
@@ -38,7 +39,6 @@ class CarAppService : androidx.car.app.CarAppService() {
     }
 }
 
-@androidx.car.app.annotations.ExperimentalCarApi
 class EVMapSession(val cas: CarAppService) : Session(), LifecycleObserver {
     var mapScreen: LocationAwareScreen? = null
         set(value) {
@@ -47,6 +47,9 @@ class EVMapSession(val cas: CarAppService) : Session(), LifecycleObserver {
         }
     private var location: Location? = null
     private var locationService: CarLocationService? = null
+    private val hardwareMan: CarHardwareManager by lazy {
+        carContext.getCarService(CarContext.HARDWARE_SERVICE) as CarHardwareManager
+    }
 
     private val serviceConnection = object : ServiceConnection {
         override fun onServiceConnected(name: ComponentName, ibinder: IBinder) {
@@ -65,33 +68,49 @@ class EVMapSession(val cas: CarAppService) : Session(), LifecycleObserver {
     }
 
     override fun onCreateScreen(intent: Intent): Screen {
-        return if (locationPermissionGranted()) {
-            WelcomeScreen(carContext, this)
-        } else {
-            PermissionScreen(carContext, this)
-        }
+        return WelcomeScreen(carContext, this)
     }
 
-    private fun locationPermissionGranted() =
-        ContextCompat.checkSelfPermission(
-            carContext,
-            Manifest.permission.ACCESS_FINE_LOCATION
-        ) == PackageManager.PERMISSION_GRANTED
+    fun locationPermissionGranted() = carContext.checkAnyLocationPermission()
 
     private val locationReceiver = object : BroadcastReceiver() {
         override fun onReceive(context: Context, intent: Intent) {
             val location = intent.getParcelableExtra(CarLocationService.EXTRA_LOCATION) as Location?
-            val mapScreen = this@EVMapSession.mapScreen
-            if (location != null && mapScreen != null) {
-                mapScreen.updateLocation(location)
-            }
-            this@EVMapSession.location = location
+            updateLocation(location)
+        }
+    }
+
+    private fun updateLocation(location: Location?) {
+        val mapScreen = mapScreen
+        if (location != null && mapScreen != null) {
+            mapScreen.updateLocation(location)
+        }
+        this.location = location
+    }
+
+    private fun onCarHardwareLocationReceived(loc: CarHardwareLocation) {
+        updateLocation(loc.location.value)
+
+        locationService?.let { service ->
+            // we successfully received a location from the car hardware,
+            // so we don't need the smartphone location anymore.
+            service.removeLocationUpdates()
+            cas.unbindService(serviceConnection)
+            locationService = null
         }
     }
 
     @OnLifecycleEvent(Lifecycle.Event.ON_START)
     fun bindLocationService() {
         if (!locationPermissionGranted()) return
+        if (supportsCarApiLevel3(carContext)) {
+            val exec = ContextCompat.getMainExecutor(carContext)
+            hardwareMan.carSensors.addCarHardwareLocationListener(
+                CarSensors.UPDATE_RATE_NORMAL,
+                exec,
+                ::onCarHardwareLocationReceived
+            )
+        }
         cas.bindService(
             Intent(cas, CarLocationService::class.java),
             serviceConnection,
@@ -101,6 +120,9 @@ class EVMapSession(val cas: CarAppService) : Session(), LifecycleObserver {
 
     @OnLifecycleEvent(Lifecycle.Event.ON_STOP)
     private fun unbindLocationService() {
+        if (supportsCarApiLevel3(carContext)) {
+            hardwareMan.carSensors.removeCarHardwareLocationListener(::onCarHardwareLocationReceived)
+        }
         locationService?.let { service ->
             service.removeLocationUpdates()
             cas.unbindService(serviceConnection)

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

@@ -0,0 +1,263 @@
+package net.vonforst.evmap.auto
+
+import android.content.ActivityNotFoundException
+import android.content.Intent
+import android.net.Uri
+import androidx.browser.customtabs.CustomTabColorSchemeParams
+import androidx.browser.customtabs.CustomTabsIntent
+import androidx.car.app.CarContext
+import androidx.car.app.CarToast
+import androidx.car.app.Screen
+import androidx.car.app.hardware.CarHardwareManager
+import androidx.car.app.hardware.info.Model
+import androidx.car.app.model.*
+import androidx.core.content.ContextCompat
+import androidx.core.graphics.drawable.IconCompat
+import androidx.lifecycle.lifecycleScope
+import kotlinx.coroutines.launch
+import moe.banana.jsonapi2.HasOne
+import net.vonforst.evmap.*
+import net.vonforst.evmap.api.chargeprice.*
+import net.vonforst.evmap.model.ChargeLocation
+import net.vonforst.evmap.storage.AppDatabase
+import net.vonforst.evmap.storage.PreferenceDataSource
+import net.vonforst.evmap.ui.currency
+
+class ChargepriceScreen(ctx: CarContext, val charger: ChargeLocation) : Screen(ctx) {
+    private val prefs = PreferenceDataSource(ctx)
+    private val db = AppDatabase.getInstance(carContext)
+    private val api by lazy {
+        ChargepriceApi.create(carContext.getString(R.string.chargeprice_key))
+    }
+    private var prices: List<ChargePrice>? = null
+    private var meta: ChargepriceChargepointMeta? = null
+    private val maxRows = 6
+    private var errorMessage: String? = null
+    private val batteryRange = listOf(20.0, 80.0)
+
+    override fun onGetTemplate(): Template {
+        if (prices == null) loadData()
+
+        return ListTemplate.Builder().apply {
+            setTitle(
+                carContext.getString(
+                    R.string.chargeprice_battery_range,
+                    batteryRange[0],
+                    batteryRange[1]
+                ) + " · " + carContext.getString(R.string.powered_by_chargeprice)
+            )
+            setHeaderAction(Action.BACK)
+            if (prices == null && errorMessage == null) {
+                setLoading(true)
+            } else {
+                setSingleList(ItemList.Builder().apply {
+                    setNoItemsMessage(
+                        errorMessage ?: carContext.getString(R.string.chargeprice_no_tariffs_found)
+                    )
+                    prices?.take(maxRows)?.forEach { price ->
+                        addItem(Row.Builder().apply {
+                            setTitle(formatProvider(price))
+                            addText(formatPrice(price))
+                        }.build())
+                    }
+                }.build())
+            }
+            setActionStrip(
+                ActionStrip.Builder().addAction(
+                    Action.Builder().setIcon(
+                        CarIcon.Builder(
+                            IconCompat.createWithResource(
+                                carContext,
+                                R.drawable.ic_chargeprice
+                            )
+                        ).build()
+                    ).setOnClickListener {
+                        val intent = CustomTabsIntent.Builder()
+                            .setDefaultColorSchemeParams(
+                                CustomTabColorSchemeParams.Builder()
+                                    .setToolbarColor(
+                                        ContextCompat.getColor(
+                                            carContext,
+                                            R.color.colorPrimary
+                                        )
+                                    )
+                                    .build()
+                            )
+                            .build().intent
+                        intent.data =
+                            Uri.parse("https://www.chargeprice.app/?poi_id=${charger.id}&poi_source=${getDataAdapter()}")
+                        intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+                        try {
+                            carContext.startActivity(intent)
+                            CarToast.makeText(
+                                carContext,
+                                R.string.opened_on_phone,
+                                CarToast.LENGTH_LONG
+                            ).show()
+                        } catch (e: ActivityNotFoundException) {
+                            CarToast.makeText(
+                                carContext,
+                                R.string.no_browser_app_found,
+                                CarToast.LENGTH_LONG
+                            ).show()
+                        }
+                    }.build()
+                ).build()
+            )
+        }.build()
+    }
+
+    private fun formatProvider(price: ChargePrice): String {
+        if (!price.tariffName.startsWith(price.provider)) {
+            return price.provider + " " + price.tariffName
+        } else {
+            return price.tariffName
+        }
+    }
+
+    private fun formatPrice(price: ChargePrice): String {
+        val totalPrice = carContext.getString(
+            R.string.charge_price_format,
+            price.chargepointPrices.first().price,
+            currency(price.currency)
+        )
+        val kwhPrice = if (price.chargepointPrices.first().price > 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,
+                currency(price.currency)
+            )
+        } else null
+        val monthlyFees = if (price.totalMonthlyFee > 0 || price.monthlyMinSales > 0) {
+            price.formatMonthlyFees(carContext)
+        } else null
+        var text = totalPrice
+        if (kwhPrice != null && monthlyFees != null) {
+            text += " ($kwhPrice, $monthlyFees)"
+        } else if (kwhPrice != null) {
+            text += " ($kwhPrice)"
+        } else if (monthlyFees != null) {
+            text += " ($monthlyFees)"
+        }
+        return text
+    }
+
+    private fun loadData() {
+        if (supportsCarApiLevel3(carContext)) {
+            val exec = ContextCompat.getMainExecutor(carContext)
+            val hardwareMan =
+                carContext.getCarService(CarContext.HARDWARE_SERVICE) as CarHardwareManager
+            hardwareMan.carInfo.fetchModel(exec) { model ->
+                loadPrices(model)
+            }
+        } else {
+            loadPrices(null)
+        }
+    }
+
+    private fun loadPrices(model: Model?) {
+        val dataAdapter = getDataAdapter() ?: return
+        val manufacturer = model?.manufacturer?.value
+        val modelName = model?.name?.value
+        lifecycleScope.launch {
+            var vehicles = api.getVehicles().filter {
+                it.id in prefs.chargepriceMyVehicles
+            }
+            if (vehicles.isEmpty()) {
+                errorMessage = carContext.getString(R.string.chargeprice_select_car_first)
+                invalidate()
+                return@launch
+            } else if (vehicles.size > 1) {
+                if (manufacturer != null && modelName != null) {
+                    vehicles = vehicles.filter {
+                        it.brand == manufacturer && it.name.startsWith(modelName)
+                    }
+                    if (vehicles.isEmpty()) {
+                        errorMessage = carContext.getString(
+                            R.string.auto_chargeprice_vehicle_unknown,
+                            manufacturer,
+                            modelName
+                        )
+                        invalidate()
+                        return@launch
+                    } else if (vehicles.size > 1) {
+                        errorMessage = carContext.getString(
+                            R.string.auto_chargeprice_vehicle_ambiguous,
+                            manufacturer,
+                            modelName
+                        )
+                        invalidate()
+                        return@launch
+                    }
+                } else {
+                    errorMessage =
+                        carContext.getString(R.string.auto_chargeprice_vehicle_unavailable)
+                    invalidate()
+                    return@launch
+                }
+            }
+            val car = vehicles[0]
+
+            val cpStation = ChargepriceStation.fromEvmap(charger, car.compatibleEvmapConnectors)
+            val result = api.getChargePrices(ChargepriceRequest().apply {
+                this.dataAdapter = dataAdapter
+                station = cpStation
+                vehicle = HasOne(car)
+                options = ChargepriceOptions(
+                    batteryRange = batteryRange,
+                    providerCustomerTariffs = prefs.chargepriceShowProviderCustomerTariffs,
+                    maxMonthlyFees = if (prefs.chargepriceNoBaseFee) 0.0 else null,
+                    currency = prefs.chargepriceCurrency
+                )
+            }, ChargepriceApi.getChargepriceLanguage())
+
+            val myTariffs = prefs.chargepriceMyTariffs
+
+            // choose the highest power chargepoint compatible with the car
+            val chargepoint = cpStation.chargePoints.filterIndexed { i, cp ->
+                charger.chargepointsMerged[i].type in car.compatibleEvmapConnectors
+            }.maxByOrNull { it.power }
+            if (chargepoint == null) {
+                errorMessage = carContext.getString(R.string.chargeprice_no_compatible_connectors)
+                invalidate()
+                return@launch
+            }
+            meta =
+                (result.meta.get<ChargepriceMeta>(ChargepriceApi.moshi.adapter(ChargepriceMeta::class.java)) as ChargepriceMeta).chargePoints.filterIndexed { i, cp ->
+                    charger.chargepointsMerged[i].type in car.compatibleEvmapConnectors
+                }.maxByOrNull {
+                    it.power
+                }
+
+            prices = result.map { cp ->
+                val filteredPrices =
+                    cp.chargepointPrices.filter {
+                        it.plug == chargepoint.plug && it.power == chargepoint.power
+                    }
+                if (filteredPrices.isEmpty()) {
+                    null
+                } else {
+                    cp.clone().apply {
+                        chargepointPrices = filteredPrices
+                    }
+                }
+            }.filterNotNull()
+                .sortedBy { it.chargepointPrices.first().price }
+                .sortedByDescending {
+                    prefs.chargepriceMyTariffsAll ||
+                            myTariffs != null && it.tariff?.get()?.id in myTariffs
+                }
+            invalidate()
+        }
+    }
+
+    private fun getDataAdapter(): String? = when (charger.dataSource) {
+        "goingelectric" -> ChargepriceApi.DATA_SOURCE_GOINGELECTRIC
+        "openchargemap" -> ChargepriceApi.DATA_SOURCE_OPENCHARGEMAP
+        else -> null
+    }
+}

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

@@ -20,6 +20,7 @@ import kotlinx.coroutines.withContext
 import net.vonforst.evmap.*
 import net.vonforst.evmap.api.availability.ChargeLocationStatus
 import net.vonforst.evmap.api.availability.getAvailability
+import net.vonforst.evmap.api.chargeprice.ChargepriceApi
 import net.vonforst.evmap.api.createApi
 import net.vonforst.evmap.api.nameForPlugType
 import net.vonforst.evmap.api.stringProvider
@@ -48,7 +49,10 @@ class ChargerDetailScreen(ctx: CarContext, val chargerSparse: ChargeLocation) :
     }
     private val referenceData = api.getReferenceData(lifecycleScope, carContext)
 
-    private val iconGen = ChargerIconGenerator(carContext, null, oversize = 1.4f, height = 64)
+    private val imageSize = 128  // images should be 128dp according to docs
+
+    private val iconGen =
+        ChargerIconGenerator(carContext, null, oversize = 1.4f, height = imageSize)
 
     init {
         referenceData.observe(this) {
@@ -147,29 +151,49 @@ class ChargerDetailScreen(ctx: CarContext, val chargerSparse: ChargeLocation) :
                             navigateToCharger(charger)
                         }
                         .build())
-                    addAction(
-                        Action.Builder()
-                            .setTitle(carContext.getString(R.string.open_in_app))
-                            .setOnClickListener(ParkedOnlyOnClickListener.create {
-                                val intent = Intent(carContext, MapsActivity::class.java)
-                                    .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
-                                    .putExtra(EXTRA_CHARGER_ID, charger.id)
-                                    .putExtra(EXTRA_LAT, charger.coordinates.lat)
-                                    .putExtra(EXTRA_LON, charger.coordinates.lng)
-                                carContext.startActivity(intent)
-                                CarToast.makeText(
-                                    carContext,
-                                    R.string.opened_on_phone,
-                                    CarToast.LENGTH_LONG
-                                ).show()
-                            })
-                            .build()
-                    )
+                    charger.chargepriceData?.country?.let { country ->
+                        if (ChargepriceApi.isCountrySupported(country, charger.dataSource)) {
+                            addAction(Action.Builder()
+                                .setIcon(
+                                    CarIcon.Builder(
+                                        IconCompat.createWithResource(
+                                            carContext,
+                                            R.drawable.ic_chargeprice
+                                        )
+                                    ).build()
+                                )
+                                .setTitle(carContext.getString(R.string.auto_prices))
+                                .setOnClickListener {
+                                    screenManager.push(ChargepriceScreen(carContext, charger))
+                                }
+                                .build())
+                        }
+                    }
                 } ?: setLoading(true)
             }.build()
         ).apply {
             setTitle(chargerSparse.name)
             setHeaderAction(Action.BACK)
+            setActionStrip(
+                ActionStrip.Builder().addAction(
+                    Action.Builder()
+                        .setTitle(carContext.getString(R.string.open_in_app))
+                        .setOnClickListener(ParkedOnlyOnClickListener.create {
+                            val intent = Intent(carContext, MapsActivity::class.java)
+                                .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+                                .putExtra(EXTRA_CHARGER_ID, chargerSparse.id)
+                                .putExtra(EXTRA_LAT, chargerSparse.coordinates.lat)
+                                .putExtra(EXTRA_LON, chargerSparse.coordinates.lng)
+                            carContext.startActivity(intent)
+                            CarToast.makeText(
+                                carContext,
+                                R.string.opened_on_phone,
+                                CarToast.LENGTH_LONG
+                            ).show()
+                        })
+                        .build()
+                ).build()
+            )
         }.build()
     }
 

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

@@ -26,15 +26,11 @@ class FilterScreen(ctx: CarContext) : Screen(ctx) {
 
     init {
         val size = (ctx.resources.displayMetrics.density * 24).roundToInt()
-        emptyIcon = CarIcon.Builder(
-            IconCompat.createWithBitmap(
-                Bitmap.createBitmap(
-                    size,
-                    size,
-                    Bitmap.Config.ARGB_8888
-                )
-            )
-        ).build()
+        emptyIcon = Bitmap.createBitmap(
+            size,
+            size,
+            Bitmap.Config.ARGB_8888
+        ).asCarIcon()
     }
 
     init {
@@ -72,7 +68,9 @@ class FilterScreen(ctx: CarContext) : Screen(ctx) {
             }.build())
             profiles.forEach {
                 addItem(Row.Builder().apply {
-                    setTitle(it.name)
+                    val name =
+                        it.name.ifEmpty { carContext.getString(R.string.unnamed_filter_profile) }
+                    setTitle(name)
                     if (it.id == filterStatus) {
                         setImage(checkIcon)
                     } else {

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

@@ -6,6 +6,7 @@ import android.text.Spanned
 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.core.content.ContextCompat
 import androidx.core.graphics.drawable.IconCompat
@@ -39,12 +40,15 @@ import kotlin.math.roundToInt
 /**
  * Main map screen showing either nearby chargers or favorites
  */
-@androidx.car.app.annotations.ExperimentalCarApi
 class MapScreen(ctx: CarContext, val session: EVMapSession, val favorites: Boolean = false) :
     Screen(ctx), LocationAwareScreen {
     private var updateCoroutine: Job? = null
     private var numUpdates = 0
-    private val maxNumUpdates = 3
+
+    /* Updating map contents is disabled - if the user uses Chargeprice from the charger
+       detail screen, this already means 4 steps, after which the app would crash.
+       follow https://issuetracker.google.com/issues/176694222 for updates how to solve this. */
+    private val maxNumUpdates = 1
 
     private var location: Location? = null
     private var lastUpdateLocation: Location? = null
@@ -59,7 +63,9 @@ class MapScreen(ctx: CarContext, val session: EVMapSession, val favorites: Boole
     private val availabilityUpdateThreshold = Duration.ofMinutes(1)
     private var availabilities: MutableMap<Long, Pair<ZonedDateTime, ChargeLocationStatus>> =
         HashMap()
-    private val maxRows = 6
+    private val maxRows = if (ctx.carAppApiLevel >= 2) {
+        ctx.constraintManager.getContentLimit(ConstraintManager.CONTENT_LIMIT_TYPE_PLACE_LIST)
+    } else 6
 
     private val referenceData = api.getReferenceData(lifecycleScope, carContext)
     private val filterStatus = MutableLiveData<Long>().apply {
@@ -214,6 +220,11 @@ class MapScreen(ctx: CarContext, val session: EVMapSession, val favorites: Boole
     }
 
     override fun updateLocation(location: Location) {
+        if (location.latitude == this.location?.latitude
+            && location.longitude == this.location?.longitude
+        ) {
+            return
+        }
         this.location = location
         if (updateCoroutine != null) {
             // don't update while still loading last update
@@ -239,8 +250,8 @@ class MapScreen(ctx: CarContext, val session: EVMapSession, val favorites: Boole
         numUpdates++
         println(numUpdates)
         if (numUpdates > maxNumUpdates) {
-            CarToast.makeText(carContext, R.string.auto_no_refresh_possible, CarToast.LENGTH_LONG)
-                .show()
+            /*CarToast.makeText(carContext, R.string.auto_no_refresh_possible, CarToast.LENGTH_LONG)
+                .show()*/
             return
         }
         updateCoroutine = lifecycleScope.launch {
@@ -263,7 +274,7 @@ class MapScreen(ctx: CarContext, val session: EVMapSession, val favorites: Boole
                     )
                     chargers = response.data?.filterIsInstance(ChargeLocation::class.java)
                     chargers?.let {
-                        if (it.size < 6) {
+                        if (it.size < maxRows) {
                             // try again with larger radius
                             val response = api.getChargepointsRadius(
                                 referenceData,

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

@@ -1,72 +0,0 @@
-package net.vonforst.evmap.auto
-
-import android.Manifest
-import android.app.Activity
-import android.content.pm.PackageManager
-import android.os.Bundle
-import android.os.ResultReceiver
-import androidx.core.app.ActivityCompat
-import androidx.core.content.ContextCompat
-
-
-class PermissionActivity : Activity() {
-    companion object {
-        const val EXTRA_RESULT_RECEIVER = "result_receiver";
-        const val RESULT_GRANTED = "granted"
-    }
-
-    private lateinit var resultReceiver: ResultReceiver
-    private val permissions = arrayOf(Manifest.permission.ACCESS_FINE_LOCATION)
-    private val requestCode = 1
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        if (intent != null) {
-            resultReceiver = intent.getParcelableExtra(EXTRA_RESULT_RECEIVER)!!
-            if (!hasPermissions(permissions)) {
-                ActivityCompat.requestPermissions(this, permissions, requestCode)
-            } else {
-                onComplete(
-                    requestCode,
-                    permissions,
-                    intArrayOf(PackageManager.PERMISSION_GRANTED)
-                )
-            }
-        } else {
-            finish()
-        }
-    }
-
-    private fun onComplete(requestCode: Int, permissions: Array<String>?, grantResults: IntArray) {
-        val bundle = Bundle()
-        bundle.putBoolean(
-            RESULT_GRANTED,
-            grantResults.all { it == PackageManager.PERMISSION_GRANTED })
-        resultReceiver.send(requestCode, bundle)
-        finish()
-    }
-
-    private fun hasPermissions(permissions: Array<String>): Boolean {
-        var result = true
-        for (permission in permissions) {
-            if (ContextCompat.checkSelfPermission(
-                    this,
-                    permission
-                ) != PackageManager.PERMISSION_GRANTED
-            ) {
-                result = false
-                break
-            }
-        }
-        return result
-    }
-
-    override fun onRequestPermissionsResult(
-        requestCode: Int,
-        permissions: Array<String>,
-        grantResults: IntArray
-    ) {
-        super.onRequestPermissionsResult(requestCode, permissions, grantResults)
-        onComplete(requestCode, permissions, grantResults)
-    }
-}

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

@@ -1,21 +1,21 @@
 package net.vonforst.evmap.auto
 
-import android.content.Intent
-import android.os.Bundle
-import android.os.ResultReceiver
+import androidx.annotation.StringRes
 import androidx.car.app.CarContext
-import androidx.car.app.CarToast
 import androidx.car.app.Screen
 import androidx.car.app.model.*
 import net.vonforst.evmap.R
 
 /**
- * Screen to grant location permission
+ * Screen to grant permission
  */
-@androidx.car.app.annotations.ExperimentalCarApi
-class PermissionScreen(ctx: CarContext, val session: EVMapSession) : Screen(ctx) {
+class PermissionScreen(
+    ctx: CarContext,
+    @StringRes val message: Int,
+    val permissions: List<String>
+) : Screen(ctx) {
     override fun onGetTemplate(): Template {
-        return MessageTemplate.Builder(carContext.getString(R.string.auto_location_permission_needed))
+        return MessageTemplate.Builder(carContext.getString(message))
             .setTitle(carContext.getString(R.string.app_name))
             .setHeaderAction(Action.APP_ICON)
             .addAction(
@@ -23,32 +23,7 @@ class PermissionScreen(ctx: CarContext, val session: EVMapSession) : Screen(ctx)
                     .setTitle(carContext.getString(R.string.grant_on_phone))
                     .setBackgroundColor(CarColor.PRIMARY)
                     .setOnClickListener(ParkedOnlyOnClickListener.create {
-                        val intent = Intent(carContext, PermissionActivity::class.java)
-                            .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
-                            .putExtra(
-                                PermissionActivity.EXTRA_RESULT_RECEIVER,
-                                object : ResultReceiver(null) {
-                                    override fun onReceiveResult(
-                                        resultCode: Int,
-                                        resultData: Bundle?
-                                    ) {
-                                        if (resultData!!.getBoolean(PermissionActivity.RESULT_GRANTED)) {
-                                            session.bindLocationService()
-                                            screenManager.push(
-                                                WelcomeScreen(
-                                                    carContext,
-                                                    session
-                                                )
-                                            )
-                                        }
-                                    }
-                                })
-                        carContext.startActivity(intent)
-                        CarToast.makeText(
-                            carContext,
-                            R.string.opened_on_phone,
-                            CarToast.LENGTH_LONG
-                        ).show()
+                        requestPermissions()
                     })
                     .build()
             )
@@ -62,4 +37,14 @@ class PermissionScreen(ctx: CarContext, val session: EVMapSession) : Screen(ctx)
             )
             .build()
     }
+
+    private fun requestPermissions() {
+        carContext.requestPermissions(permissions) { granted, rejected ->
+            if (granted.containsAll(permissions)) {
+                screenManager.pop()
+            } else {
+                requestPermissions()
+            }
+        }
+    }
 }

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

@@ -1,7 +1,16 @@
 package net.vonforst.evmap.auto
 
+import android.content.Context
+import android.graphics.Bitmap
+import androidx.car.app.CarContext
+import androidx.car.app.constraints.ConstraintManager
+import androidx.car.app.hardware.common.CarUnit
 import androidx.car.app.model.CarColor
+import androidx.car.app.model.CarIcon
+import androidx.car.app.versioning.CarAppApiLevels
+import androidx.core.graphics.drawable.IconCompat
 import net.vonforst.evmap.api.availability.ChargepointStatus
+import java.util.*
 
 fun carAvailabilityColor(status: List<ChargepointStatus>): CarColor {
     val unknown = status.any { it == ChargepointStatus.UNKNOWN }
@@ -17,4 +26,68 @@ fun carAvailabilityColor(status: List<ChargepointStatus>): CarColor {
     } else {
         CarColor.BLUE
     }
+}
+
+val CarContext.constraintManager
+    get() = getCarService(CarContext.CONSTRAINT_SERVICE) as ConstraintManager
+
+fun Bitmap.asCarIcon(): CarIcon = CarIcon.Builder(IconCompat.createWithBitmap(this)).build()
+
+private const val kmPerMile = 1.609344
+
+fun getDefaultDistanceUnit(): Int {
+    return when (Locale.getDefault().country) {
+        "US", "GB", "MM", "LR" -> CarUnit.MILE
+        else -> CarUnit.KILOMETER
+    }
+}
+
+fun getDefaultSpeedUnit(): Int {
+    return when (Locale.getDefault().country) {
+        "US", "GB", "MM", "LR" -> CarUnit.MILES_PER_HOUR
+        else -> CarUnit.KILOMETERS_PER_HOUR
+    }
+}
+
+fun formatCarUnitDistance(value: Float?, unit: Int?): String {
+    if (value == null) return ""
+    return when (unit ?: getDefaultDistanceUnit()) {
+        // distance units: base unit is meters
+        CarUnit.METER -> "%.0f m".format(value)
+        CarUnit.KILOMETER -> "%.1f km".format(value / 1000)
+        CarUnit.MILLIMETER -> "%.0f mm".format(value * 1000) // whoever uses that...
+        CarUnit.MILE -> "%.1f mi".format(value / 1000 / kmPerMile)
+        else -> ""
+    }
+}
+
+fun formatCarUnitSpeed(value: Float?, unit: Int?): String {
+    if (value == null) return ""
+    return when (unit ?: getDefaultSpeedUnit()) {
+        // speed units: base unit is meters per second
+        CarUnit.METERS_PER_SEC -> "%.0f m/s".format(value)
+        CarUnit.KILOMETERS_PER_HOUR -> "%.0f km/h".format(value * 3.6)
+        CarUnit.MILES_PER_HOUR -> "%.0f mph".format(value * 3.6 / kmPerMile)
+        else -> ""
+    }
+}
+
+fun getAndroidAutoVersion(ctx: Context): List<String> {
+    val info = ctx.packageManager.getPackageInfo("com.google.android.projection.gearhead", 0)
+    return info.versionName.split(".")
+}
+
+fun supportsCarApiLevel3(ctx: CarContext): Boolean {
+    if (ctx.carAppApiLevel < CarAppApiLevels.LEVEL_3) return false
+    ctx.hostInfo?.let { hostInfo ->
+        if (hostInfo.packageName == "com.google.android.projection.gearhead") {
+            val version = getAndroidAutoVersion(ctx)
+            // Android Auto 6.7 is required. 6.6 reports supporting API Level 3,
+            // but crashes when using it. See: https://issuetracker.google.com/issues/199509584
+            if (version[0] < "6" || version[0] == "6" && version[1] < "7") {
+                return false
+            }
+        }
+    }
+    return true
 }

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

@@ -0,0 +1,215 @@
+package net.vonforst.evmap.auto
+
+import android.content.pm.PackageManager
+import android.os.Handler
+import android.os.Looper
+import androidx.car.app.CarContext
+import androidx.car.app.Screen
+import androidx.car.app.hardware.CarHardwareManager
+import androidx.car.app.hardware.info.EnergyLevel
+import androidx.car.app.hardware.info.Model
+import androidx.car.app.hardware.info.Speed
+import androidx.car.app.model.*
+import androidx.core.content.ContextCompat
+import androidx.core.graphics.drawable.IconCompat
+import androidx.lifecycle.Lifecycle
+import androidx.lifecycle.LifecycleObserver
+import androidx.lifecycle.OnLifecycleEvent
+import net.vonforst.evmap.R
+import net.vonforst.evmap.ui.Gauge
+import kotlin.math.min
+import kotlin.math.roundToInt
+
+class VehicleDataScreen(ctx: CarContext) : Screen(ctx), LifecycleObserver {
+    private val hardwareMan = ctx.getCarService(CarContext.HARDWARE_SERVICE) as CarHardwareManager
+    private var model: Model? = null
+    private var energyLevel: EnergyLevel? = null
+    private var speed: Speed? = null
+    private var gauge = Gauge((ctx.resources.displayMetrics.density * 128).roundToInt(), ctx)
+    private val maxSpeed = 160f / 3.6f // m/s, speed gauge will show max if speed is higher
+
+    private val permissions = listOf(
+        "com.google.android.gms.permission.CAR_FUEL",
+        "com.google.android.gms.permission.CAR_SPEED"
+    )
+
+    init {
+        lifecycle.addObserver(this)
+    }
+
+    override fun onGetTemplate(): Template {
+        if (!permissionsGranted()) {
+            Handler(Looper.getMainLooper()).post {
+                screenManager.pushForResult(
+                    PermissionScreen(
+                        carContext,
+                        R.string.auto_vehicle_data_permission_needed,
+                        permissions
+                    )
+                ) {
+                    setupListeners()
+                }
+            }
+        }
+
+        val energyLevel = energyLevel
+        val model = model
+        val speed = speed
+
+        return GridTemplate.Builder().apply {
+            setTitle(
+                if (model != null && model.manufacturer.value != null && model.name.value != null) {
+                    "${model.manufacturer.value} ${model.name.value}"
+                } else {
+                    carContext.getString(R.string.auto_vehicle_data)
+                }
+            )
+            setHeaderAction(Action.BACK)
+            if (!permissionsGranted()) {
+                setLoading(true)
+            } else {
+                setSingleList(
+                    ItemList.Builder().apply {
+                        addItem(GridItem.Builder().apply {
+                            setTitle(carContext.getString(R.string.auto_charging_level))
+                            if (energyLevel == null) {
+                                setLoading(true)
+                            } else if (energyLevel.batteryPercent.value != null && energyLevel.fuelPercent.value != null) {
+                                // both battery and fuel (Plug-in hybrid)
+                                setText(
+                                    "\uD83D\uDD0C %.0f %% ⛽ %.0f %%".format(
+                                        energyLevel.batteryPercent.value,
+                                        energyLevel.fuelPercent.value
+                                    )
+                                )
+                                setImage(
+                                    gauge.draw(
+                                        energyLevel.batteryPercent.value,
+                                        energyLevel.fuelPercent.value
+                                    ).asCarIcon()
+                                )
+                            } else if (energyLevel.batteryPercent.value != null) {
+                                // BEV
+                                setText("%.0f %%".format(energyLevel.batteryPercent.value))
+                                setImage(gauge.draw(energyLevel.batteryPercent.value).asCarIcon())
+                            } else if (energyLevel.fuelPercent.value != null) {
+                                // ICE
+                                setText("⛽ %.0f %%".format(energyLevel.fuelPercent.value))
+                                setImage(gauge.draw(energyLevel.fuelPercent.value).asCarIcon())
+                            } else {
+                                setText(carContext.getString(R.string.auto_no_data))
+                                setImage(gauge.draw(0f).asCarIcon())
+                            }
+                        }.build())
+                        addItem(GridItem.Builder().apply {
+                            setTitle(carContext.getString(R.string.auto_range))
+                            if (energyLevel == null) {
+                                setLoading(true)
+                            } else if (energyLevel.rangeRemainingMeters.value != null) {
+                                setText(
+                                    formatCarUnitDistance(
+                                        energyLevel.rangeRemainingMeters.value,
+                                        energyLevel.distanceDisplayUnit.value
+                                    )
+                                )
+                                setImage(
+                                    CarIcon.Builder(
+                                        IconCompat.createWithResource(
+                                            carContext,
+                                            R.drawable.ic_car
+                                        )
+                                    ).build()
+                                )
+                            } else {
+                                setText(carContext.getString(R.string.auto_no_data))
+                                setImage(
+                                    CarIcon.Builder(
+                                        IconCompat.createWithResource(
+                                            carContext,
+                                            R.drawable.ic_car
+                                        )
+                                    ).build()
+                                )
+                            }
+                        }.build())
+                        addItem(GridItem.Builder().apply {
+                            setTitle(carContext.getString(R.string.auto_speed))
+                            if (speed == null) {
+                                setLoading(true)
+                            } else {
+                                val rawSpeed = speed.rawSpeedMetersPerSecond.value
+                                val displaySpeed = speed.displaySpeedMetersPerSecond.value
+                                if (rawSpeed != null) {
+                                    setText(
+                                        formatCarUnitSpeed(
+                                            rawSpeed,
+                                            speed.speedDisplayUnit.value
+                                        )
+                                    )
+                                    setImage(
+                                        gauge.draw(min(rawSpeed / maxSpeed * 100, 100f)).asCarIcon()
+                                    )
+                                } else if (displaySpeed != null) {
+                                    setText(
+                                        formatCarUnitSpeed(
+                                            speed.displaySpeedMetersPerSecond.value,
+                                            speed.speedDisplayUnit.value
+                                        )
+                                    )
+                                    setImage(
+                                        gauge.draw(min(displaySpeed / maxSpeed * 100, 100f))
+                                            .asCarIcon()
+                                    )
+                                } else {
+                                    setText(carContext.getString(R.string.auto_no_data))
+                                    setImage(gauge.draw(0f).asCarIcon())
+                                }
+                            }
+                        }.build())
+                    }.build()
+                )
+            }
+        }.build()
+    }
+
+    private fun onEnergyLevelUpdated(energyLevel: EnergyLevel) {
+        this.energyLevel = energyLevel
+        invalidate()
+    }
+
+    private fun onSpeedUpdated(speed: Speed) {
+        this.speed = speed
+        invalidate()
+    }
+
+    @OnLifecycleEvent(Lifecycle.Event.ON_RESUME)
+    private fun setupListeners() {
+        if (!permissionsGranted()) return
+
+        println("Setting up energy level listener")
+
+        val exec = ContextCompat.getMainExecutor(carContext)
+        hardwareMan.carInfo.addEnergyLevelListener(exec, ::onEnergyLevelUpdated)
+        hardwareMan.carInfo.addSpeedListener(exec, ::onSpeedUpdated)
+
+        hardwareMan.carInfo.fetchModel(exec) {
+            this.model = it
+            invalidate()
+        }
+    }
+
+    @OnLifecycleEvent(Lifecycle.Event.ON_PAUSE)
+    private fun removeListeners() {
+        println("Removing energy level listener")
+        hardwareMan.carInfo.removeEnergyLevelListener(::onEnergyLevelUpdated)
+        hardwareMan.carInfo.removeSpeedListener(::onSpeedUpdated)
+    }
+
+    private fun permissionsGranted(): Boolean =
+        permissions.all {
+            ContextCompat.checkSelfPermission(
+                carContext,
+                it
+            ) == PackageManager.PERMISSION_GRANTED
+        }
+}

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

@@ -1,6 +1,9 @@
 package net.vonforst.evmap.auto
 
+import android.Manifest
 import android.location.Location
+import android.os.Handler
+import android.os.Looper
 import androidx.car.app.CarContext
 import androidx.car.app.Screen
 import androidx.car.app.model.*
@@ -10,60 +13,108 @@ import net.vonforst.evmap.R
 /**
  * Welcome screen with selection between favorites and nearby chargers
  */
-@androidx.car.app.annotations.ExperimentalCarApi
 class WelcomeScreen(ctx: CarContext, val session: EVMapSession) : Screen(ctx), LocationAwareScreen {
     private var location: Location? = null
 
     override fun onGetTemplate(): Template {
+        if (!session.locationPermissionGranted()) {
+            Handler(Looper.getMainLooper()).post {
+                screenManager.pushForResult(
+                    PermissionScreen(
+                        carContext,
+                        R.string.auto_location_permission_needed,
+                        listOf(
+                            Manifest.permission.ACCESS_FINE_LOCATION,
+                            Manifest.permission.ACCESS_COARSE_LOCATION
+                        )
+                    )
+                ) {
+                    session.bindLocationService()
+                }
+            }
+        }
+
         session.mapScreen = this
         return PlaceListMapTemplate.Builder().apply {
             setTitle(carContext.getString(R.string.app_name))
-            location?.let {
-                setAnchor(Place.Builder(CarLocation.create(it)).build())
-            }
-            setItemList(ItemList.Builder().apply {
-                addItem(
-                    Row.Builder()
-                    .setTitle(carContext.getString(R.string.auto_chargers_closeby))
-                    .setImage(
-                        CarIcon.Builder(
-                            IconCompat.createWithResource(
-                                carContext,
-                                R.drawable.ic_address
-                            )
-                        )
-                            .setTint(CarColor.DEFAULT).build()
-                    )
-                    .setBrowsable(true)
-                    .setOnClickListener {
-                        screenManager.push(MapScreen(carContext, session, favorites = false))
-                    }
-                    .build())
-                addItem(
-                    Row.Builder()
-                        .setTitle(carContext.getString(R.string.auto_favorites))
-                        .setImage(
-                            CarIcon.Builder(
-                                IconCompat.createWithResource(
-                                    carContext,
-                                    R.drawable.ic_fav
+            if (!session.locationPermissionGranted()) {
+                setLoading(true)
+            } else {
+                location?.let {
+                    setAnchor(Place.Builder(CarLocation.create(it)).build())
+                }
+                setItemList(ItemList.Builder().apply {
+                    addItem(
+                        Row.Builder()
+                            .setTitle(carContext.getString(R.string.auto_chargers_closeby))
+                            .setImage(
+                                CarIcon.Builder(
+                                    IconCompat.createWithResource(
+                                        carContext,
+                                        R.drawable.ic_address
+                                    )
                                 )
+                                    .setTint(CarColor.DEFAULT).build()
                             )
-                                .setTint(CarColor.DEFAULT).build()
+                            .setBrowsable(true)
+                            .setOnClickListener {
+                                screenManager.push(
+                                    MapScreen(
+                                        carContext,
+                                        session,
+                                        favorites = false
+                                    )
+                                )
+                            }
+                            .build())
+                    addItem(
+                        Row.Builder()
+                            .setTitle(carContext.getString(R.string.auto_favorites))
+                            .setImage(
+                                CarIcon.Builder(
+                                    IconCompat.createWithResource(
+                                        carContext,
+                                        R.drawable.ic_fav
+                                    )
+                                )
+                                    .setTint(CarColor.DEFAULT).build()
+                            )
+                            .setBrowsable(true)
+                            .setOnClickListener {
+                                screenManager.push(MapScreen(carContext, session, favorites = true))
+                            }
+                            .build())
+                    if (supportsCarApiLevel3(carContext)) {
+                        addItem(
+                            Row.Builder()
+                                .setTitle(carContext.getString(R.string.auto_vehicle_data))
+                                .setImage(
+                                    CarIcon.Builder(
+                                        IconCompat.createWithResource(carContext, R.drawable.ic_car)
+                                    ).setTint(CarColor.DEFAULT).build()
+                                )
+                                .setBrowsable(true)
+                                .setOnClickListener {
+                                    session.mapScreen = null
+                                    screenManager.push(VehicleDataScreen(carContext))
+                                }
+                                .build()
                         )
-                        .setBrowsable(true)
-                        .setOnClickListener {
-                            screenManager.push(MapScreen(carContext, session, favorites = true))
-                        }
-                        .build())
-            }.build())
-            setCurrentLocationEnabled(true)
+                    }
+                }.build())
+                setCurrentLocationEnabled(true)
+            }
             setHeaderAction(Action.APP_ICON)
             build()
         }.build()
     }
 
     override fun updateLocation(location: Location) {
+        if (location.latitude == this.location?.latitude
+            && location.longitude == this.location?.longitude
+        ) {
+            return
+        }
         this.location = location
         invalidate()
     }

app/src/google/java/net/vonforst/evmap/ui/Gauge.kt

@@ -0,0 +1,74 @@
+package net.vonforst.evmap.ui
+
+import android.content.Context
+import android.graphics.*
+import androidx.annotation.ColorInt
+import androidx.core.content.ContextCompat
+import net.vonforst.evmap.R
+import kotlin.math.max
+import kotlin.math.min
+
+class Gauge(val size: Int, ctx: Context) {
+    val arcPaint = Paint().apply {
+        style = Paint.Style.STROKE
+        strokeWidth = size * 0.15f
+    }
+    val gaugePaint = Paint()
+    val activeColor = ContextCompat.getColor(ctx, R.color.gauge_active)
+    val middleColor = ContextCompat.getColor(ctx, R.color.gauge_middle)
+    val inactiveColor = ContextCompat.getColor(ctx, R.color.gauge_inactive)
+
+    fun draw(valuePercent: Float?, secondValuePercent: Float? = null): Bitmap {
+        val bitmap = Bitmap.createBitmap(size, size, Bitmap.Config.ARGB_8888)
+        val canvas = Canvas(bitmap)
+
+        canvas.drawColor(Color.TRANSPARENT, PorterDuff.Mode.CLEAR)
+
+        val angle = valuePercent?.let { 180f * it / 100 } ?: 0f
+        val secondAngle = secondValuePercent?.let { 180f * it / 100 }
+
+        drawArc(angle, secondAngle, canvas)
+        if (secondAngle != null) drawGauge(secondAngle, inactiveColor, canvas)
+        drawGauge(angle, Color.WHITE, canvas)
+        return bitmap
+    }
+
+    private fun drawGauge(angle: Float, @ColorInt color: Int, canvas: Canvas) {
+        gaugePaint.color = color
+        canvas.save()
+        canvas.rotate(angle - 90, size / 2f, 3 * size / 4f)
+        canvas.drawCircle(size / 2f, 3 * size / 4f, size * 0.1F, gaugePaint)
+        canvas.drawRect(size * 0.48f, 3 * size / 4f, size * 0.53f, size * 0.325f, gaugePaint)
+        canvas.restore()
+    }
+
+    private fun drawArc(angle: Float, secondAngle: Float?, canvas: Canvas) {
+        val (angle1, angle2) = if (secondAngle != null) {
+            min(angle, secondAngle) to max(angle, secondAngle)
+        } else {
+            angle to null
+        }
+
+        arcPaint.color = activeColor
+        val arcBounds = RectF(
+            arcPaint.strokeWidth / 2,
+            size / 4f + arcPaint.strokeWidth / 2,
+            size - arcPaint.strokeWidth / 2,
+            5 * size / 4f - arcPaint.strokeWidth / 2
+        )
+
+        canvas.drawArc(arcBounds, 180f, angle1, false, arcPaint)
+        if (angle2 != null) {
+            arcPaint.color = middleColor
+            canvas.drawArc(arcBounds, 180f + angle1, angle2 - angle1, false, arcPaint)
+        }
+        arcPaint.color = inactiveColor
+        canvas.drawArc(
+            arcBounds,
+            180f + (angle2 ?: angle1),
+            180f - (angle2 ?: angle1),
+            false,
+            arcPaint
+        )
+    }
+}

app/src/google/res/drawable/ic_car.xml

@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M18.92,6.01C18.72,5.42 18.16,5 17.5,5h-11c-0.66,0 -1.21,0.42 -1.42,1.01L3,12v8c0,0.55 0.45,1 1,1h1c0.55,0 1,-0.45 1,-1v-1h12v1c0,0.55 0.45,1 1,1h1c0.55,0 1,-0.45 1,-1v-8l-2.08,-5.99zM6.5,16c-0.83,0 -1.5,-0.67 -1.5,-1.5S5.67,13 6.5,13s1.5,0.67 1.5,1.5S7.33,16 6.5,16zM17.5,16c-0.83,0 -1.5,-0.67 -1.5,-1.5s0.67,-1.5 1.5,-1.5 1.5,0.67 1.5,1.5 -0.67,1.5 -1.5,1.5zM5,11l1.5,-4.5h11L19,11L5,11z" />
+</vector>

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

@@ -15,12 +15,22 @@
     <string name="open_in_app">In App öffnen</string>
     <string name="opened_on_phone">Auf dem Telefon geöffnet</string>
     <string name="auto_location_permission_needed">Um EVMap auf Android Auto zu nutzen, braucht die App Zugriff auf deinen Standort.</string>
+    <string name="auto_vehicle_data_permission_needed">Für diese Funktion benötigt EVMap Zugriff auf Daten deines Fahrzeugs.</string>
     <string name="grant_on_phone">Auf Telefon zulassen</string>
     <string name="auto_chargers_closeby">In der Nähe</string>
     <string name="auto_favorites">Favoriten</string>
     <string name="auto_fault_report_date">⚠️ Störungsmeldung (%s)</string>
     <string name="auto_no_refresh_possible">Weitere Aktualisierung nicht möglich. Bitte zurück gehen und neu starten.</string>
+    <string name="auto_prices">Preise</string>
+    <string name="auto_vehicle_data">Fahrzeugdaten</string>
+    <string name="auto_charging_level">Ladezustand</string>
+    <string name="auto_no_data">Nicht verfügbar</string>
+    <string name="auto_range">Reichweite</string>
+    <string name="auto_speed">Geschwindigkeit</string>
     <string name="welcome_android_auto">Android Auto-Unterstützung</string>
     <string name="welcome_android_auto_detail">Auf unterstützen Autos kannst du EVMap auch mit Android Auto nutzen. Öffne dazu einfach die EVMap-App aus dem Menü von Android Auto.</string>
     <string name="sounds_cool">klingt cool</string>
+    <string name="auto_chargeprice_vehicle_unavailable">EVMap konnte das Fahrzeugmodell nicht erkennen.</string>
+    <string name="auto_chargeprice_vehicle_unknown">Keins der in der App ausgewählten Fahrzeuge passt zu diesem Fahrzeug (%s %s).</string>
+    <string name="auto_chargeprice_vehicle_ambiguous">Mehrere der in der App ausgewählten Fahrzeuge passen zu diesem Fahrzeug (%s %s).</string>
 </resources>

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

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="gauge_active">#00e676</color>
+    <color name="gauge_middle">#087f23</color>
+    <color name="gauge_inactive">#9e9e9e</color>
+</resources>

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

@@ -25,12 +25,22 @@
     <string name="open_in_app">Open in app</string>
     <string name="opened_on_phone">Opened on phone</string>
     <string name="auto_location_permission_needed">To run EVMap on Android Auto, you need to grant access to your location.</string>
+    <string name="auto_vehicle_data_permission_needed">For this feature, EVMap needs access to your vehicle data.</string>
     <string name="grant_on_phone">Grant on phone</string>
     <string name="auto_chargers_closeby">Nearby chargers</string>
     <string name="auto_favorites">Favorites</string>
     <string name="auto_fault_report_date">⚠️ Fault report (%s)</string>
     <string name="auto_no_refresh_possible">Further updates not possible. Please go back and restart.</string>
+    <string name="auto_prices">Pricing</string>
+    <string name="auto_vehicle_data">Vehicle data</string>
+    <string name="auto_charging_level">Charging level</string>
+    <string name="auto_no_data">Unavailable</string>
+    <string name="auto_range">Range</string>
+    <string name="auto_speed">Speed</string>
     <string name="welcome_android_auto">Android Auto support</string>
     <string name="welcome_android_auto_detail">You can also use EVMap from within Android Auto on supported cars. Simply select the EVMap app in the Android Auto menu.</string>
     <string name="sounds_cool">sounds cool</string>
+    <string name="auto_chargeprice_vehicle_unavailable">EVMap could not determine your vehicle model.</string>
+    <string name="auto_chargeprice_vehicle_unknown">None of the vehicles selected in the app matches this vehicle (%s %s).</string>
+    <string name="auto_chargeprice_vehicle_ambiguous">Mehrere der in der App ausgewählten Fahrzeuge passen zu diesem Fahrzeug (%s %s).</string>
 </resources>

app/src/main/AndroidManifest.xml

@@ -3,6 +3,7 @@
     package="net.vonforst.evmap">
 
     <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" />
 
     <queries>
@@ -32,7 +33,8 @@
         <activity
             android:name=".MapsActivity"
             android:label="@string/title_activity_maps"
-            android:theme="@style/AppTheme.LaunchScreen">
+            android:theme="@style/AppTheme.LaunchScreen"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
@@ -256,6 +258,16 @@
             </intent-filter>
         </activity>
 
+        <!-- Override services of the com.mapzen.android.lost library with exported:false
+             until https://github.com/lostzen/lost/pull/270 is merged -->
+        <service
+            android:name="com.mapzen.android.lost.internal.GeofencingIntentService"
+            android:exported="false">
+            <intent-filter>
+                <action android:name="com.mapzen.lost.action.ACTION_GEOFENCING_SERVICE" />
+            </intent-filter>
+        </service>
+
     </application>
 
 </manifest>

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

@@ -4,12 +4,16 @@ import android.content.ActivityNotFoundException
 import android.content.Context
 import android.content.Intent
 import android.net.Uri
+import android.os.Build
 import android.os.Bundle
+import android.os.SystemClock
 import android.view.View
 import androidx.appcompat.app.AppCompatActivity
 import androidx.browser.customtabs.CustomTabColorSchemeParams
 import androidx.browser.customtabs.CustomTabsIntent
 import androidx.core.content.ContextCompat
+import androidx.core.splashscreen.SplashScreen
+import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen
 import androidx.core.view.ViewCompat
 import androidx.core.view.WindowInsetsCompat
 import androidx.drawerlayout.widget.DrawerLayout
@@ -51,9 +55,8 @@ class MapsActivity : AppCompatActivity() {
     }
 
     override fun onCreate(savedInstanceState: Bundle?) {
-        // set theme to AppTheme to end launch screen
-        setTheme(R.style.AppTheme)
         super.onCreate(savedInstanceState)
+        val splashScreen = installSplashScreen()
 
         setContentView(R.layout.activity_maps)
 
@@ -82,8 +85,23 @@ class MapsActivity : AppCompatActivity() {
 
         checkPlayServices(this)
 
-
         if (!prefs.welcomeDialogShown || !prefs.dataSourceSet) {
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
+                // wait for splash screen animation to finish on first start
+                splashScreen.setKeepVisibleCondition(object : SplashScreen.KeepOnScreenCondition {
+                    var startTime: Long? = null
+
+                    override fun shouldKeepOnScreen(): Boolean {
+                        val st = startTime
+                        if (st == null) {
+                            startTime = SystemClock.uptimeMillis()
+                            return true
+                        } else {
+                            return (SystemClock.uptimeMillis() - st) < 1000
+                        }
+                    }
+                })
+            }
             navGraph.startDestination = R.id.onboarding
             navController.graph = navGraph
             return

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

@@ -100,7 +100,7 @@ abstract class BaseAvailabilityDetector(private val client: OkHttpClient) : Avai
                     var i = 0
                     gePowers.map { gePower ->
                         val chargepoint =
-                            chargepoints.find { it.type == type && it.power == gePower }!!
+                            chargepoints.find { it.type in equivalentPlugTypes(type) && it.power == gePower }!!
                         val ids = allIds.subList(i, i + chargepoint.count).toSet()
                         i += chargepoint.count
                         chargepoint to ids

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

@@ -15,6 +15,7 @@ import retrofit2.http.Body
 import retrofit2.http.GET
 import retrofit2.http.Header
 import retrofit2.http.POST
+import java.util.*
 
 interface ChargepriceApi {
     @POST("charge_prices")
@@ -33,6 +34,9 @@ interface ChargepriceApi {
         private val cacheSize = 1L * 1024 * 1024 // 1MB
         val supportedLanguages = setOf("de", "en", "fr", "nl")
 
+        val DATA_SOURCE_GOINGELECTRIC = "going_electric"
+        val DATA_SOURCE_OPENCHARGEMAP = "open_charge_map"
+
         private val jsonApiAdapterFactory = ResourceAdapterFactory.builder()
             .add(ChargepriceRequest::class.java)
             .add(ChargepriceTariff::class.java)
@@ -75,6 +79,16 @@ interface ChargepriceApi {
             return retrofit.create(ChargepriceApi::class.java)
         }
 
+
+        fun getChargepriceLanguage(): String {
+            val locale = Locale.getDefault().language
+            return if (supportedLanguages.contains(locale)) {
+                locale
+            } else {
+                "en"
+            }
+        }
+
         @JvmStatic
         fun isCountrySupported(country: String, dataSource: String): Boolean = when (dataSource) {
             // list of countries updated 2021/08/24

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

@@ -11,6 +11,7 @@ import net.vonforst.evmap.R
 import net.vonforst.evmap.adapter.Equatable
 import net.vonforst.evmap.api.equivalentPlugTypes
 import net.vonforst.evmap.model.ChargeLocation
+import net.vonforst.evmap.model.Chargepoint
 import net.vonforst.evmap.ui.currency
 import kotlin.math.ceil
 import kotlin.math.floor
@@ -148,6 +149,26 @@ class ChargepriceCar : Resource(), Equatable {
         result = 31 * result + manufacturer.hashCode()
         return result
     }
+
+    private val acConnectors = listOf(
+        Chargepoint.CEE_BLAU,
+        Chargepoint.CEE_ROT,
+        Chargepoint.SCHUKO,
+        Chargepoint.TYPE_1,
+        Chargepoint.TYPE_2_UNKNOWN,
+        Chargepoint.TYPE_2_SOCKET,
+        Chargepoint.TYPE_2_PLUG
+    )
+    private val plugMapping = mapOf(
+        "ccs" to Chargepoint.CCS_UNKNOWN,
+        "tesla_suc" to Chargepoint.SUPERCHARGER,
+        "tesla_ccs" to Chargepoint.CCS_UNKNOWN,
+        "chademo" to Chargepoint.CHADEMO
+    )
+    val compatibleEvmapConnectors: List<String>
+        get() = dcChargePorts.map {
+            plugMapping[it]
+        }.filterNotNull().plus(acConnectors)
 }
 
 @JsonApi(type = "brand")

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

@@ -1,7 +1,5 @@
 package net.vonforst.evmap.fragment
 
-import android.Manifest
-import android.content.pm.PackageManager
 import android.graphics.Canvas
 import android.os.Bundle
 import android.view.Gravity
@@ -9,7 +7,6 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.widget.FrameLayout
-import androidx.core.content.ContextCompat
 import androidx.databinding.DataBindingUtil
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.viewModels
@@ -30,12 +27,13 @@ import net.vonforst.evmap.adapter.FavoritesAdapter
 import net.vonforst.evmap.databinding.FragmentFavoritesBinding
 import net.vonforst.evmap.databinding.ItemFavoriteBinding
 import net.vonforst.evmap.model.ChargeLocation
+import net.vonforst.evmap.utils.checkAnyLocationPermission
 import net.vonforst.evmap.viewmodel.FavoritesViewModel
 import net.vonforst.evmap.viewmodel.viewModelFactory
 
 class FavoritesFragment : Fragment(), LostApiClient.ConnectionCallbacks {
     private lateinit var binding: FragmentFavoritesBinding
-    private lateinit var locationClient: LostApiClient
+    private var locationClient: LostApiClient? = null
     private var toDelete: ChargeLocation? = null
     private var deleteSnackbar: Snackbar? = null
     private lateinit var adapter: FavoritesAdapter
@@ -49,11 +47,17 @@ class FavoritesFragment : Fragment(), LostApiClient.ConnectionCallbacks {
         }
     })
 
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        locationClient = LostApiClient.Builder(requireContext())
+            .addConnectionCallbacks(this).build()
+    }
+
     override fun onCreateView(
         inflater: LayoutInflater,
         container: ViewGroup?,
         savedInstanceState: Bundle?
-    ): View? {
+    ): View {
         binding = DataBindingUtil.inflate(
             inflater,
             R.layout.fragment_favorites, container, false
@@ -61,9 +65,6 @@ class FavoritesFragment : Fragment(), LostApiClient.ConnectionCallbacks {
         binding.lifecycleOwner = this
         binding.vm = vm
 
-        locationClient = LostApiClient.Builder(requireContext())
-            .addConnectionCallbacks(this).build()
-
         return binding.root
     }
 
@@ -92,17 +93,13 @@ class FavoritesFragment : Fragment(), LostApiClient.ConnectionCallbacks {
         }
         createTouchHelper().attachToRecyclerView(binding.favsList)
 
-        locationClient.connect()
+        locationClient!!.connect()
     }
 
     override fun onConnected() {
         val context = this.context ?: return
-        if (ContextCompat.checkSelfPermission(
-                context,
-                Manifest.permission.ACCESS_FINE_LOCATION
-            ) == PackageManager.PERMISSION_GRANTED
-        ) {
-            val location = LocationServices.FusedLocationApi.getLastLocation(locationClient)
+        if (context.checkAnyLocationPermission()) {
+            val location = LocationServices.FusedLocationApi.getLastLocation(locationClient!!)
             if (location != null) {
                 vm.location.value = LatLng(location.latitude, location.longitude)
             }
@@ -115,8 +112,8 @@ class FavoritesFragment : Fragment(), LostApiClient.ConnectionCallbacks {
 
     override fun onDestroy() {
         super.onDestroy()
-        if (locationClient.isConnected) {
-            locationClient.disconnect()
+        locationClient?.let {
+            if (it.isConnected) it.disconnect()
         }
     }
 

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

@@ -1,5 +1,6 @@
 package net.vonforst.evmap.fragment
 
+import android.Manifest.permission.ACCESS_COARSE_LOCATION
 import android.Manifest.permission.ACCESS_FINE_LOCATION
 import android.annotation.SuppressLint
 import android.content.Context
@@ -81,6 +82,8 @@ import net.vonforst.evmap.ui.ClusterIconGenerator
 import net.vonforst.evmap.ui.MarkerAnimator
 import net.vonforst.evmap.ui.getMarkerTint
 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.viewmodel.*
 import java.io.IOException
@@ -262,10 +265,8 @@ class MapFragment : Fragment(), OnMapReadyCallback, MapsActivity.FragmentCallbac
         )
 
         vm.reloadPrefs()
-        if (requestingLocationUpdates && ContextCompat.checkSelfPermission(
-                requireContext(),
-                ACCESS_FINE_LOCATION
-            ) == PackageManager.PERMISSION_GRANTED && locationClient.isConnected
+        if (requestingLocationUpdates && requireContext().checkAnyLocationPermission()
+            && locationClient.isConnected
         ) {
             requestLocationUpdates()
         }
@@ -273,16 +274,14 @@ class MapFragment : Fragment(), OnMapReadyCallback, MapsActivity.FragmentCallbac
 
     private fun setupClickListeners() {
         binding.fabLocate.setOnClickListener {
-            if (ContextCompat.checkSelfPermission(
-                    requireContext(),
-                    ACCESS_FINE_LOCATION
-                ) != PackageManager.PERMISSION_GRANTED
-            ) {
-                requestPermissions(
-                    arrayOf(ACCESS_FINE_LOCATION),
+            if (!requireContext().checkFineLocationPermission()) {
+                ActivityCompat.requestPermissions(
+                    requireActivity(),
+                    arrayOf(ACCESS_FINE_LOCATION, ACCESS_COARSE_LOCATION),
                     REQUEST_LOCATION_PERMISSION
                 )
-            } else {
+            }
+            if (requireContext().checkAnyLocationPermission()) {
                 enableLocation(moveTo = true, animate = true)
             }
         }
@@ -883,11 +882,7 @@ class MapFragment : Fragment(), OnMapReadyCallback, MapsActivity.FragmentCallbac
                 }
             }
         }
-        if (ContextCompat.checkSelfPermission(
-                requireContext(),
-                ACCESS_FINE_LOCATION
-            ) == PackageManager.PERMISSION_GRANTED
-        ) {
+        if (context?.checkAnyLocationPermission() ?: false) {
             enableLocation(!positionSet, false)
             positionSet = true
         }
@@ -903,7 +898,7 @@ class MapFragment : Fragment(), OnMapReadyCallback, MapsActivity.FragmentCallbac
         )
     }
 
-    @RequiresPermission(ACCESS_FINE_LOCATION)
+    @RequiresPermission(anyOf = [ACCESS_FINE_LOCATION, ACCESS_COARSE_LOCATION])
     private fun enableLocation(moveTo: Boolean, animate: Boolean) {
         val map = this.map ?: return
         map.setMyLocationEnabled(true)
@@ -917,7 +912,7 @@ class MapFragment : Fragment(), OnMapReadyCallback, MapsActivity.FragmentCallbac
         }
     }
 
-    @RequiresPermission(ACCESS_FINE_LOCATION)
+    @RequiresPermission(anyOf = [ACCESS_FINE_LOCATION, ACCESS_COARSE_LOCATION])
     private fun moveToLastLocation(map: AnyMap, animate: Boolean) {
         val location = LocationServices.FusedLocationApi.getLastLocation(locationClient)
         if (location != null) {
@@ -1027,7 +1022,7 @@ class MapFragment : Fragment(), OnMapReadyCallback, MapsActivity.FragmentCallbac
     ) {
         when (requestCode) {
             REQUEST_LOCATION_PERMISSION -> {
-                if ((grantResults.isNotEmpty() && grantResults[0] == PackageManager.PERMISSION_GRANTED)) {
+                if ((grantResults.isNotEmpty() && grantResults.any { it == PackageManager.PERMISSION_GRANTED })) {
                     enableLocation(moveTo = true, animate = true)
                 }
             }
@@ -1200,11 +1195,7 @@ class MapFragment : Fragment(), OnMapReadyCallback, MapsActivity.FragmentCallbac
         val map = this.map ?: return
         val context = this.context ?: return
         if (vm.myLocationEnabled.value == true) {
-            if (ActivityCompat.checkSelfPermission(
-                    context,
-                    ACCESS_FINE_LOCATION
-                ) == PackageManager.PERMISSION_GRANTED
-            ) {
+            if (context.checkAnyLocationPermission()) {
                 moveToLastLocation(map, false)
                 requestLocationUpdates()
             }

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

@@ -4,11 +4,13 @@ import android.animation.AnimatorSet
 import android.animation.ObjectAnimator
 import android.annotation.SuppressLint
 import android.content.Context
+import android.graphics.drawable.AnimatedVectorDrawable
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.view.animation.DecelerateInterpolator
+import android.widget.ImageView
 import androidx.fragment.app.Fragment
 import androidx.navigation.fragment.findNavController
 import androidx.viewpager2.widget.ViewPager2
@@ -93,12 +95,18 @@ class WelcomeFragment : OnboardingPageFragment() {
 
     override fun onResume() {
         super.onResume()
-        binding.animationView.playAnimation()
+        val drawable = (binding.animationView as ImageView).drawable
+        if (drawable is AnimatedVectorDrawable) {
+            drawable.start()
+        }
     }
 
     override fun onPause() {
         super.onPause()
-        binding.animationView.progress = 0f
+        val drawable = (binding.animationView as ImageView).drawable
+        if (drawable is AnimatedVectorDrawable) {
+            drawable.stop()
+        }
     }
 }
 

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

@@ -1,5 +1,6 @@
 package net.vonforst.evmap.storage
 
+import android.annotation.SuppressLint
 import android.content.ContentValues
 import android.content.Context
 import android.database.sqlite.SQLiteDatabase
@@ -256,6 +257,7 @@ abstract class AppDatabase : RoomDatabase() {
         }
 
         private val MIGRATION_13 = object : Migration(12, 13) {
+            @SuppressLint("Range")
             override fun migrate(db: SupportSQLiteDatabase) {
                 db.beginTransaction()
                 try {

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

@@ -1,7 +1,11 @@
 package net.vonforst.evmap.utils
 
+import android.Manifest
+import android.content.Context
 import android.content.Intent
+import android.content.pm.PackageManager
 import android.location.Location
+import androidx.core.content.ContextCompat
 import com.car2go.maps.model.LatLng
 import com.car2go.maps.model.LatLngBounds
 import kotlin.math.*
@@ -75,3 +79,17 @@ fun boundingBox(pos: LatLng, sizeMeters: Double): LatLngBounds {
         pos.plusMeters(sizeMeters, sizeMeters)
     )
 }
+
+fun Context.checkAnyLocationPermission() = ContextCompat.checkSelfPermission(
+    this,
+    Manifest.permission.ACCESS_FINE_LOCATION
+) == PackageManager.PERMISSION_GRANTED ||
+        ContextCompat.checkSelfPermission(
+            this,
+            Manifest.permission.ACCESS_COARSE_LOCATION
+        ) == PackageManager.PERMISSION_GRANTED
+
+fun Context.checkFineLocationPermission() = ContextCompat.checkSelfPermission(
+    this,
+    Manifest.permission.ACCESS_FINE_LOCATION
+) == PackageManager.PERMISSION_GRANTED

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

@@ -49,27 +49,10 @@ class ChargepriceViewModel(application: Application, chargepriceApiKey: String)
         MutableLiveData<ChargepriceCar>()
     }
 
-    private val acConnectors = listOf(
-        Chargepoint.CEE_BLAU,
-        Chargepoint.CEE_ROT,
-        Chargepoint.SCHUKO,
-        Chargepoint.TYPE_1,
-        Chargepoint.TYPE_2_UNKNOWN,
-        Chargepoint.TYPE_2_SOCKET,
-        Chargepoint.TYPE_2_PLUG
-    )
-    private val plugMapping = mapOf(
-        "ccs" to Chargepoint.CCS_UNKNOWN,
-        "tesla_suc" to Chargepoint.SUPERCHARGER,
-        "tesla_ccs" to Chargepoint.CCS_UNKNOWN,
-        "chademo" to Chargepoint.CHADEMO
-    )
     val vehicleCompatibleConnectors: LiveData<List<String>> by lazy {
         MediatorLiveData<List<String>>().apply {
             addSource(vehicle) {
-                value = it?.dcChargePorts?.map {
-                    plugMapping[it]
-                }?.filterNotNull()?.plus(acConnectors)
+                value = it?.compatibleEvmapConnectors
             }
         }
     }
@@ -201,12 +184,16 @@ class ChargepriceViewModel(application: Application, chargepriceApiKey: String)
                     } else if (cpMeta.status == Status.LOADING) {
                         value = Resource.loading(null)
                     } else {
-                        value =
-                            Resource.success(cpMeta.data!!.chargePoints.filter {
-                                it.plug == getChargepricePlugType(
-                                    chargepoint
-                                ) && it.power == chargepoint.power
-                            }[0])
+                        val result = cpMeta.data!!.chargePoints.filter {
+                            it.plug == getChargepricePlugType(
+                                chargepoint
+                            ) && it.power == chargepoint.power
+                        }.elementAtOrNull(0)
+                        value = if (result != null) {
+                            Resource.success(result)
+                        } else {
+                            Resource.error("matching chargepoint not found", null)
+                        }
                     }
                 }
             }
@@ -241,7 +228,7 @@ class ChargepriceViewModel(application: Application, chargepriceApiKey: String)
                         maxMonthlyFees = if (prefs.chargepriceNoBaseFee) 0.0 else null,
                         currency = prefs.chargepriceCurrency
                     )
-                }, getChargepriceLanguage())
+                }, ChargepriceApi.getChargepriceLanguage())
                 val meta =
                     result.meta.get<ChargepriceMeta>(ChargepriceApi.moshi.adapter(ChargepriceMeta::class.java)) as ChargepriceMeta
                 chargePrices.value = Resource.success(result)
@@ -268,13 +255,4 @@ class ChargepriceViewModel(application: Application, chargepriceApiKey: String)
             }
         }
     }
-
-    private fun getChargepriceLanguage(): String {
-        val locale = Locale.getDefault().language
-        return if (ChargepriceApi.supportedLanguages.contains(locale)) {
-            locale
-        } else {
-            "en"
-        }
-    }
 }

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

@@ -1,49 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="144.3dp"
-    android:height="270.5dp"
-    android:viewportWidth="144.3"
-    android:viewportHeight="270.5">
-  <path
-      android:pathData="M33.9,100l-2.5,-21.7l-3.8,0.4l2.5,21.7L33.9,100zM47.4,98.5l-2.5,-21.7l-3.8,0.4l2.5,21.7L47.4,98.5z"
-      android:fillColor="#FFB300" />
-  <path
-      android:pathData="M54.5,128c-1.2,1.4 -2.1,2.4 -2.2,2.5c-3.4,2.7 -6.1,3.5 -8.4,2.5c-3.9,-2 -3.7,-9.3 -3.5,-10.1l2.7,0.1c-0.1,2.1 0.3,6.5 2.1,7.5c1,0.5 2.9,-0.1 5.2,-2.1l0,0c0,0 7.6,-7.6 6,-13.6c-1.8,-7.2 6.5,-17.5 9.3,-21.1l0.4,-0.4l2.2,1.7l-0.4,0.5c-8.5,10.5 -9.4,15.8 -8.8,18.6C60.5,119.4 57,125 54.5,128z"
-      android:fillColor="#90A4AE" />
-  <path
-      android:pathData="M25.6,99.8l1,8.9l8.2,5.5L46,113l6.8,-7.2l-1,-8.9L25.6,99.8z"
-      android:fillColor="#90A4AE" />
-  <path
-      android:pathData="M45.8,113l-11.1,1.2l2.4,9.8l8.8,-1V113L45.8,113zM53.8,89.4l0.9,8.1l-31.9,3.7l-0.9,-8.1L53.8,89.4z"
-      android:fillColor="#546E7A" />
-  <path
-      android:pathData="M78.8,0C55.9,0 37.3,18.6 37.3,41.5c0,31.3 34.9,47.6 39.1,92.2c0.1,1.3 1.2,2.2 2.5,2.2s2.4,-0.9 2.5,-2.2c4.2,-44.6 39.1,-60.9 39.1,-92.2C120.3,18.4 101.7,0 78.8,0z"
-      android:fillColor="#00E676" />
-  <path
-      android:pathData="M78.8,0.9c22.8,0 41.2,18.3 41.5,40.9c0,-0.1 0,-0.3 0,-0.4C120.3,18.6 101.7,0 78.8,0S37.3,18.4 37.3,41.5c0,0.1 0,0.3 0,0.4C37.6,19.2 56,0.9 78.8,0.9L78.8,0.9z"
-      android:fillColor="#FFFFFF"
-      android:fillAlpha="0.2" />
-  <path
-      android:pathData="M81.3,132.6c-0.1,1.3 -1.2,2.2 -2.5,2.2c-1.3,0 -2.4,-0.9 -2.5,-2.2c-4.1,-44.5 -38.7,-60.8 -39,-91.7c0,0.3 0,0.4 0,0.7c0,31.3 34.9,47.6 39.1,92.2c0.1,1.3 1.2,2.2 2.5,2.2c1.3,0 2.4,-0.9 2.5,-2.2c4.2,-44.6 39.1,-60.9 39.1,-92.2c0,-0.3 0,-0.4 0,-0.7C120,71.8 85.3,88.1 81.3,132.6L81.3,132.6z"
-      android:fillColor="#3E2723"
-      android:fillAlpha="0.2" />
-  <path
-      android:fillColor="#FF000000"
-      android:pathData="M69.3,21.2v25.1h6.8v20.5l16,-27.5h-9.2L92,21.1C92.1,21.2 69.3,21.2 69.3,21.2z"
-      android:strokeAlpha="0.45"
-      android:fillAlpha="0.45" />
-  <path
-      android:fillColor="?android:textColorSecondary"
-      android:pathData="M19.2,244.2H2.8v14.1h18.8v2.4H0v-34.1h21.5v2.4H2.8v12.8h16.4V244.2z" />
-  <path
-      android:fillColor="?android:textColorSecondary"
-      android:pathData="M37.2,254.9l0.7,2.3h0.1l0.7,-2.3L49,226.6h3l-12.7,34.1h-2.6l-12.7,-34.1h3L37.2,254.9z" />
-  <path
-      android:fillColor="?android:textColorSecondary"
-      android:pathData="M60.9,226.6l12.5,30h0.1l12.6,-30h3.7v34.1h-2.8v-15.1l0.2,-14.9l-0.1,0l-12.7,30h-1.9l-12.7,-29.9l-0.1,0l0.3,14.8v15.1h-2.8v-34.1H60.9z" />
-  <path
-      android:fillColor="?android:textColorSecondary"
-      android:pathData="M114.1,260.7c-0.2,-0.9 -0.3,-1.6 -0.4,-2.2s-0.1,-1.3 -0.1,-1.9c-0.9,1.3 -2.2,2.4 -3.8,3.3s-3.3,1.3 -5.3,1.3c-2.5,0 -4.4,-0.7 -5.8,-2s-2.1,-3.1 -2.1,-5.3c0,-2.3 1,-4.2 3,-5.6s4.8,-2.1 8.2,-2.1h5.6v-3.1c0,-1.8 -0.6,-3.2 -1.7,-4.3s-2.8,-1.5 -4.9,-1.5c-2,0 -3.6,0.5 -4.9,1.5s-1.9,2.2 -1.9,3.6l-2.6,0l0,-0.1c-0.1,-1.9 0.8,-3.6 2.6,-5.1s4.1,-2.2 6.9,-2.2c2.8,0 5,0.7 6.8,2.1s2.6,3.5 2.6,6.1v12.5c0,0.9 0.1,1.8 0.2,2.6s0.3,1.7 0.5,2.5H114.1zM104.9,258.7c2,0 3.8,-0.5 5.3,-1.4s2.7,-2.2 3.4,-3.6v-5.3H108c-2.5,0 -4.6,0.5 -6.1,1.6s-2.3,2.4 -2.3,4c0,1.4 0.5,2.5 1.4,3.4S103.3,258.7 104.9,258.7z" />
-  <path
-      android:fillColor="?android:textColorSecondary"
-      android:pathData="M144.3,248.7c0,3.8 -0.9,6.8 -2.6,9.1s-4.1,3.4 -7.1,3.4c-1.8,0 -3.3,-0.3 -4.7,-1s-2.4,-1.6 -3.3,-2.9v13.1h-2.8v-35.1h2.4l0.4,3.9c0.8,-1.4 1.9,-2.5 3.3,-3.3s2.9,-1.1 4.7,-1.1c3,0 5.4,1.2 7.1,3.6s2.6,5.7 2.6,9.7V248.7zM141.5,248.2c0,-3.2 -0.6,-5.8 -1.9,-7.9c-1.3,-2 -3.2,-3 -5.6,-3c-1.9,0 -3.4,0.4 -4.6,1.3c-1.2,0.9 -2.1,2.1 -2.7,3.5v12.2c0.6,1.4 1.6,2.5 2.8,3.3s2.7,1.2 4.5,1.2c2.5,0 4.3,-0.9 5.6,-2.8c1.3,-1.8 1.9,-4.3 1.9,-7.3V248.2z" />
-</vector>

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

@@ -0,0 +1,217 @@
+<animated-vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:aapt="http://schemas.android.com/aapt">
+    <aapt:attr name="android:drawable">
+        <vector
+            android:width="192dp"
+            android:height="192dp"
+            android:viewportWidth="192"
+            android:viewportHeight="192">
+            <group android:name="_R_G">
+                <group
+                    android:name="_R_G_L_2_G_N_1_T_0"
+                    android:translateX="94"
+                    android:translateY="96">
+                    <group
+                        android:name="_R_G_L_2_G"
+                        android:pivotX="53.625"
+                        android:pivotY="43.025"
+                        android:rotation="73"
+                        android:translateX="-37.85"
+                        android:translateY="6.550000000000004">
+                        <path
+                            android:name="_R_G_L_2_G_D_0_P_0"
+                            android:fillAlpha="1"
+                            android:fillColor="#ffb300"
+                            android:fillType="nonZero"
+                            android:pathData=" M9.45 18.05 C9.45,18.05 7.55,1.45 7.55,1.45 C7.55,1.45 4.65,1.75 4.65,1.75 C4.65,1.75 6.55,18.35 6.55,18.35 C6.55,18.35 9.45,18.05 9.45,18.05c  M19.75 16.85 C19.75,16.85 17.85,0.25 17.85,0.25 C17.85,0.25 14.95,0.55 14.95,0.55 C14.95,0.55 16.85,17.15 16.85,17.15 C16.85,17.15 19.75,16.85 19.75,16.85c " />
+                        <path
+                            android:name="_R_G_L_2_G_D_1_P_0"
+                            android:fillAlpha="1"
+                            android:fillColor="#90a4ae"
+                            android:fillType="nonZero"
+                            android:pathData=" M25.15 39.45 C24.25,40.55 23.55,41.25 23.45,41.35 C20.85,43.45 18.75,44.05 17.05,43.25 C14.05,41.75 14.25,36.15 14.35,35.55 C14.35,35.55 16.45,35.65 16.45,35.65 C16.35,37.25 16.65,40.65 18.05,41.35 C18.85,41.75 20.25,41.25 22.05,39.75 C22.05,39.75 27.85,33.95 26.65,29.35 C25.25,23.85 31.65,15.95 33.75,13.25 C33.75,13.25 34.05,12.95 34.05,12.95 C34.05,12.95 35.75,14.25 35.75,14.25 C35.75,14.25 35.45,14.65 35.45,14.65 C28.95,22.65 28.25,26.75 28.75,28.85 C29.75,32.85 27.05,37.15 25.15,39.45c " />
+                        <path
+                            android:name="_R_G_L_2_G_D_2_P_0"
+                            android:fillAlpha="1"
+                            android:fillColor="#90a4ae"
+                            android:fillType="nonZero"
+                            android:pathData=" M3.05 17.85 C3.05,17.85 3.85,24.65 3.85,24.65 C3.85,24.65 10.15,28.85 10.15,28.85 C10.15,28.85 18.65,27.95 18.65,27.95 C18.65,27.95 23.85,22.45 23.85,22.45 C23.85,22.45 23.05,15.65 23.05,15.65 C23.05,15.65 3.05,17.85 3.05,17.85c " />
+                        <path
+                            android:name="_R_G_L_2_G_D_3_P_0"
+                            android:fillAlpha="1"
+                            android:fillColor="#546e7a"
+                            android:fillType="nonZero"
+                            android:pathData=" M18.55 27.95 C18.55,27.95 10.05,28.85 10.05,28.85 C10.05,28.85 11.85,36.35 11.85,36.35 C11.85,36.35 18.55,35.55 18.55,35.55 C18.55,35.55 18.55,27.95 18.55,27.95c  M24.65 9.95 C24.65,9.95 25.35,16.15 25.35,16.15 C25.35,16.15 0.95,18.95 0.95,18.95 C0.95,18.95 0.25,12.75 0.25,12.75 C0.25,12.75 24.65,9.95 24.65,9.95c " />
+                    </group>
+                </group>
+                <group
+                    android:name="_R_G_L_1_G_N_1_T_0"
+                    android:translateX="94"
+                    android:translateY="96">
+                    <group
+                        android:name="_R_G_L_1_G"
+                        android:translateX="-26.049"
+                        android:translateY="-52.150000000000006">
+                        <path
+                            android:name="_R_G_L_1_G_D_0_P_0"
+                            android:fillAlpha="1"
+                            android:fillColor="#00e676"
+                            android:fillType="nonZero"
+                            android:pathData=" M31.95 0.25 C14.45,0.25 0.25,14.45 0.25,31.95 C0.25,55.85 26.95,68.35 30.15,102.45 C30.25,103.45 31.05,104.15 32.05,104.15 C33.05,104.15 33.85,103.45 33.95,102.45 C37.15,68.35 63.85,55.85 63.85,31.95 C63.65,14.35 49.45,0.25 31.95,0.25c " />
+                        <path
+                            android:name="_R_G_L_1_G_D_1_P_0"
+                            android:fillAlpha="0.2"
+                            android:fillColor="#ffffff"
+                            android:fillType="nonZero"
+                            android:pathData=" M31.95 0.95 C49.35,0.95 63.45,14.95 63.65,32.25 C63.65,32.25 63.65,31.95 63.65,31.95 C63.65,14.45 49.45,0.25 31.95,0.25 C14.45,0.25 0.25,14.35 0.25,31.95 C0.25,31.95 0.25,32.25 0.25,32.25 C0.45,14.95 14.55,0.95 31.95,0.95c " />
+                        <path
+                            android:name="_R_G_L_1_G_D_2_P_0"
+                            android:fillAlpha="0.2"
+                            android:fillColor="#3e2723"
+                            android:fillType="nonZero"
+                            android:pathData=" M33.85 101.65 C33.75,102.65 32.95,103.35 31.95,103.35 C30.95,103.35 30.15,102.65 30.05,101.65 C26.95,67.65 0.45,55.15 0.25,31.55 C0.25,31.55 0.25,32.05 0.25,32.05 C0.25,55.95 26.95,68.45 30.15,102.55 C30.25,103.55 31.05,104.25 32.05,104.25 C33.05,104.25 33.85,103.55 33.95,102.55 C37.15,68.45 63.85,55.95 63.85,32.05 C63.85,32.05 63.85,31.55 63.85,31.55 C63.45,55.15 36.95,67.65 33.85,101.65c " />
+                        <path
+                            android:name="_R_G_L_1_G_D_3_P_0"
+                            android:fillAlpha="0.45"
+                            android:fillColor="#000000"
+                            android:fillType="nonZero"
+                            android:pathData=" M24.65 16.45 C24.65,16.45 24.65,35.65 24.65,35.65 C24.65,35.65 29.85,35.65 29.85,35.65 C29.85,35.65 29.85,51.35 29.85,51.35 C29.85,51.35 42.05,30.35 42.05,30.35 C42.05,30.35 35.05,30.35 35.05,30.35 C35.05,30.35 42.05,16.35 42.05,16.35 C42.15,16.45 24.65,16.45 24.65,16.45c " />
+                    </group>
+                </group>
+                <group
+                    android:name="_R_G_L_0_G_N_1_T_0"
+                    android:translateX="94"
+                    android:translateY="96">
+                    <group
+                        android:name="_R_G_L_0_G"
+                        android:translateX="-1.3999999999999995"
+                        android:translateY="-35.8">
+                        <group android:name="_R_G_L_0_C_0_G">
+                            <clip-path
+                                android:name="_R_G_L_0_C_0"
+                                android:pathData=" M23.73 37.15 C23.73,37.15 21.71,37.15 21.71,37.15 C21.71,37.15 13.39,37.15 13.39,37.15 C13.39,37.15 -2.01,37.15 -2.01,37.15 C-2.01,37.15 -6.82,37.15 -6.82,37.15 C-6.82,37.15 -8.27,37.15 -8.27,37.15 C-8.27,37.15 -8.27,40.03 -8.27,40.03 C-8.27,40.03 23.73,40.03 23.73,40.03 C23.73,40.03 23.73,37.15 23.73,37.15c " />
+                            <group android:name="_R_G_L_0_C_0_G_G">
+                                <path
+                                    android:name="_R_G_L_0_G_G_0_D_0_P_0"
+                                    android:fillAlpha="1"
+                                    android:fillColor="#ffffff"
+                                    android:fillType="nonZero"
+                                    android:pathData=" M0 0.1 C0,0.1 0,19.3 0,19.3 C0,19.3 5.2,19.3 5.2,19.3 C5.2,19.3 5.2,35 5.2,35 C5.2,35 17.4,14 17.4,14 C17.4,14 10.4,14 10.4,14 C10.4,14 17.4,0 17.4,0 C17.5,0.1 0,0.1 0,0.1c " />
+                                <path
+                                    android:name="_R_G_L_0_G_G_0_D_1_P_0"
+                                    android:fillAlpha="0.2"
+                                    android:fillColor="#000000"
+                                    android:fillType="nonZero"
+                                    android:pathData=" M0 0.1 C0,0.1 0,0.69 0,0.69 C0,0.69 0,19.3 0,19.3 C0,19.3 0.55,19.3 0.55,19.3 C0.55,19.3 0.55,0.69 0.55,0.69 C0.55,0.69 17.05,0.69 17.05,0.69 C17.05,0.69 17.4,0 17.4,0 C17.5,0.1 0,0.1 0,0.1c " />
+                                <path
+                                    android:name="_R_G_L_0_G_G_0_D_2_P_0"
+                                    android:fillAlpha="0.2"
+                                    android:fillColor="#000000"
+                                    android:fillType="nonZero"
+                                    android:pathData=" M5.82 33.92 C5.82,33.92 5.2,35 5.2,35 C5.2,35 5.2,19.3 5.2,19.3 C5.2,19.3 5.82,19.3 5.82,19.3 C5.82,19.3 5.82,33.92 5.82,33.92c " />
+                                <path
+                                    android:name="_R_G_L_0_G_G_0_D_3_P_0"
+                                    android:fillAlpha="0.2"
+                                    android:fillColor="#000000"
+                                    android:fillType="nonZero"
+                                    android:pathData=" M17.08 14.55 C17.08,14.55 11.21,14.55 11.21,14.55 C11.21,14.55 10.4,14 10.4,14 C10.4,14 17.4,14 17.4,14 C17.4,14 17.08,14.55 17.08,14.55c " />
+                            </group>
+                        </group>
+                    </group>
+                </group>
+            </group>
+            <group android:name="time_group" />
+        </vector>
+    </aapt:attr>
+    <target android:name="_R_G_L_2_G">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="434"
+                    android:propertyName="rotation"
+                    android:startOffset="0"
+                    android:valueFrom="73"
+                    android:valueTo="0"
+                    android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.667,1 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_0_C_0">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="333"
+                    android:propertyName="pathData"
+                    android:startOffset="0"
+                    android:valueFrom="M23.73 37.15 C23.73,37.15 21.71,37.15 21.71,37.15 C21.71,37.15 13.39,37.15 13.39,37.15 C13.39,37.15 -2.01,37.15 -2.01,37.15 C-2.01,37.15 -6.82,37.15 -6.82,37.15 C-6.82,37.15 -8.27,37.15 -8.27,37.15 C-8.27,37.15 -8.27,40.03 -8.27,40.03 C-8.27,40.03 23.73,40.03 23.73,40.03 C23.73,40.03 23.73,37.15 23.73,37.15c "
+                    android:valueTo="M23.73 37.15 C23.73,37.15 21.71,37.15 21.71,37.15 C21.71,37.15 13.39,37.15 13.39,37.15 C13.39,37.15 -2.01,37.15 -2.01,37.15 C-2.01,37.15 -6.82,37.15 -6.82,37.15 C-6.82,37.15 -8.27,37.15 -8.27,37.15 C-8.27,37.15 -8.27,40.03 -8.27,40.03 C-8.27,40.03 23.73,40.03 23.73,40.03 C23.73,40.03 23.73,37.15 23.73,37.15c "
+                    android:valueType="pathType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+                <objectAnimator
+                    android:duration="167"
+                    android:propertyName="pathData"
+                    android:startOffset="333"
+                    android:valueFrom="M23.73 37.15 C23.73,37.15 21.71,37.15 21.71,37.15 C21.71,37.15 13.39,37.15 13.39,37.15 C13.39,37.15 -2.01,37.15 -2.01,37.15 C-2.01,37.15 -6.82,37.15 -6.82,37.15 C-6.82,37.15 -8.27,37.15 -8.27,37.15 C-8.27,37.15 -8.27,40.03 -8.27,40.03 C-8.27,40.03 23.73,40.03 23.73,40.03 C23.73,40.03 23.73,37.15 23.73,37.15c "
+                    android:valueTo="M24.11 22.78 C24.11,22.78 21.82,22.78 21.82,22.78 C21.82,22.78 15.48,20.34 14.4,20.34 C12.43,20.34 2.78,25.37 0.81,25.37 C-0.35,25.37 -5.1,22.78 -5.1,22.78 C-5.1,22.78 -7.89,22.78 -7.89,22.78 C-7.89,22.78 -7.89,39.16 -7.89,39.16 C-7.89,39.16 24.11,39.16 24.11,39.16 C24.11,39.16 24.11,22.78 24.11,22.78c "
+                    android:valueType="pathType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+                <objectAnimator
+                    android:duration="167"
+                    android:propertyName="pathData"
+                    android:startOffset="500"
+                    android:valueFrom="M24.11 22.78 C24.11,22.78 21.82,22.78 21.82,22.78 C21.82,22.78 15.48,20.34 14.4,20.34 C12.43,20.34 2.78,25.37 0.81,25.37 C-0.35,25.37 -5.1,22.78 -5.1,22.78 C-5.1,22.78 -7.89,22.78 -7.89,22.78 C-7.89,22.78 -7.89,39.16 -7.89,39.16 C-7.89,39.16 24.11,39.16 24.11,39.16 C24.11,39.16 24.11,22.78 24.11,22.78c "
+                    android:valueTo="M24.12 9.79 C24.12,9.79 21.56,9.79 21.56,9.79 C21.56,9.79 17.22,11.4 15.06,11.4 C11.13,11.4 7.18,7.73 3.24,7.73 C0.91,7.73 -3.76,9.79 -3.76,9.79 C-3.76,9.79 -7.88,9.79 -7.88,9.79 C-7.88,9.79 -7.88,39.67 -7.88,39.67 C-7.88,39.67 24.12,39.67 24.12,39.67 C24.12,39.67 24.12,9.79 24.12,9.79c "
+                    android:valueType="pathType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+                <objectAnimator
+                    android:duration="167"
+                    android:propertyName="pathData"
+                    android:startOffset="667"
+                    android:valueFrom="M24.12 9.79 C24.12,9.79 21.56,9.79 21.56,9.79 C21.56,9.79 17.22,11.4 15.06,11.4 C11.13,11.4 7.18,7.73 3.24,7.73 C0.91,7.73 -3.76,9.79 -3.76,9.79 C-3.76,9.79 -7.88,9.79 -7.88,9.79 C-7.88,9.79 -7.88,39.67 -7.88,39.67 C-7.88,39.67 24.12,39.67 24.12,39.67 C24.12,39.67 24.12,9.79 24.12,9.79c "
+                    android:valueTo="M24.26 0.67 C24.26,0.67 22,0.67 22,0.67 C22,0.67 15.43,-1.35 14.47,-1.35 C12.71,-1.35 2.44,1.87 0.68,1.87 C-0.36,1.87 -5.09,0.67 -5.09,0.67 C-5.09,0.67 -7.74,0.67 -7.74,0.67 C-7.74,0.67 -7.74,44.06 -7.74,44.06 C-7.74,44.06 24.26,44.06 24.26,44.06 C24.26,44.06 24.26,0.67 24.26,0.67c "
+                    android:valueType="pathType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+                <objectAnimator
+                    android:duration="133"
+                    android:propertyName="pathData"
+                    android:startOffset="833"
+                    android:valueFrom="M24.26 0.67 C24.26,0.67 22,0.67 22,0.67 C22,0.67 15.43,-1.35 14.47,-1.35 C12.71,-1.35 2.44,1.87 0.68,1.87 C-0.36,1.87 -5.09,0.67 -5.09,0.67 C-5.09,0.67 -7.74,0.67 -7.74,0.67 C-7.74,0.67 -7.74,44.06 -7.74,44.06 C-7.74,44.06 24.26,44.06 24.26,44.06 C24.26,44.06 24.26,0.67 24.26,0.67c "
+                    android:valueTo="M24.4 -9.98 C24.4,-9.98 22.38,-9.98 22.38,-9.98 C22.38,-9.98 14.07,-9.99 14.06,-9.99 C14.05,-9.99 -1.32,-9.97 -1.32,-9.97 C-1.33,-9.97 -6.14,-9.98 -6.14,-9.98 C-6.14,-9.98 -7.6,-9.98 -7.6,-9.98 C-7.6,-9.98 -7.6,44.22 -7.6,44.22 C-7.6,44.22 24.4,44.22 24.4,44.22 C24.4,44.22 24.4,-9.98 24.4,-9.98c "
+                    android:valueType="pathType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
+                    </aapt:attr>
+                </objectAnimator>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="time_group">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator
+                    android:duration="1000"
+                    android:propertyName="translateX"
+                    android:startOffset="0"
+                    android:valueFrom="0"
+                    android:valueTo="1"
+                    android:valueType="floatType" />
+            </set>
+        </aapt:attr>
+    </target>
+</animated-vector>

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

@@ -0,0 +1,121 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="192dp"
+    android:height="192dp"
+    android:viewportWidth="192"
+    android:viewportHeight="192">
+    <group android:name="_R_G">
+        <group
+            android:name="_R_G_L_2_G_N_1_T_0"
+            android:translateX="94"
+            android:translateY="96">
+            <group
+                android:name="_R_G_L_2_G"
+                android:pivotX="53.625"
+                android:pivotY="43.025"
+                android:rotation="0"
+                android:translateX="-37.85"
+                android:translateY="6.550000000000004">
+                <path
+                    android:name="_R_G_L_2_G_D_0_P_0"
+                    android:fillAlpha="1"
+                    android:fillColor="#ffb300"
+                    android:fillType="nonZero"
+                    android:pathData=" M9.45 18.05 C9.45,18.05 7.55,1.45 7.55,1.45 C7.55,1.45 4.65,1.75 4.65,1.75 C4.65,1.75 6.55,18.35 6.55,18.35 C6.55,18.35 9.45,18.05 9.45,18.05c  M19.75 16.85 C19.75,16.85 17.85,0.25 17.85,0.25 C17.85,0.25 14.95,0.55 14.95,0.55 C14.95,0.55 16.85,17.15 16.85,17.15 C16.85,17.15 19.75,16.85 19.75,16.85c " />
+                <path
+                    android:name="_R_G_L_2_G_D_1_P_0"
+                    android:fillAlpha="1"
+                    android:fillColor="#90a4ae"
+                    android:fillType="nonZero"
+                    android:pathData=" M25.15 39.45 C24.25,40.55 23.55,41.25 23.45,41.35 C20.85,43.45 18.75,44.05 17.05,43.25 C14.05,41.75 14.25,36.15 14.35,35.55 C14.35,35.55 16.45,35.65 16.45,35.65 C16.35,37.25 16.65,40.65 18.05,41.35 C18.85,41.75 20.25,41.25 22.05,39.75 C22.05,39.75 27.85,33.95 26.65,29.35 C25.25,23.85 31.65,15.95 33.75,13.25 C33.75,13.25 34.05,12.95 34.05,12.95 C34.05,12.95 35.75,14.25 35.75,14.25 C35.75,14.25 35.45,14.65 35.45,14.65 C28.95,22.65 28.25,26.75 28.75,28.85 C29.75,32.85 27.05,37.15 25.15,39.45c " />
+                <path
+                    android:name="_R_G_L_2_G_D_2_P_0"
+                    android:fillAlpha="1"
+                    android:fillColor="#90a4ae"
+                    android:fillType="nonZero"
+                    android:pathData=" M3.05 17.85 C3.05,17.85 3.85,24.65 3.85,24.65 C3.85,24.65 10.15,28.85 10.15,28.85 C10.15,28.85 18.65,27.95 18.65,27.95 C18.65,27.95 23.85,22.45 23.85,22.45 C23.85,22.45 23.05,15.65 23.05,15.65 C23.05,15.65 3.05,17.85 3.05,17.85c " />
+                <path
+                    android:name="_R_G_L_2_G_D_3_P_0"
+                    android:fillAlpha="1"
+                    android:fillColor="#546e7a"
+                    android:fillType="nonZero"
+                    android:pathData=" M18.55 27.95 C18.55,27.95 10.05,28.85 10.05,28.85 C10.05,28.85 11.85,36.35 11.85,36.35 C11.85,36.35 18.55,35.55 18.55,35.55 C18.55,35.55 18.55,27.95 18.55,27.95c  M24.65 9.95 C24.65,9.95 25.35,16.15 25.35,16.15 C25.35,16.15 0.95,18.95 0.95,18.95 C0.95,18.95 0.25,12.75 0.25,12.75 C0.25,12.75 24.65,9.95 24.65,9.95c " />
+            </group>
+        </group>
+        <group
+            android:name="_R_G_L_1_G_N_1_T_0"
+            android:translateX="94"
+            android:translateY="96">
+            <group
+                android:name="_R_G_L_1_G"
+                android:translateX="-26.049"
+                android:translateY="-52.150000000000006">
+                <path
+                    android:name="_R_G_L_1_G_D_0_P_0"
+                    android:fillAlpha="1"
+                    android:fillColor="#00e676"
+                    android:fillType="nonZero"
+                    android:pathData=" M31.95 0.25 C14.45,0.25 0.25,14.45 0.25,31.95 C0.25,55.85 26.95,68.35 30.15,102.45 C30.25,103.45 31.05,104.15 32.05,104.15 C33.05,104.15 33.85,103.45 33.95,102.45 C37.15,68.35 63.85,55.85 63.85,31.95 C63.65,14.35 49.45,0.25 31.95,0.25c " />
+                <path
+                    android:name="_R_G_L_1_G_D_1_P_0"
+                    android:fillAlpha="0.2"
+                    android:fillColor="#ffffff"
+                    android:fillType="nonZero"
+                    android:pathData=" M31.95 0.95 C49.35,0.95 63.45,14.95 63.65,32.25 C63.65,32.25 63.65,31.95 63.65,31.95 C63.65,14.45 49.45,0.25 31.95,0.25 C14.45,0.25 0.25,14.35 0.25,31.95 C0.25,31.95 0.25,32.25 0.25,32.25 C0.45,14.95 14.55,0.95 31.95,0.95c " />
+                <path
+                    android:name="_R_G_L_1_G_D_2_P_0"
+                    android:fillAlpha="0.2"
+                    android:fillColor="#3e2723"
+                    android:fillType="nonZero"
+                    android:pathData=" M33.85 101.65 C33.75,102.65 32.95,103.35 31.95,103.35 C30.95,103.35 30.15,102.65 30.05,101.65 C26.95,67.65 0.45,55.15 0.25,31.55 C0.25,31.55 0.25,32.05 0.25,32.05 C0.25,55.95 26.95,68.45 30.15,102.55 C30.25,103.55 31.05,104.25 32.05,104.25 C33.05,104.25 33.85,103.55 33.95,102.55 C37.15,68.45 63.85,55.95 63.85,32.05 C63.85,32.05 63.85,31.55 63.85,31.55 C63.45,55.15 36.95,67.65 33.85,101.65c " />
+                <path
+                    android:name="_R_G_L_1_G_D_3_P_0"
+                    android:fillAlpha="0.45"
+                    android:fillColor="#000000"
+                    android:fillType="nonZero"
+                    android:pathData=" M24.65 16.45 C24.65,16.45 24.65,35.65 24.65,35.65 C24.65,35.65 29.85,35.65 29.85,35.65 C29.85,35.65 29.85,51.35 29.85,51.35 C29.85,51.35 42.05,30.35 42.05,30.35 C42.05,30.35 35.05,30.35 35.05,30.35 C35.05,30.35 42.05,16.35 42.05,16.35 C42.15,16.45 24.65,16.45 24.65,16.45c " />
+            </group>
+        </group>
+        <group
+            android:name="_R_G_L_0_G_N_1_T_0"
+            android:translateX="94"
+            android:translateY="96">
+            <group
+                android:name="_R_G_L_0_G"
+                android:translateX="-1.3999999999999995"
+                android:translateY="-35.8">
+                <group android:name="_R_G_L_0_C_0_G">
+                    <clip-path
+                        android:name="_R_G_L_0_C_0"
+                        android:pathData="M24.4 -9.98 C24.4,-9.98 22.38,-9.98 22.38,-9.98 C22.38,-9.98 14.07,-9.99 14.06,-9.99 C14.05,-9.99 -1.32,-9.97 -1.32,-9.97 C-1.33,-9.97 -6.14,-9.98 -6.14,-9.98 C-6.14,-9.98 -7.6,-9.98 -7.6,-9.98 C-7.6,-9.98 -7.6,44.22 -7.6,44.22 C-7.6,44.22 24.4,44.22 24.4,44.22 C24.4,44.22 24.4,-9.98 24.4,-9.98c " />
+                    <group android:name="_R_G_L_0_C_0_G_G">
+                        <path
+                            android:name="_R_G_L_0_G_G_0_D_0_P_0"
+                            android:fillAlpha="1"
+                            android:fillColor="#ffffff"
+                            android:fillType="nonZero"
+                            android:pathData=" M0 0.1 C0,0.1 0,19.3 0,19.3 C0,19.3 5.2,19.3 5.2,19.3 C5.2,19.3 5.2,35 5.2,35 C5.2,35 17.4,14 17.4,14 C17.4,14 10.4,14 10.4,14 C10.4,14 17.4,0 17.4,0 C17.5,0.1 0,0.1 0,0.1c " />
+                        <path
+                            android:name="_R_G_L_0_G_G_0_D_1_P_0"
+                            android:fillAlpha="0.2"
+                            android:fillColor="#000000"
+                            android:fillType="nonZero"
+                            android:pathData=" M0 0.1 C0,0.1 0,0.69 0,0.69 C0,0.69 0,19.3 0,19.3 C0,19.3 0.55,19.3 0.55,19.3 C0.55,19.3 0.55,0.69 0.55,0.69 C0.55,0.69 17.05,0.69 17.05,0.69 C17.05,0.69 17.4,0 17.4,0 C17.5,0.1 0,0.1 0,0.1c " />
+                        <path
+                            android:name="_R_G_L_0_G_G_0_D_2_P_0"
+                            android:fillAlpha="0.2"
+                            android:fillColor="#000000"
+                            android:fillType="nonZero"
+                            android:pathData=" M5.82 33.92 C5.82,33.92 5.2,35 5.2,35 C5.2,35 5.2,19.3 5.2,19.3 C5.2,19.3 5.82,19.3 5.82,19.3 C5.82,19.3 5.82,33.92 5.82,33.92c " />
+                        <path
+                            android:name="_R_G_L_0_G_G_0_D_3_P_0"
+                            android:fillAlpha="0.2"
+                            android:fillColor="#000000"
+                            android:fillType="nonZero"
+                            android:pathData=" M17.08 14.55 C17.08,14.55 11.21,14.55 11.21,14.55 C11.21,14.55 10.4,14 10.4,14 C10.4,14 17.4,14 17.4,14 C17.4,14 17.08,14.55 17.08,14.55c " />
+                    </group>
+                </group>
+            </group>
+        </group>
+    </group>
+    <group android:name="time_group" />
+</vector>

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

@@ -0,0 +1,120 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="160dp"
+    android:height="160dp"
+    android:viewportWidth="120"
+    android:viewportHeight="120">
+    <group android:name="_R_G">
+        <group
+            android:name="_R_G_L_2_G_N_1_T_0"
+            android:translateX="58"
+            android:translateY="60">
+            <group
+                android:name="_R_G_L_2_G"
+                android:pivotX="53.625"
+                android:pivotY="43.025"
+                android:rotation="0"
+                android:translateX="-37.85"
+                android:translateY="6.550000000000004">
+                <path
+                    android:name="_R_G_L_2_G_D_0_P_0"
+                    android:fillAlpha="1"
+                    android:fillColor="#ffb300"
+                    android:fillType="nonZero"
+                    android:pathData=" M9.45 18.05 C9.45,18.05 7.55,1.45 7.55,1.45 C7.55,1.45 4.65,1.75 4.65,1.75 C4.65,1.75 6.55,18.35 6.55,18.35 C6.55,18.35 9.45,18.05 9.45,18.05c  M19.75 16.85 C19.75,16.85 17.85,0.25 17.85,0.25 C17.85,0.25 14.95,0.55 14.95,0.55 C14.95,0.55 16.85,17.15 16.85,17.15 C16.85,17.15 19.75,16.85 19.75,16.85c " />
+                <path
+                    android:name="_R_G_L_2_G_D_1_P_0"
+                    android:fillAlpha="1"
+                    android:fillColor="#90a4ae"
+                    android:fillType="nonZero"
+                    android:pathData=" M25.15 39.45 C24.25,40.55 23.55,41.25 23.45,41.35 C20.85,43.45 18.75,44.05 17.05,43.25 C14.05,41.75 14.25,36.15 14.35,35.55 C14.35,35.55 16.45,35.65 16.45,35.65 C16.35,37.25 16.65,40.65 18.05,41.35 C18.85,41.75 20.25,41.25 22.05,39.75 C22.05,39.75 27.85,33.95 26.65,29.35 C25.25,23.85 31.65,15.95 33.75,13.25 C33.75,13.25 34.05,12.95 34.05,12.95 C34.05,12.95 35.75,14.25 35.75,14.25 C35.75,14.25 35.45,14.65 35.45,14.65 C28.95,22.65 28.25,26.75 28.75,28.85 C29.75,32.85 27.05,37.15 25.15,39.45c " />
+                <path
+                    android:name="_R_G_L_2_G_D_2_P_0"
+                    android:fillAlpha="1"
+                    android:fillColor="#90a4ae"
+                    android:fillType="nonZero"
+                    android:pathData=" M3.05 17.85 C3.05,17.85 3.85,24.65 3.85,24.65 C3.85,24.65 10.15,28.85 10.15,28.85 C10.15,28.85 18.65,27.95 18.65,27.95 C18.65,27.95 23.85,22.45 23.85,22.45 C23.85,22.45 23.05,15.65 23.05,15.65 C23.05,15.65 3.05,17.85 3.05,17.85c " />
+                <path
+                    android:name="_R_G_L_2_G_D_3_P_0"
+                    android:fillAlpha="1"
+                    android:fillColor="#546e7a"
+                    android:fillType="nonZero"
+                    android:pathData=" M18.55 27.95 C18.55,27.95 10.05,28.85 10.05,28.85 C10.05,28.85 11.85,36.35 11.85,36.35 C11.85,36.35 18.55,35.55 18.55,35.55 C18.55,35.55 18.55,27.95 18.55,27.95c  M24.65 9.95 C24.65,9.95 25.35,16.15 25.35,16.15 C25.35,16.15 0.95,18.95 0.95,18.95 C0.95,18.95 0.25,12.75 0.25,12.75 C0.25,12.75 24.65,9.95 24.65,9.95c " />
+            </group>
+        </group>
+        <group
+            android:name="_R_G_L_1_G_N_1_T_0"
+            android:translateX="58"
+            android:translateY="60">
+            <group
+                android:name="_R_G_L_1_G"
+                android:translateX="-26.049"
+                android:translateY="-52.150000000000006">
+                <path
+                    android:name="_R_G_L_1_G_D_0_P_0"
+                    android:fillAlpha="1"
+                    android:fillColor="#00e676"
+                    android:fillType="nonZero"
+                    android:pathData=" M31.95 0.25 C14.45,0.25 0.25,14.45 0.25,31.95 C0.25,55.85 26.95,68.35 30.15,102.45 C30.25,103.45 31.05,104.15 32.05,104.15 C33.05,104.15 33.85,103.45 33.95,102.45 C37.15,68.35 63.85,55.85 63.85,31.95 C63.65,14.35 49.45,0.25 31.95,0.25c " />
+                <path
+                    android:name="_R_G_L_1_G_D_1_P_0"
+                    android:fillAlpha="0.2"
+                    android:fillColor="#ffffff"
+                    android:fillType="nonZero"
+                    android:pathData=" M31.95 0.95 C49.35,0.95 63.45,14.95 63.65,32.25 C63.65,32.25 63.65,31.95 63.65,31.95 C63.65,14.45 49.45,0.25 31.95,0.25 C14.45,0.25 0.25,14.35 0.25,31.95 C0.25,31.95 0.25,32.25 0.25,32.25 C0.45,14.95 14.55,0.95 31.95,0.95c " />
+                <path
+                    android:name="_R_G_L_1_G_D_2_P_0"
+                    android:fillAlpha="0.2"
+                    android:fillColor="#3e2723"
+                    android:fillType="nonZero"
+                    android:pathData=" M33.85 101.65 C33.75,102.65 32.95,103.35 31.95,103.35 C30.95,103.35 30.15,102.65 30.05,101.65 C26.95,67.65 0.45,55.15 0.25,31.55 C0.25,31.55 0.25,32.05 0.25,32.05 C0.25,55.95 26.95,68.45 30.15,102.55 C30.25,103.55 31.05,104.25 32.05,104.25 C33.05,104.25 33.85,103.55 33.95,102.55 C37.15,68.45 63.85,55.95 63.85,32.05 C63.85,32.05 63.85,31.55 63.85,31.55 C63.45,55.15 36.95,67.65 33.85,101.65c " />
+                <path
+                    android:name="_R_G_L_1_G_D_3_P_0"
+                    android:fillAlpha="0.45"
+                    android:fillColor="#000000"
+                    android:fillType="nonZero"
+                    android:pathData=" M24.65 16.45 C24.65,16.45 24.65,35.65 24.65,35.65 C24.65,35.65 29.85,35.65 29.85,35.65 C29.85,35.65 29.85,51.35 29.85,51.35 C29.85,51.35 42.05,30.35 42.05,30.35 C42.05,30.35 35.05,30.35 35.05,30.35 C35.05,30.35 42.05,16.35 42.05,16.35 C42.15,16.45 24.65,16.45 24.65,16.45c " />
+            </group>
+        </group>
+        <group
+            android:name="_R_G_L_0_G_N_1_T_0"
+            android:translateX="58"
+            android:translateY="60">
+            <group
+                android:name="_R_G_L_0_G"
+                android:translateX="-1.3999999999999995"
+                android:translateY="-35.8">
+                <group android:name="_R_G_L_0_C_0_G">
+                    <clip-path
+                        android:name="_R_G_L_0_C_0"
+                        android:pathData="M23.73 37.15 C23.73,37.15 21.71,37.15 21.71,37.15 C21.71,37.15 13.39,37.15 13.39,37.15 C13.39,37.15 -2.01,37.15 -2.01,37.15 C-2.01,37.15 -6.82,37.15 -6.82,37.15 C-6.82,37.15 -8.27,37.15 -8.27,37.15 C-8.27,37.15 -8.27,40.03 -8.27,40.03 C-8.27,40.03 23.73,40.03 23.73,40.03 C23.73,40.03 23.73,37.15 23.73,37.15c " />
+                    <group android:name="_R_G_L_0_C_0_G_G">
+                        <path
+                            android:name="_R_G_L_0_G_G_0_D_0_P_0"
+                            android:fillAlpha="1"
+                            android:fillColor="#ffffff"
+                            android:fillType="nonZero"
+                            android:pathData=" M0 0.1 C0,0.1 0,19.3 0,19.3 C0,19.3 5.2,19.3 5.2,19.3 C5.2,19.3 5.2,35 5.2,35 C5.2,35 17.4,14 17.4,14 C17.4,14 10.4,14 10.4,14 C10.4,14 17.4,0 17.4,0 C17.5,0.1 0,0.1 0,0.1c " />
+                        <path
+                            android:name="_R_G_L_0_G_G_0_D_1_P_0"
+                            android:fillAlpha="0.2"
+                            android:fillColor="#000000"
+                            android:fillType="nonZero"
+                            android:pathData=" M0 0.1 C0,0.1 0,0.69 0,0.69 C0,0.69 0,19.3 0,19.3 C0,19.3 0.55,19.3 0.55,19.3 C0.55,19.3 0.55,0.69 0.55,0.69 C0.55,0.69 17.05,0.69 17.05,0.69 C17.05,0.69 17.4,0 17.4,0 C17.5,0.1 0,0.1 0,0.1c " />
+                        <path
+                            android:name="_R_G_L_0_G_G_0_D_2_P_0"
+                            android:fillAlpha="0.2"
+                            android:fillColor="#000000"
+                            android:fillType="nonZero"
+                            android:pathData=" M5.82 33.92 C5.82,33.92 5.2,35 5.2,35 C5.2,35 5.2,19.3 5.2,19.3 C5.2,19.3 5.82,19.3 5.82,19.3 C5.82,19.3 5.82,33.92 5.82,33.92c " />
+                        <path
+                            android:name="_R_G_L_0_G_G_0_D_3_P_0"
+                            android:fillAlpha="0.2"
+                            android:fillColor="#000000"
+                            android:fillType="nonZero"
+                            android:pathData=" M17.08 14.55 C17.08,14.55 11.21,14.55 11.21,14.55 C11.21,14.55 10.4,14 10.4,14 C10.4,14 17.4,14 17.4,14 C17.4,14 17.08,14.55 17.08,14.55c " />
+                    </group>
+                </group>
+            </group>
+        </group>
+    </group>
+</vector>

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

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="?android:colorBackground" />
-
-    <item
-        android:drawable="@drawable/ic_appicon_splashscreen"
-        android:gravity="center" />
-</layer-list>

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

@@ -4,7 +4,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <com.airbnb.lottie.LottieAnimationView
+    <ImageView
         android:id="@+id/animation_view"
         android:layout_width="0dp"
         android:layout_height="0dp"
@@ -21,9 +21,8 @@
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintVertical_bias="0.85"
         app:layout_constraintWidth_max="256dp"
-        app:lottie_autoPlay="true"
-        app:lottie_rawRes="@raw/logo_anim"
-        app:lottie_speed="0.75" />
+        app:srcCompat="@drawable/intro_anim_onboarding"
+        android:contentDescription="@string/app_name" />
 
     <TextView
         android:id="@+id/welcomeTitle"

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

@@ -30,9 +30,6 @@
             app:enterAnim="@animator/nav_default_enter_anim"
             app:popEnterAnim="@animator/nav_default_pop_enter_anim"
             app:popExitAnim="@animator/nav_default_pop_exit_anim" />
-        <action
-            android:id="@+id/action_map_to_update_060_androidauto"
-            app:destination="@id/update_060_androidauto" />
         <action
             android:id="@+id/action_map_to_opensource_donations"
             app:destination="@id/opensource_donations" />
@@ -91,11 +88,6 @@
         android:name="net.vonforst.evmap.fragment.DonateFragment"
         android:label="@string/donate"
         tools:layout="@layout/fragment_donate" />
-    <dialog
-        android:id="@+id/update_060_androidauto"
-        android:name="net.vonforst.evmap.fragment.updatedialogs.Update060AndroidAutoDialogFramgent"
-        android:label="@string/welcome_to_evmap"
-        tools:layout="@layout/dialog_update_060_androidauto" />
     <dialog
         android:id="@+id/opensource_donations"
         android:name="net.vonforst.evmap.fragment.updatedialogs.OpensourceDonationsDialogFramgent"

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

@@ -237,4 +237,5 @@
     <string name="github_sponsors">GitHub Sponsors</string>
     <string name="donate_desc">Unterstütze die Weiterentwicklung von EVMap mit einer einmaligen Spende</string>
     <string name="github_sponsors_desc">Unterstütze EVMap über GitHub Sponsors</string>
+    <string name="unnamed_filter_profile">Unbenanntes Filterprofil</string>
 </resources>

app/src/main/res/values-night/colors.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="background">#121212</color>
+</resources>

app/src/main/res/values-v31/drawables.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <drawable name="intro_anim_onboarding">@drawable/intro_anim_finished</drawable>
+</resources>

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

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <style name="AppTheme.LaunchScreen" parent="AppTheme.LaunchScreen.Base">
+        <item name="windowSplashScreenAnimatedIcon">@drawable/intro_anim</item>
+    </style>
+</resources>

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

@@ -22,4 +22,5 @@
     <color name="chargeprice_lock">#546E7A</color>
     <color name="chargeprice_star">#00C853</color>
     <color name="chip_background">#1F000000</color>
+    <color name="background">#FFFFFF</color>
 </resources>

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

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <drawable name="intro_anim_onboarding">@drawable/intro_anim</drawable>
+</resources>

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

@@ -222,4 +222,5 @@
     <string name="github_sponsors">GitHub Sponsors</string>
     <string name="donate_desc">Support EVMap\'s development with a one-time donation</string>
     <string name="github_sponsors_desc">Support EVMap on GitHub Sponsors</string>
+    <string name="unnamed_filter_profile">Unnamed filter profile</string>
 </resources>

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

@@ -17,8 +17,14 @@
 
     <style name="AppTheme" parent="AppTheme.Base" />
 
-    <style name="AppTheme.LaunchScreen">
-        <item name="android:windowBackground">@drawable/launch_screen</item>
+    <style name="AppTheme.LaunchScreen.Base" parent="Theme.SplashScreen">
+        <item name="windowSplashScreenBackground">@color/background</item>
+        <item name="windowSplashScreenAnimationDuration">999</item>
+        <item name="postSplashScreenTheme">@style/AppTheme</item>
+    </style>
+
+    <style name="AppTheme.LaunchScreen" parent="AppTheme.LaunchScreen.Base">
+        <item name="windowSplashScreenAnimatedIcon">@drawable/intro_static</item>
     </style>
 
     <style name="FullScreenDialogStyle" parent="AppTheme">

build.gradle

@@ -1,7 +1,7 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-    ext.kotlin_version = '1.5.10'
+    ext.kotlin_version = '1.5.20'
     ext.about_libs_version = '8.8.5'
     ext.nav_version = '2.3.5'
     repositories {
@@ -10,7 +10,7 @@ buildscript {
         gradlePluginPortal()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.0.0'
+        classpath 'com.android.tools.build:gradle:7.0.2'
         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/59.txt

@@ -0,0 +1,7 @@
+Neue Funktionen:
+- Android Auto: Preisvergleich mit Chargeprice
+- Android Auto: Neuer Bildschirm zur Anzeige von Fahrzeugdaten (falls verfügbar)
+
+Verbesserungen:
+- Android Auto: Nutzung des Fahrzeug-GPS (falls verfügbar, ab Android Auto 6.7)
+- Verschiedene Abstürze behoben

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

@@ -5,11 +5,10 @@ Funktionen:
 - Anzeige der Stromtankstellen aus den Stromtankstellenverzeichnissen von GoingElectric.de und Open Charge Map
 - Echtzeit-Verfügbarkeitsanzeige für viele Ladesäulen (nur in Europa)
 - Integrierter Preisvergleich für die jeweilige Ladesäule mit Chargeprice.app (nur in Europa)
-- Google Maps oder OpenStreetMap (Mapbox) können für die Kartendaten genutzt werden
+- Kartendaten von OpenStreetMap (Mapbox)
 - Suche nach Orten
 - Erweiterte Filterfunktionen, Filterprofile speichern
 - Favoritenliste, auch mit Anzeige der Verfügbarkeit
-- Unterstützung für Android Auto
 - Keine nervige Werbung
 
 EVMap ist ein Open-Source-Projekt und unter https://github.com/johan12345/EVMap zu finden.

fastlane/metadata/android/de-DE/images/phoneScreenshots/01_map.png

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:4fec0a34114d957c75fe02cb7e972a752c704b41a162fcd61018fb94b2f51499
+size 895589

fastlane/metadata/android/de-DE/images/phoneScreenshots/02_detail.png

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:2d96236006f8a71429080ead33352b51cdc24dac997e13bb21cac9be33c88f01
+size 857431

fastlane/metadata/android/de-DE/images/phoneScreenshots/03_prices.png

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:4f1561eeceaaf11dfc513b3e94fdb87e33363aca6afdff99ed9058bb2549ea59
+size 348799

fastlane/metadata/android/de-DE/images/phoneScreenshots/04_favorites.png

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:94c75119d726f2926f788266e2bf1d2572079cdeb24a7721eec90b38d94b7d57
+size 96031

fastlane/metadata/android/de-DE/images/phoneScreenshots/05_filters.png

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:498c57fade7895b6c714088c489d829d44da75d8f69b8ecab6c8f998f74411b5
+size 137330

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

@@ -0,0 +1,7 @@
+New features:
+- Android Auto: Price comparison with Chargeprice (only in certain countries)
+- Android Auto: New screen displaying vehicle data (if available)
+
+Improvements:
+- Android Auto: Use vehicle GPS (if available, starting with Android Auto 6.7)
+- Fixed various crashes

fastlane/metadata/android/en-US/full_description.txt

@@ -5,11 +5,10 @@ Features:
 - Shows all charging stations from the community-maintained GoingElectric.de and Open Charge Map directories
 - Realtime availability information (only in Europe)
 - Integrated price comparison using Chargeprice.app (only in Europe)
-- Map data from Google Maps or OpenStreetMap (Mapbox)
+- Map data from OpenStreetMap (Mapbox)
 - Search for places
 - Advanced filtering options, including saved filter profiles
 - Favorites list, also with availability information
-- Android Auto support
 - No ads, fully open source
 
 EVMap is an open source project and can be found at https://github.com/johan12345/EVMap.

fastlane/metadata/android/en-US/images/featureGraphic.png

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:f83e571b78b205002cf41d4d625eb22b5bf32c60d24ce39ab8987591183c5c27
+size 72855

fastlane/metadata/android/en-US/images/icon.png

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:fa929430122f3d3318f430d0148f43aa045373cd53a4e9a193280f97c11328d0
+size 25044

fastlane/metadata/android/en-US/images/phoneScreenshots/01_map.png

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:aaa0032bd567bd9f6257bf17ca72915f973d676102c66d532d12309bc901cb5e
+size 884287

fastlane/metadata/android/en-US/images/phoneScreenshots/02_detail.png

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:170fc47f88b2515f0b7d1c9b8e87c3fb905324ec32f6e25937f2fc241fbe1bbb
+size 857298

fastlane/metadata/android/en-US/images/phoneScreenshots/03_prices.png

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:aaf780abbad2388002fc9afc9d6b1534061be9a6bab96bd3c166b3317d5332ff
+size 338280

fastlane/metadata/android/en-US/images/phoneScreenshots/04_favorites.png

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:f5b58726094bb4f0d29229b729a3c369bf9f9b5ad7a9f355dbf20430b656e2ad
+size 97536

fastlane/metadata/android/en-US/images/phoneScreenshots/05_filters.png

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:3b12d10d0eef40fabc9221bdc45460c7fe607ff9b254e59ecf92123413f3f22c
+size 124451