[docs] Fix logo in readme

Signed-off-by: RedAuburn <me@hbond.xyz>

.github/CODEOWNERS

@@ -1,67 +1,69 @@
 # All non-assigned.
 * @organicmaps/mergers
 # Visual design.
-android/app/src/main/res/drawable*/ @organicmaps/design
-android/app/src/main/res/font/ @organicmaps/design
-android/app/src/main/res/mipmap*/ @organicmaps/design
-data/*.ttf @organicmaps/design
-data/resources*/ @organicmaps/design
-data/search-icons/ @organicmaps/design
-iphone/Maps/Images.xcassets/ @organicmaps/design
+/android/app/src/main/res/drawable*/ @organicmaps/design
+/android/app/src/main/res/font/ @organicmaps/design
+/android/app/src/main/res/mipmap*/ @organicmaps/design
+/data/*.ttf @organicmaps/design
+/data/resources-svg/ @organicmaps/design
+/data/search-icons/ @organicmaps/design
+/iphone/Maps/Images.xcassets/ @organicmaps/design
 # Android.
-android/ @organicmaps/android
-android/app/src/main/java/app/organicmaps/car/ @organicmaps/android-auto
-docs/ANDROID_LOCATION_TEST.md @organicmaps/android
-docs/JAVA_STYLE.md @organicmaps/android
+/android/ @organicmaps/android
+/android/app/src/main/java/app/organicmaps/car/ @organicmaps/android-auto
+/docs/ANDROID_LOCATION_TEST.md @organicmaps/android
+/docs/JAVA_STYLE.md @organicmaps/android
 # no owner for translation changes
 /android/app/src/main/res/values*/strings.xml
 # iOS.
-iphone/ @organicmaps/ios
-xcode/ @organicmaps/ios
-docs/OBJC_STYLE.md @organicmaps/ios
+/iphone/ @organicmaps/ios
+/xcode/ @organicmaps/ios
+/docs/OBJC_STYLE.md @organicmaps/ios
 # no owner for translation changes
 /iphone/plist.txt
 /iphone/Maps/LocalizedStrings/
 # Qt
-qt/ @organicmaps/qt
+/qt/ @organicmaps/qt
 # Rendering
-drape/ @organicmaps/rendering
-drape_frontend/ @organicmaps/rendering
+/drape/ @organicmaps/rendering
+/drape_frontend/ @organicmaps/rendering
 # Map Data.
-tools/python/maps_generator/ @organicmaps/data
-generator/ @organicmaps/data
-topography_generator/ @organicmaps/data
-data/borders/ @organicmaps/data
-data/conf/isolines/ @organicmaps/data
-docs/SUBWAY_GENERATION.md @organicmaps/data
-docs/MAPS.md @organicmaps/data
-docs/EXPERIMENTAL_PUBLIC_TRANSPORT_SUPPORT.md @organicmaps/data
+/tools/python/maps_generator/ @organicmaps/data
+/generator/ @organicmaps/data
+/topography_generator/ @organicmaps/data
+/data/borders/ @organicmaps/data
+/data/conf/isolines/ @organicmaps/data
+/docs/SUBWAY_GENERATION.md @organicmaps/data
+/docs/MAPS.md @organicmaps/data
+/docs/EXPERIMENTAL_PUBLIC_TRANSPORT_SUPPORT.md @organicmaps/data
+# no owner (changed often to add a new POI)
+/generator/generator_tests/osm_type_test.cpp
 # Map Styles.
-data/styles/ @organicmaps/styles
-data/types.txt @organicmaps/styles
-data/visibility.txt @organicmaps/styles
-data/mapcss-mapping.csv @organicmaps/styles
-data/replaced_tags.txt @organicmaps/styles
-data/classificator.txt @organicmaps/styles
-data/drules_* @organicmaps/styles
-docs/STYLES.md
-tools/kothic/ @organicmaps/styles
+/data/styles/ @organicmaps/styles
+/data/types.txt @organicmaps/styles
+/data/visibility.txt @organicmaps/styles
+/data/mapcss-mapping.csv @organicmaps/styles
+/data/replaced_tags.txt @organicmaps/styles
+/data/classificator.txt @organicmaps/styles
+/data/drules_* @organicmaps/styles
+/docs/STYLES.md
+/tools/kothic/ @organicmaps/styles
 # DevOps.
-.github/workflows @organicmaps/devops
-android/*gradle* @organicmaps/devops
-docs/RELEASE_MANAGEMENT.md @organicmaps/devops
-xcode/fastlane/ @organicmaps/devops
+/.github/workflows @organicmaps/devops
+/android/*gradle* @organicmaps/devops
+/docs/RELEASE_MANAGEMENT.md @organicmaps/devops
+/xcode/fastlane/ @organicmaps/devops
 # Growth.
 README.md @organicmaps/growth
-.github/FUNDING.yml @organicmaps/growth
-android/app/src/fdroid/play/ @organicmaps/growth
-android/app/src/google/play/ @organicmaps/growth
-iphone/metadata/ @organicmaps/growth
+/.github/FUNDING.yml @organicmaps/growth
+/android/app/src/fdroid/play/ @organicmaps/growth
+/android/app/src/google/play/ @organicmaps/growth
+/iphone/metadata/ @organicmaps/growth
 # Legal.
 LEGAL @organicmaps/legal
 LICENSE @organicmaps/legal
 NOTICE @organicmaps/legal
 CONTRIBUTORS @organicmaps/legal
-docs/CODE_OF_CONDUCT.md @organicmaps/legal
-docs/DCO.md @organicmaps/legal
-docs/GOVERNANCE.md @organicmaps/legal
+/docs/CODE_OF_CONDUCT.md @organicmaps/legal
+/docs/DCO.md @organicmaps/legal
+/docs/GOVERNANCE.md @organicmaps/legal

.github/workflows/linux-check.yaml

@@ -61,6 +61,10 @@ jobs:
               libgl1-mesa-dev \
               libglvnd-dev \
               libharfbuzz-dev \
+              libxrandr-dev \
+              libxinerama-dev \
+              libxcursor-dev \
+              libxi-dev \
               qt6-base-dev \
               libqt6svg6-dev \
               qt6-positioning-dev \
@@ -128,6 +132,10 @@ jobs:
               libgl1-mesa-dev \
               libglvnd-dev \
               libharfbuzz-dev \
+              libxrandr-dev \
+              libxinerama-dev \
+              libxcursor-dev \
+              libxi-dev \
               qt6-base-dev \
               libqt6svg6-dev \
               qt6-positioning-dev \

.github/workflows/stale.yml

@@ -0,0 +1,22 @@
+name: Close stale PRs
+on:
+  schedule:
+    - cron: "0 0 * * *" # Runs every day at midnight
+
+jobs:
+  stale:
+    runs-on: ubuntu-latest
+    permissions:
+      pull-requests: write
+    steps:
+      - uses: actions/stale@v9
+        with:
+          repo-token: ${{ secrets.GITHUB_TOKEN }}
+          days-before-pr-stale: 180 # 6 months before warning
+          days-before-pr-close: 365 # Closed after 12 months
+          stale-pr-label: "stale"
+          stale-pr-message: "Hi! This PR has been inactive for 6 months. If it's still relevant, please update it to let us know you’d like to keep it open 😊"
+          close-pr-message: "This PR has been automatically closed after 12 months of inactivity."
+          days-before-issue-stale: -1 # Issues are never stale
+          days-before-issue-close: -1 # Issues are never closed
+          remove-stale-when-updated: true

.github/workflows/strings-check.yaml

@@ -1,31 +0,0 @@
-name: Validate translation strings
-on:
-  workflow_dispatch: # Manual trigger
-  pull_request:
-    paths:
-      - .github/workflows/strings-check.yaml  # Run check on self change
-      - data/strings/strings.txt
-      - data/strings/types_strings.txt
-      - data/strings/sound.txt
-      - data/countries_names.txt
-      - iphone/plist.txt
-      - tools/python/strings_utils.py
-
-jobs:
-  validate-translation-strings:
-    name: Validate translation strings
-    runs-on: ubuntu-latest
-
-    steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-python@v5
-        with:
-          python-version: '3'
-
-      - name: Validate string files
-        shell: bash
-        run: |
-          for f in data/strings/strings.txt data/strings/types_strings.txt data/strings/sound.txt data/countries_names.txt iphone/plist.txt; do
-            ./tools/python/strings_utils.py --validate $f -o
-          done;
-          git diff --exit-code

.gitignore

@@ -20,6 +20,7 @@ data/drules_proto_default_design.bin
 data/colors_design.txt
 data/patterns_design.txt
 data/bookmarks
+data/edits.xml
 
 # Compiled Python
 *.pyc

.gitmodules

@@ -7,9 +7,6 @@
 [submodule "3party/protobuf/protobuf"]
   path = 3party/protobuf/protobuf
   url = https://github.com/organicmaps/protobuf.git
-[submodule "tools/twine"]
-  path = tools/twine
-  url = https://github.com/organicmaps/twine.git
 [submodule "3party/Vulkan-Headers"]
   path = 3party/Vulkan-Headers
   url = https://github.com/KhronosGroup/Vulkan-Headers.git
@@ -59,3 +56,12 @@
 [submodule "3party/utfcpp"]
 	path = 3party/utfcpp
 	url = https://github.com/nemtrif/utfcpp.git
+[submodule "3party/glfw"]
+	path = 3party/glfw
+	url = https://github.com/glfw/glfw.git
+[submodule "3party/CMake-MetalShaderSupport"]
+	path = 3party/CMake-MetalShaderSupport
+	url = https://github.com/dpogue/CMake-MetalShaderSupport.git
+[submodule "3party/imgui/imgui"]
+	path = 3party/imgui/imgui
+	url = https://github.com/ocornut/imgui

3party/CMake-MetalShaderSupport

@@ -0,0 +1 @@
+Subproject commit 989857d2e5e54869c35ad06fb21a67d12a2dbc67

3party/CMakeLists.txt

@@ -66,4 +66,19 @@ add_subdirectory(vulkan_wrapper)
 
 if (PLATFORM_DESKTOP)
   add_subdirectory(libtess2)
+
+  set(GLFW_BUILD_DOCS OFF CACHE BOOL "")
+  set(GLFW_BUILD_EXAMPLES OFF CACHE BOOL "")
+  set(GLFW_BUILD_TESTS OFF CACHE BOOL "")
+  set(GLFW_INSTALL OFF CACHE BOOL "")
+  set(GLFW_VULKAN_STATIC OFF CACHE BOOL "")
+  set(GLFW_BUILD_WAYLAND OFF CACHE BOOL "")
+  # Disable ARC for glfw and re-enable after it because it's globally set in the root CMakeLists.txt
+  set(CMAKE_OBJC_FLAGS "")
+  add_subdirectory(glfw)
+  set_target_properties(glfw PROPERTIES UNITY_BUILD OFF)
+  set_target_properties(glfw PROPERTIES XCODE_ATTRIBUTE_CLANG_ENABLE_OBJC_ARC NO)
+  set(CMAKE_OBJC_FLAGS -fobjc-arc)
+
+  add_subdirectory(imgui)
 endif()

3party/glfw

@@ -0,0 +1 @@
+Subproject commit 21fea01161e0d6b70c0c5c1f52dc8e7a7df14a50

3party/imgui/CMakeLists.txt

@@ -0,0 +1,16 @@
+project(imgui)
+
+set(SRC
+  imgui/imgui_draw.cpp
+  imgui/imgui_tables.cpp
+  imgui/imgui_widgets.cpp
+  imgui/imgui.cpp
+  imgui/backends/imgui_impl_glfw.cpp
+)
+
+add_library(${PROJECT_NAME} ${SRC})
+target_include_directories(${PROJECT_NAME} 
+  PRIVATE ${OMIM_ROOT}/3party/glfw/include
+  PUBLIC ${OMIM_ROOT}/3party/imgui/imgui
+  PUBLIC .
+)

3party/imgui/imgui

@@ -0,0 +1 @@
+Subproject commit 6982ce43f5b143c5dce5fab0ce07dd4867b705ae

CMakeLists.txt

@@ -90,6 +90,19 @@ else()
   message(FATAL_ERROR "Unsupported platform: ${CMAKE_SYSTEM_NAME}")
 endif()
 
+if(${PLATFORM_MAC})
+  set(XCODE_ATTRIBUTE_CLANG_ENABLE_OBJC_ARC YES)
+
+  # Metal language support
+  list(APPEND CMAKE_MODULE_PATH ${OMIM_ROOT}/3party/CMake-MetalShaderSupport/cmake)
+  include(CheckLanguage)
+  include(MetalShaderSupport)
+  check_language(Metal)
+  if(CMAKE_Metal_COMPILER)
+    enable_language(Metal)
+  endif()
+endif()
+
 # Sanitizer
 if (PLATFORM_DESKTOP)
   # https://clang.llvm.org/docs/UsersManual.html#controlling-code-generation
@@ -265,16 +278,6 @@ find_package(Threads REQUIRED)
 
 # Scripts
 
-if (NOT CMAKE_HOST_WIN32)
-  execute_process(
-      COMMAND "${OMIM_ROOT}/tools/unix/check_cert.sh"
-      RESULT_VARIABLE CheckCertResult
-  )
-  if (CheckCertResult)
-      message(FATAL_ERROR "Certificate check failed")
-  endif()
-endif()
-
 if (NOT PLATFORM_IPHONE AND NOT PLATFORM_ANDROID)
   list(APPEND qt_components Core Network)
   if (NOT SKIP_QT_GUI OR NOT SKIP_TESTS OR PYBINDINGS)
@@ -394,6 +397,7 @@ if (PLATFORM_DESKTOP)
     add_subdirectory(qt)
     omim_add_tool_subdirectory(skin_generator)
   endif()
+  add_subdirectory(dev_sandbox)
 endif()
 
 omim_add_test_subdirectory(qt_tstfrm)

README.md

@@ -1,5 +1,5 @@
 <div align="center">
-  <img src="/qt/res/logo.png" height="100"/>
+  <img src="qt/res/logo.png" height="100"/>
 </div>
 <h1 align="center"">Organic Maps</h1>
 

android/app/src/main/AndroidManifest.xml

@@ -37,6 +37,7 @@
   <uses-permission android:name="android.permission.WAKE_LOCK"/>
   <uses-permission android:name="android.permission.FOREGROUND_SERVICE"/>
   <uses-permission android:name="android.permission.FOREGROUND_SERVICE_LOCATION"/>
+  <uses-permission android:name="android.permission.FOREGROUND_SERVICE_DATA_SYNC"/>
   <uses-permission android:name="android.permission.FOREGROUND_SERVICE_SPECIAL_USE"/>
   <!--
     Android 13 (API level 33) and higher supports a runtime permission for sending non-exempt (including Foreground
@@ -489,6 +490,13 @@
       android:stopWithTask="false"
       />
 
+    <service
+        android:name=".downloader.DownloaderService"
+        android:foregroundServiceType="dataSync"
+        android:exported="false"
+        android:enabled="true"
+        android:stopWithTask="false"/>
+
     <provider
       android:name="androidx.core.content.FileProvider"
       android:authorities="${FILE_PROVIDER_PLACEHOLDER}"

android/app/src/main/cpp/CMakeLists.txt

@@ -22,11 +22,13 @@ set(SRC
   app/organicmaps/vulkan/android_vulkan_context_factory.hpp
 
   # JNI sources
+  app/organicmaps/sdk/search/DisplayedCategories.cpp
+  app/organicmaps/sdk/search/SearchEngine.cpp
+  app/organicmaps/sdk/search/SearchRecents.cpp
   app/organicmaps/core/jni_helper.cpp
   app/organicmaps/core/jni_java_methods.cpp
   app/organicmaps/core/logging.cpp
   app/organicmaps/bookmarks/data/BookmarkManager.cpp
-  app/organicmaps/DisplayedCategories.cpp
   app/organicmaps/DownloadResourcesLegacyActivity.cpp
   app/organicmaps/editor/Editor.cpp
   app/organicmaps/editor/OpeningHours.cpp
@@ -38,8 +40,6 @@ set(SRC
   app/organicmaps/MapManager.cpp
   app/organicmaps/MwmApplication.cpp
   app/organicmaps/routing/RoutingOptions.cpp
-  app/organicmaps/SearchEngine.cpp
-  app/organicmaps/SearchRecents.cpp
   app/organicmaps/settings/UnitLocale.cpp
   app/organicmaps/settings/MapLanguageCode.cpp
   app/organicmaps/sound/tts.cpp

android/app/src/main/cpp/app/organicmaps/Framework.cpp

@@ -1578,6 +1578,12 @@ Java_app_organicmaps_Framework_nativeAddRoutePoint(JNIEnv * env, jclass, jstring
   frm()->GetRoutingManager().AddRoutePoint(std::move(data));
 }
 
+JNIEXPORT void JNICALL
+Java_app_organicmaps_Framework_nativeRemoveRoutePoints(JNIEnv * env, jclass)
+{
+  frm()->GetRoutingManager().RemoveRoutePoints();
+}
+
 JNIEXPORT void JNICALL
 Java_app_organicmaps_Framework_nativeRemoveRoutePoint(JNIEnv * env, jclass,
                                                           jint markType, jint intermediateIndex)
@@ -1627,6 +1633,13 @@ Java_app_organicmaps_Framework_nativeGetRoutePoints(JNIEnv * env, jclass)
   });
 }
 
+JNIEXPORT void JNICALL
+Java_app_organicmaps_Framework_nativeMoveRoutePoint(JNIEnv * env, jclass,
+                                                    jint currentIndex, jint targetIndex)
+{
+  frm()->GetRoutingManager().MoveRoutePoint(currentIndex, targetIndex);
+}
+
 JNIEXPORT jobject JNICALL
 Java_app_organicmaps_Framework_nativeGetTransitRouteInfo(JNIEnv * env, jclass)
 {

android/app/src/main/cpp/app/organicmaps/SearchRecents.cpp

@@ -1,40 +0,0 @@
-#include "Framework.hpp"
-
-#include "search/result.hpp"
-
-#include "app/organicmaps/core/jni_helper.hpp"
-#include "app/organicmaps/core/jni_java_methods.hpp"
-
-using SearchRequest = search::QuerySaver::SearchRequest;
-
-extern "C"
-{
-  JNIEXPORT void JNICALL
-  Java_app_organicmaps_search_SearchRecents_nativeGetList(JNIEnv * env, jclass thiz, jobject result)
-  {
-    auto const & items = g_framework->NativeFramework()->GetSearchAPI().GetLastSearchQueries();
-    if (items.empty())
-      return;
-
-    auto const listAddMethod = jni::ListBuilder::Instance(env).m_add;
-
-    for (SearchRequest const & item : items)
-    {
-      jni::TScopedLocalRef str(env, jni::ToJavaString(env, item.second));
-      env->CallBooleanMethod(result, listAddMethod, str.get());
-    }
-  }
-
-  JNIEXPORT void JNICALL
-  Java_app_organicmaps_search_SearchRecents_nativeAdd(JNIEnv * env, jclass thiz, jstring locale, jstring query)
-  {
-    SearchRequest const sr(jni::ToNativeString(env, locale), jni::ToNativeString(env, query));
-    g_framework->NativeFramework()->GetSearchAPI().SaveSearchQuery(sr);
-  }
-
-  JNIEXPORT void JNICALL
-  Java_app_organicmaps_search_SearchRecents_nativeClear(JNIEnv * env, jclass thiz)
-  {
-    g_framework->NativeFramework()->GetSearchAPI().ClearSearchHistory();
-  }
-}

android/app/src/main/cpp/app/organicmaps/UserMarkHelper.cpp

@@ -28,7 +28,7 @@ void InjectMetadata(JNIEnv * env, jclass const clazz, jobject const mapObject, o
 //jobject CreatePopularity(JNIEnv * env, place_page::Info const & info)
 //{
 //  static jclass const popularityClass =
-//    jni::GetGlobalClassRef(env, "app/organicmaps/search/Popularity");
+//    jni::GetGlobalClassRef(env, "app/organicmaps/sdk/search/Popularity");
 //  static jmethodID const popularityConstructor =
 //    jni::GetConstructorID(env, popularityClass, "(I)V");
 //  auto const popularityValue = info.GetPopularity();
@@ -57,7 +57,7 @@ jobject CreateMapObject(JNIEnv * env, place_page::Info const & info, int mapObje
       "Ljava/lang/String;"                              // appId
       "Lapp/organicmaps/routing/RoutePointInfo;"   // routePointInfo
       "I"                                               // openingMode
-      "Lapp/organicmaps/search/Popularity;"        // popularity
+      "Lapp/organicmaps/sdk/search/Popularity;"         // popularity
       "Ljava/lang/String;"                              // description
       "I"                                               // roadWarnType
       "[Ljava/lang/String;"                             // rawTypes
@@ -105,7 +105,7 @@ jobject CreateBookmark(JNIEnv *env, const place_page::Info &info,
                                 "(Lapp/organicmaps/bookmarks/data/FeatureId;JJLjava/lang/String;"
                                 "Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;"
                                 "Lapp/organicmaps/routing/RoutePointInfo;"
-                                "ILapp/organicmaps/search/Popularity;Ljava/lang/String;"
+                                "ILapp/organicmaps/sdk/search/Popularity;Ljava/lang/String;"
                                 "[Ljava/lang/String;)V");
   static jmethodID const featureCtorId =
           jni::GetConstructorID(env, g_featureIdClazz, "(Ljava/lang/String;JI)V");

android/app/src/main/cpp/app/organicmaps/sdk/search/DisplayedCategories.cpp

@@ -5,8 +5,7 @@
 
 extern "C"
 {
-JNIEXPORT jobjectArray JNICALL
-Java_app_organicmaps_search_DisplayedCategories_nativeGetKeys(JNIEnv * env, jclass clazz)
+JNIEXPORT jobjectArray JNICALL Java_app_organicmaps_sdk_search_DisplayedCategories_nativeGetKeys(JNIEnv * env, jclass)
 {
   ::Framework * fr = g_framework->NativeFramework();
   ASSERT(fr, ());

android/app/src/main/cpp/app/organicmaps/sdk/search/SearchEngine.cpp

@@ -39,7 +39,7 @@ Results g_results;
 
 // Timestamp of last search query. Results with older stamps are ignored.
 jlong g_queryTimestamp;
-// Implements 'NativeSearchListener' java interface.
+// Implements 'SearchListener' java interface.
 jobject g_javaListener;
 jmethodID g_updateResultsId;
 jmethodID g_endResultsId;
@@ -52,7 +52,7 @@ jmethodID g_descriptionConstructor;
 jclass g_popularityClass;
 jmethodID g_popularityConstructor;
 
-// Implements 'NativeMapSearchListener' java interface.
+// Implements 'MapSearchListener' java interface.
 jmethodID g_mapResultsMethod;
 jclass g_mapResultClass;
 jmethodID g_mapResultCtor;
@@ -232,21 +232,21 @@ void OnBookmarksSearchResults(search::BookmarksSearchParams::Results results,
 extern "C"
 {
   JNIEXPORT void JNICALL
-  Java_app_organicmaps_search_SearchEngine_nativeInit(JNIEnv * env, jobject thiz)
+  Java_app_organicmaps_sdk_search_SearchEngine_nativeInit(JNIEnv * env, jobject thiz)
   {
     g_javaListener = env->NewGlobalRef(thiz);
     // public void onResultsUpdate(@NonNull SearchResult[] results, long timestamp)
     g_updateResultsId = jni::GetMethodID(env, g_javaListener, "onResultsUpdate",
-                                         "([Lapp/organicmaps/search/SearchResult;J)V");
+                                         "([Lapp/organicmaps/sdk/search/SearchResult;J)V");
     // public void onResultsEnd(long timestamp)
     g_endResultsId = jni::GetMethodID(env, g_javaListener, "onResultsEnd", "(J)V");
-    g_resultClass = jni::GetGlobalClassRef(env, "app/organicmaps/search/SearchResult");
+    g_resultClass = jni::GetGlobalClassRef(env, "app/organicmaps/sdk/search/SearchResult");
     g_resultConstructor = jni::GetConstructorID(
         env, g_resultClass,
-        "(Ljava/lang/String;Lapp/organicmaps/search/SearchResult$Description;DD[I[I"
-          "Lapp/organicmaps/search/Popularity;)V");
+        "(Ljava/lang/String;Lapp/organicmaps/sdk/search/SearchResult$Description;DD[I[I"
+        "Lapp/organicmaps/sdk/search/Popularity;)V");
     g_suggestConstructor = jni::GetConstructorID(env, g_resultClass, "(Ljava/lang/String;Ljava/lang/String;DD[I[I)V");
-    g_descriptionClass = jni::GetGlobalClassRef(env, "app/organicmaps/search/SearchResult$Description");
+    g_descriptionClass = jni::GetGlobalClassRef(env, "app/organicmaps/sdk/search/SearchResult$Description");
     /*
         Description(FeatureId featureId, String featureType, String region, Distance distance,
                     String description, int openNow, int minutesUntilOpen, int minutesUntilClosed,
@@ -257,12 +257,12 @@ extern "C"
                                                      "Ljava/lang/String;Ljava/lang/String;Lapp/organicmaps/util/Distance;"
                                                      "Ljava/lang/String;IIIZ)V");
 
-    g_popularityClass = jni::GetGlobalClassRef(env, "app/organicmaps/search/Popularity");
+    g_popularityClass = jni::GetGlobalClassRef(env, "app/organicmaps/sdk/search/Popularity");
     g_popularityConstructor = jni::GetConstructorID(env, g_popularityClass, "(I)V");
 
     g_mapResultsMethod = jni::GetMethodID(env, g_javaListener, "onMapSearchResults",
-                                          "([Lapp/organicmaps/search/NativeMapSearchListener$Result;JZ)V");
-    g_mapResultClass = jni::GetGlobalClassRef(env, "app/organicmaps/search/NativeMapSearchListener$Result");
+                                          "([Lapp/organicmaps/sdk/search/MapSearchListener$Result;JZ)V");
+    g_mapResultClass = jni::GetGlobalClassRef(env, "app/organicmaps/sdk/search/MapSearchListener$Result");
     g_mapResultCtor = jni::GetConstructorID(env, g_mapResultClass, "(Ljava/lang/String;Ljava/lang/String;)V");
 
     g_updateBookmarksResultsId =
@@ -271,7 +271,7 @@ extern "C"
       jni::GetMethodID(env, g_javaListener, "onBookmarkSearchResultsEnd", "([JJ)V");
   }
 
-  JNIEXPORT jboolean JNICALL Java_app_organicmaps_search_SearchEngine_nativeRunSearch(
+  JNIEXPORT jboolean JNICALL Java_app_organicmaps_sdk_search_SearchEngine_nativeRunSearch(
       JNIEnv * env, jclass clazz, jbyteArray bytes, jboolean isCategory,
       jstring lang, jlong timestamp, jboolean hasPosition, jdouble lat, jdouble lon)
   {
@@ -288,7 +288,7 @@ extern "C"
     return searchStarted;
   }
 
-  JNIEXPORT void JNICALL Java_app_organicmaps_search_SearchEngine_nativeRunInteractiveSearch(
+  JNIEXPORT void JNICALL Java_app_organicmaps_sdk_search_SearchEngine_nativeRunInteractiveSearch(
       JNIEnv * env, jclass clazz, jbyteArray bytes, jboolean isCategory,
       jstring lang, jlong timestamp, jboolean isMapAndTable, jboolean hasPosition, jdouble lat, jdouble lon)
   {
@@ -321,7 +321,7 @@ extern "C"
     }
   }
 
-  JNIEXPORT void JNICALL Java_app_organicmaps_search_SearchEngine_nativeRunSearchMaps(
+  JNIEXPORT void JNICALL Java_app_organicmaps_sdk_search_SearchEngine_nativeRunSearchMaps(
       JNIEnv * env, jclass clazz, jbyteArray bytes, jstring lang, jlong timestamp)
   {
     storage::DownloaderSearchParams params{
@@ -334,7 +334,7 @@ extern "C"
       g_queryTimestamp = timestamp;
   }
 
-  JNIEXPORT jboolean JNICALL Java_app_organicmaps_search_SearchEngine_nativeRunSearchInBookmarks(
+  JNIEXPORT jboolean JNICALL Java_app_organicmaps_sdk_search_SearchEngine_nativeRunSearchInBookmarks(
       JNIEnv * env, jclass clazz, jbyteArray query, jlong catId, jlong timestamp)
   {
     search::BookmarksSearchParams params{
@@ -350,25 +350,25 @@ extern "C"
   }
 
   JNIEXPORT void JNICALL
-  Java_app_organicmaps_search_SearchEngine_nativeShowResult(JNIEnv * env, jclass clazz, jint index)
+  Java_app_organicmaps_sdk_search_SearchEngine_nativeShowResult(JNIEnv * env, jclass clazz, jint index)
   {
     g_framework->NativeFramework()->ShowSearchResult(g_results[index]);
   }
 
   JNIEXPORT void JNICALL
-  Java_app_organicmaps_search_SearchEngine_nativeCancelInteractiveSearch(JNIEnv * env, jclass clazz)
+  Java_app_organicmaps_sdk_search_SearchEngine_nativeCancelInteractiveSearch(JNIEnv * env, jclass clazz)
   {
     g_framework->NativeFramework()->GetSearchAPI().CancelSearch(search::Mode::Viewport);
   }
 
   JNIEXPORT void JNICALL
-  Java_app_organicmaps_search_SearchEngine_nativeCancelEverywhereSearch(JNIEnv * env, jclass clazz)
+  Java_app_organicmaps_sdk_search_SearchEngine_nativeCancelEverywhereSearch(JNIEnv * env, jclass clazz)
   {
     g_framework->NativeFramework()->GetSearchAPI().CancelSearch(search::Mode::Everywhere);
   }
 
   JNIEXPORT void JNICALL
-  Java_app_organicmaps_search_SearchEngine_nativeCancelAllSearches(JNIEnv * env, jclass clazz)
+  Java_app_organicmaps_sdk_search_SearchEngine_nativeCancelAllSearches(JNIEnv * env, jclass clazz)
   {
     g_framework->NativeFramework()->GetSearchAPI().CancelAllSearches();
   }

android/app/src/main/cpp/app/organicmaps/sdk/search/SearchRecents.cpp

@@ -0,0 +1,37 @@
+#include "app/organicmaps/Framework.hpp"
+#include "app/organicmaps/core/jni_helper.hpp"
+#include "app/organicmaps/core/jni_java_methods.hpp"
+
+#include "search/result.hpp"
+
+using SearchRequest = search::QuerySaver::SearchRequest;
+
+extern "C"
+{
+JNIEXPORT void JNICALL Java_app_organicmaps_sdk_search_SearchRecents_nativeGetList(JNIEnv * env, jclass, jobject result)
+{
+  auto const & items = g_framework->NativeFramework()->GetSearchAPI().GetLastSearchQueries();
+  if (items.empty())
+    return;
+
+  auto const listAddMethod = jni::ListBuilder::Instance(env).m_add;
+
+  for (SearchRequest const & item : items)
+  {
+    jni::TScopedLocalRef str(env, jni::ToJavaString(env, item.second));
+    env->CallBooleanMethod(result, listAddMethod, str.get());
+  }
+}
+
+JNIEXPORT void JNICALL Java_app_organicmaps_sdk_search_SearchRecents_nativeAdd(JNIEnv * env, jclass, jstring locale,
+                                                                               jstring query)
+{
+  SearchRequest const sr(jni::ToNativeString(env, locale), jni::ToNativeString(env, query));
+  g_framework->NativeFramework()->GetSearchAPI().SaveSearchQuery(sr);
+}
+
+JNIEXPORT void JNICALL Java_app_organicmaps_sdk_search_SearchRecents_nativeClear(JNIEnv * env, jclass)
+{
+  g_framework->NativeFramework()->GetSearchAPI().ClearSearchHistory();
+}
+}

android/app/src/main/cpp/app/organicmaps/util/StringUtils.cpp

@@ -49,6 +49,12 @@ Java_app_organicmaps_util_StringUtils_nativeFilterContainsNormalized(JNIEnv * en
   return jni::ToJavaStringArray(env, filtered);
 }
 
+JNIEXPORT jint JNICALL Java_app_organicmaps_util_StringUtils_nativeFormatSpeed(
+    JNIEnv * env, jclass thiz, jdouble metersPerSecond)
+{
+  return measurement_utils::FormatSpeed(metersPerSecond, measurement_utils::GetMeasurementUnits());
+}
+
 JNIEXPORT jobject JNICALL Java_app_organicmaps_util_StringUtils_nativeFormatSpeedAndUnits(
     JNIEnv * env, jclass thiz, jdouble metersPerSecond)
 {

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

@@ -390,7 +390,7 @@ public class DownloadResourcesLegacyActivity extends BaseMwmFragmentActivity
         mProgress.setProgressCompat(0, true);
 
         mCountryDownloadListenerSlot = MapManager.nativeSubscribe(mCountryDownloadListener);
-        MapManager.nativeDownload(mCurrentCountry);
+        MapManager.startDownload(mCurrentCountry);
         setAction(PROCEED_TO_MAP);
       }
       else

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

@@ -333,11 +333,20 @@ public class Framework
   public static native int nativeGetBestRouter(double srcLat, double srcLon,
                                                double dstLat, double dstLon);
 
+  public static void addRoutePoint(RouteMarkData point)
+  {
+    Framework.nativeAddRoutePoint(point.mTitle, point.mSubtitle, point.mPointType,
+                                  point.mIntermediateIndex, point.mIsMyPosition,
+                                  point.mLat, point.mLon);
+  }
+
   public static native void nativeAddRoutePoint(String title, String subtitle,
                                                 @RoutePointInfo.RouteMarkType int markType,
                                                 int intermediateIndex, boolean isMyPosition,
                                                 double lat, double lon);
 
+  public static native void nativeRemoveRoutePoints();
+
   public static native void nativeRemoveRoutePoint(@RoutePointInfo.RouteMarkType int markType,
                                                    int intermediateIndex);
 
@@ -346,6 +355,9 @@ public class Framework
   public static native boolean nativeCouldAddIntermediatePoint();
   @NonNull
   public static native RouteMarkData[] nativeGetRoutePoints();
+
+  public static native void nativeMoveRoutePoint(int currentIndex, int targetIndex);
+
   @NonNull
   public static native TransitRouteInfo nativeGetTransitRouteInfo();
   /**

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

@@ -77,7 +77,7 @@ import app.organicmaps.maplayer.MapButtonsViewModel;
 import app.organicmaps.maplayer.ToggleMapLayerFragment;
 import app.organicmaps.maplayer.isolines.IsolinesManager;
 import app.organicmaps.maplayer.isolines.IsolinesState;
-import app.organicmaps.maplayer.subway.SubwayManager;
+import app.organicmaps.routing.ManageRouteBottomSheet;
 import app.organicmaps.routing.NavigationController;
 import app.organicmaps.routing.NavigationService;
 import app.organicmaps.routing.RoutePointInfo;
@@ -89,7 +89,7 @@ import app.organicmaps.routing.RoutingPlanFragment;
 import app.organicmaps.routing.RoutingPlanInplaceController;
 import app.organicmaps.search.FloatingSearchToolbarController;
 import app.organicmaps.search.SearchActivity;
-import app.organicmaps.search.SearchEngine;
+import app.organicmaps.sdk.search.SearchEngine;
 import app.organicmaps.search.SearchFragment;
 import app.organicmaps.settings.DrivingOptionsActivity;
 import app.organicmaps.settings.RoadType;
@@ -150,6 +150,7 @@ public class MwmActivity extends BaseMwmFragmentActivity
   public static final String EXTRA_TRACK_ID = "track_id";
   public static final String EXTRA_UPDATE_THEME = "update_theme";
   private static final String EXTRA_CONSUMED = "mwm.extra.intent.processed";
+  private boolean mPreciseLocationDialogShown = false;
 
   private static final String[] DOCKED_FRAGMENTS = { SearchFragment.class.getName(),
                                                      DownloaderFragment.class.getName(),
@@ -157,7 +158,11 @@ public class MwmActivity extends BaseMwmFragmentActivity
                                                      EditorHostFragment.class.getName(),
                                                      ReportFragment.class.getName() };
 
-  public static final int REQ_CODE_DRIVING_OPTIONS = 6;
+  public final ActivityResultLauncher<Intent> startDrivingOptionsForResult = registerForActivityResult(new ActivityResultContracts.StartActivityForResult(), activityResult ->
+  {
+     if( activityResult.getResultCode() == Activity.RESULT_OK)
+      rebuildLastRoute();
+  });
 
   private static final String MAIN_MENU_ID = "MAIN_MENU_BOTTOM_SHEET";
   private static final String LAYERS_MENU_ID = "LAYERS_MENU_BOTTOM_SHEET";
@@ -229,6 +234,8 @@ public class MwmActivity extends BaseMwmFragmentActivity
   @NonNull
   private DisplayManager mDisplayManager;
 
+  ManageRouteBottomSheet mManageRouteBottomSheet;
+
   private boolean mRemoveDisplayListener = true;
   private int mLastUiMode = Configuration.UI_MODE_TYPE_UNDEFINED;
 
@@ -586,14 +593,14 @@ public class MwmActivity extends BaseMwmFragmentActivity
     ViewCompat.setOnApplyWindowInsetsListener(mPointChooser, (view, windowInsets) -> {
       UiUtils.setViewInsetsPaddingBottom(mPointChooser, windowInsets);
       UiUtils.setViewInsetsPaddingNoBottom(mPointChooserToolbar, windowInsets);
-
+      final int trackRecorderOffset = 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
       if (mCurrentWindowInsets == null)
-        updateCompassOffset(windowInsets.getInsets(WindowInsetsCompat.Type.systemBars()).top, windowInsets.getInsets(WindowInsetsCompat.Type.systemBars()).right);
-      else
-        updateCompassOffset(-1, windowInsets.getInsets(WindowInsetsCompat.Type.systemBars()).right);
+      {
+        updateCompassOffset(trackRecorderOffset + windowInsets.getInsets(WindowInsetsCompat.Type.systemBars()).top, windowInsets.getInsets(WindowInsetsCompat.Type.systemBars()).right);
+      }
       refreshLightStatusBar();
       updateBottomWidgetsOffset(windowInsets.getInsets(WindowInsetsCompat.Type.systemBars()).left);
       mCurrentWindowInsets = windowInsets;
@@ -614,7 +621,7 @@ public class MwmActivity extends BaseMwmFragmentActivity
 
     if (!mIsTabletLayout)
     {
-      mRoutingPlanInplaceController = new RoutingPlanInplaceController(this, this, this);
+      mRoutingPlanInplaceController = new RoutingPlanInplaceController(this, startDrivingOptionsForResult, this, this);
       removeCurrentFragment(false);
     }
 
@@ -691,6 +698,16 @@ public class MwmActivity extends BaseMwmFragmentActivity
     }
   }
 
+  /** Hides/shows UI while keeping state
+   * @param isUiHidden True to hide the UI
+  **/
+  public void hideOrShowUIWithoutClosingPlacePage(boolean isUiHidden)
+  {
+    // Used instead of closeBottomSheet to preserve state and hide instantly
+    UiUtils.showIf(!isUiHidden, findViewById(R.id.place_page_container_fragment));
+    mMapButtonsViewModel.setButtonsHidden(isUiHidden);
+  }
+
   private void showSearchToolbar()
   {
     mSearchController.show();
@@ -800,6 +817,7 @@ public class MwmActivity extends BaseMwmFragmentActivity
         showBottomSheet(MAIN_MENU_ID);
       }
       case help -> showHelp();
