[fdroid] Release version 2025.11.19-2

Signed-off-by: map-per <map-per@gmx.de>

.forgejo/workflows/map-generator.yml

@@ -0,0 +1,501 @@
+name: map-generator
+on:
+  workflow_dispatch: # Manual trigger
+    inputs:
+      jobs:
+        description: 'Which job(s) to run right now?'
+        required: true
+        default: 'all-except-upload'
+        type: choice
+        options:
+          - all-except-upload
+          - copy-coasts
+          - planet
+          - wiki
+          - isolines
+          - subways
+          - tiger
+          - maps
+          - upload
+      map-generator-continue:
+        description: 'Continue previous map generation?'
+        required: false
+        default: false
+        type: boolean
+      map-generator-countries:
+        description: 'Generate specific MWMs? (i.e. "US_New York_*, foo")'
+        required: false
+        type: string
+      reset:
+        description: 'Reset part of the system?'
+        required: false
+        default: 'no'
+        type: choice
+        options:
+          - 'no'
+          - wiki-ratelimit
+
+## RCLONE_CONF is multi-line text containing keys and credentials for us2,ru1,fi1,de1 servers
+
+env:
+  RCLONE_CONF: ${{ secrets.RCLONE_CONF }}
+  WIKIMEDIA_USERNAME: ${{ secrets.WIKIMEDIA_USERNAME }}
+  WIKIMEDIA_PASSWORD: ${{ secrets.WIKIMEDIA_PASSWORD }}
+  ZULIP_BOT_EMAIL: ${{ secrets.ZULIP_BOT_EMAIL }}
+  ZULIP_API_KEY: ${{ secrets.ZULIP_API_KEY }}
+  MWMCONTINUE: ${{ inputs.map-generator-continue }}
+  MWMCOUNTRIES: ${{ inputs.map-generator-countries }}
+  DEBIAN_FRONTEND: noninteractive
+  TZ: Etc/UTC 
+
+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 }}-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: Checkout main repo
+        shell: bash
+        run: |
+          echo "Cloning $FORGEJO_SERVER_URL/$FORGEJO_REPOSITORY branch $FORGEJO_REF_NAME"
+          cd ~
+          git clone --recurse-submodules --shallow-submodules -b $FORGEJO_REF_NAME --single-branch $FORGEJO_SERVER_URL/$FORGEJO_REPOSITORY.git comaps
+      - name: Checkout wikiparser repo
+        shell: bash
+        run: |
+          cd ~
+          git clone https://codeberg.org/comaps/wikiparser.git
+      - name: Checkout subways repo
+        shell: bash
+        run: |
+          cd ~
+          git clone https://codeberg.org/comaps/subways.git
+
+  copy-coasts:
+    if: inputs.jobs == 'copy-coasts' || inputs.jobs == 'all-except-upload'
+    name: Copy Previously Generated Coasts
+    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:
+      - name: Copy Coasts
+        shell: bash
+        run: |
+          echo "WorldCoasts available:"
+          ls -al /mnt/4tbexternal/osm-maps/*/intermediate_data/WorldCoasts.*
+
+          if [ -f /mnt/4tbexternal/osm-maps/*/intermediate_data/WorldCoasts.geom ]; then
+
+          echo "Before:"
+          ls -al /home/planet/latest_coasts*
+
+          cp -p /mnt/4tbexternal/osm-maps/*/intermediate_data/WorldCoasts.geom /home/planet/latest_coasts.geom
+          cp -p /mnt/4tbexternal/osm-maps/*/intermediate_data/WorldCoasts.rawgeom /home/planet/latest_coasts.rawgeom
+
+          echo "After:"
+          ls -al /home/planet/latest_coasts*
+
+          else
+
+          echo "No WorldCoasts found."
+
+          fi
+
+  update-planet:
+    if: inputs.jobs == 'planet' || inputs.jobs == 'all-except-upload'
+    name: Update Planet
+    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:
+      - name: Download Planet File if Absent
+        shell: bash
+        # TODO: replace wget2 with curl -Z
+        run: |
+          if [ ! -d /home/planet/planet/ ]; then
+          mkdir -p /home/planet/planet/
+          fi
+          if [ ! -f /home/planet/planet/planet-latest.osm.pbf ]; then
+          cd /home/planet/planet/
+          wget2 --verbose --progress=bar --continue https://ftpmirror.your.org/pub/openstreetmap/pbf/planet-latest.osm.pbf
+          else
+          echo "planet-latest.osm.pbf was found, raw download not required."
+          fi
+      - name: Update Planet
+        shell: bash
+        run: |
+          cd /home/planet/planet/
+          rm -f planet-latest-new.osm.pbf
+          pyosmium-up-to-date planet-latest.osm.pbf -o planet-latest-new.osm.pbf -v --size 16384
+          mv planet-latest-new.osm.pbf planet-latest.osm.pbf
+      - name: Converting planet-latest.osm.pbf to planet.o5m
+        # TODO: better to run osmupdate (not convert) just before starting the maps jobs - for max fresh data.
+        run: |
+          echo "Starting..."
+          cd /home/planet/planet/
+          osmconvert -v --drop-author --drop-version --hash-memory=4000 planet-latest.osm.pbf -o=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=Planet update is done!'
+
+  wiki-update:
+    if: inputs.jobs == 'wiki' || inputs.jobs == 'all-except-upload'
+    name: Update Wikipedia
+    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: Check for planet file
+        shell: bash
+        # TODO: remove debug output
+        run: |
+          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
+      - name: Only get new dumps once per 30 days
+        shell: bash
+        run: |
+          if [[ '${{ inputs.reset }}' == 'wiki-ratelimit' ]]; then
+          echo "Bypassing wiki rate limit upon request."
+          exit 0
+          fi
+
+          datediff() {
+            d1=$(date -d "$1" +%s)
+            d2=$(date -d "$2" +%s)
+            echo $(( (d1 - d2) / 86400 ))
+          }
+          RECENTDUMPDATE=$(find /home/planet/wikipedia/dumps/ -mindepth 1 -maxdepth 1 -iname "2*" -type d | sort -n -r | head -1 |  cut -d/ -f6)
+          TODAY=$(date +%Y%m%d)
+          DATEDIFF=$(datediff $TODAY $RECENTDUMPDATE)
+          if [ $DATEDIFF -lt 30 ]; then
+          echo "ERROR: The most recent wiki dump is from $RECENTDUMPDATE, $DATEDIFF days ago. Wikimedia limits users to 15 snapshot requests per month."
+          echo "Set the 'reset' option to 'wiki-ratelimit' to bypass this."
+          ls -al /home/planet/wikipedia/dumps/
+          exit 1
+          fi
+      - name: Update Wikipedia from Enterprise API
+        shell: bash
+        run: |
+          #todo: curl in download.sh can fail when rate limited and even save error messages to the output. need to validate.
+          #downloading all languages can also trigger rate limits or fail as well. needs work.
+          #also: a failure to download means a failure to build, and could result in no wiki descriptions etc.
+          #also-also: do we want to remove old wiki data in planet between builds? pastk: no need, its being updated / augmented
+          mkdir -p /home/planet/wikipedia/dumps
+          mkdir -p /home/planet/wikipedia/build
+          cd ~/wikiparser
+          ls -al
+          echo "Downloading ..."
+          ./download.sh /home/planet/wikipedia/dumps
+          ls -al /home/planet/wikipedia/dumps/*
+          echo "Running ..."
+          ./run.sh /home/planet/wikipedia/build \
+          /home/planet/planet/planet-latest.osm.pbf \
+          /home/planet/wikipedia/dumps/latest/*.tar.gz
+          echo "DONE"
+      - name: Check that the latest dumps are present, recent, and not super tiny
+        shell: bash
+        run: |
+          FAILCHECK=0
+
+          # Check all .tar.gz files in /home/planet/wikipedia/dumps/latest/
+          for file in /home/planet/wikipedia/dumps/latest/*.tar.gz; do
+              # Check if file exists (handles case where glob doesn't match)
+              [ -e "$file" ] || continue
+
+              # Get file size in MB and modification time in days
+              size_mb=$(stat -f%z "$file" 2>/dev/null | awk '{print int($1/1024/1024)}' || stat -c%s "$file" | awk
+           '{print int($1/1024/1024)}')
+              days_old=$(find "$file" -mtime -7 | wc -l)
+
+              # Verify conditions
+              if [ "$size_mb" -lt 100 ]; then
+                  echo "FAIL: $file is only ${size_mb}MB (< 100MB)"
+                  FAILCHECK=1
+              elif [ "$days_old" -eq 0 ]; then
+                  echo "FAIL: $file is older than 7 days"
+                  ls -al $file
+                  FAILCHECK=1
+              else
+                  echo "PASS: $file (${size_mb}MB, modified within 7 days)"
+              fi
+          done
+
+          exit $FAILCHECK
+      - 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=Wiki update is done!'
+
+  update-isolines:
+    if: inputs.jobs == 'isolines' || inputs.jobs == 'all-except-upload'
+    name: Update Isolines
+    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 }}
+      # TODO: we only need to update these if our SRTM or countries change
+      # TODO: after update, verify that sizable files exist: /home/planet/isolines/*.isolines
+      - name: Update Isolines
+        shell: bash
+        # TODO: preserve previous isolines version?
+        # TODO: cleanup the tmp-tiles dir after completion
+        run: |
+          cd ~/comaps/
+          ./tools/unix/build_omim.sh -p ~ -R topography_generator_tool
+          rm -rf /home/planet/isolines/
+          mkdir /home/planet/isolines/
+          ~/omim-build-relwithdebinfo/topography_generator_tool \
+          --profiles_path=./data/conf/isolines/isolines-profiles.json \
+          --countries_to_generate_path=./data/conf/isolines/countries-to-generate.json \
+          --tiles_isolines_out_dir=/home/planet/isolines/tmp-tiles/ \
+          --countries_isolines_out_dir=/home/planet/isolines/ \
+          --data_dir=./data/ \
+          --srtm_path=/home/planet/SRTM-patched-europe/ \
+          --threads=96
+      - name: Check isolines
+        shell: bash
+        run: |
+          NUMISO=$(ls -al /home/planet/isolines/*.isolines | wc -l)
+          echo "Found $NUMISO isolines"
+          if [ $NUMISO -lt 10 ]; then
+          echo "ERROR: Did generation fail?"
+          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=Isolines are done!'
+
+  update-subways:
+    if: inputs.jobs == 'subways' || inputs.jobs == 'all-except-upload'
+    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: 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!'
+
+  update-tiger:
+    if: inputs.jobs == 'tiger' || inputs.jobs == 'all-except-upload'
+    name: Update TIGER
+    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: Build address_parser
+        shell: bash
+        run: |
+          cd ~/comaps
+          #rm -rf ~/omim-build-relwithdebinfo/CMakeCache.txt
+          #rm -rf ~/omim-build-relwithdebinfo/CMakeFiles
+          ./tools/unix/build_omim.sh -p ~ -R address_parser_tool
+      - name: Update TIGER from Nominatim
+        shell: bash
+        # TODO: use curl instead of wget2
+        run: |
+          # TODO: maybe remove old osm-planet/tiger first?
+          cd /home/planet/
+          mkdir -p tiger
+          wget2 https://nominatim.org/data/tiger-nominatim-preprocessed-latest.csv.tar.gz
+          cd ~/comaps
+          tar -xOzf /home/planet/tiger-nominatim-preprocessed-latest.csv.tar.gz | ~/omim-build-relwithdebinfo/address_parser_tool --output_path=/home/planet/tiger
+
+  generate-maps:
+    if: inputs.jobs == 'maps' || inputs.jobs == 'all-except-upload'
+    name: Generate Maps
+    runs-on: mapfilemaker
+    needs:
+      - clone-repos
+    timeout-minutes: 40320
+    container:
+      image: codeberg.org/comaps/maps_generator:f6d53d54f794
+      volumes:
+        - /mnt/4tbexternal/:/mnt/4tbexternal/
+        - /mnt/4tbexternal/osm-planet:/home/planet
+      options: --ulimit nofile=262144:262144
+    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: Make output folders if necessary
+        shell: bash
+        run: |
+          if [ ! -d /mnt/4tbexternal/osm-maps ]; then
+          mkdir -p /mnt/4tbexternal/osm-maps
+          fi
+      - name: Get SRTM if necessary
+        # TODO: it should be a separate step like Wiki or isolines
+        shell: bash
+        run: |
+          if [ ! -d /home/planet/SRTM-patched-europe/ ]; then
+          echo "ERROR: NO SRTM"
+          exit 1
+          fi
+      - name: Run docker_maps_generator.sh
+        shell: bash
+        run: |
+          cd ~/comaps
+          bash ./tools/unix/maps/docker_maps_generator.sh
+      - 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=Generator is done!'
+
+  upload-maps:
+    if: inputs.jobs == 'upload'
+    name: Upload Maps
+    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 }}-map-generator-${{ github.event.pull_request.number || github.ref }}
+      cancel-in-progress: true
+    steps:
+      - name: Write config file
+        run: |
+          mkdir -p ~/.config/rclone/
+          echo "${{ secrets.RCLONE_CONF }}" > ~/.config/rclone/rclone.conf
+      - name: Upload map files to CDNs
+        shell: bash
+        run: |
+          shopt -s nullglob
+          buildfolder=$(find /mnt/4tbexternal/osm-maps/ -mindepth 1 -maxdepth 1 -iname "2*" -type d | sort -n -r | head -1 | cut -d/ -f5)
+          builddate=$(find /mnt/4tbexternal/osm-maps/*/ -mindepth 1 -maxdepth 1 -iname "2*" -type d | sort -n -r | head -1 | cut -d/ -f6)
+          mwmfiles=( /mnt/4tbexternal/osm-maps/$buildfolder/$builddate/*.mwm )
+
+          if (( ${#mwmfiles[@]} )); then
+            echo "<$(date +%T)> Uploading maps from $buildfolder/$builddate..."
+            cd ~/comaps/tools/unix/maps
+            ./upload_to_cdn.sh /mnt/4tbexternal/osm-maps/$buildfolder/$builddate
+            echo "<$(date +%T)> Finished uploading maps from $buildfolder/$builddate."
+          else
+            echo "<$(date +%T)> No MWM files in /mnt/4tbexternal/osm-maps/$buildfolder/$builddate/*.mwm, not uploading maps."
+            echo "<$(date +%T)> Found top level: $(ls -alt /mnt/4tbexternal/osm-maps/*)"
+            echo "<$(date +%T)> Found second level: $(ls -alt /mnt/4tbexternal/osm-maps/$buildfolder/*)"
+          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=Upload is done!'
+
+          

.gitignore

@@ -9,6 +9,7 @@ Makefile.Release
 object_script.*.Debug
 object_script.*.Release
 compile_commands.json
+*.local.*
 
 stxxl.errlog
 stxxl.log

CMakeLists.txt

@@ -175,10 +175,10 @@ if (NOT PLATFORM_IPHONE AND NOT PLATFORM_ANDROID)
   find_package(Qt6 COMPONENTS REQUIRED ${qt_components} PATHS $ENV{QT_PATH} /opt/homebrew/opt/qt@6 /usr/local/opt/qt@6 /usr/lib/x86_64-linux-gnu/qt6)
 
   set(MINIMUM_REQUIRED_QT_VERSION 6.4.0)
-  if (Qt6Widgets_VERSION VERSION_LESS ${MINIMUM_REQUIRED_QT_VERSION})
-    message(FATAL_ERROR "Unsupported Qt version: ${Qt6Widgets_VERSION}, the minimum required is ${MINIMUM_REQUIRED_QT_VERSION}")
+  if (Qt6_VERSION VERSION_LESS ${MINIMUM_REQUIRED_QT_VERSION})
+    message(FATAL_ERROR "Unsupported Qt version: ${Qt6_VERSION}, the minimum required is ${MINIMUM_REQUIRED_QT_VERSION}")
   else()
-    message(STATUS "Found Qt version: ${Qt6Widgets_VERSION}")
+    message(STATUS "Found Qt version: ${Qt6_VERSION}")
   endif()
 endif()
 
@@ -222,6 +222,11 @@ if (PLATFORM_DESKTOP AND NOT WITH_SYSTEM_PROVIDED_3PARTY)
   include_directories("${PROJECT_BINARY_DIR}/3party/gflags/include")
 endif()
 
+# Android fails to find boost in many cases, this fixes it.
+if (PLATFORM_ANDROID)
+  include_directories("${OMIM_ROOT}/3party/boost")
+endif()
+
 # Used in qt/ and shaders/
 find_package(Python3 REQUIRED COMPONENTS Interpreter)
 

README.md

@@ -23,10 +23,10 @@
       <img src="https://img.shields.io/github/license/comaps/comaps?style=for-the-badge&logo=opensourceinitiative&logoColor=white&color=588157" alt="License"/>
     </a>
     <a href="https://github.com/comaps/comaps/actions/workflows/android-check.yaml">
-      <img src="https://img.shields.io/github/actions/workflow/status/comaps/comaps/.github/workflows/android-check.yaml?label=Android%20Build&logo=android&logoColor=white&style=for-the-badge&color=588157" alt="Android Build Status"/>
+      <img src="https://img.shields.io/github/actions/workflow/status/comaps/comaps/.github/workflows/android-check.yaml?label=Android%20Build&logo=android&logoColor=white&style=for-the-badge" alt="Android Build Status"/>
     </a>
     <a href="https://github.com/comaps/comaps/actions/workflows/ios-check.yaml">
-      <img src="https://img.shields.io/github/actions/workflow/status/comaps/comaps/.github/workflows/ios-check.yaml?label=iOS%20Build&logo=apple&logoColor=white&style=for-the-badge&color=588157" alt="iOS Build Status"/>
+      <img src="https://img.shields.io/github/actions/workflow/status/comaps/comaps/.github/workflows/ios-check.yaml?label=iOS%20Build&logo=apple&logoColor=white&style=for-the-badge" alt="iOS Build Status"/>
     </a>
     <a href="https://opencollective.com/comaps">
       <img src="https://img.shields.io/opencollective/all/comaps?label=Open%20Collective%20Donors&logo=opencollective&logoColor=white&style=for-the-badge&color=588157" alt="Open Collective Donors"/>

android/app/src/fdroid/play/listings/ast/title.txt

@@ -0,0 +1 @@
+CoMaps - Mapas ensin conexón con privacidá

android/app/src/fdroid/play/listings/bg/short-description.txt

@@ -0,0 +1 @@
+Лесна навигация - Открийте повече от вашето пътуване - Подкрепен от общността

android/app/src/fdroid/play/listings/bg/title.txt

@@ -0,0 +1 @@
+CoMaps - Хайкинг, Велосипед, Пътуване без Интернет

android/app/src/fdroid/play/listings/da-DK/full-description.txt

@@ -0,0 +1,33 @@
+En fællesskabdrevet og åben source kortapp, baseret på kortdata fra OpenStreetMap og styrket i forpligtelsen til værdierne gennemsigtighed, privatlivets fred, og non-profit. CoMaps udspringer af Organic Maps, som selv udsprang af Maps.ME.
+
+Læs mere om grundlaget for projektet og dets udviklingsretnign på <b><i>codeberg.org/comaps</i></b>.
+Slut dig til fælleskabet og hjælp til med at bygge den bedste kortapp i verden.
+• Brug appen og fortæl andre om den
+• Giv feedback anmeld fejl
+• Opdater kortdata i appen eller på OpenStreetMap-hjemmesiden.
+
+‣ <b>Offlinefokuseret</b>: Planlæg din rute og find vej i udlandet uden brug af mobildata, søg og find afsidesliggende mål på en afsidesliggende vandretur, mm. Alle funktioner er designet til at fungere uden internetforbindelse.
+‣ <b>Respekt for privatlivets fred</b>: Appen er designet med henblik på at respektere dit privatliv – den identificerer dig ikke, indeholder ingen sporingsmekanismer, og insamler ingen personlig information. Appen er reklamefri.
+‣ <b>Enkel og elegant</b>: de essentielle funktioner er nemme at bruge, og de virker bare.
+‣ <b>Sparer på batteriet og på lagerpladsen</b>: Dræner ikke dit batteri hurtigt, som andre kortapps. De kompakte kortfiler minimerer varigt lagerpladsforbrug.
+‣ <b>Gratis og bygget i fællesskab</b>: Folk som dig har hjulpet med denne app ved at tilføje steder til OpenStreetMap, ved at teste appens funktioner og give feedback på dem og ved at bidrage til udviklingen af appen med deres tid og penge.
+‣ <b>Åben og gennemsigtig beslutningstagningsproces og finanser, non-profit, og fuldt ud åben source.</b>
+
+<b>Hovedfunktioner</b>
+• Hent detaljerede kort, der indeholder steder som ikke findes i mange kommericelle kort.
+• En frilufts-tilstand med markede vandrestier, teltpladser, kilder, bjerg- og bakketoppe, højdekonturlinjer, mm.
+• Gangstier og cykelstier
+• Steder, der kan besøges, som f.eks. restauranter, tankstationer, hoteller, butikker, seværdigheder og mange andre.
+• Søg efter stednavn, adresse, eller type af sted.
+• Gem dine yndlingssteder som bogmærker med et enkelt tryk. 
+• iCloud synkronisering af bogmærker og optagede spor.
+• Offline artikler fra Wikipedia.
+• Metro-lag med navigation.
+• Optagelse af spor.
+• Eksport og import af bogmærker og spor i formaterne KML, KMZ og GPX.
+• Mørk tilstand til brug om natten.
+• Mulighed for at forbedre kortet vha. en indbygget editor.
+• CarPlay understøttes.
+
+<b>Friheden er ankommet</b>
+Opdag din rejse, find vej i verden med privatliv og fællesskab i førersædet!

android/app/src/fdroid/play/listings/de-DE/release-notes.txt

@@ -1,10 +1,11 @@
-• Karten-Daten vom 6. September
-• Zeitstrafen für Radrouting
-• Farbige POI-Beschriftungen in Autonavigation
-• POI-Suche nach Filialnamen
-• Abspannportale, Sicherheitskabinen & Büros hinzugefügt
-• Aktualisierte Symbole für Türme, Nachtclubs, Apotheken und Fahnenmasten
-• Lesezeichen-Farbe in GPX-Exporten
-• Farbfüllung von Fußgängerbereiche auf Plätzen
-• Android Auto: Anzeige Ausfahrtsnummern in Kreisverkehren
-Weitere Änderungen in Codeberg-Versionshinweisen!
+• OpenStreetMap-Daten vom 16. November
+• Bäume hinzugefügt
+• Kleine Bushaltestellen-Icons die früher angezeigt werden
+• Sichtbarkeit von Eingängen reduziert
+• Neue POI-Typen hinzugefügt
+• Sandflächen werden auf Karte angezeigt
+• Option „Geschäft ist leerstehend” zum OSM-Editor hinzugefügt
+• Straßenbeschilderung in Europa verbessert
+• Option „Asphaltierte Straßen vermeiden” hinzugefügt
+• Icons in den Einstellungen hinzugefügt
+Weitere Änderungen in unseren Codeberg-Versionshinweisen!

android/app/src/fdroid/play/listings/en-US/release-notes.txt

@@ -1,10 +1,11 @@
-• OpenStreetMap data as of September 6
-• Turn penalties for bicycle routing
-• Colored POI labels for car navigation map style
-• Search POIs by branch name
-• Added power portals, security booths and offices
-• Update icons for towers, nightclubs, chemists, flagpoles
-• Save bookmark color to GPX exports
-• Color fill pedestrian parts of squares
-• Android Auto: display roundabout exit numbers
+• OpenStreetMap data as of November 16
+• Added trees
+• Made bus stop icons smaller and show up earlier
+• Reduce visibility of entrances
+• Added several other POI types
+• Show sand areas on the map
+• Add business is vacant option to the OSM editor
+• Improved road shields in Europe
+• Avoid paved roads routing option
+• Added icons to the settings page
 Check our Codeberg release notes for more changes!

android/app/src/fdroid/play/listings/es-ES/release-notes.txt

@@ -1,10 +1,11 @@
-• Datos a 6 de septiembre
-• Penalizaciones de giros en rutas de bici
-• Etiquetas de puntos de interés en color en navegación
-• Buscar por nombre de sucursal
-• Añadir portales de energía, cabinas de seguridad y oficinas
-• Nuevos iconos: torres, discotecas, parafarmacias y mástiles
-• Guardar color en exportaciones GPX
-• Colorear áreas peatonales de plazas
-• Android Auto: mostrar números de salida de rotondas
+• Nuevos datos OSM a 16.11.25
+• Se añaden árboles
+• Se reducen los iconos de paradas de autobús y aparecen antes
+• Se reduce visibilidad de entradas
+• Se añaden muchos tipos de puntos de interés
+• Se muestran las zonas de arena en el mapa
+• Se añade la opción «negocio vacío» al editor
+• Se mejoran las señales de tráfico en Europa
+• Nueva opción «evitar caminos asfaltadas»
+• Nuevos iconos en la página de configuración
 Más detalles en Codeberg

android/app/src/fdroid/play/listings/fr-FR/release-notes.txt

@@ -1,9 +1,11 @@
-• Données OSM du 06 septembre
-• Pénalités dans les calculs d'itinéraires vélos
-• Ajout de labels colorés en mode navigation
-• Support du tag branch dans la recherche
-• Ajout des portiques électriques, postes de sécurité
-• Mise à jour des icônes de tours, boîtes de nuits, chimiste et mat
-• Enregistrement de la couleur des signets dans les exports GPX
-• Android Auto: Affichage du numéro de sortie des ronds-points
+• Données OpenStreetMap du 16 novembre
+• Ajout des arbres
+• Les icônes des arrêts de bus sont plus petites et apparaissent plus tôt
+• Réduction de la visibilité des entrées
+• Ajout de nouveaux types de POI
+• Affichage des zones de sable
+• Nouveau bouton pour signaler un commerce vacant
+• Amélioration des badges routiers en Europe
+• Ajout d'une option pour éviter les routes pavées
+• Ajout d'icônes dans les paramètres
 Plus d'informations sur notre Codeberg

android/app/src/fdroid/play/listings/id/full-description.txt

@@ -0,0 +1,32 @@
+Aplikasi peta gratis & sumber terbuka yang dipimpin komunitas, berbasis data OpenStreetMap dan diperkuat dengan komitmen terhadap transparansi, privasi, serta non-profit. CoMaps adalah turunan dari Organic Maps, yang merupakan turunan dari Maps.ME.
+
+Baca lebih lanjut tentang alasan proyek ini dan arahnya di <b><i>codeberg.org/comaps</i></b>.
+Bergabunglah dengan komunitas dan bantu menjadikan aplikasi peta terbaik
+• Gunakan aplikasi ini dan sebarkan
+• Beri masukan dan laporkan masalah
+• Perbarui data peta di aplikasi atau di situs OpenStreetMap
+
+‣ <b>Fokus Offline</b>: Rencanakan dan navigasikan perjalananmu di luar negeri tanpa perlu layanan seluler, cari titik saat hiking jauh, dll. Semua fungsi aplikasi dirancang untuk bekerja offline.
+‣ <b>Menghormati Privasi</b>: Aplikasi ini dirancang dengan privasi sebagai prioritas – tidak mengidentifikasi orang, tidak melacak, dan tidak mengumpulkan informasi pribadi. Bebas iklan.
+‣ <b>Sederhana dan Rapi</b>: fitur penting yang mudah digunakan dan langsung berfungsi.
+‣ <b>Hemat Baterai dan Ruang</b>: Tidak menguras baterai seperti aplikasi navigasi lain. Peta ringkas menghemat ruang berharga di ponselmu.
+‣ <b>Gratis dan Dibangun oleh Komunitas</b>: Orang seperti kamu membantu membangun aplikasi ini dengan menambahkan tempat ke OpenStreetMap, menguji serta memberi masukan fitur, dan menyumbangkan keterampilan pengembangan maupun dana.
+‣ <b>Terbuka dan Transparan</b>: Pengambilan keputusan dan keuangan transparan, non-profit, dan sepenuhnya sumber terbuka.
+
+<b>Fitur Utama</b>:
+• Peta detail yang bisa diunduh, dengan tempat yang tidak ada di Google Maps
+• Mode outdoor dengan sorotan jalur hiking, area berkemah, sumber air, puncak, garis kontur, dll
+• Jalur pejalan kaki dan jalur sepeda
+• Titik menarik seperti restoran, SPBU, hotel, toko, tempat wisata, dan banyak lagi
+• Pencarian berdasarkan nama, alamat, atau kategori titik menarik
+• Navigasi dengan suara untuk berjalan, bersepeda, atau berkendara
+• Tandai tempat favoritmu dengan sekali tap
+• Artikel Wikipedia offline
+• Layer dan rute transportasi subway
+• Rekaman jejak
+• Ekspor dan impor bookmark serta jejak dalam format KML, KMZ, GPX
+• Mode gelap untuk digunakan saat malam
+• Tingkatkan data peta untuk semua orang dengan editor bawaan sederhana
+
+<b>Kebebasan Ada di Sini</b>
+Temukan perjalananmu, jelajahi dunia dengan privasi dan komunitas di garis depan!

android/app/src/fdroid/play/listings/id/short-description.txt

@@ -0,0 +1 @@
+Navigasi peta mudah – Temukan lebih banyak – Didukung oleh komunitas

android/app/src/fdroid/play/listings/it-IT/release-notes.txt

@@ -1,10 +1,11 @@
-• OpenStreetMap aggiornato al 6 Settembre
-• Bici: miglior stima del tempo di percorrenza
-• Auto: punti d'interesse colorati
-• Cerca i punti d'interesse tramite filiale
-• Aggiunte strutture alta tensione, cabine di sicurezza e uffici
-• Aggiornate le icone per torri, discoteche, farmacie e aste per bandiere
-• Salva il colore dei Preferiti nel GPX
-• Evidenziate le aree pedonali nelle piazze
-• AndroidAuto: aggiunto il numero dell'uscita nelle rotonde
+• Mappe OSM al 16 Novembre
+• Aggiunti alberi
+• Fermate bus più piccole e visibili prima
+• Entrate rese meno ingombranti
+• Aggiunti diversi POI
+• Le zone sabbiose sono ora visibili
+• Aggiunta l'opzione di POI vacante nell'editor OSM
+• Migliorate le insegne stradali in Europa
+• Aggiunta opzione per evitare strade pavimentate
+• Aggiunte icone nelle impostazioni
 Visita Codeberg per ulteriori dettagli

android/app/src/fdroid/play/listings/no-NO/short-description.txt

@@ -1 +1 @@
-Lett kart navigasjon - Opplev mere på din reise - Drevet av felleskapet
+Enkel kartnavigering - Opplev mere på din reise - Drevet av felleskapet

android/app/src/fdroid/play/listings/no-NO/title.txt

@@ -1 +1 @@
-CoMaps - Gå tur, sykkel, kjør - med personvern
+CoMaps - Gå, sykle, kjøre offline med personvern

android/app/src/fdroid/play/listings/pl-PL/short-description.txt

@@ -1 +1 @@
-Łatwa nawigacja – Odkryj więcej ze swojej podróży – Wspierane przez społeczność
+Łatwa nawigacja po mapie - Odkryj więcej z podróży - Wspierane przez społeczność

android/app/src/fdroid/play/listings/pt-BR/release-notes.txt

@@ -1,10 +1,11 @@
-• Dados OSM de 6/09
-• Penalidades de conversão para bicicleta
-• Etiquetas de POI coloridas para o estilo do mapa de navegação de carros
-• Busca de POIs por nome de filial
-• Adição de portais de energia, guaritas e escritórios
-• Atualização de ícones para torres, discotecas, farmácias e mastros
-• Salva a cor dos favoritos nas exportações GPX
-• Preenchimento de praças pavimentadas
-• Android Auto: exibe números de saída de rotatória
-Confira nossas notas de lançamento do Codeberg para mais mudanças
+• Dados OSM de 16/11
+• Adição de árvores ao mapa
+• Ícones de pontos de ônibus menores e exibidos mais cedo
+• Visibilidade reduzida das entradas
+• Adição de diversos outros tipos de Pontos de Interesse
+• Exibição de áreas de areia no mapa
+• Adição de opção de "Estabelecimento vazio" ao editor do OSM
+• Melhorias nas placas de rodovias na Europa
+• Opção para evitar rotas por estradas pavimentadas
+• Adição de ícones nas configurações
+Confira as notas de lançamento do Codeberg para mais detalhes!

android/app/src/fdroid/play/listings/pt-PT/full-description.txt

@@ -0,0 +1,32 @@
+Uma aplicação pela comunidade, grátis e ‘open-source’, de mapas baseada em dados do OpenStreetMap e reforçada com compromisso para transparência, privacidade e sem fins lucrativos. CoMaps é um fork/spin-off de Organic Maps, que, por sua vez, é um fork de Maps.ME
+
+Leia sobre as razões deste projeto e a sua direção em <b><i>codeberg.org/comaps</i></b>.
+Junte-se à comunidade e ajude a fazer a melhor aplicação de mapas
+• Use a aplicação e partilhe-a com outros
+• Dê ‘feedback’ e reporte problemas
+• Atualize os dados de mapa na aplicação ou no site do OpenStreetMap
+
+‣ <b>Simples e Polida</b>: funcionalidades essenciais fáceis que “somente funcionam”.
+‣ <b>Foco Offline</b>: Planeie e navegue as suas viagens no estrangeiro sem dados móveis, procure locais numa caminhada distante, etc. Todas as funções da aplicação foram criadas com intenção de serem usadas sem internet.
+‣ <b>Respeita a privacidade</b>: A aplicação foi criada com privacidade em mente — não identifica o utilizador, não rastreia, e não usa a sua informação pessoal. Sem anúncios.
+‣ <b>Saves Your Battery and Space</b>: Não esgota a sua bateria ao contrário de outras aplicações. Mapas compactos salvam espaço no seu telemóvel.
+‣ <b>Gratuita e Feita pela Comunidade</b>: Pessoas como si ajudam a criar a aplicação ao adicionar locais ao OpenStreetMap, testando e dando opiniões em funcionalidades e contribuindo com dotes de desenvolvimento e dinheiro.
+‣ <b>Decisões e Finanças Abertas e Transparentes, Sem fins lucrativos e ‘Open-Source’.</b>
+
+<b>Funcionalidades principais</b>:
+• Mapas detalhados descarregáveis com locais que não estão disponíveis com o Google Maps
+• Modo ao Ar Livre com trilhos de caminhada destacados, acampamentos, fontes de água, cumes, curvas de nível, etc
+• Caminhos pedestres e ciclovias
+• Pontos de interesse como restaurantes, estações de serviço, hotéis, lojas, atrações e muitos mais
+• Pesquise por nome, endereço, ou por categoria de ponto de interesse
+• Navegação com anúncios de voz ao caminhar, pedalar ou conduzir
+• Marque os seus locais favoritos com um único clique
+• Artigos da Wikipédia Offline
+• Camada de metro e direções
+• Gravação de Percursos
+• Exportar e importar marcadores e percursos em formatos KML, KMZ, GPX
+• Um modo escuro para usar durante a noite
+• Melhore a informação do mapa para todos com um editor básico embebido
+
+<b>A liberdade chegou</b>
+Descubra a sua jornada, navegue o mundo com privacidade e a comunidade à frente!

android/app/src/fdroid/play/listings/ru-RU/release-notes.txt

@@ -1,10 +1,10 @@
-• Данные на 6 сентября
-• Предупреждения на веломаршруте
-• Цветные метки POI при автонавигации
-• Поиск POI по названию ветки
-• Добавлены высоковольтные опоры, помещения охраны и офисы
-• Обновлены значки башен,вышек,мачт,ночных клубов,аптек
-• Сохранение цвета закладок при экспорте в GPX (через OM)
-• Отображение цветом пешеходных зон
-• Android Auto: отображение номеров съездов на кольцевых развязках
-Посмотрите примечания к выпуску Codeberg, чтобы узнать о других изменениях!
+• Карты OpenStreetMap от 16 ноября
+• Добавлены деревья и песчаные области
+• Автобусные остановки показываются раньше, но маленькими иконами
+• Входы разделены по типам
+• В OSM редакторе можно отметить место как неиспользуемое
+• Улучшения в иконках номеров дорог в Европе
+• Возможность избегать дорог с покрытием при построении маршрута
+• Иконки в экране настроек
+• На карту добавлены несколько новых типов объектов 
+Подробнее смотрите на codeberg.org/comaps/comaps/releases

android/app/src/fdroid/play/listings/sl/full-description.txt

@@ -0,0 +1,31 @@
+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.
+
+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 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, nedobičkonosno in popolnoma odprtokodno.</b>
+
+<b>Glavne zmogljivosti</b>:
+• 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 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š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!

android/app/src/fdroid/play/listings/sl/short-description.txt

@@ -1 +1 @@
-Enostavna navigacija – Odkrij več o svojem potovanju – Podprto v skupnosti
+Enostavno usmerjanje – Odkrij več o svojem potovanju – Podprto v skupnosti

android/app/src/fdroid/play/listings/sr/release-notes.txt

@@ -0,0 +1,11 @@
+• Подaци са OpenStreetMap-а закључно са 16. новембром
+• Додате ознаке за дрвеће
+• Смањене иконе аутобуских стајалишта и ранији приказ
+• Смањена видљивост улаза
+• Додато неколико нових типова ознака на мапу
+• Приказ пешчаних површина на мапи
+• Додата опција „пословни простор је празан“ у OSM едитору
+• Побољшани путокази у Европи
+• Опција рутирања „избегавај асфалтиране путеве“
+• Додате иконе на страници подешавања
+Погледајте детаље на Codeberg-у за списак свих промена!

android/app/src/fdroid/play/listings/sv-SE/title.txt

@@ -0,0 +1 @@
+Comaps- Vandra, Cykla, Kör Offline, Privat

android/app/src/fdroid/play/listings/ta-IN/full-description.txt

@@ -0,0 +1,32 @@
+OpenStreetMap தரவை அடிப்படையாகக் கொண்ட சமூகம் தலைமையிலான இலவச மற்றும் திறந்த மூல வரைபட பயன்பாடு மற்றும் வெளிப்படைத்தன்மை, தனியுரிமை மற்றும் இலாப நோக்கற்றது ஆகியவற்றுக்கான அர்ப்பணிப்புடன் வலுவூட்டப்பட்டது. CoMaps என்பது ஆர்கானிக் மேப்சின் ஃபோர்க்/ச்பின்-ஆஃப் ஆகும், இது Maps.ME இன் ஃபோர்க் ஆகும். 
+
+திட்டத்திற்கான காரணங்கள் மற்றும் அதன் திசையை <b><i>codeberg.org/comaps</i></b> இல் படிக்கவும். 
+அங்குள்ள சமூகத்தில் சேர்ந்து சிறந்த வரைபட பயன்பாட்டை உருவாக்க உதவுங்கள் 
+• பயன்பாட்டைப் பயன்படுத்தி, அதைப் பற்றிய தகவலைப் பரப்புங்கள் 
+• கருத்துக்களை வழங்கவும் மற்றும் சிக்கல்களைப் புகாரளிக்கவும் 
+• பயன்பாட்டில் அல்லது OpenStreetMap இணையதளத்தில் வரைபடத் தரவைப் புதுப்பிக்கவும் 
+
+‣ <b>ஆஃப்லைனில் கவனம் செலுத்தப்பட்டது</b>: செல்லுலார் சேவையின் தேவையின்றி உங்களின் வெளிநாட்டுப் பயணத்தைத் திட்டமிட்டு வழிநடத்துங்கள், தொலைதூர பயணத்தில் இருக்கும் போது வழிப் புள்ளிகளைத் தேடுங்கள். 
+‣ <b>தனியுரிமைக்கு மதிப்பளித்தல்</b>: பயன்பாடு தனியுரிமையை மனதில் கொண்டு வடிவமைக்கப்பட்டுள்ளது - நபர்களை அடையாளம் காணாது, கண்காணிக்காது மற்றும் தனிப்பட்ட தகவல்களைச் சேகரிக்காது. விளம்பரங்கள் இல்லாதது. 
+‣ <b>எளிமையான மற்றும் மெருகூட்டப்பட்டது</b>: செயல்படும் நற்பொருத்தங்கள் பயன்படுத்த எளிதானது. 
+‣ <b>உங்கள் பேட்டரி மற்றும் இடத்தைச் சேமிக்கிறது</b>: மற்ற வழிசெலுத்தல் பயன்பாடுகளைப் போல உங்கள் பேட்டரியை வெளியேற்றாது. சிறிய வரைபடங்கள் உங்கள் தொலைபேசியில் விலைமதிப்பற்ற இடத்தை சேமிக்கின்றன. 
+‣ <b>இலவசம் மற்றும் சமூகத்தால் உருவாக்கப்பட்டது</b>: OpenStreetMap இல் இடங்களைச் சேர்ப்பதன் மூலமும், சோதனை செய்து, அம்சங்களைப் பற்றிய கருத்துக்களை வழங்குவதன் மூலமும், அவர்களின் மேம்பாட்டுத் திறன்களையும் பணத்தையும் பங்களிப்பதன் மூலமும் உங்களைப் போன்றவர்கள் பயன்பாட்டை உருவாக்க உதவியுள்ளனர். 
+‣ <b>திறந்த மற்றும் வெளிப்படையான முடிவெடுக்கும் மற்றும் நிதியியல், இலாப நோக்கற்ற மற்றும் முழு திறந்த மூல.</b> 
+
+<b>முக்கிய அம்சங்கள்</b>: 
+• கூகுள் மேப்சில் இல்லாத இடங்களுடன் தரவிறக்கம் செய்யக்கூடிய விரிவான வரைபடங்கள் 
+• ஐகிங் பாதைகள், முகாம்கள், நீர் ஆதாரங்கள், சிகரங்கள், விளிம்பு கோடுகள் போன்றவற்றைக் கொண்ட வெளிப்புறப் பயன்முறை 
+• நடைபாதைகள் மற்றும் சைக்கிள் பாதைகள் 
+• உணவகங்கள், எரிவாயு நிலையங்கள், ஓட்டல்கள், கடைகள், சுற்றிப்பார்க்கும் இடங்கள் மற்றும் பல போன்ற ஆர்வமுள்ள இடங்கள் 
+• பெயர் அல்லது முகவரி அல்லது ஆர்வமுள்ள வகை மூலம் தேடவும் 
+• நடைபயிற்சி, சைக்கிள் ஓட்டுதல் அல்லது வண்டி ஓட்டுவதற்கான குரல் அறிவிப்புகளுடன் வழிசெலுத்தல் 
+• ஒரே தட்டினால் உங்களுக்குப் பிடித்த இடங்களை புத்தகக்குறி செய்யவும் 
+• இணைப்பில்லாத விக்கிபீடியா கட்டுரைகள் 
+• சுரங்கப்பாதை போக்குவரத்து அடுக்கு மற்றும் திசைகள் 
+• ட்ராக் ரெக்கார்டிங் 
+• KML, KMZ, GPX வடிவங்களில் புக்மார்க்குகள் மற்றும் டிராக்குகளை ஏற்றுமதி மற்றும் இறக்குமதி செய்யுங்கள் 
+• இரவில் பயன்படுத்த ஒரு இருண்ட பயன்முறை 
+• அடிப்படை உள்ளமைக்கப்பட்ட எடிட்டரைப் பயன்படுத்தி அனைவருக்கும் வரைபடத் தரவை மேம்படுத்தவும் 
+
+<b>சுதந்திரம் இங்கே உள்ளது</b> 
+உங்கள் பயணத்தைக் கண்டறியவும், தனியுரிமை மற்றும் சமூகத்தை முன்னணியில் கொண்டு உலகிற்கு செல்லவும்!

android/app/src/fdroid/play/listings/ta-IN/short-description.txt

@@ -0,0 +1 @@
+எளிய வழிகாட்டி - பயணத்தை மேலும் சுவாரசியமாக்க - சமூகத்தால் இயக்கப்படுகிறது

android/app/src/fdroid/play/listings/zh-CN/full-description.txt

@@ -1,4 +1,4 @@
-这是一个由社区主导、以 OpenStreetMap 数据为基础的免费开源地图应用，建立在我们对运营透明、隐私安全和非营利性的承诺之上。CoMaps 是 Organic Maps 的分叉/衍生产品，而 Organic Maps 则是 Maps.ME 的分叉。
+这是一个由社区主导、以 OpenStreetMap 数据为基础的自由开源地图应用，建立在我们对运营透明、隐私安全和非营利性的承诺之上。CoMaps 是 Organic Maps 的分叉/衍生产品，而 Organic Maps 则是 Maps.ME 的分叉。
 
 如需了解此项目诞生的原因及未来方向，请访问 <b><i>codeberg.org/comaps</i></b>。
 加入以上社区，和大家一起打造最优质的地图应用
@@ -10,7 +10,7 @@
 ‣ <b>尊重隐私</b>：开发者们在设计 CoMaps 时，优先考虑的是保护用户隐私。CoMaps 无法识别用户身份、无法跟踪用户活动，也无法收集个人信息。此外，CoMaps 不会也不能显示任何广告。
 ‣ <b>简洁精致</b>：轻便易用、不出差错的基本功能。
 ‣ <b>节省电池电量和空间</b>：不会像其他导航应用那样耗电。精简的地图可以节省宝贵的手机空间。 
-‣ <b>由社区合作创建的免费应用</b>：如同您一样的用户通过向 OpenStreetMap 添加地点、测试功能并提供反馈、无私地贡献自己的编程技能和资金，协力开发了 CoMaps。
+‣ <b>自由且社区共建</b>：如同您一样的用户通过向 OpenStreetMap 添加地点、测试功能并提供反馈、无私地贡献自己的编程技能和资金，协力开发了 CoMaps。
 ‣ <b>决策问责、财务透明、非营利性、完全开源。</b>
 
 <b>主要功能</b>：
@@ -25,7 +25,7 @@
 • 地铁交通图层和路线指示
 • 轨迹记录
 • 以 KML、KMZ 和 GPX 格式导出和导入书签和轨迹
-• 选择天暗后自动开启的黑暗模式
+• 深色模式，适配夜间使用场景
 • 使用基本的内置编辑器来编辑 OpenStreetMap 地点，帮助大家改进地图数据
 
 <b>自由在此</b>

android/app/src/fdroid/play/version.yaml

@@ -1 +1 @@
-version: 2025.03.02-7-FDroid+25030207
+version: 2025.11.19-2-FDroid+25111902

android/app/src/google/play/listings/bg/short-description.txt

@@ -0,0 +1 @@
+Лесна навигация - Открийте повече от вашето пътуване - Подкрепен от общността

android/app/src/google/play/listings/bg/title.txt

@@ -0,0 +1 @@
+CoMaps - Пътуване с Приватност

android/app/src/google/play/listings/id/short-description.txt

@@ -0,0 +1 @@
+Navigasi peta mudah – Temukan lebih banyak – Didukung oleh komunitas

android/app/src/google/play/listings/id/title.txt

@@ -0,0 +1 @@
+CoMaps - Jelajah dengan Privat

android/app/src/google/play/listings/no-NO/short-description.txt

@@ -0,0 +1 @@
+Enkel kartnavigering - Opplev mere på din reise - Drevet av felleskapet

android/app/src/google/play/listings/no-NO/title.txt

@@ -0,0 +1 @@
+CoMaps -Naviger med personvern

android/app/src/google/play/listings/pl-PL/short-description.txt

@@ -0,0 +1 @@
+Łatwa nawigacja po mapie - Odkryj więcej z podróży - Wspierane przez społeczność

android/app/src/google/play/listings/pt-PT/full-description.txt

@@ -0,0 +1,36 @@
+Uma aplicação pela comunidade, grátis e ‘open-source’, de mapas baseada em dados do OpenStreetMap e reforçada com compromisso para transparência, privacidade e sem fins lucrativos. 
+
+Junte-se à comunidade e ajude a fazer a melhor aplicação de mapas
+• Use a aplicação e partilhe-a com outros
+• Dê ‘feedback’ e reporte problemas
+• Atualize os dados de mapa na aplicação ou no site do OpenStreetMap
+
+<i>O seu ‘feedback’ e ‘reviews’ de 5 estrelas são a melhor maneira de nos ajudar!</i>
+
+‣ <b>Simples e Polida</b>: funcionalidades essenciais fáceis que “somente funcionam”.
+‣ <b>Foco Offline</b>: Planeie e navegue as suas viagens no estrangeiro sem dados móveis, procure locais numa caminhada distante, etc. Todas as funções da aplicação foram criadas com intenção de serem usadas sem internet.
+‣ <b>Respeita a privacidade</b>: A aplicação foi criada com privacidade em mente — não identifica o utilizador, não rastreia, e não usa a sua informação pessoal. Sem anúncios.
+‣ <b>Saves Your Battery and Space</b>: Não esgota a sua bateria ao contrário de outras aplicações. Mapas compactos salvam espaço no seu telemóvel.
+‣ <b>Gratuita e Feita pela Comunidade</b>: Pessoas como si ajudam a criar a aplicação ao adicionar locais ao OpenStreetMap, testando e dando opiniões em funcionalidades e contribuindo com dotes de desenvolvimento e dinheiro.
+‣ <b>Decisões e Finanças Abertas e Transparentes, Sem fins lucrativos e ‘Open-Source’.</b>
+
+<b>Funcionalidades principais</b>:
+• Mapas detalhados descarregáveis com locais que não estão disponíveis com o Google Maps
+• Modo ao Ar Livre com trilhos de caminhada destacados, acampamentos, fontes de água, cumes, curvas de nível, etc
+• Caminhos pedestres e ciclovias
+• Pontos de interesse como restaurantes, estações de serviço, hotéis, lojas, atrações e muitos mais
+• Pesquise por nome, endereço, ou por categoria de ponto de interesse
+• Navegação com anúncios de voz ao caminhar, pedalar ou conduzir
+• Marque os seus locais favoritos com um único clique
+• Artigos da Wikipédia Offline
+• Camada de metro e direções
+• Gravação de Percursos
+• Exportar e importar marcadores e percursos em formatos KML, KMZ, GPX
+• Um modo escuro para usar durante a noite
+• Melhore a informação do mapa para todos com um editor básico embebido
+• Suporte para ‘Android Auto’
+
+Por favor, reporte problemas da aplicação, sugira ideias e junte-se à nossa comunidade no website <b><i>comaps.app</i></b>.
+
+<b>A liberdade chegou</b>
+Descubra a sua jornada, navegue o mundo com privacidade e a comunidade à frente!

android/app/src/google/play/listings/sl/full-description.txt

@@ -0,0 +1,36 @@
+Skupnostno vodena brezplačna in odprtokodna aplikacija za zemljevide, ki temelji na podatkih OpenStreetMap, ter je okrepljena z zavezanostjo k transparentnosti, zasebnosti, in ostajanju neprofitne organizacije.
+
+Pridružite se skupnosti in pomagajte ustvariti najboljšo aplikacijo za zemljevide.
+• Uporabljajte aplikacijo in jo priporočajte drugim.
+• Podajte povratne informacije in poročajte o težavah.
+• Posodobite podatke zemljevida v aplikaciji ali na spletni strani OpenStreetMap.
+
+<i>Vaše povratne informacije in 5-zvezdične ocene so najboljša podpora za nas!</i>
+
+‣ <b>Preprostost in izpopolnjenost</b>: bistvene, enostavne za uporabo funkcije, ki preprosto delujejo.
+‣ <b>Osredotočena na delovanje brez internetne povezave</b>: načrtujte in navigirajte svoje potovanje v tujini brez potrebe po mobilni povezavi, iščite točke na poti med daljšo pohodniško turo, itd. Vse funkcije aplikacije so zasnovane za delovanje brez internetne povezave.
+‣ <b>Spoštovanje zasebnosti</b>: aplikacija je zasnovana z mislijo na zasebnost – ne identificira ljudi, ne sledi in ne zbira osebnih podatkov. Brez oglasov.
+‣ <b>Varčuje z baterijo in prostorom</b>: ne izčrpava baterije kot druge navigacijske aplikacije. Kompaktni zemljevidi varčujejo dragoceni prostor na vašem telefonu.
+‣ <b>Brezplačna in ustvarjena s pomočjo skupnosti</b>: ljudje, kot ste vi, so pomagali ustvariti aplikacijo z dodajanjem krajev v OpenStreetMap, testiranjem in dajanjem povratnih informacij o funkcijah ter prispevanjem svojih razvojnih veščin in denarja.
+‣ <b>Odprto in pregledno odločanje in finance, neprofitna in popolnoma odprtokodna aplikacija.
+
+<b>Glavne značilnosti</b>:
+• Podrobni zemljevidi z mesti, ki niso na voljo v Google Maps, ki jih lahko prenesete
+• Način za uporabo na prostem z označenimi pohodniškimi potmi, kampi, vodnimi viri, vrhovi, višinskimi krivuljami itd.
+• Pešpoti in kolesarske poti
+• Zanimivosti, kot so restavracije, bencinske črpalke, hoteli, trgovine, znamenitosti in še veliko več
+• Iskanje po imenu, naslovu ali kategoriji zanimivih točk
+• Navigacija z glasovnimi napovedmi za hojo, kolesarjenje ali vožnjo
+• Z enim dotikom dodajte svoje priljubljene kraje v zaznamke
+• Članki iz Wikipedije za uporabo brez internetne povezave
+• Plast podzemne železnice in navodila za pot
+• Sledenje poti
+• Izvoz in uvoz zaznamkov in poti v formatih KML, KMZ, GPX
+• Temni način za uporabo ponoči
+• Izboljšajte zemljevidne podatke za vse z uporabo vgrajenega osnovnega urejevalnika.
+• Podpora za Android Auto.
+
+Prijavite težave z aplikacijo, predlagajte ideje in se pridružite naši skupnosti na spletni strani <b><i>comaps.app</i></b>.
+
+<b>Svoboda je tu</b>
+Odkrijte svojo pot, raziskujte svet z zasebnostjo in skupnostjo v ospredju!

android/app/src/google/play/listings/sl/short-description.txt

@@ -1 +1 @@
-Enostavna navigacija – Odkrij več o svojem potovanju – Podprto v skupnosti
+Enostavno usmerjanje – Odkrij več o svojem potovanju – Podprto v skupnosti

android/app/src/google/play/listings/sl/title.txt

@@ -0,0 +1 @@
+CoMaps - Usmerjajte zasebno

android/app/src/google/play/listings/sv-SE/title.txt

@@ -0,0 +1 @@
+Comaps- Navigera Privat

android/app/src/google/play/listings/ta-IN/short-description.txt

@@ -0,0 +1 @@
+எளிய வழிகாட்டி - பயணத்தை மேலும் சுவாரசியமாக்க - சமூகத்தால் இயக்கப்படுகிறது

android/app/src/google/play/listings/zh-CN/full-description.txt

@@ -1,4 +1,4 @@
-这是一个由社区主导、以 OpenStreetMap 数据为基础的免费开源地图应用，建立在我们对运营透明、隐私安全和非营利性的承诺之上。
+这是一个由社区主导、以 OpenStreetMap 数据为基础的自由开源地图应用，建立在我们对运营透明、隐私安全和非营利性的承诺之上。
 
 加入社区，和大家一起打造最优质的地图应用
 • 使用 CoMaps 的同时也分享推荐给周围的人 
@@ -11,7 +11,7 @@
 ‣ <b>以提供离线服务为核心</b>：无需移动网络即可规划和导航您的海外旅行，郊外远足时仍可搜索航点等等。所有功能均可离线使用。
 ‣ <b>尊重隐私</b>：开发者们在设计 CoMaps 时，优先考虑的是保护用户隐私。CoMaps 无法识别用户身份、无法跟踪用户活动，也无法收集个人信息。此外，CoMaps 不会也不能显示任何广告。
 ‣ <b>节省电池电量和空间</b>：不会像其他导航应用那样耗电。精简的地图可以节省宝贵的手机空间。 
-‣ <b>由社区合作创建的免费应用</b>：如同您一样的用户通过向 OpenStreetMap 添加地点、测试功能并提供反馈、无私地贡献自己的编程技能和资金，协力开发了 CoMaps。
+‣ <b>自由且社区共建</b>：如同您一样的用户通过向 OpenStreetMap 添加地点、测试功能并提供反馈、无私地贡献自己的编程技能和资金，协力开发了 CoMaps。
 ‣ <b>决策问责、财务透明、非营利性、完全开源。</b>
 
 <b>主要功能</b>：
@@ -26,7 +26,7 @@
 • 地铁交通图层和路线指示
 • 轨迹记录
 • 以 KML、KMZ 和 GPX 格式导出和导入书签和轨迹
-• 选择天暗后自动开启的黑暗模式
+• 深色模式，适配夜间使用场景
 • 使用基本的内置编辑器来编辑 OpenStreetMap 地点，帮助大家改进地图数据
 • 支持 Android Auto
 

android/app/src/main/AndroidManifest.xml

@@ -89,6 +89,7 @@
     <!-- Allows for config and orientation change without killing/restarting main activity -->
     <activity
       android:name="app.organicmaps.SplashActivity"
+      android:theme="@style/MwmTheme.Splash"
       android:configChanges="orientation|screenSize|smallestScreenSize|density|screenLayout|uiMode|keyboard|keyboardHidden|navigation"
       android:screenOrientation="fullUser"
       android:exported="true">
@@ -349,6 +350,7 @@
 
     <activity
         android:name="app.organicmaps.DownloadResourcesLegacyActivity"
+        android:theme="@style/MwmTheme.DownloadResourcesLegacy"
         android:configChanges="orientation|screenLayout|screenSize"
         android:screenOrientation="fullUser"/>
 
@@ -365,6 +367,7 @@
 
     <activity
         android:name="app.organicmaps.MwmActivity"
+        android:theme="@style/MwmTheme.MainActivity"
         android:launchMode="singleTask"
         android:configChanges="uiMode"
         android:screenOrientation="fullUser"
@@ -386,6 +389,7 @@
 
     <activity
         android:name="app.organicmaps.search.SearchActivity"
+        android:theme="@style/MwmTheme.CardBg"
         android:configChanges="orientation|screenLayout|screenSize"
         android:screenOrientation="fullUser"
         android:label="@string/search_map"
@@ -412,6 +416,7 @@
 
     <activity
         android:name="app.organicmaps.bookmarks.BookmarkCategoriesActivity"
+        android:theme="@style/MwmTheme.WindowBg"
         android:configChanges="orientation|screenLayout|screenSize"
         android:screenOrientation="fullUser"
         android:label="@string/bookmarks_and_tracks"
@@ -420,6 +425,7 @@
 
     <activity
         android:name="app.organicmaps.bookmarks.BookmarkListActivity"
+        android:theme="@style/MwmTheme.CardBg"
         android:configChanges="orientation|screenLayout|screenSize"
         android:screenOrientation="fullUser"
         android:label="@string/bookmarks"

android/app/src/main/java/app/organicmaps/DownloadResourcesLegacyActivity.java

@@ -24,7 +24,6 @@ import androidx.annotation.CallSuper;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.annotation.StringRes;
-import androidx.annotation.StyleRes;
 import androidx.core.view.ViewCompat;
 import app.organicmaps.base.BaseMwmFragmentActivity;
 import app.organicmaps.downloader.MapManagerHelper;
@@ -438,11 +437,4 @@ public class DownloadResourcesLegacyActivity extends BaseMwmFragmentActivity
                            .setOnDismissListener(dialog -> mAlertDialog = null)
                            .show();
   }
-
-  @Override
-  @StyleRes
-  public int getThemeResourceId(@NonNull String theme)
-  {
-    return R.style.MwmTheme_DownloadResourcesLegacy;
-  }
 }

android/app/src/main/java/app/organicmaps/MapFragment.java

@@ -1,210 +0,0 @@
-package app.organicmaps;
-
-import android.content.Context;
-import android.os.Build;
-import android.os.Bundle;
-import android.util.DisplayMetrics;
-import android.view.LayoutInflater;
-import android.view.MotionEvent;
-import android.view.SurfaceHolder;
-import android.view.SurfaceView;
-import android.view.View;
-import android.view.ViewGroup;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.core.content.res.ConfigurationHelper;
-import app.organicmaps.base.BaseMwmFragment;
-import app.organicmaps.sdk.Map;
-import app.organicmaps.sdk.MapRenderingListener;
-import app.organicmaps.sdk.display.DisplayType;
-import app.organicmaps.sdk.util.log.Logger;
-import com.google.android.material.dialog.MaterialAlertDialogBuilder;
-
-public class MapFragment extends BaseMwmFragment implements View.OnTouchListener, SurfaceHolder.Callback
-{
-  private static final String TAG = MapFragment.class.getSimpleName();
-
-  @NonNull
-  private final Map mMap = new Map(DisplayType.Device);
-
-  public void updateCompassOffset(int offsetX, int offsetY)
-  {
-    mMap.updateCompassOffset(requireContext(), offsetX, offsetY, true);
-  }
-
-  public void updateBottomWidgetsOffset(int offsetX, int offsetY)
-  {
-    mMap.updateBottomWidgetsOffset(requireContext(), offsetX, offsetY);
-  }
-
-  public void updateMyPositionRoutingOffset(int offsetY)
-  {
-    mMap.updateMyPositionRoutingOffset(offsetY);
-  }
-
-  public void destroySurface(boolean activityIsChangingConfigurations)
-  {
-    mMap.onSurfaceDestroyed(activityIsChangingConfigurations, isAdded());
-  }
-
-  public boolean isContextCreated()
-  {
-    return mMap.isContextCreated();
-  }
-
-  @Override
-  public void surfaceCreated(@NonNull SurfaceHolder surfaceHolder)
-  {
-    Logger.d(TAG);
-    int densityDpi;
-
-    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R)
-      densityDpi = ConfigurationHelper.getDensityDpi(requireContext().getResources());
-    else
-      densityDpi = getDensityDpiOld();
-
-    mMap.onSurfaceCreated(requireContext(), surfaceHolder.getSurface(), surfaceHolder.getSurfaceFrame(), densityDpi);
-  }
-
-  @Override
-  public void surfaceChanged(SurfaceHolder surfaceHolder, int format, int width, int height)
-  {
-    Logger.d(TAG);
-    mMap.onSurfaceChanged(requireContext(), surfaceHolder.getSurface(), surfaceHolder.getSurfaceFrame(),
-                          surfaceHolder.isCreating());
-  }
-
-  @Override
-  public void surfaceDestroyed(@NonNull SurfaceHolder surfaceHolder)
-  {
-    Logger.d(TAG);
-    mMap.onSurfaceDestroyed(requireActivity().isChangingConfigurations(), true);
-  }
-
-  @Override
-  public void onAttach(Context context)
-  {
-    Logger.d(TAG);
-    super.onAttach(context);
-
-    mMap.setLocationHelper(MwmApplication.from(requireContext()).getLocationHelper());
-    mMap.setMapRenderingListener((MapRenderingListener) context);
-    mMap.setCallbackUnsupported(this::reportUnsupported);
-  }
-
-  @Override
-  public void onDetach()
-  {
-    Logger.d(TAG);
-    super.onDetach();
-    mMap.setMapRenderingListener(null);
-    mMap.setCallbackUnsupported(null);
-  }
-
-  @Override
-  public void onCreate(Bundle b)
-  {
-    Logger.d(TAG);
-    super.onCreate(b);
-    setRetainInstance(true);
-    boolean launchByDeepLink = false;
-    Bundle args = getArguments();
-    if (args != null)
-      launchByDeepLink = args.getBoolean(Map.ARG_LAUNCH_BY_DEEP_LINK);
-    mMap.onCreate(launchByDeepLink);
-  }
-
-  @Override
-  public void onStart()
-  {
-    Logger.d(TAG);
-    super.onStart();
-    mMap.onStart();
-  }
-
-  @Override
-  public void onStop()
-  {
-    Logger.d(TAG);
-    super.onStop();
-    mMap.onStop();
-  }
-
-  @Override
-  public void onPause()
-  {
-    Logger.d(TAG);
-    super.onPause();
-    mMap.onPause(requireContext());
-  }
-
-  @Override
-  public void onResume()
-  {
-    Logger.d(TAG);
-    super.onResume();
-    mMap.onResume();
-  }
-
-  @Override
-  public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState)
-  {
-    Logger.d(TAG);
-    final View view = inflater.inflate(R.layout.fragment_map, container, false);
-    final SurfaceView mSurfaceView = view.findViewById(R.id.map_surfaceview);
-    mSurfaceView.getHolder().addCallback(this);
-    return view;
-  }
-
-  @Override
-  public boolean onTouch(View view, MotionEvent event)
-  {
-    int action = event.getActionMasked();
-    int pointerIndex = event.getActionIndex();
-    switch (action)
-    {
-    case MotionEvent.ACTION_POINTER_UP -> action = Map.NATIVE_ACTION_UP;
-    case MotionEvent.ACTION_UP ->
-    {
-      action = Map.NATIVE_ACTION_UP;
-      pointerIndex = 0;
-    }
-    case MotionEvent.ACTION_POINTER_DOWN -> action = Map.NATIVE_ACTION_DOWN;
-    case MotionEvent.ACTION_DOWN ->
-    {
-      action = Map.NATIVE_ACTION_DOWN;
-      pointerIndex = 0;
-    }
-    case MotionEvent.ACTION_MOVE ->
-    {
-      action = Map.NATIVE_ACTION_MOVE;
-      pointerIndex = Map.INVALID_POINTER_MASK;
-    }
-    case MotionEvent.ACTION_CANCEL -> action = Map.NATIVE_ACTION_CANCEL;
-    }
-    Map.onTouch(action, event, pointerIndex);
-    return true;
-  }
-
-  public void notifyOnSurfaceDestroyed(@NonNull Runnable task)
-  {
-    mMap.onSurfaceDestroyed(false, true);
-    task.run();
-  }
-
-  private void reportUnsupported()
-  {
-    new MaterialAlertDialogBuilder(requireContext(), R.style.MwmTheme_AlertDialog)
-        .setMessage(R.string.unsupported_phone)
-        .setCancelable(false)
-        .setPositiveButton(R.string.close, (dlg, which) -> requireActivity().moveTaskToBack(true))
-        .show();
-  }
-
-  private int getDensityDpiOld()
-  {
-    final DisplayMetrics metrics = new DisplayMetrics();
-    requireActivity().getWindowManager().getDefaultDisplay().getMetrics(metrics);
-    return metrics.densityDpi;
-  }
-}

android/app/src/main/java/app/organicmaps/MwmActivity.java

@@ -42,7 +42,6 @@ import androidx.annotation.CallSuper;
 import androidx.annotation.Keep;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
-import androidx.annotation.StyleRes;
 import androidx.annotation.UiThread;
 import androidx.core.app.ActivityCompat;
 import androidx.core.content.ContextCompat;
@@ -85,6 +84,7 @@ import app.organicmaps.routing.RoutingPlanInplaceController;
 import app.organicmaps.sdk.ChoosePositionMode;
 import app.organicmaps.sdk.Framework;
 import app.organicmaps.sdk.Map;
+import app.organicmaps.sdk.MapController;
 import app.organicmaps.sdk.MapRenderingListener;
 import app.organicmaps.sdk.PlacePageActivationListener;
 import app.organicmaps.sdk.Router;
@@ -138,10 +138,10 @@ import java.util.ArrayList;
 import java.util.Objects;
 
 public class MwmActivity extends BaseMwmFragmentActivity
-    implements PlacePageActivationListener, View.OnTouchListener, MapRenderingListener, RoutingController.Container,
-               LocationListener, SensorListener, LocationState.ModeChangeListener,
-               RoutingPlanInplaceController.RoutingPlanListener, RoutingBottomMenuListener,
-               BookmarkManager.BookmarksLoadingListener, FloatingSearchToolbarController.SearchToolbarListener,
+    implements PlacePageActivationListener, MapRenderingListener, RoutingController.Container, LocationListener,
+               SensorListener, LocationState.ModeChangeListener, RoutingPlanInplaceController.RoutingPlanListener,
+               RoutingBottomMenuListener, BookmarkManager.BookmarksLoadingListener,
+               FloatingSearchToolbarController.SearchToolbarListener,
                MenuBottomSheetFragment.MenuBottomSheetInterfaceWithHeader,
                PlacePageController.PlacePageRouteSettingsListener, MapButtonsController.MapButtonClickListener,
                DisplayChangedListener
@@ -171,8 +171,9 @@ public class MwmActivity extends BaseMwmFragmentActivity
 
   private static final String POWER_SAVE_DISCLAIMER_SHOWN = "POWER_SAVE_DISCLAIMER_SHOWN";
 
-  @Nullable
-  private MapFragment mMapFragment;
+  @SuppressWarnings("NotNullFieldNotInitialized")
+  @NonNull
+  private MapController mMapController;
 
   private View mPointChooser;
   private MaterialToolbar mPointChooserToolbar;
@@ -245,7 +246,7 @@ public class MwmActivity extends BaseMwmFragmentActivity
   ManageRouteBottomSheet mManageRouteBottomSheet;
 
   private boolean mRemoveDisplayListener = true;
-  private int mLastUiMode = Configuration.UI_MODE_TYPE_UNDEFINED;
+  private static int mLastUiMode = Configuration.UI_MODE_TYPE_UNDEFINED;
 
   public interface LeftAnimationTrackListener
   {
@@ -455,25 +456,12 @@ public class MwmActivity extends BaseMwmFragmentActivity
     }
   }
 
-  @Override
-  @StyleRes
-  protected int getThemeResourceId(@NonNull String theme)
-  {
-    if (Config.UiTheme.isDefault(theme))
-      return R.style.MwmTheme_MainActivity;
-
-    if (Config.UiTheme.isNight(theme))
-      return R.style.MwmTheme_Night_MainActivity;
-
-    return super.getThemeResourceId(theme);
-  }
-
   @Override
   public void onDisplayChangedToCar(@NonNull Runnable onTaskFinishedCallback)
   {
     mRemoveDisplayListener = false;
     startActivity(new Intent(this, MapPlaceholderActivity.class));
-    Objects.requireNonNull(mMapFragment).notifyOnSurfaceDestroyed(onTaskFinishedCallback);
+    mMapController.setOnDestroyListener(onTaskFinishedCallback);
     finish();
   }
 
@@ -482,13 +470,15 @@ public class MwmActivity extends BaseMwmFragmentActivity
   {
     super.onConfigurationChanged(newConfig);
 
-    final int newUiMode = newConfig.uiMode & Configuration.UI_MODE_TYPE_MASK;
-    final boolean newUiModeIsCarConnected = newUiMode == Configuration.UI_MODE_TYPE_CAR;
-    final boolean newUiModeIsCarDisconnected =
-        mLastUiMode == Configuration.UI_MODE_TYPE_CAR && newUiMode == Configuration.UI_MODE_TYPE_NORMAL;
-    mLastUiMode = newUiMode;
+    final int newType = newConfig.uiMode & Configuration.UI_MODE_TYPE_MASK;
+    final int oldType = mLastUiMode & Configuration.UI_MODE_TYPE_MASK;
 
-    if (newUiModeIsCarConnected || newUiModeIsCarDisconnected)
+    mLastUiMode = newConfig.uiMode;
+
+    final boolean carModeChanged =
+        newType != oldType && (newType == Configuration.UI_MODE_TYPE_CAR || oldType == Configuration.UI_MODE_TYPE_CAR);
+
+    if (carModeChanged)
       return;
 
     makeNavigationBarTransparentInLightMode();
@@ -550,7 +540,7 @@ public class MwmActivity extends BaseMwmFragmentActivity
     updateViewsInsets();
 
     if (getIntent().getBooleanExtra(EXTRA_UPDATE_THEME, false))
-      ThemeSwitcher.INSTANCE.restart(isMapRendererActive());
+      ThemeSwitcher.INSTANCE.restart(mMapController.isRenderingActive());
 
     /*
      * onRenderingInitializationFinished() hook is not called when MwmActivity is recreated with the already
@@ -618,7 +608,10 @@ public class MwmActivity extends BaseMwmFragmentActivity
 
   private void initViews(boolean isLaunchByDeeplink)
   {
-    initMap(isLaunchByDeeplink);
+    mMapController = new MapController(findViewById(R.id.map), MwmApplication.from(this).getLocationHelper(), this,
+                                       this::reportUnsupported, isLaunchByDeeplink);
+    getLifecycle().addObserver(mMapController);
+
     initNavigationButtons();
 
     if (!mIsTabletLayout)
@@ -732,16 +725,7 @@ public class MwmActivity extends BaseMwmFragmentActivity
   private void showPositionChooser(ChoosePositionMode mode, boolean isBusiness, boolean applyPosition)
   {
     closeFloatingToolbarsAndPanels(false);
-    if (mMapFragment != null)
-    {
-      final View mapView = mMapFragment.getView();
-      if (mapView != null)
-      {
-        int width = mapView.getWidth();
-        int height = mapView.getHeight();
-        Framework.nativeSetVisibleRect(0, 0, width, height);
-      }
-    }
+
     UiUtils.show(mPointChooser);
     mMapButtonsViewModel.setButtonsHidden(true);
     ChoosePositionMode.set(mode, isBusiness, applyPosition);
@@ -760,29 +744,6 @@ public class MwmActivity extends BaseMwmFragmentActivity
       finish();
   }
 
-  private void initMap(boolean isLaunchByDeepLink)
-  {
-    final FragmentManager manager = getSupportFragmentManager();
-    mMapFragment = (MapFragment) manager.findFragmentByTag(MapFragment.class.getName());
-    if (mMapFragment == null)
-    {
-      Bundle args = new Bundle();
-      args.putBoolean(Map.ARG_LAUNCH_BY_DEEP_LINK, isLaunchByDeepLink);
-      final FragmentFactory factory = manager.getFragmentFactory();
-      mMapFragment = (MapFragment) factory.instantiate(getClassLoader(), MapFragment.class.getName());
-      mMapFragment.setArguments(args);
-      manager.beginTransaction()
-          .replace(R.id.map_fragment_container, mMapFragment, MapFragment.class.getName())
-          .commit();
-    }
-
-    View container = findViewById(R.id.map_fragment_container);
-    if (container != null)
-    {
-      container.setOnTouchListener(this);
-    }
-  }
-
   private void initNavigationButtons()
   {
     prepareNavigationButtons();
@@ -1211,7 +1172,7 @@ public class MwmActivity extends BaseMwmFragmentActivity
   {
     setIntent(intent);
     super.onNewIntent(intent);
-    if (isMapRendererActive())
+    if (mMapController.isRenderingActive())
       processIntent();
     if (intent.getAction() != null && intent.getAction().equals(TrackRecordingService.STOP_TRACK_RECORDING))
     {
@@ -1221,17 +1182,12 @@ public class MwmActivity extends BaseMwmFragmentActivity
     }
   }
 
-  private boolean isMapRendererActive()
-  {
-    return mMapFragment != null && Map.isEngineCreated() && mMapFragment.isContextCreated();
-  }
-
   @CallSuper
   @Override
   protected void onResume()
   {
     super.onResume();
-    ThemeSwitcher.INSTANCE.restart(isMapRendererActive());
+    ThemeSwitcher.INSTANCE.restart(mMapController.isRenderingActive());
     refreshSearchToolbar();
     setFullscreen(isFullscreen());
     makeNavigationBarTransparentInLightMode();
@@ -1249,15 +1205,6 @@ public class MwmActivity extends BaseMwmFragmentActivity
     MwmApplication.from(this).getSensorHelper().addListener(this);
   }
 
-  @Override
-  public void recreate()
-  {
-    // Explicitly destroy surface before activity recreation.
-    if (mMapFragment != null)
-      mMapFragment.destroySurface(true);
-    super.recreate();
-  }
-
   @Override
   protected void onResumeFragments()
   {
@@ -1459,12 +1406,6 @@ public class MwmActivity extends BaseMwmFragmentActivity
     return super.onGenericMotionEvent(event);
   }
 
-  @Override
-  public boolean onTouch(View view, MotionEvent event)
-  {
-    return mMapFragment != null && mMapFragment.onTouch(view, event);
-  }
-
   public void customOnNavigateUp()
   {
     if (removeCurrentFragment(true))
@@ -1480,10 +1421,7 @@ public class MwmActivity extends BaseMwmFragmentActivity
 
   void updateCompassOffset(int offsetY, int offsetX)
   {
-    if (mMapFragment == null || !mMapFragment.isAdded())
-      return;
-
-    mMapFragment.updateCompassOffset(offsetX, offsetY);
+    mMapController.updateCompassOffset(offsetX, offsetY);
 
     final double north = MwmApplication.from(this).getSensorHelper().getSavedNorth();
     if (!Double.isNaN(north))
@@ -1502,9 +1440,6 @@ public class MwmActivity extends BaseMwmFragmentActivity
 
   public void updateBottomWidgetsOffset(int offsetX)
   {
-    if (mMapFragment == null || !mMapFragment.isAdded())
-      return;
-
     int offsetY = mNavBarHeight;
     final Float bottomButtonHeight = mMapButtonsViewModel.getBottomButtonsHeight().getValue();
     if (bottomButtonHeight != null)
@@ -1519,8 +1454,8 @@ public class MwmActivity extends BaseMwmFragmentActivity
 
     if (mDisplayManager.isDeviceDisplayUsed())
     {
-      mMapFragment.updateBottomWidgetsOffset(offsetX, offsetY);
-      mMapFragment.updateMyPositionRoutingOffset(offsetY);
+      mMapController.updateBottomWidgetsOffset(offsetX, offsetY);
+      mMapController.updateMyPositionRoutingOffset(offsetY);
     }
   }
 
@@ -1738,7 +1673,7 @@ public class MwmActivity extends BaseMwmFragmentActivity
   public void onNavigationCancelled()
   {
     closeFloatingToolbarsAndPanels(true);
-    ThemeSwitcher.INSTANCE.restart(isMapRendererActive());
+    ThemeSwitcher.INSTANCE.restart(mMapController.isRenderingActive());
     if (mRoutingPlanInplaceController == null)
       return;
 
@@ -1754,7 +1689,7 @@ public class MwmActivity extends BaseMwmFragmentActivity
   public void onNavigationStarted()
   {
     closeFloatingToolbarsAndPanels(true);
-    ThemeSwitcher.INSTANCE.restart(isMapRendererActive());
+    ThemeSwitcher.INSTANCE.restart(mMapController.isRenderingActive());
     mMapButtonsViewModel.setLayoutMode(MapButtonsController.LayoutMode.navigation);
     refreshLightStatusBar();
 
@@ -1790,7 +1725,7 @@ public class MwmActivity extends BaseMwmFragmentActivity
   public void onResetToPlanningState()
   {
     closeFloatingToolbarsAndPanels(true);
-    ThemeSwitcher.INSTANCE.restart(isMapRendererActive());
+    ThemeSwitcher.INSTANCE.restart(mMapController.isRenderingActive());
     NavigationService.stopService(this);
     mMapButtonsViewModel.setSearchOption(null);
     mMapButtonsViewModel.setLayoutMode(MapButtonsController.LayoutMode.planning);
@@ -2619,4 +2554,13 @@ public class MwmActivity extends BaseMwmFragmentActivity
         window.setNavigationBarContrastEnforced(false);
     }
   }
+
+  private void reportUnsupported()
+  {
+    new MaterialAlertDialogBuilder(this, R.style.MwmTheme_AlertDialog)
+        .setMessage(R.string.unsupported_phone)
+        .setCancelable(false)
+        .setPositiveButton(R.string.close, (dlg, which) -> this.moveTaskToBack(true))
+        .show();
+  }
 }

android/app/src/main/java/app/organicmaps/SplashActivity.java

@@ -56,15 +56,6 @@ public class SplashActivity extends AppCompatActivity
   protected void onCreate(@Nullable Bundle savedInstanceState)
   {
     super.onCreate(savedInstanceState);
-
-    final String theme = Config.UiTheme.getCurrent();
-    if (Config.UiTheme.isDefault(theme))
-      setTheme(R.style.MwmTheme_Splash);
-    else if (Config.UiTheme.isNight(theme))
-      setTheme(R.style.MwmTheme_Night_Splash);
-    else
-      throw new IllegalArgumentException("Attempt to apply unsupported theme: " + theme);
-
     UiThread.cancelDelayedTasks(mInitCoreDelayedTask);
     setContentView(R.layout.activity_splash);
 

android/app/src/main/java/app/organicmaps/background/OsmUploadWork.java

@@ -1,11 +1,13 @@
 package app.organicmaps.background;
 
 import android.content.Context;
+import android.os.Build;
 import androidx.annotation.NonNull;
 import androidx.work.Constraints;
 import androidx.work.ExistingWorkPolicy;
 import androidx.work.NetworkType;
 import androidx.work.OneTimeWorkRequest;
+import androidx.work.OutOfQuotaPolicy;
 import androidx.work.WorkManager;
 import androidx.work.Worker;
 import androidx.work.WorkerParameters;
@@ -35,7 +37,11 @@ public class OsmUploadWork extends Worker
     if (Editor.nativeHasSomethingToUpload() && OsmOAuth.isAuthorized())
     {
       final Constraints c = new Constraints.Builder().setRequiredNetworkType(NetworkType.CONNECTED).build();
-      final OneTimeWorkRequest wr = new OneTimeWorkRequest.Builder(OsmUploadWork.class).setConstraints(c).build();
+      OneTimeWorkRequest.Builder builder = new OneTimeWorkRequest.Builder(OsmUploadWork.class).setConstraints(c);
+      if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
+          builder.setExpedited(OutOfQuotaPolicy.RUN_AS_NON_EXPEDITED_WORK_REQUEST);
+      }
+      final OneTimeWorkRequest wr = builder.build();
       WorkManager.getInstance(context).beginUniqueWork("UploadOsmChanges", ExistingWorkPolicy.KEEP, wr).enqueue();
     }
   }

android/app/src/main/java/app/organicmaps/base/BaseMwmDialogFragment.java

@@ -7,23 +7,17 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.annotation.StyleRes;
 import androidx.fragment.app.DialogFragment;
-import app.organicmaps.R;
-import app.organicmaps.util.ThemeUtils;
 
 public class BaseMwmDialogFragment extends DialogFragment
 {
-  @StyleRes
-  protected final int getFullscreenTheme()
-  {
-    return ThemeUtils.isNightTheme() ? getFullscreenDarkTheme() : getFullscreenLightTheme();
-  }
 
   protected int getStyle()
   {
     return STYLE_NORMAL;
   }
 
-  protected @StyleRes int getCustomTheme()
+  @StyleRes
+  protected int getCustomTheme()
   {
     return 0;
   }
@@ -40,18 +34,6 @@ public class BaseMwmDialogFragment extends DialogFragment
       setStyle(style, theme);
   }
 
-  @StyleRes
-  protected int getFullscreenLightTheme()
-  {
-    return R.style.MwmTheme_DialogFragment_Fullscreen;
-  }
-
-  @StyleRes
-  protected int getFullscreenDarkTheme()
-  {
-    return R.style.MwmTheme_DialogFragment_Fullscreen_Night;
-  }
-
   @NonNull
   protected Application getAppContextOrThrow()
   {

android/app/src/main/java/app/organicmaps/base/BaseMwmFragmentActivity.java

@@ -11,7 +11,6 @@ import androidx.activity.SystemBarStyle;
 import androidx.annotation.CallSuper;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
-import androidx.annotation.StyleRes;
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentFactory;
@@ -19,10 +18,7 @@ import androidx.fragment.app.FragmentManager;
 import app.organicmaps.MwmApplication;
 import app.organicmaps.R;
 import app.organicmaps.SplashActivity;
-import app.organicmaps.sdk.util.Config;
-import app.organicmaps.sdk.util.concurrency.UiThread;
 import app.organicmaps.sdk.util.log.Logger;
-import app.organicmaps.util.RtlUtils;
 import com.google.android.material.appbar.MaterialToolbar;
 import java.util.Objects;
 
@@ -32,24 +28,9 @@ public abstract class BaseMwmFragmentActivity extends AppCompatActivity
 
   private boolean mSafeCreated;
 
-  @NonNull
-  private String mThemeName;
-
-  @StyleRes
-  protected int getThemeResourceId(@NonNull String theme)
-  {
-    if (Config.UiTheme.isDefault(theme))
-      return R.style.MwmTheme;
-
-    if (Config.UiTheme.isNight(theme))
-      return R.style.MwmTheme_Night;
-
-    throw new IllegalArgumentException("Attempt to apply unsupported theme: " + theme);
-  }
-
   /**
    * Shows splash screen and initializes the core in case when it was not initialized.
-   *
+   * <p>
    * Do not override this method!
    * Use {@link #onSafeCreate(Bundle savedInstanceState)}
    */
@@ -58,10 +39,7 @@ public abstract class BaseMwmFragmentActivity extends AppCompatActivity
   protected final void onCreate(@Nullable Bundle savedInstanceState)
   {
     super.onCreate(savedInstanceState);
-    mThemeName = Config.UiTheme.getCurrent();
-    setTheme(getThemeResourceId(mThemeName));
     EdgeToEdge.enable(this, SystemBarStyle.dark(Color.TRANSPARENT));
-    RtlUtils.manageRtl(this);
     if (!MwmApplication.from(this).getOrganicMaps().arePlatformAndCoreInitialized())
     {
       final Intent intent = Objects.requireNonNull(getIntent());
@@ -113,18 +91,6 @@ public abstract class BaseMwmFragmentActivity extends AppCompatActivity
     mSafeCreated = false;
   }
 
-  @CallSuper
-  @Override
-  public void onPostResume()
-  {
-    super.onPostResume();
-    if (!mThemeName.equals(Config.UiTheme.getCurrent()))
-    {
-      // Workaround described in https://code.google.com/p/android/issues/detail?id=93731
-      UiThread.runLater(this::recreate);
-    }
-  }
-
   @Override
   public boolean onOptionsItemSelected(MenuItem item)
   {

android/app/src/main/java/app/organicmaps/bookmarks/BookmarkCategoriesActivity.java

@@ -6,13 +6,11 @@ import android.os.Bundle;
 import androidx.annotation.CallSuper;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
-import androidx.annotation.StyleRes;
 import androidx.fragment.app.Fragment;
 import app.organicmaps.R;
 import app.organicmaps.base.BaseToolbarActivity;
 import app.organicmaps.sdk.bookmarks.data.BookmarkCategory;
 import app.organicmaps.sdk.bookmarks.data.BookmarkManager;
-import app.organicmaps.util.ThemeUtils;
 
 public class BookmarkCategoriesActivity extends BaseToolbarActivity
 {
@@ -38,13 +36,6 @@ public class BookmarkCategoriesActivity extends BaseToolbarActivity
     super.onPause();
   }
 
-  @Override
-  @StyleRes
-  public int getThemeResourceId(@NonNull String theme)
-  {
-    return ThemeUtils.getWindowBgThemeResourceId(theme);
-  }
-
   @Override
   protected Class<? extends Fragment> getFragmentClass()
   {

android/app/src/main/java/app/organicmaps/bookmarks/BookmarkCategoriesFragment.java

@@ -188,7 +188,7 @@ public class BookmarkCategoriesFragment extends BaseMwmRecyclerFragment<Bookmark
     ArrayList<MenuBottomSheetItem> items = new ArrayList<>();
     if (mSelectedCategory != null)
     {
-      items.add(new MenuBottomSheetItem(R.string.edit, R.drawable.ic_settings,
+      items.add(new MenuBottomSheetItem(R.string.edit, R.drawable.ic_edit,
                                         () -> onSettingsActionSelected(mSelectedCategory)));
       items.add(new MenuBottomSheetItem(mSelectedCategory.isVisible() ? R.string.hide : R.string.show,
                                         mSelectedCategory.isVisible() ? R.drawable.ic_hide : R.drawable.ic_show,

android/app/src/main/java/app/organicmaps/bookmarks/BookmarkCategorySettingsFragment.java

@@ -54,7 +54,6 @@ public class BookmarkCategorySettingsFragment extends BaseMwmToolbarFragment
   public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState)
   {
     View root = inflater.inflate(R.layout.fragment_bookmark_category_settings, container, false);
-    setHasOptionsMenu(true);
     initViews(root);
     return root;
   }
@@ -85,7 +84,7 @@ public class BookmarkCategorySettingsFragment extends BaseMwmToolbarFragment
     });
     mEditDescView = root.findViewById(R.id.edit_description);
     mEditDescView.setText(mCategory.getDescription());
-    mSaveView = root.findViewById(R.id.done);
+    mSaveView = root.findViewById(R.id.save);
     mSaveView.setOnClickListener(v -> onEditDoneClicked());
   }
 

android/app/src/main/java/app/organicmaps/bookmarks/BookmarkListActivity.java

@@ -5,13 +5,11 @@ import android.os.Bundle;
 import androidx.activity.result.ActivityResultLauncher;
 import androidx.annotation.CallSuper;
 import androidx.annotation.NonNull;
-import androidx.annotation.StyleRes;
 import androidx.fragment.app.Fragment;
 import app.organicmaps.R;
 import app.organicmaps.base.BaseToolbarActivity;
 import app.organicmaps.sdk.bookmarks.data.BookmarkCategory;
 import app.organicmaps.sdk.bookmarks.data.BookmarkManager;
-import app.organicmaps.util.ThemeUtils;
 
 public class BookmarkListActivity extends BaseToolbarActivity
 {
@@ -37,13 +35,6 @@ public class BookmarkListActivity extends BaseToolbarActivity
     super.onPause();
   }
 
-  @Override
-  @StyleRes
-  public int getThemeResourceId(@NonNull String theme)
-  {
-    return ThemeUtils.getCardBgThemeResourceId(theme);
-  }
-
   @Override
   protected Class<? extends Fragment> getFragmentClass()
   {

android/app/src/main/java/app/organicmaps/bookmarks/BookmarkListAdapter.java

@@ -466,12 +466,10 @@ public class BookmarkListAdapter extends RecyclerView.Adapter<Holders.BaseBookma
       View desc = inflater.inflate(R.layout.item_category_description, parent, false);
       MaterialTextView moreBtn = desc.findViewById(R.id.more_btn);
       MaterialTextView text = desc.findViewById(R.id.text);
-      MaterialTextView title = desc.findViewById(R.id.title);
       setMoreButtonVisibility(text, moreBtn);
       holder = new Holders.DescriptionViewHolder(desc, mSectionsDataSource.getCategory());
       text.setOnClickListener(v -> onMoreButtonClicked(text, moreBtn));
       moreBtn.setOnClickListener(v -> onMoreButtonClicked(text, moreBtn));
-      title.setOnClickListener(v -> onMoreButtonClicked(text, moreBtn));
       break;
     }
 

android/app/src/main/java/app/organicmaps/bookmarks/BookmarksListFragment.java

@@ -282,11 +282,11 @@ public class BookmarksListFragment extends BaseMwmRecyclerFragment<ConcatAdapter
   {
     if (isEmptySearchResults())
     {
-      requirePlaceholder().setContent(R.string.search_not_found, R.string.search_not_found_query);
+      requirePlaceholder().setContent(R.string.search_not_found, R.string.search_not_found_query, R.drawable.ic_search_fail);
     }
     else if (isEmpty())
     {
-      requirePlaceholder().setContent(R.string.bookmarks_empty_list_title, R.string.bookmarks_empty_list_message);
+      requirePlaceholder().setContent(R.string.bookmarks_empty_list_title, R.string.bookmarks_empty_list_message, R.drawable.ic_bookmarks);
     }
 
     boolean isEmptyRecycler = isEmpty() || isEmptySearchResults();
@@ -771,7 +771,7 @@ public class BookmarksListFragment extends BaseMwmRecyclerFragment<ConcatAdapter
       items.add(new MenuBottomSheetItem(R.string.export_file_gpx, R.drawable.ic_file_gpx,
                                         () -> onShareOptionSelected(KmlFileType.Gpx)));
     }
-    items.add(new MenuBottomSheetItem(R.string.edit, R.drawable.ic_settings, this::onSettingsOptionSelected));
+    items.add(new MenuBottomSheetItem(R.string.edit, R.drawable.ic_edit, this::onSettingsOptionSelected));
     if (!isLastOwnedCategory())
       items.add(new MenuBottomSheetItem(R.string.delete_list, R.drawable.ic_delete, this::onDeleteOptionSelected));
     return items;

android/app/src/main/java/app/organicmaps/bookmarks/Holders.java

@@ -438,21 +438,17 @@ public class Holders
     static final float SPACING_MULTIPLE = 1.0f;
     static final float SPACING_ADD = 0.0f;
     @NonNull
-    private final MaterialTextView mTitle;
-    @NonNull
     private final MaterialTextView mDescText;
 
     DescriptionViewHolder(@NonNull View itemView, @NonNull BookmarkCategory category)
     {
       super(itemView);
       mDescText = itemView.findViewById(R.id.text);
-      mTitle = itemView.findViewById(R.id.title);
     }
 
     @Override
     void bind(@NonNull SectionPosition position, @NonNull BookmarkListAdapter.SectionsDataSource sectionsDataSource)
     {
-      mTitle.setText(sectionsDataSource.getCategory().getName());
       bindDescription(sectionsDataSource.getCategory());
     }
 
@@ -462,9 +458,12 @@ public class Holders
 
       String formattedDesc = desc.replace("\n", "<br>");
       Spanned spannedDesc = Utils.fromHtml(formattedDesc);
-      mDescText.setText(spannedDesc);
-
-      UiUtils.showIf(!TextUtils.isEmpty(spannedDesc), mDescText);
+      if (!TextUtils.isEmpty(spannedDesc)) {
+        mDescText.setText(spannedDesc);
+      }
+      else {
+        mDescText.setText(R.string.list_description_empty);
+      }
     }
   }
 }

android/app/src/main/java/app/organicmaps/car/CarAppSession.java

@@ -12,9 +12,12 @@ import androidx.lifecycle.DefaultLifecycleObserver;
 import androidx.lifecycle.LifecycleOwner;
 import app.organicmaps.MwmApplication;
 import app.organicmaps.R;
+import app.organicmaps.car.renderer.Renderer;
+import app.organicmaps.car.renderer.RendererFactory;
 import app.organicmaps.car.screens.ErrorScreen;
 import app.organicmaps.car.screens.MapPlaceholderScreen;
 import app.organicmaps.car.screens.MapScreen;
+import app.organicmaps.car.screens.NavigationScreen;
 import app.organicmaps.car.screens.PlaceScreen;
 import app.organicmaps.car.screens.base.BaseMapScreen;
 import app.organicmaps.car.screens.download.DownloadMapsScreen;
@@ -49,8 +52,9 @@ public final class CarAppSession extends Session implements DefaultLifecycleObse
 
   @Nullable
   private final SessionInfo mSessionInfo;
+  @SuppressWarnings("NotNullFieldNotInitialized")
   @NonNull
-  private final SurfaceRenderer mSurfaceRenderer;
+  private Renderer mSurfaceRenderer;
   @NonNull
   private final ScreenManager mScreenManager;
   @SuppressWarnings("NotNullFieldNotInitialized")
@@ -67,7 +71,6 @@ public final class CarAppSession extends Session implements DefaultLifecycleObse
   {
     getLifecycle().addObserver(this);
     mSessionInfo = sessionInfo;
-    mSurfaceRenderer = new SurfaceRenderer(getCarContext(), getLifecycle());
     mScreenManager = getCarContext().getCarService(ScreenManager.class);
     mCurrentCountryChangedListener = new CurrentCountryChangedListener();
   }
@@ -114,6 +117,8 @@ public final class CarAppSession extends Session implements DefaultLifecycleObse
     mSensorsManager = new CarSensorsManager(getCarContext());
     mDisplayManager = MwmApplication.from(getCarContext()).getDisplayManager();
     mDisplayManager.addListener(DisplayType.Car, this);
+    mSurfaceRenderer = RendererFactory.create(getCarContext(), mDisplayManager,
+                                              MwmApplication.from(getCarContext()).getLocationHelper(), this);
     init();
   }
 
@@ -281,7 +286,19 @@ public final class CarAppSession extends Session implements DefaultLifecycleObse
   private void restoreRoute()
   {
     final RoutingController routingController = RoutingController.get();
-    if (routingController.isPlanning() || routingController.isNavigating() || routingController.hasSavedRoute())
+    final boolean isNavigating = routingController.isNavigating();
+    final boolean hasNavigatingScreen = hasNavigationScreenInStack();
+
+    if (!isNavigating && hasNavigatingScreen)
+      mScreenManager.popToRoot();
+
+    if (isNavigating && routingController.getLastRouterType() == PlaceScreen.ROUTER && hasNavigatingScreen)
+    {
+      mScreenManager.popTo(NavigationScreen.MARKER);
+      return;
+    }
+
+    if (routingController.isPlanning() || isNavigating || routingController.hasSavedRoute())
     {
       final PlaceScreen placeScreen = new PlaceScreen.Builder(getCarContext(), mSurfaceRenderer)
                                           .setMapObject(routingController.getEndPoint())
@@ -290,4 +307,14 @@ public final class CarAppSession extends Session implements DefaultLifecycleObse
       mScreenManager.push(placeScreen);
     }
   }
+
+  private boolean hasNavigationScreenInStack()
+  {
+    for (final Screen screen : mScreenManager.getScreenStack())
+    {
+      if (NavigationScreen.MARKER.equals(screen.getMarker()))
+        return true;
+    }
+    return false;
+  }
 }

