[carplay] Use system buttons for better appearance

Signed-off-by: eisa01 <eisa01@gmail.com>
make sure to use the correct myPositionMode terminology
2025-12-24 15:03:47 +00:00 · 2025-11-15 17:57:23 +01:00 · 2025-11-15 17:57:22 +01:00 · 2025-11-15 17:57:22 +01:00 · 2025-11-15 17:57:22 +01:00 · 2025-11-15 17:57:22 +01:00
402 changed files with 5175 additions and 7835 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -88,6 +88,11 @@ else()
  add_compile_options(-ffast-math $<$<CXX_COMPILER_ID:GNU>:-Wno-psabi>)
 endif()

+# Needed for std::execution::par
+if (CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
+  add_compile_options(-fexperimental-library)
+endif()
+
 if (PLATFORM_WIN)
  add_definitions(
    -DWIN32_LEAN_AND_MEAN
@@ -222,11 +227,6 @@ if (PLATFORM_DESKTOP AND NOT WITH_SYSTEM_PROVIDED_3PARTY)
  include_directories("${PROJECT_BINARY_DIR}/3party/gflags/include")
 endif()

-# Android fails to find boost in many cases, this fixes it.
-if (PLATFORM_ANDROID)
-  include_directories("${OMIM_ROOT}/3party/boost")
-endif()
-
 # Used in qt/ and shaders/
 find_package(Python3 REQUIRED COMPONENTS Interpreter)

--- a/android/app/src/fdroid/play/listings/da-DK/full-description.txt
+++ b/android/app/src/fdroid/play/listings/da-DK/full-description.txt
@@ -1,33 +0,0 @@
-En fællesskabdrevet og åben source kortapp, baseret på kortdata fra OpenStreetMap og styrket i forpligtelsen til værdierne gennemsigtighed, privatlivets fred, og non-profit. CoMaps udspringer af Organic Maps, som selv udsprang af Maps.ME.
-
-Læs mere om grundlaget for projektet og dets udviklingsretnign på <b><i>codeberg.org/comaps</i></b>.
-Slut dig til fælleskabet og hjælp til med at bygge den bedste kortapp i verden.
-• Brug appen og fortæl andre om den
-• Giv feedback anmeld fejl
-• Opdater kortdata i appen eller på OpenStreetMap-hjemmesiden.
-
-‣ <b>Offlinefokuseret</b>: Planlæg din rute og find vej i udlandet uden brug af mobildata, søg og find afsidesliggende mål på en afsidesliggende vandretur, mm. Alle funktioner er designet til at fungere uden internetforbindelse.
-‣ <b>Respekt for privatlivets fred</b>: Appen er designet med henblik på at respektere dit privatliv – den identificerer dig ikke, indeholder ingen sporingsmekanismer, og insamler ingen personlig information. Appen er reklamefri.
-‣ <b>Enkel og elegant</b>: de essentielle funktioner er nemme at bruge, og de virker bare.
-‣ <b>Sparer på batteriet og på lagerpladsen</b>: Dræner ikke dit batteri hurtigt, som andre kortapps. De kompakte kortfiler minimerer varigt lagerpladsforbrug.
-‣ <b>Gratis og bygget i fællesskab</b>: Folk som dig har hjulpet med denne app ved at tilføje steder til OpenStreetMap, ved at teste appens funktioner og give feedback på dem og ved at bidrage til udviklingen af appen med deres tid og penge.
-‣ <b>Åben og gennemsigtig beslutningstagningsproces og finanser, non-profit, og fuldt ud åben source.</b>
-
-<b>Hovedfunktioner</b>
-• Hent detaljerede kort, der indeholder steder som ikke findes i mange kommericelle kort.
-• En frilufts-tilstand med markede vandrestier, teltpladser, kilder, bjerg- og bakketoppe, højdekonturlinjer, mm.
-• Gangstier og cykelstier
-• Steder, der kan besøges, som f.eks. restauranter, tankstationer, hoteller, butikker, seværdigheder og mange andre.
-• Søg efter stednavn, adresse, eller type af sted.
-• Gem dine yndlingssteder som bogmærker med et enkelt tryk. 
-• iCloud synkronisering af bogmærker og optagede spor.
-• Offline artikler fra Wikipedia.
-• Metro-lag med navigation.
-• Optagelse af spor.
-• Eksport og import af bogmærker og spor i formaterne KML, KMZ og GPX.
-• Mørk tilstand til brug om natten.
-• Mulighed for at forbedre kortet vha. en indbygget editor.
-• CarPlay understøttes.
-
-<b>Friheden er ankommet</b>
-Opdag din rejse, find vej i verden med privatliv og fællesskab i førersædet!
--- a/android/app/src/fdroid/play/listings/de-DE/release-notes.txt
+++ b/android/app/src/fdroid/play/listings/de-DE/release-notes.txt
@@ -0,0 +1,8 @@
+• OpenStreetMap-Daten vom 4. November
+• Aktualisierte Karten-Icons, inkl. Farben für Unterhaltungs-, Sport- & andere Unternehmen
+• Informationen zu Steckdosen an EV-Ladestationen
+• Symbole für Sportzentren, Veranstaltungsorte, Massagesalons, Gästehäuser und einige stillgelegte Unternehmen
+• Verbesserungen bei der Suche
+• Behebung eines Absturzes bei der Suche
+• Verbesserte Sprachführung während der Navigation
+Weitere Änderungen finden in unseren Codeberg-Versionshinweisen!
--- a/android/app/src/fdroid/play/listings/en-US/graphics/phone-screenshots/1.png
+++ b/android/app/src/fdroid/play/listings/en-US/graphics/phone-screenshots/1.png
--- a/android/app/src/fdroid/play/listings/en-US/graphics/phone-screenshots/2.png
+++ b/android/app/src/fdroid/play/listings/en-US/graphics/phone-screenshots/2.png
--- a/android/app/src/fdroid/play/listings/en-US/graphics/phone-screenshots/3.png
+++ b/android/app/src/fdroid/play/listings/en-US/graphics/phone-screenshots/3.png
--- a/android/app/src/fdroid/play/listings/en-US/graphics/phone-screenshots/4.png
+++ b/android/app/src/fdroid/play/listings/en-US/graphics/phone-screenshots/4.png
--- a/android/app/src/fdroid/play/listings/en-US/graphics/phone-screenshots/5.png
+++ b/android/app/src/fdroid/play/listings/en-US/graphics/phone-screenshots/5.png
--- a/android/app/src/fdroid/play/listings/en-US/graphics/phone-screenshots/6.png
+++ b/android/app/src/fdroid/play/listings/en-US/graphics/phone-screenshots/6.png
--- a/android/app/src/fdroid/play/listings/en-US/release-notes.txt
+++ b/android/app/src/fdroid/play/listings/en-US/release-notes.txt
@@ -1,13 +1,8 @@
-• Fixed voice directions pronouncing weird symbols in the beginning
-• OpenStreetMap data as of November 23
-
-Changes in the previous release:
-• Added trees
-• Made bus stop icons smaller and show up earlier
-• Reduce visibility of entrances
-• Added several other POI types
-• Show sand areas on the map
-• Add business is vacant option to the OSM editor
-• Improved road shields in Europe
-• Avoid paved roads routing option
-• Added icons to the settings page
+• OpenStreetMap data as of November 4
+• Recategorized map icons including some new colors for entertainment, sports and other businesses
+• Display info about available sockets on charging stations
+• Added bandstands, backless benches and loungers
+• New icons for different sport centres, event venues, massage salons, guest houses and some disused businesses
+• Multiple search improvements and crash fix
+• Improved voice guidance during navigation
+Check our Codeberg release notes for more changes!
--- a/android/app/src/fdroid/play/listings/es-ES/release-notes.txt
+++ b/android/app/src/fdroid/play/listings/es-ES/release-notes.txt
@@ -0,0 +1,7 @@
+• Datos OSM del 04/11
+• Iconos del mapa recategorizados, incluyendo nuevos colores
+• Visualización de información sobre enchufes disponibles en estaciones de recarga
+• Adición de iconos para diferentes centros deportivos, lugares de eventos, salones de masajes, posadas y algunos establecimientos comerciales desactivados
+• Varias mejoras y correcciones de errores en la búsqueda
+• Mejora en la orientación por voz durante la navegación
+Más detalles en Codeberg
--- a/android/app/src/fdroid/play/listings/fr-FR/graphics/phone-screenshots/1.png
+++ b/android/app/src/fdroid/play/listings/fr-FR/graphics/phone-screenshots/1.png
--- a/android/app/src/fdroid/play/listings/fr-FR/graphics/phone-screenshots/2.png
+++ b/android/app/src/fdroid/play/listings/fr-FR/graphics/phone-screenshots/2.png
--- a/android/app/src/fdroid/play/listings/fr-FR/graphics/phone-screenshots/3.png
+++ b/android/app/src/fdroid/play/listings/fr-FR/graphics/phone-screenshots/3.png
--- a/android/app/src/fdroid/play/listings/fr-FR/graphics/phone-screenshots/4.png
+++ b/android/app/src/fdroid/play/listings/fr-FR/graphics/phone-screenshots/4.png
--- a/android/app/src/fdroid/play/listings/fr-FR/graphics/phone-screenshots/5.png
+++ b/android/app/src/fdroid/play/listings/fr-FR/graphics/phone-screenshots/5.png
--- a/android/app/src/fdroid/play/listings/fr-FR/graphics/phone-screenshots/6.png
+++ b/android/app/src/fdroid/play/listings/fr-FR/graphics/phone-screenshots/6.png
--- a/android/app/src/fdroid/play/listings/fr-FR/release-notes.txt
+++ b/android/app/src/fdroid/play/listings/fr-FR/release-notes.txt
@@ -0,0 +1,8 @@
+• Données OpenStreetMap au 4 novembre
+• Recatégorisation des icônes sur la carte avec ajout de nouvelles couleurs pour certains types de lieux
+• Affichage des prises sur les bornes électriques
+• Ajout d'icônes pour les centres sportifs, salles d'événements, salon de massage et autres lieux
+• Multiple améliorations dans la recherche
+• Correction d'un plantage dans la recherche
+• Amélioration de la synthèse vocale durant la navigation
+Plus d'informations sur notre Codeberg
--- a/android/app/src/fdroid/play/listings/pt-BR/release-notes.txt
+++ b/android/app/src/fdroid/play/listings/pt-BR/release-notes.txt
@@ -0,0 +1,7 @@
+• Dados OSM de 04/11
+• Ícones do mapa recategorizados, incluindo novas cores
+• Exibição de informações sobre tomadas disponíveis em eletropostos
+• Adição de ícones para diferentes centros esportivos, locais de eventos, salões de massagem, pousadas e alguns estabelecimentos comerciais desativados
+• Diversas melhorias e correção de erro na busca
+• Melhoria na orientação por voz durante a navegação
+Confira nossas notas de lançamento no Codeberg para mais detalhes!
--- a/android/app/src/fdroid/play/listings/ru-RU/release-notes.txt
+++ b/android/app/src/fdroid/play/listings/ru-RU/release-notes.txt
@@ -0,0 +1,8 @@
+• Карты OpenStreetMap от 4 ноября
+• Обновлены цвета иконок на карте, добавлены новые цвета для развлечений, спорта, некоторых бизнесов
+• На зарядных станциях показываются имеющиеся типы разъёмов
+• Добавлены эстрады, скамейки без спинок и лежаки
+• Новые иконки для разных спорт центров, массажных салонов, гостевых домов, некоторых закрытых бизнесов
+• Несколько улучшений и исправлений в поиске
+• Улучшены голосовые подсказки при навигации
+Подробнее смотрите на codeberg.org/comaps/comaps/releases
--- a/android/app/src/fdroid/play/listings/ta-IN/short-description.txt
+++ b/android/app/src/fdroid/play/listings/ta-IN/short-description.txt
@@ -1 +1 @@
-எளிய வழிகாட்டி - பயணத்தை மேலும் சுவாரசியமாக்க - சமூகத்தால் இயக்கப்படுகிறது
+எளிதான வரைபட வழிசெல் - உங்கள் பயணத்தை மேலும் கண்டறி - சமூகத்தால் இயக்கப்படுகிறது
--- a/android/app/src/fdroid/play/version.yaml
+++ b/android/app/src/fdroid/play/version.yaml
@@ -1 +1 @@
-version: 2025.11.25-4-FDroid+25112504
+version: 2025.03.02-7-FDroid+25030207
--- a/android/app/src/google/play/listings/ta-IN/short-description.txt
+++ b/android/app/src/google/play/listings/ta-IN/short-description.txt
@@ -1 +1 @@
-எளிய வழிகாட்டி - பயணத்தை மேலும் சுவாரசியமாக்க - சமூகத்தால் இயக்கப்படுகிறது
+எளிதான வரைபட வழிசெல் - உங்கள் பயணத்தை மேலும் கண்டறி - சமூகத்தால் இயக்கப்படுகிறது
--- a/android/app/src/main/java/app/organicmaps/base/BaseMwmFragmentActivity.java
+++ b/android/app/src/main/java/app/organicmaps/base/BaseMwmFragmentActivity.java
@@ -18,7 +18,9 @@ import androidx.fragment.app.FragmentManager;
 import app.organicmaps.MwmApplication;
 import app.organicmaps.R;
 import app.organicmaps.SplashActivity;
+import app.organicmaps.sdk.util.Config;
 import app.organicmaps.sdk.util.log.Logger;
+import app.organicmaps.util.RtlUtils;
 import com.google.android.material.appbar.MaterialToolbar;
 import java.util.Objects;

@@ -40,6 +42,7 @@ public abstract class BaseMwmFragmentActivity extends AppCompatActivity
  {
    super.onCreate(savedInstanceState);
    EdgeToEdge.enable(this, SystemBarStyle.dark(Color.TRANSPARENT));
+    RtlUtils.manageRtl(this);
    if (!MwmApplication.from(this).getOrganicMaps().arePlatformAndCoreInitialized())
    {
      final Intent intent = Objects.requireNonNull(getIntent());
--- a/android/app/src/main/java/app/organicmaps/routing/NavigationController.java
+++ b/android/app/src/main/java/app/organicmaps/routing/NavigationController.java
@@ -18,6 +18,7 @@ import app.organicmaps.R;
 import app.organicmaps.maplayer.MapButtonsViewModel;
 import app.organicmaps.sdk.Framework;
 import app.organicmaps.sdk.Router;
+import app.organicmaps.sdk.location.LocationHelper;
 import app.organicmaps.sdk.maplayer.traffic.TrafficManager;
 import app.organicmaps.sdk.routing.CarDirection;
 import app.organicmaps.sdk.routing.RoutingController;
@@ -267,16 +268,18 @@ public class NavigationController implements TrafficManager.TrafficCallback, Nav

  private void updateSpeedWidgets(@NonNull final RoutingInfo info)
  {
-    final Location location = MwmApplication.from(mFrame.getContext()).getLocationHelper().getSavedLocation();
+    final LocationHelper locationHelper = MwmApplication.from(mFrame.getContext()).getLocationHelper();
+    final Location location = locationHelper.getSavedLocation();
    if (location == null)
    {
      mSpeedLimit.setSpeedLimit(-1, false);
      mCurrentSpeed.setCurrentSpeed(-1);
      return;
    }
+    final double currentAvgSpeed = locationHelper.getAverageSpeed();
    final int fSpeedLimit = StringUtils.nativeFormatSpeed(info.speedLimitMps);
-    final boolean speedLimitExceeded = fSpeedLimit < StringUtils.nativeFormatSpeed(location.getSpeed());
+    final boolean speedLimitExceeded = fSpeedLimit < StringUtils.nativeFormatSpeed(currentAvgSpeed);
    mSpeedLimit.setSpeedLimit(fSpeedLimit, speedLimitExceeded);
-    mCurrentSpeed.setCurrentSpeed(location.getSpeed());
+    mCurrentSpeed.setCurrentSpeed(currentAvgSpeed);
  }
 }
--- a/android/app/src/main/java/app/organicmaps/util/RtlUtils.java
+++ b/android/app/src/main/java/app/organicmaps/util/RtlUtils.java
@@ -0,0 +1,25 @@
+package app.organicmaps.util;
+
+import android.app.Activity;
+import android.view.View;
+import androidx.annotation.NonNull;
+import androidx.core.text.TextUtilsCompat;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Locale;
+
+public class RtlUtils
+{
+  private final static List<String> rtlLocalesWithTranslation = Arrays.asList("ar", "fa");
+
+  public static void manageRtl(@NonNull final Activity activity)
+  {
+    final String currentLanguage = Locale.getDefault().getLanguage();
+    final boolean isRTL =
+        TextUtilsCompat.getLayoutDirectionFromLocale(Locale.getDefault()) == View.LAYOUT_DIRECTION_RTL;
+    if (isRTL && rtlLocalesWithTranslation.contains(currentLanguage))
+      activity.getWindow().getDecorView().setLayoutDirection(View.LAYOUT_DIRECTION_RTL);
+    else
+      activity.getWindow().getDecorView().setLayoutDirection(View.LAYOUT_DIRECTION_LTR);
+  }
+}
--- 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,8 +31,6 @@ import androidx.fragment.app.FragmentFactory;
 import androidx.fragment.app.FragmentManager;
 import androidx.lifecycle.Observer;
 import androidx.lifecycle.ViewModelProvider;
-
-import app.organicmaps.BuildConfig;
 import app.organicmaps.MwmActivity;
 import app.organicmaps.MwmApplication;
 import app.organicmaps.R;
@@ -110,6 +108,7 @@ public class PlacePageView extends Fragment
  private static final String TRACK_SHARE_MENU_ID = "TRACK_SHARE_MENU_ID";

  private static final int SHORT_HORIZON_CLOSE_MIN = 60;
+
  private static final int SHORT_HORIZON_OPEN_MIN = 15;

  private static final List<CoordinatesFormat> visibleCoordsFormat =
@@ -832,44 +831,12 @@ public class PlacePageView extends Fragment
    final SpannableStringBuilder openStateString = new SpannableStringBuilder();
    final boolean isOpen = (poiState.state == OhState.State.Open); // False == Closed due to early exit for Unknown
    final long nextStateTime = isOpen ? poiState.nextTimeClosed : poiState.nextTimeOpen; // Unix time (seconds)
-
-    ZonedDateTime nextChangeLocal = null;
-    boolean hasFiniteNextChange = false;
-
    final long nowSec = System.currentTimeMillis() / 1000;
    final int minsToNextState = (int) ((nextStateTime - nowSec) / 60);

-    // Try to resolve a finite next-change time; handle 24/7 case
-    final boolean looksLike247 = "24/7".equals(ohStr.trim());
-    final int ONE_WEEK_MIN = 7 * 24 * 60;
-    final boolean noRealNextChange = looksLike247 || minsToNextState >= ONE_WEEK_MIN;
-
-    if (!noRealNextChange)
-    {
-      try
-      {
-        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()
-          );
-          hasFiniteNextChange = true;
-        }
-      }
-      catch (Throwable ignored) {}
-    }
-
-    if (!hasFiniteNextChange) // No valid next change
-    {
-      if (isOpen)
-        openStateString.append(getString(R.string.open_now), colorGreen, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
-      else
-        openStateString.append(getString(R.string.closed_now), colorRed, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
-
-      UiUtils.setTextAndHideIfEmpty(mTvOpenState, openStateString);
-      return;
-    }
+    // NOTE: Timezone is currently device timezone. TODO: use feature-specific timezone.
+    final ZonedDateTime nextChangeLocal =
+      ZonedDateTime.ofInstant(Instant.ofEpochSecond(nextStateTime), ZoneId.systemDefault());

    String localizedTimeString = OpenStateTextFormatter.formatHoursMinutes(
      nextChangeLocal.getHour(), nextChangeLocal.getMinute(), DateUtils.is24HourFormat(context));
--- a/android/app/src/main/res/drawable-night/ic_category_atm.xml
+++ b/android/app/src/main/res/drawable-night/ic_category_atm.xml
@@ -4,7 +4,7 @@
            <size
                android:width="40dp"
                android:height="40dp" />
-            <solid android:color="#51585E" />
+            <solid android:color="#717065" />
        </shape>
    </item>
    <item>
--- a/android/app/src/main/res/drawable-night/ic_category_bank.xml
+++ b/android/app/src/main/res/drawable-night/ic_category_bank.xml
@@ -4,7 +4,7 @@
            <size
                android:width="40dp"
                android:height="40dp" />
-            <solid android:color="#51585E" />
+            <solid android:color="#717065" />
        </shape>
    </item>
    <item>
--- a/android/app/src/main/res/drawable-night/ic_category_children.xml
+++ b/android/app/src/main/res/drawable-night/ic_category_children.xml
@@ -4,7 +4,7 @@
      <size
          android:width="40dp"
          android:height="40dp" />
-      <solid android:color="#802D19" />
+      <solid android:color="#7F5933" />
    </shape>
  </item>
  <item>
--- a/android/app/src/main/res/drawable-night/ic_category_eat.xml
+++ b/android/app/src/main/res/drawable-night/ic_category_eat.xml
@@ -4,7 +4,7 @@
            <size
                android:width="40dp"
                android:height="40dp" />
-            <solid android:color="#8C491C" />
+            <solid android:color="#BB9342" />
        </shape>
    </item>
    <item>
--- a/android/app/src/main/res/drawable-night/ic_category_entertainment.xml
+++ b/android/app/src/main/res/drawable-night/ic_category_entertainment.xml
@@ -4,7 +4,7 @@
            <size
                android:width="40dp"
                android:height="40dp" />
-            <solid android:color="#802D19" />
+            <solid android:color="#7F5933" />
        </shape>
    </item>
    <item>
--- a/android/app/src/main/res/drawable-night/ic_category_food.xml
+++ b/android/app/src/main/res/drawable-night/ic_category_food.xml
@@ -4,7 +4,7 @@
            <size
                android:width="40dp"
                android:height="40dp" />
-            <solid android:color="#6B425C" />
+            <solid android:color="#8C5F93" />
        </shape>
    </item>
    <item>
--- a/android/app/src/main/res/drawable-night/ic_category_fuel.xml
+++ b/android/app/src/main/res/drawable-night/ic_category_fuel.xml
@@ -4,7 +4,7 @@
            <size
                android:width="40dp"
                android:height="40dp" />
-            <solid android:color="#574469" />
+            <solid android:color="#717065" />
        </shape>
    </item>
    <item>
--- a/android/app/src/main/res/drawable-night/ic_category_hospital.xml
+++ b/android/app/src/main/res/drawable-night/ic_category_hospital.xml
@@ -4,7 +4,7 @@
            <size
                android:width="40dp"
                android:height="40dp" />
-            <solid android:color="#983E44" />
+            <solid android:color="#C15746" />
        </shape>
    </item>
    <item>
--- a/android/app/src/main/res/drawable-night/ic_category_hotel.xml
+++ b/android/app/src/main/res/drawable-night/ic_category_hotel.xml
@@ -4,7 +4,7 @@
            <size
                android:width="40dp"
                android:height="40dp" />
-            <solid android:color="#614A43" />
+            <solid android:color="#664E42" />
        </shape>
    </item>
    <item>
--- a/android/app/src/main/res/drawable-night/ic_category_nightlife.xml
+++ b/android/app/src/main/res/drawable-night/ic_category_nightlife.xml
@@ -4,7 +4,7 @@
            <size
                android:width="40dp"
                android:height="40dp" />
-            <solid android:color="#8C491C" />
+            <solid android:color="#BB9342" />
        </shape>
    </item>
    <item>
--- a/android/app/src/main/res/drawable-night/ic_category_parking.xml
+++ b/android/app/src/main/res/drawable-night/ic_category_parking.xml
@@ -4,7 +4,7 @@
            <size
                android:width="40dp"
                android:height="40dp" />
-            <solid android:color="#20607C" />
+            <solid android:color="#2E89B0" />
        </shape>
    </item>
    <item>
--- a/android/app/src/main/res/drawable-night/ic_category_pharmacy.xml
+++ b/android/app/src/main/res/drawable-night/ic_category_pharmacy.xml
@@ -4,7 +4,7 @@
            <size
                android:width="40dp"
                android:height="40dp" />
-            <solid android:color="#983E44" />
+            <solid android:color="#C15746" />
        </shape>
    </item>
    <item>
--- a/android/app/src/main/res/drawable-night/ic_category_police.xml
+++ b/android/app/src/main/res/drawable-night/ic_category_police.xml
@@ -4,7 +4,7 @@
            <size
                android:width="40dp"
                android:height="40dp" />
-            <solid android:color="#51585E" />
+            <solid android:color="#717065" />
        </shape>
    </item>
    <item>
--- a/android/app/src/main/res/drawable-night/ic_category_post.xml
+++ b/android/app/src/main/res/drawable-night/ic_category_post.xml
@@ -4,7 +4,7 @@
            <size
                android:width="40dp"
                android:height="40dp" />
-            <solid android:color="#51585E" />
+            <solid android:color="#717065" />
        </shape>
    </item>
    <item>
--- a/android/app/src/main/res/drawable-night/ic_category_recycling.xml
+++ b/android/app/src/main/res/drawable-night/ic_category_recycling.xml
@@ -5,7 +5,7 @@
      <size
        android:width="40dp"
        android:height="40dp" />
-      <solid android:color="#51585E" />
+      <solid android:color="#717065" />
    </shape>
  </item>
  <item>
--- a/android/app/src/main/res/drawable-night/ic_category_rv.xml
+++ b/android/app/src/main/res/drawable-night/ic_category_rv.xml
@@ -4,7 +4,7 @@
            <size
                android:width="40dp"
                android:height="40dp" />
-            <solid android:color="#51585E" />
+            <solid android:color="#717065" />
        </shape>
    </item>
    <item>
--- a/android/app/src/main/res/drawable-night/ic_category_secondhand.xml
+++ b/android/app/src/main/res/drawable-night/ic_category_secondhand.xml
@@ -4,7 +4,7 @@
            <size
                android:width="40dp"
                android:height="40dp" />
-            <solid android:color="#6B425C" />
+            <solid android:color="#8C5F93" />
        </shape>
    </item>
    <item>
--- a/android/app/src/main/res/drawable-night/ic_category_shopping.xml
+++ b/android/app/src/main/res/drawable-night/ic_category_shopping.xml
@@ -4,7 +4,7 @@
            <size
                android:width="40dp"
                android:height="40dp" />
-            <solid android:color="#6B425C" />
+            <solid android:color="#8C5F93" />
        </shape>
    </item>
    <item>
--- a/android/app/src/main/res/drawable-night/ic_category_toilet.xml
+++ b/android/app/src/main/res/drawable-night/ic_category_toilet.xml
@@ -4,7 +4,7 @@
            <size
                android:width="40dp"
                android:height="40dp" />
-            <solid android:color="#51585E" />
+            <solid android:color="#7F5933" />
        </shape>
    </item>
    <item>
--- a/android/app/src/main/res/drawable-night/ic_category_tourism.xml
+++ b/android/app/src/main/res/drawable-night/ic_category_tourism.xml
@@ -4,7 +4,7 @@
            <size
                android:width="40dp"
                android:height="40dp" />
-            <solid android:color="#6E4426" />
+            <solid android:color="#7F5933" />
        </shape>
    </item>
    <item>
--- a/android/app/src/main/res/drawable-night/ic_category_wifi.xml
+++ b/android/app/src/main/res/drawable-night/ic_category_wifi.xml
@@ -4,7 +4,7 @@
            <size
                android:width="40dp"
                android:height="40dp" />
-            <solid android:color="#51585E" />
+            <solid android:color="#717065" />
        </shape>
    </item>
    <item>
--- a/android/app/src/main/res/drawable/ic_avoid_motorways_enabled.xml
+++ b/android/app/src/main/res/drawable/ic_avoid_motorways_enabled.xml
--- a/android/app/src/main/res/drawable/ic_category_children.xml
+++ b/android/app/src/main/res/drawable/ic_category_children.xml
@@ -4,7 +4,7 @@
      <size
          android:width="40dp"
          android:height="40dp" />
-      <solid android:color="#EB785D" />
+      <solid android:color="#9C6136" />
    </shape>
  </item>
  <item>
--- a/android/app/src/main/res/drawable/ic_category_entertainment.xml
+++ b/android/app/src/main/res/drawable/ic_category_entertainment.xml
@@ -4,7 +4,7 @@
            <size
                android:width="40dp"
                android:height="40dp" />
-            <solid android:color="#EB785D" />
+            <solid android:color="#9C6136" />
        </shape>
    </item>
    <item>
--- a/android/app/src/main/res/drawable/ic_category_fuel.xml
+++ b/android/app/src/main/res/drawable/ic_category_fuel.xml
@@ -4,7 +4,7 @@
            <size
                android:width="40dp"
                android:height="40dp" />
-            <solid android:color="#AA96BC" />
+            <solid android:color="#747E86" />
        </shape>
    </item>
    <item>
--- a/android/app/src/main/res/drawable/ic_category_toilet.xml
+++ b/android/app/src/main/res/drawable/ic_category_toilet.xml
@@ -4,7 +4,7 @@
            <size
                android:width="40dp"
                android:height="40dp" />
-            <solid android:color="#747E86" />
+            <solid android:color="#9C6136" />
        </shape>
    </item>
    <item>
--- a/android/app/src/main/res/layout/dialog_sorting_types.xml
+++ b/android/app/src/main/res/layout/dialog_sorting_types.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout
  xmlns:android="http://schemas.android.com/apk/res/android"
+  xmlns:app="http://schemas.android.com/apk/res-auto"
  android:layout_width="match_parent"
  android:layout_height="wrap_content"
  android:layout_margin="@dimen/margin_double_and_half"
@@ -32,7 +33,8 @@
      android:layout_height="wrap_content"
      android:padding="@dimen/margin_half_double_plus"
      android:checked="true"
-      android:text="@string/by_default"/>
+      android:text="@string/by_default"
+      app:buttonTint="@null"/>

    <RadioButton
      style="?fontSubtitle1"
@@ -41,7 +43,8 @@
      android:layout_height="wrap_content"
      android:padding="@dimen/margin_half_double_plus"
      android:checked="false"
-      android:text="@string/by_name"/>
+      android:text="@string/by_name"
+      app:buttonTint="@null"/>

    <RadioButton
      style="?fontSubtitle1"
@@ -50,7 +53,8 @@
      android:layout_height="wrap_content"
      android:padding="@dimen/margin_half_double_plus"
      android:checked="false"
-      android:text="@string/by_type"/>
+      android:text="@string/by_type"
+      app:buttonTint="@null"/>

    <RadioButton
      style="?fontSubtitle1"
@@ -59,7 +63,8 @@
      android:layout_height="wrap_content"
      android:padding="@dimen/margin_half_double_plus"
      android:checked="false"
-      android:text="@string/by_distance"/>
+      android:text="@string/by_distance"
+      app:buttonTint="@null"/>

    <RadioButton
      style="?fontSubtitle1"
@@ -68,6 +73,7 @@
      android:layout_height="wrap_content"
      android:padding="@dimen/margin_half_double_plus"
      android:checked="false"
-      android:text="@string/by_date"/>
+      android:text="@string/by_date"
+      app:buttonTint="@null"/>
  </RadioGroup>
 </LinearLayout>
--- a/android/app/src/main/res/layout/edit_bookmark_common.xml
+++ b/android/app/src/main/res/layout/edit_bookmark_common.xml
@@ -91,8 +91,9 @@
    style="?fontBody1"
    android:layout_width="match_parent"
    android:layout_height="wrap_content"
+    android:layout_marginEnd="@dimen/margin_half"
+    android:layout_marginStart="@dimen/margin_half"
    android:layout_below="@id/rl__bookmark_set"
-    android:layout_margin="@dimen/margin_half"
    android:hint="@string/placepage_personal_notes_hint"
    android:textColorHint="?android:textColorSecondary">

--- a/android/app/src/main/res/layout/fragment_driving_options.xml
+++ b/android/app/src/main/res/layout/fragment_driving_options.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout
  xmlns:android="http://schemas.android.com/apk/res/android"
-  xmlns:app="http://schemas.android.com/apk/res-auto"
  android:background="?attr/cardBackground"
  android:orientation="vertical"
  android:layout_width="match_parent"
@@ -21,15 +20,8 @@
    android:minHeight="@dimen/height_block_base"
    android:layout_width="match_parent"
    android:layout_height="wrap_content"
-    android:paddingEnd="@dimen/margin_half"
+    android:paddingEnd="@dimen/margin_base"
    android:paddingStart="@dimen/margin_base">
-    <com.google.android.material.imageview.ShapeableImageView
-      android:layout_width="24dp"
-      android:layout_height="24dp"
-      android:layout_marginEnd="@dimen/margin_base_plus"
-      android:layout_marginTop="@dimen/margin_half_plus"
-      app:srcCompat="@drawable/ic_avoid_tolls_disabled"
-      app:tint="?iconTint" />
    <com.google.android.material.textview.MaterialTextView
      android:text="@string/avoid_tolls"
      android:textAppearance="?android:attr/textAppearanceMedium"
@@ -49,15 +41,8 @@
    android:minHeight="@dimen/height_block_base"
    android:layout_width="match_parent"
    android:layout_height="wrap_content"
-    android:paddingEnd="@dimen/margin_half"
+    android:paddingEnd="@dimen/margin_base"
    android:paddingStart="@dimen/margin_base">
-    <com.google.android.material.imageview.ShapeableImageView
-      android:layout_width="24dp"
-      android:layout_height="24dp"
-      android:layout_marginEnd="@dimen/margin_base_plus"
-      android:layout_marginTop="@dimen/margin_half_plus"
-      app:srcCompat="@drawable/ic_avoid_unpaved_disabled"
-      app:tint="?iconTint" />
    <com.google.android.material.textview.MaterialTextView
      android:text="@string/avoid_unpaved"
      android:textAppearance="?android:attr/textAppearanceMedium"
@@ -77,15 +62,8 @@
    android:minHeight="@dimen/height_block_base"
    android:layout_width="match_parent"
    android:layout_height="wrap_content"
-    android:paddingEnd="@dimen/margin_half"
+    android:paddingEnd="@dimen/margin_base"
    android:paddingStart="@dimen/margin_base">
-    <com.google.android.material.imageview.ShapeableImageView
-      android:layout_width="24dp"
-      android:layout_height="24dp"
-      android:layout_marginEnd="@dimen/margin_base_plus"
-      android:layout_marginTop="@dimen/margin_half_plus"
-      app:srcCompat="@drawable/ic_avoid_paved_disabled"
-      app:tint="?iconTint" />
    <com.google.android.material.textview.MaterialTextView
      android:text="@string/avoid_paved"
      android:textAppearance="?android:attr/textAppearanceMedium"
@@ -105,15 +83,8 @@
    android:minHeight="@dimen/height_block_base"
    android:layout_width="match_parent"
    android:layout_height="wrap_content"
-    android:paddingEnd="@dimen/margin_half"
+    android:paddingEnd="@dimen/margin_base"
    android:paddingStart="@dimen/margin_base">
-    <com.google.android.material.imageview.ShapeableImageView
-      android:layout_width="24dp"
-      android:layout_height="24dp"
-      android:layout_marginEnd="@dimen/margin_base_plus"
-      android:layout_marginTop="@dimen/margin_half_plus"
-      app:srcCompat="@drawable/ic_avoid_ferry_disabled"
-      app:tint="?iconTint" />
    <com.google.android.material.textview.MaterialTextView
      android:text="@string/avoid_ferry"
      android:textAppearance="?android:attr/textAppearanceMedium"
@@ -133,15 +104,8 @@
    android:minHeight="@dimen/height_block_base"
    android:layout_width="match_parent"
    android:layout_height="wrap_content"
-    android:paddingEnd="@dimen/margin_half"
+    android:paddingEnd="@dimen/margin_base"
    android:paddingStart="@dimen/margin_base">
-    <com.google.android.material.imageview.ShapeableImageView
-      android:layout_width="24dp"
-      android:layout_height="24dp"
-      android:layout_marginEnd="@dimen/margin_base_plus"
-      android:layout_marginTop="@dimen/margin_half_plus"
-      app:srcCompat="@drawable/ic_avoid_motorways_disabled"
-      app:tint="?iconTint" />
    <com.google.android.material.textview.MaterialTextView
      android:text="@string/avoid_motorways"
      android:textAppearance="?android:attr/textAppearanceMedium"
@@ -161,15 +125,8 @@
    android:minHeight="@dimen/height_block_base"
    android:layout_width="match_parent"
    android:layout_height="wrap_content"
-    android:paddingEnd="@dimen/margin_half"
+    android:paddingEnd="@dimen/margin_base"
    android:paddingStart="@dimen/margin_base">
-    <com.google.android.material.imageview.ShapeableImageView
-      android:layout_width="24dp"
-      android:layout_height="24dp"
-      android:layout_marginEnd="@dimen/margin_base_plus"
-      android:layout_marginTop="@dimen/margin_half_plus"
-      app:srcCompat="@drawable/ic_avoid_steps_disabled"
-      app:tint="?iconTint" />
    <com.google.android.material.textview.MaterialTextView
      android:text="@string/avoid_steps"
      android:textAppearance="?android:attr/textAppearanceMedium"
--- a/android/app/src/main/res/layout/fragment_editor.xml
+++ b/android/app/src/main/res/layout/fragment_editor.xml
@@ -23,7 +23,7 @@
        android:textAppearance="@style/MwmTextAppearance.Body4"/>
    <com.google.android.material.card.MaterialCardView
        android:id="@+id/cv__category"
-        style="@style/MwmWidget.Editor.CardView">
+        style="@style/MwmWidget.M3.Editor.CardView">
      <RelativeLayout
          android:id="@+id/category"
          style="@style/MwmWidget.Editor.MetadataBlock"
@@ -64,7 +64,7 @@
    </com.google.android.material.card.MaterialCardView>
    <com.google.android.material.card.MaterialCardView
        android:id="@+id/cv__charging_station"
-        style="@style/MwmWidget.Editor.CardView"
+        style="@style/MwmWidget.M3.Editor.CardView"
        android:visibility="gone">
      <LinearLayout
          android:layout_width="match_parent"
@@ -86,12 +86,12 @@
    </com.google.android.material.card.MaterialCardView>
    <com.google.android.material.card.MaterialCardView
        android:id="@+id/cv__name"
-        style="@style/MwmWidget.Editor.CardView">
+        style="@style/MwmWidget.M3.Editor.CardView">
      <include layout="@layout/localized_name"/>
    </com.google.android.material.card.MaterialCardView>
    <com.google.android.material.card.MaterialCardView
        android:id="@+id/cv__address"
-        style="@style/MwmWidget.Editor.CardView">
+        style="@style/MwmWidget.M3.Editor.CardView">
      <LinearLayout
          android:layout_width="match_parent"
          android:layout_height="wrap_content"
@@ -147,7 +147,7 @@

    <com.google.android.material.card.MaterialCardView
        android:id="@+id/cv__details"
-        style="@style/MwmWidget.Editor.CardView">
+        style="@style/MwmWidget.M3.Editor.CardView">
      <LinearLayout
          android:layout_width="match_parent"
          android:layout_height="wrap_content"
@@ -327,7 +327,7 @@

    <com.google.android.material.card.MaterialCardView
        android:id="@+id/cv__social_media"
-        style="@style/MwmWidget.Editor.CardView">
+        style="@style/MwmWidget.M3.Editor.CardView">
      <LinearLayout
          android:layout_width="match_parent"
          android:layout_height="wrap_content"
@@ -369,7 +369,7 @@

    <com.google.android.material.card.MaterialCardView
        android:id="@+id/cv__building"
-        style="@style/MwmWidget.Editor.CardView">
+        style="@style/MwmWidget.M3.Editor.CardView">
      <LinearLayout
          android:layout_width="match_parent"
          android:layout_height="wrap_content"
@@ -394,7 +394,7 @@

    <com.google.android.material.card.MaterialCardView
        android:id="@+id/cv__more"
-        style="@style/MwmWidget.Editor.CardView"
+        style="@style/MwmWidget.M3.Editor.CardView"
        android:layout_marginBottom="@dimen/margin_base">
      <LinearLayout
          android:layout_width="match_parent"
--- a/android/app/src/main/res/layout/fragment_timetable_advanced.xml
+++ b/android/app/src/main/res/layout/fragment_timetable_advanced.xml
@@ -16,6 +16,7 @@
    <com.google.android.material.card.MaterialCardView
      android:layout_width="match_parent"
      android:layout_height="wrap_content"
+      style="@style/MwmWidget.M3.Editor.CardView"
      card_view:cardBackgroundColor="?cardBackground"
      card_view:cardCornerRadius="2dp"
      card_view:cardElevation="4dp">
--- a/android/app/src/main/res/layout/item_bookmark_category.xml
+++ b/android/app/src/main/res/layout/item_bookmark_category.xml
@@ -8,8 +8,8 @@
  android:background="@drawable/bg_clickable_card">
  <com.google.android.material.checkbox.MaterialCheckBox
    android:id="@+id/checkbox"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
+    android:layout_width="40dp"
+    android:layout_height="40dp"
    android:layout_alignBottom="@id/bottom_line_container"
    android:layout_alignParentStart="true"
    android:layout_alignParentTop="true"
@@ -18,7 +18,7 @@
    android:layout_marginStart="8dp"
    android:background="@null"
    android:button="@drawable/visibility_selector"
-    android:buttonTint="?accentColorSelector"
+    app:buttonTint="@color/accent_color_selector"
    android:padding="@dimen/margin_half" />
  <com.google.android.material.textview.MaterialTextView
    android:id="@+id/name"
--- a/android/app/src/main/res/layout/item_bookmark_category_choose.xml
+++ b/android/app/src/main/res/layout/item_bookmark_category_choose.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout
    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
    android:layout_width="match_parent"
    android:layout_height="48dp"
    android:background="?clickableBackground"
@@ -14,7 +15,8 @@
    android:layout_width="wrap_content"
    android:layout_height="wrap_content"
    android:clickable="false"
-    android:focusable="false"/>
+    android:focusable="false"
+    app:buttonTint="@null"/>

  <com.google.android.material.textview.MaterialTextView
      android:id="@+id/tv__set_name"
--- a/android/app/src/main/res/layout/item_editor_input.xml
+++ b/android/app/src/main/res/layout/item_editor_input.xml
@@ -18,7 +18,6 @@
    android:layout_width="0dp"
    android:layout_centerVertical="true"
    android:layout_marginStart="14dp"
-    android:textColorHint="?android:textColorSecondary"
    app:layout_constraintBottom_toBottomOf="parent"
    app:layout_constraintEnd_toEndOf="parent"
    app:layout_constraintStart_toEndOf="@+id/icon"
--- a/android/app/src/main/res/layout/item_phone.xml
+++ b/android/app/src/main/res/layout/item_phone.xml
@@ -28,12 +28,12 @@
        app:layout_constraintBottom_toBottomOf="parent"
        app:layout_constraintEnd_toStartOf="@+id/delete_icon"
        app:layout_constraintStart_toEndOf="@+id/phone_icon"
-        app:hintEnabled="false"
        app:layout_constraintTop_toTopOf="parent">
        <com.google.android.material.textfield.TextInputEditText
            android:id="@+id/input"
            style="@style/MwmWidget.Editor.FieldLayout.EditText"
-            android:hint="@string/phone_format"
+            tools:hint="Hint"
+            tools:text="Input"
            android:inputType="phone"/>
    </com.google.android.material.textfield.TextInputLayout>

--- a/android/app/src/main/res/layout/item_search_result.xml
+++ b/android/app/src/main/res/layout/item_search_result.xml
@@ -6,7 +6,7 @@
  android:layout_height="wrap_content"
  android:background="?selectableItemBackground"
  android:minHeight="@dimen/search_item_height"
-  android:padding="@dimen/margin_half_double_plus"
+  android:padding="@dimen/margin_base"
  tools:background="#20FF0000">

  <com.google.android.material.textview.MaterialTextView
--- a/android/app/src/main/res/layout/item_selection.xml
+++ b/android/app/src/main/res/layout/item_selection.xml
@@ -19,7 +19,8 @@
    android:layout_marginEnd="@dimen/margin_base"
    app:layout_constraintBottom_toBottomOf="parent"
    app:layout_constraintStart_toStartOf="parent"
-    app:layout_constraintTop_toTopOf="parent"/>
+    app:layout_constraintTop_toTopOf="parent"
+    app:buttonTint="@null"/>

  <LinearLayout
    android:layout_width="match_parent"
--- a/android/app/src/main/res/layout/item_street.xml
+++ b/android/app/src/main/res/layout/item_street.xml
@@ -19,7 +19,8 @@
    android:layout_marginEnd="@dimen/margin_base"
    app:layout_constraintBottom_toBottomOf="parent"
    app:layout_constraintStart_toStartOf="parent"
-    app:layout_constraintTop_toTopOf="parent"/>
+    app:layout_constraintTop_toTopOf="parent"
+    app:buttonTint="@null"/>

  <LinearLayout
    android:layout_width="match_parent"
--- a/android/app/src/main/res/layout/item_timetable.xml
+++ b/android/app/src/main/res/layout/item_timetable.xml
@@ -3,7 +3,7 @@
  xmlns:android="http://schemas.android.com/apk/res/android"
  xmlns:tools="http://schemas.android.com/tools"
  xmlns:app="http://schemas.android.com/apk/res-auto"
-  style="@style/MwmWidget.Editor.CardView"
+  style="@style/MwmWidget.M3.Editor.CardView"
  android:layout_marginBottom="@dimen/margin_half"
  android:layout_marginTop="@dimen/margin_half">

--- a/android/app/src/main/res/layout/map_buttons_layers.xml
+++ b/android/app/src/main/res/layout/map_buttons_layers.xml
@@ -7,4 +7,4 @@
  android:tint="?iconTint"
  android:contentDescription="@string/layers_title"
  app:tint="?accentColorSelector"
-  app:srcCompat="@drawable/ic_layers" />
+  app:srcCompat="@drawable/ic_layers" />
--- a/android/app/src/main/res/layout/place_page_add.xml
+++ b/android/app/src/main/res/layout/place_page_add.xml
@@ -2,6 +2,7 @@
 <LinearLayout
  xmlns:android="http://schemas.android.com/apk/res/android"
  xmlns:tools="http://schemas.android.com/tools"
+  xmlns:app="http://schemas.android.com/apk/res-auto"
  android:id="@+id/ll__place_add"
  style="@style/PlacePageItemFrame"
  tools:visibility="visible">
@@ -11,5 +12,7 @@
    style="@style/MwmWidget.M3.Button.Secondary"
    android:layout_height="wrap_content"
    android:layout_width="match_parent"
+    app:backgroundTint="?cardBackground"
+    android:backgroundTint="?cardBackground"
    android:text="@string/placepage_add_place_button" />
 </LinearLayout>
--- a/android/app/src/main/res/layout/place_page_editor.xml
+++ b/android/app/src/main/res/layout/place_page_editor.xml
@@ -2,6 +2,7 @@
 <LinearLayout
  xmlns:android="http://schemas.android.com/apk/res/android"
  xmlns:tools="http://schemas.android.com/tools"
+  xmlns:app="http://schemas.android.com/apk/res-auto"
  android:id="@+id/ll__place_editor"
  style="@style/PlacePageItemFrame"
  tools:visibility="visible">
@@ -10,5 +11,7 @@
    style="@style/MwmWidget.M3.Button.Secondary"
    android:layout_height="wrap_content"
    android:layout_width="match_parent"
+    app:backgroundTint="?cardBackground"
+    android:backgroundTint="?cardBackground"
    android:text="@string/edit_place"/>
 </LinearLayout>
--- a/android/app/src/main/res/layout/routing_plan.xml
+++ b/android/app/src/main/res/layout/routing_plan.xml
@@ -43,9 +43,8 @@

          <app.organicmaps.widget.RoutingToolbarButton
              android:id="@+id/vehicle"
-              style="@style/Widget.AppCompat.CompoundButton.RadioButton"
-              android:layout_width="wrap_content"
-              android:layout_height="wrap_content"
+              android:layout_width="@dimen/routing_toolbar_button"
+              android:layout_height="@dimen/routing_toolbar_button"
              android:layout_marginStart="@dimen/routing_selector_wheel_margin"
              android:contentDescription="@string/vehicle"
              tools:button="@drawable/ic_car"
@@ -53,9 +52,8 @@

          <app.organicmaps.widget.RoutingToolbarButton
              android:id="@+id/pedestrian"
-              style="@style/Widget.AppCompat.CompoundButton.RadioButton"
-              android:layout_width="wrap_content"
-              android:layout_height="wrap_content"
+              android:layout_width="@dimen/routing_toolbar_button"
+              android:layout_height="@dimen/routing_toolbar_button"
              android:layout_marginStart="12dp"
              android:layout_marginEnd="12dp"
              android:contentDescription="@string/pedestrian"
@@ -64,9 +62,8 @@

          <app.organicmaps.widget.RoutingToolbarButton
              android:id="@+id/transit"
-              style="@style/Widget.AppCompat.CompoundButton.RadioButton"
-              android:layout_width="wrap_content"
-              android:layout_height="wrap_content"
+              android:layout_width="@dimen/routing_toolbar_button"
+              android:layout_height="@dimen/routing_toolbar_button"
              android:layout_marginEnd="@dimen/margin_half_plus"
              android:contentDescription="@string/subway"
              tools:button="@drawable/ic_route_planning_metro_40px"
@@ -74,9 +71,8 @@

          <app.organicmaps.widget.RoutingToolbarButton
              android:id="@+id/bicycle"
-              style="@style/Widget.AppCompat.CompoundButton.RadioButton"
-              android:layout_width="wrap_content"
-              android:layout_height="wrap_content"
+              android:layout_width="@dimen/routing_toolbar_button"
+              android:layout_height="@dimen/routing_toolbar_button"
              android:layout_marginEnd="12dp"
              android:contentDescription="@string/bicycle"
              tools:button="@drawable/ic_bike"
@@ -84,9 +80,8 @@

          <app.organicmaps.widget.RoutingToolbarButton
              android:id="@+id/ruler"
-              style="@style/Widget.AppCompat.CompoundButton.RadioButton"
-              android:layout_width="wrap_content"
-              android:layout_height="wrap_content"
+              android:layout_width="@dimen/routing_toolbar_button"
+              android:layout_height="@dimen/routing_toolbar_button"
              android:layout_marginEnd="12dp"
              android:contentDescription="@string/ruler"
              tools:button="@drawable/ic_ruler_route"
--- a/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
+++ b/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
@@ -3,4 +3,4 @@
  <background android:drawable="@color/bg_app_icon_release"/>
  <foreground android:drawable="@drawable/ic_launcher_foreground"/>
  <monochrome android:drawable="@drawable/ic_launcher_foreground_monochrome"/>
-</adaptive-icon>
+</adaptive-icon>
--- a/android/app/src/main/res/values-cs/strings.xml
+++ b/android/app/src/main/res/values-cs/strings.xml
@@ -505,8 +505,8 @@
    <!-- Displayed when saving some edits to the map to warn against publishing personal data -->
    <string name="editor_share_to_all_dialog_title">Chcete změnu odeslat všem uživatelům?</string>
    <!-- Dialog before publishing the modifications to the public map. -->
-    <string name="editor_share_to_all_dialog_message_1">Ujistěte se, že jste nezadali žádná soukromá nebo osobní data.</string>
-    <string name="editor_share_to_all_dialog_message_2">Editoři OpenStreetMap zkontrolují změny a budou vás kontaktovat, pokud budou mít nějaké dotazy.</string>
+    <string name="editor_share_to_all_dialog_message_1">Ujistěte se, že jste nezadali žádná soukromá nebo osobní data</string>
+    <string name="editor_share_to_all_dialog_message_2">Editoři OpenStreetMap zkontrolují změny a budou vás kontaktovat, pokud budou mít nějaké dotazy</string>
    <!-- Shown as toast when starting the recent track recording -->
    <string name="track_recording">Záznam trasy</string>
    <!-- For the first routing -->
@@ -890,18 +890,4 @@
    <string name="offline_explanation_title">Offline mapy</string>
    <string name="list_description_empty">Upravit seznam pro přidání popisu</string>
    <string name="avoid_paved">Vyhnout se zpevněným cestám</string>
-    <string name="opens_at">Otevírá v %s</string>
-    <string name="closes_at">Zavírá v %s</string>
-    <string name="opens_day_at">Otevírá %1$s v %2$s</string>
-    <string name="closes_day_at">Zavírá %1$s v %2$s</string>
-    <string name="editor_business_vacant_button">Podnik je volný</string>
-    <string name="editor_mark_business_vacant_title">Označit podnik jako volný</string>
-    <string name="editor_mark_business_vacant_description">Použijte, pokud se podnik přestěhoval a místo je volné a připravené pro nového zájemce.</string>
-    <string name="editor_submit">Odeslat</string>
-    <plurals name="minutes_short">
-        <item quantity="one">%d min</item>
-        <item quantity="few">%d min</item>
-        <item quantity="many">%d min</item>
-        <item quantity="other">%d min</item>
-    </plurals>
 </resources>
--- a/android/app/src/main/res/values-de/strings.xml
+++ b/android/app/src/main/res/values-de/strings.xml
@@ -109,11 +109,11 @@
    <!-- Search category for fuel stations; any changes should be duplicated in categories.txt @category_fuel! -->
    <string name="category_fuel">Tankstelle</string>
    <!-- Search category for parking lots; any changes should be duplicated in categories.txt @category_parking! -->
-    <string name="category_parking">Parkplätze</string>
+    <string name="category_parking">Parkplätze|Parkplatz|Stellplatz</string>
    <!-- Search category for malls/clothes/shoes/gifts/jewellery/sport shops; any changes should be duplicated in categories.txt @category_shopping! -->
    <string name="category_shopping">Shopping</string>
    <!-- Search category for second_hand/charity/antique/auction shops; any changes should be duplicated in categories.txt @category_secondhand! -->
-    <string name="category_secondhand">Second-hand</string>
+    <string name="category_secondhand">Second-hand|Gebrauchte Artikel|Gebrauchte Ware</string>
    <!-- Search category for places to stay; any changes should be duplicated in categories.txt @category_hotel! -->
    <string name="category_hotel">Hotel</string>
    <!-- Search category sight seeings and touristic attractions; any changes should be duplicated in categories.txt @category_tourism! -->
@@ -894,15 +894,4 @@
    <string name="error_invalid_number">ungültige Zahl</string>
    <string name="list_description_empty">Liste bearbeiten, um eine Beschreibung hinzuzufügen</string>
    <string name="avoid_paved">Befst. Straßen vermeiden</string>
-    <string name="opens_at">Öffnet um %s</string>
-    <string name="closes_at">Schließt um %s</string>
-    <string name="opens_day_at">Öffnet am %1$s um %2$s</string>
-    <string name="closes_day_at">Schließt am %1$s um %2$s</string>
-    <plurals name="minutes_short">
-        <item quantity="one">%d min</item>
-        <item quantity="other">%d min</item>
-    </plurals>
-    <string name="editor_business_vacant_button">Geschäft ist leerstehend</string>
-    <string name="editor_mark_business_vacant_title">Geschäft als leerstehend markieren</string>
-    <string name="editor_submit">Absenden</string>
 </resources>
--- a/android/app/src/main/res/values-es/strings.xml
+++ b/android/app/src/main/res/values-es/strings.xml
@@ -909,8 +909,4 @@
        <item quantity="other">%d min</item>
    </plurals>
    <string name="list_description_empty">Modificar la lista para añadir una descripción</string>
-    <string name="editor_business_vacant_button">Negocio vacante</string>
-    <string name="editor_mark_business_vacant_title">Marcar negocio como vacante</string>
-    <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>
 </resources>
--- a/android/app/src/main/res/values-et/strings.xml
+++ b/android/app/src/main/res/values-et/strings.xml
@@ -516,8 +516,8 @@
    <!-- Displayed when saving some edits to the map to warn against publishing personal data -->
    <string name="editor_share_to_all_dialog_title">Kas soovid saata selle kõigile kasutajatele?</string>
    <!-- Dialog before publishing the modifications to the public map. -->
-    <string name="editor_share_to_all_dialog_message_1">Palun kontrolli, et sa ei sisestanud isiklikke andmeid.</string>
-    <string name="editor_share_to_all_dialog_message_2">OpenStreetMapi haldajad kontrollivad muudatused üle ja võtavad küsimuste korral sinuga ühendust.</string>
+    <string name="editor_share_to_all_dialog_message_1">Palun kontrolli, et sa ei sisestanud isiklikke andmeid</string>
+    <string name="editor_share_to_all_dialog_message_2">OpenStreetMapi haldajad kontrollivad muudatused üle ja võtavad küsimuste korral sinuga ühendust</string>
    <string name="navigation_stop_button">Lõpeta</string>
    <!-- Shown as toast when starting the recent track recording -->
    <string name="track_recording">Rada on salvestamisel</string>
@@ -898,8 +898,4 @@
        <item quantity="one">%d min</item>
        <item quantity="other">%d min</item>
    </plurals>
-    <string name="editor_business_vacant_button">Äripind on vaba</string>
-    <string name="editor_mark_business_vacant_title">Märgi äripind vabaks</string>
-    <string name="editor_mark_business_vacant_description">Kasuta seda valikut, kui senine rentnik/omanik on kolinud välja ja äripind on tühi ja uue ootel.</string>
-    <string name="editor_submit">Saada</string>
 </resources>
--- a/android/app/src/main/res/values-fr/strings.xml
+++ b/android/app/src/main/res/values-fr/strings.xml
@@ -899,17 +899,4 @@
    <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="opens_at">Ouvre à %s</string>
-    <string name="closes_at">Ferme à %s</string>
-    <string name="opens_day_at">Ouverture le %1$s à %2$s</string>
-    <string name="closes_day_at">Fermeture le %1$s à %2$s</string>
-    <plurals name="minutes_short">
-        <item quantity="one">%d min</item>
-        <item quantity="many">%d min</item>
-        <item quantity="other">%d min</item>
-    </plurals>
-    <string name="editor_business_vacant_button">Local commercial vacant</string>
-    <string name="editor_mark_business_vacant_title">Marquer l\'établissement comme vacant</string>
-    <string name="editor_mark_business_vacant_description">Utilisez cette option si l\'entreprise a déménagé et que l\'espace est vide et prêt à accueillir un nouveau locataire.</string>
-    <string name="editor_submit">Soumettre</string>
 </resources>
--- a/android/app/src/main/res/values-gl/strings.xml
+++ b/android/app/src/main/res/values-gl/strings.xml
@@ -627,17 +627,4 @@
    <string name="offline_explanation_title">Mapas sen conexión</string>
    <string name="offline_explanation_text">Hai que descargar un mapa para ver e navegar polo área.\nDescarga os mapas para as zonas polas que vas viaxar.</string>
    <string name="list_description_empty">Editar a lista para engadir unha descrición</string>
-    <string name="opens_at">Abre ás %s</string>
-    <string name="closes_at">Fecha ás %s</string>
-    <string name="opens_day_at">Abre o %1$s ás %2$s</string>
-    <string name="closes_day_at">Fecha o %1$s ás %2$s</string>
-    <plurals name="minutes_short">
-        <item quantity="one">%d min</item>
-        <item quantity="other">%d min</item>
-    </plurals>
-    <string name="editor_mark_business_vacant_description">Usa isto se a empresa marchou e o espazo está baleiro e preparado para un novo proxecto.</string>
-    <string name="editor_submit">Enviar</string>
-    <string name="avoid_paved">Evitar estradas asfaltadas</string>
-    <string name="editor_business_vacant_button">Dispoñible para empresas</string>
-    <string name="editor_mark_business_vacant_title">Marcar como dispoñible para negocios</string>
 </resources>
--- a/android/app/src/main/res/values-it/strings.xml
+++ b/android/app/src/main/res/values-it/strings.xml
@@ -891,8 +891,4 @@
    <string name="unknown_count">sconosciuto</string>
    <string name="error_value_must_be_positive">Il valore deve essere positivo</string>
    <string name="error_invalid_number">Numero non valido</string>
-    <string name="editor_business_vacant_button">L\'attività è vacante</string>
-    <string name="editor_mark_business_vacant_title">Contrassegna l\'attività come vacante</string>
-    <string name="editor_mark_business_vacant_description">Utilizza questa opzione se l\'azienda ha traslocato e lo spazio è vuoto e pronto per un nuovo inquilino.</string>
-    <string name="editor_submit">Conferma</string>
 </resources>
--- a/android/app/src/main/res/values-lv/strings.xml
+++ b/android/app/src/main/res/values-lv/strings.xml
@@ -506,9 +506,9 @@
    <!-- Error message for "Place doesn't exist" dialog when comment is empty -->
    <string name="delete_place_empty_comment_error">Norādiet šīs vietas dzēšanas iemeslu</string>
    <!-- Phone number error message -->
-    <string name="error_enter_correct_phone">Jāievada derīgs tālruņa numurs</string>
-    <string name="error_enter_correct_web">Jāievada derīga tīmekļa adrese</string>
-    <string name="error_enter_correct_email">Jāievada derīga e-pasta adrese</string>
+    <string name="error_enter_correct_phone">Ierakstiet derīgu tālruņa numuru</string>
+    <string name="error_enter_correct_web">Ierakstiet derīgu tīmekļa vietnes adresi</string>
+    <string name="error_enter_correct_email">Ierakstiet e-pasta adresi</string>
    <string name="error_enter_correct_facebook_page">Ierakstiet „Facebook“ lapas adresi, kontu vai mājaslapas nosaukumu</string>
    <string name="error_enter_correct_instagram_page">Ierakstiet „Instagram“ vietnes adresi vai konta nosaukumu</string>
    <string name="error_enter_correct_twitter_page">Ierakstiet „Twitter“ vietnes adresi vai lietotājvārdu</string>
@@ -518,8 +518,8 @@
    <!-- Displayed when saving some edits to the map to warn against publishing personal data -->
    <string name="editor_share_to_all_dialog_title">Vai vēlaties to nosūtīt visiem lietotājiem?</string>
    <!-- Dialog before publishing the modifications to the public map. -->
-    <string name="editor_share_to_all_dialog_message_1">Jāpārliecinās, ka neievadīji nekādus privātus vai personīgus datus.</string>
-    <string name="editor_share_to_all_dialog_message_2">OpenStreetMap redaktori pārbaudīs veiktās izmaiņas, un sazināsies ar Tevi, ja viņiem būs kādi jautājumi.</string>
+    <string name="editor_share_to_all_dialog_message_1">Jāpārliecinās, ka neievadīji nekādus privātus vai personīgus datus</string>
+    <string name="editor_share_to_all_dialog_message_2">OpenStreetMap redaktori pārbaudīs veiktās izmaiņas, un sazināsies ar Tevi, ja viņiem būs kādi jautājumi</string>
    <string name="navigation_stop_button">Apturēt</string>
    <!-- Shown as toast when starting the recent track recording -->
    <string name="track_recording">Maršruta reģistrēšana</string>
@@ -845,5 +845,4 @@
    <string name="clear">Notīrīt</string>
    <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>
 </resources>
--- a/android/app/src/main/res/values-nb/strings.xml
+++ b/android/app/src/main/res/values-nb/strings.xml
@@ -522,8 +522,8 @@
    <!-- Displayed when saving some edits to the map to warn against publishing personal data -->
    <string name="editor_share_to_all_dialog_title">Vil du sende det til alle brukere?</string>
    <!-- Dialog before publishing the modifications to the public map. -->
-    <string name="editor_share_to_all_dialog_message_1">Sørg for at du ikke har angitt noen private eller personlige data.</string>
-    <string name="editor_share_to_all_dialog_message_2">OpenStreetMap-redaktører vil sjekke endringene og kontakte deg hvis de har spørsmål.</string>
+    <string name="editor_share_to_all_dialog_message_1">Sørg for at du ikke har angitt noen private eller personlige data</string>
+    <string name="editor_share_to_all_dialog_message_2">OpenStreetMap-redaktører vil sjekke endringene og kontakte deg hvis de har spørsmål</string>
    <string name="navigation_stop_button">Stopp</string>
    <!-- Shown as toast when starting the recent track recording -->
    <string name="track_recording">Tar opp sporet</string>
@@ -894,5 +894,4 @@
    <string name="opens_day_at">Åpner %1$s %2$s</string>
    <string name="closes_at">Stenger %s</string>
    <string name="opens_at">Åpner %s</string>
-    <string name="editor_submit">Send</string>
 </resources>
--- a/android/app/src/main/res/values-night/colors.xml
+++ b/android/app/src/main/res/values-night/colors.xml
@@ -3,7 +3,7 @@
  <color name="base_accent">#FF7CBC7B</color>
  <color name="base_accent_pressed">#FF588157</color>

-  <color name="icon_tint">#FFF</color>
+  <color name="icon_tint">#FFC4C6C7</color>

  <color name="icon_tint_light">#FF76797C</color>

--- a/android/app/src/main/res/values-night/themes.xml
+++ b/android/app/src/main/res/values-night/themes.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:tools="http://schemas.android.com/tools">
-  <style name="MwmTheme.Base" parent="Theme.MaterialComponents.DayNight.NoActionBar.Bridge">
+  <style name="MwmTheme.Base" parent="Theme.Material3.DayNight.NoActionBar">
    <item name="materialCalendarStyle">@style/Widget.MaterialComponents.MaterialCalendar</item>
    <item name="materialCalendarFullscreenTheme">@style/MwmWidget.MaterialCalendar.Theme.FullScreen.Dark</item>
    <item name="materialCalendarTheme">@style/MwmWidget.MaterialCalendar.Theme.Dark</item>
@@ -121,11 +121,17 @@
    <item name="colorSecondary">@color/base_accent</item>
    <item name="colorPrimaryContainer">?colorSecondary</item>
    <item name="colorOnPrimaryContainer">?android:textColorPrimaryInverse</item>
+    <item name="colorOnSurfaceInverse">?android:textColorPrimaryInverse</item>
+    <item name="colorPrimaryInverse">?colorSecondary</item>
+    <item name="android:textColorLink">?colorSecondary</item>
+    <item name="colorOnSurfaceVariant">?colorSecondary</item>
+    <item name="colorControlActivated">?colorSecondary</item>
+    <item name="colorOutlineVariant">@color/divider</item>
  </style>

  <style name="MwmTheme" parent="MwmTheme.Base"/>

-  <style name="MwmTheme.DialogFragment.Fullscreen" parent="Theme.AppCompat.DayNight">
+  <style name="MwmTheme.DialogFragment.Fullscreen" parent="Theme.Material3.DayNight">
    <item name="colorControlNormal">@color/text_dark_hint</item>
    <item name="android:textColorHint">@color/text_light_hint</item>
  </style>
--- a/android/app/src/main/res/values-nl/strings.xml
+++ b/android/app/src/main/res/values-nl/strings.xml
@@ -520,8 +520,8 @@
    <!-- Displayed when saving some edits to the map to warn against publishing personal data -->
    <string name="editor_share_to_all_dialog_title">Wil je het naar alle gebruikers sturen?</string>
    <!-- Dialog before publishing the modifications to the public map. -->
-    <string name="editor_share_to_all_dialog_message_1">Controleer dat je geen persoonlijke gegevens hebt ingevoerd.</string>
-    <string name="editor_share_to_all_dialog_message_2">OpenStreetMap-editors zullen de wijzigingen controleren en contact met u opnemen als ze vragen hebben.</string>
+    <string name="editor_share_to_all_dialog_message_1">Controleer dat je geen persoonlijke gegevens hebt ingevoerd</string>
+    <string name="editor_share_to_all_dialog_message_2">OpenStreetMap-editors zullen de wijzigingen controleren en contact met u opnemen als ze vragen hebben</string>
    <string name="navigation_stop_button">Stop</string>
    <!-- Shown as toast when starting the recent track recording -->
    <string name="track_recording">Spoor opnemen</string>
--- a/android/app/src/main/res/values-pt-rBR/strings.xml
+++ b/android/app/src/main/res/values-pt-rBR/strings.xml
@@ -462,8 +462,8 @@
    <!-- Displayed when saving some edits to the map to warn against publishing personal data -->
    <string name="editor_share_to_all_dialog_title">Deseja enviar para todos os usuários?</string>
    <!-- Dialog before publishing the modifications to the public map. -->
-    <string name="editor_share_to_all_dialog_message_1">Certifique-se de não ter incluído nenhum dado privado ou pessoal.</string>
-    <string name="editor_share_to_all_dialog_message_2">Os mapeadores do OpenStreetMap verificarão as alterações e entrarão em contato caso tenham alguma dúvida.</string>
+    <string name="editor_share_to_all_dialog_message_1">Certifique-se de não ter incluído nenhum dado privado ou pessoal</string>
+    <string name="editor_share_to_all_dialog_message_2">Os mapeadores do OpenStreetMap verificarão as mudanças e entrarão em contato com você se tiverem alguma dúvida</string>
    <!-- Shown as toast when starting the recent track recording -->
    <string name="track_recording">Registro da pista</string>
    <!-- For the first routing -->
@@ -880,8 +880,4 @@
        <item quantity="many">%d min</item>
        <item quantity="other">%d min</item>
    </plurals>
-    <string name="editor_business_vacant_button">Local está desocupado</string>
-    <string name="editor_mark_business_vacant_title">Marcar local como desocupado</string>
-    <string name="editor_mark_business_vacant_description">Use isto se o estabelecimento mudou de endereço ou o local está vago e disponível para outra empresa.</string>
-    <string name="editor_submit">Enviar</string>
 </resources>
--- a/android/app/src/main/res/values-ro/strings.xml
+++ b/android/app/src/main/res/values-ro/strings.xml
@@ -387,10 +387,10 @@
    <string name="editor_time_open">Deschis</string>
    <string name="editor_time_close">Închis</string>
    <string name="editor_time_add_closed">Adaugă ore de închidere</string>
-    <string name="editor_time_title">Program</string>
+    <string name="editor_time_title">Ore de deschidere</string>
    <string name="editor_time_advanced">Mod Avansat</string>
    <string name="editor_time_simple">Mod simplu</string>
-    <string name="editor_hours_closed">Pauză</string>
+    <string name="editor_hours_closed">Ore de închidere</string>
    <string name="editor_example_values">Exemple</string>
    <string name="editor_correct_mistake">Corectare greșeală</string>
    <string name="editor_add_select_location">Selectați locația</string>
@@ -867,16 +867,4 @@
    <string name="pref_tts_no_system_tts_short">Nu s-a găsit un motor de text-to-speech, verifică setările aplicației</string>
    <string name="osm_note_hint">Sau, alternativ, lăsați un mesaj comunității OpenStreetMap, astfel încât altcineva să poată adăuga sau corecta un loc aici.</string>
    <string name="osm_note_toast">Nota va fi trimisă către OpenStreetMap</string>
-    <string name="opens_at">Deschide la %s</string>
-    <string name="closes_at">Închide la %s</string>
-    <string name="opens_day_at">Deschide %1$s la %2$s</string>
-    <string name="closes_day_at">Închide %1$s la %2$s</string>
-    <string name="editor_business_vacant_button">Magazinul este vacant</string>
-    <string name="editor_mark_business_vacant_title">Machează magazinul ca vacant</string>
-    <string name="editor_place_doesnt_exist_description">Descrie cum arată locul acum ca să trimiți o notiță comunității OpenStreetMap</string>
-    <string name="editor_mark_business_vacant_description">Folosește acest buton dacă magazinul a plecat din spațiu și spațiul este gol, aștepând alt magazin.</string>
-    <string name="editor_submit">Trimite</string>
-    <string name="avoid_paved">Evită drumurile pavate</string>
-    <string name="avoid_steps">Evită treptele</string>
-    <string name="offline_explanation_text">O hartă trebuie descărcată ca să vezi și si să nevighezi prin zonă.\nDescarcă hărți pentru zonele în care vrei să mergi.</string>
 </resources>
--- a/android/app/src/main/res/values-sr/strings.xml
+++ b/android/app/src/main/res/values-sr/strings.xml
@@ -513,8 +513,8 @@
    <!-- Displayed when saving some edits to the map to warn against publishing personal data -->
    <string name="editor_share_to_all_dialog_title">Да ли желите да поделите са свим другим корисницима?</string>
    <!-- Dialog before publishing the modifications to the public map. -->
-    <string name="editor_share_to_all_dialog_message_1">Проверите да нисте унели приватне или личне податке.</string>
-    <string name="editor_share_to_all_dialog_message_2">OpenStreetMap мапери ће проверити промене и контактирати Вас уколико буду имали питања.</string>
+    <string name="editor_share_to_all_dialog_message_1">Проверите да нисте унели приватне или личне податке</string>
+    <string name="editor_share_to_all_dialog_message_2">OpenStreetMap мапери ће проверити промене и контактирати Вас уколико буду имали питања</string>
    <string name="navigation_stop_button">Стоп</string>
    <!-- Shown as toast when starting the recent track recording -->
    <string name="track_recording">Снимање путање</string>
--- a/android/app/src/main/res/values-ta/strings.xml
+++ b/android/app/src/main/res/values-ta/strings.xml
@@ -449,8 +449,8 @@
    <string name="opens_day_at">%1$s அன்று %2$sக்கு திறக்கப்படும்</string>
    <string name="closes_day_at">%1$s அன்று %2$s இல் மூடப்படும்</string>
    <plurals name="minutes_short">
-        <item quantity="one">%d நிமையம்</item>
-        <item quantity="other">%d நிமையங்கள்</item>
+        <item quantity="one">%dmin</item>
+        <item quantity="other">%dmin</item>
    </plurals>
    <string name="hours_confirmed_time_ago">%s உறுதிப்படுத்தப்பட்டது</string>
    <string name="existence_confirmed_time_ago">இருப்பு உறுதிப்படுத்தப்பட்டது %s</string>
@@ -626,18 +626,4 @@
    <string name="charge_socket_chademo">சேட்மோ</string>
    <string name="unknown_socket_type">தெரியாத சாக்கெட்</string>
    <string name="unknow_socket_type">தெரியாத சாக்கெட்</string>
-    <string name="edit_socket_info_tooltip">புதிய சாக்கெட்டுகளை உருவாக்கவும் அல்லது ஏற்கனவே உள்ளவற்றைத் திருத்தவும்.</string>
-    <string name="charging_station_available_sockets">கிடைக்கும் சாக்கெட்டுகள்</string>
-    <string name="charge_socket_unknown_other">மற்றவை அல்லது தெரியாதவை</string>
-    <string name="charge_socket_count">எண்ணுங்கள்</string>
-    <string name="charge_socket_power">ஆற்றல் (kW)</string>
-    <string name="editor_socket">சாக்கெட்டை திருத்து</string>
-    <string name="unknown_count">தெரியவில்லை</string>
-    <string name="error_value_must_be_positive">மதிப்பு நேர்மறையாக இருக்க வேண்டும்</string>
-    <string name="error_invalid_number">தவறான எண்</string>
-    <string name="list_description_empty">விளக்கத்தைச் சேர்க்க பட்டியலைத் திருத்தவும்</string>
-    <string name="editor_business_vacant_button">வணிகம் காலியாக உள்ளது</string>
-    <string name="editor_mark_business_vacant_title">வணிகம் காலியாக இருப்பதாகக் குறி</string>
-    <string name="editor_mark_business_vacant_description">வணிகம் வெளியேறி, இடம் காலியாக இருந்தால் மற்றும் புதிய குத்தகைதாரருக்கு தயாராக இருந்தால் இதைப் பயன்படுத்தவும்.</string>
-    <string name="editor_submit">சமர்ப்பி</string>
 </resources>
--- a/android/app/src/main/res/values-zh/strings.xml
+++ b/android/app/src/main/res/values-zh/strings.xml
@@ -530,8 +530,8 @@
    <!-- Displayed when saving some edits to the map to warn against publishing personal data -->
    <string name="editor_share_to_all_dialog_title">您想要发送给所有用户吗？</string>
    <!-- Dialog before publishing the modifications to the public map. -->
-    <string name="editor_share_to_all_dialog_message_1">请确保您没有输入任何私人或个人数据。</string>
-    <string name="editor_share_to_all_dialog_message_2">OpenStreetMap 编辑人员将检查更改，如有任何疑问，将与您联系。</string>
+    <string name="editor_share_to_all_dialog_message_1">请确保您没有输入任何私人或个人数据</string>
+    <string name="editor_share_to_all_dialog_message_2">OpenStreetMap 编辑人员将检查更改，如有任何疑问，将与您联系</string>
    <string name="navigation_stop_button">停止</string>
    <!-- Shown as toast when starting the recent track recording -->
    <string name="track_recording">记录轨迹</string>
@@ -634,7 +634,7 @@
    <!-- Recommended length for CarPlay and Android Auto is around 25-27 characters -->
    <string name="avoid_tolls">避开收费公路</string>
    <!-- Recommended length for CarPlay and Android Auto is around 25-27 characters -->
-    <string name="avoid_unpaved">避开非铺装道路</string>
+    <string name="avoid_unpaved">避开非铺装道路‌</string>
    <!-- Recommended length for CarPlay and Android Auto is around 25-27 characters -->
    <string name="avoid_ferry">避开轮渡</string>
    <string name="avoid_motorways">避开高速公路</string>
@@ -643,7 +643,7 @@
    <string name="define_to_avoid_btn">选择要避开的道路</string>
    <string name="change_driving_options_btn">绕行设置已开启</string>
    <string name="toll_road">收费公路</string>
-    <string name="unpaved_road">非铺装道路</string>
+    <string name="unpaved_road">非铺装道路‌</string>
    <string name="ferry_crossing">轮渡</string>
    <!-- A generic "Yes" button in dialogs -->
    <string name="yes">是</string>
--- a/android/app/src/main/res/values/colors.xml
+++ b/android/app/src/main/res/values/colors.xml
@@ -74,8 +74,8 @@
  <color name="bg_statusbar_translucent">#66000000</color>

  <!-- App icons background and foreground colors -->
-  <color name="bg_app_icon_release">#588157</color>
-  <color name="bg_app_icon_test">#588157</color>
+  <color name="bg_app_icon_release">@color/bg_primary</color>
+  <color name="bg_app_icon_test">@color/bg_primary</color>
  <color name="bg_app_icon_debug">#f8b42e</color>

  <color name="fg_app_icon_white">#fefdf6</color>
--- a/android/app/src/main/res/values/dimens.xml
+++ b/android/app/src/main/res/values/dimens.xml
@@ -183,4 +183,5 @@
  <!--App Icons -->
  <dimen name="app_icon_border_width">0.8</dimen>

+  <dimen name="routing_toolbar_button">40dp</dimen>
 </resources>
--- a/android/app/src/main/res/values/donottranslate.xml
+++ b/android/app/src/main/res/values/donottranslate.xml
@@ -100,5 +100,4 @@
  <string name="pixelfed" translatable="false">Pixelfed</string>
  <string name="count_label" translatable="false">× %d</string>
  <string name="kw_label" translatable="false">%s kW</string>
-  <string name="phone_format" translatable="false">+ XX X XX XX XX</string>
 </resources>
--- a/android/app/src/main/res/values/strings.xml
+++ b/android/app/src/main/res/values/strings.xml
@@ -578,8 +578,8 @@
    <!-- Displayed when saving some edits to the map to warn against publishing personal data -->
    <string name="editor_share_to_all_dialog_title">Do you want to send it to all users?</string>
    <!-- Dialog before publishing the modifications to the public map. -->
-    <string name="editor_share_to_all_dialog_message_1">Make sure you did not enter any private or personal data.</string>
-    <string name="editor_share_to_all_dialog_message_2">OpenStreetMap editors will check the changes and contact you if they have any questions.</string>
+    <string name="editor_share_to_all_dialog_message_1">Make sure you did not enter any private or personal data</string>
+    <string name="editor_share_to_all_dialog_message_2">OpenStreetMap editors will check the changes and contact you if they have any questions</string>
    <string name="navigation_stop_button">Stop</string>
    <!-- Shown as toast when starting the recent track recording -->
    <string name="track_recording">Recording the track</string>
--- a/android/app/src/main/res/values/styles-editor.xml
+++ b/android/app/src/main/res/values/styles-editor.xml
@@ -57,12 +57,14 @@
  <style name="MwmWidget.Editor.CustomTextInput">
    <item name="android:layout_height">wrap_content</item>
    <item name="android:layout_width">match_parent</item>
+    <item name="android:textColorHint">?iconTint</item>
  </style>

  <style name="MwmWidget.Editor.FieldLayout">
    <item name="android:layout_width">match_parent</item>
    <item name="android:layout_height">wrap_content</item>
    <item name="android:layout_marginStart">@dimen/editor_margin_left</item>
+    <item name="android:textColorHighlight">?colorPrimary</item>
  </style>

  <style name="MwmWidget.Editor.FieldLayout.EditText" parent="MwmWidget.Editor">
@@ -83,4 +85,13 @@
    <item name="android:clickable">true</item>
    <item name="android:textAppearance">@style/MwmTextAppearance.Body1</item>
  </style>
+
+  <style name="MwmWidget.M3.Editor.CardView" parent="Widget.Material3.CardView.Elevated">
+    <item name="android:layout_width">match_parent</item>
+    <item name="android:layout_height">wrap_content</item>
+    <item name="android:layout_marginBottom">@dimen/margin_half</item>
+    <item name="cardBackgroundColor">?cardBackground</item>
+    <item name="android:padding">@dimen/margin_base</item>
+    <item name="cardPreventCornerOverlap">false</item>
+  </style>
 </resources>
--- a/android/app/src/main/res/values/styles.xml
+++ b/android/app/src/main/res/values/styles.xml
@@ -35,17 +35,20 @@
    <item name="maxImageSize">34dp</item>
  </style>

-  <style name="MwmWidget.Components.SearchWheel" parent="Theme.Material3.Dark">
+  <style name="MwmWidget.Components.SearchWheel" parent="Widget.MaterialComponents.FloatingActionButton">
    <item name="android:layout_width">wrap_content</item>
    <item name="android:layout_height">wrap_content</item>
    <item name="android:backgroundTint">?menuBackground</item>
+    <item name="backgroundTint">?menuBackground</item>
    <item name="elevation">0dp</item>
    <item name="hoveredFocusedTranslationZ">0dp</item>
    <item name="pressedTranslationZ">0dp</item>
    <item name="android:tint">?iconTint</item>
+    <item name="tint">?iconTint</item>
    <item name="maxImageSize">@dimen/map_button_icon_size</item>
    <item name="borderWidth">0dp</item>
    <item name="fabCustomSize">38dp</item>
+    <item name="ensureMinTouchTargetSize">false</item>
  </style>

  <style name="MwmWidget.MapButton.Bottom">
@@ -138,7 +141,7 @@
    <item name="cornerSize">50%</item>
  </style>

-  <style name="MwmWidget.ToolbarStyle" parent="ThemeOverlay.MaterialComponents.Dark.ActionBar">
+  <style name="MwmWidget.ToolbarStyle" parent="ThemeOverlay.Material3.Dark.ActionBar">
    <item name="android:background">?colorPrimary</item>
    <item name="android:displayOptions">homeAsUp|showTitle</item>
    <item name="contentInsetStart">0dp</item>
@@ -155,7 +158,7 @@
    <item name="android:elevation">0dp</item>
  </style>

-  <style name="MwmWidget.ToolbarTheme" parent="ThemeOverlay.MaterialComponents.Dark.ActionBar">
+  <style name="MwmWidget.ToolbarTheme" parent="ThemeOverlay.Material3.Dark.ActionBar">
    <item name="android:gravity">center_vertical</item>
    <item name="colorAccent">@android:color/white</item>
    <item name="colorSecondary">@android:color/white</item>
@@ -168,7 +171,7 @@
    <item name="colorSecondary">#FF32363A</item>
  </style>

-  <style name="MwmWidget.ToolbarTheme.Transparent" parent="ThemeOverlay.MaterialComponents.Dark.ActionBar">
+  <style name="MwmWidget.ToolbarTheme.Transparent" parent="ThemeOverlay.Material3.Dark.ActionBar">
    <item name="android:gravity">center_vertical</item>
    <item name="colorAccent">@android:color/white</item>
    <item name="colorSecondary">@android:color/white</item>
@@ -178,7 +181,7 @@

  <style
    name="MwmWidget.ToolbarTheme.DownButton"
-    parent="ThemeOverlay.MaterialComponents.Dark.ActionBar">
+    parent="ThemeOverlay.Material3.Dark.ActionBar">
    <item name="android:gravity">center_vertical</item>
    <item name="colorAccent">@android:color/white</item>
    <item name="colorSecondary">@android:color/white</item>
@@ -315,12 +318,12 @@
  </style>

  <style name="MwmWidget.MaterialCalendar.Theme.FullScreen.Dark"
-    parent="ThemeOverlay.MaterialComponents.MaterialCalendar.Fullscreen">
+    parent="ThemeOverlay.Material3.MaterialCalendar.Fullscreen">
    <item name="colorSurface">@color/material_calendar_surface_dark</item>
  </style>

  <style name="MwmWidget.MaterialCalendar.Theme.Dark"
-    parent="ThemeOverlay.MaterialComponents.MaterialCalendar">
+    parent="ThemeOverlay.Material3.MaterialCalendar">
    <item name="colorSurface">@color/material_calendar_surface_dark</item>
  </style>

--- a/android/app/src/main/res/values/themes.xml
+++ b/android/app/src/main/res/values/themes.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:tools="http://schemas.android.com/tools">
  <!-- Default theme -->
-  <style name="MwmTheme.Base" parent="Theme.MaterialComponents.Light.NoActionBar.Bridge">
-    <item name="materialCalendarStyle">@style/Widget.MaterialComponents.MaterialCalendar</item>
-    <item name="materialCalendarFullscreenTheme">@style/ThemeOverlay.MaterialComponents.MaterialCalendar.Fullscreen</item>
-    <item name="materialCalendarTheme">@style/ThemeOverlay.MaterialComponents.MaterialCalendar</item>
+  <style name="MwmTheme.Base" parent="Theme.Material3.Light.NoActionBar">
+    <item name="materialCalendarStyle">@style/Widget.Material3.MaterialCalendar</item>
+    <item name="materialCalendarFullscreenTheme">@style/ThemeOverlay.Material3.MaterialCalendar.Fullscreen</item>
+    <item name="materialCalendarTheme">@style/ThemeOverlay.Material3.MaterialCalendar</item>
    <item name="android:listViewStyle">@style/MwmWidget.ListView</item>
    <item name="android:textViewStyle">@style/MwmWidget.TextView</item>
    <item name="android:forceDarkAllowed" tools:targetApi="Q">false</item>
@@ -128,6 +128,12 @@
    <item name="colorSecondary">@color/base_accent</item>
    <item name="colorPrimaryContainer">?colorSecondary</item>
    <item name="colorOnPrimaryContainer">?android:textColorPrimaryInverse</item>
+    <item name="colorOnSurfaceInverse">?android:textColorPrimaryInverse</item>
+    <item name="colorPrimaryInverse">?colorSecondary</item>
+    <item name="android:textColorLink">?colorSecondary</item>
+    <item name="colorOnSurfaceVariant">?colorSecondary</item>
+    <item name="colorControlActivated">?colorSecondary</item>
+    <item name="colorOutlineVariant">@color/divider</item>

  </style>

@@ -161,7 +167,7 @@
    <item name="android:windowBackground">@color/bg_window</item>
  </style>

-  <style name="MwmTheme.AlertDialog" parent="Theme.MaterialComponents.DayNight.Dialog.Alert">
+  <style name="MwmTheme.AlertDialog" parent="Theme.Material3.DayNight.Dialog.Alert">
    <item name="colorAccent">?buttonDialogTextColor</item>
    <item name="colorSecondary">?buttonDialogTextColor</item>
    <item name="colorPrimary">?buttonDialogTextColor</item>
@@ -180,7 +186,7 @@
    <item name="android:textColor">?titleDialogTheme</item>
  </style>

-  <style name="MwmTheme.DialogFragment.Fullscreen" parent="Theme.AppCompat.Light">
+  <style name="MwmTheme.DialogFragment.Fullscreen" parent="Theme.Material3.Light">
    <item name="android:colorPrimaryDark">?statusBar</item>
    <item name="colorAccent">@color/base_accent</item>
    <item name="colorPrimary">@color/bg_primary</item>
@@ -247,7 +253,7 @@
    <item name="iconTint">@color/white_primary</item>
  </style>

-  <style name="PopupMenu" parent="ThemeOverlay.MaterialComponents">
+  <style name="PopupMenu" parent="ThemeOverlay.Material3">
    <item name="android:popupBackground">?windowBackgroundForced</item>
  </style>
 </resources>
--- a/android/sdk/src/main/java/app/organicmaps/sdk/location/LocationHelper.java
+++ b/android/sdk/src/main/java/app/organicmaps/sdk/location/LocationHelper.java
@@ -26,6 +26,7 @@ import app.organicmaps.sdk.util.LocationUtils;
 import app.organicmaps.sdk.util.NetworkPolicy;
 import app.organicmaps.sdk.util.log.Logger;
 import org.chromium.base.ObserverList;
+import java.util.ArrayList;

 public class LocationHelper implements BaseLocationProvider.Listener
 {
@@ -35,6 +36,8 @@ public class LocationHelper implements BaseLocationProvider.Listener
  private static final long AGPS_EXPIRATION_TIME_MS = 16 * 60 * 60 * 1000; // 16 hours
  private static final long LOCATION_UPDATE_TIMEOUT_MS = 30 * 1000; // 30 seconds

+  private static final double SPEED_AVERAGING_TIME = 0.5; // 0.5 seconds
+
  @NonNull
  private final Context mContext;
  @NonNull
@@ -56,6 +59,10 @@ public class LocationHelper implements BaseLocationProvider.Listener
  private Handler mHandler;
  private Runnable mLocationTimeoutRunnable = this::notifyLocationUpdateTimeout;

+  private double mTimeElapsedAtLastAverage = Double.NaN;
+  private float mLastAverageSpeed = Float.NaN;
+  private ArrayList<Float> mSpeedHistory = new ArrayList<>();
+
  @NonNull
  private final GnssStatusCompat.Callback mGnssStatusCallback = new GnssStatusCompat.Callback() {
    @Override
@@ -167,6 +174,8 @@ public class LocationHelper implements BaseLocationProvider.Listener
                                        mSavedLocation.getLongitude(), mSavedLocation.getAccuracy(),
                                        mSavedLocation.getAltitude(), mSavedLocation.getSpeed(),
                                        mSavedLocation.getBearing());
+
+    updateSpeedHistory();
  }

  private void notifyLocationUpdateTimeout()
@@ -479,4 +488,41 @@ public class LocationHelper implements BaseLocationProvider.Listener
      Framework.nativeRunFirstLaunchAnimation();
    }
  }
+
+  private void updateSpeedHistory()
+  {
+    if (mSavedLocation == null)
+    {
+      return;
+    }
+
+    if (Double.isNaN(mTimeElapsedAtLastAverage))
+    {
+      mTimeElapsedAtLastAverage = mSavedLocation.getElapsedRealtimeNanos() * 1.0E-9;
+    }
+    mSpeedHistory.add(mSavedLocation.getSpeed());
+  }
+
+  public float getAverageSpeed()
+  {
+    if (mSavedLocation == null)
+      return Float.NaN;
+    if (Double.isNaN(mTimeElapsedAtLastAverage))
+      updateSpeedHistory();
+    double timeDiff = mSavedLocation.getElapsedRealtimeNanos() * 1.0E-9 - mTimeElapsedAtLastAverage;
+    if (timeDiff < SPEED_AVERAGING_TIME || mSpeedHistory.isEmpty())
+    {
+      if (!Float.isNaN(mLastAverageSpeed))
+        return mLastAverageSpeed;
+      else
+        return mSavedLocation.getSpeed();
+    }
+    else {
+      mLastAverageSpeed = mSpeedHistory.stream().reduce(0.0F, Float::sum);
+      mLastAverageSpeed /= mSpeedHistory.size();
+      mSpeedHistory.clear();
+      mTimeElapsedAtLastAverage = mSavedLocation.getElapsedRealtimeNanos() * 1.0E-9;
+      return mLastAverageSpeed;
+    }
+  }
 }