+      case trackRecordingStatus -> showTrackSaveDialog();
     }
   }
 
@@ -1018,18 +1036,6 @@ public class MwmActivity extends BaseMwmFragmentActivity
     mPowerSaveDisclaimerShown = savedInstanceState.getBoolean(POWER_SAVE_DISCLAIMER_SHOWN, false);
   }
 
-  @Override
-  protected void onActivityResult(int requestCode, int resultCode, Intent data)
-  {
-    super.onActivityResult(requestCode, resultCode, data);
-
-    if (resultCode != Activity.RESULT_OK)
-      return;
-
-    if (requestCode == REQ_CODE_DRIVING_OPTIONS)
-      rebuildLastRoute();
-  }
-
   private void rebuildLastRoute()
   {
     RoutingController.get().attach(this);
@@ -1498,14 +1504,30 @@ public class MwmActivity extends BaseMwmFragmentActivity
     if (mCurrentWindowInsets == null) {
       return;
     }
-    int offset = mCurrentWindowInsets.getInsets(WindowInsetsCompat.Type.systemBars()).top;
+    int offsetY = mCurrentWindowInsets.getInsets(WindowInsetsCompat.Type.systemBars()).top;
+    int offsetX = mCurrentWindowInsets.getInsets(WindowInsetsCompat.Type.systemBars()).right;
     if (show && mRoutingPlanInplaceController != null)
     {
       final int height = mRoutingPlanInplaceController.calcHeight();
       if (height != 0)
-        offset = height;
+        offsetY = height;
     }
-    updateCompassOffset(offset);
+    final int orientation = getResources().getConfiguration().orientation;
+    final boolean isTrackRecordingEnabled = TrackRecorder.nativeIsTrackRecordingEnabled();
+    if (isTrackRecordingEnabled && (orientation != Configuration.ORIENTATION_LANDSCAPE))
+      offsetY += UiUtils.dimen(this, R.dimen.map_button_size);
+    if (orientation == Configuration.ORIENTATION_LANDSCAPE)
+    {
+      if (show)
+      {
+        final boolean isSmallScreen = UiUtils.getDisplayTotalHeight(this) < UiUtils.dimen(this, R.dimen.dp_400);
+        if (!isSmallScreen || TrackRecorder.nativeIsTrackRecordingEnabled())
+          offsetX += UiUtils.dimen(this, R.dimen.map_button_size);
+      }
+      else if (isTrackRecordingEnabled)
+        offsetY += UiUtils.dimen(this, R.dimen.map_button_size);
+    }
+    updateCompassOffset(offsetY, offsetX);
   }
 
   @Override
@@ -1672,12 +1694,6 @@ public class MwmActivity extends BaseMwmFragmentActivity
     mRoutingPlanInplaceController.showDrivingOptionView();
   }
 
-  @Override
-  public boolean isSubwayEnabled()
-  {
-    return SubwayManager.from(this).isEnabled();
-  }
-
   @Override
   public void onCommonBuildError(int lastResultCode, @NonNull String[] lastMissingMaps)
   {
@@ -1693,7 +1709,7 @@ public class MwmActivity extends BaseMwmFragmentActivity
     mAlertDialog = new MaterialAlertDialogBuilder(this, R.style.MwmTheme_AlertDialog)
         .setTitle(R.string.unable_to_calc_alert_title)
         .setMessage(R.string.unable_to_calc_alert_subtitle)
-        .setPositiveButton(R.string.settings, (dialog, which) -> DrivingOptionsActivity.start(this))
+        .setPositiveButton(R.string.settings, (dialog, which) -> DrivingOptionsActivity.start(this, startDrivingOptionsForResult))
         .setNegativeButton(R.string.cancel, null)
         .setOnDismissListener(dialog -> mAlertDialog = null)
         .show();
@@ -1806,7 +1822,7 @@ public class MwmActivity extends BaseMwmFragmentActivity
     }
 
     // Check for any location permissions.
-    if (!LocationUtils.checkCoarseLocationPermission(this))
+    if (!LocationUtils.checkLocationPermission(this))
     {
       Logger.w(LOCATION_TAG, "Permissions ACCESS_COARSE_LOCATION and ACCESS_FINE_LOCATION are not granted");
       // Calls onMyPositionModeChanged(NOT_FOLLOW_NO_POSITION).
@@ -1944,12 +1960,50 @@ public class MwmActivity extends BaseMwmFragmentActivity
     mLocationPermissionRequestedForRecording = false;
     if (LocationUtils.checkLocationPermission(this))
     {
+      final boolean hasFineLocationPermission = LocationUtils.checkFineLocationPermission(this);
+
       if (LocationState.getMode() == LocationState.NOT_FOLLOW_NO_POSITION)
         LocationState.nativeSwitchToNextMode();
 
-      if (requestedForRecording && LocationUtils.checkFineLocationPermission(this))
+      if (requestedForRecording && hasFineLocationPermission)
         startTrackRecording();
 
+      if (hasFineLocationPermission)
+      {
+        Logger.i(LOCATION_TAG, "ACCESS_FINE_LOCATION permission granted");
+      }
+      else
+      {
+        Logger.w(LOCATION_TAG, "Only ACCESS_COARSE_LOCATION permission granted");
+        if (mLocationErrorDialog != null && mLocationErrorDialog.isShowing())
+        {
+          Logger.w(LOCATION_TAG, "Don't show 'Precise Location denied' dialog because another dialog is in progress");
+          return;
+        }
+        if (!mPreciseLocationDialogShown)
+        {
+          mPreciseLocationDialogShown = true;
+          final MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(this, R.style.MwmTheme_AlertDialog)
+              .setTitle("⚠ " + getString(R.string.limited_accuracy))
+              .setMessage(R.string.precise_location_is_disabled_long_text)
+              .setNegativeButton(R.string.close, (dialog, which) -> dialog.dismiss())
+              .setCancelable(true)
+              .setOnDismissListener(dialog -> mLocationErrorDialog = null);
+          final Intent intent = Utils.makeSystemLocationSettingIntent(this);
+          if (intent != null)
+          {
+            intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+            intent.addFlags(Intent.FLAG_ACTIVITY_NO_HISTORY);
+            intent.addFlags(Intent.FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS);
+            builder.setPositiveButton(R.string.location_settings, (dialog, which) -> startActivity(intent));
+          }
+          mLocationErrorDialog = builder.show();
+        }
+        else
+        {
+          Toast.makeText(this, R.string.precise_location_is_disabled_long_text, Toast.LENGTH_LONG).show();
+        }
+      }
       return;
     }
 
@@ -2100,6 +2154,15 @@ public class MwmActivity extends BaseMwmFragmentActivity
     RoutingController.get().start();
   }
 
