Update .git-blame-ignore-revs

Signed-off-by: x7z4w <x7z4w@noreply.codeberg.org>
[core] Implicit m2::Point hash
2025-12-26 15:53:36 +00:00 · 2025-12-11 21:51:56 +07:00 · 2025-12-11 21:51:56 +07:00 · 2025-12-11 21:51:56 +07:00 · 2025-12-11 21:51:56 +07:00 · 2025-12-11 21:51:56 +07:00
424 changed files with 4942 additions and 3755 deletions
--- a/.forgejo/CODEOWNERS
+++ b/.forgejo/CODEOWNERS
@@ -1,55 +1,69 @@
+# All non-assigned.
+* @organicmaps/mergers
 # Visual design.
-/android/app/src/main/res/drawable*/ @comaps/design
-/android/app/src/main/res/font/ @comaps/design
-/android/app/src/main/res/mipmap*/ @comaps/design
-/data/*.ttf @comaps/design
-/data/resources-svg/ @comaps/design
-/data/search-icons/ @comaps/design
-/iphone/Maps/Images.xcassets/ @comaps/design
+/android/app/src/main/res/drawable*/ @organicmaps/design
+/android/app/src/main/res/font/ @organicmaps/design
+/android/app/src/main/res/mipmap*/ @organicmaps/design
+/data/*.ttf @organicmaps/design
+/data/resources-svg/ @organicmaps/design
+/data/search-icons/ @organicmaps/design
+/iphone/Maps/Images.xcassets/ @organicmaps/design
 # Android.
-/android/ @comaps/android
-/android/app/src/main/java/app/comaps/car/ @comaps/android-auto
-/docs/ANDROID_LOCATION_TEST.md @comaps/android
-/docs/JAVA_STYLE.md @comaps/android
+/android/ @organicmaps/android
+/android/app/src/main/java/app/organicmaps/car/ @organicmaps/android-auto
+/docs/ANDROID_LOCATION_TEST.md @organicmaps/android
+/docs/JAVA_STYLE.md @organicmaps/android
 # no owner for translation changes
 /android/app/src/main/res/values*/strings.xml
 # iOS.
-/iphone/ @comaps/ios
-/xcode/ @comaps/ios
-/docs/OBJC_STYLE.md @comaps/ios
+/iphone/ @organicmaps/ios
+/xcode/ @organicmaps/ios
+/docs/OBJC_STYLE.md @organicmaps/ios
 # no owner for translation changes
 /iphone/plist.txt
 /iphone/Maps/LocalizedStrings/
+# Qt
+/qt/ @organicmaps/qt
+# Rendering
+/drape/ @organicmaps/rendering
+/drape_frontend/ @organicmaps/rendering
+# Map Data.
+/tools/python/maps_generator/ @organicmaps/data
+/generator/ @organicmaps/data
+/topography_generator/ @organicmaps/data
+/data/borders/ @organicmaps/data
+/data/conf/isolines/ @organicmaps/data
+/docs/SUBWAY_GENERATION.md @organicmaps/data
+/docs/MAPS.md @organicmaps/data
+/docs/EXPERIMENTAL_PUBLIC_TRANSPORT_SUPPORT.md @organicmaps/data
 # no owner (changed often to add a new POI)
 /generator/generator_tests/osm_type_test.cpp
 # Map Styles.
-/data/styles/ @comaps/styles
-/data/types.txt @comaps/styles
-/data/visibility.txt @comaps/styles
-/data/mapcss-mapping.csv @comaps/styles
-/data/replaced_tags.txt @comaps/styles
-/data/classificator.txt @comaps/styles
-/data/drules_* @comaps/styles
+/data/styles/ @organicmaps/styles
+/data/types.txt @organicmaps/styles
+/data/visibility.txt @organicmaps/styles
+/data/mapcss-mapping.csv @organicmaps/styles
+/data/replaced_tags.txt @organicmaps/styles
+/data/classificator.txt @organicmaps/styles
+/data/drules_* @organicmaps/styles
 /docs/STYLES.md
-/tools/kothic/ @comaps/styles
+/tools/kothic/ @organicmaps/styles
 # DevOps.
