[android] Clean background color in views

Signed-off-by: Jean-Baptiste <jeanbaptiste.charron@outlook.fr>
[search] Improve search terms in french
2025-12-19 13:03:36 +00:00 · 2025-12-18 21:31:25 +01:00 · 2025-12-18 20:35:30 +01:00 · 2025-12-18 14:24:02 +00:00 · 2025-12-18 15:23:52 +01:00 · 2025-12-18 11:52:47 +01:00
469 changed files with 4396 additions and 5022 deletions
--- a/.forgejo/CODEOWNERS
+++ b/.forgejo/CODEOWNERS
@@ -1,69 +1,55 @@
-# All non-assigned.
-* @organicmaps/mergers
 # Visual design.
-/android/app/src/main/res/drawable*/ @organicmaps/design
-/android/app/src/main/res/font/ @organicmaps/design
-/android/app/src/main/res/mipmap*/ @organicmaps/design
-/data/*.ttf @organicmaps/design
-/data/resources-svg/ @organicmaps/design
-/data/search-icons/ @organicmaps/design
-/iphone/Maps/Images.xcassets/ @organicmaps/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.
-/android/ @organicmaps/android
-/android/app/src/main/java/app/organicmaps/car/ @organicmaps/android-auto
-/docs/ANDROID_LOCATION_TEST.md @organicmaps/android
-/docs/JAVA_STYLE.md @organicmaps/android
+/android/ @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
 # no owner for translation changes
 /android/app/src/main/res/values*/strings.xml
 # iOS.
-/iphone/ @organicmaps/ios
-/xcode/ @organicmaps/ios
-/docs/OBJC_STYLE.md @organicmaps/ios
+/iphone/ @comaps/ios
+/xcode/ @comaps/ios
+/docs/OBJC_STYLE.md @comaps/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/ @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
+/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
 /docs/STYLES.md
-/tools/kothic/ @organicmaps/styles
+/tools/kothic/ @comaps/styles
 # 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
+/.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
 # Legal.
-LEGAL @organicmaps/legal
-LICENSE @organicmaps/legal
-NOTICE @organicmaps/legal
-CONTRIBUTORS @organicmaps/legal
-/docs/CODE_OF_CONDUCT.md @organicmaps/legal
-/docs/DCO.md @organicmaps/legal
-/docs/GOVERNANCE.md @organicmaps/legal
+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
--- a/.forgejo/FUNDING.yml
+++ b/.forgejo/FUNDING.yml
@@ -1 +1,3 @@
 open_collective: comaps
+liberapay: comaps
+custom: ["https://comaps.app/donate/"]
--- a/.git-blame-ignore-revs
+++ b/.git-blame-ignore-revs
@@ -2,5 +2,3 @@
 480fa6c2fcf53be296504ac6ba8e6b3d70f92b42
 a6ede2b1466f0c9d8a443600ef337ba6b5832e58
 1377b81bf1cac72bb6da192da7fed6696d5d5281
-0288b97b1367bb971eded1018f560598ea274e6c
-bf30165b5f5de0907c3c64524a3bf8121624b0b7
--- a/.github/FUNDING.yml
+++ b/.github/FUNDING.yml
@@ -0,0 +1,3 @@
+open_collective: comaps
+liberapay: comaps
+custom: ["https://comaps.app/donate/"]
--- a/.gitignore
+++ b/.gitignore
@@ -155,6 +155,8 @@ 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
@@ -1,83 +0,0 @@
-///////////////////////// 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/1
+++ b/1
@@ -10,6 +10,7 @@ CoMaps contributors:
 Bastian Greshake Tzovaras
 clover sage
 Harry Bond <me@hbond.xyz>
+NoelClick
 thesupertechie
 vikiawv
 Yannik Bloscheck
--- 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 – Turiningos kelionės – Vystoma bendruomenės
+Paprasta ir patogi navigacija – Turiningesnės 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 nedobičkonosnosti. 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 nepridobitnosti. CoMaps je izpeljanka OrganicMaps, ta pa je izpeljanka Maps.ME.

-Preverite si o razlogih za ta projekt in njegovi usmerjenosti na <b><i>codeberg.org/comaps</i></b>.
+Preberite 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 potocanja 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 potovanja 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, nedobičkonosno in popolnoma odprtokodno.</b>
+‣ <b>Odprto in transparentno odločanje in finance, nepridobitno in popolnoma odprtokodno.</b>

 <b>Glavne zmogljivosti</b>:
-• Prenosljivi podrobni zemljevidi s kraji, ki na Googlovoh zemljevidih niso na voljo.
+• Prenosljivi podrobni zemljevidi s kraji, ki na Googlovih 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 – Turiningos kelionės – Vystoma bendruomenės
+Paprasta ir patogi navigacija – Turiningesnės 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 zasebno
+CoMaps - Usmerjajte se zasebno
--- a/android/app/src/main/java/app/organicmaps/ChartController.java
+++ b/android/app/src/main/java/app/organicmaps/ChartController.java
@@ -28,6 +28,7 @@ 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
@@ -18,6 +18,7 @@ import android.location.Location;
 import android.os.Bundle;
 import android.text.TextUtils;
 import android.view.View;
+
 import androidx.activity.result.ActivityResultLauncher;
 import androidx.activity.result.contract.ActivityResultContracts;
 import androidx.annotation.CallSuper;
@@ -25,7 +26,15 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.annotation.StringRes;
 import androidx.core.view.ViewCompat;
+
+import com.google.android.material.button.MaterialButton;
+import com.google.android.material.checkbox.MaterialCheckBox;
+import com.google.android.material.dialog.MaterialAlertDialogBuilder;
+import com.google.android.material.progressindicator.LinearProgressIndicator;
+import com.google.android.material.textview.MaterialTextView;
+
 import app.organicmaps.base.BaseMwmFragmentActivity;
+import app.organicmaps.dialog.CustomMapServerDialog;
 import app.organicmaps.downloader.MapManagerHelper;
 import app.organicmaps.intent.Factory;
 import app.organicmaps.sdk.Framework;
@@ -38,11 +47,7 @@ import app.organicmaps.sdk.util.StringUtils;
 import app.organicmaps.util.UiUtils;
 import app.organicmaps.util.Utils;
 import app.organicmaps.util.WindowInsetUtils.PaddingInsetsListener;
-import com.google.android.material.button.MaterialButton;
-import com.google.android.material.checkbox.MaterialCheckBox;
-import com.google.android.material.dialog.MaterialAlertDialogBuilder;
-import com.google.android.material.progressindicator.LinearProgressIndicator;
-import com.google.android.material.textview.MaterialTextView;
+
 import java.util.List;
 import java.util.Objects;

@@ -54,6 +59,7 @@ public class DownloadResourcesLegacyActivity extends BaseMwmFragmentActivity
  private MaterialTextView mTvMessage;
  private LinearProgressIndicator mProgress;
  private MaterialButton mBtnDownload;
+  private MaterialButton mBtnAdvanced;
  private MaterialCheckBox mChbDownloadCountry;

  private String mCurrentCountry;
@@ -253,7 +259,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);
@@ -267,6 +273,14 @@ public class DownloadResourcesLegacyActivity extends BaseMwmFragmentActivity
    mProgress = findViewById(R.id.progressbar);
    mBtnDownload = findViewById(R.id.btn_download_resources);
    mChbDownloadCountry = findViewById(R.id.chb_download_country);
+    mBtnAdvanced = findViewById(R.id.btn_advanced);
+
+    mBtnAdvanced.setOnClickListener(v -> {
+      CustomMapServerDialog.show(this, url -> {
+        prepareFilesDownload(false);
+      });
+    });
+    mBtnAdvanced.setEnabled(true);

    mBtnListeners = new View.OnClickListener[BTN_COUNT];
    mBtnNames = new String[BTN_COUNT];