--- a/android/sdk/src/main/res/values-cs/types_strings.xml
+++ b/android/sdk/src/main/res/values-cs/types_strings.xml
@@ -306,7 +306,7 @@
    <string name="type.entrance">Vchod</string>
    <!-- This is for main/primary entrances, for secondary entrances see type.entrance -->
    <string name="type.entrance.main">Hlavní vchod</string>
-    <string name="type.entrance.exit">Východ (Pouze)</string>
+    <string name="type.entrance.exit">Východ</string>
    <string name="type.fee.no">Zdarma</string>
    <string name="type.healthcare.laboratory">Lékařská laboratoř</string>
    <string name="type.healthcare.physiotherapist">Fyzioterapeut</string>
@@ -1001,7 +1001,7 @@
    <string name="type.shop.jewelry">Klenotnictví</string>
    <string name="type.shop.kitchen">Prodejna kuchyní</string>
    <string name="type.shop.laundry">Prádelna</string>
-    <string name="type.shop.mall">Obchodní centrum</string>
+    <string name="type.shop.mall">Obchoďák</string>
    <string name="type.shop.massage">Masážní salon</string>
    <string name="type.shop.mobile_phone">Obchod s mobilními telefony</string>
    <string name="type.shop.money_lender">Půjčovatel peněz</string>
