new 1.3.4 release

may fix issues with app logo in drawer & compass button on map

.github/workflows/apikeys-ci.xml

@@ -0,0 +1,7 @@
+<resources>
+   <string name="google_maps_key" templateMergeStrategy="preserve" translatable="false">ci</string>
+   <string name="mapbox_key" translatable="false">ci</string>
+   <string name="goingelectric_key" translatable="false">ci</string>
+   <string name="chargeprice_key" translatable="false">ci</string>
+   <string name="openchargemap_key" translatable="false">ci</string>
+</resources>

.github/workflows/release.yml

@@ -0,0 +1,77 @@
+on:
+  push:
+    tags:
+      - '*'
+
+name: Release
+
+jobs:
+  test:
+    name: Build and upload release
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check out code
+        uses: actions/checkout@v2
+
+      - name: Set up Java environment
+        uses: actions/setup-java@v2
+        with:
+          java-version: 11
+          distribution: 'zulu'
+          cache: 'gradle'
+      - name: Decrypt keystore
+        run: openssl aes-256-cbc -K  ${{ secrets.encrypted_53968681344a_key }} -iv  ${{ secrets.encrypted_53968681344a_iv }} -in _ci/keystore.jks.enc -out _ci/keystore.jks -d
+      - name: Extract version code
+        run: echo "VERSION_CODE=$(grep -o "^\s*versionCode\s\+[0-9]*" app/build.gradle | awk '{ print $2 }' | tr -d \''"\\')" >> $GITHUB_ENV
+
+      - name: Build app release
+        env:
+          GOINGELECTRIC_API_KEY: ${{ secrets.GOINGELECTRIC_API_KEY }}
+          OPENCHARGEMAP_API_KEY: ${{ secrets.OPENCHARGEMAP_API_KEY }}
+          CHARGEPRICE_API_KEY: ${{ secrets.CHARGEPRICE_API_KEY }}
+          MAPBOX_API_KEY: ${{ secrets.MAPBOX_API_KEY }}
+          GOOGLE_MAPS_API_KEY: ${{ secrets.GOOGLE_MAPS_API_KEY }}
+          KEYSTORE_PASSWORD: ${{ secrets.KEYSTORE_PASSWORD }}
+          KEYSTORE_ALIAS: ${{ secrets.KEYSTORE_ALIAS }}
+          KEYSTORE_ALIAS_PASSWORD: ${{ secrets.KEYSTORE_ALIAS_PASSWORD }}
+        run: ./gradlew assembleRelease --no-daemon
+
+      - name: release
+        uses: actions/create-release@v1
+        id: create_release
+        with:
+          draft: false
+          prerelease: false
+          release_name: ${{ steps.version.outputs.version }}
+          tag_name: ${{ github.ref }}
+          body_path: fastlane/metadata/android/en-US/changelogs/${{ env.VERSION_CODE }}.txt
+        env:
+          GITHUB_TOKEN: ${{ github.token }}
+
+      - name: upload Google artifact
+        uses: actions/upload-release-asset@v1
+        env:
+          GITHUB_TOKEN: ${{ github.token }}
+        with:
+          upload_url: ${{ steps.create_release.outputs.upload_url }}
+          asset_path: app/build/outputs/apk/googleNormal/release/app-google-normal-release.apk
+          asset_name: app-google-normal-release.apk
+          asset_content_type: application/vnd.android.package-archive
+      - name: upload Foss artifact
+        uses: actions/upload-release-asset@v1
+        env:
+          GITHUB_TOKEN: ${{ github.token }}
+        with:
+          upload_url: ${{ steps.create_release.outputs.upload_url }}
+          asset_path: app/build/outputs/apk/fossNormal/release/app-foss-normal-release.apk
+          asset_name: app-foss-normal-release.apk
+          asset_content_type: application/vnd.android.package-archive
+      - name: upload Google Automotive artifact
+        uses: actions/upload-release-asset@v1
+        env:
+          GITHUB_TOKEN: ${{ github.token }}
+        with:
+          upload_url: ${{ steps.create_release.outputs.upload_url }}
+          asset_path: app/build/outputs/apk/googleAutomotive/release/app-google-automotive-release.apk
+          asset_name: app-google-automotive-release.apk
+          asset_content_type: application/vnd.android.package-archive

.github/workflows/tests.yml

@@ -0,0 +1,36 @@
+on:
+  pull_request:
+  push:
+    branches:
+      - '*'
+
+name: Tests
+
+jobs:
+
+  test:
+    name: Build and Test (${{ matrix.buildvariant }})
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        buildvariant: [ FossNormal, GoogleNormal, GoogleAutomotive ]
+    steps:
+      - name: Check out code
+        uses: actions/checkout@v2
+
+      - name: Set up Java environment
+        uses: actions/setup-java@v2
+        with:
+          java-version: 11
+          distribution: 'zulu'
+          cache: 'gradle'
+
+      - name: Copy apikeys.xml
+        run: cp .github/workflows/apikeys-ci.xml app/src/main/res/values/apikeys.xml
+
+      - name: Build app
+        run: ./gradlew assemble${{ matrix.buildvariant }}Debug --no-daemon
+      - name: Run unit tests
+        run: ./gradlew test${{ matrix.buildvariant }}DebugUnitTest --no-daemon
+      - name: Run Android Lint
+        run: ./gradlew lint${{ matrix.buildvariant }}Debug --no-daemon

.travis.yml

@@ -1,46 +0,0 @@
-language: java
-dist: focal
-env:
-  global:
-    - secure: KYdFlMarsyXw+OHht1Atp+Kirbw9O09Ck14EjFuKb1eNtknurZ/tGEXuD+8xWh1W8W21kgHEG7s3rzru53t29buz+FW9f+ZmhEWXFP3OydyvXLw4BAVVOjm6xG2uHX/8MOGLJNM7cfaF25EPQ+kznHe84R29KaLH90mNRr2lPa4VnfbcnvDStiVaez/vJ72UoYSP5HICAzoF70yC3ZvvCK1hZv71UIysCbFE2IkxvMhG9OOGebdnRmFssaRCrvfRLjitobcLzkPWzZZIqdjNASf8/iAxX8VgGBYfVj8ID06AfMrtgXNJRCvcD0LICraQ+WPUbikMunRieGO8PNHSB5vKdPoC50aLUa0RoRb4G3QM1pR2A8xAFlIJFX2R7iY+2t24L9hRFqB98+QoQzutfkAI1T0rzem/wtpZpuan+bDawDJEHGCeYbE0aPDAl6lytgrEE9fRgV3c1jJLQzu0xIWG8YLl3iMg0hL+c0wCKXoeqrfCFS6kYmmG7W+rQp4tCZifvRbWfAXwIPQieffKxqdEuUwiUsYxdzCu9v9uU3nflEOLLuRgeMP3gV8mpur9b5GztpkfgfzcAqsF+NiY01kYgGtrgCYlMy0TxASE+UuALrtkQtU01wwhs9RH7Az0Ib3C+MT5DTjxHQCYETIViocmNEG2vfAbgHazCpGAhcY=
-    - secure: Hoko50vP+Mwm/O4CWvPvjMxd1gGhi+Bultjyy1WpludSmZFCfKz45Mj1EqzeYk6MeMLvGOEkSLB5wjdXdgJ9j5gEOF5K34k4vESJA7+DqDO3I7Xw9cnWgOXdFqB0qGHar0TVP3Dfg7ZcRgtmeX6t2uoELFLiS9GvTnbZXk4PCUybd979Xi8XHjEQV7+3EZbSjtsI4GFeIK1rrjd0I+UM88zYrWnz1KhdCjWvQb4iZjo+ib6NmGGEMqR7jJPRZz3KB01Y+n5h21qq9/Nv31zQIqt2B5nRxy3vBvvqKapgprIk+hVOpNnBU8w89uWUU6tYUeFk0t7z1TYWjgaBrMmGCM+aKkQ2q5F/ygNzDwB+KkpJx709Yhf0ZX8g2yvkdz+Ok7moYuvmrOPOf4E/U3BlfZxbGtRD2bGYbDgHLFYlTn6v5J2kJHDJAz31yvF5jvJejDaPp2IBVfoMRy7ZJFmGUNHGd9Se6bRwxS++AoobP5WDrBiUXNe2KKDMs3e7vbaO+hLbZ9XHpjeWIJGUfvtTee8EHZqF/8A3ju53V4/R0ehlOv2UZbpYNqcmwrsy9/R4pgMfDkG3Q054LmYrxD8DIC9b8excVMwWRP5aQ1TqZnxO2B1/vJU87RcnGl3jekeHTdHXbRq9BMV4dAdPfB9X3nGIi2GgV0iTBk+24xccOc0=
-    - secure: RsN/2nBVv0byMzwchuAhDti1AWKECg3Uzqk6Ahgaqg02zx8GHj60j0qNax7KuMUg70X3G4b3m8ZzndAU0wcJ98UyIku7ofUYgXHm0XYKTJwiyyhrKJ8pZ4qoeCoRkitIGIitlb84fSufVamcoLyLNbLUsO5OzL+Uscyhq/BwAhyOhj5FB9DM+GE9ntanQ4m3k4guMyMctR9CGS6Tk4LKJ1WCm0AnjTPalc+we+7yORY2J/9d6VHLKfaFXbpuWmrdnFfDZqxqcUODsxPVE0LuUtXyKQDTjjfQc8106Z/z19AJS+oLm/2UND84PD3MqsjX6EX0/9k3fY0OsoCuQAivDRmtevQ0bDQrTAyeBLcfnPCw/MYiJWyBcaYBAYK42EAfsFTDBRIduFB/Dpvg+8GuLZSdm4xVYpTlQ2pMtlGNWIGIRQsjk9LZ8swq8QBMiiF/bpMGKdfmnyQj8jkEOCWaAzkR9O+4E4Y7PuBENef9XuV0hLMryCrML2YXigxAKkEUOPhfnG+AbEY+g2kAMp+2EtXaG3tsGxoMhEYA+uRd3o2cacQMMwRpnePH5DYg6F05mrvdHPpt+P9UR1iHaHmjBPAYeksmrdP8bS088zcnePgiL6+6N0m3+l8Krihmxg5RyWjnH18IwX4RO+xg4x3cW+zaScCDbbotDMEYtChF+Hs=
-    - secure: LQHMdhaPUlCuJPFrCPpUphJSY6xzAFI/7RrcAVLtLcPhGdS+MeNifIkkAH7MeitTHroOC0dGkZ4bg/8/7bKfgwY4vPH9P50kZcnX5mI6zfBHgNYJzuthj+vJH9RAtkdQOW9Fe1uPIx8R9GUWUOVnkoJh0PQ1gDXdZW5fePqUtn1kYrcCCBE+Bhe3wz6QzTBqGS1nsVRTxQfSJNGi9uH1oi9kQGgQFuCCiJ/P0A6MIhSItkOfuggx/iorA+iASbhWkB4nXYQBbFe/ZhFJWbVfgYlOM0HtpKh8B2AqKw21Em32JoovCbUof4adkY7cH8/4Rt9SujC9YOw+a6oM+e//jJT0sie77V7zl670j+qODTuNvV4qVUwtoxShyc1Sfbd+Xb0xn/OC7DzBg97YuYCF/84yyuq12rl/cofynWE1L5YvGNSJk241XUw98Bvl0MK4VIfQvG9zJP0HnQZcWKt6kFOIEJSCRbmkd2tPPAZFBXBQf/bvpULOoKwneGJZBSapRoCyGwemM+EAzVB9UOXAqsXZ4FHkt1SSJVrTVwgxvXpCfmF6LZPhbz6nvouRWGsC/GdWjrHtdW5lEOvS27qKEL5rXwQ0o+71ZICGo8j4E0GOHXyi857qZhvO7cbOnts+iiawXiWzPXv2gGGabuqPwcU8JPEoWdaiIaeGUczfjBU=
-    - secure: fvPVjj3l+TZ7HF5aGn/pmrkipGIrz+MkKNy3I7pnCJSuD/oVp9nQ5ePP/dAhaRThaW+fQbq7hOmCquPAtfoN9CUnHNV2f2l9RavDQIxdqvpXqY13A0BFffZho6A6H2kO7k6kQQPQEhl4SMJjObnX12/YDaTVx3b7aIroEJ8DyY62xGTsjExtaAksuFwUEekjh0MoWICvyBoDfrYhpiEVI2721rGMHu7FIXwmE38+jj7wwZd3Bp37yI9NY/b3ZQ/HUKyYDuoAL0xl5/GaQlRepD0v2xWQUQ40NArHLfMoscXi55UaENuswCg7rt9os8jCcZ8FkZf1cVsQ71JrE0uxgs00Jfjy2QKM5u1XUZefl1Nw5cfCDTWXIEGsz9OGiidFLehWUupX/6C6wr1BStdlRt+6Pt/FXsYHxO/qog++cKqHjOJRXi+raGAb99HhQ/hLnLUMKl5DIWlKF9DImXiOpfYxrgCJc3y91vNX6noJyWYs6PvErMukTsXFHen+fM0NtfTFoKW682oILvXjoeFvuzKpk49+rcpkJbRi5+Zdo/duSPp/flwvC4LOMi0RZOO9TNMhWKdkyWweDr1HEpvQn6RS87rpHzQwRDvm85F+PkZLMMqyWpuxBWbJf0jVbew21KvTJWamuizsIgCebFh0SSxgObzmMbAIFCkzL0PRsms=
-    - ANDROID_HOME=$HOME/android-sdk
-before_install:
-  - openssl aes-256-cbc -K $encrypted_53968681344a_key -iv $encrypted_53968681344a_iv -in _ci/keystore.jks.enc -out _ci/keystore.jks -d
-install:
-  # Download and unzip the Android command line tools (if not already there thanks to the cache mechanism)
-  # Latest version of this file available here: https://developer.android.com/studio/#command-tools
-  - if test ! -e $HOME/android-cmdline-tools/cmdline-tools.zip ; then curl https://dl.google.com/android/repository/commandlinetools-linux-6609375_latest.zip > $HOME/android-cmdline-tools/cmdline-tools.zip ; fi
-  - unzip -qq -n $HOME/android-cmdline-tools/cmdline-tools.zip -d $HOME/android-cmdline-tools
-  # Install or update Android SDK components (will not do anything if already up to date thanks to the cache mechanism)
-  - echo y | $HOME/android-cmdline-tools/tools/bin/sdkmanager --sdk_root=$HOME/android-sdk 'platform-tools' > /dev/null
-  # Latest version of build-tools available here: https://developer.android.com/studio/releases/build-tools.html
-  - echo y | $HOME/android-cmdline-tools/tools/bin/sdkmanager --sdk_root=$HOME/android-sdk 'build-tools;29.0.3' > /dev/null
-  - echo y | $HOME/android-cmdline-tools/tools/bin/sdkmanager --sdk_root=$HOME/android-sdk 'platforms;android-29' > /dev/null
-script:
-  - "./gradlew lintFossDebug testFossDebugUnitTest lintGoogleDebug testGoogleDebugUnitTest"
-  - "./gradlew assembleRelease"
-before_cache:
-  - rm -f  $HOME/.gradle/caches/modules-2/modules-2.lock
-  - rm -fr $HOME/.gradle/caches/*/plugin-resolution/
-cache:
-  directories:
-    - "$HOME/.gradle/caches/"
-    - "$HOME/.gradle/wrapper/"
-    - "$HOME/.android/build-cache"
-    - "$HOME/android-cmdline-tools"
-    - "$HOME/android-sdk"
-deploy:
-  provider: releases
-  api_key:
-    secure: "XQR4GUrGkPKYVV0xMbJifX/ewKAnenBPlM/pPacQ9irAmYNYa/yEkySz4x1K6MP8cEnuJbxHFakcDqhNRCqD7Cq2NcnCi3qtTEXHK6ApLoVl/92eyiWxu/bYlidOEZb+YPcVNtTR253NiI8GYda+CrhLd4uCmsAgES+XPFJd/t2esMlDOSAp7xalZv/zFhhlB9+SevfPFMc6kkrqeHpKnMs9SK8ltVQmh3nch2KjtDvqgDW6d3nuwn7/HAer6/HY86hmA4Rh6Mo2cV6OloX0bdJ7hvA1GOT4p3+K3lWbTRxzE0o1DXAtT7+D158iKvxHFPuF3h+CTjSlLeiss6kQZL9nFjw/KhAvu+GJOp37PcMoI++mpMiFoWPlzKpp17BVKIDinYbgi8kiU4zG+QHhe2cY85SbfAplXUaysq7uzxEZwEUYHSAHNahshVooXRqvuzkthcH0/nvinfeXrzx2xDvQ3if1NENMRgttwewU0kvU61iKUwpcf/UN2bHK3DaPes0VzSH4PTHAGjoRpksDfqUwb7S8YxbYr+44aMbSPYN8Lbjda0BxPSKWwHM5/pi7FBJN1a1w3t7sV/EiACWUWr8OovmX4ljyCybbR0w9cPzRC1zAYeSUHslLXMTW2Pp9h594RnYh3q3VfeYlFCikFvuvrafwXmTkz35uhLb+2ws="
-  file:
-    - app/build/outputs/apk/foss/release/app-foss-release.apk
-    - app/build/outputs/apk/google/release/app-google-release.apk
-  on:
-    repo: johan12345/EVMap
-    tags: true
-  skip_cleanup: 'true'

Gemfile.lock

@@ -113,7 +113,7 @@ GEM
     http-cookie (1.0.3)
       domain_name (~> 0.5)
     httpclient (2.8.3)
-    jmespath (1.4.0)
+    jmespath (1.6.1)
     json (2.3.1)
     jwt (2.2.1)
     memoist (0.16.2)

LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2020-2021 Johan von Forstner
+Copyright (c) 2020-2022 Johan von Forstner
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -1,4 +1,4 @@
-EVMap [![Build Status](https://app.travis-ci.com/johan12345/EVMap.svg?branch=master)](https://app.travis-ci.com/johan12345/EVMap)
+EVMap [![Build Status](https://github.com/johan12345/EVMap/actions/workflows/tests.yml/badge.svg)](https://github.com/johan12345/EVMap/actions)
 =====
 
 <img src="https://raw.githubusercontent.com/johan12345/EVMap/master/_img/feature_graphic.svg" width=700 alt="Logo"/>

app/build.gradle

@@ -1,33 +1,39 @@
+plugins {
+    id 'com.adarshr.test-logger' version '3.1.0'
+}
+
 apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-parcelize'
 apply plugin: 'kotlin-kapt'
 apply plugin: 'androidx.navigation.safeargs.kotlin'
 apply plugin: 'com.mikepenz.aboutlibraries.plugin'
+apply plugin: 'de.timfreiheit.resourceplaceholders'
 
 android {
-    compileSdkVersion 31
+    compileSdkVersion 32
     buildToolsVersion "30.0.3"
 
     defaultConfig {
         applicationId "net.vonforst.evmap"
         minSdkVersion 21
         targetSdkVersion 31
-        versionCode 68
-        versionName "1.2.0"
+        // NOTE: always increase versionCode by 2 since automotive flavor uses versionCode + 1
+        versionCode 90
+        versionName "1.3.4"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
 
     signingConfigs {
         release {
-            def isRunningOnTravis = System.getenv("CI") == "true"
-            if (isRunningOnTravis) {
+            def isRunningOnCI = System.getenv("CI") == "true"
+            if (isRunningOnCI) {
                 // configure keystore
                 storeFile = file("../_ci/keystore.jks")
-                storePassword = System.getenv("keystore_password")
-                keyAlias = System.getenv("keystore_alias")
-                keyPassword = System.getenv("keystore_alias_password")
+                storePassword = System.getenv("KEYSTORE_PASSWORD")
+                keyAlias = System.getenv("KEYSTORE_ALIAS")
+                keyPassword = System.getenv("KEYSTORE_ALIAS_PASSWORD")
             }
         }
     }
@@ -44,7 +50,7 @@ android {
         }
     }
 
-    flavorDimensions "dependencies"
+    flavorDimensions "dependencies", "automotive"
     productFlavors {
         foss {
             dimension "dependencies"
@@ -53,6 +59,22 @@ android {
             dimension "dependencies"
             versionNameSuffix "-google"
         }
+        normal {
+            dimension "automotive"
+        }
+        automotive {
+            dimension "automotive"
+            versionNameSuffix "-automotive"
+            versionCode defaultConfig.versionCode + 1
+            minSdkVersion 29
+        }
+    }
+    variantFilter { variant ->
+        def names = variant.flavors*.name
+        // Android Automotive OS app is always based on Google variant
+        if (names.contains("automotive") && !names.contains("google")) {
+            setIgnore(true)
+        }
     }
 
     compileOptions {
@@ -69,6 +91,17 @@ android {
         dataBinding = true
         viewBinding true
     }
+    lint {
+        disable 'NullSafeMutableLiveData'
+    }
+
+    testOptions {
+        unitTests.includeAndroidResources true
+    }
+
+    resourcePlaceholders {
+        files = ['xml/shortcuts.xml']
+    }
 
     // add API keys from environment variable if not set in apikeys.xml
     applicationVariants.all { variant ->
@@ -85,7 +118,7 @@ android {
             variant.resValue "string", "openchargemap_key", openchargemapKey
         }
         def googleMapsKey = env.GOOGLE_MAPS_API_KEY ?: project.findProperty("GOOGLE_MAPS_API_KEY")
-        if (googleMapsKey != null && variant.flavorName == 'google') {
+        if (googleMapsKey != null && variant.flavorName.startsWith('google')) {
             variant.resValue "string", "google_maps_key", googleMapsKey
         }
         def mapboxKey = env.MAPBOX_API_KEY ?: project.findProperty("MAPBOX_API_KEY")
@@ -104,24 +137,27 @@ android {
         }
     }
 
-    lintOptions {
-        disable 'NullSafeMutableLiveData'
-    }
+}
+
+configurations {
+    googleNormalImplementation {}
+    googleAutomotiveImplementation {}
 }
 
 dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
-    implementation 'androidx.appcompat:appcompat:1.4.0'
-    implementation 'androidx.core:core-ktx:1.7.0'
-    implementation 'androidx.core:core-splashscreen:1.0.0-alpha02'
-    implementation "androidx.activity:activity-ktx:1.4.0"
-    implementation "androidx.fragment:fragment-ktx:1.4.0"
+    implementation 'androidx.appcompat:appcompat:1.4.2'
+    implementation 'androidx.core:core-ktx:1.8.0'
+    implementation 'androidx.core:core-splashscreen:1.0.0'
+    implementation "androidx.activity:activity-ktx:1.5.1"
+    implementation "androidx.fragment:fragment-ktx:1.5.1"
     implementation 'androidx.cardview:cardview:1.0.0'
-    implementation 'androidx.preference:preference-ktx:1.1.1'
-    implementation 'com.google.android.material:material:1.5.0-rc01'
-    implementation 'androidx.constraintlayout:constraintlayout:2.1.1'
+    implementation 'androidx.preference:preference-ktx:1.2.0'
+    implementation 'com.google.android.material:material:1.6.1'
+    implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
     implementation 'androidx.recyclerview:recyclerview:1.2.1'
     implementation 'androidx.browser:browser:1.4.0'
+    implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0'
     implementation 'com.github.johan12345:CustomBottomSheetBehavior:f69f532660'
     implementation 'com.squareup.retrofit2:retrofit:2.9.0'
     implementation 'com.squareup.retrofit2:converter-moshi:2.9.0'
@@ -143,18 +179,24 @@ dependencies {
     implementation 'com.github.romandanylyk:PageIndicatorView:b1bad589b5'
 
     // Android Auto
-    googleImplementation 'androidx.car.app:app:1.2.0-alpha02'
-    googleImplementation 'androidx.car.app:app-projected:1.2.0-alpha02'
+    def carAppVersion = '1.3.0-alpha01'
+    googleImplementation "androidx.car.app:app:$carAppVersion"
+    googleNormalImplementation "androidx.car.app:app-projected:$carAppVersion"
+    googleAutomotiveImplementation "androidx.car.app:app-automotive:$carAppVersion"
 
     // AnyMaps
-    def anyMapsVersion = '751daec281'
+    def anyMapsVersion = '3c67d7a1dc'
     implementation "com.github.johan12345.AnyMaps:anymaps-base:$anyMapsVersion"
     googleImplementation "com.github.johan12345.AnyMaps:anymaps-google:$anyMapsVersion"
-    googleImplementation 'com.google.android.gms:play-services-maps:18.0.1'
-    implementation "com.github.johan12345.AnyMaps:anymaps-mapbox:$anyMapsVersion"
+    googleImplementation 'com.google.android.gms:play-services-maps:18.1.0'
+    implementation("com.github.johan12345.AnyMaps:anymaps-mapbox:$anyMapsVersion") {
+        exclude group: 'com.mapbox.mapboxsdk', module: 'mapbox-android-accounts'
+        exclude group: 'com.mapbox.mapboxsdk', module: 'mapbox-android-telemetry'
+        exclude group: 'com.google.android.gms', module: 'play-services-location'
+    }
 
     // Google Places
-    implementation 'com.google.android.libraries.places:places:2.5.0'
+    googleImplementation 'com.google.android.libraries.places:places:2.6.0'
     googleImplementation 'org.jetbrains.kotlinx:kotlinx-coroutines-play-services:1.4.1'
 
     // Mapbox Geocoding
@@ -165,18 +207,18 @@ dependencies {
     implementation "androidx.navigation:navigation-ui-ktx:$nav_version"
 
     // viewmodel library
-    def lifecycle_version = "2.4.0"
+    def lifecycle_version = "2.5.1"
     implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycle_version"
     implementation "androidx.lifecycle:lifecycle-livedata-ktx:$lifecycle_version"
 
     // room library
-    def room_version = "2.4.0"
+    def room_version = "2.4.3"
     implementation "androidx.room:room-runtime:$room_version"
     kapt "androidx.room:room-compiler:$room_version"
     implementation "androidx.room:room-ktx:$room_version"
 
     // billing library
-    def billing_version = "4.0.0"
+    def billing_version = "4.1.0"
     googleImplementation "com.android.billingclient:billing:$billing_version"
     googleImplementation "com.android.billingclient:billing-ktx:$billing_version"
 
@@ -189,10 +231,18 @@ dependencies {
     // debug tools
     implementation 'com.facebook.stetho:stetho:1.5.1'
     implementation 'com.facebook.stetho:stetho-okhttp3:1.5.1'
+
+    // testing
     testImplementation 'junit:junit:4.13.2'
     testImplementation "com.squareup.okhttp3:mockwebserver:4.9.0"
     //noinspection GradleDependency
     testImplementation 'org.json:json:20080701'
+
+    // testing for car app
+    testGoogleImplementation "androidx.car.app:app-testing:$carAppVersion"
+    testGoogleImplementation 'org.robolectric:robolectric:4.7.3'
+    testGoogleImplementation 'androidx.test:core:1.4.0'
+
     androidTestImplementation 'androidx.test.ext:junit:1.1.3'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
 
@@ -211,4 +261,4 @@ private static byte[] xorWithKey(byte[] a, byte[] key) {
         out[i] = (byte) (a[i] ^ key[i%key.length]);
     }
     return out;
-}
+}

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

@@ -9,6 +9,7 @@
     <string-array name="pref_search_provider_values" tranlatable="false">
         <item>mapbox</item>
     </string-array>
-    <string name="donations_info" formatted="false">Findest du EVMap nützlich? Unterstütze die Weiterentwicklung der App mit einer Spende an den Entwickler.\n\nGoogle zieht von der Spende 30% Gebühren ab.</string>
+    <string name="donations_info" formatted="false">Findest du EVMap nützlich? Unterstütze die Weiterentwicklung der App mit einer Spende an den Entwickler.</string>
     <string name="donate_paypal">Mit PayPal spenden</string>
+    <string name="data_sources_hint">Die Kartendaten für die App stammen von OpenStreetMap (Mapbox).</string>
 </resources>

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

@@ -17,4 +17,5 @@
     <string name="donations_info" formatted="false">Do you find EVMap useful? Support its development by sending a donation to the developer.</string>
     <string name="donate_paypal">Donate with PayPal</string>
     <string name="paypal_link" translatable="false">https://paypal.me/johan98</string>
+    <string name="data_sources_hint">Map data in the app is provided by OpenStreetMap (Mapbox).</string>
 </resources>

app/src/google/AndroidManifest.xml

@@ -39,14 +39,8 @@
             <intent-filter>
                 <action
                     android:name="androidx.car.app.CarAppService"
-                    android:category="androidx.car.app.category.CHARGING" />
+                    android:category="androidx.car.app.category.POI" />
             </intent-filter>
         </service>
-
-        <service
-            android:name=".auto.CarLocationService"
-            android:foregroundServiceType="location"
-            android:enabled="true"
-            android:exported="false" />
     </application>
 </manifest>

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

@@ -1,22 +1,34 @@
 package net.vonforst.evmap.auto
 
-import android.content.*
+import android.Manifest
+import android.annotation.SuppressLint
+import android.app.Notification
+import android.app.NotificationChannel
+import android.app.NotificationManager
+import android.content.Context
+import android.content.Intent
 import android.content.pm.ApplicationInfo
 import android.location.Location
-import android.os.IBinder
+import android.location.LocationManager
+import android.os.Build
+import android.util.Log
+import androidx.annotation.RequiresPermission
 import androidx.car.app.CarContext
 import androidx.car.app.Screen
+import androidx.car.app.ScreenManager
 import androidx.car.app.Session
+import androidx.car.app.annotations.ExperimentalCarApi
 import androidx.car.app.hardware.CarHardwareManager
 import androidx.car.app.hardware.common.CarValue
 import androidx.car.app.hardware.info.CarHardwareLocation
 import androidx.car.app.hardware.info.CarSensors
 import androidx.car.app.validation.HostValidator
+import androidx.core.app.NotificationCompat
+import androidx.core.app.NotificationManagerCompat
 import androidx.core.content.ContextCompat
-import androidx.lifecycle.Lifecycle
-import androidx.lifecycle.LifecycleObserver
-import androidx.lifecycle.OnLifecycleEvent
-import androidx.localbroadcastmanager.content.LocalBroadcastManager
+import androidx.lifecycle.DefaultLifecycleObserver
+import androidx.lifecycle.LifecycleOwner
+import net.vonforst.evmap.R
 import net.vonforst.evmap.utils.checkAnyLocationPermission
 
 
@@ -24,7 +36,46 @@ interface LocationAwareScreen {
     fun updateLocation(location: Location)
 }
 
+@ExperimentalCarApi
 class CarAppService : androidx.car.app.CarAppService() {
+    private val CHANNEL_ID = "car_location"
+    private val NOTIFICATION_ID = 1000
+
+    override fun onCreate() {
+        super.onCreate()
+
+        // we want to run as a foreground service to make sure we can use location
+        createNotificationChannel()
+        startForeground(NOTIFICATION_ID, getNotification())
+    }
+
+    private fun createNotificationChannel() {
+        val notificationManager = getSystemService(NOTIFICATION_SERVICE) as NotificationManager
+        // Android O requires a Notification Channel.
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+            val name: CharSequence = getString(R.string.app_name)
+            // Create the channel for the notification
+            val mChannel =
+                NotificationChannel(CHANNEL_ID, name, NotificationManager.IMPORTANCE_DEFAULT)
+
+            // Set the Notification Channel for the Notification Manager.
+            notificationManager.createNotificationChannel(mChannel)
+        }
+    }
+
+    private fun getNotification(): Notification {
+        val builder: NotificationCompat.Builder = NotificationCompat.Builder(this, CHANNEL_ID)
+            .setContentText(getString(R.string.auto_location_service))
+            .setContentTitle(getString(R.string.app_name))
+            .setOngoing(true)
+            .setPriority(NotificationManagerCompat.IMPORTANCE_HIGH)
+            .setSmallIcon(R.mipmap.ic_launcher)
+            .setTicker(getString(R.string.auto_location_service))
+            .setWhen(System.currentTimeMillis())
+
+        return builder.build()
+    }
+
     override fun createHostValidator(): HostValidator {
         return if (applicationInfo.flags and ApplicationInfo.FLAG_DEBUGGABLE != 0) {
             HostValidator.ALLOW_ALL_HOSTS_VALIDATOR
@@ -40,49 +91,50 @@ class CarAppService : androidx.car.app.CarAppService() {
     }
 }
 
-class EVMapSession(val cas: CarAppService) : Session(), LifecycleObserver {
+@ExperimentalCarApi
+class EVMapSession(val cas: CarAppService) : Session(), DefaultLifecycleObserver {
+    private val TAG = "EVMapSession"
     var mapScreen: LocationAwareScreen? = null
         set(value) {
             field = value
             location?.let { value?.updateLocation(it) }
         }
     private var location: Location? = null
-    private var locationService: CarLocationService? = null
+    private val locationManager: LocationManager by lazy {
+        carContext.getSystemService(Context.LOCATION_SERVICE) as LocationManager
+    }
+
     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) {
-            val binder: CarLocationService.LocalBinder = ibinder as CarLocationService.LocalBinder
-            locationService = binder.service
-            locationService?.requestLocationUpdates()
-        }
-
-        override fun onServiceDisconnected(name: ComponentName?) {
-            locationService = null
-        }
-    }
-    private var serviceBound = false
-
     init {
         lifecycle.addObserver(this)
     }
 
     override fun onCreateScreen(intent: Intent): Screen {
-        return WelcomeScreen(carContext, this)
+        val mapScreen = MapScreen(carContext, this)
+
+        if (!locationPermissionGranted()) {
+            val screenManager = carContext.getCarService(ScreenManager::class.java)
+            screenManager.push(mapScreen)
+            return PermissionScreen(
+                carContext,
+                R.string.auto_location_permission_needed,
+                listOf(
+                    Manifest.permission.ACCESS_FINE_LOCATION,
+                    Manifest.permission.ACCESS_COARSE_LOCATION
+                )
+            )
+        }
+
+        return mapScreen
     }
 
     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?
-            updateLocation(location)
-        }
-    }
-
     private fun updateLocation(location: Location?) {
+        Log.d(TAG, "Received location: $location")
         val mapScreen = mapScreen
         if (location != null && mapScreen != null) {
             mapScreen.updateLocation(location)
@@ -90,19 +142,23 @@ class EVMapSession(val cas: CarAppService) : Session(), LifecycleObserver {
         this.location = location
     }
 
-    private fun onCarHardwareLocationReceived(loc: CarHardwareLocation) {
-        if (loc.location.status == CarValue.STATUS_SUCCESS && loc.location.value != null) {
-            updateLocation(loc.location.value)
-
-            // we successfully received a location from the car hardware,
-            // so we don't need the smartphone location anymore.
-            unbindLocationService()
-        }
+    override fun onStart(owner: LifecycleOwner) {
+        requestLocationUpdates()
     }
 
-    @OnLifecycleEvent(Lifecycle.Event.ON_START)
-    fun bindLocationService() {
+    override fun onStop(owner: LifecycleOwner) {
+        removeLocationUpdates()
+    }
+
+    @SuppressLint("MissingPermission")
+    fun requestLocationUpdates() {
         if (!locationPermissionGranted()) return
+        Log.i(TAG, "Requesting location updates")
+        requestCarHardwareLocationUpdates()
+        requestPhoneLocationUpdates()
+    }
+
+    private fun requestCarHardwareLocationUpdates() {
         if (supportsCarApiLevel3(carContext)) {
             val exec = ContextCompat.getMainExecutor(carContext)
             hardwareMan.carSensors.addCarHardwareLocationListener(
@@ -111,40 +167,48 @@ class EVMapSession(val cas: CarAppService) : Session(), LifecycleObserver {
                 ::onCarHardwareLocationReceived
             )
         }
-        serviceBound = cas.bindService(
-            Intent(cas, CarLocationService::class.java),
-            serviceConnection,
-            Context.BIND_AUTO_CREATE
+    }
+
+    @RequiresPermission(anyOf = [Manifest.permission.ACCESS_COARSE_LOCATION, Manifest.permission.ACCESS_FINE_LOCATION])
+    private fun requestPhoneLocationUpdates() {
+        val location = locationManager.getLastKnownLocation(LocationManager.GPS_PROVIDER)
+        updateLocation(location)
+        locationManager.requestLocationUpdates(
+            LocationManager.GPS_PROVIDER,
+            1000,
+            1f,
+            this::updateLocation
         )
     }
 
-    @OnLifecycleEvent(Lifecycle.Event.ON_STOP)
-    private fun onStop() {
+
+    @SuppressLint("MissingPermission")
+    private fun removeLocationUpdates() {
+        if (!locationPermissionGranted()) return
+        removeCarHardwareLocationUpdates()
+        removePhoneLocationUpdates()
+    }
+
+    private fun removeCarHardwareLocationUpdates() {
         if (supportsCarApiLevel3(carContext)) {
             hardwareMan.carSensors.removeCarHardwareLocationListener(::onCarHardwareLocationReceived)
         }
-        unbindLocationService()
     }
 
-    private fun unbindLocationService() {
-        locationService?.removeLocationUpdates()
-        if (serviceBound) {
-            cas.unbindService(serviceConnection)
-            serviceBound = false
+    @RequiresPermission(anyOf = [Manifest.permission.ACCESS_COARSE_LOCATION, Manifest.permission.ACCESS_FINE_LOCATION])
+    private fun removePhoneLocationUpdates() {
+        locationManager.removeUpdates(this::updateLocation)
+    }
+
+    @SuppressLint("MissingPermission")
+    private fun onCarHardwareLocationReceived(loc: CarHardwareLocation) {
+        if (loc.location.status == CarValue.STATUS_SUCCESS && loc.location.value != null) {
+            updateLocation(loc.location.value)
+
+            // we successfully received a location from the car hardware,
+            // so we don't need the smartphone location anymore.
+            removePhoneLocationUpdates()
         }
     }
-
-    @OnLifecycleEvent(Lifecycle.Event.ON_RESUME)
-    private fun registerBroadcastReceiver() {
-        LocalBroadcastManager.getInstance(cas).registerReceiver(
-            locationReceiver,
-            IntentFilter(CarLocationService.ACTION_BROADCAST)
-        );
-    }
-
-    @OnLifecycleEvent(Lifecycle.Event.ON_PAUSE)
-    private fun unregisterBroadcastReceiver() {
-        LocalBroadcastManager.getInstance(cas).unregisterReceiver(locationReceiver)
-    }
 }
 

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

@@ -1,163 +0,0 @@
-package net.vonforst.evmap.auto
-
-import android.app.Notification
-import android.app.NotificationChannel
-import android.app.NotificationManager
-import android.app.Service
-import android.content.Intent
-import android.location.Location
-import android.os.*
-import android.util.Log
-import androidx.core.app.NotificationCompat
-import androidx.core.app.NotificationManagerCompat
-import androidx.localbroadcastmanager.content.LocalBroadcastManager
-import com.google.android.gms.location.*
-import net.vonforst.evmap.BuildConfig
-import net.vonforst.evmap.R
-
-
-class CarLocationService : Service() {
-    private lateinit var serviceHandler: Handler
-    private lateinit var locationRequest: LocationRequest
-    private lateinit var notificationManager: NotificationManager
-    private lateinit var locationCallback: LocationCallback
-    private lateinit var fusedLocationClient: FusedLocationProviderClient
-    private val binder: IBinder = LocalBinder(this)
-    private var location: Location? = null
-
-    private val UPDATE_INTERVAL_IN_MILLISECONDS = 10000L
-    private val FASTEST_UPDATE_INTERVAL_IN_MILLISECONDS = UPDATE_INTERVAL_IN_MILLISECONDS / 2
-
-    private val CHANNEL_ID = "car_location"
-    private val NOTIFICATION_ID = 1000
-    private val TAG = "CarLocationService"
-
-    companion object {
-        const val ACTION_BROADCAST: String = BuildConfig.APPLICATION_ID + ".car_location_broadcast"
-        const val EXTRA_LOCATION: String = BuildConfig.APPLICATION_ID + ".location"
-    }
-
-    override fun onCreate() {
-        fusedLocationClient = LocationServices.getFusedLocationProviderClient(this)
-        locationCallback = object : LocationCallback() {
-            override fun onLocationResult(locationResult: LocationResult) {
-                super.onLocationResult(locationResult)
-                onNewLocation(locationResult.lastLocation)
-            }
-        }
-        createLocationRequest()
-        getLastLocation()
-        val handlerThread = HandlerThread(TAG)
-        handlerThread.start()
-        serviceHandler = Handler(handlerThread.looper)
-        notificationManager = getSystemService(NOTIFICATION_SERVICE) as NotificationManager
-
-        // Android O requires a Notification Channel.
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-            val name: CharSequence = getString(R.string.app_name)
-            // Create the channel for the notification
-            val mChannel =
-                NotificationChannel(CHANNEL_ID, name, NotificationManager.IMPORTANCE_DEFAULT)
-
-            // Set the Notification Channel for the Notification Manager.
-            notificationManager.createNotificationChannel(mChannel)
-        }
-
-        startForeground(NOTIFICATION_ID, getNotification())
-    }
-
-    /**
-     * Returns the [NotificationCompat] used as part of the foreground service.
-     */
-    private fun getNotification(): Notification {
-        val builder: NotificationCompat.Builder = NotificationCompat.Builder(this, CHANNEL_ID)
-            .setContentText(getString(R.string.auto_location_service))
-            .setContentTitle(getString(R.string.app_name))
-            .setOngoing(true)
-            .setPriority(NotificationManagerCompat.IMPORTANCE_HIGH)
-            .setSmallIcon(R.mipmap.ic_launcher)
-            .setTicker(getString(R.string.auto_location_service))
-            .setWhen(System.currentTimeMillis())
-
-        return builder.build()
-    }
-
-    override fun onBind(intent: Intent?): IBinder {
-        return binder
-    }
-
-    private fun createLocationRequest() {
-        locationRequest = LocationRequest()
-        locationRequest.interval = UPDATE_INTERVAL_IN_MILLISECONDS
-        locationRequest.fastestInterval = FASTEST_UPDATE_INTERVAL_IN_MILLISECONDS
-        locationRequest.priority = LocationRequest.PRIORITY_HIGH_ACCURACY
-    }
-
-    private fun onNewLocation(location: Location) {
-        Log.i(TAG, "New location: $location")
-        this.location = location
-
-        // Notify anyone listening for broadcasts about the new location.
-        val intent = Intent(ACTION_BROADCAST)
-        intent.putExtra(EXTRA_LOCATION, location)
-        LocalBroadcastManager.getInstance(applicationContext).sendBroadcast(intent)
-    }
-
-    private fun getLastLocation() {
-        try {
-            fusedLocationClient.lastLocation
-                .addOnCompleteListener { task ->
-                    if (task.isSuccessful && task.result != null) {
-                        location = task.result
-                    } else {
-                        Log.w(TAG, "Failed to get location.")
-                    }
-                }
-        } catch (unlikely: SecurityException) {
-            Log.e(TAG, "Lost location permission.$unlikely")
-        }
-    }
-
-    /**
-     * Makes a request for location updates. Note that in this sample we merely log the
-     * [SecurityException].
-     */
-    fun requestLocationUpdates() {
-        Log.i(TAG, "Requesting location updates")
-        startService(Intent(applicationContext, CarLocationService::class.java))
-        try {
-            fusedLocationClient.requestLocationUpdates(
-                locationRequest,
-                locationCallback, Looper.myLooper()
-            )
-        } catch (unlikely: SecurityException) {
-            Log.e(TAG, "Lost location permission. Could not request updates. $unlikely")
-        }
-    }
-
-    /**
-     * Removes location updates. Note that in this sample we merely log the
-     * [SecurityException].
-     */
-    fun removeLocationUpdates() {
-        Log.i(TAG, "Removing location updates")
-        try {
-            fusedLocationClient.removeLocationUpdates(locationCallback)
-            stopSelf()
-        } catch (unlikely: SecurityException) {
-            Log.e(TAG, "Lost location permission. Could not remove updates. $unlikely")
-        }
-    }
-
-    override fun onStartCommand(intent: Intent, flags: Int, startId: Int): Int {
-        Log.i(TAG, "Service started")
-        // Tells the system to not try to recreate the service after it has been killed.
-        return START_NOT_STICKY
-    }
-
-    override fun onDestroy() {
-        serviceHandler.removeCallbacksAndMessages(null)
-    }
-
-    class LocalBinder(val service: CarLocationService) : Binder()
-}

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

