[android] Simplify TTS code using AudioManagerCompat

Signed-off-by: Isira Seneviratne <isirasen96@gmail.com>

android/app/build.gradle

@@ -407,6 +407,7 @@ dependencies {
   implementation 'androidx.recyclerview:recyclerview:1.3.2'
   implementation 'androidx.work:work-runtime:2.10.0'
   implementation 'androidx.lifecycle:lifecycle-process:2.8.7'
+  implementation 'androidx.media:media:1.7.0'
   implementation 'com.google.android.material:material:1.12.0'
   // Fix for app/organicmaps/util/FileUploadWorker.java:14: error: cannot access ListenableFuture
   // https://github.com/organicmaps/organicmaps/issues/6106

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

@@ -78,6 +78,7 @@ 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;
@@ -111,6 +112,7 @@ import app.organicmaps.widget.menu.MainMenu;
 import app.organicmaps.widget.placepage.PlacePageController;
 import app.organicmaps.widget.placepage.PlacePageData;
 import app.organicmaps.widget.placepage.PlacePageViewModel;
+import com.google.android.material.bottomsheet.BottomSheetDialogFragment;
 import com.google.android.material.dialog.MaterialAlertDialogBuilder;
 
 import java.util.ArrayList;
@@ -150,6 +152,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 +160,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 +236,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 +595,16 @@ public class MwmActivity extends BaseMwmFragmentActivity
     ViewCompat.setOnApplyWindowInsetsListener(mPointChooser, (view, windowInsets) -> {
       UiUtils.setViewInsetsPaddingBottom(mPointChooser, windowInsets);
       UiUtils.setViewInsetsPaddingNoBottom(mPointChooserToolbar, windowInsets);
-
+      int trackRecorderOffset = TrackRecorder.nativeIsTrackRecordingEnabled() ? UiUtils.dimen(this, R.dimen.map_button_size) : 0;
+      Logger.d("kavi", "offset: " + trackRecorderOffset + "px");
       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
+        Logger.d("kavi", "it is null");
-        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 +625,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 +702,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 +821,7 @@ public class MwmActivity extends BaseMwmFragmentActivity
         showBottomSheet(MAIN_MENU_ID);
       }
       case help -> showHelp();
+      case trackRecordingStatus -> showTrackSaveDialog();
     }
   }
 
@@ -1018,18 +1040,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);
@@ -1342,6 +1352,7 @@ public class MwmActivity extends BaseMwmFragmentActivity
 
   void updateCompassOffset(int offsetY, int offsetX)
   {
+    Logger.d("kavi", "y: " + offsetY + " x: " + offsetX);
     if (mMapFragment == null || !mMapFragment.isAdded())
       return;
 
@@ -1498,14 +1509,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);
+    int orientation = getResources().getConfiguration().orientation;
+    if (TrackRecorder.nativeIsTrackRecordingEnabled() && (orientation != Configuration.ORIENTATION_LANDSCAPE))
+      offsetY += UiUtils.dimen(this, R.dimen.map_button_size);
+    if (orientation == Configuration.ORIENTATION_LANDSCAPE)
+    {
+      if (show)
+      {
+        offsetX += UiUtils.dimen(this, R.dimen.map_button_size);
+        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 (TrackRecorder.nativeIsTrackRecordingEnabled())
+        offsetY += UiUtils.dimen(this, R.dimen.map_button_size);
+    }
+    updateCompassOffset(offsetY, offsetX);
   }
 
   @Override
@@ -1693,7 +1720,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 +1833,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 +1971,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 +2165,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 +2351,11 @@ public class MwmActivity extends BaseMwmFragmentActivity
 
     requestPostNotificationsPermission();
 
+    if (mCurrentWindowInsets != null)
+    {
+      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 +2364,18 @@ public class MwmActivity extends BaseMwmFragmentActivity
 
   private void stopTrackRecording()
   {
+    if (mCurrentWindowInsets != null)
+    {
+      int offsetY = mCurrentWindowInsets.getInsets(WindowInsetsCompat.Type.systemBars()).top;
+      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/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
+  private void onImportDirectoryResult(Intent data)
-  public final void onActivityResult(int requestCode, int resultCode, Intent data)
   {
-    super.onActivityResult(requestCode, resultCode, data);
+    if (data == null)
-    if (resultCode != Activity.RESULT_OK)
+      throw new AssertionError("Data is null");
-      return;
-    switch (requestCode)
-    {
-      case REQ_CODE_DELETE_CATEGORY -> onDeleteActionSelected(getSelectedCategory());
-      case REQ_CODE_IMPORT_DIRECTORY ->
-      {
-        if (data == null)
-          throw new AssertionError("Data is null");
 
-        final Context context = requireActivity();
+    final Context context = requireActivity();
-        final Uri rootUri = data.getData();
+    final Uri rootUri = data.getData();
-        final ProgressDialog dialog = new ProgressDialog(context, R.style.MwmTheme_ProgressDialog);
+    final ProgressDialog dialog = new ProgressDialog(context, R.style.MwmTheme_ProgressDialog);
-        dialog.setMessage(getString(R.string.wait_several_minutes));
+    dialog.setMessage(getString(R.string.wait_several_minutes));
-        dialog.setProgressStyle(ProgressDialog.STYLE_SPINNER);
+    dialog.setProgressStyle(ProgressDialog.STYLE_SPINNER);
-        dialog.setIndeterminate(true);
+    dialog.setIndeterminate(true);
-        dialog.setCancelable(false);
+    dialog.setCancelable(false);
-        dialog.show();
+    dialog.show();
-        Logger.d(TAG, "Importing bookmarks from " + rootUri);
+    Logger.d(TAG, "Importing bookmarks from " + rootUri);
-        MwmApplication app = MwmApplication.from(context);
+    MwmApplication app = MwmApplication.from(context);
-        final File tempDir = new File(StorageUtils.getTempPath(app));
+    final File tempDir = new File(StorageUtils.getTempPath(app));
-        final ContentResolver resolver = context.getContentResolver();
+    final ContentResolver resolver = context.getContentResolver();
-        ThreadPool.getStorage().execute(() -> {
+    ThreadPool.getStorage().execute(() -> {
-          AtomicInteger found = new AtomicInteger(0);
+      AtomicInteger found = new AtomicInteger(0);
-          StorageUtils.listContentProviderFilesRecursively(
+      StorageUtils.listContentProviderFilesRecursively(
               resolver, rootUri, uri -> {
                 if (BookmarkManager.INSTANCE.importBookmarksFile(resolver, uri, tempDir))
                   found.incrementAndGet();
               });
-          UiThread.run(() -> {
+      UiThread.run(() -> {
-            if (dialog.isShowing())
+        if (dialog.isShowing())
-              dialog.dismiss();
+          dialog.dismiss();
-            int found_val = found.get();
+        int found_val = found.get();
-            String message = context.getResources().getQuantityString(
+        String message = context.getResources().getQuantityString(
                 R.plurals.bookmarks_detect_message, found_val, found_val);
-            Toast.makeText(requireContext(), message, Toast.LENGTH_LONG).show();
+        Toast.makeText(requireContext(), message, Toast.LENGTH_LONG).show();
-          });
+      });
-        });
+    });
-      }
-      default -> throw new AssertionError("Invalid requestCode: " + requestCode);
-    }
   }
 
   @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;
@@ -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
+  private void handleActivityResult()
-  @SuppressWarnings("deprecation") // https://github.com/organicmaps/organicmaps/issues/3630
-  public void onActivityResult(int requestCode, int resultCode, Intent data)
   {
-    super.onActivityResult(requestCode, resultCode, data);
     getBookmarkListAdapter().notifyDataSetChanged();
     ActionBar actionBar = ((AppCompatActivity) requireActivity()).getSupportActionBar();
     actionBar.setTitle(mCategoryDataSource.getData().getName());

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

@@ -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);
-          updateItem(item.countryId);
-      }
-      else
-      {
-        refreshData();
       }
     }
 

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;
@@ -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)
@@ -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/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)
-  protected void startVoiceRecognition(Intent intent, int code)
   {
-    mFragment.startActivityForResult(intent, code);
+    mFragment.startVoiceRecognitionForResult.launch(intent);
   }
 
   @Override

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
+  LayersButton 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, (LayersButton) buttonView);
+    }
+  }
+
+  void animateIconBlinking(boolean show, @NonNull LayersButton temp)
+  {
+    if (show)
+    {
+      Drawable drawable = temp.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,17 @@ 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)
+      return;
+    if (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 +401,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 +428,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 +458,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/routing/ManageRouteAdapter.java

@@ -0,0 +1,281 @@
+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_my_position_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_01);
+        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;
+    boolean showSubtitle;
+
+    if (mRoutePoints.get(position).mIsMyPosition)
+    {
+      // My position point.
+      title = mContext.getString(R.string.p2p_your_location);
+
+      if (mRoutePoints.get(position).mPointType == RoutePointInfo.ROUTE_MARK_START)
+      {
+        // Hide my position coordinates if it's the starting point of the route.
+        subtitle = "";
+        showSubtitle = false;
+      }
+      else
+      {
+        subtitle = mRoutePoints.get(position).mTitle;
+        showSubtitle = true;
+      }
+    }
+    else
+    {
+      title = mRoutePoints.get(position).mTitle;
+      subtitle = mRoutePoints.get(position).mSubtitle;
+      showSubtitle = true;
+    }
+
+    holder.mTextViewTitle.setText(title);
+    holder.mTextViewSubtitle.setText(subtitle);
+    UiUtils.showIf(showSubtitle, 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, // Title.
+                                          "", // Subtitle.
+                                          RoutePointInfo.ROUTE_MARK_START, // Point type.
+                                          0, // Intermediate index.
+                                          true, // Visible.
+                                          true, // Is my position.
+                                          false, // No passed.
+                                          myLocation.getLat(), // Latitude.
+                                          myLocation.getLon()));  // Longitude.
+
+    // Update data.
+    updateRoutePointsData();
+
+    // Update adapter.
+    notifyItemChanged(0);
+
+    // Update 'My position' image button.
+    updateMyLocationIcon();
+  }
+
+  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()
+  {
+    for (int pos = 0; pos < mRoutePoints.size(); pos++)
+    {
+      if (pos == 0)
+      {
+        // Set as starting point.
+        mRoutePoints.get(pos).mPointType = RoutePointInfo.ROUTE_MARK_START;
+      }
+      else if (pos == mRoutePoints.size() - 1)
+      {
+        // Set as finish point.
+        mRoutePoints.get(pos).mPointType = RoutePointInfo.ROUTE_MARK_FINISH;
+      }
+      else
+      {
+        // Set as intermediate point.
+        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,264 @@
+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;
+  MapObject mMyLocation;
+
+  @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);
+
+    // Get current location.
+    mMyLocation = MwmApplication.from(getContext()).getLocationHelper().getMyPosition();
+
+    // 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)
+    {
+      // Set 'My Location' as starting point of the route.
+      if (mMyLocation != null)
+        mManageRouteAdapter.setMyLocationAsStartingPoint(mMyLocation);
+    }
+    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)
+  {
+    UiUtils.showIf(showMyLocationIcon && mMyLocation != 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());
+    final boolean speedLimitExceeded = info.speedLimitMps < location.getSpeed();
-    mSpeedLimit.setSpeedLimitMps(info.speedLimitMps);
+    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 int mPointType;
-  public final int mIntermediateIndex;
+  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()
@@ -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

@@ -426,6 +426,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/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;
+    mPlanController = new RoutingPlanController(res, activity, activity.startDrivingOptionsForResult, activity, activity);
-    if (activity instanceof RoutingBottomMenuListener)
-      listener = (RoutingBottomMenuListener) activity;
-
-    RoutingPlanInplaceController.RoutingPlanListener planListener =
-        (RoutingPlanInplaceController.RoutingPlanListener) activity;
-    mPlanController = new RoutingPlanController(res, activity, planListener, listener);
     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/search/SearchFragment.java

@@ -10,6 +10,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;
@@ -113,10 +115,9 @@ public class SearchFragment extends BaseMwmFragment
     }
 
     @Override
-    @SuppressWarnings("deprecation") // https://github.com/organicmaps/organicmaps/issues/3630
+    protected void startVoiceRecognition(Intent intent)
-    protected void startVoiceRecognition(Intent intent, int code)
     {
-      startActivityForResult(intent, code);
+      startVoiceRecognitionForResult.launch(intent);
     }
 
     @Override
@@ -168,6 +169,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
@@ -525,14 +531,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/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/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,
+      UiUtils.startActivityForResult(startInstallDataIntentForResult, new Intent(TextToSpeech.Engine.ACTION_INSTALL_TTS_DATA));
-          new Intent(TextToSpeech.Engine.ACTION_INSTALL_TTS_DATA), REQUEST_INSTALL_DATA);
 
     return false;
   };
@@ -181,21 +190,13 @@ public class VoiceInstructionsSettingsFragment extends BaseXmlSettingsFragment
     updateTts();
   }
 
