Release 0.9.0

.github/FUNDING.yml

@@ -1,2 +0,0 @@
-github: johan12345
-custom: 'https://paypal.me/johan98'

.github/workflows/apikeys-ci.xml

@@ -1,7 +0,0 @@
-<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

@@ -1,77 +0,0 @@
-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

@@ -1,36 +0,0 @@
-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

@@ -0,0 +1,46 @@
+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.6.1)
+    jmespath (1.4.0)
     json (2.3.1)
     jwt (2.2.1)
     memoist (0.16.2)

LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2020-2022 Johan von Forstner
+Copyright (c) 2020-2021 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://github.com/johan12345/EVMap/actions/workflows/tests.yml/badge.svg)](https://github.com/johan12345/EVMap/actions)
+EVMap [![Build Status](https://travis-ci.org/johan12345/EVMap.svg?branch=master)](https://travis-ci.org/johan12345/EVMap)
 =====
 
 <img src="https://raw.githubusercontent.com/johan12345/EVMap/master/_img/feature_graphic.svg" width=700 alt="Logo"/>
@@ -19,7 +19,7 @@ Features
 - Search for places
 - Advanced filtering options, including saved filter profiles
 - Favorites list, also with availability information
-- Integrated price comparison using [Chargeprice.app](https://chargeprice.app) (only in Europe)
+- Integrated price comparison using Chargeprice.app [Chargeprice.app](https://chargeprice.app) (only in Europe)
 - Android Auto integration
 - No ads, fully open source
 - Compatible with Android 5.0 and above
@@ -28,22 +28,38 @@ Features
 Screenshots
 -----------
 
-<img src="https://raw.githubusercontent.com/johan12345/EVMap/master/_img/screenshots/phone/en/mapbox/01_map.png" width=250 alt="Screenshot 1"/><img src="https://raw.githubusercontent.com/johan12345/EVMap/master/_img/screenshots/phone/en/mapbox/02_detail.png" width=250 alt="Screenshot 2"/>
+<img src="https://raw.githubusercontent.com/johan12345/EVMap/master/_img/screenshots/phone/01_main.png" width=250 alt="Screenshot 1"/><img src="https://raw.githubusercontent.com/johan12345/EVMap/master/_img/screenshots/phone/02_detail.png" width=250 alt="Screenshot 2"/>
 
 Development setup
 -----------------
 
-The App is developed using Android Studio and should pretty much work out-of-the-box when you clone
-the Git repository and open the project with Android Studio.
+The App is developed using Android Studio.
 
-The only exception is that you need to obtain some free API keys for the different data sources that
-EVMap uses and put them into the app in the form of a resource file called `apikeys.xml` under
-`app/src/main/res/values`. You can find more information on which API keys are necessary for which
-features and how they can be obtained in our [documentation page](doc/api_keys.md).
+For testing the app, you need to obtain free API Keys for the 
+[GoingElectric API](https://www.goingelectric.de/stromtankstellen/api/),
+the [Chargeprice API](https://github.com/chargeprice/chargeprice-api-docs),
+the [OpenChargeMap API](https://openchargemap.org/site/profile/appedit),
+as well as for [Google APIs](https://console.developers.google.com/)
+("Maps SDK for Android" and "Places API" need to be activated) and/or [Mapbox](https://www.mapbox.com/). These API keys need to be put into the
+app in the form of a resource file called `apikeys.xml` under `app/src/main/res/values`, with the
+following content:
 
-There are two different build flavors, `google` and `foss`, where only the `google` variant uses
-Google Maps data and provides the Android Auto integration. The `foss` variant only uses Mapbox data
-and should run on devices without Google Play Services.
-
-We also have a special [documentation page](doc/android_auto.md) on how to test the Android Auto
-app.
+```xml
+<resources>
+    <string name="google_maps_key" templateMergeStrategy="preserve" translatable="false">
+        insert your Google Maps key here
+    </string>
+    <string name="mapbox_key" translatable="false">
+        insert your Mapbox key here
+    </string>
+    <string name="goingelectric_key" translatable="false">
+        insert your GoingElectric key here
+    </string>
+    <string name="chargeprice_key" translatable="false">
+        insert your Chargeprice key here
+    </string>
+    <string name="openchargemap_key" translatable="false">
+        insert your OpenChargeMap key here
+    </string>
+</resources>
+```

app/build.gradle

@@ -1,7 +1,3 @@
-plugins {
-    id 'com.adarshr.test-logger' version '3.1.0'
-}
-
 apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-parcelize'
@@ -10,29 +6,28 @@ apply plugin: 'androidx.navigation.safeargs.kotlin'
 apply plugin: 'com.mikepenz.aboutlibraries.plugin'
 
 android {
-    compileSdkVersion 31
+    compileSdkVersion 30
     buildToolsVersion "30.0.3"
 
     defaultConfig {
         applicationId "net.vonforst.evmap"
         minSdkVersion 21
-        targetSdkVersion 31
-        // NOTE: always increase versionCode by 2 since automotive flavor uses versionCode + 1
-        versionCode 80
-        versionName "1.3.2"
+        targetSdkVersion 30
+        versionCode 53
+        versionName "0.9.0"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
 
     signingConfigs {
         release {
-            def isRunningOnCI = System.getenv("CI") == "true"
-            if (isRunningOnCI) {
+            def isRunningOnTravis = System.getenv("CI") == "true"
+            if (isRunningOnTravis) {
                 // 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")
             }
         }
     }
@@ -49,7 +44,7 @@ android {
         }
     }
 
-    flavorDimensions "dependencies", "automotive"
+    flavorDimensions "dependencies"
     productFlavors {
         foss {
             dimension "dependencies"
@@ -58,22 +53,6 @@ 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 {
@@ -90,9 +69,6 @@ android {
         dataBinding = true
         viewBinding true
     }
-    lint {
-        disable 'NullSafeMutableLiveData'
-    }
 
     // add API keys from environment variable if not set in apikeys.xml
     applicationVariants.all { variant ->
@@ -109,13 +85,10 @@ 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.startsWith('google')) {
+        if (googleMapsKey != null && variant.flavorName == 'google') {
             variant.resValue "string", "google_maps_key", googleMapsKey
         }
         def mapboxKey = env.MAPBOX_API_KEY ?: project.findProperty("MAPBOX_API_KEY")
-        if (mapboxKey == null && project.hasProperty("MAPBOX_API_KEY_ENCRYPTED")) {
-            mapboxKey = decode(project.findProperty("MAPBOX_API_KEY_ENCRYPTED"), "FmK.d,-f*p+rD+WK!eds")
-        }
         if (mapboxKey != null) {
             variant.resValue "string", "mapbox_key", mapboxKey
         }
@@ -127,42 +100,35 @@ android {
             variant.resValue "string", "chargeprice_key", chargepriceKey
         }
     }
-
-}
-
-configurations {
-    googleNormalImplementation {}
-    googleAutomotiveImplementation {}
 }
 
 dependencies {
+    implementation fileTree(dir: 'libs', include: ['*.jar'])
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
-    implementation 'androidx.appcompat:appcompat:1.4.2'
-    implementation 'androidx.core:core-ktx:1.8.0'
-    implementation 'androidx.core:core-splashscreen:1.0.0-rc01'
-    implementation "androidx.activity:activity-ktx:1.4.0"
-    implementation "androidx.fragment:fragment-ktx:1.4.1"
+    implementation 'androidx.appcompat:appcompat:1.3.0'
+    implementation 'androidx.core:core-ktx:1.5.0'
+    implementation "androidx.activity:activity-ktx:1.2.3"
+    implementation "androidx.fragment:fragment-ktx:1.3.4"
     implementation 'androidx.cardview:cardview:1.0.0'
-    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 'androidx.preference:preference-ktx:1.1.1'
+    implementation 'com.google.android.material:material:1.3.0'
+    implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
+    implementation 'androidx.recyclerview:recyclerview:1.2.0'
+    implementation 'androidx.browser:browser:1.3.0'
     implementation 'com.github.johan12345:CustomBottomSheetBehavior:f69f532660'
     implementation 'com.squareup.retrofit2:retrofit:2.9.0'
     implementation 'com.squareup.retrofit2:converter-moshi:2.9.0'
     implementation 'com.squareup.okhttp3:okhttp:4.9.0'
     implementation 'com.squareup.okhttp3:okhttp-urlconnection:4.9.0'
-    implementation 'com.squareup.moshi:moshi-kotlin:1.13.0'
-    implementation 'com.squareup.moshi:moshi-adapters:1.13.0'
+    implementation 'com.squareup.moshi:moshi-kotlin:1.12.0'
+    implementation 'com.squareup.moshi:moshi-adapters:1.12.0'
     implementation 'moe.banana:moshi-jsonapi:3.5.0'
     implementation 'moe.banana:moshi-jsonapi-retrofit-converter:3.5.0'
     implementation 'io.coil-kt:coil:1.1.0'
     implementation 'com.github.johan12345:StfalconImageViewer:5082ebd392'
     implementation "com.mikepenz:aboutlibraries-core:$about_libs_version"
     implementation "com.mikepenz:aboutlibraries:$about_libs_version"
-    implementation 'com.airbnb.android:lottie:4.1.0'
+    implementation 'com.airbnb.android:lottie:3.4.0'
     implementation 'io.michaelrocks.bimap:bimap:1.1.0'
     implementation 'com.mapzen.android:lost:3.0.2'
     implementation 'com.google.guava:guava:29.0-android'
@@ -170,64 +136,66 @@ dependencies {
     implementation 'com.github.romandanylyk:PageIndicatorView:b1bad589b5'
 
     // Android Auto
-    googleImplementation 'androidx.car.app:app:1.2.0-rc01'
-    googleNormalImplementation 'androidx.car.app:app-projected:1.2.0-rc01'
-    googleAutomotiveImplementation 'androidx.car.app:app-automotive:1.2.0-rc01'
+    googleImplementation 'androidx.car.app:app:1.0.0'
 
     // AnyMaps
-    def anyMapsVersion = '3c67d7a1dc'
+    def anyMapsVersion = '95ddd6c083'
     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.2'
-    implementation("com.github.johan12345.AnyMaps:anymaps-mapbox:$anyMapsVersion") {
+    implementation "com.github.johan12345.AnyMaps:anymaps-mapbox:$anyMapsVersion"
+
+    // Google Maps v3 Beta
+    googleImplementation 'com.google.android.libraries.maps:maps:3.1.0-beta'
+    googleImplementation name:'places-maps-sdk-3.1.0-beta', ext:'aar'
+    googleImplementation 'com.android.volley:volley:1.2.0'
+    googleImplementation 'com.google.android.gms:play-services-base:17.5.0'
+    googleImplementation 'com.google.android.gms:play-services-basement:17.5.0'
+    googleImplementation 'com.google.android.gms:play-services-gcm:17.0.0'
+    googleImplementation 'com.google.android.gms:play-services-location:17.1.0'
+    googleImplementation 'com.google.android.gms:play-services-tasks:17.2.0'
+    googleImplementation 'com.google.auto.value:auto-value-annotations:1.6.3'
+    googleImplementation 'com.google.code.gson:gson:2.8.6'
+    googleImplementation 'com.google.android.datatransport:transport-runtime:2.2.5'
+    googleImplementation 'androidx.lifecycle:lifecycle-extensions:2.2.0'
+
+    // Mapbox places (autocomplete)
+    // forked this library and included through JitPack to fix https://github.com/mapbox/mapbox-plugins-android/issues/1011
+    implementation('com.github.johan12345.mapbox-plugins-android:mapbox-android-plugin-places-v9:922bf877f6') {
         exclude group: 'com.mapbox.mapboxsdk', module: 'mapbox-android-accounts'
         exclude group: 'com.mapbox.mapboxsdk', module: 'mapbox-android-telemetry'
     }
 
-    // Google Places
-    implementation 'com.google.android.libraries.places:places:2.6.0'
-    googleImplementation 'org.jetbrains.kotlinx:kotlinx-coroutines-play-services:1.4.1'
-
-    // Mapbox Geocoding
-    implementation 'com.mapbox.mapboxsdk:mapbox-sdk-services:5.5.0'
-
     // navigation library
     implementation "androidx.navigation:navigation-fragment-ktx:$nav_version"
     implementation "androidx.navigation:navigation-ui-ktx:$nav_version"
 
     // viewmodel library
-    def lifecycle_version = "2.4.1"
+    def lifecycle_version = "2.3.1"
     implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycle_version"
     implementation "androidx.lifecycle:lifecycle-livedata-ktx:$lifecycle_version"
 
     // room library
-    def room_version = "2.4.2"
+    def room_version = "2.3.0"
     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.1.0"
+    def billing_version = "4.0.0"
     googleImplementation "com.android.billingclient:billing:$billing_version"
     googleImplementation "com.android.billingclient:billing-ktx:$billing_version"
 
-    // ACRA (crash reporting)
-    def acraVersion = "5.8.4"
-    implementation("ch.acra:acra-mail:$acraVersion")
-    implementation("ch.acra:acra-dialog:$acraVersion")
-    implementation("ch.acra:acra-limiter:$acraVersion")
-
     // debug tools
     implementation 'com.facebook.stetho:stetho:1.5.1'
     implementation 'com.facebook.stetho:stetho-okhttp3:1.5.1'
-    testImplementation 'junit:junit:4.13.2'
+    testImplementation 'junit:junit:4.13'
     testImplementation "com.squareup.okhttp3:mockwebserver:4.9.0"
     //noinspection GradleDependency
     testImplementation 'org.json:json:20080701'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.3'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
+    androidTestImplementation 'androidx.test.ext:junit:1.1.2'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
 
-    kapt "com.squareup.moshi:moshi-kotlin-codegen:1.13.0"
+    kapt "com.squareup.moshi:moshi-kotlin-codegen:1.12.0"
 
     coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.5'
 }
@@ -242,4 +210,4 @@ private static byte[] xorWithKey(byte[] a, byte[] key) {
         out[i] = (byte) (a[i] ^ key[i%key.length]);
     }
     return out;
-}
+}

app/src/debug/res/drawable/ic_launcher_foreground.xml

@@ -1,107 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="108dp"
-    android:height="108dp"
-    android:viewportWidth="198.3471"
-    android:viewportHeight="198.3471">
-    <group
-        android:translateX="3.1735537"
-        android:translateY="3.1735537">
-        <group>
-            <clip-path android:pathData="M122.5,57.1c-5.8,-7.7 -15.2,-12.4 -24.7,-12.9H94c-8.1,0.5 -15.9,3.9 -21.7,9.6c-4.3,4.3 -7.4,9.7 -8.6,15.7c-1.5,7.5 -0.1,15.4 3.5,22.1c2.3,4.5 5.2,8.6 8.1,12.8c4.9,6.8 9.8,13.7 13.2,21.3c3.1,6.5 4.9,13.6 5.6,20.8c0.4,0.6 1.1,1 1.7,1.5c2.6,-1 2,-4 2.5,-6.2c1.9,-12.8 8.7,-24.2 16.1,-34.6c6.6,-9.2 14.1,-19 14.4,-30.8V74C128.5,67.9 126.3,61.9 122.5,57.1zM106.2,74.3l-12.2,21V79.5h-5.2V60.3h17.5l-7,14H106.2z" />
-            <path
-                android:pathData="M106.2,74.3h-7"
-                android:strokeAlpha="0.2"
-                android:strokeLineJoin="round"
-                android:strokeWidth="2"
-                android:fillColor="#00000000"
-                android:strokeColor="#212121"
-                android:fillAlpha="0.2" />
-        </group>
-        <group>
-            <clip-path android:pathData="M122.5,57.1c-5.8,-7.7 -15.2,-12.4 -24.7,-12.9H94c-8.1,0.5 -15.9,3.9 -21.7,9.6c-4.3,4.3 -7.4,9.7 -8.6,15.7c-1.5,7.5 -0.1,15.4 3.5,22.1c2.3,4.5 5.2,8.6 8.1,12.8c4.9,6.8 9.8,13.7 13.2,21.3c3.1,6.5 4.9,13.6 5.6,20.8c0.4,0.6 1.1,1 1.7,1.5c2.6,-1 2,-4 2.5,-6.2c1.9,-12.8 8.7,-24.2 16.1,-34.6c6.6,-9.2 14.1,-19 14.4,-30.8V74C128.5,67.9 126.3,61.9 122.5,57.1zM106.2,74.3l-12.2,21V79.5h-5.2V60.3h17.5l-7,14H106.2z" />
-            <path
-                android:pathData="M106.2,60.3c0,0 -17.5,0 -17.5,0"
-                android:strokeAlpha="0.2"
-                android:strokeLineJoin="round"
-                android:strokeWidth="2"
-                android:fillColor="#00000000"
-                android:strokeColor="#212121"
-                android:fillAlpha="0.2" />
-        </group>
-        <group>
-            <clip-path android:pathData="M122.5,57.1c-5.8,-7.7 -15.2,-12.4 -24.7,-12.9H94c-8.1,0.5 -15.9,3.9 -21.7,9.6c-4.3,4.3 -7.4,9.7 -8.6,15.7c-1.5,7.5 -0.1,15.4 3.5,22.1c2.3,4.5 5.2,8.6 8.1,12.8c4.9,6.8 9.8,13.7 13.2,21.3c3.1,6.5 4.9,13.6 5.6,20.8c0.4,0.6 1.1,1 1.7,1.5c2.6,-1 2,-4 2.5,-6.2c1.9,-12.8 8.7,-24.2 16.1,-34.6c6.6,-9.2 14.1,-19 14.4,-30.8V74C128.5,67.9 126.3,61.9 122.5,57.1zM106.2,74.3l-12.2,21V79.5h-5.2V60.3h17.5l-7,14H106.2z" />
-            <path
-                android:pathData="M93.9,79.5L88.7,79.5"
-                android:strokeAlpha="0.2"
-                android:strokeLineJoin="round"
-                android:strokeWidth="2"
-                android:fillColor="#00000000"
-                android:strokeColor="#FFFFFF"
-                android:fillAlpha="0.2" />
-        </group>
-        <group>
-            <clip-path android:pathData="M122.5,57.1c-5.8,-7.7 -15.2,-12.4 -24.7,-12.9H94c-8.1,0.5 -15.9,3.9 -21.7,9.6c-4.3,4.3 -7.4,9.7 -8.6,15.7c-1.5,7.5 -0.1,15.4 3.5,22.1c2.3,4.5 5.2,8.6 8.1,12.8c4.9,6.8 9.8,13.7 13.2,21.3c3.1,6.5 4.9,13.6 5.6,20.8c0.4,0.6 1.1,1 1.7,1.5c2.6,-1 2,-4 2.5,-6.2c1.9,-12.8 8.7,-24.2 16.1,-34.6c6.6,-9.2 14.1,-19 14.4,-30.8V74C128.5,67.9 126.3,61.9 122.5,57.1zM106.2,74.3l-12.2,21V79.5h-5.2V60.3h17.5l-7,14H106.2z" />
-            <path
-                android:strokeWidth="1"
-                android:pathData="M94,79v16.2"
-                android:strokeAlpha="0.2"
-                android:strokeLineJoin="round"
-                android:fillColor="#00000000"
-                android:strokeColor="#212121"
-                android:fillAlpha="0.2"
-                android:strokeLineCap="round" />
-        </group>
-        <group>
-            <clip-path android:pathData="M122.5,57.1c-5.8,-7.7 -15.2,-12.4 -24.7,-12.9H94c-8.1,0.5 -15.9,3.9 -21.7,9.6c-4.3,4.3 -7.4,9.7 -8.6,15.7c-1.5,7.5 -0.1,15.4 3.5,22.1c2.3,4.5 5.2,8.6 8.1,12.8c4.9,6.8 9.8,13.7 13.2,21.3c3.1,6.5 4.9,13.6 5.6,20.8c0.4,0.6 1.1,1 1.7,1.5c2.6,-1 2,-4 2.5,-6.2c1.9,-12.8 8.7,-24.2 16.1,-34.6c6.6,-9.2 14.1,-19 14.4,-30.8V74C128.5,67.9 126.3,61.9 122.5,57.1zM106.2,74.3l-12.2,21V79.5h-5.2V60.3h17.5l-7,14H106.2z" />
-            <path
-                android:strokeWidth="1"
-                android:pathData="M106.2,60.3L99.2,74.3"
-                android:strokeAlpha="0.2"
-                android:strokeLineJoin="round"
-                android:fillColor="#00000000"
-                android:strokeColor="#FFFFFF"
-                android:fillAlpha="0.2"
-                android:strokeLineCap="round" />
-        </group>
-        <group>
-            <clip-path android:pathData="M122.5,57.1c-5.8,-7.7 -15.2,-12.4 -24.7,-12.9H94c-8.1,0.5 -15.9,3.9 -21.7,9.6c-4.3,4.3 -7.4,9.7 -8.6,15.7c-1.5,7.5 -0.1,15.4 3.5,22.1c2.3,4.5 5.2,8.6 8.1,12.8c4.9,6.8 9.8,13.7 13.2,21.3c3.1,6.5 4.9,13.6 5.6,20.8c0.4,0.6 1.1,1 1.7,1.5c2.6,-1 2,-4 2.5,-6.2c1.9,-12.8 8.7,-24.2 16.1,-34.6c6.6,-9.2 14.1,-19 14.4,-30.8V74C128.5,67.9 126.3,61.9 122.5,57.1zM106.2,74.3l-12.2,21V79.5h-5.2V60.3h17.5l-7,14H106.2z" />
-            <path
-                android:strokeWidth="1"
-                android:pathData="M106.2,74.3L93.9,95.2"
-                android:strokeAlpha="0.2"
-                android:strokeLineJoin="round"
-                android:fillColor="#00000000"
-                android:strokeColor="#FFFFFF"
-                android:fillAlpha="0.2"
-                android:strokeLineCap="round" />
-        </group>
-        <path
-            android:pathData="M67.6,120.6L65.7,104l-2.9,0.3l1.9,16.6L67.6,120.6zM77.9,119.4l-1.9,-16.6l-2.9,0.3l1.9,16.6L77.9,119.4z"
-            android:fillColor="#808080" />
-        <path
-            android:pathData="M83.3,142c-0.9,1.1 -1.6,1.8 -1.7,1.9c-2.6,2.1 -4.7,2.7 -6.4,1.9c-3,-1.5 -2.8,-7.1 -2.7,-7.7l2.1,0.1c-0.1,1.6 0.2,5 1.6,5.7c0.8,0.4 2.2,-0.1 4,-1.6l0,0c0,0 5.8,-5.8 4.6,-10.4c-1.4,-5.5 5,-13.4 7.1,-16.1l0.3,-0.3l1.7,1.3l-0.3,0.4c-6.5,8 -7.2,12.1 -6.7,14.2C87.9,135.4 85.2,139.7 83.3,142z"
-            android:fillColor="#9e9e9e" />
-        <path
-            android:pathData="M61.2,120.4l0.8,6.8l6.3,4.2l8.5,-0.9l5.2,-5.5l-0.8,-6.8L61.2,120.4z"
-            android:fillColor="#9e9e9e" />
-        <path
-            android:pathData="M76.7,130.5l-8.5,0.9l1.8,7.5l6.7,-0.8L76.7,130.5L76.7,130.5zM82.8,112.5l0.7,6.2l-24.4,2.8l-0.7,-6.2L82.8,112.5z"
-            android:fillColor="#666666" />
-        <path
-            android:pathData="M101.9,44.1c-17.5,0 -31.7,14.2 -31.7,31.7c0,23.9 26.7,36.4 29.9,70.5c0.1,1 0.9,1.7 1.9,1.7s1.8,-0.7 1.9,-1.7c3.2,-34.1 29.9,-46.6 29.9,-70.5C133.6,58.2 119.4,44.1 101.9,44.1z"
-            android:fillColor="#737373" />
-        <path
-            android:pathData="M101.9,44.8c17.4,0 31.5,14 31.7,31.3c0,-0.1 0,-0.2 0,-0.3c0,-17.5 -14.2,-31.7 -31.7,-31.7S70.2,58.2 70.2,75.8c0,0.1 0,0.2 0,0.3C70.4,58.8 84.5,44.8 101.9,44.8L101.9,44.8z"
-            android:fillColor="#FFFFFF"
-            android:fillAlpha="0.2" />
-        <path
-            android:pathData="M103.8,145.5c-0.1,1 -0.9,1.7 -1.9,1.7s-1.8,-0.7 -1.9,-1.7c-3.1,-34 -29.6,-46.5 -29.8,-70.1c0,0.2 0,0.3 0,0.5c0,23.9 26.7,36.4 29.9,70.5c0.1,1 0.9,1.7 1.9,1.7s1.8,-0.7 1.9,-1.7c3.2,-34.1 29.9,-46.6 29.9,-70.5c0,-0.2 0,-0.3 0,-0.5C133.4,99 106.9,111.5 103.8,145.5L103.8,145.5z"
-            android:fillColor="#303030"
-            android:fillAlpha="0.2" />
-        <path
-            android:fillColor="#FF000000"
-            android:pathData="M94.6,60.3v19.2h5.2v15.7l12.2,-21h-7l7,-14C112.1,60.3 94.6,60.3 94.6,60.3z"
-            android:strokeAlpha="0.45"
-            android:fillAlpha="0.45" />
-    </group>
-</vector>

app/src/foss/java/net/vonforst/evmap/autocomplete/Autocomplete.kt

@@ -1,5 +0,0 @@
-package net.vonforst.evmap.autocomplete
-
-import android.content.Context
-
-fun getAutocompleteProviders(context: Context) = listOf(MapboxAutocompleteProvider(context))

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

@@ -8,7 +8,6 @@ import androidx.appcompat.app.AppCompatActivity
 import androidx.fragment.app.Fragment
 import androidx.navigation.fragment.findNavController
 import androidx.navigation.ui.setupWithNavController
-import com.google.android.material.transition.MaterialSharedAxis
 import net.vonforst.evmap.MapsActivity
 import net.vonforst.evmap.R
 import net.vonforst.evmap.databinding.FragmentDonateBinding
@@ -16,17 +15,11 @@ import net.vonforst.evmap.databinding.FragmentDonateBinding
 class DonateFragment : Fragment() {
     private lateinit var binding: FragmentDonateBinding
 
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        enterTransition = MaterialSharedAxis(MaterialSharedAxis.X, true)
-        returnTransition = MaterialSharedAxis(MaterialSharedAxis.X, false)
-    }
-
     override fun onCreateView(
         inflater: LayoutInflater,
         container: ViewGroup?,
         savedInstanceState: Bundle?
-    ): View {
+    ): View? {
         binding = FragmentDonateBinding.inflate(inflater, container, false)
         return binding.root
     }
@@ -34,8 +27,9 @@ class DonateFragment : Fragment() {
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         (requireActivity() as AppCompatActivity).setSupportActionBar(binding.toolbar)
 
+        val navController = findNavController()
         binding.toolbar.setupWithNavController(
-            findNavController(),
+            navController,
             (requireActivity() as MapsActivity).appBarConfiguration
         )
 

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

@@ -1,16 +0,0 @@
-package net.vonforst.evmap.fragment
-
-import androidx.fragment.app.Fragment
-import androidx.viewpager2.adapter.FragmentStateAdapter
-
-class OnboardingViewPagerAdapter(fragment: Fragment) :
-    FragmentStateAdapter(fragment) {
-    override fun getItemCount(): Int = 3
-
-    override fun createFragment(position: Int): Fragment = when (position) {
-        0 -> WelcomeFragment()
-        1 -> IconsFragment()
-        2 -> DataSourceSelectFragment()
-        else -> throw IllegalArgumentException()
-    }
-}

app/src/foss/res/layout/fragment_donate.xml

@@ -23,7 +23,7 @@
 
     <Button
         android:id="@+id/btnDonate"
-        style="@style/Widget.Material3.Button.Icon"
+        style="@style/Widget.MaterialComponents.Button.Icon"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="24dp"

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

@@ -3,13 +3,6 @@
     <string-array name="pref_map_provider_names">
         <item>OpenStreetMap (Mapbox)</item>
     </string-array>
-    <string-array name="pref_search_provider_names">
-        <item>OpenStreetMap (Mapbox)</item>
-    </string-array>
-    <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="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

@@ -6,16 +6,8 @@
     <string-array name="pref_map_provider_values" tranlatable="false">
         <item>mapbox</item>
     </string-array>
-    <string-array name="pref_search_provider_names">
-        <item>OpenStreetMap (Mapbox)</item>
-    </string-array>
-    <string-array name="pref_search_provider_values" tranlatable="false">
-        <item>mapbox</item>
-    </string-array>
-    <string name="pref_search_provider_default" translatable="false">mapbox</string>
     <string name="pref_map_provider_default" translatable="false">mapbox</string>
     <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/foss/res/xml/settings_variantspecific.xml

@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<PreferenceScreen>
-
-</PreferenceScreen>

app/src/google/AndroidManifest.xml

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

app/src/google/java/net/vonforst/evmap/Inits.kt

@@ -5,18 +5,10 @@ import android.content.Context
 import android.util.Log
 import com.google.android.gms.common.ConnectionResult
 import com.google.android.gms.common.GoogleApiAvailability
-import com.google.android.gms.maps.MapsInitializer
 import com.google.android.libraries.places.api.Places
-import net.vonforst.evmap.storage.PreferenceDataSource
-import net.vonforst.evmap.utils.LocaleContextWrapper
 
 fun init(context: Context) {
-    Places.initialize(context, context.getString(R.string.google_maps_key))
-
-    val localeContext = LocaleContextWrapper.wrap(
-        context.applicationContext, PreferenceDataSource(context).language
-    )
-    MapsInitializer.initialize(localeContext, MapsInitializer.Renderer.LATEST, null)
+    Places.initialize(context, context.getString(R.string.google_maps_key));
 }
 
 fun checkPlayServices(activity: Activity): Boolean {

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

@@ -1,29 +1,27 @@
 package net.vonforst.evmap.auto
 
+import android.Manifest
 import android.content.*
 import android.content.pm.ApplicationInfo
+import android.content.pm.PackageManager
 import android.location.Location
 import android.os.IBinder
-import androidx.car.app.CarContext
 import androidx.car.app.Screen
 import androidx.car.app.Session
-import androidx.car.app.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.model.*
 import androidx.car.app.validation.HostValidator
 import androidx.core.content.ContextCompat
-import androidx.lifecycle.Lifecycle
-import androidx.lifecycle.LifecycleObserver
-import androidx.lifecycle.OnLifecycleEvent
+import androidx.lifecycle.*
 import androidx.localbroadcastmanager.content.LocalBroadcastManager
-import net.vonforst.evmap.utils.checkAnyLocationPermission
+import kotlinx.coroutines.*
+import net.vonforst.evmap.*
 
 
 interface LocationAwareScreen {
     fun updateLocation(location: Location)
 }
 
+@androidx.car.app.annotations.ExperimentalCarApi
 class CarAppService : androidx.car.app.CarAppService() {
     override fun createHostValidator(): HostValidator {
         return if (applicationInfo.flags and ApplicationInfo.FLAG_DEBUGGABLE != 0) {
@@ -40,6 +38,7 @@ class CarAppService : androidx.car.app.CarAppService() {
     }
 }
 
+@androidx.car.app.annotations.ExperimentalCarApi
 class EVMapSession(val cas: CarAppService) : Session(), LifecycleObserver {
     var mapScreen: LocationAwareScreen? = null
         set(value) {
@@ -48,9 +47,6 @@ class EVMapSession(val cas: CarAppService) : Session(), LifecycleObserver {
         }
     private var location: Location? = null
     private var locationService: CarLocationService? = null
-    private val hardwareMan: CarHardwareManager by lazy {
-        carContext.getCarService(CarContext.HARDWARE_SERVICE) as CarHardwareManager
-    }
 
     private val serviceConnection = object : ServiceConnection {
         override fun onServiceConnected(name: ComponentName, ibinder: IBinder) {
@@ -63,55 +59,40 @@ class EVMapSession(val cas: CarAppService) : Session(), LifecycleObserver {
             locationService = null
         }
     }
-    private var serviceBound = false
 
     init {
         lifecycle.addObserver(this)
     }
 
     override fun onCreateScreen(intent: Intent): Screen {
-        return WelcomeScreen(carContext, this)
+        return if (locationPermissionGranted()) {
+            WelcomeScreen(carContext, this)
+        } else {
+            PermissionScreen(carContext, this)
+        }
     }
 
-    fun locationPermissionGranted() = carContext.checkAnyLocationPermission()
+    private fun locationPermissionGranted() =
+        ContextCompat.checkSelfPermission(
+            carContext,
+            Manifest.permission.ACCESS_FINE_LOCATION
+        ) == PackageManager.PERMISSION_GRANTED
 
     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?) {
-        val mapScreen = mapScreen
-        if (location != null && mapScreen != null) {
-            mapScreen.updateLocation(location)
-        }
-        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()
+            val mapScreen = this@EVMapSession.mapScreen
+            if (location != null && mapScreen != null) {
+                mapScreen.updateLocation(location)
+            }
+            this@EVMapSession.location = location
         }
     }
 
     @OnLifecycleEvent(Lifecycle.Event.ON_START)
     fun bindLocationService() {
         if (!locationPermissionGranted()) return
-        if (supportsCarApiLevel3(carContext)) {
-            val exec = ContextCompat.getMainExecutor(carContext)
-            hardwareMan.carSensors.addCarHardwareLocationListener(
-                CarSensors.UPDATE_RATE_NORMAL,
-                exec,
-                ::onCarHardwareLocationReceived
-            )
-        }
-        serviceBound = cas.bindService(
+        cas.bindService(
             Intent(cas, CarLocationService::class.java),
             serviceConnection,
             Context.BIND_AUTO_CREATE
@@ -119,18 +100,10 @@ class EVMapSession(val cas: CarAppService) : Session(), LifecycleObserver {
     }
 
     @OnLifecycleEvent(Lifecycle.Event.ON_STOP)
-    private fun onStop() {
-        if (supportsCarApiLevel3(carContext)) {
-            hardwareMan.carSensors.removeCarHardwareLocationListener(::onCarHardwareLocationReceived)
-        }
-        unbindLocationService()
-    }
-
     private fun unbindLocationService() {
-        locationService?.removeLocationUpdates()
-        if (serviceBound) {
+        locationService?.let { service ->
+            service.removeLocationUpdates()
             cas.unbindService(serviceConnection)
-            serviceBound = false
         }
     }
 

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

@@ -1,19 +0,0 @@
-package net.vonforst.evmap.auto
-
-/**
- * This file lists known mappings between the vehicle model provided by Android Auto's CarInfo API
- * and human-readable vehicle models as listed by Chargeprice in their vehicle database.
- */
-
-private val models = mapOf(
-    "Audi" to mapOf(
-        "516 (G4x)" to "e-tron"
-    )
-)
-
-fun getVehicleModel(manufacturer: String?, model: String?) =
-    if (manufacturer != null && model != null) {
-        models[manufacturer]?.get(model) ?: model
-    } else {
-        null
-    }

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

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

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

@@ -2,7 +2,6 @@ package net.vonforst.evmap.auto
 
 import android.content.Intent
 import android.graphics.Bitmap
-import android.graphics.Canvas
 import android.graphics.drawable.BitmapDrawable
 import android.net.Uri
 import android.text.SpannableStringBuilder
@@ -10,27 +9,21 @@ 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.core.graphics.scale
-import androidx.core.text.HtmlCompat
 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.*
 import net.vonforst.evmap.api.availability.ChargeLocationStatus
 import net.vonforst.evmap.api.availability.getAvailability
-import net.vonforst.evmap.api.chargeprice.ChargepriceApi
 import net.vonforst.evmap.api.createApi
 import net.vonforst.evmap.api.nameForPlugType
 import net.vonforst.evmap.api.stringProvider
 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
@@ -55,21 +48,7 @@ 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 iconGen =
-        ChargerIconGenerator(carContext, null, oversize = 1.4f, height = imageSize)
-
-    private val maxRows = if (ctx.carAppApiLevel >= 2) {
-        ctx.constraintManager.getContentLimit(ConstraintManager.CONTENT_LIMIT_TYPE_PANE)
-    } else 2
-    private val largeImageSupported =
-        ctx.carAppApiLevel >= 4  // since API 4, Row.setImage is supported
-
-    private var favorite: Favorite? = null
-    private var favoriteUpdateJob: Job? = null
+    private val iconGen = ChargerIconGenerator(carContext, null, oversize = 1.4f, height = 64)
 
     init {
         referenceData.observe(this) {
@@ -83,269 +62,117 @@ class ChargerDetailScreen(ctx: CarContext, val chargerSparse: ChargeLocation) :
         return PaneTemplate.Builder(
             Pane.Builder().apply {
                 charger?.let { charger ->
-                    if (largeImageSupported) {
-                        photo?.let {
-                            setImage(CarIcon.Builder(IconCompat.createWithBitmap(it)).build())
-                        }
-                    }
-                    generateRows(charger).forEach { addRow(it) }
-                    addAction(
-                        Action.Builder()
-                            .setIcon(
-                                CarIcon.Builder(
-                                    IconCompat.createWithResource(
-                                        carContext,
-                                        R.drawable.ic_navigation
+                    addRow(Row.Builder().apply {
+                        setTitle(charger.address.toString())
+
+                        val icon = iconGen.getBitmap(
+                            tint = getMarkerTint(charger),
+                            fault = charger.faultReport != null,
+                            multi = charger.isMulti()
+                        )
+                        setImage(
+                            CarIcon.Builder(IconCompat.createWithBitmap(icon)).build(),
+                            Row.IMAGE_TYPE_LARGE
+                        )
+
+                        val chargepointsText = SpannableStringBuilder()
+                        charger.chargepointsMerged.forEachIndexed { i, cp ->
+                            if (i > 0) chargepointsText.append(" · ")
+                            chargepointsText.append(
+                                "${cp.count}× ${
+                                    nameForPlugType(
+                                        carContext.stringProvider(),
+                                        cp.type
                                     )
-                                ).build()
+                                } ${cp.formatPower()}"
                             )
-                            .setTitle(carContext.getString(R.string.navigate))
+                            availability?.status?.get(cp)?.let { status ->
+                                chargepointsText.append(
+                                    " (${availabilityText(status)}/${cp.count})",
+                                    ForegroundCarColorSpan.create(carAvailabilityColor(status)),
+                                    Spanned.SPAN_EXCLUSIVE_EXCLUSIVE
+                                )
+                            }
+                        }
+                        addText(chargepointsText)
+                    }.build())
+                    addRow(Row.Builder().apply {
+                        photo?.let {
+                            setImage(
+                                CarIcon.Builder(IconCompat.createWithBitmap(photo)).build(),
+                                Row.IMAGE_TYPE_LARGE
+                            )
+                        }
+                        val operatorText = StringBuilder().apply {
+                            charger.operator?.let { append(it) }
+                            charger.network?.let {
+                                if (isNotEmpty()) append(" · ")
+                                append(it)
+                            }
+                        }.ifEmpty {
+                            carContext.getString(R.string.unknown_operator)
+                        }
+                        setTitle(operatorText)
+
+                        charger.cost?.let { addText(it.getStatusText(carContext, emoji = true)) }
+                        charger.faultReport?.created?.let {
+                            addText(
+                                carContext.getString(
+                                    R.string.auto_fault_report_date,
+                                    it.atZone(ZoneId.systemDefault())
+                                        .format(DateTimeFormatter.ofLocalizedDate(FormatStyle.SHORT))
+                                )
+                            )
+                        }
+
+                        /*val types = charger.chargepoints.map { it.type }.distinct()
+                        if (types.size == 1) {
+                            setImage(
+                                CarIcon.of(IconCompat.createWithResource(carContext, iconForPlugType(types[0]))),
+                                Row.IMAGE_TYPE_ICON)
+                        }*/
+                    }.build())
+                    addAction(Action.Builder()
+                        .setIcon(
+                            CarIcon.Builder(
+                                IconCompat.createWithResource(
+                                    carContext,
+                                    R.drawable.ic_navigation
+                                )
+                            ).build()
+                        )
+                        .setTitle(carContext.getString(R.string.navigate))
                         .setBackgroundColor(CarColor.PRIMARY)
                         .setOnClickListener {
                             navigateToCharger(charger)
                         }
                         .build())
-                    charger.chargepriceData?.country?.let { country ->
-                        if (ChargepriceApi.isCountrySupported(country, charger.dataSource)) {
-                            addAction(Action.Builder()
-                                .setIcon(
-                                    CarIcon.Builder(
-                                        IconCompat.createWithResource(
-                                            carContext,
-                                            R.drawable.ic_chargeprice
-                                        )
-                                    ).build()
-                                )
-                                .setTitle(carContext.getString(R.string.auto_prices))
-                                .setOnClickListener {
-                                    screenManager.push(ChargepriceScreen(carContext, charger))
-                                }
-                                .build())
-                        }
-                    }
+                    addAction(
+                        Action.Builder()
+                            .setTitle(carContext.getString(R.string.open_in_app))
+                            .setOnClickListener(ParkedOnlyOnClickListener.create {
+                                val intent = Intent(carContext, MapsActivity::class.java)
+                                    .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+                                    .putExtra(EXTRA_CHARGER_ID, charger.id)
+                                    .putExtra(EXTRA_LAT, charger.coordinates.lat)
+                                    .putExtra(EXTRA_LON, charger.coordinates.lng)
+                                carContext.startActivity(intent)
+                                CarToast.makeText(
+                                    carContext,
+                                    R.string.opened_on_phone,
+                                    CarToast.LENGTH_LONG
+                                ).show()
+                            })
+                            .build()
+                    )
                 } ?: setLoading(true)
             }.build()
         ).apply {
             setTitle(chargerSparse.name)
             setHeaderAction(Action.BACK)
-            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 {
-            setTitle(charger.address.toString())
-
-            if (photo == null) {
-                // show just the icon
-                val icon = iconGen.getBitmap(
-                    tint = getMarkerTint(charger),
-                    fault = charger.faultReport != null,
-                    multi = charger.isMulti()
-                )
-                setImage(
-                    CarIcon.Builder(IconCompat.createWithBitmap(icon)).build(),
-                    Row.IMAGE_TYPE_LARGE
-                )
-            } else if (!largeImageSupported) {
-                // show the photo with icon
-                setImage(
-                    CarIcon.Builder(IconCompat.createWithBitmap(photo)).build(),
-                    Row.IMAGE_TYPE_LARGE
-                )
-            }
-            addText(generateChargepointsText(charger))
-        }.build())
-        if (maxRows <= 3) {
-            // row 2: operator + cost + fault report
-            rows.add(Row.Builder().apply {
-                if (photo != null && !largeImageSupported) {
-                    setImage(
-                        CarIcon.Builder(IconCompat.createWithBitmap(photo)).build(),
-                        Row.IMAGE_TYPE_LARGE
-                    )
-                }
-                val operatorText = generateOperatorText(charger)
-                setTitle(operatorText)
-
-                charger.cost?.let { addText(it.getStatusText(carContext, emoji = true)) }
-                charger.faultReport?.let { fault ->
-                    addText(
-                        carContext.getString(
-                            R.string.auto_fault_report_date,
-                            fault.created?.atZone(ZoneId.systemDefault())
-                                ?.format(DateTimeFormatter.ofLocalizedDate(FormatStyle.SHORT))
-                        )
-                    )
-                }
-            }.build())
-        } else {
-            // row 2: operator + cost + cost description
-            rows.add(Row.Builder().apply {
-                if (photo != null && !largeImageSupported) {
-                    setImage(
-                        CarIcon.Builder(IconCompat.createWithBitmap(photo)).build(),
-                        Row.IMAGE_TYPE_LARGE
-                    )
-                }
-                val operatorText = generateOperatorText(charger)
-                setTitle(operatorText)
-                charger.cost?.let {
-                    addText(it.getStatusText(carContext, emoji = true))
-                    it.getDetailText()?.let { addText(it) }
-                }
-            }.build())
-            // row 3: fault report (if exists)
-            charger.faultReport?.let { fault ->
-                rows.add(Row.Builder().apply {
-                    setTitle(
-                        carContext.getString(
-                            R.string.auto_fault_report_date,
-                            fault.created?.atZone(ZoneId.systemDefault())
-                                ?.format(DateTimeFormatter.ofLocalizedDate(FormatStyle.SHORT))
-                        )
-                    )
-                    fault.description?.let {
-                        addText(
-                            HtmlCompat.fromHtml(
-                                it.replace("\n", " · "),
-                                HtmlCompat.FROM_HTML_MODE_LEGACY
-                            )
-                        )
-                    }
-                }.build())
-            }
-            // 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(title)
-                    hours.description?.let { addText(it) }
-                    charger.locationDescription?.let { addText(it) }
-                }.build())
-            }
-        }
-        return rows
-    }
-
-    private fun generateChargepointsText(charger: ChargeLocation): SpannableStringBuilder {
-        val chargepointsText = SpannableStringBuilder()
-        charger.chargepointsMerged.forEachIndexed { i, cp ->
-            if (i > 0) chargepointsText.append(" · ")
-            chargepointsText.append(
-                "${cp.count}× ${
-                    nameForPlugType(
-                        carContext.stringProvider(),
-                        cp.type
-                    )
-                } ${cp.formatPower()}"
-            )
-            availability?.status?.get(cp)?.let { status ->
-                chargepointsText.append(
-                    " (${availabilityText(status)}/${cp.count})",
-                    ForegroundCarColorSpan.create(carAvailabilityColor(status)),
-                    Spanned.SPAN_EXCLUSIVE_EXCLUSIVE
-                )
-            }
-        }
-        return chargepointsText
-    }
-
-    private fun generateOperatorText(charger: ChargeLocation) =
-        if (charger.operator != null && charger.network != null) {
-            if (charger.operator.contains(charger.network)) {
-                charger.operator
-            } else if (charger.network.contains(charger.operator)) {
-                charger.network
-            } else {
-                "${charger.operator} · ${charger.network}"
-            }
-        } else if (charger.operator != null) {
-            charger.operator
-        } else if (charger.network != null) {
-            charger.network
-        } else {
-            carContext.getString(R.string.unknown_operator)
-        }
-
     private fun navigateToCharger(charger: ChargeLocation) {
         val coord = charger.coordinates
         val intent =
@@ -359,51 +186,20 @@ 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!!
+                charger = response.data!!
 
-                val photo = charger.photos?.firstOrNull()
+                val photo = charger?.photos?.firstOrNull()
                 photo?.let {
-                    val density = carContext.resources.displayMetrics.density
-                    val url = if (largeImageSupported) {
-                        photo.getUrl(
-                            width = (imageWidthLarge * density).roundToInt(),
-                            height = (imageHeightLarge * density).roundToInt()
-                        )
-                    } else {
-                        photo.getUrl(size = (imageSize * density).roundToInt())
-                    }
+                    val size = (carContext.resources.displayMetrics.density * 64).roundToInt()
+                    val url = photo.getUrl(size = size)
                     val request = ImageRequest.Builder(carContext).data(url).build()
-                    var img =
+                    this@ChargerDetailScreen.photo =
                         (carContext.imageLoader.execute(request).drawable as BitmapDrawable).bitmap
-
-                    // draw icon on top of image
-                    val icon = iconGen.getBitmap(
-                        tint = getMarkerTint(charger),
-                        fault = charger.faultReport != null,
-                        multi = charger.isMulti()
-                    )
-
-                    img = img.copy(Bitmap.Config.ARGB_8888, true)
-                    val iconSmall = icon.scale(
-                        (img.height * 0.4 / icon.height * icon.width).roundToInt(),
-                        (img.height * 0.4).roundToInt()
-                    )
-                    val canvas = Canvas(img)
-                    canvas.drawBitmap(
-                        iconSmall,
-                        0f,
-                        (img.height - iconSmall.height * 1.1).toFloat(),
-                        null
-                    )
-                    this@ChargerDetailScreen.photo = img
                 }
-                this@ChargerDetailScreen.charger = charger
 
-                availability = getAvailability(charger).data
+                availability = charger?.let { getAvailability(it).data }
 
                 invalidate()
             } else {

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

@@ -1,17 +1,17 @@
 package net.vonforst.evmap.auto
 
+import android.graphics.Bitmap
 import androidx.car.app.CarContext
 import androidx.car.app.Screen
 import androidx.car.app.model.*
 import androidx.core.graphics.drawable.IconCompat
 import androidx.lifecycle.LiveData
 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.storage.AppDatabase
 import net.vonforst.evmap.storage.FilterProfile
 import net.vonforst.evmap.storage.PreferenceDataSource
+import kotlin.math.roundToInt
 
 class FilterScreen(ctx: CarContext) : Screen(ctx) {
     private val prefs = PreferenceDataSource(ctx)
@@ -22,6 +22,20 @@ class FilterScreen(ctx: CarContext) : Screen(ctx) {
     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 = CarIcon.Builder(
+            IconCompat.createWithBitmap(
+                Bitmap.createBitmap(
+                    size,
+                    size,
+                    Bitmap.Config.ARGB_8888
+                )
+            )
+        ).build()
+    }
 
     init {
         filterProfiles.observe(this) {
@@ -30,12 +44,9 @@ class FilterScreen(ctx: CarContext) : Screen(ctx) {
     }
 
     override fun onGetTemplate(): Template {
-        val filterStatus =
-            prefs.filterStatus.takeUnless { it == FILTERS_CUSTOM || it == FILTERS_FAVORITES }
-                ?: FILTERS_DISABLED
         return ListTemplate.Builder().apply {
             filterProfiles.value?.let {
-                setSingleList(buildFilterProfilesList(it.take(maxRows), filterStatus))
+                setSingleList(buildFilterProfilesList(it.take(maxRows), prefs.filterStatus))
             } ?: setLoading(true)
             setTitle(carContext.getString(R.string.menu_filter))
             setHeaderAction(Action.BACK)
@@ -52,7 +63,7 @@ class FilterScreen(ctx: CarContext) : Screen(ctx) {
                 if (FILTERS_DISABLED == filterStatus) {
                     setImage(checkIcon)
                 } else {
-                    setImage(emptyCarIcon)
+                    setImage(emptyIcon)
                 }
                 setOnClickListener {
                     prefs.filterStatus = FILTERS_DISABLED
@@ -61,13 +72,11 @@ class FilterScreen(ctx: CarContext) : Screen(ctx) {
             }.build())
             profiles.forEach {
                 addItem(Row.Builder().apply {
-                    val name =
-                        it.name.ifEmpty { carContext.getString(R.string.unnamed_filter_profile) }
-                    setTitle(name)
+                    setTitle(it.name)
                     if (it.id == filterStatus) {
                         setImage(checkIcon)
                     } else {
-                        setImage(emptyCarIcon)
+                        setImage(emptyIcon)
                     }
                     setOnClickListener {
                         prefs.filterStatus = it.id

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

@@ -1,22 +1,18 @@
 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.CarToast
 import androidx.car.app.Screen
-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.*
+import androidx.lifecycle.MutableLiveData
+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.api.availability.ChargeLocationStatus
 import net.vonforst.evmap.api.availability.getAvailability
@@ -25,7 +21,6 @@ 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
 import net.vonforst.evmap.ui.availabilityText
@@ -33,10 +28,10 @@ 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.roundToInt
@@ -46,16 +41,13 @@ import kotlin.math.roundToInt
  */
 @androidx.car.app.annotations.ExperimentalCarApi
 class MapScreen(ctx: CarContext, val session: EVMapSession, val favorites: Boolean = false) :
-    Screen(ctx), LocationAwareScreen, OnContentRefreshListener,
-    ItemList.OnItemVisibilityChangedListener {
+    Screen(ctx), LocationAwareScreen {
     private var updateCoroutine: Job? = null
-    private var availabilityUpdateCoroutine: Job? = null
-
-    private var visibleStart: Int? = null
-    private var visibleEnd: Int? = null
+    private var numUpdates = 0
+    private val maxNumUpdates = 3
 
     private var location: Location? = null
-    private var lastDistanceUpdateTime: Instant? = null
+    private var lastUpdateLocation: Location? = null
     private var chargers: List<ChargeLocation>? = null
     private var prefs = PreferenceDataSource(ctx)
     private val db = AppDatabase.getInstance(carContext)
@@ -63,38 +55,20 @@ class MapScreen(ctx: CarContext, val session: EVMapSession, val favorites: Boole
         createApi(prefs.dataSource, ctx)
     }
     private val searchRadius = 5 // kilometers
-    private val distanceUpdateThreshold = Duration.ofSeconds(15)
+    private val updateThreshold = 2000 // meters
     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)
-    } else 6
+    private val maxRows = 6
 
     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.takeUnless { it == FILTERS_CUSTOM } ?: FILTERS_DISABLED
     }
     private val filterValues = db.filterValueDao().getFilterValues(filterStatus, prefs.dataSource)
-    private val filters =
-        Transformations.map(referenceData) { api.getFilters(it, carContext.stringProvider()) }
+    private val filters = api.getFilters(referenceData, carContext.stringProvider())
     private val filtersWithValue = filtersWithValue(filters, filterValues)
 
-    private val hardwareMan = 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"
-        )
-    }
-
     init {
         filtersWithValue.observe(this) {
             loadChargers()
@@ -119,7 +93,7 @@ class MapScreen(ctx: CarContext, val session: EVMapSession, val favorites: Boole
             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))
                 }
@@ -132,7 +106,6 @@ class MapScreen(ctx: CarContext, val session: EVMapSession, val favorites: Boole
                         }
                     )
                 )
-                builder.setOnItemsVisibilityChangedListener(this@MapScreen)
                 setItemList(builder.build())
             } ?: setLoading(true)
             setCurrentLocationEnabled(true)
@@ -159,26 +132,20 @@ class MapScreen(ctx: CarContext, val session: EVMapSession, val favorites: Boole
                         .setOnClickListener {
                             screenManager.pushForResult(FilterScreen(carContext)) {
                                 chargers = null
-                                filterStatus.value =
-                                    prefs.filterStatus.takeUnless { it == FILTERS_CUSTOM || it == FILTERS_FAVORITES }
-                                        ?: FILTERS_DISABLED
+                                numUpdates = 0
+                                filterStatus.value = prefs.filterStatus
                             }
                             session.mapScreen = null
                         }
                         .build())
                     .build())
             }
-            setOnContentRefreshListener(this@MapScreen)
+            build()
         }.build()
     }
 
     private fun formatCharger(charger: ChargeLocation, showCity: Boolean): Row {
-        val markerTint = if ((charger.maxPower ?: 0.0) > 100) {
-            R.color.charger_100kw_dark  // slightly darker color for better contrast
-        } else {
-            getMarkerTint(charger)
-        }
-        val color = ContextCompat.getColor(carContext, markerTint)
+        val color = ContextCompat.getColor(carContext, getMarkerTint(charger))
         val place =
             Place.Builder(CarLocation.create(charger.coordinates.lat, charger.coordinates.lng))
                 .setMarker(
@@ -191,7 +158,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)
@@ -204,28 +171,20 @@ class MapScreen(ctx: CarContext, val session: EVMapSession, val favorites: Boole
 
             // distance
             location?.let {
-                val distanceMeters = distanceBetween(
+                val distance = distanceBetween(
                     it.latitude, it.longitude,
                     charger.coordinates.lat, charger.coordinates.lng
-                )
+                ) / 1000
                 text.append(
                     "distance",
-                    DistanceSpan.create(
-                        roundValueToDistance(
-                            distanceMeters,
-                            energyLevel?.distanceDisplayUnit?.value
-                        )
-                    ),
+                    DistanceSpan.create(Distance.create(distance, Distance.UNIT_KILOMETERS)),
                     Spanned.SPAN_EXCLUSIVE_EXCLUSIVE
                 )
             }
 
             // power
-            val power = charger.maxPower;
-            if (power != null) {
-                if (text.isNotEmpty()) text.append(" · ")
-                text.append("${power.roundToInt()} kW")
-            }
+            if (text.isNotEmpty()) text.append(" · ")
+            text.append("${charger.maxPower.roundToInt()} kW")
 
             // availability
             availabilities[charger.id]?.second?.let { av ->
@@ -249,36 +208,26 @@ class MapScreen(ctx: CarContext, val session: EVMapSession, val favorites: Boole
             )
 
             setOnClickListener {
-                screenManager.pushForResult(ChargerDetailScreen(carContext, charger)) {
-                    if (favorites) {
-                        // favorites list may have been updated
-                        chargers = null
-                        loadChargers()
-                    }
-                }
+                screenManager.push(ChargerDetailScreen(carContext, charger))
             }
         }.build()
     }
 
     override fun updateLocation(location: Location) {
-        if (location.latitude == this.location?.latitude
-            && location.longitude == this.location?.longitude
-        ) {
-            return
-        }
         this.location = location
         if (updateCoroutine != null) {
             // don't update while still loading last update
             return
         }
 
-        val now = Instant.now()
-        if (lastDistanceUpdateTime == null ||
-            Duration.between(lastDistanceUpdateTime, now) > distanceUpdateThreshold
+        invalidate()
+
+        if (lastUpdateLocation == null ||
+            location.distanceTo(lastUpdateLocation) > updateThreshold
         ) {
-            lastDistanceUpdateTime = now
-            // update displayed distances
-            invalidate()
+            lastUpdateLocation = location
+            // update displayed chargers
+            loadChargers()
         }
     }
 
@@ -287,17 +236,23 @@ 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
+        }
         updateCoroutine = lifecycleScope.launch {
             try {
                 // load chargers
                 if (favorites) {
-                    chargers =
-                        db.favoritesDao().getAllFavoritesAsync().map { it.charger }.sortedBy {
-                            distanceBetween(
-                                location.latitude, location.longitude,
-                                it.coordinates.lat, it.coordinates.lng
-                            )
-                        }
+                    chargers = db.chargeLocationsDao().getAllChargeLocationsAsync().sortedBy {
+                        distanceBetween(
+                            location.latitude, location.longitude,
+                            it.coordinates.lat, it.coordinates.lng
+                        )
+                    }
                 } else {
                     val response = api.getChargepointsRadius(
                         referenceData,
@@ -308,7 +263,7 @@ class MapScreen(ctx: CarContext, val session: EVMapSession, val favorites: Boole
                     )
                     chargers = response.data?.filterIsInstance(ChargeLocation::class.java)
                     chargers?.let {
-                        if (it.size < maxRows) {
+                        if (it.size < 6) {
                             // try again with larger radius
                             val response = api.getChargepointsRadius(
                                 referenceData,
@@ -323,8 +278,29 @@ 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()
             } catch (e: IOException) {
                 withContext(Dispatchers.Main) {
@@ -334,72 +310,4 @@ class MapScreen(ctx: CarContext, val session: EVMapSession, val favorites: Boole
             }
         }
     }
-
-    private fun onEnergyLevelUpdated(energyLevel: EnergyLevel) {
-        this.energyLevel = energyLevel
-        invalidate()
-    }
-
-    @OnLifecycleEvent(Lifecycle.Event.ON_RESUME)
-    private fun setupListeners() {
-        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)
-    }
-
-    @OnLifecycleEvent(Lifecycle.Event.ON_PAUSE)
-    private fun removeListeners() {
-        println("Removing energy level listener")
-        hardwareMan.carInfo.removeEnergyLevelListener(::onEnergyLevelUpdated)
-    }
-
-    override fun onContentRefreshRequested() {
-        loadChargers()
-    }
-
-    override fun onItemVisibilityChanged(startIndex: Int, endIndex: Int) {
-        // when the list is scrolled, load corresponding availabilities
-        if (startIndex == visibleStart && endIndex == visibleEnd) 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 tasks = chargers?.subList(startIndex, endIndex)?.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.isNullOrEmpty()) {
-                tasks.awaitAll()
-                invalidate()
-            }
-            availabilityUpdateCoroutine = null
-        }
-    }
 }

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

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

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

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

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

@@ -1,94 +0,0 @@
-package net.vonforst.evmap.auto
-
-import androidx.car.app.CarContext
-import androidx.car.app.Screen
-import androidx.car.app.constraints.ConstraintManager
-import androidx.car.app.model.*
-import androidx.lifecycle.lifecycleScope
-import kotlinx.coroutines.launch
-
-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
-
-    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)
-            }
-        }.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 fun buildItemList(): ItemList {
-        return ItemList.Builder().apply {
-            currentList.forEach { item ->
-                addItem(
-                    Row.Builder()
-                        .setTitle(
-                            if (isSelected(item)) {
-                                "☑  " + getLabel(item)
-                            } else {
-                                "☐  " + getLabel(item)
-                            }
-                        )
-                        .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)
-
-    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

@@ -1,376 +0,0 @@
-package net.vonforst.evmap.auto
-
-import androidx.car.app.CarContext
-import androidx.car.app.Screen
-import androidx.car.app.constraints.ConstraintManager
-import androidx.car.app.model.*
-import androidx.core.graphics.drawable.IconCompat
-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.PreferenceDataSource
-import kotlin.math.max
-import kotlin.math.min
-
-class SettingsScreen(ctx: CarContext) : Screen(ctx) {
-    val prefs = PreferenceDataSource(carContext)
-    val dataSourceNames = carContext.resources.getStringArray(R.array.pref_data_source_names)
-    val dataSourceValues = carContext.resources.getStringArray(R.array.pref_data_source_values)
-
-    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.pref_data_source))
-                    val dataSourceId = prefs.dataSource
-                    val dataSourceDesc = dataSourceNames[dataSourceValues.indexOf(dataSourceId)]
-                    addText(dataSourceDesc)
-                    setImage(
-                        CarIcon.Builder(
-                            IconCompat.createWithResource(
-                                carContext,
-                                R.drawable.ic_settings_data_source
-                            )
-                        ).setTint(
-                            CarColor.DEFAULT
-                        ).build()
-                    )
-                    setBrowsable(true)
-                    setOnClickListener {
-                        screenManager.push(ChooseDataSourceScreen(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())
-            }.build())
-        }.build()
-    }
-}
-
-class ChooseDataSourceScreen(ctx: CarContext) : Screen(ctx) {
-    val prefs = PreferenceDataSource(carContext)
-    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)
-    )
-
-    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 dataSourceNames.indices) {
-                    addItem(Row.Builder().apply {
-                        setTitle(dataSourceNames[i])
-                        addText(dataSourceDescriptions[i])
-                    }.build())
-                }
-                setOnSelectedListener {
-                    prefs.dataSource = dataSourceValues[it]
-                    screenManager.pop()
-                }
-                setSelectedIndex(dataSourceValues.indexOf(prefs.dataSource))
-            }.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))
-                    }
-                }.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 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 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)
-        } else {
-            prefs.chargepriceMyTariffs = tariffs.plus(item.id)
-        }
-    }
-
-    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 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/Utils.kt

@@ -1,18 +1,7 @@
 package net.vonforst.evmap.auto
 
-import android.content.Context
-import android.graphics.Bitmap
-import androidx.car.app.CarContext
-import androidx.car.app.constraints.ConstraintManager
-import androidx.car.app.hardware.common.CarUnit
 import androidx.car.app.model.CarColor
-import androidx.car.app.model.CarIcon
-import androidx.car.app.model.Distance
-import androidx.car.app.versioning.CarAppApiLevels
-import androidx.core.graphics.drawable.IconCompat
 import net.vonforst.evmap.api.availability.ChargepointStatus
-import java.util.*
-import kotlin.math.roundToInt
 
 fun carAvailabilityColor(status: List<ChargepointStatus>): CarColor {
     val unknown = status.any { it == ChargepointStatus.UNKNOWN }
@@ -28,128 +17,4 @@ fun carAvailabilityColor(status: List<ChargepointStatus>): CarColor {
     } else {
         CarColor.BLUE
     }
-}
-
-val CarContext.constraintManager
-    get() = getCarService(CarContext.CONSTRAINT_SERVICE) as ConstraintManager
-
-fun Bitmap.asCarIcon(): CarIcon = CarIcon.Builder(IconCompat.createWithBitmap(this)).build()
-
-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
-
-fun getDefaultDistanceUnit(): Int {
-    return if (usesImperialUnits(Locale.getDefault())) {
-        CarUnit.MILE
-    } else {
-        CarUnit.KILOMETER
-    }
-}
-
-fun usesImperialUnits(locale: Locale): Boolean {
-    return locale.country in listOf("US", "GB", "MM", "LR")
-            || locale.country == "" && locale.language == "en"
-}
-
-fun getDefaultSpeedUnit(): Int {
-    return when (Locale.getDefault().country) {
-        "US", "GB", "MM", "LR" -> CarUnit.MILES_PER_HOUR
-        else -> CarUnit.KILOMETERS_PER_HOUR
-    }
-}
-
-fun formatCarUnitDistance(value: Float?, unit: Int?): String {
-    if (value == null) return ""
-    return when (unit ?: getDefaultDistanceUnit()) {
-        // distance units: base unit is meters
-        CarUnit.METER -> "%.0f m".format(value)
-        CarUnit.KILOMETER -> "%.1f km".format(value / 1000)
-        CarUnit.MILLIMETER -> "%.0f mm".format(value * 1000) // whoever uses that...
-        CarUnit.MILE -> "%.1f mi".format(value / 1000 / kmPerMile)
-        else -> ""
-    }
-}
-
-fun formatCarUnitSpeed(value: Float?, unit: Int?): String {
-    if (value == null) return ""
-    return when (unit ?: getDefaultSpeedUnit()) {
-        // speed units: base unit is meters per second
-        CarUnit.METERS_PER_SEC -> "%.0f m/s".format(value)
-        CarUnit.KILOMETERS_PER_HOUR -> "%.0f km/h".format(value * 3.6)
-        CarUnit.MILES_PER_HOUR -> "%.0f mph".format(value * 3.6 / kmPerMile)
-        else -> ""
-    }
-}
-
-fun roundValueToDistance(value: Double, unit: Int? = null): Distance {
-    // value is in meters
-    when (unit ?: getDefaultDistanceUnit()) {
-        CarUnit.MILE -> {
-            // imperial system
-            val miles = value / 1000 / kmPerMile
-            val yards = miles * ydPerMile
-            val feet = miles * ftPerMile
-
-            return when (miles) {
-                in 0.0..0.1 -> if (Locale.getDefault().country == "UK") {
-                    Distance.create(roundToMultipleOf(yards, 10.0), Distance.UNIT_YARDS)
-                } else {
-                    Distance.create(roundToMultipleOf(feet, 10.0), Distance.UNIT_FEET)
-                }
-                in 0.1..10.0 -> Distance.create(
-                    roundToMultipleOf(miles, 0.1),
-                    Distance.UNIT_MILES_P1
-                )
-                else -> Distance.create(roundToMultipleOf(miles, 1.0), Distance.UNIT_MILES)
-            }
-        }
-        else -> {
-            // metric system
-            return when (value) {
-                in 0.0..999.0 -> Distance.create(
-                    roundToMultipleOf(value, 10.0),
-                    Distance.UNIT_METERS
-                )
-                in 1000.0..10000.0 -> Distance.create(
-                    roundToMultipleOf(value / 1000, 0.1),
-                    Distance.UNIT_KILOMETERS_P1
-                )
-                else -> Distance.create(
-                    roundToMultipleOf(value / 1000, 1.0),
-                    Distance.UNIT_KILOMETERS
-                )
-            }
-        }
-    }
-}
-
-private fun roundToMultipleOf(num: Double, step: Double): Double {
-    return (num / step).roundToInt() * step
-}
-
-fun getAndroidAutoVersion(ctx: Context): List<String> {
-    val info = ctx.packageManager.getPackageInfo("com.google.android.projection.gearhead", 0)
-    return info.versionName.split(".")
-}
-
-fun supportsCarApiLevel3(ctx: CarContext): Boolean {
-    if (ctx.carAppApiLevel < CarAppApiLevels.LEVEL_3) return false
-    ctx.hostInfo?.let { hostInfo ->
-        if (hostInfo.packageName == "com.google.android.projection.gearhead") {
-            val version = getAndroidAutoVersion(ctx)
-            // Android Auto 6.7 is required. 6.6 reports supporting API Level 3,
-            // but crashes when using it. See: https://issuetracker.google.com/issues/199509584
-            if (version[0] < "6" || version[0] == "6" && version[1] < "7") {
-                return false
-            }
-        }
-    }
-    return true
 }

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

@@ -1,264 +0,0 @@
-package net.vonforst.evmap.auto
-
-import android.content.pm.PackageManager
-import android.os.Handler
-import android.os.Looper
-import androidx.car.app.CarContext
-import androidx.car.app.Screen
-import androidx.car.app.hardware.CarHardwareManager
-import androidx.car.app.hardware.info.*
-import androidx.car.app.model.*
-import androidx.core.content.ContextCompat
-import androidx.core.graphics.drawable.IconCompat
-import androidx.lifecycle.Lifecycle
-import androidx.lifecycle.LifecycleObserver
-import androidx.lifecycle.OnLifecycleEvent
-import net.vonforst.evmap.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
-    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 = 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)
-    }
-
-    override fun onGetTemplate(): Template {
-        if (!permissionsGranted()) {
-            Handler(Looper.getMainLooper()).post {
-                screenManager.pushForResult(
-                    PermissionScreen(
-                        carContext,
-                        R.string.auto_vehicle_data_permission_needed,
-                        permissions
-                    )
-                ) {
-                    setupListeners()
-                }
-            }
-        }
-
-        val energyLevel = energyLevel
-        val model = model
-        val speed = speed
-        val heading = heading
-
-        return GridTemplate.Builder().apply {
-            setTitle(
-                if (model != null && model.manufacturer.value != null && model.name.value != null) {
-                    "${model.manufacturer.value} ${
-                        getVehicleModel(
-                            model.manufacturer.value,
-                            model.name.value
-                        )
-                    }"
-                } else {
-                    carContext.getString(R.string.auto_vehicle_data)
-                }
-            )
-            setHeaderAction(Action.BACK)
-            if (!permissionsGranted()) {
-                setLoading(true)
-            } else {
-                setSingleList(
-                    ItemList.Builder().apply {
-                        addItem(GridItem.Builder().apply {
-                            setTitle(carContext.getString(R.string.auto_charging_level))
-                            if (energyLevel == null) {
-                                setLoading(true)
-                            } else if (energyLevel.batteryPercent.value != null && energyLevel.fuelPercent.value != null) {
-                                // both battery and fuel (Plug-in hybrid)
-                                setText(
-                                    "\uD83D\uDD0C %.0f %% ⛽ %.0f %%".format(
-                                        energyLevel.batteryPercent.value,
-                                        energyLevel.fuelPercent.value
-                                    )
-                                )
-                                setImage(
-                                    gauge.draw(
-                                        energyLevel.batteryPercent.value,
-                                        energyLevel.fuelPercent.value
-                                    ).asCarIcon()
-                                )
-                            } else if (energyLevel.batteryPercent.value != null) {
-                                // BEV
-                                setText("%.0f %%".format(energyLevel.batteryPercent.value))
-                                setImage(gauge.draw(energyLevel.batteryPercent.value).asCarIcon())
-                            } else if (energyLevel.fuelPercent.value != null) {
-                                // ICE
-                                setText("⛽ %.0f %%".format(energyLevel.fuelPercent.value))
-                                setImage(gauge.draw(energyLevel.fuelPercent.value).asCarIcon())
-                            } else {
-                                setText(carContext.getString(R.string.auto_no_data))
-                                setImage(gauge.draw(0f).asCarIcon())
-                            }
-                        }.build())
-                        addItem(GridItem.Builder().apply {
-                            setTitle(carContext.getString(R.string.auto_range))
-                            if (energyLevel == null) {
-                                setLoading(true)
-                            } else if (energyLevel.rangeRemainingMeters.value != null) {
-                                setText(
-                                    formatCarUnitDistance(
-                                        energyLevel.rangeRemainingMeters.value,
-                                        energyLevel.distanceDisplayUnit.value
-                                    )
-                                )
-                                setImage(
-                                    CarIcon.Builder(
-                                        IconCompat.createWithResource(
-                                            carContext,
-                                            R.drawable.ic_car
-                                        )
-                                    ).build()
-                                )
-                            } else {
-                                setText(carContext.getString(R.string.auto_no_data))
-                                setImage(
-                                    CarIcon.Builder(
-                                        IconCompat.createWithResource(
-                                            carContext,
-                                            R.drawable.ic_car
-                                        )
-                                    ).build()
-                                )
-                            }
-                        }.build())
-                        addItem(GridItem.Builder().apply {
-                            setTitle(carContext.getString(R.string.auto_speed))
-                            if (speed == null) {
-                                setLoading(true)
-                            } else {
-                                val rawSpeed = speed.rawSpeedMetersPerSecond.value
-                                val displaySpeed = speed.displaySpeedMetersPerSecond.value
-                                if (rawSpeed != null) {
-                                    setText(
-                                        formatCarUnitSpeed(
-                                            rawSpeed,
-                                            speed.speedDisplayUnit.value
-                                        )
-                                    )
-                                    setImage(
-                                        gauge.draw(min(rawSpeed / maxSpeed * 100, 100f)).asCarIcon()
-                                    )
-                                } else if (displaySpeed != null) {
-                                    setText(
-                                        formatCarUnitSpeed(
-                                            speed.displaySpeedMetersPerSecond.value,
-                                            speed.speedDisplayUnit.value
-                                        )
-                                    )
-                                    setImage(
-                                        gauge.draw(min(displaySpeed / maxSpeed * 100, 100f))
-                                            .asCarIcon()
-                                    )
-                                } else {
-                                    setText(carContext.getString(R.string.auto_no_data))
-                                    setImage(gauge.draw(0f).asCarIcon())
-                                }
-                            }
-                        }.build())
-                        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()
-                )
-            }
-        }.build()
-    }
-
-    private fun onEnergyLevelUpdated(energyLevel: EnergyLevel) {
-        this.energyLevel = energyLevel
-        invalidate()
-    }
-
-    private fun onSpeedUpdated(speed: Speed) {
-        this.speed = speed
-        invalidate()
-    }
-
-    private fun onCompassUpdated(compass: Compass) {
-        this.heading = compass
-        invalidate()
-    }
-
-    @OnLifecycleEvent(Lifecycle.Event.ON_RESUME)
-    private fun setupListeners() {
-        if (!permissionsGranted()) return
-
-        println("Setting up energy level listener")
-
-        val exec = ContextCompat.getMainExecutor(carContext)
-        hardwareMan.carInfo.addEnergyLevelListener(exec, ::onEnergyLevelUpdated)
-        hardwareMan.carInfo.addSpeedListener(exec, ::onSpeedUpdated)
-        hardwareMan.carSensors.addCompassListener(
-            CarSensors.UPDATE_RATE_NORMAL,
-            exec,
-            ::onCompassUpdated
-        )
-
-        hardwareMan.carInfo.fetchModel(exec) {
-            this.model = it
-            invalidate()
-        }
-    }
-
-    @OnLifecycleEvent(Lifecycle.Event.ON_PAUSE)
-    private fun removeListeners() {
-        println("Removing energy level listener")
-        hardwareMan.carInfo.removeEnergyLevelListener(::onEnergyLevelUpdated)
-        hardwareMan.carInfo.removeSpeedListener(::onSpeedUpdated)
-        hardwareMan.carSensors.removeCompassListener(::onCompassUpdated)
-    }
-
-    private fun permissionsGranted(): Boolean =
-        permissions.all {
-            ContextCompat.checkSelfPermission(
-                carContext,
-                it
-            ) == PackageManager.PERMISSION_GRANTED
-        }
-}

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

@@ -1,9 +1,6 @@
 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.*
@@ -13,127 +10,60 @@ import net.vonforst.evmap.R
 /**
  * Welcome screen with selection between favorites and nearby chargers
  */
+@androidx.car.app.annotations.ExperimentalCarApi
 class WelcomeScreen(ctx: CarContext, val session: EVMapSession) : Screen(ctx), LocationAwareScreen {
     private var location: Location? = null
 
-    @androidx.car.app.annotations.ExperimentalCarApi
     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()
-                        )
-                    }
-                    addItem(
-                        Row.Builder()
-                            .setTitle(carContext.getString(R.string.auto_settings))
-                            .setImage(
-                                CarIcon.Builder(
-                                    IconCompat.createWithResource(
-                                        carContext,
-                                        R.drawable.ic_settings
-                                    )
-                                ).setTint(CarColor.DEFAULT).build()
-                            )
-                            .setBrowsable(true)
-                            .setOnClickListener(ParkedOnlyOnClickListener.create {
-                                session.mapScreen = null
-                                screenManager.push(SettingsScreen(carContext))
-                            })
-                            .build()
-                    )
-                }.build())
-                setCurrentLocationEnabled(true)
+            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())
+            }.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/autocomplete/Autocomplete.kt

@@ -1,11 +0,0 @@
-package net.vonforst.evmap.autocomplete
-
-import android.content.Context
-import net.vonforst.evmap.storage.PreferenceDataSource
-
-fun getAutocompleteProviders(context: Context) =
-    if (PreferenceDataSource(context).searchProvider == "google") {
-        listOf(GooglePlacesAutocompleteProvider(context), MapboxAutocompleteProvider(context))
-    } else {
-        listOf(MapboxAutocompleteProvider(context), GooglePlacesAutocompleteProvider(context))
-    }

app/src/google/java/net/vonforst/evmap/autocomplete/GooglePlacesAutocompleteProvider.kt

@@ -1,112 +0,0 @@
-package net.vonforst.evmap.autocomplete
-
-import android.content.Context
-import android.graphics.Typeface
-import android.text.style.CharacterStyle
-import android.text.style.StyleSpan
-import com.car2go.maps.google.adapter.AnyMapAdapter
-import com.car2go.maps.util.SphericalUtil
-import com.google.android.gms.common.api.ApiException
-import com.google.android.gms.maps.model.LatLng
-import com.google.android.gms.maps.model.LatLngBounds
-import com.google.android.gms.tasks.Tasks.await
-import com.google.android.libraries.places.api.Places
-import com.google.android.libraries.places.api.model.AutocompleteSessionToken
-import com.google.android.libraries.places.api.model.Place
-import com.google.android.libraries.places.api.model.RectangularBounds
-import com.google.android.libraries.places.api.net.FetchPlaceRequest
-import com.google.android.libraries.places.api.net.FindAutocompletePredictionsRequest
-import com.google.android.libraries.places.api.net.PlacesStatusCodes
-import kotlinx.coroutines.tasks.await
-import net.vonforst.evmap.R
-import java.util.concurrent.ExecutionException
-import kotlin.math.sqrt
-
-
-class GooglePlacesAutocompleteProvider(val context: Context) : AutocompleteProvider {
-    private var token = AutocompleteSessionToken.newInstance()
-    private val client = Places.createClient(context)
-    private val bold: CharacterStyle = StyleSpan(Typeface.BOLD)
-
-    override val id = "google"
-
-    override fun autocomplete(
-        query: String,
-        location: com.car2go.maps.model.LatLng?
-    ): List<AutocompletePlace> {
-        val request = FindAutocompletePredictionsRequest.builder().apply {
-            if (location != null) {
-                setLocationBias(calcLocationBias(location))
-                setOrigin(LatLng(location.latitude, location.longitude))
-            }
-            setSessionToken(token)
-            setQuery(query)
-        }.build()
-        try {
-            val result =
-                await(client.findAutocompletePredictions(request)).autocompletePredictions
-            return result.map {
-                AutocompletePlace(
-                    it.getPrimaryText(bold),
-                    it.getSecondaryText(bold),
-                    it.placeId,
-                    it.distanceMeters?.toDouble(),
-                    it.placeTypes.map { AutocompletePlaceType.valueOf(it.name) })
-            }
-        } catch (e: ExecutionException) {
-            val cause = e.cause
-            if (cause is ApiException) {
-                if (cause.statusCode == PlacesStatusCodes.OVER_QUERY_LIMIT) {
-                    throw ApiUnavailableException()
-                }
-            }
-            throw e
-        }
-    }
-
-    override suspend fun getDetails(id: String): PlaceWithBounds {
-        val request =
-            FetchPlaceRequest.builder(id, listOf(Place.Field.LAT_LNG, Place.Field.VIEWPORT)).build()
-        try {
-            val place = client.fetchPlace(request).await().place
-            token = AutocompleteSessionToken.newInstance()
-            return PlaceWithBounds(
-                AnyMapAdapter.adapt(place.latLng),
-                AnyMapAdapter.adapt(place.viewport)
-            )
-        } catch (e: ApiException) {
-            if (e.statusCode == PlacesStatusCodes.OVER_QUERY_LIMIT) {
-                throw ApiUnavailableException()
-            } else {
-                throw e
-            }
-        }
-    }
-
-    override fun getAttributionString(): Int = R.string.places_powered_by_google
-
-    override fun getAttributionImage(dark: Boolean): Int =
-        if (dark) R.drawable.places_powered_by_google_dark else R.drawable.places_powered_by_google_light
-
-    private fun calcLocationBias(location: com.car2go.maps.model.LatLng): RectangularBounds {
-        val radius = 100e3 // meters
-        val northEast =
-            SphericalUtil.computeOffset(
-                location,
-                radius * sqrt(2.0),
-                45.0
-            )
-        val southWest =
-            SphericalUtil.computeOffset(
-                location,
-                radius * sqrt(2.0),
-                225.0
-            )
-        return RectangularBounds.newInstance(
-            LatLngBounds(
-                AnyMapAdapter.adapt(southWest),
-                AnyMapAdapter.adapt(northEast)
-            )
-        )
-    }
-}

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

@@ -5,6 +5,7 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import androidx.appcompat.app.AppCompatActivity
+import androidx.appcompat.widget.Toolbar
 import androidx.databinding.DataBindingUtil
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.viewModels
@@ -12,9 +13,7 @@ import androidx.lifecycle.Observer
 import androidx.navigation.fragment.findNavController
 import androidx.navigation.ui.setupWithNavController
 import androidx.recyclerview.widget.LinearLayoutManager
-import com.google.android.material.color.MaterialColors
 import com.google.android.material.snackbar.Snackbar
-import com.google.android.material.transition.MaterialSharedAxis
 import net.vonforst.evmap.MapsActivity
 import net.vonforst.evmap.R
 import net.vonforst.evmap.adapter.DonationAdapter
@@ -25,29 +24,24 @@ class DonateFragment : Fragment() {
     private lateinit var binding: FragmentDonateBinding
     private val vm: DonateViewModel by viewModels()
 
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        enterTransition = MaterialSharedAxis(MaterialSharedAxis.X, true)
-        returnTransition = MaterialSharedAxis(MaterialSharedAxis.X, false)
-    }
-
     override fun onCreateView(
         inflater: LayoutInflater,
         container: ViewGroup?,
         savedInstanceState: Bundle?
-    ): View {
+    ): View? {
         binding = DataBindingUtil.inflate(inflater, R.layout.fragment_donate, container, false)
         binding.lifecycleOwner = this
         binding.vm = vm
-
         return binding.root
     }
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        (requireActivity() as AppCompatActivity).setSupportActionBar(binding.toolbar)
+        val toolbar = view.findViewById(R.id.toolbar) as Toolbar
+        (requireActivity() as AppCompatActivity).setSupportActionBar(toolbar)
 
-        binding.toolbar.setupWithNavController(
-            findNavController(),
+        val navController = findNavController()
+        toolbar.setupWithNavController(
+            navController,
             (requireActivity() as MapsActivity).appBarConfiguration
         )
 
@@ -70,8 +64,5 @@ class DonateFragment : Fragment() {
         vm.purchaseFailed.observe(viewLifecycleOwner, Observer {
             Snackbar.make(view, R.string.donation_failed, Snackbar.LENGTH_LONG).show()
         })
-
-        // Workaround for AndroidX bug: https://github.com/material-components/material-components-android/issues/1984
-        view.setBackgroundColor(MaterialColors.getColor(view, android.R.attr.windowBackground))
     }
 }

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

@@ -1,69 +0,0 @@
-package net.vonforst.evmap.fragment
-
-import android.animation.AnimatorSet
-import android.animation.ObjectAnimator
-import android.annotation.SuppressLint
-import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import android.view.animation.DecelerateInterpolator
-import androidx.fragment.app.Fragment
-import androidx.viewpager2.adapter.FragmentStateAdapter
-import net.vonforst.evmap.databinding.FragmentOnboardingAndroidAutoBinding
-
-class OnboardingViewPagerAdapter(fragment: Fragment) :
-    FragmentStateAdapter(fragment) {
-    override fun getItemCount(): Int = 4
-
-    override fun createFragment(position: Int): Fragment = when (position) {
-        0 -> WelcomeFragment()
-        1 -> IconsFragment()
-        2 -> AndroidAutoFragment()
-        3 -> DataSourceSelectFragment()
-        else -> throw IllegalArgumentException()
-    }
-}
-
-class AndroidAutoFragment : OnboardingPageFragment() {
-    private lateinit var binding: FragmentOnboardingAndroidAutoBinding
-
-    override fun onCreateView(
-        inflater: LayoutInflater,
-        container: ViewGroup?,
-        savedInstanceState: Bundle?
-    ): View {
-        binding = FragmentOnboardingAndroidAutoBinding.inflate(inflater, container, false)
-
-        binding.btnGetStarted.setOnClickListener {
-            parent.goToNext()
-        }
-        binding.imgAndroidAuto.alpha = 0f
-
-        return binding.root
-    }
-
-    @SuppressLint("Recycle")
-    override fun onResume() {
-        super.onResume()
-
-        val animators =
-            listOf(
-                ObjectAnimator.ofFloat(binding.imgAndroidAuto, "translationY", -20f, 0f).apply {
-                    interpolator = DecelerateInterpolator()
-                },
-                ObjectAnimator.ofFloat(binding.imgAndroidAuto, "alpha", 0f, 1f).apply {
-                    interpolator = DecelerateInterpolator()
-                }
-            )
-        AnimatorSet().apply {
-            playTogether(animators)
-            start()
-        }
-    }
-
-    override fun onPause() {
-        super.onPause()
-        binding.imgAndroidAuto.alpha = 0f
-    }
-}

app/src/google/java/net/vonforst/evmap/fragment/preference/AndroidAutoSettingsFragment.kt

@@ -1,47 +0,0 @@
-package net.vonforst.evmap.fragment.preference
-
-import android.content.SharedPreferences
-import android.os.Bundle
-import android.view.View
-import androidx.fragment.app.viewModels
-import androidx.preference.MultiSelectListPreference
-import net.vonforst.evmap.R
-import net.vonforst.evmap.ui.RangeSliderPreference
-import net.vonforst.evmap.viewmodel.SettingsViewModel
-import net.vonforst.evmap.viewmodel.viewModelFactory
-import java.text.NumberFormat
-
-class AndroidAutoSettingsFragment : BaseSettingsFragment() {
-    override val isTopLevel = false
-
-    private lateinit var rangePreference: RangeSliderPreference
-
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-
-        rangePreference = findPreference("chargeprice_battery_range_android_auto")!!
-        rangePreference.labelFormatter = { value: Float ->
-            val fmt = NumberFormat.getNumberInstance()
-            fmt.maximumFractionDigits = 0
-            fmt.format(value.toDouble()) + "%"
-        }
-        updateRangePreferenceSummary()
-    }
-
-    override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
-        setPreferencesFromResource(R.xml.settings_android_auto, rootKey)
-    }
-
-    override fun onSharedPreferenceChanged(sharedPreferences: SharedPreferences, key: String) {
-        when (key) {
-            "chargeprice_battery_range_android_auto_min", "chargeprice_battery_range_android_auto_max" -> {
-                updateRangePreferenceSummary()
-            }
-        }
-    }
-
-    private fun updateRangePreferenceSummary() {
-        val range = prefs.chargepriceBatteryRangeAndroidAuto
-        rangePreference.summary = getString(R.string.chargeprice_battery_range, range[0], range[1])
-    }
-}

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

@@ -1,33 +0,0 @@
-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/java/net/vonforst/evmap/ui/Gauge.kt

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

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

@@ -1,10 +0,0 @@
-<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="#FF000000"
-        android:pathData="m22.78,17.91c0.16,0.25 0.22,0.51 0.22,0.79 0,0.38 -0.13,0.69 -0.43,0.94s-0.63,0.36 -1.01,0.36h-2.48l-6.66,-12h-0.84l-6.66,12h-2.53c-0.47,0 -0.86,-0.2 -1.17,-0.62s-0.33,-0.88 -0.05,-1.38l9.61,-16.31c0.31,-0.47 0.72,-0.69 1.22,-0.69 0.53,0 0.92,0.22 1.17,0.69zM4.78,22.31 L12,9.38 19.22,22.31 18.5,23 12,20.34 5.44,23z" />
-</vector>

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

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

app/src/google/res/layout-land/fragment_onboarding_android_auto.xml

@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <TextView
-        android:id="@+id/welcomeTitle"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="72dp"
-        android:layout_marginEnd="32dp"
-        android:layout_marginBottom="16dp"
-        android:text="@string/welcome_android_auto"
-        android:textAppearance="@style/TextAppearance.Material3.HeadlineSmall"
-        app:layout_constraintBottom_toTopOf="@+id/welcomeText"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toEndOf="@+id/img_android_auto" />
-
-    <TextView
-        android:id="@+id/welcomeText"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginEnd="32dp"
-        android:layout_marginBottom="56dp"
-        android:breakStrategy="balanced"
-        android:text="@string/welcome_android_auto_detail"
-        android:textAppearance="@style/TextAppearance.Material3.BodyMedium"
-        android:textColor="?android:textColorSecondary"
-        app:layout_constraintBottom_toTopOf="@+id/btnGetStarted"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="@+id/welcomeTitle" />
-
-    <Button
-        android:id="@+id/btnGetStarted"
-        style="@style/Widget.Material3.Button.TonalButton"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginBottom="24dp"
-        android:text="@string/sounds_cool"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintStart_toStartOf="@+id/welcomeText" />
-
-    <ImageView
-        android:id="@+id/img_android_auto"
-        android:layout_width="72dp"
-        android:layout_height="72dp"
-        android:layout_marginStart="72dp"
-        android:layout_marginBottom="28dp"
-        android:background="@drawable/circle_bg_logo"
-        android:backgroundTint="@color/android_auto_accent"
-        android:scaleType="center"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintVertical_bias="0.65"
-        app:srcCompat="@drawable/android_auto" />
-
-</androidx.constraintlayout.widget.ConstraintLayout>

app/src/google/res/layout-sw720dp/fragment_onboarding_android_auto.xml

@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <TextView
-        android:id="@+id/welcomeTitle"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="32dp"
-        android:layout_marginEnd="32dp"
-        android:layout_marginBottom="16dp"
-        android:gravity="center"
-        android:text="@string/welcome_android_auto"
-        android:textAppearance="@style/TextAppearance.Material3.HeadlineSmall"
-        app:layout_constraintBottom_toTopOf="@+id/welcomeText"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.5"
-        app:layout_constraintStart_toStartOf="parent" />
-
-    <TextView
-        android:id="@+id/welcomeText"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="32dp"
-        android:layout_marginEnd="32dp"
-        android:layout_marginBottom="56dp"
-        android:breakStrategy="balanced"
-        android:gravity="center"
-        android:text="@string/welcome_android_auto_detail"
-        android:textAppearance="@style/TextAppearance.Material3.BodyMedium"
-        android:textColor="?android:textColorSecondary"
-        app:layout_constraintBottom_toTopOf="@+id/btnGetStarted"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.5"
-        app:layout_constraintStart_toStartOf="parent" />
-
-    <Button
-        android:id="@+id/btnGetStarted"
-        style="@style/Widget.Material3.Button.TonalButton"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginBottom="24dp"
-        android:text="@string/sounds_cool"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent" />
-
-    <ImageView
-        android:id="@+id/img_android_auto"
-        android:layout_width="72dp"
-        android:layout_height="72dp"
-        android:layout_marginTop="28dp"
-        android:layout_marginBottom="28dp"
-        android:background="@drawable/circle_bg_logo"
-        android:backgroundTint="@color/android_auto_accent"
-        android:scaleType="center"
-        app:layout_constraintBottom_toTopOf="@+id/welcomeTitle"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintVertical_bias="0.7"
-        app:srcCompat="@drawable/android_auto" />
-
-</androidx.constraintlayout.widget.ConstraintLayout>

app/src/google/res/layout/fragment_onboarding_android_auto.xml

@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <TextView
-        android:id="@+id/welcomeTitle"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="32dp"
-        android:layout_marginEnd="32dp"
-        android:layout_marginBottom="16dp"
-        android:gravity="center"
-        android:text="@string/welcome_android_auto"
-        android:textAppearance="@style/TextAppearance.Material3.HeadlineSmall"
-        app:layout_constraintBottom_toTopOf="@+id/welcomeText"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.5"
-        app:layout_constraintStart_toStartOf="parent" />
-
-    <TextView
-        android:id="@+id/welcomeText"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="32dp"
-        android:layout_marginEnd="32dp"
-        android:layout_marginBottom="56dp"
-        android:breakStrategy="balanced"
-        android:gravity="center"
-        android:text="@string/welcome_android_auto_detail"
-        android:textAppearance="@style/TextAppearance.Material3.BodyMedium"
-        android:textColor="?android:textColorSecondary"
-        app:layout_constraintBottom_toTopOf="@+id/btnGetStarted"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.5"
-        app:layout_constraintStart_toStartOf="parent" />
-
-    <Button
-        android:id="@+id/btnGetStarted"
-        style="@style/Widget.Material3.Button.TonalButton"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginBottom="24dp"
-        android:text="@string/sounds_cool"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent" />
-
-    <ImageView
-        android:id="@+id/img_android_auto"
-        android:layout_width="72dp"
-        android:layout_height="72dp"
-        android:layout_marginTop="28dp"
-        android:layout_marginBottom="28dp"
-        android:background="@drawable/circle_bg_logo"
-        android:backgroundTint="@color/android_auto_accent"
-        android:scaleType="center"
-        app:layout_constraintBottom_toTopOf="@+id/welcomeTitle"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintVertical_bias="0.7"
-        app:srcCompat="@drawable/android_auto" />
-
-</androidx.constraintlayout.widget.ConstraintLayout>

app/src/google/res/layout/item_donation.xml

@@ -25,24 +25,23 @@
 
             <TextView
                 android:id="@+id/textView15"
-                android:layout_width="0dp"
+                android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginEnd="8dp"
                 android:text="@{item.sku.title}"
-                android:textAppearance="@style/TextAppearance.Material3.BodyLarge"
+                android:textAppearance="@style/TextAppearance.MaterialComponents.Body1"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintEnd_toStartOf="@+id/textView21"
                 app:layout_constraintHorizontal_bias="0.0"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="parent"
-                tools:text="Spende (extrem langer Beschreibungstext)" />
+                tools:text="Spende" />
 
             <TextView
                 android:id="@+id/textView21"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text="@{item.sku.price}"
-                android:textAppearance="@style/TextAppearance.Material3.BodyLarge"
+                android:textAppearance="@style/TextAppearance.MaterialComponents.Body1"
                 android:textColor="?android:textColorSecondary"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintEnd_toEndOf="parent"

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

@@ -4,10 +4,6 @@
         <item>Google Maps</item>
         <item>OpenStreetMap (Mapbox)</item>
     </string-array>
-    <string-array name="pref_search_provider_names">
-        <item>Google Maps</item>
-        <item>OpenStreetMap (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 15% Gebühren ab.</string>
     <string name="auto_location_service">EVMap läuft unter Android Auto und nutzt dafür deinen Standort.</string>
     <string name="auto_no_chargers_found">Keine Ladestationen in der Nähe gefunden</string>
@@ -15,26 +11,9 @@
     <string name="open_in_app">In App öffnen</string>
     <string name="opened_on_phone">Auf dem Telefon geöffnet</string>
     <string name="auto_location_permission_needed">Um EVMap auf Android Auto zu nutzen, braucht die App Zugriff auf deinen Standort.</string>
-    <string name="auto_vehicle_data_permission_needed">Für diese Funktion benötigt EVMap Zugriff auf Daten deines Fahrzeugs.</string>
     <string name="grant_on_phone">Auf Telefon zulassen</string>
     <string name="auto_chargers_closeby">In der Nähe</string>
     <string name="auto_favorites">Favoriten</string>
     <string name="auto_fault_report_date">⚠️ Störungsmeldung (%s)</string>
     <string name="auto_no_refresh_possible">Weitere Aktualisierung nicht möglich. Bitte zurück gehen und neu starten.</string>
-    <string name="auto_prices">Preise</string>
-    <string name="auto_vehicle_data">Fahrzeugdaten</string>
-    <string name="auto_charging_level">Ladezustand</string>
-    <string name="auto_no_data">Nicht verfügbar</string>
-    <string name="auto_range">Reichweite</string>
-    <string name="auto_speed">Geschwindigkeit</string>
-    <string name="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>
-    <string name="auto_chargeprice_vehicle_unavailable">EVMap konnte das Fahrzeugmodell nicht erkennen.</string>
-    <string name="auto_chargeprice_vehicle_unknown">Keins der in der App ausgewählten Fahrzeuge passt zu diesem Fahrzeug (%1$s %2$s).</string>
-    <string name="auto_chargeprice_vehicle_ambiguous">Mehrere der in der App ausgewählten Fahrzeuge passen zu diesem Fahrzeug (%1$s %2$s).</string>
-    <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>
 </resources>

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

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

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

@@ -3,8 +3,8 @@
 
     <style name="CarAppTheme">
         <item name="carColorPrimary">@color/colorPrimary</item>
-        <item name="carColorPrimaryDark">@color/colorPrimaryDark</item>
+        <item name="carColorPrimaryDark">@color/colorPrimaryVariant</item>
         <item name="carColorSecondary">@color/colorSecondary</item>
-        <item name="carColorSecondaryDark">@color/colorSecondaryDark</item>
+        <item name="carColorSecondaryDark">@color/colorSecondaryVariant</item>
     </style>
 </resources>

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

@@ -8,16 +8,7 @@
         <item>google</item>
         <item>mapbox</item>
     </string-array>
-    <string-array name="pref_search_provider_names">
-        <item>Google Maps</item>
-        <item>OpenStreetMap (Mapbox)</item>
-    </string-array>
-    <string-array name="pref_search_provider_values" tranlatable="false">
-        <item>google</item>
-        <item>mapbox</item>
-    </string-array>
     <string name="pref_map_provider_default" translatable="false">google</string>
-    <string name="pref_search_provider_default" translatable="false">mapbox</string>
     <string name="donations_info" formatted="false">Do you find EVMap useful? Support its development by sending a donation to the developer.\n\nGoogle takes 15% off every donation.</string>
     <string name="auto_location_service">EVMap is running on Android Auto and using your location.</string>
     <string name="auto_no_chargers_found">No nearby chargers found</string>
@@ -25,26 +16,9 @@
     <string name="open_in_app">Open in app</string>
     <string name="opened_on_phone">Opened on phone</string>
     <string name="auto_location_permission_needed">To run EVMap on Android Auto, you need to grant access to your location.</string>
-    <string name="auto_vehicle_data_permission_needed">For this feature, EVMap needs access to your vehicle data.</string>
     <string name="grant_on_phone">Grant on phone</string>
     <string name="auto_chargers_closeby">Nearby chargers</string>
     <string name="auto_favorites">Favorites</string>
     <string name="auto_fault_report_date">⚠️ Fault report (%s)</string>
     <string name="auto_no_refresh_possible">Further updates not possible. Please go back and restart.</string>
-    <string name="auto_prices">Pricing</string>
-    <string name="auto_vehicle_data">Vehicle data</string>
-    <string name="auto_charging_level">Charging level</string>
-    <string name="auto_no_data">Unavailable</string>
-    <string name="auto_range">Range</string>
-    <string name="auto_speed">Speed</string>
-    <string name="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>
-    <string name="auto_chargeprice_vehicle_unavailable">EVMap could not determine your vehicle model.</string>
-    <string name="auto_chargeprice_vehicle_unknown">None of the vehicles selected in the app matches this vehicle (%1$s %2$s).</string>
-    <string name="auto_chargeprice_vehicle_ambiguous">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>
 </resources>

app/src/google/res/xml/settings_android_auto.xml

@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
-    <net.vonforst.evmap.ui.RangeSliderPreference
-        android:key="chargeprice_battery_range_android_auto"
-        android:title="@string/settings_android_auto_chargeprice_range"
-        android:valueFrom="0.0"
-        android:valueTo="100.0"
-        app:updatesContinuously="true"
-        android:defaultValue="20.0,80.0"
-        android:layout="@layout/preference_widget_rangeslider"
-        tools:summary="@string/chargeprice_battery_range" />
-</PreferenceScreen>

app/src/google/res/xml/settings_variantspecific.xml

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
-    <Preference
-        android:fragment="net.vonforst.evmap.fragment.preference.AndroidAutoSettingsFragment"
-        android:title="@string/settings_android_auto"
-        android:icon="@drawable/ic_android_auto" />
-</PreferenceScreen>

app/src/googleAutomotive/AndroidManifest.xml

@@ -1,65 +0,0 @@
-<?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

@@ -1,5 +0,0 @@
-<?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

@@ -1,5 +0,0 @@
-<?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/AndroidManifest.xml

@@ -3,7 +3,6 @@
     package="net.vonforst.evmap">
 
     <uses-permission android:name="android.permission.INTERNET" />
-    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
 
     <queries>
@@ -32,9 +31,8 @@
 
         <activity
             android:name=".MapsActivity"
-            android:label="@string/app_name"
-            android:theme="@style/AppTheme.LaunchScreen"
-            android:exported="true">
+            android:label="@string/title_activity_maps"
+            android:theme="@style/AppTheme.LaunchScreen">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
@@ -256,22 +254,8 @@
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.BROWSABLE" />
             </intent-filter>
-
-            <meta-data
-                android:name="android.app.shortcuts"
-                android:resource="@xml/shortcuts" />
         </activity>
 
-        <!-- Override services of the com.mapzen.android.lost library with exported:false
-             until https://github.com/lostzen/lost/pull/270 is merged -->
-        <service
-            android:name="com.mapzen.android.lost.internal.GeofencingIntentService"
-            android:exported="false">
-            <intent-filter>
-                <action android:name="com.mapzen.lost.action.ACTION_GEOFENCING_SERVICE" />
-            </intent-filter>
-        </service>
-
     </application>
 
 </manifest>

app/src/main/java/android/widget/Filter.java

@@ -1,321 +0,0 @@
-/*
- * Copyright (C) 2007 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package android.widget;
-
-import android.os.Handler;
-import android.os.HandlerThread;
-import android.os.Looper;
-import android.os.Message;
-import android.util.Log;
-
-/**
- * Copy of android.widget.Filter, exposing the hidden setDelayer() method.
- *
- * <p>A filter constrains data with a filtering pattern.</p>
- *
- * <p>Filters are usually created by {@link android.widget.Filterable}
- * classes.</p>
- *
- * <p>Filtering operations performed by calling {@link #filter(CharSequence)} or
- * {@link #filter(CharSequence, android.widget.Filter.FilterListener)} are
- * performed asynchronously. When these methods are called, a filtering request
- * is posted in a request queue and processed later. Any call to one of these
- * methods will cancel any previous non-executed filtering request.</p>
- *
- * @see android.widget.Filterable
- */
-public abstract class Filter {
-    private static final String LOG_TAG = "Filter";
-
-    private static final String THREAD_NAME = "Filter";
-    private static final int FILTER_TOKEN = 0xD0D0F00D;
-    private static final int FINISH_TOKEN = 0xDEADBEEF;
-
-    private Handler mThreadHandler;
-    private Handler mResultHandler;
-
-    private Delayer mDelayer;
-
-    private final Object mLock = new Object();
-
-    /**
-     * <p>Creates a new asynchronous filter.</p>
-     */
-    public Filter() {
-        mResultHandler = new ResultsHandler();
-    }
-
-    /**
-     * Provide an interface that decides how long to delay the message for a given query.  Useful
-     * for heuristics such as posting a delay for the delete key to avoid doing any work while the
-     * user holds down the delete key.
-     *
-     * @param delayer The delayer.
-     * @hide
-     */
-    public void setDelayer(Delayer delayer) {
-        synchronized (mLock) {
-            mDelayer = delayer;
-        }
-    }
-
-    /**
-     * <p>Starts an asynchronous filtering operation. Calling this method
-     * cancels all previous non-executed filtering requests and posts a new
-     * filtering request that will be executed later.</p>
-     *
-     * @param constraint the constraint used to filter the data
-     * @see #filter(CharSequence, android.widget.Filter.FilterListener)
-     */
-    public final void filter(CharSequence constraint) {
-        filter(constraint, null);
-    }
-
-    /**
-     * <p>Starts an asynchronous filtering operation. Calling this method
-     * cancels all previous non-executed filtering requests and posts a new
-     * filtering request that will be executed later.</p>
-     *
-     * <p>Upon completion, the listener is notified.</p>
-     *
-     * @param constraint the constraint used to filter the data
-     * @param listener   a listener notified upon completion of the operation
-     * @see #filter(CharSequence)
-     * @see #performFiltering(CharSequence)
-     * @see #publishResults(CharSequence, android.widget.Filter.FilterResults)
-     */
-    public final void filter(CharSequence constraint, FilterListener listener) {
-        synchronized (mLock) {
-            if (mThreadHandler == null) {
-                HandlerThread thread = new HandlerThread(
-                        THREAD_NAME, android.os.Process.THREAD_PRIORITY_BACKGROUND);
-                thread.start();
-                mThreadHandler = new RequestHandler(thread.getLooper());
-            }
-
-            final long delay = (mDelayer == null) ? 0 : mDelayer.getPostingDelay(constraint);
-
-            Message message = mThreadHandler.obtainMessage(FILTER_TOKEN);
-
-            RequestArguments args = new RequestArguments();
-            // make sure we use an immutable copy of the constraint, so that
-            // it doesn't change while the filter operation is in progress
-            args.constraint = constraint != null ? constraint.toString() : null;
-            args.listener = listener;
-            message.obj = args;
-
-            mThreadHandler.removeMessages(FILTER_TOKEN);
-            mThreadHandler.removeMessages(FINISH_TOKEN);
-            mThreadHandler.sendMessageDelayed(message, delay);
-        }
-    }
-
-    /**
-     * <p>Invoked in a worker thread to filter the data according to the
-     * constraint. Subclasses must implement this method to perform the
-     * filtering operation. Results computed by the filtering operation
-     * must be returned as a {@link android.widget.Filter.FilterResults} that
-     * will then be published in the UI thread through
-     * {@link #publishResults(CharSequence,
-     * android.widget.Filter.FilterResults)}.</p>
-     *
-     * <p><strong>Contract:</strong> When the constraint is null, the original
-     * data must be restored.</p>
-     *
-     * @param constraint the constraint used to filter the data
-     * @return the results of the filtering operation
-     * @see #filter(CharSequence, android.widget.Filter.FilterListener)
-     * @see #publishResults(CharSequence, android.widget.Filter.FilterResults)
-     * @see android.widget.Filter.FilterResults
-     */
-    protected abstract FilterResults performFiltering(CharSequence constraint);
-
-    /**
-     * <p>Invoked in the UI thread to publish the filtering results in the
-     * user interface. Subclasses must implement this method to display the
-     * results computed in {@link #performFiltering}.</p>
-     *
-     * @param constraint the constraint used to filter the data
-     * @param results    the results of the filtering operation
-     * @see #filter(CharSequence, android.widget.Filter.FilterListener)
-     * @see #performFiltering(CharSequence)
-     * @see android.widget.Filter.FilterResults
-     */
-    protected abstract void publishResults(CharSequence constraint,
-                                           FilterResults results);
-
-    /**
-     * <p>Converts a value from the filtered set into a CharSequence. Subclasses
-     * should override this method to convert their results. The default
-     * implementation returns an empty String for null values or the default
-     * String representation of the value.</p>
-     *
-     * @param resultValue the value to convert to a CharSequence
-     * @return a CharSequence representing the value
-     */
-    public CharSequence convertResultToString(Object resultValue) {
-        return resultValue == null ? "" : resultValue.toString();
-    }
-
-    /**
-     * <p>Holds the results of a filtering operation. The results are the values
-     * computed by the filtering operation and the number of these values.</p>
-     */
-    protected static class FilterResults {
-        public FilterResults() {
-            // nothing to see here
-        }
-
-        /**
-         * <p>Contains all the values computed by the filtering operation.</p>
-         */
-        public Object values;
-
-        /**
-         * <p>Contains the number of values computed by the filtering
-         * operation.</p>
-         */
-        public int count;
-    }
-
-    /**
-     * <p>Listener used to receive a notification upon completion of a filtering
-     * operation.</p>
-     */
-    public static interface FilterListener {
-        /**
-         * <p>Notifies the end of a filtering operation.</p>
-         *
-         * @param count the number of values computed by the filter
-         */
-        public void onFilterComplete(int count);
-    }
-
-    /**
-     * <p>Worker thread handler. When a new filtering request is posted from
-     * {@link android.widget.Filter#filter(CharSequence, android.widget.Filter.FilterListener)},
-     * it is sent to this handler.</p>
-     */
-    private class RequestHandler extends Handler {
-        public RequestHandler(Looper looper) {
-            super(looper);
-        }
-
-        /**
-         * <p>Handles filtering requests by calling
-         * {@link Filter#performFiltering} and then sending a message
-         * with the results to the results handler.</p>
-         *
-         * @param msg the filtering request
-         */
-        public void handleMessage(Message msg) {
-            int what = msg.what;
-            Message message;
-            switch (what) {
-                case FILTER_TOKEN:
-                    RequestArguments args = (RequestArguments) msg.obj;
-                    try {
-                        args.results = performFiltering(args.constraint);
-                    } catch (Exception e) {
-                        args.results = new FilterResults();
-                        Log.w(LOG_TAG, "An exception occured during performFiltering()!", e);
-                    } finally {
-                        message = mResultHandler.obtainMessage(what);
-                        message.obj = args;
-                        message.sendToTarget();
-                    }
-
-                    synchronized (mLock) {
-                        if (mThreadHandler != null) {
-                            Message finishMessage = mThreadHandler.obtainMessage(FINISH_TOKEN);
-                            mThreadHandler.sendMessageDelayed(finishMessage, 3000);
-                        }
-                    }
-                    break;
-                case FINISH_TOKEN:
-                    synchronized (mLock) {
-                        if (mThreadHandler != null) {
-                            mThreadHandler.getLooper().quit();
-                            mThreadHandler = null;
-                        }
-                    }
-                    break;
-            }
-        }
-    }
-
-    /**
-     * <p>Handles the results of a filtering operation. The results are
-     * handled in the UI thread.</p>
-     */
-    private class ResultsHandler extends Handler {
-        /**
-         * <p>Messages received from the request handler are processed in the
-         * UI thread. The processing involves calling
-         * {@link Filter#publishResults(CharSequence,
-         * android.widget.Filter.FilterResults)}
-         * to post the results back in the UI and then notifying the listener,
-         * if any.</p>
-         *
-         * @param msg the filtering results
-         */
-        @Override
-        public void handleMessage(Message msg) {
-            RequestArguments args = (RequestArguments) msg.obj;
-
-            publishResults(args.constraint, args.results);
-            if (args.listener != null) {
-                int count = args.results != null ? args.results.count : -1;
-                args.listener.onFilterComplete(count);
-            }
-        }
-    }
-
-    /**
-     * <p>Holds the arguments of a filtering request as well as the results
-     * of the request.</p>
-     */
-    private static class RequestArguments {
-        /**
-         * <p>The constraint used to filter the data.</p>
-         */
-        CharSequence constraint;
-
-        /**
-         * <p>The listener to notify upon completion. Can be null.</p>
-         */
-        FilterListener listener;
-
-        /**
-         * <p>The results of the filtering operation.</p>
-         */
-        FilterResults results;
-    }
-
-    /**
-     * @hide
-     */
-    public interface Delayer {
-
-        /**
-         * @param constraint The constraint passed to {@link Filter#filter(CharSequence)}
-         * @return The delay that should be used for
-         * {@link Handler#sendMessageDelayed(android.os.Message, long)}
-         */
-        long getPostingDelay(CharSequence constraint);
-    }
-}

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

@@ -4,11 +4,6 @@ import android.app.Application
 import com.facebook.stetho.Stetho
 import net.vonforst.evmap.storage.PreferenceDataSource
 import net.vonforst.evmap.ui.updateNightMode
-import org.acra.config.dialog
-import org.acra.config.limiter
-import org.acra.config.mailSender
-import org.acra.data.StringFormat
-import org.acra.ktx.initAcra
 
 class EvMapApplication : Application() {
     override fun onCreate() {
@@ -16,28 +11,5 @@ class EvMapApplication : Application() {
         updateNightMode(PreferenceDataSource(this))
         Stetho.initializeWithDefaults(this);
         init(applicationContext)
-
-        if (!BuildConfig.DEBUG) {
-            initAcra {
-                buildConfigClass = BuildConfig::class.java
-                reportFormat = StringFormat.KEY_VALUE_LIST
-
-                mailSender {
-                    mailTo = "evmap+crashreport@vonforst.net"
-                }
-
-                dialog {
-                    text = getString(R.string.crash_report_text)
-                    title = getString(R.string.app_name)
-                    commentPrompt = getString(R.string.crash_report_comment_prompt)
-                    resIcon = R.drawable.ic_launcher_foreground
-                    resTheme = R.style.AppTheme
-                }
-
-                limiter {
-                    enabled = true
-                }
-            }
-        }
     }
 }

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

@@ -1,36 +1,26 @@
 package net.vonforst.evmap
 
-import android.app.PendingIntent
 import android.content.ActivityNotFoundException
 import android.content.Context
 import android.content.Intent
 import android.net.Uri
-import android.os.Build
 import android.os.Bundle
-import android.os.SystemClock
 import android.view.View
 import androidx.appcompat.app.AppCompatActivity
 import androidx.browser.customtabs.CustomTabColorSchemeParams
 import androidx.browser.customtabs.CustomTabsIntent
 import androidx.core.content.ContextCompat
-import androidx.core.splashscreen.SplashScreen
-import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen
 import androidx.core.view.ViewCompat
 import androidx.core.view.WindowInsetsCompat
 import androidx.drawerlayout.widget.DrawerLayout
 import androidx.navigation.NavController
-import androidx.navigation.fragment.FragmentNavigator
+import androidx.navigation.findNavController
 import androidx.navigation.ui.AppBarConfiguration
 import androidx.navigation.ui.setupWithNavController
-import androidx.preference.Preference
-import androidx.preference.PreferenceFragmentCompat
-import com.car2go.maps.model.LatLng
 import com.google.android.material.navigation.NavigationView
 import com.google.android.material.snackbar.Snackbar
-import com.google.android.material.transition.MaterialSharedAxis
-import net.vonforst.evmap.fragment.MapFragmentArgs
+import net.vonforst.evmap.fragment.MapFragment
 import net.vonforst.evmap.model.ChargeLocation
-import net.vonforst.evmap.navigation.NavHostFragment
 import net.vonforst.evmap.storage.PreferenceDataSource
 import net.vonforst.evmap.utils.LocaleContextWrapper
 import net.vonforst.evmap.utils.getLocationFromIntent
@@ -40,10 +30,8 @@ const val REQUEST_LOCATION_PERMISSION = 1
 const val EXTRA_CHARGER_ID = "chargerId"
 const val EXTRA_LAT = "lat"
 const val EXTRA_LON = "lon"
-const val EXTRA_FAVORITES = "favorites"
 
-class MapsActivity : AppCompatActivity(),
-    PreferenceFragmentCompat.OnPreferenceStartFragmentCallback {
+class MapsActivity : AppCompatActivity() {
     interface FragmentCallback {
         fun getRootView(): View
     }
@@ -63,11 +51,14 @@ class MapsActivity : AppCompatActivity(),
     }
 
     override fun onCreate(savedInstanceState: Bundle?) {
+        // set theme to AppTheme to end launch screen
+        setTheme(R.style.AppTheme)
         super.onCreate(savedInstanceState)
-        val splashScreen = installSplashScreen()
 
         setContentView(R.layout.activity_maps)
 
+        navController = findNavController(R.id.nav_host_fragment)
+        val navGraph = navController.navInflater.inflate(R.navigation.nav_graph)
         appBarConfiguration = AppBarConfiguration(
             setOf(
                 R.id.map,
@@ -77,10 +68,6 @@ class MapsActivity : AppCompatActivity(),
             ),
             findViewById<DrawerLayout>(R.id.drawer_layout)
         )
-        val navHostFragment =
-            supportFragmentManager.findFragmentById(R.id.nav_host_fragment) as NavHostFragment
-        navController = navHostFragment.navController
-        val navGraph = navController.navInflater.inflate(R.navigation.nav_graph)
         val navView = findViewById<NavigationView>(R.id.nav_view)
         navView.setupWithNavController(navController)
 
@@ -91,83 +78,63 @@ class MapsActivity : AppCompatActivity(),
         }
 
         prefs = PreferenceDataSource(this)
-        prefs.appStartCounter += 1
 
         checkPlayServices(this)
 
-        if (!prefs.welcomeDialogShown || !prefs.dataSourceSet) {
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
-                // wait for splash screen animation to finish on first start
-                splashScreen.setKeepOnScreenCondition(object : SplashScreen.KeepOnScreenCondition {
-                    var startTime: Long? = null
 
-                    override fun shouldKeepOnScreen(): Boolean {
-                        val st = startTime
-                        if (st == null) {
-                            startTime = SystemClock.uptimeMillis()
-                            return true
-                        } else {
-                            return (SystemClock.uptimeMillis() - st) < 1000
-                        }
-                    }
-                })
-            }
-            navGraph.setStartDestination(R.id.onboarding)
+        if (!prefs.welcomeDialogShown || !prefs.dataSourceSet) {
+            navGraph.startDestination = R.id.onboarding
             navController.graph = navGraph
             return
         } else {
-            navGraph.setStartDestination(R.id.map)
-            navController.setGraph(navGraph, MapFragmentArgs(appStart = true).toBundle())
-            var deepLink: PendingIntent? = null
+            navGraph.startDestination = R.id.map
+            navController.graph = navGraph
+        }
 
-            if (intent?.scheme == "geo") {
-                val query = intent.data?.query?.split("=")?.get(1)
-                val coords = getLocationFromIntent(intent)
 
-                if (coords != null) {
-                    val lat = coords[0]
-                    val lon = coords[1]
-                    deepLink = navController.createDeepLink()
-                        .setGraph(R.navigation.nav_graph)
-                        .setDestination(R.id.map)
-                        .setArguments(MapFragmentArgs(latLng = LatLng(lat, lon)).toBundle())
-                        .createPendingIntent()
-                } else if (query != null && query.isNotEmpty()) {
-                    deepLink = navController.createDeepLink()
-                        .setGraph(R.navigation.nav_graph)
-                        .setDestination(R.id.map)
-                        .setArguments(MapFragmentArgs(locationName = query).toBundle())
-                        .createPendingIntent()
-                }
-            } else if (intent?.scheme == "https" && intent?.data?.host == "www.goingelectric.de") {
-                val id = intent.data?.pathSegments?.last()?.toLongOrNull()
-                if (id != null) {
-                    deepLink = navController.createDeepLink()
-                        .setGraph(R.navigation.nav_graph)
-                        .setDestination(R.id.map)
-                        .setArguments(MapFragmentArgs(chargerId = id).toBundle())
-                        .createPendingIntent()
-                }
-            } else if (intent.hasExtra(EXTRA_CHARGER_ID)) {
-                deepLink = navController.createDeepLink()
+        if (intent?.scheme == "geo") {
+            val query = intent.data?.query?.split("=")?.get(1)
+            val coords = getLocationFromIntent(intent)
+
+            if (coords != null) {
+                val lat = coords[0]
+                val lon = coords[1]
+                val deepLink = navController.createDeepLink()
+                    .setGraph(R.navigation.nav_graph)
                     .setDestination(R.id.map)
-                    .setArguments(
-                        MapFragmentArgs(
-                            chargerId = intent.getLongExtra(EXTRA_CHARGER_ID, 0),
-                            latLng = LatLng(
-                                intent.getDoubleExtra(EXTRA_LAT, 0.0),
-                                intent.getDoubleExtra(EXTRA_LON, 0.0)
-                            )
-                        ).toBundle()
-                    )
+                    .setArguments(MapFragment.showLocation(lat, lon))
                     .createPendingIntent()
-            } else if (intent.hasExtra(EXTRA_FAVORITES)) {
-                deepLink = navController.createDeepLink()
-                    .setDestination(R.id.favs)
+                deepLink.send()
+            } else if (query != null && query.isNotEmpty()) {
+                val deepLink = navController.createDeepLink()
+                    .setGraph(R.navigation.nav_graph)
+                    .setDestination(R.id.map)
+                    .setArguments(MapFragment.showLocationByName(query))
                     .createPendingIntent()
+                deepLink.send()
             }
-
-            deepLink?.send()
+        } else if (intent?.scheme == "https" && intent?.data?.host == "www.goingelectric.de") {
+            val id = intent.data?.pathSegments?.last()?.toLongOrNull()
+            if (id != null) {
+                val deepLink = navController.createDeepLink()
+                    .setGraph(R.navigation.nav_graph)
+                    .setDestination(R.id.map)
+                    .setArguments(MapFragment.showChargerById(id))
+                    .createPendingIntent()
+                deepLink.send()
+            }
+        } else if (intent.hasExtra(EXTRA_CHARGER_ID)) {
+            navController.createDeepLink()
+                .setDestination(R.id.map)
+                .setArguments(
+                    MapFragment.showCharger(
+                        intent.getLongExtra(EXTRA_CHARGER_ID, 0),
+                        intent.getDoubleExtra(EXTRA_LAT, 0.0),
+                        intent.getDoubleExtra(EXTRA_LON, 0.0)
+                    )
+                )
+                .createPendingIntent()
+                .send()
         }
     }
 
@@ -176,7 +143,6 @@ class MapsActivity : AppCompatActivity(),
         val coord = charger.coordinates
         val intent = Intent(Intent.ACTION_VIEW)
         intent.data = Uri.parse("google.navigation:q=${coord.lat},${coord.lng}")
-        intent.`package` = "com.google.android.apps.maps"
         if (prefs.navigateUseMaps && intent.resolveActivity(packageManager) != null) {
             startActivity(intent);
         } else {
@@ -188,11 +154,7 @@ class MapsActivity : AppCompatActivity(),
     fun showLocation(charger: ChargeLocation) {
         val coord = charger.coordinates
         val intent = Intent(Intent.ACTION_VIEW)
-        intent.data = Uri.parse(
-            "geo:${coord.lat},${coord.lng}?q=${coord.lat},${coord.lng}(${
-                Uri.encode(charger.name)
-            })"
-        )
+        intent.data = Uri.parse("geo:0,0?q=${coord.lat},${coord.lng}(${charger.name})")
         if (intent.resolveActivity(packageManager) != null) {
             startActivity(intent);
         } else {
@@ -232,18 +194,4 @@ class MapsActivity : AppCompatActivity(),
         }
         startActivity(intent)
     }
-
-    override fun onPreferenceStartFragment(
-        caller: PreferenceFragmentCompat,
-        pref: Preference
-    ): Boolean {
-        caller.exitTransition = MaterialSharedAxis(MaterialSharedAxis.X, true)
-        caller.reenterTransition = MaterialSharedAxis(MaterialSharedAxis.X, false)
-
-        // Identify the Navigation Destination
-        val navDestination = navController.graph
-            .find { target -> target is FragmentNavigator.Destination && pref.fragment == target.className }
-        navDestination?.let { target -> navController.navigate(target.id) }
-        return true
-    }
 }

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

@@ -1,7 +1,5 @@
 package net.vonforst.evmap
 
-import android.content.Context
-import android.content.res.Configuration
 import android.graphics.Typeface
 import android.os.Bundle
 import android.text.*
@@ -11,7 +9,6 @@ import androidx.lifecycle.Observer
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.suspendCancellableCoroutine
 import kotlinx.coroutines.withContext
-import java.util.*
 
 fun Bundle.optDouble(name: String): Double? {
     if (!this.containsKey(name)) return null
@@ -83,8 +80,6 @@ fun max(a: Int?, b: Int?): Int? {
     }
 }
 
-fun <T> List<T>.containsAny(vararg values: T) = values.any { this.contains(it) }
-
 public suspend fun <T> LiveData<T>.await(): T {
     return withContext(Dispatchers.Main.immediate) {
         suspendCancellableCoroutine { continuation ->
@@ -102,14 +97,4 @@ public suspend fun <T> LiveData<T>.await(): T {
             }
         }
     }
-}
-
-fun Context.isDarkMode() =
-    (resources.configuration.uiMode and Configuration.UI_MODE_NIGHT_MASK) == Configuration.UI_MODE_NIGHT_YES
-
-const val kmPerMile = 1.609344
-const val meterPerFt = 0.3048
-
-fun shouldUseImperialUnits(): Boolean {
-    return Locale.getDefault().country in listOf("US", "GB", "MM", "LR")
 }

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

@@ -144,9 +144,10 @@ class CheckableConnectorAdapter : DataBindingAdapter<Chargepoint>() {
             field = value
             checkedItem?.let {
                 if (value != null && getItem(it).type !in value) {
-                    checkedItem = currentList.indexOfFirst {
+                    val index = currentList.indexOfFirst {
                         it.type in value
-                    }.takeIf { it != -1 }
+                    }
+                    checkedItem = if (index == -1) null else index
                     onCheckedItemChangedListener?.invoke(getCheckedItem())
                 }
             }
@@ -167,7 +168,7 @@ class CheckableConnectorAdapter : DataBindingAdapter<Chargepoint>() {
         }
         root.setOnCheckedChangeListener { v: View, checked: Boolean ->
             if (checked) {
-                checkedItem = holder.bindingAdapterPosition.takeIf { it != -1 }
+                checkedItem = holder.bindingAdapterPosition
                 root.post {
                     notifyDataSetChanged()
                 }
@@ -179,7 +180,7 @@ class CheckableConnectorAdapter : DataBindingAdapter<Chargepoint>() {
     fun getCheckedItem(): Chargepoint? = checkedItem?.let { getItem(it) }
 
     fun setCheckedItem(item: Chargepoint?) {
-        checkedItem = item?.let { currentList.indexOf(item) }.takeIf { it != -1 }
+        checkedItem = item?.let { currentList.indexOf(item) }
     }
 
     var onCheckedItemChangedListener: ((Chargepoint?) -> Unit)? = null

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

@@ -44,13 +44,13 @@ fun buildDetails(
     if (loc == null) return emptyList()
 
     return listOfNotNull(
-        if (loc.address != null) DetailsAdapter.Detail(
+        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,
@@ -73,7 +73,7 @@ fun buildDetails(
                 )
             } ?: "",
             loc.faultReport.description?.let {
-                HtmlCompat.fromHtml(it.replace("\n", "<br>"), HtmlCompat.FROM_HTML_MODE_LEGACY)
+                HtmlCompat.fromHtml(it, HtmlCompat.FROM_HTML_MODE_LEGACY)
             } ?: "",
             clickable = true
         ) else null,
@@ -84,14 +84,14 @@ fun buildDetails(
                 loc.openinghours.getStatusText(ctx)
             else
                 loc.openinghours.description ?: "",
-            if (loc.openinghours.days != null || loc.openinghours.twentyfourSeven) loc.openinghours.description else null,
+            if (loc.openinghours.days != null) loc.openinghours.description else null,
             hoursDays = loc.openinghours.days
         ) else null,
-        if (loc.cost != null && !loc.cost.isEmpty) DetailsAdapter.Detail(
+        if (loc.cost != null) DetailsAdapter.Detail(
             R.drawable.ic_cost,
             R.string.cost,
             loc.cost.getStatusText(ctx),
-            loc.cost.getDetailText()
+            loc.cost.descriptionLong ?: loc.cost.descriptionShort
         )
         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).fav.favorite.favoriteId
+    override fun getItemId(position: Int): Long = getItem(position).charger.id
 
     @SuppressLint("ClickableViewAccessibility")
     override fun bind(

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

@@ -1,216 +0,0 @@
-package net.vonforst.evmap.adapter
-
-import android.content.Context
-import android.os.Handler
-import android.os.Looper
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import android.widget.*
-import androidx.databinding.DataBindingUtil
-import androidx.lifecycle.LiveData
-import com.car2go.maps.model.LatLng
-import net.vonforst.evmap.R
-import net.vonforst.evmap.autocomplete.*
-import net.vonforst.evmap.containsAny
-import net.vonforst.evmap.databinding.ItemAutocompleteResultBinding
-import net.vonforst.evmap.isDarkMode
-import net.vonforst.evmap.storage.AppDatabase
-import net.vonforst.evmap.storage.PreferenceDataSource
-import net.vonforst.evmap.storage.RecentAutocompletePlace
-import java.time.Instant
-
-class PlaceAutocompleteAdapter(val context: Context, val location: LiveData<LatLng>) :
-    BaseAdapter(), Filterable {
-    private var resultList: List<AutocompletePlace>? = null
-    private val providers = getAutocompleteProviders(context)
-    private val typeItem = 0
-    private val typeAttribution = 1
-    private val maxItems = 6
-    private var currentProvider: AutocompleteProvider? = null
-    private val recents = AppDatabase.getInstance(context).recentAutocompletePlaceDao()
-    private var recentResults = mutableListOf<RecentAutocompletePlace>()
-
-    data class ViewHolder(val binding: ItemAutocompleteResultBinding)
-
-    override fun getCount(): Int {
-        return resultList?.let { it.size + 1 } ?: 0
-    }
-
-    override fun getItem(position: Int): AutocompletePlace? {
-        return if (position < resultList!!.size) resultList!![position] else null
-    }
-
-    override fun getItemViewType(position: Int): Int {
-        return if (position < resultList!!.size) typeItem else typeAttribution
-    }
-
-    override fun getViewTypeCount(): Int = 2
-
-    override fun getItemId(position: Int): Long {
-        return 0
-    }
-
-    override fun getView(position: Int, convertView: View?, parent: ViewGroup?): View {
-        var view = convertView
-        if (getItemViewType(position) == typeItem) {
-            val viewHolder: ViewHolder
-            if (view == null) {
-                val binding: ItemAutocompleteResultBinding = DataBindingUtil.inflate(
-                    LayoutInflater.from(context),
-                    R.layout.item_autocomplete_result,
-                    parent,
-                    false
-                )
-                view = binding.root
-                viewHolder = ViewHolder(binding)
-                view.tag = viewHolder
-            } else {
-                viewHolder = view.tag as ViewHolder
-            }
-            val place = resultList!![position]
-            bindView(viewHolder, place)
-        } else if (getItemViewType(position) == typeAttribution) {
-            if (view == null) {
-                view = LayoutInflater.from(context)
-                    .inflate(R.layout.item_autocomplete_attribution, parent, false)
-            }
-            (view as ImageView).apply {
-                setImageResource(currentProvider?.getAttributionImage(context.isDarkMode()) ?: 0)
-                contentDescription = context.getString(currentProvider?.getAttributionString() ?: 0)
-            }
-
-        }
-        return view!!
-    }
-
-    private fun bindView(
-        viewHolder: ViewHolder,
-        place: AutocompletePlace
-    ) {
-        viewHolder.binding.item = place
-    }
-
-    override fun getFilter(): Filter {
-        return object : Filter() {
-            var delaySet = false
-
-            init {
-                if (PreferenceDataSource(context).searchProvider == "mapbox") {
-                    // set delay to 500 ms to reduce paid Mapbox API requests
-                    this.setDelayer { q -> if (isShortQuery(q)) 0L else 500L }
-                }
-            }
-
-            override fun publishResults(constraint: CharSequence?, results: FilterResults?) {
-                resultList = results?.values as? List<AutocompletePlace>?
-                if (results != null && results.count > 0) {
-                    notifyDataSetChanged()
-                } else {
-                    notifyDataSetInvalidated()
-                }
-            }
-
-            override fun performFiltering(constraint: CharSequence?): FilterResults {
-                val query = constraint.toString()
-                var resultList: List<AutocompletePlace>? = null
-                if (constraint != null) {
-                    for (provider in providers) {
-                        try {
-                            recentResults.clear()
-                            currentProvider = provider
-
-                            // first search in recent places
-                            val recentPlaces = if (query.isEmpty()) {
-                                recents.getAll(provider.id, limit = maxItems)
-                            } else {
-                                recents.search(query, provider.id, limit = maxItems)
-                            }
-                            recentResults.addAll(recentPlaces)
-                            resultList = recentPlaces.map { it.asAutocompletePlace(location.value) }
-                            Handler(Looper.getMainLooper()).post {
-                                // publish intermediate results on main thread
-                                publishResults(constraint, resultList.asFilterResults())
-                            }
-
-                            // 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 =
-                                (resultList!! + provider.autocomplete(query, location.value)
-                                    .filter { !recentIds.contains(it.id) }).take(maxItems)
-                            break
-                        } catch (e: ApiUnavailableException) {
-                            e.printStackTrace()
-                        }
-                    }
-                }
-
-
-                if (currentProvider is MapboxAutocompleteProvider && !delaySet) {
-                    // set delay to 500 ms to reduce paid Mapbox API requests
-                    this.setDelayer { q -> if (isShortQuery(q)) 0L else 500L }
-                }
-
-                return resultList.asFilterResults()
-            }
-
-            private fun List<AutocompletePlace>?.asFilterResults(): FilterResults {
-                val result = FilterResults()
-                if (this != null) {
-                    result.values = this
-                    result.count = this.size
-                }
-                return result
-            }
-        }
-    }
-
-    private fun isShortQuery(query: CharSequence) = query.length < 3
-
-    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
-    }
-
-}
-
-
-fun iconForPlaceType(types: List<AutocompletePlaceType>): Int =
-    when {
-        types.contains(
-            AutocompletePlaceType.RECENT
-        ) -> R.drawable.ic_history
-        types.containsAny(
-            AutocompletePlaceType.LIGHT_RAIL_STATION,
-            AutocompletePlaceType.BUS_STATION,
-            AutocompletePlaceType.TRAIN_STATION,
-            AutocompletePlaceType.TRANSIT_STATION
-        ) -> {
-            R.drawable.ic_place_type_train
-        }
-        types.contains(AutocompletePlaceType.AIRPORT) -> {
-            R.drawable.ic_place_type_airport
-        }
-        // TODO: extend this with icons for more place categories
-        else -> {
-            R.drawable.ic_place_type_default
-        }
-    }
-
-fun isSpecialPlace(types: List<AutocompletePlaceType>): Boolean =
-    !setOf(
-        R.drawable.ic_place_type_default,
-        R.drawable.ic_history
-    ).contains(iconForPlaceType(types))

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

@@ -2,6 +2,7 @@ package net.vonforst.evmap.api.availability
 
 import com.facebook.stetho.okhttp3.StethoInterceptor
 import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.withContext
 import net.vonforst.evmap.api.RateLimitInterceptor
 import net.vonforst.evmap.api.await
@@ -21,9 +22,9 @@ import java.util.concurrent.TimeUnit
 
 interface AvailabilityDetector {
     suspend fun getAvailability(location: ChargeLocation): ChargeLocationStatus
-    fun isCountrySupported(country: String, dataSource: String): Boolean
 }
 
+@ExperimentalCoroutinesApi
 abstract class BaseAvailabilityDetector(private val client: OkHttpClient) : AvailabilityDetector {
     protected val radius = 150  // max radius in meters
 
@@ -64,20 +65,10 @@ abstract class BaseAvailabilityDetector(private val client: OkHttpClient) : Avai
             connectors: Map<Long, Pair<Double, String>>,
             chargepoints: List<Chargepoint>
         ): Map<Chargepoint, Set<Long>> {
-            var chargepoints = chargepoints
-
             // iterate over each connector type
             val types = connectors.map { it.value.second }.distinct().toSet()
             val equivalentTypes = types.map { equivalentPlugTypes(it).plus(it) }.cartesianProduct()
-            var geTypes = chargepoints.map { it.type }.distinct().toSet()
-            if (!equivalentTypes.any { it == geTypes } && geTypes.size > 1 && geTypes.contains(
-                    Chargepoint.SCHUKO
-                )) {
-                // If charger has household plugs and other plugs, try removing the household plugs
-                // (common e.g. in Hamburg -> 2x Type 2 + 2x Schuko, but NM only lists Type 2)
-                geTypes = geTypes.filter { it != Chargepoint.SCHUKO }.toSet()
-                chargepoints = chargepoints.filter { it.type != Chargepoint.SCHUKO }
-            }
+            val geTypes = chargepoints.map { it.type }.distinct().toSet()
             if (!equivalentTypes.any { it == geTypes }) throw AvailabilityDetectorException("chargepoints do not match")
             return types.flatMap { type ->
                 // find connectors of this type
@@ -87,7 +78,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 } }
-                        .mapNotNull { it.power }.distinct().sorted()
+                        .map { it.power }.distinct().sorted()
 
                 // if the distinct number of powers is the same, try to match.
                 if (powers.size == gePowers.size) {
@@ -101,7 +92,7 @@ abstract class BaseAvailabilityDetector(private val client: OkHttpClient) : Avai
                         chargepoint to ids
                     }
                 } else if (powers.size == 1 && gePowers.size == 2
-                    && chargepoints.sumOf { it.count } == connsOfType.size
+                    && chargepoints.sumBy { it.count } == connsOfType.size
                 ) {
                     // special case: dual charger(s) with load balancing
                     // GoingElectric shows 2 different powers, NewMotion just one
@@ -109,7 +100,7 @@ abstract class BaseAvailabilityDetector(private val client: OkHttpClient) : Avai
                     var i = 0
                     gePowers.map { gePower ->
                         val chargepoint =
-                            chargepoints.find { it.type in equivalentPlugTypes(type) && it.power == gePower }!!
+                            chargepoints.find { it.type == type && it.power == gePower }!!
                         val ids = allIds.subList(i, i + chargepoint.count).toSet()
                         i += chargepoint.count
                         chargepoint to ids
@@ -132,7 +123,7 @@ data class ChargeLocationStatus(
             (connectors == null || connectors.map {
                 equivalentPlugTypes(it)
             }.any { equivalent -> it.type in equivalent })
-                    && (minPower == null || (it.power != null && it.power > minPower))
+                    && (minPower == null || it.power > minPower)
         }
         return this.copy(status = statusFiltered)
     }
@@ -158,7 +149,6 @@ private val okhttp = OkHttpClient.Builder()
     .cookieJar(JavaNetCookieJar(cookieManager))
     .build()
 val availabilityDetectors = listOf(
-    EnBwAvailabilityDetector(okhttp),
     NewMotionAvailabilityDetector(okhttp)
     /*ChargecloudAvailabilityDetector(
         okhttp,
@@ -172,12 +162,8 @@ val availabilityDetectors = listOf(
 
 suspend fun getAvailability(charger: ChargeLocation): Resource<ChargeLocationStatus> {
     var value: Resource<ChargeLocationStatus>? = null
-    val country = charger.chargepriceData?.country
-        ?: charger.address?.country
-        ?: return Resource.error(null, null)
     withContext(Dispatchers.IO) {
         for (ad in availabilityDetectors) {
-            if (!ad.isCountrySupported(country, charger.dataSource)) continue
             try {
                 value = Resource.success(ad.getAvailability(charger))
                 break

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

@@ -1,5 +1,6 @@
 package net.vonforst.evmap.api.availability
 
+import kotlinx.coroutines.ExperimentalCoroutinesApi
 import net.vonforst.evmap.api.iterator
 import net.vonforst.evmap.model.ChargeLocation
 import net.vonforst.evmap.model.Chargepoint
@@ -7,10 +8,12 @@ import okhttp3.OkHttpClient
 import org.json.JSONObject
 import java.io.IOException
 
+@ExperimentalCoroutinesApi
 class ChargecloudAvailabilityDetector(
     client: OkHttpClient,
     private val operatorId: String
 ) : BaseAvailabilityDetector(client) {
+    @ExperimentalCoroutinesApi
     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"
@@ -80,10 +83,6 @@ class ChargecloudAvailabilityDetector(
         }
     }
 
-    override fun isCountrySupported(country: String, dataSource: String): Boolean {
-        TODO("Not yet implemented")
-    }
-
     private fun getType(string: String): String {
         return when (string) {
             "IEC_62196_T2" -> Chargepoint.TYPE_2_UNKNOWN

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

@@ -1,226 +0,0 @@
-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)
-            }
-        }
-
-        println(markers)
-
-        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 isCountrySupported(country: String, dataSource: String): Boolean =
-        when (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
-        }
-}