@@ -291,6 +305,11 @@ public class DownloadResourcesLegacyActivity extends BaseMwmFragmentActivity
  {
    mBtnDownload.setOnClickListener(mBtnListeners[action]);
    mBtnDownload.setText(mBtnNames[action]);
+
+    // Allow changing server only when idle or after an error.
+    boolean advancedEnabled = (action == DOWNLOAD || action == TRY_AGAIN || action == RESUME);
+    mBtnAdvanced.setEnabled(advancedEnabled);
+    mBtnAdvanced.setAlpha(advancedEnabled ? 1f : 0.5f);
  }

  private void doDownload()
@@ -359,6 +378,9 @@ public class DownloadResourcesLegacyActivity extends BaseMwmFragmentActivity

  private void finishFilesDownload(int result)
  {
+    mBtnAdvanced.setEnabled(true);
+    mBtnAdvanced.setAlpha(1f);
+
    if (result == ERR_NO_MORE_FILES)
    {
      // World and WorldCoasts has been downloaded, we should register maps again to correctly add them to the model.
@@ -372,7 +394,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 +446,21 @@ 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(RESUME))
+                           .setPositiveButton(R.string.try_again,
+                                              (dialog, which) -> {
+                                                setAction(TRY_AGAIN);
+                                                onTryAgainClicked();
+                                              })
+                           .setNegativeButton(R.string.cancel,
+                                              (dialog, which) -> {
+                                                setAction(RESUME);
+                                              })
+                           .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,9 +38,8 @@ 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,6 +17,7 @@ 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,6 +10,7 @@ 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,13 +282,11 @@ 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,6 +23,7 @@ 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;
@@ -457,12 +458,10 @@ 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,8 +85,7 @@ 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,7 +39,8 @@ 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();
@@ -58,13 +59,15 @@ 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);
  }
@@ -78,7 +81,8 @@ 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();
@@ -119,7 +123,8 @@ 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/CustomMapServerDialog.java
+++ b/android/app/src/main/java/app/organicmaps/dialog/CustomMapServerDialog.java
@@ -0,0 +1,86 @@
+package app.organicmaps.dialog;
+
+import android.content.Context;
+import android.content.DialogInterface;
+import android.content.SharedPreferences;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.widget.Button;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AlertDialog;
+import androidx.preference.PreferenceManager;
+
+import com.google.android.material.dialog.MaterialAlertDialogBuilder;
+import com.google.android.material.textfield.TextInputEditText;
+import com.google.android.material.textfield.TextInputLayout;
+
+import app.organicmaps.R;
+import app.organicmaps.sdk.Framework;
+
+public final class CustomMapServerDialog
+{
+  public interface OnUrlAppliedListener
+  {
+    void onUrlApplied(@NonNull String url);
+  }
+
+  private CustomMapServerDialog() {}
+
+  public static void show(@NonNull Context context,
+                          @Nullable OnUrlAppliedListener listener)
+  {
+    View dialogView = LayoutInflater.from(context)
+        .inflate(R.layout.dialog_custom_map_server, null);
+    TextInputLayout til = dialogView.findViewById(R.id.til_custom_map_server);
+    TextInputEditText edit = dialogView.findViewById(R.id.edit_custom_map_server);
+
+    SharedPreferences prefs =
+        PreferenceManager.getDefaultSharedPreferences(context);
+    String current = prefs.getString(context.getString(R.string.pref_custom_map_download_url), "");
+    edit.setText(current);
+
+    MaterialAlertDialogBuilder builder =
+        new MaterialAlertDialogBuilder(context, R.style.MwmTheme_AlertDialog)
+            .setTitle(R.string.download_resources_custom_url_title)
+            .setMessage(R.string.download_resources_custom_url_message)
+            .setView(dialogView)
+            .setNegativeButton(R.string.cancel, null)
+            .setPositiveButton(R.string.save, null);
+
+    AlertDialog dialog = builder.create();
+    dialog.setOnShowListener(dlg -> {
+      Button ok = dialog.getButton(DialogInterface.BUTTON_POSITIVE);
+      ok.setOnClickListener(v -> {
+        String url = edit.getText() != null ? edit.getText().toString().trim() : "";
+
+        if (!url.isEmpty()
+            && !url.startsWith("http://")
+            && !url.startsWith("https://"))
+        {
+          til.setError(context.getString(R.string.download_resources_custom_url_error_scheme));
+          return;
+        }
+
+        til.setError(null);
+
+        String normalizedUrl = Framework.normalizeServerUrl(url);
+
+        prefs.edit()
+            .putString(context.getString(R.string.pref_custom_map_download_url), normalizedUrl)
+            .apply();
+
+        // Apply to native
+        Framework.applyCustomMapDownloadUrl(context, normalizedUrl);
+
+        if (listener != null)
+          listener.onUrlApplied(normalizedUrl);
+
+        dialog.dismiss();
+      });
+    });
+
+    dialog.show();
+  }
+}
--- a/android/app/src/main/java/app/organicmaps/dialog/EditTextDialogFragment.java
+++ b/android/app/src/main/java/app/organicmaps/dialog/EditTextDialogFragment.java
@@ -125,8 +125,7 @@ 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,6 +4,7 @@ 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;
@@ -48,8 +49,7 @@ public class OnmapDownloader implements MwmActivity.LeftAnimationTrackListener
    @Override
    public void onStatusChanged(List<MapManager.StorageCallbackData> data)
    {
-      if (mCurrentCountry == null)
-      {
+      if (mCurrentCountry == null) {
        updateOfflineExplanationVisibility();
        return;
      }
@@ -109,13 +109,10 @@ 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,6 +15,7 @@ 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;
@@ -397,7 +398,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);

@@ -405,16 +406,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));
@@ -462,16 +463,13 @@ 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);
      }
    });
@@ -486,16 +484,13 @@ 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);
      }
    });
@@ -503,82 +498,74 @@ 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;
      }
-      else
-      {
-        layout.setError(null);
-        return true;
-      }
-    }
-    catch (NumberFormatException e)
-    {
+    } catch (NumberFormatException e) {
      layout.setError(getString(R.string.error_invalid_number));
      return false;
    }
@@ -598,8 +585,7 @@ 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]);
@@ -617,8 +603,7 @@ 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];

@@ -629,30 +614,27 @@ 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);
      }

@@ -661,8 +643,7 @@ 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);
    }

@@ -808,8 +789,9 @@ 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);

@@ -1041,15 +1023,14 @@ 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,6 +13,7 @@ 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;
@@ -68,7 +69,8 @@ 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);
    }
@@ -132,21 +134,26 @@ 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,16 +2,19 @@ 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
 {
@@ -29,11 +32,18 @@ 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();
@@ -41,8 +51,11 @@ 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();
@@ -87,12 +100,15 @@ 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;
@@ -106,10 +122,13 @@ 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)
@@ -118,7 +137,8 @@ public class FromToTimePicker
        finishTimePicking(false);
    });