android/app/src/main/java/app/organicmaps/car/SurfaceRenderer.java

@@ -1,244 +0,0 @@
-package app.organicmaps.car;
-
-import static app.organicmaps.sdk.display.DisplayType.Car;
-
-import android.graphics.Rect;
-import android.view.Surface;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.car.app.AppManager;
-import androidx.car.app.CarContext;
-import androidx.car.app.CarToast;
-import androidx.car.app.SurfaceCallback;
-import androidx.car.app.SurfaceContainer;
-import androidx.lifecycle.DefaultLifecycleObserver;
-import androidx.lifecycle.Lifecycle;
-import androidx.lifecycle.LifecycleOwner;
-import app.organicmaps.MwmApplication;
-import app.organicmaps.R;
-import app.organicmaps.sdk.Framework;
-import app.organicmaps.sdk.Map;
-import app.organicmaps.sdk.MapRenderingListener;
-import app.organicmaps.sdk.settings.UnitLocale;
-import app.organicmaps.sdk.util.concurrency.UiThread;
-import app.organicmaps.sdk.util.log.Logger;
-
-public class SurfaceRenderer implements DefaultLifecycleObserver, SurfaceCallback, MapRenderingListener
-{
-  private static final String TAG = SurfaceRenderer.class.getSimpleName();
-
-  @NonNull
-  private final CarContext mCarContext;
-
-  @NonNull
-  private final Map mMap = new Map(Car);
-
-  @NonNull
-  private Rect mVisibleArea = new Rect();
-
-  @Nullable
-  private Surface mSurface = null;
-
-  private boolean mIsRunning;
-
-  public SurfaceRenderer(@NonNull CarContext carContext, @NonNull Lifecycle lifecycle)
-  {
-    Logger.d(TAG, "SurfaceRenderer()");
-    mCarContext = carContext;
-    mIsRunning = true;
-    lifecycle.addObserver(this);
-    mMap.setMapRenderingListener(this);
-  }
-
-  @Override
-  public void onSurfaceAvailable(@NonNull SurfaceContainer surfaceContainer)
-  {
-    Logger.d(TAG, "Surface available " + surfaceContainer);
-
-    if (mSurface != null)
-      mSurface.release();
-    mSurface = surfaceContainer.getSurface();
-
-    mMap.setLocationHelper(MwmApplication.from(mCarContext).getLocationHelper());
-    mMap.onSurfaceCreated(mCarContext, mSurface,
-                          new Rect(0, 0, surfaceContainer.getWidth(), surfaceContainer.getHeight()),
-                          surfaceContainer.getDpi());
-    mMap.updateBottomWidgetsOffset(mCarContext, -1, -1);
-  }
-
-  @Override
-  public void onVisibleAreaChanged(@NonNull Rect visibleArea)
-  {
-    Logger.d(TAG, "Visible area changed. visibleArea: " + visibleArea);
-    mVisibleArea = visibleArea;
-
-    if (!mVisibleArea.isEmpty())
-      Framework.nativeSetVisibleRect(mVisibleArea.left, mVisibleArea.top, mVisibleArea.right, mVisibleArea.bottom);
-  }
-
-  @Override
-  public void onStableAreaChanged(@NonNull Rect stableArea)
-  {
-    Logger.d(TAG, "Stable area changed. stableArea: " + stableArea);
-
-    if (!stableArea.isEmpty())
-      Framework.nativeSetVisibleRect(stableArea.left, stableArea.top, stableArea.right, stableArea.bottom);
-    else if (!mVisibleArea.isEmpty())
-      Framework.nativeSetVisibleRect(mVisibleArea.left, mVisibleArea.top, mVisibleArea.right, mVisibleArea.bottom);
-  }
-
-  @Override
-  public void onSurfaceDestroyed(@NonNull SurfaceContainer surfaceContainer)
-  {
-    Logger.d(TAG, "Surface destroyed");
-    if (mSurface != null)
-    {
-      mSurface.release();
-      mSurface = null;
-    }
-    mMap.onSurfaceDestroyed(false, true);
-  }
-
-  @Override
-  public void onCreate(@NonNull LifecycleOwner owner)
-  {
-    Logger.d(TAG);
-    mCarContext.getCarService(AppManager.class).setSurfaceCallback(this);
-    mMap.onCreate(false);
-  }
-
-  @Override
-  public void onStart(@NonNull LifecycleOwner owner)
-  {
-    Logger.d(TAG);
-    mMap.onStart();
-    mMap.setCallbackUnsupported(this::reportUnsupported);
-  }
-
-  @Override
-  public void onResume(@NonNull LifecycleOwner owner)
-  {
-    Logger.d(TAG);
-    mMap.onResume();
-    if (MwmApplication.from(mCarContext).getDisplayManager().isCarDisplayUsed())
-      UiThread.runLater(() -> mMap.updateMyPositionRoutingOffset(0));
-  }
-
-  @Override
-  public void onPause(@NonNull LifecycleOwner owner)
-  {
-    Logger.d(TAG);
-    mMap.onPause(mCarContext);
-  }
-
-  @Override
-  public void onStop(@NonNull LifecycleOwner owner)
-  {
-    Logger.d(TAG);
-    mMap.onStop();
-    mMap.setCallbackUnsupported(null);
-  }
-
-  @Override
-  public void onScroll(float distanceX, float distanceY)
-  {
-    Logger.d(TAG, "distanceX: " + distanceX + ", distanceY: " + distanceY);
-    mMap.onScroll(distanceX, distanceY);
-  }
-
-  @Override
-  public void onFling(float velocityX, float velocityY)
-  {
-    Logger.d(TAG, "velocityX: " + velocityX + ", velocityY: " + velocityY);
-  }
-
-  public void onZoomIn()
-  {
-    Map.zoomIn();
-  }
-
-  public void onZoomOut()
-  {
-    Map.zoomOut();
-  }
-
-  @Override
-  public void onScale(float focusX, float focusY, float scaleFactor)
-  {
-    Logger.d(TAG, "focusX: " + focusX + ", focusY: " + focusY + ", scaleFactor: " + scaleFactor);
-    float x = focusX;
-    float y = focusY;
-
-    if (!mVisibleArea.isEmpty())
-    {
-      // If a focal point value is negative, use the center point of the visible area.
-      if (x < 0)
-        x = mVisibleArea.centerX();
-      if (y < 0)
-        y = mVisibleArea.centerY();
-    }
-
-    final boolean animated = Float.compare(scaleFactor, 2f) == 0;
-
-    Map.onScale(scaleFactor, x, y, animated);
-  }
-
-  @Override
-  public void onClick(float x, float y)
-  {
-    Logger.d(TAG, "x: " + x + ", y: " + y);
-    Map.onClick(x, y);
-  }
-
-  public void disable()
-  {
-    if (!mIsRunning)
-    {
-      Logger.d(TAG, "Already disabled");
-      return;
-    }
-
-    mCarContext.getCarService(AppManager.class).setSurfaceCallback(null);
-    mMap.onSurfaceDestroyed(false, true);
-    mMap.onStop();
-    mMap.setCallbackUnsupported(null);
-    mMap.setMapRenderingListener(null);
-
-    mIsRunning = false;
-  }
-
-  public void enable()
-  {
-    if (mIsRunning)
-    {
-      Logger.d(TAG, "Already enabled");
-      return;
-    }
-
-    mCarContext.getCarService(AppManager.class).setSurfaceCallback(this);
-    mMap.onStart();
-    mMap.setCallbackUnsupported(this::reportUnsupported);
-    mMap.setMapRenderingListener(this);
-    UiThread.runLater(() -> mMap.updateMyPositionRoutingOffset(0));
-
-    mIsRunning = true;
-  }
-
-  public boolean isRenderingActive()
-  {
-    return mIsRunning;
-  }
-
-  private void reportUnsupported()
-  {
-    String message = mCarContext.getString(R.string.unsupported_phone);
-    Logger.e(TAG, message);
-    CarToast.makeText(mCarContext, message, CarToast.LENGTH_LONG).show();
-  }
-
-  @Override
-  public void onRenderingCreated()
-  {
-    UnitLocale.initializeCurrentUnits();
-  }
-}

