[ios] Format all Obj C code via clang-format

Signed-off-by: Konstantin Pastbin <konstantin.pastbin@gmail.com>
[ios] Enable clang-format for Obj C sources
2026-01-03 03:13:48 +00:00 · 2025-08-17 16:37:15 +07:00 · 2025-08-17 16:29:41 +07:00
1482 changed files with 12513 additions and 15134 deletions
--- a/.forgejo/workflows/dco.yml
+++ b/.forgejo/workflows/dco.yml
@@ -1,9 +1,8 @@
-name: DCO
+name: dco
 on: [pull_request]

 jobs:
  check:
-    runs-on: ubuntu-latest
+    runs-on: codeberg-tiny
    steps:
-      - name: Check for Developer Certificate of Origin (DCO) compliance
-        uses: https://github.com/KineticCafe/actions-dco@fb284c903a7673a3d4b0bdd104479a6f0d46dae7 # v1.3.6
+      - uses: https://github.com/KineticCafe/actions-dco@v1
--- a/.forgejo/workflows/linux-check.yaml
+++ b/.forgejo/workflows/linux-check.yaml
@@ -133,14 +133,6 @@ 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/.gitignore
+++ b/.gitignore
@@ -14,10 +14,12 @@ 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/World.mwm
@@ -25,15 +27,11 @@ 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*
-# TODO: designer is not used at the moment
-# data/symbols/*/design/
-# data/colors_design.txt
-# data/patterns_design.txt
+data/classificator.txt
+data/types.txt
+data/visibility.txt
+data/colors.txt
+data/patterns.txt

 # Compiled Python
 *.pyc
--- a/.gitmodules
+++ b/.gitmodules
@@ -65,7 +65,3 @@
 [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,7 +57,6 @@ 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/freetype/CMakeLists.txt
+++ b/3party/freetype/CMakeLists.txt
@@ -4,9 +4,7 @@ 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()
+target_compile_options(freetype PRIVATE -Wno-macro-redefined)

 # 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,23 +11,14 @@ target_include_directories(${PROJECT_NAME}
    harfbuzz/src
 )

-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
-      -fno-exceptions
-      -fno-threadsafe-statics
-      $<$<OR:$<CXX_COMPILER_ID:Clang>,$<CXX_COMPILER_ID:AppleClang>>:-Wno-format-pedantic>
-  )
-endif()
+# Keep these settigns in sync with xcode/harfbuzz project.
+target_compile_options(${PROJECT_NAME}
+  PRIVATE
+    -fno-rtti
+    -fno-exceptions
+    -fno-threadsafe-statics
+    $<$<OR:$<CXX_COMPILER_ID:Clang>,$<CXX_COMPILER_ID:AppleClang>>:-Wno-format-pedantic>
+)

 target_compile_definitions(${PROJECT_NAME}
  PRIVATE
@@ -37,20 +28,14 @@ target_compile_definitions(${PROJECT_NAME}
    #$<$<BOOL:${APPLE}>:HAVE_CORETEXT>
    HAVE_ATEXIT
    HAVE_GETPAGESIZE
+    HAVE_MMAP
    HAVE_MPROTECT
+    HAVE_PTHREAD
    HAVE_SYSCONF
+    HAVE_SYS_MMAN_H
+    HAVE_UNISTD_H
 )

-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)

 add_library(harfbuzz::harfbuzz ALIAS harfbuzz)
--- a/3party/icu/CMakeLists.txt
+++ b/3party/icu/CMakeLists.txt
@@ -172,7 +172,6 @@ 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,7 +11,6 @@ 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,6 +7,7 @@
 #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"

@@ -282,6 +283,12 @@ 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,6 +8,7 @@
 #include <stdint.h>

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

 namespace succinct { namespace util {

@@ -204,6 +205,29 @@ 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,18 +19,7 @@ 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__)
@@ -41,9 +30,6 @@ 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 23)
-set(CMAKE_C_STANDARD 23)
+set(CMAKE_CXX_STANDARD 20)
+set(CMAKE_C_STANDARD 17)
 # Our code does not rely on gnu extensions.
 set(CMAKE_CXX_EXTENSIONS OFF)
 set(CMAKE_C_EXTENSIONS OFF)
@@ -39,16 +39,18 @@ 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 23)
+  set(CMAKE_OBJC_STANDARD 11)
  set(CMAKE_OBJC_FLAGS -fobjc-arc)
  set(CMAKE_OBJC_VISIBILITY_PRESET hidden)
  enable_language(OBJCXX)
  set(CMAKE_OBJCXX_EXTENSIONS OFF)
-  set(CMAKE_OBJCXX_STANDARD 23)
+  set(CMAKE_OBJCXX_STANDARD 20)
  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)
@@ -85,7 +87,7 @@ if (MSVC)
  add_compile_options(/utf-8)
  add_link_options(/INCREMENTAL:NO)
 else()
-  add_compile_options(-ffast-math $<$<CXX_COMPILER_ID:GNU>:-Wno-psabi>)
+  add_compile_options(-ffast-math)
 endif()

 if (PLATFORM_WIN)
@@ -195,7 +197,7 @@ if (USE_PCH)
 endif()

 # Should be on the root level, not in 3party, so tests can get these dependencies.
-if (PLATFORM_LINUX)
+if (PLATFORM_LINUX OR PLATFORM_WIN)
  find_package(ICU COMPONENTS uc i18n data REQUIRED)
  find_package(Freetype REQUIRED)
  find_package(harfbuzz REQUIRED)
--- a/README.md
+++ b/README.md
@@ -19,20 +19,20 @@
 </div>
 <div align="center">
  <p align="center">
-    <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 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>
    <a href="https://github.com/comaps/comaps/actions/workflows/android-check.yaml">
-      <img src="https://img.shields.io/github/actions/workflow/status/comaps/comaps/.github/workflows/android-check.yaml?label=Android%20Build&logo=android&logoColor=white&style=for-the-badge&color=588157" alt="Android Build Status"/>
+      <img src="https://img.shields.io/github/actions/workflow/status/comaps/comaps/.github/workflows/android-check.yaml?label=Android%20Build&logo=android&logoColor=white&style=for-the-badge&color=588157" alt="Android Build Status" style="width: 90%; max-width: 170px;"/>
    </a>
    <a href="https://github.com/comaps/comaps/actions/workflows/ios-check.yaml">
-      <img src="https://img.shields.io/github/actions/workflow/status/comaps/comaps/.github/workflows/ios-check.yaml?label=iOS%20Build&logo=apple&logoColor=white&style=for-the-badge&color=588157" alt="iOS Build Status"/>
+      <img src="https://img.shields.io/github/actions/workflow/status/comaps/comaps/.github/workflows/ios-check.yaml?label=iOS%20Build&logo=apple&logoColor=white&style=for-the-badge&color=588157" alt="iOS Build Status" style="width: 90%; max-width: 145px;"/>
    </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"/>
+      <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;"/>
    </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"/>
+      <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;"/>
    </a>
  </p>
 </div>
@@ -41,6 +41,8 @@

 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"/>
@@ -75,10 +77,9 @@ 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

--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -138,6 +138,8 @@ 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
@@ -1 +0,0 @@
-../../../../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
@@ -0,0 +1 @@
+../../../../../google/java/app/organicmaps/sdk/location
--- 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
-• Markagailuak eta arrastoak esportatu eta inportatu KML, KMZ, GPX formatuetan
+• Laster-markak eta ibilbideak 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/hu-HU/full-description.txt
+++ b/android/app/src/fdroid/play/listings/hu-HU/full-description.txt
@@ -1,32 +0,0 @@
-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/it-IT/full-description.txt
+++ b/android/app/src/fdroid/play/listings/it-IT/full-description.txt
@@ -1,4 +1,4 @@
-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.
+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.

 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 altri punti d'interesse evidenziati
+• Modalità Outdoor con percorsi escursionistici, campeggi, sorgenti d'acqua, picchi, dislivelli ed altro 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/short-description.txt
+++ b/android/app/src/fdroid/play/listings/it-IT/short-description.txt
@@ -1 +1 @@
-Navigazione semplice - Immergiti nella tua avventura - Realizzato dalla comunità
+Navigazione semplice - Immergiti nella tua avventura - Sviluppato 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, rijd offline met privacy
+CoMaps - Wandel, fiets, rijdt 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
@@ -1 +0,0 @@
-Lett kart navigasjon - Opplev mere på din reise - Drevet av felleskapet
--- 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.location;
+package app.organicmaps.sdk.location;

 import static android.Manifest.permission.ACCESS_COARSE_LOCATION;
 import static android.Manifest.permission.ACCESS_FINE_LOCATION;
@@ -10,7 +10,6 @@ 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/sdk/location/LocationProviderFactory.java
+++ b/android/app/src/google/java/app/organicmaps/sdk/location/LocationProviderFactory.java
@@ -1,25 +1,23 @@
-package app.organicmaps.location;
+package app.organicmaps.sdk.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 LocationProviderFactoryImpl implements LocationProviderFactory
+public class LocationProviderFactory
 {
-  private static final String TAG = LocationProviderFactoryImpl.class.getSimpleName();
+  private static final String TAG = LocationProviderFactory.class.getSimpleName();

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

-  public BaseLocationProvider getProvider(@NonNull Context context, @NonNull BaseLocationProvider.Listener listener)
+  public static 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
@@ -1 +0,0 @@
-../../../../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
@@ -0,0 +1 @@
+../../../../../google/java/app/organicmaps/sdk/location
--- a/android/app/src/main/java/app/organicmaps/ChartController.java
+++ b/android/app/src/main/java/app/organicmaps/ChartController.java
@@ -10,8 +10,6 @@ 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;
@@ -33,16 +31,17 @@ import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;

-public class ChartController implements OnChartValueSelectedListener
+public class ChartController implements OnChartValueSelectedListener,
+                                        BookmarkManager.OnElevationActivePointChangedListener,
+                                        BookmarkManager.OnElevationCurrentPositionChangedListener
 {
  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 = 0;
+  private static final int CHART_ANIMATION_DURATION = 1500;
  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
@@ -63,7 +62,6 @@ 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)
  {
@@ -72,6 +70,8 @@ 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,6 +101,13 @@ 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()),
@@ -135,17 +142,15 @@ public class ChartController implements OnChartValueSelectedListener
    mChart.getAxisRight().setEnabled(false);
  }

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

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

-    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);
@@ -168,8 +173,8 @@ public class ChartController implements OnChartValueSelectedListener
    mChart.setData(data);
    mChart.animateX(CHART_ANIMATION_DURATION);

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

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

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

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

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