-    timePicker.addOnPositiveButtonClickListener(view -> {
+    timePicker.addOnPositiveButtonClickListener(view ->
+    {
      saveState(timePicker, false);
      finishTimePicking(true);
    });
@@ -129,18 +149,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,6 +7,7 @@ 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;
@@ -121,14 +122,20 @@ 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
@@ -377,21 +384,26 @@ 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,30 +35,25 @@ 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,9 +5,11 @@ 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,6 +43,7 @@ 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;
@@ -122,9 +123,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,6 +12,9 @@ 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;
@@ -26,7 +29,6 @@ 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
 {
@@ -262,7 +264,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,10 +14,12 @@ 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,12 +10,14 @@ 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>
 {
@@ -150,8 +152,7 @@ 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);
@@ -168,18 +169,15 @@ 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,8 +273,7 @@ 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,13 +5,15 @@ 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,12 +8,14 @@ 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/settings/SettingsPrefsFragment.java
+++ b/android/app/src/main/java/app/organicmaps/settings/SettingsPrefsFragment.java
@@ -4,16 +4,23 @@ import static app.organicmaps.leftbutton.LeftButtonsHolder.DISABLE_BUTTON_CODE;

 import android.annotation.SuppressLint;
 import android.content.Intent;
+import android.content.SharedPreferences;
 import android.os.Bundle;
 import android.view.View;
+
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.preference.ListPreference;
 import androidx.preference.Preference;
 import androidx.preference.PreferenceCategory;
+import androidx.preference.PreferenceManager;
 import androidx.preference.TwoStatePreference;
+
+import com.google.android.material.dialog.MaterialAlertDialogBuilder;
+
 import app.organicmaps.MwmApplication;
 import app.organicmaps.R;
+import app.organicmaps.dialog.CustomMapServerDialog;
 import app.organicmaps.downloader.OnmapDownloader;
 import app.organicmaps.editor.LanguagesFragment;
 import app.organicmaps.editor.ProfileActivity;
@@ -35,7 +42,7 @@ import app.organicmaps.sdk.util.SharedPropertiesUtils;
 import app.organicmaps.sdk.util.log.LogsManager;
 import app.organicmaps.util.ThemeSwitcher;
 import app.organicmaps.util.Utils;
-import com.google.android.material.dialog.MaterialAlertDialogBuilder;
+
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
@@ -73,6 +80,7 @@ public class SettingsPrefsFragment extends BaseXmlSettingsFragment implements La
    initScreenSleepEnabledPrefsCallbacks();
    initShowOnLockScreenPrefsCallbacks();
    initLeftButtonPrefs();
+    initCustomMapDownloadUrlPrefsCallbacks();
  }

  private void initLeftButtonPrefs()
@@ -535,6 +543,34 @@ public class SettingsPrefsFragment extends BaseXmlSettingsFragment implements La
    });
  }

+  private void initCustomMapDownloadUrlPrefsCallbacks()
+  {
+    Preference customUrlPref = getPreference(getString(R.string.pref_custom_map_download_url));
+
+    SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(requireContext());
+
+    String current = prefs.getString(getString(R.string.pref_custom_map_download_url), "");
+    String normalizedUrl = Framework.normalizeServerUrl(current);
+
+    // Initial summary
+    customUrlPref.setSummary(normalizedUrl.isEmpty()
+        ? getString(R.string.download_resources_custom_url_summary_none)
+        : normalizedUrl);
+
+    // Sync native
+    Framework.applyCustomMapDownloadUrl(requireContext(), normalizedUrl);
+
+    // Show dialog
+    customUrlPref.setOnPreferenceClickListener(preference -> {
+      CustomMapServerDialog.show(requireContext(), url -> {
+        preference.setSummary(url.isEmpty()
+            ? getString(R.string.download_resources_custom_url_summary_none)
+            : url);
+      });
+      return true;
+    });
+  }
+
  private void removePreference(@NonNull String categoryKey, @NonNull Preference preference)
  {
    final PreferenceCategory category = getPreference(categoryKey);
--- 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 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;
-
-  // 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;
-
-  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)
-    {
-      mBorderPaint.setStrokeWidth(mBorderWidth);
-      mBorderPaint.setColor(mBorderColor);
-      canvas.drawCircle(cx, cy, mBorderRadius, mBorderPaint);
+    private float mBorderWidthRatio = 0.1f;
+    protected void setBorderWidthRatio(float ratio) {
+        mBorderWidthRatio = ratio;
    }

-    // 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))
-    {
-      performClick();
-      return true;
+    private float mBorderInsetRatio = 0f;
+    protected void setBorderInsetRatio(float ratio) {
+        mBorderInsetRatio = ratio;
    }
-    return false;
-  }

-  @Override
-  public boolean performClick()
-  {
-    super.performClick();
-    return false;
-  }
+    // colors
+    protected int mBackgroundColor;
+    protected int mBorderColor;
+    protected int mAlertColor;
+    protected int mTextColor;
+    protected int mTextAlertColor;

-  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);
-  }
+    // paints
+    protected final Paint mBackgroundPaint;
+    protected final Paint mBorderPaint;
+    protected final Paint 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)
+    // geometry
+    protected float mWidth;
+    protected float mHeight;
+    protected float mRadius;
+    protected float mBorderWidth;
+    protected float mBorderRadius;
+
+    public BaseSignView(Context ctx, @Nullable AttributeSet attrs)
    {
-      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;
+        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));
    }
-    mTextPaint.setTextSize(Math.max(1f, sz));
-  }

-  /** child must return the string to draw, or null if nothing */
-  @Nullable
-  protected abstract String getValueString();
+    protected void setColors(int backgroundColor,
+                             int borderColor,
+                             int alertColor,
+                             int textColor,
+                             int textAlertColor)
+    {
+        mBackgroundColor   = backgroundColor;
+        mBorderColor       = borderColor;
+        mAlertColor        = alertColor;
+        mTextColor         = textColor;
+        mTextAlertColor    = textAlertColor;

-  /** child decides if this is in “alert” state */
-  protected abstract boolean isAlert();
+        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)
+        {
+            mBorderPaint.setStrokeWidth(mBorderWidth);
+            mBorderPaint.setColor(mBorderColor);
+            canvas.drawCircle(cx, cy, mBorderRadius, mBorderPaint);
+        }
+
+        // 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))
+        {
+            performClick();
+            return true;
+        }
+        return false;
+    }
+
+    @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();
 }
--- a/android/app/src/main/java/app/organicmaps/widget/CurrentSpeedView.java
+++ b/android/app/src/main/java/app/organicmaps/widget/CurrentSpeedView.java
@@ -4,7 +4,9 @@ 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;

@@ -20,18 +22,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);
      }
    }
  }
@@ -45,7 +47,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();
@@ -68,8 +70,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,11 +12,13 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.annotation.StringRes;
 import androidx.core.content.ContextCompat;
-import app.organicmaps.R;
-import app.organicmaps.util.UiUtils;
+
 import com.google.android.material.imageview.ShapeableImageView;
 import com.google.android.material.textview.MaterialTextView;

+import app.organicmaps.R;
+import app.organicmaps.util.UiUtils;
+
 public class PlaceholderView extends LinearLayout
 {
  @SuppressWarnings("NullableProblems")
--- a/android/app/src/main/java/app/organicmaps/widget/SpeedLimitView.java
+++ b/android/app/src/main/java/app/organicmaps/widget/SpeedLimitView.java
@@ -5,14 +5,16 @@ 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;

@@ -25,22 +27,15 @@ 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())
      {
@@ -56,7 +51,7 @@ public class SpeedLimitView extends BaseSignView
    if (mSpeedLimit != limit)
    {
      mSpeedLimit = limit;
-      mSpeedStr = Integer.toString(limit);
+      mSpeedStr   = Integer.toString(limit);
      requestLayout();
    }
    mAlert = alert;
@@ -80,7 +75,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)
    {
@@ -110,7 +105,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
@@ -127,13 +122,14 @@ 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,8 +105,7 @@ 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);
  }
@@ -185,9 +184,10 @@ 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,6 +6,9 @@ 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;
@@ -14,7 +17,6 @@ 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,8 +14,7 @@ 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);
  }
@@ -30,13 +29,21 @@ 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,6 +31,7 @@ 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;
@@ -699,20 +700,27 @@ public class PlacePageView extends Fragment

      if (shouldEnableEditPlace)
      {
+        mTvEditPlace.setEnabled(true);
+        mTvAddPlace.setEnabled(true);
        mTvEditPlace.setOnClickListener(this);
        mTvAddPlace.setOnClickListener(this);
      }
      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); });
-
        String countryId = MapManager.nativeGetSelectedCountry();

