[fdroid] Release version 2025.12.11-2

Signed-off-by: Konstantin Pastbin <konstantin.pastbin@gmail.com>
2026-01-08 21:37:58 +00:00 · 2025-12-11 13:19:40 +07:00
479 changed files with 7906 additions and 15064 deletions
--- a/.forgejo/CODEOWNERS
+++ b/.forgejo/CODEOWNERS
@@ -1,55 +1,69 @@
+# All non-assigned.
+* @organicmaps/mergers
 # Visual design.
-/android/app/src/main/res/drawable*/ @comaps/design
-/android/app/src/main/res/font/ @comaps/design
-/android/app/src/main/res/mipmap*/ @comaps/design
-/data/*.ttf @comaps/design
-/data/resources-svg/ @comaps/design
-/data/search-icons/ @comaps/design
-/iphone/Maps/Images.xcassets/ @comaps/design
+/android/app/src/main/res/drawable*/ @organicmaps/design
+/android/app/src/main/res/font/ @organicmaps/design
+/android/app/src/main/res/mipmap*/ @organicmaps/design
+/data/*.ttf @organicmaps/design
+/data/resources-svg/ @organicmaps/design
+/data/search-icons/ @organicmaps/design
+/iphone/Maps/Images.xcassets/ @organicmaps/design
 # Android.
-/android/ @comaps/android
-/android/app/src/main/java/app/comaps/car/ @comaps/android-auto
-/docs/ANDROID_LOCATION_TEST.md @comaps/android
-/docs/JAVA_STYLE.md @comaps/android
+/android/ @organicmaps/android
+/android/app/src/main/java/app/organicmaps/car/ @organicmaps/android-auto
+/docs/ANDROID_LOCATION_TEST.md @organicmaps/android
+/docs/JAVA_STYLE.md @organicmaps/android
 # no owner for translation changes
 /android/app/src/main/res/values*/strings.xml
 # iOS.
-/iphone/ @comaps/ios
-/xcode/ @comaps/ios
-/docs/OBJC_STYLE.md @comaps/ios
+/iphone/ @organicmaps/ios
+/xcode/ @organicmaps/ios
+/docs/OBJC_STYLE.md @organicmaps/ios
 # no owner for translation changes
 /iphone/plist.txt
 /iphone/Maps/LocalizedStrings/
+# Qt
+/qt/ @organicmaps/qt
+# Rendering
+/drape/ @organicmaps/rendering
+/drape_frontend/ @organicmaps/rendering
+# Map Data.
+/tools/python/maps_generator/ @organicmaps/data
+/generator/ @organicmaps/data
+/topography_generator/ @organicmaps/data
+/data/borders/ @organicmaps/data
+/data/conf/isolines/ @organicmaps/data
+/docs/SUBWAY_GENERATION.md @organicmaps/data
+/docs/MAPS.md @organicmaps/data
+/docs/EXPERIMENTAL_PUBLIC_TRANSPORT_SUPPORT.md @organicmaps/data
 # no owner (changed often to add a new POI)
 /generator/generator_tests/osm_type_test.cpp
 # Map Styles.
-/data/styles/ @comaps/styles
-/data/types.txt @comaps/styles
-/data/visibility.txt @comaps/styles
-/data/mapcss-mapping.csv @comaps/styles
-/data/replaced_tags.txt @comaps/styles
-/data/classificator.txt @comaps/styles
-/data/drules_* @comaps/styles
+/data/styles/ @organicmaps/styles
+/data/types.txt @organicmaps/styles
+/data/visibility.txt @organicmaps/styles
+/data/mapcss-mapping.csv @organicmaps/styles
+/data/replaced_tags.txt @organicmaps/styles
+/data/classificator.txt @organicmaps/styles
+/data/drules_* @organicmaps/styles
 /docs/STYLES.md
-/tools/kothic/ @comaps/styles
+/tools/kothic/ @organicmaps/styles
 # DevOps.
-/.forgejo/workflows @comaps/devops
-/android/*gradle* @comaps/devops
-/docs/RELEASE_MANAGEMENT.md @comaps/devops
-/xcode/fastlane/ @comaps/devops
-/tools/python/maps_generator/ @comaps/devops
-/generator/ @comaps/devops
-/topography_generator/ @comaps/devops
-/data/borders/ @comaps/devops
-/data/conf/isolines/ @comaps/devops
-/docs/SUBWAY_GENERATION.md @comaps/devops
-/docs/MAPS.md @comaps/devops
-/docs/EXPERIMENTAL_PUBLIC_TRANSPORT_SUPPORT.md @comaps/devops
+/.forgejo/workflows @organicmaps/devops
+/android/*gradle* @organicmaps/devops
+/docs/RELEASE_MANAGEMENT.md @organicmaps/devops
+/xcode/fastlane/ @organicmaps/devops
+# Growth.
+README.md @organicmaps/growth
+/.forgejo/FUNDING.yml @organicmaps/growth
+/android/app/src/fdroid/play/ @organicmaps/growth
+/android/app/src/google/play/ @organicmaps/growth
+/iphone/metadata/ @organicmaps/growth
 # Legal.
-LEGAL @comaps/admins
-LICENSE @comaps/admins
-NOTICE @comaps/admins
-CONTRIBUTORS @comaps/admins
-/docs/CODE_OF_CONDUCT.md @comaps/admins
-/docs/DCO.md @comaps/admins
-/docs/GOVERNANCE.md @comaps/admins
+LEGAL @organicmaps/legal
+LICENSE @organicmaps/legal
+NOTICE @organicmaps/legal
+CONTRIBUTORS @organicmaps/legal
+/docs/CODE_OF_CONDUCT.md @organicmaps/legal
+/docs/DCO.md @organicmaps/legal
+/docs/GOVERNANCE.md @organicmaps/legal
--- a/.forgejo/FUNDING.yml
+++ b/.forgejo/FUNDING.yml
@@ -1,3 +1 @@
 open_collective: comaps
-liberapay: comaps
-custom: ["https://comaps.app/donate/"]
--- a/.forgejo/workflows/process_subways.yml
+++ b/.forgejo/workflows/process_subways.yml
@@ -1,129 +0,0 @@
-name: process_subways
-on:
-  workflow_dispatch: # Manual trigger
-
-env:
-  PLANET: /home/planet/planet/planet.o5m
-  TMPDIR: /tmp
-  HTML_DIR: "/mnt/4tbexternal/osm-planet/subway/validator"
-  DUMP: "$HTML_DIR"
-  SKIP_PLANET_UPDATE: "1"
-  DEBIAN_FRONTEND: nonnteractive
-  TZ: Etc/UTC
-
-# /var/www/html/subways is mapped as a volume on cdn-fi-1
-# as is /tmp/planet
-jobs:
-  clone-repos:
-    name: Clone Git Repos
-    runs-on: mapfilemaker
-    container:
-      image: codeberg.org/comaps/maps_generator:f6d53d54f794
-      volumes:
-        - /mnt/4tbexternal:/mnt/4tbexternal
-    concurrency:
-      group: ${{ github.workflow }}-process-subways-${{ github.event.pull_request.number || github.ref }}
-      cancel-in-progress: true
-    steps:
-      - uses: actions/cache@v4
-        with:
-          path: "~"
-          key: cache-${{ github.run_id }}-${{ github.run_attempt }}
-      - name: Checkout subways repo
-        shell: bash
-        run: |
-          cd ~
-          git clone --depth 1 --single-branch https://codeberg.org/comaps/subways.git
-
-  update-planet-o5m:
-    name: Update O5M Planet
-    runs-on: mapfilemaker
-    container:
-      image: codeberg.org/comaps/maps_generator:f6d53d54f794
-      volumes:
-        - /mnt/4tbexternal/:/mnt/4tbexternal/
-        - /mnt/4tbexternal/osm-planet:/home/planet
-    concurrency:
-      group: ${{ github.workflow }}-process-subways-${{ github.event.pull_request.number || github.ref }}
-      cancel-in-progress: true
-    steps:
-      - name: Check for O5M Planet File
-        shell: bash
-        run: |
-          if [ ! -f /home/planet/planet/planet.o5m ]; then
-          echo "WARN: No file at /home/planet/planet/planet.o5m"
-
-          if [ ! -f /home/planet/planet/planet-latest.osm.pbf ]; then
-          echo "ERROR: No file at /home/planet/planet/planet-latest.osm.pbf"
-          ls -al /home/planet/
-          ls -al /home/planet/planet/
-          exit 1
-          fi
-
-          echo "Converting planet-latest.osm.pbf to planet.o5m"
-          cd /home/planet/planet/
-          osmconvert -v --drop-author --drop-version --hash-memory=4000 planet-latest.osm.pbf -o=planet.o5m
-          echo "Conversion is done."
-          fi
-      - name: Update O5M planet
-        run: |
-          echo "Starting..."
-          cd /home/planet/planet/
-          rm -f planet-new.o5m
-          osmupdate -v --drop-author --drop-version --hash-memory=4000  --max-merge=32 --out-o5m planet.o5m planet-new.o5m
-          mv planet-new.o5m planet.o5m
-          echo "Done."
-      - name: Notify Zulip
-        run: |
-          curl -X POST https://comaps.zulipchat.com/api/v1/messages \
-            -u $ZULIP_BOT_EMAIL:$ZULIP_API_KEY \
-            --data-urlencode type=stream \
-            --data-urlencode 'to="DevOps"' \
-            --data-urlencode topic=codeberg-bot \
-            --data-urlencode 'content=O5M planet update is done!'
-
-  update-subways:
-    if: inputs.run-subways
-    name: Update Subways
-    runs-on: mapfilemaker
-    needs:
-      - clone-repos
-    container:
-      image: codeberg.org/comaps/maps_generator:f6d53d54f794
-      volumes:
-        - /mnt/4tbexternal/:/mnt/4tbexternal/
-        - /mnt/4tbexternal/osm-planet:/home/planet
-    concurrency:
-      group: ${{ github.workflow }}-map-generator-${{ github.event.pull_request.number || github.ref }}
-      cancel-in-progress: true
-    steps:
-      - uses: actions/cache@v4
-        with:
-          path: "~"
-          key: cache-${{ github.run_id }}-${{ github.run_attempt }}
-      - name: Update Subways
-        shell: bash
-        run: |
-          cd ~/comaps/
-          cp tools/unix/maps/settings.sh.prod tools/unix/maps/settings.sh
-          ./tools/unix/maps/generate_subways.sh
-      - name: Compare with VK validation
-        shell: bash
-        run: |
-          cd ~/subways
-          if [ -f "$HTML_DIR/index.html" ]; then
-            echo "Comparing local validation with VK's validation..."
-            python3 ./scripts/compare_html_validation.py "$HTML_DIR/index.html" \
-              --vk-url "https://maps.vk.com/osm/tools/subways/latest/index.html"
-          else
-            echo "Local index.html not found at $HTML_DIR/index.html"
-            exit 1
-          fi
-      - name: Notify Zulip
-        run: |
-          curl -X POST https://comaps.zulipchat.com/api/v1/messages \
-            -u $ZULIP_BOT_EMAIL:$ZULIP_API_KEY \
-            --data-urlencode type=stream \
-            --data-urlencode 'to="DevOps"' \
-            --data-urlencode topic=codeberg-bot \
-            --data-urlencode 'content=Subways are done!'
--- a/.github/FUNDING.yml
+++ b/.github/FUNDING.yml
@@ -1,3 +0,0 @@
-open_collective: comaps
-liberapay: comaps
-custom: ["https://comaps.app/donate/"]
--- a/.github/workflows/android-check.yaml
+++ b/.github/workflows/android-check.yaml
@@ -15,7 +15,7 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - name: Checkout sources
-        uses: actions/checkout@v6
+        uses: actions/checkout@v4
        with:
          fetch-depth: 1

@@ -78,7 +78,7 @@ jobs:
          pip install "protobuf<3.21" --break-system-packages

      - name: Checkout sources
-        uses: actions/checkout@v6
+        uses: actions/checkout@v4
        with:
          fetch-depth: 200 # enough to get all commits for the current day

@@ -103,7 +103,7 @@ jobs:
          ./gradlew -P${{ matrix.arch }} assemble${{ matrix.flavor }}

      - name: Upload ${{ matrix.flavor }} apk
-        uses: actions/upload-artifact@v6
+        uses: actions/upload-artifact@v4
        with:
          name: android-${{ matrix.flavor }}
          path: android/app/build/outputs/apk/**/CoMaps-*.apk
--- a/.github/workflows/ios-check.yaml
+++ b/.github/workflows/ios-check.yaml
@@ -35,7 +35,7 @@ jobs:
          xcodebuild -downloadPlatform iOS

      - name: Checkout sources
-        uses: actions/checkout@v6
+        uses: actions/checkout@v4

      - name: Parallel submodules checkout
        shell: bash
--- a/.gitignore
+++ b/.gitignore
@@ -155,8 +155,6 @@ android/huawei-appgallery.json
 android/res/xml/network_security_config.xml
 ./server/
 iphone/Maps/app.omaps/
-# Generated file
-libs/indexer/localized_types_map.cpp

 *.li

--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -116,6 +116,20 @@ endif()

 message(STATUS "Build type: " ${CMAKE_BUILD_TYPE})

+if (PLATFORM_LINUX OR PLATFORM_ANDROID)
+  find_program(LLD_FOUND ld.lld)
+  if (LLD_FOUND)
+    message(STATUS "Using ld.lld linker")
+    set(CMAKE_EXE_LINKER_FLAGS "-fuse-ld=lld")
+  else()
+    find_program(GOLD_FOUND ld.gold)
+    if (GOLD_FOUND)
+      message(STATUS "Using ld.gold")
+      set(CMAKE_EXE_LINKER_FLAGS "-fuse-ld=gold")
+    endif()
+  endif()
+endif()
+
 if (NOT SKIP_TESTS)
  enable_testing()
  # Enables ctest -T memcheck with valgrind
--- a/1
+++ b/1
@@ -10,7 +10,6 @@ CoMaps contributors:
 Bastian Greshake Tzovaras
 clover sage
 Harry Bond <me@hbond.xyz>
-NoelClick
 thesupertechie
 vikiawv
 Yannik Bloscheck
--- a/2
+++ b/2
@@ -1,6 +1,6 @@
 Copyright 2020 My.com B.V. (Mail.Ru Group)
 Copyright 2025 Organic Maps Contributors
-Copyright 2026 CoMaps Contributors
+Copyright 2025 CoMaps Contributors

 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
