[generator] Add a suffix to the output dir

Signed-off-by: Konstantin Pastbin <konstantin.pastbin@gmail.com>
[core] Add language data to world files
2026-01-08 13:27:57 +00:00 · 2025-11-11 22:44:39 -08:00 · 2025-11-11 22:44:39 -08:00 · 2025-11-11 22:44:39 -08:00 · 2025-11-11 22:44:39 -08:00 · 2025-11-11 22:44:39 -08:00
454 changed files with 3440 additions and 9002 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -222,11 +222,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
@@ -1,11 +1,8 @@
-• OpenStreetMap-Daten vom 16. November
-• Bäume hinzugefügt
-• Kleine Bushaltestellen-Icons die früher angezeigt werden
-• Sichtbarkeit von Eingängen reduziert
-• Neue POI-Typen hinzugefügt
-• Sandflächen werden auf Karte angezeigt
-• Option „Geschäft ist leerstehend” zum OSM-Editor hinzugefügt
-• Straßenbeschilderung in Europa verbessert
-• Option „Asphaltierte Straßen vermeiden” hinzugefügt
-• Icons in den Einstellungen hinzugefügt
-Weitere Änderungen in unseren Codeberg-Versionshinweisen!
+• 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,11 +1,8 @@
-• OpenStreetMap data as of November 16
-• 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
@@ -1,11 +1,7 @@
-• Nuevos datos OSM a 16.11.25
-• Se añaden árboles
-• Se reducen los iconos de paradas de autobús y aparecen antes
-• Se reduce visibilidad de entradas
-• Se añaden muchos tipos de puntos de interés
-• Se muestran las zonas de arena en el mapa
-• Se añade la opción «negocio vacío» al editor
-• Se mejoran las señales de tráfico en Europa
-• Nueva opción «evitar caminos asfaltadas»
-• Nuevos iconos en la página de configuración
+• 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
@@ -1,11 +1,8 @@
-• Données OpenStreetMap du 16 novembre
-• Ajout des arbres
-• Les icônes des arrêts de bus sont plus petites et apparaissent plus tôt
-• Réduction de la visibilité des entrées
-• Ajout de nouveaux types de POI
-• Affichage des zones de sable
-• Nouveau bouton pour signaler un commerce vacant
-• Amélioration des badges routiers en Europe
-• Ajout d'une option pour éviter les routes pavées
-• Ajout d'icônes dans les paramètres
+• 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/it-IT/release-notes.txt
+++ b/android/app/src/fdroid/play/listings/it-IT/release-notes.txt
@@ -1,11 +0,0 @@
-• Mappe OSM al 16 Novembre
-• Aggiunti alberi
-• Fermate bus più piccole e visibili prima
-• Entrate rese meno ingombranti
-• Aggiunti diversi POI
-• Le zone sabbiose sono ora visibili
-• Aggiunta l'opzione di POI vacante nell'editor OSM
-• Migliorate le insegne stradali in Europa
-• Aggiunta opzione per evitare strade pavimentate
-• Aggiunte icone nelle impostazioni
-Visita Codeberg per ulteriori dettagli
--- a/android/app/src/fdroid/play/listings/pt-BR/release-notes.txt
+++ b/android/app/src/fdroid/play/listings/pt-BR/release-notes.txt
@@ -1,11 +1,7 @@
-• Dados OSM de 16/11
-• Adição de árvores ao mapa
-• Ícones de pontos de ônibus menores e exibidos mais cedo
-• Visibilidade reduzida das entradas
-• Adição de diversos outros tipos de Pontos de Interesse
-• Exibição de áreas de areia no mapa
-• Adição de opção de "Estabelecimento vazio" ao editor do OSM
-• Melhorias nas placas de rodovias na Europa
-• Opção para evitar rotas por estradas pavimentadas
-• Adição de ícones nas configurações
-Confira as notas de lançamento do Codeberg para mais detalhes!
+• 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
@@ -1,10 +1,8 @@
-• Карты OpenStreetMap от 16 ноября
-• Добавлены деревья и песчаные области
-• Автобусные остановки показываются раньше, но маленькими иконами
-• Входы разделены по типам
-• В OSM редакторе можно отметить место как неиспользуемое
-• Улучшения в иконках номеров дорог в Европе
-• Возможность избегать дорог с покрытием при построении маршрута
-• Иконки в экране настроек
-• На карту добавлены несколько новых типов объектов 
+• Карты OpenStreetMap от 4 ноября
+• Обновлены цвета иконок на карте, добавлены новые цвета для развлечений, спорта, некоторых бизнесов
+• На зарядных станциях показываются имеющиеся типы разъёмов
+• Добавлены эстрады, скамейки без спинок и лежаки
+• Новые иконки для разных спорт центров, массажных салонов, гостевых домов, некоторых закрытых бизнесов
+• Несколько улучшений и исправлений в поиске
+• Улучшены голосовые подсказки при навигации
 Подробнее смотрите на codeberg.org/comaps/comaps/releases