android/app/src/main/java/app/organicmaps/car/renderer/Renderer.java

@@ -0,0 +1,130 @@
+package app.organicmaps.car.renderer;
+
+import androidx.annotation.CallSuper;
+import androidx.annotation.NonNull;
+import androidx.car.app.AppManager;
+import androidx.car.app.CarContext;
+import androidx.car.app.SurfaceCallback;
+import androidx.lifecycle.DefaultLifecycleObserver;
+import androidx.lifecycle.LifecycleOwner;
+import app.organicmaps.sdk.Map;
+import app.organicmaps.sdk.MapRenderingListener;
+import app.organicmaps.sdk.display.DisplayManager;
+import app.organicmaps.sdk.location.LocationHelper;
+import app.organicmaps.sdk.settings.UnitLocale;
+import app.organicmaps.sdk.util.log.Logger;
+
+public abstract class Renderer implements DefaultLifecycleObserver
+{
+  @NonNull
+  private final String TAG;
+
+  private SurfaceCallback mSurfaceCallback;
+
+  private boolean mIsRunning;
+
+  @NonNull
+  protected final CarContext mCarContext;
+
+  @NonNull
+  protected final DisplayManager mDisplayManager;
+
+  @NonNull
+  protected final LocationHelper mLocationHelper;
+
+  @NonNull
+  protected final LifecycleOwner mLifecycleOwner;
+
+  @NonNull
+  private final MapRenderingListener mMapRenderingListener = new MapRenderingListener() {
+    @Override
+    public void onRenderingCreated()
+    {
+      UnitLocale.initializeCurrentUnits();
+    }
+  };
+
+  public Renderer(@NonNull CarContext carContext, @NonNull DisplayManager displayManager,
+                  @NonNull LocationHelper locationHelper, @NonNull LifecycleOwner lifecycleOwner)
+  {
+    TAG = getClass().getSimpleName();
+    Logger.d(TAG, "SurfaceRenderer()");
+    mIsRunning = true;
+    mCarContext = carContext;
+    mDisplayManager = displayManager;
+    mLocationHelper = locationHelper;
+    mLifecycleOwner = lifecycleOwner;
+    mLifecycleOwner.getLifecycle().addObserver(this);
+  }
+
+  protected void setSurfaceCallback(@NonNull SurfaceCallback surfaceCallback)
+  {
+    mSurfaceCallback = surfaceCallback;
+  }
+
+  public boolean isRenderingActive()
+  {
+    return mIsRunning;
+  }
+
+  protected MapRenderingListener getMapRenderingListener()
+  {
+    return mMapRenderingListener;
+  }
+
+  @CallSuper
+  @Override
+  public void onCreate(@NonNull LifecycleOwner owner)
+  {
+    Logger.d(TAG);
+    if (mSurfaceCallback == null)
+      throw new IllegalStateException("SurfaceCallback must be set before onCreate()");
+    mCarContext.getCarService(AppManager.class).setSurfaceCallback(mSurfaceCallback);
+  }
+
+  @CallSuper
+  @Override
+  public void onDestroy(@NonNull LifecycleOwner owner)
+  {
+    Logger.d(TAG);
+    mCarContext.getCarService(AppManager.class).setSurfaceCallback(null);
+  }
+
+  @CallSuper
+  public void enable()
+  {
+    if (isRenderingActive())
+    {
+      Logger.d(TAG, "Already enabled");
+      return;
+    }
+
+    if (mSurfaceCallback == null)
+      throw new IllegalStateException("SurfaceCallback must be set before enable()");
+    mCarContext.getCarService(AppManager.class).setSurfaceCallback(mSurfaceCallback);
+    mIsRunning = true;
+  }
+
+  @CallSuper
+  public void disable()
+  {
+    if (!isRenderingActive())
+    {
+      Logger.d(TAG, "Already disabled");
+      return;
+    }
+
+    mCarContext.getCarService(AppManager.class).setSurfaceCallback(null);
+    mIsRunning = false;
+  }
+
+  public void onZoomIn()
+  {
+    Map.zoomIn();
+  }
+
+  public void onZoomOut()
+  {
+    Map.zoomOut();
+  }
+}