@@ -1439,61 +1439,4 @@
    <string name="type.leisure.indoor_play">Vnitřní herní centrum</string>
    <string name="type.shop.telecommunication">Telekomunikační obchod</string>
    <string name="type.amenity.car_pooling">Spolujízda</string>
-    <string name="type.man_made.telescope">Teleskop</string>
-    <string name="type.amenity.sailing_school">Jachtařská škola</string>
-    <string name="type.amenity.flight_school">Letecká škola</string>
-    <string name="type.amenity.prep_school">Přípravná škola</string>
-    <string name="type.emergency.access_point">Nouzový bod záchrany</string>
-    <string name="type.emergency.life_ring">Záchranný kruh</string>
-    <string name="type.shop.beauty.day_spa">Denní lázně</string>
-    <string name="type.social_facility.food_bank">Potravinová banka</string>
-    <string name="type.man_made.telescope.optical">Teleskop (optický)</string>
-    <string name="type.man_made.telescope.radio">Teleskop (rádio)</string>
-    <string name="type.man_made.telescope.gamma">Teleskop (gamma)</string>
-    <string name="type.man_made.observatory">Observatoř</string>
-    <string name="type.social_facility.soup_kitchen">Vývařovna</string>
-    <string name="type.amenity.food_sharing">Food sharing</string>
-    <string name="type.amenity.give_box">Give Box</string>
-    <string name="type.beacon.cardinal.east">Kardinální baken</string>
-    <string name="type.beacon.cardinal.north">Kardinální baken</string>
-    <string name="type.beacon.cardinal.south">Kardinální baken</string>
-    <string name="type.beacon.cardinal.west">Kardinální baken</string>
-    <string name="type.beacon.isolated_danger">Izolovaný výstražný baken</string>
-    <string name="type.beacon.lateral.port">Laterální baken</string>
-    <string name="type.beacon.lateral.starboard">Laterální baken</string>
-    <string name="type.beacon.safe_water">Baken pro bezpečnou vodu</string>
-    <string name="type.beacon.special_purpose">Baken pro speciální účely</string>
-    <string name="type.buoy.cardinal.east">Kardinální bóje</string>
-    <string name="type.buoy.cardinal.north">Kardinální bóje</string>
-    <string name="type.buoy.cardinal.south">Kardinální bóje</string>
-    <string name="type.buoy.cardinal.west">Kardinální bóje</string>
-    <string name="type.buoy.isolated_danger">Izolovaná výstražná bóje</string>
-    <string name="type.buoy.lateral.port">Laterální bóje</string>
-    <string name="type.buoy.lateral.starboard">Laterální bóje</string>
-    <string name="type.buoy.safe_water">Bóje pro bezpečnou vodu</string>
-    <string name="type.buoy.special_purpose">Bóje pro speciální účely</string>
-    <string name="type.spherical_buoy.cardinal.east">Sférická kardinální bóje</string>
-    <string name="type.spherical_buoy.cardinal.north">Sférická kardinální bóje</string>
-    <string name="type.spherical_buoy.cardinal.south">Sférická kardinální bóje</string>
-    <string name="type.spherical_buoy.cardinal.west">Sférická kardinální bóje</string>
-    <string name="type.spherical_buoy.isolated_danger">Sférická izolovaná výstražná bóje</string>
-    <string name="type.spherical_buoy.lateral.port">Sférická laterální bóje</string>
-    <string name="type.spherical_buoy.lateral.starboard">Sférická laterální bóje</string>
-    <string name="type.spherical_buoy.safe_water">Sférická bóje pro bezpečnou vodu</string>
-    <string name="type.spherical_buoy.special_purpose">Sférická bóje pro speciální účely</string>
-    <string name="type.lateral.port">Levobok</string>
-    <string name="type.lateral.starboard">Pravobok</string>
-    <string name="type.cardinal.east">Východ</string>
-    <string name="type.cardinal.north">Sever</string>
-    <string name="type.cardinal.south">Jih</string>
-    <string name="type.cardinal.west">Západ</string>
-    <string name="type.entrance.house">Vchod do domu</string>
-    <string name="type.entrance.garage">Vchod do garáže</string>
-    <string name="type.entrance.service">Služební vchod</string>
-    <string name="type.entrance.entry">Vstup (Pouze)</string>
-    <string name="type.entrance.emergency">Nouzový východ</string>
-    <string name="type.natural.sand">Písek</string>
-    <string name="type.natural.tree">Strom</string>
-    <string name="type.shop.beauty.nails">Nehtový salón</string>
-    <string name="type.xmas.tree">Vánoční strom</string>
 </resources>