+  @Override
+  public void onManageRouteOpen()
+  {
+    // Create and show 'Manage Route' Bottom Sheet panel.
+    mManageRouteBottomSheet = new ManageRouteBottomSheet();
+    mManageRouteBottomSheet.setCancelable(false);
+    mManageRouteBottomSheet.show(getSupportFragmentManager(), "ManageRouteBottomSheet");
+  }
+
   private boolean requestBatterySaverPermission()
   {
     if (!PowerManagment.isSystemPowerSaveMode(this))
@@ -2277,6 +2340,11 @@ public class MwmActivity extends BaseMwmFragmentActivity
 
     requestPostNotificationsPermission();
 
+    if (mCurrentWindowInsets != null)
+    {
+      final int offset = mCurrentWindowInsets.getInsets(WindowInsetsCompat.Type.systemBars()).top;
+      updateCompassOffset(offset + UiUtils.dimen(this, R.dimen.map_button_size));
+    }
     Toast.makeText(this, R.string.track_recording, Toast.LENGTH_SHORT).show();
     TrackRecordingService.startForegroundService(getApplicationContext());
     mMapButtonsViewModel.setTrackRecorderState(true);
@@ -2285,6 +2353,18 @@ public class MwmActivity extends BaseMwmFragmentActivity
 
   private void stopTrackRecording()
   {
+    if (mCurrentWindowInsets != null)
+    {
+      int offsetY = mCurrentWindowInsets.getInsets(WindowInsetsCompat.Type.systemBars()).top;
+      final int offsetX = mCurrentWindowInsets.getInsets(WindowInsetsCompat.Type.systemBars()).right;
+      if (RoutingController.get().isPlanning() && mRoutingPlanInplaceController != null)
+      {
+        final int height = mRoutingPlanInplaceController.calcHeight();
+        if (height != 0)
+          offsetY = height;
+      }
+      updateCompassOffset(offsetY, offsetX);
+    }
     TrackRecordingService.stopService(getApplicationContext());
     mMapButtonsViewModel.setTrackRecorderState(false);
   }

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

@@ -16,13 +16,14 @@ import androidx.lifecycle.LifecycleObserver;
 import androidx.lifecycle.LifecycleOwner;
 import androidx.lifecycle.ProcessLifecycleOwner;
 
+import java.io.IOException;
+import java.lang.ref.WeakReference;
+
 import app.organicmaps.background.OsmUploadWork;
-import app.organicmaps.downloader.Android7RootCertificateWorkaround;
-import app.organicmaps.downloader.DownloaderNotifier;
 import app.organicmaps.bookmarks.data.BookmarkManager;
 import app.organicmaps.display.DisplayManager;
-import app.organicmaps.downloader.CountryItem;
-import app.organicmaps.downloader.MapManager;
+import app.organicmaps.downloader.Android7RootCertificateWorkaround;
+import app.organicmaps.downloader.DownloaderNotifier;
 import app.organicmaps.location.LocationHelper;
 import app.organicmaps.location.LocationState;
 import app.organicmaps.location.SensorHelper;
@@ -33,7 +34,7 @@ import app.organicmaps.maplayer.subway.SubwayManager;
 import app.organicmaps.maplayer.traffic.TrafficManager;
 import app.organicmaps.routing.NavigationService;
 import app.organicmaps.routing.RoutingController;
-import app.organicmaps.search.SearchEngine;
+import app.organicmaps.sdk.search.SearchEngine;
 import app.organicmaps.settings.StoragePathManager;
 import app.organicmaps.sound.TtsPlayer;
 import app.organicmaps.util.Config;
@@ -46,10 +47,6 @@ import app.organicmaps.util.Utils;
 import app.organicmaps.util.log.Logger;
 import app.organicmaps.util.log.LogsManager;
 
-import java.io.IOException;
-import java.lang.ref.WeakReference;
-import java.util.List;
-
 public class MwmApplication extends Application implements Application.ActivityLifecycleCallbacks
 {
   @NonNull
@@ -78,9 +75,6 @@ public class MwmApplication extends Application implements Application.ActivityL
   private volatile boolean mFrameworkInitialized;
   private volatile boolean mPlatformInitialized;
 
-  @NonNull
-  private final MapManager.StorageCallback mStorageCallbacks = new StorageCallbackImpl();
-
   @Nullable
   private WeakReference<Activity> mTopActivity;
 
@@ -127,6 +121,9 @@ public class MwmApplication extends Application implements Application.ActivityL
     return (MwmApplication) context.getApplicationContext();
   }
 
+  @NonNull
+  public static MwmApplication sInstance;
+
   @NonNull
   public static SharedPreferences prefs(@NonNull Context context)
   {
@@ -138,6 +135,9 @@ public class MwmApplication extends Application implements Application.ActivityL
   {
     super.onCreate();
     Logger.i(TAG, "Initializing application");
+
+    sInstance = this;
+
     LogsManager.INSTANCE.initFileLogging(this);
 
     Android7RootCertificateWorkaround.initializeIfNeeded(this);
@@ -230,8 +230,6 @@ public class MwmApplication extends Application implements Application.ActivityL
 
     nativeInitFramework(onComplete);
 
-    MapManager.nativeSubscribe(mStorageCallbacks);
-
     initNativeStrings();
     ThemeSwitcher.INSTANCE.initialize(this);
     SearchEngine.INSTANCE.initialize();
@@ -363,25 +361,4 @@ public class MwmApplication extends Application implements Application.ActivityL
       mLocationHelper.stop();
     }
   }
-
-  private class StorageCallbackImpl implements MapManager.StorageCallback
-  {
-    @Override
-    public void onStatusChanged(List<MapManager.StorageCallbackData> data)
-    {
-      for (MapManager.StorageCallbackData item : data)
-        if (item.isLeafNode && item.newStatus == CountryItem.STATUS_FAILED)
-        {
-          if (MapManager.nativeIsAutoretryFailed())
-          {
-            DownloaderNotifier.notifyDownloadFailed(MwmApplication.this, item.countryId);
-          }
-
-          return;
-        }
-    }
-
-    @Override
-    public void onProgress(String countryId, long localSize, long remoteSize) {}
-  }
 }

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

@@ -91,7 +91,7 @@ public class SplashActivity extends AppCompatActivity
     super.onResume();
     if (mCanceled)
       return;
-    if (!Config.isLocationRequested() && !LocationUtils.checkCoarseLocationPermission(this))
+    if (!Config.isLocationRequested() && !LocationUtils.checkLocationPermission(this))
     {
       Logger.d(TAG, "Requesting location permissions");
       mPermissionRequest.launch(new String[]{

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

@@ -15,6 +15,7 @@ import android.view.View;
 import android.widget.Toast;
 
 import androidx.activity.result.ActivityResultLauncher;
+import androidx.activity.result.contract.ActivityResultContracts;
 import androidx.annotation.CallSuper;
 import androidx.annotation.LayoutRes;
 import androidx.annotation.NonNull;
@@ -57,9 +58,6 @@ public class BookmarkCategoriesFragment extends BaseMwmRecyclerFragment<Bookmark
 {
   private static final String TAG = BookmarkCategoriesFragment.class.getSimpleName();
 
-  static final int REQ_CODE_DELETE_CATEGORY = 102;
-  static final int REQ_CODE_IMPORT_DIRECTORY = 103;
-
   private static final int MAX_CATEGORY_NAME_LENGTH = 60;
 
   public static final String BOOKMARKS_CATEGORIES_MENU_ID = "BOOKMARKS_CATEGORIES_BOTTOM_SHEET";
@@ -75,6 +73,22 @@ public class BookmarkCategoriesFragment extends BaseMwmRecyclerFragment<Bookmark
   @NonNull
   private DataChangedListener mCategoriesAdapterObserver;
 
+  private final ActivityResultLauncher<Intent> startBookmarkListForResult = registerForActivityResult(new ActivityResultContracts.StartActivityForResult(), activityResult -> {
+    if( activityResult.getResultCode() == Activity.RESULT_OK)
+      onDeleteActionSelected(getSelectedCategory());
+  });
+
+  private final ActivityResultLauncher<Intent> startImportDirectoryForResult = registerForActivityResult(new ActivityResultContracts.StartActivityForResult(), activityResult ->
+    {
+      if( activityResult.getResultCode() == Activity.RESULT_OK)
+        onImportDirectoryResult(activityResult.getData());
+    });
+
+  private final ActivityResultLauncher<Intent> startBookmarkSettingsForResult = registerForActivityResult(new ActivityResultContracts.StartActivityForResult(), activityResult -> {
+    // not handled at the moment
+  });
+
+
   @Override
   @LayoutRes
   protected int getLayoutRes()
@@ -259,7 +273,7 @@ public class BookmarkCategoriesFragment extends BaseMwmRecyclerFragment<Bookmark
 
     PackageManager packageManager = requireActivity().getPackageManager();
     if (intent.resolveActivity(packageManager) != null)
-      startActivityForResult(intent, REQ_CODE_IMPORT_DIRECTORY);
+      startImportDirectoryForResult.launch(intent);
     else
       showNoFileManagerError();
   }
@@ -275,7 +289,7 @@ public class BookmarkCategoriesFragment extends BaseMwmRecyclerFragment<Bookmark
   public void onItemClick(@NonNull View v, @NonNull BookmarkCategory category)
   {
     mSelectedCategory = category;
-    BookmarkListActivity.startForResult(this, category);
+    BookmarkListActivity.startForResult(this, startBookmarkListForResult, category);
   }
 
   @Override
@@ -303,54 +317,42 @@ public class BookmarkCategoriesFragment extends BaseMwmRecyclerFragment<Bookmark
 
   private void onSettingsActionSelected(@NonNull BookmarkCategory category)
   {
-    BookmarkCategorySettingsActivity.startForResult(this, category);
+    BookmarkCategorySettingsActivity.startForResult(this, startBookmarkSettingsForResult, category);
   }
 
-  @Override
-  public final void onActivityResult(int requestCode, int resultCode, Intent data)
+  private void onImportDirectoryResult(Intent data)
   {
-    super.onActivityResult(requestCode, resultCode, data);
-    if (resultCode != Activity.RESULT_OK)
-      return;
-    switch (requestCode)
-    {
-      case REQ_CODE_DELETE_CATEGORY -> onDeleteActionSelected(getSelectedCategory());
-      case REQ_CODE_IMPORT_DIRECTORY ->
-      {
-        if (data == null)
-          throw new AssertionError("Data is null");
+    if (data == null)
+      throw new AssertionError("Data is null");
 
-        final Context context = requireActivity();
-        final Uri rootUri = data.getData();
-        final ProgressDialog dialog = new ProgressDialog(context, R.style.MwmTheme_ProgressDialog);
-        dialog.setMessage(getString(R.string.wait_several_minutes));
-        dialog.setProgressStyle(ProgressDialog.STYLE_SPINNER);
-        dialog.setIndeterminate(true);
-        dialog.setCancelable(false);
-        dialog.show();
-        Logger.d(TAG, "Importing bookmarks from " + rootUri);
-        MwmApplication app = MwmApplication.from(context);
-        final File tempDir = new File(StorageUtils.getTempPath(app));
-        final ContentResolver resolver = context.getContentResolver();
-        ThreadPool.getStorage().execute(() -> {
-          AtomicInteger found = new AtomicInteger(0);
-          StorageUtils.listContentProviderFilesRecursively(
+    final Context context = requireActivity();
+    final Uri rootUri = data.getData();
+    final ProgressDialog dialog = new ProgressDialog(context, R.style.MwmTheme_ProgressDialog);
+    dialog.setMessage(getString(R.string.wait_several_minutes));
+    dialog.setProgressStyle(ProgressDialog.STYLE_SPINNER);
+    dialog.setIndeterminate(true);
+    dialog.setCancelable(false);
+    dialog.show();
+    Logger.d(TAG, "Importing bookmarks from " + rootUri);
+    MwmApplication app = MwmApplication.from(context);
+    final File tempDir = new File(StorageUtils.getTempPath(app));
+    final ContentResolver resolver = context.getContentResolver();
+    ThreadPool.getStorage().execute(() -> {
+      AtomicInteger found = new AtomicInteger(0);
+      StorageUtils.listContentProviderFilesRecursively(
               resolver, rootUri, uri -> {
                 if (BookmarkManager.INSTANCE.importBookmarksFile(resolver, uri, tempDir))
                   found.incrementAndGet();
               });
-          UiThread.run(() -> {
-            if (dialog.isShowing())
-              dialog.dismiss();
-            int found_val = found.get();
-            String message = context.getResources().getQuantityString(
+      UiThread.run(() -> {
+        if (dialog.isShowing())
+          dialog.dismiss();
+        int found_val = found.get();
+        String message = context.getResources().getQuantityString(
                 R.plurals.bookmarks_detect_message, found_val, found_val);
-            Toast.makeText(requireContext(), message, Toast.LENGTH_LONG).show();
-          });
-        });
-      }
-      default -> throw new AssertionError("Invalid requestCode: " + requestCode);
-    }
+        Toast.makeText(requireContext(), message, Toast.LENGTH_LONG).show();
+      });
+    });
   }
 
   @Override

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

@@ -2,6 +2,7 @@ package app.organicmaps.bookmarks;
 
 import android.content.Intent;
 
+import androidx.activity.result.ActivityResultLauncher;
 import androidx.annotation.NonNull;
 import androidx.fragment.app.Fragment;
 
@@ -11,7 +12,6 @@ import app.organicmaps.bookmarks.data.BookmarkCategory;
 
 public class BookmarkCategorySettingsActivity extends BaseMwmFragmentActivity
 {
-  public static final int REQUEST_CODE = 107;
   public static final String EXTRA_BOOKMARK_CATEGORY = "bookmark_category";
 
   @Override
@@ -32,11 +32,11 @@ public class BookmarkCategorySettingsActivity extends BaseMwmFragmentActivity
     return BookmarkCategorySettingsFragment.class;
   }
 
-  public static void startForResult(@NonNull Fragment fragment,
+  public static void startForResult(@NonNull Fragment fragment, ActivityResultLauncher<Intent> startBookmarkSettingsForResult,
                                            @NonNull BookmarkCategory category)
   {
     android.content.Intent intent = new Intent(fragment.requireActivity(), BookmarkCategorySettingsActivity.class)
         .putExtra(EXTRA_BOOKMARK_CATEGORY, category);
-    fragment.startActivityForResult(intent, REQUEST_CODE);
+    startBookmarkSettingsForResult.launch(intent);
   }
 }

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

@@ -3,6 +3,7 @@ package app.organicmaps.bookmarks;
 import android.content.Intent;
 import android.os.Bundle;
 
+import androidx.activity.result.ActivityResultLauncher;
 import androidx.annotation.CallSuper;
 import androidx.annotation.NonNull;
 import androidx.annotation.StyleRes;
@@ -57,11 +58,11 @@ public class BookmarkListActivity extends BaseToolbarActivity
     return R.layout.bookmarks_activity;
   }
 
-  static void startForResult(@NonNull Fragment fragment, @NonNull BookmarkCategory category)
+  static void startForResult(@NonNull Fragment fragment, ActivityResultLauncher<Intent> startBookmarkListForResult, @NonNull BookmarkCategory category)
   {
     Bundle args = new Bundle();
     Intent intent = new Intent(fragment.requireActivity(), BookmarkListActivity.class);
     intent.putExtra(BookmarksListFragment.EXTRA_CATEGORY, category);
-    fragment.startActivityForResult(intent, BookmarkCategoriesFragment.REQ_CODE_DELETE_CATEGORY);
+    startBookmarkListForResult.launch(intent);
   }
 }

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

@@ -14,6 +14,7 @@ import android.view.ViewGroup;
 import android.widget.ImageView;
 
 import androidx.activity.result.ActivityResultLauncher;
+import androidx.activity.result.contract.ActivityResultContracts;
 import androidx.annotation.CallSuper;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
@@ -38,8 +39,8 @@ import app.organicmaps.bookmarks.data.KmlFileType;
 import app.organicmaps.bookmarks.data.SortedBlock;
 import app.organicmaps.bookmarks.data.Track;
 import app.organicmaps.location.LocationHelper;
-import app.organicmaps.search.NativeBookmarkSearchListener;
-import app.organicmaps.search.SearchEngine;
+import app.organicmaps.sdk.search.BookmarkSearchListener;
+import app.organicmaps.sdk.search.SearchEngine;
 import app.organicmaps.util.Graphics;
 import app.organicmaps.util.SharingUtils;
 import app.organicmaps.util.UiUtils;
@@ -61,7 +62,7 @@ public class BookmarksListFragment extends BaseMwmRecyclerFragment<ConcatAdapter
     implements BookmarkManager.BookmarksSharingListener,
                BookmarkManager.BookmarksSortingListener,
                BookmarkManager.BookmarksLoadingListener,
-               NativeBookmarkSearchListener,
+               BookmarkSearchListener,
                ChooseBookmarksSortingTypeFragment.ChooseSortingTypeListener,
                MenuBottomSheetFragment.MenuBottomSheetInterface
 {
@@ -74,6 +75,15 @@ public class BookmarksListFragment extends BaseMwmRecyclerFragment<ConcatAdapter
   private static final String OPTIONS_MENU_ID = "OPTIONS_MENU_BOTTOM_SHEET";
 
   private ActivityResultLauncher<SharingUtils.SharingIntent> shareLauncher;
+  private final ActivityResultLauncher<Intent> startBookmarkListForResult = registerForActivityResult(new ActivityResultContracts.StartActivityForResult(), activityResult -> {
+    System.out.println("resultCode: " + activityResult.getResultCode());
+    handleActivityResult();
+  });
+
+  private final ActivityResultLauncher<Intent> startBookmarkSettingsForResult = registerForActivityResult(new ActivityResultContracts.StartActivityForResult(), activityResult -> {
+    System.out.println("resultCode: " + activityResult.getResultCode());
+    handleActivityResult();
+  });
 
   @SuppressWarnings("NotNullFieldNotInitialized")
   @NonNull
@@ -140,7 +150,9 @@ public class BookmarksListFragment extends BaseMwmRecyclerFragment<ConcatAdapter
 
     BookmarkCollectionAdapter adapter = new BookmarkCollectionAdapter(getCategoryOrThrow(),
                                                                       mCategoryItems);
-    adapter.setOnClickListener((v, item) -> BookmarkListActivity.startForResult(this, item));
+    adapter.setOnClickListener((v, item) -> {
+      BookmarkListActivity.startForResult(this, startBookmarkListForResult, item);
+    });
 
     return adapter;
   }
@@ -756,7 +768,7 @@ public class BookmarksListFragment extends BaseMwmRecyclerFragment<ConcatAdapter
 
   private void onSettingsOptionSelected()
   {
-    BookmarkCategorySettingsActivity.startForResult(this, mCategoryDataSource.getData());
+    BookmarkCategorySettingsActivity.startForResult(this, startBookmarkSettingsForResult, mCategoryDataSource.getData());
   }
 
   private void onDeleteOptionSelected()
@@ -812,11 +824,8 @@ public class BookmarksListFragment extends BaseMwmRecyclerFragment<ConcatAdapter
     BookmarksSharingHelper.INSTANCE.onPreparedFileForSharing(requireActivity(), shareLauncher, result);
   }
 
-  @Override
-  @SuppressWarnings("deprecation") // https://github.com/organicmaps/organicmaps/issues/3630
-  public void onActivityResult(int requestCode, int resultCode, Intent data)
+  private void handleActivityResult()
   {
-    super.onActivityResult(requestCode, resultCode, data);
     getBookmarkListAdapter().notifyDataSetChanged();
     ActionBar actionBar = ((AppCompatActivity) requireActivity()).getSupportActionBar();
     actionBar.setTitle(mCategoryDataSource.getData().getName());

android/app/src/main/java/app/organicmaps/bookmarks/data/Bookmark.java

@@ -11,7 +11,7 @@ import androidx.core.os.ParcelCompat;
 
 import app.organicmaps.Framework;
 import app.organicmaps.routing.RoutePointInfo;
-import app.organicmaps.search.Popularity;
+import app.organicmaps.sdk.search.Popularity;
 import app.organicmaps.util.Constants;
 
 // TODO consider refactoring to remove hack with MapObject unmarshalling itself and Bookmark at the same time.

android/app/src/main/java/app/organicmaps/bookmarks/data/MapObject.java

@@ -12,7 +12,7 @@ import androidx.core.os.ParcelCompat;
 
 import app.organicmaps.Framework;
 import app.organicmaps.routing.RoutePointInfo;
-import app.organicmaps.search.Popularity;
+import app.organicmaps.sdk.search.Popularity;
 import app.organicmaps.util.Utils;
 import app.organicmaps.widget.placepage.PlacePageData;
 

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

@@ -109,7 +109,7 @@ class DownloaderScreen extends BaseScreen
     for (final var item : mMissingMaps.entrySet())
     {
       item.getValue().update();
-      MapManager.nativeDownload(item.getKey());
+      MapManager.startDownload(item.getKey());
     }
   }
 

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

@@ -113,7 +113,7 @@ public class RequestPermissionsScreenWithNotification extends BaseScreen impleme
         .setOngoing(true)
         .setShowWhen(false)
         .setOnlyAlertOnce(true)
-        .setSmallIcon(R.drawable.ic_my_location)
+        .setSmallIcon(R.drawable.ic_location_crosshair)
         .setColor(ContextCompat.getColor(getCarContext(), R.color.notification))
         .setContentTitle(getCarContext().getString(R.string.aa_request_permission_notification))
         .setContentIntent(pendingIntent);

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

@@ -23,13 +23,13 @@ import app.organicmaps.car.SurfaceRenderer;
 import app.organicmaps.car.screens.base.BaseMapScreen;
 import app.organicmaps.car.util.UiHelpers;
 import app.organicmaps.location.LocationHelper;
-import app.organicmaps.search.NativeSearchListener;
-import app.organicmaps.search.SearchEngine;
-import app.organicmaps.search.SearchRecents;
-import app.organicmaps.search.SearchResult;
+import app.organicmaps.sdk.search.SearchListener;
+import app.organicmaps.sdk.search.SearchEngine;
+import app.organicmaps.sdk.search.SearchRecents;
+import app.organicmaps.sdk.search.SearchResult;
 import app.organicmaps.util.Language;
 
-public class SearchOnMapScreen extends BaseMapScreen implements NativeSearchListener
+public class SearchOnMapScreen extends BaseMapScreen implements SearchListener
 {
   private final int MAX_RESULTS_SIZE;
 

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

@@ -21,13 +21,13 @@ import app.organicmaps.bookmarks.data.MapObject;
 import app.organicmaps.car.SurfaceRenderer;
 import app.organicmaps.car.screens.base.BaseMapScreen;
 import app.organicmaps.location.LocationHelper;
-import app.organicmaps.search.NativeSearchListener;
-import app.organicmaps.search.SearchEngine;
-import app.organicmaps.search.SearchRecents;
-import app.organicmaps.search.SearchResult;
+import app.organicmaps.sdk.search.SearchListener;
+import app.organicmaps.sdk.search.SearchEngine;
+import app.organicmaps.sdk.search.SearchRecents;
+import app.organicmaps.sdk.search.SearchResult;
 import app.organicmaps.util.Language;
 
-public class SearchScreen extends BaseMapScreen implements SearchTemplate.SearchCallback, NativeSearchListener
+public class SearchScreen extends BaseMapScreen implements SearchTemplate.SearchCallback, SearchListener
 {
   private final int MAX_RESULTS_SIZE;
 

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

@@ -13,7 +13,7 @@ import androidx.car.app.model.ForegroundCarColorSpan;
 import app.organicmaps.R;
 import app.organicmaps.car.util.Colors;
 import app.organicmaps.car.util.RoutingHelpers;
-import app.organicmaps.search.SearchResult;
+import app.organicmaps.sdk.search.SearchResult;
 
 import java.util.ArrayList;
 import java.util.List;

android/app/src/main/java/app/organicmaps/car/util/SuggestionsHelpers.java

@@ -8,7 +8,7 @@ import androidx.car.app.suggestion.model.Suggestion;
 import androidx.core.graphics.drawable.IconCompat;
 
 import app.organicmaps.R;
-import app.organicmaps.search.SearchRecents;
+import app.organicmaps.sdk.search.SearchRecents;
 
 import java.util.ArrayList;
 import java.util.List;

android/app/src/main/java/app/organicmaps/dialog/ProgressDialogFragment.java

@@ -1,69 +0,0 @@
-package app.organicmaps.dialog;
-
-import android.app.Activity;
-import android.content.DialogInterface;
-import android.os.Bundle;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.TextView;
-
-import androidx.annotation.Nullable;
-import androidx.fragment.app.DialogFragment;
-import androidx.fragment.app.Fragment;
-
-import app.organicmaps.R;
-
-public class ProgressDialogFragment extends DialogFragment
-{
-  private static final String ARG_MESSAGE = "title";
-  private static final String ARG_CANCELABLE = "cancelable";
-  private static final String ARG_RETAIN_INSTANCE = "retain_instance";
-
-  public ProgressDialogFragment()
-  {
-    // Do nothing by default.
-  }
-
-  protected void setCancelResult()
-  {
-    Fragment targetFragment = getTargetFragment();
-    if (targetFragment != null)
-      targetFragment.onActivityResult(getTargetRequestCode(), Activity.RESULT_CANCELED, null);
-  }
-
-  @Override
-  public void onCreate(@Nullable Bundle savedInstanceState)
-  {
-    super.onCreate(savedInstanceState);
-    Bundle args = requireArguments();
-    setRetainInstance(args.getBoolean(ARG_RETAIN_INSTANCE, true));
-    setCancelable(args.getBoolean(ARG_CANCELABLE, false));
-  }
-
-  @Nullable
-  @Override
-  public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable
-      Bundle savedInstanceState)
-  {
-    View view = inflater.inflate(R.layout.indeterminated_progress_dialog, container, false);
-    Bundle args = requireArguments();
-    TextView messageView = view.findViewById(R.id.message);
-    messageView.setText(args.getString(ARG_MESSAGE));
-    return view;
-  }
-
-  @Override
-  public void onCancel(DialogInterface dialog)
-  {
-    setCancelResult();
-  }
-
-  @Override
-  public void onDestroyView()
-  {
-    if (getDialog() != null && getRetainInstance())
-      getDialog().setDismissMessage(null);
-    super.onDestroyView();
-  }
-}

android/app/src/main/java/app/organicmaps/downloader/BottomPanel.java

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

android/app/src/main/java/app/organicmaps/downloader/DownloaderAdapter.java

@@ -91,7 +91,7 @@ class DownloaderAdapter extends RecyclerView.Adapter<DownloaderAdapter.ViewHolde
     item.update();
     if (item.status != CountryItem.STATUS_UPDATABLE)
       return;
-    MapManager.warnOn3gUpdate(adapter.mActivity, item.id, () -> MapManager.nativeUpdate(item.id));
+    MapManager.warnOn3gUpdate(adapter.mActivity, item.id, () -> MapManager.startUpdate(item.id));
   }
 
   private void onExploreActionSelected(CountryItem item, DownloaderAdapter adapter)
@@ -150,6 +150,7 @@ class DownloaderAdapter extends RecyclerView.Adapter<DownloaderAdapter.ViewHolde
       ((MwmActivity) adapter.mActivity).closePlacePage();
     }
     deleteNode(item);
+    refreshData();
   }
 
   private record PathEntry(CountryItem item, boolean myMapsMode, int topPosition, int topOffset)
