[editor] Automatically create/update check_date

Signed-off-by: matheusgomesms <matheusgomesms@noreply.codeberg.org>

android/app/build.gradle

@@ -352,6 +352,7 @@ dependencies {
   implementation libs.androidx.work.runtime
   implementation libs.androidx.lifecycle.process
   implementation libs.androidx.documentfile
+  // 1.13 Material library version doesn't render properly alpha properties on map buttons
   implementation libs.android.material
   // Fix for app/organicmaps/util/FileUploadWorker.java:14: error: cannot access ListenableFuture
   // https://github.com/organicmaps/organicmaps/issues/6106

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

@@ -446,7 +446,7 @@ public class DownloadResourcesLegacyActivity extends BaseMwmFragmentActivity
       default -> throw new AssertionError("Unexpected result code = " + result);
     };
 
-        mAlertDialog = new MaterialAlertDialogBuilder(this, R.style.MwmTheme_AlertDialog)
+        mAlertDialog = new MaterialAlertDialogBuilder(this)
                            .setTitle(titleId)
                            .setMessage(messageId)
                            .setCancelable(true)

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

@@ -9,8 +9,7 @@ import static app.organicmaps.leftbutton.LeftButtonsHolder.BUTTON_HELP_CODE;
 import static app.organicmaps.leftbutton.LeftButtonsHolder.BUTTON_RECORD_TRACK_CODE;
 import static app.organicmaps.leftbutton.LeftButtonsHolder.BUTTON_SETTINGS_CODE;
 import static app.organicmaps.sdk.location.LocationState.FOLLOW;
-import static app.organicmaps.sdk.location.LocationState.FOLLOW_AND_ROTATE_COMPASS;
-import static app.organicmaps.sdk.location.LocationState.FOLLOW_AND_ROTATE_ROUTE;
+import static app.organicmaps.sdk.location.LocationState.FOLLOW_AND_ROTATE;
 import static app.organicmaps.sdk.location.LocationState.LOCATION_TAG;
 import static app.organicmaps.sdk.util.PowerManagment.POWER_MANAGEMENT_TAG;
 import static app.organicmaps.sdk.util.Utils.dimen;
@@ -433,7 +432,7 @@ public class MwmActivity extends BaseMwmFragmentActivity
     }
 
     dismissLocationErrorDialog();
-    mLocationErrorDialog = new MaterialAlertDialogBuilder(MwmActivity.this, R.style.MwmTheme_AlertDialog)
+    mLocationErrorDialog = new MaterialAlertDialogBuilder(MwmActivity.this)
                                .setMessage(R.string.unknown_current_position)
                                .setCancelable(true)
                                .setPositiveButton(R.string.ok, null)