-        if (countryId != null)
+        if (countryId != null && MapManager.nativeIsMapTooOldToEdit(countryId))
        {
+          // map editing is disabled because the map is too old
+          mTvEditPlace.setEnabled(true);
+          mTvAddPlace.setEnabled(true);
+          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);
+          });
+
          CountryItem map = CountryItem.fill(countryId);

          if (map.status == CountryItem.STATUS_UPDATABLE || map.status == CountryItem.STATUS_DONE
@@ -737,6 +745,12 @@ public class PlacePageView extends Fragment
              mapTooOldDescription.setText(R.string.place_page_app_too_old_description);
          }
        }
+        else
+        {
+          // map editing is disabled for other reasons
+          mTvEditPlace.setEnabled(false);
+          mTvAddPlace.setEnabled(false);
+        }
      }

      final int editButtonColor =
@@ -750,7 +764,9 @@ 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();
@@ -851,9 +867,10 @@ 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
@@ -879,12 +896,13 @@ 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
@@ -899,7 +917,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;
@@ -907,12 +925,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
    {
@@ -922,16 +940,18 @@ 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);
@@ -940,8 +960,9 @@ 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,7 +3,9 @@ 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,8 +31,7 @@ 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,13 +13,15 @@ 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>
@@ -94,8 +96,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);
@@ -106,8 +108,7 @@ 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,9 +191,8 @@ 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/bg_search_wheel_background_rect.xml
+++ b/android/app/src/main/res/drawable/bg_search_wheel_background_rect.xml
@@ -2,6 +2,6 @@
 <shape
  xmlns:android="http://schemas.android.com/apk/res/android"
  android:shape="rectangle">
-  <solid android:color="@color/bg_panel"/>
+  <solid android:color="@color/bg_window"/>
  <corners android:radius="100dp"/>
 </shape>
--- a/android/app/src/main/res/drawable/bg_search_wheel_background_round.xml
+++ b/android/app/src/main/res/drawable/bg_search_wheel_background_round.xml
@@ -2,5 +2,5 @@
 <shape
  xmlns:android="http://schemas.android.com/apk/res/android"
  android:shape="oval">
-  <solid android:color="@color/bg_panel"/>
+  <solid android:color="@color/bg_window"/>
 </shape>
--- a/android/app/src/main/res/drawable/ic_cloud_download.xml
+++ b/android/app/src/main/res/drawable/ic_cloud_download.xml
@@ -0,0 +1,11 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:tint="?colorControlNormal"
+    android:height="24dp"
+    android:width="24dp"
+    android:viewportHeight="960"
+    android:viewportWidth="960">
+      
+    <path android:fillColor="@android:color/white"
+        android:pathData="M260,800Q169,800 104.5,737Q40,674 40,583Q40,505 87,444Q134,383 210,366Q227,294 295,229Q363,164 440,164Q473,164 496.5,187.5Q520,211 520,244L520,486L584,424L640,480L480,640L320,480L376,424L440,486L440,244Q364,258 322,317.5Q280,377 280,440L260,440Q202,440 161,481Q120,522 120,580Q120,638 161,679Q202,720 260,720L740,720Q782,720 811,691Q840,662 840,620Q840,578 811,549Q782,520 740,520L680,520L680,440Q680,392 658,350.5Q636,309 600,280L600,187Q674,222 717,290.5Q760,359 760,440L760,440L760,440Q829,448 874.5,499.5Q920,551 920,620Q920,695 867.5,747.5Q815,800 740,800L260,800ZM480,442Q480,442 480,442Q480,442 480,442L480,442Q480,442 480,442Q480,442 480,442L480,442Q480,442 480,442Q480,442 480,442L480,442Q480,442 480,442Q480,442 480,442Q480,442 480,442Q480,442 480,442L480,442Q480,442 480,442Q480,442 480,442Q480,442 480,442Q480,442 480,442L480,442L480,442Q480,442 480,442Q480,442 480,442Z"/>
+    
+</vector>
--- 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="960"
-    android:viewportHeight="960">
+    android:viewportWidth="24"
+    android:viewportHeight="24">
  <path
-      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:pathData="M19,13H5v-2h14v2z"
      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="960"
-    android:viewportHeight="960">
+    android:viewportWidth="24"
+    android:viewportHeight="24">
  <path
-      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:pathData="M19,13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z"
      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
@@ -11,6 +11,18 @@
    android:layout_height="match_parent"
    android:layout_above="@+id/button_container"
    android:layout_gravity="center">
+    <com.google.android.material.button.MaterialButton
+        android:id="@+id/btn_advanced"
+        style="@style/Widget.Material3.Button.IconButton"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:icon="@drawable/ic_settings"
+        app:iconTint="?iconTint"
+        android:contentDescription="@string/download_resources_custom_url_title"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        android:layout_margin="@dimen/margin_half" />
+
    <LinearLayout
      android:layout_width="match_parent"
      android:layout_height="match_parent"
--- a/android/app/src/main/res/layout/dialog_custom_map_server.xml
+++ b/android/app/src/main/res/layout/dialog_custom_map_server.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<com.google.android.material.textfield.TextInputLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/til_custom_map_server"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:paddingStart="@dimen/margin_base"
+    android:paddingEnd="@dimen/margin_base"
+    android:paddingTop="@dimen/margin_base"
+    android:paddingBottom="@dimen/margin_half"
+    android:hint="@string/download_resources_custom_url_title"
+    app:placeholderText="@string/download_resources_custom_url_hint"
+    app:endIconMode="clear_text">
+
+  <com.google.android.material.textfield.TextInputEditText
+      android:id="@+id/edit_custom_map_server"
+      android:layout_width="match_parent"
+      android:layout_height="wrap_content"
+      android:inputType="textUri"
+      android:singleLine="true" />
+</com.google.android.material.textfield.TextInputLayout>
--- a/android/app/src/main/res/layout/dialog_missed_map.xml
+++ b/android/app/src/main/res/layout/dialog_missed_map.xml
@@ -24,7 +24,7 @@
    android:id="@+id/items_frame"
    android:layout_width="match_parent"
    android:layout_height="wrap_content"
-    android:background="?panel">
+    android:background="?windowBackgroundForced">
    <include
      layout="@layout/item_missed_map"
      android:layout_width="match_parent"
--- a/android/app/src/main/res/layout/dialog_missed_maps.xml
+++ b/android/app/src/main/res/layout/dialog_missed_maps.xml
@@ -26,7 +26,7 @@
    android:id="@+id/items_frame"
    android:layout_width="wrap_content"
    android:layout_height="wrap_content"
-    android:background="?panel"
+    android:background="?windowBackgroundForced"
    android:listSelector="?clickableBackground"
    android:drawSelectorOnTop="true"/>

--- a/android/app/src/main/res/layout/edit_bookmark_common.xml
+++ b/android/app/src/main/res/layout/edit_bookmark_common.xml
@@ -60,7 +60,7 @@
      android:layout_below="@id/tv__bookmark_set_title"
      android:layout_centerVertical="true"
      android:layout_marginEnd="@dimen/margin_quadruple"
-      android:background="?attr/selectableItemBackground"
+      android:background="?selectableItemBackground"
      android:clickable="true"
      android:paddingTop="@dimen/margin_quarter_plus"
      android:paddingBottom="@dimen/margin_half_plus"
--- a/android/app/src/main/res/layout/fragment_driving_options.xml
+++ b/android/app/src/main/res/layout/fragment_driving_options.xml
@@ -2,7 +2,7 @@
 <LinearLayout
  xmlns:android="http://schemas.android.com/apk/res/android"
  xmlns:app="http://schemas.android.com/apk/res-auto"
-  android:background="?attr/cardBackground"
+  android:background="?cardBackground"
  android:orientation="vertical"
  android:layout_width="match_parent"
  android:layout_height="match_parent">
@@ -11,7 +11,6 @@
    style="@style/MwmWidget.ToolbarStyle"
    android:layout_width="match_parent"
    android:layout_height="wrap_content"