--- a/android/sdk/src/main/res/values-da/types_strings.xml
+++ b/android/sdk/src/main/res/values-da/types_strings.xml
@@ -1416,8 +1416,5 @@
    <string name="type.social_facility.food_bank">Fødevarebank</string>
    <string name="type.social_facility.soup_kitchen">Suppekøkken</string>
    <string name="type.amenity.food_sharing">Fødevarerdeling</string>
-    <string name="type.amenity.give_box">Bytteboks</string>
-    <string name="type.amenity.sailing_school">Sejlerskole</string>
-    <string name="type.amenity.flight_school">Flyveskole</string>
-    <string name="type.power.portal">Kraftværksportal</string>
+    <string name="type.amenity.give_box">Donationsbøsse</string>
 </resources>
--- a/android/sdk/src/main/res/values-de/types_strings.xml
+++ b/android/sdk/src/main/res/values-de/types_strings.xml
@@ -345,39 +345,6 @@
    <string name="type.emergency.phone">Notruftelefon</string>
    <!-- A place where a lifeguard is on duty. -->
    <string name="type.emergency.lifeguard">Rettungsschwimmer</string>
-    <string name="type.beacon.cardinal.east">Kardinalbake</string>
-    <string name="type.beacon.cardinal.north">Kardinalbake</string>
-    <string name="type.beacon.cardinal.south">Kardinalbake</string>
-    <string name="type.beacon.cardinal.west">Kardinalbake</string>
-    <string name="type.beacon.isolated_danger">Einzelgefahrenbake</string>
-    <string name="type.beacon.lateral.port">Lateralbake</string>
-    <string name="type.beacon.lateral.starboard">Lateralbake</string>
-    <string name="type.beacon.safe_water">Mittefahrwasserbarke</string>
-    <string name="type.beacon.special_purpose">Spezialbake</string>
-    <string name="type.buoy.cardinal.east">Kardinalboje</string>
-    <string name="type.buoy.cardinal.north">Kardinalboje</string>
-    <string name="type.buoy.cardinal.south">Kardinalboje</string>
-    <string name="type.buoy.cardinal.west">Kardinalboje</string>
-    <string name="type.buoy.isolated_danger">Einzelgefahrenboje</string>
-    <string name="type.buoy.lateral.port">Lateralboje</string>
-    <string name="type.buoy.lateral.starboard">Lateralboje</string>
-    <string name="type.buoy.safe_water">Mittefahrwasserboje</string>
-    <string name="type.buoy.special_purpose">Spezialboje</string>
-    <string name="type.spherical_buoy.cardinal.east">Kugelförmige Kardinalboje</string>
-    <string name="type.spherical_buoy.cardinal.north">Kugelförmige Kardinalboje</string>
-    <string name="type.spherical_buoy.cardinal.south">Kugelförmige Kardinalboje</string>
-    <string name="type.spherical_buoy.cardinal.west">Kugelförmige Kardinalboje</string>
-    <string name="type.spherical_buoy.isolated_danger">Kugelförmige Einzelgefahrenboje</string>
-    <string name="type.spherical_buoy.lateral.port">Kugelförmige Lateralboje</string>
-    <string name="type.spherical_buoy.lateral.starboard">Kugelförmige Lateralboje</string>
-    <string name="type.spherical_buoy.safe_water">Kugelförmige Mittefahrwasserboje</string>
-    <string name="type.spherical_buoy.special_purpose">Kugelförmige Spezialboje</string>
-    <string name="type.lateral.port">Backbord</string>
-    <string name="type.lateral.starboard">Steuerbord</string>
-    <string name="type.cardinal.east">Ost</string>
-    <string name="type.cardinal.north">Nord</string>
-    <string name="type.cardinal.south">Süd</string>
-    <string name="type.cardinal.west">West</string>
    <!-- A mountain rescue base for search and rescue activities. -->
    <string name="type.emergency.mountain_rescue">Bergrettungsstation</string>
    <!-- This is for secondary entrances, for main entrances see type.entrance.main -->