@@ -656,7 +655,7 @@ public class MwmActivity extends BaseMwmFragmentActivity
         else
         {
           dismissAlertDialog();
-          mAlertDialog = new MaterialAlertDialogBuilder(this, R.style.MwmTheme_AlertDialog)
+          mAlertDialog = new MaterialAlertDialogBuilder(this)
                              .setTitle(R.string.message_invalid_feature_position)
                              .setPositiveButton(R.string.ok, null)
                              .setOnDismissListener(dialog -> mAlertDialog = null)
@@ -1156,7 +1155,7 @@ public class MwmActivity extends BaseMwmFragmentActivity
 
     if (type == IsolinesState.EXPIREDDATA)
     {
-      mAlertDialog = new MaterialAlertDialogBuilder(this, R.style.MwmTheme_AlertDialog)
+      mAlertDialog = new MaterialAlertDialogBuilder(this)
                          .setTitle(R.string.downloader_update_maps)
                          .setMessage(R.string.isolines_activation_error_dialog)
                          .setPositiveButton(
@@ -1775,7 +1774,7 @@ public class MwmActivity extends BaseMwmFragmentActivity
   {
     dismissAlertDialog();
     mAlertDialog =
-        new MaterialAlertDialogBuilder(this, R.style.MwmTheme_AlertDialog)
+        new MaterialAlertDialogBuilder(this)
             .setTitle(R.string.unable_to_calc_alert_title)
             .setMessage(R.string.unable_to_calc_alert_subtitle)
             .setPositiveButton(R.string.settings,
@@ -1798,7 +1797,7 @@ public class MwmActivity extends BaseMwmFragmentActivity
       builder.append(getString(resId)).append("\n\n");
 
     dismissAlertDialog();
-    mAlertDialog = new MaterialAlertDialogBuilder(this, R.style.MwmTheme_AlertDialog)
+    mAlertDialog = new MaterialAlertDialogBuilder(this)
                        .setTitle(R.string.dialog_routing_disclaimer_title)
                        .setMessage(builder.toString())
                        .setCancelable(false)
@@ -1847,7 +1846,7 @@ public class MwmActivity extends BaseMwmFragmentActivity
       return true;
 
     final MapObject endPoint = Objects.requireNonNull(controller.getEndPoint());
-    final MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(this, R.style.MwmTheme_AlertDialog)
+    final MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(this)
         .setTitle(R.string.p2p_only_from_current)
         .setMessage(R.string.p2p_reroute_from_current)
         .setCancelable(false)
@@ -1901,8 +1900,7 @@ public class MwmActivity extends BaseMwmFragmentActivity
 
     locationHelper.restartWithNewMode();
 
-    if ((newMode == FOLLOW || newMode == FOLLOW_AND_ROTATE_ROUTE || newMode == FOLLOW_AND_ROTATE_COMPASS)
-        && !LocationUtils.checkFineLocationPermission(this))
+    if ((newMode == FOLLOW || newMode == FOLLOW_AND_ROTATE) && !LocationUtils.checkFineLocationPermission(this))
     {
       // Try to optimistically request FINE permission for FOLLOW and FOLLOW_AND_ROTATE modes.
       Logger.i(LOCATION_TAG, "Requesting ACCESS_FINE_LOCATION permission for " + LocationState.nameOf(newMode));
@@ -2042,7 +2040,7 @@ public class MwmActivity extends BaseMwmFragmentActivity
         {
           mPreciseLocationDialogShown = true;
           final MaterialAlertDialogBuilder builder =
-              new MaterialAlertDialogBuilder(this, R.style.MwmTheme_AlertDialog)
+              new MaterialAlertDialogBuilder(this)
                   .setTitle("⚠ " + getString(R.string.limited_accuracy))
                   .setMessage(R.string.precise_location_is_disabled_long_text)
                   .setNegativeButton(R.string.close, (dialog, which) -> dialog.dismiss())
@@ -2076,7 +2074,7 @@ public class MwmActivity extends BaseMwmFragmentActivity
       return;
     }
 
-    mLocationErrorDialog = new MaterialAlertDialogBuilder(this, R.style.MwmTheme_AlertDialog)
+    mLocationErrorDialog = new MaterialAlertDialogBuilder(this)
                                .setTitle(R.string.enable_location_services)
                                .setMessage(R.string.location_is_disabled_long_text)
                                .setOnDismissListener(dialog -> mLocationErrorDialog = null)
@@ -2169,7 +2167,7 @@ public class MwmActivity extends BaseMwmFragmentActivity
       return;
     }
 
-    final MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(this, R.style.MwmTheme_AlertDialog)
+    final MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(this)
                                                    .setTitle(R.string.enable_location_services)
                                                    .setMessage(R.string.location_is_disabled_long_text)
                                                    .setOnDismissListener(dialog -> mLocationErrorDialog = null)
@@ -2255,7 +2253,7 @@ public class MwmActivity extends BaseMwmFragmentActivity
 
     dismissAlertDialog();
     final MaterialAlertDialogBuilder builder =
-        new MaterialAlertDialogBuilder(this, R.style.MwmTheme_AlertDialog)
+        new MaterialAlertDialogBuilder(this)
             .setTitle(R.string.current_location_unknown_error_title)
             .setCancelable(true)
             .setMessage(R.string.power_save_dialog_summary)
@@ -2280,7 +2278,7 @@ public class MwmActivity extends BaseMwmFragmentActivity
   {
     dismissAlertDialog();
     mAlertDialog =
-        new MaterialAlertDialogBuilder(this, R.style.MwmTheme_AlertDialog)
+        new MaterialAlertDialogBuilder(this)
             .setTitle(R.string.load_kmz_title)
             .setMessage(getString(R.string.unknown_file_type, uri))
             .setPositiveButton(R.string.ok, null)
@@ -2297,7 +2295,7 @@ public class MwmActivity extends BaseMwmFragmentActivity
   {
     dismissAlertDialog();
     mAlertDialog =
-        new MaterialAlertDialogBuilder(this, R.style.MwmTheme_AlertDialog)
+        new MaterialAlertDialogBuilder(this)
             .setTitle(R.string.load_kmz_title)
             .setMessage(getString(R.string.failed_to_open_file, uri, error))
             .setPositiveButton(R.string.ok, null)
@@ -2319,7 +2317,7 @@ public class MwmActivity extends BaseMwmFragmentActivity
   public void onBookmarksFileImportFailed()
   {
     dismissAlertDialog();
-    mAlertDialog = new MaterialAlertDialogBuilder(this, R.style.MwmTheme_AlertDialog)
+    mAlertDialog = new MaterialAlertDialogBuilder(this)
                        .setTitle(R.string.load_kmz_title)
                        .setMessage(R.string.load_kmz_failed)
                        .setPositiveButton(R.string.ok, null)
@@ -2580,7 +2578,7 @@ public class MwmActivity extends BaseMwmFragmentActivity
 
   private void reportUnsupported()
   {
-    new MaterialAlertDialogBuilder(this, R.style.MwmTheme_AlertDialog)
+    new MaterialAlertDialogBuilder(this)
         .setMessage(R.string.unsupported_phone)
         .setCancelable(false)
         .setPositiveButton(R.string.close, (dlg, which) -> this.moveTaskToBack(true))

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

@@ -120,7 +120,7 @@ public class SplashActivity extends AppCompatActivity
   private void showFatalErrorDialog(@StringRes int titleId, @StringRes int messageId, Exception error)
   {
     mCanceled = true;
-    new MaterialAlertDialogBuilder(this, R.style.MwmTheme_AlertDialog)
+    new MaterialAlertDialogBuilder(this, R.style.MwmTheme_M3_AlertDialog)
         .setTitle(titleId)
         .setMessage(messageId)
         .setPositiveButton(

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

@@ -60,14 +60,14 @@ public enum BookmarksSharingHelper
     case BookmarkSharingResult.SUCCESS ->
       SharingUtils.shareBookmarkFile(context, launcher, result.getSharingPath(), result.getMimeType());
     case BookmarkSharingResult.EMPTY_CATEGORY ->
-      new MaterialAlertDialogBuilder(context, R.style.MwmTheme_AlertDialog)
+      new MaterialAlertDialogBuilder(context)
           .setTitle(R.string.bookmarks_error_title_share_empty)
           .setMessage(R.string.bookmarks_error_message_share_empty)
           .setPositiveButton(R.string.ok, null)
           .show();
     case BookmarkSharingResult.ARCHIVE_ERROR, BookmarkSharingResult.FILE_ERROR ->
     {
-      new MaterialAlertDialogBuilder(context, R.style.MwmTheme_AlertDialog)
+      new MaterialAlertDialogBuilder(context)
           .setTitle(R.string.dialog_routing_system_error)
           .setMessage(R.string.bookmarks_error_message_share_general)
           .setPositiveButton(R.string.ok, null)

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

@@ -183,16 +183,11 @@ public final class UiHelpers
       drawableRes = R.drawable.ic_follow;
       tintColor = Colors.LOCATION_TINT;
     }
-    case LocationState.FOLLOW_AND_ROTATE_COMPASS ->
+    case LocationState.FOLLOW_AND_ROTATE ->
     {
       drawableRes = R.drawable.ic_follow_and_rotate;
       tintColor = Colors.LOCATION_TINT;
     }
-    case LocationState.FOLLOW_AND_ROTATE_ROUTE ->
-    {
-      drawableRes = R.drawable.ic_follow_route;
-      tintColor = Colors.LOCATION_TINT;
-    }
     default -> throw new IllegalArgumentException("Invalid button mode: " + locationMode);
     }
 

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

@@ -42,7 +42,7 @@ public final class CustomMapServerDialog
     edit.setText(current);
 
     MaterialAlertDialogBuilder builder =
-        new MaterialAlertDialogBuilder(context, R.style.MwmTheme_AlertDialog)
+        new MaterialAlertDialogBuilder(context)
             .setTitle(R.string.download_resources_custom_url_title)
             .setMessage(R.string.download_resources_custom_url_message)
             .setView(dialogView)

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

@@ -113,7 +113,7 @@ public class EditTextDialogFragment extends BaseMwmDialogFragment
       negativeButtonText = args.getString(ARG_NEGATIVE_BUTTON);
     }
 
-    AlertDialog editTextDialog = new MaterialAlertDialogBuilder(requireActivity(), R.style.MwmTheme_AlertDialog)
+    AlertDialog editTextDialog = new MaterialAlertDialogBuilder(requireActivity())
                                      .setView(buildView())
                                      .setNegativeButton(negativeButtonText, null)
                                      .setPositiveButton(positiveButtonText, null)

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

@@ -119,7 +119,7 @@ class DownloaderAdapter extends RecyclerView.Adapter<DownloaderAdapter.ViewHolde
   {
     if (RoutingController.get().isNavigating())
     {
-      new MaterialAlertDialogBuilder(adapter.mActivity, R.style.MwmTheme_AlertDialog)
+      new MaterialAlertDialogBuilder(adapter.mActivity)
           .setTitle(R.string.downloader_delete_map)
           .setMessage(R.string.downloader_delete_map_while_routing_dialog)
           .setPositiveButton(R.string.ok, null)
@@ -133,7 +133,7 @@ class DownloaderAdapter extends RecyclerView.Adapter<DownloaderAdapter.ViewHolde
       return;
     }
 
-    new MaterialAlertDialogBuilder(adapter.mActivity, R.style.MwmTheme_AlertDialog)
+    new MaterialAlertDialogBuilder(adapter.mActivity)
         .setTitle(R.string.downloader_delete_map)
         .setMessage(R.string.downloader_delete_map_dialog)
         .setNegativeButton(R.string.cancel, null)

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

@@ -49,7 +49,7 @@ public class MapManagerHelper
         return;
     }
 
-    final AlertDialog dlg = new MaterialAlertDialogBuilder(activity, R.style.MwmTheme_AlertDialog)
+    final AlertDialog dlg = new MaterialAlertDialogBuilder(activity)
                                 .setTitle(R.string.country_status_download_failed)
                                 .setMessage(getErrorCodeStrRes(errorData.errorCode))
                                 .setNegativeButton(R.string.cancel,
@@ -72,7 +72,7 @@ public class MapManagerHelper
 
   private static void notifyNoSpaceInternal(Activity activity)
   {
-    new MaterialAlertDialogBuilder(activity, R.style.MwmTheme_AlertDialog)
+    new MaterialAlertDialogBuilder(activity)
         .setTitle(R.string.downloader_no_space_title)
         .setMessage(R.string.downloader_no_space_message)
         .setPositiveButton(android.R.string.ok, null)
@@ -123,7 +123,7 @@ public class MapManagerHelper
       return false;
     }
 
-    new MaterialAlertDialogBuilder(activity, R.style.MwmTheme_AlertDialog)
+    new MaterialAlertDialogBuilder(activity)
         .setTitle(R.string.download_over_mobile_header)
         .setMessage(R.string.download_over_mobile_message)
         .setNegativeButton(R.string.cancel, null)

android/app/src/main/java/app/organicmaps/editor/EditorFragment.java

@@ -493,7 +493,7 @@ public class EditorFragment extends BaseMwmFragment implements View.OnClickListe
       }
     });
 
-    return new MaterialAlertDialogBuilder(requireActivity(), R.style.MwmTheme_AlertDialog)
+    return new MaterialAlertDialogBuilder(requireActivity())
         .setTitle(R.string.editor_socket)
         .setView(dialogView)
         .setPositiveButton(R.string.save,
@@ -997,7 +997,7 @@ public class EditorFragment extends BaseMwmFragment implements View.OnClickListe
       message = R.string.editor_reset_edits_message;
     }
 
-    new MaterialAlertDialogBuilder(requireActivity(), R.style.MwmTheme_AlertDialog)
+    new MaterialAlertDialogBuilder(requireActivity())
         .setTitle(message)
         .setPositiveButton(title,
                            (dialog, which) -> {
@@ -1020,7 +1020,7 @@ public class EditorFragment extends BaseMwmFragment implements View.OnClickListe
 
   private void placeDisused()
   {
-    new MaterialAlertDialogBuilder(requireActivity(), R.style.MwmTheme_AlertDialog)
+    new MaterialAlertDialogBuilder(requireActivity())
       .setTitle(R.string.editor_mark_business_vacant_title)
       .setMessage(R.string.editor_mark_business_vacant_description)
       .setPositiveButton(R.string.editor_submit, (dlg, which) -> {

android/app/src/main/java/app/organicmaps/editor/EditorHostFragment.java

@@ -352,7 +352,7 @@ public class EditorHostFragment
 
   private void processNoFeatures()
   {
-    new MaterialAlertDialogBuilder(requireActivity(), R.style.MwmTheme_AlertDialog)
+    new MaterialAlertDialogBuilder(requireActivity())
         .setTitle(R.string.downloader_no_space_title)
         .setPositiveButton(R.string.ok, null)
         .show();
@@ -386,7 +386,7 @@ public class EditorHostFragment
 
   private void showNoobDialog()
   {
-    new MaterialAlertDialogBuilder(requireActivity(), R.style.MwmTheme_AlertDialog)
+    new MaterialAlertDialogBuilder(requireActivity())
         .setTitle(R.string.editor_share_to_all_dialog_title)
         .setMessage(getString(R.string.editor_share_to_all_dialog_message_1) + " "
                     + getString(R.string.editor_share_to_all_dialog_message_2))

android/app/src/main/java/app/organicmaps/editor/FeatureCategoryFragment.java

@@ -155,7 +155,7 @@ public class FeatureCategoryFragment
   // Duplicate of showNoobDialog()
   private void showNoteConfirmationDialog(double lat, double lon, String noteText)
   {
-    new MaterialAlertDialogBuilder(requireActivity(), R.style.MwmTheme_AlertDialog)
+    new MaterialAlertDialogBuilder(requireActivity())
         .setTitle(R.string.editor_share_to_all_dialog_title)
         .setMessage(getString(R.string.editor_share_to_all_dialog_message_1) + " "
                     + getString(R.string.editor_share_to_all_dialog_message_2))

android/app/src/main/java/app/organicmaps/editor/OsmLoginFragment.java

@@ -79,7 +79,7 @@ public class OsmLoginFragment extends BaseMwmToolbarFragment
 
   private void onAuthFail()
   {
-    new MaterialAlertDialogBuilder(requireActivity(), R.style.MwmTheme_AlertDialog)
+    new MaterialAlertDialogBuilder(requireActivity())
         .setTitle(R.string.editor_login_error_dialog)
         .setPositiveButton(R.string.ok, null)
         .show();

android/app/src/main/java/app/organicmaps/help/FaqFragment.java

@@ -66,7 +66,7 @@ public class FaqFragment extends BaseMwmFragment
     FloatingActionButton feedbackFab = root.findViewById(R.id.feedback_fab);
     feedbackFab.setOnClickListener(
         v
-        -> new MaterialAlertDialogBuilder(requireActivity(), R.style.MwmTheme_AlertDialog)
+        -> new MaterialAlertDialogBuilder(requireActivity())
                .setTitle(R.string.feedback)
                .setNegativeButton(R.string.cancel, null)
                .setItems(new CharSequence[] {getString(R.string.feedback_general), getString(R.string.report_a_bug)},

android/app/src/main/java/app/organicmaps/maplayer/traffic/widget/TrafficButtonController.java

@@ -107,7 +107,7 @@ public class TrafficButtonController implements TrafficManager.TrafficCallback
     if (mDialog != null && mDialog.isShowing())
       return;
 
-    mDialog = new MaterialAlertDialogBuilder(mActivity, R.style.MwmTheme_AlertDialog)
+    mDialog = new MaterialAlertDialogBuilder(mActivity)
                   .setMessage(R.string.common_check_internet_connection_dialog)
                   .setPositiveButton(R.string.ok, (dialog, which) -> TrafficManager.INSTANCE.setEnabled(false))
                   .setCancelable(true)

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

@@ -56,7 +56,7 @@ abstract class BaseRoutingErrorDialogFragment extends BaseMwmDialogFragment
   public Dialog onCreateDialog(Bundle savedInstanceState)
   {
     parseArguments();
-    MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(requireActivity(), R.style.MwmTheme_AlertDialog)
+    MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(requireActivity())
                                              .setCancelable(true)
                                              .setNegativeButton(android.R.string.cancel, null);
     beforeDialogCreated(builder);

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

@@ -494,7 +494,7 @@ public class SettingsPrefsFragment extends BaseXmlSettingsFragment implements La
     pref.setOnPreferenceClickListener(preference -> {
       if (MapManager.nativeIsDownloading())
       {
-        new MaterialAlertDialogBuilder(requireActivity(), R.style.MwmTheme_AlertDialog)
+        new MaterialAlertDialogBuilder(requireActivity())
             .setTitle(R.string.downloading_is_active)
             .setMessage(R.string.cant_change_this_setting)
             .setPositiveButton(R.string.ok, null)

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

@@ -97,7 +97,7 @@ public class StoragePathFragment extends BaseSettingsFragment
     final String oldPath = storages.get(currentIndex).mPath;
     final String newPath = storages.get(newIndex).mPath;
 
-    new MaterialAlertDialogBuilder(requireActivity(), R.style.MwmTheme_AlertDialog)
+    new MaterialAlertDialogBuilder(requireActivity())
         .setCancelable(false)
         .setTitle(R.string.move_maps)
         .setPositiveButton(R.string.ok, (dlg, which) -> moveStorage(newPath, oldPath))
@@ -133,7 +133,7 @@ public class StoragePathFragment extends BaseSettingsFragment
 
         if (!result)
         {
-          new MaterialAlertDialogBuilder(requireActivity(), R.style.MwmTheme_AlertDialog)
+          new MaterialAlertDialogBuilder(requireActivity())
               .setTitle(R.string.move_maps_error)
               .setPositiveButton(
                   R.string.report_a_bug,

android/app/src/main/java/app/organicmaps/widget/menu/MyPositionButton.java

@@ -49,8 +49,8 @@ public class MyPositionButton
     int colorAttr = R.attr.iconTint;
     @DimenRes
     int sizeDimen = R.dimen.map_button_icon_size;
-    if (mode == LocationState.FOLLOW || mode == LocationState.FOLLOW_AND_ROTATE_ROUTE
-        || mode == LocationState.FOLLOW_AND_ROTATE_COMPASS || mode == LocationState.PENDING_POSITION)
+    if (mode == LocationState.FOLLOW || mode == LocationState.FOLLOW_AND_ROTATE
+        || mode == LocationState.PENDING_POSITION)
     {
       colorAttr = com.google.android.material.R.attr.colorSecondary;
       if (mode == LocationState.PENDING_POSITION)
@@ -69,8 +69,7 @@ public class MyPositionButton
         case LocationState.NOT_FOLLOW_NO_POSITION -> R.drawable.ic_location_off;
         case LocationState.NOT_FOLLOW -> R.drawable.ic_location_crosshair;
         case LocationState.FOLLOW -> R.drawable.ic_follow;
-        case LocationState.FOLLOW_AND_ROTATE_COMPASS -> R.drawable.ic_follow_and_rotate;
-        case LocationState.FOLLOW_AND_ROTATE_ROUTE -> R.drawable.ic_follow_route;
+        case LocationState.FOLLOW_AND_ROTATE -> R.drawable.ic_follow_and_rotate;
         default -> throw new IllegalArgumentException("Invalid button mode: " + mode);
       };
           image = ResourcesCompat.getDrawable(resources, drawableRes, context.getTheme());

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

@@ -47,7 +47,7 @@ public class BookmarkColorDialogFragment extends BaseMwmDialogFragment
         mIconResId = getArguments().getInt(ICON_RES);
     }
 
-    return new MaterialAlertDialogBuilder(requireActivity(), R.style.MwmTheme_AlertDialog)
+    return new MaterialAlertDialogBuilder(requireActivity())
         .setView(buildView())
         .setTitle(R.string.choose_color)
         .setNegativeButton(R.string.cancel, null)

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

@@ -464,7 +464,7 @@ public class PlacePageController
       mAlertDialog.show();
       return;
     }
-    mAlertDialog = new MaterialAlertDialogBuilder(requireContext(), R.style.MwmTheme_AlertDialog)
+    mAlertDialog = new MaterialAlertDialogBuilder(requireContext())
                        .setTitle(requireContext().getString(R.string.delete_track_dialog_title, mMapObject.getTitle()))
                        .setCancelable(true)
                        .setNegativeButton(R.string.cancel, null)

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

@@ -4,7 +4,7 @@
   android:color="?colorControlHighlight">
   <item>
     <shape>
-      <solid android:color="?cardBackground" />
+      <solid android:color="?appBackground" />
     </shape>
   </item>
   <item android:id="@android:id/mask">

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

@@ -1,30 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-  <path
-      android:strokeColor="@android:color/white"
-      android:fillColor="@android:color/white"
-      android:pathData="M15.15 16.92l-7.04 2.8v0.4l2.63 1.07 0.98 2.67h0.39z"/>
-  <path
-      android:strokeColor="@android:color/white"
-      android:strokeWidth="2"
-      android:strokeLineJoin="miter"
-      android:pathData="m 16.25,15.95 c 2.29,-2.29 1.91,-3.87 -4.06,-3.87"/>
-  <path
-      android:strokeColor="@android:color/white"
-      android:strokeWidth="2"
-      android:strokeLineJoin="miter"
-      android:pathData="M8.98 7.43c-2.97 2.96-2.72 4.66 3.24 4.66"/>
-  <path
-      android:strokeColor="@android:color/white"
-      android:strokeWidth="2"
-      android:strokeLineJoin="miter"
-      android:pathData="M8.89 7.51l8.83-8.79"/>
-  <path
-      android:strokeColor="@android:color/white"
-      android:strokeWidth="2"
-      android:strokeLineJoin="miter"
-      android:pathData="M9.2 22.83c-0.64 0.57-2.9 2.5-3.56 3.13"/>
-</vector>

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

@@ -1,12 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
+<com.google.android.material.card.MaterialCardView
   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:orientation="vertical"
+  style="@style/Widget.Material3.CardView.Filled"
   android:layout_width="match_parent"
   android:layout_height="match_parent"
   android:paddingBottom="@dimen/margin_half"
-  android:background="?cardBackground">
+  app:cardBackgroundColor="?attr/colorSurfaceContainerHigh"
+  app:cardCornerRadius="28dp">
+<LinearLayout
+  android:orientation="vertical"
+  android:layout_width="match_parent"
+  android:layout_height="match_parent">
 
   <LinearLayout
     android:orientation="vertical"
@@ -49,3 +55,4 @@
       tools:text="Do not Use Today"/>
   </LinearLayout>
 </LinearLayout>
+</com.google.android.material.card.MaterialCardView>

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

@@ -22,12 +22,9 @@
       android:layout_height="match_parent"
       android:clipChildren="false"
       android:clipToPadding="false"
-      android:orientation="vertical"
+      android:baselineAligned="false"
+      android:orientation="horizontal"
       tools:ignore="ScrollViewSize">
-      <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:orientation="horizontal">
         <LinearLayout
           android:layout_width="0dp"
           android:layout_height="match_parent"
@@ -111,6 +108,5 @@
             android:text="@string/register_at_openstreetmap" />
         </LinearLayout>
       </LinearLayout>
-    </LinearLayout>
   </ScrollView>
 </LinearLayout>

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

@@ -17,6 +17,7 @@
     android:id="@+id/street_frame"
     android:layout_width="500dp"
     android:layout_height="wrap_content"
+    style="@style/Widget.Material3.CardView.Filled"
     android:layout_marginEnd="@dimen/margin_quarter"
     app:cardCornerRadius="@dimen/margin_half"
     android:elevation="@dimen/nav_elevation"

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

@@ -11,8 +11,7 @@
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
     android:orientation="horizontal"
-    android:backgroundTint="?menuBackground"
-    android:background="@drawable/onmap_downloader_background"
+    android:background="?menuBackground"
     android:padding="@dimen/margin_base"
     android:clipToPadding="false"
     android:clipChildren="false"

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

@@ -1,13 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
+<com.google.android.material.card.MaterialCardView
   xmlns:android="http://schemas.android.com/apk/res/android"
   xmlns:app="http://schemas.android.com/apk/res-auto"
+  style="@style/Widget.Material3.CardView.Filled"
   android:layout_width="match_parent"
   android:layout_height="wrap_content"
   android:layout_margin="@dimen/margin_double_and_half"
-  android:background="?cardBackground"
   android:minWidth="@dimen/dialog_min_width"
   android:minHeight="@dimen/dialog_min_height"
+  app:cardBackgroundColor="?attr/colorSurfaceContainerHigh"
+  app:cardCornerRadius="28dp">
+<LinearLayout
+  android:layout_width="match_parent"
+  android:layout_height="wrap_content"
   android:orientation="vertical"
   android:padding="@dimen/margin_base_plus">
 
@@ -77,3 +82,4 @@
       app:buttonTint="@null"/>
   </RadioGroup>
 </LinearLayout>
+</com.google.android.material.card.MaterialCardView>

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

@@ -1,12 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
+<com.google.android.material.card.MaterialCardView
   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:orientation="vertical"
+  style="@style/Widget.Material3.CardView.Filled"
   android:layout_width="match_parent"
   android:layout_height="match_parent"
   android:paddingBottom="@dimen/margin_half"
-  android:background="?cardBackground">
+  app:cardBackgroundColor="?attr/colorSurfaceContainerHigh"
+  app:cardCornerRadius="28dp">
+<LinearLayout
+  android:orientation="vertical"
+  android:layout_width="match_parent"
+  android:layout_height="match_parent">
 
   <LinearLayout
     android:orientation="vertical"
@@ -41,3 +47,4 @@
     style="@style/MwmWidget.Button.StackedButtonsDialog"
     tools:text="Do not Use Today"/>
 </LinearLayout>
+</com.google.android.material.card.MaterialCardView>

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

@@ -13,7 +13,6 @@
     android:paddingTop="@dimen/margin_half"
     android:paddingBottom="@dimen/margin_half"
     android:layout_marginEnd="@dimen/margin_base"
-    android:background="?cardBackground"
     android:textAppearance="@style/MwmTextAppearance.Caption"
     tools:text="Downloaded"
     tools:background="#80FF0000"/>

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

@@ -6,7 +6,7 @@
   android:id="@+id/rl__bookmark_details"
   android:layout_width="match_parent"
   android:layout_height="match_parent"
-  android:background="?cardBackground"
+  android:background="?appBackground"
   android:padding="@dimen/margin_half">
   <LinearLayout
     android:id="@+id/ll__bookmark_name"

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

@@ -3,7 +3,7 @@
   xmlns:android="http://schemas.android.com/apk/res/android"
   xmlns:app="http://schemas.android.com/apk/res-auto"
   android:orientation="vertical"
-  android:background="?cardBackground"
+  android:background="?appBackground"
   android:layout_width="match_parent"
   android:layout_height="match_parent">
   <com.google.android.material.appbar.MaterialToolbar
@@ -69,7 +69,6 @@
       android:inputType="textMultiLine"/>
     </com.google.android.material.textfield.TextInputLayout>
     <View
-      android:background="?cardBackground"
       android:layout_width="match_parent"
       android:layout_height="match_parent"/>
   </LinearLayout>

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

@@ -11,5 +11,6 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:scrollbars="vertical"
-    android:fadeScrollbars="false" />
+    android:fadeScrollbars="false"
+    android:background="?appBackground"/>
 </LinearLayout>

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

@@ -4,7 +4,7 @@
   xmlns:app="http://schemas.android.com/apk/res-auto"
   xmlns:tools="http://schemas.android.com/tools"
   style="@style/MwmWidget.Floating"
-  android:background="?cardBackground"
+  android:background="?appBackground"
   android:layout_width="match_parent"
   android:layout_height="match_parent">
   <include layout="@layout/toolbar_with_search"/>
@@ -17,10 +17,12 @@
     style="@style/MwmWidget.Button.Primary"
     tools:text="@string/downloader_update_all_button"/>
 
-  <include
-    layout="@layout/recycler_default"
+  <androidx.recyclerview.widget.RecyclerView
+    android:id="@+id/recycler"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:background="?appBackground"
+    android:scrollbars="vertical"
     android:layout_below="@id/toolbar"
     android:layout_above="@id/action"/>
 

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

@@ -4,7 +4,7 @@
   xmlns:app="http://schemas.android.com/apk/res-auto"
   android:layout_width="match_parent"
   android:layout_height="match_parent"
-  android:background="?cardBackground">
+  android:background="?appBackground">
   <com.google.android.material.appbar.MaterialToolbar
     android:id="@+id/toolbar"
     style="@style/MwmWidget.ToolbarStyle"

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

@@ -5,6 +5,7 @@
   android:layout_width="match_parent"
   android:layout_height="match_parent"
   xmlns:app="http://schemas.android.com/apk/res-auto"
+  android:background="?windowBackgroundForced"
   android:orientation="vertical">
 
   <com.google.android.material.appbar.MaterialToolbar

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

@@ -10,7 +10,7 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:id="@+id/frameLayout"
-        android:background="?cardBackground">
+        android:background="?windowBackgroundForced">
 
         <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/phones_recycler"

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

@@ -61,12 +61,12 @@
         android:layout_height="match_parent"
         android:clickable="true"
         android:focusable="true"
-        android:background="?cardBackground">
+        android:background="?appBackground">
 
         <androidx.recyclerview.widget.RecyclerView
           android:id="@+id/recycler"
           android:clipToPadding="false"
-          android:background="?cardBackground"
+          android:background="?appBackground"
           android:layout_width="match_parent"
           android:layout_height="match_parent"
           />

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

@@ -4,6 +4,10 @@
   style="@style/MwmWidget.FrameLayout"
   android:layout_width="match_parent"
   android:layout_height="match_parent">
-  <include
-    layout="@layout/recycler_default"/>
+  <androidx.recyclerview.widget.RecyclerView
+    android:id="@+id/recycler"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="?appBackground"
+    android:scrollbars="vertical"/>
 </FrameLayout>

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

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ScrollView
   xmlns:android="http://schemas.android.com/apk/res/android"
-  xmlns:card_view="http://schemas.android.com/apk/res-auto"
+  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"
@@ -13,36 +13,12 @@
     android:orientation="vertical"
     android:padding="@dimen/margin_half">
 
-    <com.google.android.material.card.MaterialCardView
-      android:layout_width="match_parent"
-      android:layout_height="wrap_content"
-      style="@style/MwmWidget.M3.Editor.CardView"
-      card_view:cardBackgroundColor="?cardBackground"
-      card_view:cardCornerRadius="2dp"
-      card_view:cardElevation="4dp">
-
-      <com.google.android.material.textfield.TextInputEditText
-        android:id="@+id/et__timetable"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_alignParentBottom="true"
-        android:background="@null"
-        android:gravity="top|start"
-        android:inputType="textMultiLine"
-        android:padding="@dimen/margin_base"
-        android:textAppearance="@style/MwmTextAppearance.Body3"
-        tools:hint="hint"
-        tools:text="trololo \ntrololo \ntrololo"/>
-
-    </com.google.android.material.card.MaterialCardView>
-
     <com.google.android.material.card.MaterialCardView
       android:layout_width="match_parent"
       android:layout_height="wrap_content"
       android:layout_marginTop="@dimen/margin_half"
-      card_view:cardBackgroundColor="?cardBackground"
-      card_view:cardCornerRadius="2dp"
-      card_view:cardElevation="4dp">
+      style="@style/MwmWidget.M3.Editor.CardView"
+      app:cardBackgroundColor="?cardBackground">
 
       <LinearLayout
         android:id="@+id/examples"
@@ -50,6 +26,26 @@
         android:layout_height="match_parent"
         android:orientation="vertical"
         android:animateLayoutChanges="true">
+          <com.google.android.material.textfield.TextInputLayout
+              android:layout_width="match_parent"
+              android:layout_height="wrap_content"
+              android:padding="@dimen/margin_half"
+              android:layout_marginBottom="@dimen/margin_half"
+              app:hintEnabled="false">
+
+          <com.google.android.material.textfield.TextInputEditText
+              android:id="@+id/et__timetable"
+              android:layout_width="match_parent"
+              android:layout_height="wrap_content"
+              android:layout_alignParentBottom="true"
+              android:background="@null"
+              android:gravity="top|start"
+              android:inputType="textMultiLine"
+              android:padding="@dimen/margin_base"
+              android:textAppearance="@style/MwmTextAppearance.Body3"
+              tools:hint="hint"
+              tools:text="trololo \ntrololo \ntrololo"/>
+          </com.google.android.material.textfield.TextInputLayout>
 
         <com.google.android.material.textview.MaterialTextView
           android:id="@+id/tv__examples_title"

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

@@ -3,7 +3,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="?cardBackground"
+    android:background="?appBackground"
     android:padding="@dimen/margin_base">
 
   <LinearLayout

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

@@ -5,7 +5,7 @@
   style="@style/MwmTextAppearance.Headline6"
   android:layout_width="match_parent"
   android:layout_height="wrap_content"
-  android:background="?windowBackgroundForced"
+  android:background="?appBackground"
   android:gravity="start|center_vertical"
   android:paddingStart="@dimen/margin_base"
   android:paddingTop="@dimen/margin_base_plus"

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

@@ -6,7 +6,7 @@
   xmlns:app="http://schemas.android.com/apk/res-auto"
   android:layout_gravity="center"
   android:orientation="vertical"
-  android:background="?cardBackground"
+  android:background="?appBackground"
   android:padding="@dimen/margin_base">
   <com.google.android.material.textview.MaterialTextView
     android:layout_width="match_parent"

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

@@ -7,7 +7,7 @@
   xmlns:tools="http://schemas.android.com/tools"
   android:layout_width="match_parent"
   android:layout_height="wrap_content"
-  android:background="?cardBackground"
+  android:background="?colorSurfaceContainerHigh"
   android:minHeight="@dimen/height_item_oneline"
   android:paddingStart="@dimen/margin_base_plus"
   android:paddingEnd="@dimen/margin_base_plus">

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

@@ -7,7 +7,7 @@
   xmlns:tools="http://schemas.android.com/tools"
   android:layout_width="match_parent"
   android:layout_height="wrap_content"
-  android:background="?cardBackground"
+  android:background="?colorSurfaceContainerHigh"
   android:minHeight="@dimen/height_item_oneline"
   android:paddingStart="@dimen/margin_base_plus"
   android:paddingEnd="@dimen/margin_base_plus">

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

@@ -1,11 +1,15 @@
-<androidx.constraintlayout.widget.ConstraintLayout
+<com.google.android.material.card.MaterialCardView
     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"
+    style="@style/MwmWidget.M3.Editor.CardView"
     android:layout_width="match_parent"
-    android:layout_height="@dimen/height_item_oneline"
-    android:background="?clickableBackground"
-    android:layout_marginTop="@dimen/margin_half"
+    android:layout_margin="@dimen/margin_eighth"
+    android:layout_height="wrap_content">
+<androidx.constraintlayout.widget.ConstraintLayout
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:padding="@dimen/margin_half"
+    android:background="?cardBackground"
     android:paddingStart="@dimen/margin_half_plus"
     android:paddingEnd="@dimen/margin_half_plus">
 
@@ -25,7 +29,6 @@
         android:layout_marginStart="@dimen/margin_half"
         android:layout_marginEnd="@dimen/margin_half"
         android:layout_toStartOf="@id/delete_icon"
-        android:textColorHint="?android:textColorSecondary"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toStartOf="@+id/delete_icon"
         app:layout_constraintStart_toEndOf="@+id/phone_icon"
@@ -41,7 +44,6 @@
     <com.google.android.material.imageview.ShapeableImageView
       android:id="@+id/delete_icon"
       style="@style/MwmWidget.Editor.MetadataIcon"
-      android:layout_marginStart="@dimen/margin_half"
       app:layout_constraintBottom_toBottomOf="parent"
       app:layout_constraintEnd_toEndOf="parent"
       app:layout_constraintTop_toTopOf="parent"
@@ -49,3 +51,4 @@
       app:srcCompat="@drawable/ic_delete" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
+</com.google.android.material.card.MaterialCardView>

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

@@ -17,6 +17,7 @@
     android:id="@+id/street_frame"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
+    style="@style/Widget.Material3.CardView.Filled"
     android:layout_marginStart="@dimen/nav_street_left"
     android:layout_marginEnd="@dimen/margin_quarter"
     app:cardCornerRadius="@dimen/margin_half"

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

@@ -4,7 +4,7 @@
   android:id="@+id/menu_frame"
   android:layout_width="match_parent"
   android:layout_height="wrap_content"
-  android:background="?cardBackground"
+  android:background="?appBackground"
   android:clickable="true"
   android:visibility="gone"
   tools:visibility="visible">

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

@@ -2,7 +2,7 @@
 <LinearLayout
   xmlns:android="http://schemas.android.com/apk/res/android"
   android:orientation="horizontal"
-  android:background="?cardBackground"
+  android:background="?appBackground"
   android:layout_width="match_parent"
   android:layout_height="wrap_content">
 

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

@@ -29,7 +29,7 @@
   <com.google.android.material.textview.MaterialTextView
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="?cardBackground"
+    android:background="?appBackground"
     android:padding="@dimen/margin_base"
     android:text="@string/editor_focus_map_on_location"
     app:layout_constraintTop_toBottomOf="@+id/toolbar_point_chooser" />

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

@@ -6,7 +6,7 @@
   android:layout_width="match_parent"
   android:layout_height="wrap_content"
   android:minHeight="@dimen/height_block_base"
-  android:background="?cardBackground"
+  android:background="?appBackground"
   android:baselineAligned="false">
   <LinearLayout
     android:id="@+id/btn__search_point"

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

@@ -146,16 +146,13 @@
     android:foreground="@drawable/shadow_top"
     android:visibility="gone"
     tools:visibility="visible">
-    <RelativeLayout
+    <LinearLayout
       android:id="@+id/driving_options_btn"
       android:layout_width="match_parent"
       android:layout_height="wrap_content"
       android:background="?selectableItemBackgroundBorderless"
       android:gravity="center"
       android:minHeight="@dimen/height_block_base">
-      <LinearLayout
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content">
         <com.google.android.material.imageview.ShapeableImageView
           android:id="@+id/driving_options_btn_img"
           android:layout_width="@dimen/margin_base_plus"
@@ -174,8 +171,7 @@
           android:textAppearance="?android:attr/textAppearanceSmall"
           android:textColor="@color/text_light"
           tools:text="test" />
-      </LinearLayout>
-    </RelativeLayout>
+    </LinearLayout>
   </FrameLayout>
   <FrameLayout
     style="@style/MwmWidget.FrameLayout.Elevation"

android/app/src/main/res/values-night/themes.xml

@@ -11,7 +11,7 @@
     <item name="android:textColorPrimary">@color/text_light</item>
     <item name="android:textColorPrimaryInverse">@color/text_dark</item>
     <item name="android:textColorSecondary">@color/text_light_subtitle</item>
-    <item name="android:windowBackground">?windowBackgroundForced</item>
+    <item name="android:windowBackground">?appBackground</item>
     <item name="android:colorPrimaryDark">@color/bg_primary_dark</item>
     <item name="android:windowSoftInputMode">stateUnspecified|adjustPan</item>
     <item name="android:fontFamily">@string/robotoRegular</item>
@@ -21,7 +21,7 @@
     <item name="android:statusBarColor">?colorPrimary</item>
     <item name="android:windowTranslucentNavigation">false</item>
 
-    <item name="alertDialogTheme">@style/MwmTheme.AlertDialog</item>
+    <item name="alertDialogTheme">@style/MwmTheme.M3.AlertDialog</item>
     <item name="windowBackgroundForced">@color/bg_window</item>
     <item name="cardBackground">@color/bg_cards</item>
     <item name="titleDialogTheme">@color/white_primary</item>

android/app/src/main/res/values/dimens.xml

@@ -120,7 +120,7 @@
 
   <dimen name="nav_frame_padding">@dimen/margin_half</dimen>
   <dimen name="zoom_buttons_margin">58dp</dimen>
-  <dimen name="map_buttons_bottom_margin">184dp</dimen>
+  <dimen name="map_buttons_bottom_margin">136dp</dimen>
   <dimen name="map_buttons_bottom_max_width">300dp</dimen>
 
   <dimen name="appbar_elevation">4dp</dimen>

android/app/src/main/res/values/themes.xml

@@ -12,7 +12,7 @@
     <item name="android:textColorPrimary">@color/text_dark</item>
     <item name="android:textColorPrimaryInverse">@color/text_light</item>
     <item name="android:textColorSecondary">@color/text_dark_subtitle</item>
-    <item name="android:windowBackground">?windowBackgroundForced</item>
+    <item name="android:windowBackground">?appBackground</item>
     <item name="android:colorPrimaryDark">@color/bg_primary_dark</item>
     <item name="android:windowSoftInputMode">stateUnspecified|adjustPan</item>
     <item name="android:fontFamily">@string/robotoRegular</item>
@@ -20,7 +20,7 @@
     <item name="android:windowActionBarOverlay">true</item>
     <item name="clickableBackground">?selectableItemBackground</item>
     <item name="android:statusBarColor">?colorPrimary</item>
-    <item name="alertDialogTheme">@style/MwmTheme.AlertDialog</item>
+    <item name="alertDialogTheme">@style/MwmTheme.M3.AlertDialog</item>
     <item name="windowBackgroundForced">@color/bg_window</item>
     <item name="cardBackground">@color/bg_cards</item>
     <item name="titleDialogTheme">@color/black_primary</item>
@@ -185,11 +185,11 @@
   </style>
 
   <style name="MwmTheme.CardBg">
-    <item name="android:windowBackground">@color/bg_cards</item>
+    <item name="android:windowBackground">?appBackground</item>
   </style>
 
   <style name="MwmTheme.WindowBg">
-    <item name="android:windowBackground">@color/bg_window</item>
+    <item name="android:windowBackground">?appBackground</item>
   </style>
 
   <style name="MwmTheme.AlertDialog" parent="Theme.Material3.DayNight.Dialog.Alert">
@@ -243,7 +243,7 @@
 
   <style name="MwmTheme.FullScreenDialog">
     <item name="android:windowIsFloating">false</item>
-    <item name="android:windowBackground">@android:color/white</item>
+    <item name="android:windowBackground">?appBackground</item>
   </style>
 
   <style name="MwmTheme.MaterialTimePicker" parent="ThemeOverlay.MaterialComponents.TimePicker">
@@ -281,4 +281,11 @@
   <style name="PopupMenu" parent="ThemeOverlay.Material3">
     <item name="android:popupBackground">?windowBackgroundForced</item>
   </style>
+    <!-- Theme required to apply M3 dialog style on preference screen -->
+    <style name="MwmTheme.M3.AlertDialog" parent="ThemeOverlay.Material3.MaterialAlertDialog">
+        <item name="dialogCornerRadius">28dp</item>
+        <item name="cornerFamily">rounded</item>
+        <item name="android:colorBackground">?attr/colorSurfaceContainerHigh</item>
+        <item name="android:layout">@layout/m3_alert_dialog</item>
+    </style>
 </resources>

android/sdk/src/main/java/app/organicmaps/sdk/location/LocationHelper.java

@@ -27,8 +27,6 @@ import app.organicmaps.sdk.util.NetworkPolicy;
 import app.organicmaps.sdk.util.log.Logger;
 import org.chromium.base.ObserverList;
 
-import java.util.HashMap;
-
 public class LocationHelper implements BaseLocationProvider.Listener
 {
   private static final long INTERVAL_MS = 500;
@@ -58,12 +56,6 @@ public class LocationHelper implements BaseLocationProvider.Listener
   private Handler mHandler;
   private Runnable mLocationTimeoutRunnable = this::notifyLocationUpdateTimeout;
 
-  private static final double INTERVAL_PROVIDER_DECISION = 3.0; // seconds
-  private final HashMap<String, Integer> mProviderLocationCounts = new HashMap<>();
-  private final HashMap<String, Float> mProviderAccuracyMeans = new HashMap<>();
-  private double mTimeAtLastProviderChange = Double.NaN;
-  private String mCurrentProvider = null;
-
   @NonNull
   private final GnssStatusCompat.Callback mGnssStatusCallback = new GnssStatusCompat.Callback() {
     @Override
@@ -195,6 +187,7 @@ public class LocationHelper implements BaseLocationProvider.Listener
   @Override
   public void onLocationChanged(@NonNull Location location)
   {
+    Logger.d(TAG, "provider = " + mLocationProvider.getClass().getSimpleName() + " location = " + location);
 
     if (!isActive())
     {
@@ -208,59 +201,21 @@ public class LocationHelper implements BaseLocationProvider.Listener
       return;
     }
 
-    updateProviderDecision(location);
-    if(mCurrentProvider != null && !mCurrentProvider.equals(location.getProvider())) {
-        Logger.d(TAG, "REJECTED: provider = " + mLocationProvider.getClass().getSimpleName() + " location = " + location);
+    if (mSavedLocation != null)
+    {
+      if (!LocationUtils.isLocationBetterThanLast(location, mSavedLocation))
+      {
+        Logger.d(TAG, "The new " + location + " is worse than the last " + mSavedLocation);
         return;
+      }
     }
 
-    Logger.d(TAG, "provider = " + mLocationProvider.getClass().getSimpleName() + " location = " + location);
-
     mSavedLocation = location;
     mMyPosition = null;
     notifyLocationUpdated();
   }
 
-    private void updateProviderDecision(Location location) {
-      if(Double.isNaN(mTimeAtLastProviderChange))
-          mTimeAtLastProviderChange = location.getElapsedRealtimeNanos() * 1.0E-9;
-
-      String provider = location.getProvider();
-      int count = mProviderLocationCounts.getOrDefault(provider, 0);
-      float average = mProviderAccuracyMeans.getOrDefault(provider, 0.0f);
-
-      float accuracy = location.getAccuracy();
-      float newAverage = (count * average + accuracy) / (count + 1);
-
-      mProviderLocationCounts.put(provider, count + 1);
-      mProviderAccuracyMeans.put(provider, newAverage);
-
-      double currentTime = location.getElapsedRealtimeNanos();
-      double timeDiff = (currentTime - mTimeAtLastProviderChange) * 1.0E-9;
-
-      if(timeDiff > INTERVAL_PROVIDER_DECISION) {
-          mCurrentProvider = getMinAccuracyProvider();
-          Logger.d(TAG, "Selected: " + mCurrentProvider + ", with acc. " + mProviderAccuracyMeans.get(mCurrentProvider));
-          mTimeAtLastProviderChange = currentTime;
-          mProviderLocationCounts.clear();
-          mProviderAccuracyMeans.clear();
-      }
-    }
-
-    private String getMinAccuracyProvider() {
-        String minAccuracyProvider = null;
-        float minAccuracy = Float.MAX_VALUE;
-        for(String p : mProviderAccuracyMeans.keySet()) {
-            float pAccuracy = mProviderAccuracyMeans.get(p);
-            if(pAccuracy < minAccuracy) {
-                minAccuracy = pAccuracy;
-                minAccuracyProvider = p;
-            }
-        }
-        return minAccuracyProvider;
-    }
-
-    // Used by GoogleFusedLocationProvider.
+  // Used by GoogleFusedLocationProvider.
   @SuppressWarnings("unused")
   @Override
   @UiThread

android/sdk/src/main/java/app/organicmaps/sdk/location/LocationState.java

@@ -20,8 +20,7 @@ public final class LocationState
   }
 
   @Retention(RetentionPolicy.SOURCE)
-  @IntDef({PENDING_POSITION, NOT_FOLLOW_NO_POSITION, NOT_FOLLOW, FOLLOW, FOLLOW_AND_ROTATE_COMPASS,
-           FOLLOW_AND_ROTATE_ROUTE})
+  @IntDef({PENDING_POSITION, NOT_FOLLOW_NO_POSITION, NOT_FOLLOW, FOLLOW, FOLLOW_AND_ROTATE})
   @interface Value
   {}
 
@@ -30,8 +29,7 @@ public final class LocationState
   public static final int NOT_FOLLOW_NO_POSITION = 1;
   public static final int NOT_FOLLOW = 2;
   public static final int FOLLOW = 3;
-  public static final int FOLLOW_AND_ROTATE_COMPASS = 4;
-  public static final int FOLLOW_AND_ROTATE_ROUTE = 5;
+  public static final int FOLLOW_AND_ROTATE = 4;
 
   // These constants should correspond to values defined in platform/location.hpp
   // Leave 0-value as no any error.
@@ -71,8 +69,7 @@ public final class LocationState
       case NOT_FOLLOW_NO_POSITION -> "NOT_FOLLOW_NO_POSITION";
       case NOT_FOLLOW -> "NOT_FOLLOW";
       case FOLLOW -> "FOLLOW";
-      case FOLLOW_AND_ROTATE_COMPASS -> "FOLLOW_AND_ROTATE_COMPASS";
-      case FOLLOW_AND_ROTATE_ROUTE -> "FOLLOW_AND_ROTATE_ROUTE";
+      case FOLLOW_AND_ROTATE -> "FOLLOW_AND_ROTATE";
       default -> "Unknown: " + mode;
     };
   }

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

@@ -81,6 +81,20 @@ public class LocationUtils
     return location.getAccuracy() > 0.0f;
   }
 
+  public static boolean isLocationBetterThanLast(@NonNull Location newLocation, @NonNull Location lastLocation)
+  {
+    if (newLocation.getElapsedRealtimeNanos() < lastLocation.getElapsedRealtimeNanos())
+      return false;
+
+    // As described in isAccuracySatisfied, GPS may have zero accuracy "for some reasons".
+    if (isFromGpsProvider(lastLocation) && lastLocation.getAccuracy() == 0.0f)
+      return true;
+
+    double speed = Math.max(DEFAULT_SPEED_MPS, (newLocation.getSpeed() + lastLocation.getSpeed()) / 2.0);
+    double lastAccuracy = lastLocation.getAccuracy() + speed * LocationUtils.getTimeDiff(lastLocation, newLocation);
+    return newLocation.getAccuracy() < lastAccuracy;
+  }
+
   public static boolean areLocationServicesTurnedOn(@NonNull Context context)
   {
     if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P)

data/sound-strings/ta.json/localize.json

@@ -1,108 +0,0 @@
-{
-"make_a_slight_right_turn":"லேசாக வலதுபுறம் திரும்புங்கள்.",
-"make_a_slight_right_turn_street":"NULL",
-"make_a_slight_right_turn_street_verb":"NULL",
-"make_a_right_turn":"வலதுபுறமாக திரும்புங்கள்.",
-"make_a_right_turn_street":"NULL",
-"make_a_sharp_right_turn":"கூர்மையாக வலதுபுறம் திரும்புங்கள்.",
-"make_a_sharp_right_turn_street":"NULL",
-"enter_the_roundabout":"ரவுண்டபௌட்டை நுழையுங்கள்.",
-"enter_the_roundabout_street":"NULL",
-"enter_the_roundabout_street_verb":"NULL",
-"leave_the_roundabout":"ரவுண்டபௌட்டை வெளியேறுங்கள்.",
-"leave_the_roundabout_street":"NULL",
-"leave_the_roundabout_street_verb":"NULL",
-"make_a_slight_left_turn":"லேசாக இடதுபுறம் திரும்புங்கள்.",
-"make_a_slight_left_turn_street":"NULL",
-"make_a_slight_left_turn_street_verb":"NULL",
-"make_a_left_turn":"இடதுபுறமாக திரும்புங்கள்.",
-"make_a_left_turn_street":"NULL",
-"make_a_sharp_left_turn":"கூர்மையாக இடதுபுறம் திரும்புங்கள்.",
-"make_a_sharp_left_turn_street":"NULL",
-"make_a_u_turn":"U-வழியில் திரும்புங்கள்.",
-"make_a_u_turn_street":"NULL",
-"make_a_u_turn_street_verb":"NULL",
-"go_straight":"நேரா போங்க.",
-"exit":"வெளியேறுங்கள்.",
-"onto":"நோக்கி",
-"take_exit_number":"வெளியேறும் வழி எடுங்கள்",
-"take_exit_number_street_verb":"NULL",
-"route_recalculating":"வழி மறுபடி கணிக்கிறது",
-"destination":"நீங்கள் வருவீர்கள்.",
-"you_have_reached_the_destination":"நீங்கள் வந்துவிட்டீர்கள்..",
-"in_50_meters":"ஐம்பது மீட்டரில்",
-"in_100_meters":"நூறு மீட்டரில்",
-"in_200_meters":"இருநூறு மீட்டரில்",
-"in_250_meters":"இருநூற்று ஐம்பது மீட்டரில்",
-"in_300_meters":"முன்னூறு மீட்டரில்",
-"in_400_meters":"நானூறு மீட்டரில்",
-"in_500_meters":"ஐநூறு மீட்டரில்",
-"in_600_meters":"அறுநூறு மீட்டரில்",
-"in_700_meters":"எழுநூறு மீட்டரில்",
-"in_750_meters":"எழுநூறு ஐம்பது மீட்டரில்",
-"in_800_meters":"எண்ணூறு மீட்டரில்",
-"in_900_meters":"தொள்ளாயிரம் மீட்டரில்",
-"in_1_kilometer":"ஒரு கிலோமீட்டரில்",
-"in_1_5_kilometers":"ஒன்றரை கிலோமீட்டரில்",
-"in_2_kilometers":"இரண்டு கிலோமீட்டரில்",
-"in_2_5_kilometers":"இரண்டரை கிலோமீட்டரில்",
-"in_3_kilometers":"மூன்று கிலோமீட்டரில்",
-"then":"அடுத்தது",
-"dist_direction_onto_street":"%1$s %4$s %3$s %5$s %2$s",
-"take_the_1_exit":"ஒன்றாம் வெளியேறும் வழி எடுங்கள்.",
-"take_the_1_exit_street":"NULL",
-"take_the_1_exit_street_verb":"NULL",
-"take_the_2_exit":"இரண்டாம் வெளியேறும் வழி எடுங்கள்.",
-"take_the_2_exit_street":"NULL",
-"take_the_2_exit_street_verb":"NULL",
-"take_the_3_exit":"மூன்றாம் வெளியேறும் வழி எடுங்கள்.",
-"take_the_3_exit_street":"NULL",
-"take_the_3_exit_street_verb":"NULL",
-"take_the_4_exit":"நான்காவது வெளியேறும் வழி எடுங்கள்.",
-"take_the_4_exit_street":"NULL",
-"take_the_4_exit_street_verb":"NULL",
-"take_the_5_exit":"ஐந்தாவது வெளியேறும் வழி எடுங்கள்.",
-"take_the_5_exit_street":"NULL",
-"take_the_5_exit_street_verb":"NULL",
-"take_the_6_exit":"ஆறாவது வெளியேறும் வழி எடுங்கள்.",
-"take_the_6_exit_street":"NULL",
-"take_the_6_exit_street_verb":"NULL",
-"take_the_7_exit":"ஏழாவது வெளியேறும் வழி எடுங்கள்.",
-"take_the_7_exit_street":"NULL",
-"take_the_7_exit_street_verb":"NULL",
-"take_the_8_exit":"எட்டாவது வெளியேறும் வழி எடுங்கள்.",
-"take_the_8_exit_street":"NULL",
-"take_the_8_exit_street_verb":"NULL",
-"take_the_9_exit":"ஒன்பதாவது வெளியேறும் வழி எடுங்கள்.",
-"take_the_9_exit_street":"NULL",
-"take_the_9_exit_street_verb":"NULL",
-"take_the_10_exit":"பத்தாவது வெளியேறும் வழி எடுங்கள்.",
-"take_the_10_exit_street":"NULL",
-"take_the_10_exit_street_verb":"NULL",
-"take_the_11_exit":"பதினொன்றாவது வெளியேறும் வழி எடுங்கள்.",
-"take_the_11_exit_street":"NULL",
-"take_the_11_exit_street_verb":"NULL",
-"in_50_feet":"ஐம்பது அடியில்",
-"in_100_feet":"நூறு அடியில்",
-"in_200_feet":"இருநூறு அடியில்",
-"in_300_feet":"முன்னூறு அடியில்",
-"in_400_feet":"நானூறு அடியில்",
-"in_500_feet":"ஐநூறு அடியில்",
-"in_600_feet":"அறுநூறு அடியில்",
-"in_700_feet":"எழுநூறு அடியில்",
-"in_800_feet":"எண்ணூறு அடியில்",
-"in_900_feet":"தொள்ளாயிரம் அடியில்",
-"in_1000_feet":"ஆயிரம் அடியில்",
-"in_1500_feet":"ஆயிரம் ஐநூறு அடியில்",
-"in_2000_feet":"இரண்டு ஆயிரம் அடியில்",
-"in_2500_feet":"இரண்டு ஆயிரம் ஐநூறு அடியில்",
-"in_3000_feet":"மூன்று ஆயிரம் அடியில்",
-"in_3500_feet":"மூன்று ஆயிரம் ஐநூறு அடியில்",
-"in_4000_feet":"நான்கு ஆயிரம் அடியில்",
-"in_4500_feet":"நான்கு ஆயிரம் ஐநூறு அடியில்",
-"in_5000_feet":"ஐந்து ஆயிரம் அடியில்",
-"in_1_mile":"ஒன்று மைலில்",
-"in_1_5_miles":"ஒன்றரை மைலில்",
-"in_2_miles":"இரண்டு மைலில்",
-"unknown_camera":"கேமரா முன்னால் இருக்கிறது"
-}

data/styles/default/include/Basemap.mapcss

@@ -449,6 +449,7 @@ area|z13-[landuse=quarry],
 area|z13-[power=plant],
 area|z13-[power=substation],
 area|z13-[power=generator],
+area|z13-[man_made=wastewater_plant]
 {fill-opacity: 1; fill-color: @industrial;}
 
 area|z13-[landuse=construction],

data/styles/default/include/Basemap_label.mapcss

@@ -592,6 +592,7 @@ area|z15-[landuse=industrial],
 area|z15-[landuse=construction],
 area|z15-[landuse=railway],
 area|z15-[landuse=quarry],
+area|z15-[man_made=wastewater_plant],
 node|z15-[landuse=industrial],
 node|z15-[landuse=construction],
 node|z15-[landuse=landfill],

data/styles/default/include/priorities_1_BG-by-size.prio.txt

@@ -208,6 +208,7 @@ landuse-industrial                                  # area z13- (also has captio
 landuse-industrial-mine                             # area z13- (also has icon z15-, caption(optional) z15-)
 landuse-quarry                                      # area z13- (also has icon z15-, caption(optional) z15-)
 landuse-railway                                     # area z13- (also has caption z15-)
+man_made-wastewater_plant                           # area z13- (also has caption z15-)
 man_made-works                                      # area z13- (also has icon z16-, caption(optional) z17-)
 power-generator                                     # area z13- (also has icon z17-)
 power-generator-gas                                 # area z13- (also has icon z17-)

data/styles/default/include/priorities_4_overlays.prio.txt

@@ -1374,6 +1374,7 @@ leisure-slipway                                     # icon z17- (also has captio
 leisure-track                                       # caption z16- (also has line z15-)
 leisure-track-area                                  # caption z16- (also has area z15-)
 man_made-petroleum_well                             # icon z17- (also has caption(optional) z18-)
+man_made-wastewater_plant                           # caption z15- (also has area z13-)
 power-generator                                     # icon z17- (also has area z13-)
 power-generator-gas                                 # icon z17- (also has area z13-)
 power-generator-hydro                               # icon z17- (also has area z13-)

data/styles/outdoors/include/priorities_1_BG-by-size.prio.txt

@@ -208,6 +208,7 @@ landuse-industrial                                  # area z13- (also has captio
 landuse-industrial-mine                             # area z13- (also has icon z15-, caption(optional) z15-)
 landuse-quarry                                      # area z13- (also has icon z15-, caption(optional) z15-)
 landuse-railway                                     # area z13- (also has caption z15-)
+man_made-wastewater_plant                           # area z13- (also has caption z15-)
 man_made-works                                      # area z13- (also has icon z16-, caption(optional) z17-)
 power-generator                                     # area z13- (also has icon z17-)
 power-generator-gas                                 # area z13- (also has icon z17-)

data/styles/outdoors/include/priorities_4_overlays.prio.txt

@@ -1377,6 +1377,7 @@ leisure-slipway                                     # icon z17- (also has captio
 leisure-track                                       # caption z16- (also has line z15-)
 leisure-track-area                                  # caption z16- (also has area z15-)
 man_made-petroleum_well                             # icon z14- (also has caption(optional) z18-)
+man_made-wastewater_plant                           # caption z15- (also has area z13-)
 power-generator                                     # icon z17- (also has area z13-)
 power-generator-gas                                 # icon z17- (also has area z13-)
 power-generator-hydro                               # icon z17- (also has area z13-)

data/styles/vehicle/include/Basemap.mapcss

@@ -310,6 +310,7 @@ area|z15-[landuse=quarry],
 area|z15-[power=plant],
 area|z15-[power=substation],
 area|z15-[power=generator],
+area|z15-[man_made=wastewater_plant],
 {fill-opacity: 1; fill-color: @industrial;}
 
 area|z15-[landuse=construction],

data/styles/vehicle/include/priorities_1_BG-by-size.prio.txt

@@ -110,6 +110,7 @@ landuse-industrial-mine                             # area z15-
 landuse-landfill                                    # area z15- (also has caption z15-)
 landuse-quarry                                      # area z15- (also has caption z15-)
 landuse-railway                                     # area z15- (also has caption z15-)
+man_made-wastewater_plant                           # area z15-
 man_made-works                                      # area z15-
 power-generator                                     # area z15-
 power-generator-gas                                 # area z15-

docs/INSTALL_DESKTOP.md

@@ -111,6 +111,21 @@ sudo apk add \
     sqlite-dev
 ```
 
+#### Void
+
+```bash
+xbps-install -S \
+    wget \
+    optipng \
+    cmake \
+    ninja \
+    qt6-base-devel \
+    qt6-svg-devel \
+    qt6-position-devel \
+    python3-pip
+pip3 install "protobuf<3.21" --break-system-packages
+```
+
 #### macOS
 
 ```bash

iphone/Maps/Classes/CarPlay/CarPlayService.swift

@@ -239,7 +239,7 @@ final class CarPlayService: NSObject {
     MapTemplateBuilder.configureBaseUI(mapTemplate: mapTemplate)
     if currentPositionMode == .pendingPosition {
       mapTemplate.leadingNavigationBarButtons = []
-    } else if currentPositionMode == .follow || currentPositionMode == .followAndRotateCompass || currentPositionMode == .followAndRotateRoute {
+    } else if currentPositionMode == .follow || currentPositionMode == .followAndRotate {
       MapTemplateBuilder.setupDestinationButton(mapTemplate: mapTemplate)
     } else {
       MapTemplateBuilder.setupRecenterButton(mapTemplate: mapTemplate)
@@ -623,32 +623,22 @@ extension CarPlayService: CarPlayRouterListener {
 extension CarPlayService: LocationModeListener {
   func processMyPositionStateModeEvent(_ mode: MWMMyPositionMode) {
     currentPositionMode = mode
-    
-    // make sure we have a rootMapTemplate
-    guard let rootMapTemplate = rootMapTemplate else {
-      return
-    }
-    
-    // exit if we're navigating
-    guard let info = rootMapTemplate.userInfo as? MapInfo,
-              info.type == CPConstants.TemplateType.main else {
-        MapTemplateBuilder.updateMyPositionModeButton(mapTemplate: rootMapTemplate, newMode: mode)
+    guard let rootMapTemplate = rootMapTemplate,
+      let info = rootMapTemplate.userInfo as? MapInfo,
+      info.type == CPConstants.TemplateType.main else {
         return
     }
     switch mode {
-    case .follow, .followAndRotateCompass, .followAndRotateRoute:
+    case .follow, .followAndRotate:
       if !rootMapTemplate.isPanningInterfaceVisible {
         MapTemplateBuilder.setupDestinationButton(mapTemplate: rootMapTemplate)
-        MapTemplateBuilder.updateMyPositionModeButton(mapTemplate: rootMapTemplate, newMode: mode)
       }
     case .notFollow:
       if !rootMapTemplate.isPanningInterfaceVisible {
         MapTemplateBuilder.setupRecenterButton(mapTemplate: rootMapTemplate)
-        MapTemplateBuilder.updateMyPositionModeButton(mapTemplate: rootMapTemplate, newMode: mode)
       }
     case .pendingPosition, .notFollowNoPosition:
       rootMapTemplate.leadingNavigationBarButtons = []
-      MapTemplateBuilder.updateMyPositionModeButton(mapTemplate: rootMapTemplate, newMode: mode)
     }
   }
 }

iphone/Maps/Classes/CarPlay/Template Builders/MapTemplateBuilder.swift

@@ -5,7 +5,6 @@ final class MapTemplateBuilder {
     case startPanning
     case zoomIn
     case zoomOut
-    case myPositionMode
   }
   enum BarButtonType {
     case dismissPaning
@@ -29,7 +28,7 @@ final class MapTemplateBuilder {
     configureBaseUI(mapTemplate: mapTemplate)
     if positionMode == .pendingPosition {
       mapTemplate.leadingNavigationBarButtons = []
-    } else if positionMode == .follow || positionMode == .followAndRotateCompass || positionMode == .followAndRotateRoute {
+    } else if positionMode == .follow || positionMode == .followAndRotate {
       setupDestinationButton(mapTemplate: mapTemplate)
     } else {
       setupRecenterButton(mapTemplate: mapTemplate)
@@ -70,10 +69,7 @@ final class MapTemplateBuilder {
     let zoomOutButton = buildMapButton(type: .zoomOut) { _ in
       FrameworkHelper.zoomMap(.out)
     }
-    let myPositionModeButton = buildMapButton(type: .myPositionMode) { _ in
-      FrameworkHelper.switchMyPositionMode()
-    }
-    mapTemplate.mapButtons = [myPositionModeButton, panningButton, zoomInButton, zoomOutButton]
+    mapTemplate.mapButtons = [panningButton, zoomInButton, zoomOutButton]
     
     let settingsButton = buildBarButton(type: .settings) { _ in
       let gridTemplate = SettingsTemplateBuilder.buildGridTemplate()
@@ -103,10 +99,7 @@ final class MapTemplateBuilder {
     let panningButton = buildMapButton(type: .startPanning) { _ in
       mapTemplate.showPanningInterface(animated: true)
     }
-    let myPositionModeButton = buildMapButton(type: .myPositionMode) { _ in
-      FrameworkHelper.switchMyPositionMode()
-    }
-    mapTemplate.mapButtons = [myPositionModeButton, panningButton]
+    mapTemplate.mapButtons = [panningButton]
     setupMuteAndRedirectButtons(template: mapTemplate)
     let endButton = buildBarButton(type: .endRoute) { _ in
       CarPlayService.shared.cancelCurrentTrip()
@@ -124,28 +117,6 @@ final class MapTemplateBuilder {
     mapTemplate.leadingNavigationBarButtons = [destinationButton]
   }
   
-  class func updateMyPositionModeButton(mapTemplate: CPMapTemplate, newMode: MWMMyPositionMode) {
-    let button = CPMapButton(handler: { _ in
-      FrameworkHelper.switchMyPositionMode()
-    })
-    
-    switch newMode {
-    case .pendingPosition:
-      button.image = UIImage(systemName: "location.fill")
-    case .notFollowNoPosition:
-      button.image = UIImage(systemName: "location")
-    case .notFollow:
-      button.image = UIImage(systemName: "location")
-    case .follow:
-      button.image = UIImage(systemName: "location.fill")
-    case .followAndRotate:
-      button.image = UIImage(systemName: "location.north.line.fill")
-    }
-    if mapTemplate.mapButtons.count > 0 {
-      mapTemplate.mapButtons[0] = button
-    }
-  }
-  
   class func setupRecenterButton(mapTemplate: CPMapTemplate) {
     let recenterButton = buildBarButton(type: .recenter) { _ in
       FrameworkHelper.switchMyPositionMode()
@@ -195,8 +166,6 @@ final class MapTemplateBuilder {
       button.image = UIImage(systemName: "plus")
     case .zoomOut:
       button.image = UIImage(systemName: "minus")
-    case .myPositionMode:
-      button.image = UIImage(systemName: "location")
     }
     // Remove code below once Apple has fixed its issue with the button background
     if #unavailable(iOS 26) {
@@ -207,8 +176,6 @@ final class MapTemplateBuilder {
         button.focusedImage = UIImage(systemName: "plus.circle.fill")
       case .zoomOut:
         button.focusedImage = UIImage(systemName: "minus.circle.fill")
-      case .myPositionMode:
-        button.image = UIImage(systemName: "location.fill")
       }
     }
     return button

iphone/Maps/Classes/CustomViews/MapViewControls/SideButtons/MWMSideButtons.mm

@@ -91,8 +91,7 @@ NSString * const kUDDidShowLongTapToShowSideButtonsToast = @"kUDDidShowLongTapTo
     case MWMMyPositionModeNotFollow:
     case MWMMyPositionModeNotFollowNoPosition: [locBtn setStyleNameAndApply: @"ButtonGetPosition"]; break;
     case MWMMyPositionModeFollow: [locBtn setStyleNameAndApply: @"ButtonFollow"]; break;
-    case MWMMyPositionModeFollowAndRotateCompass: [locBtn setStyleNameAndApply: @"ButtonFollowAndRotateCompass"]; break;
-    case MWMMyPositionModeFollowAndRotateRoute: [locBtn setStyleNameAndApply: @"ButtonFollowAndRotateRoute"]; break;
+    case MWMMyPositionModeFollowAndRotate: [locBtn setStyleNameAndApply: @"ButtonFollowAndRotate"]; break;
   }
 }
 

iphone/Maps/Classes/MapViewController.mm

@@ -632,8 +632,7 @@ NSString *const kAboutSegue = @"Map2About";
     case MWMMyPositionModeNotFollow:
       break;
     case MWMMyPositionModeFollow:
-    case MWMMyPositionModeFollowAndRotateCompass:
-    case MWMMyPositionModeFollowAndRotateRoute:
+    case MWMMyPositionModeFollowAndRotate:
       self.disableStandbyOnLocationStateMode = YES;
       break;
   }

iphone/Maps/Core/Location/MWMLocationHelpers.h

@@ -32,8 +32,7 @@ static inline MWMMyPositionMode mwmMyPositionMode(location::EMyPositionMode mode
   case location::EMyPositionMode::NotFollowNoPosition: return MWMMyPositionModeNotFollowNoPosition;
   case location::EMyPositionMode::NotFollow: return MWMMyPositionModeNotFollow;
   case location::EMyPositionMode::Follow: return MWMMyPositionModeFollow;
-  case location::EMyPositionMode::FollowAndRotateCompass: return MWMMyPositionModeFollowAndRotateCompass;
-  case location::EMyPositionMode::FollowAndRotateRoute: return MWMMyPositionModeFollowAndRotateRoute;
+  case location::EMyPositionMode::FollowAndRotate: return MWMMyPositionModeFollowAndRotate;
   }
 }
 } // namespace location_helpers

iphone/Maps/Core/Location/MWMLocationManager.mm

@@ -50,8 +50,7 @@ std::string DebugPrint(MWMMyPositionMode mode) {
     case MWMMyPositionModeNotFollowNoPosition: return "MWMMyPositionModeNotFollowNoPosition";
     case MWMMyPositionModeNotFollow: return "MWMMyPositionModeNotFollow";
     case MWMMyPositionModeFollow: return "MWMMyPositionModeFollow";
-    case MWMMyPositionModeFollowAndRotateCompass: return "MWMMyPositionModeFollowAndRotateCompass";
-    case MWMMyPositionModeFollowAndRotateRoute: return "MWMMyPositionModeFollowAndRotateRoute";
+    case MWMMyPositionModeFollowAndRotate: return "MWMMyPositionModeFollowAndRotate";
   }
   CHECK(false, ("Unsupported value", static_cast<int>(mode)));
 }
@@ -368,8 +367,7 @@ void setShowLocationAlert(BOOL needShow) {
     case MWMMyPositionModeNotFollowNoPosition:
     case MWMMyPositionModeNotFollow: manager.geoMode = GeoMode::NotInPosition; break;
     case MWMMyPositionModeFollow: manager.geoMode = GeoMode::InPosition; break;
-    case MWMMyPositionModeFollowAndRotateCompass:
-    case MWMMyPositionModeFollowAndRotateRoute: manager.geoMode = GeoMode::FollowAndRotate; break;
+    case MWMMyPositionModeFollowAndRotate: manager.geoMode = GeoMode::FollowAndRotate; break;
     }
   }
 }

iphone/Maps/Core/Location/MWMLocationPredictor.mm

@@ -30,7 +30,7 @@ NSUInteger constexpr kMaxPredictionCount = 20;
 
 - (void)setMyPositionMode:(MWMMyPositionMode)mode
 {
-  self.isLastPositionModeValid = (mode == MWMMyPositionModeFollowAndRotateCompass);
+  self.isLastPositionModeValid = (mode == MWMMyPositionModeFollowAndRotate);
   [self restart];
 }
 

iphone/Maps/Core/Location/MWMMyPositionMode.h

@@ -3,6 +3,5 @@ typedef NS_CLOSED_ENUM(NSUInteger, MWMMyPositionMode) {
   MWMMyPositionModeNotFollowNoPosition,
   MWMMyPositionModeNotFollow,
   MWMMyPositionModeFollow,
-  MWMMyPositionModeFollowAndRotateCompass,
-  MWMMyPositionModeFollowAndRotateRoute
+  MWMMyPositionModeFollowAndRotate
 };

iphone/Maps/Core/Theme/Core/ThemeManager.swift

@@ -41,14 +41,13 @@ final class ThemeManager: NSObject {
       }
     }(actualTheme)
 
-    let isCarPlayActive = CarPlayService.shared.isCarplayActivated
-    if !isCarPlayActive, Settings.mapAppearance == .light {
+    if Settings.mapAppearance == .light {
       if actualTheme == .vehicleDay || actualTheme == .vehicleNight {
           FrameworkHelper.setTheme(.vehicleDay)
       } else {
           FrameworkHelper.setTheme(.day)
       }
-    } else if !isCarPlayActive, Settings.mapAppearance == .dark {
+    } else if Settings.mapAppearance == .dark {
       if actualTheme == .vehicleDay || actualTheme == .vehicleNight {
         FrameworkHelper.setTheme(.vehicleNight)
       } else {

iphone/Maps/Core/Theme/MapStyleSheet.swift

@@ -7,8 +7,7 @@ enum MapStyleSheet: String, CaseIterable {
   case mapButtonPending = "ButtonPending"
   case mapButtonGetPosition = "ButtonGetPosition"
   case mapButtonFollow = "ButtonFollow"
-  case mapButtonFollowAndRotateCompass = "ButtonFollowAndRotateCompass"
-  case mapButtonFollowAndRotateRoute = "ButtonFollowAndRotateRoute"
+  case mapButtonFollowAndRotate = "ButtonFollowAndRotate"
   case mapButtonMapBookmarks = "ButtonMapBookmarks"
   case mapPromoDiscoveryButton = "PromoDiscroveryButton"
   case mapButtonBookmarksBack = "ButtonBookmarksBack"
@@ -68,14 +67,10 @@ extension MapStyleSheet: IStyleSheet {
       return .add { s in
         s.mwmImage = "btn_follow"
       }
-    case .mapButtonFollowAndRotateCompass:
+    case .mapButtonFollowAndRotate:
       return .add { s in
         s.mwmImage = "btn_follow_and_rotate"
       }
-    case .mapButtonFollowAndRotateRoute:
-      return .add { s in
-        s.mwmImage = "btn_follow_route"
-      }
     case .mapButtonMapBookmarks:
       return .add { s in
         s.mwmImage = "ic_routing_bookmark"

iphone/Maps/Images.xcassets/Location/Contents.json

@@ -1,6 +1,6 @@
 {
   "info" : {
-    "author" : "xcode",
-    "version" : 1
+    "version" : 1,
+    "author" : "xcode"
   }
-}
+}

iphone/Maps/Images.xcassets/Location/btn_follow_route_dark.imageset/Contents.json

@@ -1,21 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "filename" : "btn_follow_route_dark.png",
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}

iphone/Maps/Images.xcassets/Location/btn_follow_route_highlighted_dark.imageset/Contents.json

@@ -1,21 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "filename" : "btn_follow_route_highlighted_dark.png",
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}

iphone/Maps/Images.xcassets/Location/btn_follow_route_highlighted_light.imageset/Contents.json

@@ -1,21 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "filename" : "btn_follow_route_highlighted_light.png",
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}

iphone/Maps/Images.xcassets/Location/btn_follow_route_light.imageset/Contents.json

@@ -1,21 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "filename" : "btn_follow_route_light.png",
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}

iphone/Maps/Model/Settings.swift

@@ -186,7 +186,7 @@ import AVFoundation
                 return mapAppearance
             }
             
-            return .light
+            return .auto
         }
         set {
             UserDefaults.standard.set(newValue.rawValue, forKey: userDefaultsKeyMapAppearance)

libs/drape_frontend/drape_engine.cpp

@@ -9,7 +9,6 @@
 #include "drape/support_manager.hpp"
 
 #include "platform/settings.hpp"
-#include "routing/base/followed_polyline.hpp"
 
 #include <unordered_map>
 
@@ -41,7 +40,7 @@ DrapeEngine::DrapeEngine(Params && params)
 
   using namespace location;
   EMyPositionMode mode = PendingPosition;
-  if (settings::Get(kLocationStateMode, mode) && mode == FollowAndRotateCompass)
+  if (settings::Get(kLocationStateMode, mode) && mode == FollowAndRotate)
   {
     // If the screen rect setting in follow and rotate mode is missing or invalid, it could cause
     // invalid animations, so the follow and rotate mode should be discarded.
@@ -442,12 +441,13 @@ void DrapeEngine::SetCompassInfo(location::CompassInfo const & info)
                                   MessagePriority::Normal);
 }
 
-void DrapeEngine::SetGpsInfo(location::GpsInfo const & info, df::NavigationContext const & navigationContext,
+void DrapeEngine::SetGpsInfo(location::GpsInfo const & info, bool isNavigable, double distToNextTurn, double speedLimit,
                              location::RouteMatchingInfo const & routeInfo)
 {
-  m_threadCommutator->PostMessage(ThreadsCommutator::RenderThread,
-                                  make_unique_dp<GpsInfoMessage>(info, navigationContext, routeInfo),
-                                  MessagePriority::Normal);
+  m_threadCommutator->PostMessage(
+      ThreadsCommutator::RenderThread,
+      make_unique_dp<GpsInfoMessage>(info, isNavigable, distToNextTurn, speedLimit, routeInfo),
+      MessagePriority::Normal);
 }
 
 void DrapeEngine::SwitchMyPositionNextMode()
@@ -474,13 +474,12 @@ void DrapeEngine::StopLocationFollow()
                                   MessagePriority::Normal);
 }
 
-void DrapeEngine::FollowRoute(int preferredZoomLevel, int preferredZoomLevel3d, bool enableAutoZoom, bool isArrowGlued,
-                              bool allowRouteRotation)
+void DrapeEngine::FollowRoute(int preferredZoomLevel, int preferredZoomLevel3d, bool enableAutoZoom, bool isArrowGlued)
 {
-  m_threadCommutator->PostMessage(ThreadsCommutator::RenderThread,
-                                  make_unique_dp<FollowRouteMessage>(preferredZoomLevel, preferredZoomLevel3d,
-                                                                     enableAutoZoom, isArrowGlued, allowRouteRotation),
-                                  MessagePriority::Normal);
+  m_threadCommutator->PostMessage(
+      ThreadsCommutator::RenderThread,
+      make_unique_dp<FollowRouteMessage>(preferredZoomLevel, preferredZoomLevel3d, enableAutoZoom, isArrowGlued),
+      MessagePriority::Normal);
 }
 
 void DrapeEngine::SetModelViewListener(ModelViewChangedHandler && fn)

libs/drape_frontend/drape_engine.hpp

@@ -1,7 +1,5 @@
 #pragma once
 
-#include "drape_frontend/my_position_controller.hpp"
-#include "routing/base/followed_polyline.hpp"
 #include "traffic/traffic_info.hpp"
 
 #include "drape_frontend/backend_renderer.hpp"
@@ -156,7 +154,7 @@ public:
   void UpdateMapStyle();
 
   void SetCompassInfo(location::CompassInfo const & info);
-  void SetGpsInfo(location::GpsInfo const & info, df::NavigationContext const & navigationContext,
+  void SetGpsInfo(location::GpsInfo const & info, bool isNavigable, double distToNextTurn, double speedLimit,
                   location::RouteMatchingInfo const & routeInfo);
   void SwitchMyPositionNextMode();
   void LoseLocation();
@@ -173,8 +171,7 @@ public:
 
   dp::DrapeID AddSubroute(SubrouteConstPtr subroute);
   void RemoveSubroute(dp::DrapeID subrouteId, bool deactivateFollowing);
-  void FollowRoute(int preferredZoomLevel, int preferredZoomLevel3d, bool enableAutoZoom, bool isArrowGlued,
-                   bool allowRouteRotation);
+  void FollowRoute(int preferredZoomLevel, int preferredZoomLevel3d, bool enableAutoZoom, bool isArrowGlued);
   void DeactivateRouteFollowing();
   void SetSubrouteVisibility(dp::DrapeID subrouteId, bool isVisible);
   dp::DrapeID AddRoutePreviewSegment(m2::PointD const & startPt, m2::PointD const & finishPt);

libs/drape_frontend/frontend_renderer.cpp

@@ -438,8 +438,8 @@ void FrontendRenderer::AcceptMessage(ref_ptr<Message> message)
       break;
 #endif
     ref_ptr<GpsInfoMessage> msg = message;
-    m_myPositionController->OnLocationUpdate(msg->GetInfo(), msg->GetNavigationContext(),
-                                             m_userEventStream.GetCurrentScreen());
+    m_myPositionController->OnLocationUpdate(msg->GetInfo(), msg->IsNavigable(), msg->GetDistanceToNextTurn(),
+                                             msg->GetSpeedLimit(), m_userEventStream.GetCurrentScreen());
 
     location::RouteMatchingInfo const & info = msg->GetRouteInfo();
     if (info.HasDistanceFromBegin())
@@ -512,8 +512,7 @@ void FrontendRenderer::AcceptMessage(ref_ptr<Message> message)
     if (m_pendingFollowRoute != nullptr)
     {
       FollowRoute(m_pendingFollowRoute->m_preferredZoomLevel, m_pendingFollowRoute->m_preferredZoomLevelIn3d,
-                  m_pendingFollowRoute->m_enableAutoZoom, m_pendingFollowRoute->m_isArrowGlued,
-                  m_pendingFollowRoute->m_allowRouteRotation);
+                  m_pendingFollowRoute->m_enableAutoZoom, m_pendingFollowRoute->m_isArrowGlued);
       m_pendingFollowRoute.reset();
     }
     break;
@@ -585,14 +584,13 @@ void FrontendRenderer::AcceptMessage(ref_ptr<Message> message)
     // receive FollowRoute message before FlushSubroute message, so we need to postpone its processing.
     if (m_routeRenderer->GetSubroutes().empty())
     {
-      m_pendingFollowRoute =
-          std::make_unique<FollowRouteData>(msg->GetPreferredZoomLevel(), msg->GetPreferredZoomLevelIn3d(),
-                                            msg->EnableAutoZoom(), msg->IsArrowGlued(), msg->AllowRouteRotation());
+      m_pendingFollowRoute = std::make_unique<FollowRouteData>(
+          msg->GetPreferredZoomLevel(), msg->GetPreferredZoomLevelIn3d(), msg->EnableAutoZoom(), msg->IsArrowGlued());
     }
     else
     {
       FollowRoute(msg->GetPreferredZoomLevel(), msg->GetPreferredZoomLevelIn3d(), msg->EnableAutoZoom(),
-                  msg->IsArrowGlued(), msg->AllowRouteRotation());
+                  msg->IsArrowGlued());
     }
     break;
   }
@@ -1059,11 +1057,10 @@ void FrontendRenderer::UpdateContextDependentResources()
 }
 
 void FrontendRenderer::FollowRoute(int preferredZoomLevel, int preferredZoomLevelIn3d, bool enableAutoZoom,
-                                   bool isArrowGlued, bool allowRouteRotation)
+                                   bool isArrowGlued)
 {
   m_myPositionController->ActivateRouting(
-      !m_enablePerspectiveInNavigation ? preferredZoomLevel : preferredZoomLevelIn3d, enableAutoZoom, isArrowGlued,
-      allowRouteRotation);
+      !m_enablePerspectiveInNavigation ? preferredZoomLevel : preferredZoomLevelIn3d, enableAutoZoom, isArrowGlued);
 
   if (m_enablePerspectiveInNavigation)
     AddUserEvent(make_unique_dp<SetAutoPerspectiveEvent>(true /* isAutoPerspective */));

libs/drape_frontend/frontend_renderer.hpp

@@ -261,8 +261,7 @@ private:
   using TRenderGroupRemovePredicate = std::function<bool(drape_ptr<RenderGroup> const &)>;
   void RemoveRenderGroupsLater(TRenderGroupRemovePredicate const & predicate);
 
-  void FollowRoute(int preferredZoomLevel, int preferredZoomLevelIn3d, bool enableAutoZoom, bool isArrowGlued,
-                   bool allowRouteRotation);
+  void FollowRoute(int preferredZoomLevel, int preferredZoomLevelIn3d, bool enableAutoZoom, bool isArrowGlued);
 
   bool CheckRouteRecaching(ref_ptr<BaseSubrouteData> subrouteData);
 
@@ -373,20 +372,17 @@ private:
 
   struct FollowRouteData
   {
-    FollowRouteData(int preferredZoomLevel, int preferredZoomLevelIn3d, bool enableAutoZoom, bool isArrowGlued,
-                    bool allowRouteRotation)
+    FollowRouteData(int preferredZoomLevel, int preferredZoomLevelIn3d, bool enableAutoZoom, bool isArrowGlued)
       : m_preferredZoomLevel(preferredZoomLevel)
       , m_preferredZoomLevelIn3d(preferredZoomLevelIn3d)
       , m_enableAutoZoom(enableAutoZoom)
       , m_isArrowGlued(isArrowGlued)
-      , m_allowRouteRotation(allowRouteRotation)
     {}
 
     int m_preferredZoomLevel;
     int m_preferredZoomLevelIn3d;
     bool m_enableAutoZoom;
     bool m_isArrowGlued;
-    bool m_allowRouteRotation;
   };
 
   std::unique_ptr<FollowRouteData> m_pendingFollowRoute;

libs/drape_frontend/message_subclasses.hpp

@@ -10,7 +10,6 @@
 #include "drape_frontend/gui/skin.hpp"
 #include "drape_frontend/message.hpp"
 #include "drape_frontend/my_position.hpp"
-#include "drape_frontend/my_position_controller.hpp"
 #include "drape_frontend/overlay_batcher.hpp"
 #include "drape_frontend/postprocess_renderer.hpp"
 #include "drape_frontend/render_node.hpp"
@@ -30,7 +29,6 @@
 
 #include "geometry/rect2d.hpp"
 #include "geometry/triangle2d.hpp"
-#include "routing/base/followed_polyline.hpp"
 
 #include <condition_variable>
 #include <functional>
@@ -477,22 +475,28 @@ private:
 class GpsInfoMessage : public Message
 {
 public:
-  GpsInfoMessage(location::GpsInfo const & info, df::NavigationContext const & navigationContext,
+  GpsInfoMessage(location::GpsInfo const & info, bool isNavigable, double distToNextTurn, double speedLimit,
                  location::RouteMatchingInfo const & routeInfo)
     : m_info(info)
-    , m_navigationContext(navigationContext)
+    , m_isNavigable(isNavigable)
+    , m_distToNextTurn(distToNextTurn)
+    , m_speedLimit(speedLimit)
     , m_routeInfo(routeInfo)
   {}
 
   Type GetType() const override { return Type::GpsInfo; }
 
   location::GpsInfo const & GetInfo() const { return m_info; }
-  df::NavigationContext const & GetNavigationContext() const { return m_navigationContext; }
+  bool IsNavigable() const { return m_isNavigable; }
+  double const & GetSpeedLimit() const { return m_speedLimit; }
+  double const & GetDistanceToNextTurn() const { return m_distToNextTurn; }
   location::RouteMatchingInfo const & GetRouteInfo() const { return m_routeInfo; }
 
 private:
   location::GpsInfo const m_info;
-  df::NavigationContext const m_navigationContext;
+  bool const m_isNavigable;
+  double const m_distToNextTurn;
+  double const m_speedLimit;
   location::RouteMatchingInfo const m_routeInfo;
 };
 
@@ -736,13 +740,11 @@ public:
 class FollowRouteMessage : public Message
 {
 public:
-  FollowRouteMessage(int preferredZoomLevel, int preferredZoomLevelIn3d, bool enableAutoZoom, bool isArrowGlued,
-                     bool allowRouteRotation)
+  FollowRouteMessage(int preferredZoomLevel, int preferredZoomLevelIn3d, bool enableAutoZoom, bool isArrowGlued)
     : m_preferredZoomLevel(preferredZoomLevel)
     , m_preferredZoomLevelIn3d(preferredZoomLevelIn3d)
     , m_enableAutoZoom(enableAutoZoom)
     , m_isArrowGlued(isArrowGlued)
-    , m_allowRouteRotation(allowRouteRotation)
   {}
 
   Type GetType() const override { return Type::FollowRoute; }
@@ -751,14 +753,12 @@ public:
   int GetPreferredZoomLevelIn3d() const { return m_preferredZoomLevelIn3d; }
   bool EnableAutoZoom() const { return m_enableAutoZoom; }
   bool IsArrowGlued() const { return m_isArrowGlued; }
-  bool AllowRouteRotation() const { return m_allowRouteRotation; }
 
 private:
   int const m_preferredZoomLevel;
   int const m_preferredZoomLevelIn3d;
   bool const m_enableAutoZoom;
   bool const m_isArrowGlued;
-  bool const m_allowRouteRotation;
 };
 
 class SwitchMapStyleMessage : public BaseBlockingMessage

libs/drape_frontend/my_position_controller.cpp

@@ -9,11 +9,9 @@
 
 #include "geometry/mercator.hpp"
 
-#include "platform/location.hpp"
 #include "platform/measurement_utils.hpp"
 
 #include "base/math.hpp"
-#include "routing/base/followed_polyline.hpp"
 
 #include <algorithm>
 #include <array>
@@ -33,9 +31,6 @@ double constexpr kMaxTimeInBackgroundSec = 60.0 * 60 * 30;  // 30 hours before s
 double constexpr kMaxNotFollowRoutingTimeSec = 20.0;
 double constexpr kMaxUpdateLocationInvervalSec = 30.0;
 double constexpr kMaxBlockAutoZoomTimeSec = 10.0;
-double constexpr kDefaultSpeedLimitKmpH = 50.0;
-double constexpr kLookaheadTimeSpeedRatio = 0.3;
-double constexpr kMaxLookaheadTimeSec = 25.0;
 
 int constexpr kZoomThreshold = 10;
 int constexpr kMaxScaleZoomLevel = 16;
@@ -71,6 +66,7 @@ double CalculateZoomByMaxSpeed(double speedMpS, bool isPerspectiveAllowed)
 
   std::array<TSpeedScale, 2> const & scales = isPerspectiveAllowed ? scales3d : scales2d;
 
+  double constexpr kDefaultSpeedLimitKmpH = 50.0;
   double const speedKmpH = speedMpS > 0 ? measurement_utils::MpsToKmph(speedMpS) : kDefaultSpeedLimitKmpH;
 
   size_t i = 0;
@@ -147,7 +143,7 @@ void ResetNotification(uint64_t & notifyId)
 
 bool IsModeChangeViewport(location::EMyPositionMode mode)
 {
-  return mode == location::Follow || mode == location::FollowAndRotateCompass || mode == location::FollowAndRotateRoute;
+  return mode == location::Follow || mode == location::FollowAndRotate;
 }
 }  // namespace
 
@@ -161,11 +157,9 @@ MyPositionController::MyPositionController(Params && params, ref_ptr<DrapeNotifi
   , m_errorRadius(0.0)
   , m_horizontalAccuracy(0.0)
   , m_position(m2::PointD::Zero())
-  , m_direction(0.0)
-  , m_routeDirection(0.0)
-  , m_arrowDirection(0.0)
+  , m_drawDirection(0.0)
   , m_oldPosition(m2::PointD::Zero())
-  , m_oldArrowDirection(0.0)
+  , m_oldDrawDirection(0.0)
   , m_enablePerspectiveInRouting(false)
   , m_enableAutoZoomInRouting(params.m_isAutozoomEnabled)
   , m_autoScale2d(GetScreenScale(kDefaultAutoZoom))
@@ -177,8 +171,7 @@ MyPositionController::MyPositionController(Params && params, ref_ptr<DrapeNotifi
   , m_isDirtyAutoZoom(false)
   , m_isPendingAnimation(false)
   , m_isPositionAssigned(false)
-  , m_isArrowDirectionAssigned(false)
-  , m_isRouteDirectionAssigned(false)
+  , m_isDirectionAssigned(false)
   , m_isCompassAvailable(false)
   , m_positionIsObsolete(false)
   , m_needBlockAutoZoom(false)
@@ -297,7 +290,7 @@ void MyPositionController::ScaleEnded()
 
 void MyPositionController::Rotated()
 {
-  if (m_mode == location::FollowAndRotateCompass)
+  if (m_mode == location::FollowAndRotate)
     m_wasRotationInScaling = true;
 }
 
@@ -405,32 +398,25 @@ void MyPositionController::NextMode(ScreenBase const & screen)
   // In routing not-follow -> follow-and-rotate, otherwise not-follow -> follow.
   if (m_mode == location::NotFollow)
   {
-    ChangeMode(m_isInRouting ? location::FollowAndRotateCompass : location::Follow);
+    ChangeMode(m_isInRouting ? location::FollowAndRotate : location::Follow);
     UpdateViewport(preferredZoomLevel);
     return;
   }
 
-  // From follow mode we transit to follow-and-rotate-compass, if in routing
+  // From follow mode we transit to follow-and-rotate if compass is available or
+  // routing is enabled.
   if (m_mode == location::Follow)
   {
-    if (IsArrowRotationAvailable() || m_isInRouting)
+    if (IsRotationAvailable() || m_isInRouting)
     {
-      ChangeMode(location::FollowAndRotateCompass);
+      ChangeMode(location::FollowAndRotate);
       UpdateViewport(preferredZoomLevel);
     }
     return;
   }
 
-  // From -rotate-compass mode we transit to -rotate-route mode, if allowed
-  if (m_mode == location::FollowAndRotateCompass && IsRouteRotationAvailable() && m_allowRouteRotationInRouting)
-  {
-    ChangeMode(location::FollowAndRotateRoute);
-    UpdateViewport(preferredZoomLevel);
-    return;
-  }
-
-  // From -rotate-route mode, or from -rotate-compass if -rotate-route is not allowed, we return to follow mode
-  if (m_mode == location::FollowAndRotateRoute || m_mode == location::FollowAndRotateCompass)
+  // From follow-and-rotate mode we can transit to follow mode.
+  if (m_mode == location::FollowAndRotate)
   {
     if (m_isInRouting && screen.isPerspective())
       preferredZoomLevel = static_cast<int>(GetZoomLevel(ScreenBase::GetStartPerspectiveScale() * 1.1));
@@ -439,8 +425,8 @@ void MyPositionController::NextMode(ScreenBase const & screen)
   }
 }
 
-void MyPositionController::OnLocationUpdate(location::GpsInfo const & info,
-                                            df::NavigationContext const & navigationContext, ScreenBase const & screen)
+void MyPositionController::OnLocationUpdate(location::GpsInfo const & info, bool isNavigable, double distanceToNextTurn,
+                                            double speedLimit, ScreenBase const & screen)
 {
   m2::PointD const oldPos = GetDrawablePosition();
   double const oldAzimut = GetDrawableAzimut();
@@ -452,62 +438,33 @@ void MyPositionController::OnLocationUpdate(location::GpsInfo const & info,
   m_errorRadius = rect.SizeX() * 0.5;
   m_horizontalAccuracy = info.m_horizontalAccuracy;
 
-  if (navigationContext.m_distanceToNextTurn >= 0.0 || navigationContext.m_speedLimit >= 0.0)
+  if (distanceToNextTurn >= 0.0 || speedLimit >= 0.0)
   {
     double const mercatorPerMeter = m_errorRadius / info.m_horizontalAccuracy;
     m_autoScale2d =
-        mercatorPerMeter * CalculateAutoZoom(navigationContext.m_speedLimit, navigationContext.m_distanceToNextTurn,
-                                             false /* isPerspectiveAllowed */);
+        mercatorPerMeter * CalculateAutoZoom(speedLimit, distanceToNextTurn, false /* isPerspectiveAllowed */);
     m_autoScale3d =
-        mercatorPerMeter * CalculateAutoZoom(navigationContext.m_speedLimit, navigationContext.m_distanceToNextTurn,
-                                             true /* isPerspectiveAllowed */);
+        mercatorPerMeter * CalculateAutoZoom(speedLimit, distanceToNextTurn, true /* isPerspectiveAllowed */);
   }
   else
   {
     m_autoScale2d = m_autoScale3d = kUnknownAutoZoom;
   }
 
-  // Sets arrow direction based on GPS if:
+  // Sets direction based on GPS if:
   // 1. Compass is not available.
   // 2. Direction must be glued to the route during routing (route-corrected angle is set only in
   // OnLocationUpdate(): in OnCompassUpdate() the angle always has the original value.
   // 3. Device is moving faster then pedestrian.
   bool const isMovingFast = info.HasSpeed() && info.m_speed > kMinSpeedThresholdMps;
-  bool const glueArrowInRouting = navigationContext.m_isNavigable && m_isArrowGluedInRouting;
-
-  // Calculate the route direction by looking ahead a distance in the route
-  // depending on the current speed
-  if (glueArrowInRouting && navigationContext.m_followedPolyline != nullptr)
-  {
-    double const speed =
-        (navigationContext.m_speedLimit > 0 ? measurement_utils::MpsToKmph(navigationContext.m_speedLimit)
-                                            : kDefaultSpeedLimitKmpH);
-    double const lookaheadTimeSec = std::min(speed * kLookaheadTimeSpeedRatio, kMaxLookaheadTimeSec);
-    double const lookaheadDistance = std::min(speed * lookaheadTimeSec, navigationContext.m_distanceToNextTurn);
-
-    auto const & iter = navigationContext.m_followedPolyline->GetCurrentIter();
-    m2::PointD const point = navigationContext.m_followedPolyline->GetLookaheadPoint(lookaheadDistance);
-
-    auto angle = math::RadToDeg(ang::AngleTo(iter.m_pt, point));
-    if (std::isnan(angle) || std::isinf(angle))
-    {
-      // fallback in case the current route becomes invalid for any reason
-      SetRouteDirection(info.m_bearing);
-    }
-    else
-    {
-      SetRouteDirection(math::DegToRad(location::AngleToBearing(angle)));
-    }
-  }
+  bool const glueArrowInRouting = isNavigable && m_isArrowGluedInRouting;
 
   if ((!m_isCompassAvailable || glueArrowInRouting || isMovingFast) && info.HasBearing())
   {
-    SetArrowDirection(math::DegToRad(info.m_bearing));
+    SetDirection(math::DegToRad(info.m_bearing));
     m_lastGPSBearingTimer.Reset();
   }
 
-  m_direction = m_mode == location::FollowAndRotateRoute ? m_routeDirection : m_arrowDirection;
-
   if (m_isPositionAssigned && (!AlmostCurrentPosition(oldPos) || !AlmostCurrentAzimut(oldAzimut)))
   {
     CreateAnim(oldPos, oldAzimut, screen);
@@ -530,9 +487,9 @@ void MyPositionController::OnLocationUpdate(location::GpsInfo const & info,
       {
         ChangeModelView(m_position, kDoNotChangeZoom);
       }
-      else if (m_mode == location::FollowAndRotateCompass || m_mode == location::FollowAndRotateRoute)
+      else if (m_mode == location::FollowAndRotate)
       {
-        ChangeModelView(m_position, m_direction,
+        ChangeModelView(m_position, m_drawDirection,
                         m_isInRouting ? GetRoutingRotationPixelCenter() : m_visiblePixelRect.Center(),
                         kDoNotChangeZoom);
       }
@@ -542,7 +499,7 @@ void MyPositionController::OnLocationUpdate(location::GpsInfo const & info,
   {
     if (m_isInRouting)
     {
-      ChangeMode(location::FollowAndRotateCompass);
+      ChangeMode(location::FollowAndRotate);
       UpdateViewport(kMaxScaleZoomLevel);
     }
     else
@@ -568,7 +525,7 @@ void MyPositionController::OnLocationUpdate(location::GpsInfo const & info,
   {
     if (m_isInRouting)
     {
-      ChangeMode(location::FollowAndRotateCompass);
+      ChangeMode(location::FollowAndRotate);
       UpdateViewport(kMaxScaleZoomLevel);
     }
     else
@@ -595,8 +552,7 @@ void MyPositionController::LoseLocation()
 {
   if (m_mode == location::NotFollowNoPosition)
     return;
-  else if (m_mode == location::Follow || m_mode == location::FollowAndRotateCompass ||
-           m_mode == location::FollowAndRotateRoute)
+  else if (m_mode == location::Follow || m_mode == location::FollowAndRotate)
     ChangeMode(location::PendingPosition);
   else
     ChangeMode(location::NotFollowNoPosition);
@@ -614,11 +570,10 @@ void MyPositionController::OnCompassUpdate(location::CompassInfo const & info, S
   if ((IsInRouting() && m_isArrowGluedInRouting) || existsFreshGpsBearing)
     return;
 
-  SetArrowDirection(info.m_bearing);
+  SetDirection(info.m_bearing);
 
-  if (m_isPositionAssigned && !AlmostCurrentAzimut(oldAzimut) && m_mode == location::FollowAndRotateCompass)
+  if (m_isPositionAssigned && !AlmostCurrentAzimut(oldAzimut) && m_mode == location::FollowAndRotate)
   {
-    m_direction = info.m_bearing;
     CreateAnim(GetDrawablePosition(), oldAzimut, screen);
     m_isDirtyViewport = true;
   }
@@ -627,10 +582,10 @@ void MyPositionController::OnCompassUpdate(location::CompassInfo const & info, S
 bool MyPositionController::UpdateViewportWithAutoZoom()
 {
   double const autoScale = m_enablePerspectiveInRouting ? m_autoScale3d : m_autoScale2d;
-  if (autoScale > 0.0 && (m_mode == location::FollowAndRotateCompass || m_mode == location::FollowAndRotateRoute) &&
-      m_isInRouting && m_enableAutoZoomInRouting && !m_needBlockAutoZoom)
+  if (autoScale > 0.0 && m_mode == location::FollowAndRotate && m_isInRouting && m_enableAutoZoomInRouting &&
+      !m_needBlockAutoZoom)
   {
-    ChangeModelView(autoScale, m_position, m_direction, GetRoutingRotationPixelCenter());
+    ChangeModelView(autoScale, m_position, m_drawDirection, GetRoutingRotationPixelCenter());
     return true;
   }
   return false;
@@ -662,7 +617,7 @@ void MyPositionController::Render(ref_ptr<dp::GraphicsContext> context, ref_ptr<
     m_shape->SetPositionObsolete(m_positionIsObsolete);
     m_shape->SetPosition(m2::PointF(GetDrawablePosition()));
     m_shape->SetAzimuth(static_cast<float>(GetDrawableAzimut()));
-    m_shape->SetIsValidAzimuth(IsArrowRotationAvailable());
+    m_shape->SetIsValidAzimuth(IsRotationAvailable());
     m_shape->SetAccuracy(static_cast<float>(m_errorRadius));
     m_shape->SetRoutingMode(IsInRouting());
 
@@ -676,7 +631,7 @@ void MyPositionController::Render(ref_ptr<dp::GraphicsContext> context, ref_ptr<
 
 bool MyPositionController::IsRouteFollowingActive() const
 {
-  return IsInRouting() && m_mode == location::FollowAndRotateCompass;
+  return IsInRouting() && m_mode == location::FollowAndRotate;
 }
 
 bool MyPositionController::AlmostCurrentPosition(m2::PointD const & pos) const
@@ -688,25 +643,18 @@ bool MyPositionController::AlmostCurrentPosition(m2::PointD const & pos) const
 bool MyPositionController::AlmostCurrentAzimut(double azimut) const
 {
   double constexpr kDirectionEqualityDelta = 1e-3;
-  return AlmostEqualAbs(azimut, m_direction, kDirectionEqualityDelta);
+  return AlmostEqualAbs(azimut, m_drawDirection, kDirectionEqualityDelta);
 }
 
-void MyPositionController::SetRouteDirection(double bearing)
+void MyPositionController::SetDirection(double bearing)
 {
-  m_routeDirection = bearing;
-  m_isRouteDirectionAssigned = true;
-}
-
-void MyPositionController::SetArrowDirection(double bearing)
-{
-  m_arrowDirection = bearing;
-  m_isArrowDirectionAssigned = true;
+  m_drawDirection = bearing;
+  m_isDirectionAssigned = true;
 }
 
 void MyPositionController::ChangeMode(location::EMyPositionMode newMode)
 {
-  if (m_isInRouting && (m_mode != newMode) &&
-      (newMode == location::FollowAndRotateCompass || newMode == location::FollowAndRotateRoute))
+  if (m_isInRouting && (m_mode != newMode) && (newMode == location::FollowAndRotate))
     ResetBlockAutoZoomTimer();
 
   m_mode = newMode;
@@ -727,8 +675,7 @@ bool MyPositionController::IsWaitingForLocation() const
 
 void MyPositionController::StopLocationFollow()
 {
-  if (m_mode == location::Follow || m_mode == location::FollowAndRotateCompass ||
-      m_mode == location::FollowAndRotateRoute)
+  if (m_mode == location::Follow || m_mode == location::FollowAndRotate)
     ChangeMode(location::NotFollow);
   m_desiredInitMode = location::NotFollow;
 
@@ -743,7 +690,7 @@ void MyPositionController::OnEnterForeground(double backgroundTime)
     // When location was active during previous session the app will try to follow the user.
     if (m_mode == location::NotFollow)
     {
-      ChangeMode(m_isInRouting ? location::FollowAndRotateCompass : location::Follow);
+      ChangeMode(m_isInRouting ? location::FollowAndRotate : location::Follow);
       UpdateViewport(kDoNotChangeZoom);
     }
 
@@ -759,7 +706,7 @@ void MyPositionController::OnEnterBackground() {}
 
 void MyPositionController::OnCompassTapped()
 {
-  if (m_mode == location::FollowAndRotateCompass)
+  if (m_mode == location::FollowAndRotate)
   {
     ChangeMode(location::Follow);
     ChangeModelView(m_position, 0.0, m_visiblePixelRect.Center(), kDoNotChangeZoom);
@@ -816,9 +763,9 @@ void MyPositionController::UpdateViewport(int zoomLevel)
   {
     ChangeModelView(m_position, zoomLevel);
   }
-  else if (m_mode == location::FollowAndRotateCompass || m_mode == location::FollowAndRotateRoute)
+  else if (m_mode == location::FollowAndRotate)
   {
-    ChangeModelView(m_position, m_direction,
+    ChangeModelView(m_position, m_drawDirection,
                     m_isInRouting ? GetRoutingRotationPixelCenter() : m_visiblePixelRect.Center(), zoomLevel);
   }
 }
@@ -828,7 +775,7 @@ m2::PointD MyPositionController::GetRotationPixelCenter() const
   if (m_mode == location::Follow)
     return m_visiblePixelRect.Center();
 
-  if (m_mode == location::FollowAndRotateCompass || m_mode == location::FollowAndRotateRoute)
+  if (m_mode == location::FollowAndRotate)
     return m_isInRouting ? GetRoutingRotationPixelCenter() : m_visiblePixelRect.Center();
 
   return m2::PointD::Zero();
@@ -870,15 +817,15 @@ double MyPositionController::GetDrawableAzimut()
   }
 
   if (m_isPendingAnimation)
-    return m_oldArrowDirection;
+    return m_oldDrawDirection;
 
-  return m_arrowDirection;
+  return m_drawDirection;
 }
 
 void MyPositionController::CreateAnim(m2::PointD const & oldPos, double oldAzimut, ScreenBase const & screen)
 {
   double const moveDuration = PositionInterpolator::GetMoveDuration(oldPos, m_position, screen);
-  double const rotateDuration = AngleInterpolator::GetRotateDuration(oldAzimut, m_arrowDirection);
+  double const rotateDuration = AngleInterpolator::GetRotateDuration(oldAzimut, m_drawDirection);
   if (df::IsAnimationAllowed(std::max(moveDuration, rotateDuration), screen))
   {
     if (IsModeChangeViewport())
@@ -887,7 +834,7 @@ void MyPositionController::CreateAnim(m2::PointD const & oldPos, double oldAzimu
       {
         drape_ptr<Animation> anim = make_unique_dp<ArrowAnimation>(
             GetDrawablePosition(), m_position, syncAnim == nullptr ? moveDuration : syncAnim->GetDuration(),
-            GetDrawableAzimut(), m_arrowDirection);
+            GetDrawableAzimut(), m_drawDirection);
         if (syncAnim != nullptr)
         {
           anim->SetMaxDuration(syncAnim->GetMaxDuration());
@@ -896,13 +843,13 @@ void MyPositionController::CreateAnim(m2::PointD const & oldPos, double oldAzimu
         return anim;
       };
       m_oldPosition = oldPos;
-      m_oldArrowDirection = oldAzimut;
+      m_oldDrawDirection = oldAzimut;
       m_isPendingAnimation = true;
     }
     else
     {
       AnimationSystem::Instance().CombineAnimation(
-          make_unique_dp<ArrowAnimation>(oldPos, m_position, moveDuration, oldAzimut, m_arrowDirection));
+          make_unique_dp<ArrowAnimation>(oldPos, m_position, moveDuration, oldAzimut, m_drawDirection));
     }
   }
 }
@@ -921,18 +868,16 @@ void MyPositionController::EnableAutoZoomInRouting(bool enableAutoZoom)
   }
 }
 
-void MyPositionController::ActivateRouting(int zoomLevel, bool enableAutoZoom, bool isArrowGlued,
-                                           bool allowRouteRotation)
+void MyPositionController::ActivateRouting(int zoomLevel, bool enableAutoZoom, bool isArrowGlued)
 {
   if (!m_isInRouting)
   {
     m_isInRouting = true;
     m_isArrowGluedInRouting = isArrowGlued;
     m_enableAutoZoomInRouting = enableAutoZoom;
-    m_allowRouteRotationInRouting = allowRouteRotation;
 
-    ChangeMode(location::FollowAndRotateCompass);
-    ChangeModelView(m_position, m_isRouteDirectionAssigned ? m_routeDirection : 0.0, GetRoutingRotationPixelCenter(),
+    ChangeMode(location::FollowAndRotate);
+    ChangeModelView(m_position, m_isDirectionAssigned ? m_drawDirection : 0.0, GetRoutingRotationPixelCenter(),
                     zoomLevel, [this](ref_ptr<Animation> anim) { UpdateViewport(kDoNotChangeZoom); });
     ResetRoutingNotFollowTimer();
   }
@@ -944,10 +889,8 @@ void MyPositionController::DeactivateRouting()
   {
     m_isInRouting = false;
     m_isArrowGluedInRouting = false;
-    m_allowRouteRotationInRouting = false;
 
-    m_isArrowDirectionAssigned = m_isCompassAvailable && m_isArrowDirectionAssigned;
-    m_isRouteDirectionAssigned = false;
+    m_isDirectionAssigned = m_isCompassAvailable && m_isDirectionAssigned;
 
     ChangeMode(location::Follow);
     ChangeModelView(m_position, 0.0, m_visiblePixelRect.Center(), kDoNotChangeZoom);
@@ -976,7 +919,7 @@ void MyPositionController::CheckNotFollowRouting()
     CHECK_ON_TIMEOUT(m_routingNotFollowNotifyId, kMaxNotFollowRoutingTimeSec, CheckNotFollowRouting);
     if (m_routingNotFollowTimer.ElapsedSeconds() >= kMaxNotFollowRoutingTimeSec)
     {
-      ChangeMode(location::FollowAndRotateCompass);
+      ChangeMode(location::FollowAndRotate);
       UpdateViewport(kDoNotChangeZoom);
     }
   }

libs/drape_frontend/my_position_controller.hpp

@@ -7,7 +7,6 @@
 
 #include "drape/pointers.hpp"
 
-#include "routing/base/followed_polyline.hpp"
 #include "shaders/program_manager.hpp"
 
 #include "platform/location.hpp"
@@ -25,24 +24,6 @@ using TAnimationCreator = std::function<drape_ptr<Animation>(ref_ptr<Animation>)
 
 class DrapeNotifier;
 
-struct NavigationContext
-{
-  bool m_isNavigable = false;
-  double m_distanceToNextTurn = 0.0;
-  double m_speedLimit = 0.0;
-  routing::FollowedPolyline const * m_followedPolyline = nullptr;
-
-  NavigationContext() = default;
-
-  NavigationContext(bool navigable, double distanceToTurn, double speedLimit,
-                    routing::FollowedPolyline const & followedPolyline)
-    : m_isNavigable(navigable)
-    , m_distanceToNextTurn(distanceToTurn)
-    , m_speedLimit(speedLimit)
-    , m_followedPolyline(&followedPolyline)
-  {}
-};
-
 class MyPositionController
 {
 public:
@@ -121,7 +102,7 @@ public:
                       drape_ptr<MyPosition> && shape, Arrow3d::PreloadedData && preloadedData);
   void ResetRenderShape();
 
-  void ActivateRouting(int zoomLevel, bool enableAutoZoom, bool isArrowGlued, bool allowRouteRotation);
+  void ActivateRouting(int zoomLevel, bool enableAutoZoom, bool isArrowGlued);
   void DeactivateRouting();
 
   void EnablePerspectiveInRouting(bool enablePerspective);
@@ -136,15 +117,14 @@ public:
   void OnEnterBackground();
 
   void OnCompassTapped();
-  void OnLocationUpdate(location::GpsInfo const & info, df::NavigationContext const & navigationContext,
+  void OnLocationUpdate(location::GpsInfo const & info, bool isNavigable, double distanceToNextTurn, double speedLimit,
                         ScreenBase const & screen);
   void OnCompassUpdate(location::CompassInfo const & info, ScreenBase const & screen);
 
   void Render(ref_ptr<dp::GraphicsContext> context, ref_ptr<gpu::ProgramManager> mng, ScreenBase const & screen,
               int zoomLevel, FrameValues const & frameValues);
 
-  bool IsArrowRotationAvailable() const { return m_isArrowDirectionAssigned; }
-  bool IsRouteRotationAvailable() const { return m_isRouteDirectionAssigned; }
+  bool IsRotationAvailable() const { return m_isDirectionAssigned; }
   bool IsInRouting() const { return m_isInRouting; }
   bool IsRouteFollowingActive() const;
   bool IsModeChangeViewport() const;
@@ -155,8 +135,7 @@ public:
 
 private:
   void ChangeMode(location::EMyPositionMode newMode);
-  void SetRouteDirection(double bearing);
-  void SetArrowDirection(double bearing);
+  void SetDirection(double bearing);
 
   void ChangeModelView(m2::PointD const & center, int zoomLevel);
   void ChangeModelView(double azimuth);
@@ -199,15 +178,12 @@ private:
   double m_errorRadius;  // error radius in mercator.
   double m_horizontalAccuracy;
   m2::PointD m_position;  // position in mercator.
-  double m_direction;
-  double m_routeDirection;
-  double m_arrowDirection;
+  double m_drawDirection;
   m2::PointD m_oldPosition;  // position in mercator.
-  double m_oldArrowDirection;
+  double m_oldDrawDirection;
 
   bool m_enablePerspectiveInRouting;
   bool m_enableAutoZoomInRouting;
-  bool m_allowRouteRotationInRouting;
   double m_autoScale2d;
   double m_autoScale3d;
 
@@ -229,8 +205,7 @@ private:
   TAnimationCreator m_animCreator;
 
   bool m_isPositionAssigned;
-  bool m_isArrowDirectionAssigned;
-  bool m_isRouteDirectionAssigned;
+  bool m_isDirectionAssigned;
   bool m_isCompassAvailable;
 
   bool m_positionIsObsolete;

libs/drape_frontend/user_event_stream.cpp

@@ -31,8 +31,8 @@ namespace df
 {
 namespace
 {
-uint64_t constexpr kDoubleTapPauseMs = 200;
-uint64_t constexpr kLongTouchMs = 700;
+uint64_t constexpr kDoubleTapPauseMs = 250;
+uint64_t constexpr kLongTouchMs = 500;
 uint64_t constexpr kKineticDelayMs = 500;
 
 float constexpr kForceTapThreshold = 0.75;

libs/indexer/editable_map_object.cpp

@@ -17,6 +17,8 @@
 #include <cmath>
 #include <regex>
 #include <sstream>
+#include <ctime>
+#include <iomanip>
 
 namespace osm
 {
@@ -42,6 +44,14 @@ bool ExtractName(StringUtf8Multilang const & names, int8_t const langCode, vecto
 
   return true;
 }
+std::string GetCurrentDate()
+{
+  auto const t = std::time(nullptr);
+  auto const tm = *std::localtime(&t);
+  std::ostringstream oss;
+  oss << std::put_time(&tm, "%Y-%m-%d");
+  return oss.str();
+}
 }  // namespace
 
 // LocalizedName -----------------------------------------------------------------------------------
@@ -851,6 +861,25 @@ void EditableMapObject::ApplyJournalEntry(JournalEntry const & entry)
 void EditableMapObject::LogDiffInJournal(EditableMapObject const & unedited_emo)
 {
   LOG(LDEBUG, ("Executing LogDiffInJournal"));
+  
+  // Auto-fill check_date
+  if (ftypes::IsCheckDateChecker::Instance()(GetTypes()))
+  {
+    std::string const currentDate = GetCurrentDate();
+
+    // Always update check_date
+    SetMetadata(feature::Metadata::FMD_CHECK_DATE, currentDate);
+
+    // Update check_date:opening_hours if Opening Hours changed
+    std::string_view const newOH = GetMetadata(feature::Metadata::FMD_OPEN_HOURS);
+    std::string_view const oldOH = unedited_emo.GetMetadata(feature::Metadata::FMD_OPEN_HOURS);
+
+    // If new OH exists and is different from old (or old was empty), update the date.
+    if (!newOH.empty() && newOH != oldOH)
+    {
+      SetMetadata(feature::Metadata::FMD_CHECK_DATE_OPEN_HOURS, currentDate);
+    }
+  }
 
   // Name
   for (StringUtf8Multilang::Lang language : StringUtf8Multilang::GetSupportedLanguages())

libs/map/framework.cpp

@@ -7,7 +7,6 @@
 
 #include "ge0/url_generator.hpp"
 
-#include "platform/location.hpp"
 #include "routing/route.hpp"
 #include "routing/speed_camera_prohibition.hpp"
 
@@ -1454,7 +1453,7 @@ void Framework::CreateDrapeEngine(ref_ptr<dp::GraphicsContextFactory> contextFac
     GetPlatform().RunTask(Platform::Thread::Gui, [this, mode, routingActive]()
     {
       // Deactivate selection (and hide place page) if we return to routing in F&R mode.
-      if (routingActive && (mode == location::FollowAndRotateCompass || mode == location::FollowAndRotateRoute))
+      if (routingActive && mode == location::FollowAndRotate)
         DeactivateMapSelection();
 
       if (m_myPositionListener != nullptr)
@@ -3209,7 +3208,6 @@ void Framework::ReadFeatures(function<void(FeatureType &)> const & reader, vecto
 void Framework::OnRouteFollow(routing::RouterType type)
 {
   bool const isPedestrianRoute = type == RouterType::Pedestrian;
-  bool const allowRouteRotation = type == RouterType::Vehicle;
   bool const enableAutoZoom = isPedestrianRoute ? false : LoadAutoZoom();
   int const scale = isPedestrianRoute ? scales::GetPedestrianNavigationScale() : scales::GetNavigationScale();
   int scale3d = isPedestrianRoute ? scales::GetPedestrianNavigation3dScale() : scales::GetNavigation3dScale();
@@ -3225,7 +3223,7 @@ void Framework::OnRouteFollow(routing::RouterType type)
   // TODO. We need to sync two enums VehicleType and RouterType to be able to pass
   // GetRoutingSettings(type).m_matchRoute to the FollowRoute() instead of |isPedestrianRoute|.
   // |isArrowGlued| parameter fully corresponds to |m_matchRoute| in RoutingSettings.
-  m_drapeEngine->FollowRoute(scale, scale3d, enableAutoZoom, !isPedestrianRoute /* isArrowGlued */, allowRouteRotation);
+  m_drapeEngine->FollowRoute(scale, scale3d, enableAutoZoom, !isPedestrianRoute /* isArrowGlued */);
 }
 
 // RoutingManager::Delegate