android/app/src/main/java/app/organicmaps/car/renderer/RendererFactory.java

@@ -0,0 +1,20 @@
+package app.organicmaps.car.renderer;
+
+import androidx.annotation.NonNull;
+import androidx.car.app.CarContext;
+import androidx.lifecycle.LifecycleOwner;
+import app.organicmaps.sdk.display.DisplayManager;
+import app.organicmaps.sdk.location.LocationHelper;
+
+public final class RendererFactory
+{
+  @NonNull
+  public static Renderer create(@NonNull CarContext carContext, @NonNull DisplayManager displayManager,
+                                @NonNull LocationHelper locationHelper, @NonNull LifecycleOwner lifecycleOwner)
+  {
+    if (android.os.Build.VERSION.SDK_INT >= 23)
+      return new SurfaceRenderer(carContext, displayManager, locationHelper, lifecycleOwner);
+    else
+      return new SurfaceRendererLegacy(carContext, displayManager, locationHelper, lifecycleOwner);
+  }
+}

android/app/src/main/java/app/organicmaps/car/renderer/SurfaceCallback.java

@@ -0,0 +1,100 @@
+package app.organicmaps.car.renderer;
+
+import android.app.Presentation;
+import android.hardware.display.DisplayManager;
+import android.hardware.display.VirtualDisplay;
+import android.view.SurfaceHolder;
+import android.view.View;
+import android.view.ViewGroup;
+import android.view.ViewParent;
+import android.widget.FrameLayout;
+import androidx.annotation.NonNull;
+import androidx.annotation.RequiresApi;
+import androidx.car.app.CarContext;
+import androidx.car.app.SurfaceContainer;
+import app.organicmaps.sdk.MapController;
+import app.organicmaps.sdk.util.log.Logger;
+
+@RequiresApi(23)
+class SurfaceCallback extends SurfaceCallbackBase
+{
+  private static final String TAG = SurfaceCallback.class.getSimpleName();
+
+  private static final String VIRTUAL_DISPLAY_NAME = "OM_Android_Auto_Display";
+
+  @NonNull
+  private final MapController mMapController;
+
+  private VirtualDisplay mVirtualDisplay;
+  private Presentation mPresentation;
+
+  public SurfaceCallback(@NonNull CarContext carContext, @NonNull MapController mapController)
+  {
+    super(carContext);
+    mMapController = mapController;
+    mMapController.getView().getHolder().addCallback(new SurfaceHolder.Callback() {
+      @Override
+      public void surfaceChanged(@NonNull SurfaceHolder holder, int format, int width, int height)
+      {
+        mMapController.updateMyPositionRoutingOffset(0);
+      }
+      @Override
+      public void surfaceCreated(@NonNull SurfaceHolder holder)
+      {
+        mMapController.updateMyPositionRoutingOffset(0);
+      }
+      @Override
+      public void surfaceDestroyed(@NonNull SurfaceHolder holder)
+      {}
+    });
+  }
+
+  @Override
+  public void onSurfaceAvailable(@NonNull SurfaceContainer surfaceContainer)
+  {
+    Logger.d(TAG, "Surface available " + surfaceContainer);
+
+    mVirtualDisplay =
+        mCarContext.getSystemService(DisplayManager.class)
+            .createVirtualDisplay(VIRTUAL_DISPLAY_NAME, surfaceContainer.getWidth(), surfaceContainer.getHeight(),
+                                  surfaceContainer.getDpi(), surfaceContainer.getSurface(), 0);
+    mPresentation = new Presentation(mCarContext, mVirtualDisplay.getDisplay());
+
+    mPresentation.setContentView(prepareViewForPresentation(mMapController.getView()));
+    mPresentation.show();
+  }
+
+  @Override
+  public void onSurfaceDestroyed(@NonNull SurfaceContainer surfaceContainer)
+  {
+    Logger.d(TAG, "Surface destroyed");
+    mPresentation.dismiss();
+    mVirtualDisplay.release();
+  }
+
+  void stopPresenting()
+  {
+    if (mPresentation != null)
+      mPresentation.dismiss();
+  }
+
+  void startPresenting()
+  {
+    if (mPresentation != null)
+      mPresentation.show();
+  }
+
+  @NonNull
+  private View prepareViewForPresentation(@NonNull View view)
+  {
+    final ViewParent parent = view.getParent();
+    if (parent instanceof ViewGroup)
+      ((ViewGroup) parent).removeView(view);
+
+    final FrameLayout container = new FrameLayout(mCarContext);
+    container.addView(
+        view, new FrameLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT));
+
+    return container;
+  }
+}