@@ -0,0 +1,140 @@
+package net.vonforst.evmap.auto
+
+import android.content.Context
+import android.hardware.Sensor
+import android.hardware.SensorEvent
+import android.hardware.SensorEventListener
+import android.hardware.SensorManager
+import androidx.car.app.CarContext
+import androidx.car.app.hardware.CarHardwareManager
+import androidx.car.app.hardware.common.CarValue
+import androidx.car.app.hardware.common.OnCarDataAvailableListener
+import androidx.car.app.hardware.info.*
+import androidx.car.app.hardware.info.CarSensors.UpdateRate
+import net.vonforst.evmap.BuildConfig
+import java.util.concurrent.Executor
+
+/**
+ * CarSensors is not yet implemented for Android Automotive OS
+ * (see docs at https://developer.android.com/reference/androidx/car/app/hardware/info/CarSensors)
+ * so we provide our own implementation based on SensorManager APIs.
+ */
+val CarContext.patchedCarSensors: CarSensors
+    get() = if (BuildConfig.FLAVOR_automotive != "automotive") {
+        (this.getCarService(CarContext.HARDWARE_SERVICE) as CarHardwareManager).carSensors
+    } else {
+        CarSensorsWrapper(this)
+    }
+
+class CarSensorsWrapper(carContext: CarContext) :
+    CarSensors {
+    private val sensorManager = carContext.getSystemService(Context.SENSOR_SERVICE) as SensorManager
+    private val compassListeners: MutableMap<OnCarDataAvailableListener<Compass>, SensorEventListener> =
+        mutableMapOf()
+
+    override fun addAccelerometerListener(
+        rate: Int,
+        executor: Executor,
+        listener: OnCarDataAvailableListener<Accelerometer>
+    ) {
+        TODO("Not yet implemented")
+    }
+
+    override fun removeAccelerometerListener(listener: OnCarDataAvailableListener<Accelerometer>) {
+        TODO("Not yet implemented")
+    }
+
+    override fun addGyroscopeListener(
+        rate: Int,
+        executor: Executor,
+        listener: OnCarDataAvailableListener<Gyroscope>
+    ) {
+        TODO("Not yet implemented")
+    }
+
+    override fun removeGyroscopeListener(listener: OnCarDataAvailableListener<Gyroscope>) {
+        TODO("Not yet implemented")
+    }
+
+    override fun addCompassListener(
+        rate: Int,
+        executor: Executor,
+        listener: OnCarDataAvailableListener<Compass>
+    ) {
+        val magSensor = sensorManager.getDefaultSensor(Sensor.TYPE_MAGNETIC_FIELD)
+        val accSensor = sensorManager.getDefaultSensor(Sensor.TYPE_ACCELEROMETER)
+
+        if (magSensor == null) {
+            executor.execute {
+                listener.onCarDataAvailable(Compass(CarValue(null, 0, CarValue.STATUS_UNAVAILABLE)))
+            }
+            return
+        }
+        val sensorListener = object : SensorEventListener {
+            var magValues: FloatArray? = null
+
+            // AAOS cars may not provide an acceleration sensor, so we assume acceleration based on
+            // Earth's gravity. May not be correct when driving on other planets.
+            var accValues = floatArrayOf(0f, 0f, SensorManager.GRAVITY_EARTH)
+            val rotMatrix = FloatArray(9)
+            val orientation = FloatArray(3)
+
+            override fun onSensorChanged(event: SensorEvent) {
+                when (event.sensor) {
+                    magSensor -> magValues = event.values
+                    accSensor -> accValues = event.values
+                }
+                if (magValues == null) return
+
+                SensorManager.getRotationMatrix(rotMatrix, null, accValues, magValues)
+                SensorManager.getOrientation(rotMatrix, orientation)
+                val compassDegrees = orientation.map { Math.toDegrees(it.toDouble()).toFloat() }
+                executor.execute {
+                    listener.onCarDataAvailable(
+                        Compass(
+                            CarValue(
+                                compassDegrees,
+                                event.timestamp,
+                                CarValue.STATUS_SUCCESS
+                            )
+                        )
+                    )
+                }
+            }
+
+            override fun onAccuracyChanged(sensor: Sensor, accuracy: Int) {
+            }
+
+        }
+        compassListeners[listener] = sensorListener
+        sensorManager.registerListener(sensorListener, magSensor, mapRate(rate))
+        accSensor?.let { sensorManager.registerListener(sensorListener, it, mapRate(rate)) }
+    }
+
+    private fun mapRate(@UpdateRate rate: Int): Int {
+        return when (rate) {
+            CarSensors.UPDATE_RATE_NORMAL -> SensorManager.SENSOR_DELAY_NORMAL
+            CarSensors.UPDATE_RATE_UI -> SensorManager.SENSOR_DELAY_UI
+            CarSensors.UPDATE_RATE_FASTEST -> SensorManager.SENSOR_DELAY_FASTEST
+            else -> throw IllegalArgumentException()
+        }
+    }
+
+    override fun removeCompassListener(listener: OnCarDataAvailableListener<Compass>) {
+        compassListeners[listener]?.let {
+            sensorManager.unregisterListener(it)
+        }
+    }
+
+    override fun addCarHardwareLocationListener(
+        rate: Int,
+        executor: Executor,
+        listener: OnCarDataAvailableListener<CarHardwareLocation>
+    ) {
+        TODO("Not yet implemented")
+    }
+
+    override fun removeCarHardwareLocationListener(listener: OnCarDataAvailableListener<CarHardwareLocation>) {
+        TODO("Not yet implemented")
+    }
+}

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

@@ -22,7 +22,7 @@ import moe.banana.jsonapi2.HasMany
 import moe.banana.jsonapi2.HasOne
 import moe.banana.jsonapi2.JsonBuffer
 import moe.banana.jsonapi2.ResourceIdentifier
-import net.vonforst.evmap.*
+import net.vonforst.evmap.R
 import net.vonforst.evmap.api.chargeprice.*
 import net.vonforst.evmap.model.ChargeLocation
 import net.vonforst.evmap.storage.AppDatabase
@@ -198,7 +198,8 @@ class ChargepriceScreen(ctx: CarContext, val charger: ChargeLocation) : Screen(c
                         batteryRange = batteryRange.map { it.toDouble() },
                         providerCustomerTariffs = prefs.chargepriceShowProviderCustomerTariffs,
                         maxMonthlyFees = if (prefs.chargepriceNoBaseFee) 0.0 else null,
-                        currency = prefs.chargepriceCurrency
+                        currency = prefs.chargepriceCurrency,
+                        allowUnbalancedLoad = prefs.chargepriceAllowUnbalancedLoad
                     )
                 }, ChargepriceApi.getChargepriceLanguage())
 

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

@@ -19,6 +19,7 @@ import androidx.lifecycle.lifecycleScope
 import coil.imageLoader
 import coil.request.ImageRequest
 import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.Job
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import net.vonforst.evmap.*
@@ -29,6 +30,7 @@ import net.vonforst.evmap.api.createApi
 import net.vonforst.evmap.api.nameForPlugType
 import net.vonforst.evmap.api.stringProvider
 import net.vonforst.evmap.model.ChargeLocation
+import net.vonforst.evmap.model.Favorite
 import net.vonforst.evmap.storage.AppDatabase
 import net.vonforst.evmap.storage.PreferenceDataSource
 import net.vonforst.evmap.ui.ChargerIconGenerator
@@ -54,11 +56,10 @@ class ChargerDetailScreen(ctx: CarContext, val chargerSparse: ChargeLocation) :
     private val referenceData = api.getReferenceData(lifecycleScope, carContext)
 
     private val imageSize = 128  // images should be 128dp according to docs
-    private val imageHeightLarge = 480  // images should be 480 x 854 dp according to docs
-    private val imageWidthLarge = 854
+    private val imageSizeLarge = 480  // images should be 480 x 480 dp according to docs
 
     private val iconGen =