-  @Override
+  private void onInstallDataResult()
-  @SuppressWarnings("deprecation") // https://github.com/organicmaps/organicmaps/issues/3630
-  public void onActivityResult(int requestCode, int resultCode, Intent data)
   {
-    // Do not check resultCode here as it is always RESULT_CANCELED
+    updateTts();
-    super.onActivityResult(requestCode, resultCode, data);
 
-    if (requestCode == REQUEST_INSTALL_DATA)
+    LanguageData lang = mLanguages.get(mSelectedLanguage);
-    {
+    if (lang != null && lang.downloaded)
-      updateTts();
+      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/sound/AudioFocusManager.java

@@ -1,64 +0,0 @@
-package app.organicmaps.sound;
-
-import android.content.Context;
-import android.media.AudioAttributes;
-import android.media.AudioFocusRequest;
-import android.media.AudioManager;
-import android.os.Build;
-
-import androidx.annotation.Nullable;
-
-import static android.media.AudioManager.AUDIOFOCUS_GAIN_TRANSIENT_MAY_DUCK;
-
-public class AudioFocusManager
-{
-  @Nullable
-  private AudioManager mAudioManager = null;
-  @Nullable
-  private AudioManager.OnAudioFocusChangeListener mOnFocusChange = null;
-  @Nullable
-  private AudioFocusRequest mAudioFocusRequest = null;
-
-  public AudioFocusManager(@Nullable Context context)
-  {
-    if (context != null)
-      mAudioManager = (AudioManager) context.getSystemService(Context.AUDIO_SERVICE);
-
-    if (Build.VERSION.SDK_INT < 26)
-      mOnFocusChange = focusGain -> {};
-    else
-      mAudioFocusRequest = new AudioFocusRequest.Builder(AUDIOFOCUS_GAIN_TRANSIENT_MAY_DUCK).setAudioAttributes(
-          new AudioAttributes.Builder()
-              .setUsage(AudioAttributes.USAGE_ASSISTANCE_NAVIGATION_GUIDANCE)
-              .setContentType(AudioAttributes.CONTENT_TYPE_SPEECH)
-              .build()
-      ).build();
-  }
-
-  public boolean requestAudioFocus()
-  {
-    boolean isMusicActive = false;
-
-    if (mAudioManager != null)
-    {
-      isMusicActive = mAudioManager.isMusicActive();
-      if (Build.VERSION.SDK_INT < 26)
-        mAudioManager.requestAudioFocus(mOnFocusChange, AudioManager.STREAM_VOICE_CALL, AUDIOFOCUS_GAIN_TRANSIENT_MAY_DUCK);
-      else
-        mAudioManager.requestAudioFocus(mAudioFocusRequest);
-    }
-
-    return isMusicActive;
-  }
-
-  public void releaseAudioFocus()
-  {
-    if (mAudioManager != null)
-    {
-      if (Build.VERSION.SDK_INT < 26)
-        mAudioManager.abandonAudioFocus(mOnFocusChange);
-      else
-        mAudioManager.abandonAudioFocusRequest(mAudioFocusRequest);
-    }
-  }
-}

android/app/src/main/java/app/organicmaps/sound/TtsPlayer.java

@@ -2,6 +2,7 @@ package app.organicmaps.sound;
 
 import android.content.Context;
 import android.content.res.Resources;
+import android.media.AudioManager;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Looper;
@@ -11,6 +12,11 @@ import android.text.TextUtils;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+import androidx.core.content.ContextCompat;
+import androidx.media.AudioAttributesCompat;
+import androidx.media.AudioFocusRequestCompat;
+import androidx.media.AudioManagerCompat;
+
 import app.organicmaps.MwmApplication;
 import app.organicmaps.R;
 import app.organicmaps.util.Config;
@@ -47,7 +53,18 @@ public enum TtsPlayer
 
   private TextToSpeech mTts;
   private boolean mInitializing;
-  private AudioFocusManager mAudioFocusManager;
+
+  private final AudioFocusRequestCompat mAudioFocusRequest =
+    new AudioFocusRequestCompat.Builder(AudioManagerCompat.AUDIOFOCUS_GAIN_TRANSIENT_MAY_DUCK)
+      .setAudioAttributes(
+        new AudioAttributesCompat.Builder()
+          .setUsage(AudioAttributesCompat.USAGE_ASSISTANCE_NAVIGATION_GUIDANCE)
+          .setContentType(AudioAttributesCompat.CONTENT_TYPE_SPEECH)
+          .build()
+      )
+      .setOnAudioFocusChangeListener(focusChange -> {})
+      .build();
+  private AudioManager mAudioManager;
 
   private final Bundle mParams = new Bundle();
 
@@ -162,27 +179,27 @@ public enum TtsPlayer
       mTts.setOnUtteranceProgressListener(new UtteranceProgressListener() {
         @Override
         public void onStart(String utteranceId) {
-          mAudioFocusManager.requestAudioFocus();
+          AudioManagerCompat.requestAudioFocus(mAudioManager, mAudioFocusRequest);
         }
 
         @Override
         public void onDone(String utteranceId) {
-          mAudioFocusManager.releaseAudioFocus();
+          AudioManagerCompat.abandonAudioFocusRequest(mAudioManager, mAudioFocusRequest);
         }
 
         @Override
         @SuppressWarnings("deprecated") // abstract method must be implemented
         public void onError(String utteranceId)
         {
-          mAudioFocusManager.releaseAudioFocus();
+          AudioManagerCompat.abandonAudioFocusRequest(mAudioManager, mAudioFocusRequest);
         }
 
         @Override
         public void onError(String utteranceId, int errorCode) {
-          mAudioFocusManager.releaseAudioFocus();
+          AudioManagerCompat.abandonAudioFocusRequest(mAudioManager, mAudioFocusRequest);
         }
       });
-      mAudioFocusManager = new AudioFocusManager(context);
+      mAudioManager = ContextCompat.getSystemService(context, AudioManager.class);
       mParams.putFloat(TextToSpeech.Engine.KEY_PARAM_VOLUME, Config.TTS.getVolume());
       mInitializing = false;
     }));
@@ -198,11 +215,10 @@ public enum TtsPlayer
     if (Config.TTS.isEnabled())
       try
       {
-        boolean isMusicActive = mAudioFocusManager.requestAudioFocus();
+        final boolean isMusicActive = mAudioManager.isMusicActive();
-        if (isMusicActive)
+        AudioManagerCompat.requestAudioFocus(mAudioManager, mAudioFocusRequest);
-          delayHandler.postDelayed(() -> mTts.speak(textToSpeak, TextToSpeech.QUEUE_ADD, mParams, textToSpeak), TTS_SPEAK_DELAY_MILLIS);
+        final long delay = isMusicActive ? TTS_SPEAK_DELAY_MILLIS : 0;
-        else
+        delayHandler.postDelayed(() -> mTts.speak(textToSpeak, TextToSpeech.QUEUE_ADD, mParams, textToSpeak), delay);
-          mTts.speak(textToSpeak, TextToSpeech.QUEUE_ADD, mParams, textToSpeak);
       }
       catch (IllegalArgumentException e)
       {
@@ -222,7 +238,7 @@ public enum TtsPlayer
     if (isReady())
       try
       {
-        mAudioFocusManager.releaseAudioFocus();
+        AudioManagerCompat.abandonAudioFocusRequest(mAudioManager, mAudioFocusRequest);
         mTts.stop();
       }
       catch (IllegalArgumentException e)

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,14 @@ public final class UiUtils
     return context.getResources().getDimensionPixelSize(id);
   }
 
+  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 +372,9 @@ public final class UiUtils
     }
   }
 