android/app/src/main/java/app/organicmaps/car/renderer/SurfaceCallbackBase.java

@@ -0,0 +1,96 @@
+package app.organicmaps.car.renderer;
+
+import android.graphics.Rect;
+import androidx.annotation.NonNull;
+import androidx.car.app.CarContext;
+import androidx.car.app.SurfaceCallback;
+import app.organicmaps.sdk.Framework;
+import app.organicmaps.sdk.Map;
+import app.organicmaps.sdk.util.concurrency.UiThread;
+import app.organicmaps.sdk.util.log.Logger;
+
+abstract class SurfaceCallbackBase implements SurfaceCallback
+{
+  @NonNull
+  private final String TAG;
+
+  @NonNull
+  protected final CarContext mCarContext;
+
+  @NonNull
+  protected Rect mVisibleArea = new Rect();
+
+  public SurfaceCallbackBase(@NonNull CarContext carContext)
+  {
+    TAG = getClass().getSimpleName();
+    mCarContext = carContext;
+  }
+
+  @Override
+  public void onVisibleAreaChanged(@NonNull Rect visibleArea)
+  {
+    Logger.d(TAG, "Visible area changed. visibleArea: " + visibleArea);
+    mVisibleArea = visibleArea;
+
+    if (!mVisibleArea.isEmpty())
+      UiThread.runLater(()
+                            -> Framework.nativeSetVisibleRect(mVisibleArea.left, mVisibleArea.top, mVisibleArea.right,
+                                                              mVisibleArea.bottom));
+  }
+
+  @Override
+  public void onStableAreaChanged(@NonNull Rect stableArea)
+  {
+    Logger.d(TAG, "Stable area changed. stableArea: " + stableArea);
+
+    if (!mVisibleArea.isEmpty())
+      UiThread.runLater(()
+                            -> Framework.nativeSetVisibleRect(mVisibleArea.left, mVisibleArea.top, mVisibleArea.right,
+                                                              mVisibleArea.bottom));
+    else if (!stableArea.isEmpty())
+      UiThread.runLater(
+          () -> Framework.nativeSetVisibleRect(stableArea.left, stableArea.top, stableArea.right, stableArea.bottom));
+  }
+
+  @Override
+  public void onScroll(float distanceX, float distanceY)
+  {
+    Logger.d(TAG, "distanceX: " + distanceX + ", distanceY: " + distanceY);
+    Map.onScroll(distanceX, distanceY);
+  }
+
+  @Override
+  public void onFling(float velocityX, float velocityY)
+  {
+    Logger.d(TAG, "velocityX: " + velocityX + ", velocityY: " + velocityY);
+    // TODO: Implement fling in the native code.
+  }
+
+  @Override
+  public void onScale(float focusX, float focusY, float scaleFactor)
+  {
+    Logger.d(TAG, "focusX: " + focusX + ", focusY: " + focusY + ", scaleFactor: " + scaleFactor);
+    float x = focusX;
+    float y = focusY;
+
+    if (!mVisibleArea.isEmpty())
+    {
+      // If a focal point value is negative, use the center point of the visible area.
+      if (x < 0)
+        x = mVisibleArea.centerX();
+      if (y < 0)
+        y = mVisibleArea.centerY();
+    }
+
+    final boolean animated = Float.compare(scaleFactor, 2f) == 0;
+
+    Map.onScale(scaleFactor, x, y, animated);
+  }
+
+  @Override
+  public void onClick(float x, float y)
+  {
+    Logger.d(TAG, "x: " + x + ", y: " + y);
+    Map.onClick(x, y);
+  }
+}