-/.forgejo/workflows @comaps/devops
-/android/*gradle* @comaps/devops
-/docs/RELEASE_MANAGEMENT.md @comaps/devops
-/xcode/fastlane/ @comaps/devops
-/tools/python/maps_generator/ @comaps/devops
-/generator/ @comaps/devops
-/topography_generator/ @comaps/devops
-/data/borders/ @comaps/devops
-/data/conf/isolines/ @comaps/devops
-/docs/SUBWAY_GENERATION.md @comaps/devops
-/docs/MAPS.md @comaps/devops
-/docs/EXPERIMENTAL_PUBLIC_TRANSPORT_SUPPORT.md @comaps/devops
+/.forgejo/workflows @organicmaps/devops
+/android/*gradle* @organicmaps/devops
+/docs/RELEASE_MANAGEMENT.md @organicmaps/devops
+/xcode/fastlane/ @organicmaps/devops
+# Growth.
+README.md @organicmaps/growth
+/.forgejo/FUNDING.yml @organicmaps/growth
+/android/app/src/fdroid/play/ @organicmaps/growth
+/android/app/src/google/play/ @organicmaps/growth
+/iphone/metadata/ @organicmaps/growth
 # Legal.
-LEGAL @comaps/admins
-LICENSE @comaps/admins
-NOTICE @comaps/admins
-CONTRIBUTORS @comaps/admins
-/docs/CODE_OF_CONDUCT.md @comaps/admins
-/docs/DCO.md @comaps/admins
-/docs/GOVERNANCE.md @comaps/admins
+LEGAL @organicmaps/legal
+LICENSE @organicmaps/legal
+NOTICE @organicmaps/legal
+CONTRIBUTORS @organicmaps/legal
+/docs/CODE_OF_CONDUCT.md @organicmaps/legal
+/docs/DCO.md @organicmaps/legal
+/docs/GOVERNANCE.md @organicmaps/legal
--- a/.forgejo/FUNDING.yml
+++ b/.forgejo/FUNDING.yml
@@ -1,3 +1 @@
 open_collective: comaps
-liberapay: comaps
-custom: ["https://comaps.app/donate/"]
--- a/.git-blame-ignore-revs
+++ b/.git-blame-ignore-revs
@@ -2,3 +2,5 @@
 480fa6c2fcf53be296504ac6ba8e6b3d70f92b42
 a6ede2b1466f0c9d8a443600ef337ba6b5832e58
 1377b81bf1cac72bb6da192da7fed6696d5d5281
+99900fad21bab3f97065d11562346c5525a31f57
+a53828154fc7aa363dfe8926affaea56237832e5
--- a/.github/FUNDING.yml
+++ b/.github/FUNDING.yml
@@ -1,3 +0,0 @@
-open_collective: comaps
-liberapay: comaps
-custom: ["https://comaps.app/donate/"]
--- a/.gitignore
+++ b/.gitignore
@@ -155,8 +155,6 @@ android/huawei-appgallery.json
 android/res/xml/network_security_config.xml
 ./server/
 iphone/Maps/app.omaps/
-# Generated file
-libs/indexer/localized_types_map.cpp

 *.li

--- a/3party/ankerl/stl.h
+++ b/3party/ankerl/stl.h
@@ -0,0 +1,83 @@
+///////////////////////// ankerl::unordered_dense::{map, set} /////////////////////////
+
+// A fast & densely stored hashmap and hashset based on robin-hood backward shift deletion.
+// Version 4.8.1
+// https://github.com/martinus/unordered_dense
+//
+// Licensed under the MIT License <http://opensource.org/licenses/MIT>.
+// SPDX-License-Identifier: MIT
+// Copyright (c) 2022 Martin Leitner-Ankerl <martin.ankerl@gmail.com>
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in all
+// copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+// SOFTWARE.
+
+#ifndef ANKERL_STL_H
+#define ANKERL_STL_H
+
+#include <array>            // for array
+#include <cstdint>          // for uint64_t, uint32_t, std::uint8_t, UINT64_C
+#include <cstring>          // for size_t, memcpy, memset
+#include <functional>       // for equal_to, hash
+#include <initializer_list> // for initializer_list
+#include <iterator>         // for pair, distance
+#include <limits>           // for numeric_limits
+#include <memory>           // for allocator, allocator_traits, shared_ptr
+#include <optional>         // for optional
+#include <stdexcept>        // for out_of_range
+#include <string>           // for basic_string
+#include <string_view>      // for basic_string_view, hash
+#include <tuple>            // for forward_as_tuple
+#include <type_traits>      // for enable_if_t, declval, conditional_t, ena...
+#include <utility>          // for forward, exchange, pair, as_const, piece...
+#include <vector>           // for vector
+
+// <memory_resource> includes <mutex>, which fails to compile if
+// targeting GCC >= 13 with the (rewritten) win32 thread model, and
+// targeting Windows earlier than Vista (0x600).  GCC predefines
+// _REENTRANT when using the 'posix' model, and doesn't when using the
+// 'win32' model.
+#if defined __MINGW64__ && defined __GNUC__ && __GNUC__ >= 13 && !defined _REENTRANT
+// _WIN32_WINNT is guaranteed to be defined here because of the
+// <cstdint> inclusion above.
+#    ifndef _WIN32_WINNT
+#        error "_WIN32_WINNT not defined"
+#    endif
+#    if _WIN32_WINNT < 0x600
+#        define ANKERL_MEMORY_RESOURCE_IS_BAD() 1 // NOLINT(cppcoreguidelines-macro-usage)
+#    endif
+#endif
+#ifndef ANKERL_MEMORY_RESOURCE_IS_BAD
+#    define ANKERL_MEMORY_RESOURCE_IS_BAD() 0 // NOLINT(cppcoreguidelines-macro-usage)
+#endif
+
+#if defined(__has_include) && !defined(ANKERL_UNORDERED_DENSE_DISABLE_PMR)
+#    if __has_include(<memory_resource>) && !ANKERL_MEMORY_RESOURCE_IS_BAD()
+#        define ANKERL_UNORDERED_DENSE_PMR std::pmr // NOLINT(cppcoreguidelines-macro-usage)
+#        include <memory_resource>                  // for polymorphic_allocator
+#    elif __has_include(<experimental/memory_resource>)
+#        define ANKERL_UNORDERED_DENSE_PMR std::experimental::pmr // NOLINT(cppcoreguidelines-macro-usage)
+#        include <experimental/memory_resource>                   // for polymorphic_allocator
+#    endif
+#endif
+
+#if defined(_MSC_VER) && defined(_M_X64)
+#    include <intrin.h>
+#    pragma intrinsic(_umul128)
+#endif
+
+#endif
--- a/3party/ankerl/unordered_dense.h
+++ b/3party/ankerl/unordered_dense.h
--- a/android/app/src/fdroid/play/listings/lt/short-description.txt
+++ b/android/app/src/fdroid/play/listings/lt/short-description.txt
@@ -1 +1 @@
-Paprasta ir patogi navigacija – Turiningesnės kelionės – Vystoma bendruomenės
+Paprasta ir patogi navigacija – Turiningos kelionės – Vystoma bendruomenės
--- a/android/app/src/fdroid/play/listings/sl/full-description.txt
+++ b/android/app/src/fdroid/play/listings/sl/full-description.txt
@@ -1,20 +1,20 @@
-Brezplačno in odprtokodno zemljevidno orodje, ki ga vodi skupnost, temelji na podatkih OpenStreetMap in je okrepljena s predanostjo transparentnosti, zasebnosti in nepridobitnosti. CoMaps je izpeljanka OrganicMaps, ta pa je izpeljanka Maps.ME.
+Brezplačno in odprtokodno zemljevidno orodje, ki ga vodi skupnost, temelji na podatkih OpenStreetMap in je okrepljena s predanostjo transparentnosti, zasebnosti in nedobičkonosnosti. CoMaps je izpeljanka OrganicMaps, ta pa je izpeljanka Maps.ME.

-Preberite si o razlogih za ta projekt in njegovi usmerjenosti na <b><i>codeberg.org/comaps</i></b>.
+Preverite si o razlogih za ta projekt in njegovi usmerjenosti na <b><i>codeberg.org/comaps</i></b>.
 Pridružite se skupnosti in pomagajte narediti najboljše zemljevidno orodje
 • Uporabljajte orodje in širite glas o njem
 • Dajajte povratne informacije in poročajte o napakah
 • Posodabljajte podatke zemljevida v tem orodju ali na spletni strani OpenStreetMap

-‣ <b>Osredotočeno na uporabo brez povezave</b>: Načrtujte in se usmerjajte na vašem potovanju v tujini vrez potrebe po mobilnih podatkih, iščite vmesne točke potovanja ko ste na daljšem pohodu ipd. Vse zmogljivosti orodja so zasnovane za delo brez povezave.
+‣ <b>Osredotočeno na uporabo brez povezave</b>: Načrtujte in se usmerjajte na vašem potovanju v tujini vrez potrebe po mobilnih podatkih, iščite vmesne točke potocanja ko ste na daljšem pohodu ipd. Vse zmogljivosti orodja so zasnovane za delo brez povezave.
 ‣ <b>Spoštovanje zasebnosti</b>: orodje je zasnovano z mislijo na zasebnost – ne prepoznava oseb, ne sledi in ne zbira osebnih podatkov. Brez oglasov.
 ‣ <b>Preprosto in dodelano</b>: nujne zmogljivosti, enostavne za uporabo, ki preprosto delujejo.
 ‣ <b>Prihrani vašo baterijo in prostor.</b>: ne izčrpava vaše baterije kakor druga usmerjevalna orodja. Strnjeni zemljevidi prihranijo dragocen prostor na vašem telefonu.
 ‣ <b>Brezplačno in ustvarjeno v skupnosti</b>: ljudje kot ste vi pomagajo ustvarjati to orodje, tako da dodajajo kraje na OpenStreetMap, preizkušajo in dajejo povratne informacije o zmogljivostih in prispevajo svoje razvijalske sposobnosti in sredstva.
-‣ <b>Odprto in transparentno odločanje in finance, nepridobitno in popolnoma odprtokodno.</b>
+‣ <b>Odprto in transparentno odločanje in finance, nedobičkonosno in popolnoma odprtokodno.</b>

 <b>Glavne zmogljivosti</b>:
-• Prenosljivi podrobni zemljevidi s kraji, ki na Googlovih zemljevidih niso na voljo.
+• Prenosljivi podrobni zemljevidi s kraji, ki na Googlovoh zemljevidih niso na voljo.
 • Prikaz za dejavnosti na prostem s poudarjenimi pohodniškimi potmi, tabornimi prostori, vodnimi viri, vrhovi, plastnicami itd.
 • Pešpoti in kolesarke poti
 • Kraji zanimanja, npr. restavracije, bencinske črpalke, hoteli, trgovine, znamenitosti in mnogo več
--- a/android/app/src/google/play/listings/lt/short-description.txt
+++ b/android/app/src/google/play/listings/lt/short-description.txt
@@ -1 +1 @@
-Paprasta ir patogi navigacija – Turiningesnės kelionės – Vystoma bendruomenės
+Paprasta ir patogi navigacija – Turiningos kelionės – Vystoma bendruomenės
--- a/android/app/src/google/play/listings/sl/title.txt
+++ b/android/app/src/google/play/listings/sl/title.txt
@@ -1 +1 @@
-CoMaps - Usmerjajte se zasebno
+CoMaps - Usmerjajte zasebno
--- a/android/app/src/main/java/app/organicmaps/ChartController.java
+++ b/android/app/src/main/java/app/organicmaps/ChartController.java
@@ -28,7 +28,6 @@ import com.github.mikephil.charting.formatter.IAxisValueFormatter;
 import com.github.mikephil.charting.highlight.Highlight;
 import com.github.mikephil.charting.listener.OnChartValueSelectedListener;
 import com.google.android.material.textview.MaterialTextView;
-
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
--- a/android/app/src/main/java/app/organicmaps/DownloadResourcesLegacyActivity.java
+++ b/android/app/src/main/java/app/organicmaps/DownloadResourcesLegacyActivity.java
@@ -253,7 +253,7 @@ public class DownloadResourcesLegacyActivity extends BaseMwmFragmentActivity

      mProgress.setMax(bytes);
      // Start progress at 1% according to M3 guidelines
-      mProgress.setProgressCompat(bytes/100, true);
+      mProgress.setProgressCompat(bytes / 100, true);
    }
    else
      finishFilesDownload(bytes);
@@ -372,7 +372,7 @@ public class DownloadResourcesLegacyActivity extends BaseMwmFragmentActivity
        mTvMessage.setText(getString(R.string.downloading_country_can_proceed, item.name, fileSizeString));
        mProgress.setMax((int) item.totalSize);
        // Start progress at 1% according to M3 guidelines
-        mProgress.setProgressCompat((int) (item.totalSize/100), true);
+        mProgress.setProgressCompat((int) (item.totalSize / 100), true);

        mCountryDownloadListenerSlot = MapManager.nativeSubscribe(mCountryDownloadListener);
        MapManagerHelper.startDownload(mCurrentCountry);
@@ -424,17 +424,17 @@ public class DownloadResourcesLegacyActivity extends BaseMwmFragmentActivity
      default -> throw new AssertionError("Unexpected result code = " + result);
    };

-        mAlertDialog = new MaterialAlertDialogBuilder(this, R.style.MwmTheme_AlertDialog)
-                           .setTitle(titleId)
-                           .setMessage(messageId)
-                           .setCancelable(true)
-                           .setOnCancelListener((dialog) -> setAction(PAUSE))
-                           .setPositiveButton(R.string.try_again,
-                                              (dialog, which) -> {
-                                                setAction(TRY_AGAIN);
-                                                onTryAgainClicked();
-                                              })
-                           .setOnDismissListener(dialog -> mAlertDialog = null)
-                           .show();
+    mAlertDialog = new MaterialAlertDialogBuilder(this, R.style.MwmTheme_AlertDialog)
+                       .setTitle(titleId)
+                       .setMessage(messageId)
+                       .setCancelable(true)
+                       .setOnCancelListener((dialog) -> setAction(PAUSE))
+                       .setPositiveButton(R.string.try_again,
+                                          (dialog, which) -> {
+                                            setAction(TRY_AGAIN);
+                                            onTryAgainClicked();
+                                          })
+                       .setOnDismissListener(dialog -> mAlertDialog = null)
+                       .show();
  }
 }
--- a/android/app/src/main/java/app/organicmaps/background/OsmUploadWork.java
+++ b/android/app/src/main/java/app/organicmaps/background/OsmUploadWork.java
@@ -38,8 +38,9 @@ public class OsmUploadWork extends Worker
    {
      final Constraints c = new Constraints.Builder().setRequiredNetworkType(NetworkType.CONNECTED).build();
      OneTimeWorkRequest.Builder builder = new OneTimeWorkRequest.Builder(OsmUploadWork.class).setConstraints(c);
-      if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
-          builder.setExpedited(OutOfQuotaPolicy.RUN_AS_NON_EXPEDITED_WORK_REQUEST);
+      if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S)
+      {
+        builder.setExpedited(OutOfQuotaPolicy.RUN_AS_NON_EXPEDITED_WORK_REQUEST);
      }
      final OneTimeWorkRequest wr = builder.build();
      WorkManager.getInstance(context).beginUniqueWork("UploadOsmChanges", ExistingWorkPolicy.KEEP, wr).enqueue();
--- a/android/app/src/main/java/app/organicmaps/backup/BackupUtils.java
+++ b/android/app/src/main/java/app/organicmaps/backup/BackupUtils.java
@@ -17,7 +17,6 @@ import androidx.annotation.NonNull;
 import androidx.documentfile.provider.DocumentFile;
 import app.organicmaps.R;
 import app.organicmaps.sdk.util.log.Logger;
-
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
--- a/android/app/src/main/java/app/organicmaps/base/BaseMwmDialogFragment.java
+++ b/android/app/src/main/java/app/organicmaps/base/BaseMwmDialogFragment.java
@@ -10,7 +10,6 @@ import androidx.fragment.app.DialogFragment;

 public class BaseMwmDialogFragment extends DialogFragment
 {
-
  protected int getStyle()
  {
    return STYLE_NORMAL;
--- a/android/app/src/main/java/app/organicmaps/bookmarks/BookmarksListFragment.java
+++ b/android/app/src/main/java/app/organicmaps/bookmarks/BookmarksListFragment.java
@@ -282,11 +282,13 @@ public class BookmarksListFragment extends BaseMwmRecyclerFragment<ConcatAdapter
  {
    if (isEmptySearchResults())
    {
-      requirePlaceholder().setContent(R.string.search_not_found, R.string.search_not_found_query, R.drawable.ic_search_fail);
+      requirePlaceholder().setContent(R.string.search_not_found, R.string.search_not_found_query,
+                                      R.drawable.ic_search_fail);
    }
    else if (isEmpty())
    {
-      requirePlaceholder().setContent(R.string.bookmarks_empty_list_title, R.string.bookmarks_empty_list_message, R.drawable.ic_bookmarks);
+      requirePlaceholder().setContent(R.string.bookmarks_empty_list_title, R.string.bookmarks_empty_list_message,
+                                      R.drawable.ic_bookmarks);
    }

    boolean isEmptyRecycler = isEmpty() || isEmptySearchResults();
--- a/android/app/src/main/java/app/organicmaps/bookmarks/Holders.java
+++ b/android/app/src/main/java/app/organicmaps/bookmarks/Holders.java
@@ -23,7 +23,6 @@ import app.organicmaps.util.UiUtils;
 import app.organicmaps.util.Utils;
 import app.organicmaps.widget.recycler.RecyclerClickListener;
 import app.organicmaps.widget.recycler.RecyclerLongClickListener;
-
 import com.google.android.material.button.MaterialButton;
 import com.google.android.material.checkbox.MaterialCheckBox;
 import com.google.android.material.imageview.ShapeableImageView;
@@ -458,10 +457,12 @@ public class Holders

      String formattedDesc = desc.replace("\n", "<br>");
      Spanned spannedDesc = Utils.fromHtml(formattedDesc);
-      if (!TextUtils.isEmpty(spannedDesc)) {
+      if (!TextUtils.isEmpty(spannedDesc))
+      {
        mDescText.setText(spannedDesc);
      }
-      else {
+      else
+      {
        mDescText.setText(R.string.list_description_empty);
      }
    }
--- a/android/app/src/main/java/app/organicmaps/car/util/IntentUtils.java
+++ b/android/app/src/main/java/app/organicmaps/car/util/IntentUtils.java
@@ -50,8 +50,8 @@ public final class IntentUtils
  }

  // https://developer.android.com/reference/androidx/car/app/CarContext#startCarApp(android.content.Intent)
-  private static void processNavigationIntent(@NonNull CarContext carContext,
-                                              @NonNull Renderer surfaceRenderer, @NonNull Intent intent)
+  private static void processNavigationIntent(@NonNull CarContext carContext, @NonNull Renderer surfaceRenderer,
+                                              @NonNull Intent intent)
  {
    // TODO (AndrewShkrob): This logic will need to be revised when we introduce support for adding stops during
    // navigation or route planning. Skip navigation intents during navigation
--- a/android/app/src/main/java/app/organicmaps/car/util/RoutingHelpers.java
+++ b/android/app/src/main/java/app/organicmaps/car/util/RoutingHelpers.java
@@ -31,7 +31,7 @@ public final class RoutingHelpers
      default -> Distance.UNIT_METERS;
    };

-        return Distance.create(distance.mDistance, displayUnit);
+    return Distance.create(distance.mDistance, displayUnit);
  }

  @NonNull
@@ -52,7 +52,7 @@ public final class RoutingHelpers
      default -> LaneDirection.SHAPE_UNKNOWN;
    };

-        return LaneDirection.create(shape, isRecommended);
+    return LaneDirection.create(shape, isRecommended);
  }

  @NonNull
@@ -77,7 +77,7 @@ public final class RoutingHelpers
      case EXIT_HIGHWAY_TO_LEFT -> Maneuver.TYPE_OFF_RAMP_SLIGHT_LEFT;
      case EXIT_HIGHWAY_TO_RIGHT -> Maneuver.TYPE_OFF_RAMP_SLIGHT_RIGHT;
    };
-        final Maneuver.Builder builder = new Maneuver.Builder(maneuverType);
+    final Maneuver.Builder builder = new Maneuver.Builder(maneuverType);
    if (maneuverType == Maneuver.TYPE_ROUNDABOUT_ENTER_AND_EXIT_CCW)
      builder.setRoundaboutExitNumber(roundaboutExitNum > 0 ? roundaboutExitNum : 1);
    builder.setIcon(new CarIcon.Builder(createManeuverIcon(context, carDirection, roundaboutExitNum)).build());
@@ -85,7 +85,8 @@ public final class RoutingHelpers
  }

  @NonNull
-  private static IconCompat createManeuverIcon(@NonNull final CarContext context, @NonNull CarDirection carDirection, int roundaboutExitNum)
+  private static IconCompat createManeuverIcon(@NonNull final CarContext context, @NonNull CarDirection carDirection,
+                                               int roundaboutExitNum)
  {
    if (!CarDirection.isRoundAbout(carDirection) || roundaboutExitNum == 0)
    {
--- a/android/app/src/main/java/app/organicmaps/car/util/UiHelpers.java
+++ b/android/app/src/main/java/app/organicmaps/car/util/UiHelpers.java
@@ -39,8 +39,7 @@ public final class UiHelpers
  }

  @NonNull
-  public static ActionStrip createMapActionStrip(@NonNull CarContext context,
-                                                 @NonNull Renderer surfaceRenderer)
+  public static ActionStrip createMapActionStrip(@NonNull CarContext context, @NonNull Renderer surfaceRenderer)
  {
    final CarIcon iconPlus = new CarIcon.Builder(IconCompat.createWithResource(context, R.drawable.ic_plus)).build();
    final CarIcon iconMinus = new CarIcon.Builder(IconCompat.createWithResource(context, R.drawable.ic_minus)).build();
@@ -59,15 +58,13 @@ public final class UiHelpers
  }

  @NonNull
-  public static MapController createMapController(@NonNull CarContext context,
-                                                  @NonNull Renderer surfaceRenderer)
+  public static MapController createMapController(@NonNull CarContext context, @NonNull Renderer surfaceRenderer)
  {
    return new MapController.Builder().setMapActionStrip(createMapActionStrip(context, surfaceRenderer)).build();
  }

  @NonNull
-  public static Action createSettingsAction(@NonNull BaseMapScreen mapScreen,
-                                            @NonNull Renderer surfaceRenderer)
+  public static Action createSettingsAction(@NonNull BaseMapScreen mapScreen, @NonNull Renderer surfaceRenderer)
  {
    return createSettingsAction(mapScreen, surfaceRenderer, null);
  }
@@ -81,8 +78,7 @@ public final class UiHelpers
  }

  @NonNull
-  private static Action createSettingsAction(@NonNull BaseMapScreen mapScreen,
-                                             @NonNull Renderer surfaceRenderer,
+  private static Action createSettingsAction(@NonNull BaseMapScreen mapScreen, @NonNull Renderer surfaceRenderer,
                                             @Nullable OnScreenResultListener onScreenResultListener)
  {
    final CarContext context = mapScreen.getCarContext();
@@ -123,8 +119,7 @@ public final class UiHelpers
      return null;

    final Row.Builder builder = new Row.Builder();
-    builder.setImage(
-        new CarIcon.Builder(IconCompat.createWithResource(context, R.drawable.ic_opening_hours)).build());
+    builder.setImage(new CarIcon.Builder(IconCompat.createWithResource(context, R.drawable.ic_opening_hours)).build());

    if (isEmptyTT)
      builder.setTitle(ohStr);
--- a/android/app/src/main/java/app/organicmaps/dialog/EditTextDialogFragment.java
+++ b/android/app/src/main/java/app/organicmaps/dialog/EditTextDialogFragment.java
@@ -125,7 +125,8 @@ public class EditTextDialogFragment extends BaseMwmDialogFragment

      positiveButton.setOnClickListener(view -> {
        final String result = mEtInput.getText().toString();
-        if (validateInput(requireActivity(), result)) {
+        if (validateInput(requireActivity(), result))
+        {
          processInput(result);
          editTextDialog.dismiss();
        }
--- a/android/app/src/main/java/app/organicmaps/downloader/OnmapDownloader.java
+++ b/android/app/src/main/java/app/organicmaps/downloader/OnmapDownloader.java
@@ -4,7 +4,6 @@ import android.location.Location;
 import android.text.TextUtils;
 import android.view.View;
 import android.view.ViewGroup;
-
 import androidx.annotation.Nullable;
 import androidx.core.view.ViewCompat;
 import app.organicmaps.MwmActivity;
@@ -49,7 +48,8 @@ public class OnmapDownloader implements MwmActivity.LeftAnimationTrackListener
    @Override
    public void onStatusChanged(List<MapManager.StorageCallbackData> data)
    {
-      if (mCurrentCountry == null) {
+      if (mCurrentCountry == null)
+      {
        updateOfflineExplanationVisibility();
        return;
      }
@@ -109,10 +109,13 @@ public class OnmapDownloader implements MwmActivity.LeftAnimationTrackListener
    return enqueued || progress || applying;
  }

-  private void updateOfflineExplanationVisibility() {
-    if (mOfflineExplanation == null) return;
+  private void updateOfflineExplanationVisibility()
+  {
+    if (mOfflineExplanation == null)
+      return;
    // hide once threshold reached; safe to call repeatedly.
-    app.organicmaps.util.UiUtils.showIf(MapManager.nativeGetDownloadedCount() < (DEFAULT_MAP_BASELINE + HIDE_THRESHOLD), mOfflineExplanation);
+    app.organicmaps.util.UiUtils.showIf(MapManager.nativeGetDownloadedCount() < (DEFAULT_MAP_BASELINE + HIDE_THRESHOLD),
+                                        mOfflineExplanation);
  }

  private void updateProgressState(boolean shouldAutoDownload)
--- a/android/app/src/main/java/app/organicmaps/editor/EditorFragment.java
+++ b/android/app/src/main/java/app/organicmaps/editor/EditorFragment.java
@@ -15,7 +15,6 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.widget.AutoCompleteTextView;
 import android.widget.GridLayout;
-
 import androidx.annotation.CallSuper;
 import androidx.annotation.DrawableRes;
 import androidx.annotation.IdRes;
@@ -398,7 +397,7 @@ public class EditorFragment extends BaseMwmFragment implements View.OnClickListe
    List<String> SOCKET_TYPES = Arrays.stream(getResources().getStringArray(R.array.charge_socket_types)).toList();
    for (String socketType : SOCKET_TYPES)
    {
-      ChargeSocketDescriptor socket = new ChargeSocketDescriptor(socketType,0,0);
+      ChargeSocketDescriptor socket = new ChargeSocketDescriptor(socketType, 0, 0);

      MaterialButton btn = (MaterialButton) inflater.inflate(R.layout.button_socket_type, typeBtns, false);

@@ -406,16 +405,16 @@ public class EditorFragment extends BaseMwmFragment implements View.OnClickListe

      // load SVG icon converted into VectorDrawable in res/drawable
      @SuppressLint("DiscouragedApi")
-      int resIconId =
-          getResources().getIdentifier("ic_charge_socket_" + socket.visualType(), "drawable", requireContext().getPackageName());
+      int resIconId = getResources().getIdentifier("ic_charge_socket_" + socket.visualType(), "drawable",
+                                                   requireContext().getPackageName());
      if (resIconId != 0)
      {
        btn.setIcon(getResources().getDrawable(resIconId));
      }

      @SuppressLint("DiscouragedApi")
-      int resTypeId =
-          getResources().getIdentifier("charge_socket_" + socket.visualType(), "string", requireContext().getPackageName());
+      int resTypeId = getResources().getIdentifier("charge_socket_" + socket.visualType(), "string",
+                                                   requireContext().getPackageName());
      if (resTypeId != 0)
      {
        btn.setText(getResources().getString(resTypeId));
@@ -463,13 +462,16 @@ public class EditorFragment extends BaseMwmFragment implements View.OnClickListe
    // Add a TextWatcher to validate on text change
    countView.addTextChangedListener(new TextWatcher() {
      @Override
-      public void beforeTextChanged(CharSequence s, int start, int count, int after) {}
+      public void beforeTextChanged(CharSequence s, int start, int count, int after)
+      {}

      @Override
-      public void onTextChanged(CharSequence s, int start, int before, int count) {}
+      public void onTextChanged(CharSequence s, int start, int before, int count)
+      {}

      @Override
-      public void afterTextChanged(Editable s) {
+      public void afterTextChanged(Editable s)
+      {
        validatePositiveField(s.toString(), countInputLayout);
      }
    });
@@ -484,13 +486,16 @@ public class EditorFragment extends BaseMwmFragment implements View.OnClickListe
    // Add a TextWatcher to validate on text change
    powerView.addTextChangedListener(new TextWatcher() {
      @Override
-      public void beforeTextChanged(CharSequence s, int start, int count, int after) {}
+      public void beforeTextChanged(CharSequence s, int start, int count, int after)
+      {}

      @Override
-      public void onTextChanged(CharSequence s, int start, int before, int count) {}
+      public void onTextChanged(CharSequence s, int start, int before, int count)
+      {}

      @Override
-      public void afterTextChanged(Editable s) {
+      public void afterTextChanged(Editable s)
+      {
        validatePositiveField(s.toString(), powerInputLayout);
      }
    });
@@ -498,74 +503,82 @@ public class EditorFragment extends BaseMwmFragment implements View.OnClickListe
    return new MaterialAlertDialogBuilder(requireActivity(), R.style.MwmTheme_AlertDialog)
        .setTitle(R.string.editor_socket)
        .setView(dialogView)
-        .setPositiveButton(R.string.save,
-                (dialog, which) -> {
-                  String socketType = "";
-                  for (MaterialButton b : buttonList)
-                  {
-                    if (b.isChecked())
-                    {
-                      socketType = b.getTag(R.id.socket_type).toString();
-                      break;
-                    }
-                  }
+        .setPositiveButton(
+            R.string.save,
+            (dialog, which) -> {
+              String socketType = "";
+              for (MaterialButton b : buttonList)
+              {
+                if (b.isChecked())
+                {
+                  socketType = b.getTag(R.id.socket_type).toString();
+                  break;
+                }
+              }

-                  int countValue = 0; // 0 means 'unknown count'
-                  try
-                  {
-                    countValue = Integer.parseInt(countView.getText().toString());
-                  }
-                  catch (NumberFormatException ignored)
-                  {
-                    Logger.w(CHARGE_SOCKETS_TAG, "Invalid count value for socket:" + countView.getText().toString());
-                  }
+              int countValue = 0; // 0 means 'unknown count'
+              try
+              {
+                countValue = Integer.parseInt(countView.getText().toString());
+              }
+              catch (NumberFormatException ignored)
+              {
+                Logger.w(CHARGE_SOCKETS_TAG, "Invalid count value for socket:" + countView.getText().toString());
+              }

-                  if (countValue < 0)
-                  {
-                    countValue = 0;
-                    Logger.w(CHARGE_SOCKETS_TAG, "Invalid count value for socket:" + countView.getText().toString());
-                  }
+              if (countValue < 0)
+              {
+                countValue = 0;
+                Logger.w(CHARGE_SOCKETS_TAG, "Invalid count value for socket:" + countView.getText().toString());
+              }

-                  double powerValue = 0; // 0 means 'unknown power'
-                  try
-                  {
-                    powerValue = Double.parseDouble(powerView.getText().toString());
-                  }
-                  catch (NumberFormatException ignored)
-                  {
-                    Logger.w(CHARGE_SOCKETS_TAG, "Invalid power value for socket:" + powerView.getText().toString());
-                  }
+              double powerValue = 0; // 0 means 'unknown power'
+              try
+              {
+                powerValue = Double.parseDouble(powerView.getText().toString());
+              }
+              catch (NumberFormatException ignored)
+              {
+                Logger.w(CHARGE_SOCKETS_TAG, "Invalid power value for socket:" + powerView.getText().toString());
+              }

-                  if (powerValue < 0)
-                  {
-                    powerValue = 0;
-                    Logger.w(CHARGE_SOCKETS_TAG, "Invalid power value for socket:" + powerView.getText().toString());
-                  }
+              if (powerValue < 0)
+              {
+                powerValue = 0;
+                Logger.w(CHARGE_SOCKETS_TAG, "Invalid power value for socket:" + powerView.getText().toString());
+              }

-                  ChargeSocketDescriptor socket =
-                          new ChargeSocketDescriptor(socketType, countValue, powerValue);
+              ChargeSocketDescriptor socket = new ChargeSocketDescriptor(socketType, countValue, powerValue);

-                  updateChargeSockets(socketIndex, socket);
-                })
+              updateChargeSockets(socketIndex, socket);
+            })
        .setNegativeButton(R.string.cancel, (dialog, which) -> dialog.dismiss());
  }

  // Helper method for validation logic
-  private boolean validatePositiveField(String text, TextInputLayout layout) {
-    if (text.isEmpty()) {
+  private boolean validatePositiveField(String text, TextInputLayout layout)
+  {
+    if (text.isEmpty())
+    {
      layout.setError(null); // No error if empty (assuming 0 is the default)
      return true;
    }
-    try {
+    try
+    {
      double value = Double.parseDouble(text);
-      if (value < 0) {
+      if (value < 0)
+      {
        layout.setError(getString(R.string.error_value_must_be_positive));
        return false;
-      } else {
-          layout.setError(null);
-          return true;
      }
-    } catch (NumberFormatException e) {
+      else
+      {
+        layout.setError(null);
+        return true;
+      }
+    }
+    catch (NumberFormatException e)
+    {
      layout.setError(getString(R.string.error_invalid_number));
      return false;
    }
@@ -585,7 +598,8 @@ public class EditorFragment extends BaseMwmFragment implements View.OnClickListe
    {
      sockets[socketIndex] = socket;
    }
-    else {
+    else
+    {
      List<ChargeSocketDescriptor> list = new ArrayList<>(Arrays.asList(sockets));
      list.add(socket);
      sockets = list.toArray(new ChargeSocketDescriptor[0]);
@@ -603,7 +617,8 @@ public class EditorFragment extends BaseMwmFragment implements View.OnClickListe
    GridLayout socketsGrid = mChargeSockets.findViewById(R.id.socket_grid_editor);
    socketsGrid.removeAllViews();

-    for (int i = 0; i < sockets.length; i++) {
+    for (int i = 0; i < sockets.length; i++)
+    {
      final int currentIndex = i;
      ChargeSocketDescriptor socket = sockets[i];

@@ -614,27 +629,30 @@ public class EditorFragment extends BaseMwmFragment implements View.OnClickListe
      MaterialTextView power = itemView.findViewById(R.id.socket_power);
      MaterialTextView count = itemView.findViewById(R.id.socket_count);

-
      // load SVG icon converted into VectorDrawable in res/drawable
      @SuppressLint("DiscouragedApi")
      int resIconId = getResources().getIdentifier("ic_charge_socket_" + socket.visualType(), "drawable",
-              requireContext().getPackageName());
-      if (resIconId != 0) {
+                                                   requireContext().getPackageName());
+      if (resIconId != 0)
+      {
        icon.setImageResource(resIconId);
      }

      @SuppressLint("DiscouragedApi")
-      int resTypeId =
-              getResources().getIdentifier("charge_socket_" + socket.visualType(), "string", requireContext().getPackageName());
-      if (resTypeId != 0) {
+      int resTypeId = getResources().getIdentifier("charge_socket_" + socket.visualType(), "string",
+                                                   requireContext().getPackageName());
+      if (resTypeId != 0)
+      {
        type.setText(resTypeId);
      }

-      if (socket.power() != 0) {
+      if (socket.power() != 0)
+      {
        DecimalFormat df = new DecimalFormat("#.##");
        power.setText(getString(R.string.kw_label, df.format(socket.power())));
      }
-      else if (socket.ignorePower()) {
+      else if (socket.ignorePower())
+      {
        power.setVisibility(INVISIBLE);
      }

@@ -643,7 +661,8 @@ public class EditorFragment extends BaseMwmFragment implements View.OnClickListe
        count.setText(getString(R.string.count_label, socket.count()));
      }

-      itemView.setOnClickListener(v -> buildChargeSocketDialog(currentIndex, socket.type(), socket.count(), socket.power()).show());
+      itemView.setOnClickListener(
+          v -> buildChargeSocketDialog(currentIndex, socket.type(), socket.count(), socket.power()).show());
      socketsGrid.addView(itemView);
    }

@@ -789,9 +808,8 @@ public class EditorFragment extends BaseMwmFragment implements View.OnClickListe
    View lineContactBlock =
        initBlock(view, Metadata.MetadataType.FMD_CONTACT_LINE, R.id.block_line, R.drawable.ic_line_white,
                  R.string.editor_line_social_network, InputType.TYPE_TEXT_VARIATION_URI);
-    View blueskyContactBlock =
-        initBlock(view, Metadata.MetadataType.FMD_CONTACT_BLUESKY, R.id.block_bluesky, R.drawable.ic_bluesky,
-                  R.string.bluesky, InputType.TYPE_TEXT_VARIATION_URI);
+    View blueskyContactBlock = initBlock(view, Metadata.MetadataType.FMD_CONTACT_BLUESKY, R.id.block_bluesky,
+                                         R.drawable.ic_bluesky, R.string.bluesky, InputType.TYPE_TEXT_VARIATION_URI);
    View operatorBlock = initBlock(view, Metadata.MetadataType.FMD_OPERATOR, R.id.block_operator,
                                   R.drawable.ic_operator, R.string.editor_operator, 0);

@@ -1023,14 +1041,15 @@ public class EditorFragment extends BaseMwmFragment implements View.OnClickListe
  private void placeDisused()
  {
    new MaterialAlertDialogBuilder(requireActivity(), R.style.MwmTheme_AlertDialog)
-      .setTitle(R.string.editor_mark_business_vacant_title)
-      .setMessage(R.string.editor_mark_business_vacant_description)
-      .setPositiveButton(R.string.editor_submit, (dlg, which) -> {
-        Editor.nativeMarkPlaceAsDisused();
-        mParent.processEditedFeatures();
-      })
-      .setNegativeButton(android.R.string.cancel, null)
-      .show();
+        .setTitle(R.string.editor_mark_business_vacant_title)
+        .setMessage(R.string.editor_mark_business_vacant_description)
+        .setPositiveButton(R.string.editor_submit,
+                           (dlg, which) -> {
+                             Editor.nativeMarkPlaceAsDisused();
+                             mParent.processEditedFeatures();
+                           })
+        .setNegativeButton(android.R.string.cancel, null)
+        .show();
  }

  private void commitPlaceDoesntExists(@NonNull String text)
--- a/android/app/src/main/java/app/organicmaps/editor/FeatureCategoryAdapter.java
+++ b/android/app/src/main/java/app/organicmaps/editor/FeatureCategoryAdapter.java
@@ -13,7 +13,6 @@ import app.organicmaps.R;
 import app.organicmaps.sdk.editor.data.FeatureCategory;
 import app.organicmaps.sdk.util.StringUtils;
 import app.organicmaps.util.UiUtils;
-
 import com.google.android.material.button.MaterialButton;
 import com.google.android.material.textfield.TextInputEditText;
 import com.google.android.material.textview.MaterialTextView;
@@ -69,8 +68,7 @@ public class FeatureCategoryAdapter extends RecyclerView.Adapter<RecyclerView.Vi
    }
    case TYPE_FOOTER ->
    {
-      return new FooterViewHolder(inflater.inflate(R.layout.item_feature_category_footer, parent, false),
-              mFragment);
+      return new FooterViewHolder(inflater.inflate(R.layout.item_feature_category_footer, parent, false), mFragment);
    }
    default -> throw new IllegalArgumentException("Unsupported viewType: " + viewType);
    }
@@ -134,26 +132,21 @@ public class FeatureCategoryAdapter extends RecyclerView.Adapter<RecyclerView.Vi
      mSendNoteButton = itemView.findViewById(R.id.send_note_button);
      mSendNoteButton.setOnClickListener(v -> listener.onSendNoteClicked());
      final ColorStateList bgButtonColor = new ColorStateList(
-              new int[][]{
-                      new int[]{android.R.attr.state_enabled}, // enabled
-                      new int[]{-android.R.attr.state_enabled} // disabled
-                      },
-              new int[]{
-                      ContextCompat.getColor(
-                              mSendNoteButton.getContext(), R.color.base_accent),
-                      ContextCompat.getColor(mSendNoteButton.getContext(), R.color.button_accent_disabled)
-              });
+          new int[][] {
+              new int[] {android.R.attr.state_enabled}, // enabled
+              new int[] {-android.R.attr.state_enabled} // disabled
+          },
+          new int[] {ContextCompat.getColor(mSendNoteButton.getContext(), R.color.base_accent),
+                     ContextCompat.getColor(mSendNoteButton.getContext(), R.color.button_accent_disabled)});
      final ColorStateList textButtonColor = new ColorStateList(
-              new int[][]{
-                      new int[]{android.R.attr.state_enabled}, // enabled
-                      new int[]{-android.R.attr.state_enabled} // disabled
-                      },
-              new int[]{
-                      ContextCompat.getColor(
-                              mSendNoteButton.getContext(),
-                              UiUtils.getStyledResourceId(mSendNoteButton.getContext(), android.R.attr.textColorPrimaryInverse)),
-                      ContextCompat.getColor(mSendNoteButton.getContext(), R.color.button_accent_text_disabled)
-              });
+          new int[][] {
+              new int[] {android.R.attr.state_enabled}, // enabled
+              new int[] {-android.R.attr.state_enabled} // disabled
+          },
+          new int[] {ContextCompat.getColor(mSendNoteButton.getContext(),
+                                            UiUtils.getStyledResourceId(mSendNoteButton.getContext(),
+                                                                        android.R.attr.textColorPrimaryInverse)),
+                     ContextCompat.getColor(mSendNoteButton.getContext(), R.color.button_accent_text_disabled)});
      mSendNoteButton.setBackgroundTintList(bgButtonColor);
      mSendNoteButton.setTextColor(textButtonColor);
      mNoteEditText.addTextChangedListener(new StringUtils.SimpleTextWatcher() {
--- a/android/app/src/main/java/app/organicmaps/editor/FromToTimePicker.java
+++ b/android/app/src/main/java/app/organicmaps/editor/FromToTimePicker.java
@@ -2,19 +2,16 @@ package app.organicmaps.editor;

 import android.content.res.Configuration;
 import android.content.res.Resources;
-
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentActivity;
 import androidx.fragment.app.FragmentManager;
-
-import com.google.android.material.timepicker.MaterialTimePicker;
-import com.google.android.material.timepicker.TimeFormat;
-
 import app.organicmaps.R;
 import app.organicmaps.sdk.editor.data.HoursMinutes;
 import app.organicmaps.sdk.util.DateUtils;
+import com.google.android.material.timepicker.MaterialTimePicker;
+import com.google.android.material.timepicker.TimeFormat;

 public class FromToTimePicker
 {
@@ -32,18 +29,11 @@ public class FromToTimePicker
  private boolean mIsFromTimePicked;
  private int mInputMode;

-  public static void pickTime(@NonNull Fragment fragment,
-                              @NonNull FromToTimePicker.OnPickListener listener,
-                              @NonNull HoursMinutes fromTime,
-                              @NonNull HoursMinutes toTime,
-                              int id,
+  public static void pickTime(@NonNull Fragment fragment, @NonNull FromToTimePicker.OnPickListener listener,
+                              @NonNull HoursMinutes fromTime, @NonNull HoursMinutes toTime, int id,
                              boolean startWithToTime)
  {
-    FromToTimePicker timePicker = new FromToTimePicker(fragment,
-                                                       listener,
-                                                       fromTime,
-                                                       toTime,
-                                                       id);
+    FromToTimePicker timePicker = new FromToTimePicker(fragment, listener, fromTime, toTime, id);

    if (startWithToTime)
      timePicker.showToTimePicker();
@@ -51,11 +41,8 @@ public class FromToTimePicker
      timePicker.showFromTimePicker();
  }

-  private FromToTimePicker(@NonNull Fragment fragment,
-                           @NonNull FromToTimePicker.OnPickListener listener,
-                           @NonNull HoursMinutes fromTime,
-                           @NonNull HoursMinutes toTime,
-                           int id)
+  private FromToTimePicker(@NonNull Fragment fragment, @NonNull FromToTimePicker.OnPickListener listener,
+                           @NonNull HoursMinutes fromTime, @NonNull HoursMinutes toTime, int id)
  {
    mActivity = fragment.requireActivity();
    mFragmentManager = fragment.getChildFragmentManager();
@@ -100,15 +87,12 @@ public class FromToTimePicker

  private MaterialTimePicker buildFromTimePicker()
  {
-    MaterialTimePicker timePicker = buildTimePicker(mFromTime,
-                                                    mResources.getString(R.string.editor_time_from),
-                                                    mResources.getString(R.string.next_button),
-                                                    null);
+    MaterialTimePicker timePicker = buildTimePicker(mFromTime, mResources.getString(R.string.editor_time_from),
+                                                    mResources.getString(R.string.next_button), null);

    timePicker.addOnNegativeButtonClickListener(view -> finishTimePicking(false));

-    timePicker.addOnPositiveButtonClickListener(view ->
-    {
+    timePicker.addOnPositiveButtonClickListener(view -> {
      mIsFromTimePicked = true;
      saveState(timePicker, true);
      mFromTimePicker = null;
@@ -122,13 +106,10 @@ public class FromToTimePicker

  private MaterialTimePicker buildToTimePicker()
  {
-    MaterialTimePicker timePicker = buildTimePicker(mToTime,
-                                                    mResources.getString(R.string.editor_time_to),
-                                                    null,
+    MaterialTimePicker timePicker = buildTimePicker(mToTime, mResources.getString(R.string.editor_time_to), null,
                                                    mResources.getString(R.string.back));

-    timePicker.addOnNegativeButtonClickListener(view ->
-    {
+    timePicker.addOnNegativeButtonClickListener(view -> {
      saveState(timePicker, false);
      mToTimePicker = null;
      if (mIsFromTimePicked)
@@ -137,8 +118,7 @@ public class FromToTimePicker
        finishTimePicking(false);
    });

-    timePicker.addOnPositiveButtonClickListener(view ->
-    {
+    timePicker.addOnPositiveButtonClickListener(view -> {
      saveState(timePicker, false);
      finishTimePicking(true);
    });
@@ -149,18 +129,18 @@ public class FromToTimePicker
  }

  @NonNull
-  private MaterialTimePicker buildTimePicker(@NonNull HoursMinutes time,
-                                             @NonNull String title,
+  private MaterialTimePicker buildTimePicker(@NonNull HoursMinutes time, @NonNull String title,
                                             @Nullable String positiveButtonTextOverride,
                                             @Nullable String negativeButtonTextOverride)
  {
-    MaterialTimePicker.Builder builder = new MaterialTimePicker.Builder()
-                                             .setTitleText(title)
-                                             .setTimeFormat(mIs24HourFormat ? TimeFormat.CLOCK_24H : TimeFormat.CLOCK_12H)
-                                             .setInputMode(mInputMode)
-                                             .setTheme(R.style.MwmTheme_MaterialTimePicker)
-                                             .setHour((int) time.hours)
-                                             .setMinute((int) time.minutes);
+    MaterialTimePicker.Builder builder =
+        new MaterialTimePicker.Builder()
+            .setTitleText(title)
+            .setTimeFormat(mIs24HourFormat ? TimeFormat.CLOCK_24H : TimeFormat.CLOCK_12H)
+            .setInputMode(mInputMode)
+            .setTheme(R.style.MwmTheme_MaterialTimePicker)
+            .setHour((int) time.hours)
+            .setMinute((int) time.minutes);

    if (positiveButtonTextOverride != null)
      builder.setPositiveButtonText(positiveButtonTextOverride);
--- a/android/app/src/main/java/app/organicmaps/editor/SimpleTimetableAdapter.java
+++ b/android/app/src/main/java/app/organicmaps/editor/SimpleTimetableAdapter.java
@@ -7,7 +7,6 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.widget.CompoundButton;
 import android.widget.LinearLayout;
-
 import androidx.annotation.IdRes;
 import androidx.annotation.IntRange;
 import androidx.annotation.Nullable;
@@ -122,20 +121,14 @@ class SimpleTimetableAdapter extends RecyclerView.Adapter<SimpleTimetableAdapter
    notifyItemChanged(getItemCount() - 1);
  }

-  private void pickTime(int position,
-                        @IntRange(from = ID_OPENING_TIME, to = ID_CLOSED_SPAN) int id,
+  private void pickTime(int position, @IntRange(from = ID_OPENING_TIME, to = ID_CLOSED_SPAN) int id,
                        boolean startWithToTime)
  {
    final Timetable data = mItems.get(position);
    mPickingPosition = position;

-    FromToTimePicker.pickTime(mFragment,
-        this,
-        data.workingTimespan.start,
-        data.workingTimespan.end,
-        id,
-        startWithToTime);
-
+    FromToTimePicker.pickTime(mFragment, this, data.workingTimespan.start, data.workingTimespan.end, id,
+                              startWithToTime);
  }

  @Override
@@ -384,26 +377,21 @@ class SimpleTimetableAdapter extends RecyclerView.Adapter<SimpleTimetableAdapter
      final String text = mFragment.getString(R.string.editor_time_add);
      mAdd.setEnabled(enable);
      final ColorStateList bgButtonColor = new ColorStateList(
-              new int[][]{
-                      new int[]{android.R.attr.state_enabled}, // enabled
-                      new int[]{-android.R.attr.state_enabled} // disabled
-                      },
-              new int[]{
-                      ContextCompat.getColor(
-                              mAdd.getContext(), R.color.base_accent),
-                      ContextCompat.getColor(mAdd.getContext(), R.color.button_accent_disabled)
-              });
+          new int[][] {
+              new int[] {android.R.attr.state_enabled}, // enabled
+              new int[] {-android.R.attr.state_enabled} // disabled
+          },
+          new int[] {ContextCompat.getColor(mAdd.getContext(), R.color.base_accent),
+                     ContextCompat.getColor(mAdd.getContext(), R.color.button_accent_disabled)});
      final ColorStateList textButtonColor = new ColorStateList(
-              new int[][]{
-                      new int[]{android.R.attr.state_enabled}, // enabled
-                      new int[]{-android.R.attr.state_enabled} // disabled
-                      },
-              new int[]{
-                      ContextCompat.getColor(
-                              mAdd.getContext(),
-                              UiUtils.getStyledResourceId(mAdd.getContext(), android.R.attr.textColorPrimaryInverse)),
-                      ContextCompat.getColor(mAdd.getContext(), R.color.button_accent_text_disabled)
-              });
+          new int[][] {
+              new int[] {android.R.attr.state_enabled}, // enabled
+              new int[] {-android.R.attr.state_enabled} // disabled
+          },
+          new int[] {
+              ContextCompat.getColor(mAdd.getContext(), UiUtils.getStyledResourceId(
+                                                            mAdd.getContext(), android.R.attr.textColorPrimaryInverse)),
+              ContextCompat.getColor(mAdd.getContext(), R.color.button_accent_text_disabled)});
      mAdd.setBackgroundTintList(bgButtonColor);
      mAdd.setTextColor(textButtonColor);
      mAdd.setText(enable ? text + " (" + TimeFormatUtils.formatWeekdays(mComplementItem) + ")" : text);
--- a/android/app/src/main/java/app/organicmaps/editor/SimpleTimetableFragment.java
+++ b/android/app/src/main/java/app/organicmaps/editor/SimpleTimetableFragment.java
@@ -9,8 +9,8 @@ import androidx.annotation.Nullable;
 import app.organicmaps.R;
 import app.organicmaps.base.BaseMwmRecyclerFragment;

-public class SimpleTimetableFragment extends BaseMwmRecyclerFragment<SimpleTimetableAdapter>
-    implements TimetableProvider
+public class SimpleTimetableFragment
+    extends BaseMwmRecyclerFragment<SimpleTimetableAdapter> implements TimetableProvider
 {
  private SimpleTimetableAdapter mAdapter;
  @Nullable
--- a/android/app/src/main/java/app/organicmaps/maplayer/LayerBottomSheetItem.java
+++ b/android/app/src/main/java/app/organicmaps/maplayer/LayerBottomSheetItem.java
@@ -35,25 +35,30 @@ public class LayerBottomSheetItem
    @DrawableRes
    int drawableResId = 0;
    @StringRes
-    int buttonTextResource = switch (mode) {
-        case OUTDOORS -> {
-            drawableResId = R.drawable.ic_layers_outdoors;
-            yield R.string.button_layer_outdoor;
-        }
-        case SUBWAY -> {
-            drawableResId = R.drawable.ic_layers_subway;
-            yield R.string.subway;
-        }
-        case ISOLINES -> {
-            drawableResId = R.drawable.ic_layers_isoline;
-            yield R.string.button_layer_isolines;
-        }
-        case TRAFFIC -> {
-            drawableResId = R.drawable.ic_layers_traffic;
-            yield R.string.button_layer_traffic;
-        }
+    int buttonTextResource = switch (mode)
+    {
+      case OUTDOORS ->
+      {
+        drawableResId = R.drawable.ic_layers_outdoors;
+        yield R.string.button_layer_outdoor;
+      }
+      case SUBWAY ->
+      {
+        drawableResId = R.drawable.ic_layers_subway;
+        yield R.string.subway;
+      }
+      case ISOLINES ->
+      {
+        drawableResId = R.drawable.ic_layers_isoline;
+        yield R.string.button_layer_isolines;
+      }
+      case TRAFFIC ->
+      {
+        drawableResId = R.drawable.ic_layers_traffic;
+        yield R.string.button_layer_traffic;
+      }
    };
-      return new LayerBottomSheetItem(drawableResId, buttonTextResource, mode, layerItemClickListener);
+    return new LayerBottomSheetItem(drawableResId, buttonTextResource, mode, layerItemClickListener);
  }

  @NonNull
--- a/android/app/src/main/java/app/organicmaps/maplayer/LayerHolder.java
+++ b/android/app/src/main/java/app/organicmaps/maplayer/LayerHolder.java
@@ -5,11 +5,9 @@ import android.widget.ImageView;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.recyclerview.widget.RecyclerView;
-
-import com.google.android.material.textview.MaterialTextView;
-
 import app.organicmaps.R;
 import app.organicmaps.adapter.OnItemClickListener;
+import com.google.android.material.textview.MaterialTextView;

 class LayerHolder extends RecyclerView.ViewHolder
 {
--- a/android/app/src/main/java/app/organicmaps/maplayer/MapButtonsController.java
+++ b/android/app/src/main/java/app/organicmaps/maplayer/MapButtonsController.java
@@ -395,7 +395,7 @@ public class MapButtonsController extends Fragment
            0;
            // Allow offset tolerance for zoom buttons
        };
-            showButton(getViewTopOffset(translation, button) >= toleranceOffset, entry.getKey());
+        showButton(getViewTopOffset(translation, button) >= toleranceOffset, entry.getKey());
      }
    }
  }
--- a/android/app/src/main/java/app/organicmaps/routing/RoutingBottomMenuController.java
+++ b/android/app/src/main/java/app/organicmaps/routing/RoutingBottomMenuController.java
@@ -43,7 +43,6 @@ import app.organicmaps.util.UiUtils;
 import app.organicmaps.util.Utils;
 import app.organicmaps.widget.recycler.DotDividerItemDecoration;
 import app.organicmaps.widget.recycler.MultilineLayoutManager;
-
 import com.google.android.material.button.MaterialButton;
 import com.google.android.material.imageview.ShapeableImageView;
 import com.google.android.material.textview.MaterialTextView;
@@ -123,9 +122,9 @@ final class RoutingBottomMenuController implements View.OnClickListener
                                      @NonNull View timeElevationLine, @NonNull View transitFrame,
                                      @NonNull MaterialTextView error, @NonNull MaterialButton start,
                                      @NonNull ShapeableImageView altitudeChart, @NonNull MaterialTextView time,
-                                      @NonNull MaterialTextView altitudeDifference, @NonNull MaterialTextView timeVehicle,
-                                      @Nullable MaterialTextView arrival, @NonNull View actionFrame,
-                                      @Nullable RoutingBottomMenuListener listener)
+                                      @NonNull MaterialTextView altitudeDifference,
+                                      @NonNull MaterialTextView timeVehicle, @Nullable MaterialTextView arrival,
+                                      @NonNull View actionFrame, @Nullable RoutingBottomMenuListener listener)
  {
    mContext = context;
    mAltitudeChartFrame = altitudeChartFrame;
--- a/android/app/src/main/java/app/organicmaps/routing/RoutingPlanController.java
+++ b/android/app/src/main/java/app/organicmaps/routing/RoutingPlanController.java
@@ -12,9 +12,6 @@ import androidx.annotation.IdRes;
 import androidx.annotation.NonNull;
 import androidx.core.view.ViewCompat;
 import androidx.core.view.WindowInsetsCompat;
-
-import com.google.android.material.textview.MaterialTextView;
-
 import app.organicmaps.MwmApplication;
 import app.organicmaps.R;
 import app.organicmaps.sdk.Framework;
@@ -29,6 +26,7 @@ import app.organicmaps.util.WindowInsetUtils.PaddingInsetsListener;
 import app.organicmaps.widget.RoutingToolbarButton;
 import app.organicmaps.widget.ToolbarController;
 import app.organicmaps.widget.WheelProgressView;
+import com.google.android.material.textview.MaterialTextView;

 public class RoutingPlanController extends ToolbarController
 {
@@ -264,7 +262,7 @@ public class RoutingPlanController extends ToolbarController
      default -> throw new IllegalArgumentException("unknown router: " + router);
    };

-        RoutingToolbarButton button = mRouterTypes.findViewById(mRouterTypes.getCheckedRadioButtonId());
+    RoutingToolbarButton button = mRouterTypes.findViewById(mRouterTypes.getCheckedRadioButtonId());
    button.progress();

    updateProgressLabels();
--- a/android/app/src/main/java/app/organicmaps/search/CategoriesAdapter.java
+++ b/android/app/src/main/java/app/organicmaps/search/CategoriesAdapter.java
@@ -14,12 +14,10 @@ import androidx.annotation.NonNull;
 import androidx.annotation.StringRes;
 import androidx.fragment.app.Fragment;
 import androidx.recyclerview.widget.RecyclerView;
-
-import com.google.android.material.textview.MaterialTextView;
-
 import app.organicmaps.R;
 import app.organicmaps.sdk.search.DisplayedCategories;
 import app.organicmaps.sdk.util.Language;
+import com.google.android.material.textview.MaterialTextView;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.util.Locale;
--- a/android/app/src/main/java/app/organicmaps/search/SearchAdapter.java
+++ b/android/app/src/main/java/app/organicmaps/search/SearchAdapter.java
@@ -10,14 +10,12 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.core.content.ContextCompat;
 import androidx.recyclerview.widget.RecyclerView;
-
-import com.google.android.material.textview.MaterialTextView;
-
 import app.organicmaps.R;
 import app.organicmaps.sdk.search.SearchResult;
 import app.organicmaps.util.Graphics;
 import app.organicmaps.util.ThemeUtils;
 import app.organicmaps.util.UiUtils;
+import com.google.android.material.textview.MaterialTextView;

 class SearchAdapter extends RecyclerView.Adapter<SearchAdapter.SearchDataViewHolder>
 {
@@ -152,7 +150,8 @@ class SearchAdapter extends RecyclerView.Adapter<SearchAdapter.SearchDataViewHol
    {
      final Resources resources = mSearchFragment.getResources();

-      if (result.description.openNow != SearchResult.OPEN_NOW_YES && result.description.openNow != SearchResult.OPEN_NOW_NO)
+      if (result.description.openNow != SearchResult.OPEN_NOW_YES
+          && result.description.openNow != SearchResult.OPEN_NOW_NO)
      {
        // Hide if unknown opening hours state
        UiUtils.hide(mOpen);
@@ -169,15 +168,18 @@ class SearchAdapter extends RecyclerView.Adapter<SearchAdapter.SearchDataViewHol
      {
        final String minsToChangeStr = resources.getQuantityString(
            R.plurals.minutes_short, Math.max(minsToNextState, 1), Math.max(minsToNextState, 1));
-        final String nextChangeFormatted = resources.getString(isOpen ? R.string.closes_in : R.string.opens_in, minsToChangeStr);
+        final String nextChangeFormatted =
+            resources.getString(isOpen ? R.string.closes_in : R.string.opens_in, minsToChangeStr);

        UiUtils.setTextAndShow(mOpen, nextChangeFormatted);
        mOpen.setTextColor(ContextCompat.getColor(mSearchFragment.getContext(), R.color.base_yellow));
      }
      else
      {
-        UiUtils.setTextAndShow(mOpen, isOpen ? resources.getString(R.string.editor_time_open) : resources.getString(R.string.closed));
-        mOpen.setTextColor(ContextCompat.getColor(mSearchFragment.getContext(), isOpen ? R.color.base_green : R.color.base_red));
+        UiUtils.setTextAndShow(
+            mOpen, isOpen ? resources.getString(R.string.editor_time_open) : resources.getString(R.string.closed));
+        mOpen.setTextColor(
+            ContextCompat.getColor(mSearchFragment.getContext(), isOpen ? R.color.base_green : R.color.base_red));
      }
    }

--- a/android/app/src/main/java/app/organicmaps/search/SearchFragment.java
+++ b/android/app/src/main/java/app/organicmaps/search/SearchFragment.java
@@ -273,7 +273,8 @@ public class SearchFragment extends BaseMwmFragment implements SearchListener, C
    RecyclerView mResults = mResultsFrame.findViewById(R.id.recycler);
    setRecyclerScrollListener(mResults);
    mResultsPlaceholder = mResultsFrame.findViewById(R.id.placeholder);
-    mResultsPlaceholder.setContent(R.string.search_not_found, R.string.search_not_found_query, R.drawable.ic_search_fail);
+    mResultsPlaceholder.setContent(R.string.search_not_found, R.string.search_not_found_query,
+                                   R.drawable.ic_search_fail);
    mSearchAdapter.registerAdapterDataObserver(new RecyclerView.AdapterDataObserver()

                                               {
--- a/android/app/src/main/java/app/organicmaps/search/SearchHistoryAdapter.java
+++ b/android/app/src/main/java/app/organicmaps/search/SearchHistoryAdapter.java
@@ -5,15 +5,13 @@ import android.view.View;
 import android.view.ViewGroup;
 import androidx.annotation.NonNull;
 import androidx.recyclerview.widget.RecyclerView;
-
-import com.google.android.material.textview.MaterialTextView;
-
 import app.organicmaps.MwmApplication;
 import app.organicmaps.R;
 import app.organicmaps.sdk.routing.RoutingController;
 import app.organicmaps.sdk.search.SearchRecents;
 import app.organicmaps.util.Graphics;
 import app.organicmaps.widget.SearchToolbarController;
+import com.google.android.material.textview.MaterialTextView;

 class SearchHistoryAdapter extends RecyclerView.Adapter<SearchHistoryAdapter.ViewHolder>
 {
--- a/android/app/src/main/java/app/organicmaps/settings/DrivingOptionsFragment.java
+++ b/android/app/src/main/java/app/organicmaps/settings/DrivingOptionsFragment.java
@@ -8,14 +8,12 @@ import android.view.ViewGroup;
 import android.widget.CompoundButton;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
-
-import com.google.android.material.materialswitch.MaterialSwitch;
-
 import app.organicmaps.R;
 import app.organicmaps.base.BaseMwmToolbarFragment;
 import app.organicmaps.sdk.routing.RoutingController;
 import app.organicmaps.sdk.routing.RoutingOptions;
 import app.organicmaps.sdk.settings.RoadType;
+import com.google.android.material.materialswitch.MaterialSwitch;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashSet;
--- a/android/app/src/main/java/app/organicmaps/util/ThemeSwitcher.java
+++ b/android/app/src/main/java/app/organicmaps/util/ThemeSwitcher.java
@@ -90,7 +90,8 @@ public enum ThemeSwitcher
    {
      if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S)
        uiModeManager.setApplicationNightMode(UiModeManager.MODE_NIGHT_YES);
-      AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_YES);
+      else
+        AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_YES);

      if (RoutingController.get().isVehicleNavigation())
        style = MapStyle.VehicleDark;
@@ -103,7 +104,8 @@ public enum ThemeSwitcher
    {
      if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S)
        uiModeManager.setApplicationNightMode(UiModeManager.MODE_NIGHT_NO);
-      AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_NO);
+      else
+        AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_NO);

      if (RoutingController.get().isVehicleNavigation())
        style = MapStyle.VehicleClear;
--- a/android/app/src/main/java/app/organicmaps/widget/BaseSignView.java
+++ b/android/app/src/main/java/app/organicmaps/widget/BaseSignView.java
@@ -8,165 +8,165 @@ import android.graphics.Typeface;
 import android.util.AttributeSet;
 import android.view.MotionEvent;
 import android.view.View;
-
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;

 public abstract class BaseSignView extends View
 {
-    private float mBorderWidthRatio = 0.1f;
-    protected void setBorderWidthRatio(float ratio) {
-        mBorderWidthRatio = ratio;
-    }
+  private float mBorderWidthRatio = 0.1f;
+  protected void setBorderWidthRatio(float ratio)
+  {
+    mBorderWidthRatio = ratio;
+  }

-    private float mBorderInsetRatio = 0f;
-    protected void setBorderInsetRatio(float ratio) {
-        mBorderInsetRatio = ratio;
-    }
+  private float mBorderInsetRatio = 0f;
+  protected void setBorderInsetRatio(float ratio)
+  {
+    mBorderInsetRatio = ratio;
+  }

-    // colors
-    protected int mBackgroundColor;
-    protected int mBorderColor;
-    protected int mAlertColor;
-    protected int mTextColor;
-    protected int mTextAlertColor;
+  // colors
+  protected int mBackgroundColor;
+  protected int mBorderColor;
+  protected int mAlertColor;
+  protected int mTextColor;
+  protected int mTextAlertColor;

-    // paints
-    protected final Paint mBackgroundPaint;
-    protected final Paint mBorderPaint;
-    protected final Paint mTextPaint;
+  // paints
+  protected final Paint mBackgroundPaint;
+  protected final Paint mBorderPaint;
+  protected final Paint mTextPaint;

-    // geometry
-    protected float mWidth;
-    protected float mHeight;
-    protected float mRadius;
-    protected float mBorderWidth;
-    protected float mBorderRadius;
+  // geometry
+  protected float mWidth;
+  protected float mHeight;
+  protected float mRadius;
+  protected float mBorderWidth;
+  protected float mBorderRadius;

-    public BaseSignView(Context ctx, @Nullable AttributeSet attrs)
+  public BaseSignView(Context ctx, @Nullable AttributeSet attrs)
+  {
+    super(ctx, attrs);
+    mBackgroundPaint = new Paint(Paint.ANTI_ALIAS_FLAG);
+    mBorderPaint = new Paint(Paint.ANTI_ALIAS_FLAG);
+    mBorderPaint.setStyle(Paint.Style.STROKE);
+    mTextPaint = new Paint(Paint.ANTI_ALIAS_FLAG);
+    mTextPaint.setTextAlign(Paint.Align.CENTER);
+    mTextPaint.setTypeface(Typeface.create(Typeface.DEFAULT, Typeface.BOLD));
+  }
+
+  protected void setColors(int backgroundColor, int borderColor, int alertColor, int textColor, int textAlertColor)
+  {
+    mBackgroundColor = backgroundColor;
+    mBorderColor = borderColor;
+    mAlertColor = alertColor;
+    mTextColor = textColor;
+    mTextAlertColor = textAlertColor;
+
+    mBackgroundPaint.setColor(mBackgroundColor);
+    mBorderPaint.setColor(mBorderColor);
+    mTextPaint.setColor(mTextColor);
+  }
+
+  @Override
+  protected void onSizeChanged(int width, int height, int oldWidth, int oldHeight)
+  {
+    super.onSizeChanged(width, height, oldWidth, oldHeight);
+    final float paddingX = getPaddingLeft() + getPaddingRight();
+    final float paddingY = getPaddingTop() + getPaddingBottom();
+    mWidth = width - paddingX;
+    mHeight = height - paddingY;
+    mRadius = Math.min(mWidth, mHeight) / 2f;
+    mBorderWidth = mRadius * mBorderWidthRatio;
+    // subtract half the stroke PLUS the extra inset
+    final float gap = mRadius * mBorderInsetRatio;
+    mBorderRadius = mRadius - (mBorderWidth / 2f) - gap;
+    configureTextSize();
+  }
+
+  @Override
+  protected void onDraw(@NonNull Canvas canvas)
+  {
+    super.onDraw(canvas);
+    final String str = getValueString();
+    if (str == null)
+      return;
+
+    final float cx = mWidth / 2f;
+    final float cy = mHeight / 2f;
+
+    // background & border
+    boolean alert = isAlert();
+    mBackgroundPaint.setColor(alert ? mAlertColor : mBackgroundColor);
+    canvas.drawCircle(cx, cy, mRadius, mBackgroundPaint);
+    if (!alert)
    {
-        super(ctx, attrs);
-        mBackgroundPaint = new Paint(Paint.ANTI_ALIAS_FLAG);
-        mBorderPaint = new Paint(Paint.ANTI_ALIAS_FLAG);
-        mBorderPaint.setStyle(Paint.Style.STROKE);
-        mTextPaint = new Paint(Paint.ANTI_ALIAS_FLAG);
-        mTextPaint.setTextAlign(Paint.Align.CENTER);
-        mTextPaint.setTypeface(Typeface.create(Typeface.DEFAULT, Typeface.BOLD));
+      mBorderPaint.setStrokeWidth(mBorderWidth);
+      mBorderPaint.setColor(mBorderColor);
+      canvas.drawCircle(cx, cy, mBorderRadius, mBorderPaint);
    }

-    protected void setColors(int backgroundColor,
-                             int borderColor,
-                             int alertColor,
-                             int textColor,
-                             int textAlertColor)
+    // text
+    mTextPaint.setColor(alert ? mTextAlertColor : mTextColor);
+    drawValueString(canvas, cx, cy, str);
+  }
+
+  @Override
+  public boolean onTouchEvent(@NonNull MotionEvent e)
+  {
+    final float cx = mWidth / 2f, cy = mHeight / 2f;
+    final float dx = e.getX() - cx, dy = e.getY() - cy;
+    if ((dx * dx) + (dy * dy) <= (mRadius * mRadius))
    {
-        mBackgroundColor   = backgroundColor;
-        mBorderColor       = borderColor;
-        mAlertColor        = alertColor;
-        mTextColor         = textColor;
-        mTextAlertColor    = textAlertColor;
-
-        mBackgroundPaint.setColor(mBackgroundColor);
-        mBorderPaint.setColor(mBorderColor);
-        mTextPaint.setColor(mTextColor);
+      performClick();
+      return true;
    }
+    return false;
+  }

-    @Override
-    protected void onSizeChanged(int width, int height, int oldWidth, int oldHeight) {
-        super.onSizeChanged(width, height, oldWidth, oldHeight);
-        final float paddingX = getPaddingLeft() + getPaddingRight();
-        final float paddingY = getPaddingTop()  + getPaddingBottom();
-        mWidth  = width - paddingX;
-        mHeight = height - paddingY;
-        mRadius = Math.min(mWidth, mHeight) / 2f;
-        mBorderWidth  = mRadius * mBorderWidthRatio;
-        // subtract half the stroke PLUS the extra inset
-        final float gap = mRadius * mBorderInsetRatio;
-        mBorderRadius = mRadius - (mBorderWidth / 2f) - gap;
-        configureTextSize();
-    }
+  @Override
+  public boolean performClick()
+  {
+    super.performClick();
+    return false;
+  }

-    @Override
-    protected void onDraw(@NonNull Canvas canvas)
+  private void drawValueString(Canvas c, float cx, float cy, String str)
+  {
+    Rect b = new Rect();
+    mTextPaint.getTextBounds(str, 0, str.length(), b);
+    final float y = cy - b.exactCenterY();
+    c.drawText(str, cx, y, mTextPaint);
+  }
+
+  void configureTextSize()
+  {
+    String text = getValueString();
+    if (text == null)
+      return;
+    final float textRadius = mBorderRadius - mBorderWidth;
+    final float maxTextSize = 2f * textRadius;
+    final float maxTextSize2 = maxTextSize * maxTextSize;
+    float lo = 0f, hi = maxTextSize, sz = maxTextSize;
+    Rect b = new Rect();
+    while (lo <= hi)
    {
-        super.onDraw(canvas);
-        final String str = getValueString();
-        if (str == null) return;
-
-        final float cx = mWidth / 2f;
-        final float cy = mHeight / 2f;
-
-        // background & border
-        boolean alert = isAlert();
-        mBackgroundPaint.setColor(alert ? mAlertColor : mBackgroundColor);
-        canvas.drawCircle(cx, cy, mRadius, mBackgroundPaint);
-        if (!alert)
-        {
-            mBorderPaint.setStrokeWidth(mBorderWidth);
-            mBorderPaint.setColor(mBorderColor);
-            canvas.drawCircle(cx, cy, mBorderRadius, mBorderPaint);
-        }
-
-        // text
-        mTextPaint.setColor(alert ? mTextAlertColor : mTextColor);
-        drawValueString(canvas, cx, cy, str);
+      sz = (lo + hi) / 2f;
+      mTextPaint.setTextSize(sz);
+      mTextPaint.getTextBounds(text, 0, text.length(), b);
+      float area = b.width() * b.width() + b.height() * b.height();
+      if (area <= maxTextSize2)
+        lo = sz + 1f;
+      else
+        hi = sz - 1f;
    }
+    mTextPaint.setTextSize(Math.max(1f, sz));
+  }

-    @Override
-    public boolean onTouchEvent(@NonNull MotionEvent e)
-    {
-        final float cx = mWidth / 2f, cy = mHeight / 2f;
-        final float dx = e.getX() - cx, dy = e.getY() - cy;
-        if ((dx * dx) + (dy * dy) <= (mRadius * mRadius))
-        {
-            performClick();
-            return true;
-        }
-        return false;
-    }
+  /** child must return the string to draw, or null if nothing */
+  @Nullable
+  protected abstract String getValueString();