-    android:background="?colorPrimary"
    android:gravity="end|center_vertical"
    android:theme="@style/MwmWidget.ToolbarTheme">
  </com.google.android.material.appbar.MaterialToolbar>
--- a/android/app/src/main/res/layout/fragment_edit_bookmark.xml
+++ b/android/app/src/main/res/layout/fragment_edit_bookmark.xml
@@ -18,7 +18,7 @@
        app:srcCompat="@drawable/ic_done"
        android:layout_width="?actionBarSize"
        android:layout_height="?actionBarSize"
-        android:background="?attr/selectableItemBackgroundBorderless"
+        android:background="?selectableItemBackgroundBorderless"
        android:layout_gravity="end|center_vertical"
        android:scaleType="centerInside"
        android:contentDescription="@string/save" />
--- a/android/app/src/main/res/layout/fragment_editor.xml
+++ b/android/app/src/main/res/layout/fragment_editor.xml
@@ -402,11 +402,13 @@
        <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"
@@ -416,6 +418,7 @@
              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_editor_host.xml
+++ b/android/app/src/main/res/layout/fragment_editor_host.xml
@@ -48,7 +48,6 @@
  <FrameLayout
    android:id="@+id/fragment_container"
    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="?panel"/>
+    android:layout_height="match_parent" />

 </LinearLayout>
--- a/android/app/src/main/res/layout/fragment_osm_profile.xml
+++ b/android/app/src/main/res/layout/fragment_osm_profile.xml
@@ -12,7 +12,6 @@
    style="@style/MwmWidget.ToolbarStyle"
    android:layout_width="match_parent"
    android:layout_height="wrap_content"
-    android:background="?colorPrimary"
    android:gravity="end|center_vertical"
    android:theme="@style/MwmWidget.ToolbarTheme">
    <com.google.android.material.imageview.ShapeableImageView
--- a/android/app/src/main/res/layout/fragment_report.xml
+++ b/android/app/src/main/res/layout/fragment_report.xml
@@ -22,8 +22,7 @@
  <ScrollView
    android:id="@+id/scrollView"
    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="?panel">
+    android:layout_height="match_parent">

    <LinearLayout
      android:layout_width="match_parent"
--- a/android/app/src/main/res/layout/fragment_search.xml
+++ b/android/app/src/main/res/layout/fragment_search.xml
@@ -15,7 +15,7 @@
      android:id="@+id/app_bar"
      android:layout_width="match_parent"
      android:layout_height="wrap_content"
-      android:background="?attr/colorPrimary"
+      android:background="?colorPrimary"
      android:elevation="@dimen/dp_0"
      app:elevation="@dimen/dp_0">
        <include
--- a/android/app/src/main/res/layout/manage_route_bottom_sheet.xml
+++ b/android/app/src/main/res/layout/manage_route_bottom_sheet.xml
@@ -45,7 +45,7 @@
    android:paddingStart="0dp"
    android:paddingEnd="@dimen/altitude_chart_container_padding_left">

-    <View
+    <com.google.android.material.divider.MaterialDivider
      android:layout_width="match_parent"
      android:layout_height="@dimen/divider_height"
      android:background="?dividerHorizontal"/>
--- 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:shapeAppearance="@style/Widget.MaterialComponents.FloatingActionButton"
-    android:layout_marginBottom="@dimen/margin_half"
+    app:shapeAppearanceOverlay="@style/ShapeAppearance.MapButton.Zoom.Minus"
+    android:layout_marginBottom="@dimen/margin_eighth"
    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:shapeAppearance="@style/Widget.MaterialComponents.FloatingActionButton"
+    app:shapeAppearanceOverlay="@style/ShapeAppearance.MapButton.Zoom.Plus"
    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
@@ -4,7 +4,7 @@
  xmlns:tools="http://schemas.android.com/tools"
  android:layout_width="match_parent"
  android:layout_height="wrap_content"
-  android:background="?panel"
+  android:background="?windowBackgroundForced"
  android:orientation="vertical">


--- a/android/app/src/main/res/layout/place_page_preview.xml
+++ b/android/app/src/main/res/layout/place_page_preview.xml
@@ -155,7 +155,7 @@
        android:layout_height="wrap_content"
        android:layout_marginTop="@dimen/margin_half_plus"
        android:layout_marginBottom="@dimen/margin_quarter"
-        android:background="?attr/selectableItemBackground"
+        android:background="?selectableItemBackground"
        android:gravity="center"
        android:orientation="horizontal"
        android:paddingStart="@dimen/margin_quarter"
--- a/android/app/src/main/res/layout/position_chooser.xml
+++ b/android/app/src/main/res/layout/position_chooser.xml
@@ -29,7 +29,7 @@
  <com.google.android.material.textview.MaterialTextView
    android:layout_width="match_parent"
    android:layout_height="wrap_content"
-    android:background="?panel"
+    android:background="?cardBackground"
    android:padding="@dimen/margin_base"
    android:text="@string/editor_focus_map_on_location"
    app:layout_constraintTop_toBottomOf="@+id/toolbar_point_chooser" />
--- a/android/app/src/main/res/layout/pp_buttons_fragment.xml
+++ b/android/app/src/main/res/layout/pp_buttons_fragment.xml
@@ -4,7 +4,7 @@
  android:id="@+id/pp_buttons_layout"
  android:layout_width="match_parent"
  android:layout_height="wrap_content"
-  android:background="?ppButtonsBackground"
+  android:background="?windowBackgroundForced"
  android:orientation="horizontal"
  android:layout_gravity="bottom">
  <include layout="@layout/item_divider" />
--- a/android/app/src/main/res/layout/routing_plan.xml
+++ b/android/app/src/main/res/layout/routing_plan.xml
@@ -28,7 +28,7 @@
            android:layout_width="?attr/actionBarSize"
            android:layout_height="?attr/actionBarSize"
            android:layout_alignParentStart="true"
-            android:background="?attr/selectableItemBackgroundBorderless"
+            android:background="?selectableItemBackgroundBorderless"
            app:srcCompat="?homeAsUpIndicator"
            android:scaleType="center"
            tools:src="@drawable/ic_expand_more" />
@@ -143,7 +143,7 @@
    android:id="@+id/driving_options_btn_container"
    android:layout_width="match_parent"
    android:layout_height="wrap_content"
-    android:background="?attr/drivingOptionsViewBg"
+    android:background="?drivingOptionsViewBg"
    android:foreground="@drawable/shadow_top"
    android:visibility="gone"
    tools:visibility="visible">
@@ -151,7 +151,7 @@
      android:id="@+id/driving_options_btn"
      android:layout_width="match_parent"
      android:layout_height="wrap_content"
-      android:background="?attr/selectableItemBackgroundBorderless"
+      android:background="?selectableItemBackgroundBorderless"
      android:gravity="center"
      android:minHeight="@dimen/height_block_base">
      <LinearLayout
--- a/android/app/src/main/res/layout/toolbar_search_controls.xml
+++ b/android/app/src/main/res/layout/toolbar_search_controls.xml
@@ -14,7 +14,7 @@
    android:id="@+id/back"
    android:layout_width="?attr/actionBarSize"
    android:layout_height="?attr/actionBarSize"
-    android:background="?attr/selectableItemBackgroundBorderless"
+    android:background="?selectableItemBackgroundBorderless"
    app:srcCompat="?homeAsUpIndicator"
    android:scaleType="center"
    tools:src="@drawable/ic_expand_more"
@@ -52,7 +52,7 @@
    android:layout_height="?actionBarSize"
    android:layout_gravity="center_vertical"
    android:layout_weight="0"
-    android:background="?attr/selectableItemBackgroundBorderless"
+    android:background="?selectableItemBackgroundBorderless"
    android:contentDescription="@string/clear_the_search"
    android:scaleType="center"
    app:srcCompat="@drawable/ic_close"/>