+  @Override
  public void onElevationActivePointChanged()
  {
    if (mTrackId == Utils.INVALID_ID)
@@ -229,7 +234,6 @@ 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,7 +27,6 @@ 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;
@@ -36,7 +35,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.util.UiUtils;
+import app.organicmaps.sdk.util.UiUtils;
 import app.organicmaps.util.Utils;
 import app.organicmaps.util.WindowInsetUtils.PaddingInsetsListener;
 import com.google.android.material.button.MaterialButton;
@@ -117,10 +116,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 bytesDownloaded)
+        public void onProgress(final int percent)
        {
          if (!isFinishing())
-            mProgress.setProgressCompat(bytesDownloaded, true);
+            mProgress.setProgressCompat(percent, true);
        }

        @Override
@@ -156,9 +155,7 @@ public class DownloadResourcesLegacyActivity extends BaseMwmFragmentActivity
          showMap();
          return;

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

      mProgress.setMax(bytes);
-      // Start progress at 1% according to M3 guidelines
-      mProgress.setProgressCompat(bytes/100, true);
+      mProgress.setProgressCompat(0, true);
    }
    else
      finishFilesDownload(bytes);
@@ -372,11 +368,10 @@ 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);
-        // Start progress at 1% according to M3 guidelines
-        mProgress.setProgressCompat((int) (item.totalSize/100), true);
+        mProgress.setProgressCompat(0, true);

        mCountryDownloadListenerSlot = MapManager.nativeSubscribe(mCountryDownloadListener);