@@ -1161,7 +1128,6 @@
    <string name="type.shop.bakery">Bäckerei</string>
    <string name="type.shop.bathroom_furnishing">Badezimmerausstattung</string>
    <string name="type.shop.beauty">Schönheitssalon</string>
-    <string name="type.shop.beauty.nails">Nagelstudio</string>
    <string name="type.shop.beverages">Getränkemarkt</string>
    <string name="type.shop.bicycle">Fahrradladen</string>
    <string name="type.shop.bookmaker">Wettbüro</string>
@@ -1485,19 +1451,10 @@
    <string name="type.shop.telecommunication">Telekommunikationsgeschäft</string>
    <string name="type.man_made.telescope">Teleskop</string>
    <string name="type.man_made.telescope.optical">Teleskop (Optisch)</string>
-    <string name="type.man_made.telescope.radio">Teleskop (Radio)</string>
+    <string name="type.man_made.telescope.radio">Radioteleskop</string>
    <string name="type.man_made.telescope.gamma">Teleskop (Gamma)</string>
    <string name="type.man_made.observatory">Observatorium</string>
    <string name="type.amenity.payment_centre">Zahlungszentrum</string>
    <string name="type.social_facility.soup_kitchen">Suppenküche</string>
    <string name="type.social_facility.food_bank">Tafel</string>