@@ -63,7 +63,7 @@
    android:layout_height="?actionBarSize"
    android:layout_gravity="center_vertical"
    android:layout_weight="0"
-    android:background="?attr/selectableItemBackgroundBorderless"
+    android:background="?selectableItemBackgroundBorderless"
    android:contentDescription="@null"
    android:scaleType="center"
    app:srcCompat="@drawable/ic_mic_white"
--- a/android/app/src/main/res/values-ca/strings.xml
+++ b/android/app/src/main/res/values-ca/strings.xml
@@ -912,4 +912,12 @@
    <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,4 +907,10 @@
    <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,4 +896,10 @@
    <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-de/strings.xml
+++ b/android/app/src/main/res/values-de/strings.xml
@@ -502,7 +502,7 @@
    <string name="placepage_edit_bookmark_button">Lesezeichen bearbeiten</string>
    <string name="placepage_personal_notes_hint">Persönliche Notizen (Text oder html)</string>
    <string name="editor_reset_edits_message">Alle lokalen Änderungen verwerfen?</string>
-    <string name="editor_reset_edits_button">Verwerfen</string>
+    <string name="editor_reset_edits_button">Änderungen verwerfen</string>
    <string name="editor_remove_place_message">Hinzugefügtes Objekt löschen?</string>
    <string name="editor_remove_place_button">Löschen</string>
    <string name="editor_place_doesnt_exist">Dieser Ort existiert nicht</string>
@@ -902,9 +902,17 @@
        <item quantity="other">%d min</item>
    </plurals>
    <string name="editor_business_vacant_button">Geschäft steht leer</string>
-    <string name="editor_mark_business_vacant_title">Geschäft als leerstehend markieren</string>
+    <string name="editor_mark_business_vacant_title">Geschäft auf leerstehend setzen</string>
    <string name="editor_submit">Absenden</string>
-    <string name="editor_mark_business_vacant_description">Wenn das Unternehmen ausgezogen ist und die Fläche leer und bereit für die nächste Miete ist.</string>
+    <string name="editor_mark_business_vacant_description">Verwenden Sie diese Option, wenn das Geschäft ausgezogen ist und ein neues Geschäft die leerstehenden Räume übernehmen könnte.</string>
    <string name="charge_socket_schuko">Schuko</string>
    <string name="power_management">Energiemanagement</string>
+    <string name="place_page_map_too_old_title">Kartendaten veraltet</string>
+    <string name="place_page_map_too_old_description">Die aktuellen Kartendaten sind sehr alt, bitte aktualisiere die Karte.</string>
+    <string name="place_page_app_too_old_description">Die aktuellen Kartendaten sind sehr alt, bitte aktualisiere die CoMaps-App.</string>
+    <string name="place_page_update_too_old_map">Kartenregion aktualisieren</string>
+    <string name="place_page_too_old_to_edit">OpenStreetMap-Bearbeitung ist deaktiviert, da die Kartendaten zu alt sind.</string>
+    <string name="prefs_speed_cameras_information">Blitzerwarnungen sind in Ländern deaktiviert, in denen Warnungen durch lokale Gesetze verboten sind.</string>
+    <string name="navigation_start_tts_message">"Navigation wird gestartet, Sprache der Sprachansagen: "</string>
+    <string name="navigation_start_tts_disabled_message">Sprachansagen deaktiviert: TTS-Engine nicht verfügbar</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 del grupo de marcadores</string>
+    <string name="bookmark_set_name">Nombre de la lista 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 el proyecto</string>
+    <string name="how_to_support_us">Apoya y mejora el proyecto CoMaps</string>
    <!-- Button in the main Help dialog -->
    <string name="copyright">Derechos de autor</string>
    <!-- Text in menu + Button in the main Help dialog -->
@@ -914,4 +914,12 @@
    <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,4 +905,10 @@
    <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,46 +25,46 @@
    <!-- 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>
+    <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="unsupported_phone">برنامه به OpenGL نیازمند است.شوربختانه، از دستگاه شما پشتیبانی نمی‌شود.</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="not_enough_free_space_on_sdcard">لطفا پیش از بکارگیری برنامه، نخست کمی جا در کارت SD/ویر USB آزاد کنید</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>
+    <string name="bookmarks">نشانگ‌ها</string>
    <!-- "Bookmarks and Tracks" dialog title, also sync it with iphone/plist.txt -->
    <string name="bookmarks_and_tracks">نشانه‌ها و مسیر ها</string>
    <!-- Add bookmark dialog - bookmark name -->
@@ -138,7 +138,7 @@
    <!-- Notes field in Bookmarks view -->
    <string name="description">یادداشت‌ها</string>
    <!-- message title of loading file -->
-    <string name="load_kmz_title">در حال بارگیری نشانه‌ها</string>
+    <string name="load_kmz_title">بارگذاری نشانگ‌ها</string>
    <!-- Kmz file successful loading -->
    <string name="load_kmz_successful">نشانه‌ها با موفقیت بارگذاری شد!شما می توانید آنها را در نقشه یا بخش مدیریت نشانه‌ها بیابید.</string>
    <!-- Kml file loading failed -->
@@ -778,10 +778,12 @@
    <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>
    <string name="backup_interval_manual_only">خاموش (تنها به شیوه دستی)</string>
    <string name="backup_interval_every_day">روزانه</string>
+    <string name="disconnect_usb_cable">برای بکارگیری CoMaps، لطفا USB را بگسلانید یا کارت‌ویر را اندرون گذارید.</string>
+    <string name="bookmark_set_name">نام پهرست نشانگ‌ها</string>
 </resources>
--- 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-muokkaimet tarkistavat muutokset ja ottavat sinuun yhteyttä, jos niillä on kysyttävää</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="navigation_stop_button">Lopeta</string>
    <!-- Shown as toast when starting the recent track recording -->
    <string name="track_recording">Reitin kirjaaminen</string>
@@ -903,4 +903,12 @@
    <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 goudronnées</string>
+    <string name="avoid_paved">Éviter les routes pavé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,4 +913,12 @@
    <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,4 +261,13 @@
    <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,4 +898,12 @@
    <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,4 +371,8 @@
    <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>
+    <string name="downloader_no_space_title">Nyns eus lowr dalghuster</string>
+    <string name="translated_om_site_url">https://comaps.app/</string>
 </resources>
--- a/android/app/src/main/res/values-lv/strings.xml
+++ b/android/app/src/main/res/values-lv/strings.xml
@@ -845,4 +845,10 @@
    <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
@@ -503,7 +503,7 @@
    <string name="placepage_edit_bookmark_button">Rediger bokmerke</string>
    <string name="placepage_personal_notes_hint">Personlige notater (tekst eller html)</string>
    <string name="editor_reset_edits_message">Forkaste alle lokale endringer?</string>
-    <string name="editor_reset_edits_button">Forkast</string>
+    <string name="editor_reset_edits_button">Forkast endringer</string>
    <string name="editor_remove_place_message">Slette tillagt sted?</string>
    <string name="editor_remove_place_button">Slett</string>
    <string name="editor_place_doesnt_exist">Sted finnes ikke</string>
@@ -899,4 +899,17 @@
    <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>
+    <string name="advanced">Avansert</string>
+    <string name="download_resources_custom_url_summary_none">Ikke angitt</string>
+    <string name="download_resources_custom_url_error_scheme">Angi en fullstendig nettadresse som starter med https:// og slutter med /</string>
+    <string name="download_resources_custom_url_hint">https://cdn-fi-1.comaps.app/</string>
+    <string name="download_resources_custom_url_message">Overstyr standardserveren som brukes til nedlasting av kart. La det stå tomt for å bruke CoMaps standardserver.</string>
+    <string name="download_resources_custom_url_title">Tilpasset kartserver</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,6 @@
    <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="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="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,4 +910,9 @@
    <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,4 +885,12 @@
    <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,4 +901,18 @@
    <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>