-  @SuppressWarnings("deprecation") // https://github.com/organicmaps/organicmaps/issues/3630
+  public static void startActivityForResult(ActivityResultLauncher<Intent> startForResult, @NonNull Intent intent)
-  public static void startActivityForResult(@NonNull Fragment fragment, @NonNull Intent intent, int requestCode)
   {
-    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);
+      backgroundColor = getAttrColor(data, R.styleable.LanesView_lanesBackgroundColor, DefaultValues.BACKGROUND_COLOR);
-      mActiveLaneTintColor = getAttrColor(data, R.styleable.LanesView_activeLaneTintColor, DefaultValues.ACTIVE_LANE_TINT_COLOR);
+      mActiveLaneTintColor = getAttrColor(data, R.styleable.LanesView_lanesActiveLaneTintColor, DefaultValues.ACTIVE_LANE_TINT_COLOR);
-      mInactiveLaneTintColor = getAttrColor(data, R.styleable.LanesView_inactiveLaneTintColor, DefaultValues.INACTIVE_LANE_TINT_COLOR);
+      mInactiveLaneTintColor = getAttrColor(data, R.styleable.LanesView_lanesInactiveLaneTintColor, DefaultValues.INACTIVE_LANE_TINT_COLOR);
-      mCornerRadius = (int) Math.max(data.getDimension(R.styleable.LanesView_cornerRadius, DefaultValues.CORNER_RADIUS), 0.0f);
+      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)
+      if(activityResult.getResultCode() == Activity.RESULT_OK)
-    {
+      {
-      String result = InputUtils.getBestRecognitionResult(data);
+        if (activityResult.getData() == null)
-      if (!TextUtils.isEmpty(result))
+        {
-        setQuery(result);
+          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;
+  private int mSpeedLimit = 0;
-  @Nullable
+  @NonNull
-  private String mSpeedLimitStr;
+  private String mSpeedLimitStr = "0";
-
+  private boolean mAlert = false;
-  private double mCurrentSpeed;
 
   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);
+      mBackgroundColor = data.getColor(R.styleable.SpeedLimitView_speedLimitBackgroundColor, DefaultValues.BACKGROUND_COLOR);
-      mBorderColor = data.getColor(R.styleable.SpeedLimitView_borderColor, ContextCompat.getColor(context, R.color.base_red));
+      mBorderColor = data.getColor(R.styleable.SpeedLimitView_speedLimitBorderColor, DefaultValues.BORDER_COLOR);
-      mAlertColor = data.getColor(R.styleable.SpeedLimitView_alertColor, ContextCompat.getColor(context, R.color.base_red));
+      mAlertColor = data.getColor(R.styleable.SpeedLimitView_speedLimitAlertColor, DefaultValues.ALERT_COLOR);
-      mTextColor = data.getColor(R.styleable.SpeedLimitView_textColor, DefaultValues.TEXT_COLOR);
+      mTextColor = data.getColor(R.styleable.SpeedLimitView_speedLimitTextColor, DefaultValues.TEXT_COLOR);
-      mTextAlertColor = data.getColor(R.styleable.SpeedLimitView_textAlertColor, DefaultValues.TEXT_ALERT_COLOR);
+      mTextAlertColor = data.getColor(R.styleable.SpeedLimitView_speedLimitTextAlertColor, DefaultValues.TEXT_ALERT_COLOR);
       if (isInEditMode())
       {
-        mSpeedLimitMps = data.getInt(R.styleable.SpeedLimitView_editModeSpeedLimit, -1);
+        mSpeedLimit = data.getInt(R.styleable.SpeedLimitView_speedLimitEditModeSpeedLimit, 60);
-        mSpeedLimitStr = mSpeedLimitMps > 0 ? String.valueOf(((int) mSpeedLimitMps)) : null;
+        mSpeedLimitStr = Integer.toString(mSpeedLimit);
-        mCurrentSpeed = data.getInt(R.styleable.SpeedLimitView_editModeCurrentSpeed, -1);
+        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)
+    final boolean speedLimitChanged = mSpeedLimit != speedLimit;
-      return;
 
-    mSpeedLimitMps = speedLimitMps;
+    mSpeedLimit = speedLimit;
-    if (mSpeedLimitMps <= 0)
+    mAlert = alert;
+
+    if (speedLimitChanged)
     {
-      mSpeedLimitStr = null;
+      mSpeedLimitStr = Integer.toString(mSpeedLimit);
-      setVisibility(GONE);
+      configureTextSize();
-      return;
     }
 
-    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);
+    drawSign(canvas, cx, cy, mAlert);
-    drawText(canvas, cx, cy, alert);
+    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/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_my_location_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_my_position_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_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>

android/app/src/main/res/drawable/route_point_03.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="m12.86,11.984h0.902q0.645,0 0.955,-0.322 0.311,-0.322 0.311,-0.855 0,-0.516 -0.311,-0.803 -0.305,-0.287 -0.844,-0.287 -0.486,0 -0.814,0.27 -0.328,0.264 -0.328,0.691h-1.693q0,-0.668 0.357,-1.195 0.363,-0.533 1.008,-0.832 0.65,-0.299 1.43,-0.299 1.354,0 2.121,0.65 0.768,0.645 0.768,1.781 0,0.586 -0.357,1.078 -0.357,0.492 -0.938,0.756 0.721,0.258 1.072,0.773 0.357,0.516 0.357,1.219 0,1.137 -0.832,1.822 -0.826,0.686 -2.191,0.686 -1.277,0 -2.092,-0.674 -0.809,-0.674 -0.809,-1.781h1.693q0,0.48 0.357,0.785 0.363,0.305 0.891,0.305 0.604,0 0.943,-0.316 0.346,-0.322 0.346,-0.85 0,-1.277 -1.406,-1.277h-0.896z"
+      android:fillColor="#fff"/>
+</vector>

android/app/src/main/res/drawable/route_point_04.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.147,13.789h0.967v1.365h-0.967v1.846h-1.693v-1.846h-3.498l-0.076,-1.066 3.557,-5.619h1.711zM12.567,13.789h1.887v-3.012l-0.111,0.193z"
+      android:fillColor="#fff"/>
+</vector>

android/app/src/main/res/drawable/route_point_05.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="m11.39,12.805 l0.492,-4.336h4.781v1.412h-3.393l-0.211,1.834q0.604,-0.322 1.283,-0.322 1.219,0 1.91,0.756 0.691,0.756 0.691,2.115 0,0.826 -0.352,1.482 -0.346,0.65 -0.996,1.014 -0.65,0.357 -1.535,0.357 -0.773,0 -1.436,-0.311 -0.662,-0.316 -1.049,-0.885 -0.381,-0.568 -0.404,-1.295h1.676q0.053,0.533 0.369,0.832 0.322,0.293 0.838,0.293 0.574,0 0.885,-0.41 0.311,-0.416 0.311,-1.172 0,-0.727 -0.357,-1.113 -0.357,-0.387 -1.014,-0.387 -0.604,0 -0.979,0.316l-0.164,0.152z"
+      android:fillColor="#fff"/>
+</vector>

android/app/src/main/res/drawable/route_point_06.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.731,8.381v1.395h-0.164q-1.148,0.018 -1.852,0.598 -0.697,0.58 -0.838,1.611 0.68,-0.691 1.717,-0.691 1.113,0 1.77,0.797t0.656,2.098q0,0.832 -0.363,1.506 -0.357,0.674 -1.02,1.049 -0.656,0.375 -1.488,0.375 -1.348,0 -2.18,-0.938 -0.826,-0.938 -0.826,-2.502v-0.609q0,-1.389 0.521,-2.449 0.527,-1.066 1.506,-1.646 0.984,-0.586 2.279,-0.592zM14.079,12.652q-0.41,0 -0.744,0.217 -0.334,0.211 -0.492,0.563v0.516q0,0.85 0.334,1.33 0.334,0.475 0.938,0.475 0.545,0 0.879,-0.428 0.34,-0.434 0.34,-1.119 0,-0.697 -0.34,-1.125 -0.34,-0.428 -0.914,-0.428z"
+      android:fillColor="#fff"/>
+</vector>

android/app/src/main/res/drawable/route_point_07.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.938,9.418 l-3.299,7.582h-1.787l3.305,-7.16h-4.242v-1.371h6.023z"
+      android:fillColor="#fff"/>
+</vector>

android/app/src/main/res/drawable/route_point_08.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.698,10.736q0,0.621 -0.311,1.102 -0.311,0.48 -0.855,0.768 0.621,0.299 0.984,0.826 0.363,0.521 0.363,1.23 0,1.137 -0.773,1.799 -0.773,0.656 -2.103,0.656t-2.109,-0.662 -0.779,-1.793q0,-0.709 0.363,-1.236 0.363,-0.527 0.979,-0.82 -0.545,-0.287 -0.855,-0.768 -0.305,-0.48 -0.305,-1.102 0,-1.09 0.727,-1.734 0.727,-0.65 1.975,-0.65 1.242,0 1.969,0.645 0.732,0.639 0.732,1.74zM15.18,14.539q0,-0.557 -0.322,-0.891 -0.322,-0.334 -0.867,-0.334 -0.539,0 -0.861,0.334 -0.322,0.328 -0.322,0.891 0,0.545 0.316,0.879 0.316,0.334 0.879,0.334 0.551,0 0.861,-0.322 0.316,-0.322 0.316,-0.891zM15.005,10.818q0,-0.498 -0.264,-0.797 -0.264,-0.305 -0.744,-0.305 -0.475,0 -0.738,0.293 -0.264,0.293 -0.264,0.809 0,0.51 0.264,0.82t0.744,0.311q0.48,0 0.738,-0.311 0.264,-0.311 0.264,-0.82z"
+      android:fillColor="#fff"/>
+</vector>

android/app/src/main/res/drawable/route_point_09.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.099,13.59q-0.662,0.65 -1.547,0.65 -1.131,0 -1.811,-0.773 -0.68,-0.779 -0.68,-2.098 0,-0.838 0.363,-1.535 0.369,-0.703 1.025,-1.09 0.656,-0.393 1.477,-0.393 0.844,0 1.5,0.422t1.02,1.213q0.363,0.791 0.369,1.811v0.627q0,2.133 -1.061,3.352t-3.006,1.301l-0.416,0.006v-1.412l0.375,-0.006q2.209,-0.1 2.391,-2.074zM13.968,12.945q0.41,0 0.703,-0.211 0.299,-0.211 0.451,-0.51v-0.697q0,-0.861 -0.328,-1.336 -0.328,-0.475 -0.879,-0.475 -0.51,0 -0.838,0.469 -0.328,0.463 -0.328,1.166 0,0.697 0.316,1.148 0.322,0.445 0.902,0.445z"
+      android:fillColor="#fff"/>
+</vector>

android/app/src/main/res/drawable/route_point_10.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="m11.809,17h-1.693v-6.527l-2.022,0.627v-1.377l3.533,-1.266h0.182zM20.323,13.473q0,1.77 -0.732,2.707 -0.732,0.938 -2.145,0.938 -1.395,0 -2.133,-0.92 -0.738,-0.92 -0.756,-2.637v-1.57q0,-1.787 0.738,-2.713 0.744,-0.926 2.139,-0.926 1.395,0 2.133,0.92 0.738,0.914 0.756,2.631zM18.629,11.75q0,-1.061 -0.293,-1.541 -0.287,-0.486 -0.902,-0.486 -0.598,0 -0.885,0.463 -0.281,0.457 -0.299,1.436v2.074q0,1.043 0.281,1.553 0.287,0.504 0.914,0.504 0.621,0 0.896,-0.486 0.275,-0.486 0.287,-1.488z"
+      android:fillColor="#fff"/>
+</vector>

android/app/src/main/res/drawable/route_point_11.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="m11.809,17h-1.693v-6.527l-2.022,0.627v-1.377l3.533,-1.266h0.182zM18.694,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_12.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="m11.809,17h-1.693v-6.527l-2.022,0.627v-1.377l3.533,-1.266h0.182zM20.428,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>

android/app/src/main/res/drawable/route_point_13.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="m11.809,17h-1.693v-6.527l-2.022,0.627v-1.377l3.533,-1.266h0.182zM16.303,11.984h0.902q0.645,0 0.955,-0.322 0.311,-0.322 0.311,-0.855 0,-0.516 -0.311,-0.803 -0.305,-0.287 -0.844,-0.287 -0.486,0 -0.814,0.27 -0.328,0.264 -0.328,0.691h-1.693q0,-0.668 0.357,-1.195 0.363,-0.533 1.008,-0.832 0.65,-0.299 1.43,-0.299 1.354,0 2.121,0.65 0.768,0.645 0.768,1.781 0,0.586 -0.357,1.078 -0.357,0.492 -0.938,0.756 0.721,0.258 1.072,0.773 0.357,0.516 0.357,1.219 0,1.137 -0.832,1.822 -0.826,0.686 -2.191,0.686 -1.277,0 -2.092,-0.674 -0.809,-0.674 -0.809,-1.781h1.693q0,0.48 0.357,0.785 0.363,0.305 0.891,0.305 0.604,0 0.943,-0.316 0.346,-0.322 0.346,-0.85 0,-1.277 -1.406,-1.277h-0.896z"
+      android:fillColor="#fff"/>
+</vector>

android/app/src/main/res/drawable/route_point_14.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="m11.809,17h-1.693v-6.527l-2.022,0.627v-1.377l3.533,-1.266h0.182zM19.59,13.789h0.967v1.365h-0.967v1.846h-1.693v-1.846h-3.498l-0.076,-1.066 3.557,-5.619h1.711zM16.01,13.789h1.887v-3.012l-0.111,0.193z"
+      android:fillColor="#fff"/>
+</vector>

android/app/src/main/res/drawable/route_point_15.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="m11.809,17h-1.693v-6.527l-2.022,0.627v-1.377l3.533,-1.266h0.182zM14.832,12.805 L15.325,8.469h4.781v1.412h-3.393l-0.211,1.834q0.604,-0.322 1.283,-0.322 1.219,0 1.91,0.756 0.691,0.756 0.691,2.115 0,0.826 -0.352,1.482 -0.346,0.65 -0.996,1.014 -0.65,0.357 -1.535,0.357 -0.773,0 -1.436,-0.311 -0.662,-0.316 -1.049,-0.885 -0.381,-0.568 -0.404,-1.295h1.676q0.053,0.533 0.369,0.832 0.322,0.293 0.838,0.293 0.574,0 0.885,-0.41 0.311,-0.416 0.311,-1.172 0,-0.727 -0.357,-1.113 -0.357,-0.387 -1.014,-0.387 -0.604,0 -0.979,0.316l-0.164,0.152z"
+      android:fillColor="#fff"/>
+</vector>

android/app/src/main/res/drawable/route_point_16.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="m11.809,17h-1.693v-6.527l-2.022,0.627v-1.377l3.533,-1.266h0.182zM19.174,8.381v1.395h-0.164q-1.148,0.018 -1.852,0.598 -0.697,0.58 -0.838,1.611 0.68,-0.691 1.717,-0.691 1.113,0 1.77,0.797t0.656,2.098q0,0.832 -0.363,1.506 -0.357,0.674 -1.02,1.049 -0.656,0.375 -1.488,0.375 -1.348,0 -2.18,-0.938 -0.826,-0.938 -0.826,-2.502v-0.609q0,-1.389 0.521,-2.449 0.527,-1.066 1.506,-1.646 0.984,-0.586 2.279,-0.592zM17.522,12.652q-0.41,0 -0.744,0.217 -0.334,0.211 -0.492,0.563v0.516q0,0.85 0.334,1.33 0.334,0.475 0.938,0.475 0.545,0 0.879,-0.428 0.34,-0.434 0.34,-1.119 0,-0.697 -0.34,-1.125 -0.34,-0.428 -0.914,-0.428z"
+      android:fillColor="#fff"/>
+</vector>

android/app/src/main/res/drawable/route_point_17.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="m11.809,17h-1.693v-6.527l-2.022,0.627v-1.377l3.533,-1.266h0.182zM20.381,9.418 L17.083,17h-1.787l3.305,-7.16h-4.242v-1.371h6.023z"
+      android:fillColor="#fff"/>
+</vector>

android/app/src/main/res/drawable/route_point_18.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="m11.809,17h-1.693v-6.527l-2.022,0.627v-1.377l3.533,-1.266h0.182zM20.141,10.736q0,0.621 -0.311,1.102 -0.311,0.48 -0.855,0.768 0.621,0.299 0.984,0.826 0.363,0.521 0.363,1.23 0,1.137 -0.773,1.799 -0.773,0.656 -2.103,0.656 -1.33,0 -2.109,-0.662 -0.779,-0.662 -0.779,-1.793 0,-0.709 0.363,-1.236 0.363,-0.527 0.979,-0.82 -0.545,-0.287 -0.855,-0.768 -0.305,-0.48 -0.305,-1.102 0,-1.09 0.727,-1.734 0.727,-0.65 1.975,-0.65 1.242,0 1.969,0.645 0.732,0.639 0.732,1.74zM18.623,14.539q0,-0.557 -0.322,-0.891 -0.322,-0.334 -0.867,-0.334 -0.539,0 -0.861,0.334 -0.322,0.328 -0.322,0.891 0,0.545 0.316,0.879 0.316,0.334 0.879,0.334 0.551,0 0.861,-0.322 0.316,-0.322 0.316,-0.891zM18.448,10.818q0,-0.498 -0.264,-0.797 -0.264,-0.305 -0.744,-0.305 -0.475,0 -0.738,0.293 -0.264,0.293 -0.264,0.809 0,0.51 0.264,0.82t0.744,0.311q0.48,0 0.738,-0.311 0.264,-0.311 0.264,-0.82z"
+      android:fillColor="#fff"/>
+</vector>

android/app/src/main/res/drawable/route_point_19.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="m11.809,17h-1.693v-6.527l-2.022,0.627v-1.377l3.533,-1.266h0.182zM18.541,13.59q-0.662,0.65 -1.547,0.65 -1.131,0 -1.811,-0.773 -0.68,-0.779 -0.68,-2.098 0,-0.838 0.363,-1.535 0.369,-0.703 1.025,-1.09 0.656,-0.393 1.477,-0.393 0.844,0 1.5,0.422t1.02,1.213q0.363,0.791 0.369,1.811v0.627q0,2.133 -1.061,3.352 -1.061,1.219 -3.006,1.301l-0.416,0.006v-1.412l0.375,-0.006q2.209,-0.1 2.391,-2.074zM17.411,12.945q0.41,0 0.703,-0.211 0.299,-0.211 0.451,-0.51v-0.697q0,-0.861 -0.328,-1.336 -0.328,-0.475 -0.879,-0.475 -0.51,0 -0.838,0.469 -0.328,0.463 -0.328,1.166 0,0.697 0.316,1.148 0.322,0.445 0.902,0.445z"
+      android:fillColor="#fff"/>
+</vector>

android/app/src/main/res/drawable/route_point_20.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="m8.598,16.168q0,-0.404 0.27,-0.656 0.275,-0.252 0.686,-0.252 0.416,0 0.686,0.252 0.275,0.252 0.275,0.656 0,0.398 -0.27,0.65 -0.27,0.246 -0.691,0.246 -0.416,0 -0.686,-0.246 -0.27,-0.252 -0.27,-0.65zM8.598,11.369q0,-0.404 0.27,-0.656 0.275,-0.252 0.686,-0.252 0.416,0 0.686,0.252 0.275,0.252 0.275,0.656 0,0.398 -0.27,0.65 -0.27,0.246 -0.691,0.246 -0.416,0 -0.686,-0.246 -0.27,-0.252 -0.27,-0.65zM15.195,14.029h-3.299v-1.365h3.299zM19.473,13.666q0,1.324 -0.381,2.549 -0.381,1.225 -1.096,2.162 -0.715,0.938 -1.529,1.289l-0.328,-0.896q0.832,-0.627 1.313,-1.934 0.48,-1.307 0.498,-3.006v-0.311q0,-1.752 -0.48,-3.088 -0.475,-1.336 -1.33,-2.004l0.328,-0.896q0.797,0.346 1.5,1.254 0.709,0.908 1.096,2.115 0.393,1.207 0.41,2.502z"
+      android:fillColor="#fff"/>
+</vector>

android/app/src/main/res/layout-h400dp-land/map_buttons_layout_navigation.xml

@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout
+  xmlns:android="http://schemas.android.com/apk/res/android"
+  xmlns:app="http://schemas.android.com/apk/res-auto"
+  xmlns:tools="http://schemas.android.com/tools"
+  android:layout_width="match_parent"
+  android:layout_height="match_parent"
+  android:clipChildren="false"
+  android:clipToPadding="false"
+  tools:background="@color/bg_primary">
+  <View
+    android:id="@+id/touch_interceptor"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:visibility="gone"
+    tools:visibility="visible" />
+  <androidx.constraintlayout.widget.ConstraintLayout
+    android:id="@+id/map_buttons_inner_left"
+    android:layout_width="wrap_content"
+    android:layout_height="match_parent"
+    android:layout_marginTop="@dimen/map_buttons_bottom_margin"
+    android:layout_marginBottom="@dimen/map_buttons_bottom_margin"
+    android:clipChildren="false"
+    android:clipToPadding="false"
+    android:padding="@dimen/nav_frame_padding"
+    app:layout_constraintBottom_toBottomOf="parent"
+    app:layout_constraintStart_toStartOf="parent">
+    <include
+      layout="@layout/map_buttons_bookmarks"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:layout_alignParentBottom="true"
+      app:layout_constraintBottom_toBottomOf="parent"
+      app:layout_constraintStart_toStartOf="parent" />
+    <include
+      layout="@layout/map_buttons_search_frame"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:layout_alignParentBottom="true"
+      app:layout_constraintBottom_toBottomOf="@+id/btn_search"
+      app:layout_constraintStart_toStartOf="parent"
+      app:layout_constraintTop_toTopOf="@+id/btn_search" />
+    <include
+      layout="@layout/map_buttons_search"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:layout_alignParentBottom="true"
+      android:layout_marginBottom="@dimen/margin_half"
+      app:layout_constraintBottom_toTopOf="@+id/btn_bookmarks"
+      app:layout_constraintStart_toStartOf="parent" />
+  </androidx.constraintlayout.widget.ConstraintLayout>
+  <include
+    layout="@layout/map_status_track_recording"
+    android:layout_margin="@dimen/nav_frame_padding"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    app:layout_constraintRight_toRightOf="parent"
+    app:layout_constraintTop_toTopOf="parent" />
+  <androidx.constraintlayout.widget.ConstraintLayout
+    android:id="@+id/map_buttons_inner_right"
+    android:layout_width="wrap_content"
+    android:layout_height="match_parent"
+    android:layout_marginTop="@dimen/action_bar_extended_height"
+    android:clipChildren="false"
+    android:clipToPadding="false"
+    android:padding="@dimen/nav_frame_padding"
+    app:layout_constraintBottom_toBottomOf="parent"
+    app:layout_constraintEnd_toEndOf="parent">
+    <include
+      layout="@layout/map_buttons_zoom"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:layout_alignParentBottom="true"
+      android:layout_marginTop="8dp"
+      android:layout_marginBottom="@dimen/zoom_buttons_margin"
+      app:layout_constraintBottom_toTopOf="@+id/my_position"
+      app:layout_constraintEnd_toEndOf="parent" />
+    <include
+      layout="@layout/map_buttons_myposition"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:layout_alignParentBottom="true"
+      app:layout_constraintBottom_toBottomOf="parent"
+      app:layout_constraintEnd_toEndOf="parent" />
+  </androidx.constraintlayout.widget.ConstraintLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>

android/app/src/main/res/layout-h400dp-land/map_buttons_layout_planning.xml

@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout
+  xmlns:android="http://schemas.android.com/apk/res/android"
+  xmlns:app="http://schemas.android.com/apk/res-auto"
+  xmlns:tools="http://schemas.android.com/tools"
+  android:layout_width="match_parent"
+  android:layout_height="match_parent"
+  android:clipChildren="false"
+  android:clipToPadding="false"
+  tools:background="@color/bg_primary">
+  <androidx.constraintlayout.widget.ConstraintLayout
+    android:id="@+id/map_buttons_inner_left"
+    android:layout_width="wrap_content"
+    android:layout_height="match_parent"
+    android:layout_marginTop="@dimen/map_buttons_bottom_margin"
+    android:layout_marginBottom="@dimen/map_buttons_bottom_margin"
+    android:clipChildren="false"
+    android:clipToPadding="false"
+    android:padding="@dimen/nav_frame_padding"
+    app:layout_constraintStart_toStartOf="parent">
+    <include
+      layout="@layout/map_buttons_bookmarks"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:layout_alignParentBottom="true"
+      app:layout_constraintBottom_toBottomOf="parent"
+      app:layout_constraintStart_toStartOf="parent" />
+    <include
+      layout="@layout/map_buttons_search"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:layout_alignParentBottom="true"
+      android:layout_marginBottom="@dimen/margin_half"
+      app:layout_constraintBottom_toTopOf="@+id/btn_bookmarks"
+      app:layout_constraintStart_toStartOf="parent" />
+  </androidx.constraintlayout.widget.ConstraintLayout>
+  <androidx.constraintlayout.widget.ConstraintLayout
+    android:id="@+id/map_buttons_inner_right"
+    android:layout_width="wrap_content"
+    android:layout_height="match_parent"
+    android:layout_marginTop="@dimen/map_buttons_bottom_margin"
+    android:layout_marginBottom="@dimen/map_buttons_bottom_margin"
+    android:clipChildren="false"
+    android:clipToPadding="false"
+    android:padding="@dimen/nav_frame_padding"
+    app:layout_constraintEnd_toEndOf="parent">
+    <include
+      layout="@layout/map_buttons_zoom"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:layout_alignParentBottom="true"
+      android:layout_marginBottom="@dimen/zoom_buttons_margin"
+      app:layout_constraintBottom_toTopOf="@+id/my_position"
+      app:layout_constraintEnd_toEndOf="parent" />
+    <include
+      layout="@layout/map_buttons_myposition"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:layout_alignParentBottom="true"
+      app:layout_constraintBottom_toBottomOf="parent"
+      app:layout_constraintEnd_toEndOf="parent" />
+  </androidx.constraintlayout.widget.ConstraintLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>

android/app/src/main/res/layout-h400dp-land/map_buttons_layout_regular.xml

@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout
+  xmlns:android="http://schemas.android.com/apk/res/android"
+  xmlns:app="http://schemas.android.com/apk/res-auto"
+  xmlns:tools="http://schemas.android.com/tools"
+  android:layout_width="match_parent"
+  android:layout_height="match_parent"
+  android:clipChildren="false"
+  android:clipToPadding="false"
+  tools:background="@color/bg_primary">
+  <androidx.constraintlayout.widget.ConstraintLayout
+    android:id="@+id/map_buttons_top"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:layout_alignParentLeft="true"
+    android:layout_alignParentTop="true"
+    android:clipChildren="false"
+    android:clipToPadding="false"
+    android:padding="@dimen/nav_frame_padding">
+    <include
+      layout="@layout/map_buttons_layers"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:layout_alignParentBottom="true"
+      app:layout_constraintStart_toStartOf="parent"
+      app:layout_constraintTop_toTopOf="parent" />
+  </androidx.constraintlayout.widget.ConstraintLayout>
+  <include
+    layout="@layout/map_status_track_recording"
+    android:layout_margin="@dimen/nav_frame_padding"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:layout_alignParentTop="true"
+    android:layout_alignParentEnd="true" />
+  <androidx.constraintlayout.widget.ConstraintLayout
+    android:id="@+id/map_buttons_inner_right"
+    android:layout_width="wrap_content"
+    android:layout_height="match_parent"
+    android:layout_alignParentEnd="true"
+    android:layout_below="@+id/map_buttons_top"
+    android:clipChildren="false"
+    android:clipToPadding="false"
+    android:padding="@dimen/nav_frame_padding">
+    <include
+      layout="@layout/map_buttons_zoom"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      app:layout_constraintBottom_toTopOf="@+id/my_position"
+      android:layout_marginBottom="@dimen/zoom_buttons_margin"
+      app:layout_constraintEnd_toEndOf="parent" />
+    <include
+      layout="@layout/map_buttons_myposition"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:layout_alignParentBottom="true"
+      app:layout_constraintBottom_toBottomOf="parent"
+      app:layout_constraintEnd_toEndOf="parent" />
+  </androidx.constraintlayout.widget.ConstraintLayout>
+  <include
+    layout="@layout/map_buttons_bottom"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_alignParentBottom="true"
+    android:layout_alignParentStart="true" />
+</RelativeLayout>

android/app/src/main/res/layout-h400dp/map_buttons_layout_navigation.xml

@@ -49,6 +49,13 @@
       app:layout_constraintBottom_toTopOf="@+id/btn_bookmarks"
       app:layout_constraintStart_toStartOf="parent" />
   </androidx.constraintlayout.widget.ConstraintLayout>
+  <include
+    layout="@layout/map_status_track_recording"
+    android:layout_margin="@dimen/nav_frame_padding"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    app:layout_constraintRight_toRightOf="parent"
+    app:layout_constraintTop_toTopOf="parent" />
   <androidx.constraintlayout.widget.ConstraintLayout
     android:id="@+id/map_buttons_inner_right"
     android:layout_width="wrap_content"

android/app/src/main/res/layout-h400dp/map_buttons_layout_planning.xml

@@ -34,6 +34,14 @@
       app:layout_constraintBottom_toTopOf="@+id/btn_bookmarks"
       app:layout_constraintStart_toStartOf="parent" />
   </androidx.constraintlayout.widget.ConstraintLayout>
+  <include
+    layout="@layout/map_status_track_recording"
+    android:layout_marginTop="@dimen/track_recorder_status_top_margin"
+    android:layout_marginHorizontal="@dimen/nav_frame_padding"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    app:layout_constraintRight_toRightOf="parent"
+    app:layout_constraintTop_toTopOf="parent" />
   <androidx.constraintlayout.widget.ConstraintLayout
     android:id="@+id/map_buttons_inner_right"
     android:layout_width="wrap_content"

android/app/src/main/res/layout-h400dp/map_buttons_layout_regular.xml

@@ -25,6 +25,13 @@
       app:layout_constraintStart_toStartOf="parent"
       app:layout_constraintTop_toTopOf="parent" />
   </androidx.constraintlayout.widget.ConstraintLayout>
+  <include
+    layout="@layout/map_status_track_recording"
+    android:layout_margin="@dimen/nav_frame_padding"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:layout_alignParentTop="true"
+    android:layout_alignParentEnd="true" />
   <androidx.constraintlayout.widget.ConstraintLayout
     android:id="@+id/map_buttons_inner_right"
     android:layout_width="wrap_content"

android/app/src/main/res/layout-land/altitude_chart_panel.xml

@@ -63,6 +63,16 @@
       tools:text="5 h 55 min • 1555km"
       tools:visibility="visible" />
 
+    <Button
+      android:id="@+id/btn__manage_route"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:layout_marginStart="6dp"
+      style="@style/MwmWidget.Button"
+      android:text="@string/planning_route_manage_route"
+      android:drawableStart="@drawable/ic_manage_route"
+      android:drawablePadding="6dp"/>
+
     <Button
       android:id="@+id/start"
       style="@style/MwmWidget.Button.Primary"

android/app/src/main/res/layout-land/layout_nav_top.xml

@@ -116,20 +116,19 @@
       app:layout_constraintStart_toEndOf="@+id/nav_speed_limit"
       app:layout_constraintEnd_toEndOf="parent"
       app:layout_constraintTop_toBottomOf="@id/street_frame"
-      app:activeLaneTintColor="?navLaneArrowActiveColor"
+      app:lanesActiveLaneTintColor="?navLaneArrowActiveColor"
-      app:inactiveLaneTintColor="?navLaneArrowInactiveColor"
+      app:lanesInactiveLaneTintColor="?navLaneArrowInactiveColor"
-      app:backgroundColor="?colorAccent"
+      app:lanesBackgroundColor="?colorAccent"
-      app:cornerRadius="@dimen/margin_quarter"
+      app:lanesCornerRadius="@dimen/margin_quarter"
-      app:editModeLanesCount="10"
+      app:lanesEditModeLanesCount="10"
       tools:visibility="visible" />
 
   <app.organicmaps.widget.SpeedLimitView
     android:id="@+id/nav_speed_limit"
+    style="@style/MwmWidget.SpeedLimit"
     android:layout_width="60dp"
     android:layout_height="60dp"
     android:layout_margin="@dimen/margin_half"
-    app:editModeCurrentSpeed="90"
-    app:editModeSpeedLimit="120"
     app:layout_constraintStart_toEndOf="@id/nav_next_turn_container"
     app:layout_constraintTop_toBottomOf="@id/street_frame" />
 </androidx.constraintlayout.widget.ConstraintLayout>

android/app/src/main/res/layout-land/map_buttons_layout_navigation.xml

@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout
+  xmlns:android="http://schemas.android.com/apk/res/android"
+  xmlns:app="http://schemas.android.com/apk/res-auto"
+  xmlns:tools="http://schemas.android.com/tools"
+  android:layout_width="match_parent"
+  android:layout_height="match_parent"
+  android:clipChildren="false"
+  android:clipToPadding="false"
+  tools:background="@color/bg_primary">
+  <View
+    android:id="@+id/touch_interceptor"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:visibility="gone"
+    tools:visibility="visible" />
+  <androidx.constraintlayout.widget.ConstraintLayout
+    android:id="@+id/map_buttons_inner_left"
+    android:layout_width="wrap_content"
+    android:layout_height="match_parent"
+    android:layout_marginTop="@dimen/action_bar_extended_height"
+    android:layout_marginBottom="@dimen/nav_menu_height"
+    android:clipChildren="false"
+    android:clipToPadding="false"
+    android:padding="@dimen/nav_frame_padding"
+    app:layout_constraintBottom_toBottomOf="parent"
+    app:layout_constraintStart_toStartOf="parent">
+    <include
+      layout="@layout/map_buttons_bookmarks"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:layout_alignParentBottom="true"
+      android:layout_marginStart="@dimen/margin_half"
+      app:layout_constraintBottom_toBottomOf="parent"
+      app:layout_constraintStart_toEndOf="@+id/btn_search" />
+    <include
+      layout="@layout/map_buttons_search_frame"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:layout_alignParentBottom="true"
+      app:layout_constraintBottom_toBottomOf="@+id/btn_search"
+      app:layout_constraintStart_toStartOf="parent"
+      app:layout_constraintTop_toTopOf="@+id/btn_search" />
+    <include
+      layout="@layout/map_buttons_search"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:layout_alignParentBottom="true"
+      app:layout_constraintBottom_toBottomOf="parent"
+      app:layout_constraintStart_toStartOf="parent" />
+  </androidx.constraintlayout.widget.ConstraintLayout>
+  <include
+    layout="@layout/map_status_track_recording"
+    android:layout_margin="@dimen/nav_frame_padding"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    app:layout_constraintRight_toRightOf="parent"
+    app:layout_constraintTop_toTopOf="parent" />
+  <androidx.constraintlayout.widget.ConstraintLayout
+    android:id="@+id/map_buttons_inner_right"
+    android:layout_width="wrap_content"
+    android:layout_height="match_parent"
+    android:layout_marginTop="@dimen/action_bar_extended_height"
+    android:clipChildren="false"
+    android:clipToPadding="false"
+    android:padding="@dimen/nav_frame_padding"
+    app:layout_constraintBottom_toBottomOf="parent"
+    app:layout_constraintEnd_toEndOf="parent">
+    <include
+      layout="@layout/map_buttons_zoom"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:layout_alignParentBottom="true"
+      android:layout_marginBottom="@dimen/margin_half"
+      app:layout_constraintBottom_toTopOf="@+id/my_position"
+      app:layout_constraintEnd_toEndOf="parent" />
+    <include
+      layout="@layout/map_buttons_myposition"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:layout_alignParentBottom="true"
+      app:layout_constraintBottom_toBottomOf="parent"
+      app:layout_constraintEnd_toEndOf="parent" />
+  </androidx.constraintlayout.widget.ConstraintLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>

android/app/src/main/res/layout-land/map_buttons_layout_regular.xml

@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout
+  xmlns:android="http://schemas.android.com/apk/res/android"
+  xmlns:app="http://schemas.android.com/apk/res-auto"
+  xmlns:tools="http://schemas.android.com/tools"
+  android:layout_width="match_parent"
+  android:layout_height="match_parent"
+  android:clipChildren="false"
+  android:clipToPadding="false"
+  tools:background="@color/bg_primary">
+  <androidx.constraintlayout.widget.ConstraintLayout
+    android:id="@+id/map_buttons_top"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:layout_alignParentLeft="true"
+    android:layout_alignParentTop="true"
+    android:clipChildren="false"
+    android:clipToPadding="false"
+    android:padding="@dimen/nav_frame_padding">
+    <include
+      layout="@layout/map_buttons_layers"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:layout_alignParentBottom="true"
+      app:layout_constraintStart_toStartOf="parent"
+      app:layout_constraintTop_toTopOf="parent" />
+  </androidx.constraintlayout.widget.ConstraintLayout>
+  <include
+    layout="@layout/map_status_track_recording"
+    android:layout_margin="@dimen/nav_frame_padding"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:layout_alignParentTop="true"
+    android:layout_alignParentEnd="true" />
+  <androidx.constraintlayout.widget.ConstraintLayout
+    android:id="@+id/map_buttons_inner_right"
+    android:layout_width="wrap_content"
+    android:layout_height="match_parent"
+    android:layout_alignParentEnd="true"
+    android:layout_below="@+id/map_buttons_top"
+    android:clipChildren="false"
+    android:clipToPadding="false"
+    android:padding="@dimen/nav_frame_padding">
+    <include
+      layout="@layout/map_buttons_zoom"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      app:layout_constraintBottom_toTopOf="@+id/my_position"
+      android:layout_marginBottom="@dimen/margin_half"
+      app:layout_constraintEnd_toEndOf="parent" />
+    <include
+      layout="@layout/map_buttons_myposition"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:layout_alignParentBottom="true"
+      app:layout_constraintBottom_toBottomOf="parent"
+      app:layout_constraintEnd_toEndOf="parent" />
+  </androidx.constraintlayout.widget.ConstraintLayout>
+  <include
+    layout="@layout/map_buttons_bottom"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_alignParentBottom="true"
+    android:layout_alignParentStart="true" />
+</RelativeLayout>

android/app/src/main/res/layout-w1020dp-land/altitude_chart_panel.xml

@@ -82,6 +82,16 @@
       android:layout_weight="10"
       android:layout_gravity="center_vertical" />
 
+    <Button
+      android:id="@+id/btn__manage_route"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:layout_marginStart="6dp"
+      style="@style/MwmWidget.Button"
+      android:text="@string/planning_route_manage_route"
+      android:drawableStart="@drawable/ic_manage_route"
+      android:drawablePadding="6dp"/>
+
     <Button
       android:id="@+id/start"
       style="@style/MwmWidget.Button.Primary"

android/app/src/main/res/layout/altitude_chart_panel.xml

@@ -82,4 +82,14 @@
           tools:showIn="@layout/menu_route_plan_line"
           android:layout_gravity="center_vertical" />
     </LinearLayout>
+
+    <Button
+      android:id="@+id/btn__manage_route"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      style="@style/MwmWidget.Button"
+      android:text="@string/planning_route_manage_route"
+      android:drawableStart="@drawable/ic_manage_route"
+      android:drawablePadding="6dp"/>
+
 </LinearLayout>

android/app/src/main/res/layout/layout_nav_top.xml

@@ -117,20 +117,19 @@
       app:layout_constraintEnd_toEndOf="parent"
       app:layout_constraintStart_toEndOf="@id/nav_next_turn_container"
       app:layout_constraintTop_toBottomOf="@id/street_frame"
-      app:activeLaneTintColor="?navLaneArrowActiveColor"
+      app:lanesActiveLaneTintColor="?navLaneArrowActiveColor"
-      app:inactiveLaneTintColor="?navLaneArrowInactiveColor"
+      app:lanesInactiveLaneTintColor="?navLaneArrowInactiveColor"
-      app:backgroundColor="?navLanesBackgroundColor"
+      app:lanesBackgroundColor="?navLanesBackgroundColor"
-      app:cornerRadius="@dimen/margin_quarter"
+      app:lanesCornerRadius="@dimen/margin_quarter"
-      app:editModeLanesCount="5"
+      app:lanesEditModeLanesCount="5"
       tools:visibility="visible" />
 
   <app.organicmaps.widget.SpeedLimitView
     android:id="@+id/nav_speed_limit"
+    style="@style/MwmWidget.SpeedLimit"
     android:layout_width="60dp"
     android:layout_height="60dp"
     android:layout_margin="@dimen/margin_half"
-    app:editModeCurrentSpeed="90"
-    app:editModeSpeedLimit="120"
     app:layout_constraintEnd_toEndOf="@id/nav_next_turn_container"
     app:layout_constraintStart_toStartOf="@id/nav_next_turn_container"
     app:layout_constraintTop_toBottomOf="@id/nav_next_turn_container" />

android/app/src/main/res/layout/manage_route_bottom_sheet.xml

@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+  xmlns:android="http://schemas.android.com/apk/res/android"
+  xmlns:app="http://schemas.android.com/apk/res-auto"
+  xmlns:tools="http://schemas.android.com/tools"
+  android:layout_width="match_parent"
+  android:layout_height="wrap_content"
+  android:orientation="vertical"
+  android:layout_marginBottom="@dimen/margin_half"
+  android:layout_marginTop="@dimen/margin_half"
+  android:paddingStart="@dimen/altitude_chart_container_padding_left"
+  android:paddingEnd="@dimen/altitude_chart_container_padding_left">
+
+  <RelativeLayout
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="horizontal"
+    android:layout_marginTop="@dimen/margin_half"
+    android:layout_marginBottom="@dimen/margin_half">
+
+    <TextView
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:layout_alignParentStart="true"
+      android:text="@string/planning_route_manage_route"
+      android:textSize="20sp"
+      android:textStyle="bold"/>
+
+    <ImageView
+      android:id="@+id/image_my_location"
+      android:layout_width="24dp"
+      android:layout_height="24dp"
+      android:layout_alignParentEnd="true"
+      android:visibility="invisible"
+      app:srcCompat="@drawable/ic_my_location_blue"/>
+
+  </RelativeLayout>
+
+  <View
+    android:layout_width="match_parent"
+    android:layout_height="@dimen/divider_height"
+    android:background="?dividerHorizontal"/>
+
+  <androidx.recyclerview.widget.RecyclerView
+    android:id="@+id/manage_route_list"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    tools:itemCount="3"
+    tools:listitem="@layout/manage_route_list_item"/>
+
+  <RelativeLayout
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="horizontal"
+    android:layout_marginTop="@dimen/margin_half"
+    android:layout_marginBottom="@dimen/margin_half">
+
+    <Button
+      android:id="@+id/btn__cancel"
+      style="@style/MwmWidget.Button"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:layout_alignParentStart="true"
+      android:layout_centerVertical="true"
+      android:text="@string/cancel"/>
+
+    <Button
+      android:id="@+id/btn__plan"
+      style="@style/MwmWidget.Button.Primary"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:layout_gravity="end|center_vertical"
+      android:layout_alignParentEnd="true"
+      android:layout_centerVertical="true"
+      android:text="@string/button_plan"/>
+
+  </RelativeLayout>
+
+</LinearLayout>

android/app/src/main/res/layout/manage_route_list_item.xml

@@ -0,0 +1,66 @@
+<androidx.constraintlayout.widget.ConstraintLayout
+  xmlns:android="http://schemas.android.com/apk/res/android"
+  xmlns:app="http://schemas.android.com/apk/res-auto"
+  xmlns:tools="http://schemas.android.com/tools"
+  android:layout_width="match_parent"
+  android:layout_height="60dp"
+  android:gravity="center_vertical">
+
+  <ImageView
+    android:id="@+id/type_icon"
+    android:layout_width="24dp"
+    android:layout_height="24dp"
+    app:layout_constraintLeft_toLeftOf="parent"
+    app:layout_constraintTop_toTopOf="parent"
+    app:layout_constraintBottom_toBottomOf="parent"
+    app:srcCompat="@drawable/route_point_finish"/>
+
+  <TextView
+    android:id="@+id/title"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_marginStart="6dp"
+    android:layout_marginEnd="6dp"
+    android:ellipsize="end"
+    android:inputType="none"
+    android:maxLines="1"
+    android:textAppearance="@style/MwmTextAppearance.Body1"
+    android:textStyle="bold"
+    android:textAlignment="viewStart"
+    app:layout_constraintStart_toEndOf="@id/type_icon"
+    app:layout_constraintEnd_toStartOf="@id/delete_icon"
+    app:layout_constraintTop_toTopOf="parent"
+    app:layout_constraintBottom_toTopOf="@id/subtitle"
+    app:layout_constrainedWidth="true"
+    tools:text="Title"/>
+
+  <TextView
+    android:id="@+id/subtitle"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_marginStart="6dp"
+    android:layout_marginEnd="6dp"
+    android:ellipsize="end"
+    android:inputType="none"
+    android:maxLines="2"
+    android:textAppearance="@style/MwmTextAppearance.Body1"
+    android:textAlignment="viewStart"
+    app:layout_constraintStart_toEndOf="@id/type_icon"
+    app:layout_constraintEnd_toStartOf="@id/delete_icon"
+    app:layout_constraintTop_toBottomOf="@id/title"
+    app:layout_constraintBottom_toBottomOf="parent"
+    app:layout_constrainedWidth="true"
+    tools:text="Subtitle"/>
+
+  <ImageView
+    android:id="@+id/delete_icon"
+    android:layout_width="24dp"
+    android:layout_height="24dp"
+    style="@style/MwmWidget.Editor.MetadataIcon"
+    android:layout_margin="0dp"
+    app:layout_constraintEnd_toEndOf="parent"
+    app:layout_constraintTop_toTopOf="parent"
+    app:layout_constraintBottom_toBottomOf="parent"
+    app:srcCompat="@drawable/ic_delete"/>
+
+</androidx.constraintlayout.widget.ConstraintLayout>

android/app/src/main/res/layout/map_buttons_layout_navigation.xml

@@ -49,6 +49,13 @@
       app:layout_constraintBottom_toBottomOf="parent"
       app:layout_constraintStart_toStartOf="parent" />
   </androidx.constraintlayout.widget.ConstraintLayout>
+  <include
+    layout="@layout/map_status_track_recording"
+    android:layout_margin="@dimen/nav_frame_padding"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    app:layout_constraintRight_toRightOf="parent"
+    app:layout_constraintTop_toTopOf="parent" />
   <androidx.constraintlayout.widget.ConstraintLayout
     android:id="@+id/map_buttons_inner_right"
     android:layout_width="wrap_content"

android/app/src/main/res/layout/map_buttons_layout_planning.xml

@@ -35,6 +35,14 @@
       app:layout_constraintBottom_toTopOf="@+id/btn_bookmarks"
       app:layout_constraintStart_toStartOf="parent" />
   </androidx.constraintlayout.widget.ConstraintLayout>
+  <include
+    layout="@layout/map_status_track_recording"
+    android:layout_marginHorizontal="@dimen/nav_frame_padding"
+    android:layout_marginTop="@dimen/elevation_profile_half_height"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    app:layout_constraintRight_toRightOf="parent"
+    app:layout_constraintTop_toTopOf="parent" />
   <androidx.constraintlayout.widget.ConstraintLayout
     android:id="@+id/map_buttons_inner_right"
     android:layout_width="wrap_content"

android/app/src/main/res/layout/map_buttons_layout_regular.xml

@@ -25,6 +25,13 @@
       app:layout_constraintStart_toStartOf="parent"
       app:layout_constraintTop_toTopOf="parent" />
   </androidx.constraintlayout.widget.ConstraintLayout>
+  <include
+    layout="@layout/map_status_track_recording"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:layout_alignParentTop="true"
+    android:layout_alignParentEnd="true"
+    android:layout_margin="@dimen/nav_frame_padding" />
   <androidx.constraintlayout.widget.ConstraintLayout
     android:id="@+id/map_buttons_inner_right"
     android:layout_width="wrap_content"

android/app/src/main/res/layout/map_status_track_recording.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<app.organicmaps.maplayer.LayersButton
+  xmlns:android="http://schemas.android.com/apk/res/android"
+  xmlns:app="http://schemas.android.com/apk/res-auto"
+  android:id="@+id/track_recording_status"
+  style="@style/MwmWidget.MapButton"
+  android:contentDescription="@string/layers_title"
+  android:tint="@color/accent_color_selector"
+  app:srcCompat="@drawable/ic_track_recording_status" />

android/app/src/main/res/values-ar/strings.xml

@@ -29,6 +29,10 @@
     <string name="search_map">ابحث في الخريطة</string>
     <!-- Location services are disabled by user alert - message -->
     <string name="location_is_disabled_long_text">التطبيق أو جميع خدمات تحديد المواقع معطلة لديك في الوقت الحالي. الرجاء تفعيلها في الإعدادات.</string>
+    <!-- A dialog title, that warns a user that Precise Location is disabled and suggests to turn it on -->
+    <string name="limited_accuracy">دقة محدودة</string>
+    <!-- A dialog text, that warns a user that Precise Location is disabled and suggests to turn it on -->
+    <string name="precise_location_is_disabled_long_text">لضمان التنقل الدقيق، قم بتمكين الموقع الدقيق في الإعدادات.</string>
     <!-- View and button titles for accessibility -->
     <string name="zoom_to_country">عرض على الخريطة</string>
     <!-- Message to display at the center of the screen when the country download has failed -->
@@ -637,6 +641,8 @@
     <string name="routing_add_start_point">استخدام البحث أو النقر على الخريطة لإضافة نقطة بداية الطريق</string>
     <!-- User selected the start of a route by pressing Route From. Now the destination of a route should be selected using search or by tapping on the map and then pressing "Route To". -->
     <string name="routing_add_finish_point">استخدام البحث أو النقر على الخريطة لإضافة نقطة وجهة</string>
+    <string name="planning_route_manage_route">إدارة المسار</string>
+    <string name="button_plan">خطة</string>
     <string name="placepage_remove_stop">إزالة نقطة توقف</string>
     <string name="placepage_add_stop">إضافة نقطة توقف</string>
     <!-- Alert to ask user relogin to OpenStreetMap with OAuth2 flow after OAuth1 authentication is deprecated. -->
@@ -1674,6 +1680,7 @@
     <string name="type.power.plant.solar">محطة طاقة شمسية</string>
     <string name="type.power.plant.wind">محطة طاقة الرياح</string>
     <string name="type.power.substation">محطة كهرباء فرعية</string>
+    <!-- A tower or pylon carrying high voltage electricity cables. -->
     <string name="type.power.tower">عمود كهرباء</string>
     <string name="type.railway.funicular">حبلي</string>
     <string name="type.railway.halt">محطة قطار</string>

android/app/src/main/res/values-az/strings.xml

@@ -28,6 +28,10 @@
     <string name="search_map">Xəritədə axtar</string>
     <!-- Location services are disabled by user alert - message -->
     <string name="location_is_disabled_long_text">Bütün Məkan Xidmətləri hazırda bu cihaz və ya tətbiq üçün deaktiv edilib. Zəhmət olmasa bunu parametrlərdən aktiv edin.</string>
+    <!-- A dialog title, that warns a user that Precise Location is disabled and suggests to turn it on -->
+    <string name="limited_accuracy">Məhdud dəqiqlik</string>
+    <!-- A dialog text, that warns a user that Precise Location is disabled and suggests to turn it on -->
+    <string name="precise_location_is_disabled_long_text">Dəqiq naviqasiyanı təmin etmək üçün parametrlərdə dəqiq bir yer təmin edin.</string>
     <!-- View and button titles for accessibility -->
     <string name="zoom_to_country">Xəritədə göstər</string>
     <!-- Message to display at the center of the screen when the country download has failed -->
@@ -624,6 +628,8 @@
     <string name="routing_add_start_point">Marşrutun başlanğıc nöqtəsi əlavə etmək üçün axtarışdan istifadə edin və ya xəritədə klikləyin</string>
     <!-- User selected the start of a route by pressing Route From. Now the destination of a route should be selected using search or by tapping on the map and then pressing "Route To". -->
     <string name="routing_add_finish_point">Təyinat nöqtəsi əlavə etmək üçün axtarışdan istifadə edin və ya xəritədə klikləyin</string>
+    <string name="planning_route_manage_route">Marşrutu idarə et</string>
+    <string name="button_plan">Plan</string>
     <string name="placepage_remove_stop">Kəsmə nöqtəsini silin</string>
     <string name="placepage_add_stop">Dayanacaq nöqtəsini əlavə edin</string>
     <!-- Alert to ask user relogin to OpenStreetMap with OAuth2 flow after OAuth1 authentication is deprecated. -->
@@ -1648,6 +1654,7 @@
     <string name="type.power.plant.wind">Yel deyirmani</string>
     <string name="type.power.station">Stansiya</string>
     <string name="type.power.substation">Transformator</string>
+    <!-- A tower or pylon carrying high voltage electricity cables. -->
     <string name="type.power.tower">Elektrik qülləsi</string>
     <string name="type.public_transport">İctimai nəqliyyat</string>
     <string name="type.public_transport.platform">Platforma</string>

android/app/src/main/res/values-be/strings.xml

@@ -29,6 +29,10 @@
     <string name="search_map">Шукаць на мапе</string>
     <!-- Location services are disabled by user alert - message -->
     <string name="location_is_disabled_long_text">Служба геалакацыі адключана для гэтай прылады або праграмы. Калі ласка, уключыце яе ў Наладах.</string>
+    <!-- A dialog title, that warns a user that Precise Location is disabled and suggests to turn it on -->
+    <string name="limited_accuracy">Абмежаваная дакладнасць</string>
+    <!-- A dialog text, that warns a user that Precise Location is disabled and suggests to turn it on -->
+    <string name="precise_location_is_disabled_long_text">Для забеспячэння дакладнай навігацыі ўключыце дакладнае месцазнаходжанне ў наладах.</string>
     <!-- View and button titles for accessibility -->
     <string name="zoom_to_country">Паказаць на мапе</string>
     <!-- Message to display at the center of the screen when the country download has failed -->
@@ -618,6 +622,8 @@
     <string name="routing_add_start_point">Скарыстайцеся пошукам або націсніце на мапе, каб дадаць пачатак маршруту</string>
     <!-- User selected the start of a route by pressing Route From. Now the destination of a route should be selected using search or by tapping on the map and then pressing "Route To". -->
     <string name="routing_add_finish_point">Скарыстайцеся пошукам або націсніце на мапе, каб дадаць пункт прызначэння</string>
+    <string name="planning_route_manage_route">Кіраваць маршрутам</string>
+    <string name="button_plan">Пракласці</string>
     <string name="placepage_remove_stop">Выдаліць прыпынак</string>
     <string name="placepage_add_stop">Дадаць прыпынак</string>
     <!-- Alert to ask user relogin to OpenStreetMap with OAuth2 flow after OAuth1 authentication is deprecated. -->

android/app/src/main/res/values-bg/strings.xml

@@ -29,6 +29,10 @@
     <string name="search_map">Търсене в карта</string>
     <!-- Location services are disabled by user alert - message -->
     <string name="location_is_disabled_long_text">В момента всички услуги за местоположение за това устройство или приложение са деактивирани. Моля, разрешете ги в Настройки.</string>
+    <!-- A dialog title, that warns a user that Precise Location is disabled and suggests to turn it on -->
+    <string name="limited_accuracy">Ограничена точност</string>
+    <!-- A dialog text, that warns a user that Precise Location is disabled and suggests to turn it on -->
+    <string name="precise_location_is_disabled_long_text">За да осигурите точна навигация, активирайте функцията \"Точно местоположение\" в настройките.</string>
     <!-- View and button titles for accessibility -->
     <string name="zoom_to_country">Показване на картата</string>
     <!-- Message to display at the center of the screen when the country download has failed -->
@@ -575,6 +579,8 @@
     <string name="routing_add_start_point">Използвайте търсене или докоснете картата, за да добавите начална точка на маршрута</string>
     <!-- User selected the start of a route by pressing Route From. Now the destination of a route should be selected using search or by tapping on the map and then pressing "Route To". -->
     <string name="routing_add_finish_point">Използвайте търсене или докоснете картата, за да добавите точка на дестинация</string>
+    <string name="planning_route_manage_route">Управление на маршрут</string>
+    <string name="button_plan">Планиране</string>
     <string name="placepage_remove_stop">Премахване на спирка</string>
     <string name="placepage_add_stop">Добавяне на спирка</string>
     <!-- Alert to ask user relogin to OpenStreetMap with OAuth2 flow after OAuth1 authentication is deprecated. -->

android/app/src/main/res/values-ca/strings.xml

@@ -26,6 +26,10 @@
     <string name="search_map">Cerca en el mapa</string>
     <!-- Location services are disabled by user alert - message -->
     <string name="location_is_disabled_long_text">Tots els serveis de geolocalització d’aquest aparell o aplicació estan desactivats. Activeu-los a la configuració.</string>
+    <!-- A dialog title, that warns a user that Precise Location is disabled and suggests to turn it on -->
+    <string name="limited_accuracy">Precisió limitada</string>
+    <!-- A dialog text, that warns a user that Precise Location is disabled and suggests to turn it on -->
+    <string name="precise_location_is_disabled_long_text">Per assegurar la navegació precisa, activeu la ubicació precisa en la configuració.</string>
     <!-- View and button titles for accessibility -->
     <string name="zoom_to_country">Mostra-ho al mapa</string>
     <!-- Message to display at the center of the screen when the country download has failed -->
@@ -624,6 +628,8 @@
     <string name="routing_add_start_point">Utilitzeu la cerca o toqueu el mapa per afegir un punt de partida de la ruta</string>
     <!-- User selected the start of a route by pressing Route From. Now the destination of a route should be selected using search or by tapping on the map and then pressing "Route To". -->
     <string name="routing_add_finish_point">Utilitzeu la cerca o toqueu el mapa per afegir un punt de destinació</string>
+    <string name="planning_route_manage_route">Gestionar la ruta</string>
+    <string name="button_plan">Planifica</string>
     <string name="placepage_remove_stop">Elimina parada</string>
     <string name="placepage_add_stop">Afegeix una parada</string>
     <!-- Alert to ask user relogin to OpenStreetMap with OAuth2 flow after OAuth1 authentication is deprecated. -->

android/app/src/main/res/values-cs/strings.xml

@@ -26,6 +26,10 @@
     <string name="search_map">Prohledat mapu</string>
     <!-- Location services are disabled by user alert - message -->
     <string name="location_is_disabled_long_text">Aktuálně máte všechny možnosti pro určování polohy vypnuté. Prosím, povolte je v Nastavení.</string>
+    <!-- A dialog title, that warns a user that Precise Location is disabled and suggests to turn it on -->
+    <string name="limited_accuracy">Omezená přesnost</string>
+    <!-- A dialog text, that warns a user that Precise Location is disabled and suggests to turn it on -->
+    <string name="precise_location_is_disabled_long_text">Chcete-li zajistit přesnou navigaci, povolte v nastavení možnost Přesná poloha.</string>
     <!-- View and button titles for accessibility -->
     <string name="zoom_to_country">Ukázat na mapě</string>
     <!-- Message to display at the center of the screen when the country download has failed -->
@@ -593,6 +597,8 @@
     <string name="routing_add_start_point">Pomocí vyhledávání nebo klepnutím na mapu přidejte výchozí bod trasy</string>
     <!-- User selected the start of a route by pressing Route From. Now the destination of a route should be selected using search or by tapping on the map and then pressing "Route To". -->
     <string name="routing_add_finish_point">Pomocí vyhledávání nebo klepnutím na mapu přidejte cílový bod</string>
+    <string name="planning_route_manage_route">Spravovat trasu</string>
+    <string name="button_plan">Naplánovat</string>
     <string name="placepage_remove_stop">Odstranit zastávku</string>
     <string name="placepage_add_stop">Přidat zastávku</string>
     <!-- Alert to ask user relogin to OpenStreetMap with OAuth2 flow after OAuth1 authentication is deprecated. -->
@@ -1534,6 +1540,7 @@
     <string name="type.power.plant.solar">Solární elektrárna</string>
     <string name="type.power.plant.wind">Větrná elektrárna</string>
     <string name="type.power.substation">Rozvodna</string>
+    <!-- A tower or pylon carrying high voltage electricity cables. -->
     <string name="type.power.tower">Sloup elektrického vedení</string>
     <string name="type.railway.funicular">Lanovka</string>
     <string name="type.railway.halt">Železniční stanice</string>

android/app/src/main/res/values-da/strings.xml

@@ -26,6 +26,10 @@
     <string name="search_map">Søg kort</string>
     <!-- Location services are disabled by user alert - message -->
     <string name="location_is_disabled_long_text">Du har alle lokationstjenester for denne enhed eller applikation slukket. Slå dem venligst til i Indstillinger.</string>
+    <!-- A dialog title, that warns a user that Precise Location is disabled and suggests to turn it on -->
+    <string name="limited_accuracy">Begrænset nøjagtighed</string>
+    <!-- A dialog text, that warns a user that Precise Location is disabled and suggests to turn it on -->
+    <string name="precise_location_is_disabled_long_text">For at sikre nøjagtig navigation skal du aktivere Præcis placering i indstillingerne.</string>
     <!-- View and button titles for accessibility -->
     <string name="zoom_to_country">Vis på kortet</string>
     <!-- Message to display at the center of the screen when the country download has failed -->
@@ -584,6 +588,8 @@
     <string name="routing_add_start_point">Brug søgning eller tryk på kortet for at tilføje et startpunkt for en rute</string>
     <!-- User selected the start of a route by pressing Route From. Now the destination of a route should be selected using search or by tapping on the map and then pressing "Route To". -->
     <string name="routing_add_finish_point">Brug søgning eller tryk på kortet for at tilføje et destinationspunkt</string>
+    <string name="planning_route_manage_route">Administrer rute</string>
+    <string name="button_plan">Planlæg</string>
     <string name="placepage_remove_stop">Fjern stop</string>
     <string name="placepage_add_stop">Tilføj stop</string>
     <!-- Alert to ask user relogin to OpenStreetMap with OAuth2 flow after OAuth1 authentication is deprecated. -->
@@ -1503,6 +1509,7 @@
     <string name="type.power.plant.solar">Solcelleanlæg</string>
     <string name="type.power.plant.wind">Vindkraftværk</string>
     <string name="type.power.substation">Transformerstation</string>
+    <!-- A tower or pylon carrying high voltage electricity cables. -->
     <string name="type.power.tower">El-pol</string>
     <string name="type.railway.funicular">Funicular</string>
     <string name="type.railway.halt">Togstation</string>

android/app/src/main/res/values-de/strings.xml

@@ -26,6 +26,10 @@
     <string name="search_map">Auf der Karte suchen</string>
     <!-- Location services are disabled by user alert - message -->
     <string name="location_is_disabled_long_text">Standortdienste sind für dieses Gerät oder App deaktiviert. Bitte aktivieren Sie diese in den Einstellungen.</string>
+    <!-- A dialog title, that warns a user that Precise Location is disabled and suggests to turn it on -->
+    <string name="limited_accuracy">Begrenzte Genauigkeit</string>
+    <!-- A dialog text, that warns a user that Precise Location is disabled and suggests to turn it on -->
+    <string name="precise_location_is_disabled_long_text">Um eine genaue Navigation zu gewährleisten, aktivieren Sie in den Einstellungen die Option Genauen Standort verwenden.</string>
     <!-- View and button titles for accessibility -->
     <string name="zoom_to_country">Auf der Karte anzeigen</string>
     <!-- Message to display at the center of the screen when the country download has failed -->
@@ -622,6 +626,8 @@
     <string name="routing_add_start_point">Verwende die Suche oder tippe auf die Karte, um einen Routenstartpunkt hinzuzufügen</string>
     <!-- User selected the start of a route by pressing Route From. Now the destination of a route should be selected using search or by tapping on the map and then pressing "Route To". -->
     <string name="routing_add_finish_point">Verwende die Suche oder tippe auf die Karte, um einen Zielpunkt hinzuzufügen</string>
+    <string name="planning_route_manage_route">Route verwalten</string>
+    <string name="button_plan">Planen</string>
     <string name="placepage_remove_stop">Stopp entfernen</string>
     <string name="placepage_add_stop">Stopp einfügen</string>
     <!-- Alert to ask user relogin to OpenStreetMap with OAuth2 flow after OAuth1 authentication is deprecated. -->
@@ -1671,6 +1677,7 @@
     <string name="type.power.plant.wind">Windkraftanlage</string>
     <string name="type.power.station">Umspannwerk</string>
     <string name="type.power.substation">Umspannwerk</string>
+    <!-- A tower or pylon carrying high voltage electricity cables. -->
     <string name="type.power.tower">Hochspannungsmast</string>
     <string name="type.public_transport">Öffentlicher Verkehr</string>
     <string name="type.railway">Eisenbahn</string>

android/app/src/main/res/values-el/strings.xml

@@ -27,6 +27,10 @@
     <string name="search_map">Αναζήτηση στο χάρτη</string>
     <!-- Location services are disabled by user alert - message -->
     <string name="location_is_disabled_long_text">Οι υπηρεσίες εντοπισμού τοποθεσίας είναι προς το παρόν απενεργοποιημένες σε αυτή τη συσκευή ή για αυτή την εφαρμογή. Ενεργοποιήστε τες από τις Ρυθμίσεις.</string>
+    <!-- A dialog title, that warns a user that Precise Location is disabled and suggests to turn it on -->
+    <string name="limited_accuracy">Περιορισμένη ακρίβεια</string>
+    <!-- A dialog text, that warns a user that Precise Location is disabled and suggests to turn it on -->
+    <string name="precise_location_is_disabled_long_text">Για να εξασφαλίσετε ακριβή πλοήγηση, ενεργοποιήστε την Ακριβής τοποθεσία στις ρυθμίσεις.</string>
     <!-- View and button titles for accessibility -->
     <string name="zoom_to_country">Εμφάνιση στο χάρτη</string>
     <!-- Message to display at the center of the screen when the country download has failed -->
@@ -620,6 +624,8 @@
     <string name="routing_add_start_point">Χρησιμοποιήστε την αναζήτηση ή πατήστε στο χάρτη για να προσθέσετε ένα σημείο εκκίνησης της διαδρομής</string>
     <!-- User selected the start of a route by pressing Route From. Now the destination of a route should be selected using search or by tapping on the map and then pressing "Route To". -->
     <string name="routing_add_finish_point">Χρησιμοποιήστε την αναζήτηση ή πατήστε στο χάρτη για να προσθέσετε ένα σημείο προορισμού</string>
+    <string name="planning_route_manage_route">Διαχείριση διαδρομής</string>
+    <string name="button_plan">Σχεδιασμός</string>
     <string name="placepage_remove_stop">Αφαίρεση στάσης</string>
     <string name="placepage_add_stop">Προσθήκη στάσης</string>
     <!-- Alert to ask user relogin to OpenStreetMap with OAuth2 flow after OAuth1 authentication is deprecated. -->
@@ -1578,6 +1584,7 @@
     <string name="type.power.plant.solar">Ηλιακός σταθμός παραγωγής ενέργειας</string>
     <string name="type.power.plant.wind">Αιολική μονάδα παραγωγής ενέργειας</string>
     <string name="type.power.substation">Υποσταθμός</string>
+    <!-- A tower or pylon carrying high voltage electricity cables. -->
     <string name="type.power.tower">Πυλώνες μεταφοράς ρεύματος</string>
     <string name="type.railway.funicular">Μονωτικό τρενάκι</string>
     <string name="type.railway.halt">Σιδηροδρομικός σταθμός</string>

android/app/src/main/res/values-es/strings.xml

@@ -26,6 +26,10 @@
     <string name="search_map">Buscar en el mapa</string>
     <!-- Location services are disabled by user alert - message -->
     <string name="location_is_disabled_long_text">No se puede acceder a los servicios de localización en este dispositivo o aplicación. Actívelos en la configuración.</string>
+    <!-- A dialog title, that warns a user that Precise Location is disabled and suggests to turn it on -->
+    <string name="limited_accuracy">Precisión limitada</string>
+    <!-- A dialog text, that warns a user that Precise Location is disabled and suggests to turn it on -->
+    <string name="precise_location_is_disabled_long_text">Para garantizar una navegación más exacta, active la opción de ubicación precisa en los ajustes.</string>
     <!-- View and button titles for accessibility -->
     <string name="zoom_to_country">Mostrar en el mapa</string>
     <!-- Message to display at the center of the screen when the country download has failed -->
@@ -620,6 +624,8 @@
     <string name="routing_add_start_point">Busca o toca en el mapa para añadir el origen de la ruta</string>
     <!-- User selected the start of a route by pressing Route From. Now the destination of a route should be selected using search or by tapping on the map and then pressing "Route To". -->
     <string name="routing_add_finish_point">Busca o toca en el mapa para añadir el destino</string>
+    <string name="planning_route_manage_route">Administrar ruta</string>
+    <string name="button_plan">Planificar</string>
     <string name="placepage_remove_stop">Eliminar parada</string>
     <string name="placepage_add_stop">Añadir parada</string>
     <!-- Alert to ask user relogin to OpenStreetMap with OAuth2 flow after OAuth1 authentication is deprecated. -->
@@ -1694,6 +1700,7 @@
     <string name="type.power.plant.wind">Planta eólica</string>
     <string name="type.power.station">Estación eléctrica</string>
     <string name="type.power.substation">Subestación eléctrica</string>
+    <!-- A tower or pylon carrying high voltage electricity cables. -->
     <string name="type.power.tower">Poste eléctrico</string>
     <string name="type.public_transport">Transporte público</string>
     <string name="type.public_transport.platform">Plataforma</string>

android/app/src/main/res/values-et/strings.xml

@@ -26,6 +26,10 @@
     <string name="search_map">Otsi kaardilt</string>
     <!-- Location services are disabled by user alert - message -->
     <string name="location_is_disabled_long_text">Seadme või rakenduse kõik asukohateenused on praegu välja lülitatud. Luba need Seadetes.</string>
+    <!-- A dialog title, that warns a user that Precise Location is disabled and suggests to turn it on -->
+    <string name="limited_accuracy">Piiratud täpsus</string>
+    <!-- A dialog text, that warns a user that Precise Location is disabled and suggests to turn it on -->
+    <string name="precise_location_is_disabled_long_text">Täpse navigeerimise tagamiseks lülitage seadetes sisse Täpne asukoht.</string>
     <!-- View and button titles for accessibility -->
     <string name="zoom_to_country">Kuva kaardil</string>
     <!-- Message to display at the center of the screen when the country download has failed -->
@@ -616,6 +620,8 @@
     <string name="routing_add_start_point">Marsruudi alguspunkti lisamiseks kasutage otsingut või puudutage kaarti</string>
     <!-- User selected the start of a route by pressing Route From. Now the destination of a route should be selected using search or by tapping on the map and then pressing "Route To". -->
     <string name="routing_add_finish_point">Kasutage otsingut või koputage kaardil sihtkoha lisamiseks</string>
+    <string name="planning_route_manage_route">Halda marsruuti</string>
+    <string name="button_plan">Planeeri</string>
     <string name="placepage_remove_stop">Eemalda peatus</string>
     <string name="placepage_add_stop">Lisa peatus</string>
     <!-- Alert to ask user relogin to OpenStreetMap with OAuth2 flow after OAuth1 authentication is deprecated. -->
@@ -1681,6 +1687,7 @@
     <string name="type.power.plant.wind">Tuuleelektrijaam</string>
     <string name="type.power.station">Elektrijaam</string>
     <string name="type.power.substation">Alajaam</string>
+    <!-- A tower or pylon carrying high voltage electricity cables. -->
     <string name="type.power.tower">Elektripost</string>
     <string name="type.psurface">Pind</string>
     <string name="type.public_transport">Ühistransport</string>

android/app/src/main/res/values-eu/strings.xml

@@ -26,6 +26,10 @@
     <string name="search_map">Bilatu mapan</string>
     <!-- Location services are disabled by user alert - message -->
     <string name="location_is_disabled_long_text">Ezin da kokapen-zerbitzua atzitu. Mesedez, aktibatu ezarpenetan.</string>
+    <!-- A dialog title, that warns a user that Precise Location is disabled and suggests to turn it on -->
+    <string name="limited_accuracy">Zehaztasun mugatua</string>
+    <!-- A dialog text, that warns a user that Precise Location is disabled and suggests to turn it on -->
+    <string name="precise_location_is_disabled_long_text">Nabigazio zehatzagoa ziurtatzeko, gaitu kokapen zehatza ezarpenetan.</string>
     <!-- View and button titles for accessibility -->
     <string name="zoom_to_country">Erakutsi mapan</string>
     <!-- Message to display at the center of the screen when the country download has failed -->
@@ -620,6 +624,8 @@
     <string name="routing_add_start_point">Erabili bilaketa edo sakatu mapan ibilbidearen abiapuntua gehitzeko</string>
     <!-- User selected the start of a route by pressing Route From. Now the destination of a route should be selected using search or by tapping on the map and then pressing "Route To". -->
     <string name="routing_add_finish_point">Erabili bilaketa edo sakatu mapan helmuga puntu bat gehitzeko</string>
+    <string name="planning_route_manage_route">Kudeatu ibilbidea</string>
+    <string name="button_plan">Planifikatu</string>
     <string name="placepage_remove_stop">Kendu geltokia</string>
     <string name="placepage_add_stop">Gehitu geltokia</string>
     <!-- Alert to ask user relogin to OpenStreetMap with OAuth2 flow after OAuth1 authentication is deprecated. -->
@@ -1620,6 +1626,7 @@
     <string name="type.power.plant.solar">Eguzki-zentrala</string>
     <string name="type.power.plant.wind">Zentral eolikoa</string>
     <string name="type.power.substation">Azpiestazioa</string>
+    <!-- A tower or pylon carrying high voltage electricity cables. -->
     <string name="type.power.tower">Zutabe elektrikoa</string>
     <string name="type.public_transport">Garraio publikoa</string>
     <string name="type.railway.funicular">Funikularra</string>

android/app/src/main/res/values-fa/strings.xml

@@ -29,6 +29,10 @@
     <string name="search_map">جست‌وجوی نقشه</string>
     <!-- Location services are disabled by user alert - message -->
     <string name="location_is_disabled_long_text">سرویس موقعیت مکانی شما غیر فعال است. لطفا جهت کارکرد صحیح نرم افزار آن را فعال کنید.</string>
+    <!-- A dialog title, that warns a user that Precise Location is disabled and suggests to turn it on -->
+    <string name="limited_accuracy">دقت محدود</string>
+    <!-- A dialog text, that warns a user that Precise Location is disabled and suggests to turn it on -->
+    <string name="precise_location_is_disabled_long_text">برای اطمینان از دقیق ناوبری ، موقعیت مکانی دقیق را در تنظیمات فعال کنید.</string>
     <!-- View and button titles for accessibility -->
     <string name="zoom_to_country">بر روی نقشه نمایش بده</string>
     <!-- Message to display at the center of the screen when the country download has failed -->
@@ -580,6 +584,8 @@
     <string name="routing_add_start_point">برای افزودن نقطه شروع مسیر، از جستجو استفاده کنید یا روی نقشه ضربه بزنید</string>
     <!-- User selected the start of a route by pressing Route From. Now the destination of a route should be selected using search or by tapping on the map and then pressing "Route To". -->
     <string name="routing_add_finish_point">برای افزودن نقطه مقصد، از جستجو استفاده کنید یا روی نقشه ضربه بزنید</string>
+    <string name="planning_route_manage_route">مدیریت مسیر</string>
+    <string name="button_plan">برنامه</string>
     <string name="placepage_remove_stop">توقف را حذف کنید</string>
     <string name="placepage_add_stop">اضافه کردن توقف</string>
     <!-- Alert to ask user relogin to OpenStreetMap with OAuth2 flow after OAuth1 authentication is deprecated. -->
@@ -1429,6 +1435,7 @@
     <string name="type.power.plant.hydro">نیروگاه برق آبی</string>
     <string name="type.power.plant.solar">نیروگاه خورشیدی</string>
     <string name="type.power.plant.wind">نیروگاه بادی</string>
+    <!-- A tower or pylon carrying high voltage electricity cables. -->
     <string name="type.power.tower">برج قدرت</string>
     <string name="type.railway.funicular">فونیکولور</string>
     <string name="type.railway.halt">ایستگاه قطار</string>

android/app/src/main/res/values-fi/strings.xml

@@ -29,6 +29,10 @@
     <string name="search_map">Hae kartalta</string>
     <!-- Location services are disabled by user alert - message -->
     <string name="location_is_disabled_long_text">Laitteen tai sovelluksen kaikki sijaintipalvelut ovat tällä hetkellä poissa käytöstä. Ota ne käyttöön Asetukset-valikossa.</string>
+    <!-- A dialog title, that warns a user that Precise Location is disabled and suggests to turn it on -->
+    <string name="limited_accuracy">Rajoitettu tarkkuus</string>
+    <!-- A dialog text, that warns a user that Precise Location is disabled and suggests to turn it on -->
+    <string name="precise_location_is_disabled_long_text">Tarkan navigoinnin varmistamiseksi ota Tarkka sijainti käyttöön asetuksissa.</string>
     <!-- View and button titles for accessibility -->
     <string name="zoom_to_country">Näytä kartalla</string>
     <!-- Message to display at the center of the screen when the country download has failed -->
@@ -620,6 +624,8 @@
     <string name="routing_add_start_point">Käytä hakua tai napauta karttaa lisätäksesi reitin lähtöpisteen</string>
     <!-- User selected the start of a route by pressing Route From. Now the destination of a route should be selected using search or by tapping on the map and then pressing "Route To". -->
     <string name="routing_add_finish_point">Käytä hakua tai napauta karttaa lisätäksesi kohdepisteen.</string>
+    <string name="planning_route_manage_route">Hallitse reittiä</string>
+    <string name="button_plan">Suunnittele</string>
     <string name="placepage_remove_stop">Poista pysähdys</string>
     <string name="placepage_add_stop">Lisää pysähdys</string>
     <!-- Alert to ask user relogin to OpenStreetMap with OAuth2 flow after OAuth1 authentication is deprecated. -->
@@ -1648,6 +1654,7 @@
     <string name="type.power.plant.solar">Aurinkovoimala</string>
     <string name="type.power.plant.wind">Tuulivoimala</string>
     <string name="type.power.substation">Muuntoasema</string>
+    <!-- A tower or pylon carrying high voltage electricity cables. -->
     <string name="type.power.tower">Sähköpylväs</string>
     <string name="type.railway.funicular">Köysirata</string>
     <string name="type.railway.halt">Rautatieasema</string>

android/app/src/main/res/values-fr/strings.xml

@@ -29,6 +29,10 @@
     <string name="search_map">Rechercher sur la carte</string>
     <!-- Location services are disabled by user alert - message -->
     <string name="location_is_disabled_long_text">Tous les services de localisation de cet appareil sont désactivés, ou ils le sont pour cette application. Veuillez les activer dans les paramètres.</string>
+    <!-- A dialog title, that warns a user that Precise Location is disabled and suggests to turn it on -->
+    <string name="limited_accuracy">Précision limitée</string>
+    <!-- A dialog text, that warns a user that Precise Location is disabled and suggests to turn it on -->
+    <string name="precise_location_is_disabled_long_text">Pour garantir une navigation précise, activez l\'option Localisation précise dans les paramètres.</string>
     <!-- View and button titles for accessibility -->
     <string name="zoom_to_country">Voir sur la carte</string>
     <!-- Message to display at the center of the screen when the country download has failed -->
@@ -627,6 +631,8 @@
     <string name="routing_add_start_point">Utilise la recherche ou tape sur la carte pour ajouter un point de départ d\'itinéraire</string>
     <!-- User selected the start of a route by pressing Route From. Now the destination of a route should be selected using search or by tapping on the map and then pressing "Route To". -->
     <string name="routing_add_finish_point">Utilise la recherche ou tape sur la carte pour ajouter un point de destination</string>
+    <string name="planning_route_manage_route">Gérer l’itinéraire</string>
+    <string name="button_plan">Planifier</string>
     <string name="placepage_remove_stop">Supprimer l\'arrêt</string>
     <string name="placepage_add_stop">Ajouter un arrêt</string>
     <!-- Alert to ask user relogin to OpenStreetMap with OAuth2 flow after OAuth1 authentication is deprecated. -->
@@ -1663,6 +1669,7 @@
     <string name="type.power.plant.solar">Centrale solaire</string>
     <string name="type.power.plant.wind">Ferme d\'éoliennes</string>
     <string name="type.power.substation">Poste électrique</string>
+    <!-- A tower or pylon carrying high voltage electricity cables. -->
     <string name="type.power.tower">Pylône électrique</string>
     <string name="type.public_transport.platform">Quai de transport en commun</string>
     <string name="type.railway">Chemin de fer</string>

android/app/src/main/res/values-hi/strings.xml

@@ -29,6 +29,10 @@
     <string name="search_map">मानचित्र पर खोजें</string>
     <!-- Location services are disabled by user alert - message -->
     <string name="location_is_disabled_long_text">वर्तमान में आपके पास इस डिवाइस या एप्लिकेशन के लिए सभी स्थान सेवाएँ अक्षम हैं। कृपया उन्हें सेटिंग्स में सक्षम करें।</string>
+    <!-- A dialog title, that warns a user that Precise Location is disabled and suggests to turn it on -->
+    <string name="limited_accuracy">सीमित सटीकता</string>
+    <!-- A dialog text, that warns a user that Precise Location is disabled and suggests to turn it on -->
+    <string name="precise_location_is_disabled_long_text">सटीक नेविगेशन सुनिश्चित करने के लिए सेटिंग्स में सटीक स्थान सक्षम करें।</string>
     <!-- View and button titles for accessibility -->
     <string name="zoom_to_country">मानचित्र पर दिखाएँ</string>
     <!-- Message to display at the center of the screen when the country download has failed -->
@@ -453,6 +457,7 @@
     <string name="routing_add_start_point">मार्ग का प्रारंभिक बिंदु जोड़ने के लिए खोज का उपयोग करें या मानचित्र पर टैप करें</string>
     <!-- User selected the start of a route by pressing Route From. Now the destination of a route should be selected using search or by tapping on the map and then pressing "Route To". -->
     <string name="routing_add_finish_point">गंतव्य बिंदु जोड़ने के लिए खोज का उपयोग करें या मानचित्र पर टैप करें</string>
+    <string name="planning_route_manage_route">मार्ग प्रबंधित करें</string>
     <string name="placepage_add_stop">गंतव्य जोड़ें</string>
     <!-- Alert to ask user relogin to OpenStreetMap with OAuth2 flow after OAuth1 authentication is deprecated. -->
     <string name="alert_reauth_message">कृपया अपने सभी मानचित्र संपादनों को स्वचालित रूप से अपलोड करने के लिए OpenStreetMap पर लॉगिन करें। अधिक जानें <a href="https://github.com/organicmaps/organicmaps/issues/6144">यहां</a>।</string>
@@ -1087,6 +1092,7 @@
     <string name="type.place.village">गाँव</string>
     <string name="type.power.station">बिजली घर</string>
     <string name="type.power.substation">विद्युत उपकेंद्र</string>
+    <!-- A tower or pylon carrying high voltage electricity cables. -->
     <string name="type.power.tower">संचरण स्तम्भ</string>
     <string name="type.public_transport.platform">रेलवे प्लेटफार्म</string>
     <string name="type.railway">रेल</string>

android/app/src/main/res/values-hu/strings.xml

@@ -26,6 +26,10 @@
     <string name="search_map">Keresés a térképen</string>
     <!-- Location services are disabled by user alert - message -->
     <string name="location_is_disabled_long_text">Jelenleg az eszköz vagy alkalmazás helymeghatározási szolgáltatásai le vannak tiltva. Kérjük, engedélyezze őket a Beállításokban.</string>
+    <!-- A dialog title, that warns a user that Precise Location is disabled and suggests to turn it on -->
+    <string name="limited_accuracy">Korlátozott pontosság</string>
+    <!-- A dialog text, that warns a user that Precise Location is disabled and suggests to turn it on -->
+    <string name="precise_location_is_disabled_long_text">A pontos navigáció érdekében engedélyezze a beállítások között a Pontos helymeghatározás opciót.</string>
     <!-- View and button titles for accessibility -->
     <string name="zoom_to_country">Megjelenítés a térképen</string>
     <!-- Message to display at the center of the screen when the country download has failed -->
@@ -599,6 +603,8 @@
     <string name="routing_add_start_point">Használja a keresést, vagy koppintson a térképre az útvonal kezdőpontjának hozzáadásához</string>
     <!-- User selected the start of a route by pressing Route From. Now the destination of a route should be selected using search or by tapping on the map and then pressing "Route To". -->
     <string name="routing_add_finish_point">Használja a keresést, vagy koppintson a térképre egy célpont hozzáadásához</string>
+    <string name="planning_route_manage_route">Útvonal kezelése</string>
+    <string name="button_plan">Terv</string>
     <string name="placepage_remove_stop">Távolítsa el a stopot</string>
     <string name="placepage_add_stop">Hozzáad megállót</string>
     <!-- Alert to ask user relogin to OpenStreetMap with OAuth2 flow after OAuth1 authentication is deprecated. -->
@@ -1539,6 +1545,7 @@
     <string name="type.power.plant.solar">Naperőmű</string>
     <string name="type.power.plant.wind">Szélerőmű</string>
     <string name="type.power.substation">Alállomás</string>
+    <!-- A tower or pylon carrying high voltage electricity cables. -->
     <string name="type.power.tower">Villanyoszlop</string>
     <string name="type.railway.funicular">Sikló</string>
     <string name="type.railway.halt">Vasútállomás</string>