android/app/src/main/java/app/organicmaps/car/renderer/SurfaceCallbackLegacy.java

@@ -0,0 +1,60 @@
+package app.organicmaps.car.renderer;
+
+import android.graphics.Rect;
+import android.view.Surface;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.car.app.CarContext;
+import androidx.car.app.SurfaceContainer;
+import app.organicmaps.sdk.Map;
+import app.organicmaps.sdk.location.LocationHelper;
+import app.organicmaps.sdk.util.log.Logger;
+
+class SurfaceCallbackLegacy extends SurfaceCallbackBase
+{
+  private static final String TAG = SurfaceCallbackLegacy.class.getSimpleName();
+
+  @NonNull
+  private final Map mMap;
+
+  @NonNull
+  private final LocationHelper mLocationHelper;
+
+  @Nullable
+  private Surface mSurface = null;
+
+  public SurfaceCallbackLegacy(@NonNull CarContext carContext, @NonNull Map map, @NonNull LocationHelper locationHelper)
+  {
+    super(carContext);
+    mMap = map;
+    mLocationHelper = locationHelper;
+  }
+
+  @Override
+  public void onSurfaceAvailable(@NonNull SurfaceContainer surfaceContainer)
+  {
+    Logger.d(TAG, "Surface available " + surfaceContainer);
+
+    if (mSurface != null)
+      mSurface.release();
+    mSurface = surfaceContainer.getSurface();
+
+    mMap.setLocationHelper(mLocationHelper);
+    mMap.onSurfaceCreated(mCarContext, mSurface,
+                          new Rect(0, 0, surfaceContainer.getWidth(), surfaceContainer.getHeight()),
+                          surfaceContainer.getDpi());
+    mMap.updateBottomWidgetsOffset(mCarContext, -1, -1);
+  }
+
+  @Override
+  public void onSurfaceDestroyed(@NonNull SurfaceContainer surfaceContainer)
+  {
+    Logger.d(TAG, "Surface destroyed");
+    if (mSurface != null)
+    {
+      mSurface.release();
+      mSurface = null;
+    }
+    mMap.onSurfaceDestroyed(false);
+  }
+}

android/app/src/main/java/app/organicmaps/car/renderer/SurfaceRenderer.java