--- a/android/app/src/fdroid/play/listings/sr/release-notes.txt
+++ b/android/app/src/fdroid/play/listings/sr/release-notes.txt
@@ -1,11 +0,0 @@
-• Подaци са OpenStreetMap-а закључно са 16. новембром
-• Додате ознаке за дрвеће
-• Смањене иконе аутобуских стајалишта и ранији приказ
-• Смањена видљивост улаза
-• Додато неколико нових типова ознака на мапу
-• Приказ пешчаних површина на мапи
-• Додата опција „пословни простор је празан“ у OSM едитору
-• Побољшани путокази у Европи
-• Опција рутирања „избегавај асфалтиране путеве“
-• Додате иконе на страници подешавања
-Погледајте детаље на Codeberg-у за списак свих промена!
--- a/android/app/src/fdroid/play/listings/ta-IN/full-description.txt
+++ b/android/app/src/fdroid/play/listings/ta-IN/full-description.txt
@@ -1,32 +0,0 @@
-OpenStreetMap தரவை அடிப்படையாகக் கொண்ட சமூகம் தலைமையிலான இலவச மற்றும் திறந்த மூல வரைபட பயன்பாடு மற்றும் வெளிப்படைத்தன்மை, தனியுரிமை மற்றும் இலாப நோக்கற்றது ஆகியவற்றுக்கான அர்ப்பணிப்புடன் வலுவூட்டப்பட்டது. CoMaps என்பது ஆர்கானிக் மேப்சின் ஃபோர்க்/ச்பின்-ஆஃப் ஆகும், இது Maps.ME இன் ஃபோர்க் ஆகும். 
-
-திட்டத்திற்கான காரணங்கள் மற்றும் அதன் திசையை <b><i>codeberg.org/comaps</i></b> இல் படிக்கவும். 
-அங்குள்ள சமூகத்தில் சேர்ந்து சிறந்த வரைபட பயன்பாட்டை உருவாக்க உதவுங்கள் 
-• பயன்பாட்டைப் பயன்படுத்தி, அதைப் பற்றிய தகவலைப் பரப்புங்கள் 
-• கருத்துக்களை வழங்கவும் மற்றும் சிக்கல்களைப் புகாரளிக்கவும் 
-• பயன்பாட்டில் அல்லது OpenStreetMap இணையதளத்தில் வரைபடத் தரவைப் புதுப்பிக்கவும் 
-
-‣ <b>ஆஃப்லைனில் கவனம் செலுத்தப்பட்டது</b>: செல்லுலார் சேவையின் தேவையின்றி உங்களின் வெளிநாட்டுப் பயணத்தைத் திட்டமிட்டு வழிநடத்துங்கள், தொலைதூர பயணத்தில் இருக்கும் போது வழிப் புள்ளிகளைத் தேடுங்கள். 
-‣ <b>தனியுரிமைக்கு மதிப்பளித்தல்</b>: பயன்பாடு தனியுரிமையை மனதில் கொண்டு வடிவமைக்கப்பட்டுள்ளது - நபர்களை அடையாளம் காணாது, கண்காணிக்காது மற்றும் தனிப்பட்ட தகவல்களைச் சேகரிக்காது. விளம்பரங்கள் இல்லாதது. 
-‣ <b>எளிமையான மற்றும் மெருகூட்டப்பட்டது</b>: செயல்படும் நற்பொருத்தங்கள் பயன்படுத்த எளிதானது. 
-‣ <b>உங்கள் பேட்டரி மற்றும் இடத்தைச் சேமிக்கிறது</b>: மற்ற வழிசெலுத்தல் பயன்பாடுகளைப் போல உங்கள் பேட்டரியை வெளியேற்றாது. சிறிய வரைபடங்கள் உங்கள் தொலைபேசியில் விலைமதிப்பற்ற இடத்தை சேமிக்கின்றன. 
-‣ <b>இலவசம் மற்றும் சமூகத்தால் உருவாக்கப்பட்டது</b>: OpenStreetMap இல் இடங்களைச் சேர்ப்பதன் மூலமும், சோதனை செய்து, அம்சங்களைப் பற்றிய கருத்துக்களை வழங்குவதன் மூலமும், அவர்களின் மேம்பாட்டுத் திறன்களையும் பணத்தையும் பங்களிப்பதன் மூலமும் உங்களைப் போன்றவர்கள் பயன்பாட்டை உருவாக்க உதவியுள்ளனர். 
-‣ <b>திறந்த மற்றும் வெளிப்படையான முடிவெடுக்கும் மற்றும் நிதியியல், இலாப நோக்கற்ற மற்றும் முழு திறந்த மூல.</b> 
-
-<b>முக்கிய அம்சங்கள்</b>: 
-• கூகுள் மேப்சில் இல்லாத இடங்களுடன் தரவிறக்கம் செய்யக்கூடிய விரிவான வரைபடங்கள் 
-• ஐகிங் பாதைகள், முகாம்கள், நீர் ஆதாரங்கள், சிகரங்கள், விளிம்பு கோடுகள் போன்றவற்றைக் கொண்ட வெளிப்புறப் பயன்முறை 
-• நடைபாதைகள் மற்றும் சைக்கிள் பாதைகள் 
-• உணவகங்கள், எரிவாயு நிலையங்கள், ஓட்டல்கள், கடைகள், சுற்றிப்பார்க்கும் இடங்கள் மற்றும் பல போன்ற ஆர்வமுள்ள இடங்கள் 
-• பெயர் அல்லது முகவரி அல்லது ஆர்வமுள்ள வகை மூலம் தேடவும் 
-• நடைபயிற்சி, சைக்கிள் ஓட்டுதல் அல்லது வண்டி ஓட்டுவதற்கான குரல் அறிவிப்புகளுடன் வழிசெலுத்தல் 
-• ஒரே தட்டினால் உங்களுக்குப் பிடித்த இடங்களை புத்தகக்குறி செய்யவும் 
-• இணைப்பில்லாத விக்கிபீடியா கட்டுரைகள் 
-• சுரங்கப்பாதை போக்குவரத்து அடுக்கு மற்றும் திசைகள் 
-• ட்ராக் ரெக்கார்டிங் 
-• KML, KMZ, GPX வடிவங்களில் புக்மார்க்குகள் மற்றும் டிராக்குகளை ஏற்றுமதி மற்றும் இறக்குமதி செய்யுங்கள் 
-• இரவில் பயன்படுத்த ஒரு இருண்ட பயன்முறை 
-• அடிப்படை உள்ளமைக்கப்பட்ட எடிட்டரைப் பயன்படுத்தி அனைவருக்கும் வரைபடத் தரவை மேம்படுத்தவும் 
-
-<b>சுதந்திரம் இங்கே உள்ளது</b> 
-உங்கள் பயணத்தைக் கண்டறியவும், தனியுரிமை மற்றும் சமூகத்தை முன்னணியில் கொண்டு உலகிற்கு செல்லவும்!
--- 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 +0,0 @@
-எளிய வழிகாட்டி - பயணத்தை மேலும் சுவாரசியமாக்க - சமூகத்தால் இயக்கப்படுகிறது
--- a/android/app/src/fdroid/play/version.yaml
+++ b/android/app/src/fdroid/play/version.yaml
@@ -1 +1 @@
-version: 2025.11.19-2-FDroid+25111902
+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 +0,0 @@
-எளிய வழிகாட்டி - பயணத்தை மேலும் சுவாரசியமாக்க - சமூகத்தால் இயக்கப்படுகிறது
--- 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/downloader/OnmapDownloader.java
+++ b/android/app/src/main/java/app/organicmaps/downloader/OnmapDownloader.java
@@ -4,7 +4,6 @@ import android.location.Location;
 import android.text.TextUtils;
 import android.view.View;
 import android.view.ViewGroup;
-
 import androidx.annotation.Nullable;
 import androidx.core.view.ViewCompat;
 import app.organicmaps.MwmActivity;