-    @Override
-    public boolean performClick()
-    {
-        super.performClick();
-        return false;
-    }
-
-    private void drawValueString(Canvas c, float cx, float cy, String str)
-    {
-        Rect b = new Rect();
-        mTextPaint.getTextBounds(str, 0, str.length(), b);
-        final float y = cy - b.exactCenterY();
-        c.drawText(str, cx, y, mTextPaint);
-    }
-
-    void configureTextSize()
-    {
-        String text = getValueString();
-        if (text == null) return;
-        final float textRadius = mBorderRadius - mBorderWidth;
-        final float maxTextSize = 2f * textRadius;
-        final float maxTextSize2 = maxTextSize * maxTextSize;
-        float lo = 0f, hi = maxTextSize, sz = maxTextSize;
-        Rect b = new Rect();
-        while (lo <= hi)
-        {
-            sz = (lo + hi) / 2f;
-            mTextPaint.setTextSize(sz);
-            mTextPaint.getTextBounds(text, 0, text.length(), b);
-            float area = b.width()*b.width() + b.height()*b.height();
-            if (area <= maxTextSize2)
-                lo = sz + 1f;
-            else
-                hi = sz - 1f;
-        }
-        mTextPaint.setTextSize(Math.max(1f, sz));
-    }
-
-    /** child must return the string to draw, or null if nothing */
-    @Nullable
-    protected abstract String getValueString();
-
-    /** child decides if this is in “alert” state */
-    protected abstract boolean isAlert();
+  /** child decides if this is in “alert” state */
+  protected abstract boolean isAlert();
 }