--- a/SECURITY.md
+++ b/SECURITY.md
@@ -1,17 +0,0 @@
-## Reporting Vulnerabilities
-You can report a security vulnerability by creating an issue or send mail to security@comaps.app
-
-## Verifying Fingerprints
-
-To [verify](https://developer.android.com/studio/command-line/apksigner#usage-verify) the APK, use the following signing certificate fingerprints:
-```
-SHA-256: 4894e8e6963627ef660031d8593fe77297f835acb4e23810003e926135023b4c
-SHA-1: 8b7b5739f917e9f7c681671ced0c9c8562123ade
-MD5: 9cce0ffea281dc2f0e0a154d6d2e281e
-```
-
-To verify CoMaps via [AppVerifier](https://github.com/soupslurpr/AppVerifier), use the following signing certificate fingerprint:
-```
-app.comaps
-48:94:E8:E6:96:36:27:EF:66:00:31:D8:59:3F:E7:72:97:F8:35:AC:B4:E2:38:10:00:3E:92:61:35:02:3B:4C
-```
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -254,7 +254,6 @@ android {
  androidResources {
    ignoreAssetsPattern = '!.svn:!.git:!.DS_Store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~'
    noCompress = ['txt', 'bin', 'html', 'png', 'json', 'mwm', 'ttf', 'sdf', 'ui', 'config', 'csv', 'spv', 'obj']
-    // Some languages not supported by Android require to be specified here to be applied
    localeFilters += [
            "af",
            "ar",
@@ -282,7 +281,6 @@ android {
            "in",
            "it",
            "ja",
-            "kw",
            "ko",
            "lt",
            "lv",
@@ -353,8 +351,6 @@ dependencies {
  implementation libs.androidx.recyclerview
  implementation libs.androidx.work.runtime
  implementation libs.androidx.lifecycle.process
-  implementation libs.androidx.documentfile
-  // 1.13 Material library version doesn't render properly alpha properties on map buttons
  implementation libs.android.material
  // Fix for app/organicmaps/util/FileUploadWorker.java:14: error: cannot access ListenableFuture
  // https://github.com/organicmaps/organicmaps/issues/6106
--- a/android/app/src/fdroid/play/listings/de-DE/full-description.txt
+++ b/android/app/src/fdroid/play/listings/de-DE/full-description.txt
@@ -1,6 +1,6 @@
 Eine von der Community betriebene, kostenlose Open-Source Karten-App, die auf OpenStreetMap Daten basiert. Transparent und nicht gewinnorientiert. CoMaps ist ein Fork/Abspaltung von Organic Maps, die wiederum ein Fork/Abspaltung von Maps.Me ist.

-Lese mehr über die Gründe und Ziele des Projektes unter <b><i>codeberg.org/comaps</i></b> (auf Englisch).
+Lese mehr über die Gründe und Ziele des Projektes unter <b><i>codeberg.org/comaps</i></b>.
 Werde Teil der Community und hilf mit, die beste Karten-App zu entwickeln
 • Nutze die App und erzähle anderen davon
 • Gib Feedback und melde Probleme
@@ -9,9 +9,9 @@ Werde Teil der Community und hilf mit, die beste Karten-App zu entwickeln
 ‣ <b>Einfach und ausgereift</b>: Essenzielle, leicht zu bedienende Funktionen, die einfach funktionieren.
 ‣ <b>Offline-orientiert</b>: Plane und navigiere im Ausland ohne Mobilfunkverbindung, finde Wegpunkte auf abgelegenen Wanderungen usw. Alle Funktionen sind für den Offline-Einsatz konzipiert.
 ‣ <b>Datenschutzfreundlich</b>: Die App wurde mit Fokus auf Privatsphäre entwickelt – keine Personenidentifikation, kein Tracking, keine Erfassung persönlicher Daten, keine Werbung.
-‣ <b>Spart Akku und Speicherplatz</b>: Verbraucht nicht unnötig viel Akku wie andere Navi-Apps. Kompakte Karten sparen Speicherplatz auf deinem Gerät.
+‣ <b>Spart Akku und Speicherplatz</b>: Verbraucht nicht unnötig Akku wie andere Navi-Apps. Kompakte Karten sparen Speicherplatz auf deinem Gerät.
 ‣ <b>Kostenlos und von der Community entwickelt</b>: Menschen wie du haben geholfen, diese App zu entwickeln – durch das Hinzufügen von Orten zu OpenStreetMap, Testen von neuen Funktionen, Softwareentwicklung oder Spenden.
-‣ <b>Offen und transparent bei Entscheidungen und Finanzen, gemeinnützig und vollständig Open-Source.</b>
+‣ <b>Offen und transparent bei Entscheidungen und Finanzen, gemeinnützig und vollständig Open-Source</b>

 <b>Hauptfunktionen</b>:
 • Detaillierte, herunterladbare Karten mit Orten, die bei Google Maps oft fehlen
@@ -28,5 +28,5 @@ Werde Teil der Community und hilf mit, die beste Karten-App zu entwickeln
 • Dunkler Modus für die Nutzung bei Nacht
 • Kartenbearbeitung direkt in der App mit einem einfachen Editor

-<b>Freiheit beginnt hier</b>
-Entdecke deine Reise, wobei Datenschutz und Gemeinschaft im Vordergrund stehen!
+<b>Entdecke die Unabhängigkeit</b>
+Entdecke deine Reise – navigiere in der Welt mit Datenschutz!
--- a/android/app/src/fdroid/play/listings/de-DE/release-notes.txt
+++ b/android/app/src/fdroid/play/listings/de-DE/release-notes.txt
@@ -1,9 +1,10 @@
-• OSM-Daten vom 6. Januar
-• Editor: POI mit mehr als einem Tag, (z.B. Arten von Kunstwerken wie Skulpturen...), mehr POI können als leer/stillgelegt werden
-• Miniatureisenbahnen & Kläranlagen hinzugefügt
-• Material 3-Dialoge & dunklerer Hintergrund im Darkmode
-• Fiktive Geschwindigkeitsbegrenzungen für Verbindungsstraßen entfernt
-• Versatz der Kameraausschnitt in der Navigation behoben
-• Weniger empfindliches langes Antippen
-
-Weitere Details unter codeberg.org/comaps/comaps/releases
+• OpenStreetMap-Daten vom 9. Dezember
+• Material 3 Design
+• Im OSM-Editor können nun Ladestationen hinzugefügt werden
+• Schuko und Typ E Ladestationen hinzugefügt
+• Verbesserte Suchvorschläge
+• Litauische und lettische Sprachankündigungen
+• Die Fahranweisungen wurden vergrößert
+• Der Zoomlevel passt sich an die Distanz zur nächsten Abbiegung an
+• Neue Anordnung der Einstellungen
+Weitere Einzelheiten auf codeberg.org/comaps/comaps/releases
--- a/android/app/src/fdroid/play/listings/de-DE/short-description.txt
+++ b/android/app/src/fdroid/play/listings/de-DE/short-description.txt
@@ -1 +1 @@
-Leichte Navigation – Erlebe mehr von deiner Reise – Community-unterstützt
+Einfache Navigation - Entdecken Sie mehr von Ihrer Reise - Community-Entwickelt
--- a/android/app/src/fdroid/play/listings/en-GB/full-description.txt
+++ b/android/app/src/fdroid/play/listings/en-GB/full-description.txt
@@ -1,32 +0,0 @@
-A community-led free & open source maps app based on OpenStreetMap data and reinforced with commitment to transparency, privacy and being not-for-profit. CoMaps is a fork/spin-off of Organic Maps, which in turn is a fork of Maps.ME.
-
-Read on about reasons for the project and its direction at <b><i>codeberg.org/comaps</i></b>.
-Join the community there and help make the best maps app
-• Use the app and spread the word about it
-• Give feedback and report issues
-• Update map data in the app or on the OpenStreetMap website
-
-‣ <b>Offline-focused</b>: Plan and navigate your trip abroad without the need for cellular service, search waypoints while on a distant hike, etc. All app functions are designed to work offline.
-‣ <b>Respecting Privacy</b>: The app is designed with privacy in mind - does not identify people, does not track, and does not collect personal information. Ads-free.
-‣ <b>Simple and Polished</b>: essential easy to use features that just work.
-‣ <b>Saves Your Battery and Space</b>: Doesn’t drain your battery like other navigation apps. Compact maps save precious space on your phone.
-‣ <b>Free and Built by the Community</b>: People like you helped build the app by adding places to OpenStreetMap, testing and giving feedback on features and contributing their development skills and money.
-‣ <b>Open and Transparent Decision-making and Financials, Not-for-profit and Fully Open Source.</b>
-
-<b>Main Features</b>:
-• Downloadable detailed maps with places which are not available with Google Maps
-• Outdoor mode with highlighted hiking trails, campsites, water sources, peaks, contour lines, etc
-• Walking paths and cycleways
-• Points of interest like restaurants, gas stations, hotels, shops, sightseeing and many more
-• Search by name or an address or by point of interest category
-• Navigation with voice announcements for walking, cycling, or driving
-• Bookmark your favorite places with a single tap
-• Offline Wikipedia articles
-• Subway transit layer and directions
-• Track recording
-• Export and import bookmarks and tracks in KML, KMZ, GPX formats
-• A dark mode to use during the night
-• Improve map data for everyone using a basic built-in editor
-
-<b>Freedom Is Here</b>
-Discover your journey, navigate the world with privacy and community at the forefront!
--- a/android/app/src/fdroid/play/listings/en-GB/short-description.txt
+++ b/android/app/src/fdroid/play/listings/en-GB/short-description.txt
@@ -1 +0,0 @@
-Easy map navigation - Discover more of your journey - Powered by the community
--- a/android/app/src/fdroid/play/listings/en-GB/title.txt
+++ b/android/app/src/fdroid/play/listings/en-GB/title.txt
@@ -1 +0,0 @@
-CoMaps - Hike, Bike, Drive Offline with Privacy
--- a/android/app/src/fdroid/play/listings/en-US/release-notes.txt
+++ b/android/app/src/fdroid/play/listings/en-US/release-notes.txt
@@ -1,9 +1,10 @@
-• OpenStreetMap data as of January 6
-• Editor: add POI types with more than one OSM tag, e.g. artwork subtypes sculptures, paintings..; more POI types could be marked as vacant/disused
-• Added miniature railways and wastewater treatment plants
-• Use Material 3 dialogs and darker background in dark mode
-• Removed fictional speed limits for link roads
-• Fixed camera cutout offset in navigation
-• Less sensitive long tap (full-screen mode)
-
+• OpenStreetMap data as of December 9
+• Use Material 3 themes
+• Support charging sockets in OSM Editor
+• Added schuko/type-E charge sockets
+• Improved search results ranking
+• Enabled Lithuanian and Latvian in voice announcements
+• Improved size of driving indications
+• Base zoom level on distance to next turn
+• Reordered settings
 More details on codeberg.org/comaps/comaps/releases
--- a/android/app/src/fdroid/play/listings/es-ES/release-notes.txt
+++ b/android/app/src/fdroid/play/listings/es-ES/release-notes.txt
@@ -1,9 +1,11 @@
-• Datos OSM a 06/01
-• Editor: se añaden tipos de POI con más de una etiqueta, ej. esculturas, pinturas...; se podrán marcar más tipos como en desuso
-• Se añaden ferrocarriles mini y plantas de tratamiento de aguas
-• Se utilizan diálogos Material 3 y fondo más oscuro en el modo oscuro
-• Se eliminan límites de velocidad ficticios para enlaces
-• Se corrige desplazamiento en la navegación
-• Toque largo menos sensible (en pantalla completa)
+• Datos de OpenStreetMap a fecha 9/12.
+• Uso de temas Material 3.
+• Compatibilidad con enchufes de recarga en Editor.
+• Se añaden enchufes de recarga schuko/tipo E.
+• Se mejora la búsqueda.
+• Se habilitan el lituano y el letón en las indicaciones de voz.
+• Se aumenta el tamaño de las indicaciones de conducción.
+• Nivel de zoom base según la distancia al siguiente giro.
+• Se han reordenado los ajustes.

 Más detalles en codeberg.org/comaps/comaps/releases
--- a/android/app/src/fdroid/play/listings/fr-FR/release-notes.txt
+++ b/android/app/src/fdroid/play/listings/fr-FR/release-notes.txt
@@ -1,9 +1,10 @@
-• Données OpenStreetMap du 6 janvier
-• Éditeur : support des types de POI avec plus d’un tag OSM, par exemple types d’œuvres d’art sculptures, peintures..
-• Rendu des rails pour trains miniatures et des stations d'épuration
-• Utilisation des pop-ups Material 3 et d'un fond plus sombre en thème sombre
-• Suppression des limites de vitesse fictives sur les bretelles de routes
-• Correction des instructions de navigation sur les appareils avec des encoches
-• Appui long moins sensible (en mode plein écran)
-
+• Données OpenStreetMap du 9 Décembre
+• Utilisation de Material 3
+• Support de l'édition des bornes de recharge dans l'éditeur OSM
+• Ajout du type de prise schuko/type-E
+• Amélioration de l'ordre des résultats de recherche
+• Ajout du lituanien et du letton dans le guidage vocal
+• Amélioration de la taille des instructions dans la navigation
+• Niveau de zoom basé sur la distance jusqu’au prochain virage
+• Réorganisation des paramètres
 Plus de détails sur codeberg.org/comaps/comaps/releases
--- a/android/app/src/fdroid/play/listings/hr/release-notes.txt
+++ b/android/app/src/fdroid/play/listings/hr/release-notes.txt
@@ -1,7 +1,10 @@
-• OpenStreetMap podaci od 6. siječnja
-• Uređivač: dodane točake interesa s više od jedne OSM oznake, npr. podtipovi umjetnina kao skulpture, slike...; više točaka interesa se sada može označiti kao upražnjene/napuštene
-• Dodane minijaturne željeznice i postrojenja za pročišćavanje otpadnih voda
-• Korištenje Material 3 dijaloga i tamnije pozadine u tamnom načinu rada
-• Uklonjena su izmišljena ograničenja brzine za spojne ceste
-
-Više detalja na codeberg.org/comaps/comaps/releases
+• Podaci OpenStreetMap karte od 9. prosinca
+• Korištenje Material 3 tema
+• Podrška za utičnice za punjenje u OSM Editoru
+• Dodane šuko/tip-E utičnice
+• Poboljšano rangiranje rezultata pretraživanja
+• Omogućeni litvanski i latvijski jezici u glasovnim najavama
+• Povećana veličina indikatora vožnje
+• Razina zumiranja se mijenja ovisno o udaljenosti do sljedećeg skretanja
+• Promijenjen redoslijed postavki
+Više detalja na codeberg.org/comaps/comaps/releases
--- a/android/app/src/fdroid/play/listings/lt/full-description.txt
+++ b/android/app/src/fdroid/play/listings/lt/full-description.txt
@@ -1,32 +0,0 @@
-Bendruomenės vystoma nemokama atvirojo kodo žemėlapių programa, pagrįsta „OpenStreetMap“ duomenimis ir sustiprinta įsipareigojimu užtikrinti skaidrumą, privatumą ir pelno nesiekimą. „CoMaps“ programa yra kilusi iš „Organic Maps“, o pastaroji – iš programos „Maps.ME“.
-
-Apie šio projekto kilmę, jos priežastis ir palaikomą kryptį galite paskaityti adresu <b><i>codeberg.org/comaps</i></b>.
-Prisijunkite prie bendruomenės ir padėkite sukurti geriausią žemėlapių programą
-• Naudokitės programa ir paskleiskite žinią apie ją
-• Teikite atsiliepimus ir praneškite apie problemas
-• Atnaujinkite žemėlapių duomenis programoje arba „OpenStreetMap“ svetainėje
-
-‣ <b>Skirta naudoti neprisijungus prie interneto</b>: planuokite maršrutus ir keliaukite užsienyje be mobiliojo ryšio, ieškokite kelionės taškų tolimuose žygiuose ir pan. Visos programos funkcijos yra pritaikytos veikti be interneto ryšio.
-‣ <b>Gerbia privatumą</b>: programėlė sukurta, teikiant prioritetą privatumui: neidentifikuoja žmonių, neseka ir nerenka asmeninės informacijos. Be reklamų.
-‣ <b>Paprasta ir išbaigta</b>: esminės, lengvai naudojamos funkcijos, kurios tiesiog veikia.
-‣ <b>Taupo bateriją ir vietą</b>: neišsekina baterijos kaip kitos navigacijos programos. Kompaktiški žemėlapiai tausoja vietą jūsų telefone.
-‣ <b>Nemokama ir kuriama bendruomenės</b>: paprasti žmonės – kaip jūs – padėjo sukurti šią programą, pildydami „OpenStreetMap“ žemėlapį, išbandydami ir pateikdami atsiliepimus apie funkcijas bei prisidėdami savo programavimo įgūdžiais ir pinigais.
-‣ <b>Atviras ir skaidrus sprendimų priėmimas ir finansai, ne pelno siekianti ir visiškai atviro kodo programa.</b>
-
-<b>Pagrindinės funkcijos</b>:
-• Atsisiunčiami išsamūs žemėlapiai su vietomis, kurių nėra „Google Maps“;
-• Žygių pėsčiomis veiksena su pažymėtais pėsčiųjų takais, stovyklavietėmis, vandens šaltiniais, kalnų viršūnėmis, reljefo linijomis ir kt.;
-• Pėsčiųjų ir dviračių takai;
-• Potencialūs kelionės taškai, kaip antai restoranai, degalinės, viešbučiai, parduotuvės, lankytinos vietos ir daugelis kitų;
-• Paieška pagal pavadinimą, adresą arba lankytinos vietos kategoriją;
-• Navigacija su balso instrukcijomis pėstiesiems, dviratininkams ir motorinio transporto vairuotojams;
-• Mėgstamų vietų įsiminimas vienu bakstelėjimu;
-• „Vikipedijos“ straipsniai, prieinami neprisijungus prie interneto;
-• Kelionių metro sluoksnis ir maršrutai;
-• Trasų įrašymas;
-• Žymių ir trasų eksportavimas ir importavimas KML, KMZ, GPX formatais;
-• Tamsaus žemėlapio veiksena, skirta naudoti naktį;
-• Galimybė papildyti žemėlapio duomenis visiems, naudojantis įtaisytuoju baziniu redaktoriumi.
-
-<b>Laisvė yra čia</b>
-Atraskite savo kelionę ir keliaukite po pasaulį, kuriame privatumas ir bendruomenė yra svarbiausia!
--- a/android/app/src/fdroid/play/listings/lt/short-description.txt
+++ b/android/app/src/fdroid/play/listings/lt/short-description.txt
@@ -1 +1 @@
-Paprasta ir patogi navigacija – Turiningesnės kelionės – Vystoma bendruomenės
+Paprasta ir patogi navigacija – Turiningos kelionės – Vystoma bendruomenės
--- a/android/app/src/fdroid/play/listings/pl-PL/release-notes.txt
+++ b/android/app/src/fdroid/play/listings/pl-PL/release-notes.txt
@@ -0,0 +1,10 @@
+• Dane OpenStreetMap z 9 grudnia
+• Użycie motywów Material 3
+• Obsługa gniazd ładowania w Edytorze OSM
+• Dodane gniazda ładowania schuko/type-E
+• Poprawiony ranking wyników wyszukiwania
+• Dodane litewskie i łotewskie komunikaty głosowe
+• Poprawiony rozmiar znaków drogowych
+• Poziom powiększenia oparty na odległości do następnego manewru
+• Zmieniona kolejność ustawień
+Więcej szczegółów na codeberg.org/comaps/comaps/releases
--- a/android/app/src/fdroid/play/listings/pt-BR/release-notes.txt
+++ b/android/app/src/fdroid/play/listings/pt-BR/release-notes.txt
@@ -1,9 +1,10 @@
-• Dados OSM de 6/1
-• Editor: adição de POIs com mais de uma etiqueta OSM, por exemplo esculturas e pinturas; mais tipos de POI podem ser marcados como vagos/desativados
-• Adição de ferrovias em miniatura e ETEs
-• Uso de diálogos Material 3 e fundo mais escuro no modo escuro
-• Remoção de limites de velocidade fictícios para vias de ligação
-• Correção de recorte da câmera na navegação
-• Toque longo menos sensível (modo tela cheia)
-
+• Dados OpenStreetMap atualizados em 9 de dezembro
+• Uso do estilo Material 3
+• Suporte para tomadas de carregamento no Editor OSM
+• Adição de tomadas de carregamento Schuko/Tipo E
+• Melhoria na classificação dos resultados de busca
+• Adição dos idiomas letão e lituano nas orientações por voz
+• Melhoria no tamanho das indicações de direção
+• Nível de zoom baseado em distância até a próxima curva
+• Configurações reordenadas
 Mais detalhes em codeberg.org/comaps/comaps/releases
--- a/android/app/src/fdroid/play/listings/ru-RU/release-notes.txt
+++ b/android/app/src/fdroid/play/listings/ru-RU/release-notes.txt
@@ -1,8 +0,0 @@
-• Карты OpenStreetMap от 6 января
-• Редактор: возможность добавления POI, определяемых несколькими тегами, например церквей, мечетей, буддистских храмов..
-• Добавлены миниатюрные железные дороги и очистные сооружения
-• Использование диалогов Material 3 и более тёмного фона в тёмном режиме
-• Удалены фиктивные ограничения скорости для заездов / съездов с шоссе
-• Менее чувствительное длительное нажатие на экран (переход в полноэкранный режим)
-
-Подробнее на codeberg.org/comaps/comaps/releases
--- a/android/app/src/fdroid/play/listings/sl/full-description.txt
+++ b/android/app/src/fdroid/play/listings/sl/full-description.txt
@@ -1,31 +1,31 @@
-Brezplačno in odprtokodno zemljevidno orodje, ki ga vodi skupnost, temelji na podatkih OpenStreetMap in je okrepljena s predanostjo transparentnosti, zasebnosti in nepridobitnosti. CoMaps je izpeljanka OrganicMaps, ta pa je izpeljanka Maps.ME.
+Brezplačno in odprtokodno zemljevidno orodje, ki ga vodi skupnost, temelji na podatkih OpenStreetMap in je okrepljena s predanostjo transparentnosti, zasebnosti in nedobičkonosnosti. CoMaps je izpeljanka OrganicMaps, ta pa je izpeljanka Maps.ME.

-Preberite si o razlogih za ta projekt in njegovi usmerjenosti na <b><i>codeberg.org/comaps</i></b>.
+Preverite si o razlogih za ta projekt in njegovi usmerjenosti na <b><i>codeberg.org/comaps</i></b>.
 Pridružite se skupnosti in pomagajte narediti najboljše zemljevidno orodje
 • Uporabljajte orodje in širite glas o njem
 • Dajajte povratne informacije in poročajte o napakah
 • Posodabljajte podatke zemljevida v tem orodju ali na spletni strani OpenStreetMap

-‣ <b>Osredotočeno na uporabo brez povezave</b>: Načrtujte in se usmerjajte na vašem potovanju v tujini vrez potrebe po mobilnih podatkih, iščite vmesne točke potovanja ko ste na daljšem pohodu ipd. Vse zmogljivosti orodja so zasnovane za delo brez povezave.
+‣ <b>Osredotočeno na uporabo brez povezave</b>: Načrtujte in se usmerjajte na vašem potovanju v tujini vrez potrebe po mobilnih podatkih, iščite vmesne točke potocanja ko ste na daljšem pohodu ipd. Vse zmogljivosti orodja so zasnovane za delo brez povezave.
 ‣ <b>Spoštovanje zasebnosti</b>: orodje je zasnovano z mislijo na zasebnost – ne prepoznava oseb, ne sledi in ne zbira osebnih podatkov. Brez oglasov.
 ‣ <b>Preprosto in dodelano</b>: nujne zmogljivosti, enostavne za uporabo, ki preprosto delujejo.
 ‣ <b>Prihrani vašo baterijo in prostor.</b>: ne izčrpava vaše baterije kakor druga usmerjevalna orodja. Strnjeni zemljevidi prihranijo dragocen prostor na vašem telefonu.
 ‣ <b>Brezplačno in ustvarjeno v skupnosti</b>: ljudje kot ste vi pomagajo ustvarjati to orodje, tako da dodajajo kraje na OpenStreetMap, preizkušajo in dajejo povratne informacije o zmogljivostih in prispevajo svoje razvijalske sposobnosti in sredstva.
-‣ <b>Odprto in transparentno odločanje in finance, nepridobitno in popolnoma odprtokodno.</b>
+‣ <b>Odprto in transparentno odločanje in finance, nedobičkonosno in popolnoma odprtokodno.</b>

 <b>Glavne zmogljivosti</b>:
-• Prenosljivi podrobni zemljevidi s kraji, ki na Googlovih zemljevidih niso na voljo.
+• Prenosljivi podrobni zemljevidi s kraji, ki na Googlovoh zemljevidih niso na voljo.
 • Prikaz za dejavnosti na prostem s poudarjenimi pohodniškimi potmi, tabornimi prostori, vodnimi viri, vrhovi, plastnicami itd.
 • Pešpoti in kolesarke poti
 • Kraji zanimanja, npr. restavracije, bencinske črpalke, hoteli, trgovine, znamenitosti in mnogo več
 • Iščite po imenu, hišnemu naslovu ali po vrsti
-• Usmerjanje z glasovnimi navodili za hojo, kolesarjenje ali vožnjo avtomobila.
+• Usmerjanje z glasovnimi obvestili za hojo, kolesarjenje ali vožnjo avtomobila.
 • Zaznamujte svoje najljubše kraje s preprostim dotikom
 • Wikipedijini članki brez povezave
 • Prometna plast podzemne železnice z usmerjanjem
 • Izvozite ali uvozite zaznamke in sledi v oblikah KML, KMZ, GPX
 • Temni prikaz za uporabo ponoči
-• Izboljšajte podatke zemljevida za vse z uporabo vgrajenega urejevalnika
+• Izboljšajtw podatke zemljevida za vse z uporabo vgrajenega urejevalnika

 <b>Svoboda je tu</b>
 Odkijte več o vašem potovanju, usmerjajte se po svetu s poudarkom na zasebnosti in skupnostnem delovanju!
--- a/android/app/src/fdroid/play/listings/sl/short-description.txt
+++ b/android/app/src/fdroid/play/listings/sl/short-description.txt
@@ -1 +1 @@
-Enostavno usmerjanje – Odkrijte več o svojem potovanju – Podprto v skupnosti
+Enostavno usmerjanje – Odkrij več o svojem potovanju – Podprto v skupnosti
--- a/android/app/src/fdroid/play/listings/sl/title.txt
+++ b/android/app/src/fdroid/play/listings/sl/title.txt
@@ -1 +1 @@
-CoMaps – hodi in vozi brez povezave, zasebno
+CoMaps–Hodi, kolesari, vozi brez povezave, zasebno
--- a/android/app/src/fdroid/play/version.yaml
+++ b/android/app/src/fdroid/play/version.yaml
@@ -1 +1 @@
-version: 2025.03.02-7-FDroid+25030207
+version: 2025.12.11-2-FDroid+25121102
--- a/android/app/src/google/play/listings/de-DE/full-description.txt
+++ b/android/app/src/google/play/listings/de-DE/full-description.txt
@@ -3,7 +3,7 @@ Eine von der Community betriebene, kostenlose Open-Source Karten App, die auf Op
 Werde Teil der Community und hilf mit, die beste Karten-App zu entwickeln
 • Nutze die App und erzähle anderen davon
 • Gib Feedback und melde Probleme
-• Aktualisiere Kartendaten in der App oder auf der OpenStreetMap-Webseite
+• Aktualisiere Kartendaten in der App oder auf der OpenStreetMap Website

 <i>Dein Feedback und deine 5-Sterne-Bewertung sind die beste Unterstützung für uns!</i>

@@ -12,7 +12,7 @@ Werde Teil der Community und hilf mit, die beste Karten-App zu entwickeln
 ‣ <b>Datenschutz ist uns wichtig!</b>: Die App wurde mit Fokus auf Privatsphäre entwickelt – kein Tracking, keine Erfassung persönlicher Daten, keine Werbung.
 ‣ <b>Spart Akku und Speicherplatz</b>: Verbraucht nicht unnötig Akku wie andere Navi-Apps. Kompakte Karten sparen Speicherplatz auf Deinem Gerät.
 ‣ <b>Kostenlos und von der Community entwickelt</b>: Menschen wie du haben geholfen, die App zu entwickeln – durch das Hinzufügen von Orten zu OpenStreetMap, Testen von neuen Funktionen, Softwareentwicklung oder Spenden.
-‣ <b>Offen und transparent bei Entscheidungen und Finanzen, gemeinnützig und vollständig Open Source.</b>
+‣ <b>Offen und transparent bei Entscheidungen und Finanzen, gemeinnützig und vollständig Open Source</b>

 <b>Hauptfunktionen</b>:
 • Detaillierte, herunterladbare Karten mit Orten, die bei Google Maps oft fehlen
@@ -24,13 +24,13 @@ Werde Teil der Community und hilf mit, die beste Karten-App zu entwickeln
 • Lesezeichen mit einem einzigen Tippen speichern
 • Offline verfügbare Wikipedia-Artikel
 • U- und S-Bahn-Netze
-• Aufzeichnen von GPS-Tracks
+• Aufzeichnen von GPS Tracks
 • Import und Export von Favoriten und Routen im KML-, KMZ- oder GPX-Format
 • Dunkler Modus für die Nutzung bei Nacht
 • Kartenbearbeitung direkt in der App mit einem einfachen Editor
 • Unterstützung für Android Auto

-Bitte melde Probleme, schlage neue Funktionen vor und werde Teil der Community auf unserer Website: <b><i>comaps.app/de/</i></b>
+Bitte melde Probleme, schlage neue Funktionen vor und werde Teil der Community auf unserer Website: <b><i>comaps.app</i></b>

-<b>Freiheit beginnt hier</b>
-Entdecke deine Reise, wobei Datenschutz und Gemeinschaft im Vordergrund stehen!
+<b>Entdecke die Unabhängigkeit</b>
+Entdecke deine Reise – navigiere in der Welt mit Datenschutz!
--- a/android/app/src/google/play/listings/de-DE/short-description.txt
+++ b/android/app/src/google/play/listings/de-DE/short-description.txt
@@ -1 +1 @@
-Leichte Navigation – Erlebe mehr von deiner Reise – Community-unterstützt
+Einfache Navigation - Entdecken Sie mehr von Ihrer Reise - Community-Entwickelt
--- a/android/app/src/google/play/listings/lt/full-description.txt
+++ b/android/app/src/google/play/listings/lt/full-description.txt
@@ -1,36 +0,0 @@
-Bendruomenės vystoma nemokama atvirojo kodo žemėlapių programa, pagrįsta „OpenStreetMap“ duomenimis ir sustiprinta įsipareigojimu užtikrinti skaidrumą, privatumą ir pelno nesiekimą.
-
-Prisijunkite prie bendruomenės ir padėkite sukurti geriausią žemėlapių programą
-• Naudokitės programa ir paskleiskite žinią apie ją
-• Teikite atsiliepimus ir praneškite apie problemas
-• Atnaujinkite žemėlapių duomenis programoje arba „OpenStreetMap“ svetainėje
-
-<i>Jūsų atsiliepimai ir 5 žvaigždučių vertinimai yra geriausias palaikymas mums!</i>
-
-‣ <b>Paprasta ir išbaigta</b>: esminės, lengvai naudojamos funkcijos, kurios tiesiog veikia.
-‣ <b>Skirta naudoti neprisijungus prie interneto</b>: planuokite maršrutus ir keliaukite užsienyje be mobiliojo ryšio, ieškokite kelionės taškų tolimuose žygiuose ir pan. Visos programos funkcijos yra pritaikytos veikti be interneto ryšio.
-‣ <b>Gerbia privatumą</b>: programėlė sukurta, teikiant prioritetą privatumui: neidentifikuoja žmonių, neseka ir nerenka asmeninės informacijos. Be reklamų.
-‣ <b>Taupo bateriją ir vietą</b>: neišsekina baterijos kaip kitos navigacijos programos. Kompaktiški žemėlapiai tausoja vietą jūsų telefone.
-‣ <b>Nemokama ir kuriama bendruomenės</b>: paprasti žmonės – kaip jūs – padėjo sukurti šią programą, pildydami „OpenStreetMap“ žemėlapį, išbandydami ir pateikdami atsiliepimus apie funkcijas bei prisidėdami savo programavimo įgūdžiais ir pinigais.
-‣ <b>Atviras ir skaidrus sprendimų priėmimas ir finansai, ne pelno siekianti ir visiškai atviro kodo programa.</b>
-
-<b>Pagrindinės funkcijos</b>:
-• Atsisiunčiami išsamūs žemėlapiai su vietomis, kurių nėra „Google Maps“;
-• Žygių pėsčiomis veiksena su pažymėtais pėsčiųjų takais, stovyklavietėmis, vandens šaltiniais, kalnų viršūnėmis, reljefo linijomis ir kt.;
-• Pėsčiųjų ir dviračių takai;
-• Potencialūs kelionės taškai, kaip antai restoranai, degalinės, viešbučiai, parduotuvės, lankytinos vietos ir daugelis kitų;
-• Paieška pagal pavadinimą, adresą arba lankytinos vietos kategoriją;
-• Navigacija su balso instrukcijomis pėstiesiems, dviratininkams ir motorinio transporto vairuotojams;
-• Mėgstamų vietų įsiminimas vienu bakstelėjimu;
-• „Vikipedijos“ straipsniai, prieinami neprisijungus prie interneto;
-• Kelionių metro sluoksnis ir maršrutai;
-• Trasų įrašymas;
-• Žymių ir trasų eksportavimas ir importavimas KML, KMZ, GPX formatais;
-• Tamsaus žemėlapio veiksena, skirta naudoti naktį;
-• Galimybė papildyti žemėlapio duomenis visiems, naudojantis įtaisytuoju baziniu redaktoriumi;
-• „Android Auto“ palaikymas.
-
-Praneškite apie programos problemas, siūlykite idėjas ir prisijunkite prie mūsų bendruomenės svetainėje <b><i>comaps.app</i></b>.
-
-<b>Laisvė yra čia</b>
-Atraskite savo kelionę ir keliaukite po pasaulį, kuriame privatumas ir bendruomenė yra svarbiausia!
--- a/android/app/src/google/play/listings/lt/short-description.txt
+++ b/android/app/src/google/play/listings/lt/short-description.txt
@@ -1 +1 @@
-Paprasta ir patogi navigacija – Turiningesnės kelionės – Vystoma bendruomenės
+Paprasta ir patogi navigacija – Turiningos kelionės – Vystoma bendruomenės
--- a/android/app/src/google/play/listings/sl/short-description.txt
+++ b/android/app/src/google/play/listings/sl/short-description.txt
@@ -1 +1 @@
-Enostavno usmerjanje – Odkrijte več o svojem potovanju – Podprto v skupnosti
+Enostavno usmerjanje – Odkrij več o svojem potovanju – Podprto v skupnosti
--- a/android/app/src/google/play/listings/sl/title.txt
+++ b/android/app/src/google/play/listings/sl/title.txt
@@ -1 +1 @@
-CoMaps - Usmerjajte se zasebno
+CoMaps - Usmerjajte zasebno
--- a/android/app/src/main/java/app/organicmaps/DownloadResourcesLegacyActivity.java
+++ b/android/app/src/main/java/app/organicmaps/DownloadResourcesLegacyActivity.java
@@ -18,7 +18,6 @@ import android.location.Location;
 import android.os.Bundle;
 import android.text.TextUtils;
 import android.view.View;
-
 import androidx.activity.result.ActivityResultLauncher;
 import androidx.activity.result.contract.ActivityResultContracts;
 import androidx.annotation.CallSuper;
@@ -26,15 +25,7 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.annotation.StringRes;
 import androidx.core.view.ViewCompat;
-
-import com.google.android.material.button.MaterialButton;
-import com.google.android.material.checkbox.MaterialCheckBox;
-import com.google.android.material.dialog.MaterialAlertDialogBuilder;
-import com.google.android.material.progressindicator.LinearProgressIndicator;
-import com.google.android.material.textview.MaterialTextView;
-
 import app.organicmaps.base.BaseMwmFragmentActivity;
-import app.organicmaps.dialog.CustomMapServerDialog;
 import app.organicmaps.downloader.MapManagerHelper;
 import app.organicmaps.intent.Factory;
 import app.organicmaps.sdk.Framework;
@@ -47,7 +38,11 @@ import app.organicmaps.sdk.util.StringUtils;
 import app.organicmaps.util.UiUtils;
 import app.organicmaps.util.Utils;
 import app.organicmaps.util.WindowInsetUtils.PaddingInsetsListener;
-
+import com.google.android.material.button.MaterialButton;
+import com.google.android.material.checkbox.MaterialCheckBox;
+import com.google.android.material.dialog.MaterialAlertDialogBuilder;
+import com.google.android.material.progressindicator.LinearProgressIndicator;
+import com.google.android.material.textview.MaterialTextView;
 import java.util.List;
 import java.util.Objects;

@@ -59,7 +54,6 @@ public class DownloadResourcesLegacyActivity extends BaseMwmFragmentActivity
  private MaterialTextView mTvMessage;
  private LinearProgressIndicator mProgress;
  private MaterialButton mBtnDownload;
-  private MaterialButton mBtnAdvanced;
  private MaterialCheckBox mChbDownloadCountry;

  private String mCurrentCountry;
@@ -273,14 +267,6 @@ public class DownloadResourcesLegacyActivity extends BaseMwmFragmentActivity
    mProgress = findViewById(R.id.progressbar);
    mBtnDownload = findViewById(R.id.btn_download_resources);
    mChbDownloadCountry = findViewById(R.id.chb_download_country);
-    mBtnAdvanced = findViewById(R.id.btn_advanced);
-
-    mBtnAdvanced.setOnClickListener(v -> {
-      CustomMapServerDialog.show(this, url -> {
-        prepareFilesDownload(false);
-      });
-    });
-    mBtnAdvanced.setEnabled(true);

    mBtnListeners = new View.OnClickListener[BTN_COUNT];
    mBtnNames = new String[BTN_COUNT];
@@ -305,11 +291,6 @@ public class DownloadResourcesLegacyActivity extends BaseMwmFragmentActivity
  {
    mBtnDownload.setOnClickListener(mBtnListeners[action]);
    mBtnDownload.setText(mBtnNames[action]);
-
-    // Allow changing server only when idle or after an error.
-    boolean advancedEnabled = (action == DOWNLOAD || action == TRY_AGAIN || action == RESUME);
-    mBtnAdvanced.setEnabled(advancedEnabled);
-    mBtnAdvanced.setAlpha(advancedEnabled ? 1f : 0.5f);
  }

  private void doDownload()
@@ -378,9 +359,6 @@ public class DownloadResourcesLegacyActivity extends BaseMwmFragmentActivity

  private void finishFilesDownload(int result)
  {
-    mBtnAdvanced.setEnabled(true);
-    mBtnAdvanced.setAlpha(1f);
-
    if (result == ERR_NO_MORE_FILES)
    {
      // World and WorldCoasts has been downloaded, we should register maps again to correctly add them to the model.
@@ -446,20 +424,16 @@ public class DownloadResourcesLegacyActivity extends BaseMwmFragmentActivity
      default -> throw new AssertionError("Unexpected result code = " + result);
    };

-        mAlertDialog = new MaterialAlertDialogBuilder(this)
+        mAlertDialog = new MaterialAlertDialogBuilder(this, R.style.MwmTheme_AlertDialog)
                           .setTitle(titleId)
                           .setMessage(messageId)
                           .setCancelable(true)
-                           .setOnCancelListener((dialog) -> setAction(RESUME))
+                           .setOnCancelListener((dialog) -> setAction(PAUSE))
                           .setPositiveButton(R.string.try_again,
                                              (dialog, which) -> {
                                                setAction(TRY_AGAIN);
                                                onTryAgainClicked();
                                              })
-                           .setNegativeButton(R.string.cancel,
-                                              (dialog, which) -> {
-                                                setAction(RESUME);
-                                              })
                           .setOnDismissListener(dialog -> mAlertDialog = null)
                           .show();
  }
--- a/android/app/src/main/java/app/organicmaps/MwmActivity.java
+++ b/android/app/src/main/java/app/organicmaps/MwmActivity.java
@@ -432,7 +432,7 @@ public class MwmActivity extends BaseMwmFragmentActivity
    }

    dismissLocationErrorDialog();
-    mLocationErrorDialog = new MaterialAlertDialogBuilder(MwmActivity.this)
+    mLocationErrorDialog = new MaterialAlertDialogBuilder(MwmActivity.this, R.style.MwmTheme_AlertDialog)
                               .setMessage(R.string.unknown_current_position)
                               .setCancelable(true)
                               .setPositiveButton(R.string.ok, null)
@@ -655,7 +655,7 @@ public class MwmActivity extends BaseMwmFragmentActivity
        else
        {
          dismissAlertDialog();
-          mAlertDialog = new MaterialAlertDialogBuilder(this)
+          mAlertDialog = new MaterialAlertDialogBuilder(this, R.style.MwmTheme_AlertDialog)
                             .setTitle(R.string.message_invalid_feature_position)
                             .setPositiveButton(R.string.ok, null)
                             .setOnDismissListener(dialog -> mAlertDialog = null)
@@ -1155,7 +1155,7 @@ public class MwmActivity extends BaseMwmFragmentActivity

    if (type == IsolinesState.EXPIREDDATA)
    {
-      mAlertDialog = new MaterialAlertDialogBuilder(this)
+      mAlertDialog = new MaterialAlertDialogBuilder(this, R.style.MwmTheme_AlertDialog)
                         .setTitle(R.string.downloader_update_maps)
                         .setMessage(R.string.isolines_activation_error_dialog)
                         .setPositiveButton(
@@ -1774,7 +1774,7 @@ public class MwmActivity extends BaseMwmFragmentActivity
  {
    dismissAlertDialog();
    mAlertDialog =
-        new MaterialAlertDialogBuilder(this)
+        new MaterialAlertDialogBuilder(this, R.style.MwmTheme_AlertDialog)
            .setTitle(R.string.unable_to_calc_alert_title)
            .setMessage(R.string.unable_to_calc_alert_subtitle)
            .setPositiveButton(R.string.settings,
@@ -1797,7 +1797,7 @@ public class MwmActivity extends BaseMwmFragmentActivity
      builder.append(getString(resId)).append("\n\n");

    dismissAlertDialog();
-    mAlertDialog = new MaterialAlertDialogBuilder(this)
+    mAlertDialog = new MaterialAlertDialogBuilder(this, R.style.MwmTheme_AlertDialog)
                       .setTitle(R.string.dialog_routing_disclaimer_title)
                       .setMessage(builder.toString())
                       .setCancelable(false)
@@ -1846,7 +1846,7 @@ public class MwmActivity extends BaseMwmFragmentActivity
      return true;

    final MapObject endPoint = Objects.requireNonNull(controller.getEndPoint());
-    final MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(this)
+    final MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(this, R.style.MwmTheme_AlertDialog)
        .setTitle(R.string.p2p_only_from_current)
        .setMessage(R.string.p2p_reroute_from_current)
        .setCancelable(false)
@@ -2040,7 +2040,7 @@ public class MwmActivity extends BaseMwmFragmentActivity
        {
          mPreciseLocationDialogShown = true;
          final MaterialAlertDialogBuilder builder =
-              new MaterialAlertDialogBuilder(this)
+              new MaterialAlertDialogBuilder(this, R.style.MwmTheme_AlertDialog)
                  .setTitle("⚠ " + getString(R.string.limited_accuracy))
                  .setMessage(R.string.precise_location_is_disabled_long_text)
                  .setNegativeButton(R.string.close, (dialog, which) -> dialog.dismiss())
@@ -2074,7 +2074,7 @@ public class MwmActivity extends BaseMwmFragmentActivity
      return;
    }

-    mLocationErrorDialog = new MaterialAlertDialogBuilder(this)
+    mLocationErrorDialog = new MaterialAlertDialogBuilder(this, R.style.MwmTheme_AlertDialog)
                               .setTitle(R.string.enable_location_services)
                               .setMessage(R.string.location_is_disabled_long_text)
                               .setOnDismissListener(dialog -> mLocationErrorDialog = null)
@@ -2167,7 +2167,7 @@ public class MwmActivity extends BaseMwmFragmentActivity
      return;
    }

-    final MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(this)
+    final MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(this, R.style.MwmTheme_AlertDialog)
                                                   .setTitle(R.string.enable_location_services)
                                                   .setMessage(R.string.location_is_disabled_long_text)
                                                   .setOnDismissListener(dialog -> mLocationErrorDialog = null)
@@ -2253,7 +2253,7 @@ public class MwmActivity extends BaseMwmFragmentActivity

    dismissAlertDialog();
    final MaterialAlertDialogBuilder builder =
-        new MaterialAlertDialogBuilder(this)
+        new MaterialAlertDialogBuilder(this, R.style.MwmTheme_AlertDialog)
            .setTitle(R.string.current_location_unknown_error_title)
            .setCancelable(true)
            .setMessage(R.string.power_save_dialog_summary)
@@ -2278,7 +2278,7 @@ public class MwmActivity extends BaseMwmFragmentActivity
  {
    dismissAlertDialog();
    mAlertDialog =
-        new MaterialAlertDialogBuilder(this)
+        new MaterialAlertDialogBuilder(this, R.style.MwmTheme_AlertDialog)
            .setTitle(R.string.load_kmz_title)
            .setMessage(getString(R.string.unknown_file_type, uri))
            .setPositiveButton(R.string.ok, null)
@@ -2295,7 +2295,7 @@ public class MwmActivity extends BaseMwmFragmentActivity
  {
    dismissAlertDialog();
    mAlertDialog =
-        new MaterialAlertDialogBuilder(this)
+        new MaterialAlertDialogBuilder(this, R.style.MwmTheme_AlertDialog)
            .setTitle(R.string.load_kmz_title)
            .setMessage(getString(R.string.failed_to_open_file, uri, error))
            .setPositiveButton(R.string.ok, null)
@@ -2317,7 +2317,7 @@ public class MwmActivity extends BaseMwmFragmentActivity
  public void onBookmarksFileImportFailed()
  {
    dismissAlertDialog();
-    mAlertDialog = new MaterialAlertDialogBuilder(this)
+    mAlertDialog = new MaterialAlertDialogBuilder(this, R.style.MwmTheme_AlertDialog)
                       .setTitle(R.string.load_kmz_title)
                       .setMessage(R.string.load_kmz_failed)
                       .setPositiveButton(R.string.ok, null)
@@ -2578,7 +2578,7 @@ public class MwmActivity extends BaseMwmFragmentActivity

  private void reportUnsupported()
  {
-    new MaterialAlertDialogBuilder(this)
+    new MaterialAlertDialogBuilder(this, R.style.MwmTheme_AlertDialog)
        .setMessage(R.string.unsupported_phone)
        .setCancelable(false)
        .setPositiveButton(R.string.close, (dlg, which) -> this.moveTaskToBack(true))
--- a/android/app/src/main/java/app/organicmaps/SplashActivity.java
+++ b/android/app/src/main/java/app/organicmaps/SplashActivity.java
@@ -120,7 +120,7 @@ public class SplashActivity extends AppCompatActivity
  private void showFatalErrorDialog(@StringRes int titleId, @StringRes int messageId, Exception error)
  {
    mCanceled = true;
-    new MaterialAlertDialogBuilder(this, R.style.MwmTheme_M3_AlertDialog)
+    new MaterialAlertDialogBuilder(this, R.style.MwmTheme_AlertDialog)
        .setTitle(titleId)
        .setMessage(messageId)
        .setPositiveButton(
--- a/android/app/src/main/java/app/organicmaps/bookmarks/BookmarksSharingHelper.java
+++ b/android/app/src/main/java/app/organicmaps/bookmarks/BookmarksSharingHelper.java
@@ -60,14 +60,14 @@ public enum BookmarksSharingHelper
    case BookmarkSharingResult.SUCCESS ->
      SharingUtils.shareBookmarkFile(context, launcher, result.getSharingPath(), result.getMimeType());
    case BookmarkSharingResult.EMPTY_CATEGORY ->
-      new MaterialAlertDialogBuilder(context)
+      new MaterialAlertDialogBuilder(context, R.style.MwmTheme_AlertDialog)
          .setTitle(R.string.bookmarks_error_title_share_empty)
          .setMessage(R.string.bookmarks_error_message_share_empty)
          .setPositiveButton(R.string.ok, null)
          .show();
    case BookmarkSharingResult.ARCHIVE_ERROR, BookmarkSharingResult.FILE_ERROR ->
    {
-      new MaterialAlertDialogBuilder(context)
+      new MaterialAlertDialogBuilder(context, R.style.MwmTheme_AlertDialog)
          .setTitle(R.string.dialog_routing_system_error)
          .setMessage(R.string.bookmarks_error_message_share_general)
          .setPositiveButton(R.string.ok, null)
--- a/android/app/src/main/java/app/organicmaps/bookmarks/ChooseBookmarkCategoryFragment.java
+++ b/android/app/src/main/java/app/organicmaps/bookmarks/ChooseBookmarkCategoryFragment.java
@@ -42,7 +42,6 @@ public class ChooseBookmarkCategoryFragment
  public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState)
  {
    View root = inflater.inflate(R.layout.choose_bookmark_category_fragment, container, false);
-    getDialog().getWindow().setBackgroundDrawableResource(android.R.color.transparent);
    mRecycler = root.findViewById(R.id.recycler);
    mRecycler.setLayoutManager(new LinearLayoutManager(requireActivity()));
    return root;
--- a/android/app/src/main/java/app/organicmaps/bookmarks/ChooseBookmarksSortingTypeFragment.java
+++ b/android/app/src/main/java/app/organicmaps/bookmarks/ChooseBookmarksSortingTypeFragment.java
@@ -77,7 +77,6 @@ public class ChooseBookmarksSortingTypeFragment
  public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState)
  {
    super.onViewCreated(view, savedInstanceState);
-    getDialog().getWindow().setBackgroundDrawableResource(android.R.color.transparent);

    final Bundle args = getArguments();
    if (args == null)
--- a/android/app/src/main/java/app/organicmaps/dialog/CustomMapServerDialog.java
+++ b/android/app/src/main/java/app/organicmaps/dialog/CustomMapServerDialog.java
@@ -1,86 +0,0 @@
-package app.organicmaps.dialog;
-
-import android.content.Context;
-import android.content.DialogInterface;
-import android.content.SharedPreferences;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.widget.Button;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.appcompat.app.AlertDialog;
-import androidx.preference.PreferenceManager;
-
-import com.google.android.material.dialog.MaterialAlertDialogBuilder;
-import com.google.android.material.textfield.TextInputEditText;
-import com.google.android.material.textfield.TextInputLayout;
-
-import app.organicmaps.R;
-import app.organicmaps.sdk.Framework;
-
-public final class CustomMapServerDialog
-{
-  public interface OnUrlAppliedListener
-  {
-    void onUrlApplied(@NonNull String url);
-  }
-
-  private CustomMapServerDialog() {}
-
-  public static void show(@NonNull Context context,
-                          @Nullable OnUrlAppliedListener listener)
-  {
-    View dialogView = LayoutInflater.from(context)
-        .inflate(R.layout.dialog_custom_map_server, null);
-    TextInputLayout til = dialogView.findViewById(R.id.til_custom_map_server);
-    TextInputEditText edit = dialogView.findViewById(R.id.edit_custom_map_server);
-
-    SharedPreferences prefs =
-        PreferenceManager.getDefaultSharedPreferences(context);
-    String current = prefs.getString(context.getString(R.string.pref_custom_map_download_url), "");
-    edit.setText(current);
-
-    MaterialAlertDialogBuilder builder =
-        new MaterialAlertDialogBuilder(context)
-            .setTitle(R.string.download_resources_custom_url_title)
-            .setMessage(R.string.download_resources_custom_url_message)
-            .setView(dialogView)
-            .setNegativeButton(R.string.cancel, null)
-            .setPositiveButton(R.string.save, null);
-
-    AlertDialog dialog = builder.create();
-    dialog.setOnShowListener(dlg -> {
-      Button ok = dialog.getButton(DialogInterface.BUTTON_POSITIVE);
-      ok.setOnClickListener(v -> {
-        String url = edit.getText() != null ? edit.getText().toString().trim() : "";
-
-        if (!url.isEmpty()
-            && !url.startsWith("http://")
-            && !url.startsWith("https://"))
-        {
-          til.setError(context.getString(R.string.download_resources_custom_url_error_scheme));
-          return;
-        }
-
-        til.setError(null);
-
-        String normalizedUrl = Framework.normalizeServerUrl(url);
-
-        prefs.edit()
-            .putString(context.getString(R.string.pref_custom_map_download_url), normalizedUrl)
-            .apply();
-
-        // Apply to native
-        Framework.applyCustomMapDownloadUrl(context, normalizedUrl);
-
-        if (listener != null)
-          listener.onUrlApplied(normalizedUrl);
-
-        dialog.dismiss();
-      });
-    });
-
-    dialog.show();
-  }
-}
--- a/android/app/src/main/java/app/organicmaps/dialog/EditTextDialogFragment.java
+++ b/android/app/src/main/java/app/organicmaps/dialog/EditTextDialogFragment.java
@@ -113,7 +113,7 @@ public class EditTextDialogFragment extends BaseMwmDialogFragment
      negativeButtonText = args.getString(ARG_NEGATIVE_BUTTON);
    }

-    AlertDialog editTextDialog = new MaterialAlertDialogBuilder(requireActivity())
+    AlertDialog editTextDialog = new MaterialAlertDialogBuilder(requireActivity(), R.style.MwmTheme_AlertDialog)
                                     .setView(buildView())
                                     .setNegativeButton(negativeButtonText, null)
                                     .setPositiveButton(positiveButtonText, null)
@@ -152,7 +152,7 @@ public class EditTextDialogFragment extends BaseMwmDialogFragment
    if (mInputValidator != null)
    {
      final String maybeError = mInputValidator.validate(activity, input);
-      mEtInputLayout.setError(maybeError);
+      mEtInputLayout.getEditText().setError(maybeError);
      mEtInputLayout.requestFocus();
      return maybeError == null;
    }
--- a/android/app/src/main/java/app/organicmaps/downloader/DownloaderAdapter.java
+++ b/android/app/src/main/java/app/organicmaps/downloader/DownloaderAdapter.java
@@ -119,7 +119,7 @@ class DownloaderAdapter extends RecyclerView.Adapter<DownloaderAdapter.ViewHolde
  {
    if (RoutingController.get().isNavigating())
    {
-      new MaterialAlertDialogBuilder(adapter.mActivity)
+      new MaterialAlertDialogBuilder(adapter.mActivity, R.style.MwmTheme_AlertDialog)
          .setTitle(R.string.downloader_delete_map)
          .setMessage(R.string.downloader_delete_map_while_routing_dialog)
          .setPositiveButton(R.string.ok, null)
@@ -133,7 +133,7 @@ class DownloaderAdapter extends RecyclerView.Adapter<DownloaderAdapter.ViewHolde
      return;
    }

-    new MaterialAlertDialogBuilder(adapter.mActivity)
+    new MaterialAlertDialogBuilder(adapter.mActivity, R.style.MwmTheme_AlertDialog)
        .setTitle(R.string.downloader_delete_map)
        .setMessage(R.string.downloader_delete_map_dialog)
        .setNegativeButton(R.string.cancel, null)
--- a/android/app/src/main/java/app/organicmaps/downloader/MapManagerHelper.java
+++ b/android/app/src/main/java/app/organicmaps/downloader/MapManagerHelper.java
@@ -49,7 +49,7 @@ public class MapManagerHelper
        return;
    }

-    final AlertDialog dlg = new MaterialAlertDialogBuilder(activity)
+    final AlertDialog dlg = new MaterialAlertDialogBuilder(activity, R.style.MwmTheme_AlertDialog)
                                .setTitle(R.string.country_status_download_failed)
                                .setMessage(getErrorCodeStrRes(errorData.errorCode))
                                .setNegativeButton(R.string.cancel,
@@ -72,7 +72,7 @@ public class MapManagerHelper

  private static void notifyNoSpaceInternal(Activity activity)
  {
-    new MaterialAlertDialogBuilder(activity)
+    new MaterialAlertDialogBuilder(activity, R.style.MwmTheme_AlertDialog)
        .setTitle(R.string.downloader_no_space_title)
        .setMessage(R.string.downloader_no_space_message)
        .setPositiveButton(android.R.string.ok, null)
@@ -123,7 +123,7 @@ public class MapManagerHelper
      return false;
    }

-    new MaterialAlertDialogBuilder(activity)
+    new MaterialAlertDialogBuilder(activity, R.style.MwmTheme_AlertDialog)
        .setTitle(R.string.download_over_mobile_header)
        .setMessage(R.string.download_over_mobile_message)
        .setNegativeButton(R.string.cancel, null)
--- a/android/app/src/main/java/app/organicmaps/editor/EditorFragment.java
+++ b/android/app/src/main/java/app/organicmaps/editor/EditorFragment.java
@@ -196,8 +196,10 @@ public class EditorFragment extends BaseMwmFragment implements View.OnClickListe
      {
        final Context context = mInputBuildingLevels.getContext();
        final boolean isValid = Editor.nativeIsLevelValid(s.toString());
-        mInputBuildingLevels.setError(isValid ? null : context.getString(R.string.error_enter_correct_storey_number,
-                Editor.nativeGetMaxEditableBuildingLevels()));
+        UiUtils.setInputError(mInputBuildingLevels,
+                              isValid ? null
+                                      : context.getString(R.string.error_enter_correct_storey_number,
+                                                          Editor.nativeGetMaxEditableBuildingLevels()));
      }
    });

@@ -493,7 +495,7 @@ public class EditorFragment extends BaseMwmFragment implements View.OnClickListe
      }
    });

-    return new MaterialAlertDialogBuilder(requireActivity())
+    return new MaterialAlertDialogBuilder(requireActivity(), R.style.MwmTheme_AlertDialog)
        .setTitle(R.string.editor_socket)
        .setView(dialogView)
        .setPositiveButton(R.string.save,
@@ -946,7 +948,7 @@ public class EditorFragment extends BaseMwmFragment implements View.OnClickListe

    mDisused.setVisibility(Editor.nativeCanMarkPlaceAsDisused() ? View.VISIBLE : View.GONE);

-    if (Editor.nativeAreSomeFeatureChangesUploaded())
+    if (Editor.nativeIsMapObjectUploaded())
    {
      mReset.setText(R.string.editor_place_doesnt_exist);
      return;
@@ -964,7 +966,7 @@ public class EditorFragment extends BaseMwmFragment implements View.OnClickListe

  private void reset()
  {
-    if (Editor.nativeAreSomeFeatureChangesUploaded())
+    if (Editor.nativeIsMapObjectUploaded())
    {
      placeDoesntExist();
      return;
@@ -997,7 +999,7 @@ public class EditorFragment extends BaseMwmFragment implements View.OnClickListe
      message = R.string.editor_reset_edits_message;
    }

-    new MaterialAlertDialogBuilder(requireActivity())
+    new MaterialAlertDialogBuilder(requireActivity(), R.style.MwmTheme_AlertDialog)
        .setTitle(message)
        .setPositiveButton(title,
                           (dialog, which) -> {
@@ -1020,7 +1022,7 @@ public class EditorFragment extends BaseMwmFragment implements View.OnClickListe

  private void placeDisused()
  {
-    new MaterialAlertDialogBuilder(requireActivity())
+    new MaterialAlertDialogBuilder(requireActivity(), R.style.MwmTheme_AlertDialog)
      .setTitle(R.string.editor_mark_business_vacant_title)
      .setMessage(R.string.editor_mark_business_vacant_description)
      .setPositiveButton(R.string.editor_submit, (dlg, which) -> {
--- a/android/app/src/main/java/app/organicmaps/editor/EditorHostFragment.java
+++ b/android/app/src/main/java/app/organicmaps/editor/EditorHostFragment.java
@@ -352,7 +352,7 @@ public class EditorHostFragment

  private void processNoFeatures()
  {
-    new MaterialAlertDialogBuilder(requireActivity())
+    new MaterialAlertDialogBuilder(requireActivity(), R.style.MwmTheme_AlertDialog)
        .setTitle(R.string.downloader_no_space_title)
        .setPositiveButton(R.string.ok, null)
        .show();
@@ -386,7 +386,7 @@ public class EditorHostFragment

  private void showNoobDialog()
  {
-    new MaterialAlertDialogBuilder(requireActivity())
+    new MaterialAlertDialogBuilder(requireActivity(), R.style.MwmTheme_AlertDialog)
        .setTitle(R.string.editor_share_to_all_dialog_title)
        .setMessage(getString(R.string.editor_share_to_all_dialog_message_1) + " "
                    + getString(R.string.editor_share_to_all_dialog_message_2))
--- a/android/app/src/main/java/app/organicmaps/editor/FeatureCategoryFragment.java
+++ b/android/app/src/main/java/app/organicmaps/editor/FeatureCategoryFragment.java
@@ -155,7 +155,7 @@ public class FeatureCategoryFragment
  // Duplicate of showNoobDialog()
  private void showNoteConfirmationDialog(double lat, double lon, String noteText)
  {
-    new MaterialAlertDialogBuilder(requireActivity())
+    new MaterialAlertDialogBuilder(requireActivity(), R.style.MwmTheme_AlertDialog)
        .setTitle(R.string.editor_share_to_all_dialog_title)
        .setMessage(getString(R.string.editor_share_to_all_dialog_message_1) + " "
                    + getString(R.string.editor_share_to_all_dialog_message_2))
--- a/android/app/src/main/java/app/organicmaps/editor/OsmLoginFragment.java
+++ b/android/app/src/main/java/app/organicmaps/editor/OsmLoginFragment.java
@@ -79,7 +79,7 @@ public class OsmLoginFragment extends BaseMwmToolbarFragment

  private void onAuthFail()
  {
-    new MaterialAlertDialogBuilder(requireActivity())
+    new MaterialAlertDialogBuilder(requireActivity(), R.style.MwmTheme_AlertDialog)
        .setTitle(R.string.editor_login_error_dialog)
        .setPositiveButton(R.string.ok, null)
        .show();
--- a/android/app/src/main/java/app/organicmaps/help/FaqFragment.java
+++ b/android/app/src/main/java/app/organicmaps/help/FaqFragment.java
@@ -66,7 +66,7 @@ public class FaqFragment extends BaseMwmFragment
    FloatingActionButton feedbackFab = root.findViewById(R.id.feedback_fab);
    feedbackFab.setOnClickListener(
        v
-        -> new MaterialAlertDialogBuilder(requireActivity())
+        -> new MaterialAlertDialogBuilder(requireActivity(), R.style.MwmTheme_AlertDialog)
               .setTitle(R.string.feedback)
               .setNegativeButton(R.string.cancel, null)
               .setItems(new CharSequence[] {getString(R.string.feedback_general), getString(R.string.report_a_bug)},
--- a/android/app/src/main/java/app/organicmaps/maplayer/traffic/widget/TrafficButtonController.java
+++ b/android/app/src/main/java/app/organicmaps/maplayer/traffic/widget/TrafficButtonController.java
@@ -107,7 +107,7 @@ public class TrafficButtonController implements TrafficManager.TrafficCallback
    if (mDialog != null && mDialog.isShowing())
      return;

-    mDialog = new MaterialAlertDialogBuilder(mActivity)
+    mDialog = new MaterialAlertDialogBuilder(mActivity, R.style.MwmTheme_AlertDialog)
                  .setMessage(R.string.common_check_internet_connection_dialog)
                  .setPositiveButton(R.string.ok, (dialog, which) -> TrafficManager.INSTANCE.setEnabled(false))
                  .setCancelable(true)
--- a/android/app/src/main/java/app/organicmaps/routing/BaseRoutingErrorDialogFragment.java
+++ b/android/app/src/main/java/app/organicmaps/routing/BaseRoutingErrorDialogFragment.java
@@ -56,7 +56,7 @@ abstract class BaseRoutingErrorDialogFragment extends BaseMwmDialogFragment
  public Dialog onCreateDialog(Bundle savedInstanceState)
  {
    parseArguments();
-    MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(requireActivity())
+    MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(requireActivity(), R.style.MwmTheme_AlertDialog)
                                             .setCancelable(true)
                                             .setNegativeButton(android.R.string.cancel, null);
    beforeDialogCreated(builder);
--- a/android/app/src/main/java/app/organicmaps/routing/NavigationController.java
+++ b/android/app/src/main/java/app/organicmaps/routing/NavigationController.java
@@ -98,11 +98,6 @@ public class NavigationController implements TrafficManager.TrafficCallback, Nav
    mSpeedLimit = topFrame.findViewById(R.id.nav_speed_limit);
    mCurrentSpeed = topFrame.findViewById(R.id.nav_current_speed);

-    View mTopbar = topFrame.findViewById(R.id.statutbar);
-    ViewCompat.setOnApplyWindowInsetsListener(mTopbar,(v, windowInsets) -> {
-        UiUtils.setViewNavigationTopInsetsMargin(v, windowInsets);
-        return windowInsets;
-    });
    // Show a blank view below the navbar to hide the menu content
    final View navigationBarBackground = mFrame.findViewById(R.id.nav_bottom_sheet_nav_bar);
    final View nextTurnContainer = mFrame.findViewById(R.id.nav_next_turn_container);
--- a/android/app/src/main/java/app/organicmaps/settings/BaseXmlSettingsFragment.java
+++ b/android/app/src/main/java/app/organicmaps/settings/BaseXmlSettingsFragment.java
@@ -6,10 +6,12 @@ import android.view.View;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.annotation.XmlRes;
+import androidx.core.content.ContextCompat;
 import androidx.core.view.ViewCompat;
 import androidx.preference.Preference;
 import androidx.preference.PreferenceFragmentCompat;
 import androidx.recyclerview.widget.RecyclerView;
+import app.organicmaps.R;
 import app.organicmaps.util.Utils;
 import app.organicmaps.util.WindowInsetUtils.ScrollableContentInsetsListener;

@@ -42,6 +44,7 @@ abstract class BaseXmlSettingsFragment extends PreferenceFragmentCompat
  public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState)
  {
    super.onViewCreated(view, savedInstanceState);
+    view.setBackgroundColor(ContextCompat.getColor(requireContext(), R.color.bg_cards));
    RecyclerView recyclerView = getListView();
    ViewCompat.setOnApplyWindowInsetsListener(recyclerView, new ScrollableContentInsetsListener(recyclerView));
  }
--- a/android/app/src/main/java/app/organicmaps/settings/SettingsPrefsFragment.java
+++ b/android/app/src/main/java/app/organicmaps/settings/SettingsPrefsFragment.java
@@ -4,23 +4,16 @@ import static app.organicmaps.leftbutton.LeftButtonsHolder.DISABLE_BUTTON_CODE;

 import android.annotation.SuppressLint;
 import android.content.Intent;
-import android.content.SharedPreferences;
 import android.os.Bundle;
 import android.view.View;
-
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.preference.ListPreference;
 import androidx.preference.Preference;
 import androidx.preference.PreferenceCategory;
-import androidx.preference.PreferenceManager;
 import androidx.preference.TwoStatePreference;
-
-import com.google.android.material.dialog.MaterialAlertDialogBuilder;
-
 import app.organicmaps.MwmApplication;
 import app.organicmaps.R;
-import app.organicmaps.dialog.CustomMapServerDialog;
 import app.organicmaps.downloader.OnmapDownloader;
 import app.organicmaps.editor.LanguagesFragment;
 import app.organicmaps.editor.ProfileActivity;
@@ -42,7 +35,7 @@ import app.organicmaps.sdk.util.SharedPropertiesUtils;
 import app.organicmaps.sdk.util.log.LogsManager;
 import app.organicmaps.util.ThemeSwitcher;
 import app.organicmaps.util.Utils;
-
+import com.google.android.material.dialog.MaterialAlertDialogBuilder;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
@@ -80,7 +73,6 @@ public class SettingsPrefsFragment extends BaseXmlSettingsFragment implements La
    initScreenSleepEnabledPrefsCallbacks();
    initShowOnLockScreenPrefsCallbacks();
    initLeftButtonPrefs();
-    initCustomMapDownloadUrlPrefsCallbacks();
  }

  private void initLeftButtonPrefs()
@@ -494,7 +486,7 @@ public class SettingsPrefsFragment extends BaseXmlSettingsFragment implements La
    pref.setOnPreferenceClickListener(preference -> {
      if (MapManager.nativeIsDownloading())
      {
-        new MaterialAlertDialogBuilder(requireActivity())
+        new MaterialAlertDialogBuilder(requireActivity(), R.style.MwmTheme_AlertDialog)
            .setTitle(R.string.downloading_is_active)
            .setMessage(R.string.cant_change_this_setting)
            .setPositiveButton(R.string.ok, null)
@@ -543,34 +535,6 @@ public class SettingsPrefsFragment extends BaseXmlSettingsFragment implements La
    });
  }

-  private void initCustomMapDownloadUrlPrefsCallbacks()
-  {
-    Preference customUrlPref = getPreference(getString(R.string.pref_custom_map_download_url));
-
-    SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(requireContext());
-
-    String current = prefs.getString(getString(R.string.pref_custom_map_download_url), "");
-    String normalizedUrl = Framework.normalizeServerUrl(current);
-
-    // Initial summary
-    customUrlPref.setSummary(normalizedUrl.isEmpty()
-        ? getString(R.string.download_resources_custom_url_summary_none)
-        : normalizedUrl);
-
-    // Sync native
-    Framework.applyCustomMapDownloadUrl(requireContext(), normalizedUrl);
-
-    // Show dialog
-    customUrlPref.setOnPreferenceClickListener(preference -> {
-      CustomMapServerDialog.show(requireContext(), url -> {
-        preference.setSummary(url.isEmpty()
-            ? getString(R.string.download_resources_custom_url_summary_none)
-            : url);
-      });
-      return true;
-    });
-  }
-
  private void removePreference(@NonNull String categoryKey, @NonNull Preference preference)
  {
    final PreferenceCategory category = getPreference(categoryKey);
--- a/android/app/src/main/java/app/organicmaps/settings/StoragePathFragment.java
+++ b/android/app/src/main/java/app/organicmaps/settings/StoragePathFragment.java
@@ -97,7 +97,7 @@ public class StoragePathFragment extends BaseSettingsFragment
    final String oldPath = storages.get(currentIndex).mPath;
    final String newPath = storages.get(newIndex).mPath;

-    new MaterialAlertDialogBuilder(requireActivity())
+    new MaterialAlertDialogBuilder(requireActivity(), R.style.MwmTheme_AlertDialog)
        .setCancelable(false)
        .setTitle(R.string.move_maps)
        .setPositiveButton(R.string.ok, (dlg, which) -> moveStorage(newPath, oldPath))
@@ -133,7 +133,7 @@ public class StoragePathFragment extends BaseSettingsFragment

        if (!result)
        {
-          new MaterialAlertDialogBuilder(requireActivity())
+          new MaterialAlertDialogBuilder(requireActivity(), R.style.MwmTheme_AlertDialog)
              .setTitle(R.string.move_maps_error)
              .setPositiveButton(
                  R.string.report_a_bug,
--- a/android/app/src/main/java/app/organicmaps/util/ThemeSwitcher.java
+++ b/android/app/src/main/java/app/organicmaps/util/ThemeSwitcher.java
@@ -90,7 +90,8 @@ public enum ThemeSwitcher
    {
      if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S)
        uiModeManager.setApplicationNightMode(UiModeManager.MODE_NIGHT_YES);
-      AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_YES);
+      else
+        AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_YES);

      if (RoutingController.get().isVehicleNavigation())
        style = MapStyle.VehicleDark;
@@ -103,7 +104,8 @@ public enum ThemeSwitcher
    {
      if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S)
        uiModeManager.setApplicationNightMode(UiModeManager.MODE_NIGHT_NO);
-      AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_NO);
+      else
+        AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_NO);

      if (RoutingController.get().isVehicleNavigation())
        style = MapStyle.VehicleClear;
--- a/android/app/src/main/java/app/organicmaps/util/UiUtils.java
+++ b/android/app/src/main/java/app/organicmaps/util/UiUtils.java
@@ -24,6 +24,7 @@ import androidx.annotation.ColorInt;
 import androidx.annotation.IdRes;
 import androidx.annotation.NonNull;
 import androidx.annotation.StringRes;
+import androidx.core.content.ContextCompat;
 import androidx.core.content.res.ResourcesCompat;
 import androidx.core.graphics.Insets;
 import androidx.core.view.WindowCompat;
@@ -195,7 +196,7 @@ public final class UiUtils
  public static void showHomeUpButton(MaterialToolbar toolbar)
  {
    toolbar.setNavigationIcon(
-        UiUtils.getStyledResourceId(toolbar.getContext(), androidx.appcompat.R.attr.homeAsUpIndicator));
+        ThemeUtils.getResource(toolbar.getContext(), androidx.appcompat.R.attr.homeAsUpIndicator));
  }

  // this method returns the total height of the display (in pixels) including notch and other touchable areas
@@ -208,7 +209,15 @@ public final class UiUtils
  }
  public static void setInputError(@NonNull TextInputLayout layout, @StringRes int error)
  {
-    layout.setError(error == 0 ? null : layout.getContext().getString(error));
+    setInputError(layout, error == 0 ? null : layout.getContext().getString(error));
+  }
+
+  public static void setInputError(@NonNull TextInputLayout layout, String error)
+  {
+    layout.getEditText().setError(error);
+    layout.getEditText().setTextColor(error == null
+                                          ? ThemeUtils.getColor(layout.getContext(), android.R.attr.textColorPrimary)
+                                          : ContextCompat.getColor(layout.getContext(), R.color.base_red));
  }

  public static void setFullscreen(@NonNull Activity activity, boolean fullscreen)
@@ -272,14 +281,6 @@ public final class UiUtils
    view.setPadding(systemInsets.left, systemInsets.top, systemInsets.right, view.getPaddingBottom());
  }

-  public static void setViewNavigationTopInsetsMargin(View view, WindowInsetsCompat windowInsets)
-  {
-      final Insets systemInsets = windowInsets.getInsets(WindowInsetsCompat.Type.systemBars());
-      ViewGroup.MarginLayoutParams lp = (ViewGroup.MarginLayoutParams) view.getLayoutParams();
-      lp.topMargin = systemInsets.top;
-      view.setLayoutParams(lp);
-  }
-
  public static void setupNavigationIcon(@NonNull MaterialToolbar toolbar, @NonNull View.OnClickListener listener)
  {
    View customNavigationButton = toolbar.findViewById(R.id.back);
--- a/android/app/src/main/java/app/organicmaps/widget/StackedButtonsDialog.java
+++ b/android/app/src/main/java/app/organicmaps/widget/StackedButtonsDialog.java
@@ -61,7 +61,6 @@ public class StackedButtonsDialog extends AppCompatDialog implements View.OnClic
    setCancelable(mCancelable);
    setOnCancelListener(mCancelListener);
    setContentView(R.layout.dialog_stacked_buttons);
-    getWindow().setBackgroundDrawableResource(android.R.color.transparent);

    TextView title = findViewById(R.id.tv__title);
    UiUtils.setTextAndHideIfEmpty(title, mTitle);
--- a/android/app/src/main/java/app/organicmaps/widget/placepage/BookmarkColorDialogFragment.java
+++ b/android/app/src/main/java/app/organicmaps/widget/placepage/BookmarkColorDialogFragment.java
@@ -47,7 +47,7 @@ public class BookmarkColorDialogFragment extends BaseMwmDialogFragment
        mIconResId = getArguments().getInt(ICON_RES);
    }

-    return new MaterialAlertDialogBuilder(requireActivity())
+    return new MaterialAlertDialogBuilder(requireActivity(), R.style.MwmTheme_AlertDialog)
        .setView(buildView())
        .setTitle(R.string.choose_color)
        .setNegativeButton(R.string.cancel, null)
--- a/android/app/src/main/java/app/organicmaps/widget/placepage/PlacePageController.java
+++ b/android/app/src/main/java/app/organicmaps/widget/placepage/PlacePageController.java
@@ -464,7 +464,7 @@ public class PlacePageController
      mAlertDialog.show();
      return;
    }
-    mAlertDialog = new MaterialAlertDialogBuilder(requireContext())
+    mAlertDialog = new MaterialAlertDialogBuilder(requireContext(), R.style.MwmTheme_AlertDialog)
                       .setTitle(requireContext().getString(R.string.delete_track_dialog_title, mMapObject.getTitle()))
                       .setCancelable(true)
                       .setNegativeButton(R.string.cancel, null)
--- a/android/app/src/main/java/app/organicmaps/widget/placepage/PlacePageView.java
+++ b/android/app/src/main/java/app/organicmaps/widget/placepage/PlacePageView.java
@@ -154,7 +154,6 @@ public class PlacePageView extends Fragment
  private MaterialTextView mTvLastChecked;
  private View mEditPlace;
  private View mAddPlace;
-  private View mMapTooOld;
  private View mEditTopSpace;
  private ShapeableImageView mColorIcon;
  private MaterialTextView mTvCategory;
@@ -319,7 +318,6 @@ public class PlacePageView extends Fragment
    mTvLastChecked = mFrame.findViewById(R.id.place_page_last_checked);
    mEditPlace = mFrame.findViewById(R.id.ll__place_editor);
    mAddPlace = mFrame.findViewById(R.id.ll__place_add);
-    mMapTooOld = mFrame.findViewById(R.id.cv__map_too_old);
    mEditTopSpace = mFrame.findViewById(R.id.edit_top_space);
    latlon.setOnLongClickListener(this);
    address.setOnLongClickListener(this);
@@ -428,9 +426,8 @@ public class PlacePageView extends Fragment

  private void updateBookmarkView()
  {
-   boolean enabled = mMapObject.isBookmark() || mMapObject.isTrack();
    updateViewFragment(PlacePageBookmarkFragment.class, BOOKMARK_FRAGMENT_TAG, R.id.place_page_bookmark_fragment,
-                       enabled);
+                       mMapObject.isBookmark());
  }

  private void updateTrackView()
@@ -687,84 +684,39 @@ public class PlacePageView extends Fragment

    if (RoutingController.get().isNavigating() || RoutingController.get().isPlanning())
    {
-      UiUtils.hide(mEditPlace, mAddPlace, mEditTopSpace, mMapTooOld);
+      UiUtils.hide(mEditPlace, mAddPlace, mEditTopSpace);
    }
    else
    {
      UiUtils.showIf(Editor.nativeShouldShowEditPlace(), mEditPlace);
      UiUtils.showIf(Editor.nativeShouldShowAddPlace(), mAddPlace);
-      UiUtils.hide(mMapTooOld);
      MaterialButton mTvEditPlace = mEditPlace.findViewById(R.id.mb__place_editor);
      MaterialButton mTvAddPlace = mAddPlace.findViewById(R.id.mb__place_add);
-
-      boolean shouldEnableEditPlace = Editor.nativeShouldEnableEditPlace();
-
-      if (shouldEnableEditPlace)
-      {
-        mTvEditPlace.setEnabled(true);
-        mTvAddPlace.setEnabled(true);
-        mTvEditPlace.setOnClickListener(this);
-        mTvAddPlace.setOnClickListener(this);
-      }
-      else
-      {
-        String countryId = MapManager.nativeGetSelectedCountry();
-
-        if (countryId != null && MapManager.nativeIsMapTooOldToEdit(countryId))
-        {
-          // map editing is disabled because the map is too old
-          mTvEditPlace.setEnabled(true);
-          mTvAddPlace.setEnabled(true);
-          mTvEditPlace.setOnClickListener((v) -> {
-            Utils.showSnackbar(v.getContext(), v.getRootView(), R.string.place_page_too_old_to_edit);
-          });
-          mTvAddPlace.setOnClickListener((v) -> {
-            Utils.showSnackbar(v.getContext(), v.getRootView(), R.string.place_page_too_old_to_edit);
-          });
-
-          CountryItem map = CountryItem.fill(countryId);
-
-          if (map.status == CountryItem.STATUS_UPDATABLE || map.status == CountryItem.STATUS_DONE
-              || map.status == CountryItem.STATUS_FAILED)
-          {
-            UiUtils.show(mMapTooOld);
-
-            boolean canUpdateMap = map.status != CountryItem.STATUS_DONE;
-            MaterialButton mTvUpdateTooOldMap = mMapTooOld.findViewById(R.id.mb__update_too_old_map);
-            UiUtils.showIf(canUpdateMap, mTvUpdateTooOldMap);
-
-            MaterialTextView mapTooOldDescription = mMapTooOld.findViewById(R.id.tv__map_too_old_description);
-            if (canUpdateMap)
-            {
-              mapTooOldDescription.setText(R.string.place_page_map_too_old_description);
-              mTvUpdateTooOldMap.setOnClickListener((v) -> {
-                MapManagerHelper.warn3gAndDownload(requireActivity(), map.id, null);
-                UiUtils.hide(mMapTooOld);
-              });
-            }
-            else
-              mapTooOldDescription.setText(R.string.place_page_app_too_old_description);
-          }
-        }
-        else
-        {
-          // map editing is disabled for other reasons
-          mTvEditPlace.setEnabled(false);
-          mTvAddPlace.setEnabled(false);
-        }
-      }
-
-      final int editButtonColor =
-          shouldEnableEditPlace
+      mTvEditPlace.setOnClickListener(this);
+      mTvAddPlace.setOnClickListener(this);
+      mTvEditPlace.setEnabled(Editor.nativeShouldEnableEditPlace());
+      mTvAddPlace.setEnabled(Editor.nativeShouldEnableAddPlace());
+      final int editTextButtonColor =
+          Editor.nativeShouldEnableEditPlace()
              ? ContextCompat.getColor(
                    getContext(),
                    UiUtils.getStyledResourceId(getContext(), com.google.android.material.R.attr.colorSecondary))
              : ContextCompat.getColor(getContext(), R.color.button_accent_text_disabled);
-
-      mTvEditPlace.setTextColor(editButtonColor);
-      mTvAddPlace.setTextColor(editButtonColor);
-      mTvEditPlace.setStrokeColor(ColorStateList.valueOf(editButtonColor));
-      mTvAddPlace.setStrokeColor(ColorStateList.valueOf(editButtonColor));
+      final ColorStateList editStrokeButtonColor = new ColorStateList(
+              new int[][]{
+                      new int[]{android.R.attr.state_enabled}, // enabled
+                      new int[]{-android.R.attr.state_enabled} // disabled
+      },
+              new int[]{
+                      ContextCompat.getColor(
+                              getContext(),
+                              UiUtils.getStyledResourceId(getContext(), com.google.android.material.R.attr.colorSecondary)),
+                      ContextCompat.getColor(getContext(), R.color.button_accent_text_disabled)
+              });
+      mTvEditPlace.setTextColor(editTextButtonColor);
+      mTvAddPlace.setTextColor(editTextButtonColor);
+      mTvEditPlace.setStrokeColor(editStrokeButtonColor);
+      mTvAddPlace.setStrokeColor(editStrokeButtonColor);
      UiUtils.showIf(
          UiUtils.isVisible(mEditPlace) || UiUtils.isVisible(mAddPlace),
          mEditTopSpace);
--- a/android/app/src/main/java/app/organicmaps/widget/placepage/sections/PlacePageBookmarkFragment.java
+++ b/android/app/src/main/java/app/organicmaps/widget/placepage/sections/PlacePageBookmarkFragment.java
@@ -23,7 +23,6 @@ import app.organicmaps.R;
 import app.organicmaps.sdk.bookmarks.data.Bookmark;
 import app.organicmaps.sdk.bookmarks.data.BookmarkManager;
 import app.organicmaps.sdk.bookmarks.data.MapObject;
-import app.organicmaps.sdk.bookmarks.data.Track;
 import app.organicmaps.sdk.util.StringUtils;
 import app.organicmaps.util.UiUtils;
 import app.organicmaps.util.Utils;
@@ -42,7 +41,6 @@ public class PlacePageBookmarkFragment extends Fragment implements View.OnClickL
  private PlacePageViewModel mViewModel;

  private Bookmark currentBookmark;
-  private Track currentTrack;

  @Nullable
  @Override
@@ -90,15 +88,7 @@ public class PlacePageBookmarkFragment extends Fragment implements View.OnClickL

  private void updateBookmarkDetails()
  {
-      String notes = null;
-      if (currentBookmark != null)
-      {
-          notes = currentBookmark.getBookmarkDescription();
-      }
-      if (currentTrack != null)
-      {
-          notes = currentTrack.getTrackDescription();
-      }
+    final String notes = currentBookmark.getBookmarkDescription();
    if (TextUtils.isEmpty(notes))
    {
      UiUtils.hide(mTvBookmarkNote);
@@ -130,16 +120,8 @@ public class PlacePageBookmarkFragment extends Fragment implements View.OnClickL
  public void onClick(View v)
  {
    final FragmentActivity activity = requireActivity();
-    if (currentBookmark != null)
-    {
-        EditBookmarkFragment.editBookmark(currentBookmark.getCategoryId(), currentBookmark.getBookmarkId(), activity,
-                getChildFragmentManager(), PlacePageBookmarkFragment.this);
-    }
-    else if (currentTrack != null)
-    {
-        EditBookmarkFragment.editBookmark(currentTrack.getCategoryId(), currentTrack.getTrackId(), activity,
-                getChildFragmentManager(), PlacePageBookmarkFragment.this);
-    }
+    EditBookmarkFragment.editBookmark(currentBookmark.getCategoryId(), currentBookmark.getBookmarkId(), activity,
+                                      getChildFragmentManager(), PlacePageBookmarkFragment.this);
  }

  @Override
@@ -170,11 +152,6 @@ public class PlacePageBookmarkFragment extends Fragment implements View.OnClickL
      currentBookmark = (Bookmark) mapObject;
      updateBookmarkDetails();
    }
-    if (mapObject != null && mapObject.isTrack())
-    {
-      currentTrack = (Track) mapObject;
-      updateBookmarkDetails();
-    }
  }

  @Override
--- a/android/app/src/main/res/drawable/bg_clickable_card.xml
+++ b/android/app/src/main/res/drawable/bg_clickable_card.xml
@@ -4,7 +4,7 @@
  android:color="?colorControlHighlight">
  <item>
    <shape>
-      <solid android:color="?appBackground" />
+      <solid android:color="?cardBackground" />
    </shape>
  </item>
  <item android:id="@android:id/mask">
--- a/android/app/src/main/res/drawable/bg_search_wheel_background_rect.xml
+++ b/android/app/src/main/res/drawable/bg_search_wheel_background_rect.xml
@@ -2,6 +2,6 @@
 <shape
  xmlns:android="http://schemas.android.com/apk/res/android"
  android:shape="rectangle">
-  <solid android:color="@color/bg_window"/>
+  <solid android:color="@color/bg_panel"/>
  <corners android:radius="100dp"/>
 </shape>
--- a/android/app/src/main/res/drawable/bg_search_wheel_background_round.xml
+++ b/android/app/src/main/res/drawable/bg_search_wheel_background_round.xml
@@ -2,5 +2,5 @@
 <shape
  xmlns:android="http://schemas.android.com/apk/res/android"
  android:shape="oval">
-  <solid android:color="@color/bg_window"/>
+  <solid android:color="@color/bg_panel"/>
 </shape>
--- a/android/app/src/main/res/drawable/ic_browse_activity.xml
+++ b/android/app/src/main/res/drawable/ic_browse_activity.xml
@@ -3,7 +3,7 @@
    android:height="24dp"
    android:viewportWidth="960"
    android:viewportHeight="960"
-    android:tint="?iconTint">
+    android:tint="?colorControlNormal">
  <path
      android:pathData="M80,360v-160q0,-33 23.5,-56.5T160,120h640q33,0 56.5,23.5T880,200v160h-80v-160L160,200v160L80,360ZM160,720q-33,0 -56.5,-23.5T80,640v-200h80v200h640v-200h80v200q0,33 -23.5,56.5T800,720L160,720ZM40,840v-80h880v80L40,840ZM480,420ZM80,440v-80h240q11,0 21,6t15,16l47,93 123,-215q5,-9 14,-14.5t20,-5.5q11,0 21,5.5t15,16.5l49,98h235v80L620,440q-11,0 -21,-5.5T584,418l-26,-53 -123,215q-5,10 -15,15t-21,5q-11,0 -20.5,-6T364,578l-69,-138L80,440Z"
      android:fillColor="#fff"/>
--- a/android/app/src/main/res/drawable/ic_cloud_download.xml
+++ b/android/app/src/main/res/drawable/ic_cloud_download.xml
@@ -1,11 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:tint="?iconTint"
-    android:height="24dp"
-    android:width="24dp"
-    android:viewportHeight="960"
-    android:viewportWidth="960">
-      
-    <path android:fillColor="@android:color/white"
-        android:pathData="M260,800Q169,800 104.5,737Q40,674 40,583Q40,505 87,444Q134,383 210,366Q227,294 295,229Q363,164 440,164Q473,164 496.5,187.5Q520,211 520,244L520,486L584,424L640,480L480,640L320,480L376,424L440,486L440,244Q364,258 322,317.5Q280,377 280,440L260,440Q202,440 161,481Q120,522 120,580Q120,638 161,679Q202,720 260,720L740,720Q782,720 811,691Q840,662 840,620Q840,578 811,549Q782,520 740,520L680,520L680,440Q680,392 658,350.5Q636,309 600,280L600,187Q674,222 717,290.5Q760,359 760,440L760,440L760,440Q829,448 874.5,499.5Q920,551 920,620Q920,695 867.5,747.5Q815,800 740,800L260,800ZM480,442Q480,442 480,442Q480,442 480,442L480,442Q480,442 480,442Q480,442 480,442L480,442Q480,442 480,442Q480,442 480,442L480,442Q480,442 480,442Q480,442 480,442Q480,442 480,442Q480,442 480,442L480,442Q480,442 480,442Q480,442 480,442Q480,442 480,442Q480,442 480,442L480,442L480,442Q480,442 480,442Q480,442 480,442Z"/>
-    
-</vector>
--- a/android/app/src/main/res/drawable/ic_dark_mode.xml
+++ b/android/app/src/main/res/drawable/ic_dark_mode.xml
@@ -3,7 +3,7 @@
    android:height="24dp"
    android:viewportWidth="960"
    android:viewportHeight="960"
-    android:tint="?iconTint">
+    android:tint="?colorControlNormal">
  <path
      android:pathData="M480,840q-150,0 -255,-105T120,480q0,-150 105,-255t255,-105q14,0 27.5,1t26.5,3q-41,29 -65.5,75.5T444,300q0,90 63,153t153,63q55,0 101,-24.5t75,-65.5q2,13 3,26.5t1,27.5q0,150 -105,255T480,840ZM480,760q88,0 158,-48.5T740,585q-20,5 -40,8t-40,3q-123,0 -209.5,-86.5T364,300q0,-20 3,-40t8,-40q-78,32 -126.5,102T200,480q0,116 82,198t198,82ZM470,490Z"
      android:fillColor="#fff"/>
--- a/android/app/src/main/res/drawable/ic_download_st.xml
+++ b/android/app/src/main/res/drawable/ic_download_st.xml
@@ -3,7 +3,7 @@
    android:height="24dp"
    android:viewportWidth="24"
    android:viewportHeight="24"
-    android:tint="?iconTint">
+    android:tint="?colorControlNormal">
    <path
        android:pathData="M19,9h-4v-6h-6v6h-4l7,7 7,-7ZM5,18v2h14v-2h-14Z"
        android:fillColor="#FFF"/>
--- a/android/app/src/main/res/drawable/ic_eco.xml
+++ b/android/app/src/main/res/drawable/ic_eco.xml
@@ -3,7 +3,7 @@
    android:height="24dp"
    android:viewportWidth="960"
    android:viewportHeight="960"
-    android:tint="?iconTint">
+    android:tint="?colorControlNormal">
  <path
      android:pathData="M216,784q-45,-45 -70.5,-104T120,558q0,-63 24,-124.5T222,318q35,-35 86.5,-60t122,-39.5Q501,204 591.5,201t202.5,7q8,106 5,195t-16.5,160.5q-13.5,71.5 -38,125T684,778q-53,53 -112.5,77.5T450,880q-65,0 -127,-25.5T216,784ZM328,768q29,17 59.5,24.5T450,800q46,0 91,-18.5t86,-59.5q18,-18 36.5,-50.5t32,-85Q709,534 716,459.5t2,-177.5q-49,-2 -110.5,-1.5T485,290q-61,9 -116,29t-90,55q-45,45 -62,89t-17,85q0,59 22.5,103.5T262,714q42,-80 111,-153.5T534,440q-72,63 -125.5,142.5T328,768ZM328,768ZM328,768Z"
      android:fillColor="#fff"/>
--- a/android/app/src/main/res/drawable/ic_instant_mix.xml
+++ b/android/app/src/main/res/drawable/ic_instant_mix.xml
@@ -3,7 +3,7 @@
    android:height="24dp"
    android:viewportWidth="960"
    android:viewportHeight="960"
-    android:tint="?iconTint">
+    android:tint="?colorControlNormal">
  <path
      android:pathData="M200,800v-280h-80v-80h240v80h-80v280h-80ZM200,360v-200h80v200h-80ZM360,360v-80h80v-120h80v120h80v80L360,360ZM440,800v-360h80v360h-80ZM680,800v-120h-80v-80h240v80h-80v120h-80ZM680,520v-360h80v360h-80Z"
      android:fillColor="#fff"/>
--- a/android/app/src/main/res/drawable/ic_minus.xml
+++ b/android/app/src/main/res/drawable/ic_minus.xml
@@ -1,9 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
    android:width="24dp"
    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
+    android:viewportWidth="960"
+    android:viewportHeight="960">
  <path
-      android:pathData="M19,13H5v-2h14v2z"
+      android:pathData="M240,520q-17,0 -28.5,-11.5T200,480q0,-17 11.5,-28.5T240,440h480q17,0 28.5,11.5T760,480q0,17 -11.5,28.5T720,520L240,520Z"
      android:fillColor="#ffffff"/>
 </vector>
--- a/android/app/src/main/res/drawable/ic_mobile_lock_portrait.xml
+++ b/android/app/src/main/res/drawable/ic_mobile_lock_portrait.xml
@@ -3,7 +3,7 @@
    android:height="24dp"
    android:viewportWidth="960"
    android:viewportHeight="960"
-    android:tint="?iconTint">
+    android:tint="?colorControlNormal">
  <path
      android:pathData="M280,920q-33,0 -56.5,-23.5T200,840v-720q0,-33 23.5,-56.5T280,40h400q33,0 56.5,23.5T760,120v124q18,7 29,22t11,34v80q0,19 -11,34t-29,22v404q0,33 -23.5,56.5T680,920L280,920ZM280,840h400v-720L280,120v720ZM280,840v-720,720ZM394,640h172q14,0 24,-10t10,-24v-132q0,-14 -10,-24t-24,-10h-6v-40q0,-33 -23.5,-56.5T480,320q-33,0 -56.5,23.5T400,400v40h-6q-14,0 -24,10t-10,24v132q0,14 10,24t24,10ZM440,440v-40q0,-17 11.5,-28.5T480,360q17,0 28.5,11.5T520,400v40h-80Z"
      android:fillColor="#fff"/>
--- a/android/app/src/main/res/drawable/ic_network_manage.xml
+++ b/android/app/src/main/res/drawable/ic_network_manage.xml
@@ -3,7 +3,7 @@
    android:height="24dp"
    android:viewportWidth="960"
    android:viewportHeight="960"
-    android:tint="?iconTint">
+    android:tint="?colorControlNormal">
  <path
      android:pathData="M339,698q22,-22 49.5,-36t58.5,-19q-5,19 -8,38t-3,39q0,24 3.5,47t11.5,44L339,698ZM254,614 L170,528q62,-62 142,-95t168,-33q49,0 96,10.5t90,30.5q-44,8 -81.5,29T517,522q-9,-1 -18.5,-1.5T480,520q-64,0 -122.5,24.5T254,614ZM84,444 L0,360q95,-97 219.5,-148.5T480,160q136,0 260.5,51.5T960,360l-84,84q-79,-79 -181.5,-121.5T480,280q-112,0 -214.5,42.5T84,444ZM760,520 L772,580q12,5 22.5,10.5T816,604l58,-18 40,68 -46,40q2,12 2,26t-2,26l46,40 -40,68 -58,-18q-11,8 -21.5,13.5T772,860l-12,60h-80l-12,-60q-12,-5 -22.5,-10.5T624,836l-58,18 -40,-68 46,-40q-2,-12 -2,-26t2,-26l-46,-40 40,-68 58,18q11,-8 21.5,-13.5T668,580l12,-60h80ZM720,640q-33,0 -56.5,23.5T640,720q0,33 23.5,56.5T720,800q33,0 56.5,-23.5T800,720q0,-33 -23.5,-56.5T720,640Z"
      android:fillColor="#fff"/>
--- a/android/app/src/main/res/drawable/ic_plus.xml
+++ b/android/app/src/main/res/drawable/ic_plus.xml
@@ -1,9 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
    android:width="24dp"
    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
+    android:viewportWidth="960"
+    android:viewportHeight="960">
  <path
-      android:pathData="M19,13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z"
+      android:pathData="M440,520L240,520q-17,0 -28.5,-11.5T200,480q0,-17 11.5,-28.5T240,440h200v-200q0,-17 11.5,-28.5T480,200q17,0 28.5,11.5T520,240v200h200q17,0 28.5,11.5T760,480q0,17 -11.5,28.5T720,520L520,520v200q0,17 -11.5,28.5T480,760q-17,0 -28.5,-11.5T440,720v-200Z"
      android:fillColor="@android:color/white"/>
 </vector>
--- a/android/app/src/main/res/drawable/ic_profile.xml
+++ b/android/app/src/main/res/drawable/ic_profile.xml
@@ -3,7 +3,7 @@
    android:height="24dp"
    android:viewportWidth="960"
    android:viewportHeight="960"
-    android:tint="?iconTint">
+    android:tint="?colorControlNormal">
  <path
      android:pathData="M480,480q-66,0 -113,-47t-47,-113q0,-66 47,-113t113,-47q66,0 113,47t47,113q0,66 -47,113t-113,47ZM160,800v-112q0,-34 17.5,-62.5T224,582q62,-31 126,-46.5T480,520q66,0 130,15.5T736,582q29,15 46.5,43.5T800,688v112L160,800ZM240,720h480v-32q0,-11 -5.5,-20T700,654q-54,-27 -109,-40.5T480,600q-56,0 -111,13.5T260,654q-9,5 -14.5,14t-5.5,20v32ZM480,400q33,0 56.5,-23.5T560,320q0,-33 -23.5,-56.5T480,240q-33,0 -56.5,23.5T400,320q0,33 23.5,56.5T480,400ZM480,320ZM480,720Z"
      android:fillColor="#fff"/>
--- a/android/app/src/main/res/drawable/ic_record_voice_over.xml
+++ b/android/app/src/main/res/drawable/ic_record_voice_over.xml
@@ -3,7 +3,7 @@
    android:height="24dp"
    android:viewportWidth="960"
    android:viewportHeight="960"
-    android:tint="?iconTint">
+    android:tint="?colorControlNormal">
  <path
      android:pathData="m798,638 l-62,-62q44,-41 69,-97t25,-119q0,-63 -25,-118t-69,-96l62,-64q56,53 89,125t33,153q0,81 -33,153t-89,125ZM670,510l-64,-64q18,-17 29,-38.5t11,-47.5q0,-26 -11,-47.5T606,274l64,-64q32,29 50,67.5t18,82.5q0,44 -18,82.5T670,510ZM360,520q-66,0 -113,-47t-47,-113q0,-66 47,-113t113,-47q66,0 113,47t47,113q0,66 -47,113t-113,47ZM40,840v-112q0,-33 17,-62t47,-44q51,-26 115,-44t141,-18q77,0 141,18t115,44q30,15 47,44t17,62v112L40,840ZM120,760h480v-32q0,-11 -5.5,-20T580,694q-36,-18 -92.5,-36T360,640q-71,0 -127.5,18T140,694q-9,5 -14.5,14t-5.5,20v32ZM360,440q33,0 56.5,-23.5T440,360q0,-33 -23.5,-56.5T360,280q-33,0 -56.5,23.5T280,360q0,33 23.5,56.5T360,440ZM360,360ZM360,760Z"
      android:fillColor="#fff"/>
--- a/android/app/src/main/res/drawable/ic_sd_card.xml
+++ b/android/app/src/main/res/drawable/ic_sd_card.xml
@@ -3,7 +3,7 @@
    android:height="24dp"
    android:viewportWidth="960"
    android:viewportHeight="960"
-    android:tint="?iconTint">
+    android:tint="?colorControlNormal">
  <path
      android:pathData="M360,440h80v-160h-80v160ZM480,440h80v-160h-80v160ZM600,440h80v-160h-80v160ZM240,880q-33,0 -56.5,-23.5T160,800v-480l240,-240h320q33,0 56.5,23.5T800,160v640q0,33 -23.5,56.5T720,880L240,880ZM240,800h480v-640L434,160L240,354v446ZM240,800h480,-480Z"
      android:fillColor="#fff"/>
--- a/android/app/src/main/res/drawable/ic_search_recent_st.xml
+++ b/android/app/src/main/res/drawable/ic_search_recent_st.xml
@@ -3,7 +3,7 @@
    android:height="24dp"
    android:viewportWidth="24"
    android:viewportHeight="24"
-    android:tint="?iconTint">
+    android:tint="?colorControlNormal">
    <path
        android:fillColor="@android:color/white"
        android:pathData="M13.26,3C8.17,2.86 4,6.95 4,12L2.21,12c-0.45,0 -0.67,0.54 -0.35,0.85l2.79,2.8c0.2,0.2 0.51,0.2 0.71,0l2.79,-2.8c0.31,-0.31 0.09,-0.85 -0.36,-0.85L6,12c0,-3.9 3.18,-7.05 7.1,-7 3.72,0.05 6.85,3.18 6.9,6.9 0.05,3.91 -3.1,7.1 -7,7.1 -1.61,0 -3.1,-0.55 -4.28,-1.48 -0.4,-0.31 -0.96,-0.28 -1.32,0.08 -0.42,0.42 -0.39,1.13 0.08,1.49C9,20.29 10.91,21 13,21c5.05,0 9.14,-4.17 9,-9.26 -0.13,-4.69 -4.05,-8.61 -8.74,-8.74zM12.75,8c-0.41,0 -0.75,0.34 -0.75,0.75v3.68c0,0.35 0.19,0.68 0.49,0.86l3.12,1.85c0.36,0.21 0.82,0.09 1.03,-0.26 0.21,-0.36 0.09,-0.82 -0.26,-1.03l-2.88,-1.71v-3.4c0,-0.4 -0.34,-0.74 -0.75,-0.74z"/>
--- a/android/app/src/main/res/drawable/ic_settings_backup_restore.xml
+++ b/android/app/src/main/res/drawable/ic_settings_backup_restore.xml
@@ -3,7 +3,7 @@
    android:height="24dp"
    android:viewportWidth="960"
    android:viewportHeight="960"
-    android:tint="?iconTint">
+    android:tint="?colorControlNormal">
  <path
      android:pathData="M480,560q-33,0 -56.5,-23.5T400,480q0,-33 23.5,-56.5T480,400q33,0 56.5,23.5T560,480q0,33 -23.5,56.5T480,560ZM480,840q-139,0 -241,-91.5T122,520h82q14,104 92.5,172T480,760q117,0 198.5,-81.5T760,480q0,-117 -81.5,-198.5T480,200q-69,0 -129,32t-101,88h110v80L120,400v-240h80v94q51,-64 124.5,-99T480,120q75,0 140.5,28.5t114,77q48.5,48.5 77,114T840,480q0,75 -28.5,140.5t-77,114q-48.5,48.5 -114,77T480,840Z"
      android:fillColor="#fff"/>
--- a/android/app/src/main/res/drawable/ic_straighten.xml
+++ b/android/app/src/main/res/drawable/ic_straighten.xml
@@ -3,7 +3,7 @@
    android:height="24dp"
    android:viewportWidth="960"
    android:viewportHeight="960"
-    android:tint="?iconTint">
+    android:tint="?colorControlNormal">
  <path
      android:pathData="M160,720q-33,0 -56.5,-23.5T80,640v-320q0,-33 23.5,-56.5T160,240h640q33,0 56.5,23.5T880,320v320q0,33 -23.5,56.5T800,720L160,720ZM160,640h640v-320L680,320v160h-80v-160h-80v160h-80v-160h-80v160h-80v-160L160,320v320ZM280,480h80,-80ZM440,480h80,-80ZM600,480h80,-80ZM480,480Z"
      android:fillColor="#fff"/>
--- a/android/app/src/main/res/drawable/ic_text_fields.xml
+++ b/android/app/src/main/res/drawable/ic_text_fields.xml
@@ -3,7 +3,7 @@
    android:height="24dp"
    android:viewportWidth="960"
    android:viewportHeight="960"
-    android:tint="?iconTint">
+    android:tint="?colorControlNormal">
  <path
      android:pathData="M280,800v-520L80,280v-120h520v120L400,280v520L280,800ZM640,800v-320L520,480v-120h360v120L760,480v320L640,800Z"
      android:fillColor="#fff"/>
--- a/android/app/src/main/res/drawable/ic_three_d_rotation.xml
+++ b/android/app/src/main/res/drawable/ic_three_d_rotation.xml
@@ -3,7 +3,7 @@
    android:height="24dp"
    android:viewportWidth="960"
    android:viewportHeight="960"
-    android:tint="?iconTint">
+    android:tint="?colorControlNormal">
  <path
      android:pathData="M480,880q-83,0 -156,-31.5T197,763q-54,-54 -85.5,-127T80,480h80q0,115 72.5,203T418,794l-58,-58 56,-56L598,862q-29,10 -58.5,14T480,880ZM500,600v-240h120q17,0 28.5,11.5T660,400v160q0,17 -11.5,28.5T620,600L500,600ZM300,600v-60h100v-40h-60v-40h60v-40L300,420v-60h120q17,0 28.5,11.5T460,400v160q0,17 -11.5,28.5T420,600L300,600ZM560,540h40v-120h-40v120ZM800,480q0,-115 -72.5,-203T542,166l58,58 -56,56 -182,-182q29,-10 58.5,-14t59.5,-4q83,0 156,31.5T763,197q54,54 85.5,127T880,480h-80Z"
      android:fillColor="#fff"/>
--- a/android/app/src/main/res/drawable/ic_translate.xml
+++ b/android/app/src/main/res/drawable/ic_translate.xml
@@ -3,7 +3,7 @@
    android:height="24dp"
    android:viewportWidth="960"
    android:viewportHeight="960"
-    android:tint="?iconTint">
+    android:tint="?colorControlNormal">
  <path
      android:pathData="m476,880 l182,-480h84L924,880h-84l-43,-122L603,758L560,880h-84ZM160,760l-56,-56 202,-202q-35,-35 -63.5,-80T190,320h84q20,39 40,68t48,58q33,-33 68.5,-92.5T484,240L40,240v-80h280v-80h80v80h280v80L564,240q-21,72 -63,148t-83,116l96,98 -30,82 -122,-125 -202,201ZM628,688h144l-72,-204 -72,204Z"
      android:fillColor="#fff"/>
--- a/android/app/src/main/res/drawable/ic_translate_indic.xml
+++ b/android/app/src/main/res/drawable/ic_translate_indic.xml
@@ -3,7 +3,7 @@
    android:height="24dp"
    android:viewportWidth="960"
    android:viewportHeight="960"
-    android:tint="?iconTint">
+    android:tint="?colorControlNormal">
  <path
      android:pathData="m476,880 l182,-480h84L924,880h-84l-43,-122L603,758L560,880h-84ZM628,688h144l-72,-204 -72,204ZM254,640q-66,0 -123.5,-38.5T44,498l72,-36q21,42 58,70t79,28q38,0 62.5,-23.5T340,480q0,-33 -23.5,-56.5T260,400h-60v-80h60q25,0 42.5,-17.5T320,260q0,-25 -17,-42.5T261,200q-23,0 -41,15t-32,33l-63,-49q26,-32 60,-55.5t77,-23.5q57,0 97.5,40.5T400,259q0,27 -10,52.5T361,357q10,10 18.5,20.5T396,400h124v-200h-80v-80h240v80h-80v116l-61,164L420,480v4q0,63 -46,109.5T254,640Z"
      android:fillColor="#fff"/>
--- a/android/app/src/main/res/drawable/ic_wifi_find.xml
+++ b/android/app/src/main/res/drawable/ic_wifi_find.xml
@@ -3,7 +3,7 @@
    android:height="24dp"
    android:viewportWidth="960"
    android:viewportHeight="960"
-    android:tint="?iconTint">
+    android:tint="?colorControlNormal">
  <path
      android:pathData="M480,840 L0,359q93,-93 215.5,-146T480,160q142,0 264.5,53T960,359l-56,57q-81,-81 -190,-128.5T480,240q-103,0 -195,32.5T117,363l419,420 -56,57ZM864,800L761,698q-18,11 -38,16.5t-43,5.5q-68,0 -114,-46t-46,-114q0,-68 46,-114t114,-46q68,0 114,46t46,114q0,23 -5.5,43T818,641l102,103 -56,56ZM680,640q34,0 57,-23t23,-57q0,-34 -23,-57t-57,-23q-34,0 -57,23t-23,57q0,34 23,57t57,23ZM480,783Z"
      android:fillColor="#fff"/>
--- a/android/app/src/main/res/drawable/info_icon.xml
+++ b/android/app/src/main/res/drawable/info_icon.xml
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-  android:width="48dp"
-  android:height="48dp"
-  android:viewportWidth="960"
-  android:viewportHeight="960"
-  android:tint="?colorControlNormal">
-  <path
-    android:fillColor="@android:color/white"
-    android:pathData="M453,680L513,680L513,440L453,440L453,680ZM479.98,366Q494,366 503.5,356.8Q513,347.6 513,334Q513,319.55 503.52,309.78Q494.04,300 480.02,300Q466,300 456.5,309.78Q447,319.55 447,334Q447,347.6 456.48,356.8Q465.96,366 479.98,366ZM480.27,880Q397.53,880 324.77,848.5Q252,817 197.5,762.5Q143,708 111.5,635.16Q80,562.32 80,479.5Q80,396.68 111.5,323.84Q143,251 197.5,197Q252,143 324.84,111.5Q397.68,80 480.5,80Q563.32,80 636.16,111.5Q709,143 763,197Q817,251 848.5,324Q880,397 880,479.73Q880,562.47 848.5,635.23Q817,708 763,762.32Q709,816.63 636,848.32Q563,880 480.27,880ZM480.5,820Q622,820 721,720.5Q820,621 820,479.5Q820,338 721.19,239Q622.38,140 480,140Q339,140 239.5,238.81Q140,337.62 140,480Q140,621 239.5,720.5Q339,820 480.5,820ZM480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Z"/>
-</vector>
--- a/android/app/src/main/res/layout-land/about.xml
+++ b/android/app/src/main/res/layout-land/about.xml
@@ -5,7 +5,7 @@
    xmlns:tools="http://schemas.android.com/tools"
    android:layout_width="match_parent"
    android:layout_height="match_parent"
-    android:background="?appBackground"
+    android:background="?cardBackground"
    android:clipToPadding="false"
    android:fadeScrollbars="false"
    android:fillViewport="true">
@@ -47,7 +47,7 @@
            android:layout_height="wrap_content"
            android:text="@string/about_headline"
            android:textAlignment="center"
-            android:textAppearance="@style/MwmTextAppearance.Headline6"
+            android:textAppearance="@style/MwmTextAppearance.Headline"
            android:textColor="?android:textColorPrimary"
            app:layout_constraintTop_toTopOf="@id/version" />
        </LinearLayout>
--- a/android/app/src/main/res/layout-land/dialog_stacked_buttons.xml
+++ b/android/app/src/main/res/layout-land/dialog_stacked_buttons.xml
@@ -1,18 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<com.google.android.material.card.MaterialCardView
+<LinearLayout
  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"
-  style="@style/Widget.Material3.CardView.Filled"
+  android:orientation="vertical"
  android:layout_width="match_parent"
  android:layout_height="match_parent"
  android:paddingBottom="@dimen/margin_half"
-  app:cardBackgroundColor="?attr/colorSurfaceContainerHigh"
-  app:cardCornerRadius="28dp">
-<LinearLayout
-  android:orientation="vertical"
-  android:layout_width="match_parent"
-  android:layout_height="match_parent">
+  android:background="?cardBackground">

  <LinearLayout
    android:orientation="vertical"
@@ -55,4 +49,3 @@
      tools:text="Do not Use Today"/>
  </LinearLayout>
 </LinearLayout>
-</com.google.android.material.card.MaterialCardView>
--- a/android/app/src/main/res/layout-land/fragment_osm_login.xml
+++ b/android/app/src/main/res/layout-land/fragment_osm_login.xml
@@ -13,7 +13,7 @@
    android:id="@+id/scrollView"
    android:layout_width="match_parent"
    android:layout_height="match_parent"
-    android:background="?appBackground"
+    android:background="?cardBackground"
    android:fadeScrollbars="false"
    android:fillViewport="true"
    android:clipToPadding="false">
@@ -22,9 +22,12 @@
      android:layout_height="match_parent"
      android:clipChildren="false"
      android:clipToPadding="false"
-      android:baselineAligned="false"
-      android:orientation="horizontal"
+      android:orientation="vertical"
      tools:ignore="ScrollViewSize">
+      <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="horizontal">
        <LinearLayout
          android:layout_width="0dp"
          android:layout_height="match_parent"
@@ -108,5 +111,6 @@
            android:text="@string/register_at_openstreetmap" />
        </LinearLayout>
      </LinearLayout>
+    </LinearLayout>
  </ScrollView>
 </LinearLayout>
--- a/android/app/src/main/res/layout-land/layout_nav_top.xml
+++ b/android/app/src/main/res/layout-land/layout_nav_top.xml
@@ -11,13 +11,13 @@
  <FrameLayout
    android:layout_width="match_parent"
    android:id="@+id/statutbar"
-    android:layout_height="1dp"
+    android:layout_height="15dp"
    app:layout_constraintTop_toTopOf="parent" />
  <com.google.android.material.card.MaterialCardView
    android:id="@+id/street_frame"
    android:layout_width="500dp"
    android:layout_height="wrap_content"
-    style="@style/Widget.Material3.CardView.Filled"
+    android:layout_marginTop="@dimen/margin_half_plus_eight"
    android:layout_marginEnd="@dimen/margin_quarter"
    app:cardCornerRadius="@dimen/margin_half"
    android:elevation="@dimen/nav_elevation"
@@ -52,6 +52,7 @@
    app:layout_constraintEnd_toStartOf="@+id/street_frame"
    app:layout_constraintStart_toStartOf="parent"
    app:layout_constraintTop_toBottomOf="@+id/statutbar"
+    android:layout_marginTop="@dimen/margin_half_plus_eight"
    android:layout_marginStart="@dimen/margin_quarter"
    android:clickable="true"
    android:elevation="@dimen/nav_elevation">
--- a/android/app/src/main/res/layout-land/onmap_downloader.xml
+++ b/android/app/src/main/res/layout-land/onmap_downloader.xml
@@ -11,7 +11,8 @@
    android:layout_width="wrap_content"
    android:layout_height="wrap_content"
    android:orientation="horizontal"
-    android:background="?menuBackground"
+    android:backgroundTint="?menuBackground"
+    android:background="@drawable/onmap_downloader_background"
    android:padding="@dimen/margin_base"
    android:clipToPadding="false"
    android:clipChildren="false"
--- a/android/app/src/main/res/layout-w1020dp/activity_settings.xml
+++ b/android/app/src/main/res/layout-w1020dp/activity_settings.xml
@@ -3,8 +3,7 @@
  xmlns:android="http://schemas.android.com/apk/res/android"
  android:layout_width="match_parent"
  android:layout_height="match_parent"
-  android:orientation="vertical"
-  android:background="?appBackground">
+  android:orientation="vertical">

  <include
    layout="@layout/toolbar_extended"/>
@@ -18,8 +17,7 @@
      android:id="@+id/fragment_container"
      style="@style/MwmWidget.FrameLayout.Elevation"
      android:layout_width="match_parent"
-      android:layout_height="match_parent"
-      android:background="?appBackground"/>
+      android:layout_height="match_parent"/>
  </com.google.android.material.card.MaterialCardView>

 </FrameLayout>
--- a/android/app/src/main/res/layout/about.xml
+++ b/android/app/src/main/res/layout/about.xml
@@ -4,7 +4,7 @@
    xmlns:tools="http://schemas.android.com/tools"
    android:layout_width="match_parent"
    android:layout_height="match_parent"
-    android:background="?appBackground"
+    android:background="?cardBackground"
    android:clipToPadding="false"
    android:fadeScrollbars="false"
    android:fillViewport="true">
@@ -42,7 +42,7 @@
        android:layout_marginBottom="@dimen/margin_base"
        android:text="@string/about_headline"
        android:textAlignment="center"
-        android:textAppearance="@style/MwmTextAppearance.Headline6"
+        android:textAppearance="@style/MwmTextAppearance.Headline"
        android:textColor="?android:textColorPrimary" />

    <com.google.android.material.textview.MaterialTextView
--- a/android/app/src/main/res/layout/activity_download_resources.xml
+++ b/android/app/src/main/res/layout/activity_download_resources.xml
@@ -5,24 +5,12 @@
  xmlns:app="http://schemas.android.com/apk/res-auto"
  android:layout_width="match_parent"
  android:layout_height="match_parent"
-  android:background="?appBackground">
+  android:background="?cardBackground">
  <androidx.constraintlayout.widget.ConstraintLayout
    android:layout_width="match_parent"
    android:layout_height="match_parent"
    android:layout_above="@+id/button_container"
    android:layout_gravity="center">
-    <com.google.android.material.button.MaterialButton
-        android:id="@+id/btn_advanced"
-        style="@style/Widget.Material3.Button.IconButton"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        app:icon="@drawable/ic_settings"
-        app:iconTint="?iconTint"
-        android:contentDescription="@string/download_resources_custom_url_title"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        android:layout_margin="@dimen/margin_half" />
-
    <LinearLayout
      android:layout_width="match_parent"
      android:layout_height="match_parent"
@@ -38,7 +26,7 @@
        app:tint="?colorSecondary"/>
      <com.google.android.material.textview.MaterialTextView
        android:id="@+id/head_message"
-        style="@style/MwmTextAppearance.Headline6"
+        style="?fontHeadline6"
        android:layout_width="match_parent"
        android:layout_height="wrap_content"
        android:layout_marginTop="@dimen/margin_base"
@@ -48,7 +36,7 @@
        android:text="@string/download_map_title" />
      <com.google.android.material.textview.MaterialTextView
        android:id="@+id/download_message"
-        style="@style/MwmTextAppearance.Body2"
+        style="?fontBody2"
        android:layout_width="match_parent"
        android:layout_height="wrap_content"
        android:layout_marginStart="@dimen/margin_base"
--- a/android/app/src/main/res/layout/activity_map_placeholder.xml
+++ b/android/app/src/main/res/layout/activity_map_placeholder.xml
@@ -4,7 +4,7 @@
  android:layout_width="match_parent"
  android:layout_height="match_parent"
  xmlns:app="http://schemas.android.com/apk/res-auto"
-  android:background="?appBackground"
+  android:background="?cardBackground"
  android:gravity="center"
  android:orientation="vertical">

@@ -28,7 +28,7 @@
        android:layout_marginBottom="8dp"
        android:text="@string/aa_connected_title"
        android:textAlignment="center"
-        android:textAppearance="@style/MwmTextAppearance.Headline4"
+        android:textAppearance="@style/TextAppearance.MaterialComponents.Headline4"
        android:textStyle="bold" />

    <com.google.android.material.textview.MaterialTextView
@@ -36,7 +36,7 @@
        android:layout_height="wrap_content"
        android:text="@string/car_used_on_the_car_screen"
        android:textAlignment="center"
-        android:textAppearance="@style/MwmTextAppearance.Body1" />
+        android:textAppearance="@style/TextAppearance.MaterialComponents.Body1" />
  </LinearLayout>

  <com.google.android.material.button.MaterialButton
--- a/android/app/src/main/res/layout/activity_request_permissions.xml
+++ b/android/app/src/main/res/layout/activity_request_permissions.xml
@@ -3,7 +3,7 @@
    xmlns:app="http://schemas.android.com/apk/res-auto"
    android:layout_width="match_parent"
    android:layout_height="match_parent"
-    android:background="?appBackground"
+    android:background="?cardBackground"
    android:gravity="center"
    android:orientation="vertical">

@@ -20,7 +20,7 @@
      android:layout_marginStart="32dp"
      android:text="@string/aa_request_permission_activity_text"
      android:textAlignment="center"
-      android:textAppearance="@style/MwmTextAppearance.Headline4"
+      android:textAppearance="@style/TextAppearance.MaterialComponents.Headline4"
      android:textStyle="bold" />

  <com.google.android.material.button.MaterialButton
--- a/Show More
+++ b/Show More
				`@@ -1 +0,0 @@`
				`Easy map navigation - Discover more of your journey - Powered by the community`
				`@@ -1 +0,0 @@`
				`CoMaps - Hike, Bike, Drive Offline with Privacy`