@@ -204,14 +205,9 @@ class DownloaderAdapter extends RecyclerView.Adapter<DownloaderAdapter.ViewHolde
         }
       }
 
-      if (mSearchResultsMode)
+      for (MapManager.StorageCallbackData item : data)
       {
-        for (MapManager.StorageCallbackData item : data)
-          updateItem(item.countryId);
-      }
-      else
-      {
-        refreshData();
+        updateItem(item.countryId);
       }
     }
 
@@ -386,12 +382,10 @@ class DownloaderAdapter extends RecyclerView.Adapter<DownloaderAdapter.ViewHolde
         }
         case CountryItem.STATUS_FAILED ->
         {
-          RetryFailedDownloadConfirmationListener listener =
-              new RetryFailedDownloadConfirmationListener(mActivity.getApplication());
-          MapManager.warn3gAndRetry(mActivity, mItem.id, listener);
+          MapManager.warn3gAndRetry(mActivity, mItem.id, null);
         }
         case CountryItem.STATUS_UPDATABLE ->
-            MapManager.warnOn3gUpdate(mActivity, mItem.id, () -> MapManager.nativeUpdate(mItem.id));
+            MapManager.warnOn3gUpdate(mActivity, mItem.id, () -> MapManager.startUpdate(mItem.id));
         default -> throw new IllegalArgumentException("Inappropriate item status: " + mItem.status);
       }
     }

android/app/src/main/java/app/organicmaps/downloader/DownloaderFragment.java

@@ -5,6 +5,8 @@ import android.os.Bundle;
 import android.view.View;
 import android.view.WindowManager;
 
+import androidx.activity.result.ActivityResultLauncher;
+import androidx.activity.result.contract.ActivityResultContracts;
 import androidx.annotation.CallSuper;
 import androidx.annotation.Keep;
 import androidx.annotation.NonNull;
@@ -15,8 +17,8 @@ import androidx.recyclerview.widget.RecyclerView;
 import app.organicmaps.R;
 import app.organicmaps.base.BaseMwmRecyclerFragment;
 import app.organicmaps.base.OnBackPressListener;
-import app.organicmaps.search.NativeMapSearchListener;
-import app.organicmaps.search.SearchEngine;
+import app.organicmaps.sdk.search.MapSearchListener;
+import app.organicmaps.sdk.search.SearchEngine;
 import app.organicmaps.widget.PlaceholderView;
 import app.organicmaps.util.bottomsheet.MenuBottomSheetFragment;
 import app.organicmaps.util.bottomsheet.MenuBottomSheetItem;
@@ -39,6 +41,8 @@ public class DownloaderFragment extends BaseMwmRecyclerFragment<DownloaderAdapte
 
   private int mSubscriberSlot;
 
+  final ActivityResultLauncher<Intent> startVoiceRecognitionForResult = registerForActivityResult(new ActivityResultContracts.StartActivityForResult(), activityResult -> mToolbarController.onVoiceRecognitionResult(activityResult));
+
   private final RecyclerView.OnScrollListener mScrollListener = new RecyclerView.OnScrollListener() {
     @Override
     public void onScrollStateChanged(RecyclerView recyclerView, int newState)
@@ -48,13 +52,13 @@ public class DownloaderFragment extends BaseMwmRecyclerFragment<DownloaderAdapte
     }
   };
 
-  private final NativeMapSearchListener mSearchListener = new NativeMapSearchListener()
+  private final MapSearchListener mSearchListener = new MapSearchListener()
   {
     // Called from JNI.
     @Keep
     @SuppressWarnings("unused")
     @Override
-    public void onMapSearchResults(Result[] results, long timestamp, boolean isLast)
+    public void onMapSearchResults(@NonNull Result[] results, long timestamp, boolean isLast)
     {
       if (!mSearchRunning || timestamp != mCurrentSearch)
         return;
@@ -62,8 +66,8 @@ public class DownloaderFragment extends BaseMwmRecyclerFragment<DownloaderAdapte
       List<CountryItem> rs = new ArrayList<>();
       for (Result result : results)
       {
-        CountryItem item = CountryItem.fill(result.countryId);
-        item.searchResultName = result.matchedString;
+        CountryItem item = CountryItem.fill(result.countryId());
+        item.searchResultName = result.matchedString();
         rs.add(item);
       }
 
@@ -210,13 +214,6 @@ public class DownloaderFragment extends BaseMwmRecyclerFragment<DownloaderAdapte
     return mAdapter;
   }
 
-  @Override
-  @SuppressWarnings("deprecation") // https://github.com/organicmaps/organicmaps/issues/3630
-  public void onActivityResult(int requestCode, int resultCode, Intent data)
-  {
-    super.onActivityResult(requestCode, resultCode, data);
-    mToolbarController.onActivityResult(requestCode, resultCode, data);
-  }
 
   @NonNull
   @Override

android/app/src/main/java/app/organicmaps/downloader/DownloaderNotifier.java

@@ -22,18 +22,26 @@ import app.organicmaps.R;
 import app.organicmaps.util.StringUtils;
 import app.organicmaps.util.log.Logger;
 
-public abstract class DownloaderNotifier
+public class DownloaderNotifier
 {
   private static final String TAG = DownloaderNotifier.class.getSimpleName();
 
   private static final String CHANNEL_ID = "downloader";
-  private static final int NOTIFICATION_ID = 1;
+  public static final int NOTIFICATION_ID = 1;
+
+  private final Context mContext;
+  private NotificationCompat.Builder mProgressNotificationBuilder;
+
+  public DownloaderNotifier(Context context)
+  {
+    mContext = context;
+  }
 
   public static void createNotificationChannel(@NonNull Context context)
   {
     final NotificationManagerCompat notificationManager = NotificationManagerCompat.from(context);
     final NotificationChannelCompat channel = new NotificationChannelCompat.Builder(CHANNEL_ID,
-        NotificationManagerCompat.IMPORTANCE_DEFAULT)
+        NotificationManagerCompat.IMPORTANCE_LOW)
         .setName(context.getString(R.string.notification_channel_downloader))
         .setShowBadge(true)
         .setVibrationEnabled(false)
@@ -42,49 +50,93 @@ public abstract class DownloaderNotifier
     notificationManager.createNotificationChannel(channel);
   }
 
-  public static void notifyDownloadFailed(@NonNull Context context, @Nullable String countryId)
+  public void notifyDownloadFailed(@Nullable String countryId)
   {
     if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU &&
-        ContextCompat.checkSelfPermission(context, POST_NOTIFICATIONS) != PERMISSION_GRANTED)
+        ContextCompat.checkSelfPermission(mContext, POST_NOTIFICATIONS) != PERMISSION_GRANTED)
     {
       Logger.w(TAG, "Permission POST_NOTIFICATIONS is not granted, skipping notification");
       return;
     }
 
-    final String title = context.getString(R.string.app_name);
+    final String title = mContext.getString(R.string.app_name);
     final String countryName = MapManager.nativeGetName(countryId);
-    final String content = context.getString(R.string.download_country_failed, countryName);
+    final String content = mContext.getString(R.string.download_country_failed, countryName);
 
-    final int FLAG_IMMUTABLE = Build.VERSION.SDK_INT < Build.VERSION_CODES.M ? 0 : PendingIntent.FLAG_IMMUTABLE;
-    final Intent contentIntent = MwmActivity.createShowMapIntent(context, countryId);
-    contentIntent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-    final PendingIntent contentPendingIntent = PendingIntent.getActivity(context, 0, contentIntent,
-        PendingIntent.FLAG_UPDATE_CURRENT | FLAG_IMMUTABLE);
+    var contentPendingIntent = getNotificationPendingIntent(countryId);
 
-    final Notification notification = new NotificationCompat.Builder(context, CHANNEL_ID)
+    final Notification notification = new NotificationCompat.Builder(mContext, CHANNEL_ID)
         .setAutoCancel(true)
         .setCategory(NotificationCompat.CATEGORY_ERROR)
         .setVisibility(NotificationCompat.VISIBILITY_PUBLIC)
         .setSmallIcon(R.drawable.ic_splash)
-        .setColor(ContextCompat.getColor(context, R.color.notification))
+        .setColor(ContextCompat.getColor(mContext, R.color.notification))
         .setContentTitle(title)
         .setContentText(content)
         .setShowWhen(true)
-        .setTicker(getTicker(context, title, content))
+        .setTicker(getTicker(mContext, title, content))
         .setContentIntent(contentPendingIntent)
         .setOnlyAlertOnce(true)
         .build();
 
     Logger.i(TAG, "Notifying about failed map download");
-    final NotificationManagerCompat notificationManager = NotificationManagerCompat.from(context);
+    final NotificationManagerCompat notificationManager = NotificationManagerCompat.from(mContext);
     notificationManager.notify(NOTIFICATION_ID, notification);
   }
 
-  static void cancelNotification(@NonNull Context context)
+  public void notifyProgress() {
+    notifyProgress(null, 0, 0);
+  }
+
+  public void notifyProgress(@Nullable String countryId, int maxProgress, int progress) {
+    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU &&
+            ContextCompat.checkSelfPermission(mContext, POST_NOTIFICATIONS) != PERMISSION_GRANTED)
+    {
+      Logger.w(TAG, "Permission POST_NOTIFICATIONS is not granted, skipping notification");
+      return;
+    }
+
+    NotificationManagerCompat.from(mContext).notify(NOTIFICATION_ID, buildProgressNotification(countryId, maxProgress, progress));
+  }
+
+  @NonNull
+  public Notification buildProgressNotification()
   {
-    Logger.i(TAG, "Cancelling notification about failed map download");
-    final NotificationManagerCompat notificationManager = NotificationManagerCompat.from(context);
-    notificationManager.cancel(NOTIFICATION_ID);
+    return buildProgressNotification(null, 0, 0);
+  }
+
+  @NonNull
+  public Notification buildProgressNotification(@Nullable String countryId, int maxProgress, int progress)
+  {
+    var builder = startNotification(countryId);
+
+    builder.setProgress(maxProgress, progress, maxProgress == 0);
+    builder.setContentText("Download in progress");
+
+    return builder.build();
+  }
+
+  @NonNull
+  private NotificationCompat.Builder startNotification(@Nullable String countryId)
+  {
+    final String title = mContext.getString(R.string.app_name);
+
+    return new NotificationCompat.Builder(mContext, CHANNEL_ID)
+            .setAutoCancel(true)
+            .setVisibility(NotificationCompat.VISIBILITY_PUBLIC)
+            .setSmallIcon(R.drawable.ic_splash)
+            .setColor(ContextCompat.getColor(mContext, R.color.notification))
+            .setShowWhen(true)
+            .setContentTitle(title)
+            .setContentIntent(getNotificationPendingIntent(countryId));
+  }
+
+  @NonNull
+  private PendingIntent getNotificationPendingIntent(@Nullable String countryId) {
+    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);
+    return PendingIntent.getActivity(mContext, 0, contentIntent, PendingIntent.FLAG_UPDATE_CURRENT | FLAG_IMMUTABLE);
   }
 
   @NonNull

android/app/src/main/java/app/organicmaps/downloader/DownloaderService.java

@@ -0,0 +1,142 @@
+package app.organicmaps.downloader;
+
+import static android.Manifest.permission.POST_NOTIFICATIONS;
+import static android.content.pm.PackageManager.PERMISSION_GRANTED;
+
+import android.app.ForegroundServiceStartNotAllowedException;
+import android.app.Service;
+import android.content.Intent;
+import android.os.Build;
+import android.os.IBinder;
+
+import androidx.annotation.Nullable;
+import androidx.core.content.ContextCompat;
+
+import java.util.List;
+
+import app.organicmaps.MwmApplication;
+import app.organicmaps.util.log.Logger;
+
+public class DownloaderService extends Service implements MapManager.StorageCallback
+{
+  private static final String TAG = DownloaderService.class.getSimpleName();
+
+  private final DownloaderNotifier mNotifier = new DownloaderNotifier(this);
+  private int mSubscriptionSlot;
+
+  @Override
+  public void onCreate()
+  {
+    super.onCreate();
+
+    Logger.i(TAG);
+
+    mSubscriptionSlot = MapManager.nativeSubscribe(this);
+  }
+
+  @Override
+  public int onStartCommand(Intent intent, int flags, int startId)
+  {
+    Logger.i(TAG, "Downloading: " + MapManager.nativeIsDownloading());
+
+    var notification = mNotifier.buildProgressNotification();
+    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S)
+    {
+      try
+      {
+        startForeground(DownloaderNotifier.NOTIFICATION_ID, notification);
+      } catch (ForegroundServiceStartNotAllowedException e)
+      {
+        Logger.e(TAG, "Oops! ForegroundService is not allowed", e);
+      }
+    } else
+    {
+      startForeground(DownloaderNotifier.NOTIFICATION_ID, notification);
+    }
+
+    return START_NOT_STICKY;
+  }
+
+  @Nullable
+  @Override
+  public IBinder onBind(Intent intent)
+  {
+    return null;
+  }
+
+  @Override
+  public void onStatusChanged(List<MapManager.StorageCallbackData> data)
+  {
+    var isDownloading = MapManager.nativeIsDownloading();
+    var hasFailed = hasDownloadFailed(data);
+
+    Logger.i(TAG, "Downloading: " + isDownloading + " failure: " + hasFailed);
+
+    if (!isDownloading)
+    {
+      if (hasFailed)
+      {
+        // Detach service from the notification to keep after the service is stopped.
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N)
+        {
+          stopForeground(Service.STOP_FOREGROUND_DETACH);
+        } else
+        {
+          stopForeground(false);
+        }
+      }
+      stopSelf();
+    }
+  }
+
+  @Override
+  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)
+    {
+      Logger.w(TAG, "Permission POST_NOTIFICATIONS is not granted, skipping notification");
+      return;
+    }
+
+    // TODO: How to calculate progress?
+    mNotifier.notifyProgress();
+  }
+
+  @Override
+  public void onDestroy()
+  {
+    super.onDestroy();
+
+    Logger.i(TAG, "onDestroy");
+
+    MapManager.nativeUnsubscribe(mSubscriptionSlot);
+  }
+
+  /**
+   * Start the foreground service to keep the user informed about the status of region downloads.
+   */
+  public static void startForegroundService()
+  {
+    Logger.i(TAG);
+    var context = MwmApplication.sInstance;
+    ContextCompat.startForegroundService(context, new Intent(context, DownloaderService.class));
+  }
+
+  private boolean hasDownloadFailed(List<MapManager.StorageCallbackData> data)
+  {
+    for (MapManager.StorageCallbackData item : data)
+    {
+      if (item.isLeafNode && item.newStatus == CountryItem.STATUS_FAILED)
+      {
+        if (MapManager.nativeIsAutoretryFailed())
+        {
+          mNotifier.notifyDownloadFailed(item.countryId);
+          return true;
+        }
+      }
+    }
+
+    return false;
+  }
+}

android/app/src/main/java/app/organicmaps/downloader/DownloaderToolbarController.java

@@ -58,10 +58,9 @@ class DownloaderToolbarController extends SearchToolbarController
   }
 
   @Override
-  @SuppressWarnings("deprecated") // https://github.com/organicmaps/organicmaps/issues/3630
-  protected void startVoiceRecognition(Intent intent, int code)
+  protected void startVoiceRecognition(Intent intent)
   {
-    mFragment.startActivityForResult(intent, code);
+    mFragment.startVoiceRecognitionForResult.launch(intent);
   }
 
   @Override

android/app/src/main/java/app/organicmaps/downloader/ExpandRetryConfirmationListener.java

@@ -1,28 +1,22 @@
 package app.organicmaps.downloader;
 
-import android.app.Application;
-
-import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
 import app.organicmaps.util.Utils;
 
-class ExpandRetryConfirmationListener extends RetryFailedDownloadConfirmationListener
+class ExpandRetryConfirmationListener implements Runnable
 {
   @Nullable
   private final Utils.Proc<Boolean> mDialogClickListener;
 
-  ExpandRetryConfirmationListener(@NonNull Application app,
-                                  @Nullable Utils.Proc<Boolean> dialogClickListener)
+  ExpandRetryConfirmationListener(@Nullable Utils.Proc<Boolean> dialogClickListener)
   {
-    super(app);
     mDialogClickListener = dialogClickListener;
   }
 
   @Override
   public void run()
   {
-    super.run();
     if (mDialogClickListener == null)
       return;
     mDialogClickListener.invoke(true);

android/app/src/main/java/app/organicmaps/downloader/MapManager.java

@@ -106,8 +106,8 @@ public final class MapManager
         })
         .setPositiveButton(R.string.downloader_retry, (dialog, which) -> {
           Application app = activity.getApplication();
-          RetryFailedDownloadConfirmationListener listener
-              = new ExpandRetryConfirmationListener(app, dialogClickListener);
+          ExpandRetryConfirmationListener listener
+              = new ExpandRetryConfirmationListener(dialogClickListener);
           warn3gAndRetry(activity, errorData.countryId, listener);
         }).create();
     dlg.setCanceledOnTouchOutside(false);
@@ -208,7 +208,7 @@ public final class MapManager
     return warnOn3g(activity, countryId, () -> {
       if (onAcceptListener != null)
         onAcceptListener.run();
-      nativeDownload(countryId);
+      startDownload(countryId);
     });
   }
 
@@ -217,10 +217,45 @@ public final class MapManager
     return warnOn3g(activity, countryId, () -> {
       if (onAcceptListener != null)
         onAcceptListener.run();
-      nativeRetry(countryId);
+      retryDownload(countryId);
     });
   }
 
+  /**
+   * Enqueues failed items under given {@code root} node in downloader.
+   */
+  public static void retryDownload(@NonNull String countryId) {
+    DownloaderService.startForegroundService();
+    nativeRetry(countryId);
+  }
+
+  /**
+   * Enqueues given {@code root} node with its children in downloader.
+   */
+  public static void startUpdate(@NonNull String root) {
+    DownloaderService.startForegroundService();
+    nativeUpdate(root);
+  }
+
+  /**
+   * Enqueues the given list of nodes and its children in downloader.
+   */
+  public static void startDownload(String... countries) {
+    DownloaderService.startForegroundService();
+    for (var countryId : countries)
+    {
+      nativeDownload(countryId);
+    }
+  }
+
+  /**
+   * Enqueues given {@code root} node and its children in downloader.
+   */
+  public static void startDownload(@NonNull String countryId) {
+    DownloaderService.startForegroundService();
+    nativeDownload(countryId);
+  }
+
   /**
    * Retrieves ID of root node.
    */
@@ -314,17 +349,17 @@ public final class MapManager
   /**
    * Enqueues given {@code root} node and its children in downloader.
    */
-  public static native void nativeDownload(String root);
+  private static native void nativeDownload(String root);
 
   /**
    * Enqueues failed items under given {@code root} node in downloader.
    */
-  public static native void nativeRetry(String root);
+  private static native void nativeRetry(String root);
 
   /**
    * Enqueues given {@code root} node with its children in downloader.
    */