-        MapManagerHelper.startDownload(mCurrentCountry);
+        MapManager.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
@@ -24,8 +24,9 @@ public class MapFragment extends BaseMwmFragment implements View.OnTouchListener
 {
  private static final String TAG = MapFragment.class.getSimpleName();

+  @SuppressWarnings("NonNullFieldNotInitialized")
  @NonNull
-  private final Map mMap = new Map(DisplayType.Device);
+  private Map mMap;

  public void updateCompassOffset(int offsetX, int offsetY)
  {
@@ -86,8 +87,7 @@ public class MapFragment extends BaseMwmFragment implements View.OnTouchListener
  {
    Logger.d(TAG);
    super.onAttach(context);
-
-    mMap.setLocationHelper(MwmApplication.from(requireContext()).getLocationHelper());
+    mMap = new Map(DisplayType.Device, 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,6 +28,7 @@ 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;
@@ -65,6 +66,7 @@ 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;
@@ -97,6 +99,7 @@ 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;
@@ -112,6 +115,7 @@ 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.UiUtils;
 import app.organicmaps.sdk.util.log.Logger;
 import app.organicmaps.sdk.widget.placepage.PlacePageData;
 import app.organicmaps.search.FloatingSearchToolbarController;
@@ -122,7 +126,6 @@ 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;
@@ -287,6 +290,7 @@ public class MwmActivity extends BaseMwmFragmentActivity
    }

    processIntent();
+    migrateOAuthCredentials();
  }

  /**
@@ -341,6 +345,36 @@ 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();
@@ -458,10 +492,12 @@ public class MwmActivity extends BaseMwmFragmentActivity
  @StyleRes
  protected int getThemeResourceId(@NonNull String theme)
  {
-    if (Config.UiTheme.isDefault(theme))
+    Context context = getApplicationContext();
+
+    if (ThemeUtils.isDefaultTheme(context, theme))
      return R.style.MwmTheme_MainActivity;

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

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

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

@@ -593,7 +629,7 @@ public class MwmActivity extends BaseMwmFragmentActivity
      UiUtils.setViewInsetsPaddingBottom(mPointChooser, windowInsets);
      UiUtils.setViewInsetsPaddingNoBottom(mPointChooserToolbar, windowInsets);
      final int trackRecorderOffset =
-          TrackRecorder.nativeIsTrackRecordingEnabled() ? dimen(this, R.dimen.map_button_size) : 0;
+          TrackRecorder.nativeIsTrackRecordingEnabled() ? UiUtils.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
@@ -1647,17 +1683,17 @@ public class MwmActivity extends BaseMwmFragmentActivity
    final int orientation = getResources().getConfiguration().orientation;
    final boolean isTrackRecordingEnabled = TrackRecorder.nativeIsTrackRecordingEnabled();
    if (isTrackRecordingEnabled && (orientation != Configuration.ORIENTATION_LANDSCAPE))
-      offsetY += dimen(this, R.dimen.map_button_size);
+      offsetY += UiUtils.dimen(this, R.dimen.map_button_size);
    if (orientation == Configuration.ORIENTATION_LANDSCAPE)
    {
      if (show)
      {
-        final boolean isSmallScreen = UiUtils.getDisplayTotalHeight(this) < dimen(this, R.dimen.dp_400);
+        final boolean isSmallScreen = UiUtils.getDisplayTotalHeight(this) < UiUtils.dimen(this, R.dimen.dp_400);
        if (!isSmallScreen || TrackRecorder.nativeIsTrackRecordingEnabled())
-          offsetX += dimen(this, R.dimen.map_button_size);
+          offsetX += UiUtils.dimen(this, R.dimen.map_button_size);
      }
      else if (isTrackRecordingEnabled)
-        offsetY += dimen(this, R.dimen.map_button_size);
+        offsetY += UiUtils.dimen(this, R.dimen.map_button_size);
    }
    updateCompassOffset(offsetY, offsetX);
  }
@@ -2456,7 +2492,7 @@ public class MwmActivity extends BaseMwmFragmentActivity
    if (mCurrentWindowInsets != null)
    {
      final int offset = mCurrentWindowInsets.getInsets(WindowInsetsCompat.Type.systemBars()).top;
-      updateCompassOffset(offset + dimen(this, R.dimen.map_button_size));
+      updateCompassOffset(offset + UiUtils.dimen(this, R.dimen.map_button_size));
    }
    Toast.makeText(this, R.string.track_recording, Toast.LENGTH_SHORT).show();
    TrackRecordingService.startForegroundService(getApplicationContext());
@@ -2549,7 +2585,7 @@ public class MwmActivity extends BaseMwmFragmentActivity
      items.add(new MenuBottomSheetItem(R.string.download_maps, R.drawable.ic_download, getDownloadMapsCounter(),
                                        this::onDownloadMapsOptionSelected));

-      mDonatesUrl = Utils.getDonateUrl(getApplicationContext());
+      mDonatesUrl = Config.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,10 +14,8 @@ 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.sdk.Map;
@@ -43,9 +41,6 @@ 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;
@@ -104,12 +99,6 @@ public class MwmApplication extends Application implements Application.ActivityL
    return mOrganicMaps;
  }

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

    sInstance = this;

-    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);
+    mOrganicMaps = new OrganicMaps(getApplicationContext());

    ConnectionState.INSTANCE.initialize(this);

--- a/android/app/src/main/java/app/organicmaps/PanelAnimator.java
+++ b/android/app/src/main/java/app/organicmaps/PanelAnimator.java
@@ -9,8 +9,7 @@ import androidx.annotation.IntegerRes;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.fragment.app.Fragment;
-import app.organicmaps.sdk.util.Utils;
-import app.organicmaps.util.UiUtils;
+import app.organicmaps.sdk.util.UiUtils;
 import org.chromium.base.ObserverList;

 class PanelAnimator
@@ -27,7 +26,7 @@ class PanelAnimator
  PanelAnimator(MwmActivity activity)
  {
    mActivity = activity;
-    mWidth = Utils.dimen(activity.getApplicationContext(), R.dimen.panel_width);
+    mWidth = UiUtils.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,10 +60,11 @@ public class SplashActivity extends AppCompatActivity
  {
    super.onCreate(savedInstanceState);

-    final String theme = Config.UiTheme.getCurrent();
-    if (Config.UiTheme.isDefault(theme))
+    final Context context = getApplicationContext();
+    final String theme = Config.getCurrentUiTheme(context);
+    if (ThemeUtils.isDefaultTheme(context, theme))
      setTheme(R.style.MwmTheme_Splash);
-    else if (Config.UiTheme.isNight(theme))
+    else if (ThemeUtils.isNightTheme(context, 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.util.UiUtils;
+import app.organicmaps.sdk.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,7 +1,6 @@
 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;

@@ -16,8 +15,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;
@@ -51,14 +50,14 @@ public class BackupUtils

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

    SpannableStringBuilder sb = new SpannableStringBuilder();
-    sb.append(volumeName + ": \n", new AbsoluteSizeSpan(dimen(context, R.dimen.text_size_body_3)),
+    sb.append(volumeName + ": \n", new AbsoluteSizeSpan(UiUtils.dimen(context, R.dimen.text_size_body_3)),
              Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
-    sb.append("/" + subPath, new AbsoluteSizeSpan(dimen(context, R.dimen.text_size_body_4)),
+    sb.append("/" + subPath, new AbsoluteSizeSpan(UiUtils.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() ? getFullscreenDarkTheme() : getFullscreenLightTheme();
+    return ThemeUtils.isNightTheme(requireContext()) ? 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,6 +1,7 @@
 package app.organicmaps.base;

 import android.content.ComponentName;
+import android.content.Context;
 import android.content.Intent;
 import android.graphics.Color;
 import android.media.AudioManager;
@@ -23,6 +24,7 @@ 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;

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

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

    throw new IllegalArgumentException("Attempt to apply unsupported theme: " + theme);
@@ -58,7 +62,7 @@ public abstract class BaseMwmFragmentActivity extends AppCompatActivity
  protected final void onCreate(@Nullable Bundle savedInstanceState)
  {
    super.onCreate(savedInstanceState);
-    mThemeName = Config.UiTheme.getCurrent();
+    mThemeName = Config.getCurrentUiTheme(getApplicationContext());
    setTheme(getThemeResourceId(mThemeName));
    EdgeToEdge.enable(this, SystemBarStyle.dark(Color.TRANSPARENT));
    RtlUtils.manageRtl(this);
@@ -118,7 +122,7 @@ public abstract class BaseMwmFragmentActivity extends AppCompatActivity
  public void onPostResume()
  {
    super.onPostResume();
-    if (!mThemeName.equals(Config.UiTheme.getCurrent()))
+    if (!mThemeName.equals(Config.getCurrentUiTheme(getApplicationContext())))
    {
      // 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.util.UiUtils;
+import app.organicmaps.sdk.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.util.UiUtils;
+import app.organicmaps.sdk.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(theme);
+    return ThemeUtils.getWindowBgThemeResourceId(getApplicationContext(), 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.util.UiUtils;
+import app.organicmaps.sdk.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(theme);
+    return ThemeUtils.getCardBgThemeResourceId(getApplicationContext(), 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,16 @@ 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;
--- 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.util.UiUtils;
+import app.organicmaps.sdk.util.UiUtils;

 public class ChooseBookmarksSortingTypeFragment
    extends BaseMwmDialogFragment implements RadioGroup.OnCheckedChangeListener
--- 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/SurfaceRenderer.java
+++ b/android/app/src/main/java/app/organicmaps/car/SurfaceRenderer.java
@@ -31,7 +31,7 @@ public class SurfaceRenderer implements DefaultLifecycleObserver, SurfaceCallbac
  private final CarContext mCarContext;

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

  @NonNull
  private Rect mVisibleArea = new Rect();
@@ -45,6 +45,7 @@ public class SurfaceRenderer implements DefaultLifecycleObserver, SurfaceCallbac
  {
    Logger.d(TAG, "SurfaceRenderer()");
    mCarContext = carContext;
+    mMap = new Map(Car, MwmApplication.from(mCarContext).getLocationHelper());
    mIsRunning = true;
    lifecycle.addObserver(this);
    mMap.setMapRenderingListener(this);
@@ -59,7 +60,6 @@ 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
@@ -73,7 +73,8 @@ public class NavigationScreen extends BaseMapScreen implements RoutingController
  public Template onGetTemplate()
  {
    final NavigationTemplate.Builder builder = new NavigationTemplate.Builder();
-    builder.setBackgroundColor(Colors.NAVIGATION_TEMPLATE_BACKGROUND);
+    builder.setBackgroundColor(ThemeUtils.isNightMode(getCarContext()) ? Colors.NAVIGATION_TEMPLATE_BACKGROUND_NIGHT
+                                                                       : Colors.NAVIGATION_TEMPLATE_BACKGROUND_DAY);
    builder.setActionStrip(createActionStrip());
    builder.setMapActionStrip(UiHelpers.createMapActionStrip(getCarContext(), getSurfaceRenderer()));

--- 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,7 +12,6 @@ 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;
@@ -170,7 +169,7 @@ class DownloaderScreen extends BaseScreen
    mIsDownloadFailed = true;
    final ErrorScreen.Builder builder = new ErrorScreen.Builder(getCarContext())
                                            .setTitle(R.string.country_status_download_failed)
-                                            .setErrorMessage(MapManagerHelper.getErrorCodeStrRes(data.errorCode))
+                                            .setErrorMessage(MapManager.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,7 +11,8 @@ 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 = 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 BUTTON_ACCEPT = CarColor.GREEN;

  private Colors() {}
--- a/android/app/src/main/java/app/organicmaps/car/util/ThemeUtils.java
+++ b/android/app/src/main/java/app/organicmaps/car/util/ThemeUtils.java
@@ -10,20 +10,19 @@ import androidx.car.app.CarContext;
 import app.organicmaps.R;
 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, Config.UiTheme.AUTO),
-    LIGHT(R.string.off, Config.UiTheme.DEFAULT),
-    NIGHT(R.string.on, Config.UiTheme.NIGHT);
+    AUTO(R.string.auto, R.string.theme_auto),
+    LIGHT(R.string.off, R.string.theme_default),
+    NIGHT(R.string.on, R.string.theme_night);

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

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

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

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

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

  @NonNull
  public static ThemeMode getThemeMode(@NonNull CarContext context)
  {
-    final String themeMode = getSharedPreferences(context).getString(THEME_KEY, ThemeMode.AUTO.getConfig());
+    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);

-    if (themeMode.equals(ThemeMode.AUTO.getConfig()))
+    if (themeMode.equals(autoTheme))
      return ThemeMode.AUTO;
-    else if (themeMode.equals(ThemeMode.LIGHT.getConfig()))
+    else if (themeMode.equals(lightTheme))
      return ThemeMode.LIGHT;
-    else if (themeMode.equals(ThemeMode.NIGHT.getConfig()))
+    else if (themeMode.equals(nightTheme))
      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.util.UiUtils;
+import app.organicmaps.sdk.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)
    {
-      MapManagerHelper.warn3gAndDownload(mFragment.requireActivity(), mFragment.getCurrentRoot(), null);
+      MapManager.warn3gAndDownload(mFragment.requireActivity(), mFragment.getCurrentRoot(), null);
    }
  };

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

@@ -58,7 +55,7 @@ class BottomPanel
    @Override
    public void onClick(View v)
    {
-      MapManagerHelper.warn3gAndRetry(mFragment.requireActivity(), mFragment.getCurrentRoot(), null);
+      MapManager.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.util.UiUtils;
+import app.organicmaps.sdk.util.UiUtils;
 import app.organicmaps.widget.WheelProgressView;
 import com.google.android.material.button.MaterialButton;
 import com.google.android.material.textview.MaterialTextView;
@@ -198,8 +198,7 @@ public class CountrySuggestFragment extends BaseMwmFragment implements View.OnCl
    final int id = v.getId();
    if (id == R.id.btn__download_map)
    {
-      MapManagerHelper.warn3gAndDownload(requireActivity(), mCurrentCountry.id,
-                                         () -> mDownloadingCountry = mCurrentCountry);
+      MapManager.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
@@ -24,7 +24,7 @@ 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.util.UiUtils;
+import app.organicmaps.sdk.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)
  {
-    MapManagerHelper.warn3gAndDownload(adapter.mActivity, item.id, null);
+    MapManager.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;
-    MapManagerHelper.warnOn3gUpdate(adapter.mActivity, item.id, () -> MapManagerHelper.startUpdate(item.id));
+    MapManager.warnOn3gUpdate(adapter.mActivity, item.id, () -> MapManager.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)
        {
-          MapManagerHelper.showError(mActivity, item, null);
+          MapManager.showError(mActivity, item, null);
          break;
        }
      }
@@ -382,12 +382,9 @@ class DownloaderAdapter extends RecyclerView.Adapter<DownloaderAdapter.ViewHolde
        else
          processLongClick();
      }
-      case CountryItem.STATUS_FAILED ->
-      {
-        MapManagerHelper.warn3gAndRetry(mActivity, mItem.id, null);
-      }
+      case CountryItem.STATUS_FAILED -> MapManager.warn3gAndRetry(mActivity, mItem.id, null);
      case CountryItem.STATUS_UPDATABLE ->
-        MapManagerHelper.warnOn3gUpdate(mActivity, mItem.id, () -> MapManagerHelper.startUpdate(mItem.id));
+        MapManager.warnOn3gUpdate(mActivity, mItem.id, () -> MapManager.startUpdate(mItem.id));
      default -> throw new IllegalArgumentException("Inappropriate item status: " + mItem.status);
      }
    }
--- a/android/app/src/main/java/app/organicmaps/downloader/DownloaderInsetsListener.java
+++ b/android/app/src/main/java/app/organicmaps/downloader/DownloaderInsetsListener.java
@@ -9,8 +9,7 @@ import androidx.core.view.OnApplyWindowInsetsListener;
 import androidx.core.view.WindowInsetsCompat;
 import androidx.recyclerview.widget.RecyclerView;
 import app.organicmaps.R;
-import app.organicmaps.sdk.util.Utils;
-import app.organicmaps.util.UiUtils;
+import app.organicmaps.sdk.util.UiUtils;
 import app.organicmaps.util.WindowInsetUtils;

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

  private void applyInsetsToButtons(Insets insets)
  {
-    int baseMargin = Utils.dimen(mContext, R.dimen.margin_base);
+    int baseMargin = UiUtils.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,7 +20,6 @@ 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
 {
@@ -30,8 +29,7 @@ public class DownloaderNotifier
  public static final int NOTIFICATION_ID = 1;

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

  public DownloaderNotifier(Context context)
  {
@@ -47,7 +45,6 @@ public class DownloaderNotifier
            .setShowBadge(true)
            .setVibrationEnabled(false)
            .setLightsEnabled(false)
-            .setSound(null, null)
            .build();
    notificationManager.createNotificationChannel(channel);
  }
@@ -65,6 +62,8 @@ 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)
@@ -75,7 +74,7 @@ public class DownloaderNotifier
                                          .setContentText(content)
                                          .setShowWhen(true)
                                          .setTicker(getTicker(mContext, title, content))
-                                          .setContentIntent(getNotificationPendingIntent(countryId))
+                                          .setContentIntent(contentPendingIntent)
                                          .setOnlyAlertOnce(true)
                                          .build();

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

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

-      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(mContext.getString(R.string.app_name))
-              .setContentIntent(getNotificationPendingIntent(countryId))
-              .setContentText(mContext.getString(R.string.downloader_downloading) + " " + countryName)
-              .setSound(null);
-    }
-    return mProgressNotificationBuilder;
+    return 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));
  }

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

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

  @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.util.UiUtils;
+import app.organicmaps.sdk.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
@@ -1,223 +0,0 @@
-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
@@ -15,7 +15,7 @@ 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.util.UiUtils;
+import app.organicmaps.sdk.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)
-          MapManagerHelper.showError(mActivity, item, null);
+          MapManager.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))
                {
-                  MapManagerHelper.startDownload(mCurrentCountry.id);
+                  MapManager.startDownload(mCurrentCountry.id);
                }
              }
            }
@@ -199,18 +199,18 @@ public class OnmapDownloader implements MwmActivity.LeftAnimationTrackListener
      setAutodownloadLocked(true);
    });
    mButton.setOnClickListener(
-        v -> MapManagerHelper.warnOn3g(mActivity, mCurrentCountry == null ? null : mCurrentCountry.id, () -> {
+        v -> MapManager.warnOn3g(mActivity, mCurrentCountry == null ? null : mCurrentCountry.id, () -> {
          if (mCurrentCountry == null)
            return;

          boolean retry = (mCurrentCountry.status == CountryItem.STATUS_FAILED);
          if (retry)
          {
-            MapManagerHelper.retryDownload(mCurrentCountry.id);
+            MapManager.retryDownload(mCurrentCountry.id);
          }
          else
          {
-            MapManagerHelper.startDownload(mCurrentCountry.id);
+            MapManager.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;
--- a/android/app/src/main/java/app/organicmaps/editor/EditorFragment.java
+++ b/android/app/src/main/java/app/organicmaps/editor/EditorFragment.java
@@ -29,10 +29,10 @@ import app.organicmaps.sdk.editor.data.LocalizedName;
 import app.organicmaps.sdk.editor.data.LocalizedStreet;
 import app.organicmaps.sdk.editor.data.Timetable;
 import app.organicmaps.sdk.util.StringUtils;
+import app.organicmaps.sdk.util.UiUtils;
 import app.organicmaps.sdk.util.Utils;
 import app.organicmaps.util.Graphics;
 import app.organicmaps.util.InputUtils;
-import app.organicmaps.util.UiUtils;
 import com.google.android.material.dialog.MaterialAlertDialogBuilder;
 import com.google.android.material.imageview.ShapeableImageView;
 import com.google.android.material.textfield.TextInputEditText;
@@ -236,11 +236,6 @@ public class EditorFragment extends BaseMwmFragment implements View.OnClickListe
    return true;
  }

-  boolean saveEdits()
-  {
-    return setEdits() && beforeSavingValidation();
-  }
-
  @NonNull
  protected String getDescription()
  {
@@ -287,19 +282,6 @@ public class EditorFragment extends BaseMwmFragment implements View.OnClickListe
    return validateNames();
  }

-  private boolean beforeSavingValidation()
-  {
-    // Validation to make sure address features have a house number
-    if (!Editor.nativeCheckHouseNumberWhenIsAddress())
-    {
-      mHouseNumber.requestFocus();
-      UiUtils.setInputError(mInputHouseNumber, R.string.error_enter_correct_house_number);
-      InputUtils.showKeyboard(mHouseNumber);
-      return false;
-    }
-    return true;
-  }
-
  private boolean validateNames()
  {
    for (int pos = 0; pos < mNamesAdapter.getItemCount(); pos++)
--- a/android/app/src/main/java/app/organicmaps/editor/EditorHostFragment.java
+++ b/android/app/src/main/java/app/organicmaps/editor/EditorHostFragment.java
@@ -1,5 +1,6 @@
 package app.organicmaps.editor;

+import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
 import android.text.TextUtils;
@@ -24,7 +25,7 @@ import app.organicmaps.sdk.editor.data.Language;
 import app.organicmaps.sdk.editor.data.LocalizedName;
 import app.organicmaps.sdk.editor.data.LocalizedStreet;
 import app.organicmaps.sdk.editor.data.NamesDataSource;
-import app.organicmaps.util.UiUtils;
+import app.organicmaps.sdk.util.UiUtils;
 import app.organicmaps.util.Utils;
 import app.organicmaps.util.WindowInsetUtils.PaddingInsetsListener;
 import app.organicmaps.widget.SearchToolbarController;
@@ -275,11 +276,6 @@ public class EditorHostFragment
    return ((EditorFragment) getChildFragmentManager().findFragmentByTag(EditorFragment.class.getName())).setEdits();
  }

-  private boolean saveEdits()
-  {
-    return ((EditorFragment) getChildFragmentManager().findFragmentByTag(EditorFragment.class.getName())).saveEdits();
-  }
-
  @Override
  public void onClick(View v)
  {
@@ -314,7 +310,7 @@ public class EditorHostFragment
      case LANGUAGE -> editMapObject();
      case MAP_OBJECT ->
      {
-        if (!saveEdits())
+        if (!setEdits())
          return;

        // Save object edits
--- a/android/app/src/main/java/app/organicmaps/editor/FeatureCategoryAdapter.java
+++ b/android/app/src/main/java/app/organicmaps/editor/FeatureCategoryAdapter.java
@@ -10,7 +10,7 @@ import androidx.recyclerview.widget.RecyclerView;
 import app.organicmaps.R;
 import app.organicmaps.sdk.editor.data.FeatureCategory;
 import app.organicmaps.sdk.util.StringUtils;
-import app.organicmaps.util.UiUtils;
+import app.organicmaps.sdk.util.UiUtils;
 import com.google.android.material.textfield.TextInputEditText;
 import com.google.android.material.textview.MaterialTextView;

@@ -55,23 +55,20 @@ public class FeatureCategoryAdapter extends RecyclerView.Adapter<RecyclerView.Vi
  @Override
  public RecyclerView.ViewHolder onCreateViewHolder(ViewGroup parent, int viewType)
  {
-    final LayoutInflater inflater = LayoutInflater.from(parent.getContext());
-
    switch (viewType)
    {
    case TYPE_CATEGORY ->
    {
-      return new FeatureViewHolder(inflater.inflate(R.layout.item_feature_category, parent, false));
+      return new FeatureViewHolder(
+          LayoutInflater.from(parent.getContext()).inflate(R.layout.item_feature_category, parent, false));
    }
    case TYPE_FOOTER ->
    {
-      return new FooterViewHolder(inflater.inflate(R.layout.item_feature_category_footer, parent, false),
-                                  (FooterListener) mFragment);
-    }
-    default ->
-    {
-      throw new IllegalArgumentException("Unsupported viewType: " + viewType);
+      return new FooterViewHolder(
+          LayoutInflater.from(parent.getContext()).inflate(R.layout.item_feature_category_footer, parent, false),
+          (FooterListener) mFragment);
    }
+    default -> throw new IllegalArgumentException("Unsupported");
    }
  }

--- a/android/app/src/main/java/app/organicmaps/editor/FeatureCategoryFragment.java
+++ b/android/app/src/main/java/app/organicmaps/editor/FeatureCategoryFragment.java
@@ -130,6 +130,13 @@ public class FeatureCategoryFragment
  @Override
  public void onSendNoteClicked()
  {
+    if (!OsmOAuth.isAuthorized())
+    {
+      final Intent intent = new Intent(requireActivity(), OsmLoginActivity.class);
+      startActivity(intent);
+      return;
+    }
+
    final double[] center = Framework.nativeGetScreenRectCenter();
    final double lat = center[0];
    final double lon = center[1];
@@ -143,13 +150,6 @@ public class FeatureCategoryFragment
      Editor.nativeCreateStandaloneNote(lat, lon, mPendingNoteText);
      mPendingNoteText = "";
      Toast.makeText(requireContext(), R.string.osm_note_toast, Toast.LENGTH_SHORT).show();
-
-      if (!OsmOAuth.isAuthorized())
-      {
-        final Intent intent = new Intent(requireActivity(), OsmLoginActivity.class);
-        startActivity(intent);
-      }
-
      requireActivity().finish();
    }
  }
@@ -170,13 +170,6 @@ public class FeatureCategoryFragment
                             Editor.nativeCreateStandaloneNote(lat, lon, noteText);
                             mPendingNoteText = "";
                             Toast.makeText(requireContext(), R.string.osm_note_toast, Toast.LENGTH_SHORT).show();
-
-                             if (!OsmOAuth.isAuthorized())
-                             {
-                               final Intent intent = new Intent(requireActivity(), OsmLoginActivity.class);
-                               startActivity(intent);
-                             }
-
                             requireActivity().finish();
                           })
        .setNegativeButton(R.string.cancel, null)
--- a/android/app/src/main/java/app/organicmaps/editor/HoursMinutesPickerFragment.java
+++ b/android/app/src/main/java/app/organicmaps/editor/HoursMinutesPickerFragment.java
@@ -79,8 +79,8 @@ public class HoursMinutesPickerFragment extends BaseMwmDialogFragment
    mTabs.getTabAt(mSelectedTab).select();

    @StyleRes
-    final int theme = ThemeUtils.isNightTheme() ? R.style.MwmMain_DialogFragment_TimePicker_Night
-                                                : R.style.MwmMain_DialogFragment_TimePicker;
+    final int theme = ThemeUtils.isNightTheme(requireContext()) ? R.style.MwmMain_DialogFragment_TimePicker_Night
+                                                                : R.style.MwmMain_DialogFragment_TimePicker;
    final AlertDialog dialog = new MaterialAlertDialogBuilder(requireActivity(), theme)
                                   .setView(root)
                                   .setNegativeButton(R.string.cancel, null)
@@ -141,15 +141,15 @@ public class HoursMinutesPickerFragment extends BaseMwmDialogFragment
    MaterialTextView tabView = (MaterialTextView) inflater.inflate(R.layout.tab_timepicker, mTabs, false);
    tabView.setText(getResources().getString(R.string.editor_time_from));
    final ColorStateList textColor = AppCompatResources.getColorStateList(
-        requireContext(),
-        ThemeUtils.isNightTheme() ? R.color.accent_color_selector_night : R.color.accent_color_selector);
+        requireContext(), ThemeUtils.isNightTheme(requireContext()) ? R.color.accent_color_selector_night
+                                                                    : R.color.accent_color_selector);
    tabView.setTextColor(textColor);
    mTabs.addTab(mTabs.newTab().setCustomView(tabView), true);
    tabView = (MaterialTextView) inflater.inflate(R.layout.tab_timepicker, mTabs, false);
    tabView.setText(getResources().getString(R.string.editor_time_to));
    tabView.setTextColor(textColor);
    mTabs.addTab(mTabs.newTab().setCustomView(tabView), true);
-    mTabs.addOnTabSelectedListener(new TabLayout.OnTabSelectedListener() {
+    mTabs.setOnTabSelectedListener(new TabLayout.OnTabSelectedListener() {
      @Override
      public void onTabSelected(TabLayout.Tab tab)
      {
--- a/android/app/src/main/java/app/organicmaps/editor/MultilanguageAdapter.java
+++ b/android/app/src/main/java/app/organicmaps/editor/MultilanguageAdapter.java
@@ -10,7 +10,7 @@ import app.organicmaps.sdk.editor.Editor;
 import app.organicmaps.sdk.editor.data.Language;
 import app.organicmaps.sdk.editor.data.LocalizedName;
 import app.organicmaps.sdk.util.StringUtils;
-import app.organicmaps.util.UiUtils;
+import app.organicmaps.sdk.util.UiUtils;
 import app.organicmaps.util.Utils;
 import com.google.android.material.textfield.TextInputEditText;
 import com.google.android.material.textfield.TextInputLayout;
--- a/android/sdk/src/main/java/app/organicmaps/sdk/editor/OhState.java
+++ b/android/sdk/src/main/java/app/organicmaps/sdk/editor/OhState.java
@@ -1,4 +1,4 @@
-package app.organicmaps.sdk.editor;
+package app.organicmaps.editor;

 import androidx.annotation.Keep;

--- a/android/app/src/main/java/app/organicmaps/editor/OsmLoginFragment.java
+++ b/android/app/src/main/java/app/organicmaps/editor/OsmLoginFragment.java
@@ -15,11 +15,10 @@ import app.organicmaps.R;
 import app.organicmaps.base.BaseMwmToolbarFragment;
 import app.organicmaps.sdk.editor.OsmOAuth;
 import app.organicmaps.sdk.util.Constants;
-import app.organicmaps.sdk.util.DateUtils;
+import app.organicmaps.sdk.util.UiUtils;
 import app.organicmaps.sdk.util.concurrency.ThreadPool;
 import app.organicmaps.sdk.util.concurrency.UiThread;
 import app.organicmaps.util.InputUtils;
-import app.organicmaps.util.UiUtils;
 import app.organicmaps.util.Utils;
 import app.organicmaps.util.WindowInsetUtils.ScrollableContentInsetsListener;
 import com.google.android.material.button.MaterialButton;
--- a/android/app/src/main/java/app/organicmaps/editor/PhoneListAdapter.java
+++ b/android/app/src/main/java/app/organicmaps/editor/PhoneListAdapter.java
@@ -9,7 +9,7 @@ import androidx.recyclerview.widget.RecyclerView;
 import app.organicmaps.R;
 import app.organicmaps.sdk.editor.Editor;
 import app.organicmaps.sdk.util.StringUtils;
-import app.organicmaps.util.UiUtils;
+import app.organicmaps.sdk.util.UiUtils;
 import com.google.android.material.imageview.ShapeableImageView;
 import com.google.android.material.textfield.TextInputEditText;
 import com.google.android.material.textfield.TextInputLayout;
--- a/android/app/src/main/java/app/organicmaps/editor/ProfileFragment.java
+++ b/android/app/src/main/java/app/organicmaps/editor/ProfileFragment.java
@@ -11,17 +11,14 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.core.view.ViewCompat;
 import androidx.core.view.WindowInsetsCompat;
-import androidx.fragment.app.FragmentManager;
 import app.organicmaps.R;
 import app.organicmaps.base.BaseMwmToolbarFragment;
 import app.organicmaps.sdk.editor.OsmOAuth;
-import app.organicmaps.sdk.util.NetworkPolicy;
+import app.organicmaps.sdk.util.UiUtils;
 import app.organicmaps.sdk.util.concurrency.ThreadPool;
 import app.organicmaps.sdk.util.concurrency.UiThread;
-import app.organicmaps.util.UiUtils;
 import app.organicmaps.util.Utils;
 import app.organicmaps.util.WindowInsetUtils;
-import app.organicmaps.widget.StackedButtonDialogFragment;
 import com.google.android.material.dialog.MaterialAlertDialogBuilder;
 import com.google.android.material.imageview.ShapeableImageView;
 import com.google.android.material.textview.MaterialTextView;
@@ -29,24 +26,6 @@ import java.text.NumberFormat;

 public class ProfileFragment extends BaseMwmToolbarFragment
 {
-  @NonNull
-  private static final NetworkPolicy.DialogPresenter mDialogPresenter = new NetworkPolicy.DialogPresenter() {
-    @Override
-    public void showDialogIfNeeded(@NonNull FragmentManager fragmentManager,
-                                   @NonNull NetworkPolicy.NetworkPolicyListener listener, @NonNull NetworkPolicy policy,
-                                   boolean isToday)
-    {
-      StackedButtonDialogFragment.showDialogIfNeeded(fragmentManager, listener, policy, isToday);
-    }
-
-    @Override
-    public void showDialog(@NonNull FragmentManager fragmentManager,
-                           @NonNull NetworkPolicy.NetworkPolicyListener listener)
-    {
-      StackedButtonDialogFragment.showDialog(fragmentManager, listener);
-    }
-  };
-
  private View mUserInfoBlock;
  private MaterialTextView mEditsSent;
  private MaterialTextView mProfileName;
@@ -105,7 +84,7 @@ public class ProfileFragment extends BaseMwmToolbarFragment
          UiUtils.show(mProfileInfoLoading);
          UiUtils.hide(mUserInfoBlock);
        }
-        final int profileEditCount = OsmOAuth.getOsmChangesetsCount(mDialogPresenter, getParentFragmentManager());
+        final int profileEditCount = OsmOAuth.getOsmChangesetsCount(getParentFragmentManager());
        final String profileUsername = OsmOAuth.getUsername();
        final Bitmap profilePicture = OsmOAuth.getProfilePicture();

--- a/android/app/src/main/java/app/organicmaps/editor/ReportFragment.java
+++ b/android/app/src/main/java/app/organicmaps/editor/ReportFragment.java
@@ -11,7 +11,7 @@ import androidx.core.view.ViewCompat;
 import app.organicmaps.R;
 import app.organicmaps.base.BaseMwmToolbarFragment;
 import app.organicmaps.sdk.editor.Editor;
-import app.organicmaps.util.UiUtils;
+import app.organicmaps.sdk.util.UiUtils;
 import app.organicmaps.util.WindowInsetUtils.ScrollableContentInsetsListener;
 import com.google.android.material.textfield.TextInputEditText;

--- a/android/app/src/main/java/app/organicmaps/editor/SimpleTimetableAdapter.java
+++ b/android/app/src/main/java/app/organicmaps/editor/SimpleTimetableAdapter.java
@@ -18,8 +18,7 @@ import app.organicmaps.sdk.editor.OpeningHours;
 import app.organicmaps.sdk.editor.data.HoursMinutes;
 import app.organicmaps.sdk.editor.data.Timespan;
 import app.organicmaps.sdk.editor.data.Timetable;
-import app.organicmaps.sdk.util.Utils;
-import app.organicmaps.util.UiUtils;
+import app.organicmaps.sdk.util.UiUtils;
 import com.google.android.material.button.MaterialButton;
 import com.google.android.material.checkbox.MaterialCheckBox;
 import com.google.android.material.textview.MaterialTextView;
@@ -225,7 +224,7 @@ class SimpleTimetableAdapter extends RecyclerView.Adapter<SimpleTimetableAdapter
            LayoutInflater.from(itemView.getContext()).inflate(R.layout.item_timetable_closed_hours, closedHost, false);
        closedHost.addView(
            span, new LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT,
-                                                Utils.dimen(closedHost.getContext(), R.dimen.editor_height_closed)));
+                                                UiUtils.dimen(closedHost.getContext(), R.dimen.editor_height_closed)));
        closedHours[i] = span;
        final int finalI = i;
        span.findViewById(R.id.iv__remove_closed)
--- a/android/app/src/main/java/app/organicmaps/editor/StreetAdapter.java
+++ b/android/app/src/main/java/app/organicmaps/editor/StreetAdapter.java
@@ -10,7 +10,7 @@ import app.organicmaps.MwmApplication;
 import app.organicmaps.R;
 import app.organicmaps.dialog.EditTextDialogFragment;
 import app.organicmaps.sdk.editor.data.LocalizedStreet;
-import app.organicmaps.util.UiUtils;
+import app.organicmaps.sdk.util.UiUtils;
 import com.google.android.material.radiobutton.MaterialRadioButton;
 import com.google.android.material.textview.MaterialTextView;

--- a/android/app/src/main/java/app/organicmaps/editor/TimetableContainerFragment.java
+++ b/android/app/src/main/java/app/organicmaps/editor/TimetableContainerFragment.java
@@ -15,7 +15,7 @@ import androidx.fragment.app.FragmentActivity;
 import app.organicmaps.R;
 import app.organicmaps.base.BaseMwmFragment;
 import app.organicmaps.sdk.editor.OpeningHours;
-import app.organicmaps.util.UiUtils;
+import app.organicmaps.sdk.util.UiUtils;
 import com.google.android.material.dialog.MaterialAlertDialogBuilder;
 import com.google.android.material.textview.MaterialTextView;

--- a/android/app/src/main/java/app/organicmaps/help/HelpFragment.java
+++ b/android/app/src/main/java/app/organicmaps/help/HelpFragment.java
@@ -24,8 +24,6 @@ import app.organicmaps.util.Graphics;
 import app.organicmaps.util.SharingUtils;
 import app.organicmaps.util.Utils;
 import app.organicmaps.util.WindowInsetUtils.ScrollableContentInsetsListener;
-import com.google.android.material.button.MaterialButton;
-import com.google.android.material.textview.MaterialTextView;

 public class HelpFragment extends BaseMwmFragment implements View.OnClickListener
 {
@@ -43,15 +41,15 @@ public class HelpFragment extends BaseMwmFragment implements View.OnClickListene
  @Override
  public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState)
  {
-    mDonateUrl = Utils.getDonateUrl(requireContext());
+    mDonateUrl = Config.getDonateUrl(requireContext());
    View root = inflater.inflate(R.layout.about, container, false);

-    ((MaterialTextView) root.findViewById(R.id.version)).setText(BuildConfig.VERSION_NAME);
+    ((TextView) root.findViewById(R.id.version)).setText(BuildConfig.VERSION_NAME);

    final boolean isLandscape = getResources().getConfiguration().orientation == Configuration.ORIENTATION_LANDSCAPE;

    final String dataVersion = DateUtils.getShortDateFormatter().format(Framework.getDataVersion());
-    final MaterialTextView osmPresentationView = root.findViewById(R.id.osm_presentation);
+    final TextView osmPresentationView = root.findViewById(R.id.osm_presentation);
    if (osmPresentationView != null)
    {
      osmPresentationView.setText(getString(R.string.osm_presentation, dataVersion));
@@ -73,13 +71,13 @@ public class HelpFragment extends BaseMwmFragment implements View.OnClickListene
    setupItem(R.id.report, isLandscape, root);
    setupItem(R.id.copyright, false, root);

-    final MaterialTextView supportUsView = root.findViewById(R.id.support_us);
+    final TextView supportUsView = root.findViewById(R.id.support_us);
    if (BuildConfig.FLAVOR.equals("google") && !TextUtils.isEmpty(mDonateUrl))
      supportUsView.setVisibility(View.GONE);
    else
      setupItem(R.id.support_us, true, root);

-    final MaterialButton donateView = root.findViewById(R.id.donate);
+    final TextView donateView = root.findViewById(R.id.donate);
    if (TextUtils.isEmpty(mDonateUrl))
      donateView.setVisibility(View.GONE);
    else
--- a/android/app/src/main/java/app/organicmaps/maplayer/LayersAdapter.java
+++ b/android/app/src/main/java/app/organicmaps/maplayer/LayersAdapter.java
@@ -8,7 +8,7 @@ import androidx.annotation.NonNull;
 import androidx.recyclerview.widget.RecyclerView;
 import app.organicmaps.R;
 import app.organicmaps.sdk.util.SharedPropertiesUtils;
-import app.organicmaps.util.UiUtils;
+import app.organicmaps.sdk.util.UiUtils;
 import java.util.List;

 public class LayersAdapter extends RecyclerView.Adapter<LayerHolder>
--- a/android/app/src/main/java/app/organicmaps/maplayer/MapButtonsController.java
+++ b/android/app/src/main/java/app/organicmaps/maplayer/MapButtonsController.java
@@ -16,7 +16,6 @@ import android.view.ViewTreeObserver;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.annotation.OptIn;
-import androidx.core.content.ContextCompat;
 import androidx.core.view.ViewCompat;
 import androidx.core.view.WindowInsetsCompat;
 import androidx.fragment.app.Fragment;
@@ -36,9 +35,8 @@ import app.organicmaps.sdk.maplayer.subway.SubwayManager;
 import app.organicmaps.sdk.maplayer.traffic.TrafficManager;
 import app.organicmaps.sdk.routing.RoutingController;
 import app.organicmaps.sdk.util.Config;
+import app.organicmaps.sdk.util.UiUtils;
 import app.organicmaps.util.ThemeUtils;
-import app.organicmaps.util.UiUtils;
-import app.organicmaps.util.Utils;
 import app.organicmaps.util.WindowInsetUtils;
 import app.organicmaps.widget.menu.MyPositionButton;
 import app.organicmaps.widget.placepage.PlacePageViewModel;
@@ -215,7 +213,7 @@ public class MapButtonsController extends Fragment
      //        helpButton.setImageResource(R.drawable.ic_launcher);
      //      }
      //      // Keep this button colorful in normal theme.
-      //      if (!ThemeUtils.isNightTheme())
+      //      if (!ThemeUtils.isNightTheme(requireContext()))
      //        helpButton.getDrawable().setTintList(null);
    }
    else if (leftButtonView != null)
@@ -297,7 +295,7 @@ public class MapButtonsController extends Fragment
      mBadgeDrawable.setMaxCharacterCount(0);
      mBadgeDrawable.setHorizontalOffset(verticalOffset);
      mBadgeDrawable.setVerticalOffset(dpToPx(9, context));
-      mBadgeDrawable.setBackgroundColor(ContextCompat.getColor(context, R.color.base_accent));
+      mBadgeDrawable.setBackgroundColor(getResources().getColor(R.color.base_accent));
      mBadgeDrawable.setVisible(enable);
      BadgeUtils.attachBadgeDrawable(mBadgeDrawable, menuButton);
    }
--- a/android/app/src/main/java/app/organicmaps/maplayer/SearchWheel.java
+++ b/android/app/src/main/java/app/organicmaps/maplayer/SearchWheel.java
@@ -16,9 +16,9 @@ import androidx.annotation.StringRes;
 import app.organicmaps.R;
 import app.organicmaps.sdk.routing.RoutingController;
 import app.organicmaps.sdk.search.SearchEngine;
+import app.organicmaps.sdk.util.UiUtils;
 import app.organicmaps.sdk.util.concurrency.UiThread;
 import app.organicmaps.util.Graphics;
-import app.organicmaps.util.UiUtils;

 public class SearchWheel implements View.OnClickListener
 {
--- a/android/app/src/main/java/app/organicmaps/maplayer/traffic/widget/TrafficButton.java
+++ b/android/app/src/main/java/app/organicmaps/maplayer/traffic/widget/TrafficButton.java
@@ -10,8 +10,8 @@ import android.widget.RelativeLayout;
 import androidx.annotation.NonNull;
 import androidx.core.content.res.ResourcesCompat;
 import app.organicmaps.R;
+import app.organicmaps.sdk.util.UiUtils;
 import app.organicmaps.util.ThemeUtils;
-import app.organicmaps.util.UiUtils;
 import java.util.Objects;

@SuppressWarnings("unused")
@@ -43,20 +43,22 @@ public class TrafficButton
  void turnOff()
  {
    stopWaitingAnimation();
-    mButton.setImageResource(ThemeUtils.isNightTheme() ? R.drawable.ic_traffic_on_night : R.drawable.ic_traffic_on);
+    mButton.setImageResource(ThemeUtils.isNightTheme(mButton.getContext()) ? R.drawable.ic_traffic_on_night
+                                                                           : R.drawable.ic_traffic_on);
  }

  void turnOn()
  {
    stopWaitingAnimation();
-    mButton.setImageResource(ThemeUtils.isNightTheme() ? R.drawable.ic_traffic_on_night : R.drawable.ic_traffic_on);
+    mButton.setImageResource(ThemeUtils.isNightTheme(mButton.getContext()) ? R.drawable.ic_traffic_on_night
+                                                                           : R.drawable.ic_traffic_on);
  }

  void markAsOutdated()
  {
    stopWaitingAnimation();
-    mButton.setImageResource(ThemeUtils.isNightTheme() ? R.drawable.ic_traffic_outdated_night
-                                                       : R.drawable.ic_traffic_outdated);
+    mButton.setImageResource(ThemeUtils.isNightTheme(mButton.getContext()) ? R.drawable.ic_traffic_outdated_night
+                                                                           : R.drawable.ic_traffic_outdated);
  }

  void startWaitingAnimation()
--- a/android/app/src/main/java/app/organicmaps/routing/BaseRoutingErrorDialogFragment.java
+++ b/android/app/src/main/java/app/organicmaps/routing/BaseRoutingErrorDialogFragment.java
@@ -11,15 +11,13 @@ import android.widget.ExpandableListAdapter;
 import android.widget.ExpandableListView;
 import androidx.annotation.NonNull;
 import androidx.appcompat.app.AlertDialog;
-import androidx.core.content.ContextCompat;
 import app.organicmaps.R;
 import app.organicmaps.adapter.DisabledChildSimpleExpandableListAdapter;
 import app.organicmaps.base.BaseMwmDialogFragment;
 import app.organicmaps.sdk.downloader.CountryItem;
 import app.organicmaps.sdk.routing.RoutingController;
 import app.organicmaps.sdk.util.StringUtils;
-import app.organicmaps.sdk.util.Utils;
-import app.organicmaps.util.UiUtils;
+import app.organicmaps.sdk.util.UiUtils;
 import com.google.android.material.dialog.MaterialAlertDialogBuilder;
 import com.google.android.material.textview.MaterialTextView;
 import java.util.ArrayList;
@@ -124,11 +122,11 @@ abstract class BaseRoutingErrorDialogFragment extends BaseMwmDialogFragment
    }

    listView.setAdapter(buildAdapter());
-    listView.setChildDivider(new ColorDrawable(ContextCompat.getColor(requireContext(), android.R.color.transparent)));
+    listView.setChildDivider(new ColorDrawable(getResources().getColor(android.R.color.transparent)));

    UiUtils.waitLayout(listView, () -> {
      final int width = listView.getWidth();
-      final int indicatorWidth = Utils.dimen(requireContext(), R.dimen.margin_quadruple);
+      final int indicatorWidth = UiUtils.dimen(requireContext(), R.dimen.margin_quadruple);
      listView.setIndicatorBounds(width - indicatorWidth, width);
      listView.setIndicatorBoundsRelative(width - indicatorWidth, width);
    });
--- a/android/app/src/main/java/app/organicmaps/routing/ManageRouteAdapter.java
+++ b/android/app/src/main/java/app/organicmaps/routing/ManageRouteAdapter.java
@@ -16,7 +16,7 @@ import app.organicmaps.sdk.bookmarks.data.MapObject;
 import app.organicmaps.sdk.routing.RouteMarkData;
 import app.organicmaps.sdk.routing.RouteMarkType;
 import app.organicmaps.sdk.util.StringUtils;
-import app.organicmaps.util.UiUtils;
+import app.organicmaps.sdk.util.UiUtils;
 import com.google.android.material.imageview.ShapeableImageView;
 import com.google.android.material.textview.MaterialTextView;
 import java.util.ArrayList;
@@ -94,7 +94,7 @@ public class ManageRouteAdapter extends RecyclerView.Adapter<ManageRouteAdapter.
    if (mRoutePoints.get(position).mIsMyPosition)
    {
      // My position point.
-      title = mContext.getString(app.organicmaps.sdk.R.string.core_my_position);
+      title = mContext.getString(R.string.core_my_position);

      if (mRoutePoints.get(position).mPointType != RouteMarkType.Start)
        subtitle = mRoutePoints.get(position).mTitle;
--- a/android/app/src/main/java/app/organicmaps/routing/ManageRouteBottomSheet.java
+++ b/android/app/src/main/java/app/organicmaps/routing/ManageRouteBottomSheet.java
@@ -23,7 +23,7 @@ import app.organicmaps.sdk.Framework;
 import app.organicmaps.sdk.bookmarks.data.MapObject;
 import app.organicmaps.sdk.routing.RouteMarkData;
 import app.organicmaps.sdk.routing.RoutingController;
-import app.organicmaps.util.UiUtils;
+import app.organicmaps.sdk.util.UiUtils;
 import com.google.android.material.bottomsheet.BottomSheetBehavior;
 import com.google.android.material.bottomsheet.BottomSheetDialog;
 import com.google.android.material.bottomsheet.BottomSheetDialogFragment;
--- a/android/app/src/main/java/app/organicmaps/routing/NavigationController.java
+++ b/android/app/src/main/java/app/organicmaps/routing/NavigationController.java
@@ -1,7 +1,5 @@
 package app.organicmaps.routing;

-import static app.organicmaps.sdk.util.Utils.dimen;
-
 import android.location.Location;
 import android.text.TextUtils;
 import android.view.View;
@@ -23,7 +21,7 @@ import app.organicmaps.sdk.routing.CarDirection;
 import app.organicmaps.sdk.routing.RoutingController;
 import app.organicmaps.sdk.routing.RoutingInfo;
 import app.organicmaps.sdk.util.StringUtils;
-import app.organicmaps.util.UiUtils;
+import app.organicmaps.sdk.util.UiUtils;
 import app.organicmaps.util.Utils;
 import app.organicmaps.util.WindowInsetUtils;
 import app.organicmaps.widget.LanesView;
@@ -168,7 +166,7 @@ public class NavigationController implements TrafficManager.TrafficCallback, Nav
    UiUtils.visibleIf(hasStreet, mStreetFrame);
    if (!TextUtils.isEmpty(info.nextStreet))
      mNextStreet.setText(info.nextStreet);
-    int margin = dimen(mFrame.getContext(), R.dimen.nav_frame_padding);
+    int margin = UiUtils.dimen(mFrame.getContext(), R.dimen.nav_frame_padding);
    if (hasStreet)
      margin += mStreetFrame.getHeight();
    mMapButtonsViewModel.setTopButtonsMarginTop(margin);
--- a/android/app/src/main/java/app/organicmaps/routing/RoutingBottomMenuController.java
+++ b/android/app/src/main/java/app/organicmaps/routing/RoutingBottomMenuController.java
@@ -1,7 +1,5 @@
 package app.organicmaps.routing;

-import static app.organicmaps.sdk.util.Utils.dimen;
-
 import android.annotation.SuppressLint;
 import android.app.Activity;
 import android.content.Context;
@@ -39,14 +37,12 @@ import app.organicmaps.sdk.routing.RoutingInfo;
 import app.organicmaps.sdk.routing.TransitRouteInfo;
 import app.organicmaps.sdk.routing.TransitStepInfo;
 import app.organicmaps.sdk.util.Distance;
+import app.organicmaps.sdk.util.UiUtils;
 import app.organicmaps.util.Graphics;
 import app.organicmaps.util.ThemeUtils;
-import app.organicmaps.util.UiUtils;
 import app.organicmaps.util.Utils;
 import app.organicmaps.widget.recycler.DotDividerItemDecoration;
 import app.organicmaps.widget.recycler.MultilineLayoutManager;
-
-import com.google.android.material.button.MaterialButton;
 import com.google.android.material.imageview.ShapeableImageView;
 import com.google.android.material.textview.MaterialTextView;
 import java.util.LinkedList;
@@ -155,10 +151,10 @@ final class RoutingBottomMenuController implements View.OnClickListener
    mTransitViewDecorator =
        new DotDividerItemDecoration(dividerDrawable, res.getDimensionPixelSize(R.dimen.margin_base),
                                     res.getDimensionPixelSize(R.dimen.margin_half));
-    MaterialButton manageRouteButton = altitudeChartFrame.findViewById(R.id.btn__manage_route);
+    Button manageRouteButton = altitudeChartFrame.findViewById(R.id.btn__manage_route);
    manageRouteButton.setOnClickListener(this);

-    MaterialButton saveButton = altitudeChartFrame.findViewById(R.id.btn__save);
+    Button saveButton = altitudeChartFrame.findViewById(R.id.btn__save);
    saveButton.setOnClickListener(this);
  }

@@ -170,7 +166,7 @@ final class RoutingBottomMenuController implements View.OnClickListener
      showRouteAltitudeChart();
    showRoutingDetails();
    UiUtils.show(mAltitudeChartFrame);
-    MaterialButton saveButton = mAltitudeChartFrame.findViewById(R.id.btn__save);
+    Button saveButton = mAltitudeChartFrame.findViewById(R.id.btn__save);
    saveButton.setText(R.string.save);
    saveButton.setEnabled(true);
  }
@@ -349,17 +345,16 @@ final class RoutingBottomMenuController implements View.OnClickListener

    UiUtils.hide(mTimeVehicle);

-    int chartWidth = dimen(mContext, R.dimen.altitude_chart_image_width);
-    int chartHeight = dimen(mContext, R.dimen.altitude_chart_image_height);
+    int chartWidth = UiUtils.dimen(mContext, R.dimen.altitude_chart_image_width);
+    int chartHeight = UiUtils.dimen(mContext, R.dimen.altitude_chart_image_height);
    Framework.RouteAltitudeLimits limits = new Framework.RouteAltitudeLimits();
    Bitmap bm = Framework.generateRouteAltitudeChart(chartWidth, chartHeight, limits);
    if (bm != null)
    {
      mAltitudeChart.setImageBitmap(bm);
      UiUtils.show(mAltitudeChart);
-      final String unit = limits.isMetricUnits
-                            ? mAltitudeDifference.getResources().getString(app.organicmaps.sdk.R.string.m)
-                            : mAltitudeDifference.getResources().getString(app.organicmaps.sdk.R.string.ft);
+      final String unit = limits.isMetricUnits ? mAltitudeDifference.getResources().getString(R.string.m)
+                                               : mAltitudeDifference.getResources().getString(R.string.ft);
      mAltitudeDifference.setText("↗ " + limits.totalAscentString + " " + unit + " ↘ " + limits.totalDescentString + " "
                                  + unit);
      UiUtils.show(mAltitudeDifference);
--- a/android/app/src/main/java/app/organicmaps/routing/RoutingErrorDialogFragment.java
+++ b/android/app/src/main/java/app/organicmaps/routing/RoutingErrorDialogFragment.java
@@ -14,10 +14,9 @@ import androidx.appcompat.app.AlertDialog;
 import androidx.fragment.app.FragmentFactory;
 import androidx.fragment.app.FragmentManager;
 import app.organicmaps.R;
-import app.organicmaps.downloader.MapManagerHelper;
 import app.organicmaps.sdk.downloader.CountryItem;
 import app.organicmaps.sdk.downloader.MapManager;
-import app.organicmaps.util.UiUtils;
+import app.organicmaps.sdk.util.UiUtils;
 import com.google.android.material.textview.MaterialTextView;

 public class RoutingErrorDialogFragment extends BaseRoutingErrorDialogFragment
@@ -109,7 +108,7 @@ public class RoutingErrorDialogFragment extends BaseRoutingErrorDialogFragment
      }
    }

-    MapManagerHelper.warnOn3g(requireActivity(), size, () -> {
+    MapManager.warnOn3g(requireActivity(), size, () -> {
      final FragmentManager manager = requireActivity().getSupportFragmentManager();
      RoutingMapsDownloadFragment downloader =
          RoutingMapsDownloadFragment.create(manager.getFragmentFactory(), getAppContextOrThrow(), mMapsArray);
--- a/android/app/src/main/java/app/organicmaps/routing/RoutingMapsDownloadFragment.java
+++ b/android/app/src/main/java/app/organicmaps/routing/RoutingMapsDownloadFragment.java
@@ -9,11 +9,10 @@ import androidx.annotation.NonNull;
 import androidx.appcompat.app.AlertDialog;
 import androidx.fragment.app.FragmentFactory;
 import app.organicmaps.R;
-import app.organicmaps.downloader.MapManagerHelper;
 import app.organicmaps.sdk.downloader.CountryItem;
 import app.organicmaps.sdk.downloader.MapManager;
 import app.organicmaps.sdk.routing.RoutingController;
-import app.organicmaps.util.UiUtils;
+import app.organicmaps.sdk.util.UiUtils;
 import app.organicmaps.widget.WheelProgressView;
 import java.util.HashSet;
 import java.util.List;
@@ -41,7 +40,7 @@ public class RoutingMapsDownloadFragment extends BaseRoutingErrorDialogFragment
      mMapsArray[i] = item.id;
    }

-    MapManagerHelper.startDownload(mMapsArray);
+    MapManager.startDownload(mMapsArray);
  }

  private View setupFrame(View frame)
--- a/android/app/src/main/java/app/organicmaps/routing/RoutingPlanController.java
+++ b/android/app/src/main/java/app/organicmaps/routing/RoutingPlanController.java
@@ -21,8 +21,8 @@ import app.organicmaps.sdk.routing.RoutingController;
 import app.organicmaps.sdk.routing.RoutingInfo;
 import app.organicmaps.sdk.routing.RoutingOptions;
 import app.organicmaps.sdk.routing.TransitRouteInfo;
+import app.organicmaps.sdk.util.UiUtils;
 import app.organicmaps.settings.DrivingOptionsActivity;
-import app.organicmaps.util.UiUtils;
 import app.organicmaps.util.WindowInsetUtils.PaddingInsetsListener;
 import app.organicmaps.widget.RoutingToolbarButton;
 import app.organicmaps.widget.ToolbarController;
@@ -141,8 +141,7 @@ public class RoutingPlanController extends ToolbarController
    setupRouterButton(R.id.vehicle, R.drawable.ic_car, this::onVehicleModeSelected);
    setupRouterButton(R.id.pedestrian, R.drawable.ic_pedestrian, this::onPedestrianModeSelected);
    //    setupRouterButton(R.id.taxi, R.drawable.ic_taxi, this::onTaxiModeSelected);
-    setupRouterButton(R.id.transit, app.organicmaps.sdk.R.drawable.ic_route_planning_metro_40px,
-                      this::onTransitModeSelected);
+    setupRouterButton(R.id.transit, R.drawable.ic_route_planning_metro_40px, this::onTransitModeSelected);
    setupRouterButton(R.id.bicycle, R.drawable.ic_bike, this::onBicycleModeSelected);
    setupRouterButton(R.id.ruler, app.organicmaps.sdk.R.drawable.ic_ruler_route, this::onRulerModeSelected);
  }
--- a/android/app/src/main/java/app/organicmaps/routing/RoutingPlanInplaceController.java
+++ b/android/app/src/main/java/app/organicmaps/routing/RoutingPlanInplaceController.java
@@ -9,7 +9,7 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import app.organicmaps.MwmActivity;
 import app.organicmaps.R;
-import app.organicmaps.util.UiUtils;
+import app.organicmaps.sdk.util.UiUtils;

 public class RoutingPlanInplaceController extends RoutingPlanController
 {
--- a/android/app/src/main/java/app/organicmaps/routing/TransitStepView.java
+++ b/android/app/src/main/java/app/organicmaps/routing/TransitStepView.java
@@ -90,7 +90,7 @@ public class TransitStepView extends View implements MultilineLayoutManager.Sque
    {
      mDrawable = null;
      mText = info.getDistance() + " " + info.getDistanceUnits();
-      mTextPaint.setColor(ThemeUtils.isDefaultTheme() ? Color.BLACK : Color.WHITE);
+      mTextPaint.setColor(ThemeUtils.isDefaultTheme(getContext()) ? Color.BLACK : Color.WHITE);
    }
    else
    {
--- a/android/app/src/main/java/app/organicmaps/sdk/ChoosePositionMode.java
+++ b/android/app/src/main/java/app/organicmaps/sdk/ChoosePositionMode.java
--- a/android/app/src/main/java/app/organicmaps/sdk/DownloadResourcesLegacyActivity.java
+++ b/android/app/src/main/java/app/organicmaps/sdk/DownloadResourcesLegacyActivity.java
@@ -17,7 +17,7 @@ public class DownloadResourcesLegacyActivity
  {
    // Called by JNI.
    @Keep
-    void onProgress(int bytesDownloaded);
+    void onProgress(int percent);

    // Called by JNI.
    @Keep
--- a/android/app/src/main/java/app/organicmaps/sdk/Framework.java
+++ b/android/app/src/main/java/app/organicmaps/sdk/Framework.java
--- a/android/app/src/main/java/app/organicmaps/sdk/Map.java
+++ b/android/app/src/main/java/app/organicmaps/sdk/Map.java
@@ -6,11 +6,13 @@ import android.view.MotionEvent;
 import android.view.Surface;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+import app.organicmaps.BuildConfig;
+import app.organicmaps.R;
 import app.organicmaps.sdk.display.DisplayType;
 import app.organicmaps.sdk.location.LocationHelper;
 import app.organicmaps.sdk.util.Config;
 import app.organicmaps.sdk.util.ROMUtils;
-import app.organicmaps.sdk.util.Utils;
+import app.organicmaps.sdk.util.UiUtils;
 import app.organicmaps.sdk.util.concurrency.UiThread;
 import app.organicmaps.sdk.util.log.Logger;

@@ -54,8 +56,8 @@ public final class Map
  @NonNull
  private final DisplayType mDisplayType;

-  @Nullable
-  private LocationHelper mLocationHelper;
+  @NonNull
+  private final LocationHelper mLocationHelper;

  private int mCurrentCompassOffsetX;
  private int mCurrentCompassOffsetY;
@@ -77,15 +79,11 @@ public final class Map

  private static int sCurrentDpi = 0;

-  public Map(@NonNull DisplayType mapType)
+  public Map(@NonNull DisplayType mapType, @NonNull LocationHelper locationHelper)
  {
    mDisplayType = mapType;
-    onCreate(false);
-  }
-
-  public void setLocationHelper(@NonNull LocationHelper locationHelper)
-  {
    mLocationHelper = locationHelper;
+    onCreate(false);
  }

  /**
@@ -100,9 +98,9 @@ public final class Map
  {
    final int x = offsetX < 0 ? mCurrentCompassOffsetX : offsetX;
    final int y = offsetY < 0 ? mCurrentCompassOffsetY : offsetY;
-    final int navPadding = Utils.dimen(context, R.dimen.nav_frame_padding);
-    final int marginX = Utils.dimen(context, R.dimen.margin_compass) + navPadding;
-    final int marginY = Utils.dimen(context, R.dimen.margin_compass_top) + navPadding;
+    final int navPadding = UiUtils.dimen(context, R.dimen.nav_frame_padding);
+    final int marginX = UiUtils.dimen(context, R.dimen.margin_compass) + navPadding;
+    final int marginY = UiUtils.dimen(context, R.dimen.margin_compass_top) + navPadding;
    nativeSetupWidget(WIDGET_COMPASS, mWidth - x - marginX, y + marginY, ANCHOR_CENTER);
    if (forceRedraw && mSurfaceCreated)
      nativeApplyWidgets();
@@ -144,9 +142,7 @@ public final class Map

  public void onSurfaceCreated(final Context context, final Surface surface, Rect surfaceFrame, int surfaceDpi)
  {
-    assert mLocationHelper != null : "LocationHelper must be initialized before calling onSurfaceCreated";
-
-    if (isThemeChangingProcess())
+    if (isThemeChangingProcess(context))
    {
      Logger.d(TAG, "Theme changing process, skip 'onSurfaceCreated' callback");
      return;
@@ -179,7 +175,7 @@ public final class Map
    setupWidgets(context, surfaceFrame.width(), surfaceFrame.height());

    final boolean firstStart = mLocationHelper.isInFirstRun();
-    if (!nativeCreateEngine(surface, surfaceDpi, firstStart, mLaunchByDeepLink, Config.getVersionCode(),
+    if (!nativeCreateEngine(surface, surfaceDpi, firstStart, mLaunchByDeepLink, BuildConfig.VERSION_CODE,
                            ROMUtils.isCustomROM()))
    {
      if (mCallbackUnsupported != null)
@@ -201,7 +197,7 @@ public final class Map
  public void onSurfaceChanged(final Context context, final Surface surface, Rect surfaceFrame,
                               boolean isSurfaceCreating)
  {
-    if (isThemeChangingProcess())
+    if (isThemeChangingProcess(context))
    {
      Logger.d(TAG, "Theme changing process, skip 'onSurfaceChanged' callback");
      return;
@@ -263,7 +259,7 @@ public final class Map

  public void onPause(final Context context)
  {
-    mUiThemeOnPause = Config.UiTheme.getCurrent();
+    mUiThemeOnPause = Config.getCurrentUiTheme(context);

    // Pause/Resume can be called without surface creation/destroy.
    if (mSurfaceAttached)
@@ -340,37 +336,37 @@ public final class Map
    updateBottomWidgetsOffset(context, mBottomWidgetOffsetX, mBottomWidgetOffsetY);
    if (mDisplayType == DisplayType.Device)
    {
-      nativeSetupWidget(WIDGET_SCALE_FPS_LABEL, Utils.dimen(context, R.dimen.margin_base),
-                        Utils.dimen(context, R.dimen.margin_base) * 2, ANCHOR_LEFT_TOP);
+      nativeSetupWidget(WIDGET_SCALE_FPS_LABEL, UiUtils.dimen(context, R.dimen.margin_base),
+                        UiUtils.dimen(context, R.dimen.margin_base) * 2, ANCHOR_LEFT_TOP);
      updateCompassOffset(context, mCurrentCompassOffsetX, mCurrentCompassOffsetY, false);
    }
    else
    {
-      nativeSetupWidget(WIDGET_SCALE_FPS_LABEL, (float) mWidth / 2 + Utils.dimen(context, R.dimen.margin_base) * 2,
-                        Utils.dimen(context, R.dimen.margin_base), ANCHOR_LEFT_TOP);
+      nativeSetupWidget(WIDGET_SCALE_FPS_LABEL, (float) mWidth / 2 + UiUtils.dimen(context, R.dimen.margin_base) * 2,
+                        UiUtils.dimen(context, R.dimen.margin_base), ANCHOR_LEFT_TOP);
      updateCompassOffset(context, mWidth, mCurrentCompassOffsetY, true);
    }
  }

  private void updateRulerOffset(final Context context, int offsetX, int offsetY)
  {
-    nativeSetupWidget(WIDGET_RULER, Utils.dimen(context, R.dimen.margin_ruler) + offsetX,
-                      mHeight - Utils.dimen(context, R.dimen.margin_ruler) - offsetY, ANCHOR_LEFT_BOTTOM);
+    nativeSetupWidget(WIDGET_RULER, UiUtils.dimen(context, R.dimen.margin_ruler) + offsetX,
+                      mHeight - UiUtils.dimen(context, R.dimen.margin_ruler) - offsetY, ANCHOR_LEFT_BOTTOM);
    if (mSurfaceCreated)
      nativeApplyWidgets();
  }

  private void updateAttributionOffset(final Context context, int offsetX, int offsetY)
  {
-    nativeSetupWidget(WIDGET_COPYRIGHT, Utils.dimen(context, R.dimen.margin_ruler) + offsetX,
-                      mHeight - Utils.dimen(context, R.dimen.margin_ruler) - offsetY, ANCHOR_LEFT_BOTTOM);
+    nativeSetupWidget(WIDGET_COPYRIGHT, UiUtils.dimen(context, R.dimen.margin_ruler) + offsetX,
+                      mHeight - UiUtils.dimen(context, R.dimen.margin_ruler) - offsetY, ANCHOR_LEFT_BOTTOM);
    if (mSurfaceCreated)
      nativeApplyWidgets();
  }

-  private boolean isThemeChangingProcess()
+  private boolean isThemeChangingProcess(final Context context)
  {
-    return mUiThemeOnPause != null && !mUiThemeOnPause.equals(Config.UiTheme.getCurrent());
+    return mUiThemeOnPause != null && !mUiThemeOnPause.equals(Config.getCurrentUiTheme(context));
  }

  // Engine
--- a/android/app/src/main/java/app/organicmaps/sdk/MapRenderingListener.java
+++ b/android/app/src/main/java/app/organicmaps/sdk/MapRenderingListener.java
--- a/android/app/src/main/java/app/organicmaps/sdk/MapStyle.java
+++ b/android/app/src/main/java/app/organicmaps/sdk/MapStyle.java
--- a/android/app/src/main/java/app/organicmaps/sdk/OrganicMaps.java
+++ b/android/app/src/main/java/app/organicmaps/sdk/OrganicMaps.java
@@ -6,12 +6,12 @@ import androidx.annotation.NonNull;
 import androidx.lifecycle.DefaultLifecycleObserver;
 import androidx.lifecycle.LifecycleOwner;
 import androidx.lifecycle.ProcessLifecycleOwner;
+import app.organicmaps.R;
 import app.organicmaps.sdk.bookmarks.data.BookmarkManager;
 import app.organicmaps.sdk.bookmarks.data.Icon;
 import app.organicmaps.sdk.downloader.Android7RootCertificateWorkaround;
 import app.organicmaps.sdk.editor.OsmOAuth;
 import app.organicmaps.sdk.location.LocationHelper;
-import app.organicmaps.sdk.location.LocationProviderFactory;
 import app.organicmaps.sdk.location.SensorHelper;
 import app.organicmaps.sdk.maplayer.isolines.IsolinesManager;
 import app.organicmaps.sdk.maplayer.subway.SubwayManager;
@@ -23,6 +23,7 @@ import app.organicmaps.sdk.sound.TtsPlayer;
 import app.organicmaps.sdk.util.Config;
 import app.organicmaps.sdk.util.SharedPropertiesUtils;
 import app.organicmaps.sdk.util.StorageUtils;
+import app.organicmaps.sdk.util.UiUtils;
 import app.organicmaps.sdk.util.log.Logger;
 import app.organicmaps.sdk.util.log.LogsManager;
 import java.io.IOException;
@@ -31,9 +32,6 @@ public final class OrganicMaps implements DefaultLifecycleObserver
 {
  private static final String TAG = OrganicMaps.class.getSimpleName();

-  @NonNull
-  private final String mFlavor;
-
  @NonNull
  private final Context mContext;

@@ -77,13 +75,11 @@ public final class OrganicMaps implements DefaultLifecycleObserver
    return mIsolinesManager;
  }

-  public OrganicMaps(@NonNull Context context, @NonNull String flavor, @NonNull String applicationId, int versionCode,
-                     @NonNull String versionName, @NonNull String fileProviderAuthority,
-                     @NonNull LocationProviderFactory locationProviderFactory)
+  public OrganicMaps(@NonNull Context context)
  {
-    mFlavor = flavor;
    mContext = context.getApplicationContext();
-    mPreferences = mContext.getSharedPreferences(context.getString(R.string.pref_file_name), Context.MODE_PRIVATE);
+    mPreferences = mContext.getSharedPreferences(context.getString(app.organicmaps.sdk.R.string.pref_file_name),
+                                                 Context.MODE_PRIVATE);

    // Set configuration directory as early as possible.
    // Other methods may explicitly use Config, which requires settingsDir to be set.
@@ -93,7 +89,7 @@ public final class OrganicMaps implements DefaultLifecycleObserver
    Logger.d(TAG, "Settings path = " + settingsPath);
    nativeSetSettingsDir(settingsPath);

-    Config.init(mContext, mPreferences, flavor, applicationId, versionCode, versionName, fileProviderAuthority);
+    Config.init(mContext, mPreferences);
    OsmOAuth.init(mPreferences);
    SharedPropertiesUtils.init(mPreferences);
    LogsManager.INSTANCE.initFileLogging(mContext, mPreferences);
@@ -103,7 +99,7 @@ public final class OrganicMaps implements DefaultLifecycleObserver
    Icon.loadDefaultIcons(mContext.getResources(), mContext.getPackageName());

    mSensorHelper = new SensorHelper(mContext);
-    mLocationHelper = new LocationHelper(mContext, mSensorHelper, locationProviderFactory);
+    mLocationHelper = new LocationHelper(mContext, mSensorHelper);
    mIsolinesManager = new IsolinesManager();
    mSubwayManager = new SubwayManager(mContext);
  }
@@ -163,8 +159,8 @@ public final class OrganicMaps implements DefaultLifecycleObserver
    // external storage is damaged or not available (read-only).
    createPlatformDirectories(writablePath, privatePath, tempPath);

-    nativeInitPlatform(mContext, apkPath, writablePath, privatePath, tempPath, mFlavor, BuildConfig.BUILD_TYPE,
-                       /* isTablet */ false);
+    nativeInitPlatform(mContext, apkPath, writablePath, privatePath, tempPath, app.organicmaps.BuildConfig.FLAVOR,
+                       app.organicmaps.BuildConfig.BUILD_TYPE, UiUtils.isTablet(mContext));
    Config.setStoragePath(writablePath);
    Config.setStatisticsEnabled(SharedPropertiesUtils.isStatisticsEnabled());

--- a/android/app/src/main/java/app/organicmaps/sdk/PlacePageActivationListener.java
+++ b/android/app/src/main/java/app/organicmaps/sdk/PlacePageActivationListener.java
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Konstantin Pastbin	aea784ddd7	[ios] Format all Obj C code via clang-format Signed-off-by: Konstantin Pastbin <konstantin.pastbin@gmail.com>	2025-08-17 16:37:15 +07:00
Konstantin Pastbin	52e9ddc038	[ios] Enable clang-format for Obj C sources Signed-off-by: Konstantin Pastbin <konstantin.pastbin@gmail.com>	2025-08-17 16:29:41 +07:00
				`@@ -1 +0,0 @@`
				`../../../../google/java/app/organicmaps/location`
				`@@ -0,0 +1 @@`
				`../../../../../google/java/app/organicmaps/sdk/location`
				`@@ -1 +0,0 @@`
				`Lett kart navigasjon - Opplev mere på din reise - Drevet av felleskapet`