Merge commit '05cc660641' into traffic

# Conflicts: # CMakeLists.txt # android/app/src/main/java/app/organicmaps/settings/SettingsPrefsFragment.java # android/sdk/src/main/cpp/app/organicmaps/sdk/Framework.hpp # android/sdk/src/main/cpp/app/organicmaps/sdk/OrganicMaps.cpp # android/sdk/src/main/cpp/app/organicmaps/sdk/util/Config.cpp # libs/indexer/data_source.hpp # libs/indexer/feature.hpp # libs/indexer/ftypes_matcher.hpp # libs/map/framework.cpp # libs/map/traffic_manager.cpp # libs/routing/absent_regions_finder.cpp # libs/routing/edge_estimator.hpp # libs/routing/index_router.cpp # libs/routing/index_router.hpp # libs/routing/routing_session.hpp # libs/routing_common/num_mwm_id.hpp # libs/traffic/traffic_info.cpp # qt/mainwindow.hpp # qt/preferences_dialog.cpp # tools/openlr/helpers.hpp # tools/openlr/openlr_decoder.cpp # tools/openlr/openlr_decoder.hpp # tools/openlr/openlr_stat/openlr_stat.cpp # tools/openlr/router.hpp # tools/openlr/score_candidate_paths_getter.cpp # tools/openlr/score_candidate_paths_getter.hpp # xcode/CoMaps.xcworkspace/contents.xcworkspacedata
2025-12-19 04:53:36 +00:00 · 2025-09-10 21:22:40 +03:00
parent 0713e22328 05cc660641
commit 38e98df6cc
4644 changed files with 82377 additions and 85029 deletions
--- a/.clang-format
+++ b/.clang-format
@@ -3,7 +3,6 @@ BasedOnStyle: Google

 AccessModifierOffset: -2
 AlignAfterOpenBracket: Align
-AlignArrayOfStructures: Right
 AlignConsecutiveMacros: AcrossEmptyLinesAndComments
 AlignEscapedNewlines: LeftWithLastLine
 AlignOperands: AlignAfterOperator
@@ -40,8 +39,10 @@ ColumnLimit: 120
 ConstructorInitializerIndentWidth: 2
 ContinuationIndentWidth: 4
 DerivePointerAlignment: false
+EmptyLineBeforeAccessModifier: Always
 IncludeBlocks: Preserve
 IndentAccessModifiers: false
+IndentCaseLabels: false
 IndentExternBlock: NoIndent
 InsertBraces: false
 InsertNewlineAtEOF: true
@@ -49,6 +50,7 @@ LambdaBodyIndentation: OuterScope
 PackConstructorInitializers: CurrentLine
 PointerAlignment: Middle
 RemoveBracesLLVM: true
+RemoveSemicolon: true
 QualifierAlignment: Right
 SpacesInContainerLiterals: false
 Standard: Latest
--- a/.clang-format-ignore
+++ b/.clang-format-ignore
@@ -0,0 +1,8 @@
+# Files that should not be formatted.
+./3party
+# A patched copy of the https://registry.khronos.org/OpenGL/api/GLES3/gl3.h
+./android/sdk/src/main/cpp/app/organicmaps/sdk/opengl/gl3stub.h
+# Formatting it leads to crashes in runtime. Newer protobuf may fix it.
+./libs/indexer/drules_struct.pb.cc
+# No need to format this 3party tool.
+tools/osmctools/*.c
--- a/.forgejo/workflows/dco.yml
+++ b/.forgejo/workflows/dco.yml
@@ -1,8 +1,9 @@
-name: dco
+name: DCO
 on: [pull_request]

 jobs:
  check:
-    runs-on: codeberg-tiny
+    runs-on: ubuntu-latest
    steps:
-      - uses: https://github.com/KineticCafe/actions-dco@v1
+      - name: Check for Developer Certificate of Origin (DCO) compliance
+        uses: https://github.com/KineticCafe/actions-dco@fb284c903a7673a3d4b0bdd104479a6f0d46dae7 # v1.3.6
--- a/.forgejo/workflows/desktop-file-check.yaml
+++ b/.forgejo/workflows/desktop-file-check.yaml
@@ -3,7 +3,7 @@ on:
  workflow_dispatch: # Manual trigger
  pull_request:
    paths:
-      - qt/res/app.comaps.comaps.desktop
+      - qt/res/linux/app.comaps.comaps.desktop
      - .forgejo/workflows/desktop-file-check.yaml # Run check on self change

 jobs:
@@ -16,7 +16,7 @@ jobs:
        with:
          fetch-depth: 1
          sparse-checkout: |
-            qt/res/app.comaps.comaps.desktop
+            qt/res/linux/app.comaps.comaps.desktop

      - name: Install desktop-file-validate tool
        shell: bash
@@ -27,4 +27,4 @@ jobs:

      - name: Validate desktop file
        shell: bash
-        run: desktop-file-validate qt/res/app.comaps.comaps.desktop && echo "Successfully validated .desktop file"
+        run: desktop-file-validate qt/res/linux/app.comaps.comaps.desktop && echo "Successfully validated .desktop file"
--- a/.forgejo/workflows/linux-check.yaml
+++ b/.forgejo/workflows/linux-check.yaml
@@ -133,6 +133,14 @@ jobs:
        with:
          key: ${{ github.workflow }}-unity-${{ matrix.compiler.CC }}-${{ matrix.CMAKE_BUILD_TYPE }}

+      - name: Configure repository
+        shell: bash
+        env:
+          SKIP_MAP_DOWNLOAD: 1
+          SKIP_GENERATE_SYMBOLS: 1
+          SKIP_GENERATE_DRULES: 1
+        run: ./configure.sh
+
      - name: CMake
        shell: bash
        env:
--- a/.github/workflows/android-check.yaml
+++ b/.github/workflows/android-check.yaml
@@ -23,6 +23,10 @@ jobs:
        shell: bash
        run: git submodule update --depth 1 --init --recursive --jobs=$(($(nproc) * 20))

+      - name: Configure repository
+        shell: bash
+        run: SKIP_GENERATE_SYMBOLS=1 ./configure.sh
+
      - name: Lint
        shell: bash
        working-directory: android
@@ -62,6 +66,7 @@ jobs:
          libxinerama-dev \
          libxcursor-dev \
          libxi-dev \
+          python3-protobuf \
          zlib1g-dev

      - name: Checkout sources
--- a/.github/workflows/clang-format.yaml
+++ b/.github/workflows/clang-format.yaml
@@ -1,43 +0,0 @@
-name: clang-format
-
-on:
-  push:
-    branches: [ master ]
-    paths:
-      - 'android/app/src/**.java'
-      - '.clang-format'
-      - '.github/workflows/clang-format.yml'
-  pull_request:
-    branches: [ master ]
-    paths:
-      - 'android/app/src/**.java'
-      - '.clang-format'
-      - '.github/workflows/clang-format.yml'
-
-jobs:
-  check-formatting:
-    runs-on: ubuntu-latest
-    continue-on-error: true  # TODO(AB): Remove this line when ready to enforce formatting.
-
-    steps:
-      - uses: actions/checkout@v4
-
-      - name: Install clang-format
-        run: |
-          sudo apt-get update
-          sudo apt-get install -y clang-format-19
-          clang-format-19 --version
-
-      - name: Check Java formatting
-        run: |
-          JAVA_FILES=($(find android/app/src -name '*.java'))
-
-          FORMATTING_ISSUES=$(clang-format-19 --dry-run --Werror $JAVA_FILES 2>&1 || true)
-
-          if [ -n "$FORMATTING_ISSUES" ]; then
-            echo "$FORMATTING_ISSUES"
-            echo ""
-            echo "To fix formatting, please run:"
-            echo "  clang-format -i <file>"
-            exit 1
-          fi
--- a/.github/workflows/code-style-check.yaml
+++ b/.github/workflows/code-style-check.yaml
@@ -0,0 +1,51 @@
+name: Code style check
+
+on:
+  pull_request:
+    branches: [ master ]
+    paths:  # Should stay in sync with tools/unix/clang-format.sh
+      - '.github/workflows/code-style-check.yaml'
+      - 'android/app/src/**.java'
+      - 'android/sdk/src/**.java'
+      - 'android/sdk/src/main/cpp/**.[ch]pp'
+      - 'dev_sandbox/**.[ch]pp'
+      - 'generator/**.[ch]pp'
+      - 'iphone/**.[ch]pp'
+      - 'iphone/**.[hm]'
+      - 'iphone/**.mm'
+      - 'libs/**.[ch]pp'
+      - 'libs/**.[hm]'
+      - '!libs/indexer/drules_struct.pb.h'
+      - 'libs/**.mm'
+      - 'qt/**.[ch]pp'
+      - 'qt/**.h'
+      - 'tools/**.[ch]pp'
+      - '.clang-format'
+      - '.clang-format-ignore'
+
+jobs:
+  code-style-check:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Install clang-format
+        run: |
+          sudo apt purge -y clang-format-18  # Remove default old version of clang-format
+          wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | sudo apt-key add -
+          echo 'deb http://apt.llvm.org/noble/ llvm-toolchain-noble-20 main' | sudo tee /etc/apt/sources.list.d/llvm-toolchain-noble-20.list
+          sudo apt-get update
+          sudo apt-get install -y clang-format-20
+          sudo update-alternatives --force --install /usr/bin/clang-format clang-format /usr/bin/clang-format-20 10
+          sudo update-alternatives --force --install /usr/bin/git-clang-format git-clang-format /usr/bin/git-clang-format-20 10
+          clang-format --version
+      - name: Checkout sources
+        uses: actions/checkout@v4
+
+      - name: Check code style
+        run: tools/unix/clang-format.sh
+
+      - name: Post clang-format comments
+        if: failure()
+        uses: reviewdog/action-suggester@v1.21.0
+        with:
+          tool_name: clang-format
+          fail_level: error
--- a/.github/workflows/ios-check.yaml
+++ b/.github/workflows/ios-check.yaml
@@ -30,6 +30,7 @@ jobs:
        run: |
          brew install qt \
          optipng
+          pip3 install "protobuf<3.21" --break-system-packages
      - name: Checkout sources
        uses: actions/checkout@v4

--- a/.gitignore
+++ b/.gitignore
@@ -14,12 +14,10 @@ stxxl.errlog
 stxxl.log
 screenlog.0

-data/symbols/*/design/
 # symbols png/sdf are now generated at build
 data/symbols/**/symbols.png
 data/symbols/**/symbols.sdf
-data/colors_design.txt
-data/patterns_design.txt
+
 data/bookmarks
 data/edits.xml
 data/traffic.xml
@@ -28,11 +26,15 @@ data/WorldCoasts.mwm
 data/world_mwm/*
 data/*_hash
 data/drules_proto*
-data/classificator.txt
-data/types.txt
-data/visibility.txt
-data/colors.txt
-data/patterns.txt
+data/classificator.txt*
+data/types.txt*
+data/visibility.txt*
+data/colors.txt*
+data/patterns.txt*
+# TODO: designer is not used at the moment
+# data/symbols/*/design/
+# data/colors_design.txt
+# data/patterns_design.txt

 # Compiled Python
 *.pyc
@@ -51,7 +53,7 @@ omim.sdf
 *.suo
 *.aps
 *.rc
-!qt/res/windows.rc
+!qt/res/windows/windows.rc
 *.pdb
 out/

--- a/.gitmodules
+++ b/.gitmodules
@@ -65,3 +65,7 @@
 [submodule "3party/imgui/imgui"]
  path = 3party/imgui/imgui
  url = https://github.com/ocornut/imgui
+[submodule "3party/glaze"]
+  path = 3party/glaze
+  url = https://github.com/stephenberry/glaze
+  branch = main
--- a/3party/CMakeLists.txt
+++ b/3party/CMakeLists.txt
@@ -57,6 +57,7 @@ endif()

 add_subdirectory(agg)
 add_subdirectory(bsdiff-courgette)
+add_subdirectory(glaze)
 add_subdirectory(minizip)
 add_subdirectory(open-location-code)
 add_subdirectory(opening_hours)
--- a/3party/Vulkan-Headers
+++ b/3party/Vulkan-Headers
--- a/3party/freetype/CMakeLists.txt
+++ b/3party/freetype/CMakeLists.txt
@@ -4,7 +4,9 @@ set(FT_DISABLE_HARFBUZZ ON)
 add_subdirectory(freetype)

 # Fix warning with ONE_PIXEL macro clash.
+if(NOT MSVC)
 target_compile_options(freetype PRIVATE -Wno-macro-redefined)
