[android] Add a new alert dialog when we remove the last list

Signed-off-by: Jean-Baptiste <jeanbaptiste.charron@outlook.fr>

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

@@ -432,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)
@@ -655,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)
@@ -1155,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(
@@ -1774,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,
@@ -1797,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)
@@ -1846,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)
@@ -2040,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())
@@ -2074,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)
@@ -2167,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)
@@ -2253,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)
@@ -2278,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)
@@ -2295,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)
@@ -2317,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)
@@ -2578,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/BookmarkCategoriesFragment.java

@@ -197,10 +197,8 @@ public class BookmarkCategoriesFragment extends BaseMwmRecyclerFragment<Bookmark
                                         () -> onShareActionSelected(mSelectedCategory, KmlFileType.Text)));
       items.add(new MenuBottomSheetItem(R.string.export_file_gpx, R.drawable.ic_file_gpx,
                                         () -> onShareActionSelected(mSelectedCategory, KmlFileType.Gpx)));
-      // Disallow deleting the last category
-      if (getAdapter().getBookmarkCategories().size() > 1)
-        items.add(new MenuBottomSheetItem(R.string.delete, R.drawable.ic_delete,
-                                          () -> onDeleteActionSelected(mSelectedCategory)));
+      items.add(new MenuBottomSheetItem(R.string.delete, R.drawable.ic_delete,
+                                        () -> onDeleteActionSelected(mSelectedCategory)));
     }
     return items;
   }
@@ -297,8 +295,24 @@ public class BookmarkCategoriesFragment extends BaseMwmRecyclerFragment<Bookmark
 
   private void onDeleteActionSelected(@NonNull BookmarkCategory category)
   {
-    BookmarkManager.INSTANCE.deleteCategory(category.getId());
-    getAdapter().notifyDataSetChanged();
+    // Disallow deleting the last category
+    if ((getAdapter().getBookmarkCategories().size() > 1))
+    {
+        BookmarkManager.INSTANCE.deleteCategory(category.getId());
+        getAdapter().notifyDataSetChanged();
+    }
+    else
+    {
+        new MaterialAlertDialogBuilder(requireActivity())
+                .setMessage(R.string.unable_to_delete_list)
+                .setPositiveButton(android.R.string.yes, ((dialog, which) -> {
+                    onAddButtonClick();
+                    BookmarkManager.INSTANCE.deleteCategory(category.getId());
+                    getAdapter().notifyDataSetChanged();
+                }))
+                .setNegativeButton(android.R.string.no,(dialog, which) -> dialog.dismiss())
+                .show();
+    }
   }
 
   private void onSettingsActionSelected(@NonNull BookmarkCategory category)

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/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/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/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/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/strings.xml

@@ -973,4 +973,5 @@
     <string name="download_resources_custom_url_message">Override the default map download server used for map downloads. Leave empty to use CoMaps default server.</string>
     <string name="download_resources_custom_url_summary_none">Not set</string>
     <string name="download_resources_custom_url_error_scheme">Please enter a URL starting with http:// or https://</string>
+    <string name="unable_to_delete_list">The app cannot work without at least one list. Do you want to remove it and create a new one?</string>
 </resources>

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>

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/CoreApi/CoreApi/Common/MWMGeoUtil.mm

@@ -32,7 +32,7 @@
 */
 
 - (NSString*) valueAsString {
-  auto const outString = measurement_utils::ToStringPrecision(self.value, 0);
+  auto const outString = measurement_utils::ToStringPrecision(self.value, self.value >= 10.0 ? 0 : 1);
   return [NSString stringWithUTF8String:outString.c_str()];
 }
 

libs/indexer/categories_holder.hpp

@@ -58,15 +58,15 @@ public:
   // Should match codes in the array below.
   static int8_t constexpr kEnglishCode = 1;
   static int8_t constexpr kUnsupportedLocaleCode = -1;
-  static int8_t constexpr kSimplifiedChineseCode = 44;
-  static int8_t constexpr kTraditionalChineseCode = 45;
+  static int8_t constexpr kSimplifiedChineseCode = 45;
+  static int8_t constexpr kTraditionalChineseCode = 46;
   // *NOTE* These constants should be updated when adding new
   // translation to categories.txt. When editing, keep in mind to check
   // CategoriesHolder::MapLocaleToInteger() and
   // CategoriesHolder::MapIntegerToLocale() as their implementations
   // strongly depend on the contents of the variable.
   // TODO: Refactor for more flexibility and to avoid breaking rules in two methods mentioned above.
-  static std::array<CategoriesHolder::Mapping, 45> constexpr kLocaleMapping = {{
+  static std::array<CategoriesHolder::Mapping, 46> constexpr kLocaleMapping = {{
       {"en", kEnglishCode},
       {"en-AU", 2},
       {"en-GB", 3},
@@ -93,23 +93,24 @@ public:
       {"it", 24},
       {"ja", 25},
       {"ko", 26},
-      {"lv", 27},
-      {"mr", 28},
-      {"nb", 29},
-      {"nl", 30},
-      {"pl", 31},
-      {"pt", 32},
-      {"pt-BR", 33},
-      {"ro", 34},
-      {"ru", 35},
-      {"sk", 36},
-      {"sr", 37},
-      {"sv", 38},
-      {"sw", 39},
-      {"th", 40},
-      {"tr", 41},
-      {"uk", 42},
-      {"vi", 43},
+      {"lt", 27},
+      {"lv", 28},
+      {"mr", 29},
+      {"nb", 30},
+      {"nl", 31},
+      {"pl", 32},
+      {"pt", 33},
+      {"pt-BR", 34},
+      {"ro", 35},
+      {"ru", 36},
+      {"sk", 37},
+      {"sr", 38},
+      {"sv", 39},
+      {"sw", 40},
+      {"th", 41},
+      {"tr", 42},
+      {"uk", 43},
+      {"vi", 44},
       {"zh-Hans", kSimplifiedChineseCode},
       {"zh-Hant", kTraditionalChineseCode},
   }};