@@ -27,10 +26,6 @@ public class OnmapDownloader implements MwmActivity.LeftAnimationTrackListener
 {
  private static boolean sAutodownloadLocked;

-  private static final int HIDE_THRESHOLD = 2;
-  // Default bundles (e.g., world/coasts). Used to approximate “user-downloaded” count.
-  private static final int DEFAULT_MAP_BASELINE = 2;
-
  private final MwmActivity mActivity;
  private final View mFrame;
  private final MaterialTextView mParent;
@@ -38,7 +33,6 @@ public class OnmapDownloader implements MwmActivity.LeftAnimationTrackListener
  private final MaterialTextView mSize;
  private final WheelProgressView mProgress;
  private final MaterialButton mButton;
-  private final View mOfflineExplanation;

  private int mStorageSubscriptionSlot;

@@ -49,10 +43,8 @@ public class OnmapDownloader implements MwmActivity.LeftAnimationTrackListener
    @Override
    public void onStatusChanged(List<MapManager.StorageCallbackData> data)
    {
-      if (mCurrentCountry == null) {
-        updateOfflineExplanationVisibility();
+      if (mCurrentCountry == null)
        return;
-      }

      for (MapManager.StorageCallbackData item : data)
      {
@@ -66,7 +58,7 @@ public class OnmapDownloader implements MwmActivity.LeftAnimationTrackListener
        {
          mCurrentCountry.update();
          updateProgressState(false);
-          updateOfflineExplanationVisibility();
+
          return;
        }
      }
@@ -109,12 +101,6 @@ public class OnmapDownloader implements MwmActivity.LeftAnimationTrackListener
    return enqueued || progress || applying;
  }

-  private void updateOfflineExplanationVisibility() {
-    if (mOfflineExplanation == null) return;
-    // hide once threshold reached; safe to call repeatedly.
-    app.organicmaps.util.UiUtils.showIf(MapManager.nativeGetDownloadedCount() < (DEFAULT_MAP_BASELINE + HIDE_THRESHOLD), mOfflineExplanation);
-  }
-
  private void updateProgressState(boolean shouldAutoDownload)
  {
    updateStateInternal(shouldAutoDownload);
@@ -122,8 +108,6 @@ public class OnmapDownloader implements MwmActivity.LeftAnimationTrackListener

  private void updateStateInternal(boolean shouldAutoDownload)
  {
-    updateOfflineExplanationVisibility();
-
    boolean showFrame =
        (mCurrentCountry != null && !mCurrentCountry.present && !RoutingController.get().isNavigating());
    if (showFrame)
@@ -207,9 +191,6 @@ public class OnmapDownloader implements MwmActivity.LeftAnimationTrackListener
    mProgress = controls.findViewById(R.id.wheel_downloader_progress);
    mButton = controls.findViewById(R.id.downloader_button);

-    mOfflineExplanation = mFrame.findViewById(R.id.offline_explanation);
-    updateOfflineExplanationVisibility();
-
    mProgress.setOnClickListener(v -> {
      if (mCurrentCountry == null)
        return;
@@ -266,7 +247,6 @@ public class OnmapDownloader implements MwmActivity.LeftAnimationTrackListener

  public void onResume()
  {
-    updateOfflineExplanationVisibility();
    if (mStorageSubscriptionSlot == 0)
    {
      mStorageSubscriptionSlot = MapManager.nativeSubscribe(mStorageCallback);
--- a/android/app/src/main/java/app/organicmaps/editor/EditorFragment.java
+++ b/android/app/src/main/java/app/organicmaps/editor/EditorFragment.java
@@ -153,7 +153,6 @@ public class EditorFragment extends BaseMwmFragment implements View.OnClickListe
  private final Map<Metadata.MetadataType, View> mDetailsBlocks = new HashMap<>();
  private final Map<Metadata.MetadataType, View> mSocialMediaBlocks = new HashMap<>();
  private MaterialButton mReset;
-  private MaterialButton mDisused;

  private EditorHostFragment mParent;

@@ -828,8 +827,6 @@ public class EditorFragment extends BaseMwmFragment implements View.OnClickListe
    osmInfo.setMovementMethod(LinkMovementMethod.getInstance());
    mReset = view.findViewById(R.id.reset);
    mReset.setOnClickListener(this);
-    mDisused = view.findViewById(R.id.disused);
-    mDisused.setOnClickListener(this);

    mDetailsBlocks.put(Metadata.MetadataType.FMD_OPEN_HOURS, blockOpeningHours);
    mDetailsBlocks.put(Metadata.MetadataType.FMD_PHONE_NUMBER, blockPhone);
@@ -897,8 +894,6 @@ public class EditorFragment extends BaseMwmFragment implements View.OnClickListe
      mParent.addLanguage();
    else if (id == R.id.reset)
      reset();
-    else if (id == R.id.disused)
-      placeDisused();
    else if (id == R.id.block_outdoor_seating)
      mOutdoorSeating.toggle();
  }
@@ -944,12 +939,9 @@ public class EditorFragment extends BaseMwmFragment implements View.OnClickListe
    if (mParent.addingNewObject())
    {
      UiUtils.hide(mReset);
-      UiUtils.hide(mDisused);
      return;
    }

-    mDisused.setVisibility(Editor.nativeCanMarkPlaceAsDisused() ? View.VISIBLE : View.GONE);
-
    if (Editor.nativeIsMapObjectUploaded())
    {
      mReset.setText(R.string.editor_place_doesnt_exist);
@@ -1022,19 +1014,6 @@ public class EditorFragment extends BaseMwmFragment implements View.OnClickListe
    dialogFragment.setTextSaveListener(this::commitPlaceDoesntExists);
  }

-  private void placeDisused()
-  {
-    new MaterialAlertDialogBuilder(requireActivity(), R.style.MwmTheme_AlertDialog)
-      .setTitle(R.string.editor_mark_business_vacant_title)
-      .setMessage(R.string.editor_mark_business_vacant_description)
-      .setPositiveButton(R.string.editor_submit, (dlg, which) -> {
-        Editor.nativeMarkPlaceAsDisused();
-        mParent.processEditedFeatures();
-      })
-      .setNegativeButton(android.R.string.cancel, null)
-      .show();
-  }
-
  private void commitPlaceDoesntExists(@NonNull String text)
  {
    Editor.nativePlaceDoesNotExist(text);
--- a/android/app/src/main/java/app/organicmaps/editor/EditorHostFragment.java
+++ b/android/app/src/main/java/app/organicmaps/editor/EditorHostFragment.java
@@ -358,7 +358,7 @@ public class EditorHostFragment
        .show();
  }

-  public void processEditedFeatures()
+  private void processEditedFeatures()
  {
    if (OsmOAuth.isAuthorized())
    {
--- a/android/app/src/main/java/app/organicmaps/editor/LanguagesFragment.java
+++ b/android/app/src/main/java/app/organicmaps/editor/LanguagesFragment.java
@@ -1,10 +1,7 @@
 package app.organicmaps.editor;

-import android.content.res.Configuration;
 import android.os.Bundle;
 import androidx.annotation.NonNull;
-import androidx.core.os.ConfigurationCompat;
-import androidx.core.os.LocaleListCompat;
 import androidx.fragment.app.Fragment;
 import app.organicmaps.base.BaseMwmRecyclerFragment;
 import app.organicmaps.sdk.editor.Editor;
@@ -14,7 +11,6 @@ import java.util.Collections;
 import java.util.Comparator;
 import java.util.HashSet;
 import java.util.List;
-import java.util.Locale;
 import java.util.Set;

 public class LanguagesFragment extends BaseMwmRecyclerFragment<LanguagesAdapter>
@@ -36,23 +32,10 @@ public class LanguagesFragment extends BaseMwmRecyclerFragment<LanguagesAdapter>
    Set<String> existingLanguages =
        args != null ? new HashSet<>(args.getStringArrayList(EXISTING_LOCALIZED_NAMES)) : new HashSet<>();

-    Configuration config = requireContext().getResources().getConfiguration();
-    LocaleListCompat systemLocales = ConfigurationCompat.getLocales(config);
-
    List<Language> languages = new ArrayList<>();
-    List<Language> systemLanguages = new ArrayList<>();
-
    for (Language lang : Editor.nativeGetSupportedLanguages(false))
    {
-      // Separately extract system languages
-      for (int i = 0; i < systemLocales.size(); i++)
-      {
-        Locale locale = systemLocales.get(i);
-        if (locale != null && locale.getLanguage().equals(lang.code))
-          systemLanguages.add(lang);
-      }
-
-      if (existingLanguages.contains(lang.code) || systemLanguages.contains(lang))
+      if (existingLanguages.contains(lang.code))
        continue;

      languages.add(lang);
@@ -60,8 +43,6 @@ public class LanguagesFragment extends BaseMwmRecyclerFragment<LanguagesAdapter>

    Collections.sort(languages, Comparator.comparing(lhs -> lhs.name));

-    languages.addAll(0, systemLanguages);
-
    return new LanguagesAdapter(this, languages.toArray(new Language[languages.size()]));
  }

--- a/android/app/src/main/java/app/organicmaps/editor/SimpleTimetableAdapter.java
+++ b/android/app/src/main/java/app/organicmaps/editor/SimpleTimetableAdapter.java
@@ -1,6 +1,5 @@
 package app.organicmaps.editor;

-import android.content.res.ColorStateList;
 import android.util.SparseArray;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -12,7 +11,6 @@ import androidx.annotation.IdRes;
 import androidx.annotation.IntRange;
 import androidx.annotation.Nullable;
 import androidx.appcompat.widget.SwitchCompat;
-import androidx.core.content.ContextCompat;
 import androidx.fragment.app.Fragment;
 import androidx.recyclerview.widget.RecyclerView;
 import app.organicmaps.R;
@@ -383,29 +381,6 @@ class SimpleTimetableAdapter extends RecyclerView.Adapter<SimpleTimetableAdapter
      final boolean enable = mComplementItem != null && mComplementItem.weekdays.length != 0;
      final String text = mFragment.getString(R.string.editor_time_add);
      mAdd.setEnabled(enable);
-      final ColorStateList bgButtonColor = new ColorStateList(
-              new int[][]{
-                      new int[]{android.R.attr.state_enabled}, // enabled
-                      new int[]{-android.R.attr.state_enabled} // disabled
-                      },
-              new int[]{
-                      ContextCompat.getColor(
-                              mAdd.getContext(), R.color.base_accent),
-                      ContextCompat.getColor(mAdd.getContext(), R.color.button_accent_disabled)
-              });
-      final ColorStateList textButtonColor = new ColorStateList(
-              new int[][]{
-                      new int[]{android.R.attr.state_enabled}, // enabled
-                      new int[]{-android.R.attr.state_enabled} // disabled
-                      },
-              new int[]{
-                      ContextCompat.getColor(
-                              mAdd.getContext(),
-                              UiUtils.getStyledResourceId(mAdd.getContext(), android.R.attr.textColorPrimaryInverse)),
-                      ContextCompat.getColor(mAdd.getContext(), R.color.button_accent_text_disabled)
-              });
-      mAdd.setBackgroundTintList(bgButtonColor);
-      mAdd.setTextColor(textButtonColor);
      mAdd.setText(enable ? text + " (" + TimeFormatUtils.formatWeekdays(mComplementItem) + ")" : text);
    }
  }
--- a/android/app/src/main/java/app/organicmaps/search/SearchAdapter.java
+++ b/android/app/src/main/java/app/organicmaps/search/SearchAdapter.java
@@ -21,9 +21,6 @@ import app.organicmaps.util.UiUtils;

 class SearchAdapter extends RecyclerView.Adapter<SearchAdapter.SearchDataViewHolder>
 {
-  private static final int SHORT_HORIZON_CLOSE_MIN = 60;
-  private static final int SHORT_HORIZON_OPEN_MIN = 15;
-
  private final SearchFragment mSearchFragment;
  @Nullable
  private SearchResult[] mResults;
@@ -152,32 +149,41 @@ class SearchAdapter extends RecyclerView.Adapter<SearchAdapter.SearchDataViewHol
    {
      final Resources resources = mSearchFragment.getResources();

-      if (result.description.openNow != SearchResult.OPEN_NOW_YES && result.description.openNow != SearchResult.OPEN_NOW_NO)
+      switch (result.description.openNow)
      {
-        // Hide if unknown opening hours state
-        UiUtils.hide(mOpen);
-        return;
+      case SearchResult.OPEN_NOW_YES ->
+      {
+        if (result.description.minutesUntilClosed < 60) // less than 1 hour
+        {
+          final String time = result.description.minutesUntilClosed + " " + resources.getString(R.string.minute);
+          final String string = resources.getString(R.string.closes_in, time);
+
+          UiUtils.setTextAndShow(mOpen, string);
+          mOpen.setTextColor(ContextCompat.getColor(mSearchFragment.getContext(), R.color.base_yellow));
+        }
+        else
+        {
+          UiUtils.setTextAndShow(mOpen, resources.getString(R.string.editor_time_open));
+          mOpen.setTextColor(ContextCompat.getColor(mSearchFragment.getContext(), R.color.base_green));
+        }
      }
-
-      final boolean isOpen = result.description.openNow == SearchResult.OPEN_NOW_YES;
-      final int minsToNextState = isOpen ? result.description.minutesUntilClosed : result.description.minutesUntilOpen;
-
-      final boolean shortHorizonClosing = isOpen && minsToNextState >= 0 && minsToNextState <= SHORT_HORIZON_CLOSE_MIN;
-      final boolean shortHorizonOpening = !isOpen && minsToNextState >= 0 && minsToNextState <= SHORT_HORIZON_OPEN_MIN;
-
-      if (shortHorizonClosing || shortHorizonOpening)
+      case SearchResult.OPEN_NOW_NO ->
      {
-        final String minsToChangeStr = resources.getQuantityString(
-            R.plurals.minutes_short, Math.max(minsToNextState, 1), Math.max(minsToNextState, 1));
-        final String nextChangeFormatted = resources.getString(isOpen ? R.string.closes_in : R.string.opens_in, minsToChangeStr);
+        if (result.description.minutesUntilOpen < 60) // less than 1 hour
+        {
+          final String time = result.description.minutesUntilOpen + " " + resources.getString(R.string.minute);
+          final String string = resources.getString(R.string.opens_in, time);

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

--- 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/OpenStateTextFormatter.java
+++ b/android/app/src/main/java/app/organicmaps/widget/placepage/OpenStateTextFormatter.java
@@ -1,49 +0,0 @@
-package app.organicmaps.widget.placepage;
-
-import java.time.ZonedDateTime;
-import java.time.format.TextStyle;
-import java.util.Locale;
-
-public class OpenStateTextFormatter
-{
-  private OpenStateTextFormatter() {}
-
-  static String formatHoursMinutes(int hour, int minute, boolean use24h)
-  {
-    if (use24h)
-      return String.format(Locale.ROOT, "%02d:%02d", hour, minute);
-
-    int h = hour % 12;
-    if (h == 0) h = 12;
-    String ampm = (hour < 12) ? "AM" : "PM";
-    return String.format(Locale.ROOT, "%d:%02d %s", h, minute, ampm);
-  }
-
-  static boolean isSameLocalDate(ZonedDateTime a, ZonedDateTime b)
-  {
-    return a.toLocalDate().isEqual(b.toLocalDate());
-  }
-
-  static String dayShort(ZonedDateTime t, Locale locale)
-  {
-    return t.getDayOfWeek().getDisplayName(TextStyle.SHORT, locale);
-  }
-
-  static String buildAtLabel(
-      boolean opens,
-      boolean isToday,
-      String dayShort,
-      String time,
-      String opensAtLocalized,
-      String closesAtLocalized,
-      String opensDayAtLocalized,
-      String closesDayAtLocalized
-  )
-  {
-    if (isToday)
-      return opens ? String.format(Locale.ROOT, opensAtLocalized, time) // Opens at %s
-          : String.format(Locale.ROOT, closesAtLocalized, time); // Closes at %s
-    return opens ? String.format(Locale.ROOT, opensDayAtLocalized, dayShort, time) // Opens %s at %s
-        : String.format(Locale.ROOT, closesDayAtLocalized, dayShort, time); // Closes %s at %s
-  }
-}
--- 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;
@@ -87,11 +85,9 @@ import com.google.android.material.textview.MaterialTextView;
 import java.time.Instant;
 import java.time.ZoneId;
 import java.time.ZonedDateTime;
-import java.time.format.TextStyle;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
-import java.util.Locale;

 public class PlacePageView extends Fragment
    implements View.OnClickListener, View.OnLongClickListener, LocationListener, SensorListener, Observer<MapObject>,
@@ -109,9 +105,6 @@ public class PlacePageView extends Fragment
  private static final String LINKS_FRAGMENT_TAG = "LINKS_FRAGMENT_TAG";
  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 =
      Arrays.asList(CoordinatesFormat.LatLonDMS, CoordinatesFormat.LatLonDecimal, CoordinatesFormat.OLCFull,
                    CoordinatesFormat.UTM, CoordinatesFormat.MGRS, CoordinatesFormat.OSMLink);
@@ -804,127 +797,57 @@ public class PlacePageView extends Fragment
    final String ohStr = mMapObject.getMetadata(Metadata.MetadataType.FMD_OPEN_HOURS);
    final Timetable[] timetables = OpeningHours.nativeTimetablesFromString(ohStr);

-    // No valid timetable
-    if (timetables == null || timetables.length == 0)
+    if (timetables != null && timetables.length != 0)
    {
-      UiUtils.hide(mTvOpenState);
-      return;
-    }
+      final Context context = requireContext();
+      final OhState poiState = OpeningHours.nativeCurrentState(timetables);

-    final Context context = requireContext();
-    final OhState poiState = OpeningHours.nativeCurrentState(timetables);
-
-    // Ignore unknown rule state
-    if (poiState.state == OhState.State.Unknown)
-    {
-      UiUtils.hide(mTvOpenState);
-      return;
-    }
-
-    // Get colours
-    final ForegroundColorSpan colorGreen =
-      new ForegroundColorSpan(ContextCompat.getColor(context, R.color.base_green));
-    final ForegroundColorSpan colorYellow =
-      new ForegroundColorSpan(ContextCompat.getColor(context, R.color.base_yellow));
-    final ForegroundColorSpan colorRed = new ForegroundColorSpan(ContextCompat.getColor(context, R.color.base_red));
-
-    // Get next state info
-    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
+      // Ignore unknown rule state
+      if (poiState.state == OhState.State.Unknown)
      {
-        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;
-        }
+        UiUtils.hide(mTvOpenState);
+        return;
      }
-      catch (Throwable ignored) {}
-    }

-    if (!hasFiniteNextChange) // No valid next change
-    {
-      if (isOpen)
+      // Get colours
+      final ForegroundColorSpan colorGreen =
+          new ForegroundColorSpan(ContextCompat.getColor(context, R.color.base_green));
+      final ForegroundColorSpan colorYellow =
+          new ForegroundColorSpan(ContextCompat.getColor(context, R.color.base_yellow));
+      final ForegroundColorSpan colorRed = new ForegroundColorSpan(ContextCompat.getColor(context, R.color.base_red));
+
+      // Get next state info
+      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)
+      final int minsToNextState = (int) ((nextStateTime - (System.currentTimeMillis() / 1000)) / 60);
+
+      if (minsToNextState <= 60) // POI opens/closes in 60 mins
+      {
+        final String minsToChangeStr = minsToNextState + " " + getString(R.string.minute);
+        final String nextChangeFormatted = getString(isOpen ? R.string.closes_in : R.string.opens_in, minsToChangeStr);
+        final ForegroundColorSpan nextChangeColor = isOpen ? colorYellow : colorRed;
+        // TODO: We should check closed/open time for specific feature's timezone.
+        ZonedDateTime time = ZonedDateTime.ofInstant(Instant.ofEpochSecond(nextStateTime), ZoneId.systemDefault());
+        String localizedTime =
+            new HoursMinutes(time.getHour(), time.getMinute(), DateUtils.is24HourFormat(context)).toString();
+
+        openStateString.append(nextChangeFormatted, nextChangeColor, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE)
+            .append(" • ") // Add spacer
+            .append(getString(R.string.at, localizedTime));
+      }
+      else if (isOpen)
        openStateString.append(getString(R.string.open_now), colorGreen, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
-      else
+      // TODO: Add "Closes at 18:00" etc
+      else // Closed
        openStateString.append(getString(R.string.closed_now), colorRed, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
+      // TODO: Add "Opens at 18:00" etc

      UiUtils.setTextAndHideIfEmpty(mTvOpenState, openStateString);
      return;
    }
-
-    String localizedTimeString = OpenStateTextFormatter.formatHoursMinutes(
-      nextChangeLocal.getHour(), nextChangeLocal.getMinute(), DateUtils.is24HourFormat(context));
-
-    final boolean shortHorizonClosing = isOpen && minsToNextState >= 0 && minsToNextState <= SHORT_HORIZON_CLOSE_MIN;
-    final boolean shortHorizonOpening = !isOpen && minsToNextState >= 0 && minsToNextState <= SHORT_HORIZON_OPEN_MIN;
-
-    if (shortHorizonClosing || shortHorizonOpening) // POI Opens/Closes in 60 mins • at 18:00
-    {
-      final String minsToChangeStr = getResources().getQuantityString(
-        R.plurals.minutes_short, Math.max(minsToNextState, 1), Math.max(minsToNextState, 1));
-      final String nextChangeFormatted = getString(isOpen ? R.string.closes_in : R.string.opens_in, minsToChangeStr);
-
-      openStateString.append(nextChangeFormatted, colorYellow, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE)
-        .append(" • ") // Add spacer
-        .append(getString(R.string.at, localizedTimeString));
-    }
-    else
-    {
-      final String opensAtStr = getString(R.string.opens_at); // "Opens at %s"
-      final String closesAtStr = getString(R.string.closes_at); // "Closes at %s"
-      final String opensDayAtStr = getString(R.string.opens_day_at); // "Opens %1$s at %2$s"
-      final String closesDayAtStr = getString(R.string.closes_day_at); // "Closes %1$s at %2$s"
-
-      final boolean isToday =
-        OpenStateTextFormatter.isSameLocalDate(nextChangeLocal, ZonedDateTime.now(nextChangeLocal.getZone()));
-      // Full weekday name per design feedback.
-      final String dayName =
-        nextChangeLocal.getDayOfWeek().getDisplayName(TextStyle.FULL, Locale.getDefault());
-
-      if (isOpen) // > 60 minutes OR negative (safety). Show “Open now • Closes at 18:00”
-      {
-        openStateString.append(getString(R.string.open_now), colorGreen, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
-
-        final String atLabel =
-          OpenStateTextFormatter.buildAtLabel(false, isToday, dayName, localizedTimeString,
-            opensAtStr, closesAtStr, opensDayAtStr, closesDayAtStr);
-
-        if (!TextUtils.isEmpty(atLabel))
-          openStateString.append(" • ").append(atLabel);
-      }
-      else // Closed
-      {
-        openStateString.append(getString(R.string.closed_now), colorRed, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
-
-        final String atLabel =
-          OpenStateTextFormatter.buildAtLabel(true, isToday, dayName, localizedTimeString,
-            opensAtStr, closesAtStr, opensDayAtStr, closesDayAtStr);
-
-        if (!TextUtils.isEmpty(atLabel))
-          openStateString.append(" • ").append(atLabel);
-      }
-    }
-
-    UiUtils.setTextAndHideIfEmpty(mTvOpenState, openStateString);
+    // No valid timetable
+    UiUtils.hide(mTvOpenState);
  }

  private void addPlace()
--- 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_browse_activity.xml
+++ b/android/app/src/main/res/drawable/ic_browse_activity.xml
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="960"
-    android:viewportHeight="960"
-    android:tint="?colorControlNormal">
-  <path
-      android:pathData="M80,360v-160q0,-33 23.5,-56.5T160,120h640q33,0 56.5,23.5T880,200v160h-80v-160L160,200v160L80,360ZM160,720q-33,0 -56.5,-23.5T80,640v-200h80v200h640v-200h80v200q0,33 -23.5,56.5T800,720L160,720ZM40,840v-80h880v80L40,840ZM480,420ZM80,440v-80h240q11,0 21,6t15,16l47,93 123,-215q5,-9 14,-14.5t20,-5.5q11,0 21,5.5t15,16.5l49,98h235v80L620,440q-11,0 -21,-5.5T584,418l-26,-53 -123,215q-5,10 -15,15t-21,5q-11,0 -20.5,-6T364,578l-69,-138L80,440Z"
-      android:fillColor="#fff"/>
-</vector>
--- 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/drawable/ic_dark_mode.xml
+++ b/android/app/src/main/res/drawable/ic_dark_mode.xml
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="960"
-    android:viewportHeight="960"
-    android:tint="?colorControlNormal">
-  <path
-      android:pathData="M480,840q-150,0 -255,-105T120,480q0,-150 105,-255t255,-105q14,0 27.5,1t26.5,3q-41,29 -65.5,75.5T444,300q0,90 63,153t153,63q55,0 101,-24.5t75,-65.5q2,13 3,26.5t1,27.5q0,150 -105,255T480,840ZM480,760q88,0 158,-48.5T740,585q-20,5 -40,8t-40,3q-123,0 -209.5,-86.5T364,300q0,-20 3,-40t8,-40q-78,32 -126.5,102T200,480q0,116 82,198t198,82ZM470,490Z"
-      android:fillColor="#fff"/>
-</vector>
--- a/android/app/src/main/res/drawable/ic_download_st.xml
+++ b/android/app/src/main/res/drawable/ic_download_st.xml
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="?colorControlNormal">
-    <path
-        android:pathData="M19,9h-4v-6h-6v6h-4l7,7 7,-7ZM5,18v2h14v-2h-14Z"
-        android:fillColor="#FFF"/>
-</vector>
--- a/android/app/src/main/res/drawable/ic_eco.xml
+++ b/android/app/src/main/res/drawable/ic_eco.xml
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="960"
-    android:viewportHeight="960"
-    android:tint="?colorControlNormal">
-  <path
-      android:pathData="M216,784q-45,-45 -70.5,-104T120,558q0,-63 24,-124.5T222,318q35,-35 86.5,-60t122,-39.5Q501,204 591.5,201t202.5,7q8,106 5,195t-16.5,160.5q-13.5,71.5 -38,125T684,778q-53,53 -112.5,77.5T450,880q-65,0 -127,-25.5T216,784ZM328,768q29,17 59.5,24.5T450,800q46,0 91,-18.5t86,-59.5q18,-18 36.5,-50.5t32,-85Q709,534 716,459.5t2,-177.5q-49,-2 -110.5,-1.5T485,290q-61,9 -116,29t-90,55q-45,45 -62,89t-17,85q0,59 22.5,103.5T262,714q42,-80 111,-153.5T534,440q-72,63 -125.5,142.5T328,768ZM328,768ZM328,768Z"
-      android:fillColor="#fff"/>
-</vector>
--- a/android/app/src/main/res/drawable/ic_instant_mix.xml
+++ b/android/app/src/main/res/drawable/ic_instant_mix.xml
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="960"
-    android:viewportHeight="960"
-    android:tint="?colorControlNormal">
-  <path
-      android:pathData="M200,800v-280h-80v-80h240v80h-80v280h-80ZM200,360v-200h80v200h-80ZM360,360v-80h80v-120h80v120h80v80L360,360ZM440,800v-360h80v360h-80ZM680,800v-120h-80v-80h240v80h-80v120h-80ZM680,520v-360h80v360h-80Z"
-      android:fillColor="#fff"/>
-</vector>
--- a/android/app/src/main/res/drawable/ic_mobile_lock_portrait.xml
+++ b/android/app/src/main/res/drawable/ic_mobile_lock_portrait.xml
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="960"
-    android:viewportHeight="960"
-    android:tint="?colorControlNormal">
-  <path
-      android:pathData="M280,920q-33,0 -56.5,-23.5T200,840v-720q0,-33 23.5,-56.5T280,40h400q33,0 56.5,23.5T760,120v124q18,7 29,22t11,34v80q0,19 -11,34t-29,22v404q0,33 -23.5,56.5T680,920L280,920ZM280,840h400v-720L280,120v720ZM280,840v-720,720ZM394,640h172q14,0 24,-10t10,-24v-132q0,-14 -10,-24t-24,-10h-6v-40q0,-33 -23.5,-56.5T480,320q-33,0 -56.5,23.5T400,400v40h-6q-14,0 -24,10t-10,24v132q0,14 10,24t24,10ZM440,440v-40q0,-17 11.5,-28.5T480,360q17,0 28.5,11.5T520,400v40h-80Z"
-      android:fillColor="#fff"/>
-</vector>
--- a/android/app/src/main/res/drawable/ic_network_manage.xml
+++ b/android/app/src/main/res/drawable/ic_network_manage.xml
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="960"
-    android:viewportHeight="960"
-    android:tint="?colorControlNormal">
-  <path
-      android:pathData="M339,698q22,-22 49.5,-36t58.5,-19q-5,19 -8,38t-3,39q0,24 3.5,47t11.5,44L339,698ZM254,614 L170,528q62,-62 142,-95t168,-33q49,0 96,10.5t90,30.5q-44,8 -81.5,29T517,522q-9,-1 -18.5,-1.5T480,520q-64,0 -122.5,24.5T254,614ZM84,444 L0,360q95,-97 219.5,-148.5T480,160q136,0 260.5,51.5T960,360l-84,84q-79,-79 -181.5,-121.5T480,280q-112,0 -214.5,42.5T84,444ZM760,520 L772,580q12,5 22.5,10.5T816,604l58,-18 40,68 -46,40q2,12 2,26t-2,26l46,40 -40,68 -58,-18q-11,8 -21.5,13.5T772,860l-12,60h-80l-12,-60q-12,-5 -22.5,-10.5T624,836l-58,18 -40,-68 46,-40q-2,-12 -2,-26t2,-26l-46,-40 40,-68 58,18q11,-8 21.5,-13.5T668,580l12,-60h80ZM720,640q-33,0 -56.5,23.5T640,720q0,33 23.5,56.5T720,800q33,0 56.5,-23.5T800,720q0,-33 -23.5,-56.5T720,640Z"
-      android:fillColor="#fff"/>
-</vector>
--- a/android/app/src/main/res/drawable/ic_profile.xml
+++ b/android/app/src/main/res/drawable/ic_profile.xml
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="960"
-    android:viewportHeight="960"
-    android:tint="?colorControlNormal">
-  <path
-      android:pathData="M480,480q-66,0 -113,-47t-47,-113q0,-66 47,-113t113,-47q66,0 113,47t47,113q0,66 -47,113t-113,47ZM160,800v-112q0,-34 17.5,-62.5T224,582q62,-31 126,-46.5T480,520q66,0 130,15.5T736,582q29,15 46.5,43.5T800,688v112L160,800ZM240,720h480v-32q0,-11 -5.5,-20T700,654q-54,-27 -109,-40.5T480,600q-56,0 -111,13.5T260,654q-9,5 -14.5,14t-5.5,20v32ZM480,400q33,0 56.5,-23.5T560,320q0,-33 -23.5,-56.5T480,240q-33,0 -56.5,23.5T400,320q0,33 23.5,56.5T480,400ZM480,320ZM480,720Z"
-      android:fillColor="#fff"/>
-</vector>
--- a/android/app/src/main/res/drawable/ic_record_voice_over.xml
+++ b/android/app/src/main/res/drawable/ic_record_voice_over.xml
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="960"
-    android:viewportHeight="960"
-    android:tint="?colorControlNormal">
-  <path
-      android:pathData="m798,638 l-62,-62q44,-41 69,-97t25,-119q0,-63 -25,-118t-69,-96l62,-64q56,53 89,125t33,153q0,81 -33,153t-89,125ZM670,510l-64,-64q18,-17 29,-38.5t11,-47.5q0,-26 -11,-47.5T606,274l64,-64q32,29 50,67.5t18,82.5q0,44 -18,82.5T670,510ZM360,520q-66,0 -113,-47t-47,-113q0,-66 47,-113t113,-47q66,0 113,47t47,113q0,66 -47,113t-113,47ZM40,840v-112q0,-33 17,-62t47,-44q51,-26 115,-44t141,-18q77,0 141,18t115,44q30,15 47,44t17,62v112L40,840ZM120,760h480v-32q0,-11 -5.5,-20T580,694q-36,-18 -92.5,-36T360,640q-71,0 -127.5,18T140,694q-9,5 -14.5,14t-5.5,20v32ZM360,440q33,0 56.5,-23.5T440,360q0,-33 -23.5,-56.5T360,280q-33,0 -56.5,23.5T280,360q0,33 23.5,56.5T360,440ZM360,360ZM360,760Z"
-      android:fillColor="#fff"/>
-</vector>
--- a/android/app/src/main/res/drawable/ic_sd_card.xml
+++ b/android/app/src/main/res/drawable/ic_sd_card.xml
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="960"
-    android:viewportHeight="960"
-    android:tint="?colorControlNormal">
-  <path
-      android:pathData="M360,440h80v-160h-80v160ZM480,440h80v-160h-80v160ZM600,440h80v-160h-80v160ZM240,880q-33,0 -56.5,-23.5T160,800v-480l240,-240h320q33,0 56.5,23.5T800,160v640q0,33 -23.5,56.5T720,880L240,880ZM240,800h480v-640L434,160L240,354v446ZM240,800h480,-480Z"
-      android:fillColor="#fff"/>
-</vector>
--- a/android/app/src/main/res/drawable/ic_search_recent_st.xml
+++ b/android/app/src/main/res/drawable/ic_search_recent_st.xml
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="?colorControlNormal">
-    <path
-        android:fillColor="@android:color/white"
-        android:pathData="M13.26,3C8.17,2.86 4,6.95 4,12L2.21,12c-0.45,0 -0.67,0.54 -0.35,0.85l2.79,2.8c0.2,0.2 0.51,0.2 0.71,0l2.79,-2.8c0.31,-0.31 0.09,-0.85 -0.36,-0.85L6,12c0,-3.9 3.18,-7.05 7.1,-7 3.72,0.05 6.85,3.18 6.9,6.9 0.05,3.91 -3.1,7.1 -7,7.1 -1.61,0 -3.1,-0.55 -4.28,-1.48 -0.4,-0.31 -0.96,-0.28 -1.32,0.08 -0.42,0.42 -0.39,1.13 0.08,1.49C9,20.29 10.91,21 13,21c5.05,0 9.14,-4.17 9,-9.26 -0.13,-4.69 -4.05,-8.61 -8.74,-8.74zM12.75,8c-0.41,0 -0.75,0.34 -0.75,0.75v3.68c0,0.35 0.19,0.68 0.49,0.86l3.12,1.85c0.36,0.21 0.82,0.09 1.03,-0.26 0.21,-0.36 0.09,-0.82 -0.26,-1.03l-2.88,-1.71v-3.4c0,-0.4 -0.34,-0.74 -0.75,-0.74z"/>
-</vector>
--- a/android/app/src/main/res/drawable/ic_settings_backup_restore.xml
+++ b/android/app/src/main/res/drawable/ic_settings_backup_restore.xml
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="960"
-    android:viewportHeight="960"
-    android:tint="?colorControlNormal">
-  <path
-      android:pathData="M480,560q-33,0 -56.5,-23.5T400,480q0,-33 23.5,-56.5T480,400q33,0 56.5,23.5T560,480q0,33 -23.5,56.5T480,560ZM480,840q-139,0 -241,-91.5T122,520h82q14,104 92.5,172T480,760q117,0 198.5,-81.5T760,480q0,-117 -81.5,-198.5T480,200q-69,0 -129,32t-101,88h110v80L120,400v-240h80v94q51,-64 124.5,-99T480,120q75,0 140.5,28.5t114,77q48.5,48.5 77,114T840,480q0,75 -28.5,140.5t-77,114q-48.5,48.5 -114,77T480,840Z"
-      android:fillColor="#fff"/>
-</vector>
--- a/android/app/src/main/res/drawable/ic_storage_light.xml
+++ b/android/app/src/main/res/drawable/ic_storage_light.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M2,20h20v-4h-20v4ZM4,17h2v2h-2v-2ZM2,4v4h20v-4h-20ZM6,7h-2v-2h2v2ZM2,14h20v-4h-20v4ZM4,11h2v2h-2v-2Z"
+      android:fillColor="#FFF"/>
+</vector>
--- a/android/app/src/main/res/drawable/ic_straighten.xml
+++ b/android/app/src/main/res/drawable/ic_straighten.xml
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="960"
-    android:viewportHeight="960"
-    android:tint="?colorControlNormal">
-  <path
-      android:pathData="M160,720q-33,0 -56.5,-23.5T80,640v-320q0,-33 23.5,-56.5T160,240h640q33,0 56.5,23.5T880,320v320q0,33 -23.5,56.5T800,720L160,720ZM160,640h640v-320L680,320v160h-80v-160h-80v160h-80v-160h-80v160h-80v-160L160,320v320ZM280,480h80,-80ZM440,480h80,-80ZM600,480h80,-80ZM480,480Z"
-      android:fillColor="#fff"/>
-</vector>
--- a/android/app/src/main/res/drawable/ic_text_fields.xml
+++ b/android/app/src/main/res/drawable/ic_text_fields.xml
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="960"
-    android:viewportHeight="960"
-    android:tint="?colorControlNormal">
-  <path
-      android:pathData="M280,800v-520L80,280v-120h520v120L400,280v520L280,800ZM640,800v-320L520,480v-120h360v120L760,480v320L640,800Z"
-      android:fillColor="#fff"/>
-</vector>
--- a/android/app/src/main/res/drawable/ic_three_d_rotation.xml
+++ b/android/app/src/main/res/drawable/ic_three_d_rotation.xml
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="960"
-    android:viewportHeight="960"
-    android:tint="?colorControlNormal">
-  <path
-      android:pathData="M480,880q-83,0 -156,-31.5T197,763q-54,-54 -85.5,-127T80,480h80q0,115 72.5,203T418,794l-58,-58 56,-56L598,862q-29,10 -58.5,14T480,880ZM500,600v-240h120q17,0 28.5,11.5T660,400v160q0,17 -11.5,28.5T620,600L500,600ZM300,600v-60h100v-40h-60v-40h60v-40L300,420v-60h120q17,0 28.5,11.5T460,400v160q0,17 -11.5,28.5T420,600L300,600ZM560,540h40v-120h-40v120ZM800,480q0,-115 -72.5,-203T542,166l58,58 -56,56 -182,-182q29,-10 58.5,-14t59.5,-4q83,0 156,31.5T763,197q54,54 85.5,127T880,480h-80Z"
-      android:fillColor="#fff"/>
-</vector>
--- a/android/app/src/main/res/drawable/ic_translate.xml
+++ b/android/app/src/main/res/drawable/ic_translate.xml
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="960"
-    android:viewportHeight="960"
-    android:tint="?colorControlNormal">
-  <path
-      android:pathData="m476,880 l182,-480h84L924,880h-84l-43,-122L603,758L560,880h-84ZM160,760l-56,-56 202,-202q-35,-35 -63.5,-80T190,320h84q20,39 40,68t48,58q33,-33 68.5,-92.5T484,240L40,240v-80h280v-80h80v80h280v80L564,240q-21,72 -63,148t-83,116l96,98 -30,82 -122,-125 -202,201ZM628,688h144l-72,-204 -72,204Z"
-      android:fillColor="#fff"/>
-</vector>
--- a/android/app/src/main/res/drawable/ic_translate_indic.xml
+++ b/android/app/src/main/res/drawable/ic_translate_indic.xml
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="960"
-    android:viewportHeight="960"
-    android:tint="?colorControlNormal">
-  <path
-      android:pathData="m476,880 l182,-480h84L924,880h-84l-43,-122L603,758L560,880h-84ZM628,688h144l-72,-204 -72,204ZM254,640q-66,0 -123.5,-38.5T44,498l72,-36q21,42 58,70t79,28q38,0 62.5,-23.5T340,480q0,-33 -23.5,-56.5T260,400h-60v-80h60q25,0 42.5,-17.5T320,260q0,-25 -17,-42.5T261,200q-23,0 -41,15t-32,33l-63,-49q26,-32 60,-55.5t77,-23.5q57,0 97.5,40.5T400,259q0,27 -10,52.5T361,357q10,10 18.5,20.5T396,400h124v-200h-80v-80h240v80h-80v116l-61,164L420,480v4q0,63 -46,109.5T254,640Z"
-      android:fillColor="#fff"/>
-</vector>
--- a/android/app/src/main/res/drawable/ic_wifi_find.xml
+++ b/android/app/src/main/res/drawable/ic_wifi_find.xml
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="960"
-    android:viewportHeight="960"
-    android:tint="?colorControlNormal">
-  <path
-      android:pathData="M480,840 L0,359q93,-93 215.5,-146T480,160q142,0 264.5,53T960,359l-56,57q-81,-81 -190,-128.5T480,240q-103,0 -195,32.5T117,363l419,420 -56,57ZM864,800L761,698q-18,11 -38,16.5t-43,5.5q-68,0 -114,-46t-46,-114q0,-68 46,-114t114,-46q68,0 114,46t46,114q0,23 -5.5,43T818,641l102,103 -56,56ZM680,640q34,0 57,-23t23,-57q0,-34 -23,-57t-57,-23q-34,0 -57,23t-23,57q0,34 23,57t57,23ZM480,783Z"
-      android:fillColor="#fff"/>
-</vector>
--- a/android/app/src/main/res/layout-land/onmap_downloader.xml
+++ b/android/app/src/main/res/layout-land/onmap_downloader.xml
@@ -26,33 +26,27 @@
      android:clipChildren="false"
      android:gravity="center"
      tools:ignore="UselessParent">
-      <LinearLayout
-          android:id="@+id/offline_explanation"
+      <com.google.android.material.textview.MaterialTextView
          android:layout_width="match_parent"
          android:layout_height="wrap_content"
-          android:orientation="vertical">
-        <com.google.android.material.textview.MaterialTextView
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginBottom="@dimen/margin_eighth"
-            android:gravity="center_horizontal"
-            android:textStyle="bold"
-            android:textAppearance="?android:attr/textAppearanceLarge"
-            android:text="@string/offline_explanation_title"/>
-        <com.google.android.material.textview.MaterialTextView
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginBottom="@dimen/margin_eighth"
-            android:gravity="center_horizontal"
-            android:textStyle="normal"
-            android:textAppearance="@style/MwmTextAppearance.Body1"
-            android:text="@string/offline_explanation_text"/>
-        <com.google.android.material.divider.MaterialDivider
-            android:layout_width="match_parent"
-            android:layout_height="2dp"
-            android:layout_marginTop="@dimen/margin_quarter"
-            android:layout_marginBottom="@dimen/margin_quarter"/>
-      </LinearLayout>
+          android:layout_marginBottom="@dimen/margin_eighth"
+          android:gravity="center_horizontal"
+          android:textStyle="bold"
+          android:textAppearance="?android:attr/textAppearanceLarge"
+          android:text="@string/offline_explanation_title"/>
+      <com.google.android.material.textview.MaterialTextView
+          android:layout_width="match_parent"
+          android:layout_height="wrap_content"
+          android:layout_marginBottom="@dimen/margin_eighth"
+          android:gravity="center_horizontal"
+          android:textStyle="normal"
+          android:textAppearance="@style/MwmTextAppearance.Body1"
+          android:text="@string/offline_explanation_text"/>
+      <com.google.android.material.divider.MaterialDivider
+          android:layout_width="match_parent"
+          android:layout_height="2dp"
+          android:layout_marginTop="@dimen/margin_quarter"
+          android:layout_marginBottom="@dimen/margin_quarter"/>
      <com.google.android.material.textview.MaterialTextView
        android:id="@+id/downloader_parent"
        android:layout_width="wrap_content"
--- a/android/app/src/main/res/layout/feedback_fab.xml
+++ b/android/app/src/main/res/layout/feedback_fab.xml
@@ -3,7 +3,8 @@
  xmlns:android="http://schemas.android.com/apk/res/android"
  xmlns:app="http://schemas.android.com/apk/res-auto"
  android:id="@+id/feedback_fab"
-  style="@style/MwmWidget.M3.FAB.Primary"
+  style="MwmWidget.M3.FAB.Primary"
+  app:shapeAppearance="@style/ShapeAppearanceOverlay.Material3.FloatingActionButton"
  android:layout_width="wrap_content"
  android:layout_height="wrap_content"
  android:contentDescription="@string/feedback"
--- 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
@@ -394,8 +394,7 @@

    <com.google.android.material.card.MaterialCardView
        android:id="@+id/cv__more"
-        style="@style/MwmWidget.Editor.CardView"
-        android:layout_marginBottom="@dimen/margin_base">
+        style="@style/MwmWidget.Editor.CardView">
      <LinearLayout
          android:layout_width="match_parent"
          android:layout_height="wrap_content"
@@ -422,17 +421,6 @@
        </com.google.android.material.textfield.TextInputLayout>
      </LinearLayout>
    </com.google.android.material.card.MaterialCardView>
-    <com.google.android.material.button.MaterialButton
-        android:id="@+id/disused"
-        style="@style/MwmWidget.M3.Button.Secondary"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:gravity="center"
-        android:layout_marginBottom="@dimen/margin_quarter"
-        app:backgroundTint="?cardBackground"
-        android:textColor="@color/base_red"
-        app:strokeColor="@color/base_red"
-        android:text="@string/editor_business_vacant_button"/>
    <com.google.android.material.button.MaterialButton
        android:id="@+id/reset"
        style="@style/MwmWidget.M3.Button.Secondary"
--- a/android/app/src/main/res/layout/item_opening_hours.xml
+++ b/android/app/src/main/res/layout/item_opening_hours.xml
@@ -22,7 +22,7 @@
    android:id="@+id/empty_opening_hours"
    android:layout_width="match_parent"
    android:layout_height="wrap_content"
-    android:layout_marginTop="@dimen/margin_base"
+    android:layout_centerVertical="true"
    android:layout_marginStart="@dimen/editor_margin_timetable_left"
    android:orientation="vertical"
    tools:visibility="gone">
@@ -57,8 +57,10 @@
    android:layout_height="wrap_content"
    style="@style/Widget.Material3.Button.TextButton"
    android:layout_below="@id/opening_hours"
-    android:layout_marginTop="@dimen/margin_base"
-    android:gravity="center_horizontal"
+    android:layout_marginStart="@dimen/editor_margin_timetable_left"
+    android:layout_marginTop="@dimen/margin_base_plus"
+    android:gravity="center_vertical"
+    android:minHeight="@dimen/height_block_base"
    android:text="@string/edit_opening_hours"
    android:textColor="?colorSecondary"
    android:textAppearance="@style/MwmTextAppearance.Body1" />
--- 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_timetable_add.xml
+++ b/android/app/src/main/res/layout/item_timetable_add.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout
  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:paddingBottom="@dimen/margin_base_plus"
@@ -11,7 +12,9 @@
    style="@style/MwmWidget.M3.Button.Primary"
    android:layout_gravity="center"
    android:enabled="false"
-    android:textColor="?android:textColorPrimaryInverse"
-    android:text="@string/editor_time_add" />
+    android:background="?accentButtonBackground"
+    android:padding="@dimen/margin_base"
+    android:text="@string/editor_time_add"
+    app:backgroundTint="@null"/>

 </FrameLayout>
--- 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/onmap_downloader.xml
+++ b/android/app/src/main/res/layout/onmap_downloader.xml
@@ -17,34 +17,29 @@
    android:layout_gravity="center"
    android:gravity="center_horizontal"
    android:background="@drawable/onmap_downloader_background">
-    <LinearLayout
-        android:id="@+id/offline_explanation"
-        android:layout_width="match_parent"
+
+    <com.google.android.material.textview.MaterialTextView
+        android:layout_width="@dimen/square_block_size"
        android:layout_height="wrap_content"
-        android:orientation="vertical">
-      <com.google.android.material.textview.MaterialTextView
-          android:layout_width="match_parent"
-          android:layout_height="wrap_content"
-          android:layout_marginBottom="@dimen/margin_eighth"
-          android:gravity="center_horizontal"
-          android:textStyle="bold"
-          android:textAppearance="?android:attr/textAppearanceLarge"
-          android:text="@string/offline_explanation_title"/>
-      <com.google.android.material.textview.MaterialTextView
-          android:layout_width="wrap_content"
-          android:layout_height="wrap_content"
-          android:maxWidth="212dp"
-          android:layout_marginBottom="@dimen/margin_eighth"
-          android:gravity="center_horizontal"
-          android:textStyle="normal"
-          android:textAppearance="@style/MwmTextAppearance.Body1"
-          android:text="@string/offline_explanation_text"/>
-      <com.google.android.material.divider.MaterialDivider
-          android:layout_width="match_parent"
-          android:layout_height="2dp"
-          android:layout_marginTop="@dimen/margin_quarter"
-          android:layout_marginBottom="@dimen/margin_quarter"/>
-    </LinearLayout>
+        android:layout_marginBottom="@dimen/margin_eighth"
+        android:gravity="center_horizontal"
+        android:textStyle="bold"
+        android:textAppearance="?android:attr/textAppearanceLarge"
+        android:text="@string/offline_explanation_title"/>
+    <com.google.android.material.textview.MaterialTextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:maxWidth="212dp"
+        android:layout_marginBottom="@dimen/margin_eighth"
+        android:gravity="center_horizontal"
+        android:textStyle="normal"
+        android:textAppearance="@style/MwmTextAppearance.Body1"
+        android:text="@string/offline_explanation_text"/>
+    <com.google.android.material.divider.MaterialDivider
+        android:layout_width="match_parent"
+        android:layout_height="2dp"
+        android:layout_marginTop="@dimen/margin_quarter"
+        android:layout_marginBottom="@dimen/margin_quarter"/>
    <com.google.android.material.textview.MaterialTextView
      android:id="@+id/downloader_parent"
      android:layout_width="@dimen/square_block_size"
--- a/android/app/src/main/res/layout/place_page_preview.xml
+++ b/android/app/src/main/res/layout/place_page_preview.xml
@@ -213,7 +213,6 @@
        android:layout_marginEnd="@dimen/margin_quarter"
        android:layout_marginStart="@dimen/margin_quarter"
        android:layout_weight="1"
-        android:padding="@dimen/margin_quarter"
        android:background="?clickableBackground"
        android:textAllCaps="false"
        tools:text="@string/categories" />
--- a/android/app/src/main/res/layout/position_chooser.xml
+++ b/android/app/src/main/res/layout/position_chooser.xml
@@ -38,7 +38,8 @@
        android:id="@+id/done"
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
-        style="@style/MwmWidget.M3.FAB.Primary"
+        style="MwmWidget.M3.FAB.Primary"
+        app:shapeAppearance="@style/ShapeAppearanceOverlay.Material3.FloatingActionButton"
        android:layout_marginEnd="16dp"
        android:layout_marginBottom="16dp"
        android:contentDescription="@string/save"
--- 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-b+sr+Latn/strings.xml
+++ b/android/app/src/main/res/values-b+sr+Latn/strings.xml
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-</resources>
--- 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-da/strings.xml
+++ b/android/app/src/main/res/values-da/strings.xml
@@ -881,12 +881,4 @@
    <string name="offline_explanation_text">Der skal downloades et kort for at kunne se og navigere i området.\nDownload kort over de områder, du ønsker at rejse i.</string>
    <string name="list_description_empty">Rediger listen for at tilføje en beskrivelse</string>
    <string name="avoid_paved">Undgå veje med fast belægning</string>
-    <string name="opens_at">Åbner kl. %s</string>
-    <string name="closes_at">Lukker kl. %s</string>
-    <string name="opens_day_at">Åbner %1$s kl. %2$s</string>
-    <string name="closes_day_at">Lukker %1$s kl. %2$s</string>
-    <plurals name="minutes_short">
-        <item quantity="one">%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
@@ -899,18 +899,4 @@
    <string name="offline_explanation_text">Se debe descargar un mapa para ver y navegar el área\nDescarga mapas de las áreas que quieras navegar.</string>
    <string name="editor_place_doesnt_exist_description">Describe la situación actual del lugar para enviar una nota de error a la comunidad de OpenStreetMap</string>
    <string name="avoid_paved">Evitar caminos pavimentados</string>
-    <string name="opens_at">Abre a las %s</string>
-    <string name="closes_at">Cierra a las %s</string>
-    <string name="opens_day_at">Abre el %1$s a las %2$s</string>
-    <string name="closes_day_at">Cierra el %1$s a las %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="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>
@@ -890,16 +890,4 @@
    <string name="offline_explanation_text">Selles piirkonnas liikumiseks ja teekonna juhatamiseks pead vajaliku kaardi alla laadima.\nVali allalaaditav kaart selle piirkonna kohta.</string>
    <string name="list_description_empty">Kirjelduse lisamiseks muuda loendit</string>
    <string name="avoid_paved">Väldi sillutatud teid</string>
-    <string name="opens_at">Avatakse %s</string>
-    <string name="closes_at">Suletakse %s</string>
-    <string name="opens_day_at">Avatakse %1$s kell %2$s</string>
-    <string name="closes_day_at">Suletakse %1$s kell %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">Ä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/Show More
+++ b/Show More
Author	SHA1	Message	Date
Konstantin Pastbin	ce39d6d3f6	[generator] Add a suffix to the output dir Signed-off-by: Konstantin Pastbin <konstantin.pastbin@gmail.com>	2025-11-11 22:44:39 -08:00
Yannik Bloscheck	90e79e323d	[core] Add language data to world files Signed-off-by: Yannik Bloscheck <git@yannikbloscheck.com>	2025-11-11 22:44:39 -08:00
Yannik Bloscheck	6bbd9cf68c	[styles] Adding trees Signed-off-by: Yannik Bloscheck <git@yannikbloscheck.com>	2025-11-11 22:44:39 -08:00
Yannik Bloscheck	238b63acef	[styles] Differentiate between different entrances Signed-off-by: Yannik Bloscheck <git@yannikbloscheck.com>	2025-11-11 22:44:39 -08:00
Yannik Bloscheck	73df73ba0c	[styles] Added smaller bus stop icons Signed-off-by: Yannik Bloscheck <git@yannikbloscheck.com>	2025-11-11 22:44:39 -08:00
map-per	eb15739389	[styles] Add natural=sand Signed-off-by: map-per <map-per@gmx.de>	2025-11-11 22:44:39 -08:00
Yannik Bloscheck	2cba290561	[generator] Name method parameter more clearly Signed-off-by: Yannik Bloscheck <git@yannikbloscheck.com>	2025-11-11 22:44:39 -08:00
Yannik Bloscheck	1153cceceb	[generator] Shorten code to avoid unnecessary `if` condition Signed-off-by: Yannik Bloscheck <git@yannikbloscheck.com>	2025-11-11 22:44:39 -08:00
Yannik Bloscheck	01a198a866	[generator] Ignore edited status for nearby places during map generation Signed-off-by: Yannik Bloscheck <git@yannikbloscheck.com>	2025-11-11 22:44:36 -08:00
				`@@ -1 +0,0 @@`
				`எளிய வழிகாட்டி - பயணத்தை மேலும் சுவாரசியமாக்க - சமூகத்தால் இயக்கப்படுகிறது`