@@ -0,0 +1,53 @@
+package app.organicmaps.car.renderer;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.RequiresApi;
+import androidx.car.app.CarContext;
+import androidx.lifecycle.LifecycleOwner;
+import app.organicmaps.sdk.MapController;
+import app.organicmaps.sdk.MapView;
+import app.organicmaps.sdk.display.DisplayManager;
+import app.organicmaps.sdk.display.DisplayType;
+import app.organicmaps.sdk.location.LocationHelper;
+
+@RequiresApi(23)
+class SurfaceRenderer extends Renderer
+{
+  @NonNull
+  private final MapController mMapController;
+
+  @NonNull
+  private final SurfaceCallback mSurfaceCallback;
+
+  public SurfaceRenderer(@NonNull CarContext carContext, @NonNull DisplayManager displayManager,
+                         @NonNull LocationHelper locationHelper, @NonNull LifecycleOwner lifecycleOwner)
+  {
+    super(carContext, displayManager, locationHelper, lifecycleOwner);
+
+    mMapController = new MapController(new MapView(carContext, DisplayType.Car), locationHelper,
+                                       getMapRenderingListener(), null, false);
+    mLifecycleOwner.getLifecycle().addObserver(mMapController);
+    mSurfaceCallback = new SurfaceCallback(mCarContext, mMapController);
+    setSurfaceCallback(mSurfaceCallback);
+  }
+
+  @Override
+  public void enable()
+  {
+    super.enable();
+
+    mMapController.onStart(mLifecycleOwner);
+    mMapController.updateMyPositionRoutingOffset(0);
+    mSurfaceCallback.startPresenting();
+  }
+
+  @Override
+  public void disable()
+  {
+    super.disable();
+
+    mMapController.onPause(mLifecycleOwner);
+    mSurfaceCallback.stopPresenting();
+    mMapController.onStop(mLifecycleOwner);
+  }
+}

android/app/src/main/java/app/organicmaps/car/renderer/SurfaceRendererLegacy.java

@@ -0,0 +1,90 @@
+package app.organicmaps.car.renderer;
+
+import static app.organicmaps.sdk.display.DisplayType.Car;
+
+import androidx.annotation.NonNull;
+import androidx.car.app.CarContext;
+import androidx.lifecycle.LifecycleOwner;
+import app.organicmaps.sdk.Map;
+import app.organicmaps.sdk.display.DisplayManager;
+import app.organicmaps.sdk.location.LocationHelper;
+import app.organicmaps.sdk.util.log.Logger;
+
+class SurfaceRendererLegacy extends Renderer
+{
+  private static final String TAG = SurfaceRendererLegacy.class.getSimpleName();
+
+  @NonNull
+  private final Map mMap = new Map(Car);
+
+  public SurfaceRendererLegacy(@NonNull CarContext carContext, @NonNull DisplayManager displayManager,
+                               @NonNull LocationHelper locationHelper, @NonNull LifecycleOwner lifecycleOwner)
+  {
+    super(carContext, displayManager, locationHelper, lifecycleOwner);
+    setSurfaceCallback(new SurfaceCallbackLegacy(mCarContext, mMap, mLocationHelper));
+    mMap.setMapRenderingListener(getMapRenderingListener());
+  }
+
+  @Override
+  public void onCreate(@NonNull LifecycleOwner owner)
+  {
+    super.onCreate(owner);
+    mMap.onCreate(false);
+  }
+
+  @Override
+  public void onStart(@NonNull LifecycleOwner owner)
+  {
+    Logger.d(TAG);
+    if (mDisplayManager.isCarDisplayUsed())
+      mMap.onStart();
+  }
+
+  @Override
+  public void onResume(@NonNull LifecycleOwner owner)
+  {
+    Logger.d(TAG);
+    if (mDisplayManager.isCarDisplayUsed())
+    {
+      mMap.onResume();
+      mMap.updateMyPositionRoutingOffset(0);
+    }
+  }
+
+  @Override
+  public void onPause(@NonNull LifecycleOwner owner)
+  {
+    Logger.d(TAG);
+    if (mDisplayManager.isCarDisplayUsed())
+      mMap.onPause();
+  }
+
+  @Override
+  public void onStop(@NonNull LifecycleOwner owner)
+  {
+    Logger.d(TAG);
+    if (mDisplayManager.isCarDisplayUsed())
+      mMap.onStop();
+  }
+
+  @Override
+  public void enable()
+  {
+    super.enable();
+
+    mMap.onStart();
+    mMap.setMapRenderingListener(getMapRenderingListener());
+    mMap.updateMyPositionRoutingOffset(0);
+  }
+
+  @Override
+  public void disable()
+  {
+    super.disable();
+
+    mMap.onPause();
+    mMap.onSurfaceDestroyed(false);
+    mMap.onStop();
+    mMap.setMapRenderingListener(null);
+  }
+}

android/app/src/main/java/app/organicmaps/car/screens/CategoriesScreen.java

@@ -15,30 +15,29 @@ import androidx.car.app.model.Template;
 import androidx.car.app.navigation.model.MapWithContentTemplate;
 import androidx.core.graphics.drawable.IconCompat;
 import app.organicmaps.R;
-import app.organicmaps.car.SurfaceRenderer;
+import app.organicmaps.car.renderer.Renderer;
 import app.organicmaps.car.screens.base.BaseMapScreen;
 import app.organicmaps.car.screens.search.SearchOnMapScreen;