-        ChargerIconGenerator(carContext, null, oversize = 1.4f, height = imageSize)
+        ChargerIconGenerator(carContext, null, height = imageSize)
 
     private val maxRows = if (ctx.carAppApiLevel >= 2) {
         ctx.constraintManager.getContentLimit(ConstraintManager.CONTENT_LIMIT_TYPE_PANE)
@@ -66,6 +67,9 @@ class ChargerDetailScreen(ctx: CarContext, val chargerSparse: ChargeLocation) :
     private val largeImageSupported =
         ctx.carAppApiLevel >= 4  // since API 4, Row.setImage is supported
 
+    private var favorite: Favorite? = null
+    private var favoriteUpdateJob: Job? = null
+
     init {
         referenceData.observe(this) {
             loadCharger()
@@ -78,8 +82,10 @@ class ChargerDetailScreen(ctx: CarContext, val chargerSparse: ChargeLocation) :
         return PaneTemplate.Builder(
             Pane.Builder().apply {
                 charger?.let { charger ->
-                    if (largeImageSupported && photo != null) {
-                        setImage(CarIcon.Builder(IconCompat.createWithBitmap(photo)).build())
+                    if (largeImageSupported) {
+                        photo?.let {
+                            setImage(CarIcon.Builder(IconCompat.createWithBitmap(it)).build())
+                        }
                     }
                     generateRows(charger).forEach { addRow(it) }
                     addAction(
@@ -121,31 +127,86 @@ class ChargerDetailScreen(ctx: CarContext, val chargerSparse: ChargeLocation) :
         ).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()
-            )
+            charger?.let { charger ->
+                setActionStrip(
+                    ActionStrip.Builder().apply {
+                        if (BuildConfig.FLAVOR_automotive != "automotive") {
+                            // show "Open in app" action if not running on Android Automotive
+                            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()
+                            )
+                        }
+                        // show fav action
+                        addAction(Action.Builder()
+                            .setOnClickListener {
+                                favorite?.let {
+                                    deleteFavorite(it)
+                                } ?: run {
+                                    insertFavorite(charger)
+                                }
+                            }
+                            .setIcon(
+                                CarIcon.Builder(
+                                    IconCompat.createWithResource(
+                                        carContext,
+                                        if (favorite != null) {
+                                            R.drawable.ic_fav
+                                        } else {
+                                            R.drawable.ic_fav_no
+                                        }
+                                    )
+                                )
+                                    .setTint(CarColor.DEFAULT).build()
+                            )
+                            .build())
+                            .build()
+                    }.build()
+                )
+            }
         }.build()
     }
 
+    private fun insertFavorite(charger: ChargeLocation) {
+        if (favoriteUpdateJob?.isCompleted == false) return
+        favoriteUpdateJob = lifecycleScope.launch {
+            db.chargeLocationsDao().insert(charger)
+            val fav = Favorite(
+                chargerId = charger.id,
+                chargerDataSource = charger.dataSource
+            )
+            val id = db.favoritesDao().insert(fav)[0]
+            favorite = fav.copy(favoriteId = id)
+            invalidate()
+        }
+    }
+
+    private fun deleteFavorite(fav: Favorite) {
+        if (favoriteUpdateJob?.isCompleted == false) return
+        favoriteUpdateJob = lifecycleScope.launch {
+            db.favoritesDao().delete(fav)
+            favorite = null
+            invalidate()
+        }
+    }
+
     private fun generateRows(charger: ChargeLocation): List<Row> {
         val rows = mutableListOf<Row>()
+        val photo = photo
 
         // Row 1: address + chargepoints
         rows.add(Row.Builder().apply {
@@ -207,7 +268,7 @@ class ChargerDetailScreen(ctx: CarContext, val chargerSparse: ChargeLocation) :
                 setTitle(operatorText)
                 charger.cost?.let {
                     addText(it.getStatusText(carContext, emoji = true))
-                    (it.descriptionShort ?: it.descriptionLong)?.let { addText(it) }
+                    it.getDetailText()?.let { addText(it) }
                 }
             }.build())
             // row 3: fault report (if exists)
@@ -232,8 +293,10 @@ class ChargerDetailScreen(ctx: CarContext, val chargerSparse: ChargeLocation) :
             }
             // row 4: opening hours + location description
             charger.openinghours?.let { hours ->
+                val title =
+                    hours.getStatusText(carContext).ifEmpty { carContext.getString(R.string.hours) }
                 rows.add(Row.Builder().apply {
-                    setTitle(hours.getStatusText(carContext))
+                    setTitle(title)
                     hours.description?.let { addText(it) }
                     charger.locationDescription?.let { addText(it) }
                 }.build())
@@ -295,6 +358,8 @@ class ChargerDetailScreen(ctx: CarContext, val chargerSparse: ChargeLocation) :
     private fun loadCharger() {
         val referenceData = referenceData.value ?: return
         lifecycleScope.launch {
+            favorite = db.favoritesDao().findFavorite(chargerSparse.id, chargerSparse.dataSource)
+
             val response = api.getChargepointDetail(referenceData, chargerSparse.id)
             if (response.status == Status.SUCCESS) {
                 val charger = response.data!!
@@ -303,10 +368,7 @@ class ChargerDetailScreen(ctx: CarContext, val chargerSparse: ChargeLocation) :
                 photo?.let {
                     val density = carContext.resources.displayMetrics.density
                     val url = if (largeImageSupported) {
-                        photo.getUrl(
-                            width = (imageWidthLarge * density).roundToInt(),
-                            height = (imageHeightLarge * density).roundToInt()
-                        )
+                        photo.getUrl(size = (imageSizeLarge * density).roundToInt())
                     } else {
                         photo.getUrl(size = (imageSize * density).roundToInt())
                     }

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

@@ -1,39 +1,35 @@
 package net.vonforst.evmap.auto
 
-import android.graphics.Bitmap
+import android.app.Application
+import android.text.SpannableStringBuilder
+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.graphics.drawable.IconCompat
 import androidx.lifecycle.LiveData
+import androidx.lifecycle.lifecycleScope
+import kotlinx.coroutines.launch
 import net.vonforst.evmap.R
-import net.vonforst.evmap.model.FILTERS_CUSTOM
-import net.vonforst.evmap.model.FILTERS_DISABLED
-import net.vonforst.evmap.model.FILTERS_FAVORITES
+import net.vonforst.evmap.model.*
 import net.vonforst.evmap.storage.AppDatabase
 import net.vonforst.evmap.storage.FilterProfile
 import net.vonforst.evmap.storage.PreferenceDataSource
+import net.vonforst.evmap.viewmodel.FilterViewModel
 import kotlin.math.roundToInt
 
-class FilterScreen(ctx: CarContext) : Screen(ctx) {
+@androidx.car.app.annotations.ExperimentalCarApi
+class FilterScreen(ctx: CarContext, val session: EVMapSession) : Screen(ctx) {
     private val prefs = PreferenceDataSource(ctx)
     private val db = AppDatabase.getInstance(ctx)
     val filterProfiles: LiveData<List<FilterProfile>> by lazy {
         db.filterProfileDao().getProfiles(prefs.dataSource)
     }
-    private val maxRows = 6
-    private val checkIcon =
-        CarIcon.Builder(IconCompat.createWithResource(carContext, R.drawable.ic_check)).build()
-    private val emptyIcon: CarIcon
-
-    init {
-        val size = (ctx.resources.displayMetrics.density * 24).roundToInt()
-        emptyIcon = Bitmap.createBitmap(
-            size,
-            size,
-            Bitmap.Config.ARGB_8888
-        ).asCarIcon()
-    }
+    private val maxRows = if (ctx.carAppApiLevel >= 2) {
+        ctx.constraintManager.getContentLimit(ConstraintManager.CONTENT_LIMIT_TYPE_LIST)
+    } else 6
 
     init {
         filterProfiles.observe(this) {
@@ -42,15 +38,35 @@ class FilterScreen(ctx: CarContext) : Screen(ctx) {
     }
 
     override fun onGetTemplate(): Template {
-        val filterStatus =
-            prefs.filterStatus.takeUnless { it == FILTERS_CUSTOM || it == FILTERS_FAVORITES }
-                ?: FILTERS_DISABLED
+        val filterStatus = prefs.filterStatus
         return ListTemplate.Builder().apply {
             filterProfiles.value?.let {
-                setSingleList(buildFilterProfilesList(it.take(maxRows), filterStatus))
+                setSingleList(buildFilterProfilesList(it, filterStatus))
             } ?: setLoading(true)
             setTitle(carContext.getString(R.string.menu_filter))
             setHeaderAction(Action.BACK)
+            setActionStrip(
+                ActionStrip.Builder().apply {
+                    addAction(Action.Builder().apply {
+                        setIcon(
+                            CarIcon.Builder(
+                                IconCompat.createWithResource(
+                                    carContext,
+                                    R.drawable.ic_edit
+                                )
+                            ).build()
+
+                        )
+                        setOnClickListener(ParkedOnlyOnClickListener.create {
+                            lifecycleScope.launch {
+                                db.filterValueDao()
+                                    .copyFiltersToCustom(filterStatus, prefs.dataSource)
+                                screenManager.push(EditFiltersScreen(carContext))
+                            }
+                        })
+                    }.build())
+                }.build()
+            )
         }.build()
     }
 
@@ -58,36 +74,325 @@ class FilterScreen(ctx: CarContext) : Screen(ctx) {
         profiles: List<FilterProfile>,
         filterStatus: Long
     ): ItemList {
+        val extraRows = if (FILTERS_CUSTOM == filterStatus) 3 else 2
+        val profilesToShow =
+            profiles.sortedByDescending { it.id == filterStatus }.take(maxRows - extraRows)
         return ItemList.Builder().apply {
             addItem(Row.Builder().apply {
                 setTitle(carContext.getString(R.string.no_filters))
-                if (FILTERS_DISABLED == filterStatus) {
-                    setImage(checkIcon)
-                } else {
-                    setImage(emptyIcon)
-                }
-                setOnClickListener {
-                    prefs.filterStatus = FILTERS_DISABLED
-                    screenManager.pop()
-                }
             }.build())
-            profiles.forEach {
+            addItem(Row.Builder().apply {
+                setTitle(carContext.getString(R.string.filter_favorites))
+            }.build())
+            profilesToShow.forEach {
                 addItem(Row.Builder().apply {
                     val name =
                         it.name.ifEmpty { carContext.getString(R.string.unnamed_filter_profile) }
                     setTitle(name)
-                    if (it.id == filterStatus) {
-                        setImage(checkIcon)
-                    } else {
-                        setImage(emptyIcon)
+                }.build())
+            }
+            if (FILTERS_CUSTOM == filterStatus) {
+                addItem(Row.Builder().apply {
+                    setTitle(carContext.getString(R.string.filter_custom))
+                }.build())
+            }
+            setSelectedIndex(when (filterStatus) {
+                FILTERS_DISABLED -> 0
+                FILTERS_FAVORITES -> 1
+                FILTERS_CUSTOM -> profilesToShow.size + 2
+                else -> profilesToShow.indexOfFirst { it.id == filterStatus } + 2
+            })
+            setOnSelectedListener { index ->
+                onItemClick(
+                    when (index) {
+                        0 -> FILTERS_DISABLED
+                        1 -> FILTERS_FAVORITES
+                        profilesToShow.size + 2 -> FILTERS_CUSTOM
+                        else -> profilesToShow[index - 2].id
                     }
-                    setOnClickListener {
-                        prefs.filterStatus = it.id
-                        screenManager.pop()
+                )
+            }
+        }.build()
+    }
+
+    private fun onItemClick(id: Long) {
+        prefs.filterStatus = id
+        screenManager.pop()
+    }
+}
+
+@androidx.car.app.annotations.ExperimentalCarApi
+class EditFiltersScreen(ctx: CarContext) : Screen(ctx) {
+    private val vm = FilterViewModel(carContext.applicationContext as Application)
+
+    private val maxRows = if (ctx.carAppApiLevel >= 2) {
+        ctx.constraintManager.getContentLimit(ConstraintManager.CONTENT_LIMIT_TYPE_LIST)
+    } else 6
+
+    init {
+        vm.filtersWithValue.observe(this) {
+            vm.filterProfile.observe(this) {
+                invalidate()
+            }
+        }
+    }
+
+    override fun onGetTemplate(): Template {
+        val currentProfileName = vm.filterProfile.value?.name
+
+        return ListTemplate.Builder().apply {
+            vm.filtersWithValue.value?.let { filtersWithValue ->
+                setSingleList(buildFiltersList(filtersWithValue.take(maxRows)))
+            } ?: setLoading(true)
+
+            setTitle(currentProfileName?.let {
+                carContext.getString(
+                    R.string.edit_filter_profile,
+                    it
+                )
+            } ?: carContext.getString(R.string.menu_filter))
+
+            setHeaderAction(Action.BACK)
+            setActionStrip(ActionStrip.Builder().apply {
+                val currentProfile = vm.filterProfile.value
+                if (currentProfile != null) {
+                    addAction(Action.Builder().apply {
+                        setIcon(
+                            CarIcon.Builder(
+                                IconCompat.createWithResource(
+                                    carContext,
+                                    R.drawable.ic_delete
+                                )
+                            ).build()
+
+                        )
+                        setOnClickListener {
+                            lifecycleScope.launch {
+                                vm.deleteCurrentProfile()
+                                CarToast.makeText(
+                                    carContext,
+                                    carContext.getString(
+                                        R.string.deleted_filterprofile,
+                                        currentProfile.name
+                                    ),
+                                    CarToast.LENGTH_SHORT
+                                ).show()
+                                invalidate()
+                                screenManager.pop()
+                            }
+                        }
+                    }.build())
+                }
+                addAction(
+                    Action.Builder()
+                        .setIcon(
+                            CarIcon.Builder(
+                                IconCompat.createWithResource(
+                                    carContext,
+                                    R.drawable.ic_save
+                                )
+                            ).build()
+                        )
+                        .setOnClickListener {
+                        val textPromptScreen = TextPromptScreen(
+                            carContext,
+                            R.string.save_as_profile,
+                            R.string.save_profile_enter_name,
+                            currentProfileName
+                        )
+                        screenManager.pushForResult(textPromptScreen) { name ->
+                            if (name == null) return@pushForResult
+                            lifecycleScope.launch {
+                                vm.saveAsProfile(name as String)
+                                screenManager.popTo(MapScreen.MARKER)
+                            }
+                        }
+                    }
+                    .build()
+                )
+            }.build())
+        }.build()
+    }
+
+    private fun buildFiltersList(filters: List<FilterWithValue<out FilterValue>>): ItemList {
+        return ItemList.Builder().apply {
+            filters.forEach {
+                val filter = it.filter
+                val value = it.value
+                addItem(Row.Builder().apply {
+                    setTitle(filter.name)
+                    when (filter) {
+                        is BooleanFilter -> {
+                            setToggle(Toggle.Builder {
+                                (value as BooleanFilterValue).value = it
+                                lifecycleScope.launch { vm.saveFilterValues() }
+                            }.setChecked((value as BooleanFilterValue).value).build())
+                        }
+                        is MultipleChoiceFilter -> {
+                            setBrowsable(true)
+                            setOnClickListener {
+                                screenManager.pushForResult(
+                                    MultipleChoiceFilterScreen(
+                                        carContext,
+                                        filter,
+                                        value as MultipleChoiceFilterValue
+                                    )
+                                ) {
+                                    lifecycleScope.launch { vm.saveFilterValues() }
+                                }
+                            }
+                            addText(
+                                if ((value as MultipleChoiceFilterValue).all) {
+                                    carContext.getString(R.string.all_selected)
+                                } else {
+                                    carContext.getString(
+                                        R.string.number_selected,
+                                        value.values.size
+                                    )
+                                }
+                            )
+                        }
+                        is SliderFilter -> {
+                            setBrowsable(true)
+                            addText((value as SliderFilterValue).value.toString() + " " + filter.unit)
+                            setOnClickListener {
+                                screenManager.pushForResult(
+                                    SliderFilterScreen(
+                                        carContext,
+                                        filter,
+                                        value
+                                    )
+                                ) {
+                                    lifecycleScope.launch { vm.saveFilterValues() }
+                                }
+                            }
+                        }
                     }
                 }.build())
             }
-            setNoItemsMessage(carContext.getString(R.string.filterprofiles_empty_state))
         }.build()
     }
+}
+
+class MultipleChoiceFilterScreen(
+    ctx: CarContext,
+    val filter: MultipleChoiceFilter,
+    val value: MultipleChoiceFilterValue
+) : MultiSelectSearchScreen<Pair<String, String>>(ctx) {
+    override val isMultiSelect = true
+    override val shouldShowSelectAll = true
+
+    override fun isSelected(it: Pair<String, String>): Boolean =
+        value.all || value.values.contains(it.first)
+
+    override fun toggleSelected(item: Pair<String, String>) {
+        if (isSelected(item)) {
+            val values = if (value.all) filter.choices.keys else value.values
+            value.values = values.minus(item.first).toMutableSet()
+            value.all = false
+        } else {
+            value.values.add(item.first)
+            if (value.values == filter.choices.keys) {
+                value.all = true
+            }
+        }
+    }
+
+    override fun selectAll() {
+        value.all = true
+        super.selectAll()
+    }
+
+    override fun selectNone() {
+        value.all = false
+        value.values = mutableSetOf()
+        super.selectNone()
+    }
+
+    override fun getLabel(it: Pair<String, String>): String = it.second
+
+    override suspend fun loadData(): List<Pair<String, String>> {
+        return filter.choices.entries.map { it.toPair() }
+    }
+}
+
+
+class SliderFilterScreen(
+    ctx: CarContext,
+    val filter: SliderFilter,
+    val value: SliderFilterValue
+) : Screen(ctx) {
+    override fun onGetTemplate(): Template {
+        return PaneTemplate.Builder(
+            Pane.Builder().apply {
+                addRow(Row.Builder().apply {
+                    setTitle(filter.name)
+                    addText(value.value.toString() + " " + filter.unit)
+                    addText(generateSlider())
+                }.build())
+                addAction(Action.Builder().apply {
+                    setIcon(
+                        CarIcon.Builder(
+                            IconCompat.createWithResource(
+                                carContext,
+                                R.drawable.ic_remove
+                            )
+                        ).build()
+                    )
+                    setOnClickListener(::decrease)
+                }.build())
+                addAction(Action.Builder().apply {
+                    setIcon(
+                        CarIcon.Builder(
+                            IconCompat.createWithResource(
+                                carContext,
+                                R.drawable.ic_add
+                            )
+                        ).build()
+                    )
+                    setOnClickListener(::increase)
+                }.build())
+            }.build()
+        ).apply {
+            setHeaderAction(Action.BACK)
+        }.build()
+    }
+
+    private fun generateSlider(): CharSequence {
+        val bar = "━"
+        val dot = "⬤"
+        val length = 30
+
+        val position =
+            ((filter.inverseMapping(value.value) - filter.min) / (filter.max - filter.min).toDouble() * length).roundToInt()
+
+        val text = SpannableStringBuilder()
+        text.append(
+            bar.repeat(position),
+            ForegroundCarColorSpan.create(CarColor.SECONDARY),
+            Spanned.SPAN_EXCLUSIVE_EXCLUSIVE
+        )
+        text.append(
+            dot,
+            ForegroundCarColorSpan.create(CarColor.SECONDARY),
+            Spanned.SPAN_EXCLUSIVE_EXCLUSIVE
+        )
+        text.append(bar.repeat(length - position))
+
+        return text
+    }
+
+    private fun increase() {
+        var valueInternal = filter.inverseMapping(value.value)
+        if (valueInternal < filter.max) valueInternal += 1
+        value.value = filter.mapping(valueInternal)
+        invalidate()
+    }
+
+    private fun decrease() {
+        var valueInternal = filter.inverseMapping(value.value)
+        if (valueInternal > filter.min) valueInternal -= 1
+        value.value = filter.mapping(valueInternal)
+        invalidate()
+    }
 }

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

@@ -13,20 +13,16 @@ import androidx.car.app.hardware.info.EnergyLevel
 import androidx.car.app.model.*
 import androidx.core.content.ContextCompat
 import androidx.core.graphics.drawable.IconCompat
-import androidx.lifecycle.Lifecycle
-import androidx.lifecycle.MutableLiveData
-import androidx.lifecycle.OnLifecycleEvent
-import androidx.lifecycle.lifecycleScope
+import androidx.lifecycle.*
 import com.car2go.maps.model.LatLng
 import kotlinx.coroutines.*
+import net.vonforst.evmap.BuildConfig
 import net.vonforst.evmap.R
 import net.vonforst.evmap.api.availability.ChargeLocationStatus
 import net.vonforst.evmap.api.availability.getAvailability
 import net.vonforst.evmap.api.createApi
 import net.vonforst.evmap.api.stringProvider
 import net.vonforst.evmap.model.ChargeLocation
-import net.vonforst.evmap.model.FILTERS_CUSTOM
-import net.vonforst.evmap.model.FILTERS_DISABLED
 import net.vonforst.evmap.model.FILTERS_FAVORITES
 import net.vonforst.evmap.storage.AppDatabase
 import net.vonforst.evmap.storage.PreferenceDataSource
@@ -35,30 +31,33 @@ import net.vonforst.evmap.ui.getMarkerTint
 import net.vonforst.evmap.utils.distanceBetween
 import net.vonforst.evmap.viewmodel.filtersWithValue
 import net.vonforst.evmap.viewmodel.getFilterValues
-import net.vonforst.evmap.viewmodel.getFilters
 import net.vonforst.evmap.viewmodel.getReferenceData
 import java.io.IOException
 import java.time.Duration
 import java.time.Instant
 import java.time.ZonedDateTime
 import kotlin.collections.set
+import kotlin.math.min
 import kotlin.math.roundToInt
 
 /**
  * Main map screen showing either nearby chargers or favorites
  */
-class MapScreen(ctx: CarContext, val session: EVMapSession, val favorites: Boolean = false) :
-    Screen(ctx), LocationAwareScreen {
-    private var updateCoroutine: Job? = null
-    private var numUpdates = 0
+@androidx.car.app.annotations.ExperimentalCarApi
+class MapScreen(ctx: CarContext, val session: EVMapSession) :
+    Screen(ctx), LocationAwareScreen, OnContentRefreshListener,
+    ItemList.OnItemVisibilityChangedListener, DefaultLifecycleObserver {
+    companion object {
+        val MARKER = "map"
+    }
 
-    /* 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 updateCoroutine: Job? = null
+    private var availabilityUpdateCoroutine: Job? = null
+
+    private var visibleStart: Int? = null
+    private var visibleEnd: Int? = null
 
     private var location: Location? = null
-    private var lastChargerUpdateLocation: Location? = null
     private var lastDistanceUpdateTime: Instant? = null
     private var chargers: List<ChargeLocation>? = null
     private var prefs = PreferenceDataSource(ctx)
@@ -67,10 +66,9 @@ class MapScreen(ctx: CarContext, val session: EVMapSession, val favorites: Boole
         createApi(prefs.dataSource, ctx)
     }
     private val searchRadius = 5 // kilometers
-    private val chargerUpdateThreshold = 2000 // meters
     private val distanceUpdateThreshold = Duration.ofSeconds(15)
     private val availabilityUpdateThreshold = Duration.ofMinutes(1)
-    private var availabilities: MutableMap<Long, Pair<ZonedDateTime, ChargeLocationStatus>> =
+    private var availabilities: MutableMap<Long, Pair<ZonedDateTime, ChargeLocationStatus?>> =
         HashMap()
     private val maxRows = if (ctx.carAppApiLevel >= 2) {
         ctx.constraintManager.getContentLimit(ConstraintManager.CONTENT_LIMIT_TYPE_PLACE_LIST)
@@ -78,95 +76,171 @@ class MapScreen(ctx: CarContext, val session: EVMapSession, val favorites: Boole
 
     private val referenceData = api.getReferenceData(lifecycleScope, carContext)
     private val filterStatus = MutableLiveData<Long>().apply {
-        value = prefs.filterStatus.takeUnless { it == FILTERS_CUSTOM || it == FILTERS_FAVORITES }
-            ?: FILTERS_DISABLED
+        value = prefs.filterStatus
     }
     private val filterValues = db.filterValueDao().getFilterValues(filterStatus, prefs.dataSource)
-    private val filters = api.getFilters(referenceData, carContext.stringProvider())
+    private val filters =
+        Transformations.map(referenceData) { api.getFilters(it, carContext.stringProvider()) }
     private val filtersWithValue = filtersWithValue(filters, filterValues)
 
-    private val hardwareMan = ctx.getCarService(CarContext.HARDWARE_SERVICE) as CarHardwareManager
+    private val hardwareMan: CarHardwareManager by lazy {
+        ctx.getCarService(CarContext.HARDWARE_SERVICE) as CarHardwareManager
+    }
     private var energyLevel: EnergyLevel? = null
+    private val permissions = if (BuildConfig.FLAVOR_automotive == "automotive") {
+        listOf(
+            "android.car.permission.CAR_ENERGY",
+            "android.car.permission.CAR_ENERGY_PORTS",
+            "android.car.permission.READ_CAR_DISPLAY_UNITS",
+        )
+    } else {
+        listOf(
+            "com.google.android.gms.permission.CAR_FUEL"
+        )
+    }
+
+    private var searchLocation: LatLng? = null
 
     init {
         filtersWithValue.observe(this) {
             loadChargers()
         }
+        marker = MARKER
     }
 
     override fun onGetTemplate(): Template {
+        session.requestLocationUpdates()
+
         session.mapScreen = this
         return PlaceListMapTemplate.Builder().apply {
             setTitle(
-                carContext.getString(
-                    if (favorites) {
+                prefs.placeSearchResultAndroidAutoName?.let {
+                    carContext.getString(R.string.auto_chargers_near_location, it)
+                } ?: carContext.getString(
+                    if (filterStatus.value == FILTERS_FAVORITES) {
                         R.string.auto_favorites
                     } else {
                         R.string.auto_chargers_closeby
                     }
                 )
             )
-            location?.let {
-                setAnchor(Place.Builder(CarLocation.create(it)).build())
+            searchLocation?.let {
+                setAnchor(Place.Builder(CarLocation.create(it.latitude, it.longitude)).apply {
+                    if (prefs.placeSearchResultAndroidAutoName != null) {
+                        setMarker(
+                            PlaceMarker.Builder()
+                                .setColor(CarColor.PRIMARY)
+                                .build()
+                        )
+                    }
+                }.build())
             } ?: setLoading(true)
             chargers?.take(maxRows)?.let { chargerList ->
                 val builder = ItemList.Builder()
                 // only show the city if not all chargers are in the same city
-                val showCity = chargerList.map { it.address.city }.distinct().size > 1
+                val showCity = chargerList.map { it.address?.city }.distinct().size > 1
                 chargerList.forEach { charger ->
                     builder.addItem(formatCharger(charger, showCity))
                 }
                 builder.setNoItemsMessage(
                     carContext.getString(
-                        if (favorites) {
+                        if (filterStatus.value == FILTERS_FAVORITES) {
                             R.string.auto_no_favorites_found
                         } else {
                             R.string.auto_no_chargers_found
                         }
                     )
                 )
+                builder.setOnItemsVisibilityChangedListener(this@MapScreen)
                 setItemList(builder.build())
             } ?: setLoading(true)
             setCurrentLocationEnabled(true)
-            setHeaderAction(Action.BACK)
-            if (!favorites) {
-                val filtersCount = filtersWithValue.value?.count {
+            setHeaderAction(Action.APP_ICON)
+            val filtersCount = if (filterStatus.value == FILTERS_FAVORITES) 1 else {
+                filtersWithValue.value?.count {
                     !it.value.hasSameValueAs(it.filter.defaultValue())
                 }
+            }
 
-                setActionStrip(
-                    ActionStrip.Builder()
-                        .addAction(
-                            Action.Builder()
-                                .setIcon(
-                                    CarIcon.Builder(
-                                        IconCompat.createWithResource(
-                                            carContext,
-                                            R.drawable.ic_filter
-                                        )
-                                    )
-                                        .setTint(if (filtersCount != null && filtersCount > 0) CarColor.SECONDARY else CarColor.DEFAULT)
-                                        .build()
+            setActionStrip(
+                ActionStrip.Builder()
+                    .addAction(Action.Builder()
+                        .setIcon(
+                            CarIcon.Builder(
+                                IconCompat.createWithResource(
+                                    carContext,
+                                    R.drawable.ic_settings
+                                )
+                            ).setTint(CarColor.DEFAULT).build()
                         )
                         .setOnClickListener {
-                            screenManager.pushForResult(FilterScreen(carContext)) {
-                                chargers = null
-                                numUpdates = 0
-                                filterStatus.value =
-                                    prefs.filterStatus.takeUnless { it == FILTERS_CUSTOM || it == FILTERS_FAVORITES }
-                                        ?: FILTERS_DISABLED
-                            }
+                            screenManager.push(SettingsScreen(carContext))
                             session.mapScreen = null
                         }
                         .build())
+                    .addAction(Action.Builder().apply {
+                        setIcon(
+                            CarIcon.Builder(
+                                IconCompat.createWithResource(
+                                    carContext,
+                                    if (prefs.placeSearchResultAndroidAuto != null) {
+                                        R.drawable.ic_search_off
+                                    } else {
+                                        R.drawable.ic_search
+                                    }
+                                )
+                            ).build()
+
+                        )
+                        setOnClickListener(ParkedOnlyOnClickListener.create {
+                            if (prefs.placeSearchResultAndroidAuto != null) {
+                                prefs.placeSearchResultAndroidAutoName = null
+                                prefs.placeSearchResultAndroidAuto = null
+                                screenManager.pushForResult(DummyReturnScreen(carContext)) {
+                                    chargers = null
+                                    loadChargers()
+                                }
+                            } else {
+                                screenManager.pushForResult(
+                                    PlaceSearchScreen(
+                                        carContext,
+                                        session
+                                    )
+                                ) {
+                                    chargers = null
+                                    loadChargers()
+                                }
+                                session.mapScreen = null
+                            }
+                        })
+                    }.build())
+                    .addAction(
+                        Action.Builder()
+                            .setIcon(
+                                CarIcon.Builder(
+                                    IconCompat.createWithResource(
+                                        carContext,
+                                        R.drawable.ic_filter
+                                    )
+                                )
+                                    .setTint(if (filtersCount != null && filtersCount > 0) CarColor.SECONDARY else CarColor.DEFAULT)
+                                    .build()
+                            )
+                            .setOnClickListener {
+                                screenManager.pushForResult(FilterScreen(carContext, session)) {
+                                    chargers = null
+                                    filterStatus.value = prefs.filterStatus
+                                }
+                                session.mapScreen = null
+                            }
+                            .build())
                     .build())
-            }
-            build()
+            setOnContentRefreshListener(this@MapScreen)
         }.build()
     }
 
     private fun formatCharger(charger: ChargeLocation, showCity: Boolean): Row {
-        val markerTint = if (charger.maxPower > 100) {
+        val markerTint = if ((charger.maxPower ?: 0.0) > 100) {
             R.color.charger_100kw_dark  // slightly darker color for better contrast
         } else {
             getMarkerTint(charger)
@@ -184,7 +258,7 @@ class MapScreen(ctx: CarContext, val session: EVMapSession, val favorites: Boole
         return Row.Builder().apply {
             // only show the city if not all chargers are in the same city (-> showCity == true)
             // and the city is not already contained in the charger name
-            if (showCity && charger.address.city != null && charger.address.city !in charger.name) {
+            if (showCity && charger.address?.city != null && charger.address.city !in charger.name) {
                 setTitle(
                     CarText.Builder("${charger.name} · ${charger.address.city}")
                     .addVariant(charger.name)
@@ -214,8 +288,11 @@ class MapScreen(ctx: CarContext, val session: EVMapSession, val favorites: Boole
             }
 
             // power
-            if (text.isNotEmpty()) text.append(" · ")
-            text.append("${charger.maxPower.roundToInt()} kW")
+            val power = charger.maxPower;
+            if (power != null) {
+                if (text.isNotEmpty()) text.append(" · ")
+                text.append("${power.roundToInt()} kW")
+            }
 
             // availability
             availabilities[charger.id]?.second?.let { av ->
@@ -239,7 +316,13 @@ class MapScreen(ctx: CarContext, val session: EVMapSession, val favorites: Boole
             )
 
             setOnClickListener {
-                screenManager.push(ChargerDetailScreen(carContext, charger))
+                screenManager.pushForResult(ChargerDetailScreen(carContext, charger)) {
+                    if (filterStatus.value == FILTERS_FAVORITES) {
+                        // favorites list may have been updated
+                        chargers = null
+                        loadChargers()
+                    }
+                }
             }
         }.build()
     }
@@ -264,14 +347,6 @@ class MapScreen(ctx: CarContext, val session: EVMapSession, val favorites: Boole
             // update displayed distances
             invalidate()
         }
-
-        if (lastChargerUpdateLocation == null ||
-            location.distanceTo(lastChargerUpdateLocation) > chargerUpdateThreshold
-        ) {
-            lastChargerUpdateLocation = location
-            // update displayed chargers
-            loadChargers()
-        }
     }
 
     private fun loadChargers() {
@@ -279,27 +354,25 @@ class MapScreen(ctx: CarContext, val session: EVMapSession, val favorites: Boole
         val referenceData = referenceData.value ?: return
         val filters = filtersWithValue.value ?: return
 
-        numUpdates++
-        println(numUpdates)
-        if (numUpdates > maxNumUpdates) {
-            /*CarToast.makeText(carContext, R.string.auto_no_refresh_possible, CarToast.LENGTH_LONG)
-                .show()*/
-            return
-        }
+        val searchLocation =
+            prefs.placeSearchResultAndroidAuto ?: LatLng.fromLocation(location)
+        this.searchLocation = searchLocation
+
         updateCoroutine = lifecycleScope.launch {
             try {
                 // load chargers
-                if (favorites) {
-                    chargers = db.chargeLocationsDao().getAllChargeLocationsAsync().sortedBy {
-                        distanceBetween(
-                            location.latitude, location.longitude,
-                            it.coordinates.lat, it.coordinates.lng
-                        )
-                    }
+                if (filterStatus.value == FILTERS_FAVORITES) {
+                    chargers =
+                        db.favoritesDao().getAllFavoritesAsync().map { it.charger }.sortedBy {
+                            distanceBetween(
+                                location.latitude, location.longitude,
+                                it.coordinates.lat, it.coordinates.lng
+                            )
+                        }
                 } else {
                     val response = api.getChargepointsRadius(
                         referenceData,
-                        LatLng.fromLocation(location),
+                        searchLocation,
                         searchRadius,
                         zoom = 16f,
                         filters
@@ -310,7 +383,7 @@ class MapScreen(ctx: CarContext, val session: EVMapSession, val favorites: Boole
                             // try again with larger radius
                             val response = api.getChargepointsRadius(
                                 referenceData,
-                                LatLng.fromLocation(location),
+                                searchLocation,
                                 searchRadius * 10,
                                 zoom = 16f,
                                 filters
@@ -321,28 +394,6 @@ class MapScreen(ctx: CarContext, val session: EVMapSession, val favorites: Boole
                     }
                 }
 
-                // remove outdated availabilities
-                availabilities = availabilities.filter {
-                    Duration.between(
-                        it.value.first,
-                        ZonedDateTime.now()
-                    ) > availabilityUpdateThreshold
-                }.toMutableMap()
-
-                // update availabilities
-                chargers?.take(maxRows)?.map {
-                    lifecycleScope.async {
-                        // update only if not yet stored
-                        if (!availabilities.containsKey(it.id)) {
-                            val date = ZonedDateTime.now()
-                            val availability = getAvailability(it).data
-                            if (availability != null) {
-                                availabilities[it.id] = date to availability
-                            }
-                        }
-                    }
-                }?.awaitAll()
-
                 updateCoroutine = null
                 lastDistanceUpdateTime = Instant.now()
                 invalidate()
@@ -356,28 +407,95 @@ class MapScreen(ctx: CarContext, val session: EVMapSession, val favorites: Boole
     }
 
     private fun onEnergyLevelUpdated(energyLevel: EnergyLevel) {
+        val isUpdate = this.energyLevel == null
         this.energyLevel = energyLevel
-        invalidate()
+        if (isUpdate) invalidate()
+    }
+
+    override fun onResume(owner: LifecycleOwner) {
+        setupListeners()
     }
 
-    @OnLifecycleEvent(Lifecycle.Event.ON_RESUME)
     private fun setupListeners() {
-        if (ContextCompat.checkSelfPermission(
-                carContext,
-                "com.google.android.gms.permission.CAR_FUEL"
-            ) != PackageManager.PERMISSION_GRANTED
-        )
+        if (!permissions.all {
+                ContextCompat.checkSelfPermission(
+                    carContext,
+                    it
+                ) == PackageManager.PERMISSION_GRANTED
+            })
             return
 
-        println("Setting up energy level listener")
-
-        val exec = ContextCompat.getMainExecutor(carContext)
-        hardwareMan.carInfo.addEnergyLevelListener(exec, ::onEnergyLevelUpdated)
+        if (supportsCarApiLevel3(carContext)) {
+            println("Setting up energy level listener")
+            val exec = ContextCompat.getMainExecutor(carContext)
+            hardwareMan.carInfo.addEnergyLevelListener(exec, ::onEnergyLevelUpdated)
+        }
+    }
+
+    override fun onPause(owner: LifecycleOwner) {
+        removeListeners()
     }
 
-    @OnLifecycleEvent(Lifecycle.Event.ON_PAUSE)
     private fun removeListeners() {
-        println("Removing energy level listener")
-        hardwareMan.carInfo.removeEnergyLevelListener(::onEnergyLevelUpdated)
+        if (supportsCarApiLevel3(carContext)) {
+            println("Removing energy level listener")
+            hardwareMan.carInfo.removeEnergyLevelListener(::onEnergyLevelUpdated)
+        }
+    }
+
+    override fun onContentRefreshRequested() {
+        loadChargers()
+        availabilities.clear()
+
+        val start = visibleStart
+        val end = visibleEnd
+        if (start != null && end != null) {
+            onItemVisibilityChanged(start, end)
+        }
+    }
+
+    override fun onItemVisibilityChanged(startIndex: Int, endIndex: Int) {
+        // when the list is scrolled, load corresponding availabilities
+        if (startIndex == visibleStart && endIndex == visibleEnd && !availabilities.isEmpty()) return
+        if (startIndex == -1 || endIndex == -1) return
+        if (availabilityUpdateCoroutine != null) return
+
+        visibleEnd = endIndex
+        visibleStart = startIndex
+
+        // remove outdated availabilities
+        availabilities = availabilities.filter {
+            Duration.between(
+                it.value.first,
+                ZonedDateTime.now()
+            ) <= availabilityUpdateThreshold
+        }.toMutableMap()
+
+        // update availabilities
+        availabilityUpdateCoroutine = lifecycleScope.launch {
+            delay(300L)
+
+            val chargers = chargers ?: return@launch
+            if (chargers.isEmpty()) return@launch
+
+            val tasks = chargers.subList(
+                min(startIndex, chargers.size - 1),
+                min(endIndex, chargers.size - 1)
+            ).mapNotNull {
+                // update only if not yet stored
+                if (!availabilities.containsKey(it.id)) {
+                    lifecycleScope.async {
+                        val availability = getAvailability(it).data
+                        val date = ZonedDateTime.now()
+                        availabilities[it.id] = date to availability
+                    }
+                } else null
+            }
+            if (tasks.isNotEmpty()) {
+                tasks.awaitAll()
+                invalidate()
+            }
+            availabilityUpdateCoroutine = null
+        }
     }
 }

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

@@ -0,0 +1,224 @@
+package net.vonforst.evmap.auto
+
+import android.content.pm.PackageManager
+import android.location.Location
+import android.text.SpannableStringBuilder
+import android.text.Spanned
+import androidx.car.app.CarContext
+import androidx.car.app.Screen
+import androidx.car.app.annotations.ExperimentalCarApi
+import androidx.car.app.constraints.ConstraintManager
+import androidx.car.app.hardware.CarHardwareManager
+import androidx.car.app.hardware.info.EnergyLevel
+import androidx.car.app.model.*
+import androidx.core.content.ContextCompat
+import androidx.core.graphics.drawable.IconCompat
+import androidx.lifecycle.DefaultLifecycleObserver
+import androidx.lifecycle.LifecycleOwner
+import androidx.lifecycle.lifecycleScope
+import com.car2go.maps.model.LatLng
+import kotlinx.coroutines.*
+import net.vonforst.evmap.BuildConfig
+import net.vonforst.evmap.R
+import net.vonforst.evmap.adapter.iconForPlaceType
+import net.vonforst.evmap.adapter.isSpecialPlace
+import net.vonforst.evmap.autocomplete.*
+import net.vonforst.evmap.storage.AppDatabase
+import net.vonforst.evmap.storage.PreferenceDataSource
+import net.vonforst.evmap.storage.RecentAutocompletePlace
+import java.time.Instant
+
+@ExperimentalCarApi
+class PlaceSearchScreen(ctx: CarContext, val session: EVMapSession) : Screen(ctx),
+    SearchTemplate.SearchCallback, LocationAwareScreen,
+    DefaultLifecycleObserver {
+    private val hardwareMan: CarHardwareManager by lazy {
+        ctx.getCarService(CarContext.HARDWARE_SERVICE) as CarHardwareManager
+    }
+    private var resultList: List<AutocompletePlace>? = null
+    private var recentResults = mutableListOf<RecentAutocompletePlace>()
+    private var currentProvider: AutocompleteProvider? = null
+    private val providers = getAutocompleteProviders(ctx)
+    private val recents = AppDatabase.getInstance(ctx).recentAutocompletePlaceDao()
+    private val maxItems = if (ctx.carAppApiLevel >= 2) {
+        ctx.constraintManager.getContentLimit(ConstraintManager.CONTENT_LIMIT_TYPE_LIST)
+    } else 6
+    private var location: Location? = null
+    private var energyLevel: EnergyLevel? = null
+    private var updateJob: Job? = null
+    private val prefs = PreferenceDataSource(ctx)
+
+    private val permissions = if (BuildConfig.FLAVOR_automotive == "automotive") {
+        listOf(
+            "android.car.permission.CAR_ENERGY",
+            "android.car.permission.CAR_ENERGY_PORTS",
+            "android.car.permission.READ_CAR_DISPLAY_UNITS",
+        )
+    } else {
+        listOf(
+            "com.google.android.gms.permission.CAR_FUEL"
+        )
+    }
+
+    init {
+        lifecycle.addObserver(this)
+        update("")
+    }
+
+    override fun onGetTemplate(): Template {
+        return SearchTemplate.Builder(this).apply {
+            setHeaderAction(Action.BACK)
+            setSearchHint(carContext.getString(R.string.search))
+            resultList?.let {
+                setItemList(buildItemList(it))
+            } ?: setLoading(true)
+        }.build()
+    }
+
+    private fun buildItemList(results: List<AutocompletePlace>): ItemList {
+        return ItemList.Builder().apply {
+            results.forEach { place ->
+                addItem(Row.Builder().apply {
+                    setTitle(place.primaryText)
+                    addText(place.secondaryText)
+
+                    val icon = iconForPlaceType(place.types)
+                    setImage(
+                        CarIcon.Builder(IconCompat.createWithResource(carContext, icon))
+                            .setTint(if (isSpecialPlace(place.types)) CarColor.PRIMARY else CarColor.DEFAULT)
+                            .build()
+                    )
+
+                    // distance
+                    place.distanceMeters?.let {
+                        val text = SpannableStringBuilder()
+                        text.append(
+                            "distance",
+                            DistanceSpan.create(
+                                roundValueToDistance(
+                                    it,
+                                    energyLevel?.distanceDisplayUnit?.value
+                                )
+                            ),
+                            Spanned.SPAN_EXCLUSIVE_EXCLUSIVE
+                        )
+                        addText(text)
+
+                        setOnClickListener {
+                            lifecycleScope.launch {
+                                val placeDetails = getDetails(place.id)
+                                prefs.placeSearchResultAndroidAuto = placeDetails.latLng
+                                prefs.placeSearchResultAndroidAutoName =
+                                    place.primaryText.toString()
+                                screenManager.popTo(MapScreen.MARKER)
+                            }
+                        }
+                    }
+                }.build())
+            }
+        }.build()
+    }
+
+    override fun onSearchTextChanged(searchText: String) {
+        update(searchText)
+    }
+
+    override fun onSearchSubmitted(searchText: String) {
+        update(searchText)
+    }
+
+    private fun update(searchText: String) {
+        updateJob?.cancel()
+        updateJob = lifecycleScope.launch {
+            if (prefs.searchProvider == "mapbox" && !isShortQuery(searchText)) {
+                delay(500L)
+            }
+            loadNewList(searchText)
+        }
+    }
+
+    private suspend fun loadNewList(query: String) {
+        for (provider in providers) {
+            try {
+                recentResults.clear()
+                currentProvider = provider
+
+                // first search in recent places
+                val recentPlaces = if (query.isEmpty()) {
+                    recents.getAllAsync(provider.id, limit = maxItems)
+                } else {
+                    recents.searchAsync(query, provider.id, limit = maxItems)
+                }
+                recentResults.addAll(recentPlaces)
+                resultList =
+                    recentPlaces.map { it.asAutocompletePlace(LatLng.fromLocation(location)) }
+                invalidate()
+
+                // if we already have enough results or the query is short, stop here
+                if (isShortQuery(query) || recentResults.size >= maxItems) break
+
+                // then search online
+                val recentIds = recentPlaces.map { it.id }
+                resultList = withContext(Dispatchers.IO) {
+                    (resultList!! + provider.autocomplete(query, LatLng.fromLocation(location))
+                        .filter { !recentIds.contains(it.id) }).take(maxItems)
+                }
+                invalidate()
+                break
+            } catch (e: ApiUnavailableException) {
+                e.printStackTrace()
+            }
+        }
+    }
+
+    private fun isShortQuery(query: CharSequence) = query.length < 3
+
+    override fun updateLocation(location: Location) {
+        this.location = location
+    }
+
+    override fun onResume(owner: LifecycleOwner) {
+        session.requestLocationUpdates()
+        session.mapScreen = this
+
+        if (supportsCarApiLevel3(carContext) && permissions.all {
+                ContextCompat.checkSelfPermission(
+                    carContext,
+                    it
+                ) == PackageManager.PERMISSION_GRANTED
+            }) {
+
+            println("Setting up energy level listener")
+            val exec = ContextCompat.getMainExecutor(carContext)
+            hardwareMan.carInfo.addEnergyLevelListener(exec, ::onEnergyLevelUpdated)
+        }
+    }
+
+    private fun onEnergyLevelUpdated(energyLevel: EnergyLevel) {
+        val isUpdate = this.energyLevel == null
+        this.energyLevel = energyLevel
+        if (isUpdate) invalidate()
+    }
+
+    override fun onPause(owner: LifecycleOwner) {
+        session.mapScreen = null
+
+        if (supportsCarApiLevel3(carContext)) {
+            hardwareMan.carInfo.removeEnergyLevelListener(::onEnergyLevelUpdated)
+        }
+    }
+
+    suspend fun getDetails(id: String): PlaceWithBounds {
+        val provider = currentProvider!!
+        val result = resultList!!.find { it.id == id }!!
+
+        val recentPlace = recentResults.find { it.id == id }
+        if (recentPlace != null) return recentPlace.asPlaceWithBounds()
+
+        val details = provider.getDetails(id)
+
+        recents.insert(RecentAutocompletePlace(result, details, provider.id, Instant.now()))
+
+        return details
+    }
+}

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

@@ -0,0 +1,136 @@
+package net.vonforst.evmap.auto
+
+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.graphics.drawable.IconCompat
+import androidx.lifecycle.lifecycleScope
+import kotlinx.coroutines.launch
+import net.vonforst.evmap.R
+
+abstract class MultiSelectSearchScreen<T>(ctx: CarContext) : Screen(ctx),
+    SearchTemplate.SearchCallback {
+    protected var fullList: List<T>? = null
+    private var currentList: List<T> = emptyList()
+    private var query: String = ""
+    private val maxRows = if (ctx.carAppApiLevel >= 2) {
+        ctx.constraintManager.getContentLimit(ConstraintManager.CONTENT_LIMIT_TYPE_LIST)
+    } else 6
+    protected abstract val isMultiSelect: Boolean
+    protected abstract val shouldShowSelectAll: Boolean
+
+    override fun onGetTemplate(): Template {
+        if (fullList == null) {
+            lifecycleScope.launch {
+                fullList = loadData()
+                filterList()
+                invalidate()
+            }
+        }
+
+        return SearchTemplate.Builder(this).apply {
+            setHeaderAction(Action.BACK)
+            fullList?.let {
+                setItemList(buildItemList())
+            } ?: run {
+                setLoading(true)
+            }
+            if (isMultiSelect) {
+                setActionStrip(ActionStrip.Builder().apply {
+                    addAction(
+                        Action.Builder().setIcon(
+                            CarIcon.Builder(
+                                IconCompat.createWithResource(
+                                    carContext,
+                                    R.drawable.ic_select_all
+                                )
+                            ).build()
+                        ).setOnClickListener(::selectAll).build()
+                    )
+                    addAction(
+                        Action.Builder().setIcon(
+                            CarIcon.Builder(
+                                IconCompat.createWithResource(
+                                    carContext,
+                                    R.drawable.ic_select_none
+                                )
+                            ).build()
+                        ).setOnClickListener(::selectNone).build()
+                    )
+                }.build())
+            }
+        }.build()
+    }
+
+    private fun filterList() {
+        currentList = fullList?.let {
+            it.sortedBy { getLabel(it).lowercase() }
+                .sortedBy { !isSelected(it) }
+                .filter { getLabel(it).lowercase().contains(query.lowercase()) }
+                .take(maxRows)
+        } ?: emptyList()
+    }
+
+    private val checkedIcon =
+        CarIcon.Builder(IconCompat.createWithResource(carContext, R.drawable.ic_checkbox_checked))
+            .setTint(CarColor.PRIMARY)
+            .build()
+    private val uncheckedIcon =
+        CarIcon.Builder(IconCompat.createWithResource(carContext, R.drawable.ic_checkbox_unchecked))
+            .setTint(CarColor.PRIMARY)
+            .build()
+
+    private fun buildItemList(): ItemList {
+        return ItemList.Builder().apply {
+            currentList.forEach { item ->
+                addItem(
+                    Row.Builder()
+                        .setTitle(getLabel(item))
+                        .setImage(if (isSelected(item)) checkedIcon else uncheckedIcon)
+                        .setOnClickListener {
+                            toggleSelected(item)
+                            if (isMultiSelect) {
+                                invalidate()
+                            } else {
+                                setResult(item)
+                                screenManager.pop()
+                            }
+                        }
+                        .build()
+                )
+            }
+        }.build()
+    }
+
+    override fun onSearchTextChanged(searchText: String) {
+        query = searchText
+        filterList()
+        invalidate()
+    }
+
+    override fun onSearchSubmitted(searchText: String) {
+        query = searchText
+        filterList()
+        invalidate()
+    }
+
+    abstract fun toggleSelected(item: T)
+
+    open fun selectAll() {
+        CarToast.makeText(carContext, R.string.selecting_all, CarToast.LENGTH_SHORT).show()
+        invalidate()
+    }
+
+    open fun selectNone() {
+        CarToast.makeText(carContext, R.string.selecting_none, CarToast.LENGTH_SHORT).show()
+        invalidate()
+    }
+
+    abstract fun isSelected(it: T): Boolean
+
+    abstract fun getLabel(it: T): String
+
+    abstract suspend fun loadData(): List<T>
+}

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

@@ -0,0 +1,496 @@
+package net.vonforst.evmap.auto
+
+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.graphics.drawable.IconCompat
+import androidx.lifecycle.lifecycleScope
+import kotlinx.coroutines.launch
+import net.vonforst.evmap.R
+import net.vonforst.evmap.api.chargeprice.ChargepriceApi
+import net.vonforst.evmap.api.chargeprice.ChargepriceCar
+import net.vonforst.evmap.api.chargeprice.ChargepriceTariff
+import net.vonforst.evmap.storage.AppDatabase
+import net.vonforst.evmap.storage.PreferenceDataSource
+import kotlin.math.max
+import kotlin.math.min
+
+class SettingsScreen(ctx: CarContext) : Screen(ctx) {
+    override fun onGetTemplate(): Template {
+        return ListTemplate.Builder().apply {
+            setTitle(carContext.getString(R.string.auto_settings))
+            setHeaderAction(Action.BACK)
+            setSingleList(ItemList.Builder().apply {
+                addItem(Row.Builder().apply {
+                    setTitle(carContext.getString(R.string.settings_data_sources))
+                    setImage(
+                        CarIcon.Builder(
+                            IconCompat.createWithResource(
+                                carContext,
+                                R.drawable.ic_settings_data_source
+                            )
+                        ).setTint(
+                            CarColor.DEFAULT
+                        ).build()
+                    )
+                    setBrowsable(true)
+                    setOnClickListener {
+                        screenManager.push(DataSettingsScreen(carContext))
+                    }
+                }.build())
+                addItem(Row.Builder().apply {
+                    setTitle(carContext.getString(R.string.settings_chargeprice))
+                    setImage(
+                        CarIcon.Builder(
+                            IconCompat.createWithResource(
+                                carContext,
+                                R.drawable.ic_chargeprice
+                            )
+                        ).setTint(
+                            CarColor.DEFAULT
+                        ).build()
+                    )
+                    setBrowsable(true)
+                    setOnClickListener {
+                        screenManager.push(ChargepriceSettingsScreen(carContext))
+                    }
+                }.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 {
+                                screenManager.push(VehicleDataScreen(carContext))
+                            }
+                            .build()
+                    )
+                }
+            }.build())
+        }.build()
+    }
+}
+
+class DataSettingsScreen(ctx: CarContext) : Screen(ctx) {
+    val prefs = PreferenceDataSource(ctx)
+    val db = AppDatabase.getInstance(ctx)
+    val dataSourceNames = carContext.resources.getStringArray(R.array.pref_data_source_names)
+    val dataSourceValues = carContext.resources.getStringArray(R.array.pref_data_source_values)
+    val dataSourceDescriptions = listOf(
+        carContext.getString(R.string.data_source_goingelectric_desc),
+        carContext.getString(R.string.data_source_openchargemap_desc)
+    )
+    val searchProviderNames =
+        carContext.resources.getStringArray(R.array.pref_search_provider_names)
+    val searchProviderValues =
+        carContext.resources.getStringArray(R.array.pref_search_provider_values)
+
+    override fun onGetTemplate(): Template {
+        return ListTemplate.Builder().apply {
+            setTitle(carContext.getString(R.string.settings_data_sources))
+            setHeaderAction(Action.BACK)
+            setSingleList(ItemList.Builder().apply {
+                addItem(Row.Builder().apply {
+                    setTitle(carContext.getString(R.string.pref_data_source))
+                    setBrowsable(true)
+                    val dataSourceId = prefs.dataSource
+                    val dataSourceDesc = dataSourceNames[dataSourceValues.indexOf(dataSourceId)]
+                    addText(dataSourceDesc)
+                    setOnClickListener {
+                        screenManager.push(
+                            ChooseDataSourceScreen(
+                                carContext,
+                                dataSourceNames,
+                                dataSourceValues,
+                                prefs.dataSource,
+                                dataSourceDescriptions
+                            ) {
+                                prefs.dataSource = it
+                            })
+                    }
+                }.build())
+                addItem(Row.Builder().apply {
+                    setTitle(carContext.getString(R.string.pref_search_provider))
+                    setBrowsable(true)
+                    val searchProviderId = prefs.searchProvider
+                    val searchProviderDesc =
+                        searchProviderNames[searchProviderValues.indexOf(searchProviderId)]
+                    addText(searchProviderDesc)
+                    setOnClickListener {
+                        screenManager.push(
+                            ChooseDataSourceScreen(
+                                carContext,
+                                searchProviderNames,
+                                searchProviderValues,
+                                prefs.searchProvider
+                            ) {
+                                prefs.searchProvider = it
+                            })
+                    }
+                }.build())
+                addItem(Row.Builder().apply {
+                    setTitle(carContext.getString(R.string.pref_search_delete_recent))
+                    setOnClickListener {
+                        lifecycleScope.launch {
+                            db.recentAutocompletePlaceDao().deleteAll()
+                            CarToast.makeText(
+                                carContext,
+                                R.string.deleted_recent_search_results,
+                                CarToast.LENGTH_SHORT
+                            ).show()
+                        }
+                    }
+                }.build())
+            }.build())
+        }.build()
+    }
+}
+
+class ChooseDataSourceScreen(
+    ctx: CarContext,
+    val names: Array<String>,
+    val values: Array<String>,
+    val currentValue: String,
+    val descriptions: List<String>? = null,
+    val callback: (String) -> Unit
+) : Screen(ctx) {
+    val prefs = PreferenceDataSource(carContext)
+
+    override fun onGetTemplate(): Template {
+        return ListTemplate.Builder().apply {
+            setTitle(carContext.getString(R.string.pref_data_source))
+            setHeaderAction(Action.BACK)
+            setSingleList(ItemList.Builder().apply {
+                for (i in names.indices) {
+                    addItem(Row.Builder().apply {
+                        setTitle(names[i])
+                        descriptions?.let { addText(it[i]) }
+                    }.build())
+                }
+                setOnSelectedListener {
+                    callback(values[it])
+                    screenManager.pop()
+                }
+                setSelectedIndex(values.indexOf(currentValue))
+            }.build())
+        }.build()
+    }
+}
+
+class ChargepriceSettingsScreen(ctx: CarContext) : Screen(ctx) {
+    val prefs = PreferenceDataSource(carContext)
+    private val maxRows = if (ctx.carAppApiLevel >= 2) {
+        ctx.constraintManager.getContentLimit(ConstraintManager.CONTENT_LIMIT_TYPE_LIST)
+    } else 6
+
+    override fun onGetTemplate(): Template {
+        return ListTemplate.Builder().apply {
+            setTitle(carContext.getString(R.string.settings_chargeprice))
+            setHeaderAction(Action.BACK)
+            setSingleList(ItemList.Builder().apply {
+                addItem(Row.Builder().apply {
+                    setTitle(carContext.getString(R.string.pref_my_vehicle))
+                    setBrowsable(true)
+                    setOnClickListener {
+                        screenManager.push(SelectVehiclesScreen(carContext))
+                    }
+                }.build())
+                addItem(Row.Builder().apply {
+                    setTitle(carContext.getString(R.string.pref_my_tariffs))
+                    setBrowsable(true)
+                    setOnClickListener {
+                        screenManager.push(SelectTariffsScreen(carContext))
+                    }
+                    addText(
+                        if (prefs.chargepriceMyTariffsAll) {
+                            carContext.getString(R.string.chargeprice_all_tariffs_selected)
+                        } else {
+                            val n = prefs.chargepriceMyTariffs?.size ?: 0
+                            carContext.resources
+                                .getQuantityString(
+                                    R.plurals.chargeprice_some_tariffs_selected,
+                                    n,
+                                    n
+                                ) + "\n" + carContext.getString(R.string.pref_my_tariffs_summary)
+                        }
+                    )
+                }.build())
+                addItem(Row.Builder().apply {
+                    setTitle(carContext.getString(R.string.settings_android_auto_chargeprice_range))
+                    setBrowsable(true)
+
+                    val range = prefs.chargepriceBatteryRangeAndroidAuto
+                    addText(
+                        carContext.getString(
+                            R.string.chargeprice_battery_range,
+                            range[0],
+                            range[1]
+                        )
+                    )
+
+                    setOnClickListener {
+                        screenManager.push(SelectChargingRangeScreen(carContext))
+                    }
+                }.build())
+                addItem(Row.Builder().apply {
+                    setTitle(carContext.getString(R.string.pref_chargeprice_currency))
+
+                    val names =
+                        carContext.resources.getStringArray(R.array.pref_chargeprice_currency_names)
+                    val values =
+                        carContext.resources.getStringArray(R.array.pref_chargeprice_currency_values)
+                    val index = values.indexOf(prefs.chargepriceCurrency)
+                    addText(if (index >= 0) names[index] else "")
+
+                    setBrowsable(true)
+                    setOnClickListener {
+                        screenManager.push(SelectCurrencyScreen(carContext))
+                    }
+                }.build())
+                addItem(Row.Builder().apply {
+                    setTitle(carContext.getString(R.string.pref_chargeprice_no_base_fee))
+                    setToggle(Toggle.Builder {
+                        prefs.chargepriceNoBaseFee = it
+                    }.setChecked(prefs.chargepriceNoBaseFee).build())
+                }.build())
+                addItem(Row.Builder().apply {
+                    setTitle(carContext.getString(R.string.pref_chargeprice_show_provider_customer_tariffs))
+                    addText(carContext.getString(R.string.pref_chargeprice_show_provider_customer_tariffs_summary))
+                    setToggle(Toggle.Builder {
+                        prefs.chargepriceShowProviderCustomerTariffs = it
+                    }.setChecked(prefs.chargepriceShowProviderCustomerTariffs).build())
+                }.build())
+                if (maxRows > 6) {
+                    addItem(Row.Builder().apply {
+                        setTitle(carContext.getString(R.string.pref_chargeprice_allow_unbalanced_load))
+                        addText(carContext.getString(R.string.pref_chargeprice_allow_unbalanced_load_summary))
+                        setToggle(Toggle.Builder {
+                            prefs.chargepriceAllowUnbalancedLoad = it
+                        }.setChecked(prefs.chargepriceAllowUnbalancedLoad).build())
+                    }.build())
+                }
+            }.build())
+        }.build()
+    }
+}
+
+class SelectVehiclesScreen(ctx: CarContext) : MultiSelectSearchScreen<ChargepriceCar>(ctx) {
+    private val prefs = PreferenceDataSource(carContext)
+    private var api = ChargepriceApi.create(carContext.getString(R.string.chargeprice_key))
+    override val isMultiSelect = true
+    override val shouldShowSelectAll = false
+
+    override fun isSelected(it: ChargepriceCar): Boolean {
+        return prefs.chargepriceMyVehicles.contains(it.id)
+    }
+
+    override fun toggleSelected(item: ChargepriceCar) {
+        if (isSelected(item)) {
+            prefs.chargepriceMyVehicles = prefs.chargepriceMyVehicles.minus(item.id)
+        } else {
+            prefs.chargepriceMyVehicles = prefs.chargepriceMyVehicles.plus(item.id)
+        }
+    }
+
+    override fun getLabel(it: ChargepriceCar) = "${it.brand} ${it.name}"
+
+    override suspend fun loadData(): List<ChargepriceCar> {
+        return api.getVehicles()
+    }
+}
+
+class SelectTariffsScreen(ctx: CarContext) : MultiSelectSearchScreen<ChargepriceTariff>(ctx) {
+    private val prefs = PreferenceDataSource(carContext)
+    private var api = ChargepriceApi.create(carContext.getString(R.string.chargeprice_key))
+    override val isMultiSelect = true
+    override val shouldShowSelectAll = true
+
+    override fun isSelected(it: ChargepriceTariff): Boolean {
+        return prefs.chargepriceMyTariffsAll or (prefs.chargepriceMyTariffs?.contains(it.id)
+            ?: false)
+    }
+
+    override fun toggleSelected(item: ChargepriceTariff) {
+        val tariffs = prefs.chargepriceMyTariffs ?: if (prefs.chargepriceMyTariffsAll) {
+            fullList!!.map { it.id }.toSet()
+        } else {
+            emptySet()
+        }
+        if (isSelected(item)) {
+            prefs.chargepriceMyTariffs = tariffs.minus(item.id)
+            prefs.chargepriceMyTariffsAll = false
+        } else {
+            prefs.chargepriceMyTariffs = tariffs.plus(item.id)
+            if (prefs.chargepriceMyTariffs == fullList!!.map { it.id }.toSet()) {
+                prefs.chargepriceMyTariffsAll = true
+            }
+        }
+    }
+
+    override fun selectAll() {
+        prefs.chargepriceMyTariffsAll = true
+        super.selectAll()
+    }
+
+    override fun selectNone() {
+        prefs.chargepriceMyTariffsAll = false
+        prefs.chargepriceMyTariffs = emptySet()
+        super.selectNone()
+    }
+
+    override fun getLabel(it: ChargepriceTariff): String {
+        return if (!it.name.lowercase().startsWith(it.provider.lowercase())) {
+            "${it.provider} ${it.name}"
+        } else {
+            it.name
+        }
+    }
+
+    override suspend fun loadData(): List<ChargepriceTariff> {
+        return api.getTariffs()
+    }
+}
+
+class SelectCurrencyScreen(ctx: CarContext) : MultiSelectSearchScreen<Pair<String, String>>(ctx) {
+    private val prefs = PreferenceDataSource(carContext)
+    override val isMultiSelect = false
+    override val shouldShowSelectAll = false
+
+    override fun isSelected(it: Pair<String, String>): Boolean =
+        prefs.chargepriceCurrency == it.second
+
+    override fun toggleSelected(item: Pair<String, String>) {
+        prefs.chargepriceCurrency = item.second
+    }
+
+    override fun getLabel(it: Pair<String, String>): String = it.first
+
+    override suspend fun loadData(): List<Pair<String, String>> {
+        val names = carContext.resources.getStringArray(R.array.pref_chargeprice_currency_names)
+        val values = carContext.resources.getStringArray(R.array.pref_chargeprice_currency_values)
+        return names.zip(values)
+    }
+}
+
+class SelectChargingRangeScreen(ctx: CarContext) : Screen(ctx) {
+    val prefs = PreferenceDataSource(carContext)
+    private val maxItems = if (ctx.carAppApiLevel >= 2) {
+        ctx.constraintManager.getContentLimit(ConstraintManager.CONTENT_LIMIT_TYPE_GRID)
+    } else 6
+
+    override fun onGetTemplate(): Template {
+        return GridTemplate.Builder().apply {
+            setTitle(carContext.getString(R.string.settings_android_auto_chargeprice_range))
+            setHeaderAction(Action.BACK)
+            setSingleList(
+                ItemList.Builder().apply {
+                    addItem(GridItem.Builder().apply {
+                        setTitle(carContext.getString(R.string.chargeprice_battery_range_from))
+                        setText(
+                            carContext.getString(
+                                R.string.percent_format,
+                                prefs.chargepriceBatteryRangeAndroidAuto[0]
+                            )
+                        )
+                        setImage(
+                            CarIcon.Builder(
+                                IconCompat.createWithResource(
+                                    carContext,
+                                    R.drawable.ic_add
+                                )
+                            ).build()
+                        )
+                        setOnClickListener {
+                            prefs.chargepriceBatteryRangeAndroidAuto =
+                                prefs.chargepriceBatteryRangeAndroidAuto.toMutableList().apply {
+                                    this[0] = min(this[1] - 5, this[0] + 5)
+                                }
+                            invalidate()
+                        }
+                    }.build())
+                    addItem(GridItem.Builder().apply {
+                        setTitle(carContext.getString(R.string.chargeprice_battery_range_to))
+                        setText(
+                            carContext.getString(
+                                R.string.percent_format,
+                                prefs.chargepriceBatteryRangeAndroidAuto[1]
+                            )
+                        )
+                        setImage(
+                            CarIcon.Builder(
+                                IconCompat.createWithResource(
+                                    carContext,
+                                    R.drawable.ic_add
+                                )
+                            ).build()
+                        )
+                        setOnClickListener {
+                            prefs.chargepriceBatteryRangeAndroidAuto =
+                                prefs.chargepriceBatteryRangeAndroidAuto.toMutableList().apply {
+                                    this[1] = min(100f, this[1] + 5)
+                                }
+                            invalidate()
+                        }
+                    }.build())
+
+                    val nSpacers = when {
+                        maxItems % 3 == 0 -> 1
+                        maxItems % 4 == 0 -> 2
+                        else -> 0
+                    }
+
+                    for (i in 0..nSpacers) {
+                        addItem(GridItem.Builder().apply {
+                            setTitle(" ")
+                            setImage(emptyCarIcon)
+                        }.build())
+                    }
+
+                    addItem(GridItem.Builder().apply {
+                        setTitle(" ")
+                        setImage(
+                            CarIcon.Builder(
+                                IconCompat.createWithResource(
+                                    carContext,
+                                    R.drawable.ic_remove
+                                )
+                            ).build()
+                        )
+                        setOnClickListener {
+                            prefs.chargepriceBatteryRangeAndroidAuto =
+                                prefs.chargepriceBatteryRangeAndroidAuto.toMutableList().apply {
+                                    this[0] = max(0f, this[0] - 5)
+                                }
+                            invalidate()
+                        }
+                    }.build())
+                    addItem(GridItem.Builder().apply {
+                        setTitle(" ")
+                        setImage(
+                            CarIcon.Builder(
+                                IconCompat.createWithResource(
+                                    carContext,
+                                    R.drawable.ic_remove
+                                )
+                            ).build()
+                        )
+                        setOnClickListener {
+                            prefs.chargepriceBatteryRangeAndroidAuto =
+                                prefs.chargepriceBatteryRangeAndroidAuto.toMutableList().apply {
+                                    this[1] = max(this[0] + 5, this[1] - 5)
+                                }
+                            invalidate()
+                        }
+                    }.build())
+                }.build()
+            )
+        }.build()
+    }
+}

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

@@ -0,0 +1,63 @@
+package net.vonforst.evmap.auto
+
+import androidx.annotation.StringRes
+import androidx.car.app.CarContext
+import androidx.car.app.Screen
+import androidx.car.app.model.*
+import androidx.car.app.model.signin.InputSignInMethod
+import androidx.car.app.model.signin.SignInTemplate
+import net.vonforst.evmap.R
+
+class TextPromptScreen(
+    ctx: CarContext,
+    @StringRes val title: Int,
+    @StringRes val prompt: Int,
+    val initialValue: String? = null,
+    val cancelable: Boolean = true
+) : Screen(ctx),
+    InputCallback {
+    private var inputText = ""
+
+    override fun onGetTemplate(): Template {
+        val signInMethod = InputSignInMethod.Builder(this).apply {
+            initialValue?.let {
+                setDefaultValue(it)
+                inputText = initialValue
+            }
+            setShowKeyboardByDefault(true)
+        }.build()
+        return SignInTemplate.Builder(signInMethod).apply {
+            setHeaderAction(Action.BACK)
+            setInstructions(carContext.getString(prompt))
+            setTitle(carContext.getString(title))
+            if (cancelable) {
+                addAction(
+                    Action.Builder()
+                        .setTitle(carContext.getString(R.string.cancel))
+                        .setOnClickListener(ParkedOnlyOnClickListener.create {
+                            screenManager.pop()
+                        })
+                        .build()
+                )
+            }
+            addAction(
+                Action.Builder()
+                    .setTitle(carContext.getString(R.string.ok))
+                    .setBackgroundColor(CarColor.PRIMARY)
+                    .setOnClickListener(ParkedOnlyOnClickListener.create {
+                        onInputSubmitted(inputText)
+                    })
+                    .build()
+            )
+        }.build()
+    }
+
+    override fun onInputTextChanged(text: String) {
+        inputText = text
+    }
+
+    override fun onInputSubmitted(text: String) {
+        setResult(text)
+        screenManager.pop()
+    }
+}

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

@@ -3,13 +3,13 @@ package net.vonforst.evmap.auto
 import android.content.Context
 import android.graphics.Bitmap
 import androidx.car.app.CarContext
+import androidx.car.app.Screen
 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.model.Distance
+import androidx.car.app.model.*
 import androidx.car.app.versioning.CarAppApiLevels
 import androidx.core.graphics.drawable.IconCompat
+import net.vonforst.evmap.R
 import net.vonforst.evmap.api.availability.ChargepointStatus
 import java.util.*
 import kotlin.math.roundToInt
@@ -35,6 +35,12 @@ val CarContext.constraintManager
 
 fun Bitmap.asCarIcon(): CarIcon = CarIcon.Builder(IconCompat.createWithBitmap(this)).build()
 
+val emptyCarIcon = Bitmap.createBitmap(
+    1,
+    1,
+    Bitmap.Config.ARGB_8888
+).asCarIcon()
+
 private const val kmPerMile = 1.609344
 private const val ftPerMile = 5280
 private const val ydPerMile = 1760
@@ -146,4 +152,17 @@ fun supportsCarApiLevel3(ctx: CarContext): Boolean {
         }
     }
     return true
+}
+
+class DummyReturnScreen(ctx: CarContext) : Screen(ctx) {
+    /*
+    Dummy screen to get around template refresh limitations.
+    It immediately pops back to the previous screen.
+     */
+    override fun onGetTemplate(): Template {
+        screenManager.pop()
+        return MessageTemplate.Builder(carContext.getString(R.string.loading)).setLoading(true)
+            .build()
+    }
+
 }

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

@@ -6,32 +6,46 @@ 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.hardware.info.*
 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 androidx.lifecycle.DefaultLifecycleObserver
+import androidx.lifecycle.LifecycleOwner
+import net.vonforst.evmap.BuildConfig
 import net.vonforst.evmap.R
+import net.vonforst.evmap.ui.CompassNeedle
 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
+class VehicleDataScreen(ctx: CarContext) : Screen(ctx), DefaultLifecycleObserver {
+    private val carInfo =
+        (ctx.getCarService(CarContext.HARDWARE_SERVICE) as CarHardwareManager).carInfo
+    private val carSensors = carContext.patchedCarSensors
     private var model: Model? = null
     private var energyLevel: EnergyLevel? = null
     private var speed: Speed? = null
+    private var heading: Compass? = null
     private var gauge = Gauge((ctx.resources.displayMetrics.density * 128).roundToInt(), ctx)
+    private var compass =
+        CompassNeedle((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"
-    )
+    private val permissions = if (BuildConfig.FLAVOR_automotive == "automotive") {
+        listOf(
+            "android.car.permission.CAR_INFO",
+            "android.car.permission.CAR_ENERGY",
+            "android.car.permission.CAR_ENERGY_PORTS",
+            "android.car.permission.READ_CAR_DISPLAY_UNITS",
+            "android.car.permission.CAR_SPEED"
+        )
+    } else {
+        listOf(
+            "com.google.android.gms.permission.CAR_FUEL",
+            "com.google.android.gms.permission.CAR_SPEED"
+        )
+    }
 
     init {
         lifecycle.addObserver(this)
@@ -55,6 +69,7 @@ class VehicleDataScreen(ctx: CarContext) : Screen(ctx), LifecycleObserver {
         val energyLevel = energyLevel
         val model = model
         val speed = speed
+        val heading = heading
 
         return GridTemplate.Builder().apply {
             setTitle(
@@ -171,6 +186,25 @@ class VehicleDataScreen(ctx: CarContext) : Screen(ctx), LifecycleObserver {
                                 }
                             }
                         }.build())
+                        addItem(GridItem.Builder().apply {
+                            setTitle(carContext.getString(R.string.auto_heading))
+                            if (heading == null) {
+                                setLoading(true)
+                            } else {
+                                val heading = heading.orientations.value
+                                if (heading != null) {
+                                    setText(
+                                        "${heading[0].roundToInt()}°"
+                                    )
+
+                                } else {
+                                    setText(carContext.getString(R.string.auto_no_data))
+                                }
+                                setImage(
+                                    compass.draw(heading?.get(0)).asCarIcon()
+                                )
+                            }
+                        }.build())
                     }.build()
                 )
             }
@@ -187,27 +221,44 @@ class VehicleDataScreen(ctx: CarContext) : Screen(ctx), LifecycleObserver {
         invalidate()
     }
 
-    @OnLifecycleEvent(Lifecycle.Event.ON_RESUME)
+    private fun onCompassUpdated(compass: Compass) {
+        this.heading = compass
+        invalidate()
+    }
+
+    override fun onResume(owner: LifecycleOwner) {
+        setupListeners()
+    }
+
     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)
+        carInfo.addEnergyLevelListener(exec, ::onEnergyLevelUpdated)
+        carInfo.addSpeedListener(exec, ::onSpeedUpdated)
+        carSensors.addCompassListener(
+            CarSensors.UPDATE_RATE_NORMAL,
+            exec,
+            ::onCompassUpdated
+        )
 
-        hardwareMan.carInfo.fetchModel(exec) {
+        carInfo.fetchModel(exec) {
             this.model = it
             invalidate()
         }
     }
 
-    @OnLifecycleEvent(Lifecycle.Event.ON_PAUSE)
+    override fun onPause(owner: LifecycleOwner) {
+        removeListeners()
+    }
+
     private fun removeListeners() {
         println("Removing energy level listener")
-        hardwareMan.carInfo.removeEnergyLevelListener(::onEnergyLevelUpdated)
-        hardwareMan.carInfo.removeSpeedListener(::onSpeedUpdated)
+        carInfo.removeEnergyLevelListener(::onEnergyLevelUpdated)
+        carInfo.removeSpeedListener(::onSpeedUpdated)
+        carSensors.removeCompassListener(::onCompassUpdated)
     }
 
     private fun permissionsGranted(): Boolean =

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

@@ -1,121 +0,0 @@
-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.*
-import androidx.core.graphics.drawable.IconCompat
-import net.vonforst.evmap.R
-
-/**
- * Welcome screen with selection between favorites and nearby chargers
- */
-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))
-            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()
-                            )
-                            .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()
-                        )
-                    }
-                }.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/CompassNeedle.kt

@@ -0,0 +1,33 @@
+package net.vonforst.evmap.ui
+
+import android.content.Context
+import android.graphics.Bitmap
+import android.graphics.Canvas
+import android.graphics.Color
+import android.graphics.PorterDuff
+import androidx.core.content.ContextCompat
+import net.vonforst.evmap.R
+
+class CompassNeedle(val size: Int, ctx: Context) {
+    val image = ContextCompat.getDrawable(ctx, R.drawable.ic_navigation)!!
+
+    init {
+        image.setTint(Color.WHITE)
+        image.setBounds(0, 0, size, size)
+    }
+
+    fun draw(angle: Float?): Bitmap {
+        val bitmap = Bitmap.createBitmap(size, size, Bitmap.Config.ARGB_8888)
+        val canvas = Canvas(bitmap)
+
+        canvas.drawColor(Color.TRANSPARENT, PorterDuff.Mode.CLEAR)
+
+        if (angle != null) {
+            canvas.save()
+            canvas.rotate(-angle, size / 2f, size / 2f)
+            image.draw(canvas)
+            canvas.restore()
+        }
+        return bitmap
+    }
+}

app/src/google/res/drawable/ic_checkbox_checked.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="M19,3L5,3c-1.11,0 -2,0.9 -2,2v14c0,1.1 0.89,2 2,2h14c1.11,0 2,-0.9 2,-2L21,5c0,-1.1 -0.89,-2 -2,-2zM10,17l-5,-5 1.41,-1.41L10,14.17l7.59,-7.59L19,8l-9,9z" />
+</vector>

app/src/google/res/drawable/ic_checkbox_unchecked.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="M19,5v14H5V5h14m0,-2H5c-1.1,0 -2,0.9 -2,2v14c0,1.1 0.9,2 2,2h14c1.1,0 2,-0.9 2,-2V5c0,-1.1 -0.9,-2 -2,-2z" />
+</vector>

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

@@ -0,0 +1,13 @@
+<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="M15.5,14h-0.79l-0.28,-0.27C15.41,12.59 16,11.11 16,9.5C16,5.91 13.09,3 9.5,3C6.08,3 3.28,5.64 3.03,9h2.02C5.3,6.75 7.18,5 9.5,5C11.99,5 14,7.01 14,9.5S11.99,14 9.5,14c-0.17,0 -0.33,-0.03 -0.5,-0.05v2.02C9.17,15.99 9.33,16 9.5,16c1.61,0 3.09,-0.59 4.23,-1.57L14,14.71v0.79l5,4.99L20.49,19L15.5,14z" />
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M6.47,10.82l-2.47,2.47l-2.47,-2.47l-0.71,0.71l2.47,2.47l-2.47,2.47l0.71,0.71l2.47,-2.47l2.47,2.47l0.71,-0.71l-2.47,-2.47l2.47,-2.47z" />
+</vector>

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

@@ -19,6 +19,7 @@
     <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_chargers_near_location">Nahe %s</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>
@@ -27,6 +28,8 @@
     <string name="auto_no_data">Nicht verfügbar</string>
     <string name="auto_range">Reichweite</string>
     <string name="auto_speed">Geschwindigkeit</string>
+    <string name="auto_heading">Fahrtrichtung</string>
+    <string name="auto_settings">Einstellungen</string>
     <string name="welcome_android_auto">Android Auto-Unterstützung</string>
     <string name="welcome_android_auto_detail">Auf unterstützen Autos kannst du EVMap auch mit Android Auto nutzen. Öffne dazu einfach die EVMap-App aus dem Menü von Android Auto.</string>
     <string name="sounds_cool">klingt cool</string>
@@ -34,4 +37,8 @@
     <string name="auto_chargeprice_vehicle_unknown">Keins der in der App ausgewählten Fahrzeuge passt zu diesem Fahrzeug (%1$s %2$s).</string>
     <string name="auto_chargeprice_vehicle_ambiguous">Mehrere der in der App ausgewählten Fahrzeuge passen zu diesem Fahrzeug (%1$s %2$s).</string>
     <string name="settings_android_auto_chargeprice_range">Ladebereich für Preisvergleich</string>
+    <string name="data_sources_hint">In den Einstellungen kannst du auch zwischen Google Maps und OpenStreetMap (Mapbox) für die Kartendaten wechseln.</string>
+    <string name="selecting_all">alle Einträge ausgewählt</string>
+    <string name="selecting_none">alle Einträge abgewählt</string>
+    <string name="loading">Lade…</string>
 </resources>

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

@@ -29,6 +29,7 @@
     <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_chargers_near_location">Near %s</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>
@@ -37,6 +38,8 @@
     <string name="auto_no_data">Unavailable</string>
     <string name="auto_range">Range</string>
     <string name="auto_speed">Speed</string>
+    <string name="auto_heading">Heading</string>
+    <string name="auto_settings">Settings</string>
     <string name="welcome_android_auto">Android Auto support</string>
     <string name="welcome_android_auto_detail">You can also use EVMap from within Android Auto on supported cars. Simply select the EVMap app in the Android Auto menu.</string>
     <string name="sounds_cool">sounds cool</string>
@@ -44,4 +47,8 @@
     <string name="auto_chargeprice_vehicle_unknown">None of the vehicles selected in the app matches this vehicle (%1$s %2$s).</string>
     <string name="auto_chargeprice_vehicle_ambiguous">Mehrere der in der App ausgewählten Fahrzeuge passen zu diesem Fahrzeug (%1$s %2$s).</string>
     <string name="settings_android_auto_chargeprice_range">Charging range for price comparison</string>
+    <string name="data_sources_hint">In the settings you can also switch between Google Maps and OpenStreetMap (Mapbox) for the map data.</string>
+    <string name="selecting_all">selected all items</string>
+    <string name="selecting_none">deselected all items</string>
+    <string name="loading">Loading…</string>
 </resources>

app/src/googleAutomotive/AndroidManifest.xml

@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    package="net.vonforst.evmap">
+
+    <uses-permission android:name="android.car.permission.CAR_INFO" />
+    <uses-permission android:name="android.car.permission.CAR_ENERGY" />
+    <uses-permission android:name="android.car.permission.CAR_ENERGY_PORTS" />
+    <uses-permission android:name="android.car.permission.READ_CAR_DISPLAY_UNITS" />
+    <uses-permission android:name="android.car.permission.CAR_SPEED" />
+
+    <uses-feature
+        android:name="android.hardware.type.automotive"
+        android:required="true" />
+
+    <uses-feature
+        android:name="android.software.car.templates_host"
+        android:required="true" />
+
+    <uses-feature
+        android:name="android.hardware.wifi"
+        tools:replace="required"
+        android:required="false" />
+    <uses-feature
+        android:name="android.hardware.screen.portrait"
+        android:required="false" />
+    <uses-feature
+        android:name="android.hardware.screen.landscape"
+        android:required="false" />
+    <uses-feature
+        android:name="android.hardware.camera"
+        android:required="false" />
+
+    <application>
+        <meta-data
+            android:name="com.android.automotive"
+            android:resource="@xml/automotive_app_desc" />
+
+        <meta-data
+            android:name="com.google.android.gms.car.application"
+            tools:node="remove" />
+
+        <activity
+            android:name=".MapsActivity"
+            tools:node="remove" />
+
+        <activity
+            android:exported="true"
+            android:theme="@android:style/Theme.DeviceDefault.NoActionBar"
+            android:name="androidx.car.app.activity.CarAppActivity"
+            android:launchMode="singleTask"
+            android:label="@string/app_name">
+
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+
+            <meta-data
+                android:name="distractionOptimized"
+                android:value="true" />
+
+        </activity>
+    </application>
+</manifest>

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

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="grant_on_phone">Zulassen</string>
+    <string name="auto_location_permission_needed">Um EVMap auf deinem Fahrzeug zu nutzen, braucht die App Zugriff auf deinen Standort.</string>
+</resources>

app/src/googleAutomotive/res/values/values.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="auto_location_permission_needed">To run EVMap on your car, you need to grant access to your location.</string>
+    <string name="grant_on_phone">Allow</string>
+</resources>

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

@@ -84,10 +84,10 @@ class MapsActivity : AppCompatActivity(),
         val navView = findViewById<NavigationView>(R.id.nav_view)
         navView.setupWithNavController(navController)
 
-        val header = navView.getHeaderView(0)
-        ViewCompat.setOnApplyWindowInsetsListener(header) { v, insets ->
-            v.setPadding(0, insets.getInsets(WindowInsetsCompat.Type.statusBars()).top, 0, 0)
-            insets
+        ViewCompat.setOnApplyWindowInsetsListener(navView) { v, insets ->
+            val header = navView.getHeaderView(0)
+            header.setPadding(0, insets.getInsets(WindowInsetsCompat.Type.statusBars()).top, 0, 0)
+            WindowInsetsCompat.CONSUMED
         }
 
         prefs = PreferenceDataSource(this)
@@ -98,7 +98,7 @@ class MapsActivity : AppCompatActivity(),
         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 {
+                splashScreen.setKeepOnScreenCondition(object : SplashScreen.KeepOnScreenCondition {
                     var startTime: Long? = null
 
                     override fun shouldKeepOnScreen(): Boolean {
@@ -163,6 +163,7 @@ class MapsActivity : AppCompatActivity(),
                     .createPendingIntent()
             } else if (intent.hasExtra(EXTRA_FAVORITES)) {
                 deepLink = navController.createDeepLink()
+                    .setGraph(navGraph)
                     .setDestination(R.id.favs)
                     .createPendingIntent()
             }

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

@@ -171,7 +171,7 @@ class CheckableConnectorAdapter : DataBindingAdapter<Chargepoint>() {
                 root.post {
                     notifyDataSetChanged()
                 }
-                onCheckedItemChangedListener?.invoke(getCheckedItem()!!)
+                getCheckedItem()?.let { onCheckedItemChangedListener?.invoke(it) }
             }
         }
     }

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

@@ -44,13 +44,13 @@ fun buildDetails(
     if (loc == null) return emptyList()
 
     return listOfNotNull(
-        DetailsAdapter.Detail(
+        if (loc.address != null) DetailsAdapter.Detail(
             R.drawable.ic_address,
             R.string.address,
             loc.address.toString(),
             loc.locationDescription,
             clickable = true
-        ),
+        ) else null,
         if (loc.operator != null) DetailsAdapter.Detail(
             R.drawable.ic_operator,
             R.string.operator,
@@ -91,7 +91,7 @@ fun buildDetails(
             R.drawable.ic_cost,
             R.string.cost,
             loc.cost.getStatusText(ctx),
-            loc.cost.descriptionLong ?: loc.cost.descriptionShort
+            loc.cost.getDetailText()
         )
         else null,
         if (loc.chargecards != null && loc.chargecards.isNotEmpty() || loc.barrierFree == true)

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

@@ -14,7 +14,7 @@ class FavoritesAdapter(val onDelete: (FavoritesViewModel.FavoritesListItem) -> U
 
     override fun getItemViewType(position: Int): Int = R.layout.item_favorite
 
-    override fun getItemId(position: Int): Long = getItem(position).charger.id
+    override fun getItemId(position: Int): Long = getItem(position).fav.favorite.favoriteId
 
     @SuppressLint("ClickableViewAccessibility")
     override fun bind(

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

@@ -21,6 +21,14 @@ import java.util.concurrent.TimeUnit
 
 interface AvailabilityDetector {
     suspend fun getAvailability(location: ChargeLocation): ChargeLocationStatus
+
+    /**
+     * Get a rough estimate whether this charger is supported by this provider.
+     *
+     * This might be done by checking supported countries, or even by matching the operator
+     * for operator-specific availability detectors.
+     */
+    fun isChargerSupported(charger: ChargeLocation): Boolean
 }
 
 abstract class BaseAvailabilityDetector(private val client: OkHttpClient) : AvailabilityDetector {
@@ -86,7 +94,7 @@ abstract class BaseAvailabilityDetector(private val client: OkHttpClient) : Avai
                 // find corresponding powers in GE data
                 val gePowers =
                     chargepoints.filter { equivalentPlugTypes(it.type).any { it == type } }
-                        .map { it.power }.distinct().sorted()
+                        .mapNotNull { it.power }.distinct().sorted()
 
                 // if the distinct number of powers is the same, try to match.
                 if (powers.size == gePowers.size) {
@@ -131,7 +139,7 @@ data class ChargeLocationStatus(
             (connectors == null || connectors.map {
                 equivalentPlugTypes(it)
             }.any { equivalent -> it.type in equivalent })
-                    && (minPower == null || it.power > minPower)
+                    && (minPower == null || (it.power != null && it.power >= minPower))
         }
         return this.copy(status = statusFiltered)
     }
@@ -157,21 +165,16 @@ private val okhttp = OkHttpClient.Builder()
     .cookieJar(JavaNetCookieJar(cookieManager))
     .build()
 val availabilityDetectors = listOf(
+    RheinenergieAvailabilityDetector(okhttp),
+    EnBwAvailabilityDetector(okhttp),
     NewMotionAvailabilityDetector(okhttp)
-    /*ChargecloudAvailabilityDetector(
-        okhttp,
-        "606a0da0dfdd338ee4134605653d4fd8"
-    ), // Maingau
-    ChargecloudAvailabilityDetector(
-        okhttp,
-        "6336fe713f2eb7fa04b97ff6651b76f8"
-    )  // SW Kiel*/
 )
 
 suspend fun getAvailability(charger: ChargeLocation): Resource<ChargeLocationStatus> {
     var value: Resource<ChargeLocationStatus>? = null
     withContext(Dispatchers.IO) {
         for (ad in availabilityDetectors) {
+            if (!ad.isChargerSupported(charger)) continue
             try {
                 value = Resource.success(ad.getAvailability(charger))
                 break
@@ -188,4 +191,4 @@ suspend fun getAvailability(charger: ChargeLocation): Resource<ChargeLocationSta
         }
     }
     return value ?: Resource.error(null, null)
-}
+}

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

@@ -1,83 +1,110 @@
 package net.vonforst.evmap.api.availability
 
-import net.vonforst.evmap.api.iterator
+import com.squareup.moshi.Json
+import com.squareup.moshi.JsonClass
 import net.vonforst.evmap.model.ChargeLocation
 import net.vonforst.evmap.model.Chargepoint
 import okhttp3.OkHttpClient
-import org.json.JSONObject
-import java.io.IOException
+import retrofit2.Retrofit
+import retrofit2.converter.moshi.MoshiConverterFactory
+import retrofit2.http.GET
+import retrofit2.http.Query
 
-class ChargecloudAvailabilityDetector(
-    client: OkHttpClient,
-    private val operatorId: String
+interface ChargecloudApi {
+    @GET("locations")
+    suspend fun getData(
+        @Query("latitude") latitude: Double,
+        @Query("longitude") longitude: Double,
+        @Query("radius") radius: Int,
+        @Query("offset") offset: Int = 0,
+        @Query("limit") limit: Int = 10
+    ): ChargecloudResponse
+
+    @JsonClass(generateAdapter = true)
+    data class ChargecloudResponse(
+        val data: List<ChargecloudLocation>
+    )
+
+    @JsonClass(generateAdapter = true)
+    data class ChargecloudLocation(
+        val coordinates: ChargecloudCoordinates,
+        val evses: List<ChargecloudEvse>,
+        @Json(name = "distance_in_m") val distanceInM: String
+    )
+
+    @JsonClass(generateAdapter = true)
+    data class ChargecloudCoordinates(val latitude: Double, val longitude: Double)
+
+    @JsonClass(generateAdapter = true)
+    data class ChargecloudEvse(
+        val id: String,
+        val status: String,
+        val connectors: List<ChargecloudConnector>
+    )
+
+    @JsonClass(generateAdapter = true)
+    data class ChargecloudConnector(
+        val id: Long,
+        val standard: String,
+        @Json(name = "max_power") val maxPower: Double,
+        val status: String
+    )
+
+    companion object {
+        fun create(client: OkHttpClient, baseUrl: String? = null): ChargecloudApi {
+            val retrofit = Retrofit.Builder()
+                .baseUrl(baseUrl)
+                .addConverterFactory(MoshiConverterFactory.create())
+                .client(client)
+                .build()
+            return retrofit.create(ChargecloudApi::class.java)
+        }
+    }
+}
+
+abstract class ChargecloudAvailabilityDetector(
+    client: OkHttpClient
 ) : BaseAvailabilityDetector(client) {
+    protected abstract val operatorId: String
+
+    private val api: ChargecloudApi by lazy {
+        val baseUrl = "https://app.chargecloud.de/emobility:ocpi/$operatorId/app/2.0/"
+        ChargecloudApi.create(client, baseUrl)
+    }
+
     override suspend fun getAvailability(location: ChargeLocation): ChargeLocationStatus {
-        val url =
-            "https://app.chargecloud.de/emobility:ocpi/$operatorId/app/2.0/locations?latitude=${location.coordinates.lat}&longitude=${location.coordinates.lng}&radius=$radius&offset=0&limit=10"
-        val json = JSONObject(httpGet(url))
+        val data = api.getData(location.coordinates.lat, location.coordinates.lng, radius)
 
-        val statusMessage = json.getString("status_message")
-        if (statusMessage != "Success") throw IOException(statusMessage)
+        val nearest = data.data.minByOrNull { it.distanceInM.toDouble() }
+            ?: throw AvailabilityDetectorException("no candidates found.")
 
-        val data = json.getJSONArray("data")
-        if (data.length() > 1) throw AvailabilityDetectorException(
-            "found multiple candidates."
-        )
-        if (data.length() == 0) throw AvailabilityDetectorException(
-            "no candidates found."
-        )
+        val chargecloudConnectors = mutableMapOf<Long, Pair<Double, String>>()
+        val chargecloudStatus = mutableMapOf<Long, ChargepointStatus>()
 
-        val evses = data.getJSONObject(0).getJSONArray("evses")
-        val chargepointStatus = mutableMapOf<Chargepoint, List<ChargepointStatus>>()
-        evses.iterator<JSONObject>().forEach { evse ->
-            evse.getJSONArray("connectors").iterator<JSONObject>().forEach connector@{ connector ->
-                val type = getType(connector.getString("standard"))
-                val power = connector.getDouble("max_power")
-                val status = ChargepointStatus.valueOf(connector.getString("status"))
-
-                var chargepoint = getCorrespondingChargepoint(chargepointStatus.keys, type, power)
-                val statusList: List<ChargepointStatus>
-                if (chargepoint == null) {
-                    // find corresponding chargepoint from goingelectric to get correct power
-                    val geChargepoint =
-                        getCorrespondingChargepoint(location.chargepointsMerged, type, power)
-                            ?: throw AvailabilityDetectorException(
-                                "Chargepoints from chargecloud API and goingelectric do not match."
-                            )
-                    chargepoint = Chargepoint(
-                        type,
-                        geChargepoint.power,
-                        1
-                    )
-                    statusList = listOf(status)
-                } else {
-                    val previousStatus = chargepointStatus[chargepoint]!!
-                    statusList = previousStatus + listOf(status)
-                    chargepointStatus.remove(chargepoint)
-                    chargepoint =
-                        Chargepoint(
-                            chargepoint.type,
-                            chargepoint.power,
-                            chargepoint.count + 1
-                        )
-                }
-
-                chargepointStatus[chargepoint] = statusList
+        nearest.evses.flatMap { it.connectors }.forEach {
+            val id = it.id
+            val power = it.maxPower
+            val type = getType(it.standard)
+            val status = when (it.status) {
+                "OUTOFORDER" -> ChargepointStatus.FAULTED
+                "AVAILABLE" -> ChargepointStatus.AVAILABLE
+                "CHARGING" -> ChargepointStatus.CHARGING
+                "UNKNOWN" -> ChargepointStatus.UNKNOWN
+                else -> ChargepointStatus.UNKNOWN
             }
+            chargecloudConnectors.put(id, power to type)
+            chargecloudStatus.put(id, status)
         }
 
-
-
-        if (chargepointStatus.keys == location.chargepointsMerged.toSet()) {
-            return ChargeLocationStatus(
-                chargepointStatus,
-                "chargecloud.de"
-            )
-        } else {
-            throw AvailabilityDetectorException(
-                "Chargepoints from chargecloud API and goingelectric do not match."
-            )
+        val match = matchChargepoints(chargecloudConnectors, location.chargepointsMerged)
+        val chargepointStatus = match.mapValues { entry ->
+            entry.value.map { chargecloudStatus[it]!! }
         }
+
+        return ChargeLocationStatus(
+            chargepointStatus,
+            "chargecloud.de"
+        )
     }
 
     private fun getType(string: String): String {
@@ -86,7 +113,24 @@ class ChargecloudAvailabilityDetector(
             "DOMESTIC_F" -> Chargepoint.SCHUKO
             "IEC_62196_T2_COMBO" -> Chargepoint.CCS_TYPE_2
             "CHADEMO" -> Chargepoint.CHADEMO
-            else -> throw IllegalArgumentException("unrecognized type $string")
+            else -> "unknown"
         }
     }
-}
+}
+
+class RheinenergieAvailabilityDetector(client: OkHttpClient) :
+    ChargecloudAvailabilityDetector(client) {
+    override val operatorId = "c4ce9bb82a86766833df8a4818fa1b5c"
+
+    override fun isChargerSupported(charger: ChargeLocation): Boolean {
+        val network = charger.chargepriceData?.network ?: charger.network ?: return false
+        return when (charger.dataSource) {
+            "goingelectric" -> network == "RheinEnergie"
+            "openchargemap" -> network == "72"
+            else -> false
+        }
+    }
+}
+
+// "606a0da0dfdd338ee4134605653d4fd8" Maingau
+// "6336fe713f2eb7fa04b97ff6651b76f8" SW Kiel*/

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

@@ -0,0 +1,227 @@
+package net.vonforst.evmap.api.availability
+
+import com.squareup.moshi.JsonClass
+import net.vonforst.evmap.model.ChargeLocation
+import net.vonforst.evmap.model.Chargepoint
+import net.vonforst.evmap.utils.distanceBetween
+import okhttp3.OkHttpClient
+import retrofit2.Retrofit
+import retrofit2.converter.moshi.MoshiConverterFactory
+import retrofit2.http.GET
+import retrofit2.http.Path
+import retrofit2.http.Query
+
+private const val coordRange = 0.005  // range of latitude and longitude for loading the map
+private const val maxDistance = 40  // max distance between reported positions in meters
+
+interface EnBwApi {
+    @GET("chargestations?grouping=false")
+    suspend fun getMarkers(
+        @Query("fromLon") fromLon: Double,
+        @Query("toLon") toLon: Double,
+        @Query("fromLat") fromLat: Double,
+        @Query("toLat") toLat: Double,
+    ): List<EnBwLocation>
+
+    @GET("chargestations/{id}")
+    suspend fun getLocation(@Path("id") id: Long): EnBwLocationDetail
+
+    @JsonClass(generateAdapter = true)
+    data class EnBwLocation(
+        val lat: Double,
+        val lon: Double,
+        val stationId: Long?,
+        val grouped: Boolean,
+        val availableChargePoints: Int,
+        val numberOfChargePoints: Int,
+        val operator: String,
+        val viewPort: EnBwViewport
+    )
+
+    @JsonClass(generateAdapter = true)
+    data class EnBwLocationDetail(
+        val lat: Double,
+        val lon: Double,
+        val stationId: Long,
+        val availableChargePoints: Int,
+        val numberOfChargePoints: Int,
+        val operator: String,
+        val chargePoints: List<EnBwChargePoint>
+    )
+
+    @JsonClass(generateAdapter = true)
+    data class EnBwChargePoint(
+        val evseId: String?,
+        val status: String,
+        val connectors: List<EnBwConnector>
+    )
+
+    @JsonClass(generateAdapter = true)
+    data class EnBwConnector(
+        val plugTypeName: String,
+        val maxPowerInKw: Double?,
+    )
+
+    @JsonClass(generateAdapter = true)
+    data class EnBwViewport(
+        val lowerLeftLat: Double,
+        val lowerLeftLon: Double,
+        val upperRightLat: Double,
+        val upperRightLon: Double
+    )
+
+    companion object {
+        fun create(client: OkHttpClient, baseUrl: String? = null): EnBwApi {
+            val clientWithInterceptor = client.newBuilder()
+                .addInterceptor { chain ->
+                    // add API key to every request
+                    val request = chain.request().newBuilder()
+                        .header("Ocp-Apim-Subscription-Key", "d4954e8b2e444fc89a89a463788c0a72")
+                        .header("Origin", "https://www.enbw.com")
+                        .header("Referer", "https://www.enbw.com/")
+                        .header("Accept", "application/json")
+                        .build()
+                    chain.proceed(request)
+                }.build()
+            val retrofit = Retrofit.Builder()
+                .baseUrl(baseUrl ?: "https://enbw-emp.azure-api.net/emobility-public-api/api/v1/")
+                .addConverterFactory(MoshiConverterFactory.create())
+                .client(clientWithInterceptor)
+                .build()
+            return retrofit.create(EnBwApi::class.java)
+        }
+    }
+}
+
+class EnBwAvailabilityDetector(client: OkHttpClient, baseUrl: String? = null) :
+    BaseAvailabilityDetector(client) {
+    val api = EnBwApi.create(client, baseUrl)
+
+    override suspend fun getAvailability(location: ChargeLocation): ChargeLocationStatus {
+        val lat = location.coordinates.lat
+        val lng = location.coordinates.lng
+
+        // find nearest station to this position
+        var markers =
+            api.getMarkers(lng - coordRange, lng + coordRange, lat - coordRange, lat + coordRange)
+
+        markers = markers.flatMap {
+            if (it.grouped) {
+                api.getMarkers(
+                    it.viewPort.lowerLeftLon,
+                    it.viewPort.upperRightLon,
+                    it.viewPort.lowerLeftLat,
+                    it.viewPort.upperRightLat
+                )
+            } else {
+                listOf(it)
+            }
+        }
+
+        val nearest = markers.minByOrNull { marker ->
+            distanceBetween(marker.lat, marker.lon, lat, lng)
+        } ?: throw AvailabilityDetectorException("no candidates found.")
+
+        if (distanceBetween(
+                nearest.lat,
+                nearest.lon,
+                lat,
+                lng
+            ) > radius
+        ) {
+            throw AvailabilityDetectorException("no candidates found")
+        }
+
+        // combine related stations
+        markers = markers.filter { marker ->
+            distanceBetween(
+                marker.lat,
+                marker.lon,
+                nearest.lat,
+                nearest.lon
+            ) < maxDistance
+        }
+
+        var details = markers.filter {
+            // only include stations from same operator
+            it.operator == nearest.operator && it.stationId != null
+        }.map {
+            // load details
+            api.getLocation(it.stationId!!)
+        }
+
+        val connectorStatus = details.flatMap { it.chargePoints }.flatMap { cp ->
+            cp.connectors.map { connector ->
+                connector to cp.status
+            }
+        }
+
+        val enbwConnectors = mutableMapOf<Long, Pair<Double, String>>()
+        val enbwStatus = mutableMapOf<Long, ChargepointStatus>()
+        connectorStatus.forEachIndexed { index, (connector, statusStr) ->
+            val id = index.toLong()
+            val power = connector.maxPowerInKw ?: 0.0
+            val type = when (connector.plugTypeName) {
+                "Typ 3A" -> Chargepoint.TYPE_3
+                "Typ 2" -> Chargepoint.TYPE_2_UNKNOWN
+                "Typ 1" -> Chargepoint.TYPE_1
+                "Steckdose(D)" -> Chargepoint.SCHUKO
+                "CCS (Typ 1)" -> Chargepoint.CCS_TYPE_1  // US CCS, aka type1_combo
+                "CCS (Typ 2)" -> Chargepoint.CCS_TYPE_2  // EU CCS, aka type2_combo
+                "CHAdeMO" -> Chargepoint.CHADEMO
+                else -> "unknown"
+            }
+            val status = when (statusStr) {
+                "UNAVAILABLE" -> ChargepointStatus.FAULTED
+                "OUT_OF_SERVICE" -> ChargepointStatus.FAULTED
+                "AVAILABLE" -> ChargepointStatus.AVAILABLE
+                "OCCUPIED" -> ChargepointStatus.CHARGING
+                "UNSPECIFIED" -> ChargepointStatus.UNKNOWN
+                else -> ChargepointStatus.UNKNOWN
+            }
+            enbwConnectors.put(id, power to type)
+            enbwStatus.put(id, status)
+        }
+
+        val match = matchChargepoints(enbwConnectors, location.chargepointsMerged)
+        val chargepointStatus = match.mapValues { entry ->
+            entry.value.map { enbwStatus[it]!! }
+        }
+        return ChargeLocationStatus(
+            chargepointStatus,
+            "EnBW"
+        )
+    }
+
+    override fun isChargerSupported(charger: ChargeLocation): Boolean {
+        val country = charger.chargepriceData?.country
+            ?: charger.address?.country ?: return false
+        return when (charger.dataSource) {
+            // list of countries as of 2021/06/30, according to
+            // https://www.electrive.net/2021/06/30/enbw-expandiert-mit-ladenetz-in-drei-weitere-laender/
+            "goingelectric" -> country in listOf(
+                "Deutschland",
+                "Österreich",
+                "Schweiz",
+                "Frankreich",
+                "Belgien",
+                "Niederlande",
+                "Luxemburg",
+                "Liechtenstein",
+                "Italien",
+            )
+            "openchargemap" -> country in listOf(
+                "DE",
+                "AT",
+                "CH",
+                "FR",
+                "BE",
+                "NE",
+                "LU",
+                "LI",
+                "IT"
+            )
+            else -> false
+        }
+    }
+}

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

@@ -11,8 +11,8 @@ import retrofit2.http.GET
 import retrofit2.http.Path
 import java.util.*
 
-private const val coordRange = 0.1  // range of latitude and longitude for loading the map
-private const val maxDistance = 15  // max distance between reported positions in meters
+private const val coordRange = 0.005  // range of latitude and longitude for loading the map
+private const val maxDistance = 40  // max distance between reported positions in meters
 
 interface NewMotionApi {
     @GET("markers/{lngMin}/{lngMax}/{latMin}/{latMax}")
@@ -173,4 +173,9 @@ class NewMotionAvailabilityDetector(client: OkHttpClient, baseUrl: String? = nul
         )
     }
 
+    override fun isChargerSupported(charger: ChargeLocation): Boolean {
+        // NewMotion is our fallback
+        return true
+    }
+
 }

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

@@ -48,11 +48,9 @@ data class ChargepriceStation(
                 charger.coordinates.lat,
                 charger.chargepriceData.country,
                 charger.chargepriceData.network,
-                charger.chargepoints.zip(plugTypes).filter {
-                    equivalentPlugTypes(it.first.type).any { it in compatibleConnectors }
-                }.map {
-                    ChargepriceChargepoint(it.first.power, it.second)
-                }
+                charger.chargepoints.zip(plugTypes)
+                    .filter { equivalentPlugTypes(it.first.type).any { it in compatibleConnectors } }
+                    .map { ChargepriceChargepoint(it.first.power ?: 0.0, it.second) }
             )
         }
     }

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

@@ -21,50 +21,51 @@ import okhttp3.OkHttpClient
 import retrofit2.Response
 import retrofit2.Retrofit
 import retrofit2.converter.moshi.MoshiConverterFactory
-import retrofit2.http.GET
-import retrofit2.http.Query
+import retrofit2.http.*
 import java.io.IOException
 
 interface GoingElectricApi {
-    @GET("chargepoints/")
+    @FormUrlEncoded
+    @POST("chargepoints/")
     suspend fun getChargepoints(
-        @Query("sw_lat") sw_lat: Double, @Query("sw_lng") sw_lng: Double,
-        @Query("ne_lat") ne_lat: Double, @Query("ne_lng") ne_lng: Double,
-        @Query("zoom") zoom: Float,
-        @Query("clustering") clustering: Boolean = false,
-        @Query("cluster_distance") clusterDistance: Int? = null,
-        @Query("freecharging") freecharging: Boolean = false,
-        @Query("freeparking") freeparking: Boolean = false,
-        @Query("min_power") minPower: Int = 0,
-        @Query("plugs") plugs: String? = null,
-        @Query("chargecards") chargecards: String? = null,
-        @Query("networks") networks: String? = null,
-        @Query("categories") categories: String? = null,
-        @Query("startkey") startkey: Int? = null,
-        @Query("open_twentyfourseven") open247: Boolean = false,
-        @Query("barrierfree") barrierfree: Boolean = false,
-        @Query("exclude_faults") excludeFaults: Boolean = false
+        @Field("sw_lat") sw_lat: Double, @Field("sw_lng") sw_lng: Double,
+        @Field("ne_lat") ne_lat: Double, @Field("ne_lng") ne_lng: Double,
+        @Field("zoom") zoom: Float,
+        @Field("clustering") clustering: Boolean = false,
+        @Field("cluster_distance") clusterDistance: Int? = null,
+        @Field("freecharging") freecharging: Boolean = false,
+        @Field("freeparking") freeparking: Boolean = false,
+        @Field("min_power") minPower: Int = 0,
+        @Field("plugs") plugs: String? = null,
+        @Field("chargecards") chargecards: String? = null,
+        @Field("networks") networks: String? = null,
+        @Field("categories") categories: String? = null,
+        @Field("startkey") startkey: Int? = null,
+        @Field("open_twentyfourseven") open247: Boolean = false,
+        @Field("barrierfree") barrierfree: Boolean = false,
+        @Field("exclude_faults") excludeFaults: Boolean = false
     ): Response<GEChargepointList>
 
-    @GET("chargepoints/")
+    @FormUrlEncoded
+    @POST("chargepoints/")
     suspend fun getChargepointsRadius(
-        @Query("lat") lat: Double, @Query("lng") lng: Double,
-        @Query("radius") radius: Int,
-        @Query("zoom") zoom: Float,
-        @Query("orderby") orderby: String = "distance",
-        @Query("clustering") clustering: Boolean = false,
-        @Query("cluster_distance") clusterDistance: Int? = null,
-        @Query("freecharging") freecharging: Boolean = false,
-        @Query("freeparking") freeparking: Boolean = false,
-        @Query("min_power") minPower: Int = 0,
-        @Query("plugs") plugs: String? = null,
-        @Query("chargecards") chargecards: String? = null,
-        @Query("networks") networks: String? = null,
-        @Query("categories") categories: String? = null,
-        @Query("startkey") startkey: Int? = null,
-        @Query("open_twentyfourseven") open247: Boolean = false,
-        @Query("barrierfree") barrierfree: Boolean = false,
-        @Query("exclude_faults") excludeFaults: Boolean = false
+        @Field("lat") lat: Double, @Field("lng") lng: Double,
+        @Field("radius") radius: Int,
+        @Field("zoom") zoom: Float,
+        @Field("orderby") orderby: String = "distance",
+        @Field("clustering") clustering: Boolean = false,
+        @Field("cluster_distance") clusterDistance: Int? = null,
+        @Field("freecharging") freecharging: Boolean = false,
+        @Field("freeparking") freeparking: Boolean = false,
+        @Field("min_power") minPower: Int = 0,
+        @Field("plugs") plugs: String? = null,
+        @Field("chargecards") chargecards: String? = null,
+        @Field("networks") networks: String? = null,
+        @Field("categories") categories: String? = null,
+        @Field("startkey") startkey: Int? = null,
+        @Field("open_twentyfourseven") open247: Boolean = false,
+        @Field("barrierfree") barrierfree: Boolean = false,
+        @Field("exclude_faults") excludeFaults: Boolean = false
     ): Response<GEChargepointList>
 
     @GET("chargepoints/")
@@ -125,6 +126,7 @@ class GoingElectricApiWrapper(
     baseurl: String = "https://api.goingelectric.de",
     context: Context? = null
 ) : ChargepointApi<GEReferenceData> {
+    private val clusterThreshold = 11f
     val api = GoingElectricApi.create(apikey, baseurl, context)
 
     override fun getName() = "GoingElectric.de"
@@ -172,7 +174,7 @@ class GoingElectricApiWrapper(
         val categories = formatMultipleChoice(categoriesVal)
 
         // do not use clustering if filters need to be applied locally.
-        val useClustering = zoom < 13
+        val useClustering = zoom < clusterThreshold
         val geClusteringAvailable = minConnectors == null || minConnectors <= 1
         val useGeClustering = useClustering && geClusteringAvailable
         val clusterDistance = if (useClustering) getClusterDistance(zoom) else null
@@ -266,7 +268,7 @@ class GoingElectricApiWrapper(
         val categories = formatMultipleChoice(categoriesVal)
 
         // do not use clustering if filters need to be applied locally.
-        val useClustering = zoom < 13
+        val useClustering = zoom < clusterThreshold
         val geClusteringAvailable = minConnectors == null || minConnectors <= 1
         val useGeClustering = useClustering && geClusteringAvailable
         val clusterDistance = if (useClustering) getClusterDistance(zoom) else null
@@ -326,10 +328,10 @@ class GoingElectricApiWrapper(
             } else {
                 true
             }
-        }.map { it.convert(apikey) }
+        }.map { it.convert(apikey, false) }
 
         // apply clustering
-        val useClustering = zoom < 13
+        val useClustering = zoom < clusterThreshold
         val geClusteringAvailable = minConnectors == null || minConnectors <= 1
         val clusterDistance = if (useClustering) getClusterDistance(zoom) else null
         if (!geClusteringAvailable && useClustering) {
@@ -350,7 +352,7 @@ class GoingElectricApiWrapper(
             return if (response.isSuccessful && response.body()!!.status == "ok" && response.body()!!.chargelocations.size == 1) {
                 Resource.success(
                     (response.body()!!.chargelocations[0] as GEChargeLocation).convert(
-                        apikey
+                        apikey, true
                     )
                 )
             } else {

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

@@ -29,7 +29,7 @@ data class GEChargeCardList(
 )
 
 sealed class GEChargepointListItem {
-    abstract fun convert(apikey: String): ChargepointListItem
+    abstract fun convert(apikey: String, isDetailed: Boolean): ChargepointListItem
 }
 
 @JsonClass(generateAdapter = true)
@@ -54,7 +54,7 @@ data class GEChargeLocation(
     val openinghours: GEOpeningHours?,
     val cost: GECost?
 ) : GEChargepointListItem() {
-    override fun convert(apikey: String) = ChargeLocation(
+    override fun convert(apikey: String, isDetailed: Boolean) = ChargeLocation(
         id,
         "goingelectric",
         name,
@@ -76,7 +76,9 @@ data class GEChargeLocation(
         openinghours?.convert(),
         cost?.convert(),
         null,
-        ChargepriceData(address.country, network, chargepoints.map { it.type })
+        ChargepriceData(address.country, network, chargepoints.map { it.type }),
+        Instant.now(),
+        isDetailed
     )
 }
 
@@ -161,7 +163,7 @@ data class GEChargeLocationCluster(
     val clusterCount: Int,
     val coordinates: GECoordinate
 ) : GEChargepointListItem() {
-    override fun convert(apikey: String) =
+    override fun convert(apikey: String, isDetailed: Boolean) =
         ChargeLocationCluster(clusterCount, coordinates.convert())
 }
 

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

@@ -2,12 +2,20 @@ package net.vonforst.evmap.api.openchargemap
 
 import com.squareup.moshi.FromJson
 import com.squareup.moshi.ToJson
+import java.time.LocalDateTime
+import java.time.ZoneOffset
 import java.time.ZonedDateTime
+import java.time.format.DateTimeParseException
 
 internal class ZonedDateTimeAdapter {
     @FromJson
     fun fromJson(value: String?): ZonedDateTime? = value?.let {
-        ZonedDateTime.parse(value)
+        try {
+            ZonedDateTime.parse(value)
+        } catch (e: DateTimeParseException) {
+            val dt: LocalDateTime = LocalDateTime.parse(value)
+            dt.atZone(ZoneOffset.UTC)
+        }
     }
 
     @ToJson

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

@@ -105,6 +105,7 @@ class OpenChargeMapApiWrapper(
     baseurl: String = "https://api.openchargemap.io/v3/",
     context: Context? = null
 ) : ChargepointApi<OCMReferenceData> {
+    private val clusterThreshold = 11
     val api = OpenChargeMapApi.create(apikey, baseurl, context)
 
     override fun getName() = "OpenChargeMap.org"
@@ -235,10 +236,10 @@ class OpenChargeMapApiWrapper(
                 .filter { it.power == null || it.power >= (minPower ?: 0.0) }
                 .filter { if (connectorsVal != null && !connectorsVal.all) it.connectionTypeId in connectorsVal.values.map { it.toLong() } else true }
                 .sumOf { it.quantity ?: 1 } >= (minConnectors ?: 0)
-        }.map { it.convert(referenceData) }.distinct() as List<ChargepointListItem>
+        }.map { it.convert(referenceData, false) }.distinct() as List<ChargepointListItem>
 
         // apply clustering
-        val useClustering = zoom < 13
+        val useClustering = zoom < clusterThreshold
         if (useClustering) {
             val clusterDistance = getClusterDistance(zoom)
             Dispatchers.IO.run {
@@ -256,7 +257,7 @@ class OpenChargeMapApiWrapper(
         try {
             val response = api.getChargepointDetail(id)
             if (response.isSuccessful && response.body()?.size == 1) {
-                return Resource.success(response.body()!![0].convert(referenceData))
+                return Resource.success(response.body()!![0].convert(referenceData, true))
             } else {
                 return Resource.error(response.message(), null)
             }

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

@@ -7,6 +7,7 @@ import com.squareup.moshi.JsonClass
 import kotlinx.parcelize.Parcelize
 import net.vonforst.evmap.max
 import net.vonforst.evmap.model.*
+import java.time.Instant
 import java.time.ZonedDateTime
 
 // Unknown, Currently Available, Currently In Use, Operational
@@ -44,7 +45,7 @@ data class OCMChargepoint(
     @Json(name = "UserComments") val userComments: List<OCMUserComment>?,
     @Json(name = "DateLastStatusUpdate") val lastStatusUpdateDate: ZonedDateTime?
 ) {
-    fun convert(refData: OCMReferenceData) = ChargeLocation(
+    fun convert(refData: OCMReferenceData, isDetailed: Boolean) = ChargeLocation(
         id,
         "openchargemap",
         addressInfo.title,
@@ -69,7 +70,9 @@ data class OCMChargepoint(
         ChargepriceData(
             addressInfo.countryISOCode(refData),
             operatorId?.toString(),
-            connections.map { "${it.connectionTypeId},${it.currentTypeId}" })
+            connections.map { "${it.connectionTypeId},${it.currentTypeId}" }),
+        Instant.now(),
+        isDetailed
     )
 
     private fun convertFaultReport(): FaultReport? {
@@ -138,7 +141,7 @@ data class OCMConnection(
 ) {
     fun convert(refData: OCMReferenceData) = Chargepoint(
         convertConnectionTypeFromOCM(connectionTypeId, refData),
-        power ?: 0.0,
+        power,
         quantity ?: 1
     )
 

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

@@ -0,0 +1,202 @@
+package net.vonforst.evmap.api.openstreetmap
+
+import com.squareup.moshi.Json
+import com.squareup.moshi.JsonClass
+import net.vonforst.evmap.model.*
+import okhttp3.internal.immutableListOf
+import java.time.Instant
+import java.time.ZonedDateTime
+
+private data class OsmSocket(
+    // The OSM socket name (e.g. "type2_combo")
+    val osmSocketName: String,
+    // The socket identifier used in EVMap.
+    // TODO: This should probably be a separate enum-like type, not a string.
+    val evmapKey: String?,
+) {
+    /**
+     * Return the OSM socket base tag (e.g. "socket:type2_combo").
+     */
+    fun osmSocketBaseTag(): String {
+        return "socket:${this.osmSocketName}"
+    }
+}
+
+// List of all OSM socket types that are relevant for EVs:
+// https://wiki.openstreetmap.org/wiki/Key:socket
+private val SOCKET_TYPES = immutableListOf(
+    // Type 1
+    OsmSocket("type1", Chargepoint.TYPE_1),
+    OsmSocket("type1_combo", Chargepoint.CCS_TYPE_1),
+
+    // Type 2
+    OsmSocket("type2", Chargepoint.TYPE_2_SOCKET), // Type2 socket (or unknown)
+    OsmSocket("type2_cable", Chargepoint.TYPE_2_PLUG), // Type2 plug
+    OsmSocket("type2_combo", Chargepoint.CCS_TYPE_2), // CCS
+
+    // CHAdeMO
+    OsmSocket("chademo", Chargepoint.CHADEMO),
+
+    // Tesla
+    OsmSocket("tesla_standard", null),
+    OsmSocket("tesla_supercharger", Chargepoint.SUPERCHARGER),
+
+    // CEE
+    OsmSocket("cee_blue", Chargepoint.CEE_BLAU), // Also known as "caravan socket"
+    OsmSocket("cee_red_16a", Chargepoint.CEE_ROT),
+    OsmSocket("cee_red_32a", Chargepoint.CEE_ROT),
+    OsmSocket("cee_red_63a", Chargepoint.CEE_ROT),
+    OsmSocket("cee_red_125a", Chargepoint.CEE_ROT),
+
+    // Europe
+    OsmSocket("schuko", Chargepoint.SCHUKO),
+
+    // Switzerland
+    OsmSocket("sev1011_t13", null),
+    OsmSocket("sev1011_t15", null),
+    OsmSocket("sev1011_t23", null),
+    OsmSocket("sev1011_t25", null),
+)
+
+@JsonClass(generateAdapter = true)
+data class OSMChargingStation(
+    // Unique numeric ID
+    val id: Long,
+    // Latitude (WGS84)
+    val lat: Double,
+    // Longitude (WGS84)
+    val lon: Double,
+    // Timestamp of last update
+    @Json(name = "timestamp") val lastUpdateTimestamp: ZonedDateTime,
+    // Numeric, monotonically increasing version number
+    val version: Int,
+    // User that last modified this POI
+    val user: String,
+    // Raw key-value OSM tags
+    val tags: Map<String, String>,
+) {
+    /**
+     * Convert the [OSMChargingStation] to a generic [ChargeLocation].
+     *
+     * The [dataFetchTimestamp] should be set to the timestamp when the data was last
+     * refreshed / fetched from OSM. It will always be later than the [lastUpdateTimestamp],
+     * which contains the timestamp when the data was last _edited_ in OSM.
+     */
+    fun convert(dataFetchTimestamp: Instant) = ChargeLocation(
+        id,
+        "openstreetmap",
+        getName(),
+        Coordinate(lat, lon),
+        null, // TODO: Can we determine this with overpass?
+        getChargepoints(),
+        tags["network"],
+        "https://www.openstreetmap.org/node/$id",
+        "https://www.openstreetmap.org/edit?node=$id",
+        null,
+        false, // We don't know
+        tags["authentication:none"] == "yes",
+        tags["operator"],
+        tags["description"],
+        null,
+        null,
+        null,
+        null,
+        getOpeningHours(),
+        getCost(),
+        "© OpenStreetMap contributors",
+        null,
+        dataFetchTimestamp,
+        true,
+    )
+
+    /**
+     * Return the name for this charging station.
+     */
+    private fun getName(): String {
+        // Ideally this station has a name.
+        // If not, fall back to the operator.
+        // If that is missing as well, use a generic "Charging Station" string.
+        return tags["name"]
+            ?: tags["operator"]
+            ?: "Charging Station";
+    }
+
+    /**
+     * Return the chargepoints for this charging station.
+     */
+    private fun getChargepoints(): List<Chargepoint> {
+        // Note: In OSM, the chargepoints are mapped as "socket:<type> = <count>"
+        val chargepoints = mutableListOf<Chargepoint>()
+        for (socket in SOCKET_TYPES) {
+            val count = try {
+                (this.tags[socket.osmSocketBaseTag()] ?: "0").toInt()
+            } catch (e: NumberFormatException) {
+                0
+            }
+            if (count > 0) {
+                if (socket.evmapKey != null) {
+                    val outputPower = parseOutputPower(this.tags["${socket.osmSocketBaseTag()}:output"])
+                    chargepoints.add(Chargepoint(socket.evmapKey, outputPower, count))
+                }
+            }
+        }
+        return chargepoints
+    }
+
+    private fun getOpeningHours(): OpeningHours? {
+        val rawOpeningHours = tags["opening_hours"] ?: return null
+
+        // Handle the simple 24/7 case
+        if (rawOpeningHours == "24/7") {
+            return OpeningHours(true, null, null)
+        }
+
+        // TODO: Try to convert other formats as well?
+        //
+        // Note: The current {@link OpeningHours} format is not flexible enough to handle
+        // all rules that OSM can represent and might need to be updated.
+        // This library could help: https://github.com/simonpoole/OpeningHoursParser
+        //
+        // Alternatively, with the opening-hours-evaluator library
+        // https://github.com/leonardehrenfried/opening-hours-evaluator
+        // we could implement an "open now" feature.
+        return null
+    }
+
+    private fun getCost(): Cost? {
+        val freecharging = when (tags["fee"]?.lowercase()) {
+            "yes", "y" -> false
+            "no", "n" -> true
+            else -> null
+        }
+        val freeparking = when (tags["parking:fee"]?.lowercase()) {
+            "no", "n" -> true
+            "yes", "y", "interval" -> false
+            else -> null
+        }
+        return Cost(freecharging, freeparking)
+    }
+
+    companion object {
+        /**
+         * Parse raw OSM output power.
+         *
+         * The proper format to map output power for an EV charging station is "<amount> kW",
+         * for example "22 kW" or "3.7 kW". Some fields in the wild are tagged with the unit "kVA"
+         * instead of "kW", those can be treated as equivalent.
+         *
+         * Sometimes people also mapped plain numbers (e.g. 7000, I assume that's 7 kW),
+         * ranges (5,5 - 11 kW, huh?) or even current (32 A), which is wrong. If we cannot parse,
+         * just ignore the field.
+         */
+        fun parseOutputPower(rawOutput: String?): Double? {
+            if (rawOutput == null) {
+                return null;
+            }
+            val pattern = Regex("([0-9.,]+)\\s*(kW|kVA)", setOf(RegexOption.IGNORE_CASE))
+            val matchResult = pattern.matchEntire(rawOutput) ?: return null
+            val numberString = matchResult.groupValues[1].replace(',', '.')
+            return numberString.toDoubleOrNull()
+        }
+    }
+}

app/src/main/java/net/vonforst/evmap/autocomplete/MapboxAutocompleteProvider.kt

@@ -29,7 +29,7 @@ class MapboxAutocompleteProvider(val context: Context) : AutocompleteProvider {
             location?.let {
                 proximity(Point.fromLngLat(location.longitude, location.latitude))
             }
-            languages(ConfigurationCompat.getLocales(context.resources.configuration)[0].language)
+            languages(ConfigurationCompat.getLocales(context.resources.configuration)[0]?.language)
             accessToken(context.getString(R.string.mapbox_key))
             autocomplete(true)
             this.query(query)

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

@@ -2,7 +2,11 @@ package net.vonforst.evmap.fragment
 
 import android.annotation.SuppressLint
 import android.os.Bundle
-import android.view.*
+import android.view.LayoutInflater
+import android.view.MotionEvent
+import android.view.View
+import android.view.ViewGroup
+import androidx.appcompat.app.AlertDialog
 import androidx.databinding.DataBindingUtil
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.viewModels
@@ -24,6 +28,7 @@ import net.vonforst.evmap.api.chargeprice.ChargepriceCar
 import net.vonforst.evmap.api.equivalentPlugTypes
 import net.vonforst.evmap.databinding.FragmentChargepriceBinding
 import net.vonforst.evmap.model.Chargepoint
+import net.vonforst.evmap.storage.PreferenceDataSource
 import net.vonforst.evmap.viewmodel.ChargepriceViewModel
 import net.vonforst.evmap.viewmodel.Status
 import net.vonforst.evmap.viewmodel.viewModelFactory
@@ -45,6 +50,28 @@ class ChargepriceFragment : Fragment() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         sharedElementEnterTransition = MaterialContainerTransform()
+
+        if (savedInstanceState == null) {
+            val prefs = PreferenceDataSource(requireContext())
+            prefs.chargepriceCounter += 1
+            if ((prefs.chargepriceCounter - 30).mod(50) == 0) {
+                showDonationDialog()
+            }
+        }
+    }
+
+    private fun showDonationDialog() {
+        AlertDialog.Builder(requireContext())
+            .setTitle(R.string.chargeprice_donation_dialog_title)
+            .setMessage(R.string.chargeprice_donation_dialog_detail)
+            .setNegativeButton(R.string.ok) { di, _ ->
+                di.cancel()
+            }
+            .setPositiveButton(R.string.donate) { di, _ ->
+                di.dismiss()
+                findNavController().navigate(R.id.action_chargeprice_to_donateFragment)
+            }
+            .show()
     }
 
     override fun onCreateView(
@@ -147,7 +174,7 @@ class ChargepriceFragment : Fragment() {
         }
 
         binding.btnSettings.setOnClickListener {
-            findNavController().navigate(R.id.action_chargeprice_to_settingsFragment)
+            findNavController().navigate(R.id.action_chargeprice_to_chargepriceSettingsFragment)
         }
 
         binding.batteryRange.setLabelFormatter { value: Float ->

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

@@ -28,7 +28,8 @@ import net.vonforst.evmap.adapter.DataBindingAdapter
 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.model.Favorite
+import net.vonforst.evmap.model.FavoriteWithDetail
 import net.vonforst.evmap.utils.checkAnyLocationPermission
 import net.vonforst.evmap.viewmodel.FavoritesViewModel
 import net.vonforst.evmap.viewmodel.viewModelFactory
@@ -36,7 +37,7 @@ import net.vonforst.evmap.viewmodel.viewModelFactory
 class FavoritesFragment : Fragment(), LostApiClient.ConnectionCallbacks {
     private lateinit var binding: FragmentFavoritesBinding
     private var locationClient: LostApiClient? = null
-    private var toDelete: ChargeLocation? = null
+    private var toDelete: Favorite? = null
     private var deleteSnackbar: Snackbar? = null
     private lateinit var adapter: FavoritesAdapter
 
@@ -84,7 +85,7 @@ class FavoritesFragment : Fragment(), LostApiClient.ConnectionCallbacks {
         )
 
         adapter = FavoritesAdapter(onDelete = {
-            delete(it.charger)
+            delete(it.fav)
         }).apply {
             onClickListener = {
                 findNavController().navigate(
@@ -109,6 +110,12 @@ class FavoritesFragment : Fragment(), LostApiClient.ConnectionCallbacks {
         createTouchHelper().attachToRecyclerView(binding.favsList)
 
         locationClient!!.connect()
+
+        binding.swipeRefresh.setOnRefreshListener {
+            vm.reloadAvailability() {
+                binding.swipeRefresh.isRefreshing = false
+            }
+        }
     }
 
     override fun onConnected() {
@@ -132,18 +139,20 @@ class FavoritesFragment : Fragment(), LostApiClient.ConnectionCallbacks {
         }
     }
 
-    fun delete(fav: ChargeLocation) {
-        val position = vm.listData.value?.indexOfFirst { it.charger == fav } ?: return
+    fun delete(fav: FavoriteWithDetail) {
+        val position =
+            vm.listData.value?.indexOfFirst { it.fav.favorite.favoriteId == fav.favorite.favoriteId }
+                ?: return
         // if there is already a profile to delete, delete it now
         actuallyDelete()
         deleteSnackbar?.dismiss()
 
-        toDelete = fav
+        toDelete = fav.favorite
 
         view?.let {
             val snackbar = Snackbar.make(
                 it,
-                getString(R.string.deleted_filterprofile, fav.name),
+                getString(R.string.deleted_filterprofile, fav.charger.name),
                 Snackbar.LENGTH_LONG
             ).setAction(R.string.undo) {
                 toDelete = null
@@ -182,7 +191,7 @@ class FavoritesFragment : Fragment(), LostApiClient.ConnectionCallbacks {
             }
 
             override fun onSwiped(viewHolder: RecyclerView.ViewHolder, direction: Int) {
-                val fav = vm.favorites.value?.find { it.id == viewHolder.itemId }
+                val fav = vm.favorites.value?.find { it.favorite.favoriteId == viewHolder.itemId }
                 fav?.let { delete(it) }
             }
 

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

@@ -82,16 +82,17 @@ import net.vonforst.evmap.autocomplete.PlaceWithBounds
 import net.vonforst.evmap.databinding.FragmentMapBinding
 import net.vonforst.evmap.model.*
 import net.vonforst.evmap.storage.PreferenceDataSource
-import net.vonforst.evmap.ui.ChargerIconGenerator
-import net.vonforst.evmap.ui.ClusterIconGenerator
-import net.vonforst.evmap.ui.MarkerAnimator
-import net.vonforst.evmap.ui.getMarkerTint
+import net.vonforst.evmap.ui.*
 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
+import kotlin.collections.component1
+import kotlin.collections.component2
+import kotlin.collections.contains
+import kotlin.collections.set
 
 
 class MapFragment : Fragment(), OnMapReadyCallback, MapsActivity.FragmentCallback,
@@ -112,6 +113,7 @@ class MapFragment : Fragment(), OnMapReadyCallback, MapsActivity.FragmentCallbac
     private var searchResultIcon: BitmapDescriptor? = null
     private var connectionErrorSnackbar: Snackbar? = null
     private var previousChargepointIds: Set<Long>? = null
+    private var mapTopPadding: Int = 0
 
     private lateinit var clusterIconGenerator: ClusterIconGenerator
     private lateinit var chargerIconGenerator: ChargerIconGenerator
@@ -169,7 +171,7 @@ class MapFragment : Fragment(), OnMapReadyCallback, MapsActivity.FragmentCallbac
         val provider = prefs.mapProvider
         if (mapFragment == null) {
             mapFragment =
-                requireActivity().supportFragmentManager.findFragmentByTag(mapFragmentTag) as MapFragment?
+                childFragmentManager.findFragmentByTag(mapFragmentTag) as MapFragment?
         }
         if (mapFragment == null || mapFragment!!.priority[0] != provider) {
             mapFragment = MapFragment()
@@ -182,7 +184,7 @@ class MapFragment : Fragment(), OnMapReadyCallback, MapsActivity.FragmentCallbac
                 MapFragment.GOOGLE,
                 MapFragment.MAPBOX
             )
-            requireActivity().supportFragmentManager
+            childFragmentManager
                 .beginTransaction()
                 .replace(R.id.map, mapFragment!!, mapFragmentTag)
                 .commit()
@@ -197,19 +199,21 @@ class MapFragment : Fragment(), OnMapReadyCallback, MapsActivity.FragmentCallbac
 
         setHasOptionsMenu(true)
 
-        binding.root.setOnApplyWindowInsetsListener { _, insets ->
+        ViewCompat.setOnApplyWindowInsetsListener(binding.root) { _, insets ->
+            ViewCompat.onApplyWindowInsets(binding.root, insets)
+
+            val systemWindowInsetTop = insets.getInsets(WindowInsetsCompat.Type.statusBars()).top
             binding.detailAppBar.toolbar.updateLayoutParams<ViewGroup.MarginLayoutParams> {
-                topMargin = insets.systemWindowInsetTop
+                topMargin = systemWindowInsetTop
             }
 
-            // margin of layers button
+            // margin of layers button: status bar height + toolbar height + margin
             val density = resources.displayMetrics.density
-            // status bar height + toolbar height + margin
             val margin =
                 if (binding.toolbarContainer.layoutParams.width == ViewGroup.LayoutParams.MATCH_PARENT) {
-                    insets.systemWindowInsetTop + (48 * density).toInt() + (28 * density).toInt()
+                    systemWindowInsetTop + (48 * density).toInt() + (28 * density).toInt()
                 } else {
-                    insets.systemWindowInsetTop + (12 * density).toInt()
+                    systemWindowInsetTop + (12 * density).toInt()
                 }
             binding.fabLayers.updateLayoutParams<ViewGroup.MarginLayoutParams> {
                 topMargin = margin
@@ -217,6 +221,11 @@ class MapFragment : Fragment(), OnMapReadyCallback, MapsActivity.FragmentCallbac
             binding.layersSheet.updateLayoutParams<ViewGroup.MarginLayoutParams> {
                 topMargin = margin
             }
+
+            // set map padding so that compass is not obstructed by toolbar
+            mapTopPadding = systemWindowInsetTop + (48 * density).toInt() + (16 * density).toInt()
+            map?.setPadding(0, mapTopPadding, 0, 0)
+
             insets
         }
 
@@ -398,6 +407,9 @@ class MapFragment : Fragment(), OnMapReadyCallback, MapsActivity.FragmentCallbac
                 else -> false
             }
         }
+        binding.detailView.btnRefreshLiveData.setOnClickListener {
+            vm.reloadAvailability()
+        }
     }
 
     var searchKeyListener: KeyListener? = null
@@ -499,9 +511,9 @@ class MapFragment : Fragment(), OnMapReadyCallback, MapsActivity.FragmentCallbac
     private fun toggleFavorite() {
         val favs = vm.favorites.value ?: return
         val charger = vm.chargerSparse.value ?: return
-        val isFav = favs.find { it.id == charger.id } != null
-        if (isFav) {
-            vm.deleteFavorite(charger)
+        val fav = favs.find { it.charger.id == charger.id }
+        if (fav != null) {
+            vm.deleteFavorite(fav.favorite)
         } else {
             vm.insertFavorite(charger)
         }
@@ -511,7 +523,8 @@ class MapFragment : Fragment(), OnMapReadyCallback, MapsActivity.FragmentCallbac
                 highlight = true,
                 fault = charger.faultReport != null,
                 multi = charger.isMulti(vm.filteredConnectors.value),
-                fav = !isFav
+                fav = fav == null,
+                mini = vm.useMiniMarkers.value == true
             )
         )
     }
@@ -578,6 +591,9 @@ class MapFragment : Fragment(), OnMapReadyCallback, MapsActivity.FragmentCallbac
                 updateMap(chargepoints)
             }
         })
+        vm.useMiniMarkers.observe(viewLifecycleOwner) {
+            vm.chargepoints.value?.data?.let { updateMap(it) }
+        }
         vm.favorites.observe(viewLifecycleOwner, Observer {
             updateFavoriteToggle()
         })
@@ -601,6 +617,7 @@ class MapFragment : Fragment(), OnMapReadyCallback, MapsActivity.FragmentCallbac
                 }
                 searchResultMarker = map.addMarker(
                     MarkerOptions()
+                        .z(placeSearchZ)
                         .position(place.latLng)
                         .icon(searchResultIcon)
                         .anchor(0.5f, 1f)
@@ -642,7 +659,8 @@ class MapFragment : Fragment(), OnMapReadyCallback, MapsActivity.FragmentCallbac
                     highlight = false,
                     fault = c.faultReport != null,
                     multi = c.isMulti(vm.filteredConnectors.value),
-                    fav = c.id in vm.favorites.value?.map { it.id } ?: emptyList()
+                    fav = c.id in vm.favorites.value?.map { it.charger.id } ?: emptyList(),
+                    mini = vm.useMiniMarkers.value == true
                 )
             )
         }
@@ -657,10 +675,11 @@ class MapFragment : Fragment(), OnMapReadyCallback, MapsActivity.FragmentCallbac
                 highlight = true,
                 fault = charger.faultReport != null,
                 multi = charger.isMulti(vm.filteredConnectors.value),
-                fav = charger.id in vm.favorites.value?.map { it.id } ?: emptyList()
+                fav = charger.id in vm.favorites.value?.map { it.charger.id } ?: emptyList(),
+                mini = vm.useMiniMarkers.value == true
             )
         )
-        animator.animateMarkerBounce(marker)
+        animator.animateMarkerBounce(marker, vm.useMiniMarkers.value == true)
 
         // un-highlight all other markers
         markers.forEach { (m, c) ->
@@ -671,7 +690,8 @@ class MapFragment : Fragment(), OnMapReadyCallback, MapsActivity.FragmentCallbac
                         highlight = false,
                         fault = c.faultReport != null,
                         multi = c.isMulti(vm.filteredConnectors.value),
-                        fav = c.id in vm.favorites.value?.map { it.id } ?: emptyList()
+                        fav = c.id in vm.favorites.value?.map { it.charger.id } ?: emptyList(),
+                        mini = vm.useMiniMarkers.value == true
                     )
                 )
             }
@@ -681,7 +701,7 @@ class MapFragment : Fragment(), OnMapReadyCallback, MapsActivity.FragmentCallbac
     private fun updateFavoriteToggle() {
         val favs = vm.favorites.value ?: return
         val charger = vm.chargerSparse.value ?: return
-        if (favs.find { it.id == charger.id } != null) {
+        if (favs.find { it.charger.id == charger.id } != null) {
             favToggle.setIcon(R.drawable.ic_fav)
         } else {
             favToggle.setIcon(R.drawable.ic_fav_no)
@@ -793,9 +813,10 @@ class MapFragment : Fragment(), OnMapReadyCallback, MapsActivity.FragmentCallbac
 
     override fun onMapReady(map: AnyMap) {
         this.map = map
-        chargerIconGenerator = ChargerIconGenerator(requireContext(), map.bitmapDescriptorFactory)
+        val context = this.context ?: return
+        chargerIconGenerator = ChargerIconGenerator(context, map.bitmapDescriptorFactory)
 
-        if (BuildConfig.FLAVOR == "google" && mapFragment!!.priority[0] == MapFragment.GOOGLE) {
+        if (BuildConfig.FLAVOR.contains("google") && mapFragment!!.priority[0] == MapFragment.GOOGLE) {
             // Google Maps: icons can be generated in background thread
             lifecycleScope.launch {
                 withContext(Dispatchers.IO) {
@@ -811,17 +832,25 @@ class MapFragment : Fragment(), OnMapReadyCallback, MapsActivity.FragmentCallbac
 
         animator = MarkerAnimator(chargerIconGenerator)
         map.uiSettings.setTiltGesturesEnabled(false)
+        map.uiSettings.setRotateGesturesEnabled(prefs.mapRotateGesturesEnabled)
         map.setIndoorEnabled(false)
         map.uiSettings.setIndoorLevelPickerEnabled(false)
+
         map.setOnCameraIdleListener {
             vm.mapPosition.value = MapPosition(
                 map.projection.visibleRegion.latLngBounds, map.cameraPosition.zoom
             )
-            binding.scaleView.update(map.cameraPosition.zoom, map.cameraPosition.target.latitude)
+            vm.reloadChargepoints()
         }
         map.setOnCameraMoveListener {
+            vm.mapPosition.value = MapPosition(
+                map.projection.visibleRegion.latLngBounds, map.cameraPosition.zoom
+            )
+        }
+        vm.mapPosition.observe(viewLifecycleOwner) {
             binding.scaleView.update(map.cameraPosition.zoom, map.cameraPosition.target.latitude)
         }
+
         map.setOnCameraMoveStartedListener { reason ->
             if (reason == AnyMap.OnCameraMoveStartedListener.REASON_GESTURE) {
                 if (vm.myLocationEnabled.value == true) {
@@ -864,7 +893,7 @@ class MapFragment : Fragment(), OnMapReadyCallback, MapsActivity.FragmentCallbac
         map.setTrafficEnabled(vm.mapTrafficEnabled.value ?: false)
 
         // set padding so that compass is not obstructed by toolbar
-        map.setPadding(0, binding.toolbarContainer.height, 0, 0)
+        map.setPadding(0, mapTopPadding, 0, 0)
 
         val mode = resources.configuration.uiMode and Configuration.UI_MODE_NIGHT_MASK
         map.setMapStyle(
@@ -955,7 +984,7 @@ class MapFragment : Fragment(), OnMapReadyCallback, MapsActivity.FragmentCallbac
                 }
             }
         }
-        if (context?.checkAnyLocationPermission() ?: false) {
+        if (context.checkAnyLocationPermission()) {
             enableLocation(!positionSet, false)
             positionSet = true
         }
@@ -1017,15 +1046,18 @@ class MapFragment : Fragment(), OnMapReadyCallback, MapsActivity.FragmentCallbac
 
         // update icons of existing markers (connector filter may have changed)
         for ((marker, charger) in markers) {
+            val highlight = charger.id == vm.chargerSparse.value?.id
             marker.setIcon(
                 chargerIconGenerator.getBitmapDescriptor(
                     getMarkerTint(charger, vm.filteredConnectors.value),
-                    highlight = charger == vm.chargerSparse.value,
+                    highlight = highlight,
                     fault = charger.faultReport != null,
                     multi = charger.isMulti(vm.filteredConnectors.value),
-                    fav = charger.id in vm.favorites.value?.map { it.id } ?: emptyList()
+                    fav = charger.id in vm.favorites.value?.map { it.charger.id } ?: emptyList(),
+                    mini = vm.useMiniMarkers.value == true
                 )
             )
+            marker.setAnchor(0.5f, if (vm.useMiniMarkers.value == true) 0.5f else 1f)
         }
 
         if (chargers.toSet() != markers.values) {
@@ -1038,11 +1070,15 @@ class MapFragment : Fragment(), OnMapReadyCallback, MapsActivity.FragmentCallbac
                     // animate marker if it is visible, otherwise remove immediately
                     if (bounds.contains(marker.position)) {
                         val tint = getMarkerTint(charger, vm.filteredConnectors.value)
-                        val highlight = charger == vm.chargerSparse.value
+                        val highlight = charger.id == vm.chargerSparse.value?.id
                         val fault = charger.faultReport != null
                         val multi = charger.isMulti(vm.filteredConnectors.value)
-                        val fav = charger.id in vm.favorites.value?.map { it.id } ?: emptyList()
-                        animator.animateMarkerDisappear(marker, tint, highlight, fault, multi, fav)
+                        val fav =
+                            charger.id in vm.favorites.value?.map { it.charger.id } ?: emptyList()
+                        animator.animateMarkerDisappear(
+                            marker, tint, highlight, fault, multi, fav,
+                            vm.useMiniMarkers.value == true
+                        )
                     } else {
                         animator.deleteMarker(marker)
                     }
@@ -1054,13 +1090,14 @@ class MapFragment : Fragment(), OnMapReadyCallback, MapsActivity.FragmentCallbac
             for (charger in chargers) {
                 if (!map1.contains(charger.id)) {
                     val tint = getMarkerTint(charger, vm.filteredConnectors.value)
-                    val highlight = charger == vm.chargerSparse.value
+                    val highlight = charger.id == vm.chargerSparse.value?.id
                     val fault = charger.faultReport != null
                     val multi = charger.isMulti(vm.filteredConnectors.value)
-                    val fav = charger.id in vm.favorites.value?.map { it.id } ?: emptyList()
+                    val fav = charger.id in vm.favorites.value?.map { it.charger.id } ?: emptyList()
                     val marker = map.addMarker(
                         MarkerOptions()
                             .position(LatLng(charger.coordinates.lat, charger.coordinates.lng))
+                            .z(chargerZ)
                             .icon(
                                 chargerIconGenerator.getBitmapDescriptor(
                                     tint,
@@ -1069,12 +1106,16 @@ class MapFragment : Fragment(), OnMapReadyCallback, MapsActivity.FragmentCallbac
                                     highlight,
                                     fault,
                                     multi,
-                                    fav
+                                    fav,
+                                    vm.useMiniMarkers.value == true
                                 )
                             )
-                            .anchor(0.5f, 1f)
+                            .anchor(0.5f, if (vm.useMiniMarkers.value == true) 0.5f else 1f)
+                    )
+                    animator.animateMarkerAppear(
+                        marker, tint, highlight, fault, multi, fav,
+                        vm.useMiniMarkers.value == true
                     )
-                    animator.animateMarkerAppear(marker, tint, highlight, fault, multi, fav)
                     markers[marker] = charger
                 }
             }
@@ -1084,6 +1125,7 @@ class MapFragment : Fragment(), OnMapReadyCallback, MapsActivity.FragmentCallbac
             map.addMarker(
                 MarkerOptions()
                     .position(LatLng(cluster.coordinates.lat, cluster.coordinates.lng))
+                    .z(clusterZ)
                     .icon(
                         map.bitmapDescriptorFactory.fromBitmap(
                             clusterIconGenerator.makeIcon(

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

@@ -42,8 +42,8 @@ class AboutFragment : PreferenceFragmentCompat() {
         findPreference<Preference>("version")?.summary = BuildConfig.VERSION_NAME
     }
 
-    override fun onPreferenceTreeClick(preference: Preference?): Boolean {
-        return when (preference?.key) {
+    override fun onPreferenceTreeClick(preference: Preference): Boolean {
+        return when (preference.key) {
             "github_link" -> {
                 (activity as? MapsActivity)?.openUrl(getString(R.string.github_link))
                 true

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

@@ -48,12 +48,11 @@ abstract class BaseSettingsFragment : PreferenceFragmentCompat(),
 
     override fun onResume() {
         super.onResume()
-        preferenceManager.sharedPreferences.registerOnSharedPreferenceChangeListener(this)
+        preferenceManager.sharedPreferences?.registerOnSharedPreferenceChangeListener(this)
     }
 
     override fun onPause() {
-        preferenceManager.sharedPreferences
-            .unregisterOnSharedPreferenceChangeListener(this)
+        preferenceManager.sharedPreferences?.unregisterOnSharedPreferenceChangeListener(this)
         super.onPause()
     }
 }

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

@@ -47,8 +47,8 @@ class DataSettingsFragment : BaseSettingsFragment() {
         }
     }
 
-    override fun onPreferenceTreeClick(preference: Preference?): Boolean {
-        return when (preference?.key) {
+    override fun onPreferenceTreeClick(preference: Preference): Boolean {
+        return when (preference.key) {
             "search_delete_recent" -> {
                 Snackbar.make(
                     requireView(),

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

@@ -24,6 +24,36 @@ import kotlin.math.floor
 
 sealed class ChargepointListItem
 
+
+/**
+ * A whole charging site (potentially with multiple chargepoints).
+ *
+ * @param id A unique number per charging site
+ * @param dataSource The name of the data source
+ * @param coordinates The latitude / longitude of this charge location
+ * @param address The charge location address
+ * @param chargepoints List of chargepoints at this location
+ * @param network The charging network (Mobility Service Provider, MSP)
+ * @param url A link to this charging site
+ * @param editUrl A link to a website where this charging site can be edited
+ * @param faultReport Set this if the charging site is reported to be out of service
+ * @param verified For crowdsourced data sources, this means that the data has been verified
+ *   by an independent person
+ * @param barrierFree Whether this charge location can be used without prior registration
+ * @param operator The operator of this charge location (Charge Point Operator, CPO)
+ * @param generalInformation General information about this charging site that does not fit anywhere else
+ * @param amenities Description of amenities available at or near the charging site (toilets, food, accommodation, landmarks, etc.)
+ * @param locationDescription Directions on how to find the charger (e.g. "In the parking garage on level 5")
+ * @param photos List of photos of this charging site
+ * @param chargecards List of charge cards accepted here
+ * @param openinghours List of times when this charging site can be accessed / used
+ * @param cost The cost for charging and/or parking
+ * @param license How the data about this chargepoint is licensed
+ * @param chargepriceData Additional data needed for the Chargeprice implementation
+ * @param timeRetrieved Time when this information was retrieved from the data source
+ * @param isDetailed Whether this data includes all available details (for many data sources,
+ *                   API calls that return a list may only give a compact representation)
+ */
 @Entity(primaryKeys = ["id", "dataSource"])
 @Parcelize
 data class ChargeLocation(
@@ -31,7 +61,7 @@ data class ChargeLocation(
     val dataSource: String,
     val name: String,
     @Embedded val coordinates: Coordinate,
-    @Embedded val address: Address,
+    @Embedded val address: Address?,
     val chargepoints: List<Chargepoint>,
     val network: String?,
     val url: String,
@@ -49,12 +79,14 @@ data class ChargeLocation(
     @Embedded val openinghours: OpeningHours?,
     @Embedded val cost: Cost?,
     val license: String?,
-    @Embedded(prefix = "chargeprice") val chargepriceData: ChargepriceData?
+    @Embedded(prefix = "chargeprice") val chargepriceData: ChargepriceData?,
+    val timeRetrieved: Instant,
+    val isDetailed: Boolean
 ) : ChargepointListItem(), Equatable, Parcelable {
     /**
      * maximum power available from this charger.
      */
-    val maxPower: Double
+    val maxPower: Double?
         get() {
             return maxPower()
         }
@@ -62,17 +94,20 @@ data class ChargeLocation(
     /**
      * Gets the maximum power available from certain connectors of this charger.
      */
-    fun maxPower(connectors: Set<String>? = null): Double {
-        return chargepoints.filter { connectors?.contains(it.type) ?: true }
-            .map { it.power }.maxOrNull() ?: 0.0
+    fun maxPower(connectors: Set<String>? = null): Double? {
+        return chargepoints
+            .filter { connectors?.contains(it.type) ?: true }
+            .mapNotNull { it.power }
+            .maxOrNull()
     }
 
     fun isMulti(filteredConnectors: Set<String>? = null): Boolean {
         var chargepoints = chargepointsMerged
             .filter { filteredConnectors?.contains(it.type) ?: true }
-        if (maxPower(filteredConnectors) >= 43) {
+        val chargepointMaxPower = maxPower(filteredConnectors)
+        if (chargepointMaxPower != null && chargepointMaxPower >= 43) {
             // fast charger -> only count fast chargers
-            chargepoints = chargepoints.filter { it.power >= 43 }
+            chargepoints = chargepoints.filter {it.power != null && it.power >= 43 }
         }
         val connectors = chargepoints.map { it.type }.distinct().toSet()
 
@@ -164,6 +199,18 @@ data class Cost(
             return ""
         }
     }
+
+    fun getDetailText(): CharSequence? {
+        return if (freecharging == null && freeparking == null) {
+            if (descriptionShort != null && descriptionLong != descriptionShort) {
+                descriptionLong
+            } else {
+                null
+            }
+        } else {
+            descriptionLong ?: descriptionShort
+        }
+    }
 }
 
 @Parcelize
@@ -180,26 +227,63 @@ data class OpeningHours(
         if (twentyfourSeven) {
             return HtmlCompat.fromHtml(ctx.getString(R.string.open_247), 0)
         } else if (days != null) {
-            val hours = days.getHoursForDate(LocalDate.now())
-                ?: return HtmlCompat.fromHtml(ctx.getString(R.string.closed), 0)
+            val today = LocalDate.now()
+            val hours = days.getHoursForDate(today)
+            val nextDayHours = days.getHoursForDate(today.plusDays(1))
+            val previousDayHours = days.getHoursForDate(today.minusDays(1))
 
             val now = LocalTime.now()
-            if (hours.start.isBefore(now) && hours.end.isAfter(now)) {
+            val fmt = DateTimeFormatter.ofLocalizedTime(FormatStyle.SHORT)
+
+            if (previousDayHours != null && previousDayHours.end.isBefore(previousDayHours.start) && previousDayHours.end.isAfter(
+                    now
+                )
+            ) {
+                // previous day has opening hours that go past midnight
                 return HtmlCompat.fromHtml(
                     ctx.getString(
                         R.string.open_closesat,
-                        hours.end.toString()
+                        previousDayHours.end.format(fmt)
                     ), 0
                 )
-            } else if (hours.end.isBefore(now)) {
-                return HtmlCompat.fromHtml(ctx.getString(R.string.closed), 0)
-            } else {
+            } else if (hours != null && hours.start.isBefore(hours.end)
+                && hours.start.isBefore(now) && hours.end.isAfter(now)
+            ) {
+                // current day has opening hours that do not go past midnight
+                return HtmlCompat.fromHtml(
+                    ctx.getString(
+                        R.string.open_closesat,
+                        hours.end.format(fmt)
+                    ), 0
+                )
+            } else if (hours != null && hours.end.isBefore(hours.start)
+                && hours.start.isBefore(now)
+            ) {
+                // current day has opening hours that go past midnight
+                return HtmlCompat.fromHtml(
+                    ctx.getString(
+                        R.string.open_closesat,
+                        hours.end.format(fmt)
+                    ), 0
+                )
+            } else if (hours != null && !hours.start.isBefore(now)) {
+                // currently closed, will still open on this day
                 return HtmlCompat.fromHtml(
                     ctx.getString(
                         R.string.closed_opensat,
-                        hours.start.toString()
+                        hours.start.format(fmt)
                     ), 0
                 )
+            } else if (nextDayHours != null) {
+                // currently closed, will open next day
+                return HtmlCompat.fromHtml(
+                    ctx.getString(
+                        R.string.closed_opensat,
+                        nextDayHours.start.format(fmt)
+                    ), 0
+                )
+            } else {
+                return HtmlCompat.fromHtml(ctx.getString(R.string.closed), 0)
             }
         } else {
             return ""
@@ -294,11 +378,29 @@ data class Address(
     }
 }
 
+/**
+ * One socket with a certain power, which may be available multiple times at a ChargeLocation.
+ */
 @Parcelize
 @JsonClass(generateAdapter = true)
-data class Chargepoint(val type: String, val power: Double, val count: Int) : Equatable,
-    Parcelable {
-    fun formatPower(): String {
+data class Chargepoint(
+    // The chargepoint type (use one of the constants in the companion object)
+    val type: String,
+    // Power in kW (or null if unknown)
+    val power: Double?,
+    // How many instances of this plug/socket are available?
+    val count: Int,
+) : Equatable, Parcelable {
+    fun hasKnownPower(): Boolean = power != null
+
+    /**
+     * If chargepoint power is defined, format it into a string.
+     * Otherwise, return null.
+     */
+    fun formatPower(): String? {
+        if (power == null) {
+            return null
+        }
         val powerFmt = if (power - power.toInt() == 0.0) {
             "%.0f".format(power)
         } else {

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

@@ -0,0 +1,28 @@
+package net.vonforst.evmap.model
+
+import androidx.room.*
+
+@Entity(
+    foreignKeys = [
+        ForeignKey(
+            entity = ChargeLocation::class,
+            parentColumns = arrayOf("id", "dataSource"),
+            childColumns = arrayOf("chargerId", "chargerDataSource"),
+            onDelete = ForeignKey.NO_ACTION,
+        )
+    ],
+    indices = [
+        Index(value = ["chargerId", "chargerDataSource"])
+    ]
+)
+data class Favorite(
+    @PrimaryKey(autoGenerate = true)
+    val favoriteId: Long = 0,
+    val chargerId: Long,
+    val chargerDataSource: String
+)
+
+data class FavoriteWithDetail(
+    @Embedded() val favorite: Favorite,
+    @Embedded val charger: ChargeLocation
+)

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

@@ -3,6 +3,7 @@ package net.vonforst.evmap.model
 import androidx.databinding.BaseObservable
 import androidx.room.Entity
 import androidx.room.ForeignKey
+import androidx.room.Index
 import net.vonforst.evmap.adapter.Equatable
 import net.vonforst.evmap.storage.FilterProfile
 import kotlin.reflect.KClass
@@ -59,7 +60,10 @@ sealed class FilterValue : BaseObservable(), Equatable {
         childColumns = arrayOf("profile", "dataSource"),
         onDelete = ForeignKey.CASCADE
     )],
-    primaryKeys = ["key", "profile", "dataSource"]
+    primaryKeys = ["key", "profile", "dataSource"],
+    indices = [
+        Index(value = ["profile", "dataSource"])
+    ]
 )
 data class BooleanFilterValue(
     override val key: String,
@@ -77,7 +81,10 @@ data class BooleanFilterValue(
         childColumns = arrayOf("profile", "dataSource"),
         onDelete = ForeignKey.CASCADE
     )],
-    primaryKeys = ["key", "profile", "dataSource"]
+    primaryKeys = ["key", "profile", "dataSource"],
+    indices = [
+        Index(value = ["profile", "dataSource"])
+    ]
 )
 data class MultipleChoiceFilterValue(
     override val key: String,
@@ -101,7 +108,10 @@ data class MultipleChoiceFilterValue(
         childColumns = arrayOf("profile", "dataSource"),
         onDelete = ForeignKey.CASCADE
     )],
-    primaryKeys = ["key", "profile", "dataSource"]
+    primaryKeys = ["key", "profile", "dataSource"],
+    indices = [
+        Index(value = ["profile", "dataSource"])
+    ]
 )
 data class SliderFilterValue(
     override val key: String,

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

@@ -20,6 +20,7 @@ import net.vonforst.evmap.model.*
 @Database(
     entities = [
         ChargeLocation::class,
+        Favorite::class,
         BooleanFilterValue::class,
         MultipleChoiceFilterValue::class,
         SliderFilterValue::class,
@@ -31,11 +32,12 @@ import net.vonforst.evmap.model.*
         OCMConnectionType::class,
         OCMCountry::class,
         OCMOperator::class
-    ], version = 14
+    ], version = 18
 )
 @TypeConverters(Converters::class)
 abstract class AppDatabase : RoomDatabase() {
     abstract fun chargeLocationsDao(): ChargeLocationsDao
+    abstract fun favoritesDao(): FavoritesDao
     abstract fun filterValueDao(): FilterValueDao
     abstract fun filterProfileDao(): FilterProfileDao
     abstract fun recentAutocompletePlaceDao(): RecentAutocompletePlaceDao
@@ -53,7 +55,8 @@ abstract class AppDatabase : RoomDatabase() {
                 .addMigrations(
                     MIGRATION_2, MIGRATION_3, MIGRATION_4, MIGRATION_5, MIGRATION_6,
                     MIGRATION_7, MIGRATION_8, MIGRATION_9, MIGRATION_10, MIGRATION_11,
-                    MIGRATION_12, MIGRATION_13, MIGRATION_14
+                    MIGRATION_12, MIGRATION_13, MIGRATION_14, MIGRATION_15, MIGRATION_16,
+                    MIGRATION_17, MIGRATION_18
                 )
                 .addCallback(object : Callback() {
                     override fun onCreate(db: SupportSQLiteDatabase) {
@@ -312,5 +315,66 @@ abstract class AppDatabase : RoomDatabase() {
             }
 
         }
+
+        private val MIGRATION_15 = object : Migration(14, 15) {
+            @SuppressLint("Range")
+            override fun migrate(db: SupportSQLiteDatabase) {
+                try {
+                    db.beginTransaction()
+                    db.execSQL("CREATE TABLE IF NOT EXISTS `Favorite` (`favoriteId` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `chargerId` INTEGER NOT NULL, `chargerDataSource` TEXT NOT NULL, FOREIGN KEY(`chargerId`, `chargerDataSource`) REFERENCES `ChargeLocation`(`id`, `dataSource`) ON UPDATE NO ACTION ON DELETE RESTRICT )");
+
+                    val cursor = db.query("SELECT * FROM `ChargeLocation`")
+                    while (cursor.moveToNext()) {
+                        val id = cursor.getLong(cursor.getColumnIndex("id"))
+                        val dataSource = cursor.getString(cursor.getColumnIndex("dataSource"))
+                        val values = ContentValues().apply {
+                            put("chargerId", id)
+                            put("chargerDataSource", dataSource)
+                        }
+                        db.insert("favorite", SQLiteDatabase.CONFLICT_ROLLBACK, values)
+                    }
+
+                    db.setTransactionSuccessful()
+                } finally {
+                    db.endTransaction()
+                }
+            }
+        }
+
+        private val MIGRATION_16 = object : Migration(15, 16) {
+            override fun migrate(db: SupportSQLiteDatabase) {
+                db.execSQL("ALTER TABLE `ChargeLocation` ADD `timeRetrieved` INTEGER NOT NULL DEFAULT 0")
+                db.execSQL("ALTER TABLE `ChargeLocation` ADD `isDetailed` INTEGER NOT NULL DEFAULT 0")
+            }
+        }
+
+        private val MIGRATION_17 = object : Migration(16, 17) {
+            override fun migrate(db: SupportSQLiteDatabase) {
+                db.execSQL("CREATE INDEX IF NOT EXISTS `index_Favorite_chargerId_chargerDataSource` ON `Favorite` (`chargerId`, `chargerDataSource`)")
+                db.execSQL("CREATE INDEX IF NOT EXISTS `index_BooleanFilterValue_profile_dataSource` ON `BooleanFilterValue` (`profile`, `dataSource`)")
+                db.execSQL("CREATE INDEX IF NOT EXISTS `index_MultipleChoiceFilterValue_profile_dataSource` ON `MultipleChoiceFilterValue` (`profile`, `dataSource`)")
+                db.execSQL("CREATE INDEX IF NOT EXISTS `index_SliderFilterValue_profile_dataSource` ON `SliderFilterValue` (`profile`, `dataSource`)")
+            }
+        }
+
+        private val MIGRATION_18 = object : Migration(17, 18) {
+            override fun migrate(db: SupportSQLiteDatabase) {
+                try {
+                    db.beginTransaction()
+                    db.execSQL("CREATE TABLE IF NOT EXISTS `FavoriteNew` (`favoriteId` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `chargerId` INTEGER NOT NULL, `chargerDataSource` TEXT NOT NULL, FOREIGN KEY(`chargerId`, `chargerDataSource`) REFERENCES `ChargeLocation`(`id`, `dataSource`) ON UPDATE NO ACTION ON DELETE NO ACTION )");
+                    val columnList =
+                        "`favoriteId`,`chargerId`,`chargerDataSource`"
+                    db.execSQL("INSERT INTO `FavoriteNew`($columnList) SELECT $columnList FROM `Favorite`")
+                    db.execSQL("DROP TABLE `Favorite`")
+                    db.execSQL("ALTER TABLE `FavoriteNew` RENAME TO `Favorite`")
+                    db.execSQL("CREATE INDEX IF NOT EXISTS `index_Favorite_chargerId_chargerDataSource` ON `Favorite` (`chargerId`, `chargerDataSource`)")
+
+                    db.setTransactionSuccessful()
+                } finally {
+                    db.endTransaction()
+                }
+            }
+
+        }
     }
 }

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

@@ -0,0 +1,32 @@
+package net.vonforst.evmap.storage
+
+import androidx.lifecycle.LiveData
+import androidx.room.*
+import net.vonforst.evmap.model.Favorite
+import net.vonforst.evmap.model.FavoriteWithDetail
+
+@Dao
+interface FavoritesDao {
+    @Insert(onConflict = OnConflictStrategy.REPLACE)
+    suspend fun insert(vararg favorites: Favorite): List<Long>
+
+    @Delete
+    suspend fun delete(vararg favorites: Favorite)
+
+    @Query("SELECT * FROM favorite LEFT JOIN chargelocation ON favorite.chargerDataSource = chargelocation.dataSource AND favorite.chargerId = chargelocation.id")
+    fun getAllFavorites(): LiveData<List<FavoriteWithDetail>>
+
+    @Query("SELECT * FROM favorite LEFT JOIN chargelocation ON favorite.chargerDataSource = chargelocation.dataSource AND favorite.chargerId = chargelocation.id")
+    suspend fun getAllFavoritesAsync(): List<FavoriteWithDetail>
+
+    @Query("SELECT * FROM favorite LEFT JOIN chargelocation ON favorite.chargerDataSource = chargelocation.dataSource AND favorite.chargerId = chargelocation.id WHERE lat >= :lat1 AND lat <= :lat2 AND lng >= :lng1 AND lng <= :lng2")
+    suspend fun getFavoritesInBoundsAsync(
+        lat1: Double,
+        lat2: Double,
+        lng1: Double,
+        lng2: Double
+    ): List<FavoriteWithDetail>
+
+    @Query("SELECT * FROM favorite WHERE chargerDataSource == :dataSource AND chargerId == :chargerId")
+    suspend fun findFavorite(chargerId: Long, dataSource: String): Favorite?
+}

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

@@ -4,6 +4,7 @@ import androidx.lifecycle.LiveData
 import androidx.lifecycle.MediatorLiveData
 import androidx.lifecycle.MutableLiveData
 import androidx.room.*
+import net.vonforst.evmap.await
 import net.vonforst.evmap.model.*
 
 @Dao
@@ -92,4 +93,15 @@ abstract class FilterValueDao {
         deleteSliderFilterValuesForProfile(profile, dataSource)
     }
 
+    @Transaction
+    open suspend fun copyFiltersToCustom(filterStatus: Long, dataSource: String) {
+        if (filterStatus == FILTERS_CUSTOM) return
+
+        deleteFilterValuesForProfile(FILTERS_CUSTOM, dataSource)
+        val values = getFilterValues(filterStatus, dataSource).await().onEach {
+            it.profile = FILTERS_CUSTOM
+        }
+        insert(*values.toTypedArray())
+    }
+
 }

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

@@ -3,6 +3,7 @@ package net.vonforst.evmap.storage
 import android.content.Context
 import androidx.preference.PreferenceManager
 import com.car2go.maps.AnyMap
+import com.car2go.maps.model.LatLng
 import net.vonforst.evmap.R
 import net.vonforst.evmap.model.FILTERS_CUSTOM
 import net.vonforst.evmap.model.FILTERS_DISABLED
@@ -29,6 +30,12 @@ class PreferenceDataSource(val context: Context) {
             sp.edit().putBoolean("navigate_use_maps", value).apply()
         }
 
+    var mapRotateGesturesEnabled: Boolean
+        get() = sp.getBoolean("map_rotate_gestures_enabled", true)
+        set(value) {
+            sp.edit().putBoolean("map_rotate_gestures_enabled", value).apply()
+        }
+
     var lastGeReferenceDataUpdate: Instant
         get() = Instant.ofEpochMilli(sp.getLong("last_ge_reference_data_update", 0L))
         set(value) {
@@ -80,11 +87,14 @@ class PreferenceDataSource(val context: Context) {
             context.getString(R.string.pref_map_provider_default)
         )!!
 
-    val searchProvider: String
+    var searchProvider: String
         get() = sp.getString(
             "search_provider",
             context.getString(R.string.pref_search_provider_default)
         )!!
+        set(value) {
+            sp.edit().putString("search_provider", value).apply()
+        }
 
     var mapType: AnyMap.Type
         get() = AnyMap.Type.valueOf(sp.getString("map_type", null) ?: AnyMap.Type.NORMAL.toString())
@@ -151,6 +161,12 @@ class PreferenceDataSource(val context: Context) {
             sp.edit().putBoolean("chargeprice_show_provider_customer_tariffs", value).apply()
         }
 
+    var chargepriceAllowUnbalancedLoad: Boolean
+        get() = sp.getBoolean("chargeprice_allow_unbalanced_load", false)
+        set(value) {
+            sp.edit().putBoolean("chargeprice_allow_unbalanced_load", value).apply()
+        }
+
     var chargepriceCurrency: String
         get() = sp.getString("chargeprice_currency", null) ?: "EUR"
         set(value) {
@@ -186,9 +202,41 @@ class PreferenceDataSource(val context: Context) {
             sp.edit().putLong("app_start_counter", value).apply()
         }
 
+    /** Counter for how many times the price comparison page was opened,
+     * introduced with Version 1.3.4 **/
+    var chargepriceCounter: Long
+        get() = sp.getLong("chargeprice_counter", 0)
+        set(value) {
+            sp.edit().putLong("chargeprice_counter", value).apply()
+        }
+
     var opensourceDonationsDialogShown: Boolean
         get() = sp.getBoolean("opensource_donations_dialog_shown", false)
         set(value) {
             sp.edit().putBoolean("opensource_donations_dialog_shown", value).apply()
         }
+
+    var placeSearchResultAndroidAuto: LatLng?
+        get() = if (sp.contains("place_search_result_android_auto_lat")) {
+            LatLng(
+                Double.fromBits(sp.getLong("place_search_result_android_auto_lat", 0L)),
+                Double.fromBits(sp.getLong("place_search_result_android_auto_lng", 0L))
+            )
+        } else null
+        set(value) {
+            if (value == null) {
+                sp.edit().remove("place_search_result_android_auto_lat")
+                    .remove("place_search_result_android_auto_lng").apply()
+            } else {
+                sp.edit().putLong("place_search_result_android_auto_lat", value.latitude.toBits())
+                    .putLong("place_search_result_android_auto_lng", value.longitude.toBits())
+                    .apply()
+            }
+        }
+
+    var placeSearchResultAndroidAutoName: String?
+        get() = sp.getString("place_search_result_android_auto_name", null)
+        set(value) {
+            sp.edit().putString("place_search_result_android_auto_name", value).apply()
+        }
 }

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

@@ -65,6 +65,19 @@ abstract class RecentAutocompletePlaceDao {
         limit: Int? = null
     ): List<RecentAutocompletePlace>
 
+    @Query("SELECT * FROM recentautocompleteplace WHERE dataSource = :dataSource AND primaryText LIKE '%' || :query || '%' ORDER BY timestamp DESC LIMIT :limit")
+    abstract suspend fun searchAsync(
+        query: String,
+        dataSource: String,
+        limit: Int? = null
+    ): List<RecentAutocompletePlace>
+
     @Query("SELECT * FROM recentautocompleteplace WHERE dataSource = :dataSource ORDER BY timestamp DESC LIMIT :limit")
     abstract fun getAll(dataSource: String, limit: Int? = null): List<RecentAutocompletePlace>
+
+    @Query("SELECT * FROM recentautocompleteplace WHERE dataSource = :dataSource ORDER BY timestamp DESC LIMIT :limit")
+    abstract suspend fun getAllAsync(
+        dataSource: String,
+        limit: Int? = null
+    ): List<RecentAutocompletePlace>
 }

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

@@ -64,7 +64,14 @@ fun invisibleUnless(view: View, visible: Boolean) {
 
 @BindingAdapter("invisibleUnlessAnimated")
 fun invisibleUnlessAnimated(view: View, oldValue: Boolean, newValue: Boolean) {
-    if (oldValue == newValue) return
+    if (oldValue == newValue) {
+        if (!newValue && view.visibility == View.VISIBLE && view.alpha == 1f) {
+            // view is initially invisible
+            view.visibility = View.GONE
+        } else {
+            return
+        }
+    }
 
     view.animate().cancel()
     if (newValue) {

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

@@ -46,8 +46,9 @@ class ChargerIconGenerator(
     val context: Context,
     val factory: BitmapDescriptorFactory?,
     val scaleResolution: Int = 20,
-    val oversize: Float = 1.4f, // increase to add padding for fault icon or scale > 1
-    val height: Int = 44
+    val scaleResolutionMini: Int = 10,
+    val oversize: Float = 1f, // increase to add padding for scale > 1
+    val height: Int = 48
 ) {
     private data class BitmapData(
         val tint: Int,
@@ -56,16 +57,21 @@ class ChargerIconGenerator(
         val highlight: Boolean,
         val fault: Boolean,
         val multi: Boolean,
-        val fav: Boolean
+        val fav: Boolean,
+        val mini: Boolean
     )
 
-    // 230 items: (21 sizes, 5 colors, multi on/off) + highlight + fault (only with scale = 1)
-    private val cacheSize = (scaleResolution + 3) * 5 * 2;
+    // 340 items:
+    // large: (21 sizes, 5 colors, multi on/off) + highlight + fault + fav (only with scale = 1)
+    // mini: (11 sizes, 5 colors) + highlight (only with scale = 1)
+    private val cacheSize = (scaleResolution + 8) * 5 * 2 + (scaleResolutionMini + 2) * 5;
     private val cache = LruCache<BitmapData, BitmapDescriptor>(cacheSize)
     private val icon = R.drawable.ic_map_marker_charging
     private val multiIcon = R.drawable.ic_map_marker_charging_multiple
-    private val highlightIcon = R.drawable.ic_map_marker_highlight
+    private val miniIcon = R.drawable.ic_map_marker_charging_mini
+    private val highlightIcon = R.drawable.ic_map_marker_charging_highlight
     private val highlightIconMulti = R.drawable.ic_map_marker_charging_highlight_multiple
+    private val highlightIconMini = R.drawable.ic_map_marker_charging_highlight_mini
     private val faultIcon = R.drawable.ic_map_marker_fault
     private val favIcon = R.drawable.ic_map_marker_fav
 
@@ -82,12 +88,15 @@ class ChargerIconGenerator(
             for (highlight in listOf(false, true)) {
                 for (multi in listOf(false, true)) {
                     for (fav in listOf(false, true)) {
-                        for (tint in tints) {
-                            for (scale in 0..scaleResolution) {
-                                getBitmapDescriptor(
-                                    tint, scale.toFloat() / scaleResolution,
-                                    255, highlight, fault, multi, fav
-                                )
+                        for (mini in listOf(false, true)) {
+                            for (tint in tints) {
+                                val scaleRes = if (mini) scaleResolutionMini else scaleResolution
+                                for (scale in 0..scaleRes) {
+                                    getBitmapDescriptor(
+                                        tint, scale.toFloat() / scaleRes,
+                                        255, highlight, fault, multi, fav, mini
+                                    )
+                                }
                             }
                         }
                     }
@@ -103,16 +112,10 @@ class ChargerIconGenerator(
         highlight: Boolean = false,
         fault: Boolean = false,
         multi: Boolean = false,
-        fav: Boolean = false
+        fav: Boolean = false,
+        mini: Boolean = false
     ): BitmapDescriptor? {
-        val data = BitmapData(
-            tint, (scale * scaleResolution).roundToInt(),
-            alpha,
-            if (scale == 1f) highlight else false,
-            if (scale == 1f) fault else false,
-            multi,
-            if (scale == 1f) fav else false
-        )
+        val data = createBitmapData(tint, scale, alpha, highlight, fault, multi, fav, mini)
         val cachedImg = cache[data]
         return if (cachedImg != null) {
             cachedImg
@@ -124,6 +127,26 @@ class ChargerIconGenerator(
         }
     }
 
+    private fun createBitmapData(
+        tint: Int,
+        scale: Float,
+        alpha: Int,
+        highlight: Boolean,
+        fault: Boolean,
+        multi: Boolean,
+        fav: Boolean,
+        mini: Boolean
+    ) = BitmapData(
+        tint,
+        (scale * (if (mini) scaleResolutionMini else scaleResolution)).roundToInt(),
+        alpha,
+        if (scale == 1f) highlight else false,
+        if (scale == 1f && !mini) fault else false,
+        if (!mini) multi else false,
+        if (scale == 1f && !mini) fav else false,
+        mini
+    )
+
     fun getBitmap(
         @ColorRes tint: Int,
         scale: Float = 1f,
@@ -131,94 +154,99 @@ class ChargerIconGenerator(
         highlight: Boolean = false,
         fault: Boolean = false,
         multi: Boolean = false,
-        fav: Boolean = false
+        fav: Boolean = false,
+        mini: Boolean = false
     ): Bitmap {
-        val data = BitmapData(
-            tint, (scale * scaleResolution).roundToInt(),
-            alpha,
-            if (scale == 1f) highlight else false,
-            if (scale == 1f) fault else false,
-            multi,
-            if (scale == 1f) fav else false,
-        )
+        val data = createBitmapData(tint, scale, alpha, highlight, fault, multi, fav, mini)
         return generateBitmap(data)
     }
 
     private fun generateBitmap(data: BitmapData): Bitmap {
-        val icon = if (data.multi) multiIcon else icon
+        val icon = if (data.mini) miniIcon else if (data.multi) multiIcon else icon
         val vd: Drawable = ContextCompat.getDrawable(context, icon)!!
 
-        DrawableCompat.setTint(vd, ContextCompat.getColor(context, data.tint));
-        DrawableCompat.setTintMode(vd, PorterDuff.Mode.MULTIPLY);
+        DrawableCompat.setTint(vd, ContextCompat.getColor(context, data.tint))
+        DrawableCompat.setTintMode(vd, PorterDuff.Mode.MULTIPLY)
 
         val density = context.resources.displayMetrics.density
-        val width =
-            (height.toFloat() * density / vd.intrinsicHeight * vd.intrinsicWidth).roundToInt()
-        val height = (height * density).roundToInt()
+        val (markerWidth, markerHeight) = if (data.mini) {
+            vd.intrinsicWidth to vd.intrinsicHeight
+        } else {
+            (height.toFloat() * density / vd.intrinsicHeight * vd.intrinsicWidth).roundToInt() to
+                    (height * density).roundToInt()
+        }
+        val (extraIconSize, extraIconShift) = if (data.mini) 0 to 0 else {
+            (0.75 * markerWidth).roundToInt() to (0.25 * markerWidth).roundToInt()
+        }
 
-        val leftPadding = width * (oversize - 1) / 2
-        val topPadding = height * (oversize - 1)
+        val totalWidth = markerWidth + 2 * extraIconShift
+        val totalHeight = markerHeight + extraIconShift
+
+        val (leftPadding, topPadding) = if (!data.mini) {
+            ((totalWidth) * (oversize - 1) / 2).roundToInt() + extraIconShift to
+                    ((totalHeight) * (oversize - 1)).roundToInt() + extraIconShift
+        } else {
+            0 to 0
+        }
         vd.setBounds(
-            leftPadding.toInt(), topPadding.toInt(),
-            leftPadding.toInt() + width,
-            topPadding.toInt() + height
+            leftPadding, topPadding,
+            leftPadding + markerWidth,
+            topPadding + markerHeight
         )
         vd.alpha = data.alpha
 
         val bm = Bitmap.createBitmap(
-            (width * oversize).toInt(), (height * oversize).toInt(),
+            (totalWidth * oversize).roundToInt(), (totalHeight * oversize).roundToInt(),
             Bitmap.Config.ARGB_8888
         )
         val canvas = Canvas(bm)
 
-        val scale = data.scale.toFloat() / scaleResolution
-        canvas.scale(
-            scale,
-            scale,
-            leftPadding + width / 2f,
-            topPadding + height.toFloat()
-        )
+        val scale = data.scale.toFloat() / if (data.mini) scaleResolutionMini else scaleResolution
+        val (originX, originY) = if (data.mini) {
+            canvas.width / 2f to
+                    canvas.height / 2f
+        } else {
+            canvas.width / 2f to
+                    canvas.height.toFloat()
+        }
+        canvas.scale(scale, scale, originX, originY)
 
         vd.draw(canvas)
 
         if (data.highlight) {
-            val hIcon = if (data.multi) highlightIconMulti else highlightIcon
+            val hIcon =
+                if (data.mini) highlightIconMini else if (data.multi) highlightIconMulti else highlightIcon
             val highlightDrawable = ContextCompat.getDrawable(context, hIcon)!!
             highlightDrawable.setBounds(
-                leftPadding.toInt(), topPadding.toInt(),
-                leftPadding.toInt() + width,
-                topPadding.toInt() + height
+                leftPadding, topPadding,
+                leftPadding + markerWidth,
+                topPadding + markerHeight
             )
             highlightDrawable.alpha = data.alpha
             highlightDrawable.draw(canvas)
         }
 
-        if (data.fault) {
+        if (data.fault && !data.mini) {
             val faultDrawable = ContextCompat.getDrawable(context, faultIcon)!!
-            val faultSize = 0.75
-            val faultShift = 0.25
-            val base = width
             faultDrawable.setBounds(
-                (leftPadding.toInt() + base * (1 - faultSize + faultShift)).toInt(),
-                (topPadding.toInt() - base * faultShift).toInt(),
-                (leftPadding.toInt() + base * (1 + faultShift)).toInt(),
-                (topPadding.toInt() + base * (faultSize - faultShift)).toInt()
+                leftPadding + markerWidth + extraIconShift - extraIconSize,
+                topPadding - extraIconShift,
+                leftPadding + markerWidth + extraIconShift,
+                topPadding + extraIconSize - extraIconShift
             )
             faultDrawable.alpha = data.alpha
             faultDrawable.draw(canvas)
         }
 
-        if (data.fav) {
+        if (data.fav && !data.mini) {
             val favDrawable = ContextCompat.getDrawable(context, favIcon)!!
-            val favSize = 0.75
-            val favShiftY = 0.25
-            val favShiftX = if (data.fault) -0.5 else 0.25
-            val base = width
+            val favShiftY = extraIconShift
+            val favShiftX = if (data.fault) extraIconShift - extraIconSize else extraIconShift
             favDrawable.setBounds(
-                (leftPadding.toInt() + base * (1 - favSize + favShiftX)).toInt(),
-                (topPadding.toInt() - base * favShiftY).toInt(),
-                (leftPadding.toInt() + base * (1 + favShiftX)).toInt(),
-                (topPadding.toInt() + base * (favSize - favShiftY)).toInt()
+                leftPadding + markerWidth - extraIconSize + favShiftX,
+                topPadding - favShiftY,
+                leftPadding + markerWidth + favShiftX,
+                topPadding + extraIconSize - favShiftY
             )
             favDrawable.alpha = data.alpha
             favDrawable.draw(canvas)

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

@@ -13,14 +13,22 @@ import kotlin.math.max
 fun getMarkerTint(
     charger: ChargeLocation,
     connectors: Set<String>? = null
-): Int = when {
-    charger.maxPower(connectors) >= 100 -> R.color.charger_100kw
-    charger.maxPower(connectors) >= 43 -> R.color.charger_43kw
-    charger.maxPower(connectors) >= 20 -> R.color.charger_20kw
-    charger.maxPower(connectors) >= 11 -> R.color.charger_11kw
-    else -> R.color.charger_low
+): Int {
+    val maxPower = charger.maxPower(connectors)
+    return when {
+        maxPower == null -> R.color.charger_low
+        maxPower >= 100 -> R.color.charger_100kw
+        maxPower >= 43 -> R.color.charger_43kw
+        maxPower >= 20 -> R.color.charger_20kw
+        maxPower >= 11 -> R.color.charger_11kw
+        else -> R.color.charger_low
+    }
 }
 
+val chargerZ = 1
+val clusterZ = chargerZ + 1
+val placeSearchZ = clusterZ + 1
+
 class MarkerAnimator(val gen: ChargerIconGenerator) {
     private val animatingMarkers = hashMapOf<Marker, ValueAnimator>()
 
@@ -30,7 +38,8 @@ class MarkerAnimator(val gen: ChargerIconGenerator) {
         highlight: Boolean,
         fault: Boolean,
         multi: Boolean,
-        fav: Boolean
+        fav: Boolean,
+        mini: Boolean
     ) {
         animatingMarkers[marker]?.let {
             it.cancel()
@@ -49,7 +58,8 @@ class MarkerAnimator(val gen: ChargerIconGenerator) {
                         highlight = highlight,
                         fault = fault,
                         multi = multi,
-                        fav = fav
+                        fav = fav,
+                        mini = mini
                     )
                 )
             }
@@ -69,7 +79,8 @@ class MarkerAnimator(val gen: ChargerIconGenerator) {
         highlight: Boolean,
         fault: Boolean,
         multi: Boolean,
-        fav: Boolean
+        fav: Boolean,
+        mini: Boolean
     ) {
         animatingMarkers[marker]?.let {
             it.cancel()
@@ -88,7 +99,8 @@ class MarkerAnimator(val gen: ChargerIconGenerator) {
                         highlight = highlight,
                         fault = fault,
                         multi = multi,
-                        fav = fav
+                        fav = fav,
+                        mini = mini
                     )
                 )
             }
@@ -112,7 +124,7 @@ class MarkerAnimator(val gen: ChargerIconGenerator) {
         marker.remove()
     }
 
-    fun animateMarkerBounce(marker: Marker) {
+    fun animateMarkerBounce(marker: Marker, mini: Boolean) {
         animatingMarkers[marker]?.let {
             it.cancel()
             animatingMarkers.remove(marker)
@@ -123,7 +135,7 @@ class MarkerAnimator(val gen: ChargerIconGenerator) {
             interpolator = BounceInterpolator()
             addUpdateListener { state ->
                 val t = max(1f - state.animatedValue as Float, 0f) / 2
-                marker.setAnchor(0.5f, 1.0f + t)
+                marker.setAnchor(0.5f, (if (mini) 0.5f else 1.0f) + t)
             }
             addListener(onEnd = {
                 animatingMarkers.remove(marker)

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

@@ -26,7 +26,7 @@ class MultiSelectDialogPreference(ctx: Context, attrs: AttributeSet) :
             // backwards compatibility when changing a ListPreference into a MultiSelectListPreference
             val value =
                 getPersistedString(null)?.let { setOf(it) } ?: (defaultValue as Set<String>?)
-            sharedPreferences.edit()
+            sharedPreferences!!.edit()
                 .remove(key)
                 .putStringSet(key, value)
                 .apply()
@@ -51,8 +51,8 @@ class MultiSelectDialogPreference(ctx: Context, attrs: AttributeSet) :
     }
 
     var all: Boolean
-        get() = sharedPreferences.getBoolean(key + "_all", defaultToAll)
+        get() = sharedPreferences!!.getBoolean(key + "_all", defaultToAll)
         set(value) {
-            sharedPreferences.edit().putBoolean(key + "_all", value).apply()
+            sharedPreferences!!.edit().putBoolean(key + "_all", value).apply()
         }
 }

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

@@ -46,14 +46,14 @@ class RangeSliderPreference(context: Context, attrs: AttributeSet) : Preference(
     private var dragging = false
 
     var values: List<Float>
-        get() = if ((sharedPreferences.contains(key + "_min") && sharedPreferences.contains(key + "_max"))) {
+        get() = if ((sharedPreferences!!.contains(key + "_min") && sharedPreferences!!.contains(key + "_max"))) {
             listOf(
-                sharedPreferences.getFloat(key + "_min", 0f),
-                sharedPreferences.getFloat(key + "_max", 0f)
+                sharedPreferences!!.getFloat(key + "_min", 0f),
+                sharedPreferences!!.getFloat(key + "_max", 0f)
             )
         } else defaultValue
         set(value) {
-            sharedPreferences.edit()
+            sharedPreferences!!.edit()
                 .putFloat(key + "_min", value[0])
                 .putFloat(key + "_max", value[1])
                 .apply()

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

@@ -15,7 +15,6 @@ import net.vonforst.evmap.model.Chargepoint
 import net.vonforst.evmap.storage.PreferenceDataSource
 import retrofit2.HttpException
 import java.io.IOException
-import java.util.*
 
 class ChargepriceViewModel(application: Application, chargepriceApiKey: String) :
     AndroidViewModel(application) {
@@ -245,7 +244,8 @@ class ChargepriceViewModel(application: Application, chargepriceApiKey: String)
                         batteryRange = batteryRange.value!!.map { it.toDouble() },
                         providerCustomerTariffs = prefs.chargepriceShowProviderCustomerTariffs,
                         maxMonthlyFees = if (prefs.chargepriceNoBaseFee) 0.0 else null,
-                        currency = prefs.chargepriceCurrency
+                        currency = prefs.chargepriceCurrency,
+                        allowUnbalancedLoad = prefs.chargepriceAllowUnbalancedLoad
                     )
                 }, ChargepriceApi.getChargepriceLanguage())
                 val meta =

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

@@ -5,7 +5,6 @@ import androidx.lifecycle.LiveData
 import androidx.lifecycle.MediatorLiveData
 import kotlinx.coroutines.CoroutineScope
 import net.vonforst.evmap.api.ChargepointApi
-import net.vonforst.evmap.api.StringProvider
 import net.vonforst.evmap.api.goingelectric.GoingElectricApiWrapper
 import net.vonforst.evmap.api.openchargemap.OpenChargeMapApiWrapper
 import net.vonforst.evmap.model.*
@@ -59,15 +58,6 @@ fun filtersWithValue(
         }
     }
 
-fun ChargepointApi<ReferenceData>.getFilters(
-    referenceData: LiveData<out ReferenceData>,
-    stringProvider: StringProvider
-) = MediatorLiveData<List<Filter<FilterValue>>>().apply {
-    addSource(referenceData) { data ->
-        value = getFilters(data, stringProvider)
-    }
-}
-
 fun FilterValueDao.getFilterValues(filterStatus: LiveData<Long>, dataSource: String) =
     MediatorLiveData<List<FilterValue>>().apply {
         var source: LiveData<List<FilterValue>>? = null

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

@@ -11,6 +11,8 @@ import net.vonforst.evmap.api.availability.ChargeLocationStatus
 import net.vonforst.evmap.api.availability.ChargepointStatus
 import net.vonforst.evmap.api.availability.getAvailability
 import net.vonforst.evmap.model.ChargeLocation
+import net.vonforst.evmap.model.Favorite
+import net.vonforst.evmap.model.FavoriteWithDetail
 import net.vonforst.evmap.storage.AppDatabase
 import net.vonforst.evmap.utils.distanceBetween
 
@@ -18,8 +20,8 @@ class FavoritesViewModel(application: Application, geApiKey: String) :
     AndroidViewModel(application) {
     private var db = AppDatabase.getInstance(application)
 
-    val favorites: LiveData<List<ChargeLocation>> by lazy {
-        db.chargeLocationsDao().getAllChargeLocations()
+    val favorites: LiveData<List<FavoriteWithDetail>> by lazy {
+        db.favoritesDao().getAllFavorites()
     }
 
     val location: MutableLiveData<LatLng> by lazy {
@@ -28,22 +30,9 @@ class FavoritesViewModel(application: Application, geApiKey: String) :
 
     val availability: MediatorLiveData<Map<Long, Resource<ChargeLocationStatus>>> by lazy {
         MediatorLiveData<Map<Long, Resource<ChargeLocationStatus>>>().apply {
-            addSource(favorites) { chargers ->
-                if (chargers != null) {
-                    viewModelScope.launch {
-                        val data = hashMapOf<Long, Resource<ChargeLocationStatus>>()
-                        chargers.forEach { charger ->
-                            data[charger.id] = Resource.loading(null)
-                        }
-                        availability.value = data
-
-                        chargers.map { charger ->
-                            async {
-                                data[charger.id] = getAvailability(charger)
-                                availability.value = data
-                            }
-                        }.awaitAll()
-                    }
+            addSource(favorites) { favorites ->
+                if (favorites != null) {
+                    reloadAvailability()
                 } else {
                     value = null
                 }
@@ -51,12 +40,34 @@ class FavoritesViewModel(application: Application, geApiKey: String) :
         }
     }
 
+    fun reloadAvailability(callback: (() -> Unit)? = null) {
+        val favorites = favorites.value ?: return
+        val chargers = favorites.map { it.charger }
+
+        viewModelScope.launch {
+            val data = hashMapOf<Long, Resource<ChargeLocationStatus>>()
+            chargers.forEach { charger ->
+                data[charger.id] = Resource.loading(null)
+            }
+            availability.value = data
+
+            chargers.map { charger ->
+                async {
+                    data[charger.id] = getAvailability(charger)
+                    availability.value = data
+                }
+            }.awaitAll()
+            callback?.invoke()
+        }
+    }
+
     val listData: MediatorLiveData<List<FavoritesListItem>> by lazy {
         MediatorLiveData<List<FavoritesListItem>>().apply {
             val callback = { _: Any ->
-                listData.value = favorites.value?.map { charger ->
+                listData.value = favorites.value?.map { favorite ->
+                    val charger = favorite.charger
                     FavoritesListItem(
-                        charger,
+                        favorite,
                         totalAvailable(charger.id),
                         charger.chargepoints.sumBy { it.count },
                         location.value.let { loc ->
@@ -78,11 +89,14 @@ class FavoritesViewModel(application: Application, geApiKey: String) :
     }
 
     data class FavoritesListItem(
-        val charger: ChargeLocation,
+        val fav: FavoriteWithDetail,
         val available: Resource<List<ChargepointStatus>>,
         val total: Int,
         val distance: Double?
-    ) : Equatable
+    ) : Equatable {
+        val charger
+            get() = fav.charger
+    }
 
     private fun totalAvailable(id: Long): Resource<List<ChargepointStatus>> {
         val availability = availability.value?.get(id) ?: return Resource.error(null, null)
@@ -97,12 +111,14 @@ class FavoritesViewModel(application: Application, geApiKey: String) :
     fun insertFavorite(charger: ChargeLocation) {
         viewModelScope.launch {
             db.chargeLocationsDao().insert(charger)
+            db.favoritesDao()
+                .insert(Favorite(chargerId = charger.id, chargerDataSource = charger.dataSource))
         }
     }
 
-    fun deleteFavorite(charger: ChargeLocation) {
+    fun deleteFavorite(fav: Favorite) {
         viewModelScope.launch {
-            db.chargeLocationsDao().delete(charger)
+            db.favoritesDao().delete(fav)
         }
     }
 }

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

@@ -86,4 +86,11 @@ class FilterViewModel(application: Application) : AndroidViewModel(application)
         // set selected profile
         prefs.filterStatus = profileId
     }
+
+    suspend fun deleteCurrentProfile() {
+        filterProfile.value?.let {
+            db.filterProfileDao().delete(it)
+            prefs.filterStatus = FILTERS_DISABLED
+        }
+    }
 }

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

@@ -35,9 +35,7 @@ data class MapPosition(val bounds: LatLngBounds, val zoom: Float) : Parcelable
 internal fun getClusterDistance(zoom: Float): Int? {
     return when (zoom) {
         in 0.0..7.0 -> 100
-        in 7.0..11.5 -> 75
-        in 11.5..12.5 -> 60
-        in 12.5..13.0 -> 45
+        in 7.0..11.0 -> 75
         else -> null
     }
 }
@@ -45,13 +43,15 @@ internal fun getClusterDistance(zoom: Float): Int? {
 class MapViewModel(application: Application, private val state: SavedStateHandle) :
     AndroidViewModel(application) {
     val apiType: Class<ChargepointApi<ReferenceData>>
-        get() = api.javaClass
+        get() = api.value!!.javaClass
     val apiName: String
-        get() = api.getName()
+        get() = api.value!!.getName()
 
     private var db = AppDatabase.getInstance(application)
     private var prefs = PreferenceDataSource(application)
-    private var api: ChargepointApi<ReferenceData> = createApi(prefs.dataSource, application)
+    private var api = MutableLiveData<ChargepointApi<ReferenceData>>().apply {
+        value = createApi(prefs.dataSource, application)
+    }
 
     val bottomSheetState: MutableLiveData<Int> by lazy {
         state.getLiveData("bottomSheetState")
@@ -71,8 +71,14 @@ class MapViewModel(application: Application, private val state: SavedStateHandle
     }
     private val filterValues: LiveData<List<FilterValue>> =
         db.filterValueDao().getFilterValues(filterStatus, prefs.dataSource)
-    private val referenceData = api.getReferenceData(viewModelScope, application)
-    private val filters = api.getFilters(referenceData, application.stringProvider())
+    private val referenceData =
+        Transformations.switchMap(api) { it.getReferenceData(viewModelScope, application) }
+    private val filters = Transformations.map(referenceData) {
+        api.value!!.getFilters(
+            it,
+            application.stringProvider()
+        )
+    }
 
     private val filtersWithValue: LiveData<FilterValues> by lazy {
         filtersWithValue(filters, filterValues)
@@ -111,7 +117,9 @@ class MapViewModel(application: Application, private val state: SavedStateHandle
         MediatorLiveData<Resource<List<ChargepointListItem>>>()
             .apply {
                 value = Resource.loading(emptyList())
-                listOf(mapPosition, filtersWithValue, referenceData).forEach {
+                // this is not automatically updated with mapPosition, as we only want to update
+                // when map is idle.
+                listOf(filtersWithValue, referenceData).forEach {
                     addSource(it) {
                         reloadChargepoints()
                     }
@@ -222,8 +230,8 @@ class MapViewModel(application: Application, private val state: SavedStateHandle
         }
     }
 
-    val favorites: LiveData<List<ChargeLocation>> by lazy {
-        db.chargeLocationsDao().getAllChargeLocations()
+    val favorites: LiveData<List<FavoriteWithDetail>> by lazy {
+        db.favoritesDao().getAllFavorites()
     }
 
     val searchResult: MutableLiveData<PlaceWithBounds> by lazy {
@@ -250,6 +258,7 @@ class MapViewModel(application: Application, private val state: SavedStateHandle
 
     fun reloadPrefs() {
         filterStatus.value = prefs.filterStatus
+        api.value = createApi(prefs.dataSource, getApplication())
     }
 
     fun toggleFilters() {
@@ -261,15 +270,7 @@ class MapViewModel(application: Application, private val state: SavedStateHandle
     }
 
     suspend fun copyFiltersToCustom() {
-        if (filterStatus.value == FILTERS_CUSTOM) return
-
-        db.filterValueDao().deleteFilterValuesForProfile(FILTERS_CUSTOM, prefs.dataSource)
-        filterValues.value?.map {
-            it.profile = FILTERS_CUSTOM
-            it
-        }?.let {
-            db.filterValueDao().insert(*it.toTypedArray())
-        }
+        filterStatus.value?.let { db.filterValueDao().copyFiltersToCustom(it, prefs.dataSource) }
     }
 
     fun setMapType(type: AnyMap.Type) {
@@ -279,12 +280,14 @@ class MapViewModel(application: Application, private val state: SavedStateHandle
     fun insertFavorite(charger: ChargeLocation) {
         viewModelScope.launch {
             db.chargeLocationsDao().insert(charger)
+            db.favoritesDao()
+                .insert(Favorite(chargerId = charger.id, chargerDataSource = charger.dataSource))
         }
     }
 
-    fun deleteFavorite(charger: ChargeLocation) {
+    fun deleteFavorite(favorite: Favorite) {
         viewModelScope.launch {
-            db.chargeLocationsDao().delete(charger)
+            db.favoritesDao().delete(favorite)
         }
     }
 
@@ -295,6 +298,29 @@ class MapViewModel(application: Application, private val state: SavedStateHandle
         chargepointLoader(Triple(pos, filters, referenceData))
     }
 
+    private val miniMarkerThreshold = 13f
+    private val clusterThreshold = 11f
+    val useMiniMarkers: LiveData<Boolean> = MediatorLiveData<Boolean>().apply {
+        for (source in listOf(filteredMinPower, mapPosition)) {
+            addSource(source) {
+                val minPower = filteredMinPower.value ?: 0
+                val zoom = mapPosition.value?.zoom
+                value = when {
+                    zoom == null -> {
+                        false
+                    }
+                    minPower >= 100 -> {
+                        // when only showing high-power chargers we can use large markers
+                        zoom < clusterThreshold
+                    }
+                    else -> {
+                        zoom < miniMarkerThreshold
+                    }
+                }
+            }
+        }
+    }.distinctUntilChanged()
+
     private var chargepointLoader =
         throttleLatest(
             500L,
@@ -304,18 +330,18 @@ class MapViewModel(application: Application, private val state: SavedStateHandle
 
             val mapPosition = data.first
             val filters = data.second
-            val api = api
+            val api = api.value!!
             val refData = data.third
 
             if (filterStatus.value == FILTERS_FAVORITES) {
                 // load favorites from local DB
                 val b = mapPosition.bounds
-                var chargers = db.chargeLocationsDao().getChargeLocationsInBoundsAsync(
+                var chargers = db.favoritesDao().getFavoritesInBoundsAsync(
                     b.southwest.latitude,
                     b.northeast.latitude,
                     b.southwest.longitude,
                     b.northeast.longitude
-                ) as List<ChargepointListItem>
+                ).map { it.charger } as List<ChargepointListItem>
 
                 val clusterDistance = getClusterDistance(mapPosition.zoom)
                 clusterDistance?.let {
@@ -339,7 +365,7 @@ class MapViewModel(application: Application, private val state: SavedStateHandle
                     if (connectorsVal.all) null else connectorsVal.values.map {
                         GEChargepoint.convertTypeFromGE(it)
                     }.toSet()
-                filteredMinPower.value = filters.getSliderValue("minPower")
+                filteredMinPower.value = filters.getSliderValue("min_power")
             } else if (api is OpenChargeMapApiWrapper) {
                 val connectorsVal = filters.getMultipleChoiceValue("connectors")!!
                 filteredConnectors.value =
@@ -349,7 +375,7 @@ class MapViewModel(application: Application, private val state: SavedStateHandle
                             refData as OCMReferenceData
                         )
                     }.toSet()
-                filteredMinPower.value = filters.getSliderValue("minPower")
+                filteredMinPower.value = filters.getSliderValue("min_power")
             } else {
                 filteredConnectors.value = null
                 filteredMinPower.value = null
@@ -370,6 +396,13 @@ class MapViewModel(application: Application, private val state: SavedStateHandle
         availability.value = getAvailability(charger)
     }
 
+    fun reloadAvailability() {
+        val charger = chargerSparse.value ?: return
+        viewModelScope.launch {
+            loadAvailability(charger)
+        }
+    }
+
     private var chargerLoadingTask: Job? = null
 
     private fun loadChargerDetails(charger: ChargeLocation, referenceData: ReferenceData) {
@@ -377,7 +410,12 @@ class MapViewModel(application: Application, private val state: SavedStateHandle
         chargerLoadingTask?.cancel()
         chargerLoadingTask = viewModelScope.launch {
             try {
-                chargerDetails.value = api.getChargepointDetail(referenceData, charger.id)
+                val chargerDetail = api.value!!.getChargepointDetail(referenceData, charger.id)
+                chargerDetails.value = chargerDetail
+                if (favorites.value?.any { it.charger.id == chargerDetail.data?.id } == true) {
+                    // update data of stored favorite
+                    db.chargeLocationsDao().insert(charger)
+                }
             } catch (e: IOException) {
                 chargerDetails.value = Resource.error(e.message, null)
                 e.printStackTrace()
@@ -392,10 +430,15 @@ class MapViewModel(application: Application, private val state: SavedStateHandle
             override fun onChanged(refData: ReferenceData) {
                 referenceData.removeObserver(this)
                 viewModelScope.launch {
-                    val response = api.getChargepointDetail(refData, chargerId)
+                    val response = api.value!!.getChargepointDetail(refData, chargerId)
                     chargerDetails.value = response
                     if (response.status == Status.SUCCESS) {
                         chargerSparse.value = response.data
+
+                        if (response.data != null && favorites.value?.any { it.charger.id == response.data.id } == true) {
+                            // update data of stored favorite
+                            db.chargeLocationsDao().insert(response.data)
+                        }
                     } else {
                         chargerSparse.value = null
                     }

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

@@ -0,0 +1,9 @@
+<vector android:viewportHeight="24"
+    android:viewportWidth="24"
+    android:width="16dp"
+    android:height="16dp"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M12,12m-4,0a4,4 0,1 1,8 0a4,4 0,1 1,-8 0" />
+</vector>

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

@@ -0,0 +1,12 @@
+<vector android:viewportHeight="24"
+    android:viewportWidth="24"
+    android:width="16dp"
+    android:height="16dp"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+    <path
+        android:fillColor="#dddddd"
+        android:pathData="M12,12m-8.5,0a8.5,8.5 0,1 1,17 0a8.5,8.5 0,1 1,-17 0" />
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M12,12m-7.5,0a7.5,7.5 0,1 1,15 0a7.5,7.5 0,1 1,-15 0" />
+</vector>

app/src/main/res/drawable/ic_refresh.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="M17.65,6.35C16.2,4.9 14.21,4 12,4c-4.42,0 -7.99,3.58 -7.99,8s3.57,8 7.99,8c3.73,0 6.84,-2.55 7.73,-6h-2.08c-0.82,2.33 -3.04,4 -5.65,4 -3.31,0 -6,-2.69 -6,-6s2.69,-6 6,-6c1.66,0 3.14,0.69 4.22,1.78L13,11h7V4l-2.35,2.35z" />
+</vector>

app/src/main/res/drawable/ic_remove.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="M19,13H5v-2h14v2z" />
+</vector>

app/src/main/res/drawable/ic_select_all.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,7l-1.41,-1.41 -6.34,6.34 1.41,1.41L18,7zM22.24,5.59L11.66,16.17 7.48,12l-1.41,1.41L11.66,19l12,-12 -1.42,-1.41zM0.41,13.41L6,19l1.41,-1.41L1.83,12 0.41,13.41z" />
+</vector>

app/src/main/res/drawable/ic_select_none.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="M1.79,12l5.58,5.59L5.96,19 0.37,13.41 1.79,12zM2.24,4.22L12.9,14.89l-1.28,1.28L7.44,12l-1.41,1.41L11.62,19l2.69,-2.69 4.89,4.89 1.41,-1.41L3.65,2.81 2.24,4.22zM17.14,13.49L23.62,7 22.2,5.59l-6.48,6.48 1.42,1.42zM17.96,7l-1.41,-1.41 -3.65,3.66 1.41,1.41L17.96,7z" />
+</vector>

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

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@color/chip_background" />
+    <item android:drawable="@color/my_tariff_background" />
     <item android:drawable="?selectableItemBackground" />
 </layer-list>

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

@@ -3,7 +3,8 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/drawer_layout"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
+    android:fitsSystemWindows="true">
 
     <androidx.fragment.app.FragmentContainerView
         android:id="@+id/nav_host_fragment"
@@ -18,7 +19,6 @@
         android:layout_width="wrap_content"
         android:layout_height="match_parent"
         android:layout_gravity="start"
-        android:fitsSystemWindows="true"
         app:headerLayout="@layout/nav_header"
         app:menu="@menu/drawer" />
 </androidx.drawerlayout.widget.DrawerLayout>

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

@@ -82,6 +82,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginEnd="30dp"
                 android:ellipsize="end"
+                android:hyphenationFrequency="normal"
                 android:maxLines="@{expanded ? 3 : 1}"
                 android:text="@{charger.data.name}"
                 android:textAppearance="@style/TextAppearance.Material3.BodyLarge"
@@ -100,6 +101,7 @@
                 android:maxLines="1"
                 android:text="@{charger.data.address.toString()}"
                 android:textAppearance="@style/TextAppearance.Material3.BodySmall"
+                app:invisibleUnless="@{charger.data.address != null}"
                 app:layout_constraintEnd_toStartOf="@+id/guideline2"
                 app:layout_constraintStart_toStartOf="@+id/guideline"
                 app:layout_constraintTop_toBottomOf="@+id/txtName"
@@ -133,9 +135,9 @@
                 android:text="@{String.format("%s/%d", BindingAdaptersKt.availabilityText(BindingAdaptersKt.flatten(filteredAvailability.data.status.values())), filteredAvailability.data.totalChargepoints)}"
                 android:textAppearance="@style/TextAppearance.Material3.BodySmall"
                 android:textColor="@android:color/white"
-                app:backgroundTintAvailability="@{BindingAdaptersKt.flatten(availability.data.status.values())}"
-                app:invisibleUnlessAnimated="@{availability.data != null && !expanded}"
-                app:invisibleUnless="@{availability.data != null}"
+                app:backgroundTintAvailability="@{BindingAdaptersKt.flatten(filteredAvailability.data.status.values())}"
+                app:invisibleUnlessAnimated="@{filteredAvailability.data != null && !expanded}"
+                app:invisibleUnless="@{filteredAvailability.data != null && !expanded}"
                 app:layout_constraintEnd_toStartOf="@+id/guideline2"
                 app:layout_constraintTop_toTopOf="@+id/txtName"
                 tools:backgroundTint="@color/available"
@@ -277,7 +279,7 @@
 
             <Button
                 android:id="@+id/sourceButton"
-                style="@style/Widget.Material3.Button.TextButton"
+                style="@style/Widget.Material3.Button.OutlinedButton"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="16dp"
@@ -291,10 +293,11 @@
                 android:id="@+id/textView13"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
+                android:layout_marginEnd="8dp"
                 android:gravity="right|end"
                 android:text="@{availability.status == Status.SUCCESS ? @string/realtime_data_source(availability.data.source) : availability.status == Status.LOADING ? @string/realtime_data_loading : @string/realtime_data_unavailable}"
                 android:textAppearance="@style/TextAppearance.Material3.BodySmall"
-                app:layout_constraintEnd_toStartOf="@+id/guideline2"
+                app:layout_constraintEnd_toStartOf="@+id/btnRefreshLiveData"
                 app:layout_constraintStart_toStartOf="@+id/guideline"
                 app:layout_constraintTop_toBottomOf="@+id/connectors"
                 tools:text="Echtzeitdaten nicht verfügbar" />
@@ -374,6 +377,18 @@
                 app:layout_constraintBottom_toBottomOf="parent"
                 tools:text="The data is provided under the National Oman Open Data LicensE (NOODLE), Version 3.14, and may be used for any purpose whatsoever." />
 
+            <Button
+                android:id="@+id/btnRefreshLiveData"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                style="@style/Widget.App.Button.OutlinedButton.IconOnly.Small"
+                android:contentDescription="@string/refresh_live_data"
+                android:enabled="@{availability.status != Status.LOADING}"
+                app:icon="@drawable/ic_refresh"
+                app:layout_constraintBottom_toBottomOf="@+id/textView13"
+                app:layout_constraintEnd_toStartOf="@+id/guideline2"
+                app:layout_constraintTop_toBottomOf="@+id/connectors" />
+
         </androidx.constraintlayout.widget.ConstraintLayout>
 
     </androidx.cardview.widget.CardView>

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

@@ -102,20 +102,17 @@
                     app:layout_constraintTop_toBottomOf="@+id/connectors_list"
                     tools:text="Charge from 20% to 80%" />
 
+
                 <TextView
                     android:id="@+id/textView4"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginStart="4dp"
-                    android:layout_marginTop="8dp"
-                    android:text="@{@string/chargeprice_duration(BindingAdaptersKt.time((int) Math.round(vm.chargepriceMetaForChargepoint.data.duration)))}"
-                    android:textAppearance="@style/TextAppearance.Material3.TitleSmall"
-                    android:textColor="?colorPrimary"
+                    android:text="@{@string/chargeprice_stats(vm.chargepriceMetaForChargepoint.data.energy, BindingAdaptersKt.time((int) Math.round(vm.chargepriceMetaForChargepoint.data.duration)), vm.chargepriceMetaForChargepoint.data.energy / vm.chargepriceMetaForChargepoint.data.duration * 60)}"
+                    android:textAppearance="@style/TextAppearance.Material3.BodySmall"
                     app:invisibleUnlessAnimated="@{!vm.batteryRangeSliderDragging &amp;&amp; vm.chargepriceMetaForChargepoint.status == Status.SUCCESS}"
-                    app:layout_constraintStart_toEndOf="@+id/textView2"
-                    app:layout_constraintTop_toBottomOf="@+id/connectors_list"
-                    tools:text="(25 min)" />
-
+                    app:layout_constraintStart_toStartOf="@+id/textView2"
+                    app:layout_constraintTop_toBottomOf="@+id/textView2"
+                    tools:text="(18 kWh, approx. 23 min, ⌀ 50 kW)" />
 
                 <TextView
                     android:id="@+id/tvVehicleHeader"
@@ -155,8 +152,9 @@
                     android:valueFrom="0.0"
                     android:valueTo="100.0"
                     app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintHorizontal_bias="0.0"
                     app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toBottomOf="@+id/textView2"
+                    app:layout_constraintTop_toBottomOf="@+id/textView4"
                     app:values="@={vm.batteryRange}" />
 
                 <androidx.recyclerview.widget.RecyclerView
@@ -244,4 +242,4 @@
         </androidx.core.widget.NestedScrollView>
 
     </LinearLayout>
-</layout>
+</layout>

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

@@ -33,16 +33,21 @@
 
         </com.google.android.material.appbar.AppBarLayout>
 
-
-        <androidx.recyclerview.widget.RecyclerView
-            android:id="@+id/favs_list"
+        <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
+            android:id="@+id/swipe_refresh"
             android:layout_width="0dp"
             android:layout_height="0dp"
-            app:data="@{vm.listData}"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/toolbar_container" />
+            app:layout_constraintTop_toBottomOf="@+id/toolbar_container">
+
+            <androidx.recyclerview.widget.RecyclerView
+                android:id="@+id/favs_list"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                app:data="@{vm.listData}" />
+        </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
 
         <com.airbnb.lottie.LottieAnimationView
             android:id="@+id/animation_view"

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

@@ -16,8 +16,8 @@
             android:layout_height="wrap_content"
             android:layout_marginStart="24dp"
             android:layout_marginEnd="24dp"
-            android:layout_marginBottom="56dp"
-            app:layout_constraintBottom_toTopOf="@+id/btnGetStarted"
+            android:layout_marginBottom="32dp"
+            app:layout_constraintBottom_toTopOf="@+id/dataSourceHint"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintHorizontal_bias="0.5"
             app:layout_constraintStart_toStartOf="parent" />
@@ -65,5 +65,22 @@
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent" />
 
+        <TextView
+            android:id="@+id/dataSourceHint"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="32dp"
+            android:layout_marginEnd="32dp"
+            android:layout_marginBottom="32dp"
+            android:gravity="center"
+            android:text="@string/data_sources_hint"
+            android:textAppearance="@style/TextAppearance.Material3.BodySmall"
+            android:textColor="?android:textColorSecondary"
+            android:breakStrategy="balanced"
+            app:layout_constraintBottom_toTopOf="@+id/btnGetStarted"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0.5"
+            app:layout_constraintStart_toStartOf="parent" />
+
     </androidx.constraintlayout.widget.ConstraintLayout>
 </ScrollView>

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

@@ -4,7 +4,6 @@
     xmlns:tools="http://schemas.android.com/tools">
 
     <data>
-
         <import type="net.vonforst.evmap.adapter.ConnectorAdapter.ChargepointWithAvailability" />
         <import type="net.vonforst.evmap.ui.BindingAdaptersKt" />
 
@@ -74,6 +73,7 @@
             android:layout_marginBottom="8dp"
             android:text="@{item.chargepoint.formatPower()}"
             android:textAppearance="@style/TextAppearance.Material3.BodySmall"
+            app:goneUnless="@{item.chargepoint.hasKnownPower()}"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"

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

@@ -50,13 +50,18 @@
 
             <TextView
                 android:id="@+id/textView15"
-                android:layout_width="wrap_content"
+                android:layout_width="0dp"
                 android:layout_height="wrap_content"
+                android:layout_marginEnd="16dp"
                 android:text="@{item.charger.name}"
                 android:textAppearance="@style/TextAppearance.Material3.BodyLarge"
+                android:maxLines="2"
+                android:ellipsize="end"
+                android:hyphenationFrequency="normal"
+                app:layout_constraintEnd_toStartOf="@+id/textView16"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="parent"
-                tools:text="Parkhaus" />
+                tools:text="Nikola-Tesla-Parkhaus mit extra langem Namen, der auf mehrere Zeilen umbricht" />
 
         <TextView
             android:id="@+id/textView2"
@@ -67,6 +72,7 @@
             android:maxLines="1"
             android:text="@{item.charger.address.toString()}"
             android:textAppearance="@style/TextAppearance.Material3.BodySmall"
+            app:invisibleUnless="@{item.charger.address != null}"
             app:layout_constraintEnd_toStartOf="@+id/textView7"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/textView15"
@@ -109,7 +115,7 @@
                 android:textAppearance="@style/TextAppearance.AppCompat.Body1"
                 android:textColor="@android:color/white"
                 app:backgroundTintAvailability="@{item.available.data}"
-                app:goneUnless="@{item.available.status == Status.SUCCESS}"
+                app:invisibleUnless="@{item.available.status == Status.SUCCESS}"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintEnd_toStartOf="@id/btnDelete"
                 tools:backgroundTint="@color/available"

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

@@ -4,50 +4,54 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/nav_graph">
 
-    <fragment
+    <navigation
         android:id="@+id/map"
-        android:name="net.vonforst.evmap.fragment.MapFragment"
-        android:label="MapFragment"
-        tools:layout="@layout/fragment_map">
-        <action
-            android:id="@+id/action_map_to_filterFragment"
-            app:destination="@id/filter"
-            app:exitAnim="@animator/nav_default_exit_anim"
-            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_filterProfilesFragment"
-            app:destination="@id/filter_profiles"
-            app:exitAnim="@animator/nav_default_exit_anim"
-            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_chargepriceFragment"
-            app:destination="@id/chargeprice" />
-        <action
-            android:id="@+id/action_map_to_opensource_donations"
-            app:destination="@id/opensource_donations" />
-        <argument
-            android:name="locationName"
-            android:defaultValue="@null"
-            app:argType="string"
-            app:nullable="true" />
-        <argument
-            android:name="chargerId"
-            android:defaultValue="0L"
-            app:argType="long" />
-        <argument
-            android:name="latLng"
-            android:defaultValue="@null"
-            app:argType="com.car2go.maps.model.LatLng"
-            app:nullable="true" />
-        <argument
-            android:name="appStart"
-            android:defaultValue="false"
-            app:argType="boolean" />
-    </fragment>
+        app:startDestination="@id/map_frag">
+        <fragment
+            android:id="@+id/map_frag"
+            android:name="net.vonforst.evmap.fragment.MapFragment"
+            android:label=""
+            tools:layout="@layout/fragment_map">
+            <action
+                android:id="@+id/action_map_to_filterFragment"
+                app:destination="@id/filter"
+                app:exitAnim="@animator/nav_default_exit_anim"
+                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_filterProfilesFragment"
+                app:destination="@id/filter_profiles"
+                app:exitAnim="@animator/nav_default_exit_anim"
+                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_chargepriceFragment"
+                app:destination="@id/chargeprice" />
+            <action
+                android:id="@+id/action_map_to_opensource_donations"
+                app:destination="@id/opensource_donations" />
+            <argument
+                android:name="locationName"
+                android:defaultValue="@null"
+                app:argType="string"
+                app:nullable="true" />
+            <argument
+                android:name="chargerId"
+                android:defaultValue="0L"
+                app:argType="long" />
+            <argument
+                android:name="latLng"
+                android:defaultValue="@null"
+                app:argType="com.car2go.maps.model.LatLng"
+                app:nullable="true" />
+            <argument
+                android:name="appStart"
+                android:defaultValue="false"
+                app:argType="boolean" />
+        </fragment>
+    </navigation>
     <fragment
         android:id="@+id/about"
         android:name="net.vonforst.evmap.fragment.preference.AboutFragment"
@@ -85,15 +89,19 @@
         android:name="net.vonforst.evmap.fragment.preference.AndroidAutoSettingsFragment"
         android:label="@string/settings_android_auto"
         tools:layout="@layout/fragment_preference" />
-    <fragment
+    <navigation
         android:id="@+id/favs"
-        android:name="net.vonforst.evmap.fragment.FavoritesFragment"
-        android:label="@string/menu_favs"
-        tools:layout="@layout/fragment_favorites">
-        <action
-            android:id="@+id/action_favs_to_map"
-            app:destination="@id/map" />
-    </fragment>
+        app:startDestination="@id/favs_frag">
+        <fragment
+            android:id="@+id/favs_frag"
+            android:name="net.vonforst.evmap.fragment.FavoritesFragment"
+            android:label="@string/menu_favs"
+            tools:layout="@layout/fragment_favorites">
+            <action
+                android:id="@+id/action_favs_to_map"
+                app:destination="@id/map" />
+        </fragment>
+    </navigation>
     <fragment
         android:id="@+id/filter"
         android:name="net.vonforst.evmap.fragment.FilterFragment"
@@ -110,12 +118,15 @@
         android:label="@string/chargeprice_title"
         tools:layout="@layout/fragment_chargeprice">
         <action
-            android:id="@+id/action_chargeprice_to_settingsFragment"
-            app:destination="@id/settings"
+            android:id="@+id/action_chargeprice_to_chargepriceSettingsFragment"
+            app:destination="@id/settings_chargeprice"
             app:exitAnim="@animator/nav_default_exit_anim"
             app:enterAnim="@animator/nav_default_enter_anim"
             app:popEnterAnim="@animator/nav_default_enter_anim"
             app:popExitAnim="@animator/nav_default_exit_anim" />
+        <action
+            android:id="@+id/action_chargeprice_to_donateFragment"
+            app:destination="@id/donate" />
         <argument
             android:name="charger"
             app:argType="net.vonforst.evmap.model.ChargeLocation" />

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

@@ -40,7 +40,7 @@
     <string name="settings_ui">Oberfläche</string>
     <string name="settings_map">Karte</string>
     <string name="copyright">Copyright</string>
-    <string name="copyright_summary">©2020–2021 Johan von Forstner</string>
+    <string name="copyright_summary">©2020–2022 Johan von Forstner</string>
     <string name="other">Sonstiges</string>
     <string name="privacy">Datenschutzerklärung</string>
     <string name="fav_add">Zu Favoriten hinzufügen</string>
@@ -158,6 +158,8 @@
     <string name="welcome_2_detail">Du kannst die Farben im Menü unter “Über EVMap → FAQ” erneut ansehen)</string>
     <string name="donation_dialog_title">Danke, dass du EVMap nutzt!</string>
     <string name="donation_dialog_detail">EVMap ist kostenlos und Open Source, ich entwickle es in meiner Freizeit. Über GitHub kann jeder zur Weiterentwicklung der App beitragen. Durch die steigende Beliebtheit der App müssen allerdings auch laufende Kosten, z.B. für den Zugriff auf die Datenquellen, gedeckt werden. Daher freue ich mich auch über Spenden in der App oder über GitHub Sponsors.</string>
+    <string name="chargeprice_donation_dialog_title">Du bist ein richtiger Sparfuchs!</string>
+    <string name="chargeprice_donation_dialog_detail">Es sieht so aus, als wenn du den Preisvergleich sehr gern nutzt. Für den Zugang zu den Preisinformationen muss der Entwickler von EVMap eine monatliche Gebühr an die Datenquelle Chargeprice.app zahlen. Um diesen Dienst weiter anbieten zu können, würde ich mich sehr über Spenden freuen.</string>
     <string name="deleted_filterprofile">„%s” gelöscht</string>
     <string name="undo">Rückgängig</string>
     <string name="rename">Umbenennen</string>
@@ -190,7 +192,9 @@
     <string name="pref_chargeprice_show_provider_customer_tariffs_summary">Einige Anbieter bieten für ihre Kunden (z.B. Haushaltsstrom, Gas) günstigere Tarife an</string>
     <string name="chargeprice_select_car_first">Bitte wähle zuerst dein Auto in den Einstellungen aus.</string>
     <string name="chargeprice_battery_range">Laden von %1$.0f%% bis %2$.0f%%</string>
-    <string name="chargeprice_duration">(ca. %s)</string>
+    <string name="chargeprice_battery_range_from">Laden von</string>
+    <string name="chargeprice_battery_range_to">bis</string>
+    <string name="chargeprice_stats">(%1$.0f kWh, ca. %2$s, ⌀ %3$.0f kW)</string>
     <string name="chargeprice_vehicle">Fahrzeug</string>
     <string name="edit_on_goingelectric_info">Falls hier nur eine leere Seite erscheint, logge dich bitte zuerst bei GoingElectric.de ein.</string>
     <string name="close">schließen</string>
@@ -223,7 +227,7 @@
         <item quantity="other">%d Tarife ausgewählt</item>
     </plurals>
     <string name="unknown_operator">Unbekannter Betreiber</string>
-    <string name="data_sources_description">EVMap unterstützt verschiedene Datenquellen. Bitte wähle aus, welche du nutzen möchtest. Du kannst sie später in den Einstellungen der App ändern.</string>
+    <string name="data_sources_description">EVMap unterstützt verschiedene Datenquellen für Ladestationen. Bitte wähle aus, welche du nutzen möchtest. Du kannst sie später in den Einstellungen der App ändern.</string>
     <string name="data_source_goingelectric">GoingElectric.de</string>
     <string name="data_source_openchargemap">Open Charge Map</string>
     <string name="data_source_goingelectric_desc">Sehr gute Abdeckung in Deutschland, Österreich, Schweiz und vielen angrenzenden Ländern. Beschreibungen in Deutsch. Von der Community gepflegt.</string>
@@ -251,4 +255,10 @@
     <string name="settings_data_sources">Datenquellen</string>
     <string name="help">Hilfe</string>
     <string name="settings_android_auto">Android Auto</string>
+    <string name="pref_chargeprice_allow_unbalanced_load">Schieflast erlauben</string>
+    <string name="pref_chargeprice_allow_unbalanced_load_summary"><![CDATA[Erlaubt das Laden mit >4.5 kW an AC-Stationen für Autos mit 1-phasigem Lader]]></string>
+    <string name="pref_map_rotate_gestures_enabled">Kartenrotation erlauben</string>
+    <string name="pref_map_rotate_gestures_on">Karte kann mit Zweifingergeste rotiert werden</string>
+    <string name="pref_map_rotate_gestures_off">Karte bleibt fest nach Norden ausgerichtet</string>
+    <string name="refresh_live_data">Echtzeitstatus aktualisieren</string>
 </resources>

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

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

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

@@ -25,6 +25,7 @@
     <color name="chargeprice_lock">#546E7A</color>
     <color name="chargeprice_star">#00C853</color>
     <color name="chip_background">#1F000000</color>
+    <color name="my_tariff_background">#1F000000</color>
     <color name="background">#FFFFFF</color>
     <color name="pager_unselected">#1F000000</color>
 </resources>

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

@@ -39,7 +39,7 @@
     <string name="settings_ui">User Interface</string>
     <string name="settings_map">Map</string>
     <string name="copyright">Copyright</string>
-    <string name="copyright_summary">©2020–2021 Johan von Forstner</string>
+    <string name="copyright_summary">©2020–2022 Johan von Forstner</string>
     <string name="other">Other</string>
     <string name="privacy">Privacy Notice</string>
     <string name="fav_add">Add to favorites</string>
@@ -157,6 +157,8 @@
     <string name="welcome_2_detail">(You can check the colors again under “About EVMap → FAQ” in the menu)</string>
     <string name="donation_dialog_title">Thank you for using EVMap!</string>
     <string name="donation_dialog_detail">EVMap is free and Open Source software that I develop in my spare time. Coding contributions on GitHub are very much appreciated. However, due to increasing popularity of the app, I also need to cover some running costs, e.g. for access to the data sources. Therefore, please consider supporting the app through a donation or via GitHub Sponsors.</string>
+    <string name="chargeprice_donation_dialog_title">You\'re a real bargain hunter!</string>
+    <string name="chargeprice_donation_dialog_detail">It seems like you like the price comparison feature a lot. To access the pricing data, the developer of EVMap needs to pay a monthly fee to the data provider Chargeprice.app. Therefore, please consider supporting EVMap through a donation.</string>
     <string name="deleted_filterprofile">Deleted “%s”</string>
     <string name="undo">Undo</string>
     <string name="rename">Rename</string>
@@ -189,7 +191,9 @@
     <string name="pref_chargeprice_show_provider_customer_tariffs">Show customer-exclusive plans</string>
     <string name="chargeprice_select_car_first">Please first select your car model in the settings.</string>
     <string name="chargeprice_battery_range">Charge from %1$.0f%% to %2$.0f%%</string>
-    <string name="chargeprice_duration">(approx. %s)</string>
+    <string name="chargeprice_battery_range_from">Charge from</string>
+    <string name="chargeprice_battery_range_to">to</string>
+    <string name="chargeprice_stats">(%1$.0f kWh, approx. %2$s, ⌀ %3$.0f kW)</string>
     <string name="chargeprice_vehicle">Vehicle</string>
     <string name="pref_chargeprice_show_provider_customer_tariffs_summary">Some providers offer cheaper plans exclusively to their customers (e.g., household electricity, gas)</string>
     <string name="close">close</string>
@@ -208,7 +212,7 @@
         <item quantity="other">%d plans selected</item>
     </plurals>
     <string name="unknown_operator">Unknown operator</string>
-    <string name="data_sources_description">EVMap supports multiple data sources. Please select the one you would like to use. You can always change it later in the app\'s settings.</string>
+    <string name="data_sources_description">EVMap supports multiple data sources for charging stations. Please select the one you would like to use. You can always change it later in the app\'s settings.</string>
     <string name="data_source_goingelectric">GoingElectric.de</string>
     <string name="data_source_openchargemap">Open Charge Map</string>
     <string name="data_source_goingelectric_desc">Very good coverage in Germany, Austria and Switzerland and many neighboring countries. Descriptions in German. Community-maintained.</string>
@@ -236,4 +240,10 @@
     <string name="settings_data_sources">Data sources</string>
     <string name="help">Help</string>
     <string name="settings_android_auto">Android Auto</string>
+    <string name="pref_chargeprice_allow_unbalanced_load">Enable unbalanced load</string>
+    <string name="pref_chargeprice_allow_unbalanced_load_summary"><![CDATA[Allow charging with >4.5 kW at AC stations for cars with single-phase charger]]></string>
+    <string name="pref_map_rotate_gestures_enabled">Enable map rotation</string>
+    <string name="pref_map_rotate_gestures_on">Map can be rotated with two-finger gesture</string>
+    <string name="pref_map_rotate_gestures_off">Map will be fixed to north-up</string>
+    <string name="refresh_live_data">refresh real-time status</string>
 </resources>

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

@@ -56,4 +56,15 @@
         <item name="android:minHeight">48dp</item>
     </style>
 
+    <style name="Widget.App.Button.OutlinedButton.IconOnly.Small" parent="Widget.Material3.Button.OutlinedButton">
+        <item name="iconPadding">0dp</item>
+        <item name="android:insetTop">0dp</item>
+        <item name="android:insetBottom">0dp</item>
+        <item name="android:paddingLeft">7dp</item>
+        <item name="android:paddingRight">7dp</item>
+        <item name="android:minWidth">30dp</item>
+        <item name="android:minHeight">30dp</item>
+        <item name="iconTint">?android:textColorSecondary</item>
+    </style>
+
 </resources>

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

@@ -28,4 +28,10 @@
         android:summary="@string/pref_chargeprice_show_provider_customer_tariffs_summary"
         android:defaultValue="false"
         app:singleLineTitle="false" />
+    <CheckBoxPreference
+        android:key="chargeprice_allow_unbalanced_load"
+        android:title="@string/pref_chargeprice_allow_unbalanced_load"
+        android:summary="@string/pref_chargeprice_allow_unbalanced_load_summary"
+        android:defaultValue="false"
+        app:singleLineTitle="false" />
 </PreferenceScreen>

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

@@ -15,6 +15,12 @@
         android:entryValues="@array/pref_darkmode_values"
         android:defaultValue="default"
         android:summary="@string/pref_darkmode_summary" />
+    <CheckBoxPreference
+        android:key="map_rotate_gestures_enabled"
+        android:title="@string/pref_map_rotate_gestures_enabled"
+        android:summaryOn="@string/pref_map_rotate_gestures_on"
+        android:summaryOff="@string/pref_map_rotate_gestures_off"
+        android:defaultValue="true" />
     <CheckBoxPreference
         android:key="navigate_use_maps"
         android:title="@string/pref_navigate_use_maps"

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

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

app/src/test/java/net/vonforst/evmap/api/availability/NewMotionAvailabilityDetectorTest.kt

@@ -43,8 +43,8 @@ class NewMotionAvailabilityDetectorTest {
                     "nm/markers" -> {
                         val urlTail = segments.subList(2, segments.size).joinToString("/")
                         val id = when (urlTail) {
-                            "9.47108/9.67108/54.4116/54.6116" -> 2105
-                            "9.444284/9.644283999999999/54.376699/54.576699000000005" -> 18284
+                            "9.56608/9.576080000000001/54.5066/54.516600000000004" -> 2105
+                            "9.539283999999999/9.549284/54.471699/54.481699000000006" -> 18284
                             else -> -1
                         }
                         return okResponse("/newmotion/$id/markers.json")
@@ -67,7 +67,7 @@ class NewMotionAvailabilityDetectorTest {
     fun apiTest() {
         for (chargepoint in listOf(2105L, 18284L)) {
             val charger = runBlocking { api.getChargepointDetail(chargepoint).body()!! }
-                .chargelocations[0].convert("") as ChargeLocation
+                .chargelocations[0].convert("", true) as ChargeLocation
             println(charger)
 
             runBlocking {