--- a/android/app/src/main/java/app/organicmaps/widget/CurrentSpeedView.java
+++ b/android/app/src/main/java/app/organicmaps/widget/CurrentSpeedView.java
@@ -4,9 +4,7 @@ import android.content.Context;
 import android.content.res.TypedArray;
 import android.util.AttributeSet;
 import android.util.Pair;
-
 import androidx.annotation.Nullable;
-
 import app.organicmaps.R;
 import app.organicmaps.sdk.util.StringUtils;

@@ -22,18 +20,18 @@ public class CurrentSpeedView extends BaseSignView
    setBorderWidthRatio(0.1f);
    setBorderInsetRatio(0.05f);

-    try (TypedArray a = ctx.getTheme()
-            .obtainStyledAttributes(attrs, R.styleable.CurrentSpeedView /* reuse same attrs or define new */ , 0, 0))
+    try (TypedArray a = ctx.getTheme().obtainStyledAttributes(
+             attrs, R.styleable.CurrentSpeedView /* reuse same attrs or define new */, 0, 0))
    {
-      int bg   = a.getColor(R.styleable.CurrentSpeedView_currentSpeedBackgroundColor, DefaultValues.BACKGROUND_COLOR);
-      int bd   = a.getColor(R.styleable.CurrentSpeedView_currentSpeedBorderColor,     DefaultValues.BORDER_COLOR);
-      int tc   = a.getColor(R.styleable.CurrentSpeedView_currentSpeedTextColor,       DefaultValues.TEXT_COLOR);
+      int bg = a.getColor(R.styleable.CurrentSpeedView_currentSpeedBackgroundColor, DefaultValues.BACKGROUND_COLOR);
+      int bd = a.getColor(R.styleable.CurrentSpeedView_currentSpeedBorderColor, DefaultValues.BORDER_COLOR);
+      int tc = a.getColor(R.styleable.CurrentSpeedView_currentSpeedTextColor, DefaultValues.TEXT_COLOR);
      setColors(bg, bd, 0, tc, 0);

      if (isInEditMode())
      {
-        mSpeedMps = a.getInt(R.styleable.CurrentSpeedView_currentSpeedEditModeCurrentSpeed,  50);
-        mSpeedStr = Integer.toString((int)mSpeedMps);
+        mSpeedMps = a.getInt(R.styleable.CurrentSpeedView_currentSpeedEditModeCurrentSpeed, 50);
+        mSpeedStr = Integer.toString((int) mSpeedMps);
      }
    }
  }
@@ -47,7 +45,7 @@ public class CurrentSpeedView extends BaseSignView
    }
    else
    {
-      Pair<String,String> su = StringUtils.nativeFormatSpeedAndUnits(mps);
+      Pair<String, String> su = StringUtils.nativeFormatSpeedAndUnits(mps);
      mSpeedStr = su.first;
    }
    requestLayout();
@@ -70,8 +68,8 @@ public class CurrentSpeedView extends BaseSignView

  private interface DefaultValues
  {
-    int BACKGROUND_COLOR    = 0xFFFFFFFF;
-    int BORDER_COLOR        = 0xFF000000;
-    int TEXT_COLOR          = 0xFF000000;
+    int BACKGROUND_COLOR = 0xFFFFFFFF;
+    int BORDER_COLOR = 0xFF000000;
+    int TEXT_COLOR = 0xFF000000;
  }
 }
--- a/android/app/src/main/java/app/organicmaps/widget/PlaceholderView.java
+++ b/android/app/src/main/java/app/organicmaps/widget/PlaceholderView.java
@@ -12,12 +12,10 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.annotation.StringRes;
 import androidx.core.content.ContextCompat;
-
-import com.google.android.material.imageview.ShapeableImageView;
-import com.google.android.material.textview.MaterialTextView;
-
 import app.organicmaps.R;
 import app.organicmaps.util.UiUtils;