-  public static native void nativeUpdate(String root);
+  private static native void nativeUpdate(String root);
 
   /**
    * Removes given currently downloading {@code root} node and its children from downloader.

android/app/src/main/java/app/organicmaps/downloader/OnmapDownloader.java

@@ -166,7 +166,7 @@ public class OnmapDownloader implements MwmActivity.LeftAnimationTrackListener
                 if (TextUtils.equals(mCurrentCountry.id, country) &&
                     MapManager.nativeHasSpaceToDownloadCountry(country))
                 {
-                  MapManager.nativeDownload(mCurrentCountry.id);
+                  MapManager.startDownload(mCurrentCountry.id);
                 }
               }
             }
@@ -210,12 +210,11 @@ public class OnmapDownloader implements MwmActivity.LeftAnimationTrackListener
       boolean retry = (mCurrentCountry.status == CountryItem.STATUS_FAILED);
       if (retry)
       {
-        DownloaderNotifier.cancelNotification(mActivity.getApplicationContext());
-        MapManager.nativeRetry(mCurrentCountry.id);
+        MapManager.retryDownload(mCurrentCountry.id);
       }
       else
       {
-        MapManager.nativeDownload(mCurrentCountry.id);
+        MapManager.startDownload(mCurrentCountry.id);
         mActivity.requestPostNotificationsPermission();
       }
     }));

android/app/src/main/java/app/organicmaps/downloader/RetryFailedDownloadConfirmationListener.java

@@ -1,22 +0,0 @@
-package app.organicmaps.downloader;
-
-import android.app.Application;
-
-import androidx.annotation.NonNull;
-
-public class RetryFailedDownloadConfirmationListener implements Runnable
-{
-  @NonNull
-  private final Application mApplication;
-
-  RetryFailedDownloadConfirmationListener(@NonNull Application application)
-  {
-    mApplication = application;
-  }
-
-  @Override
-  public void run()
-  {
-    DownloaderNotifier.cancelNotification(mApplication);
-  }
-}

android/app/src/main/java/app/organicmaps/intent/Factory.java

@@ -3,7 +3,6 @@ package app.organicmaps.intent;
 import android.content.ContentResolver;
 import android.content.Intent;
 import android.net.Uri;
-import android.util.Log;
 
 import androidx.annotation.NonNull;
 import androidx.core.content.IntentCompat;
@@ -22,7 +21,7 @@ import app.organicmaps.bookmarks.data.MapObject;
 import app.organicmaps.editor.OsmLoginActivity;
 import app.organicmaps.routing.RoutingController;
 import app.organicmaps.search.SearchActivity;
-import app.organicmaps.search.SearchEngine;
+import app.organicmaps.sdk.search.SearchEngine;
 import app.organicmaps.util.StorageUtils;
 import app.organicmaps.util.concurrency.ThreadPool;
 
@@ -99,7 +98,7 @@ public class Factory
           RoutingController.get().prepare(MapObject.createMapObject(FeatureId.EMPTY, MapObject.API_POINT,
                                                                     from.mName, "", from.mLat, from.mLon),
                                           MapObject.createMapObject(FeatureId.EMPTY, MapObject.API_POINT,
-                                                                    to.mName, "", to.mLat, to.mLon), true);
+                                                                    to.mName, "", to.mLat, to.mLon));
           return true;
         case RequestType.SEARCH:
         {

android/app/src/main/java/app/organicmaps/maplayer/MapButtonsController.java

@@ -1,6 +1,9 @@
 package app.organicmaps.maplayer;
 
+import android.animation.ArgbEvaluator;
+import android.animation.ObjectAnimator;
 import android.content.Context;
+import android.graphics.drawable.Drawable;
 import android.os.Bundle;
 import android.text.TextUtils;
 import android.util.TypedValue;
@@ -52,6 +55,8 @@ public class MapButtonsController extends Fragment
   private View mBottomButtonsFrame;
   @Nullable
   private LayersButton mToggleMapLayerButton;
+  @Nullable
+  FloatingActionButton mTrackRecordingStatusButton;
 
   @Nullable
   private MyPositionButton mNavMyPosition;
@@ -68,7 +73,11 @@ public class MapButtonsController extends Fragment
   private final Observer<Boolean> mButtonHiddenObserver = this::setButtonsHidden;
   private final Observer<Integer> mMyPositionModeObserver = this::updateNavMyPositionButton;
   private final Observer<SearchWheel.SearchOption> mSearchOptionObserver = this::onSearchOptionChange;
-  private final Observer<Boolean> mTrackRecorderObserver = this::updateMenuBadge;
+  private final Observer<Boolean> mTrackRecorderObserver = (enable) -> {
+    updateMenuBadge(enable);
+    showButton(enable, MapButtons.trackRecordingStatus);
+  };
+  private final Observer<Integer> mTopButtonMarginObserver = this::updateTopButtonsMargin;
 
   @Nullable
   @Override
@@ -119,6 +128,10 @@ public class MapButtonsController extends Fragment
       mToggleMapLayerButton.setOnClickListener(view -> mMapButtonClickListener.onMapButtonClick(MapButtons.toggleMapLayer));
       mToggleMapLayerButton.setVisibility(View.VISIBLE);
     }
+    mMapButtonsViewModel.setTopButtonsMarginTop(-1);
+    mTrackRecordingStatusButton = mFrame.findViewById(R.id.track_recording_status);
+    if (mTrackRecordingStatusButton != null)
+      mTrackRecordingStatusButton.setOnClickListener(view -> mMapButtonClickListener.onMapButtonClick(MapButtons.trackRecordingStatus));
     final View menuButton = mFrame.findViewById(R.id.menu_button);
     if (menuButton != null)
     {
@@ -157,6 +170,9 @@ public class MapButtonsController extends Fragment
       mButtonsMap.put(MapButtons.menu, menuButton);
     if (helpButton != null)
       mButtonsMap.put(MapButtons.help, helpButton);
+    if (mTrackRecordingStatusButton != null)
+      mButtonsMap.put(MapButtons.trackRecordingStatus, mTrackRecordingStatusButton);
+    showButton(false, MapButtons.trackRecordingStatus);
     return mFrame;
   }
 
@@ -184,6 +200,28 @@ public class MapButtonsController extends Fragment
       case bookmarks:
       case menu:
         UiUtils.showIf(show, buttonView);
+        break;
+      case trackRecordingStatus:
+        UiUtils.showIf(show, buttonView);
+        animateIconBlinking(show, (FloatingActionButton) buttonView);
+    }
+  }
+
+  void animateIconBlinking(boolean show, @NonNull FloatingActionButton button)
+  {
+    if (show)
+    {
+      Drawable drawable = button.getDrawable();
+      ObjectAnimator colorAnimator = ObjectAnimator.ofArgb(
+          drawable,
+          "tint",
+          0xFF757575,
+          0xFFFF0000);
+      colorAnimator.setDuration(2500);
+      colorAnimator.setEvaluator(new ArgbEvaluator());
+      colorAnimator.setRepeatCount(ObjectAnimator.INFINITE);
+      colorAnimator.setRepeatMode(ObjectAnimator.REVERSE);
+      colorAnimator.start();
     }
   }
 
@@ -192,6 +230,15 @@ public class MapButtonsController extends Fragment
     return (int) TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, dp, context.getResources().getDisplayMetrics());
   }
 
+  private void updateTopButtonsMargin(int margin)
+  {
+    if (margin == -1 || mTrackRecordingStatusButton == null)
+      return;
+    ViewGroup.MarginLayoutParams params = (ViewGroup.MarginLayoutParams) mTrackRecordingStatusButton.getLayoutParams();
+    params.topMargin = margin;
+    mTrackRecordingStatusButton.setLayoutParams(params);
+  }
+
   @OptIn(markerClass = ExperimentalBadgeUtils.class)
   private void updateMenuBadge(Boolean enable)
   {
@@ -352,6 +399,7 @@ public class MapButtonsController extends Fragment
     mMapButtonsViewModel.getMyPositionMode().observe(activity, mMyPositionModeObserver);
     mMapButtonsViewModel.getSearchOption().observe(activity, mSearchOptionObserver);
     mMapButtonsViewModel.getTrackRecorderState().observe(activity, mTrackRecorderObserver);
+    mMapButtonsViewModel.getTopButtonsMarginTop().observe(activity, mTopButtonMarginObserver);
   }
 
   public void onResume()
@@ -378,6 +426,7 @@ public class MapButtonsController extends Fragment
   public void onStop()
   {
     super.onStop();
+    mMapButtonsViewModel.getTopButtonsMarginTop().removeObserver(mTopButtonMarginObserver);
     mPlacePageViewModel.getPlacePageDistanceToTop().removeObserver(mPlacePageDistanceToTopObserver);
     mMapButtonsViewModel.getButtonsHidden().removeObserver(mButtonHiddenObserver);
     mMapButtonsViewModel.getMyPositionMode().removeObserver(mMyPositionModeObserver);
@@ -407,7 +456,8 @@ public class MapButtonsController extends Fragment
     search,
     bookmarks,
     menu,
-    help
+    help,
+    trackRecordingStatus
   }
 
   public interface MapButtonClickListener

android/app/src/main/java/app/organicmaps/maplayer/MapButtonsViewModel.java

@@ -9,6 +9,7 @@ public class MapButtonsViewModel extends ViewModel
 {
   private final MutableLiveData<Boolean> mButtonsHidden = new MutableLiveData<>(false);
   private final MutableLiveData<Float> mBottomButtonsHeight = new MutableLiveData<>(0f);
+  private final MutableLiveData<Integer> mTopButtonsMarginTop = new MutableLiveData<>(-1);
   private final MutableLiveData<MapButtonsController.LayoutMode> mLayoutMode = new MutableLiveData<>(MapButtonsController.LayoutMode.regular);
   private final MutableLiveData<Integer> mMyPositionMode = new MutableLiveData<>();
   private final MutableLiveData<SearchWheel.SearchOption> mSearchOption = new MutableLiveData<>();
@@ -34,6 +35,16 @@ public class MapButtonsViewModel extends ViewModel
     mBottomButtonsHeight.setValue(height);
   }
 
+  public MutableLiveData<Integer> getTopButtonsMarginTop()
+  {
+    return mTopButtonsMarginTop;
+  }
+
+  public void setTopButtonsMarginTop(int margin)
+  {
+    mTopButtonsMarginTop.setValue(margin);
+  }
+
   public MutableLiveData<MapButtonsController.LayoutMode> getLayoutMode()
   {
     return mLayoutMode;

android/app/src/main/java/app/organicmaps/maplayer/SearchWheel.java

@@ -16,7 +16,7 @@ import androidx.annotation.Nullable;
 import androidx.annotation.StringRes;
 import app.organicmaps.R;
 import app.organicmaps.routing.RoutingController;
-import app.organicmaps.search.SearchEngine;
+import app.organicmaps.sdk.search.SearchEngine;
 import app.organicmaps.util.Graphics;
 import app.organicmaps.util.UiUtils;
 import app.organicmaps.util.concurrency.UiThread;

android/app/src/main/java/app/organicmaps/routing/ManageRouteAdapter.java

@@ -0,0 +1,265 @@
+package app.organicmaps.routing;
+
+import android.annotation.SuppressLint;
+import android.content.Context;
+import android.content.res.TypedArray;
+import android.graphics.RectF;
+import android.view.LayoutInflater;
+import android.view.MotionEvent;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import androidx.annotation.NonNull;
+import androidx.appcompat.content.res.AppCompatResources;
+import androidx.recyclerview.widget.RecyclerView;
+
+import app.organicmaps.R;
+import app.organicmaps.bookmarks.data.MapObject;
+import app.organicmaps.util.StringUtils;
+import app.organicmaps.util.UiUtils;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+
+public class ManageRouteAdapter extends RecyclerView.Adapter<ManageRouteAdapter.ManageRouteViewHolder>
+{
+  Context mContext;
+  ArrayList<RouteMarkData> mRoutePoints;
+  ManageRouteListener mManageRouteListener;
+
+  public interface ManageRouteListener
+  {
+    void startDrag(RecyclerView.ViewHolder viewHolder);
+    void showMyLocationIcon(boolean showMyLocationIcon);
+    void onRoutePointDeleted(RecyclerView.ViewHolder viewHolder);
+  }
+
+  public ManageRouteAdapter(Context context, RouteMarkData[] routeMarkData, ManageRouteListener listener)
+  {
+    mContext = context;
+    mRoutePoints = new ArrayList<>(Arrays.asList(routeMarkData));
+    mManageRouteListener = listener;
+
+    updateMyLocationIcon();
+  }
+
+  @NonNull
+  @Override
+  public ManageRouteViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType)
+  {
+    View view = LayoutInflater.from(parent.getContext()).inflate(R.layout.manage_route_list_item,
+                                                                 parent, false);
+
+    return new ManageRouteViewHolder(view);
+  }
+
+  @SuppressLint("ClickableViewAccessibility")
+  @Override
+  public void onBindViewHolder(@NonNull ManageRouteViewHolder holder, int position)
+  {
+    // Set route point icon.
+    int iconId;
+
+    switch (mRoutePoints.get(position).mPointType)
+    {
+      case RoutePointInfo.ROUTE_MARK_START: // Starting point.
+        if (mRoutePoints.get(position).mIsMyPosition)
+          iconId = R.drawable.ic_location_arrow_blue;
+        else
+          iconId = R.drawable.route_point_start;
+        break;
+
+      case RoutePointInfo.ROUTE_MARK_INTERMEDIATE: // Intermediate stop.
+        TypedArray iconArray = mContext.getResources().obtainTypedArray(R.array.route_stop_icons);
+        iconId = iconArray.getResourceId(mRoutePoints.get(position).mIntermediateIndex,
+                                         R.drawable.route_point_20);
+        iconArray.recycle();
+        break;
+
+      case RoutePointInfo.ROUTE_MARK_FINISH: // Destination point.
+        iconId = R.drawable.route_point_finish;
+        break;
+
+      default: // Unknown route type.
+        iconId = R.drawable.warning_icon;
+        break;
+    }
+
+    // Set icon widget.
+    holder.mImageViewIcon.setImageDrawable(AppCompatResources.getDrawable(mContext, iconId));
+
+    // Set title & subtitle.
+    String title, subtitle;
+
+    if (mRoutePoints.get(position).mIsMyPosition)
+    {
+      // My position point.
+      title = mContext.getString(R.string.core_my_position);
+
+      if (mRoutePoints.get(position).mPointType != RoutePointInfo.ROUTE_MARK_START)
+        subtitle = mRoutePoints.get(position).mTitle;
+      else
+      {
+        // Hide my position coordinates if it's the starting point of the route.
+        subtitle = "";
+      }
+    }
+    else
+    {
+      title = mRoutePoints.get(position).mTitle;
+      subtitle = mRoutePoints.get(position).mSubtitle;
+    }
+
+    holder.mTextViewTitle.setText(title);
+    holder.mTextViewSubtitle.setText(subtitle);
+    UiUtils.showIf(subtitle != null && !subtitle.isEmpty(), holder.mTextViewSubtitle);
+
+    // Show 'Delete' icon button only if we have intermediate stops.
+    UiUtils.showIf(mRoutePoints.size() > 2, holder.mImageViewDelete);
+
+    // Detection of touch events on holder view.
+    holder.mItemView.setOnTouchListener((v, event) -> {
+
+      if (event.getAction() == MotionEvent.ACTION_DOWN)
+      {
+        RectF deleteButtonRect = new RectF(holder.mImageViewDelete.getLeft(),
+                                           holder.mImageViewDelete.getTop(),
+                                           holder.mImageViewDelete.getRight(),
+                                           holder.mImageViewDelete.getBottom());
+
+        if (holder.mImageViewDelete.isShown() && deleteButtonRect.contains(event.getX(), event.getY()))
+        {
+          // User has clicked on the 'Delete' icon button.
+          mManageRouteListener.onRoutePointDeleted(holder);
+        }
+        else
+        {
+          // Call start drag listener on touch.
+          mManageRouteListener.startDrag(holder);
+        }
+      }
+
+      return false;
+    });
+  }
+
+  @Override
+  public int getItemCount()
+  {
+    return mRoutePoints.size();
+  }
+
+  public void moveRoutePoint(int draggedItemIndex, int targetIndex)
+  {
+    if (draggedItemIndex == targetIndex) // Dragged to same spot. Do nothing.
+      return;
+
+    Collections.swap(mRoutePoints, draggedItemIndex, targetIndex);
+
+    updateRoutePointsData();
+
+    notifyItemMoved(draggedItemIndex, targetIndex);
+  }
+
+  public void deleteRoutePoint(RecyclerView.ViewHolder viewHolder)
+  {
+    mRoutePoints.remove(viewHolder.getAbsoluteAdapterPosition());
+
+    updateRoutePointsData();
+
+    notifyItemRemoved(viewHolder.getAbsoluteAdapterPosition());
+  }
+
+  public void setMyLocationAsStartingPoint(MapObject myLocation)
+  {
+    String latLonString = StringUtils.formatUsingUsLocale("%.6f, %.6f",
+                                                          myLocation.getLat(),
+                                                          myLocation.getLon());
+
+    // Replace route point in first position with 'My Position".
+    mRoutePoints.set(0, new RouteMarkData(latLonString, "", RoutePointInfo.ROUTE_MARK_START,
+                                          0, true, true, false, myLocation.getLat(),
+                                          myLocation.getLon()));
+
+    // Update data.
+    updateRoutePointsData();
+
+    // Update adapter.
+    notifyItemChanged(0);
+
+    // Show 'My location' crosshair button.
+    if (mManageRouteListener != null)
+      mManageRouteListener.showMyLocationIcon(true);
+  }
+
+  private void updateMyLocationIcon()
+  {
+    boolean containsMyLocationPoint = false;
+
+    for (RouteMarkData routePoint : mRoutePoints)
+    {
+      if (routePoint.mIsMyPosition)
+      {
+        containsMyLocationPoint = true;
+        break;
+      }
+    }
+
+    if (mManageRouteListener != null)
+      mManageRouteListener.showMyLocationIcon(!containsMyLocationPoint);
+  }
+
+  private void updateRoutePointsData()
+  {
+    assert(mRoutePoints.size() >= 2);
+
+    // Set starting point.
+    mRoutePoints.get(0).mPointType = RoutePointInfo.ROUTE_MARK_START;
+
+    // Set finish point.
+    mRoutePoints.get(mRoutePoints.size() - 1).mPointType = RoutePointInfo.ROUTE_MARK_FINISH;
+
+    // Set intermediate point(s).
+    for (int pos = 1; pos < mRoutePoints.size() - 1; pos++)
+    {
+      mRoutePoints.get(pos).mPointType = RoutePointInfo.ROUTE_MARK_INTERMEDIATE;
+      mRoutePoints.get(pos).mIntermediateIndex = pos - 1;
+    }
+  }
+
+  public ArrayList<RouteMarkData> getRoutePoints()
+  {
+    return mRoutePoints;
+  }
+
+  static class ManageRouteViewHolder extends RecyclerView.ViewHolder
+  {
+    @NonNull
+    public final View mItemView;
+
+    @NonNull
+    public final ImageView mImageViewIcon;
+
+    @NonNull
+    public final TextView mTextViewTitle;
+
+    @NonNull
+    public final TextView mTextViewSubtitle;
+
+    @NonNull
+    public final ImageView mImageViewDelete;
+
+    ManageRouteViewHolder(@NonNull View itemView)
+    {
+      super(itemView);
+      mItemView = itemView;
+      mImageViewIcon = itemView.findViewById(R.id.type_icon);
+      mTextViewTitle = itemView.findViewById(R.id.title);
+      mTextViewSubtitle = itemView.findViewById(R.id.subtitle);
+      mImageViewDelete = itemView.findViewById(R.id.delete_icon);
+    }
+  }
+}

android/app/src/main/java/app/organicmaps/routing/ManageRouteBottomSheet.java

@@ -0,0 +1,266 @@
+package app.organicmaps.routing;
+
+import android.app.Dialog;
+import android.content.res.Resources;
+import android.os.Bundle;
+import android.view.KeyEvent;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.Button;
+import android.widget.FrameLayout;
+import android.widget.ImageView;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.recyclerview.widget.ItemTouchHelper;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+import app.organicmaps.Framework;
+import app.organicmaps.MwmApplication;
+import app.organicmaps.R;
+import app.organicmaps.bookmarks.data.MapObject;
+import app.organicmaps.util.UiUtils;
+import com.google.android.material.bottomsheet.BottomSheetBehavior;
+import com.google.android.material.bottomsheet.BottomSheetDialog;
+import com.google.android.material.bottomsheet.BottomSheetDialogFragment;
+import com.google.android.material.divider.MaterialDividerItemDecoration;
+
+import java.util.ArrayList;
+
+import static androidx.recyclerview.widget.ItemTouchHelper.*;
+
+public class ManageRouteBottomSheet extends BottomSheetDialogFragment
+    implements View.OnClickListener, ManageRouteAdapter.ManageRouteListener
+{
+  ManageRouteAdapter mManageRouteAdapter;
+  ItemTouchHelper mTouchHelper;
+  ImageView mMyLocationImageView;
+
+  @Override
+  public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container,
+                           @Nullable Bundle savedInstanceState)
+  {
+    View v = inflater.inflate(R.layout.manage_route_bottom_sheet, container, false);
+
+    Button cancelButton = v.findViewById(R.id.btn__cancel);
+    cancelButton.setOnClickListener(this);
+
+    Button planButton = v.findViewById(R.id.btn__plan);
+    planButton.setOnClickListener(this);
+
+    mMyLocationImageView = v.findViewById(R.id.image_my_location);
+    mMyLocationImageView.setOnClickListener(this);
+
+    RecyclerView manageRouteList = v.findViewById(R.id.manage_route_list);
+    LinearLayoutManager layoutManager = new LinearLayoutManager(getContext());
+    manageRouteList.setLayoutManager(layoutManager);
+    RecyclerView.ItemDecoration decoration = new MaterialDividerItemDecoration(getContext(),
+                                                                               layoutManager.getOrientation());
+    manageRouteList.addItemDecoration(decoration);
+
+    mManageRouteAdapter = new ManageRouteAdapter(getContext(), Framework.nativeGetRoutePoints(), this);
+
+    manageRouteList.setAdapter(mManageRouteAdapter);
+
+    // Enable drag & drop in route list.
+    mTouchHelper = new ItemTouchHelper(new ManageRouteItemTouchHelperCallback(mManageRouteAdapter,
+                                                                              getResources()));
+    mTouchHelper.attachToRecyclerView(manageRouteList);
+
+    return v;
+  }
+
+  @NonNull
+  @Override
+  public Dialog onCreateDialog(@Nullable Bundle savedInstanceState)
+  {
+    Dialog dialog = super.onCreateDialog(savedInstanceState);
+
+    // Expand bottom sheet dialog.
+    dialog.setOnShowListener(dialogInterface -> {
+
+      FrameLayout bottomSheet = ((BottomSheetDialog) dialogInterface).findViewById(
+          com.google.android.material.R.id.design_bottom_sheet);
+
+      if (bottomSheet != null)
+        BottomSheetBehavior.from(bottomSheet).setState(BottomSheetBehavior.STATE_EXPANDED);
+    });
+
+    // Set key listener to detect back button pressed.
+    dialog.setOnKeyListener((dialog1, keyCode, event) -> {
+
+      if (keyCode == KeyEvent.KEYCODE_BACK && event.getAction() == KeyEvent.ACTION_UP)
+      {
+        // Dismiss the fragment
+        dismiss();
+        return true;
+      }
+
+      // Otherwise, do nothing else.
+      return false;
+    });
+
+    return dialog;
+  }
+
+  @Override
+  public void onClick(View v)
+  {
+    int buttonId = v.getId();
+
+    if (buttonId == R.id.btn__cancel)
+    {
+      // Close dialog if 'Cancel' button is pressed.
+      dismiss();
+    }
+    else if (buttonId == R.id.image_my_location)
+    {
+      // Get current location.
+      MapObject myLocation = MwmApplication.from(getContext()).getLocationHelper().getMyPosition();
+
+      // Set 'My Location' as starting point of the route.
+      if (myLocation != null)
+        mManageRouteAdapter.setMyLocationAsStartingPoint(myLocation);
+    }
+    else if (buttonId == R.id.btn__plan)
+    {
+      // Get route points from adapter.
+      ArrayList<RouteMarkData> newRoutePoints = mManageRouteAdapter.getRoutePoints();
+
+      // Make sure that the new route contains at least 2 points (start and destination).
+      assert(newRoutePoints.size() >= 2);
+
+      // Remove all existing route points.
+      Framework.nativeRemoveRoutePoints();
+
+      // First, add the destination point.
+      Framework.addRoutePoint(newRoutePoints.get(newRoutePoints.size() - 1));
+
+      // Secondly, add the starting point.
+      Framework.addRoutePoint(newRoutePoints.get(0));
+
+      // And then, add all intermediate points.
+      for (int pos = 1; pos < newRoutePoints.size() - 1; pos++)
+        Framework.addRoutePoint(newRoutePoints.get(pos));
+
+      // Intermediate route points are added sorted by distance.
+      // We have to make sure that they follow the requested order.
+      RouteMarkData[] finalRoutePoints = Framework.nativeGetRoutePoints();
+
+      for (int first = 1; first < newRoutePoints.size() - 1; first++)
+      {
+        int secondIndex = -1;
+
+        for (int second = first; second < newRoutePoints.size() - 1; second++)
+        {
+          if (finalRoutePoints[first].equals(newRoutePoints.get(second)))
+          {
+            secondIndex = second;
+            break;
+          }
+        }
+
+        if (secondIndex < 0)
+        {
+          // Something went bad. Intermediate point not found in the route points.
+          break;
+        }
+
+        if (first != secondIndex)
+        {
+          // Intermediate point needs to be moved.
+          Framework.nativeMoveRoutePoint(secondIndex, first);
+
+          // Refresh final route points.
+          finalRoutePoints = Framework.nativeGetRoutePoints();
+        }
+      }
+
+      // Launch route planning.
+      RoutingController.get().launchPlanning();
+
+      // Dismiss (close) manage route bottom sheet.
+      dismiss();
+    }
+  }
+
+  @Override
+  public void startDrag(RecyclerView.ViewHolder viewHolder)
+  {
+    // Start dragging.
+    mTouchHelper.startDrag(viewHolder);
+  }
+
+  @Override
+  public void showMyLocationIcon(boolean showMyLocationIcon)
+  {
+    // Get current location.
+    MapObject myLocation = MwmApplication.from(getContext()).getLocationHelper().getMyPosition();
+
+    UiUtils.showIf(showMyLocationIcon && myLocation != null, mMyLocationImageView);
+  }
+
+  @Override
+  public void onRoutePointDeleted(RecyclerView.ViewHolder viewHolder)
+  {
+    mManageRouteAdapter.deleteRoutePoint(viewHolder);
+
+    mManageRouteAdapter.notifyDataSetChanged();
+  }
+
+  private static class ManageRouteItemTouchHelperCallback extends ItemTouchHelper.Callback
+  {
+    private final ManageRouteAdapter mManageRouteAdapter;
+
+    public ManageRouteItemTouchHelperCallback(ManageRouteAdapter adapter, Resources resources)
+    {
+      mManageRouteAdapter = adapter;
+    }
+
+    @Override
+    public int getMovementFlags(@NonNull RecyclerView recyclerView,
+                                @NonNull RecyclerView.ViewHolder viewHolder)
+    {
+      // Enable up & down dragging. No left-right swiping is enabled.
+      return makeMovementFlags(UP | DOWN, 0);
+    }
+
+    @Override
+    public boolean isLongPressDragEnabled()
+    {
+      return false;
+    }
+
+    @Override
+    public boolean isItemViewSwipeEnabled()
+    {
+      return false;
+    }
+
+    @Override
+    public boolean onMove(@NonNull RecyclerView recyclerView,
+                          @NonNull RecyclerView.ViewHolder viewHolder,
+                          @NonNull RecyclerView.ViewHolder target)
+    {
+      mManageRouteAdapter.moveRoutePoint(viewHolder.getAbsoluteAdapterPosition(),
+                                         target.getAbsoluteAdapterPosition());
+      return true;
+    }
+
+    @Override
+    public void onSwiped(@NonNull RecyclerView.ViewHolder viewHolder, int direction)
+    {
+    }
+
+    @Override
+    public void clearView(@NonNull RecyclerView recyclerView,
+                          @NonNull RecyclerView.ViewHolder viewHolder)
+    {
+      super.clearView(recyclerView, viewHolder);
+
+      // Called when dragging action has finished.
+      mManageRouteAdapter.notifyDataSetChanged();
+    }
+  }
+}

android/app/src/main/java/app/organicmaps/routing/NavigationController.java

@@ -12,15 +12,18 @@ import androidx.appcompat.app.AppCompatActivity;
 import androidx.core.graphics.Insets;
 import androidx.core.view.ViewCompat;
 import androidx.core.view.WindowInsetsCompat;
+import androidx.lifecycle.ViewModelProvider;
 import app.organicmaps.Framework;
 import app.organicmaps.R;
 import app.organicmaps.location.LocationHelper;
+import app.organicmaps.maplayer.MapButtonsViewModel;
 import app.organicmaps.maplayer.traffic.TrafficManager;
+import app.organicmaps.util.StringUtils;
 import app.organicmaps.util.UiUtils;
 import app.organicmaps.util.Utils;
+import app.organicmaps.util.WindowInsetUtils;
 import app.organicmaps.widget.LanesView;
 import app.organicmaps.widget.SpeedLimitView;
-import app.organicmaps.util.WindowInsetUtils;
 import app.organicmaps.widget.menu.NavMenu;
 import com.google.android.material.bottomsheet.BottomSheetBehavior;
 
@@ -44,6 +47,8 @@ public class NavigationController implements TrafficManager.TrafficCallback,
   @NonNull
   private final SpeedLimitView mSpeedLimit;
 
+  private final MapButtonsViewModel mMapButtonsViewModel;
+
   private final NavMenu mNavMenu;
   View.OnClickListener mOnSettingsClickListener;
 
@@ -59,6 +64,8 @@ public class NavigationController implements TrafficManager.TrafficCallback,
   public NavigationController(AppCompatActivity activity, View.OnClickListener onSettingsClickListener,
                               NavMenu.OnMenuSizeChangedListener onMenuSizeChangedListener)
   {
+    mMapButtonsViewModel = new ViewModelProvider(activity).get(MapButtonsViewModel.class);
+
     mFrame = activity.findViewById(R.id.navigation_frame);
     mNavMenu = new NavMenu(activity, this, onMenuSizeChangedListener);
     mOnSettingsClickListener = onSettingsClickListener;
@@ -156,6 +163,10 @@ public class NavigationController implements TrafficManager.TrafficCallback,
     UiUtils.visibleIf(hasStreet, mStreetFrame);
     if (!TextUtils.isEmpty(info.nextStreet))
       mNextStreet.setText(info.nextStreet);
+    int margin = UiUtils.dimen(mFrame.getContext(), R.dimen.nav_frame_padding);
+    if (hasStreet)
+      margin += mStreetFrame.getHeight();
+    mMapButtonsViewModel.setTopButtonsMarginTop(margin);
   }
 
   public void show(boolean show)
@@ -249,10 +260,10 @@ public class NavigationController implements TrafficManager.TrafficCallback,
   {
     final Location location = LocationHelper.from(mFrame.getContext()).getSavedLocation();
     if (location == null) {
-      mSpeedLimit.setSpeedLimitMps(0);
+      mSpeedLimit.setSpeedLimit(0, false);
       return;
     }
-    mSpeedLimit.setCurrentSpeed(location.getSpeed());
-    mSpeedLimit.setSpeedLimitMps(info.speedLimitMps);
+    final boolean speedLimitExceeded = info.speedLimitMps < location.getSpeed();
+    mSpeedLimit.setSpeedLimit(StringUtils.nativeFormatSpeed(info.speedLimitMps), speedLimitExceeded);
   }
 }

android/app/src/main/java/app/organicmaps/routing/RouteMarkData.java

@@ -16,8 +16,8 @@ public class RouteMarkData
   @Nullable
   public final String mSubtitle;
   @RoutePointInfo.RouteMarkType
-  public final int mPointType;
-  public final int mIntermediateIndex;
+  public int mPointType;
+  public int mIntermediateIndex;
   public final boolean mIsVisible;
   public final boolean mIsMyPosition;
   public final boolean mIsPassed;
@@ -39,4 +39,12 @@ public class RouteMarkData
     mLat = lat;
     mLon = lon;
   }
+
+  public boolean equals(RouteMarkData other)
+  {
+    return mTitle != null && other.mTitle != null &&
+           mTitle.compareTo(other.mTitle) == 0 &&
+           mSubtitle != null && other.mSubtitle != null &&
+           mSubtitle.compareTo(other.mSubtitle) == 0;
+  }
 }

android/app/src/main/java/app/organicmaps/routing/RoutingBottomMenuController.java

@@ -151,6 +151,8 @@ final class RoutingBottomMenuController implements View.OnClickListener
     Resources res = mContext.getResources();
     mTransitViewDecorator = new DotDividerItemDecoration(dividerDrawable, res.getDimensionPixelSize(R.dimen.margin_base),
                                                          res.getDimensionPixelSize(R.dimen.margin_half));
+    Button manageRouteButton = altitudeChartFrame.findViewById(R.id.btn__manage_route);
+    manageRouteButton.setOnClickListener(this);
   }
 
   void showAltitudeChartAndRoutingDetails()
@@ -253,7 +255,7 @@ final class RoutingBottomMenuController implements View.OnClickListener
     if (LocationHelper.from(mContext).getMyPosition() != null)
     {
       UiUtils.show(mActionButton);
-      Drawable icon = ContextCompat.getDrawable(mContext, R.drawable.ic_my_location);
+      Drawable icon = ContextCompat.getDrawable(mContext, R.drawable.ic_location_crosshair);
       int colorAccent = ContextCompat.getColor(mContext,
                                                UiUtils.getStyledResourceId(mContext, androidx.appcompat.R.attr.colorAccent));
       mActionIcon.setImageDrawable(Graphics.tint(icon, colorAccent));
@@ -485,5 +487,7 @@ final class RoutingBottomMenuController implements View.OnClickListener
       int pointType = (Integer) mActionMessage.getTag();
       mListener.onSearchRoutePoint(pointType);
     }
+    else if (id == R.id.btn__manage_route && mListener != null)
+      mListener.onManageRouteOpen();
   }
 }

android/app/src/main/java/app/organicmaps/routing/RoutingBottomMenuListener.java

@@ -5,4 +5,5 @@ public interface RoutingBottomMenuListener
   void onUseMyPositionAsStart();
   void onSearchRoutePoint(@RoutePointInfo.RouteMarkType int type);
   void onRoutingStart();
+  void onManageRouteOpen();
 }

android/app/src/main/java/app/organicmaps/routing/RoutingController.java

@@ -60,7 +60,7 @@ public class RoutingController
     default void onResetToPlanningState() {}
     default void onBuiltRoute() {}
     default void onDrivingOptionsWarning() {}
-    default boolean isSubwayEnabled() { return false; }
+
     default void onCommonBuildError(int lastResultCode, @NonNull String[] lastMissingMaps) {}
     default void onDrivingOptionsBuildError() {}
 
@@ -333,45 +333,23 @@ public class RoutingController
   {
     setState(State.NONE);
     setBuildState(BuildState.NONE);
-    prepare(getStartPoint(), getEndPoint(), false);
+    prepare(getStartPoint(), getEndPoint());
   }
 
   public void prepare(@Nullable MapObject startPoint, @Nullable MapObject endPoint)
-  {
-    prepare(startPoint, endPoint, false);
-  }
-
-  public void prepare(@Nullable MapObject startPoint, @Nullable MapObject endPoint, boolean fromApi)
   {
     Logger.d(TAG, "prepare (" + (endPoint == null ? "route)" : "p2p)"));
-    initLastRouteType(startPoint, endPoint, fromApi);
+    initLastRouteType(startPoint, endPoint);
     prepare(startPoint, endPoint, mLastRouterType);
   }
 
-  private void initLastRouteType(@Nullable MapObject startPoint, @Nullable MapObject endPoint,
-                                 boolean fromApi)
+  private void initLastRouteType(@Nullable MapObject startPoint, @Nullable MapObject endPoint)
   {
-    if (shouldForceTransitRoute(fromApi))
-    {
-      mLastRouterType = Framework.ROUTER_TYPE_TRANSIT;
-      return;
-    }
-
     if (startPoint != null && endPoint != null)
       mLastRouterType = Framework.nativeGetBestRouter(startPoint.getLat(), startPoint.getLon(),
                                                       endPoint.getLat(), endPoint.getLon());
   }
 
-  private boolean isSubwayEnabled()
-  {
-    return mContainer != null && mContainer.isSubwayEnabled();
-  }
-
-  private boolean shouldForceTransitRoute(boolean fromApi)
-  {
-    return mState == State.NONE && isSubwayEnabled() && !fromApi;
-  }
-
   public void prepare(final @Nullable MapObject startPoint, final @Nullable MapObject endPoint,
                       @Framework.RouterType int routerType)
   {
@@ -426,6 +404,17 @@ public class RoutingController
     resetToPlanningStateIfNavigating();
   }
 
+  public void launchPlanning()
+  {
+    build();
+    setState(State.PREPARE);
+    startPlanning();
+    if (mContainer != null)
+      mContainer.updateMenu();
+    if (mContainer != null)
+      mContainer.onResetToPlanningState();
+  }
+
   /**
    * @return False if not navigating, true otherwise
    */