+endif()

 # Use ft2build.h from the current directory instead of the default.
 target_include_directories(freetype
--- a/3party/glaze
+++ b/3party/glaze
--- a/3party/harfbuzz/CMakeLists.txt
+++ b/3party/harfbuzz/CMakeLists.txt
@@ -11,7 +11,15 @@ target_include_directories(${PROJECT_NAME}
    harfbuzz/src
 )

-# Keep these settigns in sync with xcode/harfbuzz project.
+if (MSVC)
+  target_compile_options(${PROJECT_NAME}
+    PRIVATE
+      /GR-
+      /EHsc-
+      /Zc:threadSafeInit-
+  )
+else()
+  # Keep these settings in sync with xcode/harfbuzz project.
  target_compile_options(${PROJECT_NAME}
    PRIVATE
      -fno-rtti
@@ -19,6 +27,7 @@ target_compile_options(${PROJECT_NAME}
      -fno-threadsafe-statics
      $<$<OR:$<CXX_COMPILER_ID:Clang>,$<CXX_COMPILER_ID:AppleClang>>:-Wno-format-pedantic>
  )
+endif()

 target_compile_definitions(${PROJECT_NAME}
  PRIVATE
@@ -28,13 +37,19 @@ target_compile_definitions(${PROJECT_NAME}
    #$<$<BOOL:${APPLE}>:HAVE_CORETEXT>
    HAVE_ATEXIT
    HAVE_GETPAGESIZE
-    HAVE_MMAP
    HAVE_MPROTECT
-    HAVE_PTHREAD
    HAVE_SYSCONF
+)
+
+if (NOT MSVC)
+  target_compile_definitions(${PROJECT_NAME}
+    PRIVATE
+      HAVE_MMAP
+      HAVE_PTHREAD
      HAVE_SYS_MMAN_H
      HAVE_UNISTD_H
  )
+endif()

 target_link_libraries(${PROJECT_NAME} Freetype::Freetype)

--- a/3party/icu/CMakeLists.txt
+++ b/3party/icu/CMakeLists.txt
@@ -172,6 +172,7 @@ add_library(icuuc
  icu/icu4c/source/common/uvector.cpp
  icu/icu4c/source/common/uvectr32.cpp
  icu/icu4c/source/common/uvectr64.h
+  icu/icu4c/source/common/wintz.cpp
  icu/icu4c/source/common/wintz.h
 )

--- a/3party/protobuf/CMakeLists.txt
+++ b/3party/protobuf/CMakeLists.txt
@@ -11,6 +11,7 @@ set(SRC
  protobuf/src/google/protobuf/message_lite.cc
  protobuf/src/google/protobuf/repeated_field.cc
  protobuf/src/google/protobuf/stubs/atomicops_internals_x86_gcc.cc
+  protobuf/src/google/protobuf/stubs/atomicops_internals_x86_msvc.cc
  protobuf/src/google/protobuf/stubs/bytestream.cc
  protobuf/src/google/protobuf/stubs/common.cc
  protobuf/src/google/protobuf/stubs/int128.cc
--- a/3party/succinct/mapper.hpp
+++ b/3party/succinct/mapper.hpp
@@ -7,7 +7,6 @@
 #include <boost/utility/enable_if.hpp>
 #include <boost/utility.hpp>
 #include <boost/type_traits/is_pod.hpp>
-#include <boost/iostreams/device/mapped_file.hpp>

 #include "mappable_vector.hpp"

@@ -283,12 +282,6 @@ namespace succinct { namespace mapper {
        return mapper.bytes_read();
    }

-    template <typename T>
-    size_t map(T& val, boost::iostreams::mapped_file_source const& m, uint64_t flags = 0, const char* friendly_name = "<TOP>")
-    {
-        return map(val, m.data(), flags, friendly_name);
-    }
-
    template <typename T>
    uint64_t size_of(T& val)
    {
--- a/3party/succinct/util.hpp
+++ b/3party/succinct/util.hpp
@@ -8,7 +8,6 @@
 #include <stdint.h>

 #include <boost/iterator/iterator_facade.hpp>
-#include <boost/iostreams/device/mapped_file.hpp>

 namespace succinct { namespace util {

@@ -205,29 +204,6 @@ namespace succinct { namespace util {
        std::string m_cur_value;
    };

-    struct mmap_lines
-    {
-        typedef buffer_line_iterator iterator;
-        typedef buffer_line_iterator const_iterator;
-
-        mmap_lines(std::string filename)
-            : m_map(filename)
-        {}
-
-        const_iterator begin() const
-        {
-            return const_iterator(m_map.data(), m_map.size());
-        }
-
-        const_iterator end() const
-        {
-            return const_iterator();
-        }
-
-    private:
-        boost::iostreams::mapped_file_source m_map;
-    };
-
    struct input_error : std::invalid_argument
    {
        input_error(std::string const& what)
--- a/3party/vulkan_wrapper/vulkan_wrapper.cpp
+++ b/3party/vulkan_wrapper/vulkan_wrapper.cpp
@@ -19,7 +19,18 @@ extern "C" {
 #endif

 #include "vulkan_wrapper.h"
+
+#if defined(_WIN32)
+#ifndef WIN32_LEAN_AND_MEAN
+#define WIN32_LEAN_AND_MEAN
+#endif
+#ifndef NOMINMAX
+#define NOMINMAX
+#endif
+#include <windows.h>
+#else
 #include <dlfcn.h>
+#endif

 int InitVulkan(void) {
 #if defined(__APPLE__)
@@ -30,6 +41,9 @@ int InitVulkan(void) {
    if (!libvulkan) {
        libvulkan = dlopen("libMoltenVK.dylib", RTLD_NOW | RTLD_LOCAL);
    }
+#elif defined( _WIN32 )
+    HMODULE libvulkan = LoadLibraryA("vulkan-1.dll");
+    auto dlsym = [](HMODULE h, char const * name) { return GetProcAddress(h, name); };
 #else
    void* libvulkan = dlopen("libvulkan.so.1", RTLD_NOW | RTLD_LOCAL);
    if (!libvulkan) {
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2,8 +2,8 @@ cmake_minimum_required(VERSION 3.22.1)

 project(omim C CXX)

-set(CMAKE_CXX_STANDARD 20)
-set(CMAKE_C_STANDARD 17)
+set(CMAKE_CXX_STANDARD 23)
+set(CMAKE_C_STANDARD 23)
 # Our code does not rely on gnu extensions.
 set(CMAKE_CXX_EXTENSIONS OFF)
 set(CMAKE_C_EXTENSIONS OFF)
@@ -39,18 +39,16 @@ if (APPLE AND NOT ("${CMAKE_SYSTEM_NAME}" STREQUAL Android))
  # https://gitlab.kitware.com/cmake/cmake/-/issues/21963
  enable_language(OBJC)
  set(CMAKE_OBJC_EXTENSIONS OFF)
-  set(CMAKE_OBJC_STANDARD 11)
+  set(CMAKE_OBJC_STANDARD 23)
  set(CMAKE_OBJC_FLAGS -fobjc-arc)
  set(CMAKE_OBJC_VISIBILITY_PRESET hidden)
  enable_language(OBJCXX)
  set(CMAKE_OBJCXX_EXTENSIONS OFF)
-  set(CMAKE_OBJCXX_STANDARD 20)
+  set(CMAKE_OBJCXX_STANDARD 23)
  set(CMAKE_OBJCXX_FLAGS -fobjc-arc)
  set(CMAKE_OBJCXX_VISIBILITY_PRESET hidden)
 endif()

-execute_process(COMMAND "./configure.sh" WORKING_DIRECTORY ${OMIM_ROOT})
-
 message(STATUS "Using compiler ${CMAKE_CXX_COMPILER_ID} ${CMAKE_CXX_COMPILER_VERSION}")

 if (CMAKE_UNITY_BUILD)
@@ -87,7 +85,7 @@ if (MSVC)
  add_compile_options(/utf-8)
  add_link_options(/INCREMENTAL:NO)
 else()
-  add_compile_options(-ffast-math)
+  add_compile_options(-ffast-math $<$<CXX_COMPILER_ID:GNU>:-Wno-psabi>)
 endif()

 if (PLATFORM_WIN)
@@ -185,7 +183,7 @@ if (NOT PLATFORM_IPHONE AND NOT PLATFORM_ANDROID)
 endif()

 # To allow #include "base/file_name.hpp" in all sources.
-include_directories(${CMAKE_HOME_DIRECTORY})
+include_directories("${CMAKE_HOME_DIRECTORY}" "${CMAKE_HOME_DIRECTORY}/libs" "${CMAKE_HOME_DIRECTORY}/tools")

 if (USE_PCH)
  message(STATUS "Precompiled headers are ON")
@@ -197,7 +195,7 @@ if (USE_PCH)
 endif()

 # Should be on the root level, not in 3party, so tests can get these dependencies.
-if (PLATFORM_LINUX OR PLATFORM_WIN)
+if (PLATFORM_LINUX)
  find_package(ICU COMPONENTS uc i18n data REQUIRED)
  find_package(Freetype REQUIRED)
  find_package(harfbuzz REQUIRED)
@@ -227,50 +225,22 @@ endif()
 # Used in qt/ and shaders/
 find_package(Python3 REQUIRED COMPONENTS Interpreter)

-add_subdirectory(base)
-add_subdirectory(coding)
-add_subdirectory(descriptions)
-add_subdirectory(drape)
-add_subdirectory(drape_frontend)
-add_subdirectory(editor)
-add_subdirectory(ge0)
-add_subdirectory(generator/mwm_diff)
-add_subdirectory(geometry)
-add_subdirectory(indexer)
-add_subdirectory(kml)
-add_subdirectory(map)
-add_subdirectory(cppjansson)
-add_subdirectory(platform)
-add_subdirectory(routing)
-add_subdirectory(routing_common)
-add_subdirectory(search)
-add_subdirectory(shaders)
-add_subdirectory(storage)
-add_subdirectory(tracking)
-add_subdirectory(traffic)
-add_subdirectory(traffxml)
-add_subdirectory(transit)
+add_subdirectory(libs)

 if (PLATFORM_DESKTOP)
-  omim_add_tool_subdirectory(feature_list)
+  add_subdirectory(dev_sandbox)
  add_subdirectory(generator)
-  add_subdirectory(openlr)
-  add_subdirectory(poly_borders)
-  omim_add_tool_subdirectory(topography_generator)
-  add_subdirectory(track_analyzing)
-  omim_add_tool_subdirectory(track_generator)
+  add_subdirectory(tools)
  if (NOT SKIP_QT_GUI)
    add_subdirectory(qt)
-    omim_add_tool_subdirectory(skin_generator)
  endif()
  if (GENERATOR_TOOL)
    add_compile_options(-march=native -mtune=native)
    message(STATUS "target CPU optimizations enabled, produced binaries will NOT work on a different CPU")
  endif()
-  add_subdirectory(dev_sandbox)
 endif()

-omim_add_test_subdirectory(qt_tstfrm)
+omim_add_test_subdirectory(libs/qt_tstfrm)

 if (PLATFORM_ANDROID)
  add_subdirectory(android/sdk/src/main/cpp)
--- a/README.md
+++ b/README.md
@@ -19,20 +19,20 @@
 </div>
 <div align="center">
  <p align="center">
-    <a href="https://codeberg.org/comaps/comaps/releases">
-      <img src="https://img.shields.io/github/license/comaps/comaps?style=for-the-badge&logo=opensourceinitiative&logoColor=white&color=588157" alt="License" style="width: 90%; max-width: 150px;"/>
+    <a href="https://codeberg.org/comaps/comaps/src/branch/main/LICENSE">
+      <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" style="width: 90%; max-width: 170px;"/>
+      <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"/>
    </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" style="width: 90%; max-width: 145px;"/>
+      <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"/>
    </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" style="width: 90%; max-width: 191px;"/>
+      <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"/>
    </a>
    <a href="https://liberapay.com/CoMaps">
-      <img src="https://img.shields.io/liberapay/patrons/CoMaps.svg?label=Liberapay%20Patrons&logo=liberapay&logoColor=white&style=for-the-badge&color=588157" alt="Liberapay Patrons" style="width: 90%; max-width: 160px;"/>
+      <img src="https://img.shields.io/liberapay/patrons/CoMaps.svg?label=Liberapay%20Patrons&logo=liberapay&logoColor=white&style=for-the-badge&color=588157" alt="Liberapay Patrons"/>
    </a>
  </p>
 </div>
@@ -41,8 +41,6 @@

 A community-led free & open source maps app based on [OpenStreetMap](https://www.openstreetmap.org), built for transparency, privacy, and not-for-profit values. A fork of Organic Maps, originally based on Maps.ME.

-**Available for:** Android, iOS, ARM macOS, and alpha Linux/macOS desktop builds (also usable on Linux phones).
-
 <p align="center">
  <a href="https://apps.apple.com/app/comaps/id6747180809">
    <img src="docs/badges/apple-appstore.png" alt="App Store" width="160"/>
@@ -77,9 +75,10 @@ A community-led free & open source maps app based on [OpenStreetMap](https://www
 ## ⚡️ Highlights

 - **Offline-first**: Navigate without a connection
- **Privacy-respecting**: No tracking, Ads or data collection
+- **Privacy-respecting**: No tracking, ads or data collection
 - **Lightweight**: Battery- and space-efficient
 - **Simple**: Polished, user-focused interface
+- **Cross-platform**: Available for Android, iOS, MacOS, and Linux.
 - **Community-built**: Free, open source, and collaborative
 - **Transparent**: Open finances and governance

@@ -140,7 +139,7 @@ There is a dedicated [Zulip](https://codeberg.org/comaps/Governance/src/branch/m

 ## 💸 Funding

-CoMaps is free. To stay that way, it relies on your support.  
+CoMaps is free. To fund development, we rely on your voluntary support ♥️
 Donate via [OpenCollective](https://opencollective.com/comaps/donate) or [Liberapay](https://liberapay.com/CoMaps).  
 The project's financial information is completely open and transparent at [our Open Collective](https://opencollective.com/comaps).

--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -138,8 +138,6 @@ android {
    disable 'MissingTranslation'
    // https://github.com/organicmaps/organicmaps/issues/3551
    disable 'MissingQuantity', 'UnusedQuantity'
-    // https://github.com/organicmaps/organicmaps/issues/3550
-    disable 'ByteOrderMark'
    // https://github.com/organicmaps/organicmaps/issues/1077
    disable 'CustomSplashScreen'
    // https://github.com/organicmaps/organicmaps/issues/3610
--- a/android/app/src/fdroid/java/app/organicmaps/location
+++ b/android/app/src/fdroid/java/app/organicmaps/location
@@ -0,0 +1 @@
+../../../../google/java/app/organicmaps/location
--- a/android/app/src/fdroid/java/app/organicmaps/sdk/location
+++ b/android/app/src/fdroid/java/app/organicmaps/sdk/location
@@ -1 +0,0 @@
-../../../../../google/java/app/organicmaps/sdk/location
--- a/android/app/src/fdroid/play/listings/bn-BD/short-description.txt
+++ b/android/app/src/fdroid/play/listings/bn-BD/short-description.txt
@@ -0,0 +1 @@
+মানচিত্র নেভিগেশন - আপনার যাত্রা সম্পর্কে আরও জানুন - সম্প্রদায় কর্তৃক পরিচালিত
--- a/android/app/src/fdroid/play/listings/bn-BD/title.txt
+++ b/android/app/src/fdroid/play/listings/bn-BD/title.txt
@@ -0,0 +1 @@
+কোম্যাপস - অফলাইনে হাইকিং, সাইকেলিং ও ড্রাইভিং
--- a/android/app/src/fdroid/play/listings/bn/short-description.txt
+++ b/android/app/src/fdroid/play/listings/bn/short-description.txt
@@ -1 +0,0 @@
-সহজ মানচিত্র নেভিগেশন - আপনার যাত্রা সম্পর্কে আরও জানুন - সম্প্রদায় কর্তৃক পরিচালিত
--- a/android/app/src/fdroid/play/listings/bn/title.txt
+++ b/android/app/src/fdroid/play/listings/bn/title.txt
@@ -1 +0,0 @@
-কোম্যাপস - অফলাইনে হাইকিং, সাইকেলিং এবং ড্রাইভিং করুন গোপনীয়তা সহ
--- a/android/app/src/fdroid/play/listings/cs-CZ/release-notes.txt
+++ b/android/app/src/fdroid/play/listings/cs-CZ/release-notes.txt
@@ -1,7 +0,0 @@
-• Data OpenStreetMap k 4. 8.
-• vylepšené barvy mapy pro vodu, lesy, křoviny, různé vybavení, pěší zóny atd.
-• přidány stanice lesní stráže, krytých parkovišť pro jízdní kola, únikových her, úschoven zavazadel, partnerských pošt
-• vylepšeny výškové vrstevnice na 20 m pro některé oblíbené turistické oblasti
-• podpora více zkratek a aliasů pro vyhledávání
-• přidání ikon pro vyhledávání a záložky pro rychlé občerstvení, jízdní kola a dobíjecí stanice
-• plynulejší pohyb šipky pro určení polohy
--- a/android/app/src/fdroid/play/listings/de-DE/release-notes.txt
+++ b/android/app/src/fdroid/play/listings/de-DE/release-notes.txt
@@ -1,7 +1,8 @@
-• OpenStreetMap-Daten vom 4. August
-• Verbesserte Farben für Wasser, Wälder, Gestrüpp, verschiedene Einrichtungen, Fussgängerbereiche etc.
-• Besucherstationen, überdachte Fahrradparkplätze, Escaperooms, Gepäckschließfächer, und Postpartner hinzugefügt
-• Konturhöhenlinien aktualisiert, bis zu 20m für beliebte Wanderregionen
-• Unterstützung für mehr Such-Abkürzungen und Synonyme
-• Such- und Lesezeichen-Symbole für Fast Food, Rad- und Lade-Stationen
-• Der Positionspfeil bewegt sich gleichmässiger
+• OpenStreetMap-Daten vom 22. August
+• Neue Geschwindigkeitsanzeige & Details aufgezeichneter Strecken
+• Besserer dunkler Modus, neue farbige Labels 
+• Anzeige wann Orte & Öffnungszeiten überprüft wurden
+• Routenplanung berücksichtigt Stoppschilder, Ampeln & bedingte Einschränkungen.
+• GPS-Peilung wird statt Kompass bevorzugt & höhere GPS-Frequenz.
+• Adressen & Notizen im OSM-Editor unterstützt.
+• Mehr Verbesserungen an UI-Elementen & Kartenstil, alle Details in den Codeberg-Versionshinweisen!
--- a/android/app/src/fdroid/play/listings/en-US/release-notes.txt
+++ b/android/app/src/fdroid/play/listings/en-US/release-notes.txt
@@ -1,7 +1,9 @@
-• OpenStreetMap data as of August 4
-• improve map colors for water, forests, scrubs, various amenities, pedestrian areas etc.
-• add ranger stations, covered bicycle parkings, escape games, luggage lockers, post office partners
-• upgrade altitude contour lines to 20m step for some popular hiking regions
-• support more search abbreviations and aliases
-• add search and bookmark icons for fast food, bicycle and charging stations
-• more smooth position arrow movements
+• OpenStreetMap data as of August 22
+• New current speed indicator, display track info
+• Improved dark map style, added coloured labels
+• Display when places & opening hours were last checked
+• Routing now considers turns, stop signs, lights & conditional restrictions
+• Prefer GPS bearing over compass and increase location poll rate
+• Enable adding standalone addresses & notes in the editor
+• Various UI element & map style improvements
+Check our Codeberg release notes for more changes!
--- a/android/app/src/fdroid/play/listings/es-ES/release-notes.txt
+++ b/android/app/src/fdroid/play/listings/es-ES/release-notes.txt
@@ -1,7 +1,9 @@
-• Datos de OpenStreetMap a fecha 2025.08.04
-• Mejora de colores del mapa para agua, bosques, matorrales, servicios, zonas peatonales, etc.
-• Añadidas estaciones de guardabosques, aparcamientos cubiertos de bicis, juegos de escape, consignas y oficinas de correo
-• Nuevas curvas de nivel (20 m) en regiones populares para senderismo
-• Más abreviaturas y alias de búsqueda
-• Iconos de búsqueda y marcadores para comida rápida, bicicletas y estaciones de recarga
-• Más fluidez de la flecha de posición
+• Datos de OSM a 22-08-2025
+• Nuevo indicador de velocidad e información de pista
+• Modo oscuro mejorado y nombres de POI coloreados
+• Indicador de última revisión de lugares y horarios de apertura
+• Rutas mejoradas teniendo en cuenta giros, señales de STOP, semáforos y restricciones
+• Mayor precisión para determinar tu localización y sentido
+• Añade direcciones y notas con el editor
+• Otras mejoras en elementos de la interfaz y estilo del mapa
+Entra en nuestro Codeberg para más cambios!
--- a/android/app/src/fdroid/play/listings/eu-ES/full-description.txt
+++ b/android/app/src/fdroid/play/listings/eu-ES/full-description.txt
@@ -24,7 +24,7 @@ Sartu komunitatean eta lagundu maparik onena aplikatzen
 • Lineaz kanpoko Wikipedia artikuluak
 • Metroaren garraio geruza eta jarraibideak
 • Arrastoen grabazioa
-• Laster-markak eta ibilbideak esportatu eta inportatu KML, KMZ, GPX formatuetan
+• Markagailuak eta arrastoak esportatu eta inportatu KML, KMZ, GPX formatuetan
 • Gauean erabiltzeko modu iluna
 • Hobetu mapako datuak guztiontzat oinarrizko editore integratua erabiliz

--- a/android/app/src/fdroid/play/listings/fa-IR/title.txt
+++ b/android/app/src/fdroid/play/listings/fa-IR/title.txt
@@ -1 +1 @@
-CoMaps - کوه نوردی، دوچرخه سواری و رانندگی افلاین و خصوصی
+CoMaps - کوه‌نوردی، دوچرخه‌سواری و رانندگی آفلاین
--- a/android/app/src/fdroid/play/listings/fr-FR/release-notes.txt
+++ b/android/app/src/fdroid/play/listings/fr-FR/release-notes.txt
@@ -0,0 +1,9 @@
+• Données OSM du 22 août
+• Nouvel indicateur de vitesse et détails des pistes
+• Amélioration du style sombre, ajout de labels colorées
+• Affichage de la date de dernière vérification d'un lieu
+• Support dans le routage des virages, signalisations et restrictions
+• Amélioration de la boussole et de la précision GPS
+• Support des adresses et des notes dans l'éditeur
+• Diverses améliorations d'UI et du style de la carte
+Plus d'informations sur notre Codeberg
--- a/android/app/src/fdroid/play/listings/hr/title.txt
+++ b/android/app/src/fdroid/play/listings/hr/title.txt
@@ -1 +1 @@
-CoMaps - Pješačite, biciklirajte, vozite Offline i privatno
+CoMaps - Pješačite, biciklirajte, vozite Offline
--- a/android/app/src/fdroid/play/listings/hu-HU/full-description.txt
+++ b/android/app/src/fdroid/play/listings/hu-HU/full-description.txt
@@ -0,0 +1,32 @@
+A CoMaps egy közösség által létrehozott, ingyenes és nyílt forráskódú térképalkalmazás, amely az OpenStreetMap térképadatain alapul, és amelyet az átláthatóság, a magánélet védelme és a nonprofit jelleg iránti elkötelezettség erősít. A CoMaps az Organic Maps villája, amely viszont a Maps.ME villája.
+
+A projekt előzményeiről és az irányáról a <b><i>codeberg.org/comaps</i></b> oldalon olvashatsz.
+Csatlakozz ott a közösséghez, és segíts a legjobb térképalkalmazás elkészítésében.
+• Használd az alkalmazást és terjeszd a hírét
+• Adj visszajelzést és jelentsd a problémákat
+• Frissítsd és javítsd a térképadatokat az alkalmazásban vagy az OpenStreetMap weboldalán.
+
+‣ <b>Offline-fókuszú:</b> Tervezd meg és navigáld külföldi útad mobilszolgáltatás nélkül, keress útpontokat egy távoli túra során stb. Az alkalmazás minden funkcióját úgy terveztük, hogy internetkapcsolat nélkül is működjön.
+‣ <b>A magánélet tiszteletben tartása:</b> Az alkalmazás az adatvédelem szem előtt tartásával készült, nem azonosítja az embereket, nem követi nyomon és nem gyűjt személyes adatokat, és reklámmentes.
+‣ <b>Takarékosdik az akkumulátorral és a tárhellyel:</b> Nem meríti le az akkumulátort, mint más navigációs alkalmazások. A jól összeállítot kis méretű térképek értékes helyet takarítanak meg a telefonon.
+‣ <b>Egyszerű és szép grafikus felület,</b> nagyszerű és könnyen használható funkciók, amelyek egyszerűen működnek.
+‣ <b>Ingyenes és a közösség által készített:</b> A hozzád hasonló emberek segítettek az alkalmazás létrehozásában azáltal, hogy hozzáadtak helyeket az OpenStreetMap térképhez, tesztelték és visszajelzést adtak a funkciókról, valamint hozzájárultak a fejlesztői képességeikkel és a pénzükkel.
+‣ <b>Nyílt és átlátható döntéshozatal és pénzügyek, nonprofit és teljesen nyílt forráskódú.</b>
+
+<b>Főbb jellemzők:</b>
+• Letölthető részletes térképek olyan helyekkel, amelyek sok kereskedelmi térképen nem állnak rendelkezésre.
+• Szabadtéri üzemmód kiemelt túraútvonalakkal, táborhelyekkel, vízforrásokkal, csúcsokkal, szintvonalakkal stb.
+• Sétaútvonalak és kerékpárutak
+• Érdekes pontok, mint például éttermek, benzinkutak, szállodák, üzletek, látnivalók és még sok minden más
+• Keresés név, cím vagy az érdekes pontok kategóriája alapján
+• Navigáció hangutasításokkal gyalogláshoz, kerékpározáshoz vagy vezetéshez
+• Kedvenc helyeid könyvjelzővel láthatod el egyetlen érintéssel
+• Wikipedia szócikkek internetkapcsolat nélkül
+• Metró tranzit réteg és irányok
+• Útvonal mentése
+• Könyvjelzők és nyomvonalak exportálása és importálása KML, KMZ, GPX formátumokban
+• Sötét üzemmód az éjszakai használathoz
+• Térképadatok javítása mindenki számára egy alapvető beépített szerkesztő segítségével
+
+<b>Itt van a szabadság</b>
+Fedezd fel az utadat, navigálj a világban úgy, hogy a magánélet és a közösség kerüljön előtérbe!
--- a/android/app/src/fdroid/play/listings/ia/short-description.txt
+++ b/android/app/src/fdroid/play/listings/ia/short-description.txt
@@ -1 +0,0 @@
-Navigation facile del mappa – Discoperi tu viage – Alimentate per le communitate
--- a/android/app/src/fdroid/play/listings/it-IT/full-description.txt
+++ b/android/app/src/fdroid/play/listings/it-IT/full-description.txt
@@ -1,4 +1,4 @@
-Una app sviluppata dalla comunità, gratuita e open-source, basata su OpenStreetMap e sull'impegno alla trasparenza, al rispetto della Privacy senza scopo di lucro. CoMaps è uno spin-off di Organic Maps, che a sua volta deriva da Maps.ME.
+Una app realizzata dalla community gratuita e open-source, basata su OpenStreetMap e sull'impegno alla trasparenza, al rispetto della Privacy e senza scopo di lucro. CoMaps è uno spin-off di Organic Maps, che a sua volta deriva da Maps.ME.

 Leggi delle ragioni del progetto e della sua direzione futura su <b><i>codeberg.org/comaps</i></b>.
 Unisciti alla nostra comunità e aiutaci a creare la migliore app di mappe.
@@ -15,7 +15,7 @@ Unisciti alla nostra comunità e aiutaci a creare la migliore app di mappe.

 <b>Funzionalità principali</b>:
 • Scarica mappe dettagliate di luoghi che non sono disponibili su Google Maps
-• Modalità Outdoor con percorsi escursionistici, campeggi, sorgenti d'acqua, picchi, dislivelli ed altro evidenziati
+• Modalità Outdoor con percorsi escursionistici, campeggi, sorgenti d'acqua, picchi, dislivelli ed altri punti d'interesse evidenziati
 • Strade pedonali e piste ciclabili
 • Punti d'interesse come ristoranti, stazioni di benzina, hotel, negozi, luoghi turistici e molto altro
 • Cerca per nome, indirizzo o categoria
--- a/android/app/src/fdroid/play/listings/it-IT/release-notes.txt
+++ b/android/app/src/fdroid/play/listings/it-IT/release-notes.txt
@@ -1,7 +0,0 @@
-• Dati di OpenStreetMap aggiornati al 4 Agosto
-• Migliorati i colori per acqua, foreste, servizi etc
-• Aggiunte le stazioni delle guardie forestali, i parcheggi coperti per bici, gli escape games e altri servizi
-• Aggiornato l'intervallo delle isolinee a 20 m per le zone escursionistiche più popolari
-• Aggiunto il supporto per un maggior numero di alias
-• Aggiunte le icone per i fast food, i punti di ricarica e le biciclette
-• Resi più fluidi i movimenti della freccia di posizione
--- a/android/app/src/fdroid/play/listings/it-IT/short-description.txt
+++ b/android/app/src/fdroid/play/listings/it-IT/short-description.txt
@@ -1 +1 @@
-Navigazione semplice - Immergiti nella tua avventura - Sviluppato dalla comunità
+Navigazione semplice - Immergiti nella tua avventura - Realizzato dalla comunità
--- a/android/app/src/fdroid/play/listings/nl-NL/title.txt
+++ b/android/app/src/fdroid/play/listings/nl-NL/title.txt
@@ -1 +1 @@
-CoMaps - Wandel, fiets, rijdt offline met privacy
+CoMaps - Wandel, fiets, rijd offline met privacy
--- a/android/app/src/fdroid/play/listings/no-NO/short-description.txt
+++ b/android/app/src/fdroid/play/listings/no-NO/short-description.txt
@@ -0,0 +1 @@
+Lett kart navigasjon - Opplev mere på din reise - Drevet av felleskapet
--- a/android/app/src/fdroid/play/listings/no-NO/title.txt
+++ b/android/app/src/fdroid/play/listings/no-NO/title.txt
@@ -0,0 +1 @@
+CoMaps - Gå tur, sykkel, kjør - med personvern
--- a/android/app/src/fdroid/play/listings/pt-BR/release-notes.txt
+++ b/android/app/src/fdroid/play/listings/pt-BR/release-notes.txt
@@ -1,7 +1,8 @@
-• Dados OSM de 4/08
-• Melhoria nas cores para água, florestas, matagais, serviços, áreas de pedestres, etc.
-• Adição de guarda-florestais, estacionamentos cobertos para bicicletas, jogos de fuga, armários para bagagem e parceiros postais
-• Melhoria na precisão de curvas de nível para 20 m em algumas regiões populares
-• Suporte a mais abreviações para busca
-• Adição de ícones de pesquisa e favoritos para fast food, bicicletas e estações de recarga
-• Movimentos mais suaves para seta de posição
+• Dados OSM de 22/08
+• Novo indicador de velocidade e tela de informações de trilha
+• Melhor estilo de mapa escuro, rótulos coloridos adicionados
+• Exibição da última atualização de locais e horários de funcionamento
+• O roteamento agora considera conversões, PARE, semáforos, e restrições condicionais
+• Preferência por orientação GPS em vez de bússola e aumento da frequência de localização
+• Editor: adição de endereços e notas independentes
+• Melhorias em elementos da interface e estilo de mapa
--- a/android/app/src/fdroid/play/listings/pt/full-description.txt
+++ b/android/app/src/fdroid/play/listings/pt/full-description.txt
@@ -1,32 +0,0 @@
-Um aplicativo de mapas gratuito e de código aberto, liderado pela comunidade, baseado em dados do OpenStreetMap e reforçado pelo compromisso com a transparência, privacidade e sem fins lucrativos. O CoMaps é um fork/spin-off do Organic Maps, que por sua vez é um fork do Maps.ME.
-
-Leia mais sobre os motivos do projeto e sua direção em <b><i>codeberg.org/comaps</i></b>.
-Junte-se à comunidade e ajude a criar o melhor aplicativo de mapas.
-• Use o aplicativo e divulgue-o.
-• Envie feedback e relate problemas.
-• Atualize os dados do mapa no aplicativo ou no site do OpenStreetMap.
-
-‣ <b>Foco offline</b>: Planeje e navegue em sua viagem ao exterior sem a necessidade de sinal de celular, pesquise pontos de referência durante uma caminhada distante, etc. Todas as funções do aplicativo foram projetadas para funcionar offline.
-‣ <b>Respeitando a privacidade</b>: O aplicativo foi projetado com a privacidade em mente - não identifica pessoas, não rastreia e não coleta informações pessoais. Sem anúncios.
-‣ <b>Simples e sofisticado</b>: recursos essenciais e fáceis de usar que simplesmente funcionam.
-‣ <b>Economiza bateria e espaço</b>: Não consome muita bateria como outros aplicativos de navegação. Mapas compactos economizam espaço precioso no seu celular.
-‣ <b>Gratuito e desenvolvido pela comunidade</b>: Pessoas como você ajudaram a desenvolver o aplicativo adicionando lugares ao OpenStreetMap, testando e dando feedback sobre os recursos e contribuindo com suas habilidades de desenvolvimento e dinheiro.
-‣ <b>Tomada de decisões e finanças abertas e transparentes, sem fins lucrativos e totalmente de código aberto.</b>
-
-<b>Principais recursos</b>:
-• Mapas detalhados para download com locais não disponíveis no Google Maps
-• Modo ao ar livre com trilhas em destaque, acampamentos, fontes de água, picos, curvas de nível, etc.
-• Trilhas para caminhada e ciclovias
-• Pontos de interesse como restaurantes, postos de gasolina, hotéis, lojas, pontos turísticos e muito mais
-• Pesquise por nome, endereço ou por categoria de ponto de interesse
-• Navegação com anúncios de voz para caminhadas, ciclismo ou direção
-• Marque seus lugares favoritos com um único toque
-• Artigos offline da Wikipédia
-• Camada e direções de transporte público do metrô
-• Gravação de trilhas
-• Exporte e importe favoritos e trilhas nos formatos KML, KMZ e GPX
-• Um modo escuro para usar à noite
-• Aprimore os dados do mapa para todos usando um editor básico integrado
-
-<b>A Liberdade Chegou</b>
-Descubra sua jornada, navegue pelo mundo com privacidade e comunidade em primeiro lugar!
--- a/android/app/src/fdroid/play/listings/pt/short-description.txt
+++ b/android/app/src/fdroid/play/listings/pt/short-description.txt
@@ -1 +0,0 @@
-Navegação fácil nos mapas - Descubra mais sobre o seu percurso - Feito por todos
--- a/android/app/src/fdroid/play/listings/pt/title.txt
+++ b/android/app/src/fdroid/play/listings/pt/title.txt
@@ -1 +0,0 @@
-CoMaps - Mapas e Navegação - Offline e Privada
--- a/android/app/src/fdroid/play/listings/ro/title.txt
+++ b/android/app/src/fdroid/play/listings/ro/title.txt
@@ -1 +1 @@
-CoMaps - Drumeții, Ciclism, Condus Offline în confidențialitate
+CoMaps - călătorește offline cu confidențialitate
--- a/android/app/src/fdroid/play/listings/ru-RU/release-notes.txt
+++ b/android/app/src/fdroid/play/listings/ru-RU/release-notes.txt
@@ -1,7 +1,9 @@
-• Карты OpenStreetMap от 4 августа
-• Улучшен цвет воды, леса, кустарников, различных объектов инфраструктуры, пешеходных зон и т.д.
-• Добавлены лесничества, крытые велопарковки, квесты, камеры хранения
-• Для некоторых популярных туристических регионов добавлены линии высот 20м
-• Поддержка дополнительных поисковых сокращений и синонимов
-• Добавлены иконки меток и результатов поиска для фастфуда, велопарковок и зарядных станций
-• Более плавное движение стрелки местоположения
+• Данные 22 августа
+• Новый спидометр,информация о маршруте
+• Улучшен тёмный стиль,цветные метки
+• Время последней проверки часов работы
+• Построении маршрута учитывает повороты, знак «Стоп»,светофоры и ограничения
+• Предпочтение отдается GPS-координатам,а не компасу,увеличена частота опроса местоположения
+• Можно добавлять отдельные адреса и заметки в редакторе
+• Улучшены различные элементы пользовательского интерфейса и стиль карты
+Ознакомьтесь с примечания к релизу про изменения!
--- a/android/app/src/fdroid/play/listings/sr/full-description.txt
+++ b/android/app/src/fdroid/play/listings/sr/full-description.txt
@@ -1,32 +1,32 @@
-Бесплатна апликација отвореног кода коју је обављала заједница и заснива се на ОpenStreetMap-у подацима, усмерени транспарентност, приватност и непрофитни. CoMaps је Апликације за органске карте виљушка, које је пак форк Maps.ME.
+Бесплатна апликација отвореног кода коју одржава заједница, која се заснива на ОpenStreetMap подацима. Непрофитна, транспарентна и цени вашу приватност. CoMaps је настала од апликације Organic Maps,  које је настала од апликације Maps.ME.

 Прочитајте о разлозима пројекта и његовог правца на <b><i>codeberg.org/comaps</i></b>
 Придружите се отвореној заједници и помозите да направимо најбољу апликацију за мапе
 • Користите апликацију и проширите глас о томе
 • Дајте повратне информације и пријавите проблеме
-• Ажурирајте податке на мапи у апликацији или на веб локацији OpenStreetMap
+• Ажурирајте податке на мапи у апликацији или на сајту OpenStreetMap

-‣ <b> фокусирано на офлајн Вар </b>: Планирајте и управљајте путовањем у иностранству без потребе за мобилним услугама, тражите путне тачке док је на даљинском покрету, итд. Све апликације су дизајниране за рад ван мреже.
-‣ <b> Поштовање приватности </b>: Апликација је осмишљена задржавања у уму приватност - не идентификује људе, не прати или прикупља личне податке. Нема реклама.
-‣ <b> Једноставно и елегантно </b>: Апликација је тривијална за употребу и једноставно функционише.
-‣ <b> Чува вашу батерију и простор </b>: не конзумира батерију као остале навигационе апликације. Компактне картице сачувајте драгоцени простор на вашем телефону.
-‣ <b> Отворено и направио је заједницу </b>: Људи попут вас је помогли да додају апликацију додавањем локација на OpenStreetMap-у, тестирању и давање повратних информација о апликацији и доприносе вашим развојним вештинама и новцу.
-‣ <b> Отворено и транспарентно доношење одлука и употреба финансија, непрофитна и потпуно отворена извора. </b>
+‣ <b>Фокусирано на офлајн рад</b>: Планирајте и управљајте путовањем у иностранству без потребе за мобилним интернетом, тражите успутне тачке док сте на забаченом планинском путу, итд. Све функционалности су дизајниране за рад без интернета.
+‣ <b>Поштовање приватности</b>: Апликација је осмишљена са приватношћу корисника на уму - не идентификује људе, не прати или прикупља личне податке. Нема реклама.
+‣ <b>Једноставно и елегантно</b>: Апликација је лака за употребу и једноставно функционише.
+‣ <b>Чува вашу батерију и простор</b>: Не троши батерију као остале апликације за навигацију. Компактне мапе чувају драгоцени простор на вашем телефону.
+‣ <b>Отворено и направљено од стране заједнице</b>: Људи попут вас су допринели развоју апликације додавањем локација на OpenStreetMap, тестирањем, давањем повратних информација о апликацији и помогли су својим програмерским вештинама  и донацијама.
+‣ <b>Отворено и транспарентно доношење одлука и употреба донација, непрофитна и потпуно отвореног кода.</b>

 <b> Главне карактеристике </b>:
-• Преузмите детаљне мапе са локацијама које нису доступне са Гоогле мапама
-• Улазнице за излете са истакнутим планинарским стазама, камповима, изворима воде, планинске врхове, контурне линије итд.
+• Преузмимање детаљне мапе са локацијама које нису доступне са Google мапама
+• Режим за излете са истакнутим планинарским стазама, камповима, изворима воде, планинским врховима, изохипсама итд.
 • Стазе за планинарење и бицикле
-• Тачке интереса као што су ресторани, бензинске пумпе, хотели, продавнице, погледа и још много тога
-• Претражите име или адресу или по категоријама камате
-• навигација са гласовним најавама за ходање, бициклизам или аутомобил
-• Означите своја омиљена места једним додиром
+• Тачке интереса као што су ресторани, бензинске пумпе, хотели, продавнице, знаменитости и још много тога
+• Претрага по називу, адреси или категоријама
+• Навигација са гласовним инструкцијама за ходање, вожњу бицикла или аутомобила
+• Означивање омиљених места једним додиром
 • Офлајн чланци Википедије
-• транзитни слој подземне пруге са навигацијом
-• Снимање ГПС трагова
-• Ознака и увоз и увоз у KML, KMZ, GPX формате
+• Транзитни слој подземне железнице са навигацијом
+• Снимање ГПС путања
+• Увоз и увоз маркера и путања у KML, KMZ, GPX формате
 • Тамни режим за употребу током ноћи
-• Побољшајте карту за све кориснике, користећи основни уредни уредник мапе
+• Побољшајте карту за све кориснике, користећи основни едитор за мапе

 <b> Слобода је овде </b>
-Откријте своје путовање, крећете се са свијетом са приватношћу и заједницом на првом месту!
+Откријте своје путовање, крећете се са светом са приватношћу и заједницом на првом месту!
--- a/android/app/src/fdroid/play/listings/sr/release-notes.txt
+++ b/android/app/src/fdroid/play/listings/sr/release-notes.txt
@@ -1,7 +0,0 @@
-• подаци из OpenStreetMap-а од 4. августа
-• побољшане боје на мапи за воду, шуме, жбуње, разне објекте, пешачке зоне итд.
-• додате станице ренџера, наткривена паркинг места за бицикле, escape room-ови, ормарићи за пртљаг
-• унапређене изохипсе на кораке од 20 м за популарне планинарске регионе
-• подршка за више скраћеница и алтернативних назива у претрази
-• додате иконе за претрагу и обележавање за брзу храну, бицикле и станице за пуњење
-• равномерније кретање стрелице која приказује позицију
--- a/android/app/src/google/java/app/organicmaps/sdk/location/GoogleFusedLocationProvider.java
+++ b/android/app/src/google/java/app/organicmaps/sdk/location/GoogleFusedLocationProvider.java
@@ -1,4 +1,4 @@
-package app.organicmaps.sdk.location;
+package app.organicmaps.location;

 import static android.Manifest.permission.ACCESS_COARSE_LOCATION;
 import static android.Manifest.permission.ACCESS_FINE_LOCATION;
@@ -10,6 +10,7 @@ import android.location.Location;
 import android.os.Looper;
 import androidx.annotation.NonNull;
 import androidx.annotation.RequiresPermission;
+import app.organicmaps.sdk.location.BaseLocationProvider;
 import app.organicmaps.sdk.util.LocationUtils;
 import app.organicmaps.sdk.util.log.Logger;
 import com.google.android.gms.common.api.ApiException;
--- a/android/app/src/google/java/app/organicmaps/location/LocationProviderFactoryImpl.java
+++ b/android/app/src/google/java/app/organicmaps/location/LocationProviderFactoryImpl.java
@@ -1,23 +1,25 @@
-package app.organicmaps.sdk.location;
+package app.organicmaps.location;

 import android.content.Context;
 import androidx.annotation.NonNull;
+import app.organicmaps.sdk.location.AndroidNativeProvider;
+import app.organicmaps.sdk.location.BaseLocationProvider;
+import app.organicmaps.sdk.location.LocationProviderFactory;
 import app.organicmaps.sdk.util.Config;
 import app.organicmaps.sdk.util.log.Logger;
 import com.google.android.gms.common.ConnectionResult;
 import com.google.android.gms.common.GoogleApiAvailability;

-public class LocationProviderFactory
+public class LocationProviderFactoryImpl implements LocationProviderFactory
 {
-  private static final String TAG = LocationProviderFactory.class.getSimpleName();
+  private static final String TAG = LocationProviderFactoryImpl.class.getSimpleName();

-  public static boolean isGoogleLocationAvailable(@NonNull Context context)
+  public boolean isGoogleLocationAvailable(@NonNull Context context)
  {
    return GoogleApiAvailability.getInstance().isGooglePlayServicesAvailable(context) == ConnectionResult.SUCCESS;
  }

-  public static BaseLocationProvider getProvider(@NonNull Context context,
-                                                 @NonNull BaseLocationProvider.Listener listener)
+  public BaseLocationProvider getProvider(@NonNull Context context, @NonNull BaseLocationProvider.Listener listener)
  {
    if (isGoogleLocationAvailable(context) && Config.useGoogleServices())
    {
--- a/android/app/src/huawei/java/app/organicmaps/location
+++ b/android/app/src/huawei/java/app/organicmaps/location
@@ -0,0 +1 @@
+../../../../google/java/app/organicmaps/location
--- a/android/app/src/huawei/java/app/organicmaps/sdk/location
+++ b/android/app/src/huawei/java/app/organicmaps/sdk/location
@@ -1 +0,0 @@
-../../../../../google/java/app/organicmaps/sdk/location
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@@ -6,7 +6,7 @@

  <!-- Requiring "android.hardware.touchscreen" here breaks DeX mode -->
  <uses-feature
-      android:glEsVersion="0x00020000"
+      android:glEsVersion="0x00030000"
      android:required="true"/>
  <uses-feature
      android:name="android.hardware.wifi"
--- a/android/app/src/main/java/app/organicmaps/ChartController.java
+++ b/android/app/src/main/java/app/organicmaps/ChartController.java
@@ -10,6 +10,8 @@ import androidx.core.content.ContextCompat;
 import app.organicmaps.sdk.Framework;
 import app.organicmaps.sdk.bookmarks.data.BookmarkManager;
 import app.organicmaps.sdk.bookmarks.data.ElevationInfo;
+import app.organicmaps.sdk.bookmarks.data.Track;
+import app.organicmaps.sdk.bookmarks.data.TrackStatistics;
 import app.organicmaps.util.ThemeUtils;
 import app.organicmaps.util.Utils;
 import app.organicmaps.widget.placepage.AxisValueFormatter;
@@ -31,17 +33,16 @@ import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;

-public class ChartController implements OnChartValueSelectedListener,
-                                        BookmarkManager.OnElevationActivePointChangedListener,
-                                        BookmarkManager.OnElevationCurrentPositionChangedListener
+public class ChartController implements OnChartValueSelectedListener
 {
  private static final int CHART_Y_LABEL_COUNT = 3;
  private static final int CHART_X_LABEL_COUNT = 6;
-  private static final int CHART_ANIMATION_DURATION = 1500;
+  private static final int CHART_ANIMATION_DURATION = 0;
  private static final int CHART_FILL_ALPHA = (int) (0.12 * 255);
  private static final int CHART_AXIS_GRANULARITY = 100;
  private static final float CUBIC_INTENSITY = 0.2f;
  private static final int CURRENT_POSITION_OUT_OF_TRACK = -1;
+  private static final String ELEVATION_PROFILE_POINTS = "ELEVATION_PROFILE_POINTS";

  @SuppressWarnings("NullableProblems")
  @NonNull
@@ -62,6 +63,7 @@ public class ChartController implements OnChartValueSelectedListener,
  private final Context mContext;
  private long mTrackId = Utils.INVALID_ID;
  private boolean mCurrentPositionOutOfTrack = true;
+  private boolean mInformSelectedActivePointToCore = true;

  public ChartController(@NonNull Context context)
  {
@@ -70,8 +72,6 @@ public class ChartController implements OnChartValueSelectedListener,

  public void initialize(@NonNull View view)
  {
-    BookmarkManager.INSTANCE.setElevationActivePointChangedListener(this);
-    BookmarkManager.INSTANCE.setElevationCurrentPositionChangedListener(this);
    final Resources resources = mContext.getResources();
    mChart = view.findViewById(R.id.elevation_profile_chart);

@@ -101,13 +101,6 @@ public class ChartController implements OnChartValueSelectedListener,
    initAxises();
  }

-  @SuppressWarnings("unused")
-  public void destroy()
-  {
-    BookmarkManager.INSTANCE.setElevationActivePointChangedListener(null);
-    BookmarkManager.INSTANCE.setElevationCurrentPositionChangedListener(null);
-  }
-
  private void highlightChartCurrentLocation()
  {
    mChart.highlightValues(Collections.singletonList(getCurrentPosHighlight()),
@@ -142,15 +135,17 @@ public class ChartController implements OnChartValueSelectedListener,
    mChart.getAxisRight().setEnabled(false);
  }

-  public void setData(@NonNull ElevationInfo info)
+  public void setData(Track track)
  {
-    mTrackId = info.getId();
+    mTrackId = track.getTrackId();
+    ElevationInfo info = track.getElevationInfo();
+    TrackStatistics stats = track.getTrackStatistics();
    List<Entry> values = new ArrayList<>();

    for (ElevationInfo.Point point : info.getPoints())
-      values.add(new Entry((float) point.getDistance(), point.getAltitude()));
+      values.add(new Entry((float) point.getDistance(), point.getAltitude(), point));

-    LineDataSet set = new LineDataSet(values, "Elevation_profile_points");
+    LineDataSet set = new LineDataSet(values, ELEVATION_PROFILE_POINTS);
    set.setMode(LineDataSet.Mode.CUBIC_BEZIER);
    set.setCubicIntensity(CUBIC_INTENSITY);
    set.setDrawFilled(true);
@@ -173,8 +168,8 @@ public class ChartController implements OnChartValueSelectedListener,
    mChart.setData(data);
    mChart.animateX(CHART_ANIMATION_DURATION);

-    mMinAltitude.setText(Framework.nativeFormatAltitude(info.getMinAltitude()));
-    mMaxAltitude.setText(Framework.nativeFormatAltitude(info.getMaxAltitude()));
+    mMinAltitude.setText(Framework.nativeFormatAltitude(stats.getMinElevation()));
+    mMaxAltitude.setText(Framework.nativeFormatAltitude(stats.getMaxElevation()));

    highlightActivePointManually();
  }
@@ -192,7 +187,9 @@ public class ChartController implements OnChartValueSelectedListener,
    if (mTrackId == Utils.INVALID_ID)
      return;

-    BookmarkManager.INSTANCE.setElevationActivePoint(mTrackId, e.getX());
+    if (mInformSelectedActivePointToCore)
+      BookmarkManager.INSTANCE.setElevationActivePoint(mTrackId, e.getX(), (ElevationInfo.Point) e.getData());
+    mInformSelectedActivePointToCore = true;
  }

  @NonNull
@@ -211,7 +208,6 @@ public class ChartController implements OnChartValueSelectedListener,
    highlightChartCurrentLocation();
  }

-  @Override
  public void onCurrentPositionChanged()
  {
    if (mTrackId == Utils.INVALID_ID)
@@ -222,7 +218,6 @@ public class ChartController implements OnChartValueSelectedListener,
    highlightActivePointManually();
  }

-  @Override
  public void onElevationActivePointChanged()
  {
    if (mTrackId == Utils.INVALID_ID)
@@ -234,6 +229,7 @@ public class ChartController implements OnChartValueSelectedListener,
  private void highlightActivePointManually()
  {
    Highlight highlight = getActivePoint();
+    mInformSelectedActivePointToCore = false;
    mChart.highlightValue(highlight, true);
  }

--- a/android/app/src/main/java/app/organicmaps/DownloadResourcesLegacyActivity.java
+++ b/android/app/src/main/java/app/organicmaps/DownloadResourcesLegacyActivity.java
@@ -27,6 +27,7 @@ import androidx.annotation.StringRes;
 import androidx.annotation.StyleRes;
 import androidx.core.view.ViewCompat;
 import app.organicmaps.base.BaseMwmFragmentActivity;
+import app.organicmaps.downloader.MapManagerHelper;
 import app.organicmaps.intent.Factory;
 import app.organicmaps.sdk.Framework;
 import app.organicmaps.sdk.downloader.CountryItem;
@@ -35,7 +36,7 @@ import app.organicmaps.sdk.location.LocationListener;
 import app.organicmaps.sdk.util.Config;
 import app.organicmaps.sdk.util.ConnectionState;
 import app.organicmaps.sdk.util.StringUtils;
-import app.organicmaps.sdk.util.UiUtils;
+import app.organicmaps.util.UiUtils;
 import app.organicmaps.util.Utils;
 import app.organicmaps.util.WindowInsetUtils.PaddingInsetsListener;
 import com.google.android.material.button.MaterialButton;
@@ -116,10 +117,10 @@ public class DownloadResourcesLegacyActivity extends BaseMwmFragmentActivity
  private final app.organicmaps.sdk.DownloadResourcesLegacyActivity.Listener mResourcesDownloadListener =
      new app.organicmaps.sdk.DownloadResourcesLegacyActivity.Listener() {
        @Override
-        public void onProgress(final int percent)
+        public void onProgress(final int bytesDownloaded)
        {
          if (!isFinishing())
-            mProgress.setProgressCompat(percent, true);
+            mProgress.setProgressCompat(bytesDownloaded, true);
        }

        @Override
@@ -156,7 +157,7 @@ public class DownloadResourcesLegacyActivity extends BaseMwmFragmentActivity
          return;

        case CountryItem.STATUS_FAILED:
-            MapManager.showError(DownloadResourcesLegacyActivity.this, item, null);
+          MapManagerHelper.showError(DownloadResourcesLegacyActivity.this, item, null);
          return;
        }
      }
@@ -252,7 +253,8 @@ public class DownloadResourcesLegacyActivity extends BaseMwmFragmentActivity
      setDownloadMessage(bytes);

      mProgress.setMax(bytes);
-      mProgress.setProgressCompat(0, true);
+      // Start progress at 1% according to M3 guidelines
+      mProgress.setProgressCompat(bytes/100, true);
    }
    else
      finishFilesDownload(bytes);
@@ -370,10 +372,11 @@ public class DownloadResourcesLegacyActivity extends BaseMwmFragmentActivity
        String fileSizeString = StringUtils.getFileSizeString(this, item.totalSize);
        mTvMessage.setText(getString(R.string.downloading_country_can_proceed, item.name, fileSizeString));
        mProgress.setMax((int) item.totalSize);
-        mProgress.setProgressCompat(0, true);
+        // Start progress at 1% according to M3 guidelines
+        mProgress.setProgressCompat((int) (item.totalSize/100), true);

        mCountryDownloadListenerSlot = MapManager.nativeSubscribe(mCountryDownloadListener);
-        MapManager.startDownload(mCurrentCountry);
+        MapManagerHelper.startDownload(mCurrentCountry);
        setAction(PROCEED_TO_MAP);
      }
      else
--- a/android/app/src/main/java/app/organicmaps/MapFragment.java
+++ b/android/app/src/main/java/app/organicmaps/MapFragment.java
@@ -23,6 +23,8 @@ 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)
@@ -84,6 +86,8 @@ public class MapFragment extends BaseMwmFragment implements View.OnTouchListener
  {
    Logger.d(TAG);
    super.onAttach(context);
+
+    mMap.setLocationHelper(MwmApplication.from(requireContext()).getLocationHelper());
    mMap.setMapRenderingListener((MapRenderingListener) context);
    mMap.setCallbackUnsupported(this::reportUnsupported);
  }
--- a/android/app/src/main/java/app/organicmaps/MwmActivity.java
+++ b/android/app/src/main/java/app/organicmaps/MwmActivity.java
@@ -12,13 +12,13 @@ import static app.organicmaps.sdk.location.LocationState.FOLLOW;
 import static app.organicmaps.sdk.location.LocationState.FOLLOW_AND_ROTATE;
 import static app.organicmaps.sdk.location.LocationState.LOCATION_TAG;
 import static app.organicmaps.sdk.util.PowerManagment.POWER_MANAGEMENT_TAG;
+import static app.organicmaps.sdk.util.Utils.dimen;

 import android.annotation.SuppressLint;
 import android.app.Activity;
 import android.app.Dialog;
 import android.app.PendingIntent;
 import android.content.Context;
-import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.res.ColorStateList;
 import android.content.res.Configuration;
@@ -28,7 +28,6 @@ import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
 import android.text.TextUtils;
-import android.text.method.LinkMovementMethod;
 import android.view.KeyEvent;
 import android.view.MotionEvent;
 import android.view.View;
@@ -66,7 +65,6 @@ import app.organicmaps.downloader.OnmapDownloader;
 import app.organicmaps.editor.EditorActivity;
 import app.organicmaps.editor.EditorHostFragment;
 import app.organicmaps.editor.FeatureCategoryActivity;
-import app.organicmaps.editor.OsmLoginActivity;
 import app.organicmaps.editor.ReportFragment;
 import app.organicmaps.help.HelpActivity;
 import app.organicmaps.intent.Factory;
@@ -82,7 +80,6 @@ import app.organicmaps.routing.ManageRouteBottomSheet;
 import app.organicmaps.routing.NavigationController;
 import app.organicmaps.routing.NavigationService;
 import app.organicmaps.routing.RoutingBottomMenuListener;
-import app.organicmaps.routing.RoutingController;
 import app.organicmaps.routing.RoutingErrorDialogFragment;
 import app.organicmaps.routing.RoutingPlanFragment;
 import app.organicmaps.routing.RoutingPlanInplaceController;
@@ -100,7 +97,6 @@ import app.organicmaps.sdk.display.DisplayType;
 import app.organicmaps.sdk.downloader.MapManager;
 import app.organicmaps.sdk.downloader.UpdateInfo;
 import app.organicmaps.sdk.editor.Editor;
-import app.organicmaps.sdk.editor.OsmOAuth;
 import app.organicmaps.sdk.location.LocationHelper;
 import app.organicmaps.sdk.location.LocationListener;
 import app.organicmaps.sdk.location.LocationState;
@@ -108,6 +104,7 @@ import app.organicmaps.sdk.location.SensorListener;
 import app.organicmaps.sdk.location.TrackRecorder;
 import app.organicmaps.sdk.maplayer.isolines.IsolinesState;
 import app.organicmaps.sdk.routing.RouteMarkType;
+import app.organicmaps.sdk.routing.RoutingController;
 import app.organicmaps.sdk.routing.RoutingOptions;
 import app.organicmaps.sdk.search.SearchEngine;
 import app.organicmaps.sdk.settings.RoadType;
@@ -115,8 +112,6 @@ import app.organicmaps.sdk.settings.UnitLocale;
 import app.organicmaps.sdk.util.Config;
 import app.organicmaps.sdk.util.LocationUtils;
 import app.organicmaps.sdk.util.PowerManagment;
-import app.organicmaps.sdk.util.ThemeSwitcher;
-import app.organicmaps.sdk.util.UiUtils;
 import app.organicmaps.sdk.util.log.Logger;
 import app.organicmaps.sdk.widget.placepage.PlacePageData;
 import app.organicmaps.search.FloatingSearchToolbarController;
@@ -125,7 +120,9 @@ import app.organicmaps.search.SearchFragment;
 import app.organicmaps.settings.DrivingOptionsActivity;
 import app.organicmaps.settings.SettingsActivity;
 import app.organicmaps.util.SharingUtils;
+import app.organicmaps.util.ThemeSwitcher;
 import app.organicmaps.util.ThemeUtils;
+import app.organicmaps.util.UiUtils;
 import app.organicmaps.util.Utils;
 import app.organicmaps.util.bottomsheet.MenuBottomSheetFragment;
 import app.organicmaps.util.bottomsheet.MenuBottomSheetItem;
@@ -290,7 +287,6 @@ public class MwmActivity extends BaseMwmFragmentActivity
    }

    processIntent();
-    migrateOAuthCredentials();
  }

  /**
@@ -345,36 +341,6 @@ public class MwmActivity extends BaseMwmFragmentActivity
    }
  }

-  private void migrateOAuthCredentials()
-  {
-    if (OsmOAuth.containsOAuth1Credentials())
-    {
-      // Remove old OAuth v1 secrets
-      OsmOAuth.clearOAuth1Credentials();
-
-      // Notify user to re-login
-      dismissAlertDialog();
-      final DialogInterface.OnClickListener navigateToLoginHandler =
-          (dialog, which) -> startActivity(new Intent(MwmActivity.this, OsmLoginActivity.class));
-
-      final int marginBase = getResources().getDimensionPixelSize(R.dimen.margin_base);
-      final float textSize = getResources().getDimension(R.dimen.line_spacing_extra_1);
-      final TextView text = new TextView(this);
-      text.setText(getText(R.string.alert_reauth_message));
-      text.setPadding(marginBase, marginBase, marginBase, marginBase);
-      text.setTextSize(textSize);
-      text.setMovementMethod(LinkMovementMethod.getInstance());
-
-      mAlertDialog = new MaterialAlertDialogBuilder(this, R.style.MwmTheme_AlertDialog)
-                         .setTitle(R.string.login_osm)
-                         .setView(text)
-                         .setPositiveButton(R.string.login, navigateToLoginHandler)
-                         .setNegativeButton(R.string.cancel, null)
-                         .setOnDismissListener(dialog -> mAlertDialog = null)
-                         .show();
-    }
-  }
-
  private static void checkMeasurementSystem()
  {
    UnitLocale.initializeCurrentUnits();
@@ -492,12 +458,10 @@ public class MwmActivity extends BaseMwmFragmentActivity
  @StyleRes
  protected int getThemeResourceId(@NonNull String theme)
  {
-    Context context = getApplicationContext();
-
-    if (ThemeUtils.isDefaultTheme(context, theme))
+    if (Config.UiTheme.isDefault(theme))
      return R.style.MwmTheme_MainActivity;

-    if (ThemeUtils.isNightTheme(context, theme))
+    if (Config.UiTheme.isNight(theme))
      return R.style.MwmTheme_Night_MainActivity;

    return super.getThemeResourceId(theme);
@@ -619,7 +583,7 @@ public class MwmActivity extends BaseMwmFragmentActivity

  private void refreshLightStatusBar()
  {
-    UiUtils.setLightStatusBar(this, !(ThemeUtils.isNightTheme(this) || RoutingController.get().isPlanning()
+    UiUtils.setLightStatusBar(this, !(ThemeUtils.isNightTheme() || RoutingController.get().isPlanning()
                                      || ChoosePositionMode.get() != ChoosePositionMode.None));
  }

@@ -629,7 +593,7 @@ public class MwmActivity extends BaseMwmFragmentActivity
      UiUtils.setViewInsetsPaddingBottom(mPointChooser, windowInsets);
      UiUtils.setViewInsetsPaddingNoBottom(mPointChooserToolbar, windowInsets);
      final int trackRecorderOffset =
-          TrackRecorder.nativeIsTrackRecordingEnabled() ? UiUtils.dimen(this, R.dimen.map_button_size) : 0;
+          TrackRecorder.nativeIsTrackRecordingEnabled() ? dimen(this, R.dimen.map_button_size) : 0;
      mNavBarHeight = isFullscreen() ? 0 : windowInsets.getInsets(WindowInsetsCompat.Type.systemBars()).bottom;
      // For the first loading, set compass top margin to status bar size
      // The top inset will be then be updated by the routing controller
@@ -1223,22 +1187,23 @@ public class MwmActivity extends BaseMwmFragmentActivity

  private void onIsolinesStateChanged(@NonNull IsolinesState type)
  {
-    if (type != IsolinesState.EXPIREDDATA)
+    if (type == IsolinesState.NODATA)
    {
-      type.activate(this, findViewById(R.id.coordinator), findViewById(R.id.menu_frame));
-      return;
+      Toast.makeText(this, R.string.isolines_location_error_dialog, Toast.LENGTH_SHORT).show();
    }

-    dismissAlertDialog();
+    if (type == IsolinesState.EXPIREDDATA)
+    {
      mAlertDialog = new MaterialAlertDialogBuilder(this, R.style.MwmTheme_AlertDialog)
                         .setTitle(R.string.downloader_update_maps)
                         .setMessage(R.string.isolines_activation_error_dialog)
-                       .setPositiveButton(R.string.ok,
-                                          (dialog, which) -> startActivity(new Intent(this, DownloaderActivity.class)))
+                         .setPositiveButton(
+                             R.string.ok, (dialog, which) -> startActivity(new Intent(this, DownloaderActivity.class)))
                         .setNegativeButton(R.string.cancel, null)
                         .setOnDismissListener(dialog -> mAlertDialog = null)
                         .show();
    }
+  }

  @Override
  protected void onNewIntent(Intent intent)
@@ -1682,17 +1647,17 @@ public class MwmActivity extends BaseMwmFragmentActivity
    final int orientation = getResources().getConfiguration().orientation;
    final boolean isTrackRecordingEnabled = TrackRecorder.nativeIsTrackRecordingEnabled();
    if (isTrackRecordingEnabled && (orientation != Configuration.ORIENTATION_LANDSCAPE))
-      offsetY += UiUtils.dimen(this, R.dimen.map_button_size);
+      offsetY += dimen(this, R.dimen.map_button_size);
    if (orientation == Configuration.ORIENTATION_LANDSCAPE)
    {
      if (show)
      {
-        final boolean isSmallScreen = UiUtils.getDisplayTotalHeight(this) < UiUtils.dimen(this, R.dimen.dp_400);
+        final boolean isSmallScreen = UiUtils.getDisplayTotalHeight(this) < dimen(this, R.dimen.dp_400);
        if (!isSmallScreen || TrackRecorder.nativeIsTrackRecordingEnabled())
-          offsetX += UiUtils.dimen(this, R.dimen.map_button_size);
+          offsetX += dimen(this, R.dimen.map_button_size);
      }
      else if (isTrackRecordingEnabled)
-        offsetY += UiUtils.dimen(this, R.dimen.map_button_size);
+        offsetY += dimen(this, R.dimen.map_button_size);
    }
    updateCompassOffset(offsetY, offsetX);
  }
@@ -2491,7 +2456,7 @@ public class MwmActivity extends BaseMwmFragmentActivity
    if (mCurrentWindowInsets != null)
    {
      final int offset = mCurrentWindowInsets.getInsets(WindowInsetsCompat.Type.systemBars()).top;
-      updateCompassOffset(offset + UiUtils.dimen(this, R.dimen.map_button_size));
+      updateCompassOffset(offset + dimen(this, R.dimen.map_button_size));
    }
    Toast.makeText(this, R.string.track_recording, Toast.LENGTH_SHORT).show();
    TrackRecordingService.startForegroundService(getApplicationContext());
@@ -2584,7 +2549,7 @@ public class MwmActivity extends BaseMwmFragmentActivity
      items.add(new MenuBottomSheetItem(R.string.download_maps, R.drawable.ic_download, getDownloadMapsCounter(),
                                        this::onDownloadMapsOptionSelected));

-      mDonatesUrl = Config.getDonateUrl(getApplicationContext());
+      mDonatesUrl = Utils.getDonateUrl(getApplicationContext());
      if (!mDonatesUrl.isEmpty())
        items.add(new MenuBottomSheetItem(R.string.donate, R.drawable.ic_donate, this::onDonateOptionSelected));

--- a/android/app/src/main/java/app/organicmaps/MwmApplication.java
+++ b/android/app/src/main/java/app/organicmaps/MwmApplication.java
@@ -14,11 +14,12 @@ import androidx.lifecycle.DefaultLifecycleObserver;
 import androidx.lifecycle.LifecycleObserver;
 import androidx.lifecycle.LifecycleOwner;
 import androidx.lifecycle.ProcessLifecycleOwner;
+import androidx.preference.PreferenceManager;
 import app.organicmaps.background.OsmUploadWork;
 import app.organicmaps.downloader.DownloaderNotifier;
+import app.organicmaps.location.LocationProviderFactoryImpl;
 import app.organicmaps.location.TrackRecordingService;
 import app.organicmaps.routing.NavigationService;
-import app.organicmaps.routing.RoutingController;
 import app.organicmaps.sdk.Map;
 import app.organicmaps.sdk.OrganicMaps;
 import app.organicmaps.sdk.display.DisplayManager;
@@ -28,9 +29,11 @@ import app.organicmaps.sdk.location.SensorHelper;
 import app.organicmaps.sdk.location.TrackRecorder;
 import app.organicmaps.sdk.maplayer.isolines.IsolinesManager;
 import app.organicmaps.sdk.maplayer.subway.SubwayManager;
+import app.organicmaps.sdk.routing.RoutingController;
 import app.organicmaps.sdk.util.Config;
 import app.organicmaps.sdk.util.ConnectionState;
 import app.organicmaps.sdk.util.log.Logger;
+import app.organicmaps.util.ThemeSwitcher;
 import app.organicmaps.util.Utils;
 import java.io.IOException;
 import java.lang.ref.WeakReference;
@@ -40,6 +43,9 @@ public class MwmApplication extends Application implements Application.ActivityL
  @NonNull
  private static final String TAG = MwmApplication.class.getSimpleName();

+  @NonNull
+  private final LocationProviderFactoryImpl mLocationProviderFactory = new LocationProviderFactoryImpl();
+
  @SuppressWarnings("NotNullFieldNotInitialized")
  @NonNull
  private OrganicMaps mOrganicMaps;
@@ -98,6 +104,12 @@ public class MwmApplication extends Application implements Application.ActivityL
    return mOrganicMaps;
  }

+  @NonNull
+  public LocationProviderFactoryImpl getLocationProviderFactory()
+  {
+    return mLocationProviderFactory;
+  }
+
  @NonNull
  public static MwmApplication from(@NonNull Context context)
  {
@@ -118,7 +130,10 @@ public class MwmApplication extends Application implements Application.ActivityL

    sInstance = this;

-    mOrganicMaps = new OrganicMaps(getApplicationContext());
+    PreferenceManager.setDefaultValues(this, R.xml.prefs_main, false);
+    mOrganicMaps = new OrganicMaps(getApplicationContext(), BuildConfig.FLAVOR, BuildConfig.APPLICATION_ID,
+                                   BuildConfig.VERSION_CODE, BuildConfig.VERSION_NAME,
+                                   BuildConfig.FILE_PROVIDER_AUTHORITY, mLocationProviderFactory);

    ConnectionState.INSTANCE.initialize(this);

@@ -133,6 +148,8 @@ public class MwmApplication extends Application implements Application.ActivityL
  public boolean initOrganicMaps(@NonNull Runnable onComplete) throws IOException
  {
    return mOrganicMaps.init(() -> {
+      ThemeSwitcher.INSTANCE.initialize(this);
+      ThemeSwitcher.INSTANCE.restart(false);
      ProcessLifecycleOwner.get().getLifecycle().addObserver(mProcessLifecycleObserver);
      onComplete.run();
    });
--- a/android/app/src/main/java/app/organicmaps/PanelAnimator.java
+++ b/android/app/src/main/java/app/organicmaps/PanelAnimator.java
@@ -9,7 +9,8 @@ import androidx.annotation.IntegerRes;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.fragment.app.Fragment;
-import app.organicmaps.sdk.util.UiUtils;
+import app.organicmaps.sdk.util.Utils;
+import app.organicmaps.util.UiUtils;
 import org.chromium.base.ObserverList;

 class PanelAnimator
@@ -26,7 +27,7 @@ class PanelAnimator
  PanelAnimator(MwmActivity activity)
  {
    mActivity = activity;
-    mWidth = UiUtils.dimen(activity.getApplicationContext(), R.dimen.panel_width);
+    mWidth = Utils.dimen(activity.getApplicationContext(), R.dimen.panel_width);
    mPanel = mActivity.findViewById(R.id.fragment_container);
    mDuration = mActivity.getResources().getInteger(R.integer.anim_panel);
  }
--- a/android/app/src/main/java/app/organicmaps/SplashActivity.java
+++ b/android/app/src/main/java/app/organicmaps/SplashActivity.java
@@ -60,11 +60,10 @@ public class SplashActivity extends AppCompatActivity
  {
    super.onCreate(savedInstanceState);

-    final Context context = getApplicationContext();
-    final String theme = Config.getCurrentUiTheme(context);
-    if (ThemeUtils.isDefaultTheme(context, theme))
+    final String theme = Config.UiTheme.getCurrent();
+    if (Config.UiTheme.isDefault(theme))
      setTheme(R.style.MwmTheme_Splash);
-    else if (ThemeUtils.isNightTheme(context, theme))
+    else if (Config.UiTheme.isNight(theme))
      setTheme(R.style.MwmTheme_Night_Splash);
    else
      throw new IllegalArgumentException("Attempt to apply unsupported theme: " + theme);
--- a/android/app/src/main/java/app/organicmaps/WebContainerDelegate.java
+++ b/android/app/src/main/java/app/organicmaps/WebContainerDelegate.java
@@ -9,7 +9,7 @@ import android.webkit.WebView;
 import android.webkit.WebViewClient;
 import androidx.annotation.NonNull;
 import app.organicmaps.base.OnBackPressListener;
-import app.organicmaps.sdk.util.UiUtils;
+import app.organicmaps.util.UiUtils;

 public abstract class WebContainerDelegate implements OnBackPressListener
 {
--- a/android/app/src/main/java/app/organicmaps/backup/BackupUtils.java
+++ b/android/app/src/main/java/app/organicmaps/backup/BackupUtils.java
@@ -1,6 +1,7 @@
 package app.organicmaps.backup;

 import static app.organicmaps.sdk.util.StorageUtils.isFolderWritable;
+import static app.organicmaps.sdk.util.Utils.dimen;
 import static app.organicmaps.settings.BackupSettingsFragment.MAX_BACKUPS_DEFAULT_COUNT;
 import static app.organicmaps.settings.BackupSettingsFragment.MAX_BACKUPS_KEY;

@@ -15,8 +16,8 @@ import android.text.style.AbsoluteSizeSpan;
 import androidx.annotation.NonNull;
 import androidx.documentfile.provider.DocumentFile;
 import app.organicmaps.R;
-import app.organicmaps.sdk.util.UiUtils;
 import app.organicmaps.sdk.util.log.Logger;
+import app.organicmaps.util.UiUtils;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
@@ -50,14 +51,14 @@ public class BackupUtils

    String volumeName;
    if ("primary".equalsIgnoreCase(volumeId))
-      volumeName = context.getString(R.string.maps_storage_shared);
+      volumeName = context.getString(app.organicmaps.sdk.R.string.maps_storage_shared);
    else
-      volumeName = context.getString(R.string.maps_storage_removable);
+      volumeName = context.getString(app.organicmaps.sdk.R.string.maps_storage_removable);

    SpannableStringBuilder sb = new SpannableStringBuilder();
-    sb.append(volumeName + ": \n", new AbsoluteSizeSpan(UiUtils.dimen(context, R.dimen.text_size_body_3)),
+    sb.append(volumeName + ": \n", new AbsoluteSizeSpan(dimen(context, R.dimen.text_size_body_3)),
              Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
-    sb.append("/" + subPath, new AbsoluteSizeSpan(UiUtils.dimen(context, R.dimen.text_size_body_4)),
+    sb.append("/" + subPath, new AbsoluteSizeSpan(dimen(context, R.dimen.text_size_body_4)),
              Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
    return sb;
  }
--- a/android/app/src/main/java/app/organicmaps/base/BaseMwmDialogFragment.java
+++ b/android/app/src/main/java/app/organicmaps/base/BaseMwmDialogFragment.java
@@ -15,7 +15,7 @@ public class BaseMwmDialogFragment extends DialogFragment
  @StyleRes
  protected final int getFullscreenTheme()
  {
-    return ThemeUtils.isNightTheme(requireContext()) ? getFullscreenDarkTheme() : getFullscreenLightTheme();
+    return ThemeUtils.isNightTheme() ? getFullscreenDarkTheme() : getFullscreenLightTheme();
  }

  protected int getStyle()
--- a/android/app/src/main/java/app/organicmaps/base/BaseMwmFragmentActivity.java
+++ b/android/app/src/main/java/app/organicmaps/base/BaseMwmFragmentActivity.java
@@ -1,7 +1,6 @@
 package app.organicmaps.base;

 import android.content.ComponentName;
-import android.content.Context;
 import android.content.Intent;
 import android.graphics.Color;
 import android.media.AudioManager;
@@ -24,7 +23,6 @@ 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 app.organicmaps.util.ThemeUtils;
 import com.google.android.material.appbar.MaterialToolbar;
 import java.util.Objects;

@@ -40,12 +38,10 @@ public abstract class BaseMwmFragmentActivity extends AppCompatActivity
  @StyleRes
  protected int getThemeResourceId(@NonNull String theme)
  {
-    Context context = getApplicationContext();
-
-    if (ThemeUtils.isDefaultTheme(context, theme))
+    if (Config.UiTheme.isDefault(theme))
      return R.style.MwmTheme;

-    if (ThemeUtils.isNightTheme(context, theme))
+    if (Config.UiTheme.isNight(theme))
      return R.style.MwmTheme_Night;

    throw new IllegalArgumentException("Attempt to apply unsupported theme: " + theme);
@@ -62,7 +58,7 @@ public abstract class BaseMwmFragmentActivity extends AppCompatActivity
  protected final void onCreate(@Nullable Bundle savedInstanceState)
  {
    super.onCreate(savedInstanceState);
-    mThemeName = Config.getCurrentUiTheme(getApplicationContext());
+    mThemeName = Config.UiTheme.getCurrent();
    setTheme(getThemeResourceId(mThemeName));
    EdgeToEdge.enable(this, SystemBarStyle.dark(Color.TRANSPARENT));
    RtlUtils.manageRtl(this);
@@ -122,7 +118,7 @@ public abstract class BaseMwmFragmentActivity extends AppCompatActivity
  public void onPostResume()
  {
    super.onPostResume();
-    if (!mThemeName.equals(Config.getCurrentUiTheme(getApplicationContext())))
+    if (!mThemeName.equals(Config.UiTheme.getCurrent()))
    {
      // Workaround described in https://code.google.com/p/android/issues/detail?id=93731
      UiThread.runLater(this::recreate);
--- a/android/app/src/main/java/app/organicmaps/base/BaseMwmRecyclerFragment.java
+++ b/android/app/src/main/java/app/organicmaps/base/BaseMwmRecyclerFragment.java
@@ -14,7 +14,7 @@ import androidx.fragment.app.Fragment;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 import app.organicmaps.R;
-import app.organicmaps.sdk.util.UiUtils;
+import app.organicmaps.util.UiUtils;
 import app.organicmaps.util.Utils;
 import app.organicmaps.util.WindowInsetUtils.ScrollableContentInsetsListener;
 import app.organicmaps.widget.PlaceholderView;
--- a/android/app/src/main/java/app/organicmaps/base/BaseToolbarActivity.java
+++ b/android/app/src/main/java/app/organicmaps/base/BaseToolbarActivity.java
@@ -10,7 +10,7 @@ import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentFactory;
 import androidx.fragment.app.FragmentManager;
 import app.organicmaps.R;
-import app.organicmaps.sdk.util.UiUtils;
+import app.organicmaps.util.UiUtils;
 import app.organicmaps.util.WindowInsetUtils.PaddingInsetsListener;
 import com.google.android.material.appbar.MaterialToolbar;

--- a/android/app/src/main/java/app/organicmaps/bookmarks/BookmarkCategoriesActivity.java
+++ b/android/app/src/main/java/app/organicmaps/bookmarks/BookmarkCategoriesActivity.java
@@ -42,7 +42,7 @@ public class BookmarkCategoriesActivity extends BaseToolbarActivity
  @StyleRes
  public int getThemeResourceId(@NonNull String theme)
  {
-    return ThemeUtils.getWindowBgThemeResourceId(getApplicationContext(), theme);
+    return ThemeUtils.getWindowBgThemeResourceId(theme);
  }

  @Override
--- a/android/app/src/main/java/app/organicmaps/bookmarks/BookmarkCollectionAdapter.java
+++ b/android/app/src/main/java/app/organicmaps/bookmarks/BookmarkCollectionAdapter.java
@@ -11,7 +11,7 @@ import app.organicmaps.R;
 import app.organicmaps.adapter.OnItemClickListener;
 import app.organicmaps.sdk.bookmarks.data.BookmarkCategory;
 import app.organicmaps.sdk.bookmarks.data.BookmarkManager;
-import app.organicmaps.sdk.util.UiUtils;
+import app.organicmaps.util.UiUtils;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.util.List;
--- a/android/app/src/main/java/app/organicmaps/bookmarks/BookmarkListActivity.java
+++ b/android/app/src/main/java/app/organicmaps/bookmarks/BookmarkListActivity.java
@@ -41,7 +41,7 @@ public class BookmarkListActivity extends BaseToolbarActivity
  @StyleRes
  public int getThemeResourceId(@NonNull String theme)
  {
-    return ThemeUtils.getCardBgThemeResourceId(getApplicationContext(), theme);
+    return ThemeUtils.getCardBgThemeResourceId(theme);
  }

  @Override
--- a/android/app/src/main/java/app/organicmaps/bookmarks/BookmarksListFragment.java
+++ b/android/app/src/main/java/app/organicmaps/bookmarks/BookmarksListFragment.java
@@ -33,15 +33,15 @@ import app.organicmaps.sdk.bookmarks.data.BookmarkInfo;
 import app.organicmaps.sdk.bookmarks.data.BookmarkManager;
 import app.organicmaps.sdk.bookmarks.data.BookmarkSharingResult;
 import app.organicmaps.sdk.bookmarks.data.CategoryDataSource;
-import app.organicmaps.sdk.bookmarks.data.Icon;
 import app.organicmaps.sdk.bookmarks.data.KmlFileType;
+import app.organicmaps.sdk.bookmarks.data.PredefinedColors;
 import app.organicmaps.sdk.bookmarks.data.SortedBlock;
 import app.organicmaps.sdk.bookmarks.data.Track;
 import app.organicmaps.sdk.search.BookmarkSearchListener;
 import app.organicmaps.sdk.search.SearchEngine;
-import app.organicmaps.sdk.util.UiUtils;
 import app.organicmaps.util.Graphics;
 import app.organicmaps.util.SharingUtils;
+import app.organicmaps.util.UiUtils;
 import app.organicmaps.util.Utils;
 import app.organicmaps.util.WindowInsetUtils;
 import app.organicmaps.util.bottomsheet.MenuBottomSheetFragment;
@@ -592,7 +592,7 @@ public class BookmarksListFragment extends BaseMwmRecyclerFragment<ConcatAdapter
    if (mTrack == null)
      return;
    final Bundle args = new Bundle();
-    args.putInt(BookmarkColorDialogFragment.ICON_TYPE, Icon.getColorPosition(mTrack.getColor()));
+    args.putInt(BookmarkColorDialogFragment.ICON_COLOR, PredefinedColors.getPredefinedColorIndex(mTrack.getColor()));
    final FragmentManager manager = getChildFragmentManager();
    String className = BookmarkColorDialogFragment.class.getName();
    final FragmentFactory factory = manager.getFragmentFactory();
@@ -601,7 +601,7 @@ public class BookmarksListFragment extends BaseMwmRecyclerFragment<ConcatAdapter
    dialogFragment.setArguments(args);
    dialogFragment.setOnColorSetListener((colorPos) -> {
      int from = mTrack.getColor();
-      int to = BookmarkManager.ICONS.get(colorPos).argb();
+      int to = PredefinedColors.getColor(colorPos);
      if (from == to)
        return;
      BookmarkManager.INSTANCE.changeTrackColor(mTrack.getTrackId(), to);
--- a/android/app/src/main/java/app/organicmaps/bookmarks/ChooseBookmarksSortingTypeFragment.java
+++ b/android/app/src/main/java/app/organicmaps/bookmarks/ChooseBookmarksSortingTypeFragment.java
@@ -13,7 +13,7 @@ import androidx.fragment.app.FragmentManager;
 import app.organicmaps.R;
 import app.organicmaps.base.BaseMwmDialogFragment;
 import app.organicmaps.sdk.bookmarks.data.BookmarkManager;
-import app.organicmaps.sdk.util.UiUtils;
+import app.organicmaps.util.UiUtils;

 public class ChooseBookmarksSortingTypeFragment
    extends BaseMwmDialogFragment implements RadioGroup.OnCheckedChangeListener
--- a/android/app/src/main/java/app/organicmaps/bookmarks/ColorsAdapter.java
+++ b/android/app/src/main/java/app/organicmaps/bookmarks/ColorsAdapter.java
@@ -6,19 +6,26 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ArrayAdapter;
+import androidx.annotation.DrawableRes;
 import app.organicmaps.R;
-import app.organicmaps.sdk.bookmarks.data.Icon;
+import app.organicmaps.sdk.bookmarks.data.PredefinedColors;
 import app.organicmaps.util.Graphics;
 import com.google.android.material.imageview.ShapeableImageView;
 import java.util.List;
+import java.util.Objects;

-public class IconsAdapter extends ArrayAdapter<Icon>
+public class ColorsAdapter extends ArrayAdapter<Integer>
 {
+  @PredefinedColors.Color
  private int mCheckedIconColor;

-  public IconsAdapter(Context context, List<Icon> list)
+  @DrawableRes
+  private final int mIconResId;
+
+  public ColorsAdapter(Context context, List<Integer> list, @DrawableRes int iconResId)
  {
    super(context, 0, 0, list);
+    mIconResId = iconResId;
  }

  @Override
@@ -35,19 +42,19 @@ public class IconsAdapter extends ArrayAdapter<Icon>
    else
      holder = (SpinnerViewHolder) convertView.getTag();

-    final Icon icon = getItem(position);
+    @PredefinedColors.Color
+    final int color = Objects.requireNonNull(getItem(position));

    Drawable circle;
-    if (icon.getColor() == mCheckedIconColor)
+    if (color == mCheckedIconColor)
    {
-      circle = Graphics.drawCircleAndImage(getItem(position).argb(), R.dimen.track_circle_size,
-                                           app.organicmaps.sdk.R.drawable.ic_bookmark_none, R.dimen.bookmark_icon_size,
-                                           getContext());
+      circle = Graphics.drawCircleAndImage(PredefinedColors.getColor(mCheckedIconColor), R.dimen.track_circle_size,
+                                           mIconResId, R.dimen.bookmark_icon_size, getContext());
    }
    else
    {
-      circle =
-          Graphics.drawCircle(getItem(position).argb(), R.dimen.select_color_circle_size, getContext().getResources());
+      circle = Graphics.drawCircle(PredefinedColors.getColor(color), R.dimen.select_color_circle_size,
+                                   getContext().getResources());
    }
    holder.icon.setImageDrawable(circle);
    return convertView;
--- a/android/app/src/main/java/app/organicmaps/bookmarks/Holders.java
+++ b/android/app/src/main/java/app/organicmaps/bookmarks/Holders.java
@@ -18,8 +18,8 @@ import app.organicmaps.sdk.bookmarks.data.BookmarkInfo;
 import app.organicmaps.sdk.bookmarks.data.BookmarkManager;
 import app.organicmaps.sdk.bookmarks.data.IconClickListener;
 import app.organicmaps.sdk.bookmarks.data.Track;
-import app.organicmaps.sdk.util.UiUtils;
 import app.organicmaps.util.Graphics;
+import app.organicmaps.util.UiUtils;
 import app.organicmaps.util.Utils;
 import app.organicmaps.widget.recycler.RecyclerClickListener;
 import app.organicmaps.widget.recycler.RecyclerLongClickListener;
--- a/android/app/src/main/java/app/organicmaps/car/CarAppSession.java
+++ b/android/app/src/main/java/app/organicmaps/car/CarAppSession.java
@@ -26,7 +26,6 @@ import app.organicmaps.car.util.CurrentCountryChangedListener;
 import app.organicmaps.car.util.IntentUtils;
 import app.organicmaps.car.util.ThemeUtils;
 import app.organicmaps.car.util.UserActionRequired;
-import app.organicmaps.routing.RoutingController;
 import app.organicmaps.sdk.Framework;
 import app.organicmaps.sdk.PlacePageActivationListener;
 import app.organicmaps.sdk.bookmarks.data.MapObject;
@@ -34,6 +33,7 @@ import app.organicmaps.sdk.display.DisplayChangedListener;
 import app.organicmaps.sdk.display.DisplayManager;
 import app.organicmaps.sdk.display.DisplayType;
 import app.organicmaps.sdk.location.LocationState;
+import app.organicmaps.sdk.routing.RoutingController;
 import app.organicmaps.sdk.util.Config;
 import app.organicmaps.sdk.util.LocationUtils;
 import app.organicmaps.sdk.util.log.Logger;
--- a/android/app/src/main/java/app/organicmaps/car/SurfaceRenderer.java
+++ b/android/app/src/main/java/app/organicmaps/car/SurfaceRenderer.java
@@ -27,7 +27,10 @@ public class SurfaceRenderer implements DefaultLifecycleObserver, SurfaceCallbac
 {
  private static final String TAG = SurfaceRenderer.class.getSimpleName();

+  @NonNull
  private final CarContext mCarContext;
+
+  @NonNull
  private final Map mMap = new Map(Car);

  @NonNull
@@ -56,6 +59,7 @@ public class SurfaceRenderer implements DefaultLifecycleObserver, SurfaceCallbac
      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());
--- a/android/app/src/main/java/app/organicmaps/car/screens/NavigationScreen.java
+++ b/android/app/src/main/java/app/organicmaps/car/screens/NavigationScreen.java
@@ -28,11 +28,11 @@ import app.organicmaps.car.util.RoutingUtils;
 import app.organicmaps.car.util.ThemeUtils;
 import app.organicmaps.car.util.UiHelpers;
 import app.organicmaps.routing.NavigationService;
-import app.organicmaps.routing.RoutingController;
 import app.organicmaps.sdk.Framework;
 import app.organicmaps.sdk.location.LocationHelper;
 import app.organicmaps.sdk.location.LocationListener;
 import app.organicmaps.sdk.routing.JunctionInfo;
+import app.organicmaps.sdk.routing.RoutingController;
 import app.organicmaps.sdk.routing.RoutingInfo;
 import app.organicmaps.sdk.sound.TtsPlayer;
 import app.organicmaps.sdk.util.LocationUtils;
@@ -73,8 +73,7 @@ public class NavigationScreen extends BaseMapScreen implements RoutingController
  public Template onGetTemplate()
  {
    final NavigationTemplate.Builder builder = new NavigationTemplate.Builder();
-    builder.setBackgroundColor(ThemeUtils.isNightMode(getCarContext()) ? Colors.NAVIGATION_TEMPLATE_BACKGROUND_NIGHT
-                                                                       : Colors.NAVIGATION_TEMPLATE_BACKGROUND_DAY);
+    builder.setBackgroundColor(Colors.NAVIGATION_TEMPLATE_BACKGROUND);
    builder.setActionStrip(createActionStrip());
    builder.setMapActionStrip(UiHelpers.createMapActionStrip(getCarContext(), getSurfaceRenderer()));

--- a/android/app/src/main/java/app/organicmaps/car/screens/PlaceScreen.java
+++ b/android/app/src/main/java/app/organicmaps/car/screens/PlaceScreen.java
@@ -35,11 +35,11 @@ import app.organicmaps.car.util.OnBackPressedCallback;
 import app.organicmaps.car.util.RoutingHelpers;
 import app.organicmaps.car.util.UiHelpers;
 import app.organicmaps.routing.ResultCodesHelper;
-import app.organicmaps.routing.RoutingController;
 import app.organicmaps.sdk.Framework;
 import app.organicmaps.sdk.Router;
 import app.organicmaps.sdk.bookmarks.data.MapObject;
 import app.organicmaps.sdk.bookmarks.data.Metadata;
+import app.organicmaps.sdk.routing.RoutingController;
 import app.organicmaps.sdk.routing.RoutingInfo;
 import app.organicmaps.sdk.util.Config;
 import java.util.Objects;
--- a/android/app/src/main/java/app/organicmaps/car/screens/download/DownloaderScreen.java
+++ b/android/app/src/main/java/app/organicmaps/car/screens/download/DownloaderScreen.java
@@ -12,6 +12,7 @@ import androidx.lifecycle.LifecycleOwner;
 import app.organicmaps.R;
 import app.organicmaps.car.screens.ErrorScreen;
 import app.organicmaps.car.screens.base.BaseScreen;
+import app.organicmaps.downloader.MapManagerHelper;
 import app.organicmaps.sdk.downloader.CountryItem;
 import app.organicmaps.sdk.downloader.MapManager;
 import app.organicmaps.sdk.util.StringUtils;
@@ -169,7 +170,7 @@ class DownloaderScreen extends BaseScreen
    mIsDownloadFailed = true;
    final ErrorScreen.Builder builder = new ErrorScreen.Builder(getCarContext())
                                            .setTitle(R.string.country_status_download_failed)
-                                            .setErrorMessage(MapManager.getErrorCodeStrRes(data.errorCode))
+                                            .setErrorMessage(MapManagerHelper.getErrorCodeStrRes(data.errorCode))
                                            .setPositiveButton(R.string.downloader_retry, null);
    if (!mIsCancelActionDisabled)
      builder.setNegativeButton(R.string.cancel, this::finish);
--- a/android/app/src/main/java/app/organicmaps/car/util/Colors.java
+++ b/android/app/src/main/java/app/organicmaps/car/util/Colors.java
@@ -11,8 +11,7 @@ public final class Colors
  public static final CarColor OPENING_HOURS_CLOSES_SOON = CarColor.YELLOW;
  public static final CarColor OPENING_HOURS_CLOSED = CarColor.RED;
  public static final CarColor START_NAVIGATION = CarColor.GREEN;
-  public static final CarColor NAVIGATION_TEMPLATE_BACKGROUND_DAY = CarColor.GREEN;
-  public static final CarColor NAVIGATION_TEMPLATE_BACKGROUND_NIGHT = CarColor.DEFAULT;
+  public static final CarColor NAVIGATION_TEMPLATE_BACKGROUND = CarColor.GREEN;
  public static final CarColor BUTTON_ACCEPT = CarColor.GREEN;

  private Colors() {}
--- a/android/app/src/main/java/app/organicmaps/car/util/CurrentCountryChangedListener.java
+++ b/android/app/src/main/java/app/organicmaps/car/util/CurrentCountryChangedListener.java
@@ -7,9 +7,9 @@ import androidx.car.app.CarContext;
 import androidx.car.app.ScreenManager;
 import app.organicmaps.car.screens.download.DownloadMapsScreen;
 import app.organicmaps.car.screens.download.DownloadMapsScreenBuilder;
-import app.organicmaps.routing.RoutingController;
 import app.organicmaps.sdk.downloader.CountryItem;
 import app.organicmaps.sdk.downloader.MapManager;
+import app.organicmaps.sdk.routing.RoutingController;

 public class CurrentCountryChangedListener implements MapManager.CurrentCountryChangedListener
 {
--- a/android/app/src/main/java/app/organicmaps/car/util/IntentUtils.java
+++ b/android/app/src/main/java/app/organicmaps/car/util/IntentUtils.java
@@ -15,13 +15,13 @@ import app.organicmaps.car.CarAppService;
 import app.organicmaps.car.SurfaceRenderer;
 import app.organicmaps.car.screens.NavigationScreen;
 import app.organicmaps.car.screens.search.SearchScreen;
-import app.organicmaps.routing.RoutingController;
 import app.organicmaps.sdk.Framework;
 import app.organicmaps.sdk.Map;
 import app.organicmaps.sdk.api.ParsedSearchRequest;
 import app.organicmaps.sdk.api.RequestType;
 import app.organicmaps.sdk.display.DisplayManager;
 import app.organicmaps.sdk.display.DisplayType;
+import app.organicmaps.sdk.routing.RoutingController;
 import app.organicmaps.sdk.util.log.Logger;

 public final class IntentUtils
--- a/android/app/src/main/java/app/organicmaps/car/util/ThemeUtils.java
+++ b/android/app/src/main/java/app/organicmaps/car/util/ThemeUtils.java
@@ -8,21 +8,22 @@ import androidx.annotation.StringRes;
 import androidx.annotation.UiThread;
 import androidx.car.app.CarContext;
 import app.organicmaps.R;
-import app.organicmaps.routing.RoutingController;
 import app.organicmaps.sdk.MapStyle;
+import app.organicmaps.sdk.routing.RoutingController;
+import app.organicmaps.sdk.util.Config;

 public final class ThemeUtils
 {
  public enum ThemeMode
  {
-    AUTO(R.string.auto, R.string.theme_auto),
-    LIGHT(R.string.off, R.string.theme_default),
-    NIGHT(R.string.on, R.string.theme_night);
+    AUTO(R.string.auto, Config.UiTheme.AUTO),
+    LIGHT(R.string.off, Config.UiTheme.DEFAULT),
+    NIGHT(R.string.on, Config.UiTheme.NIGHT);

-    ThemeMode(@StringRes int titleId, @StringRes int prefsKeyId)
+    ThemeMode(@StringRes int titleId, @NonNull String config)
    {
      mTitleId = titleId;
-      mPrefsKeyId = prefsKeyId;
+      mConfig = config;
    }

    @StringRes
@@ -31,16 +32,16 @@ public final class ThemeUtils
      return mTitleId;
    }

-    @StringRes
-    public int getPrefsKeyId()
+    @NonNull
+    public String getConfig()
    {
-      return mPrefsKeyId;
+      return mConfig;
    }

    @StringRes
    private final int mTitleId;
-    @StringRes
-    private final int mPrefsKeyId;
+    @NonNull
+    private final String mConfig;
  }

  private static final String ANDROID_AUTO_PREFERENCES_FILE_KEY = "ANDROID_AUTO_PREFERENCES_FILE_KEY";
@@ -79,23 +80,20 @@ public final class ThemeUtils
  @UiThread
  public static void setThemeMode(@NonNull CarContext context, @NonNull ThemeMode themeMode)
  {
-    getSharedPreferences(context).edit().putString(THEME_KEY, context.getString(themeMode.getPrefsKeyId())).commit();
+    getSharedPreferences(context).edit().putString(THEME_KEY, themeMode.getConfig()).commit();
    update(context, themeMode);
  }

  @NonNull
  public static ThemeMode getThemeMode(@NonNull CarContext context)
  {
-    final String autoTheme = context.getString(R.string.theme_auto);
-    final String lightTheme = context.getString(R.string.theme_default);
-    final String nightTheme = context.getString(R.string.theme_night);
-    final String themeMode = getSharedPreferences(context).getString(THEME_KEY, autoTheme);
+    final String themeMode = getSharedPreferences(context).getString(THEME_KEY, ThemeMode.AUTO.getConfig());

-    if (themeMode.equals(autoTheme))
+    if (themeMode.equals(ThemeMode.AUTO.getConfig()))
      return ThemeMode.AUTO;
-    else if (themeMode.equals(lightTheme))
+    else if (themeMode.equals(ThemeMode.LIGHT.getConfig()))
      return ThemeMode.LIGHT;
-    else if (themeMode.equals(nightTheme))
+    else if (themeMode.equals(ThemeMode.NIGHT.getConfig()))
      return ThemeMode.NIGHT;
    else
      throw new IllegalArgumentException("Unsupported value");
--- a/android/app/src/main/java/app/organicmaps/downloader/BottomPanel.java
+++ b/android/app/src/main/java/app/organicmaps/downloader/BottomPanel.java
@@ -15,7 +15,7 @@ import app.organicmaps.sdk.downloader.CountryItem;
 import app.organicmaps.sdk.downloader.MapManager;
 import app.organicmaps.sdk.downloader.UpdateInfo;
 import app.organicmaps.sdk.util.StringUtils;
-import app.organicmaps.sdk.util.UiUtils;
+import app.organicmaps.util.UiUtils;
 import com.google.android.material.button.MaterialButton;
 import com.google.android.material.floatingactionbutton.FloatingActionButton;

@@ -29,7 +29,7 @@ class BottomPanel
    @Override
    public void onClick(View v)
    {
-      MapManager.warn3gAndDownload(mFragment.requireActivity(), mFragment.getCurrentRoot(), null);
+      MapManagerHelper.warn3gAndDownload(mFragment.requireActivity(), mFragment.getCurrentRoot(), null);
    }
  };

@@ -38,7 +38,10 @@ class BottomPanel
    public void onClick(View v)
    {
      final String country = mFragment.getCurrentRoot();
-      MapManager.warnOn3gUpdate(mFragment.requireActivity(), country, () -> MapManager.startUpdate(country));
+      MapManagerHelper.warnOn3gUpdate(mFragment.requireActivity(), country, () -> {
+        DownloaderService.startForegroundService();
+        MapManagerHelper.startUpdate(country);
+      });
    }
  };

@@ -55,7 +58,7 @@ class BottomPanel
    @Override
    public void onClick(View v)
    {
-      MapManager.warn3gAndRetry(mFragment.requireActivity(), mFragment.getCurrentRoot(), null);
+      MapManagerHelper.warn3gAndRetry(mFragment.requireActivity(), mFragment.getCurrentRoot(), null);
    }
  };

--- a/android/app/src/main/java/app/organicmaps/downloader/CountrySuggestFragment.java
+++ b/android/app/src/main/java/app/organicmaps/downloader/CountrySuggestFragment.java
@@ -16,7 +16,7 @@ import app.organicmaps.base.BaseMwmFragmentActivity;
 import app.organicmaps.sdk.downloader.CountryItem;
 import app.organicmaps.sdk.downloader.MapManager;
 import app.organicmaps.sdk.util.StringUtils;
-import app.organicmaps.sdk.util.UiUtils;
+import app.organicmaps.util.UiUtils;
 import app.organicmaps.widget.WheelProgressView;
 import com.google.android.material.button.MaterialButton;
 import com.google.android.material.textview.MaterialTextView;
@@ -198,7 +198,8 @@ public class CountrySuggestFragment extends BaseMwmFragment implements View.OnCl
    final int id = v.getId();
    if (id == R.id.btn__download_map)
    {
-      MapManager.warn3gAndDownload(requireActivity(), mCurrentCountry.id, () -> mDownloadingCountry = mCurrentCountry);
+      MapManagerHelper.warn3gAndDownload(requireActivity(), mCurrentCountry.id,
+                                         () -> mDownloadingCountry = mCurrentCountry);
    }
    else if (id == R.id.btn__select_map)
    {
--- a/android/app/src/main/java/app/organicmaps/downloader/DownloaderAdapter.java
+++ b/android/app/src/main/java/app/organicmaps/downloader/DownloaderAdapter.java
@@ -20,11 +20,11 @@ import androidx.recyclerview.widget.RecyclerView;
 import app.organicmaps.MwmActivity;
 import app.organicmaps.MwmApplication;
 import app.organicmaps.R;
-import app.organicmaps.routing.RoutingController;
 import app.organicmaps.sdk.downloader.CountryItem;
 import app.organicmaps.sdk.downloader.MapManager;
+import app.organicmaps.sdk.routing.RoutingController;
 import app.organicmaps.sdk.util.StringUtils;
-import app.organicmaps.sdk.util.UiUtils;
+import app.organicmaps.util.UiUtils;
 import app.organicmaps.util.bottomsheet.MenuBottomSheetFragment;
 import app.organicmaps.util.bottomsheet.MenuBottomSheetItem;
 import com.google.android.material.dialog.MaterialAlertDialogBuilder;
@@ -93,7 +93,7 @@ class DownloaderAdapter extends RecyclerView.Adapter<DownloaderAdapter.ViewHolde

  private void onDownloadActionSelected(final CountryItem item, DownloaderAdapter adapter)
  {
-    MapManager.warn3gAndDownload(adapter.mActivity, item.id, null);
+    MapManagerHelper.warn3gAndDownload(adapter.mActivity, item.id, null);
  }

  private void onUpdateActionSelected(final CountryItem item, DownloaderAdapter adapter)
@@ -101,7 +101,7 @@ class DownloaderAdapter extends RecyclerView.Adapter<DownloaderAdapter.ViewHolde
    item.update();
    if (item.status != CountryItem.STATUS_UPDATABLE)
      return;
-    MapManager.warnOn3gUpdate(adapter.mActivity, item.id, () -> MapManager.startUpdate(item.id));
+    MapManagerHelper.warnOn3gUpdate(adapter.mActivity, item.id, () -> MapManagerHelper.startUpdate(item.id));
  }

  private void onExploreActionSelected(CountryItem item, DownloaderAdapter adapter)
@@ -206,7 +206,7 @@ class DownloaderAdapter extends RecyclerView.Adapter<DownloaderAdapter.ViewHolde
      {
        if (item.isLeafNode && item.newStatus == CountryItem.STATUS_FAILED)
        {
-          MapManager.showError(mActivity, item, null);
+          MapManagerHelper.showError(mActivity, item, null);
          break;
        }
      }
@@ -382,9 +382,12 @@ class DownloaderAdapter extends RecyclerView.Adapter<DownloaderAdapter.ViewHolde
        else
          processLongClick();
      }
-        case CountryItem.STATUS_FAILED -> MapManager.warn3gAndRetry(mActivity, mItem.id, null);
+      case CountryItem.STATUS_FAILED ->
+      {
+        MapManagerHelper.warn3gAndRetry(mActivity, mItem.id, null);
+      }
      case CountryItem.STATUS_UPDATABLE ->
-          MapManager.warnOn3gUpdate(mActivity, mItem.id, () -> MapManager.startUpdate(mItem.id));
+        MapManagerHelper.warnOn3gUpdate(mActivity, mItem.id, () -> MapManagerHelper.startUpdate(mItem.id));
      default -> throw new IllegalArgumentException("Inappropriate item status: " + mItem.status);
      }
    }
--- a/android/app/src/main/java/app/organicmaps/downloader/DownloaderFragment.java
+++ b/android/app/src/main/java/app/organicmaps/downloader/DownloaderFragment.java
@@ -24,8 +24,8 @@ import app.organicmaps.widget.PlaceholderView;
 import java.util.ArrayList;
 import java.util.List;

-public class DownloaderFragment extends BaseMwmRecyclerFragment<DownloaderAdapter>
-    implements MenuBottomSheetFragment.MenuBottomSheetInterface
+public class DownloaderFragment
+    extends BaseMwmRecyclerFragment<DownloaderAdapter> implements MenuBottomSheetFragment.MenuBottomSheetInterface
 {
  private DownloaderToolbarController mToolbarController;

@@ -153,7 +153,8 @@ public class DownloaderFragment extends BaseMwmRecyclerFragment<DownloaderAdapte

    mBottomPanel = new BottomPanel(this, view);
    mToolbarController = new DownloaderToolbarController(view, requireActivity(), this);
-    requireActivity().getOnBackPressedDispatcher().addCallback(getViewLifecycleOwner(), mToolbarController.getBackPressedCallback());
+    requireActivity().getOnBackPressedDispatcher().addCallback(getViewLifecycleOwner(),
+                                                               mToolbarController.getBackPressedCallback());

    update();
  }
@@ -195,7 +196,8 @@ public class DownloaderFragment extends BaseMwmRecyclerFragment<DownloaderAdapte
  {
    if (mAdapter == null)
      mAdapter = new DownloaderAdapter(this);
-    requireActivity().getOnBackPressedDispatcher().addCallback(getViewLifecycleOwner(), mAdapter.getBackPressedCallback());
+    requireActivity().getOnBackPressedDispatcher().addCallback(getViewLifecycleOwner(),
+                                                               mAdapter.getBackPressedCallback());

    return mAdapter;
  }
--- a/android/app/src/main/java/app/organicmaps/downloader/DownloaderInsetsListener.java
+++ b/android/app/src/main/java/app/organicmaps/downloader/DownloaderInsetsListener.java
@@ -9,7 +9,8 @@ import androidx.core.view.OnApplyWindowInsetsListener;
 import androidx.core.view.WindowInsetsCompat;
 import androidx.recyclerview.widget.RecyclerView;
 import app.organicmaps.R;
-import app.organicmaps.sdk.util.UiUtils;
+import app.organicmaps.sdk.util.Utils;
+import app.organicmaps.util.UiUtils;
 import app.organicmaps.util.WindowInsetUtils;

 final class DownloaderInsetsListener implements OnApplyWindowInsetsListener
@@ -55,7 +56,7 @@ final class DownloaderInsetsListener implements OnApplyWindowInsetsListener

  private void applyInsetsToButtons(Insets insets)
  {
-    int baseMargin = UiUtils.dimen(mContext, R.dimen.margin_base);
+    int baseMargin = Utils.dimen(mContext, R.dimen.margin_base);

    ViewGroup.MarginLayoutParams fabParams = (ViewGroup.MarginLayoutParams) mFab.getLayoutParams();
    ViewGroup.MarginLayoutParams buttonParams = (ViewGroup.MarginLayoutParams) mButton.getLayoutParams();
--- a/android/app/src/main/java/app/organicmaps/downloader/DownloaderNotifier.java
+++ b/android/app/src/main/java/app/organicmaps/downloader/DownloaderNotifier.java
@@ -20,6 +20,7 @@ import app.organicmaps.R;
 import app.organicmaps.sdk.downloader.MapManager;
 import app.organicmaps.sdk.util.StringUtils;
 import app.organicmaps.sdk.util.log.Logger;
+import java.util.Objects;

 public class DownloaderNotifier
 {
@@ -29,7 +30,8 @@ public class DownloaderNotifier
  public static final int NOTIFICATION_ID = 1;

  private final Context mContext;
-  private NotificationCompat.Builder mProgressNotificationBuilder;
+  private NotificationCompat.Builder mProgressNotificationBuilder = null;
+  private String mNotificationCountryId = null;

  public DownloaderNotifier(Context context)
  {
@@ -45,6 +47,7 @@ public class DownloaderNotifier
            .setShowBadge(true)
            .setVibrationEnabled(false)
            .setLightsEnabled(false)
+            .setSound(null, null)
            .build();
    notificationManager.createNotificationChannel(channel);
  }
@@ -62,8 +65,6 @@ public class DownloaderNotifier
    final String countryName = MapManager.nativeGetName(countryId);
    final String content = mContext.getString(R.string.download_country_failed, countryName);

-    var contentPendingIntent = getNotificationPendingIntent(countryId);
-
    final Notification notification = new NotificationCompat.Builder(mContext, CHANNEL_ID)
                                          .setAutoCancel(true)
                                          .setCategory(NotificationCompat.CATEGORY_ERROR)
@@ -74,7 +75,7 @@ public class DownloaderNotifier
                                          .setContentText(content)
                                          .setShowWhen(true)
                                          .setTicker(getTicker(mContext, title, content))
-                                          .setContentIntent(contentPendingIntent)
+                                          .setContentIntent(getNotificationPendingIntent(countryId))
                                          .setOnlyAlertOnce(true)
                                          .build();

@@ -110,32 +111,41 @@ public class DownloaderNotifier
  @NonNull
  public Notification buildProgressNotification(@Nullable String countryId, int maxProgress, int progress)
  {
-    var builder = startNotification(countryId);
-
-    builder.setProgress(maxProgress, progress, maxProgress == 0);
-    builder.setContentText("Download in progress");
-
+    var builder = getNotificationBuilder(countryId);
+    ///  @todo Doesn't work properly .. Bad input sizes?
+    // builder.setProgress(maxProgress, progress, maxProgress == 0);
+    builder.setProgress(maxProgress, progress, true);
    return builder.build();
  }

  @NonNull
-  private NotificationCompat.Builder startNotification(@Nullable String countryId)
+  private NotificationCompat.Builder getNotificationBuilder(@Nullable String countryId)
  {
-    final String title = mContext.getString(R.string.app_name);
+    if (mProgressNotificationBuilder == null || !Objects.equals(countryId, mNotificationCountryId))
+    {
+      mNotificationCountryId = countryId;
+      final String countryName = countryId != null ? MapManager.nativeGetName(countryId) : "";

-    return new NotificationCompat.Builder(mContext, CHANNEL_ID)
+      mProgressNotificationBuilder =
+          new NotificationCompat.Builder(mContext, CHANNEL_ID)
              .setAutoCancel(true)
              .setVisibility(NotificationCompat.VISIBILITY_PUBLIC)
              .setSmallIcon(R.drawable.ic_logo_small)
              .setColor(ContextCompat.getColor(mContext, R.color.notification))
              .setShowWhen(true)
-        .setContentTitle(title)
-        .setContentIntent(getNotificationPendingIntent(countryId));
+              .setContentTitle(mContext.getString(R.string.app_name))
+              .setContentIntent(getNotificationPendingIntent(countryId))
+              .setContentText(mContext.getString(R.string.downloader_downloading) + " " + countryName)
+              .setSound(null);
+    }
+    return mProgressNotificationBuilder;
  }

  @NonNull
  private PendingIntent getNotificationPendingIntent(@Nullable String countryId)
  {
+    /// @todo Zooming to the countryId when tapping on the notification?
+    /// Shows very low zoom level, need z=9/10, I suppose ...
    final int FLAG_IMMUTABLE = Build.VERSION.SDK_INT < Build.VERSION_CODES.M ? 0 : PendingIntent.FLAG_IMMUTABLE;
    final Intent contentIntent = MwmActivity.createShowMapIntent(mContext, countryId);
    contentIntent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
--- a/android/app/src/main/java/app/organicmaps/downloader/DownloaderService.java
+++ b/android/app/src/main/java/app/organicmaps/downloader/DownloaderService.java
@@ -97,7 +97,7 @@ public class DownloaderService extends Service implements MapManager.StorageCall
  }

  @Override
-  public void onProgress(String countryId, long localSize, long remoteSize)
+  public void onProgress(String countryId, long bytesDownloaded, long bytesTotal)
  {
    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU
        && ContextCompat.checkSelfPermission(this, POST_NOTIFICATIONS) != PERMISSION_GRANTED)
@@ -106,8 +106,7 @@ public class DownloaderService extends Service implements MapManager.StorageCall
      return;
    }

-    // TODO: How to calculate progress?
-    mNotifier.notifyProgress();
+    mNotifier.notifyProgress(countryId, (int) bytesTotal, (int) bytesDownloaded);
  }

  @Override
--- a/android/app/src/main/java/app/organicmaps/downloader/DownloaderStatusIcon.java
+++ b/android/app/src/main/java/app/organicmaps/downloader/DownloaderStatusIcon.java
@@ -6,8 +6,8 @@ import androidx.annotation.AttrRes;
 import androidx.annotation.DrawableRes;
 import app.organicmaps.R;
 import app.organicmaps.sdk.downloader.CountryItem;
-import app.organicmaps.sdk.util.UiUtils;
 import app.organicmaps.util.ThemeUtils;
+import app.organicmaps.util.UiUtils;
 import app.organicmaps.widget.WheelProgressView;
 import com.google.android.material.imageview.ShapeableImageView;

--- a/android/app/src/main/java/app/organicmaps/downloader/DownloaderToolbarController.java
+++ b/android/app/src/main/java/app/organicmaps/downloader/DownloaderToolbarController.java
@@ -5,7 +5,7 @@ import android.content.Intent;
 import android.text.TextUtils;
 import android.view.View;
 import app.organicmaps.R;
-import app.organicmaps.sdk.util.UiUtils;
+import app.organicmaps.util.UiUtils;
 import app.organicmaps.widget.SearchToolbarController;

 class DownloaderToolbarController extends SearchToolbarController
--- a/android/app/src/main/java/app/organicmaps/downloader/MapManagerHelper.java
+++ b/android/app/src/main/java/app/organicmaps/downloader/MapManagerHelper.java
@@ -0,0 +1,223 @@
+package app.organicmaps.downloader;
+
+import android.app.Activity;
+import android.text.TextUtils;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.StringRes;
+import androidx.appcompat.app.AlertDialog;
+import androidx.core.util.Consumer;
+import app.organicmaps.R;
+import app.organicmaps.sdk.downloader.CountryItem;
+import app.organicmaps.sdk.downloader.ExpandRetryConfirmationListener;
+import app.organicmaps.sdk.downloader.MapManager;
+import app.organicmaps.sdk.util.ConnectionState;
+import com.google.android.material.dialog.MaterialAlertDialogBuilder;
+import java.lang.ref.WeakReference;
+
+public class MapManagerHelper
+{
+  private static WeakReference<AlertDialog> sCurrentErrorDialog;
+
+  @StringRes
+  public static int getErrorCodeStrRes(final int errorCode)
+  {
+    return switch (errorCode)
+    {
+      case CountryItem.ERROR_NO_INTERNET -> R.string.common_check_internet_connection_dialog;
+      case CountryItem.ERROR_OOM -> R.string.downloader_no_space_title;
+      default -> throw new IllegalArgumentException("Given error can not be displayed: " + errorCode);
+    };
+  }
+
+  public static void showError(final Activity activity, final MapManager.StorageCallbackData errorData,
+                               @Nullable final Consumer<Boolean> dialogClickListener)
+  {
+    if (!MapManager.nativeIsAutoretryFailed())
+      return;
+
+    showErrorDialog(activity, errorData, dialogClickListener);
+  }
+
+  public static void showErrorDialog(final Activity activity, final MapManager.StorageCallbackData errorData,
+                                     @Nullable final Consumer<Boolean> dialogClickListener)
+  {
+    if (sCurrentErrorDialog != null)
+    {
+      AlertDialog dlg = sCurrentErrorDialog.get();
+      if (dlg != null && dlg.isShowing())
+        return;
+    }
+
+    final AlertDialog dlg = new MaterialAlertDialogBuilder(activity, R.style.MwmTheme_AlertDialog)
+                                .setTitle(R.string.country_status_download_failed)
+                                .setMessage(getErrorCodeStrRes(errorData.errorCode))
+                                .setNegativeButton(R.string.cancel,
+                                                   (dialog, which) -> {
+                                                     sCurrentErrorDialog = null;
+                                                     if (dialogClickListener != null)
+                                                       dialogClickListener.accept(false);
+                                                   })
+                                .setPositiveButton(R.string.downloader_retry,
+                                                   (dialog, which) -> {
+                                                     ExpandRetryConfirmationListener listener =
+                                                         new ExpandRetryConfirmationListener(dialogClickListener);
+                                                     warn3gAndRetry(activity, errorData.countryId, listener);
+                                                   })
+                                .create();
+    dlg.setCanceledOnTouchOutside(false);
+    dlg.show();
+    sCurrentErrorDialog = new WeakReference<>(dlg);
+  }
+
+  private static void notifyNoSpaceInternal(Activity activity)
+  {
+    new MaterialAlertDialogBuilder(activity, R.style.MwmTheme_AlertDialog)
+        .setTitle(R.string.downloader_no_space_title)
+        .setMessage(R.string.downloader_no_space_message)
+        .setPositiveButton(android.R.string.ok, null)
+        .show();
+  }
+
+  /**
+   * @return true if there is no space to update the given {@code root}, so the alert dialog will be shown.
+   */
+  private static boolean notifyNoSpaceToUpdate(Activity activity, String root)
+  {
+    if (MapManager.nativeHasSpaceToUpdate(root))
+      return false;
+
+    notifyNoSpaceInternal(activity);
+    return true;
+  }
+
+  /**
+   * @return true if there is no space to download the given {@code root}, so the alert dialog will be shown.
+   */
+  private static boolean notifyNoSpace(Activity activity, String root)
+  {
+    if (MapManager.nativeHasSpaceToDownloadCountry(root))
+      return false;
+
+    notifyNoSpaceInternal(activity);
+    return true;
+  }
+
+  /**
+   * @return true if there is no space to download {@code size} bytes, so the alert dialog will be shown.
+   */
+  private static boolean notifyNoSpace(Activity activity, long size)
+  {
+    if (MapManager.nativeHasSpaceToDownloadAmount(size))
+      return false;
+
+    notifyNoSpaceInternal(activity);
+    return true;
+  }
+
+  private static boolean warnOn3gInternal(Activity activity, @NonNull final Runnable onAcceptListener)
+  {
+    if (MapManager.nativeIsDownloadOn3gEnabled() || !ConnectionState.INSTANCE.isMobileConnected())
+    {
+      onAcceptListener.run();
+      return false;
+    }
+
+    new MaterialAlertDialogBuilder(activity, R.style.MwmTheme_AlertDialog)
+        .setTitle(R.string.download_over_mobile_header)
+        .setMessage(R.string.download_over_mobile_message)
+        .setNegativeButton(R.string.cancel, null)
+        .setPositiveButton(R.string.ok,
+                           (dlg, which) -> {
+                             MapManager.nativeEnableDownloadOn3g();
+                             onAcceptListener.run();
+                           })
+        .show();
+
+    return true;
+  }
+
+  public static boolean warnOn3gUpdate(Activity activity, @Nullable String countryId,
+                                       @NonNull final Runnable onAcceptListener)
+  {
+    // noinspection SimplifiableIfStatement
+    if (TextUtils.isEmpty(countryId) || !notifyNoSpaceToUpdate(activity, countryId))
+      return warnOn3gInternal(activity, onAcceptListener);
+
+    return true;
+  }
+
+  public static boolean warnOn3g(Activity activity, @Nullable String countryId,
+                                 @NonNull final Runnable onAcceptListener)
+  {
+    // noinspection SimplifiableIfStatement
+    if (TextUtils.isEmpty(countryId) || !notifyNoSpace(activity, countryId))
+      return warnOn3gInternal(activity, onAcceptListener);
+
+    return true;
+  }
+
+  public static boolean warnOn3g(Activity activity, long size, @NonNull Runnable onAcceptListener)
+  {
+    return !notifyNoSpace(activity, size) && warnOn3gInternal(activity, onAcceptListener);
+  }
+
+  public static boolean warn3gAndDownload(Activity activity, final String countryId,
+                                          @Nullable final Runnable onAcceptListener)
+  {
+    return warnOn3g(activity, countryId, () -> {
+      if (onAcceptListener != null)
+        onAcceptListener.run();
+      startDownload(countryId);
+    });
+  }
+
+  public static boolean warn3gAndRetry(Activity activity, final String countryId,
+                                       @Nullable final Runnable onAcceptListener)
+  {
+    return warnOn3g(activity, countryId, () -> {
+      if (onAcceptListener != null)
+        onAcceptListener.run();
+      retryDownload(countryId);
+    });
+  }
+
+  /**
+   * Enqueues failed items under given {@code root} node in downloader.
+   */
+  public static void retryDownload(@NonNull String countryId)
+  {
+    DownloaderService.startForegroundService();
+    MapManager.retryDownload(countryId);
+  }
+
+  /**
+   * Enqueues given {@code root} node with its children in downloader.
+   */
+  public static void startUpdate(@NonNull String root)
+  {
+    DownloaderService.startForegroundService();
+    MapManager.startUpdate(root);
+  }
+
+  /**
+   * Enqueues the given list of nodes and its children in downloader.
+   */
+  public static void startDownload(String... countries)
+  {
+    DownloaderService.startForegroundService();
+    for (var countryId : countries)
+    {
+      MapManager.startDownload(countryId);
+    }
+  }
+
+  /**
+   * Enqueues given {@code root} node and its children in downloader.
+   */
+  public static void startDownload(@NonNull String countryId)
+  {
+    DownloaderService.startForegroundService();
+    MapManager.startDownload(countryId);
+  }
+}
--- a/android/app/src/main/java/app/organicmaps/downloader/OnmapDownloader.java
+++ b/android/app/src/main/java/app/organicmaps/downloader/OnmapDownloader.java
@@ -9,13 +9,13 @@ import androidx.core.view.ViewCompat;
 import app.organicmaps.MwmActivity;
 import app.organicmaps.MwmApplication;
 import app.organicmaps.R;
-import app.organicmaps.routing.RoutingController;
 import app.organicmaps.sdk.downloader.CountryItem;
 import app.organicmaps.sdk.downloader.MapManager;
+import app.organicmaps.sdk.routing.RoutingController;
 import app.organicmaps.sdk.util.Config;
 import app.organicmaps.sdk.util.ConnectionState;
 import app.organicmaps.sdk.util.StringUtils;
-import app.organicmaps.sdk.util.UiUtils;
+import app.organicmaps.util.UiUtils;
 import app.organicmaps.util.WindowInsetUtils.PaddingInsetsListener;
 import app.organicmaps.widget.WheelProgressView;
 import com.google.android.material.button.MaterialButton;
@@ -52,7 +52,7 @@ public class OnmapDownloader implements MwmActivity.LeftAnimationTrackListener
          continue;

        if (item.newStatus == CountryItem.STATUS_FAILED)
-          MapManager.showError(mActivity, item, null);
+          MapManagerHelper.showError(mActivity, item, null);

        if (mCurrentCountry.id.equals(item.countryId))
        {
@@ -163,7 +163,7 @@ public class OnmapDownloader implements MwmActivity.LeftAnimationTrackListener
                if (TextUtils.equals(mCurrentCountry.id, country)
                    && MapManager.nativeHasSpaceToDownloadCountry(country))
                {
-                  MapManager.startDownload(mCurrentCountry.id);
+                  MapManagerHelper.startDownload(mCurrentCountry.id);
                }
              }
            }
@@ -199,18 +199,18 @@ public class OnmapDownloader implements MwmActivity.LeftAnimationTrackListener
      setAutodownloadLocked(true);
    });
    mButton.setOnClickListener(
-        v -> MapManager.warnOn3g(mActivity, mCurrentCountry == null ? null : mCurrentCountry.id, () -> {
+        v -> MapManagerHelper.warnOn3g(mActivity, mCurrentCountry == null ? null : mCurrentCountry.id, () -> {
          if (mCurrentCountry == null)
            return;

          boolean retry = (mCurrentCountry.status == CountryItem.STATUS_FAILED);
          if (retry)
          {
-            MapManager.retryDownload(mCurrentCountry.id);
+            MapManagerHelper.retryDownload(mCurrentCountry.id);
          }
          else
          {
-            MapManager.startDownload(mCurrentCountry.id);
+            MapManagerHelper.startDownload(mCurrentCountry.id);
            mActivity.requestPostNotificationsPermission();
          }
        }));
--- a/android/app/src/main/java/app/organicmaps/editor/AdvancedTimetableFragment.java
+++ b/android/app/src/main/java/app/organicmaps/editor/AdvancedTimetableFragment.java
@@ -14,9 +14,9 @@ import app.organicmaps.R;
 import app.organicmaps.base.BaseMwmFragment;
 import app.organicmaps.sdk.editor.OpeningHours;
 import app.organicmaps.sdk.util.Constants;
-import app.organicmaps.sdk.util.UiUtils;
 import app.organicmaps.util.Graphics;
 import app.organicmaps.util.InputUtils;
+import app.organicmaps.util.UiUtils;
 import com.google.android.material.imageview.ShapeableImageView;
 import com.google.android.material.textfield.TextInputEditText;
 import com.google.android.material.textview.MaterialTextView;
@@ -87,8 +87,8 @@ public class AdvancedTimetableFragment extends BaseMwmFragment implements View.O
  private void setExampleDrawables(@DrawableRes int left, @DrawableRes int right)
  {
    mExamplesTitle.setCompoundDrawablesRelativeWithIntrinsicBounds(
-        Graphics.tint(requireActivity(), left, androidx.appcompat.R.attr.colorAccent), null,
-        Graphics.tint(requireActivity(), right, androidx.appcompat.R.attr.colorAccent), null);
+        Graphics.tint(requireActivity(), left, com.google.android.material.R.attr.colorSecondary), null,
+        Graphics.tint(requireActivity(), right, com.google.android.material.R.attr.colorSecondary), null);
  }

  @Override
--- a/Show More
+++ b/Show More
				`@@ -0,0 +1 @@`
				`../../../../google/java/app/organicmaps/location`
				`@@ -1 +0,0 @@`
				`../../../../../google/java/app/organicmaps/sdk/location`
				`@@ -0,0 +1 @@`
				`মানচিত্র নেভিগেশন - আপনার যাত্রা সম্পর্কে আরও জানুন - সম্প্রদায় কর্তৃক পরিচালিত`
				`@@ -0,0 +1 @@`
				`কোম্যাপস - অফলাইনে হাইকিং, সাইকেলিং ও ড্রাইভিং`
				`@@ -1 +0,0 @@`
				`সহজ মানচিত্র নেভিগেশন - আপনার যাত্রা সম্পর্কে আরও জানুন - সম্প্রদায় কর্তৃক পরিচালিত`
				`@@ -1 +0,0 @@`
				`কোম্যাপস - অফলাইনে হাইকিং, সাইকেলিং এবং ড্রাইভিং করুন গোপনীয়তা সহ`
				`@@ -1 +0,0 @@`
				`Navigation facile del mappa – Discoperi tu viage – Alimentate per le communitate`
				`@@ -0,0 +1 @@`
				`Lett kart navigasjon - Opplev mere på din reise - Drevet av felleskapet`
				`@@ -0,0 +1 @@`
				`CoMaps - Gå tur, sykkel, kjør - med personvern`
				`@@ -1 +0,0 @@`
				`Navegação fácil nos mapas - Descubra mais sobre o seu percurso - Feito por todos`