+    <string name="advanced">Avançadas</string>
+    <string name="download_resources_custom_url_title">Servidor de Mapa Personalizado</string>
+    <string name="download_resources_custom_url_message">Substitui o servidor de download de mapas normal. Deixe em branco para usar o servidor do CoMaps padrão.</string>
+    <string name="download_resources_custom_url_hint">https://cdn-fi-1.comaps.app/</string>
+    <string name="download_resources_custom_url_summary_none">Indefinido</string>
+    <string name="download_resources_custom_url_error_scheme">Por favor insira um URL inteiro começando com https:// e acabando com /</string>
 </resources>
--- a/android/app/src/main/res/values-ro/strings.xml
+++ b/android/app/src/main/res/values-ro/strings.xml
@@ -277,7 +277,7 @@
    <!-- Preference title -->
    <string name="google_play_services">Serviciul de Localizare Fuzionat Google</string>
    <!-- Preference text -->
-    <string name="pref_use_google_play">Un serviciu proprietar care combină GPS, Wi-Fi, rețelele celulare etc. pentru a-ți determina locația mai precisă. Se poate conecta la serverele Google.</string>
+    <string name="pref_use_google_play">Un serviciu proprietar care combină GPS, Wi-Fi, rețelele celulare etc. pentru a-ți determina locația mai precis. Se poate conecta la serverele Google.</string>
    <!-- Preference title -->
    <!-- Preference description -->
    <!-- Text for routing error dialog -->
@@ -460,7 +460,7 @@
    <string name="osm_presentation">Date OpenStreetMap create de comunitate la data de %s. Aflați mai multe despre cum să editați și să actualizați harta la OpenStreetMap.org</string>
    <!-- OSM explanation on Android login screen -->
    <string name="login_osm_presentation">OpenStreetMap.org (OSM) este un proiect comunitar pentru construirea unei hărți libere și deschise. Este principala sursă de date cartografice în CoMaps și funcționează similar cu Wikipedia. Puteți adăuga sau edita locuri, iar acestea devin disponibile pentru milioane de utilizatori din întreaga lume. \nAlăturați-vă comunității și ajutați la crearea unei hărți mai bune pentru toată lumea!</string>
-    <string name="login_to_make_edits_visible">Creați un cont OpenStreetMap sau conectați-vă pentru a vă publica edițiile de hartă în întreaga lume</string>
+    <string name="login_to_make_edits_visible">Creați un cont OpenStreetMap sau conectați-vă pentru a vă publica editările hărții pentru întreaga lume</string>
    <!-- Downloaded 10 **of** 20 <- it is that "of" -->
    <string name="downloader_of">%1$d din %2$d</string>
    <string name="download_over_mobile_header">Vrei să descarci prin rețeaua de telefonie mobilă?</string>
@@ -475,7 +475,7 @@
    <!-- Hint of the input field in the OSM note section of the editor -->
    <string name="editor_note_hint">Descrieți erorile de pe hartă sau lucrurile care nu pot fi editate cu CoMaps</string>
    <!-- Information about OSM at the top of the editing page -->
-    <string name="editor_about_osm">Edițiile dvs. sunt încărcate în baza de date publică <a href="https://wiki.openstreetmap.org/wiki/About_OpenStreetMap">OpenStreetMap</a>. Vă rugăm să nu adăugați informații personale sau protejate prin drepturi de autor.</string>
+    <string name="editor_about_osm">Editările dvs. sunt încărcate în baza de date publică <a href="https://wiki.openstreetmap.org/wiki/About_OpenStreetMap">OpenStreetMap</a>. Vă rugăm să nu adăugați informații personale sau protejate prin drepturi de autor.</string>
    <string name="editor_more_about_osm">Mai multe despre OpenStreetMap</string>
    <string name="editor_osm_history">Istoricul dvs. de editare</string>
    <string name="editor_osm_notes">Note privind datele hărții dvs</string>
@@ -889,4 +889,13 @@
    <string name="list_description_empty">Editează lista ca să adaugi o descriere</string>
    <string name="charging_station_available_sockets">Conectori</string>
    <string name="charge_socket_unknown_other">Alte tipuri necunoscute</string>