android/app/src/main/java/app/organicmaps/routing/RoutingMapsDownloadFragment.java

@@ -42,8 +42,7 @@ public class RoutingMapsDownloadFragment extends BaseRoutingErrorDialogFragment
       mMapsArray[i] = item.id;
     }
 
-    for (String map : mMaps)
-      MapManager.nativeDownload(map);
+    MapManager.startDownload(mMapsArray);
   }
 
   private View setupFrame(View frame)

android/app/src/main/java/app/organicmaps/routing/RoutingPlanController.java

@@ -1,12 +1,14 @@
 package app.organicmaps.routing;
 
 import android.app.Activity;
+import android.content.Intent;
 import android.os.Bundle;
 import android.view.View;
 import android.widget.CompoundButton;
 import android.widget.RadioGroup;
 import android.widget.TextView;
 
+import androidx.activity.result.ActivityResultLauncher;
 import androidx.annotation.DrawableRes;
 import androidx.annotation.IdRes;
 import androidx.annotation.NonNull;
@@ -78,6 +80,7 @@ public class RoutingPlanController extends ToolbarController
   }
 
   RoutingPlanController(View root, Activity activity,
+                        ActivityResultLauncher<Intent> startDrivingOptionsForResult,
                         @NonNull RoutingPlanInplaceController.RoutingPlanListener routingPlanListener,
                         @Nullable RoutingBottomMenuListener listener)
   {
@@ -103,7 +106,7 @@ public class RoutingPlanController extends ToolbarController
     View btn = mDrivingOptionsBtnContainer.findViewById(R.id.driving_options_btn);
     mDrivingOptionsImage = mFrame.findViewById(R.id.driving_options_btn_img);
 
-    btn.setOnClickListener(v -> DrivingOptionsActivity.start(requireActivity()));
+    btn.setOnClickListener(v -> DrivingOptionsActivity.start(requireActivity(), startDrivingOptionsForResult));
     mDriverOptionsLayoutListener = new SelfTerminatedDrivingOptionsLayoutListener();
     mAnimToggle = MwmApplication.from(activity.getApplicationContext())
                                 .getResources().getInteger(R.integer.anim_default);

android/app/src/main/java/app/organicmaps/routing/RoutingPlanFragment.java

@@ -7,9 +7,9 @@ import android.view.ViewGroup;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
-import androidx.fragment.app.FragmentActivity;
 
 import app.organicmaps.Framework;
+import app.organicmaps.MwmActivity;
 import app.organicmaps.R;
 import app.organicmaps.base.BaseMwmFragment;
 
@@ -21,15 +21,9 @@ public class RoutingPlanFragment extends BaseMwmFragment
   @Override
   public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState)
   {
-    final FragmentActivity activity = requireActivity();
+    final MwmActivity activity = (MwmActivity) requireActivity();
     View res = inflater.inflate(R.layout.fragment_routing, container, false);
-    RoutingBottomMenuListener listener = null;
-    if (activity instanceof RoutingBottomMenuListener)
-      listener = (RoutingBottomMenuListener) activity;
-
-    RoutingPlanInplaceController.RoutingPlanListener planListener =
-        (RoutingPlanInplaceController.RoutingPlanListener) activity;
-    mPlanController = new RoutingPlanController(res, activity, planListener, listener);
+    mPlanController = new RoutingPlanController(res, activity, activity.startDrivingOptionsForResult, activity, activity);
     return res;
   }
 

android/app/src/main/java/app/organicmaps/routing/RoutingPlanInplaceController.java

@@ -2,8 +2,10 @@ package app.organicmaps.routing;
 
 import android.animation.Animator;
 import android.animation.ValueAnimator;
+import android.content.Intent;
 import android.os.Bundle;
 
+import androidx.activity.result.ActivityResultLauncher;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
@@ -20,10 +22,11 @@ public class RoutingPlanInplaceController extends RoutingPlanController
   private Animator mAnimator;
 
   public RoutingPlanInplaceController(@NonNull MwmActivity activity,
+                                      ActivityResultLauncher<Intent> startDrivingOptionsForResult,
                                       @NonNull RoutingPlanListener routingPlanListener,
                                       @NonNull RoutingBottomMenuListener listener)
   {
-    super(activity.findViewById(R.id.routing_plan_frame), activity, routingPlanListener, listener);
+    super(activity.findViewById(R.id.routing_plan_frame), activity, startDrivingOptionsForResult, routingPlanListener, listener);
     mRoutingPlanListener = routingPlanListener;
   }
 

android/app/src/main/java/app/organicmaps/sdk/search/BookmarkSearchListener.java

@@ -1,4 +1,4 @@
-package app.organicmaps.search;
+package app.organicmaps.sdk.search;
 
 import androidx.annotation.Keep;
 import androidx.annotation.Nullable;
@@ -6,11 +6,11 @@ import androidx.annotation.Nullable;
 /**
  * Native search will return results via this interface.
  */