-import app.organicmaps.car.util.ThemeUtils;
 import app.organicmaps.car.util.UiHelpers;
 import java.util.Arrays;
 import java.util.List;
 
 public class CategoriesScreen extends BaseMapScreen
 {
-  private record CategoryData(@StringRes int nameResId, @DrawableRes int iconResId, @DrawableRes int iconNightResId) {}
+  private record CategoryData(@StringRes int nameResId, @DrawableRes int iconResId) {}
 
-  private static final List<CategoryData> CATEGORIES = Arrays.asList(
-      new CategoryData(R.string.category_fuel, R.drawable.ic_category_fuel, R.drawable.ic_category_fuel_night),
-      new CategoryData(R.string.category_parking, R.drawable.ic_category_parking, R.drawable.ic_category_parking_night),
-      new CategoryData(R.string.category_eat, R.drawable.ic_category_eat, R.drawable.ic_category_eat_night),
-      new CategoryData(R.string.category_food, R.drawable.ic_category_food, R.drawable.ic_category_food_night),
-      new CategoryData(R.string.category_hotel, R.drawable.ic_category_hotel, R.drawable.ic_category_hotel_night),
-      new CategoryData(R.string.category_toilet, R.drawable.ic_category_toilet, R.drawable.ic_category_toilet_night),
-      new CategoryData(R.string.category_rv, R.drawable.ic_category_rv, R.drawable.ic_category_rv_night));
+  private static final List<CategoryData> CATEGORIES =
+      Arrays.asList(new CategoryData(R.string.category_fuel, R.drawable.ic_category_fuel),
+                    new CategoryData(R.string.category_parking, R.drawable.ic_category_parking),
+                    new CategoryData(R.string.category_eat, R.drawable.ic_category_eat),
+                    new CategoryData(R.string.category_food, R.drawable.ic_category_food),
+                    new CategoryData(R.string.category_hotel, R.drawable.ic_category_hotel),
+                    new CategoryData(R.string.category_toilet, R.drawable.ic_category_toilet),
+                    new CategoryData(R.string.category_rv, R.drawable.ic_category_rv));
 
   private final int MAX_CATEGORIES_SIZE;
 
-  public CategoriesScreen(@NonNull CarContext carContext, @NonNull SurfaceRenderer surfaceRenderer)
+  public CategoriesScreen(@NonNull CarContext carContext, @NonNull Renderer surfaceRenderer)
   {
     super(carContext, surfaceRenderer);
     final ConstraintManager constraintManager = getCarContext().getCarService(ConstraintManager.class);
@@ -47,7 +46,7 @@ public class CategoriesScreen extends BaseMapScreen
 
   @NonNull
   @Override
-  public Template onGetTemplate()
+  protected Template onGetTemplateImpl()
   {
     final MapWithContentTemplate.Builder builder = new MapWithContentTemplate.Builder();
     builder.setMapController(UiHelpers.createMapController(getCarContext(), getSurfaceRenderer()));
@@ -67,7 +66,6 @@ public class CategoriesScreen extends BaseMapScreen
   @NonNull
   private GridTemplate createCategoriesListTemplate()
   {
-    final boolean isNightMode = ThemeUtils.isNightMode(getCarContext());
     final ItemList.Builder builder = new ItemList.Builder();
     final int categoriesSize = Math.min(CATEGORIES.size(), MAX_CATEGORIES_SIZE);
     for (int i = 0; i < categoriesSize; ++i)
@@ -75,7 +73,7 @@ public class CategoriesScreen extends BaseMapScreen
       final GridItem.Builder itemBuilder = new GridItem.Builder();
       final String title = getCarContext().getString(CATEGORIES.get(i).nameResId);
       @DrawableRes
-      final int iconResId = isNightMode ? CATEGORIES.get(i).iconNightResId : CATEGORIES.get(i).iconResId;
+      final int iconResId = CATEGORIES.get(i).iconResId;
 
       itemBuilder.setTitle(title);
       itemBuilder.setImage(new CarIcon.Builder(IconCompat.createWithResource(getCarContext(), iconResId)).build());

android/app/src/main/java/app/organicmaps/car/screens/ErrorScreen.java

@@ -43,7 +43,7 @@ public class ErrorScreen extends BaseScreen implements UserActionRequired
 
   @NonNull
   @Override
-  public Template onGetTemplate()
+  protected Template onGetTemplateImpl()
   {
     final MessageTemplate.Builder builder = new MessageTemplate.Builder(getCarContext().getString(mErrorMessage));
 

android/app/src/main/java/app/organicmaps/car/screens/FreeDriveScreen.java

@@ -9,20 +9,20 @@ import androidx.car.app.model.Template;
 import androidx.car.app.navigation.model.NavigationTemplate;
 import androidx.core.graphics.drawable.IconCompat;
 import app.organicmaps.R;
-import app.organicmaps.car.SurfaceRenderer;
+import app.organicmaps.car.renderer.Renderer;
 import app.organicmaps.car.screens.base.BaseMapScreen;
 import app.organicmaps.car.util.UiHelpers;
 
 public class FreeDriveScreen extends BaseMapScreen
 {
-  public FreeDriveScreen(@NonNull CarContext carContext, @NonNull SurfaceRenderer surfaceRenderer)
+  public FreeDriveScreen(@NonNull CarContext carContext, @NonNull Renderer surfaceRenderer)
   {
     super(carContext, surfaceRenderer);
   }
 
   @NonNull
   @Override
-  public Template onGetTemplate()
+  protected Template onGetTemplateImpl()
   {
     final NavigationTemplate.Builder builder = new NavigationTemplate.Builder();
     builder.setMapActionStrip(UiHelpers.createMapActionStrip(getCarContext(), getSurfaceRenderer()));

android/app/src/main/java/app/organicmaps/car/screens/MapPlaceholderScreen.java

@@ -22,7 +22,7 @@ public class MapPlaceholderScreen extends BaseScreen
 
   @NonNull
   @Override
-  public Template onGetTemplate()
+  protected Template onGetTemplateImpl()
   {
     final MessageTemplate.Builder builder =
         new MessageTemplate.Builder(getCarContext().getString(R.string.car_used_on_the_phone_screen));

android/app/src/main/java/app/organicmaps/car/screens/MapScreen.java

@@ -14,7 +14,7 @@ import androidx.car.app.model.Template;
 import androidx.car.app.navigation.model.MapWithContentTemplate;
 import androidx.core.graphics.drawable.IconCompat;
 import app.organicmaps.R;
-import app.organicmaps.car.SurfaceRenderer;
+import app.organicmaps.car.renderer.Renderer;
 import app.organicmaps.car.screens.base.BaseMapScreen;
 import app.organicmaps.car.screens.bookmarks.BookmarkCategoriesScreen;
 import app.organicmaps.car.screens.search.SearchScreen;
@@ -24,14 +24,14 @@ import app.organicmaps.car.util.UiHelpers;
 
 public class MapScreen extends BaseMapScreen
 {
-  public MapScreen(@NonNull CarContext carContext, @NonNull SurfaceRenderer surfaceRenderer)
+  public MapScreen(@NonNull CarContext carContext, @NonNull Renderer surfaceRenderer)
   {
     super(carContext, surfaceRenderer);
   }
 
   @NonNull
   @Override
-  public Template onGetTemplate()
+  protected Template onGetTemplateImpl()
   {
     SuggestionsHelpers.updateSuggestions(getCarContext());
 

android/app/src/main/java/app/organicmaps/car/screens/NavigationScreen.java

@@ -20,7 +20,7 @@ import androidx.lifecycle.LifecycleOwner;
 import app.organicmaps.MwmApplication;
 import app.organicmaps.R;
 import app.organicmaps.car.CarAppService;
-import app.organicmaps.car.SurfaceRenderer;
+import app.organicmaps.car.renderer.Renderer;
 import app.organicmaps.car.screens.base.BaseMapScreen;
 import app.organicmaps.car.screens.settings.DrivingOptionsScreen;
 import app.organicmaps.car.util.Colors;
@@ -70,7 +70,7 @@ public class NavigationScreen extends BaseMapScreen implements RoutingController
 
   @NonNull
   @Override
-  public Template onGetTemplate()
+  protected Template onGetTemplateImpl()
   {
     final NavigationTemplate.Builder builder = new NavigationTemplate.Builder();
     builder.setBackgroundColor(Colors.NAVIGATION_TEMPLATE_BACKGROUND);
@@ -104,7 +104,11 @@ public class NavigationScreen extends BaseMapScreen implements RoutingController
   public void onAutoDriveEnabled()
   {
     Logger.i(TAG);
-    final JunctionInfo[] points = Framework.nativeGetRouteJunctionPoints();
+
+    /// @todo Pass maxDistM from RouteSimulationProvider?
+    /// Result speed between points will be in range (25, 50] km/h (for 1 second update interval).
+    final double kMaxDistM = 13.9; // 13.9 m/s == 50 km/h
+    final JunctionInfo[] points = Framework.nativeGetRouteJunctionPoints(kMaxDistM);
     if (points == null)
     {
       Logger.e(TAG, "Navigation has not started yet");
@@ -121,6 +125,8 @@ public class NavigationScreen extends BaseMapScreen implements RoutingController
     if (!mNavigationCancelled)
       CarToast.makeText(getCarContext(), getCarContext().getString(R.string.trip_finished), CarToast.LENGTH_LONG)
           .show();
+    NavigationService.stopService(getCarContext());
+    ThemeUtils.update(getCarContext());
     finish();
     getScreenManager().popToRoot();
   }
@@ -128,7 +134,7 @@ public class NavigationScreen extends BaseMapScreen implements RoutingController
   @Override
   public void onCreate(@NonNull LifecycleOwner owner)
   {
-    Logger.d(TAG);
+    super.onCreate(owner);
     mRoutingController.attach(this);
     ThemeUtils.update(getCarContext());
     mNavigationManager.setNavigationManagerCallback(this);
@@ -144,20 +150,19 @@ public class NavigationScreen extends BaseMapScreen implements RoutingController
   @Override
   public void onResume(@NonNull LifecycleOwner owner)
   {
-    Logger.d(TAG);
+    super.onResume(owner);
     mRoutingController.attach(this);
   }
 
   @Override
   public void onDestroy(@NonNull LifecycleOwner owner)
   {
-    NavigationService.stopService(getCarContext());
+    super.onDestroy(owner);
     MwmApplication.from(getCarContext()).getLocationHelper().removeListener(mLocationListener);
 
     if (mRoutingController.isNavigating())
       mRoutingController.onSaveState();
     mRoutingController.detach();
-    ThemeUtils.update(getCarContext());
     mNavigationManager.navigationEnded();
     mNavigationManager.clearNavigationManagerCallback();
   }
@@ -257,9 +262,9 @@ public class NavigationScreen extends BaseMapScreen implements RoutingController
     @NonNull
     private final CarContext mCarContext;
     @NonNull
-    private final SurfaceRenderer mSurfaceRenderer;
+    private final Renderer mSurfaceRenderer;
 
-    public Builder(@NonNull final CarContext carContext, @NonNull final SurfaceRenderer surfaceRenderer)
+    public Builder(@NonNull final CarContext carContext, @NonNull final Renderer surfaceRenderer)
     {
       mCarContext = carContext;
       mSurfaceRenderer = surfaceRenderer;

android/app/src/main/java/app/organicmaps/car/screens/PlaceScreen.java

@@ -26,7 +26,7 @@ import androidx.core.graphics.drawable.IconCompat;
 import androidx.lifecycle.LifecycleOwner;
 import app.organicmaps.MwmApplication;
 import app.organicmaps.R;
-import app.organicmaps.car.SurfaceRenderer;
+import app.organicmaps.car.renderer.Renderer;
 import app.organicmaps.car.screens.base.BaseMapScreen;
 import app.organicmaps.car.screens.download.DownloadMapsScreenBuilder;
 import app.organicmaps.car.screens.settings.DrivingOptionsScreen;
@@ -46,7 +46,7 @@ import java.util.Objects;
 
 public class PlaceScreen extends BaseMapScreen implements OnBackPressedCallback.Callback, RoutingController.Container
 {
-  private static final Router ROUTER = Router.Vehicle;
+  public static final Router ROUTER = Router.Vehicle;
 
   @Nullable
   private MapObject mMapObject;
@@ -68,7 +68,7 @@ public class PlaceScreen extends BaseMapScreen implements OnBackPressedCallback.
 
   @NonNull
   @Override
-  public Template onGetTemplate()
+  protected Template onGetTemplateImpl()
   {
     final MapWithContentTemplate.Builder builder = new MapWithContentTemplate.Builder();
     builder.setMapController(UiHelpers.createMapController(getCarContext(), getSurfaceRenderer()));
@@ -80,6 +80,7 @@ public class PlaceScreen extends BaseMapScreen implements OnBackPressedCallback.
   @Override
   public void onCreate(@NonNull LifecycleOwner owner)
   {
+    super.onCreate(owner);
     mRoutingController.restore();
     if (mRoutingController.isNavigating() && mRoutingController.getLastRouterType() == ROUTER)
     {
@@ -112,12 +113,14 @@ public class PlaceScreen extends BaseMapScreen implements OnBackPressedCallback.
   @Override
   public void onResume(@NonNull LifecycleOwner owner)
   {
+    super.onResume(owner);
     mRoutingController.attach(this);
   }
 
   @Override
   public void onDestroy(@NonNull LifecycleOwner owner)
   {
+    super.onDestroy(owner);
     if (mRoutingController.isPlanning())
       mRoutingController.onSaveState();
     if (!mRoutingController.isNavigating())
@@ -340,11 +343,11 @@ public class PlaceScreen extends BaseMapScreen implements OnBackPressedCallback.
     @NonNull
     private final CarContext mCarContext;
     @NonNull
-    private final SurfaceRenderer mSurfaceRenderer;
+    private final Renderer mSurfaceRenderer;
     @Nullable
     private MapObject mMapObject;
 
-    public Builder(@NonNull final CarContext carContext, @NonNull final SurfaceRenderer surfaceRenderer)
+    public Builder(@NonNull final CarContext carContext, @NonNull final Renderer surfaceRenderer)
     {
       mCarContext = carContext;
       mSurfaceRenderer = surfaceRenderer;

android/app/src/main/java/app/organicmaps/car/screens/base/BaseMapScreen.java

@@ -2,21 +2,21 @@ package app.organicmaps.car.screens.base;
 
 import androidx.annotation.NonNull;
 import androidx.car.app.CarContext;
-import app.organicmaps.car.SurfaceRenderer;
+import app.organicmaps.car.renderer.Renderer;
 
 public abstract class BaseMapScreen extends BaseScreen
 {
   @NonNull
-  private final SurfaceRenderer mSurfaceRenderer;
+  private final Renderer mSurfaceRenderer;
 
-  public BaseMapScreen(@NonNull CarContext carContext, @NonNull SurfaceRenderer surfaceRenderer)
+  public BaseMapScreen(@NonNull CarContext carContext, @NonNull Renderer surfaceRenderer)
   {
     super(carContext);
     mSurfaceRenderer = surfaceRenderer;
   }
 
   @NonNull
-  protected SurfaceRenderer getSurfaceRenderer()
+  protected Renderer getSurfaceRenderer()
   {
     return mSurfaceRenderer;
   }

android/app/src/main/java/app/organicmaps/car/screens/base/BaseScreen.java

@@ -1,15 +1,71 @@
 package app.organicmaps.car.screens.base;
 
+import androidx.annotation.CallSuper;
 import androidx.annotation.NonNull;
 import androidx.car.app.CarContext;
 import androidx.car.app.Screen;
+import androidx.car.app.model.Template;
 import androidx.lifecycle.DefaultLifecycleObserver;
+import androidx.lifecycle.LifecycleOwner;
+import app.organicmaps.sdk.util.log.Logger;
 
 public abstract class BaseScreen extends Screen implements DefaultLifecycleObserver
 {
+  @NonNull
+  private final String TAG;
+
   public BaseScreen(@NonNull CarContext carContext)
   {
     super(carContext);
+    TAG = getClass().getSimpleName();
+
     getLifecycle().addObserver(this);
   }
+
+  @NonNull
+  protected abstract Template onGetTemplateImpl();
+
+  @Override
+  @NonNull
+  public final Template onGetTemplate()
+  {
+    Logger.d(TAG);
+    return onGetTemplateImpl();
+  }
+
+  @CallSuper
+  public void onCreate(@NonNull LifecycleOwner owner)
+  {
+    Logger.d(TAG);
+  }
+
+  @CallSuper
+  public void onStart(@NonNull LifecycleOwner owner)
+  {
+    Logger.d(TAG);
+  }
+
+  @CallSuper
+  public void onResume(@NonNull LifecycleOwner owner)
+  {
+    Logger.d(TAG);
+  }
+
+  @CallSuper
+  public void onPause(@NonNull LifecycleOwner owner)
+  {
+    Logger.d(TAG);
+  }
+
+  @CallSuper
+  public void onStop(@NonNull LifecycleOwner owner)
+  {
+    Logger.d(TAG);
+  }
+
+  @CallSuper
+  public void onDestroy(@NonNull LifecycleOwner owner)
+  {
+    Logger.d(TAG);
+  }
 }

android/app/src/main/java/app/organicmaps/car/screens/bookmarks/BookmarkCategoriesScreen.java

@@ -11,7 +11,7 @@ import androidx.car.app.model.Row;
 import androidx.car.app.model.Template;
 import androidx.car.app.navigation.model.MapWithContentTemplate;
 import app.organicmaps.R;
-import app.organicmaps.car.SurfaceRenderer;
+import app.organicmaps.car.renderer.Renderer;
 import app.organicmaps.car.screens.base.BaseMapScreen;
 import app.organicmaps.car.util.UiHelpers;
 import app.organicmaps.sdk.bookmarks.data.BookmarkCategory;
@@ -23,7 +23,7 @@ public class BookmarkCategoriesScreen extends BaseMapScreen
 {
   private final int MAX_CATEGORIES_SIZE;
 
-  public BookmarkCategoriesScreen(@NonNull CarContext carContext, @NonNull SurfaceRenderer surfaceRenderer)
+  public BookmarkCategoriesScreen(@NonNull CarContext carContext, @NonNull Renderer surfaceRenderer)
   {
     super(carContext, surfaceRenderer);
     final ConstraintManager constraintManager = getCarContext().getCarService(ConstraintManager.class);
@@ -32,7 +32,7 @@ public class BookmarkCategoriesScreen extends BaseMapScreen
 
   @NonNull
   @Override
-  public Template onGetTemplate()
+  protected Template onGetTemplateImpl()
   {
     final MapWithContentTemplate.Builder builder = new MapWithContentTemplate.Builder();
     builder.setMapController(UiHelpers.createMapController(getCarContext(), getSurfaceRenderer()));

android/app/src/main/java/app/organicmaps/car/screens/bookmarks/BookmarksScreen.java

@@ -13,7 +13,7 @@ import androidx.car.app.navigation.model.MapWithContentTemplate;
 import androidx.core.graphics.drawable.IconCompat;
 import androidx.lifecycle.LifecycleOwner;
 import app.organicmaps.R;
-import app.organicmaps.car.SurfaceRenderer;
+import app.organicmaps.car.renderer.Renderer;
 import app.organicmaps.car.screens.base.BaseMapScreen;
 import app.organicmaps.car.util.UiHelpers;
 import app.organicmaps.sdk.bookmarks.data.BookmarkCategory;
@@ -31,7 +31,7 @@ public class BookmarksScreen extends BaseMapScreen
 
   private boolean mIsOnSortingScreen = false;
 
-  public BookmarksScreen(@NonNull CarContext carContext, @NonNull SurfaceRenderer surfaceRenderer,
+  public BookmarksScreen(@NonNull CarContext carContext, @NonNull Renderer surfaceRenderer,
                          @NonNull BookmarkCategory bookmarkCategory)
   {
     super(carContext, surfaceRenderer);
@@ -41,7 +41,7 @@ public class BookmarksScreen extends BaseMapScreen
 
   @NonNull
   @Override
-  public Template onGetTemplate()
+  protected Template onGetTemplateImpl()
   {
     final MapWithContentTemplate.Builder builder = new MapWithContentTemplate.Builder();
     builder.setMapController(UiHelpers.createMapController(getCarContext(), getSurfaceRenderer()));
@@ -52,6 +52,7 @@ public class BookmarksScreen extends BaseMapScreen
   @Override
   public void onStop(@NonNull LifecycleOwner owner)
   {
+    super.onStop(owner);
     if (!mIsOnSortingScreen)
       mBookmarksLoader.cancel();
   }

android/app/src/main/java/app/organicmaps/car/screens/bookmarks/SortingScreen.java

@@ -16,7 +16,7 @@ import androidx.core.graphics.drawable.IconCompat;
 import androidx.lifecycle.LifecycleOwner;
 import app.organicmaps.MwmApplication;
 import app.organicmaps.R;
-import app.organicmaps.car.SurfaceRenderer;
+import app.organicmaps.car.renderer.Renderer;
 import app.organicmaps.car.screens.base.BaseMapScreen;
 import app.organicmaps.car.util.UiHelpers;
 import app.organicmaps.sdk.bookmarks.data.BookmarkCategory;
@@ -38,7 +38,7 @@ class SortingScreen extends BaseMapScreen
 
   private @BookmarkManager.SortingType int mNewSortingType;
 
-  public SortingScreen(@NonNull CarContext carContext, @NonNull SurfaceRenderer surfaceRenderer,
+  public SortingScreen(@NonNull CarContext carContext, @NonNull Renderer surfaceRenderer,
                        @NonNull BookmarkCategory bookmarkCategory)
   {
     super(carContext, surfaceRenderer);
@@ -53,7 +53,7 @@ class SortingScreen extends BaseMapScreen
 
   @NonNull
   @Override
-  public Template onGetTemplate()
+  protected Template onGetTemplateImpl()
   {
     final MapWithContentTemplate.Builder builder = new MapWithContentTemplate.Builder();
     builder.setMapController(UiHelpers.createMapController(getCarContext(), getSurfaceRenderer()));

android/app/src/main/java/app/organicmaps/car/screens/download/DownloadMapsForFirstLaunchScreen.java

@@ -23,6 +23,7 @@ class DownloadMapsForFirstLaunchScreen extends DownloadMapsScreen
   @Override
   public void onResume(@NonNull LifecycleOwner owner)
   {
+    super.onResume(owner);
     // Attempting to streamline initial download by including the current country in the list of missing maps for
     // simultaneous retrieval.
     final Location location = MwmApplication.from(getCarContext()).getLocationHelper().getSavedLocation();

android/app/src/main/java/app/organicmaps/car/screens/download/DownloadMapsScreen.java

@@ -34,7 +34,7 @@ public abstract class DownloadMapsScreen extends BaseScreen
 
   @NonNull
   @Override
-  public final Template onGetTemplate()
+  protected final Template onGetTemplateImpl()
   {
     final MessageTemplate.Builder builder = new MessageTemplate.Builder(getText(getMapsSize(mMissingMaps)));
     final Header.Builder headerBuilder = new Header.Builder();

android/app/src/main/java/app/organicmaps/car/screens/download/DownloaderScreen.java

@@ -102,6 +102,7 @@ class DownloaderScreen extends BaseScreen
   @Override
   public void onResume(@NonNull LifecycleOwner owner)
   {
+    super.onResume(owner);
     if (mSubscriptionSlot == 0)
       mSubscriptionSlot = MapManager.nativeSubscribe(mStorageCallback);
     for (final var item : mMissingMaps.entrySet())
@@ -114,6 +115,7 @@ class DownloaderScreen extends BaseScreen
   @Override
   public void onPause(@NonNull LifecycleOwner owner)
   {
+    super.onPause(owner);
     if (!mIsDownloadFailed)
       cancelMapsDownloading();
     if (mSubscriptionSlot != 0)
@@ -125,7 +127,7 @@ class DownloaderScreen extends BaseScreen
 
   @NonNull
   @Override
-  public Template onGetTemplate()
+  protected Template onGetTemplateImpl()
   {
     final MessageTemplate.Builder builder = new MessageTemplate.Builder(getText());
     builder.setLoading(true);

android/app/src/main/java/app/organicmaps/car/screens/permissions/RequestPermissionsScreenWithApi.java

@@ -37,7 +37,7 @@ public class RequestPermissionsScreenWithApi extends BaseScreen implements UserA
 
   @NonNull
   @Override
-  public Template onGetTemplate()
+  protected Template onGetTemplateImpl()
   {
     final MessageTemplate.Builder builder =
         new MessageTemplate.Builder(getCarContext().getString(R.string.aa_request_permission_activity_text));
@@ -63,6 +63,7 @@ public class RequestPermissionsScreenWithApi extends BaseScreen implements UserA
   @Override
   public void onResume(@NonNull LifecycleOwner owner)
   {
+    super.onResume(owner);
     // Let's review the permissions once more, as we might enter this function following an ErrorScreen situation
     // where the user manually enabled location permissions.
     if (LocationUtils.checkFineLocationPermission(getCarContext()))

android/app/src/main/java/app/organicmaps/car/screens/permissions/RequestPermissionsScreenWithNotification.java

@@ -47,7 +47,7 @@ public class RequestPermissionsScreenWithNotification extends BaseScreen impleme
 
   @NonNull
   @Override
-  public Template onGetTemplate()
+  protected Template onGetTemplateImpl()
   {
     final MessageTemplate.Builder builder =
         new MessageTemplate.Builder(getCarContext().getString(R.string.aa_location_permissions_request));
@@ -66,6 +66,7 @@ public class RequestPermissionsScreenWithNotification extends BaseScreen impleme
   @RequiresPermission(value = Manifest.permission.POST_NOTIFICATIONS)
   public void onStart(@NonNull LifecycleOwner owner)
   {
+    super.onStart(owner);
     mIsPermissionCheckEnabled = true;
     mBackgroundExecutor.execute(this::checkPermissions);
     sendPermissionsRequestNotification();
@@ -74,12 +75,14 @@ public class RequestPermissionsScreenWithNotification extends BaseScreen impleme
   @Override
   public void onStop(@NonNull LifecycleOwner owner)
   {
+    super.onStop(owner);
     mIsPermissionCheckEnabled = false;
   }
 
   @Override
   public void onDestroy(@NonNull LifecycleOwner owner)
   {
+    super.onDestroy(owner);
     NotificationManagerCompat.from(getCarContext()).cancel(NOTIFICATION_ID);
   }
 

android/app/src/main/java/app/organicmaps/car/screens/search/SearchOnMapScreen.java

@@ -17,7 +17,7 @@ import androidx.core.graphics.drawable.IconCompat;
 import androidx.lifecycle.LifecycleOwner;
 import app.organicmaps.MwmApplication;
 import app.organicmaps.R;
-import app.organicmaps.car.SurfaceRenderer;
+import app.organicmaps.car.renderer.Renderer;
 import app.organicmaps.car.screens.base.BaseMapScreen;
 import app.organicmaps.car.util.UiHelpers;
 import app.organicmaps.sdk.bookmarks.data.MapObject;
@@ -54,7 +54,7 @@ public class SearchOnMapScreen extends BaseMapScreen implements SearchListener
 
   @NonNull
   @Override
-  public Template onGetTemplate()
+  protected Template onGetTemplateImpl()
   {
     final MapWithContentTemplate.Builder builder = new MapWithContentTemplate.Builder();
     builder.setMapController(UiHelpers.createMapController(getCarContext(), getSurfaceRenderer()));
@@ -136,12 +136,14 @@ public class SearchOnMapScreen extends BaseMapScreen implements SearchListener
   @Override
   public void onStart(@NonNull LifecycleOwner owner)
   {
+    super.onStart(owner);
     SearchEngine.INSTANCE.addListener(this);
   }
 
   @Override
   public void onResume(@NonNull LifecycleOwner owner)
   {
+    super.onResume(owner);
     SearchEngine.INSTANCE.cancel();
 
     final MapObject location = MwmApplication.from(getCarContext()).getLocationHelper().getMyPosition();
@@ -156,6 +158,7 @@ public class SearchOnMapScreen extends BaseMapScreen implements SearchListener
   @Override
   public void onStop(@NonNull LifecycleOwner owner)
   {
+    super.onStop(owner);
     SearchEngine.INSTANCE.removeListener(this);
     SearchEngine.INSTANCE.cancel();
   }
@@ -177,7 +180,7 @@ public class SearchOnMapScreen extends BaseMapScreen implements SearchListener
     @NonNull
     private final CarContext mCarContext;
     @NonNull
-    private final SurfaceRenderer mSurfaceRenderer;
+    private final Renderer mSurfaceRenderer;
 
     @NonNull
     private String mQuery = "";
@@ -185,7 +188,7 @@ public class SearchOnMapScreen extends BaseMapScreen implements SearchListener
     private String mLocale;
     private boolean mIsCategory;
 
-    public Builder(@NonNull CarContext carContext, @NonNull SurfaceRenderer surfaceRenderer)
+    public Builder(@NonNull CarContext carContext, @NonNull Renderer surfaceRenderer)
     {
       mCarContext = carContext;
       mSurfaceRenderer = surfaceRenderer;

android/app/src/main/java/app/organicmaps/car/screens/search/SearchScreen.java

@@ -16,7 +16,7 @@ import androidx.core.graphics.drawable.IconCompat;
 import androidx.lifecycle.LifecycleOwner;
 import app.organicmaps.MwmApplication;
 import app.organicmaps.R;
-import app.organicmaps.car.SurfaceRenderer;
+import app.organicmaps.car.renderer.Renderer;
 import app.organicmaps.car.screens.base.BaseMapScreen;
 import app.organicmaps.sdk.bookmarks.data.MapObject;
 import app.organicmaps.sdk.search.SearchEngine;
@@ -50,7 +50,7 @@ public class SearchScreen extends BaseMapScreen implements SearchTemplate.Search
 
   @NonNull
   @Override
-  public Template onGetTemplate()
+  protected Template onGetTemplateImpl()
   {
     final SearchTemplate.Builder builder = new SearchTemplate.Builder(this);
     builder.setHeaderAction(Action.BACK);
@@ -106,12 +106,14 @@ public class SearchScreen extends BaseMapScreen implements SearchTemplate.Search
   @Override
   public void onStart(@NonNull LifecycleOwner owner)
   {
+    super.onStart(owner);
     SearchEngine.INSTANCE.addListener(this);
   }
 
   @Override
   public void onStop(@NonNull LifecycleOwner owner)
   {
+    super.onStop(owner);
     SearchEngine.INSTANCE.removeListener(this);
     SearchEngine.INSTANCE.cancel();
   }
@@ -209,14 +211,14 @@ public class SearchScreen extends BaseMapScreen implements SearchTemplate.Search
     @NonNull
     private final CarContext mCarContext;
     @NonNull
-    private final SurfaceRenderer mSurfaceRenderer;
+    private final Renderer mSurfaceRenderer;
 
     @NonNull
     private String mQuery = "";
     @NonNull
     private String mLocale;
 
-    public Builder(@NonNull CarContext carContext, @NonNull SurfaceRenderer surfaceRenderer)
+    public Builder(@NonNull CarContext carContext, @NonNull Renderer surfaceRenderer)
     {
       mCarContext = carContext;
       mSurfaceRenderer = surfaceRenderer;

android/app/src/main/java/app/organicmaps/car/screens/settings/DrivingOptionsScreen.java

@@ -13,7 +13,7 @@ import androidx.car.app.model.Template;
 import androidx.car.app.navigation.model.MapWithContentTemplate;
 import androidx.lifecycle.LifecycleOwner;
 import app.organicmaps.R;
-import app.organicmaps.car.SurfaceRenderer;
+import app.organicmaps.car.renderer.Renderer;
 import app.organicmaps.car.screens.base.BaseMapScreen;
 import app.organicmaps.car.util.Toggle;
 import app.organicmaps.car.util.UiHelpers;
@@ -31,12 +31,14 @@ public class DrivingOptionsScreen extends BaseMapScreen
   private final DrivingOption[] mDrivingOptions = {new DrivingOption(RoadType.Toll, R.string.avoid_tolls),
                                                    new DrivingOption(RoadType.Dirty, R.string.avoid_unpaved),
                                                    new DrivingOption(RoadType.Ferry, R.string.avoid_ferry),
-                                                   new DrivingOption(RoadType.Motorway, R.string.avoid_motorways)};
+                                                   new DrivingOption(RoadType.Motorway, R.string.avoid_motorways),
+                                                   new DrivingOption(RoadType.Steps, R.string.avoid_steps),
+                                                   new DrivingOption(RoadType.Paved, R.string.avoid_paved)};
 
   @NonNull
   private final Map<RoadType, Boolean> mInitialDrivingOptionsState = new HashMap<>();
 
-  public DrivingOptionsScreen(@NonNull CarContext carContext, @NonNull SurfaceRenderer surfaceRenderer)
+  public DrivingOptionsScreen(@NonNull CarContext carContext, @NonNull Renderer surfaceRenderer)
   {
     super(carContext, surfaceRenderer);
 
@@ -45,7 +47,7 @@ public class DrivingOptionsScreen extends BaseMapScreen
 
   @NonNull
   @Override
-  public Template onGetTemplate()
+  protected Template onGetTemplateImpl()
   {
     final MapWithContentTemplate.Builder builder = new MapWithContentTemplate.Builder();
     builder.setMapController(UiHelpers.createMapController(getCarContext(), getSurfaceRenderer()));
@@ -56,6 +58,7 @@ public class DrivingOptionsScreen extends BaseMapScreen
   @Override
   public void onStop(@NonNull LifecycleOwner owner)
   {
+    super.onStop(owner);
     for (final DrivingOption drivingOption : mDrivingOptions)
     {
       if (Boolean.TRUE.equals(mInitialDrivingOptionsState.get(drivingOption.roadType))

android/app/src/main/java/app/organicmaps/car/screens/settings/HelpScreen.java

@@ -12,7 +12,7 @@ import androidx.car.app.model.Template;
 import androidx.car.app.navigation.model.MapWithContentTemplate;
 import app.organicmaps.BuildConfig;
 import app.organicmaps.R;
-import app.organicmaps.car.SurfaceRenderer;
+import app.organicmaps.car.renderer.Renderer;
 import app.organicmaps.car.screens.base.BaseMapScreen;
 import app.organicmaps.car.util.UiHelpers;
 import app.organicmaps.sdk.Framework;
@@ -20,14 +20,14 @@ import app.organicmaps.sdk.util.DateUtils;
 
 public class HelpScreen extends BaseMapScreen
 {
-  public HelpScreen(@NonNull CarContext carContext, @NonNull SurfaceRenderer surfaceRenderer)
+  public HelpScreen(@NonNull CarContext carContext, @NonNull Renderer surfaceRenderer)
   {
     super(carContext, surfaceRenderer);
   }
 
   @NonNull
   @Override
-  public Template onGetTemplate()
+  protected Template onGetTemplateImpl()
   {
     final MapWithContentTemplate.Builder builder = new MapWithContentTemplate.Builder();
     builder.setMapController(UiHelpers.createMapController(getCarContext(), getSurfaceRenderer()));