-    <string name="type.amenity.flight_school">Flugschule</string>
-    <string name="type.amenity.sailing_school">Segelschule</string>
-    <string name="type.amenity.prep_school">Nachhilfeschule</string>
-    <string name="type.shop.beauty.day_spa">Tages-Spa</string>
-    <string name="type.amenity.give_box">Spendenbox</string>
-    <string name="type.xmas.tree">Weihnachtsbaum</string>
-    <string name="type.amenity.mobile_money_agent">Mobile Money Vertretung</string>
-    <string name="type.amenity.food_sharing">Food Sharing</string>
-    <string name="type.natural.sand">Sand</string>
 </resources>
--- a/android/sdk/src/main/res/values-es/types_strings.xml
+++ b/android/sdk/src/main/res/values-es/types_strings.xml
@@ -1454,49 +1454,4 @@
    <string name="type.social_facility.soup_kitchen">Comedor social</string>
    <string name="type.amenity.food_sharing">Alimentos compartidos</string>
    <string name="type.amenity.give_box">Give Box</string>
-    <string name="type.amenity.sailing_school">Escuela de vela</string>
-    <string name="type.amenity.flight_school">Escuela de aviación</string>
-    <string name="type.amenity.prep_school">Escuela de tutoría</string>
-    <string name="type.beacon.cardinal.east">Marca cardinal</string>
-    <string name="type.beacon.cardinal.north">Marca cardinal</string>
-    <string name="type.beacon.cardinal.south">Marca cardinal</string>
-    <string name="type.beacon.cardinal.west">Marca cardinal</string>
-    <string name="type.beacon.isolated_danger">Marca de peligro aislado</string>
-    <string name="type.beacon.lateral.port">Marca lateral</string>
-    <string name="type.beacon.lateral.starboard">Marca lateral</string>
-    <string name="type.beacon.safe_water">Marca de aguas navegables</string>
-    <string name="type.beacon.special_purpose">Marca especial</string>
-    <string name="type.buoy.cardinal.east">Boya cardinal</string>
-    <string name="type.buoy.cardinal.north">Boya cardinal</string>
-    <string name="type.buoy.cardinal.south">Boya cardinal</string>
-    <string name="type.buoy.cardinal.west">Boya cardinal</string>
-    <string name="type.buoy.isolated_danger">Boya de peligro aislado</string>
-    <string name="type.buoy.lateral.port">Boya lateral</string>
-    <string name="type.buoy.lateral.starboard">Boya lateral</string>
-    <string name="type.buoy.safe_water">Boya de aguas navegables</string>
-    <string name="type.buoy.special_purpose">Boya de uso especial</string>
-    <string name="type.spherical_buoy.cardinal.east">Boya cardinal especial</string>
-    <string name="type.spherical_buoy.cardinal.north">Boya esférica cardinal</string>
-    <string name="type.spherical_buoy.cardinal.south">Boya esférica cardinal</string>
-    <string name="type.spherical_buoy.cardinal.west">Boya esférica cardinal</string>
-    <string name="type.spherical_buoy.isolated_danger">Boya esférica de peligro aislado</string>
-    <string name="type.spherical_buoy.lateral.port">Boya esférica lateral</string>
-    <string name="type.spherical_buoy.lateral.starboard">Boya esférica lateral</string>
-    <string name="type.spherical_buoy.safe_water">Boya esférica de aguas navegables</string>
-    <string name="type.spherical_buoy.special_purpose">Boya esférica de uso especial</string>
-    <string name="type.lateral.port">Babor</string>
-    <string name="type.lateral.starboard">Estribor</string>
-    <string name="type.cardinal.east">Este</string>
-    <string name="type.cardinal.north">Norte</string>
-    <string name="type.cardinal.south">Sur</string>
-    <string name="type.cardinal.west">Oeste</string>
-    <string name="type.entrance.house">Entrada de casa</string>
-    <string name="type.entrance.garage">Entrada de garaje</string>
-    <string name="type.entrance.service">Entrada de servicio</string>
-    <string name="type.entrance.entry">Entrada (únicamente)</string>
-    <string name="type.entrance.emergency">Salida de emergencia</string>
-    <string name="type.natural.sand">Arena</string>
-    <string name="type.natural.tree">Árbol</string>
-    <string name="type.shop.beauty.day_spa">Spa</string>
-    <string name="type.xmas.tree">Árbol de Navidad</string>
 </resources>
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
eisa01	85ee511d78	[carplay] Use system buttons for better appearance Signed-off-by: eisa01 <eisa01@gmail.com>	2025-11-15 17:57:23 +01:00
Johannes	48d0adf66b	make sure to use the correct myPositionMode terminology	2025-11-15 17:57:22 +01:00
Johannes	3b057bea71	Add position mode toggle for CarPlay	2025-11-15 17:57:22 +01:00
gekeleda	292f84faa8	[android] Fix avg speed display edge case, simplify code Signed-off-by: gekeleda <git@davidgekeler.eu>	2025-11-15 17:57:22 +01:00
David Gekeler	079d51f4af	[android] Clarify speed average behaviour in absence of location updates Signed-off-by: David Gekeler <git@davidgekeler.eu>	2025-11-15 17:57:22 +01:00
David Gekeler	1c5a2ac628	[android] Fix formatting Signed-off-by: David Gekeler <git@davidgekeler.eu>	2025-11-15 17:57:22 +01:00
David Gekeler	82a4058cc3	[android] Add average speed calculation and change speed view to display it Signed-off-by: David Gekeler <git@davidgekeler.eu>	2025-11-15 17:57:22 +01:00
Jean-Baptiste	e3736a8e33	[android] Apply M3 theme like app theme Signed-off-by: Jean-Baptiste <jeanbaptiste.charron@outlook.fr>	2025-11-15 17:57:22 +01:00
Yannik Bloscheck	3536716983	[styles] Added smaller bus stop icons Signed-off-by: Yannik Bloscheck <git@yannikbloscheck.com>	2025-11-15 17:57:22 +01:00
Yannik Bloscheck	11ccb1c1c9	[styles] Differentiate between different entrances Signed-off-by: Yannik Bloscheck <git@yannikbloscheck.com>	2025-11-15 17:57:22 +01:00
Yannik Bloscheck	a6eba0d923	[styles] Adding trees Signed-off-by: Yannik Bloscheck <git@yannikbloscheck.com>	2025-11-15 17:57:22 +01:00
x7z4w	18f034762b	[routing] Faster IndexGraph Signed-off-by: x7z4w <x7z4w@noreply.codeberg.org>	2025-11-15 17:57:22 +01:00
x7z4w	bf07edbc33	[drape] Faster RenderBucket Signed-off-by: x7z4w <x7z4w@noreply.codeberg.org>	2025-11-15 17:57:22 +01:00
map-per	bb9637041d	Use desert color on the world map Signed-off-by: map-per <map-per@gmx.de>	2025-11-15 17:57:22 +01:00
map-per	0fdabef2da	[styles] Add natural=sand Signed-off-by: map-per <map-per@gmx.de>	2025-11-15 17:57:22 +01:00
x7z4w	c49454ec8d	[search] Remove stop words Signed-off-by: x7z4w <x7z4w@noreply.codeberg.org>	2025-11-15 17:57:22 +01:00
Jean-Baptiste	ff8f42214b	[android] Fix background color of edit buttons on Android 5 Signed-off-by: Jean-Baptiste <jeanbaptiste.charron@outlook.fr>	2025-11-15 17:57:22 +01:00
map-per	bd16b516e3	[planet] Update map data to 251112 Signed-off-by: map-per <map-per@gmx.de>	2025-11-15 17:57:22 +01:00