-public interface NativeBookmarkSearchListener
+public interface BookmarkSearchListener
 {
   /**
    * @param bookmarkIds Founded bookmark ids.
-   * @param timestamp Timestamp of search request.
+   * @param timestamp   Timestamp of search request.
    */
   // Used by JNI.
   @Keep
@@ -19,7 +19,7 @@ public interface NativeBookmarkSearchListener
 
   /**
    * @param bookmarkIds Founded bookmark ids.
-   * @param timestamp Timestamp of search request.
+   * @param timestamp   Timestamp of search request.
    */
   // Used by JNI.
   @Keep

android/app/src/main/java/app/organicmaps/sdk/search/DisplayedCategories.java

@@ -1,8 +1,8 @@
-package app.organicmaps.search;
+package app.organicmaps.sdk.search;
 
 import androidx.annotation.NonNull;
 
-class DisplayedCategories
+public class DisplayedCategories
 {
   @NonNull
   public static String[] getKeys()

android/app/src/main/java/app/organicmaps/sdk/search/MapSearchListener.java

@@ -0,0 +1,19 @@
+package app.organicmaps.sdk.search;
+
+import androidx.annotation.Keep;
+import androidx.annotation.NonNull;
+
+public interface MapSearchListener
+{
+  // Called from JNI.
+  @Keep
+  @SuppressWarnings("unused")
+  record Result(String countryId, String matchedString)
+  {
+  }
+
+  // Called from JNI.
+  @Keep
+  @SuppressWarnings("unused")
+  void onMapSearchResults(@NonNull Result[] results, long timestamp, boolean isLast);
+}

android/app/src/main/java/app/organicmaps/sdk/search/Popularity.java

@@ -1,4 +1,4 @@
-package app.organicmaps.search;
+package app.organicmaps.sdk.search;
 
 import android.os.Parcel;
 import android.os.Parcelable;
@@ -38,12 +38,12 @@ public class Popularity implements Parcelable
   }
 
   @Override
-  public void writeToParcel(Parcel dest, int flags)
+  public void writeToParcel(@NonNull Parcel dest, int flags)
   {
     dest.writeInt(this.mType.ordinal());
   }
 
-  protected Popularity(Parcel in)
+  protected Popularity(@NonNull Parcel in)
   {
     int tmpMPopularity = in.readInt();
     this.mType = Type.values()[tmpMPopularity];

android/app/src/main/java/app/organicmaps/sdk/search/SearchEngine.java

@@ -1,4 +1,4 @@
-package app.organicmaps.search;
+package app.organicmaps.sdk.search;
 
 import android.content.Context;
 
@@ -14,9 +14,9 @@ import app.organicmaps.util.concurrency.UiThread;
 
 import java.nio.charset.StandardCharsets;
 
-public enum SearchEngine implements NativeSearchListener,
-                                    NativeMapSearchListener,
-                                    NativeBookmarkSearchListener
+public enum SearchEngine implements SearchListener,
+    MapSearchListener,
+    BookmarkSearchListener
 {
   INSTANCE;
 
@@ -30,7 +30,7 @@ public enum SearchEngine implements NativeSearchListener,
     UiThread.run(
         () ->
         {
-          for (NativeSearchListener listener : mListeners)
+          for (SearchListener listener : mListeners)
             listener.onResultsUpdate(results, timestamp);
         });
   }
@@ -41,18 +41,18 @@ public enum SearchEngine implements NativeSearchListener,
     UiThread.run(
         () ->
         {
-          for (NativeSearchListener listener : mListeners)
+          for (SearchListener listener : mListeners)
             listener.onResultsEnd(timestamp);
         });
   }
 
   @Override
-  public void onMapSearchResults(final NativeMapSearchListener.Result[] results, final long timestamp, final boolean isLast)
+  public void onMapSearchResults(@NonNull final MapSearchListener.Result[] results, final long timestamp, final boolean isLast)
   {
     UiThread.run(
         () ->
         {
-          for (NativeMapSearchListener listener : mMapListeners)
+          for (MapSearchListener listener : mMapListeners)
             listener.onMapSearchResults(results, timestamp, isLast);
         });
   }
@@ -60,55 +60,53 @@ public enum SearchEngine implements NativeSearchListener,
   @Override
   public void onBookmarkSearchResultsUpdate(@Nullable long[] bookmarkIds, long timestamp)
   {
-    for (NativeBookmarkSearchListener listener : mBookmarkListeners)
+    for (BookmarkSearchListener listener : mBookmarkListeners)
       listener.onBookmarkSearchResultsUpdate(bookmarkIds, timestamp);
   }
 
   @Override
   public void onBookmarkSearchResultsEnd(@Nullable long[] bookmarkIds, long timestamp)
   {
-    for (NativeBookmarkSearchListener listener : mBookmarkListeners)
+    for (BookmarkSearchListener listener : mBookmarkListeners)
       listener.onBookmarkSearchResultsEnd(bookmarkIds, timestamp);
   }
 
-  private final ObserverList<NativeSearchListener> mListeners = new ObserverList<>();
+  private final ObserverList<SearchListener> mListeners = new ObserverList<>();
 
-  private final ObserverList<NativeMapSearchListener> mMapListeners = new ObserverList<>();
+  private final ObserverList<MapSearchListener> mMapListeners = new ObserverList<>();
 
-  private final ObserverList<NativeBookmarkSearchListener> mBookmarkListeners = new ObserverList<>();
+  private final ObserverList<BookmarkSearchListener> mBookmarkListeners = new ObserverList<>();
 
-  public void addListener(NativeSearchListener listener)
+  public void addListener(SearchListener listener)
   {
     mListeners.addObserver(listener);
   }
 
-  public void removeListener(NativeSearchListener listener)
+  public void removeListener(SearchListener listener)
   {
     mListeners.removeObserver(listener);
   }
 
-  public void addMapListener(NativeMapSearchListener listener)
+  public void addMapListener(MapSearchListener listener)
   {
     mMapListeners.addObserver(listener);
   }
 
-  public void removeMapListener(NativeMapSearchListener listener)
+  public void removeMapListener(MapSearchListener listener)
   {
     mMapListeners.removeObserver(listener);
   }
 
-  public void addBookmarkListener(NativeBookmarkSearchListener listener)
+  public void addBookmarkListener(BookmarkSearchListener listener)
   {
     mBookmarkListeners.addObserver(listener);
   }
 
-  public void removeBookmarkListener(NativeBookmarkSearchListener listener)
+  public void removeBookmarkListener(BookmarkSearchListener listener)
   {
     mBookmarkListeners.removeObserver(listener);
   }
 
-  private native void nativeInit();
-
   /**
    *
    * @param context
@@ -116,7 +114,7 @@ public enum SearchEngine implements NativeSearchListener,
    * @return whether search was actually started.
    */
   @MainThread
-  public boolean search(@NonNull Context context, String query, boolean isCategory,
+  public boolean search(@NonNull Context context, @NonNull String query, boolean isCategory,
                         long timestamp, boolean hasLocation, double lat, double lon)
   {
     return nativeRunSearch(query.getBytes(StandardCharsets.UTF_8), isCategory,
@@ -146,7 +144,7 @@ public enum SearchEngine implements NativeSearchListener,
   }
 
   @MainThread
-  public static void searchMaps(@NonNull Context context, String query, long timestamp)
+  public static void searchMaps(@NonNull Context context, @NonNull String query, long timestamp)
   {
     nativeRunSearchMaps(query.getBytes(StandardCharsets.UTF_8), Language.getKeyboardLocale(context),
                         timestamp);
@@ -208,6 +206,8 @@ public enum SearchEngine implements NativeSearchListener,
     nativeInit();
   }
 
+  private native void nativeInit();
+
   /**
    * @param bytes utf-8 formatted bytes of query.
    */

android/app/src/main/java/app/organicmaps/sdk/search/SearchListener.java

@@ -1,4 +1,4 @@
-package app.organicmaps.search;
+package app.organicmaps.sdk.search;
 
 import androidx.annotation.Keep;
 import androidx.annotation.NonNull;
@@ -6,10 +6,10 @@ import androidx.annotation.NonNull;
 /**
  * Native search will return results via this interface.
  */
-public interface NativeSearchListener
+public interface SearchListener
 {
   /**
-   * @param results Search results.
+   * @param results   Search results.
    * @param timestamp Timestamp of search request.
    */
   // Called by JNI.

android/app/src/main/java/app/organicmaps/sdk/search/SearchRecents.java

@@ -1,8 +1,7 @@
-package app.organicmaps.search;
+package app.organicmaps.sdk.search;
 
 import android.content.Context;
 import android.text.TextUtils;
-import android.util.Pair;
 
 import androidx.annotation.NonNull;
 
@@ -50,6 +49,8 @@ public final class SearchRecents
   }
 
   private static native void nativeGetList(List<String> result);
+
   private static native void nativeAdd(String locale, String query);
+
   private static native void nativeClear();
 }

android/app/src/main/java/app/organicmaps/sdk/search/SearchResult.java

@@ -1,4 +1,4 @@
-package app.organicmaps.search;
+package app.organicmaps.sdk.search;
 
 import android.content.Context;
 import android.graphics.Typeface;
@@ -32,7 +32,7 @@ public class SearchResult
   public static final int OPEN_NOW_NO = 2;
 
   public static final SearchResult EMPTY = new SearchResult("", "", 0, 0,
-                                                            new int[] {}, new int[] {});
+      new int[]{}, new int[]{});
 
   // Used by JNI.
   @Keep

android/app/src/main/java/app/organicmaps/search/CategoriesAdapter.java

@@ -18,6 +18,7 @@ import androidx.fragment.app.Fragment;
 import androidx.recyclerview.widget.RecyclerView;
 
 import app.organicmaps.R;
+import app.organicmaps.sdk.search.DisplayedCategories;
 import app.organicmaps.util.ThemeUtils;
 
 import java.lang.annotation.Retention;
@@ -26,9 +27,10 @@ import java.lang.annotation.RetentionPolicy;
 class CategoriesAdapter extends RecyclerView.Adapter<CategoriesAdapter.ViewHolder>
 {
   @Retention(RetentionPolicy.SOURCE)
-  @IntDef({ TYPE_CATEGORY })
-  @interface ViewType {}
-  private static final int TYPE_CATEGORY = 0;
+  @IntDef({ ViewType.CATEGORY })
+  @interface ViewType {
+    int CATEGORY = 0;
+  }
 
   @StringRes
   private int[] mCategoryResIds;
@@ -121,15 +123,16 @@ class CategoriesAdapter extends RecyclerView.Adapter<CategoriesAdapter.ViewHolde
   @ViewType
   public int getItemViewType(int position)
   {
-    return TYPE_CATEGORY;
+    return ViewType.CATEGORY;
   }
 
+  @NonNull
   @Override
-  public ViewHolder onCreateViewHolder(ViewGroup parent, @ViewType int viewType)
+  public ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, @ViewType int viewType)
   {
     View view;
     ViewHolder viewHolder;
-    if (viewType == TYPE_CATEGORY)
+    if (viewType == ViewType.CATEGORY)
     {
       view = mInflater.inflate(R.layout.item_search_category, parent, false);
       viewHolder = new ViewHolder(view, (TextView) view);

android/app/src/main/java/app/organicmaps/search/FloatingSearchToolbarController.java

@@ -6,7 +6,8 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
 import androidx.core.view.ViewCompat;
-import app.organicmaps.util.WindowInsetUtils;
+
+import app.organicmaps.sdk.search.SearchEngine;
 import app.organicmaps.util.WindowInsetUtils.PaddingInsetsListener;
 import app.organicmaps.widget.SearchToolbarController;
 import app.organicmaps.util.UiUtils;

android/app/src/main/java/app/organicmaps/search/NativeMapSearchListener.java

@@ -1,26 +0,0 @@
-package app.organicmaps.search;
-
-import androidx.annotation.Keep;
-
-public interface NativeMapSearchListener
-{
-  // Called from JNI.
-  @Keep
-  @SuppressWarnings("unused")
-  class Result
-  {
-    public final String countryId;
-    public final String matchedString;
-
-    public Result(String countryId, String matchedString)
-    {
-      this.countryId = countryId;
-      this.matchedString = matchedString;
-    }
-  }
-
-  // Called from JNI.
-  @Keep
-  @SuppressWarnings("unused")
-  void onMapSearchResults(Result[] results, long timestamp, boolean isLast);
-}

android/app/src/main/java/app/organicmaps/search/SearchAdapter.java

@@ -2,10 +2,6 @@ package app.organicmaps.search;
 
 import android.content.Context;
 import android.content.res.Resources;
-import android.graphics.Typeface;
-import android.text.SpannableStringBuilder;
-import android.text.Spanned;
-import android.text.style.StyleSpan;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -17,6 +13,7 @@ import androidx.core.content.ContextCompat;
 import androidx.recyclerview.widget.RecyclerView;
 
 import app.organicmaps.R;
+import app.organicmaps.sdk.search.SearchResult;
 import app.organicmaps.util.Graphics;
 import app.organicmaps.util.ThemeUtils;
 import app.organicmaps.util.UiUtils;

android/app/src/main/java/app/organicmaps/search/SearchFragment.java

@@ -3,6 +3,7 @@ package app.organicmaps.search;
 import android.app.Activity;
 import android.content.Context;
 import android.content.Intent;
+import android.content.SharedPreferences;
 import android.location.Location;
 import android.os.Bundle;
 import android.text.TextUtils;
@@ -10,6 +11,8 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 
+import androidx.activity.result.ActivityResultLauncher;
+import androidx.activity.result.contract.ActivityResultContracts;
 import androidx.annotation.CallSuper;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
@@ -22,6 +25,7 @@ import androidx.recyclerview.widget.RecyclerView;
 import androidx.viewpager.widget.ViewPager;
 import app.organicmaps.Framework;
 import app.organicmaps.MwmActivity;
+import app.organicmaps.MwmApplication;
 import app.organicmaps.R;
 import app.organicmaps.base.BaseMwmFragment;
 import app.organicmaps.bookmarks.data.FeatureId;
@@ -31,6 +35,10 @@ import app.organicmaps.downloader.MapManager;
 import app.organicmaps.location.LocationHelper;
 import app.organicmaps.location.LocationListener;
 import app.organicmaps.routing.RoutingController;
+import app.organicmaps.sdk.search.SearchEngine;
+import app.organicmaps.sdk.search.SearchListener;
+import app.organicmaps.sdk.search.SearchRecents;
+import app.organicmaps.sdk.search.SearchResult;
 import app.organicmaps.util.Config;
 import app.organicmaps.util.SharedPropertiesUtils;
 import app.organicmaps.util.UiUtils;
@@ -47,7 +55,7 @@ import java.util.Arrays;
 import java.util.List;
 
 public class SearchFragment extends BaseMwmFragment
-                         implements NativeSearchListener,
+                         implements SearchListener,
                                     CategoriesAdapter.CategoriesUiListener
 {
   private long mLastQueryTimestamp;
@@ -113,10 +121,9 @@ public class SearchFragment extends BaseMwmFragment
     }
 
     @Override
-    @SuppressWarnings("deprecation") // https://github.com/organicmaps/organicmaps/issues/3630
-    protected void startVoiceRecognition(Intent intent, int code)
+    protected void startVoiceRecognition(Intent intent)
     {
-      startActivityForResult(intent, code);
+      startVoiceRecognitionForResult.launch(intent);
     }
 
     @Override
@@ -168,6 +175,11 @@ public class SearchFragment extends BaseMwmFragment
   private String mInitialLocale;
   private boolean mInitialSearchOnMap = false;
 
+  private final ActivityResultLauncher<Intent> startVoiceRecognitionForResult = registerForActivityResult(new ActivityResultContracts.StartActivityForResult(), activityResult ->
+  {
+    mToolbarController.onVoiceRecognitionResult(activityResult);
+  });
+
   private final LocationListener mLocationListener = new LocationListener()
   {
     @Override
@@ -299,8 +311,10 @@ public class SearchFragment extends BaseMwmFragment
 
     SearchEngine.INSTANCE.addListener(this);
 
+    SharedPreferences preferences = MwmApplication.prefs(requireContext());
+    int lastSelectedTabPosition = preferences.getInt(Config.KEY_PREF_LAST_SEARCHED_TAB, 0);
     if (SearchRecents.getSize() == 0 && Config.isSearchHistoryEnabled())
-      pager.setCurrentItem(TabAdapter.Tab.CATEGORIES.ordinal());
+      pager.setCurrentItem(lastSelectedTabPosition);
 
     tabAdapter.setTabSelectedListener(tab -> mToolbarController.deactivate());
 
@@ -525,14 +539,6 @@ public class SearchFragment extends BaseMwmFragment
     mToolbarController.showProgress(true);
   }
 
-  @Override
-  @SuppressWarnings("deprecation") // https://github.com/organicmaps/organicmaps/issues/3630
-  public void onActivityResult(int requestCode, int resultCode, Intent data)
-  {
-    super.onActivityResult(requestCode, resultCode, data);
-    mToolbarController.onActivityResult(requestCode, resultCode, data);
-  }
-
   @Override
   public boolean onBackPressed()
   {

android/app/src/main/java/app/organicmaps/search/SearchHistoryAdapter.java

@@ -11,6 +11,7 @@ import androidx.recyclerview.widget.RecyclerView;
 import app.organicmaps.R;
 import app.organicmaps.location.LocationHelper;
 import app.organicmaps.routing.RoutingController;
+import app.organicmaps.sdk.search.SearchRecents;
 import app.organicmaps.widget.SearchToolbarController;
 import app.organicmaps.util.Graphics;
 

android/app/src/main/java/app/organicmaps/search/TabAdapter.java

@@ -1,6 +1,7 @@
 package app.organicmaps.search;
 
 import android.content.Context;
+import android.content.SharedPreferences;
 import android.util.SparseArray;
 import android.view.View;
 
@@ -11,6 +12,8 @@ import androidx.fragment.app.FragmentPagerAdapter;
 import androidx.viewpager.widget.ViewPager;
 
 import com.google.android.material.tabs.TabLayout;
+
+import app.organicmaps.MwmApplication;
 import app.organicmaps.R;
 import app.organicmaps.util.Graphics;
 import app.organicmaps.util.Config;
@@ -91,6 +94,9 @@ class TabAdapter extends FragmentPagerAdapter
     @Override
     public void onTabSelected(TabLayout.Tab tab)
     {
+      SharedPreferences.Editor editor = MwmApplication.prefs(mContext).edit();
+      editor.putInt(Config.KEY_PREF_LAST_SEARCHED_TAB, tab.getPosition());
+      editor.apply();
       super.onTabSelected(tab);
       Graphics.tint(mContext, tab.getIcon(), androidx.appcompat.R.attr.colorAccent);
     }
@@ -151,7 +157,9 @@ class TabAdapter extends FragmentPagerAdapter
     ViewPager.OnPageChangeListener listener = new PageChangedListener(tabs);
     mPager.addOnPageChangeListener(listener);
     tabs.setOnTabSelectedListener(new OnTabSelectedListenerForViewPager(mPager));
-    listener.onPageSelected(0);
+    SharedPreferences preferences = MwmApplication.prefs(mPager.getContext());
+    int lastSelectedTabPosition = preferences.getInt(Config.KEY_PREF_LAST_SEARCHED_TAB, 0);
+    listener.onPageSelected(lastSelectedTabPosition);
   }
 
   void setTabSelectedListener(OnTabSelectedListener listener)

android/app/src/main/java/app/organicmaps/settings/DrivingOptionsActivity.java

@@ -3,10 +3,9 @@ package app.organicmaps.settings;
 import android.app.Activity;
 import android.content.Intent;
 
+import androidx.activity.result.ActivityResultLauncher;
 import androidx.annotation.NonNull;
 import androidx.fragment.app.Fragment;
-
-import app.organicmaps.MwmActivity;
 import app.organicmaps.base.BaseMwmFragmentActivity;
 
 public class DrivingOptionsActivity extends BaseMwmFragmentActivity
@@ -17,9 +16,9 @@ public class DrivingOptionsActivity extends BaseMwmFragmentActivity
     return DrivingOptionsFragment.class;
   }
 
-  public static void start(@NonNull Activity activity)
+  public static void start(@NonNull Activity activity, ActivityResultLauncher<Intent> startDrivingOptionsForResult)
   {
     Intent intent = new Intent(activity, DrivingOptionsActivity.class);
-    activity.startActivityForResult(intent, MwmActivity.REQ_CODE_DRIVING_OPTIONS);
+    startDrivingOptionsForResult.launch(intent);
   }
 }

android/app/src/main/java/app/organicmaps/settings/SettingsPrefsFragment.java

@@ -32,7 +32,7 @@ import app.organicmaps.util.SharedPropertiesUtils;
 import app.organicmaps.util.ThemeSwitcher;
 import app.organicmaps.util.Utils;
 import app.organicmaps.util.log.LogsManager;
-import app.organicmaps.search.SearchRecents;
+import app.organicmaps.sdk.search.SearchRecents;
 import com.google.android.material.dialog.MaterialAlertDialogBuilder;
 
 import java.util.Locale;
@@ -231,6 +231,8 @@ public class SettingsPrefsFragment extends BaseXmlSettingsFragment implements La
 
     if (!SharedPropertiesUtils.shouldShowEmulateBadStorageSetting(requireContext()))
       removePreference(getString(R.string.pref_settings_general), pref);
+    else
+      pref.setVisible(true);
   }
 
   private void initAutoZoomPrefsCallbacks()

android/app/src/main/java/app/organicmaps/settings/VoiceInstructionsSettingsFragment.java

@@ -1,5 +1,6 @@
 package app.organicmaps.settings;
 
+import android.app.Activity;
 import android.content.ActivityNotFoundException;
 import android.content.Intent;
 import android.content.res.Configuration;
@@ -11,6 +12,8 @@ import android.text.style.ForegroundColorSpan;
 import android.view.View;
 import android.widget.Toast;
 
+import androidx.activity.result.ActivityResultLauncher;
+import androidx.activity.result.contract.ActivityResultContracts;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.core.content.ContextCompat;
@@ -35,7 +38,6 @@ import java.util.Map;
 
 public class VoiceInstructionsSettingsFragment extends BaseXmlSettingsFragment
 {
-  private static final int REQUEST_INSTALL_DATA = 1;
 
   @NonNull
   @SuppressWarnings("NotNullFieldNotInitialized")
@@ -67,6 +69,14 @@ public class VoiceInstructionsSettingsFragment extends BaseXmlSettingsFragment
   private LanguageData mCurrentLanguage;
   private String mSelectedLanguage;
 
+  private final ActivityResultLauncher<Intent> startInstallDataIntentForResult = registerForActivityResult(new ActivityResultContracts.StartActivityForResult(), activityResult -> {
+
+    if(activityResult.getResultCode() == Activity.RESULT_OK)
+      {
+        onInstallDataResult();
+      }
+  });
+
   private final Preference.OnPreferenceChangeListener mEnabledListener = (preference, newValue) -> {
     final boolean set = (Boolean) newValue;
     if (!set)
@@ -107,8 +117,7 @@ public class VoiceInstructionsSettingsFragment extends BaseXmlSettingsFragment
     if (lang.downloaded)
       setLanguage(lang);
     else
-      UiUtils.startActivityForResult(VoiceInstructionsSettingsFragment.this,
-          new Intent(TextToSpeech.Engine.ACTION_INSTALL_TTS_DATA), REQUEST_INSTALL_DATA);
+      UiUtils.startActivityForResult(startInstallDataIntentForResult, new Intent(TextToSpeech.Engine.ACTION_INSTALL_TTS_DATA));
 
     return false;
   };
@@ -181,21 +190,13 @@ public class VoiceInstructionsSettingsFragment extends BaseXmlSettingsFragment
     updateTts();
   }
 
-  @Override
-  @SuppressWarnings("deprecation") // https://github.com/organicmaps/organicmaps/issues/3630
-  public void onActivityResult(int requestCode, int resultCode, Intent data)
+  private void onInstallDataResult()
   {
-    // Do not check resultCode here as it is always RESULT_CANCELED
-    super.onActivityResult(requestCode, resultCode, data);
+    updateTts();
 
-    if (requestCode == REQUEST_INSTALL_DATA)
-    {
-      updateTts();
-
-      LanguageData lang = mLanguages.get(mSelectedLanguage);
-      if (lang != null && lang.downloaded)
-        setLanguage(lang);
-    }
+    LanguageData lang = mLanguages.get(mSelectedLanguage);
+    if (lang != null && lang.downloaded)
+      setLanguage(lang);
   }
 
   private void enableListeners(boolean enable)

android/app/src/main/java/app/organicmaps/util/Config.java

@@ -7,7 +7,6 @@ import android.os.Build;
 import androidx.annotation.NonNull;
 import androidx.preference.PreferenceManager;
 import app.organicmaps.BuildConfig;
-import app.organicmaps.MwmActivity;
 import app.organicmaps.MwmApplication;
 import app.organicmaps.R;
 
@@ -36,6 +35,8 @@ public final class Config
   private static final String KEY_DONATE_URL = "DonateUrl";
   private static final String KEY_PREF_SEARCH_HISTORY = "SearchHistoryEnabled";
 
+  public static final String KEY_PREF_LAST_SEARCHED_TAB = "LastSearchTab";
+
   /**
    * The total number of app launches.
    */

android/app/src/main/java/app/organicmaps/util/LocationUtils.java

@@ -118,13 +118,14 @@ public class LocationUtils
     return ContextCompat.checkSelfPermission(context, ACCESS_FINE_LOCATION) == PERMISSION_GRANTED;
   }
 
-  public static boolean checkCoarseLocationPermission(@NonNull Context context)
+  /**
+   * Checks if the app has location permissions granted.
+   * Returns true if either:
+   * Only ACCESS_COARSE_LOCATION is granted
+   * Both ACCESS_COARSE_LOCATION and ACCESS_FINE_LOCATION are granted
+   */
+  public static boolean checkLocationPermission(@NonNull Context context)
   {
     return ContextCompat.checkSelfPermission(context, ACCESS_COARSE_LOCATION) == PERMISSION_GRANTED;
   }
-
-  public static boolean checkLocationPermission(@NonNull Context context)
-  {
-    return checkFineLocationPermission(context) || checkCoarseLocationPermission(context);
-  }
 }

android/app/src/main/java/app/organicmaps/util/StringUtils.java

@@ -49,6 +49,7 @@ public class StringUtils
   public static native boolean nativeContainsNormalized(String str, String substr);
   public static native String[] nativeFilterContainsNormalized(String[] strings, String substr);
 
+  public static native int nativeFormatSpeed(double metersPerSecond);
   public static native Pair<String, String> nativeFormatSpeedAndUnits(double metersPerSecond);
   public static native Distance nativeFormatDistance(double meters);
   @NonNull

android/app/src/main/java/app/organicmaps/util/UiUtils.java

@@ -9,6 +9,7 @@ import android.graphics.Color;
 import android.graphics.Rect;
 import android.os.Build;
 import android.text.TextUtils;
+import android.util.DisplayMetrics;
 import android.view.TouchDelegate;
 import android.view.View;
 import android.view.ViewGroup;
@@ -18,6 +19,8 @@ import android.view.WindowManager;
 import android.widget.Button;
 import android.widget.TextView;
 
+import androidx.activity.result.ActivityResult;
+import androidx.activity.result.ActivityResultLauncher;
 import androidx.annotation.AnyRes;
 import androidx.annotation.AttrRes;
 import androidx.annotation.ColorInt;
@@ -32,7 +35,6 @@ import androidx.core.graphics.Insets;
 import androidx.core.view.WindowCompat;
 import androidx.core.view.WindowInsetsCompat;
 import androidx.core.view.WindowInsetsControllerCompat;
-import androidx.fragment.app.Fragment;
 import androidx.recyclerview.widget.RecyclerView;
 import app.organicmaps.MwmApplication;
 import app.organicmaps.R;
@@ -207,6 +209,15 @@ public final class UiUtils
     return context.getResources().getDimensionPixelSize(id);
   }
 