+import com.google.android.material.imageview.ShapeableImageView;
+import com.google.android.material.textview.MaterialTextView;

 public class PlaceholderView extends LinearLayout
 {
--- a/android/app/src/main/java/app/organicmaps/widget/SpeedLimitView.java
+++ b/android/app/src/main/java/app/organicmaps/widget/SpeedLimitView.java
@@ -5,16 +5,14 @@ import android.content.res.TypedArray;
 import android.graphics.Canvas;
 import android.graphics.Paint;
 import android.util.AttributeSet;
-
 import androidx.annotation.Nullable;
-
 import app.organicmaps.R;

 public class SpeedLimitView extends BaseSignView
 {
-  private int    mSpeedLimit = -1;
-  private boolean mAlert     = false;
-  private String mSpeedStr   = "-1";
+  private int mSpeedLimit = -1;
+  private boolean mAlert = false;
+  private String mSpeedStr = "-1";
  private final int unlimitedBorderColor;
  private final int unlimitedStripeColor;

@@ -27,15 +25,22 @@ public class SpeedLimitView extends BaseSignView

    try (TypedArray styleAttrs = ctx.getTheme().obtainStyledAttributes(attrs, R.styleable.SpeedLimitView, 0, 0))
    {
-      final int bgColor = styleAttrs.getColor(R.styleable.SpeedLimitView_speedLimitBackgroundColor, DefaultValues.BACKGROUND_COLOR);
-      final int borderColor = styleAttrs.getColor(R.styleable.SpeedLimitView_speedLimitBorderColor, DefaultValues.BORDER_COLOR);
-      final int alertColor = styleAttrs.getColor(R.styleable.SpeedLimitView_speedLimitAlertColor, DefaultValues.ALERT_COLOR);
-      final int textColor = styleAttrs.getColor(R.styleable.SpeedLimitView_speedLimitTextColor, DefaultValues.TEXT_COLOR);
-      final int txtAlertColor = styleAttrs.getColor(R.styleable.SpeedLimitView_speedLimitTextAlertColor, DefaultValues.TEXT_ALERT_COLOR);
+      final int bgColor =
+          styleAttrs.getColor(R.styleable.SpeedLimitView_speedLimitBackgroundColor, DefaultValues.BACKGROUND_COLOR);
+      final int borderColor =
+          styleAttrs.getColor(R.styleable.SpeedLimitView_speedLimitBorderColor, DefaultValues.BORDER_COLOR);
+      final int alertColor =
+          styleAttrs.getColor(R.styleable.SpeedLimitView_speedLimitAlertColor, DefaultValues.ALERT_COLOR);
+      final int textColor =
+          styleAttrs.getColor(R.styleable.SpeedLimitView_speedLimitTextColor, DefaultValues.TEXT_COLOR);
+      final int txtAlertColor =
+          styleAttrs.getColor(R.styleable.SpeedLimitView_speedLimitTextAlertColor, DefaultValues.TEXT_ALERT_COLOR);
      setColors(bgColor, borderColor, alertColor, textColor, txtAlertColor);

-      unlimitedBorderColor = styleAttrs.getColor(R.styleable.SpeedLimitView_speedLimitUnlimitedBorderColor, DefaultValues.UNLIMITED_BORDER_COLOR);
-      unlimitedStripeColor = styleAttrs.getColor(R.styleable.SpeedLimitView_speedLimitUnlimitedStripeColor, DefaultValues.UNLIMITED_STRIPE_COLOR);
+      unlimitedBorderColor = styleAttrs.getColor(R.styleable.SpeedLimitView_speedLimitUnlimitedBorderColor,
+                                                 DefaultValues.UNLIMITED_BORDER_COLOR);
+      unlimitedStripeColor = styleAttrs.getColor(R.styleable.SpeedLimitView_speedLimitUnlimitedStripeColor,
+                                                 DefaultValues.UNLIMITED_STRIPE_COLOR);

      if (isInEditMode())
      {
@@ -51,7 +56,7 @@ public class SpeedLimitView extends BaseSignView
    if (mSpeedLimit != limit)
    {
      mSpeedLimit = limit;
-      mSpeedStr   = Integer.toString(limit);
+      mSpeedStr = Integer.toString(limit);
      requestLayout();
    }
    mAlert = alert;
@@ -75,7 +80,7 @@ public class SpeedLimitView extends BaseSignView
  @Override
  protected void onDraw(Canvas canvas)
  {
-    final float cx = mWidth/2f, cy = mHeight/2f;
+    final float cx = mWidth / 2f, cy = mHeight / 2f;

    if (mSpeedLimit == 0) // 0 means unlimited speed (maxspeed=none)
    {
@@ -105,7 +110,7 @@ public class SpeedLimitView extends BaseSignView
    stripe.setStrokeWidth(mBorderWidth * 0.4f);

    final float radius = mRadius * 0.8f; // Shorten to 80% of full radius
-    final float diag = (float) (1/Math.sqrt(2)); // 45 degrees
+    final float diag = (float) (1 / Math.sqrt(2)); // 45 degrees
    final float dx = -diag, dy = +diag;
    final float px = -dy, py = +dx; // Perpendicular
    final float step = radius * 0.15f; // Spacing
@@ -122,14 +127,13 @@ public class SpeedLimitView extends BaseSignView
    }
  }

-
  private interface DefaultValues
  {
-    int BACKGROUND_COLOR       = 0xFFFFFFFF;
-    int BORDER_COLOR           = 0xFFFF0000;
-    int ALERT_COLOR            = 0xFFFF0000;
-    int TEXT_COLOR             = 0xFF000000;
-    int TEXT_ALERT_COLOR       = 0xFFFFFFFF;
+    int BACKGROUND_COLOR = 0xFFFFFFFF;
+    int BORDER_COLOR = 0xFFFF0000;
+    int ALERT_COLOR = 0xFFFF0000;
+    int TEXT_COLOR = 0xFF000000;
+    int TEXT_ALERT_COLOR = 0xFFFFFFFF;
    int UNLIMITED_BORDER_COLOR = 0xFF000000;
    int UNLIMITED_STRIPE_COLOR = 0xFF000000;
  }
--- a/android/app/src/main/java/app/organicmaps/widget/menu/MyPositionButton.java
+++ b/android/app/src/main/java/app/organicmaps/widget/menu/MyPositionButton.java
@@ -72,7 +72,7 @@ public class MyPositionButton
        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());
+      image = ResourcesCompat.getDrawable(resources, drawableRes, context.getTheme());
      mIcons.put(mode, image);
    }

--- a/android/app/src/main/java/app/organicmaps/widget/placepage/AxisValueFormatter.java
+++ b/android/app/src/main/java/app/organicmaps/widget/placepage/AxisValueFormatter.java
@@ -1,9 +1,9 @@
 package app.organicmaps.widget.placepage;

 import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import app.organicmaps.sdk.util.StringUtils;
 import com.github.mikephil.charting.charts.BarLineChartBase;
-import androidx.annotation.Nullable;
 import com.github.mikephil.charting.components.AxisBase;
 import com.github.mikephil.charting.formatter.IAxisValueFormatter;

--- a/android/app/src/main/java/app/organicmaps/widget/placepage/EditBookmarkFragment.java
+++ b/android/app/src/main/java/app/organicmaps/widget/placepage/EditBookmarkFragment.java
@@ -105,7 +105,8 @@ public class EditBookmarkFragment extends BaseMwmDialogFragment implements View.
  public EditBookmarkFragment() {}

  @Override
-  public void onCreate(@Nullable Bundle savedInstanceState) {
+  public void onCreate(@Nullable Bundle savedInstanceState)
+  {
    super.onCreate(savedInstanceState);
    setStyle(DialogFragment.STYLE_NORMAL, R.style.MwmTheme_FullScreenDialog);
  }
@@ -184,10 +185,9 @@ public class EditBookmarkFragment extends BaseMwmDialogFragment implements View.
  {
    super.onStart();
    Dialog dialog = getDialog();
-    if (dialog != null) {
-      dialog.getWindow().setLayout(
-              ViewGroup.LayoutParams.MATCH_PARENT,
-              ViewGroup.LayoutParams.MATCH_PARENT);
+    if (dialog != null)
+    {
+      dialog.getWindow().setLayout(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT);
    }

    // Focus name and show keyboard for "Unknown Place" bookmarks
--- a/android/app/src/main/java/app/organicmaps/widget/placepage/ElevationProfileViewRenderer.java
+++ b/android/app/src/main/java/app/organicmaps/widget/placepage/ElevationProfileViewRenderer.java
@@ -6,9 +6,6 @@ import android.widget.RelativeLayout;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.core.widget.NestedScrollView;
-
-import com.google.android.material.textview.MaterialTextView;
-
 import app.organicmaps.ChartController;
 import app.organicmaps.R;
 import app.organicmaps.sdk.Framework;
@@ -17,6 +14,7 @@ import app.organicmaps.sdk.bookmarks.data.Track;
 import app.organicmaps.sdk.bookmarks.data.TrackStatistics;
 import app.organicmaps.util.UiUtils;
 import app.organicmaps.util.Utils;
+import com.google.android.material.textview.MaterialTextView;
 import java.util.Objects;

 public class ElevationProfileViewRenderer implements PlacePageStateListener
--- a/android/app/src/main/java/app/organicmaps/widget/placepage/OpenStateTextFormatter.java
+++ b/android/app/src/main/java/app/organicmaps/widget/placepage/OpenStateTextFormatter.java
@@ -14,7 +14,8 @@ public class OpenStateTextFormatter
      return String.format(Locale.ROOT, "%02d:%02d", hour, minute);

    int h = hour % 12;
-    if (h == 0) h = 12;
+    if (h == 0)
+      h = 12;
    String ampm = (hour < 12) ? "AM" : "PM";
    return String.format(Locale.ROOT, "%d:%02d %s", h, minute, ampm);
  }
@@ -29,21 +30,13 @@ public class OpenStateTextFormatter
    return t.getDayOfWeek().getDisplayName(TextStyle.SHORT, locale);
  }

-  static String buildAtLabel(
-      boolean opens,
-      boolean isToday,
-      String dayShort,
-      String time,
-      String opensAtLocalized,
-      String closesAtLocalized,
-      String opensDayAtLocalized,
-      String closesDayAtLocalized
-  )
+  static String buildAtLabel(boolean opens, boolean isToday, String dayShort, String time, String opensAtLocalized,
+                             String closesAtLocalized, String opensDayAtLocalized, String closesDayAtLocalized)
  {
    if (isToday)
      return opens ? String.format(Locale.ROOT, opensAtLocalized, time) // Opens at %s
-          : String.format(Locale.ROOT, closesAtLocalized, time); // Closes at %s
+                   : String.format(Locale.ROOT, closesAtLocalized, time); // Closes at %s
    return opens ? String.format(Locale.ROOT, opensDayAtLocalized, dayShort, time) // Opens %s at %s
-        : String.format(Locale.ROOT, closesDayAtLocalized, dayShort, time); // Closes %s at %s
+                 : String.format(Locale.ROOT, closesDayAtLocalized, dayShort, time); // Closes %s at %s
  }
 }
--- a/android/app/src/main/java/app/organicmaps/widget/placepage/PlacePageButtonFactory.java
+++ b/android/app/src/main/java/app/organicmaps/widget/placepage/PlacePageButtonFactory.java
@@ -80,6 +80,6 @@ public class PlacePageButtonFactory
        yield R.drawable.ic_more;
      }
    };
-        return new PlacePageButton(titleId, iconId, buttonType);
+    return new PlacePageButton(titleId, iconId, buttonType);
  }
 }
--- a/android/app/src/main/java/app/organicmaps/widget/placepage/PlacePageView.java
+++ b/android/app/src/main/java/app/organicmaps/widget/placepage/PlacePageView.java
@@ -31,7 +31,6 @@ import androidx.fragment.app.FragmentFactory;
 import androidx.fragment.app.FragmentManager;
 import androidx.lifecycle.Observer;
 import androidx.lifecycle.ViewModelProvider;
-
 import app.organicmaps.MwmActivity;
 import app.organicmaps.MwmApplication;
 import app.organicmaps.R;
@@ -692,7 +691,6 @@ public class PlacePageView extends Fragment
    {
      UiUtils.showIf(Editor.nativeShouldShowEditPlace(), mEditPlace);
      UiUtils.showIf(Editor.nativeShouldShowAddPlace(), mAddPlace);
-      UiUtils.hide(mMapTooOld);
      MaterialButton mTvEditPlace = mEditPlace.findViewById(R.id.mb__place_editor);
      MaterialButton mTvAddPlace = mAddPlace.findViewById(R.id.mb__place_add);

@@ -705,39 +703,32 @@ public class PlacePageView extends Fragment
      }
      else
      {
-        mTvEditPlace.setOnClickListener((v) -> {
-          Utils.showSnackbar(v.getContext(), v.getRootView(), R.string.place_page_too_old_to_edit);
-        });
-        mTvAddPlace.setOnClickListener((v) -> {
-          Utils.showSnackbar(v.getContext(), v.getRootView(), R.string.place_page_too_old_to_edit);
-        });
+        mTvEditPlace.setOnClickListener(
+            (v) -> { Utils.showSnackbar(v.getContext(), v.getRootView(), R.string.place_page_too_old_to_edit); });
+        mTvAddPlace.setOnClickListener(
+            (v) -> { Utils.showSnackbar(v.getContext(), v.getRootView(), R.string.place_page_too_old_to_edit); });

-        String countryId = MapManager.nativeGetSelectedCountry();
+        CountryItem map = CountryItem.fill(MapManager.nativeGetSelectedCountry());

-        if (countryId != null)
+        if (map.status == CountryItem.STATUS_UPDATABLE || map.status == CountryItem.STATUS_DONE
+            || map.status == CountryItem.STATUS_FAILED)
        {
-          CountryItem map = CountryItem.fill(countryId);
+          mMapTooOld.setVisibility(VISIBLE);
+          MaterialButton mTvUpdateTooOldMap = mMapTooOld.findViewById(R.id.mb__update_too_old_map);
+          boolean canUpdateMap = map.status != CountryItem.STATUS_DONE;

-          if (map.status == CountryItem.STATUS_UPDATABLE || map.status == CountryItem.STATUS_DONE
-              || map.status == CountryItem.STATUS_FAILED)
+          if (canUpdateMap)
          {
-            UiUtils.show(mMapTooOld);
-
-            boolean canUpdateMap = map.status != CountryItem.STATUS_DONE;
-            MaterialButton mTvUpdateTooOldMap = mMapTooOld.findViewById(R.id.mb__update_too_old_map);
-            UiUtils.showIf(canUpdateMap, mTvUpdateTooOldMap);
-
+            mTvUpdateTooOldMap.setOnClickListener((v) -> {
+              MapManagerHelper.warn3gAndDownload(requireActivity(), map.id, null);
+              mMapTooOld.setVisibility(GONE);
+            });
+          }
+          else
+          {
+            mTvUpdateTooOldMap.setVisibility(GONE);
            MaterialTextView mapTooOldDescription = mMapTooOld.findViewById(R.id.tv__map_too_old_description);
-            if (canUpdateMap)
-            {
-              mapTooOldDescription.setText(R.string.place_page_map_too_old_description);
-              mTvUpdateTooOldMap.setOnClickListener((v) -> {
-                MapManagerHelper.warn3gAndDownload(requireActivity(), map.id, null);
-                UiUtils.hide(mMapTooOld);
-              });
-            }
-            else
-              mapTooOldDescription.setText(R.string.place_page_app_too_old_description);
+            mapTooOldDescription.setText(R.string.place_page_app_too_old_description);
          }
        }
      }
@@ -753,9 +744,7 @@ public class PlacePageView extends Fragment
      mTvAddPlace.setTextColor(editButtonColor);
      mTvEditPlace.setStrokeColor(ColorStateList.valueOf(editButtonColor));
      mTvAddPlace.setStrokeColor(ColorStateList.valueOf(editButtonColor));
-      UiUtils.showIf(
-          UiUtils.isVisible(mEditPlace) || UiUtils.isVisible(mAddPlace),
-          mEditTopSpace);
+      UiUtils.showIf(UiUtils.isVisible(mEditPlace) || UiUtils.isVisible(mAddPlace), mEditTopSpace);
    }
    updateLinksView();
    updateOpeningHoursView();
@@ -856,10 +845,9 @@ public class PlacePageView extends Fragment
    }

    // Get colours
-    final ForegroundColorSpan colorGreen =
-      new ForegroundColorSpan(ContextCompat.getColor(context, R.color.base_green));
+    final ForegroundColorSpan colorGreen = new ForegroundColorSpan(ContextCompat.getColor(context, R.color.base_green));
    final ForegroundColorSpan colorYellow =
-      new ForegroundColorSpan(ContextCompat.getColor(context, R.color.base_yellow));
+        new ForegroundColorSpan(ContextCompat.getColor(context, R.color.base_yellow));
    final ForegroundColorSpan colorRed = new ForegroundColorSpan(ContextCompat.getColor(context, R.color.base_red));

    // Get next state info
@@ -885,13 +873,12 @@ public class PlacePageView extends Fragment
        if (nextStateTime > 0 && nextStateTime < Long.MAX_VALUE / 2)
        {
          // NOTE: Timezone is currently device timezone. TODO: use feature-specific timezone.
-          nextChangeLocal = ZonedDateTime.ofInstant(
-              Instant.ofEpochSecond(nextStateTime), ZoneId.systemDefault()
-          );
+          nextChangeLocal = ZonedDateTime.ofInstant(Instant.ofEpochSecond(nextStateTime), ZoneId.systemDefault());
          hasFiniteNextChange = true;
        }
      }
-      catch (Throwable ignored) {}
+      catch (Throwable ignored)
+      {}
    }

    if (!hasFiniteNextChange) // No valid next change
@@ -906,7 +893,7 @@ public class PlacePageView extends Fragment
    }

    String localizedTimeString = OpenStateTextFormatter.formatHoursMinutes(
-      nextChangeLocal.getHour(), nextChangeLocal.getMinute(), DateUtils.is24HourFormat(context));
+        nextChangeLocal.getHour(), nextChangeLocal.getMinute(), DateUtils.is24HourFormat(context));

    final boolean shortHorizonClosing = isOpen && minsToNextState >= 0 && minsToNextState <= SHORT_HORIZON_CLOSE_MIN;
    final boolean shortHorizonOpening = !isOpen && minsToNextState >= 0 && minsToNextState <= SHORT_HORIZON_OPEN_MIN;
@@ -914,12 +901,12 @@ public class PlacePageView extends Fragment
    if (shortHorizonClosing || shortHorizonOpening) // POI Opens/Closes in 60 mins • at 18:00
    {
      final String minsToChangeStr = getResources().getQuantityString(
-        R.plurals.minutes_short, Math.max(minsToNextState, 1), Math.max(minsToNextState, 1));
+          R.plurals.minutes_short, Math.max(minsToNextState, 1), Math.max(minsToNextState, 1));
      final String nextChangeFormatted = getString(isOpen ? R.string.closes_in : R.string.opens_in, minsToChangeStr);

      openStateString.append(nextChangeFormatted, colorYellow, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE)
