Release 2.1.4

Currently translated at 100.0% (381 of 381 strings)

Co-authored-by: Hosted Weblate <hosted@weblate.org>
Co-authored-by: mcliquid <info@mcliquid.de>
Translate-URL: https://hosted.weblate.org/projects/evmap/android/de/
Translation: EVMap/Android

.github/workflows/release.yml

@@ -11,14 +11,16 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Check out code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
 
       - name: Set up Java environment
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@v5
         with:
           java-version: 21
           distribution: 'zulu'
-          cache: 'gradle'
+      - name: Setup Gradle
+        uses: gradle/actions/setup-gradle@v6
+
       - 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
@@ -26,6 +28,7 @@ jobs:
 
       - name: Build app release & export licenses
         env:
+          EVMAP_API_KEY: ${{ secrets.EVMAP_API_KEY }}
           GOINGELECTRIC_API_KEY: ${{ secrets.GOINGELECTRIC_API_KEY }}
           OPENCHARGEMAP_API_KEY: ${{ secrets.OPENCHARGEMAP_API_KEY }}
           CHARGEPRICE_API_KEY: ${{ secrets.CHARGEPRICE_API_KEY }}
@@ -39,7 +42,7 @@ jobs:
           KEYSTORE_PASSWORD: ${{ secrets.KEYSTORE_PASSWORD }}
           KEYSTORE_ALIAS: ${{ secrets.KEYSTORE_ALIAS }}
           KEYSTORE_ALIAS_PASSWORD: ${{ secrets.KEYSTORE_ALIAS_PASSWORD }}
-        run: ./gradlew exportLibraryDefinitions assembleRelease --no-daemon
+        run: ./gradlew exportLibraryDefinitions assembleRelease
 
       - name: Export licenses in Appning format
         run: python3 _ci/export_licenses_appning.py
@@ -119,3 +122,13 @@ jobs:
           asset_path: licenses_fossNormalRelease_appning.csv
           asset_name: licenses_fossNormalRelease_appning.csv
           asset_content_type: text/csv
+
+      - name: Trigger Website update
+        run: |
+          curl -L \
+            -X POST \
+            -H "Accept: application/vnd.github+json" \
+            -H "Authorization: Bearer ${{ github.token }}" \
+            -H "X-GitHub-Api-Version: 2022-11-28" \
+            https://api.github.com/repos/ev-map/ev-map.github.io/dispatches \
+            -d "{\"event_type\": \"trigger-workflow\"}"

.github/workflows/tests.yml

@@ -16,26 +16,28 @@ jobs:
         buildvariant: [ FossNormal, FossAutomotive, GoogleNormal, GoogleAutomotive ]
     steps:
       - name: Check out code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
 
       - name: Set up Java environment
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@v5
         with:
           java-version: 21
           distribution: 'zulu'
-          cache: 'gradle'
+
+      - name: Setup Gradle
+        uses: gradle/actions/setup-gradle@v6
 
       - name: Copy apikeys.xml
         run: cp _ci/apikeys-ci.xml app/src/main/res/values/apikeys.xml
 
       - name: Build app
-        run: ./gradlew assemble${{ matrix.buildvariant }}Debug --no-daemon
+        run: ./gradlew assemble${{ matrix.buildvariant }}Debug
       - name: Run unit tests
-        run: ./gradlew test${{ matrix.buildvariant }}DebugUnitTest --no-daemon
+        run: ./gradlew test${{ matrix.buildvariant }}DebugUnitTest
       - name: Run Android Lint
-        run: ./gradlew lint${{ matrix.buildvariant }}Debug --no-daemon
+        run: ./gradlew lint${{ matrix.buildvariant }}Debug
       - name: Check licenses
-        run: ./gradlew exportLibraryDefinitions --no-daemon
+        run: ./gradlew exportLibraryDefinitions
 
   apk_check:
     name: Release APK checks (${{ matrix.buildvariant }})
@@ -49,10 +51,10 @@ jobs:
         run: sudo apt install -y checksec
 
       - name: Check out code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
 
       - name: Set up Java environment
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@v5
         with:
           java-version: 17
           distribution: 'zulu'
@@ -62,7 +64,7 @@ jobs:
         run: cp _ci/apikeys-ci.xml app/src/main/res/values/apikeys.xml
 
       - name: Build app
-        run: ./gradlew assemble${{ matrix.buildvariant }}Release --no-daemon
+        run: ./gradlew assemble${{ matrix.buildvariant }}Release
 
       - name: Unpack native libraries from APK
         run: |
@@ -75,8 +77,10 @@ jobs:
         run: |
           checksec --output=json --dir=lib > checksec_output.json
           jq --argjson exceptions '[
+            "lib/arm64-v8a/libc++_shared.so",
             "lib/armeabi-v7a/libc++_shared.so",
-            "lib/x86/libc++_shared.so"
+            "lib/x86/libc++_shared.so",
+            "lib/x86_64/libc++_shared.so"
           ]' '
             to_entries
             | map(select(.value.fortify_source == "no" and (.key as $lib | $exceptions | index($lib) | not)))

.gitignore

@@ -14,4 +14,5 @@ apikeys.xml
 /_img/connectors/*.ai
 api-7125266970515251116-798419-8e2dda660c80.json
 output-metadata.json
-licenses_*.csv
+licenses_*.csv
+gradle/gradle-daemon-jvm.properties

Gemfile.lock

@@ -2,31 +2,40 @@ GEM
   remote: https://rubygems.org/
   specs:
     CFPropertyList (3.0.2)
-    addressable (2.8.0)
-      public_suffix (>= 2.0.2, < 5.0)
+    abbrev (0.1.2)
+    addressable (2.9.0)
+      public_suffix (>= 2.0.2, < 8.0)
+    artifactory (3.0.17)
     atomos (0.1.3)
-    aws-eventstream (1.1.0)
-    aws-partitions (1.354.0)
-    aws-sdk-core (3.104.3)
-      aws-eventstream (~> 1, >= 1.0.2)
-      aws-partitions (~> 1, >= 1.239.0)
-      aws-sigv4 (~> 1.1)
-      jmespath (~> 1.0)
-    aws-sdk-kms (1.36.0)
-      aws-sdk-core (~> 3, >= 3.99.0)
-      aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.78.0)
-      aws-sdk-core (~> 3, >= 3.104.3)
+    aws-eventstream (1.4.0)
+    aws-partitions (1.1196.0)
+    aws-sdk-core (3.240.0)
+      aws-eventstream (~> 1, >= 1.3.0)
+      aws-partitions (~> 1, >= 1.992.0)
+      aws-sigv4 (~> 1.9)
+      base64
+      bigdecimal
+      jmespath (~> 1, >= 1.6.1)
+      logger
+    aws-sdk-kms (1.118.0)
+      aws-sdk-core (~> 3, >= 3.239.1)
+      aws-sigv4 (~> 1.5)
+    aws-sdk-s3 (1.208.0)
+      aws-sdk-core (~> 3, >= 3.234.0)
       aws-sdk-kms (~> 1)
-      aws-sigv4 (~> 1.1)
-    aws-sigv4 (1.2.1)
+      aws-sigv4 (~> 1.5)
+    aws-sigv4 (1.12.1)
       aws-eventstream (~> 1, >= 1.0.2)
     babosa (1.0.3)
+    base64 (0.3.0)
+    benchmark (0.5.0)
+    bigdecimal (4.0.1)
     claide (1.0.3)
     colored (1.2)
     colored2 (3.1.2)
-    commander-fastlane (4.4.6)
-      highline (~> 1.7.2)
+    commander (4.6.0)
+      highline (~> 2.0.0)
+    csv (3.3.5)
     declarative (0.0.20)
     declarative-option (0.1.0)
     digest-crc (0.6.1)
@@ -35,118 +44,174 @@ GEM
       unf (>= 0.0.5, < 1.0.0)
     dotenv (2.7.6)
     emoji_regex (3.0.0)
-    excon (0.76.0)
-    faraday (1.0.1)
-      multipart-post (>= 1.2, < 3)
+    excon (1.5.0)
+      logger
+    faraday (1.10.6)
+      faraday-em_http (~> 1.0)
+      faraday-em_synchrony (~> 1.0)
+      faraday-excon (~> 1.1)
+      faraday-httpclient (~> 1.0)
+      faraday-multipart (~> 1.0)
+      faraday-net_http (~> 1.0)
+      faraday-net_http_persistent (~> 1.0)
+      faraday-patron (~> 1.0)
+      faraday-rack (~> 1.0)
+      faraday-retry (~> 1.0)
+      ruby2_keywords (>= 0.0.4)
     faraday-cookie_jar (0.0.6)
       faraday (>= 0.7.4)
       http-cookie (~> 1.0.0)
+    faraday-em_http (1.0.0)
+    faraday-em_synchrony (1.0.1)
+    faraday-excon (1.1.0)
+    faraday-httpclient (1.0.1)
+    faraday-multipart (1.2.0)
+      multipart-post (~> 2.0)
+    faraday-net_http (1.0.2)
+    faraday-net_http_persistent (1.2.0)
+    faraday-patron (1.0.0)
+    faraday-rack (1.0.0)
+    faraday-retry (1.0.4)
     faraday_middleware (1.0.0)
       faraday (~> 1.0)
     fastimage (2.2.0)
-    fastlane (2.156.1)
-      CFPropertyList (>= 2.3, < 4.0.0)
-      addressable (>= 2.3, < 3.0.0)
-      aws-sdk-s3 (~> 1.0)
+    fastlane (2.237.0)
+      CFPropertyList (>= 2.3, < 5.0.0)
+      abbrev (~> 0.1)
+      addressable (>= 2.9.0, < 3.0.0)
+      artifactory (~> 3.0)
+      aws-sdk-s3 (~> 1.197)
       babosa (>= 1.0.3, < 2.0.0)
-      bundler (>= 1.12.0, < 3.0.0)
-      colored
-      commander-fastlane (>= 4.4.6, < 5.0.0)
+      base64 (~> 0.2)
+      benchmark (>= 0.1.0)
+      bundler (>= 2.4.0, < 5.0.0)
+      colored (~> 1.2)
+      commander (~> 4.6)
+      csv (~> 3.3)
       dotenv (>= 2.1.1, < 3.0.0)
       emoji_regex (>= 0.1, < 4.0)
-      excon (>= 0.71.0, < 1.0.0)
+      excon (>= 0.71.0, < 2.0.0)
       faraday (~> 1.0)
       faraday-cookie_jar (~> 0.0.6)
       faraday_middleware (~> 1.0)
       fastimage (>= 2.1.0, < 3.0.0)
+      fastlane-sirp (>= 1.1.0)
       gh_inspector (>= 1.1.2, < 2.0.0)
-      google-api-client (>= 0.37.0, < 0.39.0)
-      google-cloud-storage (>= 1.15.0, < 2.0.0)
-      highline (>= 1.7.2, < 2.0.0)
+      google-apis-androidpublisher_v3 (~> 0.3)
+      google-apis-playcustomapp_v1 (~> 0.1)
+      google-cloud-env (>= 1.6.0, < 2.3.0)
+      google-cloud-storage (~> 1.31)
+      highline (~> 2.0)
+      http-cookie (~> 1.0.5)
       json (< 3.0.0)
-      jwt (>= 2.1.0, < 3)
+      jwt (>= 2.10.3, < 4)
+      logger (>= 1.6, < 2.0)
       mini_magick (>= 4.9.4, < 5.0.0)
-      multipart-post (~> 2.0.0)
+      multi_json (~> 1.12)
+      multipart-post (>= 2.0.0, < 3.0.0)
+      mutex_m (~> 0.3)
+      naturally (~> 2.2)
+      nkf (~> 0.2)
+      optparse (>= 0.1.1, < 1.0.0)
+      ostruct (>= 0.1.0)
       plist (>= 3.1.0, < 4.0.0)
       rubyzip (>= 2.0.0, < 3.0.0)
-      security (= 0.1.3)
+      security (= 0.1.5)
       simctl (~> 1.6.3)
-      slack-notifier (>= 2.0.0, < 3.0.0)
       terminal-notifier (>= 2.0.0, < 3.0.0)
-      terminal-table (>= 1.4.5, < 2.0.0)
+      terminal-table (~> 3)
       tty-screen (>= 0.6.3, < 1.0.0)
       tty-spinner (>= 0.8.0, < 1.0.0)
       word_wrap (~> 1.0.0)
       xcodeproj (>= 1.13.0, < 2.0.0)
-      xcpretty (~> 0.3.0)
-      xcpretty-travis-formatter (>= 0.0.3)
+      xcpretty (~> 0.4.1)
+      xcpretty-travis-formatter (>= 0.0.3, < 2.0.0)
+    fastlane-sirp (1.1.0)
     gh_inspector (1.1.3)
-    google-api-client (0.38.0)
+    google-apis-androidpublisher_v3 (0.104.0)
+      google-apis-core (>= 0.15.0, < 2.a)
+    google-apis-core (0.18.0)
       addressable (~> 2.5, >= 2.5.1)
-      googleauth (~> 0.9)
-      httpclient (>= 2.8.1, < 3.0)
+      googleauth (~> 1.9)
+      httpclient (>= 2.8.3, < 3.a)
       mini_mime (~> 1.0)
+      mutex_m
       representable (~> 3.0)
-      retriable (>= 2.0, < 4.0)
-      signet (~> 0.12)
-    google-cloud-core (1.5.0)
-      google-cloud-env (~> 1.0)
+      retriable (>= 2.0, < 4.a)
+    google-apis-iamcredentials_v1 (0.28.0)
+      google-apis-core (>= 0.15.0, < 2.a)
+    google-apis-playcustomapp_v1 (0.18.0)
+      google-apis-core (>= 0.15.0, < 2.a)
+    google-apis-storage_v1 (0.64.0)
+      google-apis-core (>= 0.15.0, < 2.a)
+    google-cloud-core (1.9.0)
+      google-cloud-env (>= 1.0, < 3.a)
       google-cloud-errors (~> 1.0)
-    google-cloud-env (1.3.3)
-      faraday (>= 0.17.3, < 2.0)
+    google-cloud-env (2.2.2)
+      base64 (~> 0.2)
+      faraday (>= 1.0, < 3.a)
     google-cloud-errors (1.0.1)
-    google-cloud-storage (1.27.0)
-      addressable (~> 2.5)
+    google-cloud-storage (1.62.0)
+      addressable (~> 2.8)
       digest-crc (~> 0.4)
-      google-api-client (~> 0.33)
-      google-cloud-core (~> 1.2)
-      googleauth (~> 0.9)
+      google-apis-core (>= 0.18, < 2)
+      google-apis-iamcredentials_v1 (~> 0.18)
+      google-apis-storage_v1 (>= 0.42)
+      google-cloud-core (~> 1.6)
+      googleauth (~> 1.9)
       mini_mime (~> 1.0)
-    googleauth (0.13.1)
-      faraday (>= 0.17.3, < 2.0)
-      jwt (>= 1.4, < 3.0)
-      memoist (~> 0.16)
-      multi_json (~> 1.11)
+    google-logging-utils (0.2.0)
+    googleauth (1.17.1)
+      faraday (>= 1.0, < 3.a)
+      google-cloud-env (~> 2.2)
+      google-logging-utils (~> 0.1)
+      jwt (>= 1.4, < 4.0)
       os (>= 0.9, < 2.0)
-      signet (~> 0.14)
-    highline (1.7.10)
-    http-cookie (1.0.3)
+      pstore (~> 0.1)
+      signet (>= 0.16, < 2.a)
+    highline (2.0.3)
+    http-cookie (1.0.8)
       domain_name (~> 0.5)
     httpclient (2.8.3)
-    jmespath (1.6.1)
+    jmespath (1.6.2)
     json (2.3.1)
-    jwt (2.2.1)
-    memoist (0.16.2)
+    jwt (3.2.0)
+      base64
+    logger (1.7.0)
     mini_magick (4.10.1)
     mini_mime (1.0.2)
     multi_json (1.15.0)
-    multipart-post (2.0.0)
+    multipart-post (2.4.1)
+    mutex_m (0.3.0)
     nanaimo (0.3.0)
     naturally (2.2.0)
+    nkf (0.3.0)
+    optparse (0.8.1)
     os (1.1.1)
+    ostruct (0.6.3)
     plist (3.5.0)
-    public_suffix (4.0.6)
+    pstore (0.2.1)
+    public_suffix (7.0.5)
     rake (13.0.1)
     representable (3.0.4)
       declarative (< 0.1.0)
       declarative-option (< 0.2.0)
       uber (< 0.2.0)
     retriable (3.1.2)
-    rouge (2.0.7)
+    rouge (3.28.0)
+    ruby2_keywords (0.0.5)
     rubyzip (2.3.0)
-    security (0.1.3)
-    signet (0.14.0)
-      addressable (~> 2.3)
-      faraday (>= 0.17.3, < 2.0)
-      jwt (>= 1.5, < 3.0)
-      multi_json (~> 1.10)
+    security (0.1.5)
+    signet (0.22.0)
+      addressable (~> 2.8)
+      faraday (>= 0.17.5, < 3.a)
+      jwt (>= 1.5, < 4.0)
     simctl (1.6.8)
       CFPropertyList
       naturally
-    slack-notifier (2.3.2)
     terminal-notifier (2.0.0)
-    terminal-table (1.8.0)
-      unicode-display_width (~> 1.1, >= 1.1.1)
+    terminal-table (3.0.2)
+      unicode-display_width (>= 1.1.1, < 3)
     tty-cursor (0.7.1)
     tty-screen (0.8.1)
     tty-spinner (0.9.3)
@@ -155,7 +220,6 @@ GEM
     unf (0.1.4)
       unf_ext
     unf_ext (0.0.7.7)
-    unf_ext (0.0.7.7-x64-mingw32)
     unicode-display_width (1.7.0)
     word_wrap (1.0.0)
     xcodeproj (1.18.0)
@@ -164,13 +228,13 @@ GEM
       claide (>= 1.0.2, < 2.0)
       colored2 (~> 3.1)
       nanaimo (~> 0.3.0)
-    xcpretty (0.3.0)
-      rouge (~> 2.0.7)
+    xcpretty (0.4.1)
+      rouge (~> 3.28.0)
     xcpretty-travis-formatter (1.0.0)
       xcpretty (~> 0.2, >= 0.0.7)
 
 PLATFORMS
-  x64-mingw32
+  x64-mingw-ucrt
   x86_64-linux
 
 DEPENDENCIES

LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2020-2024 Johan von Forstner and contributors
+Copyright (c) 2020-2026 Johan von Forstner and contributors
 
 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

@@ -20,7 +20,6 @@ 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)
 - Android Auto & Android Automotive OS integration
 - No ads, fully open source
 - Compatible with Android 5.0 and above
@@ -83,16 +82,9 @@ into new languages.
 Sponsors
 --------
 
-Many users currently support the development EVMap with their donations. You can find more
+Many users currently support the development of EVMap with their donations. You can find more
 information on the [Donate page](https://ev-map.app/donate/) on the EVMap website.
 
 <a href="https://www.jawg.io"><img src="https://www.jawg.io/static/Blue@10x-9cdc4596e4e59acbd9ead55e9c28613e.png" alt="JawgMaps" height="38"/></a><br>
-Since May 2024, **JawgMaps** provides their OpenStreetMap vector map tiles service to EVMap for
+Since May 2024, **JawgMaps** provide their OpenStreetMap vector map tiles service to EVMap for
 free, i.e. the background map displayed in the app if OpenStreetMap is selected as the data source.
-
-<a href="https://chargeprice.app"><img src="https://raw.githubusercontent.com/ev-map/EVMap/master/_img/powered_by_chargeprice.svg" alt="Powered by Chargeprice" height="38"/></a><br>
-Since April 2021, **Chargeprice.app** provide their price comparison API at a greatly reduced
-price for EVMap. This data is used in EVMap's price comparison feature.
-
-<a href="https://www.jetbrains.com/community/opensource/"><img src="https://resources.jetbrains.com/storage/products/company/brand/logos/jetbrains.svg" alt="JetBrains logo" height="38"/></a><br>
-As part of its support program for Open-source projects, **JetBrains** supports the development of EVMap since December 2023 with a license of their software suite.

_ci/apikeys-ci.xml

@@ -4,9 +4,9 @@
    <string name="jawg_key" translatable="false">ci</string>
    <string name="arcgis_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>
    <string name="nobil_key" translatable="false">ci</string>
    <string name="fronyx_key" translatable="false">ci</string>
    <string name="acra_credentials" translatable="false">ci:ci</string>
+   <string name="evmap_key" translatable="false">ci</string>
 </resources>

_img/connectors/connector_mcs.svg

@@ -0,0 +1,14 @@
+<svg id="vector" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+    <title>connector_mcs</title>
+
+    <path fill="#000000" d="M7.57,2.904A5.168,5.168 0,0 0,2.4 8.074a5.168,5.168 0,0 0,1.097 3.181l5.656,7.24A3.616,3.616 0,0 0,12 19.885a3.616,3.616 0,0 0,2.843 -1.389l5.656,-7.24 A5.168,5.168 0,0 0,21.6 8.074a5.168,5.168 0,0 0,-5.17 -5.17z" fill-opacity="0" stroke="#000" stroke-width="2" id="path_0"/>
+
+    <path d="M11.5 10.159a1.0 1.0 0 0 0 -1.0 1.0 1.0 1.0 0 0 0 1.0 1.0h1.0a1.0 1.0 0 0 0 1.0 -1.0 1.0 1.0 0 0 0 -1.0 -1.0z"/>
+    <circle fill="none" stroke="black" stroke-width="1px" cx="7.5" cy="8.074" r="2.9" />
+    <circle fill="none" stroke="black" stroke-width="1px" cx="16.5" cy="8.074" r="2.9" />
+
+    <circle cx="9" cy="13" r="1" />
+    <circle cx="15" cy="13" r="1" />
+
+    <circle fill="none" stroke="black" stroke-width="1px" cx="12" cy="15.5" r="1.8" />
+</svg>

app/build.gradle.kts

@@ -1,14 +1,15 @@
+import com.android.build.api.dsl.ApplicationBaseFlavor
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 import java.util.Base64
 
 plugins {
-    id("com.adarshr.test-logger") version "4.0.0"
-    id("com.android.application")
-    id("kotlin-android")
-    id("kotlin-parcelize")
-    id("kotlin-kapt")
-    id("com.google.devtools.ksp").version("2.0.21-1.0.28")
-    id("androidx.navigation.safeargs.kotlin")
-    id("com.mikepenz.aboutlibraries.plugin")
+    alias(libs.plugins.test.logger)
+    alias(libs.plugins.android.application)
+    alias(libs.plugins.kotlin.parcelize)
+    alias(libs.plugins.ksp)
+    alias(libs.plugins.moshix)
+    alias(libs.plugins.navigation.safeargs)
+    alias(libs.plugins.aboutlibraries)
 }
 
 
@@ -18,17 +19,15 @@ android {
     defaultConfig {
         applicationId = "net.vonforst.evmap"
         compileSdk = 36
-        minSdk = 21
+        minSdk = 23
         targetSdk = 36
         // NOTE: always increase versionCode by 2 since automotive flavor uses versionCode + 1
-        versionCode = 262
-        versionName = "2.0.0"
+        versionCode = 280
+        versionName = "2.1.4"
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
-    }
 
-    ksp {
-        arg("room.schemaLocation", "$projectDir/schemas")
+        addApiKeys()
     }
 
     val isRunningOnCI = System.getenv("CI") == "true"
@@ -83,6 +82,7 @@ android {
         create("google") {
             dimension = "dependencies"
             versionNameSuffix = "-google"
+            addGoogleApiKey()
         }
         create("normal") {
             dimension = "automotive"
@@ -102,14 +102,10 @@ android {
         sourceCompatibility = JavaVersion.VERSION_17
     }
 
-    kotlinOptions {
-        jvmTarget = JavaVersion.VERSION_17.toString()
-    }
-
     buildFeatures {
-        dataBinding = true
         viewBinding = true
         buildConfig = true
+        resValues = true
     }
     lint {
         disable += listOf("NullSafeMutableLiveData")
@@ -127,112 +123,6 @@ android {
 
     namespace = "net.vonforst.evmap"
 
-    // add API keys from environment variable if not set in apikeys.xml
-    applicationVariants.all {
-        val goingelectricKey =
-            System.getenv("GOINGELECTRIC_API_KEY") ?: project.findProperty("GOINGELECTRIC_API_KEY")
-                ?.toString()
-        if (goingelectricKey != null) {
-            resValue("string", "goingelectric_key", goingelectricKey)
-        }
-        var nobilKey =
-            System.getenv("NOBIL_API_KEY") ?: project.findProperty("NOBIL_API_KEY")?.toString()
-        if (nobilKey == null && project.hasProperty("NOBIL_API_KEY_ENCRYPTED")) {
-            nobilKey = decode(
-                project.findProperty("NOBIL_API_KEY_ENCRYPTED").toString(),
-                "FmK.d,-f*p+rD+WK!eds"
-            )
-        }
-        if (nobilKey != null) {
-            resValue("string", "nobil_key", nobilKey)
-        }
-        var openchargemapKey =
-            System.getenv("OPENCHARGEMAP_API_KEY") ?: project.findProperty("OPENCHARGEMAP_API_KEY")
-                ?.toString()
-        if (openchargemapKey == null && project.hasProperty("OPENCHARGEMAP_API_KEY_ENCRYPTED")) {
-            openchargemapKey = decode(
-                project.findProperty("OPENCHARGEMAP_API_KEY_ENCRYPTED").toString(),
-                "FmK.d,-f*p+rD+WK!eds"
-            )
-        }
-        if (openchargemapKey != null) {
-            resValue("string", "openchargemap_key", openchargemapKey)
-        }
-        val googleMapsKey =
-            System.getenv("GOOGLE_MAPS_API_KEY") ?: project.findProperty("GOOGLE_MAPS_API_KEY")
-                ?.toString()
-        if (googleMapsKey != null && flavorName.startsWith("google")) {
-            resValue("string", "google_maps_key", googleMapsKey)
-        }
-        var mapboxKey =
-            System.getenv("MAPBOX_API_KEY") ?: project.findProperty("MAPBOX_API_KEY")?.toString()
-        if (mapboxKey == null && project.hasProperty("MAPBOX_API_KEY_ENCRYPTED")) {
-            mapboxKey = decode(
-                project.findProperty("MAPBOX_API_KEY_ENCRYPTED").toString(),
-                "FmK.d,-f*p+rD+WK!eds"
-            )
-        }
-        if (mapboxKey != null) {
-            resValue("string", "mapbox_key", mapboxKey)
-        }
-        var jawgKey =
-            System.getenv("JAWG_API_KEY") ?: project.findProperty("JAWG_API_KEY")?.toString()
-        if (jawgKey == null && project.hasProperty("JAWG_API_KEY_ENCRYPTED")) {
-            jawgKey = decode(
-                project.findProperty("JAWG_API_KEY_ENCRYPTED").toString(),
-                "FmK.d,-f*p+rD+WK!eds"
-            )
-        }
-        if (jawgKey != null) {
-            resValue("string", "jawg_key", jawgKey)
-        }
-        var arcgisKey =
-            System.getenv("ARCGIS_API_KEY") ?: project.findProperty("ARCGIS_API_KEY")?.toString()
-        if (arcgisKey == null && project.hasProperty("ARCGIS_API_KEY_ENCRYPTED")) {
-            arcgisKey = decode(
-                project.findProperty("ARCGIS_API_KEY_ENCRYPTED").toString(),
-                "FmK.d,-f*p+rD+WK!eds"
-            )
-        }
-        if (arcgisKey != null) {
-            resValue("string", "arcgis_key", jawgKey)
-        }
-        var chargepriceKey =
-            System.getenv("CHARGEPRICE_API_KEY") ?: project.findProperty("CHARGEPRICE_API_KEY")
-                ?.toString()
-        if (chargepriceKey == null && project.hasProperty("CHARGEPRICE_API_KEY_ENCRYPTED")) {
-            chargepriceKey = decode(
-                project.findProperty("CHARGEPRICE_API_KEY_ENCRYPTED").toString(),
-                "FmK.d,-f*p+rD+WK!eds"
-            )
-        }
-        if (chargepriceKey != null) {
-            resValue("string", "chargeprice_key", chargepriceKey)
-        }
-        var fronyxKey =
-            System.getenv("FRONYX_API_KEY") ?: project.findProperty("FRONYX_API_KEY")?.toString()
-        if (fronyxKey == null && project.hasProperty("FRONYX_API_KEY_ENCRYPTED")) {
-            fronyxKey = decode(
-                project.findProperty("FRONYX_API_KEY_ENCRYPTED").toString(),
-                "FmK.d,-f*p+rD+WK!eds"
-            )
-        }
-        if (fronyxKey != null) {
-            resValue("string", "fronyx_key", fronyxKey)
-        }
-        var acraKey = System.getenv("ACRA_CRASHREPORT_CREDENTIALS")
-            ?: project.findProperty("ACRA_CRASHREPORT_CREDENTIALS")?.toString()
-        if (acraKey == null && project.hasProperty("ACRA_CRASHREPORT_CREDENTIALS_ENCRYPTED")) {
-            acraKey = decode(
-                project.findProperty("ACRA_CRASHREPORT_CREDENTIALS_ENCRYPTED").toString(),
-                "FmK.d,-f*p+rD+WK!eds"
-            )
-        }
-        if (acraKey != null) {
-            resValue("string", "acra_credentials", acraKey)
-        }
-    }
-
     packaging {
         jniLibs {
             pickFirsts.addAll(
@@ -247,6 +137,126 @@ android {
     }
 }
 
+/**
+ * add API keys from environment variable if not set in apikeys.xml
+ */
+fun ApplicationBaseFlavor.addApiKeys() {
+    var evmapKey =
+        System.getenv("EVMAP_API_KEY") ?: project.findProperty("EVMAP_API_KEY")?.toString()
+    if (evmapKey == null && project.hasProperty("EVMAP_API_KEY_ENCRYPTED")) {
+        evmapKey = decode(
+            project.findProperty("EVMAP_API_KEY_ENCRYPTED").toString(),
+            "FmK.d,-f*p+rD+WK!eds"
+        )
+    }
+    if (evmapKey != null) {
+        resValue("string", "evmap_key", evmapKey)
+    }
+    val goingelectricKey =
+        System.getenv("GOINGELECTRIC_API_KEY") ?: project.findProperty("GOINGELECTRIC_API_KEY")
+            ?.toString()
+    if (goingelectricKey != null) {
+        resValue("string", "goingelectric_key", goingelectricKey)
+    }
+    var nobilKey =
+        System.getenv("NOBIL_API_KEY") ?: project.findProperty("NOBIL_API_KEY")?.toString()
+    if (nobilKey == null && project.hasProperty("NOBIL_API_KEY_ENCRYPTED")) {
+        nobilKey = decode(
+            project.findProperty("NOBIL_API_KEY_ENCRYPTED").toString(),
+            "FmK.d,-f*p+rD+WK!eds"
+        )
+    }
+    if (nobilKey != null) {
+        resValue("string", "nobil_key", nobilKey)
+    }
+    var openchargemapKey =
+        System.getenv("OPENCHARGEMAP_API_KEY") ?: project.findProperty("OPENCHARGEMAP_API_KEY")
+            ?.toString()
+    if (openchargemapKey == null && project.hasProperty("OPENCHARGEMAP_API_KEY_ENCRYPTED")) {
+        openchargemapKey = decode(
+            project.findProperty("OPENCHARGEMAP_API_KEY_ENCRYPTED").toString(),
+            "FmK.d,-f*p+rD+WK!eds"
+        )
+    }
+    if (openchargemapKey != null) {
+        resValue("string", "openchargemap_key", openchargemapKey)
+    }
+    var mapboxKey =
+        System.getenv("MAPBOX_API_KEY") ?: project.findProperty("MAPBOX_API_KEY")?.toString()
+    if (mapboxKey == null && project.hasProperty("MAPBOX_API_KEY_ENCRYPTED")) {
+        mapboxKey = decode(
+            project.findProperty("MAPBOX_API_KEY_ENCRYPTED").toString(),
+            "FmK.d,-f*p+rD+WK!eds"
+        )
+    }
+    if (mapboxKey != null) {
+        resValue("string", "mapbox_key", mapboxKey)
+    }
+    var jawgKey =
+        System.getenv("JAWG_API_KEY") ?: project.findProperty("JAWG_API_KEY")?.toString()
+    if (jawgKey == null && project.hasProperty("JAWG_API_KEY_ENCRYPTED")) {
+        jawgKey = decode(
+            project.findProperty("JAWG_API_KEY_ENCRYPTED").toString(),
+            "FmK.d,-f*p+rD+WK!eds"
+        )
+    }
+    if (jawgKey != null) {
+        resValue("string", "jawg_key", jawgKey)
+    }
+    var arcgisKey =
+        System.getenv("ARCGIS_API_KEY") ?: project.findProperty("ARCGIS_API_KEY")?.toString()
+    if (arcgisKey == null && project.hasProperty("ARCGIS_API_KEY_ENCRYPTED")) {
+        arcgisKey = decode(
+            project.findProperty("ARCGIS_API_KEY_ENCRYPTED").toString(),
+            "FmK.d,-f*p+rD+WK!eds"
+        )
+    }
+    if (arcgisKey != null) {
+        resValue("string", "arcgis_key", arcgisKey)
+    }
+    var fronyxKey =
+        System.getenv("FRONYX_API_KEY") ?: project.findProperty("FRONYX_API_KEY")?.toString()
+    if (fronyxKey == null && project.hasProperty("FRONYX_API_KEY_ENCRYPTED")) {
+        fronyxKey = decode(
+            project.findProperty("FRONYX_API_KEY_ENCRYPTED").toString(),
+            "FmK.d,-f*p+rD+WK!eds"
+        )
+    }
+    if (fronyxKey != null) {
+        resValue("string", "fronyx_key", fronyxKey)
+    }
+    var acraKey = System.getenv("ACRA_CRASHREPORT_CREDENTIALS")
+        ?: project.findProperty("ACRA_CRASHREPORT_CREDENTIALS")?.toString()
+    if (acraKey == null && project.hasProperty("ACRA_CRASHREPORT_CREDENTIALS_ENCRYPTED")) {
+        acraKey = decode(
+            project.findProperty("ACRA_CRASHREPORT_CREDENTIALS_ENCRYPTED").toString(),
+            "FmK.d,-f*p+rD+WK!eds"
+        )
+    }
+    if (acraKey != null) {
+        resValue("string", "acra_credentials", acraKey)
+    }
+}
+
+fun ApplicationBaseFlavor.addGoogleApiKey() {
+    val googleMapsKey =
+        System.getenv("GOOGLE_MAPS_API_KEY") ?: project.findProperty("GOOGLE_MAPS_API_KEY")
+            ?.toString()
+    if (googleMapsKey != null) {
+        resValue("string", "google_maps_key", googleMapsKey)
+    }
+}
+
+kotlin {
+    compilerOptions {
+        jvmTarget = JvmTarget.fromTarget("17")
+    }
+}
+
+ksp {
+    arg("room.schemaLocation", "$projectDir/schemas")
+}
+
 androidComponents {
     beforeVariants { variantBuilder ->
         if (variantBuilder.buildType == "releaseAutomotivePackageName"
@@ -287,128 +297,110 @@ aboutLibraries {
 }
 
 dependencies {
-    val kotlinVersion: String by rootProject.extra
-    val aboutLibsVersion: String by rootProject.extra
-    val navVersion: String by rootProject.extra
     val normalImplementation by configurations
     val googleImplementation by configurations
     val automotiveImplementation by configurations
-    val fossImplementation by configurations
-    val testGoogleImplementation by configurations
 
-    implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlinVersion")
-    implementation("androidx.appcompat:appcompat:1.7.1")
-    implementation("androidx.core:core-ktx:1.17.0")
-    implementation("androidx.core:core-splashscreen:1.0.1")
-    implementation("androidx.activity:activity-ktx:1.10.1")
-    implementation("androidx.fragment:fragment-ktx:1.8.9")
-    implementation("androidx.cardview:cardview:1.0.0")
-    implementation("androidx.preference:preference-ktx:1.2.1")
-    implementation("com.google.android.material:material:1.13.0-rc01")
-    implementation("androidx.constraintlayout:constraintlayout:2.2.1")
-    implementation("androidx.recyclerview:recyclerview:1.4.0")
-    implementation("androidx.browser:browser:1.9.0")
-    implementation("androidx.swiperefreshlayout:swiperefreshlayout:1.1.0")
-    implementation("androidx.viewpager2:viewpager2:1.1.0")
-    implementation("androidx.security:security-crypto:1.1.0")
-    implementation("androidx.work:work-runtime-ktx:2.10.3")
-    implementation("com.github.ev-map:CustomBottomSheetBehavior:e48f73ea7b")
-    implementation("com.squareup.retrofit2:retrofit:3.0.0")
-    implementation("com.squareup.retrofit2:converter-moshi:3.0.0")
-    implementation("com.squareup.okhttp3:okhttp:4.12.0")
-    implementation("com.squareup.okhttp3:okhttp-urlconnection:4.12.0")
-    implementation("com.squareup.moshi:moshi-kotlin:1.15.2")
-    implementation("com.squareup.moshi:moshi-adapters:1.15.2")
-    implementation("com.markomilos.jsonapi:jsonapi-retrofit:1.1.0")
-    implementation("io.coil-kt:coil:2.7.0")
-    implementation("com.github.ev-map:StfalconImageViewer:5082ebd392")
-    implementation("com.mikepenz:aboutlibraries-core:$aboutLibsVersion")
-    implementation("com.mikepenz:aboutlibraries:$aboutLibsVersion")
-    implementation("com.airbnb.android:lottie:6.6.7")
-    implementation("io.michaelrocks.bimap:bimap:1.1.0")
-    implementation("com.github.pengrad:mapscaleview:1.6.0")
-    implementation("com.github.romandanylyk:PageIndicatorView:b1bad589b5")
-    implementation("com.github.ev-map:locale-config-x:c97ce250b9")
+    implementation(libs.kotlin.stdlib.jdk7)
+    implementation(libs.androidx.appcompat)
+    implementation(libs.androidx.core.ktx)
+    implementation(libs.androidx.core.splashscreen)
+    implementation(libs.androidx.activity.ktx)
+    implementation(libs.androidx.fragment.ktx)
+    implementation(libs.androidx.cardview)
+    implementation(libs.androidx.preference.ktx)
+    implementation(libs.material)
+    implementation(libs.androidx.constraintlayout)
+    implementation(libs.androidx.recyclerview)
+    implementation(libs.androidx.browser)
+    implementation(libs.androidx.swiperefreshlayout)
+    implementation(libs.androidx.viewpager2)
+    implementation(libs.androidx.security.crypto)
+    implementation(libs.androidx.work.runtime.ktx)
+    implementation(libs.custom.bottom.sheet.behavior)
+    implementation(libs.retrofit)
+    implementation(libs.retrofit.converter.moshi)
+    implementation(libs.okhttp)
+    implementation(libs.okhttp.urlconnection)
+    implementation(libs.moshi.kotlin)
+    implementation(libs.moshi.adapters)
+    implementation(libs.coil)
+    implementation(libs.stfalcon.image.viewer)
+    implementation(libs.aboutlibraries.core)
+    implementation(libs.aboutlibraries)
+    implementation(libs.lottie)
+    implementation(libs.bimap)
+    implementation(libs.mapscaleview)
+    implementation(libs.page.indicator.view)
+    implementation(libs.locale.config.x)
 
     // Android Auto
-    val carAppVersion = "1.7.0"
-    implementation("androidx.car.app:app:$carAppVersion")
-    normalImplementation("androidx.car.app:app-projected:$carAppVersion")
-    automotiveImplementation("androidx.car.app:app-automotive:$carAppVersion")
+    implementation(libs.androidx.car.app)
+    normalImplementation(libs.androidx.car.app.projected)
+    automotiveImplementation(libs.androidx.car.app.automotive)
 
     // AnyMaps
-    val anyMapsVersion = "1174ef9375"
-    implementation("com.github.ev-map.AnyMaps:anymaps-base:$anyMapsVersion")
-    googleImplementation("com.github.ev-map.AnyMaps:anymaps-google:$anyMapsVersion")
-    googleImplementation("com.google.android.gms:play-services-maps:19.2.0")
-    implementation("com.github.ev-map.AnyMaps:anymaps-maplibre:$anyMapsVersion") {
-        // duplicates classes from mapbox-sdk-services
-        exclude("org.maplibre.gl", "android-sdk-geojson")
-    }
-    implementation("org.maplibre.gl:android-sdk:10.3.5") {
-        exclude("org.maplibre.gl", "android-sdk-geojson")
+    implementation(libs.anymaps.base)
+    googleImplementation(libs.anymaps.google)
+    googleImplementation(libs.play.services.maps)
+    implementation(libs.anymaps.maplibre) {
+        // exclude default (Vulkan) version and use Vulkan + OpenGL ES 3.0 version for better compatibility
+        exclude("org.maplibre.gl", "android-sdk")
     }
+    implementation(libs.maplibre.android.sdk.vulkan.opengl)
 
     // Google Places
-    googleImplementation("com.google.android.libraries.places:places:3.5.0")
-    googleImplementation("org.jetbrains.kotlinx:kotlinx-coroutines-play-services:1.10.2")
+    googleImplementation(libs.places)
+    googleImplementation(libs.kotlinx.coroutines.play.services)
 
     // Mapbox Geocoding
-    implementation("com.mapbox.mapboxsdk:mapbox-sdk-services:5.8.0")
+    implementation(libs.mapbox.sdk.services)
 
     // navigation library
-    implementation("androidx.navigation:navigation-fragment-ktx:$navVersion")
-    implementation("androidx.navigation:navigation-ui-ktx:$navVersion")
+    implementation(libs.androidx.navigation.fragment.ktx)
+    implementation(libs.androidx.navigation.ui.ktx)
 
     // viewmodel library
-    val lifecycleVersion = "2.9.2"
-    implementation("androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycleVersion")
-    implementation("androidx.lifecycle:lifecycle-livedata-ktx:$lifecycleVersion")
+    implementation(libs.androidx.lifecycle.viewmodel.ktx)
+    implementation(libs.androidx.lifecycle.livedata.ktx)
 
     // room library
-    val roomVersion = "2.7.2"
-    implementation("androidx.room:room-runtime:$roomVersion")
-    ksp("androidx.room:room-compiler:$roomVersion")
-    implementation("androidx.room:room-ktx:$roomVersion")
-    implementation("com.github.anboralabs:spatia-room:0.3.0") {
+    implementation(libs.androidx.room.runtime)
+    ksp(libs.androidx.room.compiler)
+    implementation(libs.androidx.room.ktx)
+    implementation(libs.spatia.room) {
         exclude("com.github.dalgarins", "android-spatialite")
     }
-    // forked version with upgraded sqlite & libxml & 16 KB page size support
-    // https://github.com/dalgarins/android-spatialite/pull/11
-    // https://github.com/dalgarins/android-spatialite/pull/12
-    implementation("io.github.ev-map:android-spatialite:2.2.1-alpha")
+    // forked version with upgraded libxml 2.15.2 & APP_STL := c++_static
+    implementation(libs.android.spatialite)
 
     // billing library
-    val billingVersion = "7.0.0"
-    googleImplementation("com.android.billingclient:billing:$billingVersion")
-    googleImplementation("com.android.billingclient:billing-ktx:$billingVersion")
+    googleImplementation(libs.billing)
+    googleImplementation(libs.billing.ktx)
 
     // ACRA (crash reporting)
-    val acraVersion = "5.12.0"
-    implementation("ch.acra:acra-http:$acraVersion")
-    implementation("ch.acra:acra-dialog:$acraVersion")
-    implementation("ch.acra:acra-limiter:$acraVersion")
+    implementation(libs.acra.http)
+    implementation(libs.acra.dialog)
+    implementation(libs.acra.limiter)
 
     // debug tools
-    debugImplementation("com.jakewharton.timber:timber:5.0.1")
-    debugImplementation("com.squareup.leakcanary:leakcanary-android:2.14")
+    debugImplementation(libs.timber)
+    debugImplementation(libs.leakcanary.android)
 
     // testing
-    testImplementation("junit:junit:4.13.2")
-    testImplementation("com.squareup.okhttp3:mockwebserver:4.12.0")
+    testImplementation(libs.junit4)
+    testImplementation(libs.okhttp.mockwebserver)
     //noinspection GradleDependency
-    testImplementation("org.robolectric:robolectric:4.16-beta-1")
-    testImplementation("androidx.test:core:1.7.0")
-    testImplementation("androidx.arch.core:core-testing:2.2.0")
-    testImplementation("androidx.car.app:app-testing:$carAppVersion")
+    testImplementation(libs.robolectric)
+    testImplementation(libs.androidx.test.core)
+    testImplementation(libs.androidx.arch.core.testing)
+    testImplementation(libs.androidx.car.app.testing)
 
-    androidTestImplementation("androidx.test.ext:junit:1.3.0")
-    androidTestImplementation("androidx.test.espresso:espresso-core:3.7.0")
-    androidTestImplementation("androidx.arch.core:core-testing:2.2.0")
+    androidTestImplementation(libs.androidx.test.ext.junit)
+    androidTestImplementation(libs.androidx.test.espresso.core)
+    androidTestImplementation(libs.androidx.arch.core.testing)
 
-    ksp("com.squareup.moshi:moshi-kotlin-codegen:1.15.2")
-
-    coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:2.1.5")
+    coreLibraryDesugaring(libs.desugar.jdk.libs)
 }
 
 fun decode(s: String, key: String): String {

app/schemas/net.vonforst.evmap.storage.AppDatabase/28.json

@@ -0,0 +1,938 @@
+{
+  "formatVersion": 1,
+  "database": {
+    "version": 28,
+    "identityHash": "84f71cce385c444726ba336834ddf6b4",
+    "entities": [
+      {
+        "tableName": "ChargeLocation",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER NOT NULL, `dataSource` TEXT NOT NULL, `name` TEXT NOT NULL, `coordinates` BLOB NOT NULL, `chargepoints` TEXT NOT NULL, `network` TEXT, `dataSourceUrl` TEXT NOT NULL, `url` TEXT, `editUrl` TEXT, `verified` INTEGER NOT NULL, `barrierFree` INTEGER, `operator` TEXT, `generalInformation` TEXT, `amenities` TEXT, `locationDescription` TEXT, `photos` TEXT, `chargecards` TEXT, `accessibility` TEXT, `license` TEXT, `networkUrl` TEXT, `chargerUrl` TEXT, `timeRetrieved` INTEGER NOT NULL, `isDetailed` INTEGER NOT NULL, `coordinatesProjected` BLOB NOT NULL, `city` TEXT, `country` TEXT, `postcode` TEXT, `street` TEXT, `fault_report_created` INTEGER, `fault_report_description` TEXT, `twentyfourSeven` INTEGER, `description` TEXT, `mostart` TEXT, `moend` TEXT, `tustart` TEXT, `tuend` TEXT, `westart` TEXT, `weend` TEXT, `thstart` TEXT, `thend` TEXT, `frstart` TEXT, `frend` TEXT, `sastart` TEXT, `saend` TEXT, `sustart` TEXT, `suend` TEXT, `hostart` TEXT, `hoend` TEXT, `freecharging` INTEGER, `freeparking` INTEGER, `descriptionShort` TEXT, `descriptionLong` TEXT, `chargepricecountry` TEXT, `chargepricenetwork` TEXT, `chargepriceplugTypes` TEXT, PRIMARY KEY(`id`, `dataSource`))",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "dataSource",
+            "columnName": "dataSource",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "coordinates",
+            "columnName": "coordinates",
+            "affinity": "BLOB",
+            "notNull": true
+          },
+          {
+            "fieldPath": "chargepoints",
+            "columnName": "chargepoints",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "network",
+            "columnName": "network",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "dataSourceUrl",
+            "columnName": "dataSourceUrl",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "url",
+            "columnName": "url",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "editUrl",
+            "columnName": "editUrl",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "verified",
+            "columnName": "verified",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "barrierFree",
+            "columnName": "barrierFree",
+            "affinity": "INTEGER"
+          },
+          {
+            "fieldPath": "operator",
+            "columnName": "operator",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "generalInformation",
+            "columnName": "generalInformation",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "amenities",
+            "columnName": "amenities",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "locationDescription",
+            "columnName": "locationDescription",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "photos",
+            "columnName": "photos",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "chargecards",
+            "columnName": "chargecards",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "accessibility",
+            "columnName": "accessibility",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "license",
+            "columnName": "license",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "networkUrl",
+            "columnName": "networkUrl",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "chargerUrl",
+            "columnName": "chargerUrl",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "timeRetrieved",
+            "columnName": "timeRetrieved",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isDetailed",
+            "columnName": "isDetailed",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "coordinatesProjected",
+            "columnName": "coordinatesProjected",
+            "affinity": "BLOB",
+            "notNull": true
+          },
+          {
+            "fieldPath": "address.city",
+            "columnName": "city",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "address.country",
+            "columnName": "country",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "address.postcode",
+            "columnName": "postcode",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "address.street",
+            "columnName": "street",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "faultReport.created",
+            "columnName": "fault_report_created",
+            "affinity": "INTEGER"
+          },
+          {
+            "fieldPath": "faultReport.description",
+            "columnName": "fault_report_description",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "openinghours.twentyfourSeven",
+            "columnName": "twentyfourSeven",
+            "affinity": "INTEGER"
+          },
+          {
+            "fieldPath": "openinghours.description",
+            "columnName": "description",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "openinghours.days.monday.start",
+            "columnName": "mostart",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "openinghours.days.monday.end",
+            "columnName": "moend",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "openinghours.days.tuesday.start",
+            "columnName": "tustart",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "openinghours.days.tuesday.end",
+            "columnName": "tuend",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "openinghours.days.wednesday.start",
+            "columnName": "westart",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "openinghours.days.wednesday.end",
+            "columnName": "weend",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "openinghours.days.thursday.start",
+            "columnName": "thstart",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "openinghours.days.thursday.end",
+            "columnName": "thend",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "openinghours.days.friday.start",
+            "columnName": "frstart",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "openinghours.days.friday.end",
+            "columnName": "frend",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "openinghours.days.saturday.start",
+            "columnName": "sastart",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "openinghours.days.saturday.end",
+            "columnName": "saend",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "openinghours.days.sunday.start",
+            "columnName": "sustart",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "openinghours.days.sunday.end",
+            "columnName": "suend",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "openinghours.days.holiday.start",
+            "columnName": "hostart",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "openinghours.days.holiday.end",
+            "columnName": "hoend",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "cost.freecharging",
+            "columnName": "freecharging",
+            "affinity": "INTEGER"
+          },
+          {
+            "fieldPath": "cost.freeparking",
+            "columnName": "freeparking",
+            "affinity": "INTEGER"
+          },
+          {
+            "fieldPath": "cost.descriptionShort",
+            "columnName": "descriptionShort",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "cost.descriptionLong",
+            "columnName": "descriptionLong",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "chargepriceData.country",
+            "columnName": "chargepricecountry",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "chargepriceData.network",
+            "columnName": "chargepricenetwork",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "chargepriceData.plugTypes",
+            "columnName": "chargepriceplugTypes",
+            "affinity": "TEXT"
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "id",
+            "dataSource"
+          ]
+        }
+      },
+      {
+        "tableName": "Favorite",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`favoriteId` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `chargerId` INTEGER NOT NULL, `chargerDataSource` TEXT NOT NULL, FOREIGN KEY(`chargerId`, `chargerDataSource`) REFERENCES `ChargeLocation`(`id`, `dataSource`) ON UPDATE NO ACTION ON DELETE NO ACTION )",
+        "fields": [
+          {
+            "fieldPath": "favoriteId",
+            "columnName": "favoriteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "chargerId",
+            "columnName": "chargerId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "chargerDataSource",
+            "columnName": "chargerDataSource",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "favoriteId"
+          ]
+        },
+        "indices": [
+          {
+            "name": "index_Favorite_chargerId_chargerDataSource",
+            "unique": false,
+            "columnNames": [
+              "chargerId",
+              "chargerDataSource"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_Favorite_chargerId_chargerDataSource` ON `${TABLE_NAME}` (`chargerId`, `chargerDataSource`)"
+          }
+        ],
+        "foreignKeys": [
+          {
+            "table": "ChargeLocation",
+            "onDelete": "NO ACTION",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "chargerId",
+              "chargerDataSource"
+            ],
+            "referencedColumns": [
+              "id",
+              "dataSource"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "BooleanFilterValue",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`key` TEXT NOT NULL, `value` INTEGER NOT NULL, `dataSource` TEXT NOT NULL, `profile` INTEGER NOT NULL, PRIMARY KEY(`key`, `profile`, `dataSource`), FOREIGN KEY(`profile`, `dataSource`) REFERENCES `FilterProfile`(`id`, `dataSource`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "key",
+            "columnName": "key",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "value",
+            "columnName": "value",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "dataSource",
+            "columnName": "dataSource",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "profile",
+            "columnName": "profile",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "key",
+            "profile",
+            "dataSource"
+          ]
+        },
+        "indices": [
+          {
+            "name": "index_BooleanFilterValue_profile_dataSource",
+            "unique": false,
+            "columnNames": [
+              "profile",
+              "dataSource"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_BooleanFilterValue_profile_dataSource` ON `${TABLE_NAME}` (`profile`, `dataSource`)"
+          }
+        ],
+        "foreignKeys": [
+          {
+            "table": "FilterProfile",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "profile",
+              "dataSource"
+            ],
+            "referencedColumns": [
+              "id",
+              "dataSource"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "MultipleChoiceFilterValue",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`key` TEXT NOT NULL, `values` TEXT NOT NULL, `all` INTEGER NOT NULL, `dataSource` TEXT NOT NULL, `profile` INTEGER NOT NULL, PRIMARY KEY(`key`, `profile`, `dataSource`), FOREIGN KEY(`profile`, `dataSource`) REFERENCES `FilterProfile`(`id`, `dataSource`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "key",
+            "columnName": "key",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "values",
+            "columnName": "values",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "all",
+            "columnName": "all",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "dataSource",
+            "columnName": "dataSource",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "profile",
+            "columnName": "profile",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "key",
+            "profile",
+            "dataSource"
+          ]
+        },
+        "indices": [
+          {
+            "name": "index_MultipleChoiceFilterValue_profile_dataSource",
+            "unique": false,
+            "columnNames": [
+              "profile",
+              "dataSource"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_MultipleChoiceFilterValue_profile_dataSource` ON `${TABLE_NAME}` (`profile`, `dataSource`)"
+          }
+        ],
+        "foreignKeys": [
+          {
+            "table": "FilterProfile",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "profile",
+              "dataSource"
+            ],
+            "referencedColumns": [
+              "id",
+              "dataSource"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "SliderFilterValue",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`key` TEXT NOT NULL, `value` INTEGER NOT NULL, `dataSource` TEXT NOT NULL, `profile` INTEGER NOT NULL, PRIMARY KEY(`key`, `profile`, `dataSource`), FOREIGN KEY(`profile`, `dataSource`) REFERENCES `FilterProfile`(`id`, `dataSource`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "key",
+            "columnName": "key",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "value",
+            "columnName": "value",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "dataSource",
+            "columnName": "dataSource",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "profile",
+            "columnName": "profile",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "key",
+            "profile",
+            "dataSource"
+          ]
+        },
+        "indices": [
+          {
+            "name": "index_SliderFilterValue_profile_dataSource",
+            "unique": false,
+            "columnNames": [
+              "profile",
+              "dataSource"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_SliderFilterValue_profile_dataSource` ON `${TABLE_NAME}` (`profile`, `dataSource`)"
+          }
+        ],
+        "foreignKeys": [
+          {
+            "table": "FilterProfile",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "profile",
+              "dataSource"
+            ],
+            "referencedColumns": [
+              "id",
+              "dataSource"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "FilterProfile",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`name` TEXT NOT NULL, `dataSource` TEXT NOT NULL, `id` INTEGER NOT NULL, `order` INTEGER NOT NULL, PRIMARY KEY(`dataSource`, `id`))",
+        "fields": [
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "dataSource",
+            "columnName": "dataSource",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "order",
+            "columnName": "order",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "dataSource",
+            "id"
+          ]
+        },
+        "indices": [
+          {
+            "name": "index_FilterProfile_dataSource_name",
+            "unique": true,
+            "columnNames": [
+              "dataSource",
+              "name"
+            ],
+            "orders": [],
+            "createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `index_FilterProfile_dataSource_name` ON `${TABLE_NAME}` (`dataSource`, `name`)"
+          }
+        ]
+      },
+      {
+        "tableName": "RecentAutocompletePlace",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` TEXT NOT NULL, `dataSource` TEXT NOT NULL, `timestamp` INTEGER NOT NULL, `primaryText` TEXT NOT NULL, `secondaryText` TEXT NOT NULL, `latLng` TEXT NOT NULL, `viewport` TEXT, `types` TEXT NOT NULL, PRIMARY KEY(`id`, `dataSource`))",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "dataSource",
+            "columnName": "dataSource",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "timestamp",
+            "columnName": "timestamp",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "primaryText",
+            "columnName": "primaryText",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "secondaryText",
+            "columnName": "secondaryText",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "latLng",
+            "columnName": "latLng",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "viewport",
+            "columnName": "viewport",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "types",
+            "columnName": "types",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "id",
+            "dataSource"
+          ]
+        }
+      },
+      {
+        "tableName": "GEPlug",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`name` TEXT NOT NULL, PRIMARY KEY(`name`))",
+        "fields": [
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "name"
+          ]
+        }
+      },
+      {
+        "tableName": "GENetwork",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`name` TEXT NOT NULL, PRIMARY KEY(`name`))",
+        "fields": [
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "name"
+          ]
+        }
+      },
+      {
+        "tableName": "GEChargeCard",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER NOT NULL, `name` TEXT NOT NULL, `url` TEXT NOT NULL, PRIMARY KEY(`id`))",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "url",
+            "columnName": "url",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "id"
+          ]
+        }
+      },
+      {
+        "tableName": "OCMConnectionType",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER NOT NULL, `title` TEXT NOT NULL, `formalName` TEXT, `discontinued` INTEGER, `obsolete` INTEGER, PRIMARY KEY(`id`))",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "title",
+            "columnName": "title",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "formalName",
+            "columnName": "formalName",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "discontinued",
+            "columnName": "discontinued",
+            "affinity": "INTEGER"
+          },
+          {
+            "fieldPath": "obsolete",
+            "columnName": "obsolete",
+            "affinity": "INTEGER"
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "id"
+          ]
+        }
+      },
+      {
+        "tableName": "OCMCountry",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER NOT NULL, `isoCode` TEXT NOT NULL, `continentCode` TEXT, `title` TEXT NOT NULL, PRIMARY KEY(`id`))",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isoCode",
+            "columnName": "isoCode",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "continentCode",
+            "columnName": "continentCode",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "title",
+            "columnName": "title",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "id"
+          ]
+        }
+      },
+      {
+        "tableName": "OCMOperator",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER NOT NULL, `websiteUrl` TEXT, `title` TEXT NOT NULL, `contactEmail` TEXT, `contactTelephone1` TEXT, `contactTelephone2` TEXT, PRIMARY KEY(`id`))",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "websiteUrl",
+            "columnName": "websiteUrl",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "title",
+            "columnName": "title",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "contactEmail",
+            "columnName": "contactEmail",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "contactTelephone1",
+            "columnName": "contactTelephone1",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "contactTelephone2",
+            "columnName": "contactTelephone2",
+            "affinity": "TEXT"
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "id"
+          ]
+        }
+      },
+      {
+        "tableName": "OSMNetwork",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`name` TEXT NOT NULL, PRIMARY KEY(`name`))",
+        "fields": [
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "name"
+          ]
+        }
+      },
+      {
+        "tableName": "SavedRegion",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`region` BLOB NOT NULL, `dataSource` TEXT NOT NULL, `timeRetrieved` INTEGER NOT NULL, `filters` TEXT, `isDetailed` INTEGER NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT)",
+        "fields": [
+          {
+            "fieldPath": "region",
+            "columnName": "region",
+            "affinity": "BLOB",
+            "notNull": true
+          },
+          {
+            "fieldPath": "dataSource",
+            "columnName": "dataSource",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "timeRetrieved",
+            "columnName": "timeRetrieved",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "filters",
+            "columnName": "filters",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "isDetailed",
+            "columnName": "isDetailed",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER"
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "id"
+          ]
+        },
+        "indices": [
+          {
+            "name": "index_SavedRegion_filters_dataSource",
+            "unique": false,
+            "columnNames": [
+              "filters",
+              "dataSource"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_SavedRegion_filters_dataSource` ON `${TABLE_NAME}` (`filters`, `dataSource`)"
+          }
+        ]
+      }
+    ],
+    "setupQueries": [
+      "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
+      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, '84f71cce385c444726ba336834ddf6b4')"
+    ]
+  }
+}

app/schemas/net.vonforst.evmap.storage.AppDatabase/29.json

@@ -0,0 +1,938 @@
+{
+  "formatVersion": 1,
+  "database": {
+    "version": 29,
+    "identityHash": "84f71cce385c444726ba336834ddf6b4",
+    "entities": [
+      {
+        "tableName": "ChargeLocation",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER NOT NULL, `dataSource` TEXT NOT NULL, `name` TEXT NOT NULL, `coordinates` BLOB NOT NULL, `chargepoints` TEXT NOT NULL, `network` TEXT, `dataSourceUrl` TEXT NOT NULL, `url` TEXT, `editUrl` TEXT, `verified` INTEGER NOT NULL, `barrierFree` INTEGER, `operator` TEXT, `generalInformation` TEXT, `amenities` TEXT, `locationDescription` TEXT, `photos` TEXT, `chargecards` TEXT, `accessibility` TEXT, `license` TEXT, `networkUrl` TEXT, `chargerUrl` TEXT, `timeRetrieved` INTEGER NOT NULL, `isDetailed` INTEGER NOT NULL, `coordinatesProjected` BLOB NOT NULL, `city` TEXT, `country` TEXT, `postcode` TEXT, `street` TEXT, `fault_report_created` INTEGER, `fault_report_description` TEXT, `twentyfourSeven` INTEGER, `description` TEXT, `mostart` TEXT, `moend` TEXT, `tustart` TEXT, `tuend` TEXT, `westart` TEXT, `weend` TEXT, `thstart` TEXT, `thend` TEXT, `frstart` TEXT, `frend` TEXT, `sastart` TEXT, `saend` TEXT, `sustart` TEXT, `suend` TEXT, `hostart` TEXT, `hoend` TEXT, `freecharging` INTEGER, `freeparking` INTEGER, `descriptionShort` TEXT, `descriptionLong` TEXT, `chargepricecountry` TEXT, `chargepricenetwork` TEXT, `chargepriceplugTypes` TEXT, PRIMARY KEY(`id`, `dataSource`))",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "dataSource",
+            "columnName": "dataSource",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "coordinates",
+            "columnName": "coordinates",
+            "affinity": "BLOB",
+            "notNull": true
+          },
+          {
+            "fieldPath": "chargepoints",
+            "columnName": "chargepoints",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "network",
+            "columnName": "network",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "dataSourceUrl",
+            "columnName": "dataSourceUrl",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "url",
+            "columnName": "url",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "editUrl",
+            "columnName": "editUrl",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "verified",
+            "columnName": "verified",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "barrierFree",
+            "columnName": "barrierFree",
+            "affinity": "INTEGER"
+          },
+          {
+            "fieldPath": "operator",
+            "columnName": "operator",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "generalInformation",
+            "columnName": "generalInformation",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "amenities",
+            "columnName": "amenities",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "locationDescription",
+            "columnName": "locationDescription",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "photos",
+            "columnName": "photos",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "chargecards",
+            "columnName": "chargecards",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "accessibility",
+            "columnName": "accessibility",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "license",
+            "columnName": "license",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "networkUrl",
+            "columnName": "networkUrl",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "chargerUrl",
+            "columnName": "chargerUrl",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "timeRetrieved",
+            "columnName": "timeRetrieved",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isDetailed",
+            "columnName": "isDetailed",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "coordinatesProjected",
+            "columnName": "coordinatesProjected",
+            "affinity": "BLOB",
+            "notNull": true
+          },
+          {
+            "fieldPath": "address.city",
+            "columnName": "city",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "address.country",
+            "columnName": "country",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "address.postcode",
+            "columnName": "postcode",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "address.street",
+            "columnName": "street",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "faultReport.created",
+            "columnName": "fault_report_created",
+            "affinity": "INTEGER"
+          },
+          {
+            "fieldPath": "faultReport.description",
+            "columnName": "fault_report_description",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "openinghours.twentyfourSeven",
+            "columnName": "twentyfourSeven",
+            "affinity": "INTEGER"
+          },
+          {
+            "fieldPath": "openinghours.description",
+            "columnName": "description",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "openinghours.days.monday.start",
+            "columnName": "mostart",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "openinghours.days.monday.end",
+            "columnName": "moend",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "openinghours.days.tuesday.start",
+            "columnName": "tustart",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "openinghours.days.tuesday.end",
+            "columnName": "tuend",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "openinghours.days.wednesday.start",
+            "columnName": "westart",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "openinghours.days.wednesday.end",
+            "columnName": "weend",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "openinghours.days.thursday.start",
+            "columnName": "thstart",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "openinghours.days.thursday.end",
+            "columnName": "thend",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "openinghours.days.friday.start",
+            "columnName": "frstart",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "openinghours.days.friday.end",
+            "columnName": "frend",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "openinghours.days.saturday.start",
+            "columnName": "sastart",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "openinghours.days.saturday.end",
+            "columnName": "saend",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "openinghours.days.sunday.start",
+            "columnName": "sustart",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "openinghours.days.sunday.end",
+            "columnName": "suend",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "openinghours.days.holiday.start",
+            "columnName": "hostart",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "openinghours.days.holiday.end",
+            "columnName": "hoend",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "cost.freecharging",
+            "columnName": "freecharging",
+            "affinity": "INTEGER"
+          },
+          {
+            "fieldPath": "cost.freeparking",
+            "columnName": "freeparking",
+            "affinity": "INTEGER"
+          },
+          {
+            "fieldPath": "cost.descriptionShort",
+            "columnName": "descriptionShort",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "cost.descriptionLong",
+            "columnName": "descriptionLong",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "chargepriceData.country",
+            "columnName": "chargepricecountry",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "chargepriceData.network",
+            "columnName": "chargepricenetwork",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "chargepriceData.plugTypes",
+            "columnName": "chargepriceplugTypes",
+            "affinity": "TEXT"
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "id",
+            "dataSource"
+          ]
+        }
+      },
+      {
+        "tableName": "Favorite",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`favoriteId` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `chargerId` INTEGER NOT NULL, `chargerDataSource` TEXT NOT NULL, FOREIGN KEY(`chargerId`, `chargerDataSource`) REFERENCES `ChargeLocation`(`id`, `dataSource`) ON UPDATE NO ACTION ON DELETE NO ACTION )",
+        "fields": [
+          {
+            "fieldPath": "favoriteId",
+            "columnName": "favoriteId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "chargerId",
+            "columnName": "chargerId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "chargerDataSource",
+            "columnName": "chargerDataSource",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "favoriteId"
+          ]
+        },
+        "indices": [
+          {
+            "name": "index_Favorite_chargerId_chargerDataSource",
+            "unique": false,
+            "columnNames": [
+              "chargerId",
+              "chargerDataSource"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_Favorite_chargerId_chargerDataSource` ON `${TABLE_NAME}` (`chargerId`, `chargerDataSource`)"
+          }
+        ],
+        "foreignKeys": [
+          {
+            "table": "ChargeLocation",
+            "onDelete": "NO ACTION",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "chargerId",
+              "chargerDataSource"
+            ],
+            "referencedColumns": [
+              "id",
+              "dataSource"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "BooleanFilterValue",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`key` TEXT NOT NULL, `value` INTEGER NOT NULL, `dataSource` TEXT NOT NULL, `profile` INTEGER NOT NULL, PRIMARY KEY(`key`, `profile`, `dataSource`), FOREIGN KEY(`profile`, `dataSource`) REFERENCES `FilterProfile`(`id`, `dataSource`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "key",
+            "columnName": "key",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "value",
+            "columnName": "value",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "dataSource",
+            "columnName": "dataSource",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "profile",
+            "columnName": "profile",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "key",
+            "profile",
+            "dataSource"
+          ]
+        },
+        "indices": [
+          {
+            "name": "index_BooleanFilterValue_profile_dataSource",
+            "unique": false,
+            "columnNames": [
+              "profile",
+              "dataSource"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_BooleanFilterValue_profile_dataSource` ON `${TABLE_NAME}` (`profile`, `dataSource`)"
+          }
+        ],
+        "foreignKeys": [
+          {
+            "table": "FilterProfile",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "profile",
+              "dataSource"
+            ],
+            "referencedColumns": [
+              "id",
+              "dataSource"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "MultipleChoiceFilterValue",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`key` TEXT NOT NULL, `values` TEXT NOT NULL, `all` INTEGER NOT NULL, `dataSource` TEXT NOT NULL, `profile` INTEGER NOT NULL, PRIMARY KEY(`key`, `profile`, `dataSource`), FOREIGN KEY(`profile`, `dataSource`) REFERENCES `FilterProfile`(`id`, `dataSource`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "key",
+            "columnName": "key",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "values",
+            "columnName": "values",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "all",
+            "columnName": "all",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "dataSource",
+            "columnName": "dataSource",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "profile",
+            "columnName": "profile",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "key",
+            "profile",
+            "dataSource"
+          ]
+        },
+        "indices": [
+          {
+            "name": "index_MultipleChoiceFilterValue_profile_dataSource",
+            "unique": false,
+            "columnNames": [
+              "profile",
+              "dataSource"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_MultipleChoiceFilterValue_profile_dataSource` ON `${TABLE_NAME}` (`profile`, `dataSource`)"
+          }
+        ],
+        "foreignKeys": [
+          {
+            "table": "FilterProfile",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "profile",
+              "dataSource"
+            ],
+            "referencedColumns": [
+              "id",
+              "dataSource"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "SliderFilterValue",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`key` TEXT NOT NULL, `value` INTEGER NOT NULL, `dataSource` TEXT NOT NULL, `profile` INTEGER NOT NULL, PRIMARY KEY(`key`, `profile`, `dataSource`), FOREIGN KEY(`profile`, `dataSource`) REFERENCES `FilterProfile`(`id`, `dataSource`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "key",
+            "columnName": "key",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "value",
+            "columnName": "value",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "dataSource",
+            "columnName": "dataSource",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "profile",
+            "columnName": "profile",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "key",
+            "profile",
+            "dataSource"
+          ]
+        },
+        "indices": [
+          {
+            "name": "index_SliderFilterValue_profile_dataSource",
+            "unique": false,
+            "columnNames": [
+              "profile",
+              "dataSource"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_SliderFilterValue_profile_dataSource` ON `${TABLE_NAME}` (`profile`, `dataSource`)"
+          }
+        ],
+        "foreignKeys": [
+          {
+            "table": "FilterProfile",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "profile",
+              "dataSource"
+            ],
+            "referencedColumns": [
+              "id",
+              "dataSource"
+            ]
+          }
+        ]
+      },
+      {
+        "tableName": "FilterProfile",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`name` TEXT NOT NULL, `dataSource` TEXT NOT NULL, `id` INTEGER NOT NULL, `order` INTEGER NOT NULL, PRIMARY KEY(`dataSource`, `id`))",
+        "fields": [
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "dataSource",
+            "columnName": "dataSource",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "order",
+            "columnName": "order",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "dataSource",
+            "id"
+          ]
+        },
+        "indices": [
+          {
+            "name": "index_FilterProfile_dataSource_name",
+            "unique": true,
+            "columnNames": [
+              "dataSource",
+              "name"
+            ],
+            "orders": [],
+            "createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `index_FilterProfile_dataSource_name` ON `${TABLE_NAME}` (`dataSource`, `name`)"
+          }
+        ]
+      },
+      {
+        "tableName": "RecentAutocompletePlace",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` TEXT NOT NULL, `dataSource` TEXT NOT NULL, `timestamp` INTEGER NOT NULL, `primaryText` TEXT NOT NULL, `secondaryText` TEXT NOT NULL, `latLng` TEXT NOT NULL, `viewport` TEXT, `types` TEXT NOT NULL, PRIMARY KEY(`id`, `dataSource`))",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "dataSource",
+            "columnName": "dataSource",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "timestamp",
+            "columnName": "timestamp",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "primaryText",
+            "columnName": "primaryText",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "secondaryText",
+            "columnName": "secondaryText",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "latLng",
+            "columnName": "latLng",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "viewport",
+            "columnName": "viewport",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "types",
+            "columnName": "types",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "id",
+            "dataSource"
+          ]
+        }
+      },
+      {
+        "tableName": "GEPlug",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`name` TEXT NOT NULL, PRIMARY KEY(`name`))",
+        "fields": [
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "name"
+          ]
+        }
+      },
+      {
+        "tableName": "GENetwork",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`name` TEXT NOT NULL, PRIMARY KEY(`name`))",
+        "fields": [
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "name"
+          ]
+        }
+      },
+      {
+        "tableName": "GEChargeCard",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER NOT NULL, `name` TEXT NOT NULL, `url` TEXT NOT NULL, PRIMARY KEY(`id`))",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "url",
+            "columnName": "url",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "id"
+          ]
+        }
+      },
+      {
+        "tableName": "OCMConnectionType",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER NOT NULL, `title` TEXT NOT NULL, `formalName` TEXT, `discontinued` INTEGER, `obsolete` INTEGER, PRIMARY KEY(`id`))",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "title",
+            "columnName": "title",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "formalName",
+            "columnName": "formalName",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "discontinued",
+            "columnName": "discontinued",
+            "affinity": "INTEGER"
+          },
+          {
+            "fieldPath": "obsolete",
+            "columnName": "obsolete",
+            "affinity": "INTEGER"
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "id"
+          ]
+        }
+      },
+      {
+        "tableName": "OCMCountry",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER NOT NULL, `isoCode` TEXT NOT NULL, `continentCode` TEXT, `title` TEXT NOT NULL, PRIMARY KEY(`id`))",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "isoCode",
+            "columnName": "isoCode",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "continentCode",
+            "columnName": "continentCode",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "title",
+            "columnName": "title",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "id"
+          ]
+        }
+      },
+      {
+        "tableName": "OCMOperator",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER NOT NULL, `websiteUrl` TEXT, `title` TEXT NOT NULL, `contactEmail` TEXT, `contactTelephone1` TEXT, `contactTelephone2` TEXT, PRIMARY KEY(`id`))",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "websiteUrl",
+            "columnName": "websiteUrl",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "title",
+            "columnName": "title",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "contactEmail",
+            "columnName": "contactEmail",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "contactTelephone1",
+            "columnName": "contactTelephone1",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "contactTelephone2",
+            "columnName": "contactTelephone2",
+            "affinity": "TEXT"
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "id"
+          ]
+        }
+      },
+      {
+        "tableName": "OSMNetwork",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`name` TEXT NOT NULL, PRIMARY KEY(`name`))",
+        "fields": [
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "name"
+          ]
+        }
+      },
+      {
+        "tableName": "SavedRegion",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`region` BLOB NOT NULL, `dataSource` TEXT NOT NULL, `timeRetrieved` INTEGER NOT NULL, `filters` TEXT, `isDetailed` INTEGER NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT)",
+        "fields": [
+          {
+            "fieldPath": "region",
+            "columnName": "region",
+            "affinity": "BLOB",
+            "notNull": true
+          },
+          {
+            "fieldPath": "dataSource",
+            "columnName": "dataSource",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "timeRetrieved",
+            "columnName": "timeRetrieved",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "filters",
+            "columnName": "filters",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "isDetailed",
+            "columnName": "isDetailed",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER"
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "id"
+          ]
+        },
+        "indices": [
+          {
+            "name": "index_SavedRegion_filters_dataSource",
+            "unique": false,
+            "columnNames": [
+              "filters",
+              "dataSource"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_SavedRegion_filters_dataSource` ON `${TABLE_NAME}` (`filters`, `dataSource`)"
+          }
+        ]
+      }
+    ],
+    "setupQueries": [
+      "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
+      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, '84f71cce385c444726ba336834ddf6b4')"
+    ]
+  }
+}

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

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="chargeprice_api_url">https://staging-api.chargeprice.app/v1/</string>
-    <string name="chargeprice_key">20c0d68918c9dc96c564784b711a6570</string>
-</resources>

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

@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="app_name">EVMap</string>
+    <string name="app_name">EVMap (debug)</string>
 </resources>

app/src/foss/res/values-sv/strings.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="donations_info" formatted="false">Tycker du att EVMap är praktisk? Stöd utvecklingen genom att skicka en donation till utvecklaren.</string>
+    <string name="donations_info" formatted="false">Har du nytta av EVMap? Stöd utvecklingen genom att skicka en donation till utvecklaren.</string>
     <string name="donate_paypal">Donera med PayPal</string>
     <string name="data_sources_hint">Kartdata i appen tillhandahålls av OpenStreetMap.</string>
 </resources>

app/src/google/java/net/vonforst/evmap/adapter/DonationAdapter.kt

@@ -1,8 +1,25 @@
 package net.vonforst.evmap.adapter
 
+import android.view.LayoutInflater
+import android.view.ViewGroup
+import androidx.viewbinding.ViewBinding
 import net.vonforst.evmap.R
+import net.vonforst.evmap.databinding.ItemDonationBinding
 import net.vonforst.evmap.viewmodel.DonationItem
 
-class DonationAdapter() : DataBindingAdapter<DonationItem>() {
+class DonationAdapter : DataBindingAdapter<DonationItem>() {
     override fun getItemViewType(position: Int): Int = R.layout.item_donation
+
+    override fun createBinding(
+        inflater: LayoutInflater,
+        parent: ViewGroup,
+        viewType: Int
+    ): ViewBinding = ItemDonationBinding.inflate(inflater, parent, false)
+
+    override fun bind(holder: ViewHolder, item: DonationItem) {
+        super.bind(holder, item)
+        val binding = holder.binding as ItemDonationBinding
+        binding.txtName.text = item.product.title
+        binding.txtPrice.text = item.product.oneTimePurchaseOfferDetails?.formattedPrice
+    }
 }

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

@@ -19,7 +19,6 @@ 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.io.IOException
 import java.util.concurrent.ExecutionException
 import kotlin.math.sqrt
@@ -53,7 +52,7 @@ class GooglePlacesAutocompleteProvider(val context: Context) : AutocompleteProvi
                     it.getSecondaryText(bold),
                     it.placeId,
                     it.distanceMeters?.toDouble(),
-                    it.placeTypes.map { AutocompletePlaceType.valueOf(it.name) })
+                    it.types.mapNotNull { AutocompletePlaceType.valueOfOrNull(it.uppercase()) })
             }
         } catch (e: ExecutionException) {
             val cause = e.cause
@@ -75,12 +74,13 @@ class GooglePlacesAutocompleteProvider(val context: Context) : AutocompleteProvi
 
     override suspend fun getDetails(id: String): PlaceWithBounds {
         val request =
-            FetchPlaceRequest.builder(id, listOf(Place.Field.LAT_LNG, Place.Field.VIEWPORT)).build()
+            FetchPlaceRequest.builder(id, listOf(Place.Field.LOCATION, Place.Field.VIEWPORT))
+                .build()
         try {
             val place = client.fetchPlace(request).await().place
             token = AutocompleteSessionToken.newInstance()
             return PlaceWithBounds(
-                AnyMapAdapter.adapt(place.latLng),
+                AnyMapAdapter.adapt(place.location),
                 AnyMapAdapter.adapt(place.viewport)
             )
         } catch (e: ApiException) {

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

@@ -5,7 +5,6 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import androidx.appcompat.app.AppCompatActivity
-import androidx.databinding.DataBindingUtil
 import androidx.fragment.app.viewModels
 import androidx.navigation.fragment.findNavController
 import androidx.navigation.ui.setupWithNavController
@@ -21,7 +20,9 @@ import net.vonforst.evmap.adapter.SingleViewAdapter
 import net.vonforst.evmap.databinding.FragmentDonateBinding
 import net.vonforst.evmap.databinding.FragmentDonateHeaderBinding
 import net.vonforst.evmap.databinding.FragmentDonateReferralBinding
+import net.vonforst.evmap.ui.goneUnless
 import net.vonforst.evmap.viewmodel.DonateViewModel
+import net.vonforst.evmap.viewmodel.Status
 
 class DonateFragment : DonateFragmentBase() {
     private lateinit var binding: FragmentDonateBinding
@@ -40,9 +41,7 @@ class DonateFragment : DonateFragmentBase() {
         container: ViewGroup?,
         savedInstanceState: Bundle?
     ): View {
-        binding = DataBindingUtil.inflate(inflater, R.layout.fragment_donate, container, false)
-        binding.lifecycleOwner = this
-        binding.vm = vm
+        binding = FragmentDonateBinding.inflate(inflater, container, false)
 
         header = FragmentDonateHeaderBinding.inflate(inflater, container, false)
         referrals = FragmentDonateReferralBinding.inflate(inflater, container, false)
@@ -75,6 +74,7 @@ class DonateFragment : DonateFragmentBase() {
 
         vm.products.observe(viewLifecycleOwner) {
             donationAdapter.submitList(it.data)
+            binding.progressBar.visibility = goneUnless(it.status == Status.LOADING)
         }
 
         vm.purchaseSuccessful.observe(viewLifecycleOwner) {

app/src/google/java/net/vonforst/evmap/viewmodel/DonateViewModel.kt

@@ -4,8 +4,18 @@ import android.app.Activity
 import android.app.Application
 import androidx.lifecycle.AndroidViewModel
 import androidx.lifecycle.MutableLiveData
-import com.android.billingclient.api.*
+import com.android.billingclient.api.BillingClient
 import com.android.billingclient.api.BillingClient.ProductType
+import com.android.billingclient.api.BillingClientStateListener
+import com.android.billingclient.api.BillingFlowParams
+import com.android.billingclient.api.BillingResult
+import com.android.billingclient.api.ConsumeParams
+import com.android.billingclient.api.PendingPurchasesParams
+import com.android.billingclient.api.ProductDetails
+import com.android.billingclient.api.Purchase
+import com.android.billingclient.api.PurchasesUpdatedListener
+import com.android.billingclient.api.QueryProductDetailsParams
+import com.android.billingclient.api.QueryPurchasesParams
 import net.vonforst.evmap.BuildConfig
 import net.vonforst.evmap.adapter.Equatable
 
@@ -13,7 +23,7 @@ class DonateViewModel(application: Application) : AndroidViewModel(application),
     PurchasesUpdatedListener {
     private var billingClient = BillingClient.newBuilder(application)
         .setListener(this)
-        .enablePendingPurchases()
+        .enablePendingPurchases(PendingPurchasesParams.newBuilder().enableOneTimeProducts().build())
         .build()
     
     val products: MutableLiveData<Resource<List<DonationItem>>> by lazy {
@@ -67,6 +77,7 @@ class DonateViewModel(application: Application) : AndroidViewModel(application),
         billingClient.queryProductDetailsAsync(params) { result, details ->
             if (result.responseCode == BillingClient.BillingResponseCode.OK) {
                 products.postValue(Resource.success(details
+                    .productDetailsList
                     .sortedBy { it.oneTimePurchaseOfferDetails!!.priceAmountMicros }
                     .map { DonationItem(it) }
                 ))

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

@@ -1,23 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools">
-
-    <data>
-
-        <import type="net.vonforst.evmap.viewmodel.DonateViewModel" />
-
-        <import type="net.vonforst.evmap.viewmodel.Status" />
-
-        <variable
-            name="vm"
-            type="DonateViewModel" />
-    </data>
-
-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:id="@+id/linearLayout2"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/linearLayout2"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
 
         <com.google.android.material.appbar.AppBarLayout
             android:id="@+id/toolbar_container"
@@ -46,15 +33,13 @@
             tools:itemCount="1"
             tools:listitem="@layout/fragment_donate_preview" />
 
-        <ProgressBar
-            android:id="@+id/progressBar3"
-            style="?android:attr/progressBarStyle"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="@+id/products_list"
-            app:goneUnless="@{vm.products.status == Status.LOADING}" />
-    </androidx.constraintlayout.widget.ConstraintLayout>
-</layout>
+    <ProgressBar
+        android:id="@+id/progressBar"
+        style="?android:attr/progressBarStyle"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="@+id/products_list" />
+</androidx.constraintlayout.widget.ConstraintLayout>

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

@@ -1,21 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools">
-
-    <data>
-
-        <variable
-            name="item"
-            type="net.vonforst.evmap.viewmodel.DonationItem" />
-    </data>
-
-    <androidx.cardview.widget.CardView
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginLeft="16dp"
-        android:layout_marginRight="16dp"
-        android:layout_marginBottom="16dp">
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_marginLeft="16dp"
+    android:layout_marginRight="16dp"
+    android:layout_marginBottom="16dp">
 
         <androidx.constraintlayout.widget.ConstraintLayout
             android:layout_width="match_parent"
@@ -24,32 +15,27 @@
             android:padding="16dp">
 
             <TextView
-                android:id="@+id/textView15"
+                android:id="@+id/txtName"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_marginEnd="8dp"
-                android:text="@{item.product.title}"
                 android:textAppearance="@style/TextAppearance.Material3.BodyLarge"
                 app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintEnd_toStartOf="@+id/textView21"
+                app:layout_constraintEnd_toStartOf="@+id/txtPrice"
                 app:layout_constraintHorizontal_bias="0.0"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="parent"
                 tools:text="Spende (extrem langer Beschreibungstext)" />
 
             <TextView
-                android:id="@+id/textView21"
+                android:id="@+id/txtPrice"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="@{item.product.oneTimePurchaseOfferDetails.formattedPrice}"
                 android:textAppearance="@style/TextAppearance.Material3.BodyLarge"
                 android:textColor="?android:textColorSecondary"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintTop_toTopOf="parent"
                 tools:text="1,00 €" />
-
-
         </androidx.constraintlayout.widget.ConstraintLayout>
-    </androidx.cardview.widget.CardView>
-</layout>
+</androidx.cardview.widget.CardView>

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

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="donations_info" formatted="false">Tycker du att EVMap är praktisk? Stöd utvecklingen genom att skicka en donation till utvecklaren.\n\nGoogle tar 15% av alla donationer.</string>
+    <string name="donations_info" formatted="false">Har du nytta av EVMap? Stöd utvecklingen genom att skicka en donation till utvecklaren.\n\nGoogle tar 15% av alla donationer.</string>
     <string name="data_sources_hint">I inställningarna kan du välja mellan Google Maps och OpenStreetMap som kartleverantör.</string>
 </resources>

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

@@ -9,12 +9,14 @@ import android.net.Uri
 import android.os.Build
 import android.os.Bundle
 import android.os.SystemClock
+import android.util.Log
 import android.view.View
 import android.widget.Toast
 import androidx.appcompat.app.AppCompatActivity
 import androidx.browser.customtabs.CustomTabColorSchemeParams
 import androidx.browser.customtabs.CustomTabsIntent
 import androidx.core.content.ContextCompat
+import androidx.core.net.toUri
 import androidx.core.splashscreen.SplashScreen
 import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen
 import androidx.core.view.ViewCompat
@@ -254,11 +256,9 @@ class MapsActivity : AppCompatActivity(),
     fun showLocation(charger: ChargeLocation, rootView: View) {
         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 = "geo:${coord.lat},${coord.lng}?q=${coord.lat},${coord.lng}(${
+            Uri.encode(charger.name)
+        })".toUri()
 
         val resolveInfo =
             packageManager.resolveActivity(intent, PackageManager.MATCH_DEFAULT_ONLY)
@@ -277,11 +277,19 @@ class MapsActivity : AppCompatActivity(),
         try {
             startActivity(intent)
         } catch (e: ActivityNotFoundException) {
-            Snackbar.make(
-                rootView,
-                R.string.no_maps_app_found,
-                Snackbar.LENGTH_SHORT
-            ).show()
+            try {
+                // if the intent is not working with an explicit package for some reason,
+                // as a last resort, try again without package
+                intent.setPackage(null)
+                startActivity(intent)
+            } catch (e: ActivityNotFoundException) {
+                Snackbar.make(
+                    rootView,
+                    R.string.no_maps_app_found,
+                    Snackbar.LENGTH_SHORT
+                ).show()
+                Log.e("MapsActivity", "no navigation app found")
+            }
         }
     }
 
@@ -294,12 +302,12 @@ class MapsActivity : AppCompatActivity(),
             )
             .build()
 
-        val uri = Uri.parse(url)
+        val uri = url.toUri()
         val viewIntent = Intent(Intent.ACTION_VIEW, uri)
         if (preferBrowser) {
             // EVMap may be set as default app for this link, but we want to open it in a browser
             // try to find default web browser
-            val browserIntent = Intent(Intent.ACTION_VIEW, Uri.parse("http://"))
+            val browserIntent = Intent(Intent.ACTION_VIEW, "http://".toUri())
             val resolveInfo =
                 packageManager.resolveActivity(browserIntent, PackageManager.MATCH_DEFAULT_ONLY)
             val pkg = resolveInfo?.activityInfo?.packageName.takeIf { it != "android" }
@@ -334,20 +342,37 @@ class MapsActivity : AppCompatActivity(),
         try {
             intent.launchUrl(this, uri)
         } catch (e: ActivityNotFoundException) {
-            Snackbar.make(
-                rootView,
-                R.string.no_browser_app_found,
-                Snackbar.LENGTH_SHORT
-            ).show()
+            try {
+                // if the intent is not working with an explicit package for some reason,
+                // as a last resort, try again without package
+                intent.intent.setPackage(null)
+                intent.launchUrl(this, uri)
+            } catch (e: ActivityNotFoundException) {
+                Snackbar.make(
+                    rootView,
+                    R.string.no_browser_app_found,
+                    Snackbar.LENGTH_SHORT
+                ).show()
+                Log.e("MapsActivity", "no web browser found")
+            }
         }
     }
 
-    fun shareUrl(url: String) {
+    fun shareUrl(url: String, rootView: View) {
         val intent = Intent(Intent.ACTION_SEND).apply {
             type = "text/plain"
             putExtra(Intent.EXTRA_TEXT, url)
         }
-        startActivity(intent)
+        try {
+            startActivity(intent)
+        } catch (e: ActivityNotFoundException) {
+            Snackbar.make(
+                rootView,
+                R.string.no_share_app_found,
+                Snackbar.LENGTH_SHORT
+            ).show()
+            Log.e("MapsActivity", "no sharing app found")
+        }
     }
 
     override fun onPreferenceStartFragment(

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

@@ -1,73 +1,73 @@
 package net.vonforst.evmap.adapter
 
+import android.content.res.ColorStateList
 import android.view.LayoutInflater
-import android.view.View
 import android.view.ViewGroup
-import androidx.databinding.DataBindingUtil
-import androidx.databinding.ViewDataBinding
 import androidx.recyclerview.widget.DiffUtil
-import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.ListAdapter
 import androidx.recyclerview.widget.RecyclerView
-import com.google.android.material.chip.Chip
-import net.vonforst.evmap.BR
+import androidx.viewbinding.ViewBinding
 import net.vonforst.evmap.R
 import net.vonforst.evmap.api.availability.ChargepointStatus
-import net.vonforst.evmap.api.chargeprice.ChargePrice
-import net.vonforst.evmap.api.chargeprice.ChargepriceCar
-import net.vonforst.evmap.api.chargeprice.ChargepriceChargepointMeta
-import net.vonforst.evmap.api.chargeprice.ChargepriceTag
-import net.vonforst.evmap.databinding.ItemChargepriceBinding
-import net.vonforst.evmap.databinding.ItemChargepriceVehicleChipBinding
-import net.vonforst.evmap.databinding.ItemConnectorButtonBinding
+import net.vonforst.evmap.api.iconForPlugType
+import net.vonforst.evmap.databinding.DialogConnectorDetailsItemBinding
+import net.vonforst.evmap.databinding.ItemConnectorBinding
 import net.vonforst.evmap.model.Chargepoint
-import net.vonforst.evmap.ui.CheckableConstraintLayout
+import net.vonforst.evmap.ui.availabilityColor
+import net.vonforst.evmap.ui.availabilityText
+import net.vonforst.evmap.ui.goneUnless
 import java.time.Instant
+import java.util.Locale
 
 interface Equatable {
     override fun equals(other: Any?): Boolean
 }
 
 abstract class DataBindingAdapter<T : Equatable>(getKey: ((T) -> Any)? = null) :
-    ListAdapter<T, DataBindingAdapter.ViewHolder<T>>(DiffCallback(getKey)) {
+    ListAdapter<T, DataBindingAdapter.ViewHolder>(DiffCallback(getKey)) {
 
     var onClickListener: ((T) -> Unit)? = null
     var onLongClickListener: ((T) -> Boolean)? = null
 
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder<T> {
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder {
         val layoutInflater = LayoutInflater.from(parent.context)
-        val binding =
-            DataBindingUtil.inflate<ViewDataBinding>(layoutInflater, viewType, parent, false)
-        return ViewHolder(binding)
+        return ViewHolder(createBinding(layoutInflater, parent, viewType))
     }
 
-    override fun onBindViewHolder(holder: ViewHolder<T>, position: Int) =
+    override fun onBindViewHolder(holder: ViewHolder, position: Int) =
         bind(holder, getItem(position))
 
-    class ViewHolder<T>(val binding: ViewDataBinding) :
-        RecyclerView.ViewHolder(binding.root) {
-    }
+    protected abstract fun createBinding(
+        inflater: LayoutInflater,
+        parent: ViewGroup,
+        viewType: Int
+    ): ViewBinding
 
-    open fun bind(holder: ViewHolder<T>, item: T) {
-        holder.binding.setVariable(BR.item, item)
-        holder.binding.executePendingBindings()
+    class ViewHolder(val binding: ViewBinding) : RecyclerView.ViewHolder(binding.root)
+
+    open fun bind(holder: ViewHolder, item: T) {
         if (onClickListener != null) {
             holder.binding.root.setOnClickListener {
                 val listener = onClickListener ?: return@setOnClickListener
                 listener(item)
             }
+        } else {
+            holder.binding.root.setOnClickListener(null)
         }
         if (onLongClickListener != null) {
             holder.binding.root.setOnLongClickListener {
                 val listener = onLongClickListener ?: return@setOnLongClickListener false
                 return@setOnLongClickListener listener(item)
             }
+        } else {
+            holder.binding.root.setOnLongClickListener(null)
         }
     }
 
-    class DiffCallback<T : Equatable>(val getKey: ((T) -> Any)?) : DiffUtil.ItemCallback<T>() {
+    class DiffCallback<T : Equatable>(private val getKey: ((T) -> Any)?) :
+        DiffUtil.ItemCallback<T>() {
         override fun areItemsTheSame(oldItem: T, newItem: T): Boolean = if (getKey != null) {
-            (getKey)(oldItem) == (getKey)(newItem)
+            getKey(oldItem) == getKey(newItem)
         } else {
             oldItem === newItem
         }
@@ -90,10 +90,46 @@ class ConnectorAdapter : DataBindingAdapter<ConnectorAdapter.ChargepointWithAvai
     data class ChargepointWithAvailability(
         val chargepoint: Chargepoint,
         val status: List<ChargepointStatus>?
-    ) :
-        Equatable
+    ) : Equatable
 
     override fun getItemViewType(position: Int): Int = R.layout.item_connector
+
+    override fun createBinding(
+        inflater: LayoutInflater,
+        parent: ViewGroup,
+        viewType: Int
+    ): ViewBinding = ItemConnectorBinding.inflate(inflater, parent, false)
+
+    override fun bind(holder: ViewHolder, item: ChargepointWithAvailability) {
+        super.bind(holder, item)
+        val binding = holder.binding as ItemConnectorBinding
+        val context = binding.root.context
+        val locale = Locale.getDefault()
+
+        binding.imageView.setImageResource(iconForPlugType(item.chargepoint.type))
+        binding.imageView.contentDescription = item.chargepoint.type
+        binding.imageView.imageTintList =
+            ColorStateList.valueOf(availabilityColor(item.status, context))
+
+        binding.txtNumber.text = String.format(locale, "x %d", item.chargepoint.count)
+        binding.txtNumber.visibility = goneUnless(item.status == null)
+
+        if (item.status != null) {
+            binding.txtStatus.text = String.format(
+                locale,
+                "%s/%d",
+                availabilityText(item.status),
+                item.chargepoint.count
+            )
+            binding.txtStatus.backgroundTintList =
+                ColorStateList.valueOf(availabilityColor(item.status, context))
+        }
+        binding.txtStatus.visibility = goneUnless(item.status != null)
+
+        binding.txtPower.text = item.chargepoint.formatPower(locale)
+        binding.txtPower.visibility = goneUnless(item.chargepoint.hasKnownPower())
+        binding.txtPower.setTextColor(availabilityColor(item.status, context))
+    }
 }
 
 class ConnectorDetailsAdapter : DataBindingAdapter<ConnectorDetailsAdapter.ConnectorDetails>() {
@@ -102,145 +138,32 @@ class ConnectorDetailsAdapter : DataBindingAdapter<ConnectorDetailsAdapter.Conne
         val evseId: String?,
         val label: String?,
         val lastChange: Instant?
-    ) :
-        Equatable
+    ) : Equatable
 
     override fun getItemViewType(position: Int): Int = R.layout.dialog_connector_details_item
-}
 
-class ChargepriceAdapter :
-    DataBindingAdapter<ChargePrice>() {
+    override fun createBinding(
+        inflater: LayoutInflater,
+        parent: ViewGroup,
+        viewType: Int
+    ): ViewBinding = DialogConnectorDetailsItemBinding.inflate(inflater, parent, false)
 
-    val viewPool = RecyclerView.RecycledViewPool()
-    var meta: ChargepriceChargepointMeta? = null
-        set(value) {
-            field = value
-            notifyDataSetChanged()
-        }
-    var myTariffs: Set<String>? = null
-        set(value) {
-            field = value
-            notifyDataSetChanged()
-        }
-    var myTariffsAll: Boolean? = null
-        set(value) {
-            field = value
-            notifyDataSetChanged()
-        }
-
-    override fun getItemViewType(position: Int): Int = R.layout.item_chargeprice
-
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder<ChargePrice> {
-        val holder = super.onCreateViewHolder(parent, viewType)
-        val binding = holder.binding as ItemChargepriceBinding
-        binding.rvTags.apply {
-            adapter = ChargepriceTagsAdapter()
-            layoutManager =
-                LinearLayoutManager(context, LinearLayoutManager.VERTICAL, false).apply {
-                    recycleChildrenOnDetach = true
-                }
-            itemAnimator = null
-            setRecycledViewPool(viewPool)
-        }
-        return holder
-    }
-
-    override fun bind(holder: ViewHolder<ChargePrice>, item: ChargePrice) {
+    override fun bind(holder: ViewHolder, item: ConnectorDetails) {
         super.bind(holder, item)
-        (holder.binding as ItemChargepriceBinding).apply {
-            this.meta = this@ChargepriceAdapter.meta
-            this.myTariffs = this@ChargepriceAdapter.myTariffs
-            this.myTariffsAll = this@ChargepriceAdapter.myTariffsAll
+        val binding = holder.binding as DialogConnectorDetailsItemBinding
+        val context = binding.root.context
+
+        binding.imageView.imageTintList =
+            ColorStateList.valueOf(availabilityColor(item.status, context))
+        binding.imageView.contentDescription = availabilityText(item.status, null, context)
+
+        binding.txtEvseid.text = when {
+            item.label != null && item.evseId != null -> "${item.label} · ${item.evseId}"
+            item.label != null -> item.label
+            else -> item.evseId ?: ""
         }
+
+        binding.txtStatus.text = availabilityText(item.status, item.lastChange, context)
+        binding.txtStatus.visibility = goneUnless(item.status != null)
     }
-}
-
-class CheckableConnectorAdapter : DataBindingAdapter<Chargepoint>() {
-    private var checkedItem: Int? = 0
-
-    var enabledConnectors: List<String>? = null
-        get() = field
-        set(value) {
-            field = value
-            checkedItem?.let {
-                if (value != null && getItem(it).type !in value) {
-                    checkedItem = currentList.indexOfFirst {
-                        it.type in value
-                    }.takeIf { it != -1 }
-                    onCheckedItemChangedListener?.invoke(getCheckedItem())
-                }
-            }
-            notifyDataSetChanged()
-        }
-
-    override fun getItemViewType(position: Int): Int = R.layout.item_connector_button
-
-    override fun onBindViewHolder(holder: ViewHolder<Chargepoint>, position: Int) {
-        val item = getItem(position)
-        super.bind(holder, item)
-        val binding = holder.binding as ItemConnectorButtonBinding
-        binding.enabled = enabledConnectors?.let { item.type in it } ?: true
-        val root = binding.root as CheckableConstraintLayout
-        root.setOnCheckedChangeListener { _, _ -> }
-        root.isChecked = checkedItem == position
-        root.setOnClickListener {
-            root.isChecked = true
-        }
-        root.setOnCheckedChangeListener { _, checked: Boolean ->
-            if (checked) {
-                checkedItem = holder.bindingAdapterPosition.takeIf { it != -1 }
-                root.post {
-                    notifyDataSetChanged()
-                }
-                getCheckedItem()?.let { onCheckedItemChangedListener?.invoke(it) }
-            }
-        }
-    }
-
-    fun getCheckedItem(): Chargepoint? = checkedItem?.let { getItem(it) }
-
-    fun setCheckedItem(item: Chargepoint?) {
-        checkedItem = item?.let { currentList.indexOf(item) }.takeIf { it != -1 }
-    }
-
-    var onCheckedItemChangedListener: ((Chargepoint?) -> Unit)? = null
-}
-
-class ChargepriceTagsAdapter() :
-    DataBindingAdapter<ChargepriceTag>() {
-    override fun getItemViewType(position: Int): Int = R.layout.item_chargeprice_tag
-}
-
-class CheckableChargepriceCarAdapter : DataBindingAdapter<ChargepriceCar>() {
-    private var checkedItem: ChargepriceCar? = null
-
-    override fun getItemViewType(position: Int): Int = R.layout.item_chargeprice_vehicle_chip
-
-    override fun onBindViewHolder(holder: ViewHolder<ChargepriceCar>, position: Int) {
-        val item = getItem(position)
-        super.bind(holder, item)
-        val binding = holder.binding as ItemChargepriceVehicleChipBinding
-        val root = binding.root as Chip
-        root.isChecked = checkedItem == item
-        root.setOnClickListener {
-            root.isChecked = true
-        }
-        root.setOnCheckedChangeListener { _, checked: Boolean ->
-            if (checked && item != checkedItem) {
-                checkedItem = item
-                root.post {
-                    notifyDataSetChanged()
-                    onCheckedItemChangedListener?.invoke(getCheckedItem()!!)
-                }
-            }
-        }
-    }
-
-    fun getCheckedItem(): ChargepriceCar? = checkedItem
-
-    fun setCheckedItem(item: ChargepriceCar?) {
-        checkedItem = item
-    }
-
-    var onCheckedItemChangedListener: ((ChargepriceCar?) -> Unit)? = null
 }

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

@@ -4,25 +4,36 @@ import android.content.Context
 import android.graphics.Typeface
 import android.text.Spannable
 import android.text.style.StyleSpan
+import android.text.util.Linkify
+import android.transition.TransitionManager
+import android.view.LayoutInflater
+import android.view.ViewGroup
 import androidx.core.text.HtmlCompat
 import androidx.core.text.buildSpannedString
+import androidx.viewbinding.ViewBinding
 import net.vonforst.evmap.R
 import net.vonforst.evmap.api.availability.tesla.Pricing
 import net.vonforst.evmap.api.availability.tesla.Rates
-import net.vonforst.evmap.bold
+import net.vonforst.evmap.databinding.ItemDetailBinding
+import net.vonforst.evmap.databinding.ItemDetailOpeninghoursBinding
 import net.vonforst.evmap.joinToSpannedString
 import net.vonforst.evmap.model.ChargeCard
 import net.vonforst.evmap.model.ChargeCardId
 import net.vonforst.evmap.model.ChargeLocation
-import net.vonforst.evmap.model.Coordinate
 import net.vonforst.evmap.model.OpeningHoursDays
 import net.vonforst.evmap.plus
+import net.vonforst.evmap.ui.applySelectableItemBackground
 import net.vonforst.evmap.ui.currency
+import net.vonforst.evmap.ui.goneUnless
+import net.vonforst.evmap.ui.setLinkify
 import net.vonforst.evmap.utils.formatDMS
 import net.vonforst.evmap.utils.formatDecimal
+import java.time.DayOfWeek
 import java.time.ZoneId
 import java.time.format.DateTimeFormatter
 import java.time.format.FormatStyle
+import java.time.format.TextStyle
+import java.util.Locale
 
 class DetailsAdapter : DataBindingAdapter<DetailsAdapter.Detail>() {
     data class Detail(
@@ -37,12 +48,132 @@ class DetailsAdapter : DataBindingAdapter<DetailsAdapter.Detail>() {
 
     override fun getItemViewType(position: Int): Int {
         val item = getItem(position)
-        if (item.hoursDays != null) {
-            return R.layout.item_detail_openinghours
+        return if (item.hoursDays != null) {
+            R.layout.item_detail_openinghours
         } else {
-            return R.layout.item_detail
+            R.layout.item_detail
         }
     }
+
+    override fun createBinding(
+        inflater: LayoutInflater,
+        parent: ViewGroup,
+        viewType: Int
+    ): ViewBinding = when (viewType) {
+        R.layout.item_detail_openinghours -> ItemDetailOpeninghoursBinding.inflate(
+            inflater,
+            parent,
+            false
+        )
+
+        else -> ItemDetailBinding.inflate(inflater, parent, false)
+    }
+
+    override fun bind(holder: ViewHolder, item: Detail) {
+        super.bind(holder, item)
+        if (holder.binding is ItemDetailBinding) {
+            bindNormal(holder.binding, item)
+        } else {
+            bindOpeningHours(holder.binding as ItemDetailOpeninghoursBinding, item)
+        }
+    }
+
+    private fun bindNormal(binding: ItemDetailBinding, item: Detail) {
+        binding.root.isClickable = item.clickable
+        applySelectableItemBackground(binding.root, item.clickable)
+
+        binding.imgIcon.setImageResource(item.icon)
+        binding.imgIcon.contentDescription =
+            binding.root.context.getString(item.contentDescription)
+        binding.txtTariff.text = item.text
+
+        binding.txtProvider.text = item.detailText
+        binding.txtProvider.visibility = goneUnless(item.detailText != null)
+        setLinkify(
+            binding.txtProvider,
+            if (item.links) Linkify.WEB_URLS or Linkify.PHONE_NUMBERS else 0,
+            item.detailText
+        )
+    }
+
+    private fun bindOpeningHours(binding: ItemDetailOpeninghoursBinding, item: Detail) {
+        binding.root.isClickable = item.clickable
+        applySelectableItemBackground(binding.root, item.clickable)
+
+        binding.imageView3.setImageResource(item.icon)
+        binding.imageView3.contentDescription =
+            binding.root.context.getString(item.contentDescription)
+        binding.txtTariff.text = item.text
+
+        binding.txtProvider.text = item.detailText
+        binding.txtProvider.visibility = goneUnless(item.detailText != null)
+        setLinkify(
+            binding.txtProvider,
+            if (item.links) Linkify.WEB_URLS or Linkify.PHONE_NUMBERS else 0,
+            item.detailText
+        )
+
+        val toggleMarginTop = binding.root.resources.getDimensionPixelSize(
+            if (item.detailText != null) {
+                R.dimen.expand_toggle_padding_large
+            } else {
+                R.dimen.expand_toggle_padding_small
+            }
+        )
+        val toggleLayoutParams = binding.expandToggle.layoutParams
+        if (toggleLayoutParams is ViewGroup.MarginLayoutParams) {
+            toggleLayoutParams.topMargin = toggleMarginTop
+            binding.expandToggle.layoutParams = toggleLayoutParams
+        }
+
+        val days = item.hoursDays
+        val expanded = days != null
+        binding.expandToggle.visibility =
+            if (expanded) android.view.View.VISIBLE else android.view.View.GONE
+        if (!expanded) return
+
+        bindDay(binding.hoursMon, DayOfWeek.MONDAY, days)
+        bindDay(binding.hoursTue, DayOfWeek.TUESDAY, days)
+        bindDay(binding.hoursWed, DayOfWeek.WEDNESDAY, days)
+        bindDay(binding.hoursThu, DayOfWeek.THURSDAY, days)
+        bindDay(binding.hoursFri, DayOfWeek.FRIDAY, days)
+        bindDay(binding.hoursSat, DayOfWeek.SATURDAY, days)
+        bindDay(binding.hoursSun, DayOfWeek.SUNDAY, days)
+        bindDay(binding.hoursHoliday, null, days)
+
+        val toggleListener = android.view.View.OnClickListener {
+            TransitionManager.beginDelayedTransition(binding.container)
+            val show = binding.expandToggle.isChecked
+            val visibility = if (show) android.view.View.VISIBLE else android.view.View.GONE
+            listOf(
+                binding.hoursMon.root,
+                binding.hoursTue.root,
+                binding.hoursWed.root,
+                binding.hoursThu.root,
+                binding.hoursFri.root,
+                binding.hoursSat.root,
+                binding.hoursSun.root,
+                binding.hoursHoliday.root
+            ).forEach { it.visibility = visibility }
+        }
+        binding.expandToggle.setOnClickListener(toggleListener)
+        binding.expandToggle.isChecked = false
+        toggleListener.onClick(binding.expandToggle)
+    }
+
+    private fun bindDay(
+        include: net.vonforst.evmap.databinding.ItemDetailOpeninghoursItemBinding,
+        dayOfWeek: DayOfWeek?,
+        hours: OpeningHoursDays
+    ) {
+        include.txtDay.text = if (dayOfWeek != null) {
+            dayOfWeek.getDisplayName(TextStyle.FULL, Locale.getDefault())
+        } else {
+            include.root.context.getString(R.string.holiday)
+        }
+        include.txtHours.text = hours.getHoursForDayOfWeek(dayOfWeek)?.toString()
+            ?: include.root.context.getString(R.string.closed_unfmt)
+    }
 }
 
 fun buildDetails(
@@ -278,7 +409,9 @@ fun formatChargeCards(
         .mapNotNull {
             val name = chargecardData[it.id]?.name ?: return@mapNotNull null
             if (filteredChargeCards?.contains(it.id) == true) {
-                name.bold()
+                buildSpannedString {
+                    append(name, StyleSpan(Typeface.BOLD), Spannable.SPAN_EXCLUSIVE_EXCLUSIVE)
+                }
             } else {
                 name
             }
@@ -288,4 +421,4 @@ fun formatChargeCards(
     }
 
     return result
-}
+}

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

@@ -1,10 +1,22 @@
 package net.vonforst.evmap.adapter
 
 import android.annotation.SuppressLint
+import android.content.res.ColorStateList
+import android.view.LayoutInflater
+import android.view.ViewGroup
 import android.view.animation.AccelerateInterpolator
+import androidx.viewbinding.ViewBinding
 import net.vonforst.evmap.R
+import net.vonforst.evmap.api.stringProvider
 import net.vonforst.evmap.databinding.ItemFavoriteBinding
+import net.vonforst.evmap.ui.availabilityColor
+import net.vonforst.evmap.ui.availabilityText
+import net.vonforst.evmap.ui.distance
+import net.vonforst.evmap.ui.goneUnless
+import net.vonforst.evmap.ui.invisibleUnless
 import net.vonforst.evmap.viewmodel.FavoritesViewModel
+import net.vonforst.evmap.viewmodel.Status
+import java.util.Locale
 
 class FavoritesAdapter(val onDelete: (FavoritesViewModel.FavoritesListItem) -> Unit) :
     DataBindingAdapter<FavoritesViewModel.FavoritesListItem>() {
@@ -14,16 +26,49 @@ class FavoritesAdapter(val onDelete: (FavoritesViewModel.FavoritesListItem) -> U
 
     override fun getItemViewType(position: Int): Int = R.layout.item_favorite
 
+    override fun createBinding(
+        inflater: LayoutInflater,
+        parent: ViewGroup,
+        viewType: Int
+    ): ViewBinding = ItemFavoriteBinding.inflate(inflater, parent, false)
+
     override fun getItemId(position: Int): Long = getItem(position).fav.favorite.favoriteId
 
     @SuppressLint("ClickableViewAccessibility")
     override fun bind(
-        holder: ViewHolder<FavoritesViewModel.FavoritesListItem>,
+        holder: ViewHolder,
         item: FavoritesViewModel.FavoritesListItem
     ) {
         super.bind(holder, item)
 
         val binding = holder.binding as ItemFavoriteBinding
+        val context = binding.root.context
+        val locale = Locale.getDefault()
+
+        binding.txtName.text = item.charger.name
+        binding.txtAddress.text = item.charger.address?.toString()
+        binding.txtAddress.visibility = invisibleUnless(item.charger.address != null)
+
+        binding.txtConnectors.text =
+            item.charger.formatChargepoints(context.stringProvider(), locale)
+
+        binding.txtDistance.text = distance(item.distance, context)
+        binding.txtDistance.visibility = goneUnless(item.distance != null)
+
+        val availableData = item.available.data
+        if (availableData != null) {
+            binding.txtStatus.text = String.format(
+                locale,
+                "%s/%d",
+                availabilityText(availableData),
+                item.total
+            )
+            binding.txtStatus.backgroundTintList =
+                ColorStateList.valueOf(availabilityColor(availableData, context))
+        }
+        binding.txtStatus.visibility = invisibleUnless(item.available.status == Status.SUCCESS)
+        binding.progressBar.visibility = goneUnless(item.available.status == Status.LOADING)
+
         binding.foreground.translationX = 0f
         binding.btnDelete.setOnClickListener {
             binding.foreground.animate()

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

@@ -1,9 +1,12 @@
 package net.vonforst.evmap.adapter
 
 import android.annotation.SuppressLint
+import android.view.LayoutInflater
 import android.view.MotionEvent
+import android.view.ViewGroup
 import android.view.animation.AccelerateInterpolator
 import androidx.recyclerview.widget.ItemTouchHelper
+import androidx.viewbinding.ViewBinding
 import net.vonforst.evmap.R
 import net.vonforst.evmap.databinding.ItemFilterProfileBinding
 import net.vonforst.evmap.storage.FilterProfile
@@ -17,14 +20,21 @@ class FilterProfilesAdapter(
         setHasStableIds(true)
     }
 
+    override fun createBinding(
+        inflater: LayoutInflater,
+        parent: ViewGroup,
+        viewType: Int
+    ): ViewBinding = ItemFilterProfileBinding.inflate(inflater, parent, false)
+
     @SuppressLint("ClickableViewAccessibility")
     override fun bind(
-        holder: ViewHolder<FilterProfile>,
+        holder: ViewHolder,
         item: FilterProfile
     ) {
         super.bind(holder, item)
 
         val binding = holder.binding as ItemFilterProfileBinding
+        binding.txtName.text = item.name
         binding.handle.setOnTouchListener { _, event ->
             if (event?.action == MotionEvent.ACTION_DOWN) {
                 dragHelper.startDrag(holder)

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

@@ -2,17 +2,27 @@ package net.vonforst.evmap.adapter
 
 import android.view.LayoutInflater
 import android.view.View
+import android.view.ViewGroup
+import android.widget.CompoundButton
+import android.widget.SeekBar
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.view.children
-import androidx.databinding.Observable
+import androidx.viewbinding.ViewBinding
 import com.google.android.material.chip.Chip
-import net.vonforst.evmap.BR
 import net.vonforst.evmap.R
+import net.vonforst.evmap.databinding.ItemFilterBooleanBinding
 import net.vonforst.evmap.databinding.ItemFilterMultipleChoiceBinding
 import net.vonforst.evmap.databinding.ItemFilterMultipleChoiceLargeBinding
 import net.vonforst.evmap.databinding.ItemFilterSliderBinding
 import net.vonforst.evmap.fragment.MultiSelectDialog
-import net.vonforst.evmap.model.*
+import net.vonforst.evmap.model.BooleanFilter
+import net.vonforst.evmap.model.BooleanFilterValue
+import net.vonforst.evmap.model.FilterValue
+import net.vonforst.evmap.model.FilterWithValue
+import net.vonforst.evmap.model.MultipleChoiceFilter
+import net.vonforst.evmap.model.MultipleChoiceFilterValue
+import net.vonforst.evmap.model.SliderFilter
+import net.vonforst.evmap.model.SliderFilterValue
 import kotlin.math.max
 
 class FiltersAdapter : DataBindingAdapter<FilterWithValue<FilterValue>>() {
@@ -36,8 +46,30 @@ class FiltersAdapter : DataBindingAdapter<FilterWithValue<FilterValue>>() {
             is SliderFilter -> R.layout.item_filter_slider
         }
 
+    override fun createBinding(
+        inflater: LayoutInflater,
+        parent: ViewGroup,
+        viewType: Int
+    ): ViewBinding = when (viewType) {
+        R.layout.item_filter_boolean -> ItemFilterBooleanBinding.inflate(inflater, parent, false)
+        R.layout.item_filter_multiple_choice -> ItemFilterMultipleChoiceBinding.inflate(
+            inflater,
+            parent,
+            false
+        )
+
+        R.layout.item_filter_multiple_choice_large -> ItemFilterMultipleChoiceLargeBinding.inflate(
+            inflater,
+            parent,
+            false
+        )
+
+        R.layout.item_filter_slider -> ItemFilterSliderBinding.inflate(inflater, parent, false)
+        else -> error("Unknown viewType: $viewType")
+    }
+
     override fun bind(
-        holder: ViewHolder<FilterWithValue<FilterValue>>,
+        holder: ViewHolder,
         item: FilterWithValue<FilterValue>
     ) {
         super.bind(holder, item)
@@ -45,7 +77,8 @@ class FiltersAdapter : DataBindingAdapter<FilterWithValue<FilterValue>>() {
             is SliderFilterValue -> {
                 setupSlider(
                     holder.binding as ItemFilterSliderBinding,
-                    item.filter as SliderFilter, item.value
+                    item.filter as SliderFilter,
+                    item.value
                 )
             }
             is MultipleChoiceFilterValue -> {
@@ -53,54 +86,75 @@ class FiltersAdapter : DataBindingAdapter<FilterWithValue<FilterValue>>() {
                 if (filter.manyChoices) {
                     setupMultipleChoiceMany(
                         holder.binding as ItemFilterMultipleChoiceLargeBinding,
-                        filter, item.value
+                        filter,
+                        item.value
                     )
                 } else {
                     setupMultipleChoice(
                         holder.binding as ItemFilterMultipleChoiceBinding,
-                        filter, item.value
+                        filter,
+                        item.value
                     )
                 }
             }
             is BooleanFilterValue -> {
+                setupBoolean(holder.binding as ItemFilterBooleanBinding, item)
             }
         }
     }
 
+    private fun setupBoolean(
+        binding: ItemFilterBooleanBinding,
+        item: FilterWithValue<FilterValue>
+    ) {
+        val filter = item.filter as BooleanFilter
+        val value = item.value as BooleanFilterValue
+        binding.txtName.text = filter.name
+        binding.toggle.setOnCheckedChangeListener(null)
+        binding.toggle.isChecked = value.value
+        binding.toggle.setOnCheckedChangeListener { _: CompoundButton, isChecked: Boolean ->
+            value.value = isChecked
+        }
+    }
+
     private fun setupMultipleChoice(
         binding: ItemFilterMultipleChoiceBinding,
         filter: MultipleChoiceFilter,
         value: MultipleChoiceFilterValue
     ) {
-        // TODO: this implementation seems to be buggy
         val inflater = LayoutInflater.from(binding.root.context)
+        binding.txtName.text = filter.name
+
         value.values.toList().forEach {
-            // delete values that cannot be selected anymore
             if (it !in filter.choices.keys) value.values.remove(it)
         }
 
+        var showingAll = false
         fun updateButtons() {
             value.all = value.values == filter.choices.keys
             binding.btnAll.isEnabled = !value.all
             binding.btnNone.isEnabled = value.values.isNotEmpty()
+            binding.chipMore.text = binding.root.context.getString(
+                if (showingAll) R.string.show_less else R.string.show_more
+            )
         }
 
         val chips = mutableMapOf<String, Chip>()
 
-        // reuse existing chips in layout
         val reuseChips = binding.chipGroup.children.filter {
             it.id != R.id.chipMore
         }.toMutableList()
-        binding.chipGroup.children.forEach {
+        binding.chipGroup.children.toList().forEach {
             if (it.id != R.id.chipMore) binding.chipGroup.removeView(it)
         }
+
         filter.choices.entries.sortedByDescending {
             it.key in value.values
         }.sortedByDescending {
             if (filter.commonChoices != null) it.key in filter.commonChoices else false
         }.forEach { choice ->
             var reused = false
-            val chip = if (reuseChips.size > 0) {
+            val chip = if (reuseChips.isNotEmpty()) {
                 reused = true
                 reuseChips.removeAt(0) as Chip
             } else {
@@ -111,6 +165,7 @@ class FiltersAdapter : DataBindingAdapter<FilterWithValue<FilterValue>>() {
                 ) as Chip
             }
             chip.text = choice.value
+            chip.setOnCheckedChangeListener(null)
             chip.isChecked = choice.key in value.values || value.all
             if (value.all && choice.key !in value.values) value.values.add(choice.key)
 
@@ -124,7 +179,7 @@ class FiltersAdapter : DataBindingAdapter<FilterWithValue<FilterValue>>() {
             }
 
             if (filter.commonChoices != null && choice.key !in filter.commonChoices
-                && !(chip.isChecked && !value.all) && !binding.showingAll
+                && !(chip.isChecked && !value.all) && !showingAll
             ) {
                 chip.visibility = View.GONE
             } else {
@@ -134,7 +189,7 @@ class FiltersAdapter : DataBindingAdapter<FilterWithValue<FilterValue>>() {
             if (!reused) binding.chipGroup.addView(chip, binding.chipGroup.childCount - 1)
             chips[choice.key] = chip
         }
-        // delete surplus reusable chips
+
         reuseChips.forEach {
             binding.chipGroup.removeView(it)
         }
@@ -152,16 +207,17 @@ class FiltersAdapter : DataBindingAdapter<FilterWithValue<FilterValue>>() {
             updateButtons()
         }
         binding.chipMore.setOnClickListener {
-            binding.showingAll = !binding.showingAll
+            showingAll = !showingAll
             chips.forEach { (key, chip) ->
                 if (filter.commonChoices != null && key !in filter.commonChoices
-                    && !(chip.isChecked && !value.all) && !binding.showingAll
+                    && !(chip.isChecked && !value.all) && !showingAll
                 ) {
                     chip.visibility = View.GONE
                 } else {
                     chip.visibility = View.VISIBLE
                 }
             }
+            updateButtons()
         }
         updateButtons()
     }
@@ -173,21 +229,36 @@ class FiltersAdapter : DataBindingAdapter<FilterWithValue<FilterValue>>() {
     ) {
         if (value.all) {
             value.values = filter.choices.keys.toMutableSet()
-            binding.notifyPropertyChanged(BR.item)
         }
 
+        binding.txtName.text = filter.name
+        binding.txtDetail.text = binding.root.context.getString(
+            if (value.all) {
+                R.string.all_selected
+            } else {
+                R.string.number_selected
+            },
+            value.values.size
+        )
+
         binding.btnEdit.setOnClickListener {
-            val dialog =
-                MultiSelectDialog.getInstance(
-                    filter.name,
-                    filter.choices,
-                    value.values,
-                    commonChoices = filter.commonChoices
-                )
+            val dialog = MultiSelectDialog.getInstance(
+                filter.name,
+                filter.choices,
+                value.values,
+                commonChoices = filter.commonChoices
+            )
             dialog.okListener = { selected ->
                 value.values = selected.toMutableSet()
                 value.all = value.values == filter.choices.keys
-                binding.item = binding.item
+                binding.txtDetail.text = binding.root.context.getString(
+                    if (value.all) {
+                        R.string.all_selected
+                    } else {
+                        R.string.number_selected
+                    },
+                    value.values.size
+                )
             }
             dialog.show((binding.root.context as AppCompatActivity).supportFragmentManager, null)
         }
@@ -198,24 +269,37 @@ class FiltersAdapter : DataBindingAdapter<FilterWithValue<FilterValue>>() {
         filter: SliderFilter,
         value: SliderFilterValue
     ) {
-        binding.progress =
-            max(filter.inverseMapping(value.value) - filter.min, 0)
-        binding.mappedValue = filter.mapping(binding.progress + filter.min)
+        binding.txtName.text = filter.name
+        val progress = max(filter.inverseMapping(value.value) - filter.min, 0)
+        binding.seekBar.max = filter.max - filter.min
+        binding.seekBar.setOnSeekBarChangeListener(null)
+        binding.seekBar.progress = progress
+        updateSliderValueText(binding, filter, progress)
 
-        binding.addOnPropertyChangedCallback(object :
-            Observable.OnPropertyChangedCallback() {
-            override fun onPropertyChanged(sender: Observable?, propertyId: Int) {
-                when (propertyId) {
-                    BR.progress -> {
-                        val mapped = filter.mapping(binding.progress + filter.min)
-                        value.value = mapped
-                        binding.mappedValue = mapped
-                    }
-                }
+        binding.seekBar.setOnSeekBarChangeListener(object : SeekBar.OnSeekBarChangeListener {
+            override fun onProgressChanged(seekBar: SeekBar?, progress: Int, fromUser: Boolean) {
+                value.value = filter.mapping(progress + filter.min)
+                updateSliderValueText(binding, filter, progress)
             }
+
+            override fun onStartTrackingTouch(seekBar: SeekBar?) = Unit
+            override fun onStopTrackingTouch(seekBar: SeekBar?) = Unit
         })
     }
 
+    private fun updateSliderValueText(
+        binding: ItemFilterSliderBinding,
+        filter: SliderFilter,
+        progress: Int
+    ) {
+        val mappedValue = filter.mapping(progress + filter.min)
+        binding.txtValue.text = if (filter.unit.isNullOrBlank()) {
+            mappedValue.toString()
+        } else {
+            "$mappedValue ${filter.unit}"
+        }
+    }
+
     override fun getItemId(position: Int): Long {
         val key = getItem(position).filter.key
         var value = itemids[key]

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

@@ -1,23 +1,34 @@
 package net.vonforst.evmap.adapter
 
 import android.content.Context
+import android.content.res.ColorStateList
 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 android.widget.BaseAdapter
+import android.widget.Filter
+import android.widget.Filterable
+import android.widget.ImageView
 import androidx.lifecycle.LiveData
 import com.car2go.maps.model.LatLng
 import net.vonforst.evmap.R
-import net.vonforst.evmap.autocomplete.*
+import net.vonforst.evmap.autocomplete.ApiUnavailableException
+import net.vonforst.evmap.autocomplete.AutocompletePlace
+import net.vonforst.evmap.autocomplete.AutocompletePlaceType
+import net.vonforst.evmap.autocomplete.AutocompleteProvider
+import net.vonforst.evmap.autocomplete.MapboxAutocompleteProvider
+import net.vonforst.evmap.autocomplete.PlaceWithBounds
+import net.vonforst.evmap.autocomplete.getAutocompleteProviders
 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 net.vonforst.evmap.ui.distance
+import net.vonforst.evmap.ui.goneUnless
 import java.time.Instant
 
 class PlaceAutocompleteAdapter(val context: Context, val location: LiveData<LatLng>) :
@@ -56,9 +67,8 @@ class PlaceAutocompleteAdapter(val context: Context, val location: LiveData<LatL
         if (getItemViewType(position) == typeItem) {
             val viewHolder: ViewHolder
             if (view == null) {
-                val binding: ItemAutocompleteResultBinding = DataBindingUtil.inflate(
+                val binding = ItemAutocompleteResultBinding.inflate(
                     LayoutInflater.from(context),
-                    R.layout.item_autocomplete_result,
                     parent,
                     false
                 )
@@ -88,7 +98,27 @@ class PlaceAutocompleteAdapter(val context: Context, val location: LiveData<LatL
         viewHolder: ViewHolder,
         place: AutocompletePlace
     ) {
-        viewHolder.binding.item = place
+        val binding = viewHolder.binding
+        val isSpecial = isSpecialPlace(place.types)
+
+        binding.title.text = place.primaryText
+        binding.subtitle.text = place.secondaryText
+
+        binding.icon.contentDescription = place.secondaryText
+        binding.icon.setImageResource(iconForPlaceType(place.types))
+        val tintColor = if (isSpecial) {
+            androidx.appcompat.R.attr.colorPrimary
+        } else {
+            androidx.appcompat.R.attr.colorControlNormal
+        }
+        val ta = binding.root.context.theme.obtainStyledAttributes(intArrayOf(tintColor))
+        val tint = ta.getColor(0, 0)
+        ta.recycle()
+        binding.icon.imageTintList = ColorStateList.valueOf(tint)
+        binding.icon.backgroundTintList = ColorStateList.valueOf(tint)
+
+        binding.textView16.text = distance(place.distanceMeters, binding.root.context)
+        binding.textView16.visibility = goneUnless(place.distanceMeters != null)
     }
 
     override fun getFilter(): Filter {

app/src/main/java/net/vonforst/evmap/api/RateLimitInterceptor.kt

@@ -2,10 +2,27 @@ package net.vonforst.evmap.api
 
 import okhttp3.Interceptor
 import okhttp3.Response
+import okio.IOException
+import retrofit2.HttpException
 import kotlin.time.Duration
 import kotlin.time.Duration.Companion.seconds
 import kotlin.time.TimeSource
 
+fun Interceptor.Chain.proceedSafely(request: okhttp3.Request): Response {
+    return try {
+        proceed(request)
+    } catch (e: Throwable) {
+        if (e is IOException) {
+            throw e
+        } else if (e is HttpException) {
+            // wrap HttpExceptions as IOExceptions, so that they are properly handled by Retrofit's error handling
+            throw IOException("${e.response()}", e)
+        } else {
+            // wrap other exceptions as IOExceptions, so that they are properly handled by Retrofit's error handling
+            throw IOException(e)
+        }
+    }
+}
 
 class RateLimitInterceptor : Interceptor {
     private val rateLimiter = SimpleRateLimiter(3.0)
@@ -16,7 +33,7 @@ class RateLimitInterceptor : Interceptor {
             // limit requests sent to NewMotion to 3 per second
             rateLimiter.acquire()
 
-            var response: Response = chain.proceed(request)
+            var response: Response = chain.proceedSafely(request)
             // 403 is how the NewMotion API indicates a rate limit error
             if (!response.isSuccessful && response.code == 403) {
                 response.close()
@@ -25,11 +42,11 @@ class RateLimitInterceptor : Interceptor {
                     Thread.sleep(1000)
                 } catch (e: InterruptedException) {
                 }
-                response = chain.proceed(request)
+                response = chain.proceedSafely(request)
             }
             return response
         } else {
-            return chain.proceed(request)
+            return chain.proceedSafely(request)
         }
     }
 }

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

@@ -20,7 +20,8 @@ private val plugNames = mapOf(
     Chargepoint.SUPERCHARGER to R.string.plug_supercharger,
     Chargepoint.CEE_BLAU to R.string.plug_cee_blau,
     Chargepoint.CEE_ROT to R.string.plug_cee_rot,
-    Chargepoint.TESLA_ROADSTER_HPC to R.string.plug_roadster_hpc
+    Chargepoint.TESLA_ROADSTER_HPC to R.string.plug_roadster_hpc,
+    Chargepoint.MCS to R.string.plug_mcs
 )
 
 fun nameForPlugType(ctx: StringProvider, type: String): String =
@@ -63,6 +64,7 @@ fun iconForPlugType(type: String): Int =
         Chargepoint.CEE_BLAU -> R.drawable.ic_connector_cee_blau
         Chargepoint.CEE_ROT -> R.drawable.ic_connector_cee_rot
         Chargepoint.TYPE_1 -> R.drawable.ic_connector_typ1
+        Chargepoint.MCS -> R.drawable.ic_connector_mcs
         // TODO: add other connectors
         else -> R.drawable.ic_connector_unknown
     }

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

@@ -175,8 +175,8 @@ class AvailabilityRepository(context: Context) {
         RheinenergieAvailabilityDetector(okhttp),
         teslaOwnerAvailabilityDetector,
         TeslaGuestAvailabilityDetector(okhttp),
-        EnBwAvailabilityDetector(okhttp),
-        NewMotionAvailabilityDetector(okhttp)
+        NobilAvailabilityDetector(okhttp, context),
+        EnBwAvailabilityDetector(okhttp)
     )
 
     suspend fun getAvailability(charger: ChargeLocation): Resource<ChargeLocationStatus> {

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

@@ -4,6 +4,7 @@ import com.squareup.moshi.FromJson
 import com.squareup.moshi.JsonClass
 import com.squareup.moshi.Moshi
 import com.squareup.moshi.ToJson
+import net.vonforst.evmap.api.proceedSafely
 import net.vonforst.evmap.model.ChargeLocation
 import net.vonforst.evmap.model.Chargepoint
 import net.vonforst.evmap.utils.distanceBetween
@@ -86,15 +87,15 @@ interface EnBwApi {
                 .addInterceptor { chain ->
                     // add API key to every request
                     val request = chain.request().newBuilder()
-                        .header("Ocp-Apim-Subscription-Key", "d4954e8b2e444fc89a89a463788c0a72")
+                        .header("Ocp-Apim-Subscription-Key", "90a67b9900364009b588e100e4b1cc64")
                         .header("Origin", "https://www.enbw.com")
                         .header("Referer", "https://www.enbw.com/")
                         .header("Accept", "application/json")
                         .build()
-                    chain.proceed(request)
+                    chain.proceedSafely(request)
                 }.build()
             val retrofit = Retrofit.Builder()
-                .baseUrl(baseUrl ?: "https://enbw-emp.azure-api.net/emobility-public-api/api/v1/")
+                .baseUrl(baseUrl ?: "https://api.emp.emob-enbw.com/emobility-public-api/api/v1/")
                 .addConverterFactory(
                     MoshiConverterFactory.create(
                         Moshi.Builder().add(InstantAdapter()).build()
@@ -136,17 +137,8 @@ class EnBwAvailabilityDetector(client: OkHttpClient, baseUrl: String? = null) :
         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)
-            }
+        repeat(3) {
+            markers = ungroupMarkers(markers)
         }
         if (markers.any { it.grouped }) throw AvailabilityDetectorException("markers still grouped")
 
@@ -203,7 +195,7 @@ class EnBwAvailabilityDetector(client: OkHttpClient, baseUrl: String? = null) :
                 "Typ 3A" -> Chargepoint.TYPE_3A
                 "Typ 3C \"Scame\"" -> Chargepoint.TYPE_3C
                 "Typ 2" -> Chargepoint.TYPE_2_UNKNOWN
-                "Typ 1" -> Chargepoint.TYPE_1
+                "Typ 1 Steckdose" -> 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
@@ -241,6 +233,20 @@ class EnBwAvailabilityDetector(client: OkHttpClient, baseUrl: String? = null) :
         )
     }
 
+    private suspend fun ungroupMarkers(markers: List<EnBwApi.EnBwLocation>): List<EnBwApi.EnBwLocation> =
+        markers.flatMap {
+            if (it.grouped) {
+                api.getMarkers(
+                    it.viewPort.lowerLeftLon,
+                    it.viewPort.upperRightLon,
+                    it.viewPort.lowerLeftLat,
+                    it.viewPort.upperRightLat
+                )
+            } else {
+                listOf(it)
+            }
+        }
+
     override fun isChargerSupported(charger: ChargeLocation): Boolean {
         val country = charger.chargepriceData?.country ?: charger.address?.country
 

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

@@ -1,229 +0,0 @@
-package net.vonforst.evmap.api.availability
-
-import com.squareup.moshi.FromJson
-import com.squareup.moshi.JsonClass
-import com.squareup.moshi.Moshi
-import com.squareup.moshi.ToJson
-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 java.time.ZonedDateTime
-import java.util.Locale
-
-private const val coordRange = 0.005  // range of latitude and longitude for loading the map
-private const val maxDistance = 60  // max distance between reported positions in meters
-
-interface NewMotionApi {
-    @GET("markers/{lngMin}/{lngMax}/{latMin}/{latMax}/{zoom}")
-    suspend fun getMarkers(
-        @Path("lngMin") lngMin: Double,
-        @Path("lngMax") lngMax: Double,
-        @Path("latMin") latMin: Double,
-        @Path("latMax") latMax: Double,
-        @Path("zoom") zoom: Int = 22
-    ): List<NMMarker>
-
-    @GET("locations/{id}")
-    suspend fun getLocation(@Path("id") id: Long): NMLocation
-
-    @JsonClass(generateAdapter = true)
-    data class NMMarker(val coordinates: NMCoordinates, val locationUid: Long, val evseCount: Int)
-
-    @JsonClass(generateAdapter = true)
-    data class NMCoordinates(val latitude: Double, val longitude: Double)
-
-    @JsonClass(generateAdapter = true)
-    data class NMLocation(
-        val uid: Long,
-        val coordinates: NMCoordinates,
-        val operatorName: String,
-        val evses: List<NMEvse>
-    )
-
-    @JsonClass(generateAdapter = true)
-    data class NMEvse(
-        val evseId: String?,
-        val status: String,
-        val connectors: List<NMConnector>,
-        val updated: ZonedDateTime?
-    )
-
-    @JsonClass(generateAdapter = true)
-    data class NMConnector(
-        val uid: Long,
-        val connectorType: String,
-        val electricalProperties: NMElectricalProperties
-    )
-
-    @JsonClass(generateAdapter = true)
-    data class NMElectricalProperties(val powerType: String, val voltage: Int, val amperage: Int) {
-        fun getPower(): Double {
-            val phases = when (powerType) {
-                "AC1Phase" -> 1
-                "AC3Phase" -> 3
-                else -> 1
-            }
-            val volt = when (voltage) {
-                277 -> 230
-                else -> voltage
-            }
-            val power = volt * amperage * phases
-            return when (power) {
-                3680 -> 3.7
-                11040 -> 11.0
-                22080 -> 22.0
-                43470 -> 43.0
-                else -> power / 1000.0
-            }
-        }
-    }
-
-    companion object {
-        fun create(client: OkHttpClient, baseUrl: String? = null): NewMotionApi {
-            val retrofit = Retrofit.Builder()
-                .baseUrl(baseUrl ?: "https://ui-map.shellrecharge.com/api/map/v2/")
-                .addConverterFactory(
-                    MoshiConverterFactory.create(
-                        Moshi.Builder().add(ZonedDateTimeAdapter()).build()
-                    )
-                )
-                .client(client)
-                .build()
-            return retrofit.create(NewMotionApi::class.java)
-        }
-    }
-}
-
-internal class ZonedDateTimeAdapter {
-    @FromJson
-    fun fromJson(value: String): ZonedDateTime? = ZonedDateTime.parse(value)
-
-    @ToJson
-    fun toJson(value: ZonedDateTime): String = value.toString()
-}
-
-data class NmStatus(
-    val conn: NewMotionApi.NMConnector,
-    val status: String,
-    val evseId: String?,
-    val updated: ZonedDateTime?
-)
-
-class NewMotionAvailabilityDetector(client: OkHttpClient, baseUrl: String? = null) :
-    BaseAvailabilityDetector(client) {
-    val api = NewMotionApi.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)
-        val nearest = markers.minByOrNull { marker ->
-            distanceBetween(marker.coordinates.latitude, marker.coordinates.longitude, lat, lng)
-        } ?: throw AvailabilityDetectorException("no candidates found.")
-
-        if (distanceBetween(
-                nearest.coordinates.latitude,
-                nearest.coordinates.longitude,
-                lat,
-                lng
-            ) > radius
-        ) {
-            throw AvailabilityDetectorException("no candidates found")
-        }
-
-        markers = if (nearest.evseCount < location.totalChargepoints) {
-            // combine related stations
-            markers.filter { marker ->
-                distanceBetween(
-                    marker.coordinates.latitude,
-                    marker.coordinates.longitude,
-                    nearest.coordinates.latitude,
-                    nearest.coordinates.longitude
-                ) < maxDistance
-            }
-        } else {
-            listOf(nearest)
-        }
-
-        // load details
-        var details = markers.map {
-            api.getLocation(it.locationUid)
-        }
-        // only include stations from same operator
-        details = details.filter {
-            it.operatorName == details[0].operatorName
-        }
-        val connectorStatus = details.flatMap { it.evses }.flatMap { evse ->
-            evse.connectors.map { connector ->
-                NmStatus(connector, evse.status, evse.evseId, evse.updated)
-            }
-        }
-
-        val nmConnectors = mutableMapOf<Long, Pair<Double, String>>()
-        val nmStatus = mutableMapOf<Long, ChargepointStatus>()
-        val nmEvseId = mutableMapOf<Long, String>()
-        val nmUpdated = mutableMapOf<Long, ZonedDateTime>()
-        connectorStatus.forEach { (connector, statusStr, evseId, updated) ->
-            val id = connector.uid
-            val power = connector.electricalProperties.getPower()
-            val type = when (connector.connectorType.lowercase(Locale.ROOT)) {
-                "type3" -> Chargepoint.TYPE_3C
-                "type2" -> Chargepoint.TYPE_2_UNKNOWN
-                "type1" -> Chargepoint.TYPE_1
-                "domestic" -> Chargepoint.SCHUKO
-                "type1combo" -> Chargepoint.CCS_TYPE_1  // US CCS, aka type1_combo
-                "type2combo" -> Chargepoint.CCS_TYPE_2  // EU CCS, aka type2_combo
-                "tepcochademo" -> Chargepoint.CHADEMO
-                "unspecified" -> "unknown"
-                "unknown" -> "unknown"
-                "saej1772" -> "unknown"
-                else -> "unknown"
-            }
-            val status = when (statusStr) {
-                "Unavailable" -> ChargepointStatus.FAULTED
-                "Available" -> ChargepointStatus.AVAILABLE
-                "Occupied" -> ChargepointStatus.CHARGING
-                "Unspecified" -> ChargepointStatus.UNKNOWN
-                else -> ChargepointStatus.UNKNOWN
-            }
-            nmConnectors.put(id, power to type)
-            nmStatus.put(id, status)
-            evseId?.let { nmEvseId[id] = it }
-            updated?.let { nmUpdated[id] = it }
-        }
-
-        val match = matchChargepoints(nmConnectors, location.chargepointsMerged)
-        val chargepointStatus = match.mapValues { entry ->
-            entry.value.map { nmStatus[it]!! }
-        }
-        val evseIds = if (nmEvseId.size == nmStatus.size) match.mapValues { entry ->
-            entry.value.map { nmEvseId[it]!! }
-        } else null
-        val updated = match.mapValues { entry -> entry.value.map { nmUpdated[it]?.toInstant() } }
-        return ChargeLocationStatus(
-            chargepointStatus,
-            "NewMotion",
-            evseIds,
-            lastChange = updated
-        )
-    }
-
-    override fun isChargerSupported(charger: ChargeLocation): Boolean {
-        // NewMotion is our fallback
-        return when (charger.dataSource) {
-            "goingelectric" -> charger.network != "Tesla Supercharger"
-            "openchargemap" -> charger.chargepriceData?.network !in listOf("23", "3534")
-            "openstreetmap" -> charger.operator !in listOf("Tesla, Inc.", "Tesla")
-            else -> false
-        }
-    }
-
-}

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

@@ -0,0 +1,109 @@
+package net.vonforst.evmap.api.availability
+
+import android.content.Context
+import com.squareup.moshi.FromJson
+import com.squareup.moshi.JsonClass
+import com.squareup.moshi.Moshi
+import com.squareup.moshi.ToJson
+import net.vonforst.evmap.R
+import net.vonforst.evmap.model.ChargeLocation
+import okhttp3.OkHttpClient
+import retrofit2.Retrofit
+import retrofit2.converter.moshi.MoshiConverterFactory
+import retrofit2.http.GET
+import retrofit2.http.Header
+import retrofit2.http.Path
+import java.time.Instant
+
+internal class InstantStringAdapter {
+    @FromJson
+    fun fromJson(value: String?): Instant? = value?.let {
+        Instant.parse(value)
+    }
+
+    @ToJson
+    fun toJson(value: Instant?): String? = value?.toString()
+}
+
+interface NobilRealtimeApi {
+    @GET("{nobilId}")
+    suspend fun getAvailability(
+        @Path("nobilId") nobilId: String,
+        @Header("X-Api-Key") apiKey: String
+    ): List<NobilChargepointState>
+
+    companion object {
+        fun create(client: OkHttpClient): NobilRealtimeApi {
+            val retrofit = Retrofit.Builder()
+                .baseUrl("https://api.ev-map.app/nobil/api/realtime/")
+                .addConverterFactory(
+                    MoshiConverterFactory.create(
+                        Moshi.Builder().add(InstantStringAdapter()).build()
+                    )
+                )
+                .client(client)
+                .build()
+            return retrofit.create(NobilRealtimeApi::class.java)
+        }
+    }
+}
+
+@JsonClass(generateAdapter = true)
+data class NobilChargepointState(
+    val evseUid: String,
+    val status: String,
+    val timestamp: Instant
+)
+
+class NobilAvailabilityDetector(client: OkHttpClient, context: Context) :
+    BaseAvailabilityDetector(client) {
+    val api = NobilRealtimeApi.create(client)
+    val apiKey = context.getString(R.string.evmap_key)
+
+    override suspend fun getAvailability(location: ChargeLocation): ChargeLocationStatus {
+        val nobilId = when (location.address?.country) {
+            "Norway" -> "NOR"
+            "Sweden" -> "SWE"
+            else -> throw AvailabilityDetectorException("nobil: unsupported country")
+        } + "_%05d".format(location.id)
+
+        val availability = api.getAvailability(nobilId, apiKey)
+        if (availability.isEmpty()) {
+            throw AvailabilityDetectorException("nobil: no real-time data available")
+        }
+        return ChargeLocationStatus(
+            location.chargepointsMerged.associateWith { cp ->
+                cp.evseUIds!!.map { evseUId ->
+                    when (availability.find { it.evseUid == evseUId }?.status) {
+                        "AVAILABLE" -> ChargepointStatus.AVAILABLE
+                        "BLOCKED" -> ChargepointStatus.OCCUPIED
+                        "CHARGING" -> ChargepointStatus.CHARGING
+                        "INOPERATIVE" -> ChargepointStatus.FAULTED
+                        "OUTOFORDER" -> ChargepointStatus.FAULTED
+                        "PLANNED" -> ChargepointStatus.FAULTED
+                        "REMOVED" -> ChargepointStatus.FAULTED
+                        "RESERVED" -> ChargepointStatus.OCCUPIED
+                        "UNKNOWN" -> ChargepointStatus.UNKNOWN
+                        else -> ChargepointStatus.UNKNOWN
+                    }
+                }
+            },
+            "Nobil",
+            location.chargepointsMerged.associateWith { cp ->
+                if (cp.evseIds != null) cp.evseIds.map { it ?: "??" } else listOf()
+            },
+            lastChange = location.chargepointsMerged.associateWith { cp ->
+                cp.evseUIds!!.map { evseUId ->
+                    availability.find { it.evseUid == evseUId }?.timestamp
+                }
+            }
+        )
+    }
+
+    override fun isChargerSupported(charger: ChargeLocation): Boolean {
+        return when (charger.dataSource) {
+            "nobil" -> charger.chargepoints.any { it.evseUIds?.isNotEmpty() == true }
+            else -> false
+        }
+    }
+}

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

@@ -7,6 +7,7 @@ import net.vonforst.evmap.api.availability.tesla.asTeslaCoord
 import net.vonforst.evmap.model.ChargeLocation
 import net.vonforst.evmap.model.Chargepoint
 import okhttp3.OkHttpClient
+import retrofit2.HttpException
 import java.time.Instant
 import java.util.Collections
 
@@ -229,12 +230,21 @@ class TeslaOwnerAvailabilityDetector(
                         ?: run {
                             val refreshToken = tokenStore.teslaRefreshToken
                                 ?: throw NotSignedInException()
-                            val response =
+                            val response = try {
                                 authApi.getToken(
                                     TeslaAuthenticationApi.RefreshTokenRequest(
                                         refreshToken
                                     )
                                 )
+                            } catch (e: HttpException) {
+                                if (e.code() == 401) {
+                                    // refresh token is invalid, clear it
+                                    tokenStore.teslaRefreshToken = null
+                                    throw NotSignedInException()
+                                } else {
+                                    throw e
+                                }
+                            }
                             tokenStore.teslaAccessToken = response.accessToken
                             tokenStore.teslaAccessTokenExpiry = now + response.expiresIn
                             response.accessToken

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

@@ -3,6 +3,7 @@ package net.vonforst.evmap.api.availability.tesla
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
 import com.squareup.moshi.Moshi
+import net.vonforst.evmap.api.proceedSafely
 import okhttp3.CacheControl
 import okhttp3.OkHttpClient
 import retrofit2.Retrofit
@@ -48,7 +49,7 @@ interface TeslaCuaApi {
                     val request = chain.request().newBuilder()
                         .cacheControl(CacheControl.Builder().maxStale(24, TimeUnit.HOURS).build())
                         .build()
-                    chain.proceed(request)
+                    chain.proceedSafely(request)
                 }.build()
             val retrofit = Retrofit.Builder()
                 .baseUrl(baseUrl ?: "https://www.tesla.com/cua-api/")
@@ -115,7 +116,7 @@ interface TeslaChargingGuestGraphQlApi {
         val activeOutages: List<Outage>?,
         val chargerList: List<ChargerDetail>,
         val trtId: Long,
-        val maxPowerKw: Int,
+        val maxPowerKw: Int?,
         val name: String,
         val pricing: Pricing?,
         val publicStallCount: Int

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

@@ -7,6 +7,7 @@ import com.squareup.moshi.JsonClass
 import com.squareup.moshi.Moshi
 import com.squareup.moshi.adapters.PolymorphicJsonAdapterFactory
 import kotlinx.coroutines.runBlocking
+import net.vonforst.evmap.api.proceedSafely
 import okhttp3.OkHttpClient
 import retrofit2.Retrofit
 import retrofit2.converter.moshi.MoshiConverterFactory
@@ -25,7 +26,7 @@ interface TeslaAuthenticationApi {
     class AuthCodeRequest(
         val code: String,
         @Json(name = "code_verifier") val codeVerifier: String,
-        @Json(name = "redirect_uri") val redirectUri: String = "https://auth.tesla.com/void/callback",
+        @Json(name = "redirect_uri") val redirectUri: String = "tesla://auth/callback",
         scope: String = "openid email offline_access",
         @Json(name = "client_id") clientId: String = "ownerapi"
     ) : OAuth2Request(scope, clientId)
@@ -98,13 +99,13 @@ interface TeslaAuthenticationApi {
                 .appendQueryParameter("client_id", "ownerapi")
                 .appendQueryParameter("code_challenge", codeChallenge)
                 .appendQueryParameter("code_challenge_method", "S256")
-                .appendQueryParameter("redirect_uri", "https://auth.tesla.com/void/callback")
+                .appendQueryParameter("redirect_uri", "tesla://auth/callback")
                 .appendQueryParameter("response_type", "code")
                 .appendQueryParameter("scope", "openid email offline_access phone")
                 .appendQueryParameter("is_in_app", "true")
                 .appendQueryParameter("state", "123").build()
 
-        val resultUrlPrefix = "https://auth.tesla.com/void/callback"
+        val resultUrlPrefix = "tesla://auth/callback"
     }
 }
 
@@ -135,7 +136,7 @@ interface TeslaOwnerApi {
                         .header("x-tesla-user-agent", "TeslaApp/4.44.5-3304/3a5d531cc3/android/27")
                         .header("Accept", "*/*")
                         .build()
-                    chain.proceed(request)
+                    chain.proceedSafely(request)
                 }.build()
             val retrofit = Retrofit.Builder()
                 .baseUrl(baseUrl ?: "https://owner-api.teslamotors.com")
@@ -376,7 +377,7 @@ interface TeslaChargingOwnershipGraphQlApi {
                         .header("x-tesla-user-agent", "TeslaApp/4.44.5-3304/3a5d531cc3/android/27")
                         .header("Accept", "*/*")
                         .build()
-                    chain.proceed(request)
+                    chain.proceedSafely(request)
                 }.build()
             val retrofit = Retrofit.Builder()
                 .baseUrl(baseUrl ?: "https://akamai-apigateway-charging-ownership.tesla.com")

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

@@ -1,99 +1,16 @@
 package net.vonforst.evmap.api.chargeprice
 
-import android.content.Context
-import com.squareup.moshi.Moshi
-import com.squareup.moshi.adapters.PolymorphicJsonAdapterFactory
-import jsonapi.Document
-import jsonapi.JsonApiFactory
-import jsonapi.retrofit.DocumentConverterFactory
-import net.vonforst.evmap.BuildConfig
-import net.vonforst.evmap.addDebugInterceptors
 import net.vonforst.evmap.model.ChargeLocation
-import okhttp3.Cache
-import okhttp3.OkHttpClient
-import retrofit2.Retrofit
-import retrofit2.converter.moshi.MoshiConverterFactory
-import retrofit2.http.Body
-import retrofit2.http.GET
-import retrofit2.http.Header
-import retrofit2.http.POST
-import java.util.*
+import java.util.Locale
 
 interface ChargepriceApi {
-    @POST("charge_prices")
-    suspend fun getChargePrices(
-        @Body @jsonapi.retrofit.Document request: ChargepriceRequest,
-        @Header("Accept-Language") language: String
-    ): Document<List<ChargePrice>>
-
-    @GET("vehicles")
-    @jsonapi.retrofit.Document
-    suspend fun getVehicles(): List<ChargepriceCar>
-
-    @GET("tariffs")
-    @jsonapi.retrofit.Document
-    suspend fun getTariffs(): List<ChargepriceTariff>
-
-    @POST("user_feedback")
-    suspend fun userFeedback(@Body @jsonapi.retrofit.Document feedback: ChargepriceUserFeedback)
 
     companion object {
-        private val cacheSize = 1L * 1024 * 1024 // 1MB
         val supportedLanguages = setOf("de", "en", "fr", "nl")
 
         private val DATA_SOURCE_GOINGELECTRIC = "going_electric"
         private val DATA_SOURCE_OPENCHARGEMAP = "open_charge_map"
 
-        private val jsonApiAdapterFactory = JsonApiFactory.Builder()
-            .addType(ChargepriceRequest::class.java)
-            .addType(ChargepriceTariff::class.java)
-            .addType(ChargepriceBrand::class.java)
-            .addType(ChargePrice::class.java)
-            .addType(ChargepriceCar::class.java)
-            .build()
-        val moshi = Moshi.Builder()
-            .add(jsonApiAdapterFactory)
-            .add(
-                PolymorphicJsonAdapterFactory.of(ChargepriceUserFeedback::class.java, "type")
-                    .withSubtype(ChargepriceMissingPriceFeedback::class.java, "missing_price")
-                    .withSubtype(ChargepriceWrongPriceFeedback::class.java, "wrong_price")
-                    .withSubtype(ChargepriceMissingVehicleFeedback::class.java, "missing_vehicle")
-            )
-            .build()
-
-        fun create(
-            apikey: String,
-            baseurl: String = "https://api.chargeprice.app/v1/",
-            context: Context? = null
-        ): ChargepriceApi {
-            val client = OkHttpClient.Builder().apply {
-                addInterceptor { chain ->
-                    // add API key to every request
-                    val original = chain.request()
-                    val new = original.newBuilder()
-                        .header("API-Key", apikey)
-                        .header("Content-Type", "application/json")
-                        .build()
-                    chain.proceed(new)
-                }
-                if (BuildConfig.DEBUG) {
-                    addDebugInterceptors()
-                }
-                if (context != null) {
-                    cache(Cache(context.cacheDir, cacheSize))
-                }
-            }.build()
-
-            val retrofit = Retrofit.Builder()
-                .baseUrl(baseurl)
-                .addConverterFactory(DocumentConverterFactory.create())
-                .addConverterFactory(MoshiConverterFactory.create(moshi))
-                .client(client)
-                .build()
-            return retrofit.create(ChargepriceApi::class.java)
-        }
-
-
         fun getChargepriceLanguage(): String {
             val locale = Locale.getDefault().language
             return if (supportedLanguages.contains(locale)) {

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

@@ -1,466 +0,0 @@
-package net.vonforst.evmap.api.chargeprice
-
-import android.content.Context
-import android.os.Parcel
-import android.os.Parcelable
-import android.util.Patterns
-import com.squareup.moshi.Json
-import com.squareup.moshi.JsonClass
-import jsonapi.*
-import kotlinx.parcelize.Parceler
-import kotlinx.parcelize.Parcelize
-import kotlinx.parcelize.WriteWith
-import net.vonforst.evmap.R
-import net.vonforst.evmap.adapter.Equatable
-import net.vonforst.evmap.api.equivalentPlugTypes
-import net.vonforst.evmap.model.ChargeLocation
-import net.vonforst.evmap.model.Chargepoint
-import net.vonforst.evmap.ui.currency
-import kotlin.math.ceil
-import kotlin.math.floor
-
-
-@Resource("charge_price_request")
-@JsonClass(generateAdapter = true)
-data class ChargepriceRequest(
-    @Json(name = "data_adapter")
-    val dataAdapter: String,
-    val station: ChargepriceStation,
-    val options: ChargepriceOptions,
-    @ToMany("tariffs")
-    val tariffs: List<ChargepriceTariff>? = null,
-    @ToOne("vehicle")
-    val vehicle: ChargepriceCar? = null,
-    @RelationshipsObject var relationships: Relationships? = null
-)
-
-@JsonClass(generateAdapter = true)
-data class ChargepriceStation(
-    val longitude: Double,
-    val latitude: Double,
-    val country: String?,
-    val network: String?,
-    @Json(name = "charge_points") val chargePoints: List<ChargepriceChargepoint>
-) {
-    companion object {
-        fun fromEvmap(
-            charger: ChargeLocation,
-            compatibleConnectors: List<String>,
-        ): ChargepriceStation {
-            if (charger.chargepriceData == null) throw IllegalArgumentException()
-
-            val plugTypes =
-                charger.chargepriceData.plugTypes ?: charger.chargepoints.map { it.type }
-            return ChargepriceStation(
-                charger.coordinates.lng,
-                charger.coordinates.lat,
-                charger.chargepriceData.country,
-                charger.chargepriceData.network,
-                charger.chargepoints.zip(plugTypes)
-                    .filter { equivalentPlugTypes(it.first.type).any { it in compatibleConnectors } }
-                    .map { ChargepriceChargepoint(it.first.power ?: 0.0, it.second) }
-            )
-        }
-    }
-}
-
-@JsonClass(generateAdapter = true)
-data class ChargepriceChargepoint(
-    val power: Double,
-    val plug: String
-)
-
-@JsonClass(generateAdapter = true)
-data class ChargepriceOptions(
-    @Json(name = "max_monthly_fees") val maxMonthlyFees: Double? = null,
-    val energy: Double? = null,
-    val duration: Int? = null,
-    @Json(name = "battery_range") val batteryRange: List<Double>? = null,
-    @Json(name = "car_ac_phases") val carAcPhases: Int? = null,
-    val currency: String? = null,
-    @Json(name = "start_time") val startTime: Int? = null,
-    @Json(name = "allow_unbalanced_load") val allowUnbalancedLoad: Boolean? = null,
-    @Json(name = "provider_customer_tariffs") val providerCustomerTariffs: Boolean? = null,
-    @Json(name = "show_price_unavailable") val showPriceUnavailable: Boolean? = null,
-    @Json(name = "show_all_brand_restricted_tariffs") val showAllBrandRestrictedTariffs: Boolean? = null
-)
-
-@Resource("tariff")
-@Parcelize
-@JsonClass(generateAdapter = true)
-data class ChargepriceTariff(
-    @Id val id_: String?,
-    val provider: String,
-    val name: String,
-    @Json(name = "direct_payment")
-    val directPayment: Boolean = false,
-    @Json(name = "provider_customer_tariff")
-    val providerCustomerTariff: Boolean = false,
-    @Json(name = "supported_countries")
-    val supportedCountries: Set<String>,
-    @Json(name = "charge_card_id")
-    val chargeCardId: String?,  // GE charge card ID
-) : Parcelable {
-    val id: String
-        get() = id_!!
-}
-
-@JsonClass(generateAdapter = true)
-@Resource("car")
-@Parcelize
-data class ChargepriceCar(
-    @Id val id_: String?,
-    val name: String,
-    val brand: String,
-
-    @Json(name = "dc_charge_ports")
-    val dcChargePorts: List<String>,
-
-    @Json(name = "usable_battery_size")
-    val usableBatterySize: Float,
-
-    @Json(name = "ac_max_power")
-    val acMaxPower: Float,
-
-    @Json(name = "dc_max_power")
-    val dcMaxPower: Float?
-) : Equatable, Parcelable {
-    fun formatSpecs(): String = buildString {
-        append("%.0f kWh".format(usableBatterySize))
-        append(" | ")
-        append("AC %.0f kW".format(acMaxPower))
-        dcMaxPower?.let {
-            append(" | ")
-            append("DC %.0f kW".format(it))
-        }
-    }
-
-    companion object {
-        private val acConnectors = listOf(
-            Chargepoint.CEE_BLAU,
-            Chargepoint.CEE_ROT,
-            Chargepoint.SCHUKO,
-            Chargepoint.TYPE_1,
-            Chargepoint.TYPE_2_UNKNOWN,
-            Chargepoint.TYPE_2_SOCKET,
-            Chargepoint.TYPE_2_PLUG
-        )
-        private val plugMapping = mapOf(
-            "ccs" to Chargepoint.CCS_UNKNOWN,
-            "tesla_suc" to Chargepoint.SUPERCHARGER,
-            "tesla_ccs" to Chargepoint.CCS_UNKNOWN,
-            "chademo" to Chargepoint.CHADEMO
-        )
-    }
-
-    val id: String
-        get() = id_!!
-
-    val compatibleEvmapConnectors: List<String>
-        get() = dcChargePorts.mapNotNull {
-            plugMapping[it]
-        }.plus(acConnectors)
-}
-
-@JsonClass(generateAdapter = true)
-@Resource("brand")
-@Parcelize
-data class ChargepriceBrand(
-    @Id val id: String?
-) : Parcelable
-
-@JsonClass(generateAdapter = true)
-@Resource("charge_price")
-@Parcelize
-data class ChargePrice(
-    val provider: String,
-    @Json(name = "tariff_name")
-    val tariffName: String,
-    val url: String,
-    @Json(name = "monthly_min_sales")
-    val monthlyMinSales: Double = 0.0,
-    @Json(name = "total_monthly_fee")
-    val totalMonthlyFee: Double = 0.0,
-    @Json(name = "flat_rate")
-    val flatRate: Boolean = false,
-
-    @Json(name = "direct_payment")
-    val directPayment: Boolean = false,
-
-    @Json(name = "provider_customer_tariff")
-    val providerCustomerTariff: Boolean = false,
-    val currency: String,
-
-    @Json(name = "start_time")
-    val startTime: Int = 0,
-    val tags: List<ChargepriceTag>,
-
-    @Json(name = "charge_point_prices")
-    val chargepointPrices: List<ChargepointPrice>,
-
-    @Json(name = "branding")
-    val branding: ChargepriceBranding? = null,
-
-    @RelationshipsObject
-    val relationships: @WriteWith<RelationshipsParceler>() Relationships? = null,
-) : Equatable, Cloneable, Parcelable {
-    val tariffId: String?
-        get() = (relationships?.get("tariff") as? Relationship.ToOne)?.data?.id
-
-    fun formatMonthlyFees(ctx: Context): String {
-        return listOfNotNull(
-            if (totalMonthlyFee > 0) {
-                ctx.getString(R.string.chargeprice_base_fee, totalMonthlyFee, currency(currency))
-            } else null,
-            if (monthlyMinSales > 0) {
-                ctx.getString(R.string.chargeprice_min_spend, monthlyMinSales, currency(currency))
-            } else null
-        ).joinToString(", ")
-    }
-}
-
-/**
- * Parceler implementation for the Relationships object.
- * Note that this ignores certain fields that we don't need (links, meta, etc.)
- */
-internal object RelationshipsParceler : Parceler<Relationships?> {
-    override fun create(parcel: Parcel): Relationships? {
-        if (parcel.readInt() == 0) return null
-
-        val nMembers = parcel.readInt()
-        val members = (0 until nMembers).associate { _ ->
-            val key = parcel.readString()!!
-            val value = if (parcel.readInt() == 0) {
-                val type = parcel.readString()
-                val id = parcel.readString()
-                val ri = if (type != null && id != null) {
-                    ResourceIdentifier(type, id)
-                } else null
-                Relationship.ToOne(ri)
-            } else {
-                val size = parcel.readInt()
-                val ris = (0 until size).map { _ ->
-                    val type = parcel.readString()!!
-                    val id = parcel.readString()!!
-                    ResourceIdentifier(type, id)
-                }
-                Relationship.ToMany(ris)
-            }
-            key to value
-        }
-
-        return Relationships(members)
-    }
-
-    override fun Relationships?.write(parcel: Parcel, flags: Int) {
-        if (this == null) {
-            parcel.writeInt(0)
-            return
-        } else {
-            parcel.writeInt(1)
-        }
-
-        parcel.writeInt(members.size)
-        for (member in this.members) {
-            parcel.writeString(member.key)
-            when (val value = member.value) {
-                is Relationship.ToOne -> {
-                    parcel.writeInt(0)
-                    parcel.writeString(value.data?.type)
-                    parcel.writeString(value.data?.id)
-                }
-                is Relationship.ToMany -> {
-                    parcel.writeInt(1)
-                    parcel.writeInt(value.data.size)
-                    for (ri in value.data) {
-                        parcel.writeString(ri.type)
-                        parcel.writeString(ri.id)
-                    }
-                }
-            }
-        }
-
-    }
-}
-
-@JsonClass(generateAdapter = true)
-@Parcelize
-data class ChargepointPrice(
-    val power: Double,
-    val plug: String,
-    val price: Double?,
-    @Json(name = "price_distribution") val priceDistribution: PriceDistribution,
-    @Json(name = "blocking_fee_start") val blockingFeeStart: Int?,
-    @Json(name = "no_price_reason") var noPriceReason: String?
-) : Parcelable {
-    fun formatDistribution(ctx: Context): String {
-        fun percent(value: Double): String {
-            return ctx.getString(R.string.percent_format, value * 100) + "\u00a0"
-        }
-
-        fun time(value: Int): String {
-            val h = floor(value.toDouble() / 60).toInt()
-            val min = ceil(value.toDouble() % 60).toInt()
-            return if (h == 0 && min > 0) "${min}min";
-            // be slightly sloppy (3:01 is shown as 3h) to save space
-            else if (h > 0 && (min == 0 || min == 1)) "${h}h";
-            else "%d:%02dh".format(h, min)
-        }
-
-        // based on https://github.com/chargeprice/chargeprice-client/blob/d420bb2f216d9ad91a210a36dd0859a368a8229a/src/views/priceList.js
-        with(priceDistribution) {
-            return listOfNotNull(
-                if (session != null && session > 0.0) {
-                    (if (session < 1) percent(session) else "") + ctx.getString(R.string.chargeprice_session_fee)
-                } else null,
-                if (kwh != null && kwh > 0.0 && !isOnlyKwh) {
-                    (if (kwh < 1) percent(kwh) else "") + ctx.getString(R.string.chargeprice_per_kwh)
-                } else null,
-                if (minute != null && minute > 0.0) {
-                    (if (minute < 1) percent(minute) else "") + ctx.getString(R.string.chargeprice_per_minute) +
-                            if (blockingFeeStart != null) {
-                                " (${
-                                    ctx.getString(
-                                        R.string.chargeprice_blocking_fee,
-                                        time(blockingFeeStart)
-                                    )
-                                })"
-                            } else ""
-                } else null,
-                if ((minute == null || minute == 0.0) && blockingFeeStart != null) {
-                    ctx.getString(R.string.chargeprice_blocking_fee, time(blockingFeeStart))
-                } else null
-            ).joinToString(" +\u00a0")
-        }
-    }
-}
-
-@JsonClass(generateAdapter = true)
-@Parcelize
-data class ChargepriceBranding(
-    @Json(name = "background_color") val backgroundColor: String,
-    @Json(name = "text_color") val textColor: String,
-    @Json(name = "logo_url") val logoUrl: String
-) : Parcelable
-
-@JsonClass(generateAdapter = true)
-@Parcelize
-data class PriceDistribution(val kwh: Double?, val session: Double?, val minute: Double?) :
-    Parcelable {
-    val isOnlyKwh
-        get() = kwh != null && kwh > 0 && (session == null || session == 0.0) && (minute == null || minute == 0.0)
-}
-
-@JsonClass(generateAdapter = true)
-@Parcelize
-data class ChargepriceTag(val kind: String, val text: String, val url: String?) : Equatable,
-    Parcelable
-
-@JsonClass(generateAdapter = true)
-data class ChargepriceMeta(
-    @Json(name = "charge_points") val chargePoints: List<ChargepriceChargepointMeta>
-)
-
-enum class ChargepriceInclude {
-    @Json(name = "filter")
-    FILTER,
-    @Json(name = "always")
-    ALWAYS,
-    @Json(name = "exclusive")
-    EXCLUSIVE
-}
-
-@JsonClass(generateAdapter = true)
-@Parcelize
-data class ChargepriceRequestTariffMeta(
-    val include: ChargepriceInclude
-) : Parcelable
-
-@JsonClass(generateAdapter = true)
-data class ChargepriceChargepointMeta(
-    val power: Double,
-    val plug: String,
-    val energy: Double,
-    val duration: Double
-)
-
-@Resource("user_feedback")
-sealed class ChargepriceUserFeedback(
-    val notes: String,
-    val email: String,
-    val context: String,
-    val language: String
-) {
-    init {
-        if (email.isBlank() || email.length > 100 || !Patterns.EMAIL_ADDRESS.matcher(email)
-                .matches()
-        ) {
-            throw IllegalArgumentException("invalid email")
-        }
-        if (!ChargepriceApi.supportedLanguages.contains(language)) {
-            throw IllegalArgumentException("invalid language")
-        }
-        if (context.length > 500) throw IllegalArgumentException("invalid context")
-        if (notes.length > 1000) throw IllegalArgumentException("invalid notes")
-    }
-}
-
-@JsonClass(generateAdapter = true)
-@Resource(type = "missing_price")
-class ChargepriceMissingPriceFeedback(
-    val tariff: String,
-    val cpo: String,
-    val price: String,
-    @Json(name = "poi_link") val poiLink: String,
-    notes: String,
-    email: String,
-    context: String,
-    language: String
-) : ChargepriceUserFeedback(notes, email, context, language) {
-    init {
-        if (tariff.isBlank() || tariff.length > 100) throw IllegalArgumentException("invalid tariff")
-        if (cpo.length > 200) throw IllegalArgumentException("invalid cpo")
-        if (price.isBlank() || price.length > 100) throw IllegalArgumentException("invalid price")
-        if (poiLink.isBlank() || poiLink.length > 200) throw IllegalArgumentException("invalid poiLink")
-    }
-}
-
-
-@JsonClass(generateAdapter = true)
-@Resource(type = "wrong_price")
-class ChargepriceWrongPriceFeedback(
-    val tariff: String,
-    val cpo: String,
-    @Json(name = "displayed_price") val displayedPrice: String,
-    @Json(name = "actual_price") val actualPrice: String,
-    @Json(name = "poi_link") val poiLink: String,
-    notes: String,
-    email: String,
-    context: String,
-    language: String,
-) : ChargepriceUserFeedback(notes, email, context, language) {
-    init {
-        if (tariff.length > 100) throw IllegalArgumentException("invalid tariff")
-        if (cpo.length > 200) throw IllegalArgumentException("invalid cpo")
-        if (displayedPrice.length > 100) throw IllegalArgumentException("invalid displayedPrice")
-        if (actualPrice.length > 100) throw IllegalArgumentException("invalid actualPrice")
-        if (poiLink.length > 200) throw IllegalArgumentException("invalid poiLink")
-    }
-}
-
-
-@JsonClass(generateAdapter = true)
-@Resource(type = "missing_vehicle")
-class ChargepriceMissingVehicleFeedback(
-    val brand: String,
-    val model: String,
-    notes: String,
-    email: String,
-    context: String,
-    language: String,
-) : ChargepriceUserFeedback(notes, email, context, language) {
-    init {
-        if (brand.length > 100) throw IllegalArgumentException("invalid brand")
-        if (model.length > 100) throw IllegalArgumentException("invalid model")
-    }
-}

app/src/main/java/net/vonforst/evmap/api/fronyx/FronyxApiRetrofit.kt

@@ -4,6 +4,7 @@ import android.content.Context
 import com.squareup.moshi.Moshi
 import net.vonforst.evmap.BuildConfig
 import net.vonforst.evmap.addDebugInterceptors
+import net.vonforst.evmap.api.proceedSafely
 import net.vonforst.evmap.model.ChargeLocation
 import net.vonforst.evmap.model.Chargepoint
 import okhttp3.Cache
@@ -46,7 +47,7 @@ private interface FronyxApiRetrofit {
                         .header("X-API-Token", apikey)
                         .header("Content-Type", "application/json")
                         .build()
-                    chain.proceed(new)
+                    chain.proceedSafely(new)
                 }
                 if (BuildConfig.DEBUG) {
                     addDebugInterceptors()

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

@@ -1,7 +1,14 @@
 package net.vonforst.evmap.api.goingelectric
 
 import android.util.Log
-import com.squareup.moshi.*
+import com.squareup.moshi.FromJson
+import com.squareup.moshi.JsonAdapter
+import com.squareup.moshi.JsonQualifier
+import com.squareup.moshi.JsonReader
+import com.squareup.moshi.JsonWriter
+import com.squareup.moshi.Moshi
+import com.squareup.moshi.ToJson
+import com.squareup.moshi.Types
 import java.lang.reflect.Type
 import java.time.Instant
 import java.time.LocalTime
@@ -67,58 +74,95 @@ internal class ChargepointListItemJsonAdapter(val moshi: Moshi) :
     }
 }
 
-internal class JsonObjectOrFalseAdapter<T> private constructor(
-    private val objectDelegate: JsonAdapter<T>,
-    private val clazz: Class<*>
-) : JsonAdapter<T>() {
-
-    class Factory : JsonAdapter.Factory {
-        override fun create(
-            type: Type,
-            annotations: Set<Annotation>,
-            moshi: Moshi
-        ): JsonAdapter<Any>? {
-            val clazz = Types.getRawType(type)
-            return when (hasJsonObjectOrFalseAnnotation(
-                annotations
-            )) {
-                false -> null
-                true -> JsonObjectOrFalseAdapter(
-                    moshi.adapter(type), clazz
-                )
-            }
-        }
-    }
-
-    @Suppress("UNCHECKED_CAST")
-    override fun fromJson(reader: JsonReader): T? = when (reader.peek()) {
+class StringOrFalseAdapter {
+    @FromJson
+    @JsonObjectOrFalse
+    fun fromJson(reader: JsonReader): String? = when (reader.peek()) {
         JsonReader.Token.BOOLEAN -> when (reader.nextBoolean()) {
-            false -> null // Response was false
-            else -> {
-                if (this.clazz == GEFaultReport::class.java) {
-                    GEFaultReport(null, "") as T
-                } else {
-                    throw IllegalStateException("Non-false boolean for @JsonObjectOrFalse field")
-                }
-            }
+            false -> null
+            true -> throw IllegalArgumentException("found true")
         }
-        JsonReader.Token.BEGIN_OBJECT -> objectDelegate.fromJson(reader)
-        JsonReader.Token.BEGIN_ARRAY -> objectDelegate.fromJson(reader)
-        JsonReader.Token.STRING -> objectDelegate.fromJson(reader)
-        JsonReader.Token.NUMBER -> objectDelegate.fromJson(reader)
-        else ->
-            throw IllegalStateException("Non-object-non-boolean value for @JsonObjectOrFalse field")
+
+        JsonReader.Token.STRING -> reader.nextString()
+        else -> throw IllegalArgumentException("illegal value found")
     }
 
-    override fun toJson(writer: JsonWriter, value: T?) = objectDelegate.toJson(writer, value)
+    @ToJson
+    fun toJson(writer: JsonWriter, @JsonObjectOrFalse value: String?) {
+        writer.value(value)
+    }
 }
 
-private fun hasJsonObjectOrFalseAnnotation(annotations: Set<Annotation>?) =
-    annotations?.firstOrNull { it.annotationClass == JsonObjectOrFalse::class } != null
+class IntOrFalseAdapter {
+    @FromJson
+    @JsonObjectOrFalse
+    fun fromJson(reader: JsonReader): Int? = when (reader.peek()) {
+        JsonReader.Token.BOOLEAN -> when (reader.nextBoolean()) {
+            false -> null
+            true -> throw IllegalArgumentException("found true")
+        }
+
+        JsonReader.Token.NUMBER -> reader.nextInt()
+        else -> throw IllegalArgumentException("illegal value found")
+    }
+
+    @ToJson
+    fun toJson(writer: JsonWriter, @JsonObjectOrFalse value: Int?) {
+        writer.value(value)
+    }
+}
+
+class GEFaultReportOrFalseAdapter {
+    @FromJson
+    @JsonObjectOrFalse
+    fun fromJson(reader: JsonReader, delegate: JsonAdapter<GEFaultReport>): GEFaultReport? =
+        when (reader.peek()) {
+            JsonReader.Token.BOOLEAN -> when (reader.nextBoolean()) {
+                false -> null
+                true -> GEFaultReport(null, "")
+            }
+
+            else -> delegate.fromJson(reader)
+        }
+
+    @ToJson
+    fun toJson(
+        writer: JsonWriter,
+        @JsonObjectOrFalse value: GEFaultReport?,
+        delegate: JsonAdapter<GEFaultReport>
+    ) {
+        delegate.toJson(writer, value)
+    }
+}
+
+
+class ChargeCardListOrFalseAdapter {
+    @FromJson
+    @JsonObjectOrFalse
+    fun fromJson(
+        reader: JsonReader,
+        delegate: JsonAdapter<List<GEChargeCardId>>
+    ): List<GEChargeCardId>? = when (reader.peek()) {
+        JsonReader.Token.BOOLEAN -> when (reader.nextBoolean()) {
+            false -> null
+            true -> throw IllegalArgumentException("found true")
+        }
+
+        else -> delegate.fromJson(reader)
+    }
+
+    @ToJson
+    fun toJson(
+        writer: JsonWriter,
+        @JsonObjectOrFalse value: List<GEChargeCardId>?,
+        delegate: JsonAdapter<List<GEChargeCardId>>
+    ) {
+        delegate.toJson(writer, value)
+    }
+}
 
 @JsonQualifier
 @Retention(AnnotationRetention.RUNTIME)
-@Target(AnnotationTarget.FIELD)
 annotation class JsonObjectOrFalse {
 
 }

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

@@ -21,6 +21,7 @@ import net.vonforst.evmap.api.mapPower
 import net.vonforst.evmap.api.mapPowerInverse
 import net.vonforst.evmap.api.nameForPlugType
 import net.vonforst.evmap.api.powerSteps
+import net.vonforst.evmap.api.proceedSafely
 import net.vonforst.evmap.model.BooleanFilter
 import net.vonforst.evmap.model.ChargeLocation
 import net.vonforst.evmap.model.Chargepoint
@@ -112,7 +113,10 @@ interface GoingElectricApi {
 
         private val moshi = Moshi.Builder()
             .add(ChargepointListItemJsonAdapterFactory())
-            .add(JsonObjectOrFalseAdapter.Factory())
+            .add(StringOrFalseAdapter())
+            .add(IntOrFalseAdapter())
+            .add(GEFaultReportOrFalseAdapter())
+            .add(ChargeCardListOrFalseAdapter())
             .add(HoursAdapter())
             .add(InstantAdapter())
             .build()
@@ -128,7 +132,7 @@ interface GoingElectricApi {
                     var original = chain.request()
                     val url = original.url.newBuilder().addQueryParameter("key", apikey).build()
                     original = original.newBuilder().url(url).build()
-                    chain.proceed(original)
+                    chain.proceedSafely(original)
                 }
                 if (BuildConfig.DEBUG) {
                     addDebugInterceptors()

app/src/main/java/net/vonforst/evmap/api/nobil/NobilApi.kt

@@ -120,7 +120,7 @@ class NobilApiWrapper(
 
     override suspend fun fullDownload(): FullDownloadResult<NobilReferenceData> {
         var numTotalChargepoints = 0
-        arrayOf("DAN", "FIN", "ISL", "NOR", "SWE").forEach { countryCode ->
+        arrayOf("NOR", "SWE").forEach { countryCode ->
             val request = NobilNumChargepointsRequest(apikey, countryCode)
             val response = api.getNumChargepoints(request)
             if (!response.isSuccessful) {
@@ -234,7 +234,8 @@ class NobilApiWrapper(
             Chargepoint.TYPE_2_PLUG,
             Chargepoint.CCS_UNKNOWN,
             Chargepoint.CHADEMO,
-            Chargepoint.SUPERCHARGER
+            Chargepoint.SUPERCHARGER,
+            Chargepoint.MCS
         )
         val connectorsMap = connectors.associateWith { connector ->
             nameForPlugType(sp, connector)

app/src/main/java/net/vonforst/evmap/api/nobil/NobilModel.kt

@@ -125,9 +125,6 @@ data class NobilChargerStation(
             Address(
                 chargerStationData.city,
                 when (chargerStationData.landCode) {
-                    "DAN" -> "Denmark"
-                    "FIN" -> "Finland"
-                    "ISL" -> "Iceland"
                     "NOR" -> "Norway"
                     "SWE" -> "Sweden"
                     else -> ""
@@ -235,7 +232,7 @@ data class NobilChargerStation(
                 "40" -> Chargepoint.SUPERCHARGER // Tesla Connector Model
                 "70" -> return null // Hydrogen
                 "82" -> return null // Biogas
-                "87" -> "" // MCS
+                "87" -> Chargepoint.MCS
 
                 // These are deprecated and not used
                 "50" -> "" // Type 2 + Schuko
@@ -277,14 +274,23 @@ data class NobilChargerStation(
                 "43" -> 600.0 // 600 kW DC
                 "44" -> 700.0 // 700 kW DC
                 "45" -> 800.0 // 800 kW DC
+                "46" -> 320.0
+                "47" -> 900.0
+                "48" -> 1000.0
+                "49" -> 1100.0
+                "50" -> 1200.0
+                "51" -> 1300.0
+                "52" -> 1400.0
+                "53" -> 1500.0
                 else -> null
             }
 
             val connectionVoltage = if (attribs["12"]?.attrVal is String) attribs["12"]?.attrVal.toString().toDoubleOrNull() else null
             val connectionCurrent = if (attribs["31"]?.attrVal is String) attribs["31"]?.attrVal.toString().toDoubleOrNull() else null
+            val evseUId = if (attribs["27"]?.attrVal is String) listOf(attribs["27"]?.attrVal.toString()) else null
             val evseId = if (attribs["28"]?.attrVal is String) listOf(attribs["28"]?.attrVal.toString()) else null
 
-            return Chargepoint(connectionType, connectionPower, 1, connectionCurrent, connectionVoltage, evseId)
+            return Chargepoint(connectionType, connectionPower, 1, connectionCurrent, connectionVoltage, evseId, evseUId)
         }
     }
 }

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

@@ -16,6 +16,7 @@ import net.vonforst.evmap.api.StringProvider
 import net.vonforst.evmap.api.mapPower
 import net.vonforst.evmap.api.mapPowerInverse
 import net.vonforst.evmap.api.powerSteps
+import net.vonforst.evmap.api.proceedSafely
 import net.vonforst.evmap.model.BooleanFilter
 import net.vonforst.evmap.model.ChargeLocation
 import net.vonforst.evmap.model.ChargepointListItem
@@ -101,7 +102,7 @@ interface OpenChargeMapApi {
                     val new = original.newBuilder()
                         .header("X-API-Key", apikey)
                         .build()
-                    chain.proceed(new)
+                    chain.proceedSafely(new)
                 }
                 if (BuildConfig.DEBUG) {
                     addDebugInterceptors()

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

@@ -3,7 +3,13 @@ package net.vonforst.evmap.api.openstreetmap
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
 import kotlinx.parcelize.Parcelize
-import net.vonforst.evmap.model.*
+import net.vonforst.evmap.model.Address
+import net.vonforst.evmap.model.ChargeLocation
+import net.vonforst.evmap.model.Chargepoint
+import net.vonforst.evmap.model.ChargerPhoto
+import net.vonforst.evmap.model.Coordinate
+import net.vonforst.evmap.model.Cost
+import net.vonforst.evmap.model.OpeningHours
 import okhttp3.internal.immutableListOf
 import java.time.Instant
 import java.time.ZonedDateTime
@@ -239,10 +245,24 @@ data class OSMChargingStation(
             if (rawOutput == null) {
                 return null
             }
-            val pattern = Regex("([0-9.,]+)\\s*(kW|kVA)", setOf(RegexOption.IGNORE_CASE))
-            val matchResult = pattern.matchEntire(rawOutput) ?: return null
-            val numberString = matchResult.groupValues[1].replace(',', '.')
-            return numberString.toDoubleOrNull()
+            val kwPattern = Regex("([0-9.,]+)\\s*(kW|kVA)", setOf(RegexOption.IGNORE_CASE))
+            kwPattern.matchEntire(rawOutput)?.let { matchResult ->
+                val numberString = matchResult.groupValues[1].replace(',', '.')
+                return numberString.toDoubleOrNull()
+            }
+
+            val numberPattern = Regex("([0-9.,]+)")
+            numberPattern.matchEntire(rawOutput)?.let { matchResult ->
+                // just a number is mapped without unit
+                val numberString = matchResult.groupValues[1].replace(',', '.')
+                val number = numberString.toDoubleOrNull()
+                return number?.let {
+                    // assume kW if the number is < 1000, otherwise assume W and convert to kW
+                    if (number < 1000) number else number / 1000
+                }
+            }
+
+            return null
         }
     }
 }

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

@@ -109,6 +109,7 @@ class CarAppService : androidx.car.app.CarAppService() {
 @ExperimentalCarApi
 class EVMapSession(val cas: CarAppService) : Session(), DefaultLifecycleObserver {
     private val TAG = "EVMapSession"
+    lateinit var intent: Intent
     var mapScreen: LocationAwareScreen? = null
         set(value) {
             field = value
@@ -132,7 +133,8 @@ class EVMapSession(val cas: CarAppService) : Session(), DefaultLifecycleObserver
     }
 
     override fun onCreateScreen(intent: Intent): Screen {
-        val mapScreen = if (supportsNewMapScreen(carContext)) {
+        this.intent = intent
+        val mapScreen = if (supportsNewMapScreen(carContext) && prefs.androidAutoNewMapScreenEnabled) {
             MapScreen(carContext, this)
         } else {
             LegacyMapScreen(carContext, this)

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

@@ -1,402 +0,0 @@
-package net.vonforst.evmap.auto
-
-import androidx.car.app.CarContext
-import androidx.car.app.CarToast
-import androidx.car.app.Screen
-import androidx.car.app.annotations.ExperimentalCarApi
-import androidx.car.app.constraints.ConstraintManager
-import androidx.car.app.hardware.CarHardwareManager
-import androidx.car.app.hardware.info.Model
-import androidx.car.app.model.Action
-import androidx.car.app.model.ActionStrip
-import androidx.car.app.model.CarIcon
-import androidx.car.app.model.ItemList
-import androidx.car.app.model.ListTemplate
-import androidx.car.app.model.Row
-import androidx.car.app.model.SectionedItemList
-import androidx.car.app.model.Template
-import androidx.core.content.ContextCompat
-import androidx.core.graphics.drawable.IconCompat
-import androidx.lifecycle.lifecycleScope
-import com.github.erfansn.localeconfigx.currentOrDefaultLocale
-import jsonapi.Meta
-import jsonapi.Relationship
-import jsonapi.Relationships
-import jsonapi.ResourceIdentifier
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.launch
-import kotlinx.coroutines.withContext
-import net.vonforst.evmap.R
-import net.vonforst.evmap.api.chargeprice.ChargePrice
-import net.vonforst.evmap.api.chargeprice.ChargepriceApi
-import net.vonforst.evmap.api.chargeprice.ChargepriceCar
-import net.vonforst.evmap.api.chargeprice.ChargepriceChargepointMeta
-import net.vonforst.evmap.api.chargeprice.ChargepriceInclude
-import net.vonforst.evmap.api.chargeprice.ChargepriceMeta
-import net.vonforst.evmap.api.chargeprice.ChargepriceOptions
-import net.vonforst.evmap.api.chargeprice.ChargepriceRequest
-import net.vonforst.evmap.api.chargeprice.ChargepriceRequestTariffMeta
-import net.vonforst.evmap.api.chargeprice.ChargepriceStation
-import net.vonforst.evmap.api.equivalentPlugTypes
-import net.vonforst.evmap.api.nameForPlugType
-import net.vonforst.evmap.api.stringProvider
-import net.vonforst.evmap.model.ChargeLocation
-import net.vonforst.evmap.model.Chargepoint
-import net.vonforst.evmap.storage.AppDatabase
-import net.vonforst.evmap.storage.PreferenceDataSource
-import net.vonforst.evmap.ui.currency
-import net.vonforst.evmap.ui.time
-import retrofit2.HttpException
-import java.io.IOException
-import kotlin.math.roundToInt
-
-@ExperimentalCarApi
-class ChargepriceScreen(ctx: CarContext, val session: EVMapSession, 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),
-            carContext.getString(R.string.chargeprice_api_url)
-        )
-    }
-    private var prices: List<ChargePrice>? = null
-    private var meta: ChargepriceChargepointMeta? = null
-    private var chargepoint: Chargepoint? = null
-    private val maxRows = ctx.getContentLimit(ConstraintManager.CONTENT_LIMIT_TYPE_LIST)
-    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 {
-                val header = meta?.let { meta ->
-                    chargepoint?.let { chargepoint ->
-                        "${
-                            nameForPlugType(
-                                carContext.stringProvider(),
-                                chargepoint.type
-                            )
-                        } ${chargepoint.formatPower(carContext.currentOrDefaultLocale)} ${
-                            carContext.getString(
-                                R.string.chargeprice_stats,
-                                meta.energy,
-                                time(meta.duration.roundToInt()),
-                                meta.energy / meta.duration * 60
-                            )
-                        }"
-                    }
-                }
-                val myTariffs = prefs.chargepriceMyTariffs
-                val myTariffsAll = prefs.chargepriceMyTariffsAll
-
-                val prices = prices?.take(maxRows)
-                if (prices != null && prices.isNotEmpty() && !myTariffsAll && myTariffs != null) {
-                    val (myPrices, otherPrices) = prices.partition { price -> price.tariffId in myTariffs }
-                    val myPricesList = buildPricesList(myPrices)
-                    val otherPricesList = buildPricesList(otherPrices)
-                    if (myPricesList.items.isNotEmpty() && otherPricesList.items.isNotEmpty()) {
-                        addSectionedList(
-                            SectionedItemList.create(
-                                myPricesList,
-                                (header?.let { it + "\n" } ?: "") +
-                                        carContext.getString(R.string.chargeprice_header_my_tariffs)
-                            )
-                        )
-                        addSectionedList(
-                            SectionedItemList.create(
-                                otherPricesList,
-                                carContext.getString(R.string.chargeprice_header_other_tariffs)
-                            )
-                        )
-                    } else {
-                        val list =
-                            if (myPricesList.items.isNotEmpty()) myPricesList else otherPricesList
-                        if (header != null) {
-                            addSectionedList(SectionedItemList.create(list, header))
-                        } else {
-                            setSingleList(list)
-                        }
-                    }
-                } else {
-                    val list = buildPricesList(prices)
-                    if (header != null && list.items.isNotEmpty()) {
-                        addSectionedList(SectionedItemList.create(list, header))
-                    } else {
-                        setSingleList(list)
-                    }
-                }
-            }
-            setActionStrip(
-                ActionStrip.Builder().addAction(
-                    Action.Builder().setIcon(
-                        CarIcon.Builder(
-                            IconCompat.createWithResource(
-                                carContext,
-                                R.drawable.ic_chargeprice
-                            )
-                        ).build()
-                    ).setOnClickListener {
-                        openUrl(carContext, session.cas, ChargepriceApi.getPoiUrl(charger))
-                    }.build()
-                ).build()
-            )
-        }.build()
-    }
-
-    private fun buildPricesList(prices: List<ChargePrice>?): ItemList {
-        return ItemList.Builder().apply {
-            setNoItemsMessage(
-                errorMessage
-                    ?: carContext.getString(R.string.chargeprice_no_tariffs_found)
-            )
-            prices?.forEach { price ->
-                addItem(Row.Builder().apply {
-                    setTitle(formatProvider(price))
-                    addText(formatPrice(price))
-                }.build())
-            }
-        }.build()
-    }
-
-    private fun formatProvider(price: ChargePrice): String {
-        if (!price.tariffName.startsWith(price.provider)) {
-            return price.provider + " " + price.tariffName
-        } else {
-            return price.tariffName
-        }
-    }
-
-    private fun formatPrice(price: ChargePrice): String {
-        val amount = price.chargepointPrices.first().price
-            ?: return "${carContext.getString(R.string.chargeprice_price_not_available)} (${price.chargepointPrices.first().noPriceReason})"
-        val totalPrice = carContext.getString(
-            R.string.charge_price_format,
-            amount,
-            currency(price.currency)
-        )
-        val kwhPrice = if (amount > 0f) {
-            carContext.getString(
-                if (price.chargepointPrices[0].priceDistribution.isOnlyKwh) {
-                    R.string.charge_price_kwh_format
-                } else {
-                    R.string.charge_price_average_format
-                },
-                amount / 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 = ChargepriceApi.getDataAdapter(charger)
-        val manufacturer = getVehicleBrand(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)
-
-                if (cpStation.chargePoints.isEmpty()) {
-                    errorMessage =
-                        carContext.getString(R.string.chargeprice_no_compatible_connectors)
-                    invalidate()
-                    return@launch
-                }
-
-                val result = api.getChargePrices(
-                    ChargepriceRequest(
-                        dataAdapter = dataAdapter,
-                        station = cpStation,
-                        vehicle = car,
-                        options = ChargepriceOptions(
-                            batteryRange = batteryRange.map { it.toDouble() },
-                            providerCustomerTariffs = prefs.chargepriceShowProviderCustomerTariffs,
-                            maxMonthlyFees = if (prefs.chargepriceNoBaseFee) 0.0 else null,
-                            currency = prefs.chargepriceCurrency,
-                            allowUnbalancedLoad = prefs.chargepriceAllowUnbalancedLoad,
-                            showPriceUnavailable = true
-                        ),
-                        relationships = if (!prefs.chargepriceMyTariffsAll) {
-                            val myTariffs = prefs.chargepriceMyTariffs ?: emptySet()
-                            Relationships(
-                                "tariffs" to Relationship.ToMany(
-                                    myTariffs.map {
-                                        ResourceIdentifier(
-                                            "tariff",
-                                            id = it
-                                        )
-                                    },
-                                    meta = Meta.from(
-                                        ChargepriceRequestTariffMeta(ChargepriceInclude.ALWAYS),
-                                        ChargepriceApi.moshi
-                                    )
-                                )
-                            )
-                        } else null
-                    ), ChargepriceApi.getChargepriceLanguage()
-                )
-
-                val myTariffs = prefs.chargepriceMyTariffs
-
-                // choose the highest power chargepoint
-                // (we have already filtered so that only compatible ones are included)
-                val chargepoint = cpStation.chargePoints.maxByOrNull { it.power }
-
-                val index = cpStation.chargePoints.indexOf(chargepoint)
-                this@ChargepriceScreen.chargepoint =
-                    charger.chargepoints.filter { equivalentPlugTypes(it.type).any { it in car.compatibleEvmapConnectors } }[index]
-
-                if (chargepoint == null) {
-                    errorMessage =
-                        carContext.getString(R.string.chargeprice_no_compatible_connectors)
-                    invalidate()
-                    return@launch
-                }
-
-                val metaMapped =
-                    result.meta!!.map(ChargepriceMeta::class.java, ChargepriceApi.moshi)!!
-                meta = metaMapped.chargePoints.maxByOrNull { it.power }
-
-                prices = result.data!!.mapNotNull { cp ->
-                    val filteredPrices =
-                        cp.chargepointPrices.filter {
-                            it.plug == chargepoint.plug && it.power == chargepoint.power
-                        }
-                    if (filteredPrices.isEmpty()) {
-                        null
-                    } else {
-                        cp.copy(
-                            chargepointPrices = filteredPrices
-                        )
-                    }
-                }
-                    .sortedBy { it.chargepointPrices.first().price ?: Double.MAX_VALUE }
-                    .sortedByDescending {
-                        prefs.chargepriceMyTariffsAll ||
-                                myTariffs != null && it.tariffId in myTariffs
-                    }
-                invalidate()
-            } catch (e: IOException) {
-                withContext(Dispatchers.Main) {
-                    CarToast.makeText(
-                        carContext,
-                        R.string.chargeprice_connection_error,
-                        CarToast.LENGTH_LONG
-                    )
-                        .show()
-                }
-            } catch (e: HttpException) {
-                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.lowercase() == getVehicleBrand(manufacturer)?.lowercase()
-                }
-                if (vehicles.isEmpty()) {
-                    throw VehicleUnknownException()
-                } else if (vehicles.size > 1) {
-                    if (modelName != null) {
-                        vehicles = vehicles.filter {
-                            it.name.lowercase().startsWith(modelName.lowercase())
-                        }
-                        if (vehicles.isEmpty()) {
-                            throw VehicleUnknownException()
-                        } else if (vehicles.size > 1) {
-                            throw VehicleAmbiguousException()
-                        }
-                    } else {
-                        throw VehicleAmbiguousException()
-                    }
-                }
-            } else {
-                throw VehicleUnavailableException()
-            }
-        }
-        return vehicles[0]
-    }
-}

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

@@ -32,7 +32,6 @@ import androidx.core.text.HtmlCompat
 import androidx.lifecycle.lifecycleScope
 import coil.imageLoader
 import coil.request.ImageRequest
-import com.github.erfansn.localeconfigx.currentOrDefaultLocale
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.launch
@@ -142,32 +141,26 @@ class ChargerDetailScreen(
                         if (ChargepriceApi.isChargerSupported(charger)) {
                             addAction(
                                 Action.Builder()
-                                    .setIcon(
-                                        CarIcon.Builder(
-                                            IconCompat.createWithResource(
-                                                carContext,
-                                                R.drawable.ic_chargeprice
-                                            )
-                                        ).build()
-                                    )
                                     .setTitle(carContext.getString(R.string.auto_prices))
                                 .setOnClickListener {
-                                    if (prefs.chargepriceNativeIntegration) {
+                                    if (!prefs.chargepriceRemoval2025DialogShown) {
                                         screenManager.push(
-                                            ChargepriceScreen(
+                                            TextDialogScreen(
                                                 carContext,
-                                                session,
-                                                charger
+                                                R.string.chargeprice_removal_2025_dialog_title,
+                                                R.string.chargeprice_removal_2025_dialog_detail
                                             )
                                         )
-                                    } else {
-                                        val intent = Intent(
-                                            Intent.ACTION_VIEW,
-                                            Uri.parse(ChargepriceApi.getPoiUrl(charger))
-                                        )
-                                            .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
-                                        session.cas.startActivity(intent)
+                                        prefs.chargepriceRemoval2025DialogShown = true
+                                        return@setOnClickListener
                                     }
+
+                                    val intent = Intent(
+                                        Intent.ACTION_VIEW,
+                                        Uri.parse(ChargepriceApi.getPoiUrl(charger))
+                                    )
+                                        .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+                                    session.cas.startActivity(intent)
                                 }
                                 .build())
                         }

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

@@ -21,6 +21,7 @@ import androidx.car.app.model.Pane
 import androidx.car.app.model.Place
 import androidx.car.app.model.PlaceMarker
 import androidx.car.app.model.Row
+import androidx.car.app.model.RowSection
 import androidx.core.content.ContextCompat
 import androidx.core.graphics.drawable.IconCompat
 import net.vonforst.evmap.R
@@ -54,7 +55,7 @@ class ChargerListFormatter(
     private val iconGen = ChargerIconGenerator(carContext, null, height = 96)
     var favorites: Set<Long> = emptySet()
 
-    fun buildChargerList(
+    fun buildChargerListLegacy(
         chargers: List<ChargeLocation>?,
         availabilities: Map<Long, Pair<ZonedDateTime, ChargeLocationStatus?>>
     ): ItemList? {
@@ -103,6 +104,55 @@ class ChargerListFormatter(
         }
     }
 
+    fun buildChargerList(
+        chargers: List<ChargeLocation>?,
+        availabilities: Map<Long, Pair<ZonedDateTime, ChargeLocationStatus?>>
+    ): RowSection? {
+        return if (chargers != null) {
+            val chargerList = chargers.take(screen.maxRows)
+            val builder = RowSection.Builder()
+            // only show the city if not all chargers are in the same city
+            val showCity = chargerList.map { it.address?.city }.distinct().size > 1
+            chargerList.forEach { charger ->
+                builder.addItem(
+                    formatCharger(
+                        charger,
+                        availabilities,
+                        showCity,
+                        charger.id in favorites
+                    )
+                )
+            }
+            builder.setNoItemsMessage(
+                carContext.getString(
+                    if (screen.filterStatus == FILTERS_FAVORITES) {
+                        R.string.auto_no_favorites_found
+                    } else {
+                        R.string.auto_no_chargers_found
+                    }
+                )
+            )
+            builder.setOnItemVisibilityChangedListener(screen)
+            builder.build()
+        } else {
+            if (screen.loadingError) {
+                val builder = RowSection.Builder()
+                builder.setNoItemsMessage(
+                    carContext.getString(R.string.connection_error)
+                )
+                builder.build()
+            } else if (screen.locationError) {
+                val builder = RowSection.Builder()
+                builder.setNoItemsMessage(
+                    carContext.getString(R.string.location_error)
+                )
+                builder.build()
+            } else {
+                null
+            }
+        }
+    }
+
     private fun formatCharger(
         charger: ChargeLocation,
         availabilities: Map<Long, Pair<ZonedDateTime, ChargeLocationStatus?>>,

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

@@ -15,8 +15,10 @@ import androidx.car.app.model.CarColor
 import androidx.car.app.model.CarIcon
 import androidx.car.app.model.CarText
 import androidx.car.app.model.ForegroundCarColorSpan
+import androidx.car.app.model.Header
 import androidx.car.app.model.ItemList
 import androidx.car.app.model.ListTemplate
+import androidx.car.app.model.MessageTemplate
 import androidx.car.app.model.Pane
 import androidx.car.app.model.PaneTemplate
 import androidx.car.app.model.ParkedOnlyOnClickListener
@@ -241,20 +243,23 @@ class FilterScreen(ctx: CarContext, val session: EVMapSession) : Screen(ctx) {
 
                             )
                             setOnClickListener {
-                                lifecycleScope.launch {
-                                    db.filterProfileDao().delete(it)
-                                    if (prefs.filterStatus == it.id) {
-                                        prefs.filterStatus = FILTERS_DISABLED
+                                val confirmScreen = ConfirmDeleteScreen(carContext, it) {
+                                    lifecycleScope.launch {
+                                        db.filterProfileDao().delete(it)
+                                        if (prefs.filterStatus == it.id) {
+                                            prefs.filterStatus = FILTERS_DISABLED
+                                        }
+                                        CarToast.makeText(
+                                            carContext,
+                                            carContext.getString(
+                                                R.string.deleted_item,
+                                                it.name
+                                            ),
+                                            CarToast.LENGTH_SHORT
+                                        ).show()
                                     }
-                                    CarToast.makeText(
-                                        carContext,
-                                        carContext.getString(
-                                            R.string.deleted_item,
-                                            it.name
-                                        ),
-                                        CarToast.LENGTH_SHORT
-                                    ).show()
                                 }
+                                screenManager.push(confirmScreen)
                             }
                         }.build())
                     }
@@ -299,6 +304,31 @@ class FilterScreen(ctx: CarContext, val session: EVMapSession) : Screen(ctx) {
     }
 }
 
+class ConfirmDeleteScreen(ctx: CarContext, val profile: FilterProfile, val deleteListener: () -> Unit): Screen(ctx) {
+    override fun onGetTemplate(): Template {
+        val message = carContext.getString(R.string.auto_confirm_delete_profile, profile.name)
+        return MessageTemplate.Builder(message)
+            .setHeader(Header.Builder()
+                .setTitle(carContext.getString(R.string.delete))
+                .setStartHeaderAction(Action.BACK)
+                .build())
+            .addAction(Action.Builder()
+                .setTitle(carContext.getString(R.string.delete))
+                .setBackgroundColor(CarColor.PRIMARY)
+                .setFlags(Action.FLAG_PRIMARY)
+                .setOnClickListener {
+                    deleteListener()
+                    screenManager.pop()
+                }
+                .build())
+            .addAction(Action.Builder()
+                .setTitle(carContext.getString(R.string.cancel))
+                .setOnClickListener { screenManager.pop() }
+                .build())
+            .build()
+    }
+}
+
 @androidx.car.app.annotations.ExperimentalCarApi
 class EditFiltersScreen(ctx: CarContext) : Screen(ctx) {
     private val vm = FilterViewModel(carContext.applicationContext as Application)
@@ -360,18 +390,21 @@ class EditFiltersScreen(ctx: CarContext) : Screen(ctx) {
 
                         )
                         setOnClickListener {
-                            lifecycleScope.launch {
-                                vm.deleteCurrentProfile()
-                                CarToast.makeText(
-                                    carContext,
-                                    carContext.getString(
-                                        R.string.deleted_item,
-                                        currentProfile.name
-                                    ),
-                                    CarToast.LENGTH_SHORT
-                                ).show()
-                                screenManager.pop()
+                            val confirmScreen = ConfirmDeleteScreen(carContext, currentProfile) {
+                                lifecycleScope.launch {
+                                    vm.deleteCurrentProfile()
+                                    CarToast.makeText(
+                                        carContext,
+                                        carContext.getString(
+                                            R.string.deleted_item,
+                                            currentProfile.name
+                                        ),
+                                        CarToast.LENGTH_SHORT
+                                    ).show()
+                                    screenManager.pop()
+                                }
                             }
+                            screenManager.push(confirmScreen)
                         }
                     }.build())
                 }

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

@@ -58,7 +58,6 @@ import java.io.IOException
 import java.time.Duration
 import java.time.Instant
 import java.time.ZonedDateTime
-import kotlin.collections.set
 import kotlin.math.abs
 import kotlin.math.min
 
@@ -164,7 +163,7 @@ class LegacyMapScreen(ctx: CarContext, val session: EVMapSession) :
                     setAnchor(Place.Builder(CarLocation.create(it.latitude, it.longitude)).build())
                 }
             }
-            formatter.buildChargerList(chargers, availabilities)?.let {
+            formatter.buildChargerListLegacy(chargers, availabilities)?.let {
                 setItemList(it)
             } ?: setLoading(true)
             setCurrentLocationEnabled(true)

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

@@ -21,9 +21,9 @@ import androidx.car.app.model.ActionStrip
 import androidx.car.app.model.CarColor
 import androidx.car.app.model.CarIcon
 import androidx.car.app.model.Header
-import androidx.car.app.model.ListTemplate
 import androidx.car.app.model.MessageTemplate
 import androidx.car.app.model.PaneTemplate
+import androidx.car.app.model.SectionedItemTemplate
 import androidx.car.app.model.Template
 import androidx.car.app.navigation.model.MapController
 import androidx.car.app.navigation.model.MapWithContentTemplate
@@ -59,7 +59,6 @@ import net.vonforst.evmap.storage.ChargeLocationsRepository
 import net.vonforst.evmap.storage.PreferenceDataSource
 import net.vonforst.evmap.ui.MarkerManager
 import net.vonforst.evmap.utils.distanceBetween
-import net.vonforst.evmap.utils.headingDiff
 import net.vonforst.evmap.viewmodel.Resource
 import net.vonforst.evmap.viewmodel.Status
 import net.vonforst.evmap.viewmodel.await
@@ -70,12 +69,12 @@ import java.io.IOException
 import java.time.Duration
 import java.time.Instant
 import java.time.ZonedDateTime
-import kotlin.collections.set
 import kotlin.math.min
-import kotlin.math.roundToInt
 import kotlin.time.DurationUnit
 import kotlin.time.TimeSource
 
+private const val DEFAULT_ZOOM_MYLOCATION = 14f
+
 /**
  * Main map screen showing either nearby chargers or favorites.
  *
@@ -146,6 +145,7 @@ class MapScreen(ctx: CarContext, val session: EVMapSession) :
     private var map: AnyMap? = null
     private var markerManager: MarkerManager? = null
     private var myLocationEnabled = false
+    private var compassEnabled = false
     private var myLocationNeedsUpdate = false
 
     private val formatter = ChargerListFormatter(ctx, this, session.cas)
@@ -213,7 +213,7 @@ class MapScreen(ctx: CarContext, val session: EVMapSession) :
                     }.build())
                 }.build()
         } else {
-            ListTemplate.Builder().apply {
+            SectionedItemTemplate.Builder().apply {
                 setHeader(Header.Builder().apply {
                     setTitle(title)
                     setStartHeaderAction(Action.APP_ICON)
@@ -223,8 +223,10 @@ class MapScreen(ctx: CarContext, val session: EVMapSession) :
                     chargers?.filterIsInstance<ChargeLocation>(),
                     availabilities
                 )?.let {
-                    setSingleList(it)
+                    addSection(it)
                 } ?: setLoading(true)
+
+                setScrollStatePersistenceStrategy(SectionedItemTemplate.SCROLL_STATE_PRESERVE_INDEX)
             }.build()
         }
         return MapWithContentTemplate.Builder().apply {
@@ -241,11 +243,17 @@ class MapScreen(ctx: CarContext, val session: EVMapSession) :
         .addAction(Action.PAN)
         .addAction(
             Action.Builder().setIcon(
-                CarIcon.Builder(IconCompat.createWithResource(carContext, R.drawable.ic_location))
+                CarIcon.Builder(
+                    IconCompat.createWithResource(
+                        carContext,
+                        if (compassEnabled) R.drawable.ic_compass else R.drawable.ic_location
+                    )
+                )
                     .setTint(if (myLocationEnabled) CarColor.SECONDARY else CarColor.DEFAULT)
                     .build()
             ).setOnClickListener {
-                enableLocation(true)
+                enableLocation(true, myLocationEnabled && !compassEnabled)
+                invalidate()
             }.build()
         )
         .addAction(
@@ -385,8 +393,15 @@ class MapScreen(ctx: CarContext, val session: EVMapSession) :
 
         val map = map ?: return
         if (myLocationEnabled) {
+            val bearing = if (compassEnabled) getBearing(location) else 0f
             if (oldLoc == null) {
-                mapSurfaceCallback.animateCamera(map.cameraUpdateFactory.newLatLngZoom(latLng, 13f))
+                mapSurfaceCallback.animateCamera(
+                    map.cameraUpdateFactory.newLatLngZoomBearing(
+                        latLng,
+                        DEFAULT_ZOOM_MYLOCATION,
+                        bearing
+                    )
+                )
             } else if (latLng != oldLoc && distanceBetween(
                     latLng.latitude,
                     latLng.longitude,
@@ -395,7 +410,11 @@ class MapScreen(ctx: CarContext, val session: EVMapSession) :
                 ) > 1
             ) {
                 // only update map if location changed by more than 1 meter
-                val camUpdate = map.cameraUpdateFactory.newLatLng(latLng)
+                val camUpdate = map.cameraUpdateFactory.newLatLngZoomBearing(
+                    latLng,
+                    map.cameraPosition.zoom,
+                    bearing
+                )
                 mapSurfaceCallback.animateCamera(camUpdate)
             }
         }
@@ -545,6 +564,7 @@ class MapScreen(ctx: CarContext, val session: EVMapSession) :
         availabilities.clear()
         location = null
         myLocationEnabled = false
+        compassEnabled = false
         removeListeners()
     }
 
@@ -556,6 +576,7 @@ class MapScreen(ctx: CarContext, val session: EVMapSession) :
             prefs.currentMapZoom = it.cameraPosition.zoom
         }
         prefs.currentMapMyLocationEnabled = myLocationEnabled
+        prefs.androidAutoCompassEnabled = compassEnabled
     }
 
     private fun removeListeners() {
@@ -625,9 +646,10 @@ class MapScreen(ctx: CarContext, val session: EVMapSession) :
                 onClusterClick = {
                     val newZoom = map.cameraPosition.zoom + 2
                     mapSurfaceCallback.animateCamera(
-                        map.cameraUpdateFactory.newLatLngZoom(
+                        map.cameraUpdateFactory.newLatLngZoomBearing(
                             LatLng(it.coordinates.lat, it.coordinates.lng),
-                            newZoom
+                            newZoom,
+                            if (compassEnabled) location?.let { getBearing(it) } ?: 0f else 0f
                         )
                     )
                 }
@@ -657,6 +679,7 @@ class MapScreen(ctx: CarContext, val session: EVMapSession) :
         prefs.placeSearchResultAndroidAuto?.let { place ->
             // move to the location of the search result
             myLocationEnabled = false
+            compassEnabled = false
             markerManager?.searchResult = place
             if (place.viewport != null) {
                 map.moveCamera(map.cameraUpdateFactory.newLatLngBounds(place.viewport, 0))
@@ -664,7 +687,7 @@ class MapScreen(ctx: CarContext, val session: EVMapSession) :
                 map.moveCamera(map.cameraUpdateFactory.newLatLngZoom(place.latLng, 12f))
             }
         } ?: if (prefs.currentMapMyLocationEnabled) {
-            enableLocation(false)
+            enableLocation(false, prefs.androidAutoCompassEnabled)
         } else {
             // use position saved in preferences, fall back to default (Europe)
             val cameraUpdate =
@@ -692,14 +715,16 @@ class MapScreen(ctx: CarContext, val session: EVMapSession) :
         loadChargers()
     }
 
-    private fun enableLocation(animated: Boolean) {
+    private fun enableLocation(animated: Boolean, withCompass: Boolean) {
         myLocationEnabled = true
+        compassEnabled = withCompass
         myLocationNeedsUpdate = true
-        if (location != null) {
+        location?.let { location ->
             val map = map ?: return
-            val update = map.cameraUpdateFactory.newLatLngZoom(
+            val update = map.cameraUpdateFactory.newLatLngZoomBearing(
                 LatLng.fromLocation(location),
-                13f
+                DEFAULT_ZOOM_MYLOCATION,
+                if (withCompass) getBearing(location) else 0f
             )
             if (animated) {
                 mapSurfaceCallback.animateCamera(update)
@@ -708,4 +733,7 @@ class MapScreen(ctx: CarContext, val session: EVMapSession) :
             }
         }
     }
+
+    private fun getBearing(location: Location): Float =
+        heading?.orientations?.value?.get(0) ?: location.bearing
 }

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

@@ -171,8 +171,9 @@ class MapSurfaceCallback(val ctx: CarContext, val lifecycleScope: LifecycleCorou
         flingAnimator?.cancel()
         val map = map ?: return
 
-        val offsetX = (focusX - mapView.width / 2) * (scaleFactor - 1f)
-        val offsetY = (offsetY(focusY) - mapView.height / 2) * (scaleFactor - 1f)
+        val (x, y) = offsetScreen(focusX, focusY)
+        val offsetX = (x - mapView.width / 2) * (scaleFactor - 1f)
+        val offsetY = (y - mapView.height / 2) * (scaleFactor - 1f)
 
         Log.i("MapSurfaceCallback", "focus: $focusX, $focusY, scaleFactor: $scaleFactor")
         if (scaleFactor == 2f) {
@@ -223,13 +224,13 @@ class MapSurfaceCallback(val ctx: CarContext, val lifecycleScope: LifecycleCorou
         flingAnimator?.cancel()
         val downTime: Long = SystemClock.uptimeMillis()
         val eventTime: Long = downTime + 100
-        val yOffset = offsetY(y)
+        val (xOffset, yOffset) = offsetScreen(x, y)
 
         val downEvent = MotionEvent.obtain(
             downTime,
             downTime,
             MotionEvent.ACTION_DOWN,
-            x,
+            xOffset,
             yOffset,
             0
         )
@@ -239,7 +240,7 @@ class MapSurfaceCallback(val ctx: CarContext, val lifecycleScope: LifecycleCorou
             downTime,
             eventTime,
             MotionEvent.ACTION_UP,
-            x,
+            xOffset,
             yOffset,
             0
         )
@@ -247,16 +248,24 @@ class MapSurfaceCallback(val ctx: CarContext, val lifecycleScope: LifecycleCorou
         upEvent.recycle()
     }
 
-    private fun offsetY(y: Float): Float {
+    private fun offsetScreen(x: Float, y: Float): Pair<Float, Float> {
         if (BuildConfig.FLAVOR_automotive != "automotive") {
-            return y
+            return x to y
         }
 
-        // On AAOS, touch locations seem to be offset by the status bar height
+        // On AAOS, touch locations don't seem to take into account system bar insets
         // related: https://issuetracker.google.com/issues/256905247
         val resId = ctx.resources.getIdentifier("status_bar_height", "dimen", "android")
-        val offset = resId.takeIf { it > 0 }?.let { ctx.resources.getDimensionPixelSize(it) } ?: 0
-        return y + offset
+        val yOffset = resId.takeIf { it > 0 }?.let { ctx.resources.getDimensionPixelSize(it) } ?: 0
+
+        val xOffset = if (Build.MODEL == "AIVI2 R FULL DOM" && width > height) {
+            // Renault 5 left system bar
+            120
+        } else {
+            0
+        }
+
+        return x + xOffset to y + yOffset
     }
 
     private fun createMap(ctx: Context): MapContainerView {

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

@@ -1,9 +1,7 @@
 package net.vonforst.evmap.auto
 
-import android.content.BroadcastReceiver
 import android.content.Context
 import android.content.Intent
-import android.content.IntentFilter
 import android.content.pm.PackageManager.NameNotFoundException
 import android.hardware.Sensor
 import android.hardware.SensorManager
@@ -17,8 +15,6 @@ import androidx.car.app.constraints.ConstraintManager
 import androidx.car.app.model.Action
 import androidx.car.app.model.CarColor
 import androidx.car.app.model.CarIcon
-import androidx.car.app.model.GridItem
-import androidx.car.app.model.GridTemplate
 import androidx.car.app.model.ItemList
 import androidx.car.app.model.ListTemplate
 import androidx.car.app.model.MessageTemplate
@@ -27,15 +23,12 @@ import androidx.car.app.model.Row
 import androidx.car.app.model.SectionedItemList
 import androidx.car.app.model.Template
 import androidx.car.app.model.Toggle
-import androidx.core.content.IntentCompat
 import androidx.core.graphics.drawable.IconCompat
 import androidx.core.net.toUri
 import androidx.core.text.HtmlCompat
 import androidx.lifecycle.DefaultLifecycleObserver
 import androidx.lifecycle.LifecycleOwner
 import androidx.lifecycle.lifecycleScope
-import kotlinx.coroutines.flow.collectLatest
-import kotlinx.coroutines.flow.single
 import kotlinx.coroutines.launch
 import net.vonforst.evmap.BuildConfig
 import net.vonforst.evmap.EXTRA_DONATE
@@ -44,11 +37,6 @@ import net.vonforst.evmap.R
 import net.vonforst.evmap.addDebugInterceptors
 import net.vonforst.evmap.api.availability.tesla.TeslaAuthenticationApi
 import net.vonforst.evmap.api.availability.tesla.TeslaOwnerApi
-import net.vonforst.evmap.api.chargeprice.ChargepriceApi
-import net.vonforst.evmap.api.chargeprice.ChargepriceCar
-import net.vonforst.evmap.api.chargeprice.ChargepriceTariff
-import net.vonforst.evmap.currencyDisplayName
-import net.vonforst.evmap.fragment.oauth.OAuthLoginFragment
 import net.vonforst.evmap.fragment.oauth.OAuthLoginFragmentArgs
 import net.vonforst.evmap.getPackageInfoCompat
 import net.vonforst.evmap.storage.AppDatabase
@@ -57,12 +45,15 @@ import net.vonforst.evmap.storage.PreferenceDataSource
 import okhttp3.OkHttpClient
 import java.io.IOException
 import java.time.Instant
-import kotlin.math.max
-import kotlin.math.min
 
 @ExperimentalCarApi
-class SettingsScreen(ctx: CarContext, val session: EVMapSession) : Screen(ctx) {
+class SettingsScreen(ctx: CarContext, val session: EVMapSession) : Screen(ctx), DefaultLifecycleObserver {
     val prefs = PreferenceDataSource(ctx)
+    val newMapScreenEnabledPrevious = prefs.androidAutoNewMapScreenEnabled
+
+    init {
+        lifecycle.addObserver(this)
+    }
 
     override fun onGetTemplate(): Template {
         return ListTemplate.Builder().apply {
@@ -86,23 +77,6 @@ class SettingsScreen(ctx: CarContext, val session: EVMapSession) : Screen(ctx) {
                         screenManager.push(DataSettingsScreen(carContext, session))
                     }
                 }.build())
-                addItem(Row.Builder().apply {
-                    setTitle(carContext.getString(R.string.settings_chargeprice))
-                    setImage(
-                        CarIcon.Builder(
-                            IconCompat.createWithResource(
-                                carContext,
-                                R.drawable.ic_chargeprice
-                            )
-                        ).setTint(
-                            CarColor.DEFAULT
-                        ).build()
-                    )
-                    setBrowsable(true)
-                    setOnClickListener {
-                        screenManager.push(ChargepriceSettingsScreen(carContext))
-                    }
-                }.build())
                 if (supportsCarApiLevel3(carContext)) {
                     addItem(
                         Row.Builder()
@@ -118,7 +92,26 @@ class SettingsScreen(ctx: CarContext, val session: EVMapSession) : Screen(ctx) {
                             }
                             .build()
                     )
-                    if (carContext.carAppApiLevel < 7 || !carContext.isAppDrivenRefreshSupported) {
+                    if (supportsNewMapScreen(carContext)) {
+                        addItem(
+                            Row.Builder()
+                                .setTitle(carContext.getString(R.string.auto_use_new_map_screen))
+                                .setToggle(Toggle.Builder {
+                                    prefs.androidAutoNewMapScreenEnabled = it
+                                    invalidate()
+                                }.setChecked(prefs.androidAutoNewMapScreenEnabled).build())
+                                .setImage(
+                                    CarIcon.Builder(
+                                        IconCompat.createWithResource(
+                                            carContext,
+                                            R.drawable.ic_developer
+                                        )
+                                    ).setTint(CarColor.DEFAULT).build()
+                                )
+                                .build()
+                        )
+                    }
+                    if (!supportsNewMapScreen(carContext) || !prefs.androidAutoNewMapScreenEnabled) {
                         // this option is only supported in LegacyMapScreen
                         addItem(
                             Row.Builder()
@@ -150,14 +143,23 @@ class SettingsScreen(ctx: CarContext, val session: EVMapSession) : Screen(ctx) {
                             ).setTint(CarColor.DEFAULT).build()
                         )
                         .setBrowsable(true)
-                        .setOnClickListener {
+                        .setOnClickListener(ParkedOnlyOnClickListener.create {
                             screenManager.push(AboutScreen(carContext, session))
-                        }
+                        })
                         .build()
                 )
             }.build())
         }.build()
     }
+
+    override fun onStop(owner: LifecycleOwner) {
+        if (newMapScreenEnabledPrevious != prefs.androidAutoNewMapScreenEnabled) {
+            val newMapScreen = session.onCreateScreen(session.intent)
+            val oldMapScreen = screenManager.screenStack.last()
+            screenManager.push(newMapScreen)
+            screenManager.remove(oldMapScreen)
+        }
+    }
 }
 
 @ExperimentalCarApi
@@ -507,341 +509,6 @@ class ChooseDataSourceScreen(
     }
 }
 
-class ChargepriceSettingsScreen(ctx: CarContext) : Screen(ctx) {
-    val prefs = PreferenceDataSource(carContext)
-    private val maxRows = ctx.getContentLimit(ConstraintManager.CONTENT_LIMIT_TYPE_LIST)
-
-    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_chargeprice_native_integration))
-                    addText(carContext.getString(if (prefs.chargepriceNativeIntegration) R.string.pref_chargeprice_native_integration_on else R.string.pref_chargeprice_native_integration_off))
-                    setToggle(Toggle.Builder {
-                        prefs.chargepriceNativeIntegration = it
-                        invalidate()
-                    }.setChecked(prefs.chargepriceNativeIntegration).build())
-                }.build())
-                addItem(Row.Builder().apply {
-                    setTitle(carContext.getString(R.string.pref_my_vehicle))
-                    setBrowsable(true)
-                    setOnClickListener {
-                        screenManager.push(SelectVehiclesScreen(carContext))
-                    }
-                    setEnabled(prefs.chargepriceNativeIntegration)
-                }.build())
-                addItem(Row.Builder().apply {
-                    setTitle(carContext.getString(R.string.pref_my_tariffs))
-                    setBrowsable(true)
-                    setOnClickListener {
-                        screenManager.push(SelectTariffsScreen(carContext))
-                    }
-                    addText(
-                        if (prefs.chargepriceMyTariffsAll) {
-                            carContext.getString(R.string.chargeprice_all_tariffs_selected)
-                        } else {
-                            val n = prefs.chargepriceMyTariffs?.size ?: 0
-                            carContext.resources
-                                .getQuantityString(
-                                    R.plurals.chargeprice_some_tariffs_selected,
-                                    n,
-                                    n
-                                ) + "\n" + carContext.resources.getQuantityString(
-                                R.plurals.pref_my_tariffs_summary,
-                                n
-                            )
-                        }
-                    )
-                    setEnabled(prefs.chargepriceNativeIntegration)
-                }.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))
-                    }
-                    setEnabled(prefs.chargepriceNativeIntegration)
-                }.build())
-                addItem(Row.Builder().apply {
-                    setTitle(carContext.getString(R.string.pref_chargeprice_currency))
-
-                    val values =
-                        carContext.resources.getStringArray(R.array.pref_chargeprice_currencies)
-                    val names = values.map(::currencyDisplayName)
-                    val index = values.indexOf(prefs.chargepriceCurrency)
-                    addText(if (index >= 0) names[index] else "")
-
-                    setBrowsable(true)
-                    setOnClickListener {
-                        screenManager.push(SelectCurrencyScreen(carContext))
-                    }
-                    setEnabled(prefs.chargepriceNativeIntegration)
-                }.build())
-                addItem(Row.Builder().apply {
-                    setTitle(carContext.getString(R.string.pref_chargeprice_no_base_fee))
-                    setToggle(Toggle.Builder {
-                        prefs.chargepriceNoBaseFee = it
-                    }.setChecked(prefs.chargepriceNoBaseFee).build())
-                    setEnabled(prefs.chargepriceNativeIntegration)
-                }.build())
-                if (maxRows > 6) {
-                    addItem(Row.Builder().apply {
-                        setTitle(carContext.getString(R.string.pref_chargeprice_show_provider_customer_tariffs))
-                        addText(carContext.getString(R.string.pref_chargeprice_show_provider_customer_tariffs_summary))
-                        setToggle(Toggle.Builder {
-                            prefs.chargepriceShowProviderCustomerTariffs = it
-                        }.setChecked(prefs.chargepriceShowProviderCustomerTariffs).build())
-                        setEnabled(prefs.chargepriceNativeIntegration)
-                    }.build())
-                    addItem(Row.Builder().apply {
-                        setTitle(carContext.getString(R.string.pref_chargeprice_allow_unbalanced_load))
-                        addText(carContext.getString(R.string.pref_chargeprice_allow_unbalanced_load_summary))
-                        setToggle(Toggle.Builder {
-                            prefs.chargepriceAllowUnbalancedLoad = it
-                        }.setChecked(prefs.chargepriceAllowUnbalancedLoad).build())
-                        setEnabled(prefs.chargepriceNativeIntegration)
-                    }.build())
-                }
-            }.build())
-        }.build()
-    }
-}
-
-class SelectVehiclesScreen(ctx: CarContext) : MultiSelectSearchScreen<ChargepriceCar>(ctx) {
-    private val prefs = PreferenceDataSource(carContext)
-    private var api = ChargepriceApi.create(
-        carContext.getString(R.string.chargeprice_key),
-        carContext.getString(R.string.chargeprice_api_url)
-    )
-    override val isMultiSelect = true
-    override val shouldShowSelectAll = false
-
-    override fun isSelected(it: ChargepriceCar): Boolean {
-        return prefs.chargepriceMyVehicles.contains(it.id)
-    }
-
-    override fun toggleSelected(item: ChargepriceCar) {
-        if (isSelected(item)) {
-            prefs.chargepriceMyVehicles = prefs.chargepriceMyVehicles.minus(item.id)
-        } else {
-            prefs.chargepriceMyVehicles = prefs.chargepriceMyVehicles.plus(item.id)
-        }
-    }
-
-    override fun getLabel(it: ChargepriceCar) = "${it.brand} ${it.name}"
-
-    override fun getDetails(it: ChargepriceCar) = it.formatSpecs()
-
-    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),
-        carContext.getString(R.string.chargeprice_api_url)
-    )
-    override val isMultiSelect = true
-    override val shouldShowSelectAll = true
-
-    override fun isSelected(it: ChargepriceTariff): Boolean {
-        return prefs.chargepriceMyTariffsAll or (prefs.chargepriceMyTariffs?.contains(it.id)
-            ?: false)
-    }
-
-    override fun toggleSelected(item: ChargepriceTariff) {
-        val tariffs = prefs.chargepriceMyTariffs ?: if (prefs.chargepriceMyTariffsAll) {
-            fullList!!.map { it.id }.toSet()
-        } else {
-            emptySet()
-        }
-        if (isSelected(item)) {
-            prefs.chargepriceMyTariffs = tariffs.minus(item.id)
-            prefs.chargepriceMyTariffsAll = false
-        } else {
-            prefs.chargepriceMyTariffs = tariffs.plus(item.id)
-            if (prefs.chargepriceMyTariffs == fullList!!.map { it.id }.toSet()) {
-                prefs.chargepriceMyTariffsAll = true
-            }
-        }
-    }
-
-    override fun selectAll() {
-        prefs.chargepriceMyTariffsAll = true
-        super.selectAll()
-    }
-
-    override fun selectNone() {
-        prefs.chargepriceMyTariffsAll = false
-        prefs.chargepriceMyTariffs = emptySet()
-        super.selectNone()
-    }
-
-    override fun getLabel(it: ChargepriceTariff): String {
-        return if (!it.name.lowercase().startsWith(it.provider.lowercase())) {
-            "${it.provider} ${it.name}"
-        } else {
-            it.name
-        }
-    }
-
-    override suspend fun loadData(): List<ChargepriceTariff> {
-        return api.getTariffs()
-    }
-}
-
-class SelectCurrencyScreen(ctx: CarContext) : MultiSelectSearchScreen<Pair<String, String>>(ctx) {
-    private val prefs = PreferenceDataSource(carContext)
-    override val isMultiSelect = false
-    override val shouldShowSelectAll = false
-
-    override fun isSelected(it: Pair<String, String>): Boolean =
-        prefs.chargepriceCurrency == it.second
-
-    override fun toggleSelected(item: Pair<String, String>) {
-        prefs.chargepriceCurrency = item.second
-    }
-
-    override fun getLabel(it: Pair<String, String>): String = it.first
-
-    override suspend fun loadData(): List<Pair<String, String>> {
-        val values = carContext.resources.getStringArray(R.array.pref_chargeprice_currencies)
-        val names = values.map(::currencyDisplayName)
-        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 == 100 -> 0  // AA has increased the limit to 100 and changed the way items are laid out
-                        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()
-    }
-}
-
 @ExperimentalCarApi
 class AboutScreen(ctx: CarContext, val session: EVMapSession) : Screen(ctx) {
     val prefs = PreferenceDataSource(ctx)

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

@@ -0,0 +1,21 @@
+package net.vonforst.evmap.auto
+
+import androidx.annotation.StringRes
+import androidx.car.app.CarContext
+import androidx.car.app.Screen
+import androidx.car.app.model.Action
+import androidx.car.app.model.LongMessageTemplate
+import androidx.car.app.model.Template
+
+class TextDialogScreen(
+    ctx: CarContext,
+    @StringRes val title: Int,
+    @StringRes val message: Int
+) : Screen(ctx) {
+    override fun onGetTemplate(): Template {
+        return LongMessageTemplate.Builder(carContext.getString(message)).apply {
+            setTitle(carContext.getString(title))
+            setHeaderAction(Action.BACK)
+        }.build()
+    }
+}

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

@@ -1,275 +0,0 @@
-package net.vonforst.evmap.fragment
-
-import android.annotation.SuppressLint
-import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.MotionEvent
-import android.view.View
-import android.view.ViewGroup
-import androidx.core.view.ViewCompat
-import androidx.core.view.WindowInsetsCompat
-import androidx.core.view.updatePadding
-import androidx.databinding.DataBindingUtil
-import androidx.fragment.app.Fragment
-import androidx.fragment.app.viewModels
-import androidx.lifecycle.Observer
-import androidx.navigation.fragment.findNavController
-import androidx.navigation.fragment.navArgs
-import androidx.navigation.ui.setupWithNavController
-import androidx.recyclerview.widget.ConcatAdapter
-import androidx.recyclerview.widget.DividerItemDecoration
-import androidx.recyclerview.widget.LinearLayoutManager
-import com.google.android.material.color.MaterialColors
-import com.google.android.material.dialog.MaterialAlertDialogBuilder
-import com.google.android.material.snackbar.Snackbar
-import com.google.android.material.transition.MaterialContainerTransform
-import net.vonforst.evmap.MapsActivity
-import net.vonforst.evmap.R
-import net.vonforst.evmap.adapter.ChargepriceAdapter
-import net.vonforst.evmap.adapter.CheckableChargepriceCarAdapter
-import net.vonforst.evmap.adapter.CheckableConnectorAdapter
-import net.vonforst.evmap.adapter.SingleViewAdapter
-import net.vonforst.evmap.api.chargeprice.ChargepriceApi
-import net.vonforst.evmap.api.chargeprice.ChargepriceCar
-import net.vonforst.evmap.api.equivalentPlugTypes
-import net.vonforst.evmap.databinding.FragmentChargepriceBinding
-import net.vonforst.evmap.databinding.FragmentChargepriceHeaderBinding
-import net.vonforst.evmap.model.Chargepoint
-import net.vonforst.evmap.navigation.safeNavigate
-import net.vonforst.evmap.storage.PreferenceDataSource
-import net.vonforst.evmap.viewmodel.ChargepriceViewModel
-import net.vonforst.evmap.viewmodel.Status
-import net.vonforst.evmap.viewmodel.savedStateViewModelFactory
-import java.text.NumberFormat
-
-class ChargepriceFragment : Fragment() {
-    private lateinit var binding: FragmentChargepriceBinding
-    private lateinit var headerBinding: FragmentChargepriceHeaderBinding
-    private var connectionErrorSnackbar: Snackbar? = null
-
-    private val vm: ChargepriceViewModel by viewModels(factoryProducer = {
-        savedStateViewModelFactory { state ->
-            ChargepriceViewModel(
-                requireActivity().application,
-                getString(R.string.chargeprice_key),
-                getString(R.string.chargeprice_api_url),
-                state
-            )
-        }
-    })
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        sharedElementEnterTransition = MaterialContainerTransform()
-
-        if (savedInstanceState == null) {
-            val prefs = PreferenceDataSource(requireContext())
-            prefs.chargepriceCounter += 1
-            if ((prefs.chargepriceCounter).mod(30) == 0) {
-                showDonationDialog()
-            }
-        }
-    }
-
-    override fun onResume() {
-        super.onResume()
-        vm.reloadPrefs()
-    }
-
-    private fun showDonationDialog() {
-        MaterialAlertDialogBuilder(requireContext())
-            .setTitle(R.string.chargeprice_donation_dialog_title)
-            .setMessage(R.string.chargeprice_donation_dialog_detail)
-            .setNegativeButton(R.string.ok) { di, _ ->
-                di.cancel()
-            }
-            .setPositiveButton(R.string.donate) { di, _ ->
-                di.dismiss()
-                findNavController().safeNavigate(ChargepriceFragmentDirections.actionChargepriceToDonateFragment())
-            }
-            .show()
-    }
-
-    override fun onCreateView(
-        inflater: LayoutInflater,
-        container: ViewGroup?,
-        savedInstanceState: Bundle?
-    ): View {
-        binding = DataBindingUtil.inflate(
-            inflater,
-            R.layout.fragment_chargeprice, container, false
-        )
-        headerBinding = DataBindingUtil.inflate(
-            inflater,
-            R.layout.fragment_chargeprice_header, container, false
-        )
-        binding.lifecycleOwner = viewLifecycleOwner
-        binding.vm = vm
-        headerBinding.lifecycleOwner = viewLifecycleOwner
-        headerBinding.vm = vm
-
-        binding.toolbar.inflateMenu(R.menu.chargeprice)
-        binding.toolbar.setTitle(R.string.chargeprice_title)
-
-        ViewCompat.setOnApplyWindowInsetsListener(binding.chargePricesList) { v, insets ->
-            v.updatePadding(bottom = insets.getInsets(WindowInsetsCompat.Type.systemBars()).bottom)
-            WindowInsetsCompat.CONSUMED
-        }
-
-        return binding.root
-    }
-
-    @SuppressLint("ClickableViewAccessibility")
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-
-        binding.toolbar.setupWithNavController(
-            findNavController(),
-            (requireActivity() as MapsActivity).appBarConfiguration
-        )
-
-        val fragmentArgs: ChargepriceFragmentArgs by navArgs()
-        val charger = fragmentArgs.charger
-        vm.charger.value = charger
-        if (vm.chargepoint.value == null) {
-            vm.chargepoint.value = charger.chargepointsMerged[0]
-        }
-
-        val vehicleAdapter = CheckableChargepriceCarAdapter()
-        headerBinding.vehicleSelection.adapter = vehicleAdapter
-        val vehicleObserver: Observer<ChargepriceCar?> = Observer {
-            vehicleAdapter.setCheckedItem(it)
-        }
-        vm.vehicle.observe(viewLifecycleOwner, vehicleObserver)
-        vehicleAdapter.onCheckedItemChangedListener = {
-            vm.vehicle.removeObserver(vehicleObserver)
-            vm.vehicle.value = it
-            vm.vehicle.observe(viewLifecycleOwner, vehicleObserver)
-        }
-
-        val chargepriceAdapter = ChargepriceAdapter().apply {
-            onClickListener = {
-                (requireActivity() as MapsActivity).openUrl(it.url, binding.root)
-            }
-        }
-        val joinedAdapter = ConcatAdapter(
-            SingleViewAdapter(headerBinding.root),
-            chargepriceAdapter
-        )
-        binding.chargePricesList.apply {
-            adapter = joinedAdapter
-            layoutManager =
-                LinearLayoutManager(context, LinearLayoutManager.VERTICAL, false)
-            addItemDecoration(
-                DividerItemDecoration(
-                    context, LinearLayoutManager.VERTICAL
-                )
-            )
-        }
-        vm.chargepriceMetaForChargepoint.observe(viewLifecycleOwner) {
-            chargepriceAdapter.meta = it?.data
-        }
-        vm.myTariffs.observe(viewLifecycleOwner) {
-            chargepriceAdapter.myTariffs = it
-        }
-        vm.myTariffsAll.observe(viewLifecycleOwner) {
-            chargepriceAdapter.myTariffsAll = it
-        }
-        vm.chargePricesForChargepoint.observe(viewLifecycleOwner) {
-            chargepriceAdapter.submitList(it?.data ?: emptyList())
-        }
-
-        val connectorsAdapter = CheckableConnectorAdapter()
-
-        val observer: Observer<Chargepoint?> = Observer {
-            connectorsAdapter.setCheckedItem(it)
-        }
-        vm.chargepoint.observe(viewLifecycleOwner, observer)
-        connectorsAdapter.onCheckedItemChangedListener = {
-            vm.chargepoint.removeObserver(observer)
-            vm.chargepoint.value = it
-            vm.chargepoint.observe(viewLifecycleOwner, observer)
-        }
-
-        vm.vehicleCompatibleConnectors.observe(viewLifecycleOwner) { plugs ->
-            connectorsAdapter.enabledConnectors =
-                plugs?.flatMap { plug -> equivalentPlugTypes(plug) }
-        }
-
-        headerBinding.connectorsList.apply {
-            adapter = connectorsAdapter
-            layoutManager = LinearLayoutManager(context, LinearLayoutManager.HORIZONTAL, false)
-        }
-
-        binding.imgChargepriceLogo.setOnClickListener {
-            (requireActivity() as MapsActivity).openUrl(
-                ChargepriceApi.getPoiUrl(charger),
-                binding.root
-            )
-        }
-
-        binding.btnSettings.setOnClickListener {
-            findNavController().safeNavigate(ChargepriceFragmentDirections.actionChargepriceToChargepriceSettingsFragment())
-        }
-
-        headerBinding.batteryRange.setLabelFormatter { value: Float ->
-            val fmt = NumberFormat.getNumberInstance()
-            fmt.maximumFractionDigits = 0
-            fmt.format(value.toDouble()) + "%"
-        }
-        headerBinding.batteryRange.setOnTouchListener { _: View, motionEvent: MotionEvent ->
-            when (motionEvent.actionMasked) {
-                MotionEvent.ACTION_DOWN -> vm.batteryRangeSliderDragging.value = true
-                MotionEvent.ACTION_UP -> vm.batteryRangeSliderDragging.value = false
-            }
-            false
-        }
-        headerBinding.tvChargeFromTo.setOnClickListener {
-            it.postDelayed({
-                vm.resetBatteryRangeToDefault()
-            }, 250)
-        }
-
-        binding.toolbar.setOnMenuItemClickListener {
-            when (it.itemId) {
-                R.id.menu_help -> {
-                    (activity as? MapsActivity)?.openUrl(
-                        getString(R.string.chargeprice_faq_link),
-                        binding.root
-                    )
-                    true
-                }
-                else -> false
-            }
-        }
-
-        vm.chargePricesForChargepoint.observe(viewLifecycleOwner) { res ->
-            when (res?.status) {
-                Status.ERROR -> {
-                    if (vm.vehicle.value == null) return@observe
-                    connectionErrorSnackbar?.dismiss()
-                    connectionErrorSnackbar = Snackbar
-                        .make(
-                            view,
-                            R.string.chargeprice_connection_error,
-                            Snackbar.LENGTH_INDEFINITE
-                        )
-                        .setAction(R.string.retry) {
-                            connectionErrorSnackbar?.dismiss()
-                            vm.loadPrices()
-                        }
-                    connectionErrorSnackbar!!.show()
-                }
-                Status.SUCCESS, null -> {
-                    connectionErrorSnackbar?.dismiss()
-                }
-                Status.LOADING -> {
-                }
-            }
-        }
-
-        // Workaround for AndroidX bug: https://github.com/material-components/material-components-android/issues/1984
-        view.setBackgroundColor(MaterialColors.getColor(view, android.R.attr.windowBackground))
-    }
-
-}

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

@@ -1,19 +1,23 @@
 package net.vonforst.evmap.fragment
 
 import android.content.Context
+import android.content.res.ColorStateList
 import android.view.LayoutInflater
-import android.view.View
-import androidx.databinding.DataBindingUtil
 import androidx.recyclerview.widget.ConcatAdapter
 import androidx.recyclerview.widget.LinearLayoutManager
-import net.vonforst.evmap.R
-import net.vonforst.evmap.adapter.ConnectorAdapter
 import net.vonforst.evmap.adapter.ConnectorDetailsAdapter
 import net.vonforst.evmap.adapter.SingleViewAdapter
 import net.vonforst.evmap.api.availability.ChargeLocationStatus
+import net.vonforst.evmap.api.iconForPlugType
+import net.vonforst.evmap.api.nameForPlugType
+import net.vonforst.evmap.api.stringProvider
 import net.vonforst.evmap.databinding.DialogConnectorDetailsBinding
 import net.vonforst.evmap.databinding.DialogConnectorDetailsHeaderBinding
 import net.vonforst.evmap.model.Chargepoint
+import net.vonforst.evmap.ui.availabilityColor
+import net.vonforst.evmap.ui.availabilityText
+import net.vonforst.evmap.ui.goneUnless
+import java.util.Locale
 
 class ConnectorDetailsDialog(
     binding: DialogConnectorDetailsBinding,
@@ -30,9 +34,10 @@ class ConnectorDetailsDialog(
             layoutManager =
                 LinearLayoutManager(context, LinearLayoutManager.VERTICAL, false)
         }
-        headerBinding_ = DataBindingUtil.inflate(
+        headerBinding_ = DialogConnectorDetailsHeaderBinding.inflate(
             LayoutInflater.from(context),
-            R.layout.dialog_connector_details_header, binding.list, false
+            binding.list,
+            false
         )
         binding.list.adapter = ConcatAdapter(
             SingleViewAdapter(headerBinding.root),
@@ -57,8 +62,41 @@ class ConnectorDetailsDialog(
         } else emptyList()
         detailsAdapter.submitList(items)
 
-        headerBinding.divider.visibility = if (items.isEmpty()) View.GONE else View.VISIBLE
-        headerBinding.item = ConnectorAdapter.ChargepointWithAvailability(cp, cpStatus)
+        headerBinding.divider.visibility = goneUnless(items.isNotEmpty())
+
+        val context = headerBinding.root.context
+        val locale = Locale.getDefault()
+        val provider = context.stringProvider()
+
+        headerBinding.imageView.setImageResource(iconForPlugType(cp.type))
+        headerBinding.imageView.contentDescription = cp.type
+        headerBinding.imageView.imageTintList =
+            ColorStateList.valueOf(availabilityColor(cpStatus, context))
+
+        headerBinding.txtNumber.text = String.format(locale, "x %d", cp.count)
+        headerBinding.txtNumber.visibility = goneUnless(cpStatus == null)
+
+        if (cpStatus != null) {
+            headerBinding.txtStatus.text = String.format(
+                locale,
+                "%s/%d",
+                availabilityText(cpStatus),
+                cp.count
+            )
+            headerBinding.txtStatus.backgroundTintList =
+                ColorStateList.valueOf(availabilityColor(cpStatus, context))
+        }
+        headerBinding.txtStatus.visibility = goneUnless(cpStatus != null)
+
+        val name = nameForPlugType(provider, cp.type)
+        headerBinding.txtTitle.text = if (cp.hasKnownPower()) {
+            "$name - ${cp.formatPower(locale)}"
+        } else {
+            name
+        }
+
+        headerBinding.txtDetail.text = cp.formatVoltageAndCurrent()
+        headerBinding.txtDetail.visibility = goneUnless(cp.hasKnownVoltageAndCurrent())
     }
 
     fun onDestroy() {

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

@@ -10,7 +10,6 @@ import android.widget.FrameLayout
 import androidx.core.view.ViewCompat
 import androidx.core.view.WindowInsetsCompat
 import androidx.core.view.updatePadding
-import androidx.databinding.DataBindingUtil
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.viewModels
 import androidx.navigation.fragment.findNavController
@@ -32,6 +31,7 @@ import net.vonforst.evmap.databinding.ItemFavoriteBinding
 import net.vonforst.evmap.location.FusionEngine
 import net.vonforst.evmap.location.LocationEngine
 import net.vonforst.evmap.model.FavoriteWithDetail
+import net.vonforst.evmap.ui.goneUnless
 import net.vonforst.evmap.utils.checkAnyLocationPermission
 import net.vonforst.evmap.viewmodel.FavoritesViewModel
 import net.vonforst.evmap.viewmodel.viewModelFactory
@@ -64,12 +64,7 @@ class FavoritesFragment : Fragment() {
         container: ViewGroup?,
         savedInstanceState: Bundle?
     ): View {
-        binding = DataBindingUtil.inflate(
-            inflater,
-            R.layout.fragment_favorites, container, false
-        )
-        binding.lifecycleOwner = viewLifecycleOwner
-        binding.vm = vm
+        binding = FragmentFavoritesBinding.inflate(inflater, container, false)
 
         ViewCompat.setOnApplyWindowInsetsListener(
             binding.favsList
@@ -114,6 +109,13 @@ class FavoritesFragment : Fragment() {
                 )
             )
         }
+        vm.listData.observe(viewLifecycleOwner) { items ->
+            adapter.submitList(items)
+            val isEmpty = items.isNullOrEmpty()
+            binding.animationView.visibility = goneUnless(isEmpty)
+            binding.txtEmptyState.visibility = goneUnless(isEmpty)
+        }
+
         createTouchHelper().attachToRecyclerView(binding.favsList)
 
         binding.swipeRefresh.setOnRefreshListener {
@@ -185,7 +187,7 @@ class FavoritesFragment : Fragment() {
             override fun onSelectedChanged(viewHolder: RecyclerView.ViewHolder?, actionState: Int) {
                 if (viewHolder != null && actionState == ItemTouchHelper.ACTION_STATE_SWIPE) {
                     val binding =
-                        (viewHolder as DataBindingAdapter.ViewHolder<*>).binding as ItemFavoriteBinding
+                        (viewHolder as DataBindingAdapter.ViewHolder).binding as ItemFavoriteBinding
                     getDefaultUIUtil().onSelected(binding.foreground)
                 } else {
                     super.onSelectedChanged(viewHolder, actionState)
@@ -199,7 +201,7 @@ class FavoritesFragment : Fragment() {
             ) {
                 if (actionState == ItemTouchHelper.ACTION_STATE_SWIPE) {
                     val binding =
-                        (viewHolder as DataBindingAdapter.ViewHolder<*>).binding as ItemFavoriteBinding
+                        (viewHolder as DataBindingAdapter.ViewHolder).binding as ItemFavoriteBinding
                     getDefaultUIUtil().onDrawOver(
                         c, recyclerView, binding.foreground, dX, dY,
                         actionState, isCurrentlyActive
@@ -229,7 +231,7 @@ class FavoritesFragment : Fragment() {
                 viewHolder: RecyclerView.ViewHolder
             ) {
                 val binding =
-                    (viewHolder as DataBindingAdapter.ViewHolder<*>).binding as ItemFavoriteBinding
+                    (viewHolder as DataBindingAdapter.ViewHolder).binding as ItemFavoriteBinding
                 getDefaultUIUtil().clearView(binding.foreground)
             }
 
@@ -240,7 +242,7 @@ class FavoritesFragment : Fragment() {
             ) {
                 if (actionState == ItemTouchHelper.ACTION_STATE_SWIPE) {
                     val binding =
-                        (viewHolder as DataBindingAdapter.ViewHolder<*>).binding as ItemFavoriteBinding
+                        (viewHolder as DataBindingAdapter.ViewHolder).binding as ItemFavoriteBinding
                     getDefaultUIUtil().onDraw(
                         c, recyclerView, binding.foreground, dX, dY,
                         actionState, isCurrentlyActive

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

@@ -12,7 +12,6 @@ import androidx.core.view.MenuProvider
 import androidx.core.view.ViewCompat
 import androidx.core.view.WindowInsetsCompat
 import androidx.core.view.updatePadding
-import androidx.databinding.DataBindingUtil
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.viewModels
 import androidx.lifecycle.Lifecycle
@@ -34,6 +33,7 @@ import net.vonforst.evmap.viewmodel.FilterViewModel
 
 class FilterFragment : Fragment(), MenuProvider {
     private lateinit var binding: FragmentFilterBinding
+    private lateinit var filtersAdapter: FiltersAdapter
     private val vm: FilterViewModel by viewModels()
 
     override fun onCreate(savedInstanceState: Bundle?) {
@@ -47,10 +47,7 @@ class FilterFragment : Fragment(), MenuProvider {
         container: ViewGroup?,
         savedInstanceState: Bundle?
     ): View {
-        binding = DataBindingUtil.inflate(inflater, R.layout.fragment_filter, container, false)
-        binding.lifecycleOwner = viewLifecycleOwner
-        binding.vm = vm
-        vm.filterProfile.observe(viewLifecycleOwner) {}
+        binding = FragmentFilterBinding.inflate(inflater, container, false)
 
         ViewCompat.setOnApplyWindowInsetsListener(
             binding.filtersList
@@ -77,8 +74,9 @@ class FilterFragment : Fragment(), MenuProvider {
             }
         }
 
+        filtersAdapter = FiltersAdapter()
         binding.filtersList.apply {
-            adapter = FiltersAdapter()
+            adapter = filtersAdapter
             layoutManager =
                 LinearLayoutManager(context, LinearLayoutManager.VERTICAL, false)
             addItemDecoration(
@@ -88,6 +86,13 @@ class FilterFragment : Fragment(), MenuProvider {
             )
         }
 
+        vm.filtersWithValue.observe(viewLifecycleOwner) {
+            @Suppress("UNCHECKED_CAST")
+            val items =
+                it as? List<net.vonforst.evmap.model.FilterWithValue<net.vonforst.evmap.model.FilterValue>>
+            filtersAdapter.submitList(items)
+        }
+
         binding.toolbar.setNavigationOnClickListener {
             findNavController().popBackStack()
         }

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

@@ -31,6 +31,7 @@ import net.vonforst.evmap.adapter.FilterProfilesAdapter
 import net.vonforst.evmap.databinding.FragmentFilterProfilesBinding
 import net.vonforst.evmap.databinding.ItemFilterProfileBinding
 import net.vonforst.evmap.storage.FilterProfile
+import net.vonforst.evmap.ui.goneUnless
 import net.vonforst.evmap.ui.showEditTextDialog
 import net.vonforst.evmap.viewmodel.FilterProfilesViewModel
 import net.vonforst.evmap.viewmodel.viewModelFactory
@@ -60,8 +61,6 @@ class FilterProfilesFragment : Fragment() {
         savedInstanceState: Bundle?
     ): View {
         binding = FragmentFilterProfilesBinding.inflate(inflater, container, false)
-        binding.lifecycleOwner = viewLifecycleOwner
-        binding.vm = vm
 
         ViewCompat.setOnApplyWindowInsetsListener(
             binding.filterProfilesList
@@ -116,7 +115,7 @@ class FilterProfilesFragment : Fragment() {
             override fun onSelectedChanged(viewHolder: RecyclerView.ViewHolder?, actionState: Int) {
                 if (viewHolder != null && actionState == ItemTouchHelper.ACTION_STATE_SWIPE) {
                     val binding =
-                        (viewHolder as DataBindingAdapter.ViewHolder<*>).binding as ItemFilterProfileBinding
+                        (viewHolder as DataBindingAdapter.ViewHolder).binding as ItemFilterProfileBinding
                     getDefaultUIUtil().onSelected(binding.foreground)
                 } else {
                     super.onSelectedChanged(viewHolder, actionState)
@@ -130,7 +129,7 @@ class FilterProfilesFragment : Fragment() {
             ) {
                 if (actionState == ItemTouchHelper.ACTION_STATE_SWIPE) {
                     val binding =
-                        (viewHolder as DataBindingAdapter.ViewHolder<*>).binding as ItemFilterProfileBinding
+                        (viewHolder as DataBindingAdapter.ViewHolder).binding as ItemFilterProfileBinding
                     getDefaultUIUtil().onDrawOver(
                         c, recyclerView, binding.foreground, dX, dY,
                         actionState, isCurrentlyActive
@@ -160,7 +159,7 @@ class FilterProfilesFragment : Fragment() {
                 viewHolder: RecyclerView.ViewHolder
             ) {
                 val binding =
-                    (viewHolder as DataBindingAdapter.ViewHolder<*>).binding as ItemFilterProfileBinding
+                    (viewHolder as DataBindingAdapter.ViewHolder).binding as ItemFilterProfileBinding
                 getDefaultUIUtil().clearView(binding.foreground)
             }
 
@@ -171,7 +170,7 @@ class FilterProfilesFragment : Fragment() {
             ) {
                 if (actionState == ItemTouchHelper.ACTION_STATE_SWIPE) {
                     val binding =
-                        (viewHolder as DataBindingAdapter.ViewHolder<*>).binding as ItemFilterProfileBinding
+                        (viewHolder as DataBindingAdapter.ViewHolder).binding as ItemFilterProfileBinding
                     getDefaultUIUtil().onDraw(
                         c, recyclerView, binding.foreground, dX, dY,
                         actionState, isCurrentlyActive
@@ -223,6 +222,11 @@ class FilterProfilesFragment : Fragment() {
             )
         }
 
+        vm.filterProfiles.observe(viewLifecycleOwner) { profiles ->
+            adapter.submitList(profiles)
+            binding.txtEmptyState.visibility = goneUnless(profiles.isNullOrEmpty())
+        }
+
         touchHelper.attachToRecyclerView(binding.filterProfilesList)
 
         binding.toolbar.setNavigationOnClickListener {

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

@@ -8,11 +8,13 @@ import android.content.ClipData
 import android.content.ClipboardManager
 import android.content.Context
 import android.content.Intent
+import android.content.res.ColorStateList
 import android.content.res.Configuration
 import android.graphics.Color
 import android.net.Uri
 import android.os.Build
 import android.os.Bundle
+import android.text.format.DateUtils
 import android.text.method.KeyListener
 import android.view.ContextThemeWrapper
 import android.view.Gravity
@@ -31,23 +33,23 @@ import androidx.activity.OnBackPressedCallback
 import androidx.activity.result.contract.ActivityResultContracts
 import androidx.annotation.RequiresPermission
 import androidx.appcompat.widget.PopupMenu
+import androidx.appcompat.widget.TooltipCompat
 import androidx.core.content.ContextCompat
 import androidx.core.location.LocationListenerCompat
 import androidx.core.view.MenuCompat
 import androidx.core.view.MenuProvider
 import androidx.core.view.ViewCompat
+import androidx.core.view.ViewGroupCompat
 import androidx.core.view.WindowInsetsCompat
 import androidx.core.view.doOnLayout
 import androidx.core.view.doOnNextLayout
 import androidx.core.view.updateLayoutParams
-import androidx.databinding.DataBindingUtil
+import androidx.core.widget.doAfterTextChanged
 import androidx.fragment.app.Fragment
-import androidx.fragment.app.activityViewModels
 import androidx.fragment.app.viewModels
 import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.Observer
 import androidx.lifecycle.lifecycleScope
-import androidx.navigation.fragment.FragmentNavigatorExtras
 import androidx.navigation.fragment.findNavController
 import androidx.navigation.fragment.navArgs
 import androidx.navigation.ui.setupWithNavController
@@ -87,7 +89,10 @@ import net.vonforst.evmap.adapter.ConnectorAdapter
 import net.vonforst.evmap.adapter.DetailsAdapter
 import net.vonforst.evmap.adapter.GalleryAdapter
 import net.vonforst.evmap.adapter.PlaceAutocompleteAdapter
+import net.vonforst.evmap.adapter.buildDetails
+import net.vonforst.evmap.adapter.chargepointWithAvailability
 import net.vonforst.evmap.api.chargeprice.ChargepriceApi
+import net.vonforst.evmap.api.stringProvider
 import net.vonforst.evmap.autocomplete.ApiUnavailableException
 import net.vonforst.evmap.autocomplete.PlaceWithBounds
 import net.vonforst.evmap.bold
@@ -106,13 +111,20 @@ import net.vonforst.evmap.shouldUseImperialUnits
 import net.vonforst.evmap.storage.PreferenceDataSource
 import net.vonforst.evmap.ui.HideOnScrollFabBehavior
 import net.vonforst.evmap.ui.MarkerManager
+import net.vonforst.evmap.ui.availabilityColor
+import net.vonforst.evmap.ui.availabilityText
+import net.vonforst.evmap.ui.distance
+import net.vonforst.evmap.ui.flatten
+import net.vonforst.evmap.ui.goneUnless
+import net.vonforst.evmap.ui.invisibleUnless
+import net.vonforst.evmap.ui.isFabActive
 import net.vonforst.evmap.ui.setTouchModal
 import net.vonforst.evmap.utils.boundingBox
 import net.vonforst.evmap.utils.checkAnyLocationPermission
 import net.vonforst.evmap.utils.checkFineLocationPermission
 import net.vonforst.evmap.utils.distanceBetween
+import net.vonforst.evmap.utils.formatDMS
 import net.vonforst.evmap.utils.formatDecimal
-import net.vonforst.evmap.viewmodel.GalleryViewModel
 import net.vonforst.evmap.viewmodel.MapPosition
 import net.vonforst.evmap.viewmodel.MapViewModel
 import net.vonforst.evmap.viewmodel.Resource
@@ -120,6 +132,7 @@ import net.vonforst.evmap.viewmodel.Status
 import java.io.IOException
 import java.time.Duration
 import java.time.Instant
+import java.util.Locale
 import kotlin.math.min
 
 
@@ -127,7 +140,6 @@ class MapFragment : Fragment(), OnMapReadyCallback, MenuProvider {
     private var _binding: FragmentMapBinding? = null
     private val binding get() = _binding!!
     private val vm: MapViewModel by viewModels()
-    private val galleryVm: GalleryViewModel by activityViewModels()
     private var mapFragment: MapFragment? = null
     private var map: AnyMap? = null
     private var markerManager: MarkerManager? = null
@@ -192,10 +204,7 @@ class MapFragment : Fragment(), OnMapReadyCallback, MenuProvider {
         container: ViewGroup?,
         savedInstanceState: Bundle?
     ): View {
-        _binding = DataBindingUtil.inflate(inflater, R.layout.fragment_map, container, false)
-        println(binding.detailView.sourceButton)
-        binding.lifecycleOwner = viewLifecycleOwner
-        binding.vm = vm
+        _binding = FragmentMapBinding.inflate(inflater, container, false)
 
         val provider = prefs.mapProvider
         if (mapFragment == null) {
@@ -222,6 +231,9 @@ class MapFragment : Fragment(), OnMapReadyCallback, MenuProvider {
             com.google.android.material.R.style.Theme_Material3_DayNight
 
         val density = resources.displayMetrics.density
+
+        ViewGroupCompat.installCompatInsetsDispatch(binding.root)
+
         ViewCompat.setOnApplyWindowInsetsListener(binding.detailAppBar.toolbar) { v, insets ->
             val systemWindowInsetTop = insets.getInsets(WindowInsetsCompat.Type.systemBars()).top
             v.updateLayoutParams<ViewGroup.MarginLayoutParams> {
@@ -322,6 +334,7 @@ class MapFragment : Fragment(), OnMapReadyCallback, MenuProvider {
         vm.apiName.observe(viewLifecycleOwner) {
             binding.detailAppBar.toolbar.menu.findItem(R.id.menu_edit).title =
                 getString(R.string.edit_at_datasource, it)
+            renderDetailView()
         }
 
         binding.detailView.topPart.doOnNextLayout {
@@ -334,6 +347,7 @@ class MapFragment : Fragment(), OnMapReadyCallback, MenuProvider {
         setupObservers()
         setupClickListeners()
         setupAdapters()
+        renderDetailView()
         (activity as? MapsActivity)?.setSupportActionBar(binding.toolbar)
 
         binding.toolbar.setupWithNavController(
@@ -437,6 +451,16 @@ class MapFragment : Fragment(), OnMapReadyCallback, MenuProvider {
         binding.fabLayers.setOnClickListener {
             openLayersMenu()
         }
+        binding.layers.radioGroup.setOnCheckedChangeListener { group, i ->
+            when (i) {
+                R.id.rbStandard -> vm.setMapType(AnyMap.Type.NORMAL)
+                R.id.rbSatellite -> vm.setMapType(AnyMap.Type.HYBRID)
+                R.id.rbTerrain -> vm.setMapType(AnyMap.Type.TERRAIN)
+            }
+        }
+        binding.layers.cbTraffic.setOnCheckedChangeListener { _, isChecked ->
+            vm.mapTrafficEnabled.value = isChecked
+        }
         binding.layers.btnClose.setOnClickListener {
             closeLayersMenu()
         }
@@ -448,19 +472,28 @@ class MapFragment : Fragment(), OnMapReadyCallback, MenuProvider {
         }
         binding.detailView.btnChargeprice.setOnClickListener {
             val charger = vm.charger.value?.data ?: return@setOnClickListener
-            if (prefs.chargepriceNativeIntegration) {
-                val extras =
-                    FragmentNavigatorExtras(binding.detailView.btnChargeprice to getString(R.string.shared_element_chargeprice))
-                findNavController().safeNavigate(
-                    MapFragmentDirections.actionMapToChargepriceFragment(charger),
-                    extras
-                )
-            } else {
-                (activity as? MapsActivity)?.openUrl(
-                    ChargepriceApi.getPoiUrl(charger),
-                    binding.root
-                )
+
+            if (prefs.chargepriceCounter > 0 && !prefs.chargepriceRemoval2025DialogShown) {
+                // user has been using the native Chargeprice integration before
+                MaterialAlertDialogBuilder(requireContext())
+                    .setTitle(R.string.chargeprice_removal_2025_dialog_title)
+                    .setMessage(R.string.chargeprice_removal_2025_dialog_detail)
+                    .setPositiveButton(R.string.ok) { di, _ ->
+                        di.cancel()
+                        prefs.chargepriceRemoval2025DialogShown = true
+                        (activity as? MapsActivity)?.openUrl(
+                            ChargepriceApi.getPoiUrl(charger),
+                            binding.root
+                        )
+                    }
+                    .show()
+                return@setOnClickListener
             }
+
+            (activity as? MapsActivity)?.openUrl(
+                ChargepriceApi.getPoiUrl(charger),
+                binding.root
+            )
         }
         binding.detailView.btnChargerWebsite.setOnClickListener {
             val charger = vm.charger.value?.data ?: return@setOnClickListener
@@ -505,7 +538,7 @@ class MapFragment : Fragment(), OnMapReadyCallback, MenuProvider {
                 R.id.menu_share -> {
                     val charger = vm.charger.value?.data
                     if (charger != null && charger.url != null) {
-                        (activity as? MapsActivity)?.shareUrl(charger.url)
+                        (activity as? MapsActivity)?.shareUrl(charger.url, binding.root)
                     }
                     true
                 }
@@ -559,6 +592,9 @@ class MapFragment : Fragment(), OnMapReadyCallback, MenuProvider {
     @SuppressLint("SetTextI18n")
     private fun setupSearchAutocomplete() {
         binding.search.threshold = 1
+        binding.search.doAfterTextChanged {
+            updateClearSearchVisibility()
+        }
 
         searchKeyListener = binding.search.keyListener
         binding.search.keyListener = null
@@ -586,6 +622,7 @@ class MapFragment : Fragment(), OnMapReadyCallback, MenuProvider {
                         place.primaryText.toString()
                     }
                 )
+                updateClearSearchVisibility()
             }
         binding.search.onFocusChangeListener = View.OnFocusChangeListener { _, hasFocus ->
             if (hasFocus) {
@@ -599,11 +636,186 @@ class MapFragment : Fragment(), OnMapReadyCallback, MenuProvider {
         binding.clearSearch.setOnClickListener {
             vm.searchResult.value = null
             removeSearchFocus()
+            updateClearSearchVisibility()
         }
         binding.toolbar.doOnLayout {
             binding.search.dropDownWidth = binding.toolbar.width
             binding.search.dropDownAnchor = R.id.toolbar
         }
+        updateClearSearchVisibility()
+    }
+
+    private fun updateClearSearchVisibility() {
+        binding.clearSearch.visibility = invisibleUnless(!binding.search.text.isNullOrEmpty())
+    }
+
+    private fun updateChargepointsUi(res: Resource<List<ChargepointListItem>>) {
+        binding.progressBar2.visibility = goneUnless(res.status == Status.LOADING)
+        binding.progressBar2.isIndeterminate = res.progress == null
+        binding.progressBar2.progress = ((res.progress ?: 0f) * 100f).toInt().coerceIn(0, 100)
+        binding.search.hint = if (res.progress != null) {
+            getString(R.string.downloading_chargers_percent, (res.progress * 100f).coerceIn(0f, 100f))
+        } else {
+            getString(R.string.search)
+        }
+    }
+
+    private fun updateGallery(photos: List<ChargerPhoto>?) {
+        val galleryAdapter = binding.gallery.adapter as? GalleryAdapter ?: return
+        galleryAdapter.submitList(photos)
+        binding.galleryPlaceholder.visibility = invisibleUnless(photos.isNullOrEmpty())
+    }
+
+    private fun renderDetailView() {
+        if (_binding == null) return
+
+        val context = requireContext()
+        val charger = vm.charger.value?.data
+        val availability = vm.availability.value
+        val filteredAvailability = vm.filteredAvailability.value
+        val predictionData = vm.predictionData.value
+        val chargeCards = vm.chargeCardMap.value
+        val filteredChargeCards = vm.filteredChargeCards.value
+        val distanceMeters = vm.chargerDistance.value
+        val expanded = vm.bottomSheetExpanded.value == true
+        val teslaPricing = vm.teslaPricing.value
+        val apiName = vm.apiName.value.orEmpty()
+
+        binding.detailView.apply {
+            txtName.text = charger?.name
+            txtName.maxLines = if (expanded) 3 else 1
+
+            txtAddress.text = charger?.address?.toString() ?: charger?.coordinates?.formatDMS()
+            txtAddress.visibility = invisibleUnless(charger != null)
+
+            txtDistance.text = distance(distanceMeters, context)
+            txtConnectors.text =
+                charger?.formatChargepoints(context.stringProvider(), Locale.getDefault())
+
+            val hasConnectors = charger?.chargepointsMerged?.isNotEmpty() == true
+            connectors.visibility = goneUnless(hasConnectors)
+            txtConnectorsHeading.visibility = goneUnless(hasConnectors)
+            txtRealtimeDesc.visibility = goneUnless(hasConnectors)
+            btnRefreshLiveData.visibility = goneUnless(hasConnectors)
+            btnRefreshLiveData.isEnabled = availability?.status != Status.LOADING
+
+            txtRealtimeDesc.text = when {
+                availability?.status == Status.SUCCESS -> getString(
+                    R.string.realtime_data_source,
+                    availability.data?.source.orEmpty()
+                )
+
+                availability?.status == Status.LOADING -> getString(R.string.realtime_data_loading)
+                availability?.message == "not signed in" -> getString(R.string.realtime_data_login_needed)
+                else -> getString(R.string.realtime_data_unavailable)
+            }
+
+            btnLogin.visibility = goneUnless(
+                hasConnectors && availability?.status == Status.ERROR && availability.message == "not signed in"
+            )
+
+            val flattenedAvailability = flatten(filteredAvailability?.data?.status?.values)
+            if (flattenedAvailability != null && !expanded) {
+                txtAvailability.visibility = View.VISIBLE
+                txtAvailability.text = String.format(
+                    Locale.getDefault(),
+                    "%s/%d",
+                    availabilityText(flattenedAvailability),
+                    filteredAvailability?.data?.totalChargepoints ?: 0
+                )
+                txtAvailability.backgroundTintList = ColorStateList.valueOf(
+                    availabilityColor(flattenedAvailability, context)
+                )
+            } else {
+                txtAvailability.visibility = View.INVISIBLE
+            }
+
+            (connectors.adapter as? ConnectorAdapter)?.submitList(
+                chargepointWithAvailability(
+                    charger?.chargepointsMerged,
+                    availability?.data?.status
+                )
+            )
+
+            (details.adapter as? DetailsAdapter)?.submitList(
+                buildDetails(charger, chargeCards, filteredChargeCards, teslaPricing, context)
+            )
+
+            val amenities = charger?.amenities
+            val hasAmenities = !amenities.isNullOrBlank()
+            txtAmenitiesHeading.visibility = goneUnless(hasAmenities)
+            txtAmenities.visibility = goneUnless(hasAmenities)
+            txtAmenities.text = amenities
+
+            val generalInformation = charger?.generalInformation
+            val hasGeneralInformation = !generalInformation.isNullOrBlank()
+            txtGeneralInformationHeading.visibility = goneUnless(hasGeneralInformation)
+            txtGeneralInformation.visibility = goneUnless(hasGeneralInformation)
+            txtGeneralInformation.text = generalInformation
+
+            sourceButton.text = getString(R.string.source, apiName)
+
+            val hasChargeprice = charger?.let { ChargepriceApi.isChargerSupported(it) } == true
+            val hasChargerWebsite = charger?.chargerUrl != null
+            val hasExternalLinks = charger != null && (hasChargeprice || hasChargerWebsite)
+
+            buttonsScroller.visibility = goneUnless(hasExternalLinks)
+            divider3.visibility = goneUnless(hasExternalLinks)
+            btnChargeprice.visibility = goneUnless(hasChargeprice)
+            btnChargerWebsite.visibility = goneUnless(hasChargerWebsite)
+
+            val hasPredictionGraph = predictionData?.predictionGraph != null
+            val isPredictionPercentage = predictionData?.isPercentage == true
+            val predictionDescription = predictionData?.description
+            val showPredictionInfo = hasPredictionGraph && !isPredictionPercentage
+
+            txtPredictionHeading.visibility = goneUnless(hasPredictionGraph)
+            txtPredictionHeading.text = if (isPredictionPercentage) {
+                getString(R.string.average_utilization)
+            } else {
+                getString(R.string.utilization_prediction)
+            }
+
+            prediction.visibility = goneUnless(hasPredictionGraph)
+            prediction.data = predictionData?.predictionGraph
+            prediction.maxValue = predictionData?.maxValue
+            prediction.isPercentage = isPredictionPercentage
+
+            txtPredictionDescription.text = predictionDescription
+            txtPredictionDescription.visibility =
+                goneUnless(showPredictionInfo && !predictionDescription.isNullOrBlank())
+            btnPredictionHelp.visibility = goneUnless(showPredictionInfo)
+            imgPredictionSource.visibility = goneUnless(showPredictionInfo)
+            divider1.visibility = goneUnless(hasPredictionGraph)
+
+            imgVerified.visibility = goneUnless(charger?.verified == true)
+            TooltipCompat.setTooltipText(imgVerified, getString(R.string.verified_desc, apiName))
+
+            imgFaultReport.visibility = goneUnless(charger?.faultReport != null)
+            TooltipCompat.setTooltipText(imgFaultReport, getString(R.string.fault_report))
+
+            val timeRetrieved = charger?.timeRetrieved
+            val showTimeRetrieved = timeRetrieved != null &&
+                    Duration.between(timeRetrieved, Instant.now()) > Duration.ofHours(1)
+            txtTimeRetrieved.visibility = goneUnless(showTimeRetrieved)
+            val shownTimeRetrieved = if (showTimeRetrieved) timeRetrieved else null
+            if (shownTimeRetrieved != null) {
+                txtTimeRetrieved.text = getString(
+                    R.string.data_retrieved_at,
+                    DateUtils.getRelativeTimeSpanString(
+                        shownTimeRetrieved.toEpochMilli(),
+                        Instant.now().toEpochMilli(),
+                        0
+                    )
+                )
+            } else {
+                txtTimeRetrieved.text = null
+            }
+
+            val license = charger?.license
+            txtLicense.visibility = goneUnless(!license.isNullOrBlank())
+            txtLicense.text = license
+        }
     }
 
     private fun removeSearchFocus() {
@@ -676,7 +888,6 @@ class MapFragment : Fragment(), OnMapReadyCallback, MenuProvider {
                         mapBottomPadding + min(bottomSheetBehavior.peekHeight, height)
                     )
                 }
-                println(slideOffset)
                 if (bottomSheetBehavior.state != STATE_HIDDEN) {
                     binding.navBarScrim.visibility = View.VISIBLE
                     binding.navBarScrim.translationY =
@@ -727,6 +938,7 @@ class MapFragment : Fragment(), OnMapReadyCallback, MenuProvider {
             }
         }
         vm.chargepoints.observe(viewLifecycleOwner, Observer { res ->
+            updateChargepointsUi(res)
             val chargepoints = res.data
             if (chargepoints != null) {
                 markerManager?.chargepoints = chargepoints
@@ -764,21 +976,72 @@ class MapFragment : Fragment(), OnMapReadyCallback, MenuProvider {
         vm.searchResult.observe(viewLifecycleOwner) { place ->
             displaySearchResult(place, moveCamera = true)
         }
+        vm.charger.observe(viewLifecycleOwner) {
+            updateGallery(it?.data?.photos)
+            renderDetailView()
+        }
+        vm.availability.observe(viewLifecycleOwner) {
+            renderDetailView()
+        }
+        vm.filteredAvailability.observe(viewLifecycleOwner) {
+            renderDetailView()
+        }
+        vm.predictionData.observe(viewLifecycleOwner) {
+            renderDetailView()
+        }
+        vm.chargeCardMap.observe(viewLifecycleOwner) {
+            renderDetailView()
+        }
+        vm.filteredChargeCards.observe(viewLifecycleOwner) {
+            renderDetailView()
+        }
+        vm.chargerDistance.observe(viewLifecycleOwner) {
+            renderDetailView()
+        }
+        vm.bottomSheetExpanded.observe(viewLifecycleOwner) {
+            renderDetailView()
+        }
+        vm.teslaPricing.observe(viewLifecycleOwner) {
+            renderDetailView()
+        }
+        vm.myLocationEnabled.observe(viewLifecycleOwner) {
+            isFabActive(binding.fabLocate, it == true)
+        }
+        vm.bottomSheetState.observe(viewLifecycleOwner) {
+            binding.navBarScrim.visibility = invisibleUnless(it == STATE_COLLAPSED)
+        }
         vm.layersMenuOpen.observe(viewLifecycleOwner) { open ->
             HideOnScrollFabBehavior.from(binding.fabLayers)?.hidden = open
-            binding.fabLayers.visibility = if (open) View.INVISIBLE else View.VISIBLE
-            binding.layersSheet.visibility = if (open) View.VISIBLE else View.INVISIBLE
+            binding.fabLayers.visibility = invisibleUnless(!open)
+            binding.layersSheet.visibility = invisibleUnless(open)
             updateBackPressedCallback()
         }
         vm.mapType.observe(viewLifecycleOwner) {
             map?.setMapType(it)
+            when (it) {
+                AnyMap.Type.NORMAL -> binding.layers.rbStandard.isChecked = true
+                AnyMap.Type.HYBRID -> binding.layers.rbSatellite.isChecked = true
+                AnyMap.Type.TERRAIN -> binding.layers.rbTerrain.isChecked = true
+                else -> {
+                    binding.layers.rbStandard.isChecked = false
+                    binding.layers.rbSatellite.isChecked = false
+                    binding.layers.rbTerrain.isChecked = false
+                }
+            }
         }
         vm.mapTrafficEnabled.observe(viewLifecycleOwner) {
             map?.setTrafficEnabled(it)
+            if (binding.layers.cbTraffic.isChecked != it) {
+                binding.layers.cbTraffic.isChecked = it
+            }
+        }
+        vm.mapTrafficSupported.observe(viewLifecycleOwner) { supported ->
+            val visibility = goneUnless(supported)
+            binding.layers.textView23.visibility = visibility
+            binding.layers.cbTraffic.visibility = visibility
         }
         vm.selectedChargepoint.observe(viewLifecycleOwner) {
-            binding.detailView.connectorDetailsCard.visibility =
-                if (it != null) View.VISIBLE else View.INVISIBLE
+            binding.detailView.connectorDetailsCard.visibility = invisibleUnless(it != null)
             if (it != null) {
                 detailsDialog.setData(it, vm.availability.value?.data)
             }
@@ -1259,7 +1522,7 @@ class MapFragment : Fragment(), OnMapReadyCallback, MenuProvider {
         if (filterBadge != null) {
             // set up badge showing number of active filters
             vm.filtersCount.observe(viewLifecycleOwner) {
-                filterBadge.visibility = if (it > 0) View.VISIBLE else View.GONE
+                filterBadge.visibility = goneUnless(it > 0)
                 filterBadge.text = it.toString()
             }
         }
@@ -1461,4 +1724,4 @@ class MapFragment : Fragment(), OnMapReadyCallback, MenuProvider {
         (split-screen mode) and then have references to a destroyed fragment. */
         popupMenu?.dismiss()
     }
-}
+}

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

@@ -4,14 +4,20 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import android.widget.CheckBox
+import android.widget.CompoundButton
 import androidx.core.widget.doAfterTextChanged
 import androidx.recyclerview.widget.LinearLayoutManager
+import androidx.viewbinding.ViewBinding
 import net.vonforst.evmap.R
 import net.vonforst.evmap.adapter.DataBindingAdapter
 import net.vonforst.evmap.adapter.Equatable
 import net.vonforst.evmap.databinding.DialogMultiSelectBinding
+import net.vonforst.evmap.databinding.DialogMultiSelectItemBinding
 import net.vonforst.evmap.ui.MaterialDialogFragment
-import java.util.*
+import java.util.HashMap
+import java.util.HashSet
+import java.util.Locale
 
 class MultiSelectDialog : MaterialDialogFragment() {
     companion object {
@@ -121,8 +127,26 @@ private fun search(
     }
 }
 
-class Adapter() : DataBindingAdapter<MultiSelectItem>({ it.key }) {
+class Adapter : DataBindingAdapter<MultiSelectItem>({ it.key }) {
     override fun getItemViewType(position: Int) = R.layout.dialog_multi_select_item
+
+    override fun createBinding(
+        inflater: LayoutInflater,
+        parent: ViewGroup,
+        viewType: Int
+    ): ViewBinding = DialogMultiSelectItemBinding.inflate(inflater, parent, false)
+
+    override fun bind(holder: ViewHolder, item: MultiSelectItem) {
+        super.bind(holder, item)
+        val binding = holder.binding as DialogMultiSelectItemBinding
+        val checkBox = binding.root.findViewById<CheckBox>(android.R.id.text1)
+        checkBox.text = item.name
+        checkBox.setOnCheckedChangeListener(null)
+        checkBox.isChecked = item.selected
+        checkBox.setOnCheckedChangeListener { _: CompoundButton, isChecked: Boolean ->
+            item.selected = isChecked
+        }
+    }
 }
 
 data class MultiSelectItem(val key: String, val name: CharSequence, var selected: Boolean) :

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

@@ -11,6 +11,7 @@ import android.view.View
 import android.view.ViewGroup
 import android.view.animation.DecelerateInterpolator
 import android.widget.ImageView
+import android.widget.ScrollView
 import androidx.core.content.ContextCompat
 import androidx.core.text.HtmlCompat
 import androidx.core.text.method.LinkMovementMethodCompat
@@ -27,6 +28,7 @@ import net.vonforst.evmap.databinding.FragmentOnboardingWelcomeBinding
 import net.vonforst.evmap.model.FILTERS_DISABLED
 import net.vonforst.evmap.navigation.safeNavigate
 import net.vonforst.evmap.storage.PreferenceDataSource
+import net.vonforst.evmap.ui.replaceUrlSpansWithCustom
 import net.vonforst.evmap.waitForLayout
 
 class OnboardingFragment : Fragment() {
@@ -237,13 +239,14 @@ class DataSourceSelectFragment : OnboardingPageFragment() {
     }
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        binding.cbAcceptPrivacy.text =
+         val text =
             HtmlCompat.fromHtml(
                 getString(
                     R.string.accept_privacy,
                     getString(R.string.privacy_link)
                 ), HtmlCompat.FROM_HTML_MODE_LEGACY
-            )
+            ).replaceUrlSpansWithCustom()
+        binding.cbAcceptPrivacy.text = text
         binding.cbAcceptPrivacy.linksClickable = true
         binding.cbAcceptPrivacy.movementMethod = LinkMovementMethodCompat.getInstance()
         binding.btnGetStarted.visibility = View.INVISIBLE
@@ -260,6 +263,9 @@ class DataSourceSelectFragment : OnboardingPageFragment() {
                     ObjectAnimator.ofFloat(binding.btnGetStarted, "alpha", 0f, 1f).apply {
                         interpolator = DecelerateInterpolator()
                     }.start()
+                    (binding.root as? ScrollView)?.let {
+                        it.smoothScrollBy(0, it.height)
+                    }
                 }
             }
         }

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

@@ -1,43 +0,0 @@
-package net.vonforst.evmap.fragment.preference
-
-import android.content.SharedPreferences
-import android.os.Bundle
-import android.view.View
-import net.vonforst.evmap.R
-import net.vonforst.evmap.ui.RangeSliderPreference
-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/main/java/net/vonforst/evmap/fragment/preference/ChargepriceSettingsFragment.kt

@@ -1,147 +0,0 @@
-package net.vonforst.evmap.fragment.preference
-
-import android.content.SharedPreferences
-import android.os.Bundle
-import android.text.SpannableStringBuilder
-import android.text.Spanned
-import android.text.style.RelativeSizeSpan
-import android.view.View
-import androidx.fragment.app.viewModels
-import androidx.preference.CheckBoxPreference
-import androidx.preference.ListPreference
-import net.vonforst.evmap.R
-import net.vonforst.evmap.currencyDisplayName
-import net.vonforst.evmap.ui.MultiSelectDialogPreference
-import net.vonforst.evmap.viewmodel.SettingsViewModel
-import net.vonforst.evmap.viewmodel.viewModelFactory
-
-
-class ChargepriceSettingsFragment : BaseSettingsFragment() {
-    override val isTopLevel = false
-
-    private val vm: SettingsViewModel by viewModels(factoryProducer = {
-        viewModelFactory {
-            SettingsViewModel(
-                requireActivity().application,
-                getString(R.string.chargeprice_key),
-                getString(R.string.chargeprice_api_url)
-            )
-        }
-    })
-
-    private lateinit var myVehiclePreference: MultiSelectDialogPreference
-    private lateinit var myTariffsPreference: MultiSelectDialogPreference
-    private lateinit var nativeIntegrationPreference: CheckBoxPreference
-
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-        nativeIntegrationPreference = findPreference("chargeprice_native_integration")!!
-
-        myVehiclePreference = findPreference("chargeprice_my_vehicle")!!
-        myVehiclePreference.isEnabled = false
-        vm.vehicles.observe(viewLifecycleOwner) { res ->
-            res.data?.let { cars ->
-                val sortedCars = cars.sortedBy { it.brand }
-                myVehiclePreference.entryValues = sortedCars.map { it.id }.toTypedArray()
-                myVehiclePreference.entries = sortedCars.map {
-                    SpannableStringBuilder().apply {
-                        appendLine("${it.brand} ${it.name}")
-                        append(
-                            it.formatSpecs(),
-                            RelativeSizeSpan(0.86f),
-                            Spanned.SPAN_INCLUSIVE_EXCLUSIVE
-                        )
-                    }
-                }.toTypedArray()
-                myVehiclePreference.isEnabled = nativeIntegrationPreference.isChecked
-                updateMyVehiclesSummary()
-            }
-        }
-
-        myTariffsPreference = findPreference("chargeprice_my_tariffs")!!
-        myTariffsPreference.isEnabled = false
-        vm.tariffs.observe(viewLifecycleOwner) { res ->
-            res.data?.let { tariffs ->
-                myTariffsPreference.entryValues = tariffs.map { it.id }.toTypedArray()
-                myTariffsPreference.entries = tariffs.map {
-                    if (!it.name.lowercase().startsWith(it.provider.lowercase())) {
-                        "${it.provider} ${it.name}"
-                    } else {
-                        it.name
-                    }
-                }.toTypedArray()
-                myTariffsPreference.isEnabled = nativeIntegrationPreference.isChecked
-                updateMyTariffsSummary()
-            }
-        }
-        updateNativeIntegrationState()
-
-        val currencyPreference = findPreference<ListPreference>("chargeprice_currency")!!
-        currencyPreference.entries = currencyPreference.entryValues.map {
-            currencyDisplayName(it.toString()).replaceFirstChar { it.uppercase() }
-        }.toTypedArray()
-    }
-
-    private fun updateNativeIntegrationState() {
-        for (i in 0 until preferenceScreen.preferenceCount) {
-            val pref = preferenceScreen.getPreference(i)
-            if (pref == nativeIntegrationPreference) {
-                continue
-            } else if (pref == myTariffsPreference) {
-                pref.isEnabled =
-                    nativeIntegrationPreference.isChecked && vm.tariffs.value?.data != null
-            } else if (pref == myVehiclePreference) {
-                pref.isEnabled =
-                    nativeIntegrationPreference.isChecked && vm.tariffs.value?.data != null
-            } else {
-                pref.isEnabled = nativeIntegrationPreference.isChecked
-            }
-        }
-    }
-
-    private fun updateMyTariffsSummary() {
-        myTariffsPreference.summary =
-            if (prefs.chargepriceMyTariffsAll) {
-                getString(R.string.chargeprice_all_tariffs_selected)
-            } else {
-                val n = prefs.chargepriceMyTariffs?.size ?: 0
-                requireContext().resources
-                    .getQuantityString(
-                        R.plurals.chargeprice_some_tariffs_selected,
-                        n,
-                        n
-                    ) + "\n" + requireContext().resources
-                    .getQuantityString(R.plurals.pref_my_tariffs_summary, n)
-            }
-    }
-
-    private fun updateMyVehiclesSummary() {
-        vm.vehicles.value?.data?.let { cars ->
-            val vehicles = cars.filter { it.id in prefs.chargepriceMyVehicles }
-            val summary = vehicles.joinToString(", ") {
-                "${it.brand} ${it.name}"
-            }
-            myVehiclePreference.summary = summary
-        }
-    }
-
-    override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
-        setPreferencesFromResource(R.xml.settings_chargeprice, rootKey)
-    }
-
-    override fun onSharedPreferenceChanged(sharedPreferences: SharedPreferences, key: String?) {
-        when (key) {
-            "chargeprice_my_vehicle" -> {
-                updateMyVehiclesSummary()
-            }
-
-            "chargeprice_my_tariffs" -> {
-                updateMyTariffsSummary()
-            }
-
-            "chargeprice_native_integration" -> {
-                updateNativeIntegrationState()
-            }
-        }
-    }
-}

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

@@ -1,10 +1,10 @@
 package net.vonforst.evmap.fragment.preference
 
 import android.content.SharedPreferences
-import android.net.Uri
 import android.os.Bundle
 import android.view.View
 import android.widget.TextView
+import androidx.core.net.toUri
 import androidx.fragment.app.setFragmentResultListener
 import androidx.fragment.app.viewModels
 import androidx.lifecycle.lifecycleScope
@@ -24,7 +24,6 @@ import net.vonforst.evmap.viewmodel.viewModelFactory
 import okhttp3.OkHttpClient
 import okio.IOException
 import java.time.Instant
-import androidx.core.net.toUri
 
 class DataSettingsFragment : BaseSettingsFragment() {
     override val isTopLevel = false
@@ -33,8 +32,6 @@ class DataSettingsFragment : BaseSettingsFragment() {
         viewModelFactory {
             SettingsViewModel(
                 requireActivity().application,
-                getString(R.string.chargeprice_key),
-                getString(R.string.chargeprice_api_url)
             )
         }
     })

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

@@ -1,15 +1,18 @@
 package net.vonforst.evmap.fragment.preference
 
+import android.content.ActivityNotFoundException
 import android.content.Intent
 import android.content.SharedPreferences
-import android.net.Uri
 import android.os.Build
 import android.os.Bundle
 import android.provider.Settings
+import android.util.Log
+import androidx.core.net.toUri
 import androidx.preference.CheckBoxPreference
 import androidx.preference.ListPreference
 import androidx.preference.Preference
 import com.github.erfansn.localeconfigx.configuredLocales
+import com.google.android.material.snackbar.Snackbar
 import net.vonforst.evmap.R
 import net.vonforst.evmap.isAppInstalled
 import net.vonforst.evmap.ui.getAppLocale
@@ -83,9 +86,23 @@ class UiSettingsFragment : BaseSettingsFragment() {
                     val context = context ?: return false
                     val intent = Intent(
                         Settings.ACTION_APP_OPEN_BY_DEFAULT_SETTINGS,
-                        Uri.parse("package:${context.packageName}")
+                        "package:${context.packageName}".toUri()
                     )
-                    context.startActivity(intent)
+                    try {
+                        context.startActivity(intent)
+                    } catch (_: ActivityNotFoundException) {
+                        view?.let { v ->
+                            Snackbar.make(
+                                v,
+                                R.string.system_setting_not_supported,
+                                Snackbar.LENGTH_SHORT
+                            ).show()
+                        }
+                        Log.e(
+                            "UiSettingsFragment",
+                            "Settings.ACTION_APP_OPEN_BY_DEFAULT_SETTINGS activity not found"
+                        )
+                    }
                 }
                 return true
             }

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

@@ -140,10 +140,12 @@ data class ChargeLocation(
                     .filter { it.type == variant.type && it.power == variant.power }
                 val count = filtered.sumOf { it.count }
                 val mergedEvseIds = filtered.map { if (it.evseIds == null) List(it.count) {null} else it.evseIds }.flatten()
+                val mergedEvseUIds = filtered.map { if (it.evseUIds == null) List(it.count) {null} else it.evseUIds }.flatten()
                 Chargepoint(variant.type, variant.power, count,
                     filtered.map { it.current }.distinct().singleOrNull(),
                     filtered.map { it.voltage }.distinct().singleOrNull(),
-                    if (mergedEvseIds.all { it == null }) null else mergedEvseIds
+                    if (mergedEvseIds.all { it == null }) null else mergedEvseIds,
+                    if (mergedEvseUIds.all { it == null }) null else mergedEvseUIds
                 )
             }
         }
@@ -425,7 +427,9 @@ data class Chargepoint(
     // (each of the three can be separately limited)
     val voltage: Double? = null,
     // Electric Vehicle Supply Equipment Ids for this Chargepoint's plugs/sockets
-    val evseIds: List<String?>? = null
+    val evseIds: List<String?>? = null,
+    // Electric Vehicle Supply Equipment Unique Ids for this Chargepoint's plugs/sockets
+    val evseUIds: List<String?>? = null
 ) : Equatable, Parcelable {
     fun hasKnownPower(): Boolean = power != null
     fun hasKnownVoltageAndCurrent(): Boolean = voltage != null && current != null
@@ -466,6 +470,7 @@ data class Chargepoint(
         const val CEE_BLAU = "CEE Blau"
         const val CEE_ROT = "CEE Rot"
         const val TESLA_ROADSTER_HPC = "Tesla HPC"
+        const val MCS = "Megawatt Charging System"
     }
 }
 

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

@@ -25,4 +25,4 @@ data class Favorite(
 data class FavoriteWithDetail(
     @Embedded val favorite: Favorite,
     @Embedded val charger: ChargeLocation
-)
+)

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

@@ -1,6 +1,5 @@
 package net.vonforst.evmap.model
 
-import androidx.databinding.BaseObservable
 import androidx.room.Entity
 import androidx.room.ForeignKey
 import androidx.room.Index
@@ -46,7 +45,7 @@ data class SliderFilter(
     override fun defaultValue() = SliderFilterValue(key, min)
 }
 
-sealed class FilterValue : BaseObservable(), Equatable {
+sealed class FilterValue : Equatable {
     abstract val key: String
     var dataSource: String = ""
     var profile: Long = FILTERS_CUSTOM

app/src/main/java/net/vonforst/evmap/navigation/CustomNavigator.kt

@@ -37,6 +37,7 @@ class CustomNavigator(
                 "goingelectric" -> "https://www.goingelectric.de/stromtankstellen/new/"
                 "nobil" -> "http://nobil.no/api/chargerregistration/chargerregistration.php?action=register"
                 "openchargemap" -> "https://openchargemap.org/site/poi/add"
+                "openstreetmap" -> "https://www.openstreetmap.org/edit"
                 else -> throw IllegalArgumentException()
             }
             launchCustomTab(url)

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

@@ -69,8 +69,11 @@ abstract class ChargeLocationsDao {
     @Query("DELETE FROM chargelocation WHERE NOT EXISTS (SELECT 1 FROM favorite WHERE favorite.chargerId = chargelocation.id)")
     abstract suspend fun deleteAllIfNotFavorite()
 
-    @Query("DELETE FROM chargelocation WHERE dataSource == :dataSource AND id NOT IN (:chargerIds)")
-    abstract suspend fun deleteIdNotIn(dataSource: String, chargerIds: List<Long>)
+    @Query("SELECT id FROM chargelocation WHERE dataSource == :dataSource")
+    abstract suspend fun getAllIds(dataSource: String): List<Long>
+
+    @Query("DELETE FROM chargelocation WHERE dataSource == :dataSource AND id IN (:chargerIds)")
+    abstract suspend fun deleteById(dataSource: String, chargerIds: List<Long>)
 
     @Query("SELECT * FROM chargelocation WHERE dataSource == :dataSource AND id == :id AND isDetailed == 1 AND timeRetrieved > :after")
     abstract suspend fun getChargeLocationById(
@@ -98,7 +101,7 @@ abstract class ChargeLocationsDao {
     ): List<ChargeLocation>
 
     @SkipQueryVerification
-    @Query("SELECT * FROM chargelocation WHERE dataSource == :dataSource AND PtDistWithin(coordinates, MakePoint(:lng, :lat, 4326), :radius) AND timeRetrieved > :after AND ROWID IN (SELECT ROWID FROM SpatialIndex WHERE f_table_name = 'ChargeLocation' AND f_geometry_column = 'coordinates' AND search_frame = BuildCircleMbr(:lng, :lat, :radius)) ORDER BY Distance(coordinates, MakePoint(:lng, :lat, 4326))")
+    @Query("SELECT * FROM chargelocation WHERE dataSource == :dataSource AND PtDistWithin(coordinates, MakePoint(:lng, :lat, 4326), :radius) AND timeRetrieved > :after AND ROWID IN (SELECT ROWID FROM SpatialIndex WHERE f_table_name = 'ChargeLocation' AND f_geometry_column = 'coordinates' AND search_frame = BuildCircleMbr(:lng, :lat, :radius)) ORDER BY Distance(coordinates, MakePoint(:lng, :lat, 4326), 0)")
     abstract suspend fun getChargeLocationsRadius(
         lat: Double,
         lng: Double,
@@ -580,7 +583,7 @@ class ChargeLocationsRepository(
         val region =
             radiusSpatialIndexQuery(location, radius)
         val order =
-            "ORDER BY Distance(coordinates, MakePoint(${location.longitude}, ${location.latitude}, 4326))"
+            "ORDER BY Distance(coordinates, MakePoint(${location.longitude}, ${location.latitude}, 4326), 0)"
         return queryWithFilters(api, filters, region, order)
     }
 
@@ -706,7 +709,7 @@ class ChargeLocationsRepository(
         val result = api.fullDownload()
         try {
             var insertJob: Job? = null
-            val chargerIds = mutableListOf<Long>()
+            val idsToDelete = chargeLocationsDao.getAllIds(api.id).toMutableSet()
             result.chargers.chunked(1024).forEach {
                 insertJob?.join()
                 insertJob = withContext(Dispatchers.IO) {
@@ -714,11 +717,11 @@ class ChargeLocationsRepository(
                         chargeLocationsDao.insert(*it.toTypedArray())
                     }
                 }
-                chargerIds.addAll(it.map { it.id })
+                idsToDelete.removeAll(it.map { it.id })
                 fullDownloadProgress.value = result.progress
             }
             // delete chargers that have been removed
-            chargeLocationsDao.deleteIdNotIn(api.id, chargerIds)
+            chargeLocationsDao.deleteById(api.id, idsToDelete.toList())
 
             val region = Mbr(
                 -180.0,

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

@@ -15,7 +15,7 @@ class CleanupCacheWorker(appContext: Context, workerParams: WorkerParameters) :
         val savedRegionDao = db.savedRegionDao()
         val now = Instant.now()
 
-        val dataSources = listOf("openchargemap", "openstreetmap", "goingelectric")
+        val dataSources = listOf("openchargemap", "openstreetmap", "goingelectric", "nobil")
         for (dataSource in dataSources) {
             val api = createApi(dataSource, applicationContext)
             val limit = now.minus(api.cacheLimit).toEpochMilli()

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

@@ -40,7 +40,7 @@ import net.vonforst.evmap.model.SliderFilterValue
         OCMOperator::class,
         OSMNetwork::class,
         SavedRegion::class
-    ], version = 27
+    ], version = 29
 )
 @TypeConverters(Converters::class, GeometryConverters::class)
 abstract class AppDatabase : RoomDatabase() {
@@ -85,7 +85,7 @@ abstract class AppDatabase : RoomDatabase() {
                 MIGRATION_12, MIGRATION_13, MIGRATION_14, MIGRATION_15, MIGRATION_16,
                 MIGRATION_17, MIGRATION_18, MIGRATION_19, MIGRATION_20, MIGRATION_21,
                 MIGRATION_22, MIGRATION_23, MIGRATION_24, MIGRATION_25, MIGRATION_26,
-                MIGRATION_27
+                MIGRATION_27, MIGRATION_28, MIGRATION_29
             )
                 .addCallback(object : Callback() {
                     override fun onCreate(db: SupportSQLiteDatabase) {
@@ -547,6 +547,22 @@ abstract class AppDatabase : RoomDatabase() {
                 db.execSQL("ALTER TABLE `ChargeLocation` ADD `accessibility` TEXT")
             }
         }
+
+        private val MIGRATION_28 = object : Migration(27, 28) {
+            override fun migrate(db: SupportSQLiteDatabase) {
+                // Force nobil data refresh to fetch EVSE UId attributes needed for real-time data
+                db.execSQL("DELETE FROM SavedRegion WHERE `dataSource` = 'nobil'")
+                db.execSQL("DELETE FROM ChargeLocation WHERE `dataSource` = 'nobil'")
+            }
+        }
+
+        private val MIGRATION_29 = object : Migration(28, 29) {
+            override fun migrate(db: SupportSQLiteDatabase) {
+                // Force nobil data refresh to update MCS connectors
+                db.execSQL("DELETE FROM SavedRegion WHERE `dataSource` = 'nobil'")
+                db.execSQL("DELETE FROM ChargeLocation WHERE `dataSource` = 'nobil'")
+            }
+        }
     }
 
     /**

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

@@ -13,10 +13,10 @@ interface FavoritesDao {
     @Delete
     suspend fun delete(vararg favorites: Favorite)
 
-    @Query("SELECT * FROM favorite LEFT JOIN chargelocation ON favorite.chargerDataSource = chargelocation.dataSource AND favorite.chargerId = chargelocation.id")
+    @Query("SELECT * FROM favorite LEFT JOIN chargelocation ON favorite.chargerDataSource = chargelocation.dataSource AND favorite.chargerId = chargelocation.id WHERE chargelocation.id is not NULL")
     fun getAllFavorites(): LiveData<List<FavoriteWithDetail>>
 
-    @Query("SELECT * FROM favorite LEFT JOIN chargelocation ON favorite.chargerDataSource = chargelocation.dataSource AND favorite.chargerId = chargelocation.id")
+    @Query("SELECT * FROM favorite LEFT JOIN chargelocation ON favorite.chargerDataSource = chargelocation.dataSource AND favorite.chargerId = chargelocation.id WHERE chargelocation.id is not NULL")
     suspend fun getAllFavoritesAsync(): List<FavoriteWithDetail>
 
     @SkipQueryVerification

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

@@ -12,6 +12,7 @@ import net.vonforst.evmap.autocomplete.PlaceWithBounds
 import net.vonforst.evmap.model.FILTERS_CUSTOM
 import net.vonforst.evmap.model.FILTERS_DISABLED
 import java.time.Instant
+import androidx.core.content.edit
 
 class PreferenceDataSource(val context: Context) {
     val sp = PreferenceManager.getDefaultSharedPreferences(context)
@@ -152,87 +153,6 @@ class PreferenceDataSource(val context: Context) {
             sp.edit().putBoolean("update_0.6.0_androidauto_dialog_shown", value).apply()
         }
 
-    var chargepriceNativeIntegration: Boolean
-        get() = sp.getBoolean("chargeprice_native_integration", true)
-        set(value) {
-            sp.edit().putBoolean("chargeprice_native_integration", value).apply()
-        }
-
-    var chargepriceMyVehicles: Set<String>
-        get() = try {
-            sp.getStringSet("chargeprice_my_vehicle", emptySet())!!
-        } catch (e: ClassCastException) {
-            // backwards compatibility
-            sp.getString("chargeprice_my_vehicle", null)?.let { setOf(it) } ?: emptySet()
-        }
-        set(value) {
-            sp.edit().putStringSet("chargeprice_my_vehicle", value).apply()
-        }
-
-    var chargepriceLastSelectedVehicle: String?
-        get() = sp.getString("chargeprice_last_vehicle", null)
-        set(value) {
-            sp.edit().putString("chargeprice_last_vehicle", value).apply()
-        }
-
-    var chargepriceMyTariffs: Set<String>?
-        get() = sp.getStringSet("chargeprice_my_tariffs", null)
-        set(value) {
-            sp.edit().putStringSet("chargeprice_my_tariffs", value).apply()
-        }
-
-    var chargepriceMyTariffsAll: Boolean
-        get() = sp.getBoolean("chargeprice_my_tariffs_all", true)
-        set(value) {
-            sp.edit().putBoolean("chargeprice_my_tariffs_all", value).apply()
-        }
-
-    var chargepriceNoBaseFee: Boolean
-        get() = sp.getBoolean("chargeprice_no_base_fee", false)
-        set(value) {
-            sp.edit().putBoolean("chargeprice_no_base_fee", value).apply()
-        }
-
-    var chargepriceShowProviderCustomerTariffs: Boolean
-        get() = sp.getBoolean("chargeprice_show_provider_customer_tariffs", false)
-        set(value) {
-            sp.edit().putBoolean("chargeprice_show_provider_customer_tariffs", value).apply()
-        }
-
-    var chargepriceAllowUnbalancedLoad: Boolean
-        get() = sp.getBoolean("chargeprice_allow_unbalanced_load", false)
-        set(value) {
-            sp.edit().putBoolean("chargeprice_allow_unbalanced_load", value).apply()
-        }
-
-    var chargepriceCurrency: String
-        get() = sp.getString("chargeprice_currency", null) ?: "EUR"
-        set(value) {
-            sp.edit().putString("chargeprice_currency", value).apply()
-        }
-
-    var chargepriceBatteryRange: List<Float>
-        get() = listOf(
-            sp.getFloat("chargeprice_battery_range_min", 20f),
-            sp.getFloat("chargeprice_battery_range_max", 80f),
-        )
-        set(value) {
-            sp.edit().putFloat("chargeprice_battery_range_min", value[0])
-                .putFloat("chargeprice_battery_range_max", value[1])
-                .apply()
-        }
-
-    var chargepriceBatteryRangeAndroidAuto: List<Float>
-        get() = listOf(
-            sp.getFloat("chargeprice_battery_range_android_auto_min", 20f),
-            sp.getFloat("chargeprice_battery_range_android_auto_max", 80f),
-        )
-        set(value) {
-            sp.edit().putFloat("chargeprice_battery_range_android_auto_min", value[0])
-                .putFloat("chargeprice_battery_range_android_auto_max", value[1])
-                .apply()
-        }
-
     /** App start counter, introduced with Version 1.0.0 */
     var appStartCounter: Long
         get() = sp.getLong("app_start_counter", 0)
@@ -248,6 +168,12 @@ class PreferenceDataSource(val context: Context) {
             sp.edit().putLong("chargeprice_counter", value).apply()
         }
 
+    var chargepriceRemoval2025DialogShown: Boolean
+        get() = sp.getBoolean("chargeprice_removal_2025_dialog_shown", false)
+        set(value) {
+            sp.edit().putBoolean("chargeprice_removal_2025_dialog_shown", value).apply()
+        }
+
     var opensourceDonationsDialogLastShown: Instant
         get() = Instant.ofEpochMilli(sp.getLong("opensource_donations_dialog_last_shown", 0L))
         set(value) {
@@ -323,6 +249,18 @@ class PreferenceDataSource(val context: Context) {
         set(value) {
             sp.edit().putBoolean("privacy_accepted", value).apply()
         }
+
+    var androidAutoCompassEnabled: Boolean
+        get() = sp.getBoolean("android_auto_compass_enabled", false)
+        set(value) {
+            sp.edit().putBoolean("android_auto_compass_enabled", value).apply()
+        }
+
+    var androidAutoNewMapScreenEnabled: Boolean
+        get() = sp.getBoolean("android_auto_new_map_screen_enabled", false)
+        set(value) {
+            sp.edit { putBoolean("android_auto_new_map_screen_enabled", value) }
+        }
 }
 
 fun SharedPreferences.getLatLng(key: String): LatLng? =

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

@@ -23,7 +23,7 @@ class UpdateFullDownloadWorker(appContext: Context, workerParams: WorkerParamete
 
         var insertJob: Job? = null
         val result = api.fullDownload()
-        val chargerIds = mutableListOf<Long>()
+        val idsToDelete = chargeLocations.getAllIds(api.id).toMutableSet()
         result.chargers.chunked(1024).forEach {
             insertJob?.join()
             insertJob = withContext(Dispatchers.IO) {
@@ -31,11 +31,11 @@ class UpdateFullDownloadWorker(appContext: Context, workerParams: WorkerParamete
                     chargeLocations.insert(*it.toTypedArray())
                 }
             }
-            chargerIds.addAll(it.map { it.id })
+            idsToDelete.removeAll(it.map { it.id })
         }
 
         // delete chargers that have been removed
-        chargeLocations.deleteIdNotIn(api.id, chargerIds)
+        chargeLocations.deleteById(api.id, idsToDelete.toList())
 
         when (api) {
             is OpenStreetMapApiWrapper -> {

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

@@ -2,188 +2,40 @@ package net.vonforst.evmap.ui
 
 import android.content.Context
 import android.content.res.ColorStateList
-import android.graphics.Color
-import android.graphics.drawable.ColorDrawable
-import android.graphics.drawable.Drawable
-import android.graphics.drawable.LayerDrawable
 import android.text.format.DateUtils
 import android.text.method.LinkMovementMethod
 import android.text.util.Linkify
 import android.view.View
-import android.view.ViewGroup.MarginLayoutParams
-import android.widget.ImageView
 import android.widget.TextView
-import androidx.annotation.ColorInt
-import androidx.appcompat.widget.TooltipCompat
 import androidx.core.content.ContextCompat
 import androidx.core.content.res.use
-import androidx.core.text.HtmlCompat
-import androidx.databinding.BindingAdapter
-import androidx.databinding.InverseBindingAdapter
-import androidx.databinding.InverseBindingListener
-import androidx.recyclerview.widget.ListAdapter
-import androidx.recyclerview.widget.RecyclerView
-import androidx.viewpager2.widget.ViewPager2
-import coil.load
 import com.google.android.material.floatingactionbutton.FloatingActionButton
-import com.google.android.material.slider.RangeSlider
 import net.vonforst.evmap.R
 import net.vonforst.evmap.api.availability.ChargepointStatus
-import net.vonforst.evmap.api.iconForPlugType
-import net.vonforst.evmap.isDarkMode
 import net.vonforst.evmap.kmPerMile
 import net.vonforst.evmap.meterPerFt
 import net.vonforst.evmap.shouldUseImperialUnits
 import java.time.Instant
-import kotlin.math.ceil
-import kotlin.math.floor
-import kotlin.math.roundToInt
 
+fun goneUnless(visible: Boolean): Int = if (visible) View.VISIBLE else View.GONE
 
-@BindingAdapter("goneUnless")
-fun goneUnless(view: View, visible: Boolean) {
-    view.visibility = if (visible) View.VISIBLE else View.GONE
-}
+fun invisibleUnless(visible: Boolean): Int = if (visible) View.VISIBLE else View.INVISIBLE
 
-@BindingAdapter("goneUnlessAnimated")
-fun goneUnlessAnimated(view: View, oldValue: Boolean, newValue: Boolean) {
-    if (oldValue == newValue) return
-
-    view.animate().cancel()
-    if (newValue) {
-        view.visibility = View.VISIBLE
-        view.alpha = 0f
-        view.animate().alpha(1f).withEndAction {
-            view.alpha = 1f
-        }
-    } else {
-        view.animate().alpha(0f).withEndAction {
-            view.alpha = 1f
-            view.visibility = View.GONE
-        }
-    }
-}
-
-@BindingAdapter("invisibleUnless")
-fun invisibleUnless(view: View, visible: Boolean) {
-    view.visibility = if (visible) View.VISIBLE else View.INVISIBLE
-}
-
-@BindingAdapter("invisibleUnlessAnimated")
-fun invisibleUnlessAnimated(view: View, oldValue: Boolean, newValue: Boolean) {
-    if (oldValue == newValue) {
-        if (!newValue && view.visibility == View.VISIBLE && view.alpha == 1f) {
-            // view is initially invisible
-            view.visibility = View.INVISIBLE
-        } else {
-            return
-        }
-    }
-
-    view.animate().cancel()
-    if (newValue) {
-        view.visibility = View.VISIBLE
-        view.alpha = 0f
-        view.animate().alpha(1f).withEndAction {
-            view.alpha = 1f
-        }
-    } else {
-        view.animate().alpha(0f).withEndAction {
-            view.alpha = 1f
-            view.visibility = View.INVISIBLE
-        }
-    }
-}
-
-@BindingAdapter("isFabActive")
 fun isFabActive(view: FloatingActionButton, isColored: Boolean) {
     view.imageTintList = activeTint(view.context, isColored)
 }
 
-@BindingAdapter("backgroundTintActive")
-fun backgroundTintActive(view: View, isColored: Boolean) {
-    view.backgroundTintList = activeTint(view.context, isColored)
-}
-
-@BindingAdapter("imageTintActive")
-fun imageTintActive(view: ImageView, isColored: Boolean) {
-    view.imageTintList = activeTint(view.context, isColored)
-}
-
-private fun activeTint(
-    context: Context,
-    isColored: Boolean
-): ColorStateList {
-    val color = context.theme.obtainStyledAttributes(
-        intArrayOf(
-            if (isColored) {
-                androidx.appcompat.R.attr.colorPrimary
-            } else {
-                androidx.appcompat.R.attr.colorControlNormal
-            }
-        )
-    )
-    val valueOf = ColorStateList.valueOf(color.getColor(0, 0))
-    return valueOf
-}
-
-@BindingAdapter("data")
-@Suppress("UNCHECKED_CAST")
-fun <T> setRecyclerViewData(recyclerView: RecyclerView, items: List<T>?) {
-    if (recyclerView.adapter is ListAdapter<*, *>) {
-        (recyclerView.adapter as ListAdapter<T, *>).submitList(items)
+private fun activeTint(context: Context, isColored: Boolean): ColorStateList {
+    val colorAttr = if (isColored) {
+        androidx.appcompat.R.attr.colorPrimary
+    } else {
+        androidx.appcompat.R.attr.colorControlNormal
+    }
+    return context.obtainStyledAttributes(intArrayOf(colorAttr)).use {
+        ColorStateList.valueOf(it.getColor(0, 0))
     }
 }
 
-@BindingAdapter("data")
-@Suppress("UNCHECKED_CAST")
-fun <T> setRecyclerViewData(recyclerView: ViewPager2, items: List<T>?) {
-    if (recyclerView.adapter is ListAdapter<*, *>) {
-        (recyclerView.adapter as ListAdapter<T, *>).submitList(items)
-    }
-}
-
-@BindingAdapter("connectorIcon")
-fun getConnectorItem(view: ImageView, type: String?) {
-    view.setImageResource(type?.let { iconForPlugType(it) } ?: 0)
-}
-
-@BindingAdapter("srcCompat")
-fun setImageResource(imageView: ImageView, resource: Int) {
-    imageView.setImageResource(resource)
-}
-
-@BindingAdapter("android:contentDescription")
-fun setContentDescriptionResource(imageView: ImageView, resource: Int) {
-    imageView.contentDescription = imageView.context.getString(resource)
-}
-
-@BindingAdapter("tintAvailability")
-fun setImageTintAvailability(view: ImageView, available: List<ChargepointStatus>?) {
-    view.imageTintList = ColorStateList.valueOf(availabilityColor(available, view.context))
-}
-
-@BindingAdapter("tintAvailability")
-fun setImageTintAvailability(view: ImageView, available: ChargepointStatus?) {
-    view.imageTintList = ColorStateList.valueOf(availabilityColor(available, view.context))
-}
-
-@BindingAdapter("textColorAvailability")
-fun setTextColorAvailability(view: TextView, available: List<ChargepointStatus>?) {
-    view.setTextColor(availabilityColor(available, view.context))
-}
-
-@BindingAdapter("textColorAvailability")
-fun setTextColorAvailability(view: TextView, available: ChargepointStatus?) {
-    view.setTextColor(availabilityColor(available, view.context))
-}
-
-@BindingAdapter("backgroundTintAvailability")
-fun setBackgroundTintAvailability(view: View, available: List<ChargepointStatus>?) {
-    view.backgroundTintList = ColorStateList.valueOf(availabilityColor(available, view.context))
-}
-
-@BindingAdapter("selectableItemBackground")
 fun applySelectableItemBackground(view: View, apply: Boolean) {
     if (apply) {
         view.context.obtainStyledAttributes(intArrayOf(androidx.appcompat.R.attr.selectableItemBackground))
@@ -195,105 +47,36 @@ fun applySelectableItemBackground(view: View, apply: Boolean) {
     }
 }
 
-@BindingAdapter("htmlText")
-fun setHtmlTextValue(textView: TextView, htmlText: String?) {
-    if (htmlText == null) {
-        textView.text = null
-    } else {
-        textView.text = HtmlCompat.fromHtml(htmlText, HtmlCompat.FROM_HTML_MODE_LEGACY)
-    }
-}
-
-@BindingAdapter("android:layout_marginTop")
-fun setTopMargin(view: View, topMargin: Float) {
-    val layoutParams = view.layoutParams as MarginLayoutParams
-    layoutParams.setMargins(
-        layoutParams.leftMargin, topMargin.roundToInt(),
-        layoutParams.rightMargin, layoutParams.bottomMargin
-    )
-    view.layoutParams = layoutParams
-}
-
-/**
- * Linkify is already possible using the autoLink and linksClickable attributes, but this does not
- * remove spans correctly after autoLink is set to false.
- * So we implement a new version that manually uses Linkify to create links if necessary.
- */
-@BindingAdapter(value = ["linkify", "android:text"])
-fun setLinkify(
-    textView: TextView,
-    oldLinkify: Int,
-    oldText: CharSequence?,
-    newLinkify: Int,
-    newText: CharSequence?
-) {
-    if (oldLinkify == newLinkify && oldText == newText) return
-
-    textView.text = newText
-    if (newLinkify != 0) {
-        Linkify.addLinks(textView, newLinkify)
+fun setLinkify(textView: TextView, linkifyMask: Int, text: CharSequence?) {
+    textView.text = text
+    if (linkifyMask != 0) {
+        Linkify.addLinks(textView, linkifyMask)
         textView.movementMethod = LinkMovementMethod.getInstance()
     } else {
         textView.movementMethod = null
     }
 }
 
-@BindingAdapter("chargepriceTagColor")
-fun setChargepriceTagColor(view: TextView, kind: String) {
-    view.backgroundTintList = ColorStateList.valueOf(
-        ContextCompat.getColor(
-            view.context,
-            when (kind) {
-                "star" -> R.color.chargeprice_star
-                "alert" -> R.color.chargeprice_alert
-                "info" -> R.color.chargeprice_info
-                "lock" -> R.color.chargeprice_lock
-                else -> R.color.chip_background
-            }
-        )
-    )
-}
-
-@BindingAdapter("chargepriceTagIcon")
-fun setChargepriceTagIcon(view: TextView, kind: String) {
-    view.setCompoundDrawablesRelativeWithIntrinsicBounds(
-        when (kind) {
-            "star" -> R.drawable.ic_chargeprice_star
-            "alert" -> R.drawable.ic_chargeprice_alert
-            "info" -> R.drawable.ic_chargeprice_info
-            "lock" -> R.drawable.ic_chargeprice_lock
-            else -> 0
-        }, 0, 0, 0
-    )
-}
-
-private fun availabilityColor(
-    status: List<ChargepointStatus>?,
-    context: Context
-): Int = if (status != null) {
+fun availabilityColor(status: List<ChargepointStatus>?, context: Context): Int =
+    if (status != null) {
     val unknown = status.any { it == ChargepointStatus.UNKNOWN }
     val available = status.count { it == ChargepointStatus.AVAILABLE }
     val allFaulted = status.all { it == ChargepointStatus.FAULTED }
 
-    if (unknown) {
-        ContextCompat.getColor(context, R.color.unknown)
-    } else if (available > 0) {
-        ContextCompat.getColor(context, R.color.available)
-    } else if (allFaulted) {
-        ContextCompat.getColor(context, R.color.unavailable)
-    } else {
-        ContextCompat.getColor(context, R.color.charging)
+        when {
+            unknown -> ContextCompat.getColor(context, R.color.unknown)
+            available > 0 -> ContextCompat.getColor(context, R.color.available)
+            allFaulted -> ContextCompat.getColor(context, R.color.unavailable)
+            else -> ContextCompat.getColor(context, R.color.charging)
     }
 } else {
-    val ta =
-        context.theme.obtainStyledAttributes(intArrayOf(androidx.appcompat.R.attr.colorControlNormal))
-    ta.getColor(0, 0)
+        context.obtainStyledAttributes(intArrayOf(androidx.appcompat.R.attr.colorControlNormal))
+            .use {
+                it.getColor(0, 0)
+            }
 }
 
-private fun availabilityColor(
-    status: ChargepointStatus?,
-    context: Context
-): Int = when (status) {
+fun availabilityColor(status: ChargepointStatus?, context: Context): Int = when (status) {
     ChargepointStatus.UNKNOWN -> ContextCompat.getColor(context, R.color.unknown)
     ChargepointStatus.AVAILABLE -> ContextCompat.getColor(context, R.color.available)
     ChargepointStatus.FAULTED -> ContextCompat.getColor(context, R.color.unavailable)
@@ -302,28 +85,26 @@ private fun availabilityColor(
         R.color.charging
     )
 
-    null -> {
-        val ta =
-            context.theme.obtainStyledAttributes(intArrayOf(androidx.appcompat.R.attr.colorControlNormal))
-        ta.getColor(0, 0)
+    null -> context.obtainStyledAttributes(intArrayOf(androidx.appcompat.R.attr.colorControlNormal))
+        .use {
+            it.getColor(0, 0)
     }
 }
 
 fun availabilityText(status: List<ChargepointStatus>?): String? {
     if (status == null) return null
-
     val total = status.size
     val unknown = status.count { it == ChargepointStatus.UNKNOWN }
     val available = status.count { it == ChargepointStatus.AVAILABLE }
-
     return if (unknown > 0) {
         if (unknown == total) "?" else "$available?"
-    } else available.toString()
+    } else {
+        available.toString()
+    }
 }
 
 fun availabilityText(status: ChargepointStatus?, lastChange: Instant?, context: Context): String? {
     if (status == null) return null
-
     val statusText = when (status) {
         ChargepointStatus.UNKNOWN -> context.getString(R.string.status_unknown)
         ChargepointStatus.AVAILABLE -> context.getString(R.string.status_available)
@@ -331,60 +112,49 @@ fun availabilityText(status: ChargepointStatus?, lastChange: Instant?, context:
         ChargepointStatus.OCCUPIED -> context.getString(R.string.status_occupied)
         ChargepointStatus.FAULTED -> context.getString(R.string.status_faulted)
     }
-
     return if (lastChange != null) {
         val relativeTime = DateUtils.getRelativeTimeSpanString(
             lastChange.toEpochMilli(),
             Instant.now().toEpochMilli(),
             0
         ).toString()
-        return context.getString(R.string.status_since, statusText, relativeTime)
+        context.getString(R.string.status_since, statusText, relativeTime)
     } else {
         statusText
     }
 }
 
-fun flatten(it: Iterable<Iterable<ChargepointStatus>>?): List<ChargepointStatus>? {
-    return it?.flatten()
+fun flatten(values: Iterable<Iterable<ChargepointStatus>>?): List<ChargepointStatus>? {
+    return values?.flatten()
 }
 
-fun currency(currency: String): String {
-    // shorthands for currencies
-    return when (currency) {
-        "EUR" -> "€"
-        "USD" -> "$"
-        "DKK", "SEK", "NOK" -> "kr."
-        "PLN" -> "zł"
-        "CHF" -> "Fr. "
-        "CZK" -> "Kč"
-        "GBP" -> "£"
-        "HRK" -> "kn"
-        "HUF" -> "Ft"
-        "ISK" -> "kr"
-        else -> currency
-    }
-}
-
-fun time(value: Int): String {
-    val h = floor(value.toDouble() / 60).toInt()
-    val min = ceil(value.toDouble() % 60).toInt()
-    return if (h == 0 && min > 0) "$min min"
-    else "%d:%02d h".format(h, min)
+fun currency(currency: String): String = when (currency) {
+    "EUR" -> "€"
+    "USD" -> "$"
+    "DKK", "SEK", "NOK" -> "kr."
+    "PLN" -> "zł"
+    "CHF" -> "Fr. "
+    "CZK" -> "Kč"
+    "GBP" -> "£"
+    "HRK" -> "kn"
+    "HUF" -> "Ft"
+    "ISK" -> "kr"
+    else -> currency
 }
 
 fun distance(meters: Number?, ctx: Context): String? {
     if (meters == null) return null
-    if (shouldUseImperialUnits(ctx)) {
+    return if (shouldUseImperialUnits(ctx)) {
         val ft = meters.toDouble() / meterPerFt
         val mi = meters.toDouble() / 1e3 / kmPerMile
-        return when {
+        when {
             ft < 1000 -> "%.0f ft".format(ft)
             mi < 10 -> "%.1f mi".format(mi)
             else -> "%.0f mi".format(mi)
         }
     } else {
         val km = meters.toDouble() / 1e3
-        return when {
+        when {
             km < 1 -> "%.0f m".format(meters.toDouble())
             km < 10 -> "%.1f km".format(km)
             else -> "%.0f km".format(km)
@@ -392,103 +162,3 @@ fun distance(meters: Number?, ctx: Context): String? {
     }
 }
 
-@InverseBindingAdapter(attribute = "values")
-fun getRangeSliderValue(slider: RangeSlider) = slider.values
-
-@BindingAdapter("valuesAttrChanged")
-fun setRangeSliderListeners(slider: RangeSlider, attrChange: InverseBindingListener) {
-    slider.addOnChangeListener { _, _, _ ->
-        attrChange.onChange()
-    }
-}
-
-@ColorInt
-fun colorEnabled(ctx: Context, enabled: Boolean): Int {
-    val attr = if (enabled) {
-        android.R.attr.textColorSecondary
-    } else {
-        android.R.attr.textColorHint
-    }
-    val typedValue = ctx.obtainStyledAttributes(intArrayOf(attr))
-    val color = typedValue.getColor(0, 0)
-    typedValue.recycle()
-    return color
-}
-
-@BindingAdapter("tint")
-fun setImageTintList(view: ImageView, @ColorInt color: Int) {
-    view.imageTintList = ColorStateList.valueOf(color)
-}
-
-fun tariffBackground(context: Context, myTariff: Boolean, brandingColor: String?): Drawable? {
-    when {
-        myTariff -> {
-            return ContextCompat.getDrawable(context, R.drawable.my_tariff_background)
-        }
-        brandingColor != null -> {
-            val drawable = ContextCompat.getDrawable(context, R.drawable.branded_tariff_background)
-            val color = colorToTransparent(Color.parseColor(brandingColor))
-            (drawable as LayerDrawable).setDrawableByLayerId(
-                R.id.background, ColorDrawable(
-                    color
-                )
-            )
-            return drawable
-        }
-        else -> {
-            context.obtainStyledAttributes(intArrayOf(androidx.appcompat.R.attr.selectableItemBackground))
-                .use {
-                    return it.getDrawable(0)
-                }
-        }
-    }
-}
-
-fun isDarkMode(context: Context) = context.isDarkMode()
-
-/**
- * Converts an opaque color to a transparent color, assuming it was on a white background
- * with a certain opacity targetAlpha.
- */
-private fun colorToTransparent(color: Int, targetAlpha: Float = 31f / 255): Int {
-    if (Color.alpha(color) != 255) return color
-
-    val red = Color.red(color)
-    val green = Color.green(color)
-    val blue = Color.blue(color)
-
-    val newRed = kotlin.math.max(((red - (1 - targetAlpha) * 255) / targetAlpha).roundToInt(), 0)
-    val newGreen =
-        kotlin.math.max(((green - (1 - targetAlpha) * 255) / targetAlpha).roundToInt(), 0)
-    val newBlue = kotlin.math.max(((blue - (1 - targetAlpha) * 255) / targetAlpha).roundToInt(), 0)
-
-    return Color.argb((targetAlpha * 255).roundToInt(), newRed, newGreen, newBlue)
-}
-
-@BindingAdapter("imageUrl")
-fun loadImage(view: ImageView, url: String?) {
-    if (url != null) {
-        view.load(url)
-    } else {
-        view.setImageDrawable(null)
-    }
-}
-
-@BindingAdapter("tooltipTextCompat")
-fun setTooltipTextCompat(view: View, text: String) {
-    TooltipCompat.setTooltipText(view, text)
-}
-
-@BindingAdapter("tintNullable")
-fun setImageTint(view: ImageView, @ColorInt tint: Int?) {
-    if (tint != null) {
-        view.imageTintList = ColorStateList.valueOf(tint)
-    } else {
-        view.imageTintList = null
-    }
-}
-
-@BindingAdapter("isPercentage")
-fun setIsPercentage(view: BarGraphView, value: Boolean) {
-    view.isPercentage = value
-}

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

@@ -0,0 +1,27 @@
+package net.vonforst.evmap.ui
+
+import android.text.SpannableStringBuilder
+import android.text.Spanned
+import android.text.style.URLSpan
+import android.view.View
+import androidx.core.text.getSpans
+import net.vonforst.evmap.MapsActivity
+
+class CustomUrlSpan(url: String): URLSpan(url) {
+    override fun onClick(widget: View) {
+        (widget.context as? MapsActivity)?.let {
+            it.openUrl(url, widget.rootView)
+        } ?: {
+            super.onClick(widget)
+        }
+    }
+}
+
+fun Spanned.replaceUrlSpansWithCustom(): Spanned {
+    val builder = SpannableStringBuilder(this)
+    builder.getSpans<URLSpan>().forEach {
+        builder.setSpan(CustomUrlSpan(it.url), builder.getSpanStart(it), builder.getSpanEnd(it), builder.getSpanFlags(it))
+        builder.removeSpan(it)
+    }
+    return builder
+}

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

@@ -1,320 +0,0 @@
-package net.vonforst.evmap.viewmodel
-
-import android.app.Application
-import androidx.lifecycle.AndroidViewModel
-import androidx.lifecycle.LiveData
-import androidx.lifecycle.MediatorLiveData
-import androidx.lifecycle.MutableLiveData
-import androidx.lifecycle.SavedStateHandle
-import androidx.lifecycle.distinctUntilChanged
-import androidx.lifecycle.viewModelScope
-import jsonapi.Meta
-import jsonapi.Relationship
-import jsonapi.Relationships
-import jsonapi.ResourceIdentifier
-import kotlinx.coroutines.Job
-import kotlinx.coroutines.launch
-import net.vonforst.evmap.api.chargeprice.ChargePrice
-import net.vonforst.evmap.api.chargeprice.ChargepriceApi
-import net.vonforst.evmap.api.chargeprice.ChargepriceCar
-import net.vonforst.evmap.api.chargeprice.ChargepriceChargepointMeta
-import net.vonforst.evmap.api.chargeprice.ChargepriceInclude
-import net.vonforst.evmap.api.chargeprice.ChargepriceMeta
-import net.vonforst.evmap.api.chargeprice.ChargepriceOptions
-import net.vonforst.evmap.api.chargeprice.ChargepriceRequest
-import net.vonforst.evmap.api.chargeprice.ChargepriceRequestTariffMeta
-import net.vonforst.evmap.api.chargeprice.ChargepriceStation
-import net.vonforst.evmap.api.equivalentPlugTypes
-import net.vonforst.evmap.model.ChargeLocation
-import net.vonforst.evmap.model.Chargepoint
-import net.vonforst.evmap.storage.PreferenceDataSource
-import retrofit2.HttpException
-import java.io.IOException
-
-class ChargepriceViewModel(
-    application: Application,
-    chargepriceApiKey: String,
-    chargepriceApiUrl: String,
-    private val state: SavedStateHandle
-) :
-    AndroidViewModel(application) {
-    private var api = ChargepriceApi.create(chargepriceApiKey, chargepriceApiUrl)
-    private var prefs = PreferenceDataSource(application)
-
-    val charger: MutableLiveData<ChargeLocation> by lazy {
-        state.getLiveData("charger")
-    }
-
-    val chargepoint: MutableLiveData<Chargepoint?> by lazy {
-        state.getLiveData("chargepoint")
-    }
-
-    private val vehicleIds: MutableLiveData<Set<String>> by lazy {
-        MutableLiveData<Set<String>>().apply {
-            value = prefs.chargepriceMyVehicles
-        }
-    }
-
-    val vehicles: LiveData<Resource<List<ChargepriceCar>>> by lazy {
-        MediatorLiveData<Resource<List<ChargepriceCar>>>().apply {
-            addSource(vehicleIds.distinctUntilChanged()) { vehicleIds ->
-                if (vehicleIds.isEmpty()) {
-                    value = Resource.success(emptyList())
-                } else {
-                    value = Resource.loading(null)
-                    viewModelScope.launch {
-                        value = try {
-                            val result = api.getVehicles()
-                            Resource.success(result.filter {
-                                it.id in vehicleIds
-                            })
-                        } catch (e: IOException) {
-                            Resource.error(e.message, null)
-                        } catch (e: HttpException) {
-                            Resource.error(e.message, null)
-                        }
-                    }
-                }
-            }
-            observeForever {
-                vehicle.value = it.data?.firstOrNull()
-            }
-        }
-    }
-
-    val vehicle: MutableLiveData<ChargepriceCar> by lazy {
-        state.getLiveData("vehicle")
-    }
-
-    val vehicleCompatibleConnectors: LiveData<List<String>> by lazy {
-        MediatorLiveData<List<String>>().apply {
-            addSource(vehicle) {
-                value = it?.compatibleEvmapConnectors
-            }
-        }
-    }
-
-    val noCompatibleConnectors: LiveData<Boolean> by lazy {
-        MediatorLiveData<Boolean>().apply {
-            value = false
-            listOf(charger, vehicleCompatibleConnectors).forEach {
-                addSource(it) {
-                    val charger = charger.value ?: return@addSource
-                    val connectors = vehicleCompatibleConnectors.value ?: return@addSource
-                    value = !charger.chargepoints.flatMap { equivalentPlugTypes(it.type) }
-                        .any { it in connectors }
-                }
-            }
-        }
-    }
-
-    val batteryRange: MutableLiveData<List<Float>> by lazy {
-        MutableLiveData<List<Float>>().apply {
-            value = prefs.chargepriceBatteryRange
-            observeForever {
-                if (it[0] == it[1]) {
-                    value = if (it[0] < 1.0) {
-                        listOf(it[0], it[1] + 1)
-                    } else {
-                        listOf(it[0] - 1, it[1])
-                    }
-                }
-                prefs.chargepriceBatteryRange = value!!
-            }
-        }
-    }
-    val batteryRangeSliderDragging: MutableLiveData<Boolean> by lazy {
-        MutableLiveData<Boolean>().apply {
-            value = false
-        }
-    }
-
-    val chargePrices: MutableLiveData<Resource<List<ChargePrice>>> by lazy {
-        MediatorLiveData<Resource<List<ChargePrice>>>().apply {
-            value = state["chargePrices"] ?: Resource.loading(null)
-            listOf(
-                vehicle,
-                batteryRange,
-                batteryRangeSliderDragging,
-                vehicleCompatibleConnectors,
-                myTariffs, myTariffsAll, charger
-            ).forEach {
-                addSource(it.distinctUntilChanged()) {
-                    if (!batteryRangeSliderDragging.value!!) {
-                        loadPrices()
-                        state["chargePrices"] = this.value
-                    }
-                }
-            }
-        }
-    }
-
-    val chargePriceMeta: MutableLiveData<Resource<ChargepriceMeta>> by lazy {
-        MutableLiveData<Resource<ChargepriceMeta>>().apply {
-            value = Resource.loading(null)
-        }
-    }
-
-    val chargePricesForChargepoint: MediatorLiveData<Resource<List<ChargePrice>>> by lazy {
-        MediatorLiveData<Resource<List<ChargePrice>>>().apply {
-            listOf(chargePrices, chargepoint).forEach {
-                addSource(it) {
-                    val cps = chargePrices.value
-                    val chargepoint = chargepoint.value
-                    if (cps == null || chargepoint == null) {
-                        value = null
-                    } else if (cps.status == Status.ERROR) {
-                        value = Resource.error(cps.message, null)
-                    } else if (cps.status == Status.LOADING) {
-                        value = Resource.loading(null)
-                    } else {
-                        val myTariffs = prefs.chargepriceMyTariffs
-                        value = Resource.success(cps.data!!.mapNotNull { cp ->
-                            val filteredPrices =
-                                cp.chargepointPrices.filter {
-                                    it.plug == getChargepricePlugType(chargepoint) && it.power == chargepoint.power
-                                }
-                            if (filteredPrices.isEmpty()) {
-                                null
-                            } else {
-                                cp.copy(
-                                    chargepointPrices = filteredPrices
-                                )
-                            }
-                        }
-                            .sortedBy { it.chargepointPrices.first().price ?: Double.MAX_VALUE }
-                            .sortedByDescending {
-                                prefs.chargepriceMyTariffsAll ||
-                                        myTariffs != null && it.tariffId in myTariffs
-                            }
-                        )
-                    }
-                }
-            }
-        }
-    }
-
-    fun reloadPrefs() {
-        vehicleIds.value = prefs.chargepriceMyVehicles
-    }
-
-    private fun getChargepricePlugType(chargepoint: Chargepoint): String {
-        val index = charger.value!!.chargepointsMerged.indexOf(chargepoint)
-        val type = charger.value!!.chargepriceData!!.plugTypes?.get(index) ?: chargepoint.type
-        return type
-    }
-
-    val myTariffs: LiveData<Set<String>> by lazy {
-        MutableLiveData<Set<String>>().apply {
-            value = prefs.chargepriceMyTariffs
-        }
-    }
-    val myTariffsAll: LiveData<Boolean> by lazy {
-        MutableLiveData<Boolean>().apply {
-            value = prefs.chargepriceMyTariffsAll
-        }
-    }
-
-    val chargepriceMetaForChargepoint: MediatorLiveData<Resource<ChargepriceChargepointMeta>> by lazy {
-        MediatorLiveData<Resource<ChargepriceChargepointMeta>>().apply {
-            listOf(chargePriceMeta, chargepoint).forEach {
-                addSource(it) {
-                    val cpMeta = chargePriceMeta.value
-                    val chargepoint = chargepoint.value
-                    if (cpMeta == null || chargepoint == null) {
-                        value = null
-                    } else if (cpMeta.status == Status.ERROR) {
-                        value = Resource.error(cpMeta.message, null)
-                    } else if (cpMeta.status == Status.LOADING) {
-                        value = Resource.loading(null)
-                    } else {
-                        val result = cpMeta.data!!.chargePoints.filter {
-                            it.plug == getChargepricePlugType(
-                                chargepoint
-                            ) && it.power == chargepoint.power
-                        }.elementAtOrNull(0)
-                        value = if (result != null) {
-                            Resource.success(result)
-                        } else {
-                            Resource.error("matching chargepoint not found", null)
-                        }
-                    }
-                }
-            }
-        }
-    }
-
-    private var loadPricesJob: Job? = null
-    fun loadPrices() {
-        chargePrices.value = Resource.loading(null)
-        chargePriceMeta.value = Resource.loading(null)
-        val charger = charger.value
-        val car = vehicle.value
-        val compatibleConnectors = vehicleCompatibleConnectors.value
-        val myTariffs = myTariffs.value
-        val myTariffsAll = myTariffsAll.value
-        if (charger == null || car == null || compatibleConnectors == null || myTariffsAll == null || myTariffsAll == false && myTariffs == null) {
-            chargePrices.value = Resource.error(null, null)
-            return
-        }
-
-        val cpStation = ChargepriceStation.fromEvmap(charger, compatibleConnectors)
-        if (cpStation.chargePoints.isEmpty()) {
-            // no compatible connectors
-            chargePrices.value = Resource.success(emptyList())
-            chargePriceMeta.value = Resource.success(ChargepriceMeta(emptyList()))
-            return
-        }
-
-        loadPricesJob?.cancel()
-        loadPricesJob = viewModelScope.launch {
-            try {
-                val result = api.getChargePrices(
-                    ChargepriceRequest(
-                        dataAdapter = ChargepriceApi.getDataAdapter(charger),
-                        station = cpStation,
-                        vehicle = car,
-                        options = ChargepriceOptions(
-                            batteryRange = batteryRange.value!!.map { it.toDouble() },
-                            providerCustomerTariffs = prefs.chargepriceShowProviderCustomerTariffs,
-                            maxMonthlyFees = if (prefs.chargepriceNoBaseFee) 0.0 else null,
-                            currency = prefs.chargepriceCurrency,
-                            allowUnbalancedLoad = prefs.chargepriceAllowUnbalancedLoad,
-                            showPriceUnavailable = true
-                        ),
-                        relationships = if (!myTariffsAll) {
-                            Relationships(
-                                "tariffs" to Relationship.ToMany(
-                                    (myTariffs ?: emptySet()).map {
-                                        ResourceIdentifier(
-                                            "tariff",
-                                            id = it
-                                        )
-                                    },
-                                    meta = Meta.from(
-                                        ChargepriceRequestTariffMeta(ChargepriceInclude.ALWAYS),
-                                        ChargepriceApi.moshi
-                                    )
-                                )
-                            )
-                        } else null
-                    ), ChargepriceApi.getChargepriceLanguage()
-                )
-
-                val meta = result.meta!!.map(ChargepriceMeta::class.java, ChargepriceApi.moshi)!!
-                chargePrices.value = Resource.success(result.data)
-                chargePriceMeta.value = Resource.success(meta)
-            } catch (e: IOException) {
-                chargePrices.value = Resource.error(e.message, null)
-                chargePriceMeta.value = Resource.error(e.message, null)
-            } catch (e: HttpException) {
-                chargePrices.value = Resource.error(e.message, null)
-                chargePriceMeta.value = Resource.error(e.message, null)
-            }
-        }
-    }
-
-    fun resetBatteryRangeToDefault() {
-        batteryRange.value = prefs.chargepriceBatteryRangeAndroidAuto
-    }
-}

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

@@ -6,38 +6,16 @@ import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.viewModelScope
 import kotlinx.coroutines.launch
-import net.vonforst.evmap.api.chargeprice.ChargepriceApi
-import net.vonforst.evmap.api.chargeprice.ChargepriceCar
-import net.vonforst.evmap.api.chargeprice.ChargepriceTariff
 import net.vonforst.evmap.storage.AppDatabase
 import net.vonforst.evmap.storage.PreferenceDataSource
-import retrofit2.HttpException
-import java.io.IOException
 
 class SettingsViewModel(
     application: Application,
-    chargepriceApiKey: String,
-    chargepriceApiUrl: String
 ) :
     AndroidViewModel(application) {
-    private val api = ChargepriceApi.create(chargepriceApiKey, chargepriceApiUrl)
     private val db = AppDatabase.getInstance(application)
     private val prefs = PreferenceDataSource(application)
 
-    val vehicles: MutableLiveData<Resource<List<ChargepriceCar>>> by lazy {
-        MutableLiveData<Resource<List<ChargepriceCar>>>().apply {
-            value = Resource.loading(null)
-            loadVehicles()
-        }
-    }
-
-    val tariffs: MutableLiveData<Resource<List<ChargepriceTariff>>> by lazy {
-        MutableLiveData<Resource<List<ChargepriceTariff>>>().apply {
-            value = Resource.loading(null)
-            loadTariffs()
-        }
-    }
-
     val chargerCacheCount: LiveData<Long> by lazy {
         db.chargeLocationsDao().getCount()
     }
@@ -52,32 +30,6 @@ class SettingsViewModel(
         }
     }
 
-    private fun loadVehicles() {
-        viewModelScope.launch {
-            try {
-                val result = api.getVehicles()
-                vehicles.value = Resource.success(result)
-            } catch (e: IOException) {
-                vehicles.value = Resource.error(e.message, null)
-            } catch (e: HttpException) {
-                vehicles.value = Resource.error(e.message, null)
-            }
-        }
-    }
-
-    private fun loadTariffs() {
-        viewModelScope.launch {
-            try {
-                val result = api.getTariffs()
-                tariffs.value = Resource.success(result)
-            } catch (e: IOException) {
-                tariffs.value = Resource.error(e.message, null)
-            } catch (e: HttpException) {
-                tariffs.value = Resource.error(e.message, null)
-            }
-        }
-    }
-
     fun deleteRecentSearchResults() {
         viewModelScope.launch {
             db.recentAutocompletePlaceDao().deleteAll()

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

@@ -1,5 +0,0 @@
-<vector android:height="15.811624dp" android:viewportHeight="131.5"
-    android:tint="?attr/colorControlNormal"
-    android:viewportWidth="199.6" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#FF000000" android:pathData="M197.544,65.685l-9.2,-4.8l8,-4.2c2.7,-1.4 2.7,-3.8 0,-5.2l-8.6,-4.5l8.6,-4.5c2.7,-1.4 2.7,-3.8 0,-5.2l-68.9,-36.1c-2.7,-1.4 -7.2,-1.4 -9.9,0l-115.5,59.7c-2.7,1.4 -2.7,3.7 0,5.1l8.8,4.5l-8.8,4.6c-2.7,1.4 -2.7,3.7 0,5.1l9.4,4.8l-8.2,4.3c-2.7,1.4 -2.7,3.7 0,5.1l70.4,36.2c2.7,1.4 7.2,1.4 9.9,0l114,-59.6C200.344,69.385 200.344,67.085 197.544,65.685L197.544,65.685zM123.144,18.785L105.844,38.685c-0.9,1 -0.6,2.3 0.6,2.9l13.7,7.1c1.2,0.6 1.2,1.6 0,2.2l-43.1,22.3c-1.2,0.6 -1.4,0.3 -0.6,-0.7l17.3,-19.9c0.9,-1 0.6,-2.3 -0.6,-2.9l-13.7,-7.1c-1.2,-0.6 -1.2,-1.6 0,-2.2l43.1,-22.3C123.744,17.485 123.944,17.785 123.144,18.785L123.144,18.785z"/>
-</vector>

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

@@ -1,10 +0,0 @@
-<vector android:height="20dp"
-    android:tint="?attr/colorControlNormal"
-    android:viewportHeight="24"
-    android:viewportWidth="24"
-    android:width="20dp"
-    xmlns:android="http://schemas.android.com/apk/res/android">
-    <path
-        android:fillColor="@android:color/white"
-        android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM13,17h-2v-2h2v2zM13,13h-2L11,7h2v6z" />
-</vector>

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

@@ -1,10 +0,0 @@
-<vector android:height="20dp"
-    android:tint="?attr/colorControlNormal"
-    android:viewportHeight="24"
-    android:viewportWidth="24"
-    android:width="20dp"
-    xmlns:android="http://schemas.android.com/apk/res/android">
-    <path
-        android:fillColor="@android:color/white"
-        android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM13,17h-2v-6h2v6zM13,9h-2L11,7h2v2z" />
-</vector>

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

@@ -1,10 +0,0 @@
-<vector android:height="16dp"
-    android:tint="?attr/colorControlNormal"
-    android:viewportHeight="24"
-    android:viewportWidth="24"
-    android:width="16dp"
-    xmlns:android="http://schemas.android.com/apk/res/android">
-    <path
-        android:fillColor="@android:color/white"
-        android:pathData="M18,8h-1L17,6c0,-2.76 -2.24,-5 -5,-5S7,3.24 7,6v2L6,8c-1.1,0 -2,0.9 -2,2v10c0,1.1 0.9,2 2,2h12c1.1,0 2,-0.9 2,-2L20,10c0,-1.1 -0.9,-2 -2,-2zM12,17c-1.1,0 -2,-0.9 -2,-2s0.9,-2 2,-2 2,0.9 2,2 -0.9,2 -2,2zM15.1,8L8.9,8L8.9,6c0,-1.71 1.39,-3.1 3.1,-3.1 1.71,0 3.1,1.39 3.1,3.1v2z" />
-</vector>

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

@@ -1,10 +0,0 @@
-<vector android:height="16dp"
-    android:tint="?attr/colorControlNormal"
-    android:viewportHeight="24"
-    android:viewportWidth="24"
-    android:width="16dp"
-    xmlns:android="http://schemas.android.com/apk/res/android">
-    <path
-        android:fillColor="@android:color/white"
-        android:pathData="M12,17.27L18.18,21l-1.64,-7.03L22,9.24l-7.19,-0.61L12,2 9.19,8.63 2,9.24l5.46,4.73L5.82,21z" />
-</vector>

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

@@ -0,0 +1,12 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:height="24dp"
+    android:tint="#000000"
+    android:viewportHeight="24"
+    android:viewportWidth="24"
+    android:width="24dp">
+
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M12,10.9c-0.61,0 -1.1,0.49 -1.1,1.1s0.49,1.1 1.1,1.1c0.61,0 1.1,-0.49 1.1,-1.1s-0.49,-1.1 -1.1,-1.1zM12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM14.19,14.19L6,18l3.81,-8.19L18,6l-3.81,8.19z" />
+
+</vector>

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

@@ -0,0 +1,51 @@
+<!--
+  ~ Copyright (C) 2026 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.
+  -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M7.57,2.904A5.168,5.168 0,0 0,2.4 8.074a5.168,5.168 0,0 0,1.097 3.181l5.656,7.24A3.616,3.616 0,0 0,12 19.885a3.616,3.616 0,0 0,2.843 -1.389l5.656,-7.24A5.168,5.168 0,0 0,21.6 8.074a5.168,5.168 0,0 0,-5.17 -5.17z"
+      android:strokeWidth="2"
+      android:fillColor="#000000"
+      android:fillAlpha="0"
+      android:strokeColor="#000"/>
+  <path
+      android:fillColor="#FF000000"
+      android:pathData="M11.5,10.159a1,1 0,0 0,-1 1,1 1,0 0,0 1,1h1a1,1 0,0 0,1 -1,1 1,0 0,0 -1,-1z"/>
+  <path
+      android:pathData="M7.5,8.074m-2.9,0a2.9,2.9 0,1 1,5.8 0a2.9,2.9 0,1 1,-5.8 0"
+      android:strokeWidth="1"
+      android:fillColor="#00000000"
+      android:strokeColor="#000000"/>
+  <path
+      android:pathData="M16.5,8.074m-2.9,0a2.9,2.9 0,1 1,5.8 0a2.9,2.9 0,1 1,-5.8 0"
+      android:strokeWidth="1"
+      android:fillColor="#00000000"
+      android:strokeColor="#000000"/>
+  <path
+      android:fillColor="#FF000000"
+      android:pathData="M9,13m-1,0a1,1 0,1 1,2 0a1,1 0,1 1,-2 0"/>
+  <path
+      android:fillColor="#FF000000"
+      android:pathData="M15,13m-1,0a1,1 0,1 1,2 0a1,1 0,1 1,-2 0"/>
+  <path
+      android:pathData="M12,15.5m-1.8,0a1.8,1.8 0,1 1,3.6 0a1.8,1.8 0,1 1,-3.6 0"
+      android:strokeWidth="1"
+      android:fillColor="#00000000"
+      android:strokeColor="#000000"/>
+</vector>

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

@@ -1,149 +0,0 @@
-<vector android:height="26dp"
-    android:viewportHeight="257.0819"
-    android:viewportWidth="1289.0747"
-    android:width="130.4dp"
-    xmlns:android="http://schemas.android.com/apk/res/android">
-    <path
-        android:fillColor="#000000"
-        android:pathData="m339.23,124.6q14.22,0 23.58,4.5 9.54,4.5 9.54,11.52 0,3.06 -1.98,5.58 -1.98,2.34 -5.04,2.34 -2.34,0 -3.78,-0.72 -1.26,-0.72 -3.6,-2.34 -1.08,-1.08 -3.42,-2.52 -2.16,-1.08 -6.12,-1.8 -3.96,-0.72 -7.2,-0.72 -9.36,0 -16.56,4.32 -7.2,4.32 -11.16,12.06 -3.96,7.56 -3.96,16.92 0,9.54 3.78,17.1 3.96,7.56 10.98,11.88 7.02,4.32 16.02,4.32 9.36,0 15.12,-2.88 1.26,-0.72 3.42,-2.34 1.8,-1.44 3.06,-2.16 1.44,-0.72 3.42,-0.72 3.6,0 5.58,2.34 2.16,2.16 2.16,5.76 0,3.78 -4.86,7.56 -4.68,3.6 -12.78,5.94 -7.92,2.34 -17.1,2.34 -13.68,0 -24.12,-6.3 -10.44,-6.48 -16.2,-17.64 -5.58,-11.34 -5.58,-25.2 0,-13.86 5.94,-25.02 5.94,-11.34 16.56,-17.64 10.62,-6.48 24.3,-6.48z"
-        android:strokeColor="#00000000"
-        android:strokeLineCap="butt"
-        android:strokeLineJoin="miter"
-        android:strokeWidth="1" />
-    <path
-        android:fillColor="#000000"
-        android:pathData="m437.63,125.14q31.68,0 31.68,39.24l0,48.06q0,3.6 -2.52,6.12 -2.34,2.52 -6.12,2.52 -3.6,0 -6.12,-2.52 -2.34,-2.52 -2.34,-6.12l0,-48.06q0,-23.4 -19.8,-23.4 -10.62,0 -17.64,6.84 -7.02,6.66 -7.02,16.56l0,48.06q0,3.6 -2.52,6.12 -2.34,2.52 -6.12,2.52 -3.78,0 -6.12,-2.34 -2.34,-2.52 -2.34,-6.3l0,-115.92q0,-3.6 2.34,-6.12 2.52,-2.52 6.12,-2.52 3.78,0 6.12,2.52 2.52,2.52 2.52,6.12l0,45.54q4.5,-7.02 12.6,-11.88 8.1,-5.04 17.28,-5.04z"
-        android:strokeColor="#00000000"
-        android:strokeLineCap="butt"
-        android:strokeLineJoin="miter"
-        android:strokeWidth="1" />
-    <path
-        android:fillColor="#000000"
-        android:pathData="m571.21,125.5q3.78,0 6.12,2.52 2.52,2.34 2.52,6.3l0,78.12q0,3.6 -2.52,6.12 -2.34,2.52 -6.12,2.52 -3.78,0 -6.12,-2.34 -2.34,-2.52 -2.34,-6.3l0,-4.68q-4.68,6.3 -12.78,10.8 -8.1,4.32 -17.46,4.32 -12.24,0 -22.32,-6.3 -9.9,-6.3 -15.66,-17.46 -5.58,-11.34 -5.58,-25.38 0,-14.04 5.58,-25.2 5.76,-11.34 15.66,-17.64 9.9,-6.3 21.78,-6.3 9.54,0 17.64,3.96 8.28,3.96 13.14,10.08l0,-4.32q0,-3.78 2.34,-6.3 2.34,-2.52 6.12,-2.52zM534.49,207.04q8.46,0 14.94,-4.32 6.66,-4.32 10.26,-11.88 3.78,-7.56 3.78,-17.1 0,-9.36 -3.78,-16.92 -3.6,-7.56 -10.26,-11.88 -6.48,-4.5 -14.94,-4.5 -8.46,0 -15.12,4.32 -6.48,4.32 -10.26,11.88 -3.6,7.56 -3.6,17.1 0,9.54 3.6,17.1 3.78,7.56 10.26,11.88 6.66,4.32 15.12,4.32z"
-        android:strokeColor="#00000000"
-        android:strokeLineCap="butt"
-        android:strokeLineJoin="miter"
-        android:strokeWidth="1" />
-    <path
-        android:fillColor="#000000"
-        android:pathData="m652.08,124.6q4.68,0 8.1,2.52 3.42,2.34 3.42,5.94 0,4.32 -2.34,6.66 -2.16,2.16 -5.4,2.16 -1.62,0 -4.86,-1.08 -3.78,-1.26 -5.94,-1.26 -5.58,0 -10.98,3.96 -5.22,3.78 -8.64,10.62 -3.24,6.66 -3.24,14.94l0,43.38q0,3.6 -2.52,6.12 -2.34,2.52 -6.12,2.52 -3.78,0 -6.12,-2.34 -2.34,-2.52 -2.34,-6.3l0,-77.04q0,-3.6 2.34,-6.12 2.52,-2.52 6.12,-2.52 3.78,0 6.12,2.52 2.52,2.52 2.52,6.12l0,9.18q3.96,-8.82 11.88,-14.22 7.92,-5.58 18,-5.76z"
-        android:strokeColor="#00000000"
-        android:strokeLineCap="butt"
-        android:strokeLineJoin="miter"
-        android:strokeWidth="1" />
-    <path
-        android:fillColor="#000000"
-        android:pathData="m755.31,125.5q3.78,0 6.12,2.52 2.52,2.34 2.52,6.3l0,79.2q0,14.58 -6.3,24.3 -6.12,9.9 -16.74,14.58 -10.62,4.68 -23.94,4.68 -7.2,0 -16.92,-2.52 -9.54,-2.52 -12.24,-5.22 -5.58,-2.88 -5.58,-7.2 0,-1.08 0.72,-2.88 1.98,-4.5 6.66,-4.5 2.34,0 5.04,1.08 14.4,5.58 22.5,5.58 14.4,0 21.96,-7.02 7.74,-6.84 7.74,-18.9l0,-9.72q-3.78,7.02 -12.78,12.06 -8.82,5.04 -18.72,5.04 -12.42,0 -22.68,-6.3 -10.26,-6.3 -16.2,-17.46 -5.76,-11.34 -5.76,-25.38 0,-14.04 5.76,-25.2 5.94,-11.34 16.02,-17.64 10.26,-6.3 22.5,-6.3 9.9,0 18.36,4.5 8.64,4.5 13.5,10.98l0,-5.76q0,-3.78 2.34,-6.3 2.34,-2.52 6.12,-2.52zM717.33,207.04q8.82,0 15.66,-4.14 6.84,-4.32 10.62,-11.88 3.96,-7.74 3.96,-17.28 0,-9.54 -3.96,-17.1 -3.78,-7.56 -10.62,-11.88 -6.84,-4.32 -15.66,-4.32 -8.64,0 -15.48,4.32 -6.84,4.32 -10.8,12.06 -3.78,7.56 -3.78,16.92 0,9.36 3.78,17.1 3.96,7.56 10.8,11.88 6.84,4.32 15.48,4.32z"
-        android:strokeColor="#00000000"
-        android:strokeLineCap="butt"
-        android:strokeLineJoin="miter"
-        android:strokeWidth="1" />
-    <path
-        android:fillColor="#000000"
-        android:pathData="m868.61,170.32q-0.18,3.24 -2.7,5.58 -2.52,2.16 -5.94,2.16l-63.36,0q1.26,13.14 9.9,21.06 8.82,7.92 21.42,7.92 8.64,0 14.04,-2.52 5.4,-2.52 9.54,-6.48 2.7,-1.62 5.22,-1.62 3.06,0 5.04,2.16 2.16,2.16 2.16,5.04 0,3.78 -3.6,6.84 -5.22,5.22 -13.86,8.82 -8.64,3.6 -17.64,3.6 -14.58,0 -25.74,-6.12 -10.98,-6.12 -17.1,-17.1 -5.94,-10.98 -5.94,-24.84 0,-15.12 6.12,-26.46 6.3,-11.52 16.38,-17.64 10.26,-6.12 21.96,-6.12 11.52,0 21.6,5.94 10.08,5.94 16.2,16.38 6.12,10.44 6.3,23.4zM824.51,140.44q-10.08,0 -17.46,5.76 -7.38,5.58 -9.72,17.46l53.1,0l0,-1.44q-0.9,-9.54 -8.64,-15.66 -7.56,-6.12 -17.28,-6.12z"
-        android:strokeColor="#00000000"
-        android:strokeLineCap="butt"
-        android:strokeLineJoin="miter"
-        android:strokeWidth="1" />
-    <path
-        android:fillColor="#000000"
-        android:pathData="m935.8,125.14q12.24,0 22.14,6.3 9.9,6.12 15.48,17.28 5.76,11.16 5.76,25.2 0,14.04 -5.76,25.2 -5.58,10.98 -15.48,17.28 -9.9,6.3 -21.78,6.3 -9.36,0 -17.46,-4.14 -8.1,-4.14 -13.14,-10.08l0,39.96q0,3.6 -2.52,6.12 -2.34,2.52 -6.12,2.52 -3.6,0 -6.12,-2.52 -2.34,-2.34 -2.34,-6.12l0,-113.22q0,-3.78 2.34,-6.3 2.34,-2.52 6.12,-2.52 3.78,0 6.12,2.52 2.52,2.52 2.52,6.3l0,5.22q4.32,-6.3 12.6,-10.8 8.28,-4.5 17.64,-4.5zM933.82,206.86q8.28,0 14.94,-4.32 6.66,-4.32 10.26,-11.7 3.78,-7.56 3.78,-16.92 0,-9.36 -3.78,-16.74 -3.6,-7.56 -10.26,-11.88 -6.66,-4.32 -14.94,-4.32 -8.46,0 -15.12,4.32 -6.66,4.14 -10.44,11.7 -3.6,7.56 -3.6,16.92 0,9.36 3.6,16.92 3.78,7.56 10.44,11.88 6.66,4.14 15.12,4.14z"
-        android:strokeColor="#00000000"
-        android:strokeLineCap="butt"
-        android:strokeLineJoin="miter"
-        android:strokeWidth="1" />
-    <path
-        android:fillColor="#000000"
-        android:pathData="m1045.83,124.6q4.68,0 8.1,2.52 3.42,2.34 3.42,5.94 0,4.32 -2.34,6.66 -2.16,2.16 -5.4,2.16 -1.62,0 -4.86,-1.08 -3.78,-1.26 -5.94,-1.26 -5.58,0 -10.98,3.96 -5.22,3.78 -8.64,10.62 -3.24,6.66 -3.24,14.94l0,43.38q0,3.6 -2.52,6.12 -2.34,2.52 -6.12,2.52 -3.78,0 -6.12,-2.34 -2.34,-2.52 -2.34,-6.3l0,-77.04q0,-3.6 2.34,-6.12 2.52,-2.52 6.12,-2.52 3.78,0 6.12,2.52 2.52,2.52 2.52,6.12l0,9.18q3.96,-8.82 11.88,-14.22 7.92,-5.58 18,-5.76z"
-        android:strokeColor="#00000000"
-        android:strokeLineCap="butt"
-        android:strokeLineJoin="miter"
-        android:strokeWidth="1" />
-    <path
-        android:fillColor="#000000"
-        android:pathData="m1089.23,212.44q0,3.6 -2.52,6.12 -2.34,2.52 -6.12,2.52 -3.6,0 -6.12,-2.52 -2.34,-2.52 -2.34,-6.12l0,-77.94q0,-3.6 2.34,-6.12 2.52,-2.52 6.12,-2.52 3.78,0 6.12,2.52 2.52,2.52 2.52,6.12zM1080.59,113.98q-5.22,0 -7.56,-1.8 -2.16,-1.98 -2.16,-6.12l0,-2.88q0,-4.32 2.34,-6.12 2.52,-1.8 7.56,-1.8 5.04,0 7.2,1.98 2.34,1.8 2.34,5.94l0,2.88q0,4.32 -2.34,6.12 -2.34,1.8 -7.38,1.8z"
-        android:strokeColor="#00000000"
-        android:strokeLineCap="butt"
-        android:strokeLineJoin="miter"
-        android:strokeWidth="1" />
-    <path
-        android:fillColor="#000000"
-        android:pathData="m1154.85,124.6q14.22,0 23.58,4.5 9.54,4.5 9.54,11.52 0,3.06 -1.98,5.58 -1.98,2.34 -5.04,2.34 -2.34,0 -3.78,-0.72 -1.26,-0.72 -3.6,-2.34 -1.08,-1.08 -3.42,-2.52 -2.16,-1.08 -6.12,-1.8 -3.96,-0.72 -7.2,-0.72 -9.36,0 -16.56,4.32 -7.2,4.32 -11.16,12.06 -3.96,7.56 -3.96,16.92 0,9.54 3.78,17.1 3.96,7.56 10.98,11.88 7.02,4.32 16.02,4.32 9.36,0 15.12,-2.88 1.26,-0.72 3.42,-2.34 1.8,-1.44 3.06,-2.16 1.44,-0.72 3.42,-0.72 3.6,0 5.58,2.34 2.16,2.16 2.16,5.76 0,3.78 -4.86,7.56 -4.68,3.6 -12.78,5.94 -7.92,2.34 -17.1,2.34 -13.68,0 -24.12,-6.3 -10.44,-6.48 -16.2,-17.64 -5.58,-11.34 -5.58,-25.2 0,-13.86 5.94,-25.02 5.94,-11.34 16.56,-17.64 10.62,-6.48 24.3,-6.48z"
-        android:strokeColor="#00000000"
-        android:strokeLineCap="butt"
-        android:strokeLineJoin="miter"
-        android:strokeWidth="1" />
-    <path
-        android:fillColor="#000000"
-        android:pathData="m1289.07,170.32q-0.18,3.24 -2.7,5.58 -2.52,2.16 -5.94,2.16l-63.36,0q1.26,13.14 9.9,21.06 8.82,7.92 21.42,7.92 8.64,0 14.04,-2.52 5.4,-2.52 9.54,-6.48 2.7,-1.62 5.22,-1.62 3.06,0 5.04,2.16 2.16,2.16 2.16,5.04 0,3.78 -3.6,6.84 -5.22,5.22 -13.86,8.82 -8.64,3.6 -17.64,3.6 -14.58,0 -25.74,-6.12 -10.98,-6.12 -17.1,-17.1 -5.94,-10.98 -5.94,-24.84 0,-15.12 6.12,-26.46 6.3,-11.52 16.38,-17.64 10.26,-6.12 21.96,-6.12 11.52,0 21.6,5.94 10.08,5.94 16.2,16.38 6.12,10.44 6.3,23.4zM1244.97,140.44q-10.08,0 -17.46,5.76 -7.38,5.58 -9.72,17.46l53.1,0l0,-1.44q-0.9,-9.54 -8.64,-15.66 -7.56,-6.12 -17.28,-6.12z"
-        android:strokeColor="#00000000"
-        android:strokeLineCap="butt"
-        android:strokeLineJoin="miter"
-        android:strokeWidth="1" />
-    <path
-        android:fillColor="#000000"
-        android:pathData="m321.33,1q5.1,0 9.7,3.1 4.6,3 7.4,8.2 2.8,5.1 2.8,11.2 0,6 -2.8,11.2 -2.8,5.2 -7.4,8.3 -4.6,3 -9.7,3l-17.4,0l0,18.9q0,2.7 -1.6,4.4 -1.6,1.7 -4.2,1.7 -2.5,0 -4.1,-1.7 -1.6,-1.8 -1.6,-4.4l0,-57.8q0,-2.6 1.7,-4.3 1.8,-1.8 4.4,-1.8zM321.33,34.6q1.9,0 3.7,-1.6 1.9,-1.6 3,-4.1 1.2,-2.6 1.2,-5.4 0,-2.8 -1.2,-5.3 -1.1,-2.6 -3,-4.1 -1.8,-1.6 -3.7,-1.6l-17.4,0l0,22.1z"
-        android:strokeColor="#00000000"
-        android:strokeLineCap="butt"
-        android:strokeLineJoin="miter"
-        android:strokeWidth="1" />
-    <path
-        android:fillColor="#000000"
-        android:pathData="m417.18,36q0,9.9 -4.4,18.2 -4.4,8.2 -12.2,13 -7.7,4.8 -17.4,4.8 -9.7,0 -17.5,-4.8 -7.7,-4.8 -12.1,-13 -4.3,-8.3 -4.3,-18.2 0,-9.9 4.3,-18.1 4.4,-8.3 12.1,-13.1 7.8,-4.8 17.5,-4.8 9.7,0 17.4,4.8 7.8,4.8 12.2,13.1 4.4,8.2 4.4,18.1zM404.18,36q0,-6.7 -2.7,-12.1 -2.7,-5.5 -7.5,-8.7 -4.8,-3.2 -10.8,-3.2 -6.1,0 -10.9,3.2 -4.7,3.1 -7.4,8.6 -2.6,5.5 -2.6,12.2 0,6.7 2.6,12.2 2.7,5.5 7.4,8.7 4.8,3.1 10.9,3.1 6,0 10.8,-3.2 4.8,-3.2 7.5,-8.6 2.7,-5.5 2.7,-12.2z"
-        android:strokeColor="#00000000"
-        android:strokeLineCap="butt"
-        android:strokeLineJoin="miter"
-        android:strokeWidth="1" />
-    <path
-        android:fillColor="#000000"
-        android:pathData="m506.87,0.7q2.4,0 4.4,1.9 2.1,1.8 2.1,4.6 0,0.9 -0.3,2l-19.7,58q-0.6,1.7 -2.1,2.7 -1.5,1 -3.3,1.1 -1.8,0 -3.4,-1 -1.6,-1 -2.5,-2.9l-14.2,-32.3 -14.3,32.3q-0.9,1.9 -2.5,2.9 -1.6,1 -3.4,1 -1.8,-0.1 -3.3,-1.1 -1.5,-1 -2.1,-2.7l-19.7,-58q-0.3,-1.1 -0.3,-2 0,-2.8 2,-4.6 2.1,-1.9 4.6,-1.9 2,0 3.6,1.1 1.6,1 2.2,2.8l14.9,45.2 13,-31.2q0.8,-1.8 2.3,-2.8 1.5,-1.1 3.4,-1 1.9,-0.1 3.3,1 1.5,1 2.3,2.8l12.3,30.9 14.8,-44.9q0.6,-1.8 2.2,-2.8 1.7,-1.1 3.7,-1.1z"
-        android:strokeColor="#00000000"
-        android:strokeLineCap="butt"
-        android:strokeLineJoin="miter"
-        android:strokeWidth="1" />
-    <path
-        android:fillColor="#000000"
-        android:pathData="m562.11,59.5q2.6,0 4.3,1.8 1.8,1.7 1.8,4 0,2.5 -1.8,4.1 -1.7,1.6 -4.3,1.6l-33.5,0q-2.6,0 -4.4,-1.7 -1.7,-1.8 -1.7,-4.4l0,-57.8q0,-2.6 1.7,-4.3 1.8,-1.8 4.4,-1.8l33.5,0q2.6,0 4.3,1.7 1.8,1.6 1.8,4.2 0,2.5 -1.7,4.1 -1.7,1.5 -4.4,1.5l-27.1,0l0,17l22.6,0q2.6,0 4.3,1.7 1.8,1.6 1.8,4.2 0,2.5 -1.7,4.1 -1.7,1.5 -4.4,1.5l-22.6,0l0,18.5z"
-        android:strokeColor="#00000000"
-        android:strokeLineCap="butt"
-        android:strokeLineJoin="miter"
-        android:strokeWidth="1" />
-    <path
-        android:fillColor="#000000"
-        android:pathData="m634.63,61.2q1.3,0.8 2,2.1 0.8,1.3 0.8,2.7 0,1.8 -1.2,3.3 -1.5,1.8 -4.6,1.8 -2.4,0 -4.4,-1.1 -7.2,-4.1 -7.2,-16.7 0,-3.6 -2.4,-5.7 -2.3,-2.1 -6.7,-2.1L592.23,45.5l0,19.4q0,2.7 -1.5,4.4 -1.4,1.7 -3.8,1.7 -2.9,0 -5.1,-1.7 -2.1,-1.8 -2.1,-4.4l0,-57.8q0,-2.6 1.7,-4.3 1.8,-1.8 4.4,-1.8l28.8,0q5.2,0 9.8,2.8 4.6,2.8 7.3,7.7 2.8,4.9 2.8,11 0,5 -2.7,9.8 -2.7,4.7 -7,7.5 6.3,4.4 6.9,11.8 0.3,1.6 0.3,3.1 0.4,3.1 0.8,4.5 0.4,1.3 1.8,2zM614.13,35.2q1.8,0 3.5,-1.7 1.7,-1.7 2.8,-4.5 1.1,-2.9 1.1,-6.2 0,-2.8 -1.1,-5.1 -1.1,-2.4 -2.8,-3.8 -1.7,-1.4 -3.5,-1.4l-21.9,0l0,22.7z"
-        android:strokeColor="#00000000"
-        android:strokeLineCap="butt"
-        android:strokeLineJoin="miter"
-        android:strokeWidth="1" />
-    <path
-        android:fillColor="#000000"
-        android:pathData="m688.08,59.5q2.6,0 4.3,1.8 1.8,1.7 1.8,4 0,2.5 -1.8,4.1 -1.7,1.6 -4.3,1.6l-33.5,0q-2.6,0 -4.4,-1.7 -1.7,-1.8 -1.7,-4.4l0,-57.8q0,-2.6 1.7,-4.3 1.8,-1.8 4.4,-1.8l33.5,0q2.6,0 4.3,1.7 1.8,1.6 1.8,4.2 0,2.5 -1.7,4.1 -1.7,1.5 -4.4,1.5l-27.1,0l0,17l22.6,0q2.6,0 4.3,1.7 1.8,1.6 1.8,4.2 0,2.5 -1.7,4.1 -1.7,1.5 -4.4,1.5l-22.6,0l0,18.5z"
-        android:strokeColor="#00000000"
-        android:strokeLineCap="butt"
-        android:strokeLineJoin="miter"
-        android:strokeWidth="1" />
-    <path
-        android:fillColor="#000000"
-        android:pathData="m735.71,1q9.4,0 16.1,4.7 6.8,4.6 10.3,12.6 3.6,7.9 3.6,17.7 0,9.8 -3.6,17.8 -3.5,7.9 -10.3,12.6 -6.7,4.6 -16.1,4.6l-23.9,0q-2.6,0 -4.4,-1.7 -1.7,-1.8 -1.7,-4.4l0,-57.8q0,-2.6 1.7,-4.3 1.8,-1.8 4.4,-1.8zM734.71,59.5q9,0 13.5,-6.6 4.5,-6.7 4.5,-16.9 0,-10.2 -4.6,-16.8 -4.5,-6.7 -13.4,-6.7l-16.5,0l0,47z"
-        android:strokeColor="#00000000"
-        android:strokeLineCap="butt"
-        android:strokeLineJoin="miter"
-        android:strokeWidth="1" />
-    <path
-        android:fillColor="#000000"
-        android:pathData="m847.12,32.2q5.3,2.1 8.6,6.4 3.4,4.3 3.4,11.1 0,11.9 -6.8,16.6 -6.8,4.7 -16.2,4.7l-24.9,0q-2.6,0 -4.4,-1.7 -1.7,-1.8 -1.7,-4.4l0,-57.8q0,-2.6 1.7,-4.3 1.8,-1.8 4.4,-1.8l25.2,0q19,0 19,17.8 0,4.5 -2.2,8 -2.1,3.4 -6.1,5.4zM842.42,21q0,-4.1 -2.1,-6.1 -2,-2.1 -5.7,-2.1l-16.5,0l0,15.6l16.8,0q3,0 5.2,-2 2.3,-2 2.3,-5.4zM836.12,59.5q4.7,0 7.3,-2.5 2.7,-2.5 2.7,-7.3 0,-5.9 -3.1,-7.7 -3.1,-1.8 -7.6,-1.8l-17.3,0l0,19.3z"
-        android:strokeColor="#00000000"
-        android:strokeLineCap="butt"
-        android:strokeLineJoin="miter"
-        android:strokeWidth="1" />
-    <path
-        android:fillColor="#000000"
-        android:pathData="m918.81,6.9q0,2 -1.1,3.7l-20.9,29.9l0,24.4q0,2.6 -1.7,4.4 -1.7,1.7 -4.1,1.7 -2.5,0 -4.3,-1.7 -1.7,-1.8 -1.7,-4.4l0,-25.8l-20.8,-27.6q-1.8,-2.4 -1.8,-4.7 0,-2.6 2,-4.3 2.1,-1.8 4.4,-1.8 2.8,0 4.9,2.8l17.6,24.3 16.5,-24.1q2.1,-3 5,-3 2.4,0 4.2,1.8 1.8,1.8 1.8,4.4z"
-        android:strokeColor="#00000000"
-        android:strokeLineCap="butt"
-        android:strokeLineJoin="miter"
-        android:strokeWidth="1" />
-    <path
-        android:fillColor="#000016"
-        android:pathData="m246.94,173.65 l-11.5,-6.03 10.02,-5.24c3.41,-1.78 3.42,-4.71 0.01,-6.5l-10.76,-5.65 10.76,-5.62c3.41,-1.79 3.42,-4.71 0.01,-6.5L159.4,92.94c-3.41,-1.79 -9,-1.81 -12.42,-0.04L2.56,167.49c-3.42,1.77 -3.42,4.65 0.01,6.41l11.02,5.66 -11.02,5.69c-3.42,1.77 -3.42,4.65 0.01,6.41l11.76,6.04 -10.29,5.31c-3.42,1.77 -3.42,4.65 0.01,6.41l88.01,45.22c3.43,1.76 9.02,1.74 12.43,-0.04l142.46,-74.47c3.41,-1.78 3.41,-4.71 0,-6.5zM153.91,115.02 L132.31,139.92c-1.08,1.25 -0.76,2.88 0.7,3.64l17.18,8.83c1.47,0.75 1.47,1.99 0,2.75l-53.92,27.85c-1.47,0.76 -1.78,0.36 -0.7,-0.89l21.59,-24.9c1.08,-1.25 0.77,-2.88 -0.7,-3.64l-17.18,-8.83c-1.47,-0.75 -1.47,-1.99 0,-2.75l53.92,-27.85c1.47,-0.76 1.78,-0.36 0.7,0.89z" />
-</vector>

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

@@ -12,6 +12,7 @@
         android:layout_marginStart="24dp"
         android:layout_marginTop="16dp"
         android:layout_marginBottom="16dp"
+        android:requiresFadingEdge="vertical"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toStartOf="@+id/welcomeTitle"
         app:layout_constraintHorizontal_bias="0.5"

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

@@ -4,7 +4,8 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     xmlns:tools="http://schemas.android.com/tools"
-    android:fillViewport="true">
+    android:fillViewport="true"
+    android:requiresFadingEdge="vertical">
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
@@ -30,13 +31,16 @@
             android:layout_marginStart="32dp"
             android:layout_marginEnd="32dp"
             android:layout_marginBottom="16dp"
+            android:layout_marginTop="32dp"
             android:gravity="center"
             android:text="@string/pref_data_source"
             android:textAppearance="@style/TextAppearance.Material3.HeadlineSmall"
             app:layout_constraintBottom_toTopOf="@+id/welcomeText2"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintHorizontal_bias="0.5"
-            app:layout_constraintStart_toStartOf="parent" />
+            app:layout_constraintVertical_bias="1.0"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
 
         <TextView
             android:id="@+id/welcomeText2"
@@ -61,7 +65,7 @@
             android:layout_height="wrap_content"
             android:layout_marginStart="32dp"
             android:layout_marginEnd="32dp"
-            android:layout_marginBottom="32dp"
+            android:layout_marginBottom="16dp"
             android:gravity="center"
             android:text="@string/data_sources_hint"
             android:textAppearance="@style/TextAppearance.Material3.BodySmall"

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

@@ -1,91 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:tools="http://schemas.android.com/tools"
+<com.google.android.material.card.MaterialCardView xmlns:tools="http://schemas.android.com/tools"
     xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
-
-    <data>
-
-        <import type="java.util.Map" />
-
-        <import type="com.github.erfansn.localeconfigx.LocaleConfigXKt" />
-
-        <import type="java.time.ZonedDateTime" />
-
-        <import type="net.vonforst.evmap.model.ChargeLocation" />
-
-        <import type="net.vonforst.evmap.model.Chargepoint" />
-
-        <import type="net.vonforst.evmap.model.ChargeCard" />
-
-        <import type="net.vonforst.evmap.api.availability.ChargeLocationStatus" />
-
-        <import type="net.vonforst.evmap.adapter.DataBindingAdaptersKt" />
-
-        <import type="net.vonforst.evmap.adapter.DetailsAdapterKt" />
-
-        <import type="net.vonforst.evmap.utils.LocationUtilsKt" />
-
-        <import type="net.vonforst.evmap.viewmodel.Resource" />
-
-        <import type="net.vonforst.evmap.viewmodel.Status" />
-
-        <import type="net.vonforst.evmap.ui.BindingAdaptersKt" />
-
-        <import type="net.vonforst.evmap.api.ChargepointApiKt" />
-
-        <import type="net.vonforst.evmap.api.chargeprice.ChargepriceApi" />
-
-        <import type="android.text.format.DateUtils" />
-
-        <import type="java.time.Instant" />
-
-        <import type="java.time.Duration" />
-
-        <import type="net.vonforst.evmap.api.fronyx.PredictionData" />
-
-        <variable
-            name="charger"
-            type="Resource&lt;ChargeLocation&gt;" />
-
-        <variable
-            name="distance"
-            type="Double" />
-
-        <variable
-            name="availability"
-            type="Resource&lt;ChargeLocationStatus&gt;" />
-
-        <variable
-            name="predictionData"
-            type="PredictionData" />
-
-        <variable
-            name="filteredAvailability"
-            type="Resource&lt;ChargeLocationStatus&gt;" />
-
-        <variable
-            name="teslaPricing"
-            type="net.vonforst.evmap.api.availability.tesla.Pricing" />
-
-        <variable
-            name="chargeCards"
-            type="java.util.Map&lt;Long, ChargeCard&gt;" />
-
-        <variable
-            name="filteredChargeCards"
-            type="java.util.Set&lt;Long&gt;" />
-
-        <variable
-            name="expanded"
-            type="Boolean" />
-
-        <variable
-            name="apiName"
-            type="String" />
-
-    </data>
-
-    <com.google.android.material.card.MaterialCardView
+    xmlns:app="http://schemas.android.com/apk/res-auto"
         style="?attr/materialCardViewElevatedStyle"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -107,8 +23,7 @@
                 android:layout_height="wrap_content"
                 android:ellipsize="end"
                 android:hyphenationFrequency="normal"
-                android:maxLines="@{expanded ? 3 : 1}"
-                android:text="@{charger.data.name}"
+                android:maxLines="1"
                 android:textAppearance="@style/TextAppearance.Material3.BodyLarge"
                 app:layout_constrainedWidth="true"
                 app:layout_constraintEnd_toStartOf="@+id/imgFaultReport"
@@ -119,15 +34,14 @@
                 tools:text="Parkhaus" />
 
             <TextView
-                android:id="@+id/textView2"
+                android:id="@+id/txtAddress"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:ellipsize="end"
                 android:maxLines="1"
                 android:textAlignment="viewStart"
-                android:text="@{charger.data != null ? (charger.data.address != null ? charger.data.address.toString() : LocationUtilsKt.formatDMS(charger.data.coordinates)) : null }"
                 android:textAppearance="@style/TextAppearance.Material3.BodySmall"
-                app:invisibleUnless="@{charger.data != null}"
+                android:visibility="invisible"
                 app:layout_constraintEnd_toStartOf="@+id/guideline2"
                 app:layout_constraintStart_toStartOf="@+id/guideline"
                 app:layout_constraintTop_toBottomOf="@+id/txtName"
@@ -142,7 +56,6 @@
                 android:textAlignment="viewEnd"
                 android:maxLines="1"
                 android:minWidth="50dp"
-                android:text="@{BindingAdaptersKt.distance(distance, context)}"
                 android:textAppearance="@style/TextAppearance.Material3.BodySmall"
                 app:layout_constraintBottom_toBottomOf="@+id/txtConnectors"
                 app:layout_constraintEnd_toStartOf="@+id/guideline2"
@@ -158,11 +71,9 @@
                 android:gravity="end"
                 android:maxLines="1"
                 android:padding="2dp"
-                android:text="@{String.format(LocaleConfigXKt.getCurrentOrDefaultLocale(context), &quot;%s/%d&quot;, BindingAdaptersKt.availabilityText(BindingAdaptersKt.flatten(filteredAvailability.data.status.values())), filteredAvailability.data.totalChargepoints)}"
                 android:textAppearance="@style/TextAppearance.Material3.BodySmall"
                 android:textColor="@android:color/white"
-                app:backgroundTintAvailability="@{BindingAdaptersKt.flatten(filteredAvailability.data.status.values())}"
-                app:invisibleUnless="@{filteredAvailability.data != null &amp;&amp; !expanded}"
+                android:visibility="invisible"
                 app:layout_constraintEnd_toStartOf="@+id/guideline2"
                 app:layout_constraintTop_toTopOf="@+id/txtName"
                 tools:backgroundTint="@color/available"
@@ -176,29 +87,27 @@
                 android:ellipsize="end"
                 android:maxLines="1"
                 android:textAlignment="viewStart"
-                android:text="@{charger.data.formatChargepoints(ChargepointApiKt.stringProvider(context), LocaleConfigXKt.getCurrentOrDefaultLocale(context))}"
                 android:textAppearance="@style/TextAppearance.Material3.BodySmall"
                 app:layout_constraintEnd_toStartOf="@+id/txtDistance"
                 app:layout_constraintStart_toStartOf="@+id/guideline"
-                app:layout_constraintTop_toBottomOf="@+id/textView2"
+                app:layout_constraintTop_toBottomOf="@+id/txtAddress"
                 tools:text="2x Typ 2 22 kW" />
 
             <androidx.recyclerview.widget.RecyclerView
                 android:id="@+id/connectors"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                app:data="@{DataBindingAdaptersKt.chargepointWithAvailability(charger.data.chargepointsMerged, availability.data.status)}"
+                android:visibility="gone"
                 app:layout_constraintEnd_toStartOf="@+id/guideline2"
                 app:layout_constraintStart_toStartOf="@+id/guideline"
-                app:layout_constraintTop_toBottomOf="@+id/textView7"
-                app:goneUnless="@{charger.data.chargepointsMerged.size() > 0}"
+                app:layout_constraintTop_toBottomOf="@+id/txtConnectorsHeading"
                 tools:itemCount="3"
                 tools:layoutManager="LinearLayoutManager"
                 tools:listitem="@layout/item_connector"
                 tools:orientation="horizontal" />
 
             <TextView
-                android:id="@+id/textView7"
+                android:id="@+id/txtConnectorsHeading"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="8dp"
@@ -207,69 +116,67 @@
                 android:textAppearance="@style/TextAppearance.Material3.TitleSmall"
                 android:textColor="?colorPrimary"
                 android:textAlignment="viewStart"
-                app:goneUnless="@{charger.data.chargepointsMerged.size() > 0}"
+                android:visibility="gone"
                 app:layout_constraintEnd_toStartOf="@+id/btnRefreshLiveData"
                 app:layout_constraintStart_toStartOf="@+id/guideline"
                 app:layout_constraintTop_toBottomOf="@+id/txtConnectors" />
 
             <TextView
-                android:id="@+id/textView12"
+                android:id="@+id/txtAmenitiesHeading"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="8dp"
                 android:text="@string/amenities"
                 android:textAppearance="@style/TextAppearance.Material3.TitleSmall"
                 android:textColor="?colorPrimary"
-                app:goneUnless="@{charger.data.amenities != null}"
+                android:visibility="gone"
                 app:layout_constraintEnd_toStartOf="@+id/guideline2"
                 app:layout_constraintHorizontal_bias="0.0"
                 app:layout_constraintStart_toStartOf="@+id/guideline"
                 app:layout_constraintTop_toBottomOf="@+id/details" />
 
             <TextView
-                android:id="@+id/textView11"
+                android:id="@+id/txtAmenities"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="2dp"
                 android:autoLink="web"
                 android:linksClickable="true"
-                android:text="@{charger.data.amenities}"
                 android:textAppearance="@style/TextAppearance.Material3.BodyMedium"
-                app:goneUnless="@{charger.data.amenities != null}"
+                android:visibility="gone"
                 app:layout_constraintEnd_toStartOf="@+id/guideline2"
                 app:layout_constraintHorizontal_bias="0.0"
                 app:layout_constraintStart_toStartOf="@+id/guideline"
-                app:layout_constraintTop_toBottomOf="@+id/textView12"
+                app:layout_constraintTop_toBottomOf="@+id/txtAmenitiesHeading"
                 tools:text="Toilet" />
 
             <TextView
-                android:id="@+id/textView10"
+                android:id="@+id/txtGeneralInformationHeading"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="8dp"
                 android:text="@string/general_info"
                 android:textAppearance="@style/TextAppearance.Material3.TitleSmall"
                 android:textColor="?colorPrimary"
-                app:goneUnless="@{charger.data.generalInformation != null}"
+                android:visibility="gone"
                 app:layout_constraintEnd_toStartOf="@+id/guideline2"
                 app:layout_constraintHorizontal_bias="0.0"
                 app:layout_constraintStart_toStartOf="@+id/guideline"
-                app:layout_constraintTop_toBottomOf="@+id/textView11" />
+                app:layout_constraintTop_toBottomOf="@+id/txtAmenities" />
 
             <TextView
-                android:id="@+id/textView4"
+                android:id="@+id/txtGeneralInformation"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="2dp"
                 android:autoLink="web"
                 android:linksClickable="true"
-                android:text="@{charger.data.generalInformation}"
                 android:textAppearance="@style/TextAppearance.Material3.BodyMedium"
-                app:goneUnless="@{charger.data.generalInformation != null}"
+                android:visibility="gone"
                 app:layout_constraintEnd_toStartOf="@+id/guideline2"
                 app:layout_constraintHorizontal_bias="0.0"
                 app:layout_constraintStart_toStartOf="@+id/guideline3"
-                app:layout_constraintTop_toBottomOf="@+id/textView10"
+                app:layout_constraintTop_toBottomOf="@+id/txtGeneralInformationHeading"
                 tools:text="Only for guests" />
 
             <androidx.constraintlayout.widget.Guideline
@@ -291,7 +198,6 @@
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:nestedScrollingEnabled="false"
-                app:data="@{DetailsAdapterKt.buildDetails(charger.data, chargeCards, filteredChargeCards, teslaPricing, context)}"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintHorizontal_bias="1.0"
                 app:layout_constraintStart_toStartOf="parent"
@@ -313,21 +219,21 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="16dp"
                 android:layout_marginBottom="16dp"
-                android:text="@{@string/source(apiName)}"
+                android:text=""
                 app:layout_constraintEnd_toStartOf="@+id/guideline2"
                 app:layout_constraintStart_toStartOf="@+id/guideline"
-                app:layout_constraintTop_toBottomOf="@+id/textView4"
+                app:layout_constraintTop_toBottomOf="@+id/txtGeneralInformation"
                 tools:text="Source: DataSource" />
 
             <TextView
-                android:id="@+id/textView13"
+                android:id="@+id/txtRealtimeDesc"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_marginEnd="8dp"
                 android:gravity="end"
-                android:text="@{availability.status == Status.SUCCESS ? @string/realtime_data_source(availability.data.source) : availability.status == Status.LOADING ? @string/realtime_data_loading : availability.message == &quot;not signed in&quot; ? @string/realtime_data_login_needed : @string/realtime_data_unavailable}"
+                android:text="@string/realtime_data_unavailable"
                 android:textAppearance="@style/TextAppearance.Material3.BodySmall"
-                app:goneUnless="@{charger.data.chargepointsMerged.size() > 0}"
+                android:visibility="gone"
                 app:layout_constraintEnd_toStartOf="@+id/btnLogin"
                 app:layout_constraintStart_toStartOf="@+id/guideline"
                 app:layout_constraintTop_toBottomOf="@+id/connectors"
@@ -350,7 +256,7 @@
                 android:layout_height="1dp"
                 android:layout_marginTop="8dp"
                 android:background="?android:attr/listDivider"
-                app:layout_constraintTop_toBottomOf="@+id/textView13" />
+                app:layout_constraintTop_toBottomOf="@+id/txtRealtimeDesc" />
 
             <View
                 android:id="@+id/divider3"
@@ -358,34 +264,33 @@
                 android:layout_height="1dp"
                 android:layout_marginTop="8dp"
                 android:background="?android:attr/listDivider"
-                app:goneUnless="@{charger.data != null &amp;&amp; (ChargepriceApi.isChargerSupported(charger.data) || charger.data.chargerUrl != null)}"
+                android:visibility="gone"
                 app:layout_constraintTop_toBottomOf="@+id/buttonsScroller" />
 
             <TextView
-                android:id="@+id/textView8"
+                android:id="@+id/txtPredictionHeading"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="8dp"
-                android:text="@{predictionData.isPercentage ? @string/average_utilization : @string/utilization_prediction}"
+                android:text="@string/utilization_prediction"
                 tools:text="@string/utilization_prediction"
                 android:textAppearance="@style/TextAppearance.Material3.TitleSmall"
                 android:textColor="?colorPrimary"
-                app:goneUnless="@{predictionData.predictionGraph != null}"
+                android:visibility="gone"
                 app:layout_constraintStart_toStartOf="@+id/guideline"
                 app:layout_constraintTop_toBottomOf="@+id/divider2" />
 
             <TextView
-                android:id="@+id/textView29"
+                android:id="@+id/txtPredictionDescription"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_marginStart="8dp"
                 android:layout_marginEnd="8dp"
-                android:text="@{predictionData.description}"
                 android:textAppearance="@style/TextAppearance.Material3.BodySmall"
-                app:goneUnless="@{predictionData.predictionGraph != null &amp;&amp; !predictionData.isPercentage}"
-                app:layout_constraintBaseline_toBaselineOf="@+id/textView8"
+                android:visibility="gone"
+                app:layout_constraintBaseline_toBaselineOf="@+id/txtPredictionHeading"
                 app:layout_constraintEnd_toStartOf="@+id/btnPredictionHelp"
-                app:layout_constraintStart_toEndOf="@+id/textView8"
+                app:layout_constraintStart_toEndOf="@+id/txtPredictionHeading"
                 tools:text="(DC plugs only)" />
 
             <Button
@@ -394,25 +299,22 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:contentDescription="@string/help"
-                app:goneUnless="@{predictionData.predictionGraph != null &amp;&amp; !predictionData.isPercentage}"
+                android:visibility="gone"
                 app:icon="@drawable/ic_help"
                 app:iconTint="?android:textColorSecondary"
-                app:layout_constraintBottom_toBottomOf="@+id/textView8"
+                app:layout_constraintBottom_toBottomOf="@+id/txtPredictionHeading"
                 app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintTop_toTopOf="@+id/textView8" />
+                app:layout_constraintTop_toTopOf="@+id/txtPredictionHeading" />
 
             <net.vonforst.evmap.ui.BarGraphView
                 android:id="@+id/prediction"
                 android:layout_width="0dp"
                 android:layout_height="100dp"
                 android:layout_marginTop="8dp"
-                app:data="@{predictionData.predictionGraph}"
-                app:goneUnless="@{predictionData.predictionGraph != null}"
+                android:visibility="gone"
                 app:layout_constraintEnd_toStartOf="@+id/guideline2"
                 app:layout_constraintStart_toStartOf="@+id/guideline"
-                app:layout_constraintTop_toBottomOf="@+id/textView8"
-                app:maxValue="@{predictionData.maxValue}"
-                app:isPercentage="@{predictionData.isPercentage}"
+                app:layout_constraintTop_toBottomOf="@+id/txtPredictionHeading"
                 tools:itemCount="3"
                 tools:layoutManager="LinearLayoutManager"
                 tools:listitem="@layout/item_connector"
@@ -426,7 +328,7 @@
                 android:adjustViewBounds="true"
                 android:background="?selectableItemBackgroundBorderless"
                 android:scaleType="fitCenter"
-                app:goneUnless="@{predictionData.predictionGraph != null &amp;&amp; !predictionData.isPercentage}"
+                android:visibility="gone"
                 app:layout_constraintEnd_toStartOf="@+id/guideline2"
                 app:layout_constraintTop_toBottomOf="@+id/prediction"
                 app:srcCompat="@drawable/ic_powered_by_fronyx"
@@ -438,7 +340,7 @@
                 android:layout_height="1dp"
                 android:layout_marginTop="8dp"
                 android:background="?android:attr/listDivider"
-                app:goneUnless="@{predictionData.predictionGraph != null}"
+                android:visibility="gone"
                 app:layout_constraintTop_toBottomOf="@+id/imgPredictionSource" />
 
             <ImageView
@@ -449,14 +351,13 @@
                 android:layout_marginTop="2dp"
                 android:layout_marginEnd="8dp"
                 android:contentDescription="@string/verified"
-                app:goneUnless="@{ charger.data.verified }"
+                android:visibility="gone"
                 app:layout_constraintEnd_toStartOf="@+id/txtAvailability"
                 app:layout_constraintHorizontal_bias="0.0"
                 app:layout_constraintStart_toEndOf="@+id/imgFaultReport"
                 app:layout_constraintTop_toTopOf="@+id/txtName"
                 app:srcCompat="@drawable/ic_verified"
                 app:tint="@color/available"
-                app:tooltipTextCompat="@{@string/verified_desc(apiName)}"
                 tools:targetApi="o" />
 
             <ImageView
@@ -466,12 +367,11 @@
                 android:layout_marginStart="8dp"
                 android:layout_marginTop="2dp"
                 android:contentDescription="@string/fault_report"
-                app:goneUnless="@{ charger.data.faultReport != null }"
+                android:visibility="gone"
                 app:layout_constraintEnd_toStartOf="@+id/imgVerified"
                 app:layout_constraintStart_toEndOf="@+id/txtName"
                 app:layout_constraintTop_toTopOf="@+id/txtName"
                 app:srcCompat="@drawable/ic_map_marker_fault"
-                app:tooltipTextCompat="@{@string/fault_report}"
                 tools:targetApi="o" />
 
             <TextView
@@ -480,11 +380,11 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="8dp"
                 android:breakStrategy="balanced"
-                android:text="@{@string/data_retrieved_at(DateUtils.getRelativeTimeSpanString(charger.data.timeRetrieved.toEpochMilli(), Instant.now().toEpochMilli(), 0))}"
+                android:text=""
                 android:textAlignment="center"
                 android:textAppearance="@style/TextAppearance.Material3.BodySmall"
                 android:textStyle="italic"
-                app:goneUnless="@{charger.data.timeRetrieved == null || Duration.between(charger.data.timeRetrieved, Instant.now()).compareTo(Duration.ofHours(1)) > 0}"
+                android:visibility="gone"
                 app:layout_constraintEnd_toStartOf="@+id/guideline2"
                 app:layout_constraintStart_toStartOf="@+id/guideline"
                 app:layout_constraintTop_toBottomOf="@+id/sourceButton"
@@ -496,11 +396,11 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="2dp"
                 android:breakStrategy="balanced"
-                android:text="@{charger.data.license}"
+                android:text=""
                 android:textAlignment="center"
                 android:textAppearance="@style/TextAppearance.Material3.BodySmall"
                 android:textStyle="italic"
-                app:goneUnless="@{charger.data.license != null}"
+                android:visibility="gone"
                 app:layout_constraintEnd_toStartOf="@+id/guideline2"
                 app:layout_constraintStart_toStartOf="@+id/guideline"
                 app:layout_constraintTop_toBottomOf="@+id/txtTimeRetrieved"
@@ -512,13 +412,12 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:contentDescription="@string/refresh_live_data"
-                android:enabled="@{availability.status != Status.LOADING}"
-                app:goneUnless="@{charger.data.chargepointsMerged.size() > 0}"
+                android:visibility="gone"
                 app:icon="@drawable/ic_refresh"
                 app:iconTint="?android:textColorSecondary"
-                app:layout_constraintBottom_toBottomOf="@+id/textView7"
+                app:layout_constraintBottom_toBottomOf="@+id/txtConnectorsHeading"
                 app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintTop_toTopOf="@+id/textView7" />
+                app:layout_constraintTop_toTopOf="@+id/txtConnectorsHeading" />
 
             <HorizontalScrollView
                 android:id="@+id/buttonsScroller"
@@ -530,7 +429,7 @@
                 app:layout_constraintTop_toBottomOf="@+id/divider1"
                 app:layout_constrainedWidth="true"
                 android:fillViewport="true"
-                app:goneUnless="@{charger.data != null &amp;&amp; (ChargepriceApi.isChargerSupported(charger.data) || charger.data.chargerUrl != null)}">
+                android:visibility="gone">
 
                 <LinearLayout
                     android:layout_width="wrap_content"
@@ -543,9 +442,7 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:text="@string/go_to_chargeprice"
-                        android:transitionName="@string/shared_element_chargeprice"
-                        app:goneUnless="@{charger.data != null &amp;&amp; ChargepriceApi.isChargerSupported(charger.data)}"
-                        app:icon="@drawable/ic_chargeprice" />
+                        android:visibility="gone" />
 
                     <Button
                         android:id="@+id/btnChargerWebsite"
@@ -554,7 +451,7 @@
                         android:layout_height="wrap_content"
                         android:layout_marginStart="8dp"
                         android:text="@string/charger_website"
-                        app:goneUnless="@{charger.data != null &amp;&amp; charger.data.chargerUrl != null}"
+                        android:visibility="gone"
                         app:icon="@drawable/ic_link" />
 
                 </LinearLayout>
@@ -566,10 +463,10 @@
                 android:layout_width="wrap_content"
                 android:layout_height="40dp"
                 android:text="@string/login"
-                app:goneUnless="@{availability.status == Status.ERROR &amp;&amp; availability.message == &quot;not signed in&quot;}"
-                app:layout_constraintBottom_toBottomOf="@+id/textView13"
+                android:visibility="gone"
+                app:layout_constraintBottom_toBottomOf="@+id/txtRealtimeDesc"
                 app:layout_constraintEnd_toStartOf="@+id/guideline2"
-                app:layout_constraintTop_toTopOf="@+id/textView13" />
+                app:layout_constraintTop_toTopOf="@+id/txtRealtimeDesc" />
             <com.google.android.material.card.MaterialCardView
                 style="?attr/materialCardViewElevatedStyle"
                 android:id="@+id/connector_details_card"
@@ -591,5 +488,4 @@
 
         </androidx.constraintlayout.widget.ConstraintLayout>
 
-    </com.google.android.material.card.MaterialCardView>
-</layout>
+</com.google.android.material.card.MaterialCardView>

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

@@ -1,116 +1,85 @@
 <?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout 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">
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:minHeight="?attr/listPreferredItemHeightSmall"
+    android:layout_marginStart="?attr/dialogPreferredPadding"
+    android:layout_marginEnd="?attr/dialogPreferredPadding">
 
-    <data>
+    <ImageView
+        android:id="@+id/imageView"
+        android:layout_width="48dp"
+        android:layout_height="48dp"
+        android:layout_marginTop="8dp"
+        android:layout_marginBottom="16dp"
+        android:tintMode="src_in"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintBottom_toTopOf="@+id/divider"
+        tools:srcCompat="@drawable/ic_connector_typ2"
+        tools:tint="@color/available" />
 
-        <import type="net.vonforst.evmap.adapter.ConnectorAdapter.ChargepointWithAvailability" />
-
-        <import type="com.github.erfansn.localeconfigx.LocaleConfigXKt" />
-
-        <import type="net.vonforst.evmap.ui.BindingAdaptersKt" />
-
-        <import type="net.vonforst.evmap.api.UtilsKt" />
-
-        <import type="net.vonforst.evmap.api.ChargepointApiKt" />
-
-        <variable
-            name="item"
-            type="ChargepointWithAvailability" />
-    </data>
-
-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:layout_width="match_parent"
+    <TextView
+        android:id="@+id/txtNumber"
+        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:minHeight="?attr/listPreferredItemHeightSmall"
-        android:layout_marginStart="?attr/dialogPreferredPadding"
-        android:layout_marginEnd="?attr/dialogPreferredPadding">
+        android:layout_marginStart="38dp"
+        android:layout_marginTop="38dp"
+        android:textAppearance="@style/TextAppearance.Material3.BodySmall"
+        app:layout_constraintStart_toStartOf="@+id/imageView"
+        app:layout_constraintTop_toTopOf="@+id/imageView"
+        tools:text="x99"
+        tools:visibility="gone" />
 
-        <ImageView
-            android:id="@+id/imageView"
-            android:layout_width="48dp"
-            android:layout_height="48dp"
-            android:layout_marginTop="8dp"
-            android:layout_marginBottom="16dp"
-            android:contentDescription="@{item.chargepoint.type}"
-            android:tintMode="src_in"
-            app:connectorIcon="@{item.chargepoint.type}"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
-            app:layout_constraintBottom_toTopOf="@+id/divider"
-            app:tintAvailability="@{item.status}"
-            tools:srcCompat="@drawable/ic_connector_typ2"
-            tools:tint="@color/available" />
+    <TextView
+        android:id="@+id/txtStatus"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="30dp"
+        android:layout_marginTop="30dp"
+        android:background="@drawable/rounded_rect"
+        android:padding="2dp"
+        android:textAppearance="@style/TextAppearance.Material3.BodySmall"
+        android:textColor="@android:color/white"
+        app:layout_constraintStart_toStartOf="@+id/imageView"
+        app:layout_constraintTop_toTopOf="@+id/imageView"
+        tools:backgroundTint="@color/available"
+        tools:text="80/99" />
 
-        <TextView
-            android:id="@+id/textView5"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="38dp"
-            android:layout_marginTop="38dp"
-            android:text="@{String.format(LocaleConfigXKt.getCurrentOrDefaultLocale(context), &quot;\u00D7 %d&quot;, item.chargepoint.count)}"
-            android:textAppearance="@style/TextAppearance.Material3.BodySmall"
-            app:goneUnless="@{item.status == null}"
-            app:layout_constraintStart_toStartOf="@+id/imageView"
-            app:layout_constraintTop_toTopOf="@+id/imageView"
-            tools:text="×99"
-            tools:visibility="gone" />
+    <TextView
+        android:id="@+id/txtTitle"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="36dp"
+        android:layout_marginTop="4dp"
+        android:textAppearance="@style/TextAppearance.Material3.BodyMedium"
+        app:layout_constraintBottom_toTopOf="@id/txtDetail"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toEndOf="@+id/imageView"
+        app:layout_constraintTop_toTopOf="@id/imageView"
+        tools:text="CCS - 350 kW" />
 
-        <TextView
-            android:id="@+id/textView7"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="30dp"
-            android:layout_marginTop="30dp"
-            android:background="@drawable/rounded_rect"
-            android:padding="2dp"
-            android:text="@{String.format(LocaleConfigXKt.getCurrentOrDefaultLocale(context), &quot;%s/%d&quot;, BindingAdaptersKt.availabilityText(item.status), item.chargepoint.count)}"
-            android:textAppearance="@style/TextAppearance.Material3.BodySmall"
-            android:textColor="@android:color/white"
-            app:backgroundTintAvailability="@{item.status}"
-            app:goneUnless="@{item.status != null}"
-            app:layout_constraintStart_toStartOf="@+id/imageView"
-            app:layout_constraintTop_toTopOf="@+id/imageView"
-            tools:backgroundTint="@color/available"
-            tools:text="80/99" />
+    <TextView
+        android:id="@+id/txtDetail"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="2dp"
+        android:textAppearance="@style/TextAppearance.Material3.BodySmall"
+        app:layout_constraintBottom_toBottomOf="@+id/imageView"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="@+id/txtTitle"
+        app:layout_constraintTop_toBottomOf="@id/txtTitle"
+        tools:text="1000 V - 500 A" />
 
-        <TextView
-            android:id="@+id/textView6"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="36dp"
-            android:layout_marginTop="4dp"
-            android:text="@{item != null ? UtilsKt.nameForPlugType(ChargepointApiKt.stringProvider(context), item.chargepoint.type) + (item.chargepoint.hasKnownPower() ? &quot; · &quot; + item.chargepoint.formatPower(LocaleConfigXKt.getCurrentOrDefaultLocale(context)) : &quot;&quot;) : null}"
-            android:textAppearance="@style/TextAppearance.Material3.BodyMedium"
-            app:layout_constraintBottom_toTopOf="@id/textView8"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toEndOf="@+id/imageView"
-            app:layout_constraintTop_toTopOf="@id/imageView"
-            tools:text="CCS · 350 kW" />
+    <View
+        android:id="@+id/divider"
+        android:layout_width="match_parent"
+        android:layout_height="1dp"
+        android:layout_marginBottom="4dp"
+        android:background="?android:attr/listDivider"
+        app:layout_constraintTop_toBottomOf="@+id/imageView"
+        app:layout_constraintBottom_toBottomOf="parent" />
 
-        <TextView
-            android:id="@+id/textView8"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="2dp"
-            android:text="@{item.chargepoint.formatVoltageAndCurrent()}"
-            android:textAppearance="@style/TextAppearance.Material3.BodySmall"
-            app:goneUnless="@{item.chargepoint.hasKnownVoltageAndCurrent()}"
-            app:layout_constraintBottom_toBottomOf="@+id/imageView"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="@+id/textView6"
-            app:layout_constraintTop_toBottomOf="@id/textView6"
-            tools:text="1000 V · 500 A" />
-
-        <View
-            android:id="@+id/divider"
-            android:layout_width="match_parent"
-            android:layout_height="1dp"
-            android:layout_marginBottom="4dp"
-            android:background="?android:attr/listDivider"
-            app:layout_constraintTop_toBottomOf="@+id/imageView"
-            app:layout_constraintBottom_toBottomOf="parent" />
-
-    </androidx.constraintlayout.widget.ConstraintLayout>
-</layout>
+</androidx.constraintlayout.widget.ConstraintLayout>

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

@@ -1,70 +1,50 @@
 <?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout 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">
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:minHeight="?attr/listPreferredItemHeightSmall"
+    android:layout_marginStart="?attr/dialogPreferredPadding"
+    android:layout_marginEnd="?attr/dialogPreferredPadding">
 
-    <data>
+    <ImageView
+        android:id="@+id/imageView"
+        android:layout_width="24dp"
+        android:layout_height="24dp"
+        android:scaleType="center"
+        android:tintMode="src_in"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:srcCompat="@drawable/circle"
+        tools:tint="@color/available" />
 
-        <import type="net.vonforst.evmap.adapter.ConnectorDetailsAdapter.ConnectorDetails" />
-
-        <import type="net.vonforst.evmap.ui.BindingAdaptersKt" />
-        <import type="java.time.Instant" />
-
-        <variable
-            name="item"
-            type="ConnectorDetails" />
-    </data>
-
-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:layout_width="match_parent"
+    <TextView
+        android:id="@+id/txtEvseid"
+        android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:minHeight="?attr/listPreferredItemHeightSmall"
-        android:layout_marginStart="?attr/dialogPreferredPadding"
-        android:layout_marginEnd="?attr/dialogPreferredPadding">
+        android:layout_marginStart="24dp"
+        android:layout_marginTop="8dp"
+        android:layout_marginEnd="16dp"
+        android:layout_marginBottom="14dp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toEndOf="@+id/imageView"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:text="SK*IOY*E222901" />
 
-        <ImageView
-            android:id="@+id/imageView"
-            android:layout_width="24dp"
-            android:layout_height="24dp"
-            android:contentDescription="@{BindingAdaptersKt.availabilityText(item.status, (Instant) null, context)}"
-            android:scaleType="center"
-            android:tintMode="src_in"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
-            app:tintAvailability="@{item.status}"
-            app:srcCompat="@drawable/circle"
-            tools:tint="@color/available" />
+    <TextView
+        android:id="@+id/txtStatus"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="2dp"
+        android:layout_marginEnd="16dp"
+        android:layout_marginBottom="8dp"
+        android:textAppearance="@style/TextAppearance.Material3.BodySmall"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="@+id/txtEvseid"
+        app:layout_constraintTop_toBottomOf="@+id/txtEvseid"
+        tools:text="Available" />
 
-        <TextView
-            android:id="@+id/txtEvseid"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="24dp"
-            android:layout_marginTop="8dp"
-            android:layout_marginEnd="16dp"
-            android:layout_marginBottom="14dp"
-            android:text="@{(item.label != null &amp;&amp; item.evseId != null) ? item.label + &quot; · &quot; + item.evseId : (item.label ?? item.evseId)}"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toEndOf="@+id/imageView"
-            app:layout_constraintTop_toTopOf="parent"
-            tools:text="SK*IOY*E222901" />
-
-        <TextView
-            android:id="@+id/txtStatus"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="2dp"
-            android:layout_marginEnd="16dp"
-            android:layout_marginBottom="8dp"
-            android:text="@{BindingAdaptersKt.availabilityText(item.status, item.lastChange, context)}"
-            android:textAppearance="@style/TextAppearance.Material3.BodySmall"
-            app:goneUnless="@{item.status != null}"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="@+id/txtEvseid"
-            app:layout_constraintTop_toBottomOf="@+id/txtEvseid"
-            tools:text="Available" />
-
-    </androidx.constraintlayout.widget.ConstraintLayout>
-</layout>
+</androidx.constraintlayout.widget.ConstraintLayout>

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

@@ -1,27 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools">
-
-    <data>
-
-        <import type="net.vonforst.evmap.fragment.MultiSelectItem" />
-
-        <variable
-            name="item"
-            type="MultiSelectItem" />
-    </data>
-
-    <CheckBox
-        android:id="@android:id/text1"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:minHeight="?attr/listPreferredItemHeightSmall"
-        android:layout_marginStart="?attr/dialogPreferredPadding"
-        android:layout_marginEnd="?attr/dialogPreferredPadding"
-        android:paddingStart="20dp"
-        android:ellipsize="marquee"
-        android:text="@{item.name}"
-        android:checked="@={item.selected}"
-        tools:text="Item"
-        tools:ignore="RtlSymmetry" />
-</layout>
+<CheckBox xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@android:id/text1"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:minHeight="?attr/listPreferredItemHeightSmall"
+    android:layout_marginStart="?attr/dialogPreferredPadding"
+    android:layout_marginEnd="?attr/dialogPreferredPadding"
+    android:paddingStart="20dp"
+    android:ellipsize="marquee"
+    tools:text="Item"
+    tools:ignore="RtlSymmetry" />

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

@@ -1,141 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:tools="http://schemas.android.com/tools"
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
-
-    <data>
-
-        <import type="net.vonforst.evmap.viewmodel.ChargepriceViewModel" />
-        <import type="net.vonforst.evmap.viewmodel.Status" />
-        <import type="net.vonforst.evmap.ui.BindingAdaptersKt" />
-
-        <variable
-            name="vm"
-            type="ChargepriceViewModel" />
-    </data>
-
-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:id="@+id/linearLayout5"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:orientation="vertical"
-        android:transitionName="@string/shared_element_chargeprice">
-
-        <com.google.android.material.appbar.AppBarLayout
-            android:id="@+id/toolbar_container"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:fitsSystemWindows="true"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
-            app:liftOnScroll="true">
-
-            <com.google.android.material.appbar.MaterialToolbar
-                android:id="@+id/toolbar"
-                android:layout_width="match_parent"
-                android:layout_height="?android:actionBarSize">
-
-                <ImageView
-                    android:id="@+id/imgChargepriceLogo"
-                    android:layout_width="wrap_content"
-                    android:layout_height="match_parent"
-                    android:background="?selectableItemBackgroundBorderless"
-                    android:clickable="true"
-                    android:contentDescription="@string/powered_by_chargeprice"
-                    android:focusable="true"
-                    android:paddingStart="8dp"
-                    android:paddingEnd="8dp"
-                    android:layout_gravity="right"
-                    app:srcCompat="@drawable/ic_powered_by_chargeprice"
-                    app:tint="?android:textColorPrimary"
-                    tools:ignore="RtlSymmetry" />
-            </com.google.android.material.appbar.MaterialToolbar>
-
-        </com.google.android.material.appbar.AppBarLayout>
-
-        <androidx.recyclerview.widget.RecyclerView
-            android:id="@+id/charge_prices_list"
-            android:layout_width="0dp"
-            android:layout_height="0dp"
-            android:clipToPadding="false"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/toolbar_container"
-            tools:itemCount="1"
-            tools:listitem="@layout/fragment_chargeprice_preview" />
-
-        <ProgressBar
-            android:id="@+id/progressBar5"
-            style="?android:attr/progressBarStyle"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="280dp"
-            app:goneUnless="@{vm.chargePricesForChargepoint.status == Status.LOADING || vm.vehicles.status == Status.LOADING}"
-            app:layout_constraintBottom_toBottomOf="@+id/charge_prices_list"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="@+id/charge_prices_list"
-            app:layout_constraintTop_toTopOf="@+id/charge_prices_list" />
-
-        <TextView
-            android:id="@+id/textView8"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="16dp"
-            android:layout_marginEnd="16dp"
-            android:layout_marginTop="280dp"
-            android:gravity="center_horizontal"
-            android:text="@string/chargeprice_no_tariffs_found"
-            app:goneUnless="@{vm.chargePricesForChargepoint.status == Status.SUCCESS &amp;&amp; vm.chargePricesForChargepoint.data.size() == 0}"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="@+id/charge_prices_list"
-            app:layout_constraintTop_toTopOf="@+id/charge_prices_list" />
-
-        <TextView
-            android:id="@+id/textView9"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="16dp"
-            android:layout_marginEnd="16dp"
-            android:layout_marginTop="280dp"
-            android:gravity="center_horizontal"
-            android:text="@string/chargeprice_no_compatible_connectors"
-            app:goneUnless="@{vm.noCompatibleConnectors}"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="@+id/charge_prices_list"
-            app:layout_constraintTop_toTopOf="@+id/charge_prices_list" />
-
-        <TextView
-            android:id="@+id/textView3"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="16dp"
-            android:layout_marginTop="280dp"
-            android:layout_marginEnd="16dp"
-            android:gravity="center_horizontal"
-            android:text="@string/chargeprice_select_car_first"
-            app:goneUnless="@{vm.vehicles.status == Status.SUCCESS &amp;&amp; vm.vehicles.data.size() == 0}"
-            app:layout_constraintBottom_toTopOf="@+id/btnSettings"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="@+id/charge_prices_list"
-            app:layout_constraintTop_toTopOf="@+id/charge_prices_list"
-            app:layout_constraintVertical_chainStyle="packed" />
-
-        <Button
-            android:id="@+id/btnSettings"
-            style="@style/Widget.Material3.Button.TonalButton"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="16dp"
-            android:text="@string/settings"
-            app:goneUnless="@{vm.vehicles.status == Status.SUCCESS &amp;&amp; vm.vehicles.data.size() == 0}"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/textView3" />
-
-    </androidx.constraintlayout.widget.ConstraintLayout>
-</layout>

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

@@ -1,122 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools">
-
-    <data>
-
-        <import type="net.vonforst.evmap.viewmodel.ChargepriceViewModel" />
-
-        <import type="net.vonforst.evmap.viewmodel.Status" />
-
-        <import type="net.vonforst.evmap.ui.BindingAdaptersKt" />
-
-        <variable
-            name="vm"
-            type="ChargepriceViewModel" />
-    </data>
-
-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginBottom="16dp">
-
-        <TextView
-            android:id="@+id/textView"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="16dp"
-            android:layout_marginTop="8dp"
-            android:text="@string/chargeprice_select_connector"
-            android:textAppearance="@style/TextAppearance.Material3.TitleSmall"
-            android:textColor="?colorPrimary"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/vehicle_selection" />
-
-        <androidx.recyclerview.widget.RecyclerView
-            android:id="@+id/connectors_list"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="8dp"
-            app:data="@{vm.charger.chargepointsMerged}"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/textView"
-            tools:itemCount="3"
-            tools:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
-            tools:listitem="@layout/item_connector_button"
-            tools:orientation="horizontal" />
-
-        <TextView
-            android:id="@+id/tvChargeFromTo"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="16dp"
-            android:layout_marginTop="8dp"
-            android:clickable="true"
-            android:focusable="true"
-            android:background="?selectableItemBackground"
-            android:text="@{String.format(@string/chargeprice_battery_range, vm.batteryRange[0], vm.batteryRange[1])}"
-            android:textAppearance="@style/TextAppearance.Material3.TitleSmall"
-            android:textColor="?colorPrimary"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/connectors_list"
-            tools:text="Charge from 20% to 80%" />
-
-
-        <TextView
-            android:id="@+id/textView4"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@{@string/chargeprice_stats(vm.chargepriceMetaForChargepoint.data.energy, BindingAdaptersKt.time((int) Math.round(vm.chargepriceMetaForChargepoint.data.duration)), vm.chargepriceMetaForChargepoint.data.energy / vm.chargepriceMetaForChargepoint.data.duration * 60)}"
-            android:textAppearance="@style/TextAppearance.Material3.BodySmall"
-            app:invisibleUnlessAnimated="@{!vm.batteryRangeSliderDragging &amp;&amp; vm.chargepriceMetaForChargepoint.status == Status.SUCCESS}"
-            app:layout_constraintStart_toStartOf="@+id/tvChargeFromTo"
-            app:layout_constraintTop_toBottomOf="@+id/tvChargeFromTo"
-            tools:text="(18 kWh, approx. 23 min, ⌀ 50 kW)" />
-
-        <TextView
-            android:id="@+id/tvVehicleHeader"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="16dp"
-            android:layout_marginTop="8dp"
-            android:text="@string/chargeprice_vehicle"
-            android:textAppearance="@style/TextAppearance.Material3.TitleSmall"
-            android:textColor="?colorPrimary"
-            app:goneUnless="@{vm.vehicles.data != null &amp;&amp; vm.vehicles.data.size() > 1}"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
-
-        <androidx.recyclerview.widget.RecyclerView
-            android:id="@+id/vehicle_selection"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="16dp"
-            android:layout_marginEnd="16dp"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintHorizontal_bias="0.0"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/tvVehicleHeader"
-            app:data="@{vm.vehicles.data}"
-            app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
-            app:goneUnless="@{vm.vehicles.data != null &amp;&amp; vm.vehicles.data.size() > 1}"
-            android:orientation="horizontal"
-            tools:listitem="@layout/item_chargeprice_vehicle_chip" />
-
-        <com.google.android.material.slider.RangeSlider
-            android:id="@+id/battery_range"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="16dp"
-            android:layout_marginEnd="16dp"
-            android:valueFrom="0.0"
-            android:valueTo="100.0"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintHorizontal_bias="0.0"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/textView4"
-            app:values="@={vm.batteryRange}" />
-
-    </androidx.constraintlayout.widget.ConstraintLayout>
-</layout>

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

@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <include layout="@layout/fragment_chargeprice_header" />
-
-    <include layout="@layout/item_chargeprice" />
-
-    <include layout="@layout/item_chargeprice" />
-
-    <include layout="@layout/item_chargeprice" />
-
-    <include layout="@layout/item_chargeprice" />
-
-    <include layout="@layout/item_chargeprice" />
-</LinearLayout>

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

@@ -1,20 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
-
-    <data>
-
-        <import type="net.vonforst.evmap.viewmodel.FavoritesViewModel" />
-
-        <variable
-            name="vm"
-            type="FavoritesViewModel" />
-    </data>
-
-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:id="@+id/linearLayout"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/linearLayout"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
 
         <com.google.android.material.appbar.AppBarLayout
             android:id="@+id/toolbar_container"
@@ -46,45 +35,40 @@
                 android:id="@+id/favs_list"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                android:clipToPadding="false"
-                app:data="@{vm.listData}" />
+                android:clipToPadding="false" />
         </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
 
-        <com.airbnb.lottie.LottieAnimationView
-            android:id="@+id/animation_view"
-            android:layout_width="200dp"
-            android:layout_height="200dp"
-            android:layout_marginStart="16dp"
-            android:layout_marginEnd="16dp"
-            android:layout_marginBottom="8dp"
-            app:goneUnless="@{vm.listData.size() == 0}"
-            app:layout_constraintBottom_toTopOf="@+id/textView19"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintHorizontal_bias="0.497"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/toolbar_container"
-            app:layout_constraintVertical_chainStyle="packed"
-            app:lottie_autoPlay="true"
-            app:lottie_loop="true"
-            app:lottie_rawRes="@raw/ev_anim" />
+    <com.airbnb.lottie.LottieAnimationView
+        android:id="@+id/animation_view"
+        android:layout_width="200dp"
+        android:layout_height="200dp"
+        android:layout_marginStart="16dp"
+        android:layout_marginEnd="16dp"
+        android:layout_marginBottom="8dp"
+        app:layout_constraintBottom_toTopOf="@+id/txtEmptyState"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.497"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/toolbar_container"
+        app:layout_constraintVertical_chainStyle="packed"
+        app:lottie_autoPlay="true"
+        app:lottie_loop="true"
+        app:lottie_rawRes="@raw/ev_anim" />
 
-        <TextView
-            android:id="@+id/textView19"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="16dp"
-            android:layout_marginEnd="16dp"
-            android:breakStrategy="balanced"
-            android:gravity="center_horizontal"
-            android:text="@string/favorites_empty_state"
-            android:textAppearance="@style/TextAppearance.Material3.BodyLarge"
-            android:textColor="?android:textColorSecondary"
-            app:goneUnless="@{vm.listData.size() == 0}"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/animation_view" />
+    <TextView
+        android:id="@+id/txtEmptyState"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="16dp"
+        android:layout_marginEnd="16dp"
+        android:breakStrategy="balanced"
+        android:gravity="center_horizontal"
+        android:text="@string/favorites_empty_state"
+        android:textAppearance="@style/TextAppearance.Material3.BodyLarge"
+        android:textColor="?android:textColorSecondary"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/animation_view" />
 
-
-    </androidx.constraintlayout.widget.ConstraintLayout>
-</layout>
+</androidx.constraintlayout.widget.ConstraintLayout>