+    <string name="place_page_map_too_old_title">Harta este prea veche</string>
+    <string name="place_page_map_too_old_description">Harta dvs. este foarte veche, vă rugăm actualizați-o.</string>
+    <string name="place_page_app_too_old_description">Harta dvs. este foarte veche, vă rugăm actualizați CoMaps.</string>
+    <string name="place_page_update_too_old_map">Actualizează harta</string>
+    <string name="place_page_too_old_to_edit">Editarea OpenStreetMap este dezactivată pentru că harta descărcată este prea veche.</string>
+    <string name="prefs_speed_cameras_information">Avertizările pentru radare sunt dezactivate unde avertizarea este interzisă de legea locală.</string>
+    <string name="navigation_start_tts_disabled_message">Instrucțiuni vocale dezactivate: Nu este disponibil niciun sistem TTS</string>
+    <string name="charge_socket_count">Număr</string>
+    <string name="unknown_count">Necunoscut</string>
 </resources>
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Jean-Baptiste	60b1ad232a	[android] Clean background color in views Signed-off-by: Jean-Baptiste <jeanbaptiste.charron@outlook.fr>	2025-12-18 21:31:25 +01:00
Jean-Baptiste	1bac0fd4fc	[search] Improve search terms in french Signed-off-by: Jean-Baptiste <jeanbaptiste.charron@outlook.fr>	2025-12-18 20:35:30 +01:00
Codeberg Translate	ed6dcc5cb2	[strings] Update from Codeberg Translate Co-authored-by: Codeberg Translate <translate@codeberg.org> Co-authored-by: JanezPavelZebovec <janezpavelzebovec@noreply.codeberg.org> Co-authored-by: N4ta <codeberg@n4ta.anonaddy.me> Co-authored-by: Prefill add-on <noreply-addon-prefill@weblate.org> Co-authored-by: Priit Jõerüüt <jrtcdbrg@noreply.codeberg.org> Co-authored-by: Stephan-P <stephan-p@noreply.codeberg.org> Co-authored-by: Stzyxh <stzyxh@noreply.codeberg.org> Co-authored-by: Weblate <noreply-mt-weblate@weblate.org> Co-authored-by: Weblate Translation Memory <noreply-mt-weblate-translation-memory@weblate.org> Co-authored-by: aoxa <aoxa@noreply.codeberg.org> Co-authored-by: dobridabar <dobridabar@noreply.codeberg.org> Co-authored-by: map-per <map-per@noreply.codeberg.org> Co-authored-by: metehan <metehan@noreply.codeberg.org> Co-authored-by: ovl-005 <ovl-005@noreply.codeberg.org> Co-authored-by: patepelo <patepelo@noreply.codeberg.org> Co-authored-by: teletext <teletext@noreply.codeberg.org> Translate-URL: https://translate.codeberg.org/projects/comaps/android-typestrings/ Translate-URL: https://translate.codeberg.org/projects/comaps/ios-typestrings/ Translation: CoMaps/Android - Map Feature Types Translation: CoMaps/Android UI Strings Translation: CoMaps/Apple AppStore description Translation: CoMaps/Countries and regions names Translation: CoMaps/Voice announcements for navigation (TTS) Translation: CoMaps/iOS - Map Feature Types Translation: CoMaps/iOS UI Strings	2025-12-18 14:24:02 +00:00
Jean-Baptiste	33b440dd71	[android] Remove custom attrs fonts styles Signed-off-by: Jean-Baptiste <jeanbaptiste.charron@outlook.fr>	2025-12-18 15:23:52 +01:00
map-per	6a20269819	[editor] Rename button to 'Discard changes' Signed-off-by: map-per <map-per@gmx.de>	2025-12-18 11:52:47 +01:00
NoelClick	8cd1b41cd2	[android] Update connection failure dialog cancellation behavior - Update the connection failure dialog in the world download view based on reviewers' feedback. Signed-off-by: NoelClick <dev@noel.click>	2025-12-18 09:41:55 +01:00
NoelClick	2b630964d0	[android] Unify custom map server dialog logic and UI - Add setting icon for custom map server download option. - Extract shared custom map server dialog helper. - Clean up based on reviewers' feedback. Signed-off-by: NoelClick <dev@noel.click>	2025-12-18 09:41:55 +01:00
NoelClick	76ecd8209e	[android] Improve custom map server dialog UX Signed-off-by: NoelClick <dev@noel.click>	2025-12-18 09:41:55 +01:00
NoelClick	82d2932ba0	[android] Add validation for custom map download URL - Add validation for custom map download URL. - Re-enable advanced server button after failed or paused downloads. Signed-off-by: NoelClick <dev@noel.click>	2025-12-18 09:41:55 +01:00
NoelClick	85540133b3	[android] Clarify custom map download URL strings Signed-off-by: NoelClick <dev@noel.click>	2025-12-18 09:41:55 +01:00
NoelClick	6ded75de9c	[core] Treat custom map download URL as CDN base, not meta server - Update `MapFilesDownloader::LoadMetaConfig()` to skip the metaserver when a custom base URL is set and build MetaConfig with that URL as the only server. - Keep the existing metaserver-based behavior when no custom base URL is set. Signed-off-by: NoelClick <dev@noel.click>	2025-12-18 09:41:55 +01:00
NoelClick	08e8ebd434	[android] Add custom world map download URL option - Allow setting a custom map download URL in the "world-download" screen. Signed-off-by: NoelClick <dev@noel.click>	2025-12-18 09:41:55 +01:00
NoelClick	6c92264fb0	[android] Add custom map download URL setting Signed-off-by: NoelClick <dev@noel.click>	2025-12-18 09:41:55 +01:00
NoelClick	4ba0fc51a5	[android] Make it possible to set a custom map download URL Signed-off-by: NoelClick <dev@noel.click>	2025-12-18 09:41:55 +01:00
NoelClick	29c363a581	[core] Allow overriding map metaserver URL and reset downloader cache - Add custom meta server API. - Implement override. - Add reset hook and implement reset. - Expose reset from Storage. - Let JNI set URL and reset cache. Signed-off-by: NoelClick <dev@noel.click>	2025-12-18 09:41:55 +01:00
map-per	4973f4fed2	[editor] Lower priority for building in changeset comments Signed-off-by: map-per <map-per@gmx.de>	2025-12-18 07:53:52 +01:00
map-per	8cffa508f3	[android] Use separate function to check for MapTooOldToEdit Signed-off-by: map-per <map-per@gmx.de>	2025-12-17 21:07:12 +01:00
map-per	3511dbb692	[android] Adjust margin in editor layout Signed-off-by: map-per <map-per@gmx.de>	2025-12-16 21:35:31 +01:00
Codeberg Translate	e238a317f1	[strings] Update from Codeberg Translate Co-authored-by: Codeberg Translate <translate@codeberg.org> Co-authored-by: ERYpTION <eryption@noreply.codeberg.org> Co-authored-by: Edgarsons <edgarsons@noreply.codeberg.org> Co-authored-by: Fjuro <fjuro@alius.cz> Co-authored-by: JanezPavelZebovec <janezpavelzebovec@noreply.codeberg.org> Co-authored-by: Juno Takano <jutty@noreply.codeberg.org> Co-authored-by: Mickael81 <mickael81@noreply.codeberg.org> Co-authored-by: N4ta <codeberg@n4ta.anonaddy.me> Co-authored-by: Outbreak2096 <outbreak2096@noreply.codeberg.org> Co-authored-by: Prefill add-on <noreply-addon-prefill@weblate.org> Co-authored-by: Priit Jõerüüt <jrtcdbrg@noreply.codeberg.org> Co-authored-by: Stephan-P <stephan-p@noreply.codeberg.org> Co-authored-by: Weblate Translation Memory <noreply-mt-weblate-translation-memory@weblate.org> Co-authored-by: aoxa <aoxa@noreply.codeberg.org> Co-authored-by: arnyminerz <arnyminerz@noreply.codeberg.org> Co-authored-by: artnay <artnay@noreply.codeberg.org> Co-authored-by: cirilla <cirilla@noreply.codeberg.org> Co-authored-by: demode <demode@noreply.codeberg.org> Co-authored-by: gimse <gimse@noreply.codeberg.org> Co-authored-by: jeanbaptisteC <jeanbaptistec@noreply.codeberg.org> Co-authored-by: ldmpub <ldmpub@noreply.codeberg.org> Co-authored-by: loscati <loscati@noreply.codeberg.org> Co-authored-by: ma12vlad <ma12vlad@noreply.codeberg.org> Co-authored-by: mnalis <mnalis@noreply.codeberg.org> Co-authored-by: ovl-005 <ovl-005@noreply.codeberg.org> Co-authored-by: patepelo <patepelo@noreply.codeberg.org> Co-authored-by: rimas <rimas@noreply.codeberg.org> Translate-URL: https://translate.codeberg.org/projects/comaps/android-typestrings/ Translate-URL: https://translate.codeberg.org/projects/comaps/ios-typestrings/ Translation: CoMaps/Android - Map Feature Types Translation: CoMaps/Android UI Strings Translation: CoMaps/Countries and regions names Translation: CoMaps/F-Droid app description Translation: CoMaps/Google Play and Huawei AppGallery descriptions Translation: CoMaps/Voice announcements for navigation (TTS) Translation: CoMaps/iOS - Map Feature Types Translation: CoMaps/iOS UI Strings	2025-12-16 18:10:27 +00:00
x7z4w	2e85899fcb	[search] Add synonym Signed-off-by: x7z4w <x7z4w@noreply.codeberg.org>	2025-12-16 12:48:48 +01:00
pablogila	ce978d8ede	[styles] Add `amenity=hydrant` Signed-off-by: pablogila <pablo.gila.herranz@gmail.com> Co-authored-by: pablogila <pablo.gila.herranz@gmail.com> Co-committed-by: pablogila <pablo.gila.herranz@gmail.com>	2025-12-16 10:40:18 +01:00
thesupertechie	d56f9700f5	[tts] [routing] further revert out-of-scope changes Signed-off-by: thesupertechie <thesupertechie1@gmail.com>	2025-12-16 07:27:59 +01:00
thesupertechie	cc042c3d1c	[tts] [routing] revert out-of-scope changes Signed-off-by: thesupertechie <thesupertechie1@gmail.com>	2025-12-16 07:27:59 +01:00
thesupertechie	4f739d98b0	[tts] Change notification to 400-700 m Signed-off-by: thesupertechie <thesupertechie1@gmail.com>	2025-12-16 07:27:59 +01:00
Dobri Dabar	4691de7a66	[desktop] Display type names Signed-off-by: Dobri Dabar <dobridabar@noreply.codeberg.org> Co-authored-by: Dobri Dabar <dobridabar@noreply.codeberg.org> Co-committed-by: Dobri Dabar <dobridabar@noreply.codeberg.org>	2025-12-15 19:36:29 +01:00
Jean-Baptiste	3c082b0629	[android] Rework shape of zoom buttons Signed-off-by: Jean-Baptiste <jeanbaptiste.charron@outlook.fr>	2025-12-15 18:59:54 +01:00
Jean-Baptiste	a468bd3fab	[docs] Update docs and funding config Signed-off-by: Jean-Baptiste <jeanbaptiste.charron@outlook.fr>	2025-12-15 13:09:27 +01:00
x7z4w	fc87316184	[search] Fix apartment blocks search Signed-off-by: x7z4w <x7z4w@noreply.codeberg.org>	2025-12-14 20:52:17 +00:00