+  // this method returns the total height of the display (in pixels) including notch and other touchable areas
+  public static int getDisplayTotalHeight(Context context)
+  {
+    DisplayMetrics metrics = new DisplayMetrics();
+    WindowManager windowManager = (WindowManager) context.getSystemService(Context.WINDOW_SERVICE);
+    windowManager.getDefaultDisplay().getRealMetrics(metrics);
+    return metrics.heightPixels;
+  }
+
   public static void updateRedButton(Button button)
   {
     button.setTextColor(ThemeUtils.getColor(button.getContext(), button.isEnabled() ? R.attr.redButtonTextColor
@@ -362,10 +373,9 @@ public final class UiUtils
     }
   }
 
-  @SuppressWarnings("deprecation") // https://github.com/organicmaps/organicmaps/issues/3630
-  public static void startActivityForResult(@NonNull Fragment fragment, @NonNull Intent intent, int requestCode)
+  public static void startActivityForResult(ActivityResultLauncher<Intent> startForResult, @NonNull Intent intent)
   {
-    fragment.startActivityForResult(intent, requestCode);
+    startForResult.launch(intent);
   }
 
   // utility class

android/app/src/main/java/app/organicmaps/util/Utils.java

@@ -271,10 +271,12 @@ public class Utils
    * @param context the app context
    * @param uri the URI to open.
    * @param failMessage string id: message to show in a toast when the system can't find an app to open with.
+   * @param action (optional) the Intent action to use. If none is provided, defaults to Intent.ACTION_VIEW.
    */
-  public static void openUri(@NonNull Context context, @NonNull Uri uri, Integer failMessage)
+  public static void openUri(@NonNull Context context, @NonNull Uri uri, Integer failMessage, @NonNull String... action)
   {
-    final Intent intent = new Intent(Intent.ACTION_VIEW);
+    final String act = (action != null && action.length > 0 && action[0] != null) ? action[0] : Intent.ACTION_VIEW;
+    final Intent intent = new Intent(act);
     intent.setData(uri);
     intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
 

android/app/src/main/java/app/organicmaps/widget/LanesView.java

@@ -59,14 +59,14 @@ public class LanesView extends View
 
     try (TypedArray data = context.getTheme().obtainStyledAttributes(attrs, R.styleable.LanesView, 0, 0))
     {
-      backgroundColor = getAttrColor(data, R.styleable.LanesView_backgroundColor, DefaultValues.BACKGROUND_COLOR);
-      mActiveLaneTintColor = getAttrColor(data, R.styleable.LanesView_activeLaneTintColor, DefaultValues.ACTIVE_LANE_TINT_COLOR);
-      mInactiveLaneTintColor = getAttrColor(data, R.styleable.LanesView_inactiveLaneTintColor, DefaultValues.INACTIVE_LANE_TINT_COLOR);
-      mCornerRadius = (int) Math.max(data.getDimension(R.styleable.LanesView_cornerRadius, DefaultValues.CORNER_RADIUS), 0.0f);
+      backgroundColor = getAttrColor(data, R.styleable.LanesView_lanesBackgroundColor, DefaultValues.BACKGROUND_COLOR);
+      mActiveLaneTintColor = getAttrColor(data, R.styleable.LanesView_lanesActiveLaneTintColor, DefaultValues.ACTIVE_LANE_TINT_COLOR);
+      mInactiveLaneTintColor = getAttrColor(data, R.styleable.LanesView_lanesInactiveLaneTintColor, DefaultValues.INACTIVE_LANE_TINT_COLOR);
+      mCornerRadius = (int) Math.max(data.getDimension(R.styleable.LanesView_lanesCornerRadius, DefaultValues.CORNER_RADIUS), 0.0f);
 
       if (isInEditMode())
       {
-        final int lanesCount = Math.max(1, data.getInt(R.styleable.LanesView_editModeLanesCount, DefaultValues.LANES_COUNT));
+        final int lanesCount = Math.max(1, data.getInt(R.styleable.LanesView_lanesEditModeLanesCount, DefaultValues.LANES_COUNT));
         createLanesForEditMode(lanesCount);
       }
     }

android/app/src/main/java/app/organicmaps/widget/SearchToolbarController.java

@@ -10,6 +10,7 @@ import android.view.KeyEvent;
 import android.view.View;
 import android.view.inputmethod.EditorInfo;
 
+import androidx.activity.result.ActivityResult;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.annotation.StringRes;
@@ -22,7 +23,6 @@ import com.google.android.material.textfield.TextInputEditText;
 
 public class SearchToolbarController extends ToolbarController implements View.OnClickListener
 {
-  private static final int REQUEST_VOICE_RECOGNITION = 0xCA11;
   @Nullable
   private final View mToolbarContainer;
   @NonNull
@@ -107,7 +107,7 @@ public class SearchToolbarController extends ToolbarController implements View.O
     clear();
   }
 
-  protected void startVoiceRecognition(Intent intent, int code)
+  protected void startVoiceRecognition(Intent intent)
   {
     throw new RuntimeException("To be used startVoiceRecognition() must be implemented by descendant class");
   }
@@ -130,7 +130,7 @@ public class SearchToolbarController extends ToolbarController implements View.O
     try
     {
       startVoiceRecognition(InputUtils.createIntentForVoiceRecognition(
-          requireActivity().getString(getVoiceInputPrompt())), REQUEST_VOICE_RECOGNITION);
+          requireActivity().getString(getVoiceInputPrompt())));
     }
     catch (ActivityNotFoundException e)
     {
@@ -210,14 +210,18 @@ public class SearchToolbarController extends ToolbarController implements View.O
     UiUtils.showIf(show, mSearchContainer);
   }
 
-  public void onActivityResult(int requestCode, int resultCode, Intent data)
+  public void onVoiceRecognitionResult(ActivityResult activityResult)
   {
-    if (requestCode == REQUEST_VOICE_RECOGNITION && resultCode == Activity.RESULT_OK)
-    {
-      String result = InputUtils.getBestRecognitionResult(data);
-      if (!TextUtils.isEmpty(result))
-        setQuery(result);
-    }
+      if(activityResult.getResultCode() == Activity.RESULT_OK)
+      {
+        if (activityResult.getData() == null)
+        {
+          return;
+        }
+        String recognitionResult = InputUtils.getBestRecognitionResult(activityResult.getData());
+        if (!TextUtils.isEmpty(recognitionResult))
+          setQuery(recognitionResult);
+      }
   }
 
   public void setHint(@StringRes int hint)

android/app/src/main/java/app/organicmaps/widget/SpeedLimitView.java

@@ -8,16 +8,14 @@ import android.graphics.Paint;
 import android.graphics.Rect;
 import android.graphics.Typeface;
 import android.util.AttributeSet;
-import android.util.Pair;
+import android.view.MotionEvent;
 import android.view.View;
 
 import androidx.annotation.ColorInt;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
-import androidx.core.content.ContextCompat;
 
 import app.organicmaps.R;
-import app.organicmaps.util.StringUtils;
 
 public class SpeedLimitView extends View
 {
@@ -26,6 +24,10 @@ public class SpeedLimitView extends View
     @ColorInt
     int BACKGROUND_COLOR = Color.WHITE;
     @ColorInt
+    int BORDER_COLOR = Color.RED;
+    @ColorInt
+    int ALERT_COLOR = Color.RED;
+    @ColorInt
     int TEXT_COLOR = Color.BLACK;
     @ColorInt
     int TEXT_ALERT_COLOR = Color.WHITE;
@@ -61,29 +63,28 @@ public class SpeedLimitView extends View
   private float mBorderRadius;
   private float mBorderWidth;
 
-  private double mSpeedLimitMps;
-  @Nullable
-  private String mSpeedLimitStr;
-
-  private double mCurrentSpeed;
+  private int mSpeedLimit = 0;
+  @NonNull
+  private String mSpeedLimitStr = "0";
+  private boolean mAlert = false;
 
   public SpeedLimitView(Context context, @Nullable AttributeSet attrs)
   {
     super(context, attrs);
 
     try (TypedArray data = context.getTheme()
-                                  .obtainStyledAttributes(attrs, R.styleable.SpeedLimitView, 0, 0))
+        .obtainStyledAttributes(attrs, R.styleable.SpeedLimitView, 0, 0))
     {
-      mBackgroundColor = data.getColor(R.styleable.SpeedLimitView_BackgroundColor, DefaultValues.BACKGROUND_COLOR);
-      mBorderColor = data.getColor(R.styleable.SpeedLimitView_borderColor, ContextCompat.getColor(context, R.color.base_red));
-      mAlertColor = data.getColor(R.styleable.SpeedLimitView_alertColor, ContextCompat.getColor(context, R.color.base_red));
-      mTextColor = data.getColor(R.styleable.SpeedLimitView_textColor, DefaultValues.TEXT_COLOR);
-      mTextAlertColor = data.getColor(R.styleable.SpeedLimitView_textAlertColor, DefaultValues.TEXT_ALERT_COLOR);
+      mBackgroundColor = data.getColor(R.styleable.SpeedLimitView_speedLimitBackgroundColor, DefaultValues.BACKGROUND_COLOR);
+      mBorderColor = data.getColor(R.styleable.SpeedLimitView_speedLimitBorderColor, DefaultValues.BORDER_COLOR);
+      mAlertColor = data.getColor(R.styleable.SpeedLimitView_speedLimitAlertColor, DefaultValues.ALERT_COLOR);
+      mTextColor = data.getColor(R.styleable.SpeedLimitView_speedLimitTextColor, DefaultValues.TEXT_COLOR);
+      mTextAlertColor = data.getColor(R.styleable.SpeedLimitView_speedLimitTextAlertColor, DefaultValues.TEXT_ALERT_COLOR);
       if (isInEditMode())
       {
-        mSpeedLimitMps = data.getInt(R.styleable.SpeedLimitView_editModeSpeedLimit, -1);
-        mSpeedLimitStr = mSpeedLimitMps > 0 ? String.valueOf(((int) mSpeedLimitMps)) : null;
-        mCurrentSpeed = data.getInt(R.styleable.SpeedLimitView_editModeCurrentSpeed, -1);
+        mSpeedLimit = data.getInt(R.styleable.SpeedLimitView_speedLimitEditModeSpeedLimit, 60);
+        mSpeedLimitStr = Integer.toString(mSpeedLimit);
+        mAlert = data.getBoolean(R.styleable.SpeedLimitView_speedLimitEditModeAlert, false);
       }
     }
 
@@ -101,29 +102,19 @@ public class SpeedLimitView extends View
     mTextPaint.setTypeface(Typeface.create(Typeface.DEFAULT, Typeface.BOLD));
   }
 
-  public void setSpeedLimitMps(final double speedLimitMps)
+  public void setSpeedLimit(final int speedLimit, boolean alert)
   {
-    if (mSpeedLimitMps == speedLimitMps)
-      return;
+    final boolean speedLimitChanged = mSpeedLimit != speedLimit;
 
-    mSpeedLimitMps = speedLimitMps;
-    if (mSpeedLimitMps <= 0)
+    mSpeedLimit = speedLimit;
+    mAlert = alert;
+
+    if (speedLimitChanged)
     {
-      mSpeedLimitStr = null;
-      setVisibility(GONE);
-      return;
+      mSpeedLimitStr = Integer.toString(mSpeedLimit);
+      configureTextSize();
     }
 
-    final Pair<String, String> speedLimitAndUnits = StringUtils.nativeFormatSpeedAndUnits(mSpeedLimitMps);
-    setVisibility(VISIBLE);
-    mSpeedLimitStr = speedLimitAndUnits.first;
-    configureTextSize();
-    invalidate();
-  }
-
-  public void setCurrentSpeed(final double currentSpeed)
-  {
-    mCurrentSpeed = currentSpeed;
     invalidate();
   }
 
@@ -132,13 +123,15 @@ public class SpeedLimitView extends View
   {
     super.onDraw(canvas);
 
-    final boolean alert = mCurrentSpeed > mSpeedLimitMps && mSpeedLimitMps > 0;
+    final boolean validSpeedLimit = mSpeedLimit > 0;
+    if (!validSpeedLimit)
+      return;
 
     final float cx = mWidth / 2;
     final float cy = mHeight / 2;
 
-    drawSign(canvas, cx, cy, alert);
-    drawText(canvas, cx, cy, alert);
+    drawSign(canvas, cx, cy, mAlert);
+    drawText(canvas, cx, cy, mAlert);
   }
 
   private void drawSign(@NonNull Canvas canvas, float cx, float cy, boolean alert)
@@ -158,9 +151,6 @@ public class SpeedLimitView extends View
 
   private void drawText(@NonNull Canvas canvas, float cx, float cy, boolean alert)
   {
-    if (mSpeedLimitStr == null)
-      return;
-
     if (alert)
       mTextPaint.setColor(mTextAlertColor);
     else
@@ -172,6 +162,26 @@ public class SpeedLimitView extends View
     canvas.drawText(mSpeedLimitStr, cx, textY, mTextPaint);
   }
 
+  @Override
+  public boolean onTouchEvent(@NonNull MotionEvent event)
+  {
+    final float cx = mWidth / 2;
+    final float cy = mHeight / 2;
+    if (Math.pow(event.getX() - cx, 2) + Math.pow(event.getY() - cy, 2) <= Math.pow(mBackgroundRadius, 2))
+    {
+      performClick();
+      return true;
+    }
+    return false;
+  }
+
+  @Override
+  public boolean performClick()
+  {
+    super.performClick();
+    return false;
+  }
+
   @Override
   protected void onSizeChanged(int w, int h, int oldw, int oldh)
   {
@@ -191,9 +201,6 @@ public class SpeedLimitView extends View
   // Apply binary search to determine the optimal text size that fits within the circular boundary.
   private void configureTextSize()
   {
-    if (mSpeedLimitStr == null)
-      return;
-
     final String text = mSpeedLimitStr;
     final float textRadius = mBorderRadius - mBorderWidth;
     final float textMaxSize = 2 * textRadius;

android/app/src/main/java/app/organicmaps/widget/placepage/DirectionFragment.java

@@ -11,6 +11,7 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
 import app.organicmaps.Framework;
+import app.organicmaps.MwmActivity;
 import app.organicmaps.R;
 import app.organicmaps.base.BaseMwmDialogFragment;
 import app.organicmaps.bookmarks.data.DistanceAndAzimut;
@@ -46,6 +47,7 @@ public class DirectionFragment extends BaseMwmDialogFragment
   {
     final View root = inflater.inflate(R.layout.fragment_direction, container, false);
     root.setOnTouchListener((v, event) -> {
+      root.performClick();
       dismiss();
       return false;
     });
@@ -99,6 +101,7 @@ public class DirectionFragment extends BaseMwmDialogFragment
     super.onResume();
     LocationHelper.from(requireContext()).addListener(this);
     SensorHelper.from(requireContext()).addListener(this);
+    ((MwmActivity) requireActivity()).hideOrShowUIWithoutClosingPlacePage(true);
     refreshViews();
   }
 
@@ -110,6 +113,13 @@ public class DirectionFragment extends BaseMwmDialogFragment
     SensorHelper.from(requireContext()).removeListener(this);
   }
 
+  @Override
+  public void onStop()
+  {
+    super.onStop();
+    ((MwmActivity) requireActivity()).hideOrShowUIWithoutClosingPlacePage(false);
+  }
+
   @Override
   public void onLocationUpdated(@NonNull Location location)
   {

android/app/src/main/java/app/organicmaps/widget/placepage/PlacePageController.java

@@ -38,6 +38,7 @@ import app.organicmaps.util.bottomsheet.MenuBottomSheetFragment;
 import app.organicmaps.util.bottomsheet.MenuBottomSheetItem;
 import app.organicmaps.util.log.Logger;
 import com.google.android.material.bottomsheet.BottomSheetBehavior;
+import com.google.android.material.shape.MaterialShapeDrawable;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -76,7 +77,53 @@ public class PlacePageController extends Fragment implements
 
   private ValueAnimator mCustomPeekHeightAnimator;
   private PlacePageRouteSettingsListener mPlacePageRouteSettingsListener;
-  private final Observer<Integer> mPlacePageDistanceToTopObserver = this::updateStatusBarBackground;
+
+  private final Observer<Integer> mPlacePageDistanceToTopObserver = new Observer<>()
+  {
+    private float mPlacePageCornerRadius;
+
+    // This updates mPlacePageStatusBarBackground visibility and mPlacePage corner radius
+    // effectively handling when place page fills the screen vertically
+    @Override
+    public void onChanged(Integer distanceToTop)
+    {
+      // This callback may be called before insets are updated when resuming the app
+      if (mCurrentWindowInsets == null)
+        return;
+      final int topInset = mCurrentWindowInsets.getInsets(WindowInsetsCompat.Type.systemBars()).top;
+      // Only animate the status bar background if the place page can reach it
+      if (mCoordinator.getHeight() - mPlacePageContainer.getHeight() < topInset)
+      {
+        final int animationStartHeight = topInset * 3;
+        int newHeight = 0;
+        if (distanceToTop < animationStartHeight)
+          newHeight = Math.min(topInset * (animationStartHeight - distanceToTop) / 100, topInset);
+        if (newHeight > 0)
+        {
+          mPlacePageStatusBarBackground.setTranslationY(distanceToTop - newHeight);
+          if (!UiUtils.isVisible(mPlacePageStatusBarBackground))
+            onScreenFilled();
+        }
+        else if (UiUtils.isVisible(mPlacePageStatusBarBackground))
+          onScreenUnfilled();
+      }
+    }
+
+    private void onScreenFilled()
+    {
+      UiUtils.show(mPlacePageStatusBarBackground);
+      MaterialShapeDrawable bg = (MaterialShapeDrawable) mPlacePage.getBackground();
+      mPlacePageCornerRadius = bg.getTopLeftCornerResolvedSize();
+      bg.setCornerSize(0);
+    }
+
+    private void onScreenUnfilled()
+    {
+      UiUtils.hide(mPlacePageStatusBarBackground);
+      MaterialShapeDrawable bg = (MaterialShapeDrawable) mPlacePage.getBackground();
+      bg.setCornerSize(mPlacePageCornerRadius);
+    }
+  };
 
   private final BottomSheetBehavior.BottomSheetCallback mDefaultBottomSheetCallback = new BottomSheetBehavior.BottomSheetCallback()
   {
@@ -576,30 +623,6 @@ public class PlacePageController extends Fragment implements
       close();
   }
 
-  private void updateStatusBarBackground(int distanceToTop)
-  {
-    // This callback may be called before insets are updated when resuming the app
-    if (mCurrentWindowInsets == null)
-      return;
-    final int topInset = mCurrentWindowInsets.getInsets(WindowInsetsCompat.Type.systemBars()).top;
-    // Only animate the status bar background if the place page can reach it
-    if (mCoordinator.getHeight() - mPlacePageContainer.getHeight() < topInset)
-    {
-      final int animationStartHeight = topInset * 3;
-      int newHeight = 0;
-      if (distanceToTop < animationStartHeight)
-        newHeight = Math.min(topInset * (animationStartHeight - distanceToTop) / 100, topInset);
-      if (newHeight > 0)
-      {
-        mPlacePageStatusBarBackground.setTranslationY(distanceToTop - newHeight);
-        if (!UiUtils.isVisible(mPlacePageStatusBarBackground))
-          UiUtils.show(mPlacePageStatusBarBackground);
-      }
-      else if (UiUtils.isVisible(mPlacePageStatusBarBackground))
-        UiUtils.hide(mPlacePageStatusBarBackground);
-    }
-  }
-
   @Override
   public void onStart()
   {

android/app/src/main/res/drawable/ic_location_arrow_blue.xml

@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+  android:width="24dp"
+  android:height="24dp"
+  android:viewportWidth="24"
+  android:viewportHeight="24">
+  <path
+    android:fillColor="@android:color/holo_blue_light"
+    android:pathData="M21,3L3,10.53v0.98l6.84,2.65L12.48,21h0.98L21,3z"/>
+</vector>

android/app/src/main/res/drawable/ic_location_crosshair_blue.xml

@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+  android:width="24dp"
+  android:height="24dp"
+  android:viewportWidth="24"
+  android:viewportHeight="24">
+  <path
+    android:pathData="M12,8c-2.21,0 -4,1.79 -4,4 0,2.21 1.79,4 4,4 2.21,0 4,-1.79 4,-4 0,-2.21 -1.79,-4 -4,-4ZM20.94,11c-0.46,-4.17 -3.77,-7.48 -7.94,-7.94v-2.06h-2v2.06c-4.17,0.46 -7.48,3.77 -7.94,7.94h-2.06v2h2.06c0.46,4.17 3.77,7.48 7.94,7.94v2.06h2v-2.06c4.17,-0.46 7.48,-3.77 7.94,-7.94h2.06v-2h-2.06ZM12,19c-3.87,0 -7,-3.13 -7,-7 0,-3.87 3.13,-7 7,-7 3.87,0 7,3.13 7,7 0,3.87 -3.13,7 -7,7Z"
+    android:fillColor="@color/base_accent"/>
+</vector>

android/app/src/main/res/drawable/ic_manage_route.xml

@@ -0,0 +1,28 @@
+<vector
+  android:height="24dp"
+  android:tint="#808080"
+  android:viewportHeight="48"
+  android:viewportWidth="48"
+  android:width="24dp"
+  xmlns:android="http://schemas.android.com/apk/res/android">
+
+  <path
+    android:fillColor="@android:color/white"
+    android:pathData="M06,09 A1,1 0 0 0 06,15 A1,1 0 0 0 06,09
+                      M16,09 A1,1 0 0 0 16,15
+                      M16,09 L42,09 L42,15 L16,15 z
+                      M42,15 A1,1 0 0 0 42,09
+
+                      M06,21 A1,1 0 0 0 06,27 A1,1 0 0 0 06,21
+                      M16,21 A1,1 0 0 0 16,27
+                      M16,21 L42,21 L42,27 L16,27 z
+                      M42,27 A1,1 0 0 0 42,21
+
+                      M06,33 A1,1 0 0 0 06,39 A1,1 0 0 0 06,33
+                      M16,33 A1,1 0 0 0 16,39
+                      M16,33 L42,33 L42,39 L16,39 z
+                      M42,39 A1,1 0 0 0 42,33"
+
+    android:strokeWidth="1"
+    android:strokeColor="@android:color/white"/>
+</vector>

android/app/src/main/res/drawable/ic_track_recording_status.xml

@@ -0,0 +1,14 @@
+<vector
+  xmlns:android="http://schemas.android.com/apk/res/android"
+  android:width="199dp"
+  android:height="199dp"
+  android:viewportWidth="19"
+  android:viewportHeight="19">
+  <path
+    android:pathData="M9.5,4.5a5,5 0,1 0,0 10a5,5 0,0 0,0,-10z"
+    android:fillColor="#000000" />
+  <path
+    android:pathData="M1.5,9.5a8,8 0,1 1,16 0a8,8 0,0 1,-16 0zM9.5,3a6.5,6.5 0,1 0,0 13a6.5,6.5 0 0,0,0,-13z"
+    android:fillColor="#000000"
+    android:fillType="evenOdd" />
+</vector>

android/app/src/main/res/drawable/route_point_01.xml

@@ -0,0 +1,19 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="28dp"
+    android:height="28dp"
+    android:viewportWidth="28"
+    android:viewportHeight="28">
+  <path
+      android:fillColor="#FF000000"
+      android:pathData="M14,14m-11,0a11,11 0,1 1,22 0a11,11 0,1 1,-22 0"
+      android:strokeAlpha="0.35"
+      android:fillAlpha="0.35"/>
+  <path
+      android:pathData="M14,13m-11,0a11,11 0,1 1,22 0a11,11 0,1 1,-22 0"
+      android:strokeWidth="2"
+      android:fillColor="#006c35"
+      android:strokeColor="#fff"/>
+  <path
+      android:pathData="m15.251,17h-1.693v-6.527l-2.022,0.627v-1.377l3.533,-1.266h0.182z"
+      android:fillColor="#fff"/>
+</vector>

android/app/src/main/res/drawable/route_point_02.xml

@@ -0,0 +1,19 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="28dp"
+    android:height="28dp"
+    android:viewportWidth="28"
+    android:viewportHeight="28">
+  <path
+      android:fillColor="#FF000000"
+      android:pathData="M14,14m-11,0a11,11 0,1 1,22 0a11,11 0,1 1,-22 0"
+      android:strokeAlpha="0.35"
+      android:fillAlpha="0.35"/>
+  <path
+      android:pathData="M14,13m-11,0a11,11 0,1 1,22 0a11,11 0,1 1,-22 0"
+      android:strokeWidth="2"
+      android:fillColor="#006c35"
+      android:strokeColor="#fff"/>
+  <path
+      android:pathData="m16.985,17h-5.848v-1.16l2.76,-2.941q0.568,-0.621 0.838,-1.084 0.275,-0.463 0.275,-0.879 0,-0.568 -0.287,-0.891 -0.287,-0.328 -0.82,-0.328 -0.574,0 -0.908,0.398 -0.328,0.393 -0.328,1.037h-1.699q0,-0.779 0.369,-1.424 0.375,-0.645 1.055,-1.008 0.68,-0.369 1.541,-0.369 1.318,0 2.045,0.633 0.732,0.633 0.732,1.787 0,0.633 -0.328,1.289t-1.125,1.529l-1.939,2.045h3.668z"
+      android:fillColor="#fff"/>
+</vector>