-        .append(" • ") // Add spacer
-        .append(getString(R.string.at, localizedTimeString));
+          .append(" • ") // Add spacer
+          .append(getString(R.string.at, localizedTimeString));
    }
    else
    {
@@ -929,18 +916,16 @@ public class PlacePageView extends Fragment
      final String closesDayAtStr = getString(R.string.closes_day_at); // "Closes %1$s at %2$s"

      final boolean isToday =
-        OpenStateTextFormatter.isSameLocalDate(nextChangeLocal, ZonedDateTime.now(nextChangeLocal.getZone()));
+          OpenStateTextFormatter.isSameLocalDate(nextChangeLocal, ZonedDateTime.now(nextChangeLocal.getZone()));
      // Full weekday name per design feedback.
-      final String dayName =
-        nextChangeLocal.getDayOfWeek().getDisplayName(TextStyle.FULL, Locale.getDefault());
+      final String dayName = nextChangeLocal.getDayOfWeek().getDisplayName(TextStyle.FULL, Locale.getDefault());

      if (isOpen) // > 60 minutes OR negative (safety). Show “Open now • Closes at 18:00”
      {
        openStateString.append(getString(R.string.open_now), colorGreen, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);

-        final String atLabel =
-          OpenStateTextFormatter.buildAtLabel(false, isToday, dayName, localizedTimeString,
-            opensAtStr, closesAtStr, opensDayAtStr, closesDayAtStr);
+        final String atLabel = OpenStateTextFormatter.buildAtLabel(
+            false, isToday, dayName, localizedTimeString, opensAtStr, closesAtStr, opensDayAtStr, closesDayAtStr);

        if (!TextUtils.isEmpty(atLabel))
          openStateString.append(" • ").append(atLabel);
@@ -949,9 +934,8 @@ public class PlacePageView extends Fragment
      {
        openStateString.append(getString(R.string.closed_now), colorRed, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);

-        final String atLabel =
-          OpenStateTextFormatter.buildAtLabel(true, isToday, dayName, localizedTimeString,
-            opensAtStr, closesAtStr, opensDayAtStr, closesDayAtStr);
+        final String atLabel = OpenStateTextFormatter.buildAtLabel(
+            true, isToday, dayName, localizedTimeString, opensAtStr, closesAtStr, opensDayAtStr, closesDayAtStr);

        if (!TextUtils.isEmpty(atLabel))
          openStateString.append(" • ").append(atLabel);
--- a/android/app/src/main/java/app/organicmaps/widget/placepage/PlacePageViewModel.java
+++ b/android/app/src/main/java/app/organicmaps/widget/placepage/PlacePageViewModel.java
@@ -3,9 +3,7 @@ package app.organicmaps.widget.placepage;
 import androidx.lifecycle.LiveData;
 import androidx.lifecycle.MutableLiveData;
 import androidx.lifecycle.ViewModel;
-
 import app.organicmaps.sdk.bookmarks.data.MapObject;
-
 import java.util.List;

 public class PlacePageViewModel extends ViewModel
--- a/android/app/src/main/java/app/organicmaps/widget/placepage/sections/PlacePageBookmarkFragment.java
+++ b/android/app/src/main/java/app/organicmaps/widget/placepage/sections/PlacePageBookmarkFragment.java
@@ -31,7 +31,8 @@ import app.organicmaps.widget.placepage.PlacePageViewModel;
 import com.google.android.material.textview.MaterialTextView;

 public class PlacePageBookmarkFragment extends Fragment implements View.OnClickListener, View.OnLongClickListener,
-                                                                   Observer<MapObject>, EditBookmarkFragment.EditBookmarkListener
+                                                                   Observer<MapObject>,
+                                                                   EditBookmarkFragment.EditBookmarkListener
 {
  private View mFrame;
  private MaterialTextView mTvBookmarkNote;
--- a/android/app/src/main/java/app/organicmaps/widget/placepage/sections/PlacePageChargeSocketsFragment.java
+++ b/android/app/src/main/java/app/organicmaps/widget/placepage/sections/PlacePageChargeSocketsFragment.java
@@ -13,15 +13,13 @@ import androidx.annotation.Nullable;
 import androidx.fragment.app.Fragment;
 import androidx.lifecycle.Observer;
 import androidx.lifecycle.ViewModelProvider;
-
-import com.google.android.material.imageview.ShapeableImageView;
-import com.google.android.material.textview.MaterialTextView;
-
 import app.organicmaps.R;
 import app.organicmaps.sdk.Framework;
 import app.organicmaps.sdk.bookmarks.data.ChargeSocketDescriptor;
 import app.organicmaps.sdk.bookmarks.data.MapObject;
 import app.organicmaps.widget.placepage.PlacePageViewModel;
+import com.google.android.material.imageview.ShapeableImageView;
+import com.google.android.material.textview.MaterialTextView;
 import java.text.DecimalFormat;

 public class PlacePageChargeSocketsFragment extends Fragment implements Observer<MapObject>
@@ -96,8 +94,8 @@ public class PlacePageChargeSocketsFragment extends Fragment implements Observer
      }

      @SuppressLint("DiscouragedApi")
-      int resTypeId =
-          getResources().getIdentifier("charge_socket_" + socket.visualType(), "string", requireContext().getPackageName());
+      int resTypeId = getResources().getIdentifier("charge_socket_" + socket.visualType(), "string",
+                                                   requireContext().getPackageName());
      if (resTypeId != 0)
      {
        type.setText(resTypeId);
@@ -108,7 +106,8 @@ public class PlacePageChargeSocketsFragment extends Fragment implements Observer
        DecimalFormat df = new DecimalFormat("#.##");
        power.setText(getString(R.string.kw_label, df.format(socket.power())));
      }
-      else if (socket.ignorePower()) {
+      else if (socket.ignorePower())
+      {
        power.setVisibility(INVISIBLE);
      }

--- a/android/app/src/main/java/app/organicmaps/widget/placepage/sections/PlacePageLinksFragment.java
+++ b/android/app/src/main/java/app/organicmaps/widget/placepage/sections/PlacePageLinksFragment.java
@@ -191,8 +191,9 @@ public class PlacePageLinksFragment extends Fragment implements Observer<MapObje
      case FMD_PANORAMAX -> null; // Don't add raw ID to list, as it's useless for users.
      default -> mMapObject.getMetadata(type);
    };
-        // Add user names for social media if available
-        if (!TextUtils.isEmpty(title) && !title.equals(url) && !title.contains("/")) items.add(title);
+    // Add user names for social media if available
+    if (!TextUtils.isEmpty(title) && !title.equals(url) && !title.contains("/"))
+      items.add(title);

    if (items.size() == 1)
      PlacePageUtils.copyToClipboard(requireContext(), mFrame, items.get(0));
--- a/android/app/src/main/res/drawable/ic_minus.xml
+++ b/android/app/src/main/res/drawable/ic_minus.xml
@@ -1,9 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
    android:width="24dp"
    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
+    android:viewportWidth="960"
+    android:viewportHeight="960">
  <path
-      android:pathData="M19,13H5v-2h14v2z"
+      android:pathData="M240,520q-17,0 -28.5,-11.5T200,480q0,-17 11.5,-28.5T240,440h480q17,0 28.5,11.5T760,480q0,17 -11.5,28.5T720,520L240,520Z"
      android:fillColor="#ffffff"/>
 </vector>
--- a/android/app/src/main/res/drawable/ic_plus.xml
+++ b/android/app/src/main/res/drawable/ic_plus.xml
@@ -1,9 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
    android:width="24dp"
    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
+    android:viewportWidth="960"
+    android:viewportHeight="960">
  <path
-      android:pathData="M19,13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z"
+      android:pathData="M440,520L240,520q-17,0 -28.5,-11.5T200,480q0,-17 11.5,-28.5T240,440h200v-200q0,-17 11.5,-28.5T480,200q17,0 28.5,11.5T520,240v200h200q17,0 28.5,11.5T760,480q0,17 -11.5,28.5T720,520L520,520v200q0,17 -11.5,28.5T480,760q-17,0 -28.5,-11.5T440,720v-200Z"
      android:fillColor="@android:color/white"/>
 </vector>
--- a/android/app/src/main/res/layout/activity_download_resources.xml
+++ b/android/app/src/main/res/layout/activity_download_resources.xml
@@ -26,7 +26,7 @@
        app:tint="?colorSecondary"/>
      <com.google.android.material.textview.MaterialTextView
        android:id="@+id/head_message"
-        style="@style/TextAppearance.Headline6"
+        style="?fontHeadline6"
        android:layout_width="match_parent"
        android:layout_height="wrap_content"
        android:layout_marginTop="@dimen/margin_base"
@@ -36,7 +36,7 @@
        android:text="@string/download_map_title" />
      <com.google.android.material.textview.MaterialTextView
        android:id="@+id/download_message"
-        style="@style/TextAppearance.Body2"
+        style="?fontBody2"
        android:layout_width="match_parent"
        android:layout_height="wrap_content"
        android:layout_marginStart="@dimen/margin_base"
--- a/android/app/src/main/res/layout/activity_map_placeholder.xml
+++ b/android/app/src/main/res/layout/activity_map_placeholder.xml
@@ -28,7 +28,7 @@
        android:layout_marginBottom="8dp"
        android:text="@string/aa_connected_title"
        android:textAlignment="center"
-        android:textAppearance="@style/TextAppearance.Headline4"
+        android:textAppearance="@style/TextAppearance.MaterialComponents.Headline4"
        android:textStyle="bold" />

    <com.google.android.material.textview.MaterialTextView
@@ -36,7 +36,7 @@
        android:layout_height="wrap_content"
        android:text="@string/car_used_on_the_car_screen"
        android:textAlignment="center"
-        android:textAppearance="@style/TextAppearance.Body1" />
+        android:textAppearance="@style/TextAppearance.MaterialComponents.Body1" />
  </LinearLayout>

  <com.google.android.material.button.MaterialButton
--- a/android/app/src/main/res/layout/activity_request_permissions.xml
+++ b/android/app/src/main/res/layout/activity_request_permissions.xml
@@ -20,7 +20,7 @@
      android:layout_marginStart="32dp"
      android:text="@string/aa_request_permission_activity_text"
      android:textAlignment="center"
-      android:textAppearance="@style/TextAppearance.Headline4"
+      android:textAppearance="@style/TextAppearance.MaterialComponents.Headline4"
      android:textStyle="bold" />

  <com.google.android.material.button.MaterialButton
--- a/android/app/src/main/res/layout/bottom_sheet.xml
+++ b/android/app/src/main/res/layout/bottom_sheet.xml
@@ -22,7 +22,7 @@
    android:layout_marginStart="@dimen/margin_base"
    android:maxLines="3"
    android:ellipsize="end"
-    android:textAppearance="@style/TextAppearance.Headline6"
+    android:textAppearance="?fontHeadline6"
    tools:text="Title" />

  <androidx.recyclerview.widget.RecyclerView
--- a/android/app/src/main/res/layout/button_with_progress.xml
+++ b/android/app/src/main/res/layout/button_with_progress.xml
@@ -12,7 +12,7 @@
    android:layout_height="wrap_content"
    android:layout_marginStart="@dimen/margin_base"
    android:text="@string/download_country_ask"
-    android:textAppearance="@style/TextAppearance.Body2"
+    android:textAppearance="?fontBody2"
    android:visibility="gone"
    tools:visibility="visible"/>
  <com.google.android.material.progressindicator.LinearProgressIndicator
--- a/android/app/src/main/res/layout/dialog_edit_text.xml
+++ b/android/app/src/main/res/layout/dialog_edit_text.xml
@@ -14,6 +14,7 @@
    android:textAppearance="@style/MwmTextAppearance.Title" />
  <com.google.android.material.textfield.TextInputLayout
    android:id="@+id/et__input_layout"
+    style="?fontBody1"
    android:layout_width="match_parent"
    android:layout_height="wrap_content"
    app:hintEnabled="false">
--- a/android/app/src/main/res/layout/dialog_sorting_types.xml
+++ b/android/app/src/main/res/layout/dialog_sorting_types.xml
@@ -27,7 +27,7 @@
    android:layout_marginTop="@dimen/margin_base">

    <RadioButton
-      style="@style/TextAppearance.Subtitle1"
+      style="?fontSubtitle1"
      android:id="@+id/sort_by_default"
      android:layout_width="match_parent"
      android:layout_height="wrap_content"
@@ -37,7 +37,7 @@
      app:buttonTint="@null"/>

    <RadioButton
-      style="@style/TextAppearance.Subtitle1"
+      style="?fontSubtitle1"
      android:id="@+id/sort_by_name"
      android:layout_width="match_parent"
      android:layout_height="wrap_content"
@@ -47,7 +47,7 @@
      app:buttonTint="@null"/>

    <RadioButton
-      style="@style/TextAppearance.Subtitle1"
+      style="?fontSubtitle1"
      android:id="@+id/sort_by_type"
      android:layout_width="match_parent"
      android:layout_height="wrap_content"
@@ -57,7 +57,7 @@
      app:buttonTint="@null"/>

    <RadioButton
-      style="@style/TextAppearance.Subtitle1"
+      style="?fontSubtitle1"
      android:id="@+id/sort_by_distance"
      android:layout_width="match_parent"
      android:layout_height="wrap_content"
@@ -67,7 +67,7 @@
      app:buttonTint="@null"/>

    <RadioButton
-      style="@style/TextAppearance.Subtitle1"
+      style="?fontSubtitle1"
      android:id="@+id/sort_by_time"
      android:layout_width="match_parent"
      android:layout_height="wrap_content"
--- a/android/app/src/main/res/layout/edit_bookmark_common.xml
+++ b/android/app/src/main/res/layout/edit_bookmark_common.xml
@@ -17,6 +17,7 @@
    android:orientation="vertical">
    <com.google.android.material.textfield.TextInputLayout
      android:id="@+id/edit_bookmark_name_input"
+      style="?fontBody1"
      android:layout_width="match_parent"
      android:layout_height="wrap_content"
      android:hint="@string/name"
@@ -87,6 +88,7 @@
      tools:src="@drawable/ic_bookmark_none" />
  </RelativeLayout>
  <com.google.android.material.textfield.TextInputLayout
+    style="?fontBody1"
    android:layout_width="match_parent"
    android:layout_height="wrap_content"
    android:layout_marginEnd="@dimen/margin_half"
--- a/android/app/src/main/res/layout/elevation_profile_internal.xml
+++ b/android/app/src/main/res/layout/elevation_profile_internal.xml
@@ -17,7 +17,7 @@
      android:layout_marginEnd="@dimen/margin_base"
      android:paddingTop="@dimen/margin_half"
      android:paddingBottom="@dimen/margin_base"
-      android:textAppearance="@style/TextAppearance.Headline6"
+      android:textAppearance="?fontHeadline6"
      tools:text="Xindian Shitoushan Trail" />
    <include
      layout="@layout/item_divider"
--- a/android/app/src/main/res/layout/fragment_editor.xml
+++ b/android/app/src/main/res/layout/fragment_editor.xml
@@ -402,13 +402,11 @@
        <com.google.android.material.textview.MaterialTextView
            android:layout_width="match_parent"
            android:layout_height="wrap_content"
-            android:layout_marginBottom="@dimen/margin_half"
            android:fontFamily="@string/robotoMedium"
            android:text="@string/editor_other_info"
            android:textAppearance="@style/MwmTextAppearance.Body3"/>
        <com.google.android.material.textfield.TextInputLayout
            android:id="@+id/custom_input"
-            android:layout_marginBottom="@dimen/margin_quarter"
            style="@style/MwmWidget.Editor.CustomTextInput"
            android:gravity="center_vertical"
            android:minHeight="74dp"
@@ -418,7 +416,6 @@
              android:id="@+id/input"
              style="@style/MwmWidget.Editor.FieldLayout.EditText"
              android:inputType="textMultiLine"
-              android:gravity="top"
              android:hint="@string/editor_note_hint"/>
        </com.google.android.material.textfield.TextInputLayout>
      </LinearLayout>
--- a/android/app/src/main/res/layout/fragment_toggle_map_layer.xml
+++ b/android/app/src/main/res/layout/fragment_toggle_map_layer.xml
@@ -16,7 +16,7 @@
      android:layout_marginStart="@dimen/margin_base"
      android:layout_marginTop="@dimen/margin_base"
      android:text="@string/layers_title"
-      android:textAppearance="@style/TextAppearance.Headline6"
+      android:textAppearance="?fontHeadline6"
      app:layout_constraintStart_toStartOf="parent"
      app:layout_constraintTop_toTopOf="parent" />
    <com.google.android.material.button.MaterialButton
--- a/android/app/src/main/res/layout/item_bookmark_category.xml
+++ b/android/app/src/main/res/layout/item_bookmark_category.xml
@@ -30,7 +30,7 @@
    android:ellipsize="middle"
    android:singleLine="true"
    android:textAlignment="viewStart"
-    android:textAppearance="@style/TextAppearance.Body1"
+    android:textAppearance="?fontBody1"
    tools:text="Bookmark name looooooooooooooooooongasdasdasd" />
  <LinearLayout
    android:id="@+id/bottom_line_container"
--- a/android/app/src/main/res/layout/item_bookmark_collection.xml
+++ b/android/app/src/main/res/layout/item_bookmark_collection.xml
@@ -25,7 +25,7 @@
      android:layout_marginEnd="@dimen/bookmark_collection_item_end_margin"
      android:ellipsize="middle"
      android:singleLine="true"
-      android:textAppearance="@style/TextAppearance.Body1"
+      android:textAppearance="?fontBody1"
      tools:text="Bookmark name looooooooooooooooooongasdasdasd" />
    <com.google.android.material.textview.MaterialTextView
      android:id="@+id/size"
@@ -37,7 +37,7 @@
      android:ellipsize="end"
      android:singleLine="true"
      android:textColor="?android:textColorSecondary"
-      style="@style/TextAppearance.Body2"
+      style="?fontBody2"
      tools:text="42000000" />
  </LinearLayout>
 </LinearLayout>
--- a/android/app/src/main/res/layout/item_bookmark_group_list_header.xml
+++ b/android/app/src/main/res/layout/item_bookmark_group_list_header.xml
@@ -12,7 +12,7 @@
  android:paddingBottom="@dimen/margin_half_plus">
  <com.google.android.material.textview.MaterialTextView
    android:id="@+id/text_message"
-    style="@style/TextAppearance.Headline6"
+    style="?fontHeadline6"
    android:layout_width="wrap_content"
    android:layout_height="wrap_content"
    android:layout_alignParentStart="true"
--- a/android/app/src/main/res/layout/item_category_title.xml
+++ b/android/app/src/main/res/layout/item_category_title.xml
@@ -2,7 +2,7 @@
 <com.google.android.material.textview.MaterialTextView
  xmlns:android="http://schemas.android.com/apk/res/android"
  android:id="@+id/text"
-  style="@style/TextAppearance.Headline6"
+  style="?fontHeadline6"
  android:layout_width="match_parent"
  android:layout_height="wrap_content"
  android:background="?windowBackgroundForced"
--- a/android/app/src/main/res/layout/item_feature_category_footer.xml
+++ b/android/app/src/main/res/layout/item_feature_category_footer.xml
@@ -14,7 +14,7 @@
    android:gravity="center"
    android:maxWidth="500dp"
    android:text="@string/editor_category_unsuitable_title"
-    android:textAppearance="@style/TextAppearance.Headline6"
+    android:textAppearance="@style/TextAppearance.MdcTypographyStyles.Headline6"
    android:textStyle="bold" />
  <com.google.android.material.textview.MaterialTextView
    android:id="@+id/editor_category_unsuitable_text"
--- a/android/app/src/main/res/layout/item_localized_name.xml
+++ b/android/app/src/main/res/layout/item_localized_name.xml
@@ -10,6 +10,7 @@
  android:orientation="horizontal">
  <com.google.android.material.textfield.TextInputLayout
    android:id="@+id/input_layout"
+    style="?fontBody1"
    android:layout_width="0dp"
    android:layout_height="wrap_content"
    android:layout_weight="1"
--- a/android/app/src/main/res/layout/item_timetable.xml
+++ b/android/app/src/main/res/layout/item_timetable.xml
@@ -147,12 +147,12 @@
    <LinearLayout
      android:id="@+id/allday"
      android:layout_width="match_parent"
-      android:layout_height="wrap_content"
+      android:layout_height="@dimen/editor_height_allday"
      android:layout_gravity="center_vertical"
      android:background="?clickableBackground"
      android:gravity="center_vertical"
      android:orientation="horizontal"
-      android:padding="@dimen/margin_half">
+      android:padding="@dimen/margin_half_plus">

      <com.google.android.material.textview.MaterialTextView
        android:layout_width="0dp"
@@ -164,8 +164,7 @@
      <com.google.android.material.materialswitch.MaterialSwitch
        android:id="@+id/sw__allday"
        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginEnd="@dimen/margin_quarter"/>
+        android:layout_height="wrap_content"/>

    </LinearLayout>

--- a/android/app/src/main/res/layout/item_track.xml
+++ b/android/app/src/main/res/layout/item_track.xml
@@ -29,7 +29,7 @@
      android:layout_marginTop="@dimen/margin_base"
      android:layout_marginEnd="@dimen/bookmark_collection_item_end_margin"
      android:singleLine="true"
-      android:textAppearance="@style/TextAppearance.Body1"
+      android:textAppearance="?fontBody1"
      tools:text="@string/tracks_title" />
    <com.google.android.material.textview.MaterialTextView
      android:id="@+id/tv__bookmark_distance"
@@ -39,7 +39,7 @@
      android:layout_marginBottom="@dimen/margin_half_plus"
      android:singleLine="true"
      android:textColor="?android:textColorSecondary"
-      android:textAppearance="@style/TextAppearance.Body2"
+      android:textAppearance="?fontBody2"
      tools:text="@string/by_distance" />
  </LinearLayout>
  <com.google.android.material.imageview.ShapeableImageView
--- a/android/app/src/main/res/layout/map_buttons_zoom.xml
+++ b/android/app/src/main/res/layout/map_buttons_zoom.xml
@@ -11,14 +11,14 @@
    style="@style/MwmWidget.M3.FAB.MapButton.Zoom"
    android:tint="?iconTint"
    app:srcCompat="@drawable/ic_plus"
-    app:shapeAppearanceOverlay="@style/ShapeAppearance.MapButton.Zoom.Minus"
-    android:layout_marginBottom="@dimen/margin_eighth"
+    app:shapeAppearance="@style/Widget.MaterialComponents.FloatingActionButton"
+    android:layout_marginBottom="@dimen/margin_half"
    android:contentDescription="@string/zoom_in"/>
  <com.google.android.material.floatingactionbutton.FloatingActionButton
    android:id="@+id/nav_zoom_out"
    style="@style/MwmWidget.M3.FAB.MapButton.Zoom"
    android:tint="?iconTint"
    app:srcCompat="@drawable/ic_minus"
-    app:shapeAppearanceOverlay="@style/ShapeAppearance.MapButton.Zoom.Plus"
+    app:shapeAppearance="@style/Widget.MaterialComponents.FloatingActionButton"
    android:contentDescription="@string/zoom_out"/>
 </LinearLayout>
--- a/android/app/src/main/res/layout/place_page_details.xml
+++ b/android/app/src/main/res/layout/place_page_details.xml
@@ -82,7 +82,7 @@

  <com.google.android.material.textview.MaterialTextView
    android:id="@+id/place_page_last_checked"
-    style="@style/TextAppearance.Caption"
+    style="?fontCaption"
    android:layout_width="match_parent"
    android:layout_height="wrap_content"
    android:paddingBottom="@dimen/margin_half"
--- a/android/app/src/main/res/layout/place_page_opening_hours_fragment.xml
+++ b/android/app/src/main/res/layout/place_page_opening_hours_fragment.xml
@@ -65,7 +65,7 @@

  <com.google.android.material.textview.MaterialTextView
    android:id="@+id/oh_check_date"
-    style="@style/TextAppearance.Caption"
+    style="?fontCaption"
    android:layout_height="wrap_content"
    android:layout_width="wrap_content"
    android:layout_alignParentEnd="true"
--- a/android/app/src/main/res/values-ca/strings.xml
+++ b/android/app/src/main/res/values-ca/strings.xml
@@ -912,12 +912,4 @@
    <string name="charge_socket_type1">Tipus 1</string>
    <string name="charge_socket_nacs">NACS</string>
    <string name="charge_socket_chademo">CHAdeMO</string>
-    <string name="place_page_too_old_to_edit">L\'edició de dades d\'OpenStreetMap està deshabilitada perquè les dades del mapa són massa antigues.</string>
-    <string name="place_page_map_too_old_title">Dades del mapa desactualitzades</string>
-    <string name="place_page_map_too_old_description">Les teves dades de mapa son molt antigues, per favor actualitza el mapa.</string>
-    <string name="place_page_app_too_old_description">Les teues dades del mapa son molt antigues, per favor actualitza l\'app de CoMaps.</string>
-    <string name="place_page_update_too_old_map">Actualitzar regió del mapa</string>
-    <string name="prefs_speed_cameras_information">Les advertències de càmeres radar estan deshabilitades als països on estan prohibides per llei.</string>
-    <string name="navigation_start_tts_message">"Iniciant Navegació, idioma d\'instruccions de veu: "</string>
-    <string name="navigation_start_tts_disabled_message">Instruccions de veu desactivades: motor TTS no disponible</string>
 </resources>
--- a/android/app/src/main/res/values-cs/strings.xml
+++ b/android/app/src/main/res/values-cs/strings.xml
@@ -907,10 +907,4 @@
    <string name="charge_socket_schuko">Domovní EU</string>
    <string name="prefs_speed_cameras_information">Upozornění na radary jsou vypnuty v zemích, kde je tato funkcionalita zakázána místními zákony.</string>
    <string name="navigation_start_tts_message">"Spouštím navigaci, jazyk hlasových instrukcí: "</string>
-    <string name="place_page_map_too_old_title">Mapová data jsou zastaralá</string>
-    <string name="place_page_map_too_old_description">Vaše mapová data jsou velmi stará, doporučujeme je aktualizovat.</string>
-    <string name="place_page_app_too_old_description">Vaše aktuální mapová data jsou velmi stará, aktualizujte prosím aplikaci CoMaps.</string>
-    <string name="place_page_update_too_old_map">Aktualizovat oblast mapy</string>
-    <string name="place_page_too_old_to_edit">Úprava OpenStreetMap je zakázaná, protože mapová data jsou příliš stará.</string>
-    <string name="navigation_start_tts_disabled_message">Hlasové pokyny vypnuty: služba TTS není dostupná</string>
 </resources>
--- a/android/app/src/main/res/values-da/strings.xml
+++ b/android/app/src/main/res/values-da/strings.xml
@@ -896,10 +896,4 @@
    <string name="charge_socket_schuko">Europæisk</string>
    <string name="prefs_speed_cameras_information">Advarsler om hastighedskameraer er deaktiveret i lande, hvor advarsler er forbudt i henhold til lokal lovgivning.</string>
    <string name="navigation_start_tts_message">"Starter navigation, sprog for stemmeinstruktioner: "</string>
-    <string name="place_page_map_too_old_title">Kortdata forældet</string>
-    <string name="place_page_map_too_old_description">Dine nuværende kortdata er meget gamle. Opdater kortet.</string>
-    <string name="place_page_app_too_old_description">Dine nuværende kortdata er meget gamle. Opdater CoMaps-appen.</string>
-    <string name="place_page_update_too_old_map">Opdater kortregion</string>
-    <string name="place_page_too_old_to_edit">Redigering af OpenStreetMap er deaktiveret, fordi kortdataene er for gamle.</string>
-    <string name="navigation_start_tts_disabled_message">Stemmeinstruktioner deaktiveret: TTS-motor ikke tilgængelig</string>
 </resources>
--- a/android/app/src/main/res/values-es/strings.xml
+++ b/android/app/src/main/res/values-es/strings.xml
@@ -68,7 +68,7 @@
    <!-- "Add new bookmark list" dialog title -->
    <string name="add_new_set">Agregar una lista nueva</string>
    <!-- Add Bookmark list dialog - hint when the list name is empty -->
-    <string name="bookmark_set_name">Nombre de la lista de marcadores</string>
+    <string name="bookmark_set_name">Nombre del grupo de marcadores</string>
    <!-- Should be used in the bookmarks-only context, see bookmarks_and_tracks if tracks are also implied. -->
    <string name="bookmarks">Marcadores</string>
    <!-- "Bookmarks and Tracks" dialog title, also sync it with iphone/plist.txt -->
@@ -246,7 +246,7 @@
    <!-- Button in the main menu -->
    <string name="donate">Donar</string>
    <!-- Button in the main Help dialog -->
-    <string name="how_to_support_us">Apoya y mejora el proyecto CoMaps</string>
+    <string name="how_to_support_us">Apoya el proyecto</string>
    <!-- Button in the main Help dialog -->
    <string name="copyright">Derechos de autor</string>
    <!-- Text in menu + Button in the main Help dialog -->
@@ -914,12 +914,4 @@
    <string name="editor_mark_business_vacant_description">Usa esto si el negocio ya no existe y el local ha quedado vacío para un nuevo inquilino.</string>
    <string name="editor_submit">Enviar</string>
    <string name="power_management">Gestión de energía</string>
-    <string name="place_page_map_too_old_title">Datos del mapa anticuados</string>
-    <string name="place_page_map_too_old_description">Tus datos del mapa están muy anticuados, por favor actualiza el mapa.</string>
-    <string name="place_page_app_too_old_description">Tus datos del mapa están muy anticuados, por favor actualiza la aplicación CoMaps.</string>
-    <string name="place_page_update_too_old_map">Actualizar mapa de la región</string>
-    <string name="place_page_too_old_to_edit">La edición de OpenStreetMap está deshabilitada porque los datos del mapa están muy anticuados.</string>
-    <string name="prefs_speed_cameras_information">Las advertencias de radares de velocidad están deshabilitadas en países donde las alertas están prohibidas por ley.</string>
-    <string name="navigation_start_tts_message">"Iniciando Navegación, idioma de las instrucciones por voz: "</string>
-    <string name="navigation_start_tts_disabled_message">Instrucciones por voz deshabilitadas: Motor de TTS no disponible</string>
 </resources>
--- a/android/app/src/main/res/values-et/strings.xml
+++ b/android/app/src/main/res/values-et/strings.xml
@@ -905,10 +905,4 @@
    <string name="charge_socket_schuko">EU-sisene</string>
    <string name="prefs_speed_cameras_information">Kiiruskaamerate teavitused on nendes riikides lülitatud välja, kus seda keelab kohalik seadusandlus.</string>
    <string name="navigation_start_tts_message">"Alustan tee juhatamist, hääljuhiste keel: "</string>
-    <string name="place_page_map_too_old_title">Kaardiandmed on aegunud</string>
-    <string name="place_page_map_too_old_description">Sinu kasutatavad kaardiandmed on väga vanad. Palun uuenda andmeid.</string>
-    <string name="place_page_app_too_old_description">Sinu kasutatavad kaardiandmed on väga vanad. Palun uuenda CoMapsi rakendust.</string>
-    <string name="place_page_update_too_old_map">Uuenda piirkonna kaardiandmeid</string>
-    <string name="place_page_too_old_to_edit">Kuna kaardiandmed on liiga vanad, siis OpenStreetMapi muutmise võimalus on lülitatud välja.</string>
-    <string name="navigation_start_tts_disabled_message">Hääljuhiste kasutamine on lülitatud välja: kõnesünteesimootorit pole saadaval</string>
 </resources>
--- a/android/app/src/main/res/values-fa/strings.xml
+++ b/android/app/src/main/res/values-fa/strings.xml
@@ -25,44 +25,44 @@
    <!-- Location services are disabled by user alert - message -->
    <string name="location_is_disabled_long_text">هم‌اینک، شما همه‌ی سامانه‌های گیاگ‌یابی را برای این دستگاه یا این برنامه ناکارا کرده‌اید. خواهشمند است آن را در پیکربندی‌ها کارا کنید.</string>
    <!-- A dialog title, that warns a user that Precise Location is disabled and suggests to turn it on -->
-    <string name="limited_accuracy">نزومان ویمندیگ</string>
+    <string name="limited_accuracy">دقت محدود</string>
    <!-- A dialog text, that warns a user that Precise Location is disabled and suggests to turn it on -->
-    <string name="precise_location_is_disabled_long_text">برای آسوده‌دل بودن از نزومانی ناوبری، گیاگ‌یابی نزومان را در پیکربندی کارا کنید</string>
+    <string name="precise_location_is_disabled_long_text">برای اطمینان از دقیق ناوبری ، موقعیت مکانی دقیق را در تنظیمات فعال کنید</string>
    <!-- View and button titles for accessibility -->
    <string name="zoom_to_country">نمایش بر روی نقشه</string>
    <!-- Message to display at the center of the screen when the country download has failed -->
-    <string name="country_status_download_failed">بارگیری ناکام بود</string>
+    <string name="country_status_download_failed">دانلود با شکست مواجه شد</string>
    <!-- Button text for the button under the country_status_download_failed message -->
-    <string name="try_again">تلاش دوباره</string>
-    <string name="about_menu_title">درباره CoMaps</string>
+    <string name="try_again">تلاش مجدد</string>
+    <string name="about_menu_title">CoMaps درباره‌ی</string>
    <!-- Text in About screen -->
-    <string name="about_proposition_1">• بکارگیری آسان اود پیراسته</string>
+    <string name="about_proposition_1">• آسان برای استفاده و جلا</string>
    <!-- Text in About screen -->
-    <string name="about_proposition_2">• حریم خصوصی متمرکز اود بی‌آگهی</string>
+    <string name="about_proposition_2">• حریم خصوصی متمرکز و بدون تبلیغات</string>
    <!-- Text in About screen -->
-    <string name="about_proposition_3">• آفلاین، چابک و جمع و جور</string>
+    <string name="about_proposition_3">• آفلاین، سریع و جمع و جور</string>
    <!-- Text in About screen -->
    <string name="about_developed_by_enthusiasts">منبع کاملا باز، نه برای سود، تصمیم گیری شفاف و امور مالی شفاف.</string>
    <!-- The button that opens system location settings -->
-    <string name="location_settings">پیکربندی‌های گیاگ</string>
+    <string name="location_settings">تنظیمات مکان</string>
    <string name="close">بستن</string>
    <string name="unsupported_phone">متأسفانه دستگاه شما از آن پشتیبانی نمی‌کندبرنامه برای اجرا به OpenGL نیازمند است.</string>
-    <string name="download">بارگیری</string>
+    <string name="download">دانلود</string>
    <!-- Used in DownloadResources startup screen -->
    <string name="not_enough_free_space_on_sdcard">لطفا مقداری از فضای ذخیره‌سازی را آزاد نمایید</string>
    <string name="download_resources">قبل از استفاده از اپلیکیشن, اجازه دهید تا ما نقشه جهانی را بر روی موبایل شما دانلود کنیم. \nمقدار %s از حافظه شما اشغال می شود.</string>
    <string name="download_resources_continue">برو به نقشه</string>
-    <string name="downloading_country_can_proceed">بارگیری می‌شود %1$s (%2$s). شما اکنون می‌توانید\nبه نقشه بروید.</string>
-    <string name="download_country_ask">بارگیری %1$s؟ (%2$s)</string>
+    <string name="downloading_country_can_proceed">درحال دانلود %1$s (%2$s). شما اکنون می توانید \nبه نقشه بروید.</string>
+    <string name="download_country_ask">دانلود %1$s؟ (%2$s)</string>
    <string name="update_country_ask">بروزرسانی %1$s؟ (%2$s)</string>
    <!-- REMOVE THIS STRING AFTER REFACTORING -->
    <string name="pause">درنگ</string>
    <!-- REMOVE THIS STRING AFTER REFACTORING -->
    <string name="continue_button">ادامه</string>
    <!-- Show popup notification on top of the map when country download has failed. -->
-    <string name="download_country_failed">%s بارگیری ناکام بود</string>
+    <string name="download_country_failed">%s دانلود با شکست مواجه شد</string>
    <!-- "Add new bookmark list" dialog title -->
-    <string name="add_new_set">افزودن پهرستی نو</string>
+    <string name="add_new_set">اضافه کردن مجموعه جدید</string>
    <!-- Should be used in the bookmarks-only context, see bookmarks_and_tracks if tracks are also implied. -->
    <string name="bookmarks">نشانه‌ها</string>
    <!-- "Bookmarks and Tracks" dialog title, also sync it with iphone/plist.txt -->
@@ -778,7 +778,7 @@
    <string name="panoramax">تصویر Panoramax</string>
    <string name="app_site_url">https://comaps.app</string>
    <string name="saved">ذخیره شد</string>
-    <string name="about_headline">پروژه‌ای باز نیرو گرفته از انجمن</string>
+    <string name="about_headline">رایگان برای همه، ساخته شده با عشق</string>
    <string name="pedestrian">پیاده</string>
    <string name="bicycle">دوچرخه</string>
    <string name="backup_interval_every_week">هفتگی</string>
--- a/android/app/src/main/res/values-fi/strings.xml
+++ b/android/app/src/main/res/values-fi/strings.xml
@@ -524,7 +524,7 @@
    <string name="editor_share_to_all_dialog_title">Haluatko lähettää sen kaikille käyttäjille?</string>
    <!-- Dialog before publishing the modifications to the public map. -->
    <string name="editor_share_to_all_dialog_message_1">Varmista, ettet syöttänyt henkilökohtaisia tietojasi.</string>
-    <string name="editor_share_to_all_dialog_message_2">OpenStreetMap-muokkaajat tarkistavat muutokset ja ottavat sinuun yhteyttä, jos heillä on kysyttävää.</string>
+    <string name="editor_share_to_all_dialog_message_2">OpenStreetMap-muokkaimet tarkistavat muutokset ja ottavat sinuun yhteyttä, jos niillä on kysyttävää</string>
    <string name="navigation_stop_button">Lopeta</string>
    <!-- Shown as toast when starting the recent track recording -->
    <string name="track_recording">Reitin kirjaaminen</string>
@@ -903,12 +903,4 @@
    <string name="editor_submit">Lähetä</string>
    <string name="list_description_empty">Muokkaa listaa lisätäksesi kuvauksen</string>
    <string name="editor_business_vacant_button">Liike on tyhjillään</string>
-    <string name="place_page_map_too_old_title">Karttatiedot vanhentuneet</string>
-    <string name="place_page_map_too_old_description">Nykyinen karttadata on hyvin vanhaa, päivitä kartta.</string>
-    <string name="place_page_app_too_old_description">Nykyinen karttadata on hyvin vanhaa, päivitä CoMaps-sovellus.</string>
-    <string name="place_page_update_too_old_map">Päivitä kartta-alue</string>
-    <string name="place_page_too_old_to_edit">OpenStreetMap-muokkaus on poistettu käytöstä, koska karttadata on liian vanhaa.</string>
-    <string name="prefs_speed_cameras_information">Nopeuskameravaroitukset on poistettu käytöstä niissä maissa, missä varoitukset on kielletty lain nojalla.</string>
-    <string name="power_management">Virranhallinta</string>
-    <string name="navigation_start_tts_message">"Käynnistetään navigointi, ääniohjeistuksen kieli: "</string>
 </resources>
--- a/android/app/src/main/res/values-fr/strings.xml
+++ b/android/app/src/main/res/values-fr/strings.xml
@@ -897,7 +897,7 @@
    <string name="editor_place_doesnt_exist_description">Décrivez le lieu afin de signaler l\'erreur à la communauté OpenStreetMap</string>
    <string name="offline_explanation_text">Une carte doit être téléchargée pour visualiser et vous déplacer dans une zone.\nTéléchargez les cartes des zones que vous souhaitez visiter.</string>
    <string name="list_description_empty">Modifier la liste pour ajouter une description</string>
-    <string name="avoid_paved">Éviter les routes pavées</string>
+    <string name="avoid_paved">Éviter les routes goudronnées</string>
    <string name="opens_at">Ouvre à %s</string>
    <string name="closes_at">Ferme à %s</string>
    <string name="opens_day_at">Ouverture le %1$s à %2$s</string>
@@ -913,12 +913,4 @@
    <string name="editor_submit">Soumettre</string>
    <string name="power_management">Gestion de l\'énergie</string>
    <string name="charge_socket_schuko">Europe</string>
-    <string name="place_page_map_too_old_title">Carte obsolète</string>
-    <string name="place_page_map_too_old_description">Les données de la carte actuelle sont anciennes, pensez à les mettre à jour.</string>
-    <string name="place_page_update_too_old_map">Mettre à jour la carte</string>
-    <string name="place_page_too_old_to_edit">Les modifications OpenStreetMap sont désactivées car les données de la carte sont trop anciennes.</string>
-    <string name="place_page_app_too_old_description">Vos données cartographiques actuelles sont très anciennes, veuillez mettre à jour l\'application CoMaps.</string>
-    <string name="prefs_speed_cameras_information">Les avertissements relatifs aux radars de vitesse sont désactivés dans les pays où les alertes sont interdites par la législation locale.</string>
-    <string name="navigation_start_tts_message">"Navigation de démarrage, langue des instructions vocales : "</string>
-    <string name="navigation_start_tts_disabled_message">Instructions vocales désactivées : moteur de synthèse vocale non disponible</string>
 </resources>
--- a/android/app/src/main/res/values-hr/strings.xml
+++ b/android/app/src/main/res/values-hr/strings.xml
@@ -261,13 +261,4 @@
    <string name="dialog_routing_system_error">Sistemska greška</string>
    <string name="dialog_routing_application_error">Nije moguće napraviti rutu zbog greške u aplikaciji</string>
    <string name="dialog_routing_try_again">Pokušajte ponovno</string>
-    <string name="search_not_found_query">Preuzmite regiju u kojoj pretražujete ili pokušajte dodati naziv obližnjeg grada/sela.</string>
-    <string name="search_history_text">Pogledajte svoja nedavna pretraživanja</string>
-    <string name="read_in_wikipedia">Wikipedija</string>
-    <string name="p2p_your_location">Vaša lokacija</string>
-    <string name="p2p_only_from_current">Navigacija je dostupna samo od vaše trenutne lokacije</string>
-    <string name="p2p_reroute_from_current">Želite li isplanirati rutu od vaše trenutne lokacije?</string>
-    <string name="editor_time_add">Dodaj Raspored</string>
-    <string name="editor_time_delete">Izbriši Raspored</string>
-    <string name="editor_time_allday">Cijeli dan (24 sata)</string>
 </resources>
--- a/android/app/src/main/res/values-it/strings.xml
+++ b/android/app/src/main/res/values-it/strings.xml
@@ -898,12 +898,4 @@
    <string name="avoid_paved">Evita le strade asfaltate</string>
    <string name="charge_socket_schuko">Domestico EU</string>
    <string name="power_management">Risparmio energetico</string>
-    <string name="place_page_too_old_to_edit">La modifica di OpenStreetMap è disabilitata perché le mappe sono troppo vecchie.</string>
-    <string name="place_page_update_too_old_map">Aggiorna questa mappa</string>
-    <string name="place_page_app_too_old_description">Le mappe correnti sono molto vecchie, si suggerisce di aggiornare CoMaps.</string>
-    <string name="place_page_map_too_old_description">La mappa corrente è molto vecchia, si suggerisce di aggiornarla.</string>
-    <string name="place_page_map_too_old_title">Mappa obsoleta</string>
-    <string name="navigation_start_tts_disabled_message">Istruzioni vocali disabilitate: TTS non disponibile</string>
-    <string name="prefs_speed_cameras_information">Gli avvisi di Autovelox sono disabilitati dove proibito dalla legge locale.</string>
-    <string name="navigation_start_tts_message">"Inizio Navigazione, lingua per istruzioni vocali: "</string>
 </resources>
--- a/android/app/src/main/res/values-kw/strings.xml
+++ b/android/app/src/main/res/values-kw/strings.xml
@@ -371,6 +371,4 @@
    <string name="error_value_must_be_positive">Res an niver positiv</string>
    <string name="error_invalid_number">Niver anewn</string>
    <string name="offline_explanation_title">Mappys Dhywarlinen</string>
-    <string name="category_shopping">Gwerthjiow</string>
-    <string name="edit">Golegi</string>
 </resources>
--- a/android/app/src/main/res/values-lv/strings.xml
+++ b/android/app/src/main/res/values-lv/strings.xml
@@ -845,10 +845,4 @@
    <string name="closed_now">Šobrīd slēgts</string>
    <string name="avoid_paved">Izvairīties no ceļiem ar cietu mākslīgo segumu</string>
    <string name="editor_submit">Iesniegt</string>
-    <string name="place_page_map_too_old_title">Novecojuši kartes dati</string>
-    <string name="place_page_map_too_old_description">Pašreizējie kartes dati ir ļoti veci, lūgums atjaunināt karti.</string>
-    <string name="place_page_app_too_old_description">Pašreizējie kartes dati ir ļoti veci, lūgums atjaunināt CoMaps lietotni.</string>
-    <string name="place_page_update_too_old_map">Atjaunināt karšu apgabalu</string>
-    <string name="place_page_too_old_to_edit">OpenStreetMap labošana ir atspējota, jo kartes dati ir pārāk veci.</string>
-    <string name="navigation_start_tts_disabled_message">Balss norādes atspējotas: nav pieejams teksta pārveidošanas runā dzinējs</string>
 </resources>
--- a/android/app/src/main/res/values-nb/strings.xml
+++ b/android/app/src/main/res/values-nb/strings.xml
@@ -899,11 +899,4 @@
    <string name="navigation_start_tts_disabled_message">Taleveiledninger deaktivert: TTS-motor ikke tilgjengelig</string>
    <string name="navigation_start_tts_message">"Starter navigering, taleveiledningsspråk: "</string>
    <string name="prefs_speed_cameras_information">Fotoboksvarsler er deaktivert i land hvor varsler er forbudt i henhold til lokal lovgivning.</string>
-    <string name="place_page_map_too_old_title">Kartdata utdatert</string>
-    <string name="place_page_map_too_old_description">Gjeldende kartdata er gamle, oppdater kartet.</string>
-    <string name="place_page_app_too_old_description">Gjeldende kartdata er gamle, oppdater CoMaps-appen.</string>
-    <string name="place_page_update_too_old_map">Oppdater kartregion</string>
-    <string name="place_page_too_old_to_edit">OpenStreetMap-redigering er deaktivert fordi kartdataene er for gamle.</string>
-    <string name="osm_note_hint">Alternativt, så kan du legge til et notat i OpenStreetMap, slik at noen andre kan redigere eller legge til stedet.</string>
-    <string name="osm_note_toast">Notatet vil bli sendt til OpenStreetMap</string>
 </resources>
--- a/android/app/src/main/res/values-night/themes.xml
+++ b/android/app/src/main/res/values-night/themes.xml
@@ -88,19 +88,19 @@
    <item name="android:textAppearanceSmall">@style/TextAppearance.Small</item>
    <item name="android:textAppearanceMedium">@style/TextAppearance.Medium</item>
    <item name="android:textAppearanceLarge">@style/TextAppearance.Large</item>
-    <item name="fontHeadline1">@style/TextAppearance.Headline1</item>
-    <item name="fontHeadline2">@style/TextAppearance.Headline2</item>
-    <item name="fontHeadline3">@style/TextAppearance.Headline3</item>
-    <item name="fontHeadline4">@style/TextAppearance.Headline4</item>
+    <item name="fontHeadline1">@style/TextAppearance.MdcTypographyStyles.Headline1</item>
+    <item name="fontHeadline2">@style/TextAppearance.MdcTypographyStyles.Headline2</item>
+    <item name="fontHeadline3">@style/TextAppearance.MdcTypographyStyles.Headline3</item>
+    <item name="fontHeadline4">@style/TextAppearance.MdcTypographyStyles.Headline4</item>
    <item name="fontHeadline5">@style/TextAppearance.MaterialComponents.Headline5</item>
-    <item name="fontHeadline6">@style/TextAppearance.Headline6</item>
-    <item name="fontSubtitle1">@style/TextAppearance.Subtitle1</item>
-    <item name="fontSubtitle2">@style/TextAppearance.Subtitle2</item>
-    <item name="fontBody1">@style/TextAppearance.Body1</item>
-    <item name="fontBody2">@style/TextAppearance.Body2</item>
-    <item name="fontButton">@style/TextAppearance.Button</item>
-    <item name="fontCaption">@style/TextAppearance.Caption</item>
-    <item name="fontOverline">@style/TextAppearance.Overline</item>
+    <item name="fontHeadline6">@style/TextAppearance.MdcTypographyStyles.Headline6</item>
+    <item name="fontSubtitle1">@style/TextAppearance.MdcTypographyStyles.Subtitle1</item>
+    <item name="fontSubtitle2">@style/TextAppearance.MdcTypographyStyles.Subtitle2</item>
+    <item name="fontBody1">@style/TextAppearance.MdcTypographyStyles.Body1</item>
+    <item name="fontBody2">@style/TextAppearance.MdcTypographyStyles.Body2</item>
+    <item name="fontButton">@style/TextAppearance.MdcTypographyStyles.Button</item>
+    <item name="fontCaption">@style/TextAppearance.MdcTypographyStyles.Caption</item>
+    <item name="fontOverline">@style/TextAppearance.MdcTypographyStyles.Overline</item>
    <item name="drivingOptionsViewBg">@color/bg_primary_dark</item>
    <item name="elevationProfilePropertyBg">@drawable/bg_rounded_rect</item>
    <item name="elevationProfilePropIconTint">@color/white_secondary</item>
--- a/android/app/src/main/res/values-nl/strings.xml
+++ b/android/app/src/main/res/values-nl/strings.xml
@@ -910,9 +910,4 @@
    <string name="navigation_start_tts_message">"Navigatie starten, taal voor steminstructie: "</string>
    <string name="prefs_speed_cameras_information">Waarschuwingen voor flitsers zijn uitgeschakeld in landen waar deze wettelijk zijn verboden.</string>
    <string name="navigation_start_tts_disabled_message">Spraakinstructies uitgeschakeld: TTS-engine niet beschikbaar</string>
-    <string name="place_page_map_too_old_title">Kaartgegevens verouderd</string>
-    <string name="place_page_map_too_old_description">Uw huidige kaartgegevens zijn erg oud. Werk de kaart bij.</string>
-    <string name="place_page_app_too_old_description">Uw huidige kaartgegevens zijn erg oud. Update de CoMaps-app.</string>
-    <string name="place_page_update_too_old_map">Kaart regio bijwerken</string>
-    <string name="place_page_too_old_to_edit">Het bewerken van OpenStreetMap is uitgeschakeld omdat de kaartgegevens te oud zijn.</string>
 </resources>
--- a/android/app/src/main/res/values-pt-rBR/strings.xml
+++ b/android/app/src/main/res/values-pt-rBR/strings.xml
@@ -885,12 +885,4 @@
    <string name="editor_submit">Enviar</string>
    <string name="power_management">Gerenciamento de energia</string>
    <string name="charge_socket_schuko">Doméstica UE</string>
-    <string name="place_page_map_too_old_title">Dados do mapa desatualizados</string>
-    <string name="place_page_map_too_old_description">Os seus dados do mapa atuais são muito antigos, por favor atualize o mapa.</string>
-    <string name="place_page_app_too_old_description">Seus dados do mapa atuais são muito antigos, por favor atualize o aplicativo CoMaps.</string>
-    <string name="place_page_update_too_old_map">Atualizar região do mapa</string>
-    <string name="place_page_too_old_to_edit">A edição do OpenStreetMap está desativada porque os dados do mapa são antigos demais.</string>
-    <string name="prefs_speed_cameras_information">Alertas de radar fotográfico de velocidade estão desativados em países onde os alertas são proibidos pelas leis locais.</string>
-    <string name="navigation_start_tts_message">"Iniciando navegação, idioma da instrução por voz: "</string>
-    <string name="navigation_start_tts_disabled_message">Instrução por voz desativada: nenhum motor de texto para voz disponível</string>
 </resources>
--- a/android/app/src/main/res/values-pt/strings.xml
+++ b/android/app/src/main/res/values-pt/strings.xml
@@ -901,12 +901,4 @@
    <string name="list_description_empty">Edite a lista para adicionar uma descrição</string>
    <string name="power_management">Gestão de Energia</string>
    <string name="charge_socket_schuko">Doméstica UE</string>
-    <string name="place_page_map_too_old_title">Dados do mapa desatualizados</string>
-    <string name="place_page_map_too_old_description">O seu mapa atual tem dados demasiado antigos, por favor atualize-o.</string>
-    <string name="place_page_app_too_old_description">O seu mapa atual tem dados demasiado antigos, por favor atualize a aplicação do CoMaps.</string>
-    <string name="place_page_update_too_old_map">Atualizar região do mapa</string>
-    <string name="place_page_too_old_to_edit">Edição OpenStreetMap está desativada, pois os dados do mapa são demasiado antigos.</string>
-    <string name="prefs_speed_cameras_information">Avisos de câmaras de velocidade estão desativados em países onde alertas estão proibidos por lei.</string>
-    <string name="navigation_start_tts_message">"Iniciando Navegação, idioma das instruções por voz: "</string>
-    <string name="navigation_start_tts_disabled_message">Instruções por voz desativadas: nenhum motor de TTS disponível</string>
 </resources>
--- a/android/app/src/main/res/values-ru/strings.xml
+++ b/android/app/src/main/res/values-ru/strings.xml
@@ -17,7 +17,7 @@
    <!-- Choose measurement on first launch alert - choose imperial system button -->
    <string name="miles">Мили</string>
    <!-- Update maps later button text -->
-    <string name="later">Позже</string>
+    <string name="later">Не сейчас</string>
    <!-- View and button titles for accessibility, please also edit it in iphone/plist.txt -->
    <string name="search">Поиск</string>
    <!-- Search box placeholder text; Used when searching on the map itself, not when searching for a map -->
@@ -27,7 +27,7 @@
    <!-- A dialog title, that warns a user that Precise Location is disabled and suggests to turn it on -->
    <string name="limited_accuracy">Точность местоположения ограничена</string>
    <!-- A dialog text, that warns a user that Precise Location is disabled and suggests to turn it on -->
-    <string name="precise_location_is_disabled_long_text">Включите в настройках определение точного местоположения</string>
+    <string name="precise_location_is_disabled_long_text">Для обеспечения точной навигации включите определение точного местоположения в настройках</string>
    <!-- View and button titles for accessibility -->
    <string name="zoom_to_country">Показать на карте</string>
    <!-- Message to display at the center of the screen when the country download has failed -->
@@ -297,7 +297,7 @@
    <!-- location service disabled -->
    <string name="enable_location_services">Пожалуйста, включите геолокацию</string>
    <string name="save">Сохранить</string>
-    <string name="create">Создать</string>
+    <string name="create">создать</string>
    <!-- red color -->
    <string name="red">Красный</string>
    <!-- yellow color -->
@@ -526,8 +526,8 @@
    <!-- Displayed when saving some edits to the map to warn against publishing personal data -->
    <string name="editor_share_to_all_dialog_title">Отправить всем пользователям?</string>
    <!-- Dialog before publishing the modifications to the public map. -->
-    <string name="editor_share_to_all_dialog_message_1">Убедитесь, что вы не указали никаких личных данных.</string>
-    <string name="editor_share_to_all_dialog_message_2">Редакторы OpenStreetMap проверят изменения и свяжутся с вами, если у них возникнут вопросы.</string>
+    <string name="editor_share_to_all_dialog_message_1">Убедитесь, что вы не указали никаких личных данных</string>
+    <string name="editor_share_to_all_dialog_message_2">Редакторы OpenStreetMap проверят изменения и свяжутся с вами, если у них возникнут вопросы</string>
    <string name="navigation_stop_button">Cтоп</string>
    <!-- Shown as toast when starting the recent track recording -->
    <string name="track_recording">Запись трека</string>
@@ -918,9 +918,4 @@
    <string name="list_description_empty">Отредактируйте список, чтобы добавить описание</string>
    <string name="pref_tts_no_system_tts_short">Не найден движок синтезатора речи, проверьте настройки приложения</string>
    <string name="unknown_power_output">неизвестно</string>
-    <string name="opens_day_at">Откроется %1$s на %2$s</string>
-    <string name="closes_day_at">Закроется %1$s на %2$s</string>
-    <string name="place_page_map_too_old_title">Данные карты устарели</string>
-    <string name="place_page_update_too_old_map">Обновить регион карты</string>
-    <string name="place_page_too_old_to_edit">Редактирование OpenStreetMap отключено, так как данные карты слишком старые.</string>
 </resources>
--- a/android/app/src/main/res/values-sl/strings.xml
+++ b/android/app/src/main/res/values-sl/strings.xml
@@ -349,8 +349,8 @@
    <string name="osm_note_hint">Ali pa pusti sporočilo skupnosti OpenStreetMap, da bo nekdo drug dodal ali popravil ta kraj.</string>
    <string name="osm_note_toast">Sporočilo bo poslano na OpenStreetMap</string>
    <string name="editor_share_to_all_dialog_title">Ali to želite poslati vsem uporabnikom?</string>
-    <string name="editor_share_to_all_dialog_message_1">Poskrbite, da niste vnesli nobenih zasebnih ali osebnih podatkov</string>
-    <string name="editor_share_to_all_dialog_message_2">Uredniki na OpenStreetMap bodo preverili spremembe in stopili v stik z vami, če kaj ne bo jasno.</string>
+    <string name="editor_share_to_all_dialog_message_1">Poskrbite, da niste vnesli nobenih zasebnih podatkov</string>
+    <string name="editor_share_to_all_dialog_message_2">Uredniki na OpenStreetMap bodo preverili spremembe in stopili v stik z vami, če kaj ne bo jasno</string>
    <string name="navigation_stop_button">Ustavi</string>
    <string name="track_recording">Snemam pot</string>
    <string name="accept">Potrdi</string>
@@ -639,22 +639,4 @@
        <item quantity="few">%d min</item>
        <item quantity="other">%d min</item>
    </plurals>
-    <string name="opens_day_at">Odpre se %1$s, ob %2$s</string>
-    <string name="closes_day_at">Zapre se %1$s, ob %2$s</string>
-    <string name="editor_business_vacant_button">Podjetje ni zakupljeno</string>
-    <string name="editor_mark_business_vacant_title">Označi, da je podjetje nezakupljeno</string>
-    <string name="editor_mark_business_vacant_description">To uporabite, če se je podjetje izselilo in so prostori prazni in pripravljeni za novega zakupnika.</string>
-    <string name="editor_submit">Potrdi</string>
-    <string name="place_page_map_too_old_title">Podatki zemljevida so zastareli</string>
-    <string name="place_page_map_too_old_description">Vaši trenutni podatki zemljevida so zelo stari; prosimo, posodobite zemljevid.</string>
-    <string name="place_page_app_too_old_description">Vaši trenutni podatki zemljevida so zelo stari; prosimo, posodobite orodje CoMaps.</string>
-    <string name="place_page_update_too_old_map">Posodobi področje zemljevida</string>
-    <string name="place_page_too_old_to_edit">Urejanje OpenStreetMap je onemogočeno, ker so podatki zemljevida prestari.</string>
-    <string name="prefs_speed_cameras_information">Opozorila o merilnikih hitrosti so onemogočena v državah, kjer so prepovedana s tamkajšnjimi zakoni.</string>
-    <string name="power_management">Energetsko upravljanje</string>
-    <string name="avoid_paved">Izogni se neasfaltiranim cestam</string>
-    <string name="navigation_start_tts_message">"Začenjanje potnega usmerjanja, jezik glasovnih napotkov: "</string>
-    <string name="navigation_start_tts_disabled_message">Glasovni napotki so onemogočeni: ustvarjalec glasu (TTS) ni na voljo</string>
-    <string name="charge_socket_schuko">standardna evropska vtičnica (Schuko)</string>
-    <string name="list_description_empty">Uredite seznam, da dodate opis</string>
 </resources>
--- a/android/app/src/main/res/values-zh/strings.xml
+++ b/android/app/src/main/res/values-zh/strings.xml
@@ -912,9 +912,4 @@
    <string name="navigation_start_tts_message">"启动导航，语音指令语言： "</string>
    <string name="prefs_speed_cameras_information">在当地法律禁止发出警报的国家/地区，测速摄像头警告功能将被禁用。</string>
    <string name="navigation_start_tts_disabled_message">语音指令已禁用：TTS 引擎不可用</string>
-    <string name="place_page_map_too_old_title">地图数据已过时</string>
-    <string name="place_page_map_too_old_description">您当前的地图数据非常旧，请更新地图。</string>
-    <string name="place_page_app_too_old_description">您当前的地图数据非常旧，请更新 CoMaps 应用。</string>
-    <string name="place_page_update_too_old_map">更新地图区域</string>
-    <string name="place_page_too_old_to_edit">由于地图数据太旧，OpenStreetMap 编辑被禁用。</string>
 </resources>
--- a/android/app/src/main/res/values/dimens.xml
+++ b/android/app/src/main/res/values/dimens.xml
@@ -119,7 +119,7 @@
  <dimen name="nav_menu_landscape_width">360dp</dimen>

  <dimen name="nav_frame_padding">@dimen/margin_half</dimen>
-  <dimen name="zoom_buttons_margin">58dp</dimen>
+  <dimen name="zoom_buttons_margin">64dp</dimen>
  <dimen name="map_buttons_bottom_margin">136dp</dimen>
  <dimen name="map_buttons_bottom_max_width">300dp</dimen>

@@ -130,6 +130,7 @@
  <!-- Editor -->
  <dimen name="editor_height_days">72dp</dimen>
  <dimen name="editor_height_closed">72dp</dimen>
+  <dimen name="editor_height_allday">56dp</dimen>
  <dimen name="editor_height_field">64dp</dimen>
  <dimen name="editor_margin_left">56dp</dimen>
  <dimen name="editor_auth_btn_height">@dimen/primary_button_min_height</dimen>
--- a/android/app/src/main/res/values/styles-text.xml
+++ b/android/app/src/main/res/values/styles-text.xml
@@ -6,6 +6,11 @@
    <item name="android:textStyle">normal</item>
  </style>

+  <style name="MwmTextAppearance.Display1">
+    <item name="android:textSize">@dimen/text_size_display_1</item>
+    <item name="android:textColor">?android:textColorPrimary</item>
+  </style>
+
  <style name="MwmTextAppearance.Title">
    <item name="android:textSize">@dimen/text_size_title</item>
    <item name="android:textColor">?android:textColorPrimary</item>
@@ -185,91 +190,91 @@
    <item name="android:textColor">@color/white_secondary</item>
  </style>

-  <style name="TextAppearance.Headline1"
-    parent="TextAppearance.Material3.DisplayLarge">
+  <style name="TextAppearance.MdcTypographyStyles.Headline1"
+    parent="TextAppearance.MaterialComponents.Headline1">
    <item name="fontFamily">@string/robotoLight</item>
    <item name="android:fontFamily">@string/robotoLight</item>
    <item name="android:textSize">96sp</item>
  </style>

-  <style name="TextAppearance.Headline2"
-    parent="TextAppearance.Material3.DisplayLarge">
+  <style name="TextAppearance.MdcTypographyStyles.Headline2"
+    parent="TextAppearance.MaterialComponents.Headline2">
    <item name="fontFamily">@string/robotoRegular</item>
    <item name="android:fontFamily">@string/robotoRegular</item>
    <item name="android:textSize">60sp</item>
  </style>

-  <style name="TextAppearance.Headline3"
-    parent="TextAppearance.Material3.DisplayMedium">
+  <style name="TextAppearance.MdcTypographyStyles.Headline3"
+    parent="TextAppearance.MaterialComponents.Headline3">
    <item name="fontFamily">@string/robotoRegular</item>
    <item name="android:fontFamily">@string/robotoRegular</item>
    <item name="android:textSize">48sp</item>
  </style>

-  <style name="TextAppearance.Headline4"
-    parent="TextAppearance.Material3.HeadlineLarge">
+  <style name="TextAppearance.MdcTypographyStyles.Headline4"
+    parent="TextAppearance.MaterialComponents.Headline4">
    <item name="fontFamily">@string/robotoRegular</item>
    <item name="android:fontFamily">@string/robotoRegular</item>
    <item name="android:textSize">34sp</item>
  </style>

-  <style name="TextAppearance.Headline5"
-    parent="TextAppearance.Material3.HeadlineMedium">
+  <style name="TextAppearance.MdcTypographyStyles.Headline5"
+    parent="TextAppearance.MaterialComponents.Headline5">
    <item name="fontFamily">@string/robotoRegular</item>
    <item name="android:fontFamily">@string/robotoRegular</item>
    <item name="android:textSize">24sp</item>
  </style>

-  <style name="TextAppearance.Headline6"
-    parent="TextAppearance.Material3.HeadlineSmall">
+  <style name="TextAppearance.MdcTypographyStyles.Headline6"
+    parent="TextAppearance.MaterialComponents.Headline6">
    <item name="fontFamily">@string/robotoMedium</item>
    <item name="android:fontFamily">@string/robotoMedium</item>
    <item name="android:textSize">20sp</item>
  </style>

-  <style name="TextAppearance.Subtitle1"
-    parent="TextAppearance.Material3.TitleMedium">
+  <style name="TextAppearance.MdcTypographyStyles.Subtitle1"
+    parent="TextAppearance.MaterialComponents.Subtitle1">
    <item name="fontFamily">@string/robotoRegular</item>
    <item name="android:fontFamily">@string/robotoRegular</item>
    <item name="android:textSize">16sp</item>
  </style>

-  <style name="TextAppearance.Subtitle2"
-    parent="TextAppearance.Material3.TitleSmall">
+  <style name="TextAppearance.MdcTypographyStyles.Subtitle2"
+    parent="TextAppearance.MaterialComponents.Subtitle2">
    <item name="fontFamily">@string/robotoMedium</item>
    <item name="android:fontFamily">@string/robotoMedium</item>
    <item name="android:textSize">14sp</item>
  </style>

-  <style name="TextAppearance.Body1"
-    parent="TextAppearance.Material3.BodyLarge">
+  <style name="TextAppearance.MdcTypographyStyles.Body1"
+    parent="TextAppearance.MaterialComponents.Body1">
    <item name="fontFamily">@string/robotoRegular</item>
    <item name="android:fontFamily">@string/robotoRegular</item>
    <item name="android:textSize">16sp</item>
  </style>

-  <style name="TextAppearance.Body2"
-    parent="TextAppearance.Material3.BodyMedium">
+  <style name="TextAppearance.MdcTypographyStyles.Body2"
+    parent="TextAppearance.MaterialComponents.Body2">
    <item name="fontFamily">@string/robotoRegular</item>
    <item name="android:fontFamily">@string/robotoRegular</item>
    <item name="android:textSize">14sp</item>
  </style>

-  <style name="TextAppearance.Button"
+  <style name="TextAppearance.MdcTypographyStyles.Button"
    parent="TextAppearance.MaterialComponents.Button">
    <item name="fontFamily">@string/robotoMedium</item>
    <item name="android:fontFamily">@string/robotoMedium</item>
    <item name="android:textSize">14sp</item>
  </style>

-  <style name="TextAppearance.Caption"
-    parent="TextAppearance.Material3.LabelMedium">
+  <style name="TextAppearance.MdcTypographyStyles.Caption"
+    parent="TextAppearance.MaterialComponents.Caption">
    <item name="fontFamily">@string/robotoRegular</item>
    <item name="android:fontFamily">@string/robotoRegular</item>
    <item name="android:textSize">12sp</item>
  </style>

-  <style name="TextAppearance.Overline"
+  <style name="TextAppearance.MdcTypographyStyles.Overline"
    parent="TextAppearance.MaterialComponents.Overline">
    <item name="fontFamily">@string/robotoRegular</item>
    <item name="android:fontFamily">@string/robotoRegular</item>
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
x7z4w	b0d1abb0d1	Update .git-blame-ignore-revs Signed-off-by: x7z4w <x7z4w@noreply.codeberg.org>	2025-12-11 21:51:56 +07:00
x7z4w	eb28c50161	[core] Implicit `m2::Point` hash Signed-off-by: x7z4w <x7z4w@noreply.codeberg.org>	2025-12-11 21:51:56 +07:00
x7z4w	650f0ca120	[generator] Implement hash for `OsmElement::Tag` Signed-off-by: x7z4w <x7z4w@noreply.codeberg.org>	2025-12-11 21:51:56 +07:00
x7z4w	882dccb87d	[core] Replace `SmallMap` Signed-off-by: x7z4w <x7z4w@noreply.codeberg.org>	2025-12-11 21:51:56 +07:00
x7z4w	969e1ef2da	[core] Switch to ankerl::unordered_dense Signed-off-by: x7z4w <x7z4w@noreply.codeberg.org>	2025-12-11 21:51:56 +07:00
x7z4w	a60efa9b43	[drape] nits Signed-off-by: x7z4w <x7z4w@noreply.codeberg.org>	2025-12-11 21:51:56 +07:00