[android] Adds delay to inset application on API 29 and lower

Signed-off-by: hemanggs <hemangmanhas@gmail.com>

.forgejo/workflows/dco.yml

@@ -0,0 +1,8 @@
+name: dco
+on: [pull_request]
+
+jobs:
+  check:
+    runs-on: codeberg-tiny
+    steps:
+      - uses: https://github.com/KineticCafe/actions-dco@v1

.forgejo/workflows/ios-check.yaml

@@ -41,7 +41,7 @@ jobs:
       LANG: en_US.UTF-8  # Fastlane complains that the terminal is using ASCII.
       LANGUAGE: en_US.UTF-8
       LC_ALL: en_US.UTF-8
-      TEST_RESULTS_BUNDLE_NAME: OMaps-Test-Results
+      TEST_RESULTS_BUNDLE_NAME: CoMaps-Test-Results
     strategy:
       fail-fast: false
       matrix:
@@ -75,7 +75,7 @@ jobs:
         run: |
           xcodebuild test \
             -workspace xcode/omim.xcworkspace \
-            -scheme OMaps \
+            -scheme CoMaps \
             -configuration Debug \
             -sdk iphonesimulator \
             -destination 'platform=iOS Simulator,name=iPhone 16 Pro Max,OS=latest' \
@@ -98,7 +98,7 @@ jobs:
         run: |
           xcodebuild build \
             -workspace xcode/omim.xcworkspace \
-            -scheme OMaps \
+            -scheme CoMaps \
             -configuration Release \
             -destination 'generic/platform=iOS' \
             -quiet \

.github/workflows/ios-check.yaml

@@ -15,6 +15,7 @@ jobs:
       LANGUAGE: en_US.UTF-8
       LC_ALL: en_US.UTF-8
       TEST_RESULTS_BUNDLE_NAME: CoMaps-Test-Results
+      SIMULATOR_DEVICE: 'iPhone 16 Pro Max'
     strategy:
       fail-fast: false
       matrix:
@@ -50,12 +51,15 @@ jobs:
         if: matrix.buildType == 'Debug'
         shell: bash
         run: |
+          # Start sim before the build to make sure it's booted when tests start.
+          xcrun simctl boot "${{ env.SIMULATOR_DEVICE }}" || true
+          xcrun simctl bootstatus "${{ env.SIMULATOR_DEVICE }}" -b
           xcodebuild test \
             -workspace xcode/omim.xcworkspace \
-            -scheme OMaps \
+            -scheme CoMaps \
             -configuration Debug \
             -sdk iphonesimulator \
-            -destination 'platform=iOS Simulator,name=iPhone 16 Pro Max,OS=latest' \
+            -destination "platform=iOS Simulator,name=${{ env.SIMULATOR_DEVICE }},OS=latest" \
             -quiet \
             -resultBundlePath ${{ env.TEST_RESULTS_BUNDLE_NAME }}.xcresult \
             CODE_SIGNING_REQUIRED=NO \
@@ -75,7 +79,7 @@ jobs:
         run: |
           xcodebuild build \
             -workspace xcode/omim.xcworkspace \
-            -scheme OMaps \
+            -scheme CoMaps \
             -configuration Release \
             -destination 'generic/platform=iOS' \
             -quiet \

README.md

@@ -29,16 +29,16 @@
 
 A community-led free & open source maps app based on [OpenStreetMap](https://www.openstreetmap.org) data and reinforced with commitment to transparency, privacy and being not-for-profit. CoMaps is a fork/spin-off of Organic Maps, which in turn is a fork of Maps.ME.
 
-There are apps for Android and iOS (and ARM macOS).
-An alpha linux / macOS Qt desktop version, which is also suitable for linux phones.
+There are apps for Android and iOS (and ARM MacOS).
+An alpha Linux / MacOS Qt desktop version, which is also suitable for Linux phones.
 
-The first app release is available as an APK download now! We are still working on publishing on F-Droid, Google Play Store and iOS App Store as well, please stay tuned!
+The June app release is available on Google Play, F-Droid and as an APK to download now! We are working on publishing in the iOS App Store as well, please stay tuned!
 
 <!--
 [<img src="docs/badges/apple-appstore.png" alt="App Store" width="160">](https://apps.apple.com/app/comaps/id1567437057)
-[<img src="docs/badges/google-play.png" alt="Google Play" width="160">](https://play.google.com/store/apps/details?id=app.comaps)
-[<img src="docs/badges/fdroid.png" alt="F-Droid" width="160">](https://f-droid.org/en/packages/app.comaps/)
 -->
+[<img src="docs/badges/google-play.png" alt="Google Play" width="160">](https://play.google.com/store/apps/details?id=app.comaps.google)
+[<img src="docs/badges/fdroid.png" alt="F-Droid" width="160">](https://f-droid.org/en/packages/app.comaps.fdroid/)
 [<img src="docs/badges/codeberg.png" alt="Codeberg" width="160">](https://codeberg.org/comaps/comaps/releases)
 
 <p float="left">
@@ -52,7 +52,7 @@ The first app release is available as an APK download now! We are still working
 
 **Respecting Privacy**: The app is designed with privacy in mind - does not identify people, does not track, and does not collect personal information. Ads-free.
 
-**Simple and Polished**: essential easy to use features that just work.
+**Simple and Polished**: Essential, easy to use features that just work.
 
 **Saves Your Battery and Space**: Doesn’t drain your battery like other navigation apps. Compact maps save precious space on your phone.
 

android/app/build.gradle

@@ -169,6 +169,7 @@ android {
 
     fdroid {
       dimension 'default'
+      applicationIdSuffix '.fdroid'
       versionName = android.defaultConfig.versionName + '-FDroid'
       buildConfigField 'String', 'SUPPORT_MAIL', '"fdroid@comaps.app"'
     }

android/app/src/fdroid/play/listings/cs-CZ/full-description.txt

@@ -14,21 +14,19 @@ Můžete se zde také připojit ke komunitě pomáhat s vytvářením nejlepší
 • <b>Otevřené a transparentní rozhodování a nakládání s financemi, neziskovost a plně otevřený zdrojový kód.</b>
 
 <b>Hlavní funkce</b>:
-<ul>
-<li>Stahovatelné podrobné mapy s místy, která nenajdete ani v Mapách Google</li>
-<li>Outdoorový režim se zvýrazněnými turistickými trasami, tábořišti, vodními zdroji, vrcholy, vrstevnicemi atd.</li>
-<li>Pěší trasy a cyklostezky</li>
-<li>Body zájmu, jako jsou restaurace, čerpací stanice, hotely, obchody, vyhlídky a mnoho dalšího</li>
-<li>Hledání podle názvu nebo adresy nebo podle kategorie bodů zájmu</li>
-<li>Navigace s hlasovými pokyny pro chůzi, jízdu na kole nebo řízení</li>
-<li>Uložení oblíbených míst jedním klepnutím</li>
-<li>Offline články z Wikipedie</li>
-<li>Vrstva metra a navigace v něm</li>
-<li>Záznam tras</li>
-<li>Export a import záložek a tras ve formátech KML, KMZ a GPX</li>
-<li>Tmavý režim k použití během noci</li>
-<li>Zlepšování mapových dat pro všechny pomocí jednoduchého vestavěného editoru</li>
-</ul>
+• Stahovatelné podrobné mapy s místy, která nenajdete ani v Mapách Google
+• Outdoorový režim se zvýrazněnými turistickými trasami, tábořišti, vodními zdroji, vrcholy, vrstevnicemi atd.
+• Pěší trasy a cyklostezky
+• Body zájmu, jako jsou restaurace, čerpací stanice, hotely, obchody, vyhlídky a mnoho dalšího
+• Hledání podle názvu nebo adresy nebo podle kategorie bodů zájmu
+• Navigace s hlasovými pokyny pro chůzi, jízdu na kole nebo řízení
+• Uložení oblíbených míst jedním klepnutím
+• Offline články z Wikipedie
+• Vrstva metra a navigace v něm
+• Záznam tras
+• Export a import záložek a tras ve formátech KML, KMZ a GPX
+• Tmavý režim k použití během noci
+• Zlepšování mapových dat pro všechny pomocí jednoduchého vestavěného editoru
 
 <b>Svoboda je tady</b>
 Objevujte své cesty, navigujte se světem se soukromím a komunitou na prvním místě!

android/app/src/fdroid/play/listings/de-DE/full-description.txt

@@ -14,7 +14,6 @@ Werde Teil der Community und hilf mit, die beste Karten-App zu entwickeln
 ‣ <b>Offen und transparent bei Entscheidungen und Finanzen, gemeinnützig und vollständig Open-Source</b>
 
 <b>Hauptfunktionen</b>:
-<ul>
 • Detaillierte, herunterladbare Karten mit Orten, die bei Google Maps oft fehlen
 • Outdoor-Modus mit hervorgehobenen Wanderwegen, Campingplätzen, Wasserquellen, Gipfeln, Höhenlinien usw.
 • Geh- und Radwege

android/app/src/fdroid/play/listings/en-US/full-description.txt

@@ -14,21 +14,19 @@ Join the community there and help make the best maps app
 ‣ <b>Open and Transparent Decision-making and Financials, Not-for-profit and Fully Open Source.</b>
 
 <b>Main Features</b>:
-<ul>
-<li>Downloadable detailed maps with places which are not available with Google Maps</li>
-<li>Outdoor mode with highlighted hiking trails, campsites, water sources, peaks, contour lines, etc</li>
-<li>Walking paths and cycleways</li>
-<li>Points of interest like restaurants, gas stations, hotels, shops, sightseeings and many more</li>
-<li>Search by name or an address or by point of interest category</li>
-<li>Navigation with voice announcements for walking, cycling, or driving</li>
-<li>Bookmark your favorite places with a single tap</li>
-<li>Offline Wikipedia articles</li>
-<li>Subway transit layer and directions</li>
-<li>Track recording</li>
-<li>Export and import bookmarks and tracks in KML, KMZ, GPX formats</li>
-<li>A dark mode to use during the night</li>
-<li>Improve map data for everyone using a basic built-in editor</li>
-</ul>
+• Downloadable detailed maps with places which are not available with Google Maps
+• Outdoor mode with highlighted hiking trails, campsites, water sources, peaks, contour lines, etc
+• Walking paths and cycleways
+• Points of interest like restaurants, gas stations, hotels, shops, sightseeings and many more
+• Search by name or an address or by point of interest category
+• Navigation with voice announcements for walking, cycling, or driving
+• Bookmark your favorite places with a single tap
+• Offline Wikipedia articles
+• Subway transit layer and directions
+• Track recording
+• Export and import bookmarks and tracks in KML, KMZ, GPX formats
+• A dark mode to use during the night
+• Improve map data for everyone using a basic built-in editor
 
 <b>Freedom Is Here</b>
 Discover your journey, navigate the world with privacy and community at the forefront!

android/app/src/fdroid/play/listings/et/full-description.txt

@@ -14,21 +14,19 @@ Liitu kogukonnaga ja aita luua parimat kaardirakendust:
 ‣ <b>Organisatsioon on avatud ja kasutab läbipaistvat otsustusprotsessi ning rahastamist ega taotle kasumit. Rakendus on avatud lähtekoodiga.</b>
 
 <b>Põhifunktsionaalsused</b>:
-<ul>
-<li>Allalaaditavad detailsed kaardid, mille sisu tihtipeale ei leia Google Mapsist</li>
-<li>Kaardivaade välitingimuste jaoks, kus matkarajad, laagriplatsid, allikad, mäetipud, kontuurjooned ja palju muud vajalikku on esile tõstetud</li>
-<li>Jalgrajad, rattateed ning maanteed</li>
-<li>Huvipunktid, nagu restoranid, tanklad, hotellid, poed, vaatamisväärsused ja palju muud</li>
-<li>Otsida saad nime, aadressi või huvipunkti kategooria alusel</li>
-<li>Tee juhatamine hääljuhiste abil toimib nii kõndimisel, rattasõidul kui auto juhtimisel</li>
-<li>Ühe puudutusega saad oma lemmikkohad märkida järjehoidjana</li>
-<li>Vikipeedia artiklid, mida saad lugeda ilma võrguühenduseta</li>
-<li>Metroode plaanid ja suunajuhised</li>
-<li>Raja või teekonna salvestamise võimalus</li>
-<li>Järjehoidjate ja radade eksport ning import KML, KMZ ja GPX vormingutes</li>
-<li>Tume kaardivaade kasutamiseks öösel</li>
-<li>Kasutades lihtsat muutmisliidest saad kaarti kõikide huvides täiendada</li>
-</ul>
+• Allalaaditavad detailsed kaardid, mille sisu tihtipeale ei leia Google Mapsist
+• Kaardivaade välitingimuste jaoks, kus matkarajad, laagriplatsid, allikad, mäetipud, kontuurjooned ja palju muud vajalikku on esile tõstetud
+• Jalgrajad, rattateed ning maanteed
+• Huvipunktid, nagu restoranid, tanklad, hotellid, poed, vaatamisväärsused ja palju muud
+• Otsida saad nime, aadressi või huvipunkti kategooria alusel
+• Tee juhatamine hääljuhiste abil toimib nii kõndimisel, rattasõidul kui auto juhtimisel
+• Ühe puudutusega saad oma lemmikkohad märkida järjehoidjana
+• Vikipeedia artiklid, mida saad lugeda ilma võrguühenduseta
+• Metroode plaanid ja suunajuhised
+• Raja või teekonna salvestamise võimalus
+• Järjehoidjate ja radade eksport ning import KML, KMZ ja GPX vormingutes
+• Tume kaardivaade kasutamiseks öösel
+• Kasutades lihtsat muutmisliidest saad kaarti kõikide huvides täiendada
 
 <b>Vabadus on siin</b>
 Uuri maailma ja avasta uusi teid - tee seda privaatselt ja kogukonnaga arvestades!

android/app/src/fdroid/play/listings/fi-FI/full-description.txt

@@ -0,0 +1,32 @@
+Yhteisövetoinen, ilmainen ja avoimeen lähdekoodiin perustuva karttasovellus, jonka pohjalla käytetään OpenStreetMapin avointa karttadataa. Sovelluksen kehityksessä on sitouduttu läpinäkyvyyteen, yksityisyyteen ja voittoa tavoittelemattomuuteen. CoMapsin projekti on haarautunut Organic Mapsista, joka taas on haarautunut aiemmin Maps.ME:stä
+
+Lue lisää projektin tavotteista ja suunnasta osoitteesta <b><i>codeberg.org/comaps</i></b>.
+Liity yhteisöön ja auta kehittämään paras saatavilla oleva karttasovellus
+• Käytä sovellusta ja kerro siitä myös muille
+• Anna palautetta ja raportoi ongelmia
+• Päivitä karttoja, joko sovelluksessa tai OpenStreetMapin verkkosivuilla
+
+‣ <b>Offline-painotteinen</b>: Suunnittele ja navigoi ulkomailla ilman mobiiliverkkoja. Kaikki sovelluksen toiminnot on suunniteltu käytettäväksi ilman verkkoyhteyttä.
+‣ <b>Kunnioittaa yksityisyyttä</b>: Sovellus on suunniteltu yksilön yksityisyys silmälläpitäen. Sovellus ei tunnista tai kerää tietoja sinusta. Mainosvapaa.
+‣ <b>Yksinkertainen ja viimeistelty</b>: Olennaiset ominaisuudet, joita on helppo käyttää. 
+‣ <b>Säästä akkua ja tallennustilaa</b>: Ei kuluta akkua, kuten muut navigointisovellukset. Kompaktit kartat säästävät arvokasta tallennustilaa puhelimessasi. 
+‣ <b>Ilmainen ja yhteisön luoma</b>: Vapaaehtoiset, kuten sinä olette auttaneet sovelluksen kehityksessä lisäämällä paikkoja OpenStreetMap:iin, testaamalla sovellusta ja antamalla palautetta. Voit myös auttaa kehittämällä ominaisuuksia ja lahjoittamalla sovelluskehitykseen
+‣ <b>Avoin ja läpinäkyvä päätöksenteko sekä rahoitus. Voittoa tavoittelematon ja täysin avoimeen lähdekoodiin perustuva.</b>
+
+<b>Tärkeimmät ominaisuudet</b>:
+• Ladattavat yksityiskohtaiset kartat paikoista, joita ei löydy edes Google Maps:sta
+• Ulkoilutila, josta löytyy korostettuna reitit, leirintäpaikat, vesipisteet, huiput ja korkeuserot yms.
+• Kävely- ja pyörätiet
+• Kiinnostavat paikat, kuten ravintolat, huoltoasemat, hotellit, kaupat, nähtävyydet ja monta muuta
+• Etsi nimellä, osoitteella tai kiinnostavan paikan kategorialla
+• Navigointi ääni-ilmoituksilla kävellessä, pyöräillessä tai ajaessa
+• Tallenna suosikkipaikkasi yhdellä napautuksella
+• Offline Wikipedia-artikkelit
+• Maanalaisen liikenteen tasot ja ohjeet
+• Reittien tallennus
+• Tuo ja vie kirjanmerkkejä ja reittejä KML-, KMZ- ja GPX-formaateissa
+• Tumma tila iltaa ja yötä varten
+• Paranna karttadataa kaikille sisäänrakennetulla editorilla
+
+<b>Vapaus on täällä</b>
+Löydä matkasi ja navigoi maailmalla yksityisyyden ja yhteisön tukemana!

android/app/src/fdroid/play/listings/fi-FI/title.txt

@@ -1 +1 @@
-CoMaps - Patikoi, pyöräile, autoile ilman verkkoyhteyttä yksityisesti
+CoMaps - Navigoi ilman verkkoyhteyttä yksityisesti

android/app/src/fdroid/play/listings/fr-FR/full-description.txt

@@ -14,21 +14,19 @@ Rejoignez la communauté et aidez-nous à créer la meilleure application de nav
 ‣ <b>Prises de décisions et comptes clairs et transparents, but non lucratif et complètement open source.</b>
 
 <b>Fonctionnalités principales :</b>
-<ul>
-<li>Cartes détaillées téléchargeables avec des lieux non disponibles sur Google Maps</li>
-<li>Mode extérieur avec sentiers de randonnée, campings, sources d'eau, sommets, courbes de niveau, etc. surlignés</li>
-<li>Chemins piétons et pistes cyclables</li>
-<li>Points d'intérêt comme des restaurants, stations-service, hôtels, magasins, lieux touristiques et bien plus</li>
-<li>Recherche par nom, adresse ou catégorie de point d'intérêt</li>
-<li>Navigation avec annonces vocales pour la marche, le vélo ou la conduite</li>
-<li>Mettez en favori vos lieux préférés en un seul clic</li>
-<li>Articles Wikipédia hors-ligne</li>
-<li>Plan de métro et indications pour s'y rendre</li>
-<li>Enregistrement des parcours</li>
-<li>Exportez et importez vos favoris aux formats KML, KMZ et GPX</li>
-<li>Mode sombre pour utiliser pendant la nuit</li>
-<li>Amélioration de la carte par tout le monde avec un éditeur simple intégré</li>
-</ul>
+• Cartes détaillées téléchargeables avec des lieux non disponibles sur Google Maps
+• Mode extérieur avec sentiers de randonnée, campings, sources d'eau, sommets, courbes de niveau, etc. surlignés
+• Chemins piétons et pistes cyclables
+• Points d'intérêt comme des restaurants, stations-service, hôtels, magasins, lieux touristiques et bien plus
+• Recherche par nom, adresse ou catégorie de point d'intérêt
+• Navigation avec annonces vocales pour la marche, le vélo ou la conduite
+• Mettez en favori vos lieux préférés en un seul clic
+• Articles Wikipédia hors-ligne
+• Plan de métro et indications pour s'y rendre
+• Enregistrement des parcours
+• Exportez et importez vos favoris aux formats KML, KMZ et GPX
+• Mode sombre pour utiliser pendant la nuit
+• Amélioration de la carte par tout le monde avec un éditeur simple intégré
 
 <b>La liberté est ici</b>
 Découvrez votre voyage, naviguez dans le monde en plaçant la vie privée et la communauté au premier plan !

android/app/src/fdroid/play/listings/fr-FR/title.txt

@@ -1 +1 @@
-CoMaps - Randonnée, vélo, conduite hors ligne en toute confidentialité
+CoMaps - Rando, vélo, conduite hors ligne & privée

android/app/src/fdroid/play/listings/hr/full-description.txt

@@ -14,21 +14,19 @@ Pridružite se otvorenoj zajednici i pomozite izraditi najbolju aplikaciju za ka
 ‣ <b>Otvoreno i transparentno donošenje odluka i korištenja financija, Neprofitna i potpuno Otvorenog koda.</b>
 
 <b>Glavne značajke</b>:
-<ul>
-<li>Preuzimanje detaljnih karti s lokacijama koje nisu dostupne s Google kartama</li>
-<li>Karte za izlete s istaknutim pješačkim stazama, kampovima, izvorima vode, planinskim vrhovima, konturnim linijama itd.</li>
-<li>Pješačke i biciklističke staze</li>
-<li>Točke interesa kao što su restorani, benzinske crpke, hoteli, trgovine, vidikovci i još mnogo toga</li>
-<li>Pretražujte po nazivu ili adresi ili po kategoriji interesa</li>
-<li>Navigacija s glasovnim najavama za hodanje, vožnju biciklom ili automobilom</li>
-<li>Obilježite svoja omiljena mjesta jednim dodirom</li>
-<li>Offline članci Wikipedije</li>
-<li>Tranzitni sloj podzemne željeznice sa navigacijom</li>
-<li>Snimanje GPS tragova</li>
-<li>Izvoz i uvoz oznaka i staza u KML, KMZ, i GPX formatima</li>
-<li>Tamni način rada za korištenje tijekom noći</li>
-<li>Poboljšajte kartu za sve korisnike, koristeći osnovni ugrađeni uređivač karte</li>
-</ul>
+• Preuzimanje detaljnih karti s lokacijama koje nisu dostupne s Google kartama
+• Karte za izlete s istaknutim pješačkim stazama, kampovima, izvorima vode, planinskim vrhovima, konturnim linijama itd.
+• Pješačke i biciklističke staze
+• Točke interesa kao što su restorani, benzinske crpke, hoteli, trgovine, vidikovci i još mnogo toga
+• Pretražujte po nazivu ili adresi ili po kategoriji interesa
+• Navigacija s glasovnim najavama za hodanje, vožnju biciklom ili automobilom
+• Obilježite svoja omiljena mjesta jednim dodirom
+• Offline članci Wikipedije
+• Tranzitni sloj podzemne željeznice sa navigacijom
+• Snimanje GPS tragova
+• Izvoz i uvoz oznaka i staza u KML, KMZ, i GPX formatima
+• Tamni način rada za korištenje tijekom noći
+• Poboljšajte kartu za sve korisnike, koristeći osnovni ugrađeni uređivač karte
 
 <b>Sloboda je ovdje</b>
 Otkrijte svoje putovanje, navigirajte svijetom s privatnošću i zajednicom na prvom mjestu!

android/app/src/fdroid/play/listings/it-IT/full-description.txt

@@ -14,21 +14,19 @@ Unisciti alla nostra comunità e aiutaci a creare la migliore app di mappe.
 ‣ <b>Aperta e Trasparente nel Processo Decisionale e Finanziario, Senza Scopo di Lucro e Completamente Open Source</b>
 
 <b>Funzionalità principali</b>:
-<ul>
-<li>Scarica mappe dettagliate di luoghi che non sono disponibili su Google Maps</li>
-<li>Modalità Outdoor con percorsi escursionistici, campeggi, sorgenti d'acqua, picchi, dislivelli ed altro evidenziati</li>
-<li>Strade pedonali e piste ciclabili</li>
-<li>Punti d'interesse come ristoranti, stazioni di benzina, hotel, negozi, luoghi turistici e molto altro</li>
-<li>Cerca per nome, indirizzo o categoria</li>
-<li>Navigazione con assistente vocale a piedi, in bici o in macchina</li>
-<li>Salva i tuoi luoghi preferiti con un tocco</li>
-<li>Leggi gli articoli Wikipedia Offline</li>
-<li>Cartina delle metropolitane con direzioni</li>
-<li>Registrazione del percorso</li>
-<li>Esporta ed importa i tuoi luoghi preferiti e percorsi nei formati KML, KMZ o GPX</li>
-<li>Modalità notturna per la notte</li>
-<li>Migliora le mappe per tutti usando l'editor interno</li>
-</ul>
+• Scarica mappe dettagliate di luoghi che non sono disponibili su Google Maps
+• Modalità Outdoor con percorsi escursionistici, campeggi, sorgenti d'acqua, picchi, dislivelli ed altro evidenziati
+• Strade pedonali e piste ciclabili
+• Punti d'interesse come ristoranti, stazioni di benzina, hotel, negozi, luoghi turistici e molto altro
+• Cerca per nome, indirizzo o categoria
+• Navigazione con assistente vocale a piedi, in bici o in macchina
+• Salva i tuoi luoghi preferiti con un tocco
+• Leggi gli articoli Wikipedia Offline
+• Cartina delle metropolitane con direzioni
+• Registrazione del percorso
+• Esporta ed importa i tuoi luoghi preferiti e percorsi nei formati KML, KMZ o GPX
+• Modalità notturna per la notte
+• Migliora le mappe per tutti usando l'editor interno
 
 <b>La Libertà è Qui</b>
 Esplora la tua nuova avventura, naviga il mondo con Privacy e la comunità in prima linea!

android/app/src/fdroid/play/listings/pt-BR/full-description.txt

@@ -15,21 +15,19 @@ Junte-se à comunidade e ajude a criar o melhor aplicativo de mapas.
 ‣ <b>Tomada de decisões e finanças abertas e transparentes, sem fins lucrativos e totalmente de código aberto.</b>
 
 <b>Principais recursos</b>:
-<ul>
-<li>Mapas detalhados para download com locais não disponíveis no Google Maps</li>
-<li>Modo ao ar livre com trilhas em destaque, acampamentos, fontes de água, picos, curvas de nível, etc.</li>
-<li>Trilhas para caminhada e ciclovias</li>
-<li>Pontos de interesse como restaurantes, postos de gasolina, hotéis, lojas, pontos turísticos e muito mais</li>
-<li>Pesquise por nome, endereço ou categoria de ponto de interesse</li>
-<li>Navegação com anúncios de voz para caminhada, ciclismo ou direção</li>
-<li>Marque seus lugares favoritos com um único toque</li>
-<li>Artigos offline da Wikipédia</li>
-<li>Caminho de transporte e direções do metrô</li>
-<li>Gravação de trilhas</li>
-<li>Exporte e importe favoritos e trilhas em Formatos KML, KMZ, GPX</li>
-<li>Um modo escuro para usar à noite</li>
-<li>Aprimore os dados do mapa para todos usando um editor básico integrado</li>
-</ul>
+• Mapas detalhados para download com locais não disponíveis no Google Maps
+• Modo ao ar livre com trilhas em destaque, acampamentos, fontes de água, picos, curvas de nível, etc.
+• Trilhas para caminhada e ciclovias
+• Pontos de interesse como restaurantes, postos de gasolina, hotéis, lojas, pontos turísticos e muito mais
+• Pesquise por nome, endereço ou categoria de ponto de interesse
+• Navegação com anúncios de voz para caminhada, ciclismo ou direção
+• Marque seus lugares favoritos com um único toque
+• Artigos offline da Wikipédia
+• Caminho de transporte e direções do metrô
+• Gravação de trilhas
+• Exporte e importe favoritos e trilhas em Formatos KML, KMZ, GPX
+• Um modo escuro para usar à noite
+• Aprimore os dados do mapa para todos usando um editor básico integrado
 
 <b>A Liberdade Chegou</b>
 Descubra sua jornada, navegue pelo mundo com privacidade e comunidade em primeiro lugar!

android/app/src/fdroid/play/listings/pt/title.txt

@@ -0,0 +1 @@
+CoMaps - Andar, Pedalar, Dirigir Offline com Privacidade

android/app/src/fdroid/play/listings/ru-RU/full-description.txt

@@ -8,21 +8,19 @@
 ‣ <b>Открытое и прозрачное принятие решений, финансовая отчетность, некоммерческая организация и полностью открытый исходный код.</b>
 
 <b>Главные особенности</b>:
-<ul>
-<li>Загружаемые и подробные карты с местами, которые недоступны в Google Maps</li>
-<li>Режим Outdoor с отмеченными туристическими тропами, кемпингами, источниками воды, вершинами, контурными линиями и т.д.</li>
-<li>Пешеходные переходы и велодорожки</li>
-<li>Точки интереса, такие как: рестораны, заправочные станции, отели, магазины, достопримечательности и многое другое</li>
-<li>Поиск по имени, адресу или категории достопримечательностей</li>
-<li>Навигация с голосовыми уведомлениями для пешеходов, велосипедистов или водителей</li>
-<li>Возможность добавлять любимые места в закладки одним касанием</li>
-<li>Загружаемые страницы Википедии</li>
-<li>Слой общественного транспорта (метро)</li>
-<li>Запись маршрута</li>
-<li>Экспорт и импорт закладок и маршрутов в форматах KML, KMZ, GPX</li>
-<li>Темный режим для использования в ночное время</li>
-<li>Улучшение картографических данных для всех с помощью базового встроенного редактора</li>
-<li>Поддержка Android Auto и CarPlay</li>
-</ul>
+• Загружаемые и подробные карты с местами, которые недоступны в Google Maps
+• Режим Outdoor с отмеченными туристическими тропами, кемпингами, источниками воды, вершинами, контурными линиями и т.д.
+• Пешеходные переходы и велодорожки
+• Точки интереса, такие как: рестораны, заправочные станции, отели, магазины, достопримечательности и многое другое
+• Поиск по имени, адресу или категории достопримечательностей
+• Навигация с голосовыми уведомлениями для пешеходов, велосипедистов или водителей
+• Возможность добавлять любимые места в закладки одним касанием
+• Загружаемые страницы Википедии
+• Слой общественного транспорта (метро)
+• Запись маршрута
+• Экспорт и импорт закладок и маршрутов в форматах KML, KMZ, GPX
+• Темный режим для использования в ночное время
+• Улучшение картографических данных для всех с помощью базового встроенного редактора
+• Поддержка Android Auto и CarPlay
 
 <i>Свобода здесь - Открой для себя поездки, навигацию по миру, ставя приватность и сообщество во главе</i>

android/app/src/fdroid/play/listings/sr/full-description.txt

@@ -0,0 +1,33 @@
+Бесплатна апликација отвореног кода коју је обављала заједница и заснива се на ОпенСтреетМап-у подацима, усмерени транспарентност, приватност и непрофитни. ЦОМПАПС је Апликације за органске карте виљушка, које је пак форк мапс.ме.
+
+Прочитајте о разлозима пројекта и његовог правца на <b><i>codeberg.org/comaps</i></b>
+Придружите се отвореној заједници и помозите да направимо најбољу апликацију за мапе
+• Користите апликацију и проширите глас о томе
+• Дајте повратне информације и пријавите проблеме
+• Ажурирајте податке на мапи у апликацији или на веб локацији OpenStreetMap
+‣<b>фокусирано на офлајн Вар </b>: Планирајте и управљајте путовањем у иностранству без потребе за мобилним услугама, тражите путне тачке док је на даљинском покрету, итд. 
+
+Све апликације су дизајниране за рад ван мреже.
+‣<b> Поштовање приватности </b>: Апликација је осмишљена задржавања у уму приватност - не идентификује људе, не прати или прикупља личне податке. Нема реклама.
+‣ <b> Једноставно и елегантно </b>: Апликација је тривијална за употребу и једноставно функционише.
+‣ <b> Чува вашу батерију и простор </b>: не конзумира батерију као остале навигационе апликације. Компактне картице сачувајте драгоцени простор на вашем телефону.
+‣ <b> Отворено и направио је заједницу </b>: Људи попут вас је помогли да додају апликацију додавањем локација на OpenStreetMap-у, тестирању и давање повратних информација о апликацији и доприносе вашим развојним вештинама и новцу.
+‣ <b> Отворено и транспарентно доношење одлука и употреба финансија, непрофитна и потпуно отворена извора. </ Б>
+
+<b> Главне карактеристике </b>:
+• Преузмите детаљне мапе са локацијама које нису доступне са Гоогле мапама
+• Улазнице за излете са истакнутим планинарским стазама, камповима, изворима воде, планинске врхове, контурне линије итд.
+• Стазе за планинарење и бицикле
+• Тачке интереса као што су ресторани, бензинске пумпе, хотели, продавнице, погледа и још много тога
+• Претражите име или адресу или по категоријама камате
+• навигација са гласовним најавама за ходање, бициклизам или аутомобил
+• Означите своја омиљена места једним додиром
+• Офлајн чланци Википедије
+• транзитни слој подземне пруге са навигацијом
+• Снимање ГПС трагова
+• Ознака и увоз и увоз у KML, KMZ, GPX формате
+• Тамни режим за употребу током ноћи
+• Побољшајте карту за све кориснике, користећи основни уредни уредник мапе
+
+<b> Слобода је овде </b>
+Откријте своје путовање, крећете се са свијетом са приватношћу и заједницом на првом месту!

android/app/src/fdroid/play/listings/tr-TR/full-description.txt

@@ -0,0 +1,32 @@
+OpenStreetMap'in verilerine ve kar amacı gütmeyen olma taahhüdündeki topluluk liderliğine dayanan şeffaflık, gizlilik, ücretsiz ve açık kaynaklı haritalar uygulaması. Comaps, Organic Maps çatalı/düzenlemesidir, bu da bir Maps.ME çatalıdır.
+
+Projenin sebepleri ve rotası hakkında <b><i>codeberg.org/comaps</i></b> adresinden bilgi edinebilirsiniz.
+Oradaki topluluğa katılın ve en iyi harita uygulamasını yapmanıza yardımcı olun
+• Uygulamayı kullanın ve bu bilgiyi yayın
+• Geri bildirim verin ve sorunları bildirin
+• Uygulamada veya OpenStreetMap internet sitesinde harita verilerini güncelleyin
+
+‣ <b>Çevrimdışı odaklı</b>: Hücresel veriye ihtiyaç duymadan yurt dışında seyahatinizi planlayın ve gezin, uzak bir yürüyüş sırasında durak noktaları arama, vb. Tüm uygulama işlevleri çevrimdışı çalışacak şekilde tasarlanmıştır.
+‣ <b>Gizliliğe saygı gösterir</b>: Uygulama gizlilik göz önünde bulundurularak tasarlanmıştır - insanları fişlemez, izlemez ve kişisel bilgileri toplamaz. Reklamsızdır.
+‣ <b>Basit ve parlak</b>: Sadece işe yarayan kullanımı kolay özellikler.
+‣ <b>Pilinizi ve hafızanızı kurtarın</b>: Pilinizi diğer gezinme uygulamaları gibi boşaltmaz. Sıkıştırılmış haritalar telefonunuzdaki değerli hafızadan tasarruf eder.
+‣ <b>Özgür ve topluluk tarafından inşa edilmiştir</b>: Sizin gibi insanlar, OpenStreetMap'e yerler ekleyerek, özellikleri test edip hakkında geri bildirim vererek, geliştirme becerileri ve paralarıyla katkıda bulunarak uygulamanın oluşturulmasına yardımcı oldu.
+‣ <b>Açık, şeffaf finans ve karar verme, kar amacı gütmeyen ve tamamen açık kaynaklı.</b>
+
+<b>Ana Özellikler</b>:
+• Google Haritalarda mevcut olmayan yerlerle, indirilebilir ve ayrıntılı haritalar
+• Vurgulanmış yürüyüş parkurları, kamp alanları, su kaynakları, zirveler, yükseklik çizgileri, vb.
+• Yürüyüş ve bisiklet yolları
+• Lokantalar, benzin istasyonları, oteller, mağazalar, şahin tepeleri ve daha fazla ilgi çekici nokta
+• Ada, adrese veya ilgi alanına göre arayın
+• Yürüyüş, bisiklete binme veya sürüş için sesli bildirimlerle gezinme
+• En sevdiğiniz yerlere tek bir dokunuşla yer işareti koyun
+• Çevrimdışı Vikipedi makaleleri
+• Metro katmanı ve tarifler
+• Rota kaydı
+• KML, KMZ, GPX biçimlerindeki yer imlerini ve izlerini dışa veya içe aktarın
+• Gece boyunca kullanılacak karanlık kip
+• Temel yerleşik bir arayüz kullanan herkes için harita verilerini geliştirin
+
+<b>Özgürlük Burada</b>
+Yolculuğunuzu keşfedin, dünyayı gizlilik ve topluluk desteğiyle gezin!

android/app/src/fdroid/play/listings/tr-TR/short-description.txt

@@ -0,0 +1 @@
+Kolayca gezinin - Seyahat etmenin ötesini bulun - Gönüllüler tarafından yapıldı

android/app/src/fdroid/play/listings/tr-TR/title.txt

@@ -0,0 +1 @@
+CoMaps - İnternetsiz Seyahat Edin

android/app/src/fdroid/play/listings/zh-CN/full-description.txt

@@ -14,21 +14,19 @@
 ‣ <b>决策问责、财务透明、非营利性、完全开源。</b>
 
 <b>主要功能</b>：
-<ul>
-<li>可下载详细的地图，包括许多Google地图中未显示的地方</li>
-<li>突出显示远足路线、露营地、水源、山峰、等高线等的户外模式</li>
-<li>步行道和自行车道</li>
-<li>餐厅、加油站、酒店、商店、景点等众多兴趣点</li>
-<li>按名称、地址或兴趣点类别搜索</li>
-<li>步行、骑车或驾驶时，可通过语音提示进行导航</li>
-<li>一键收藏您中意的地点</li>
-<li>离线阅读维基百科文章</li>
-<li>地铁交通图层和路线指示</li>
-<li>轨迹记录</li>
-<li>以 KML、KMZ 和 GPX 格式导出和导入书签和轨迹</li>
-<li>选择天暗后自动开启的黑暗模式</li>
-<li>使用基本的内置编辑器来编辑 OpenStreetMap 地点，帮助大家改进地图数据</li>
-</ul>
+• 可下载详细的地图，包括许多Google地图中未显示的地方
+• 突出显示远足路线、露营地、水源、山峰、等高线等的户外模式
+• 步行道和自行车道
+• 餐厅、加油站、酒店、商店、景点等众多兴趣点
+• 按名称、地址或兴趣点类别搜索
+• 步行、骑车或驾驶时，可通过语音提示进行导航
+• 一键收藏您中意的地点
+• 离线阅读维基百科文章
+• 地铁交通图层和路线指示
+• 轨迹记录
+• 以 KML、KMZ 和 GPX 格式导出和导入书签和轨迹
+• 选择天暗后自动开启的黑暗模式
+• 使用基本的内置编辑器来编辑 OpenStreetMap 地点，帮助大家改进地图数据
 
 <b>自由在此</b>
 探索您的旅程，以隐私和社区为本，畅游世界！

android/app/src/fdroid/play/listings/zh-TW/full-description.txt

@@ -14,21 +14,19 @@
 ‣ <b>決策問責、財務透明、非營利性、完全開源。</b>
 
 <b>主要功能</b>：
-<ul>
-<li>可下載詳細的地圖，包括許多Google地圖中未顯示的地方</li>
-<li>突出顯示遠足路線、露營地、水源、山峰、等高線等的戶外模式</li>
-<li>步道和自行車道</li>
-<li>餐廳、加油站、旅館、商店、景點等眾多興趣點</li>
-<li>按名稱、地址或興趣點類別搜尋</li>
-<li>步行、騎車或駕駛時，可透過語音提示進行導航</li>
-<li>一鍵收藏您喜愛的地點</li>
-<li>離線閱讀維基百科文章</li>
-<li>列車運輸圖層及路線指示</li>
-<li>軌跡記錄</li>
-<li>以 KML、KMZ 和 GPX 格式匯出和匯入書籤和軌跡</li>
-<li>選擇天暗後自動開啟的黑暗模式</li>
-<li>使用基本的內建編輯器來編輯 OpenStreetMap 地點，幫助大家改進地圖資料</li>
-</ul>
+• 可下載詳細的地圖，包括許多Google地圖中未顯示的地方
+• 突出顯示遠足路線、露營地、水源、山峰、等高線等的戶外模式
+• 步道和自行車道
+• 餐廳、加油站、旅館、商店、景點等眾多興趣點
+• 按名稱、地址或興趣點類別搜尋
+• 步行、騎車或駕駛時，可透過語音提示進行導航
+• 一鍵收藏您喜愛的地點
+• 離線閱讀維基百科文章
+• 列車運輸圖層及路線指示
+• 軌跡記錄
+• 以 KML、KMZ 和 GPX 格式匯出和匯入書籤和軌跡
+• 選擇天暗後自動開啟的黑暗模式
+• 使用基本的內建編輯器來編輯 OpenStreetMap 地點，幫助大家改進地圖資料
 
 <b>自由在此</b>
 探索您的旅程，以隱私和社群為本，暢遊世界！

android/app/src/fdroid/play/version.yaml

@@ -1 +1 @@
-version: 2025.06.10-4-FDroid+25061004
+version: 2025.03.02-7-FDroid+25030207

android/app/src/google/play/listings/de-DE/title.txt

@@ -1 +1 @@
-CoMaps: Navigation Datenschutz
+CoMaps

android/app/src/google/play/listings/fi-FI/full-description.txt

@@ -0,0 +1,36 @@
+Yhteisön johtama vapaa ja avoimeen lähdekoodiin perustuva karttasovellus, jonka karttadata perustuu OpenStreetMap:n avoimeen dataan. Sovelluksessa painottuu vahva sitoutuminen läpinäkyvyyteen, yksityisyyteen ja voittoa tavoittelemattomaan toimintaan.
+
+Liity yhteisöön ja auta kehittämään parasta karttasovellusta
+• Käytä sovellusta ja levitä sanaa
+• Anna palautetta ja raportoi ongelmista
+• Päivitä karttadataa sovelluksessa tai OpenStreetMap:n verkkosivuilla
+
+<i>Palautteesi ja 5-tähden arvostelu on paras tukesi meille!</i>
+
+‣ <b>Yksinkertainen ja viimeistelty</b>: Olennaiset ominaisuudet, joita on helppo käyttää.
+‣ <b>Offline-painotteinen</b>: Suunnittele ja navigoi matkasi ilman verkkoyhteyttä. Etsi reittipisteitä retkilläsi. Kaikki sovelluksen toiminnot on suunniteltu käytettäväksi ilman verkkoyhteyttä.
+‣ <b>Kunnioittaa yksityisyyttä</b>: Sovellus on suunniteltu yksityisyyttä silmälläpitäen. Sovellu ei tunnista ihmisä, seuraa toimintaasi, eikä kerää henkilökohtaisia tietojasi. Mainosvapaa.
+‣ <b>Säästää akkua ja tilaa</b>: Ei kuluta akkua, kuten toiset karttasovellukset. Kompaktit kartat säästävät tilaa puhelimessasi.
+‣ <b>Ilmainen ja yhteisön rakentama</b>: Ihmiset, kuten sinä ovat auttaneet sovelluksen kehityksessä lisäämällä paikkoja OpenStreetMap:iin, testaamalla sovellusta ja antamalla palautetta. Voit auttaa myös kehittämällä sovellusta ja lahjoittamalla sovelluskehitykseen.
+‣ <b>Avoin ja läpinäkyvä päätöksenteko ja rahoitus. Voittoa tavoittelematon ja täysin avoimeen lähdekoodiin perustuva.</b>
+
+<b>Tärkeimmät ominaisuudet</b>:
+• Ladattavat yksityiskohtaiset kartat paikoista, joita ei löydy edes Google Maps:sta
+• Ulkoilutila, josta löytyy korostettuna reitit, leirintäpaikat, vesipisteet, huiput ja korkeuserot yms.
+• Kävely- ja pyörätiet
+• Kiinnostavat paikat, kuten ravintolat, huoltoasemat, hotellit, kaupat, nähtävyydet ja monta muuta
+• Etsi nimellä, osoitteella tai kiinnostavan paikan kategorialla
+• Navigointi ääni-ilmoituksilla kävellessä, pyöräillessä tai ajaessa
+• Tallenna suosikkipaikkasi yhdellä napautuksella
+• Offline Wikipedia-artikkelit
+• Maanalaisen liikenteen tasot ja ohjeet
+• Reittien tallennus
+• Tuo ja vie kirjanmerkkejä ja reittejä KML-, KMZ- ja GPX-formaateissa
+• Tumma tila iltaa ja yötä varten
+• Paranna karttadataa kaikille sisäänrakennetulla editorilla
+• Android Auto -tuki
+
+Raportoi sovellusvirheistä, ehdota ideoita liity yhteisöön osoitteessa <b><i>comaps.app</i></b>
+
+<b>Vapaus on täällä</b>
+Löydä matkasi, navigoi maailmassa yksityisyyden ja yhteisön tukemana!

android/app/src/google/play/listings/sr/full-description.txt

@@ -1,6 +1,6 @@
 Бесплатна апликација за мапе отвореног кода коју води заједница заснована на OpenStreetMap подацима и ојачана посвећеношћу транспарентности, приватности и непрофитности.
 
-Придружите се заједници и помозите да направите најбољу навигацију
+Придружите се заједници и помозите да направимо најбољу навигацију
 • Користите апликацију и ширите информације о њој
 • Оставите повратне информације и пријавите проблеме
 • Ажурирајте мапе из апликације или на сајту OpenStreetMap

android/app/src/google/play/listings/tr-TR/short-description.txt

@@ -0,0 +1 @@
+Kolayca gezinin - Seyahat etmenin ötesini bulun - Gönüllüler tarafından yapıldı

android/app/src/google/play/listings/tr-TR/title.txt

@@ -0,0 +1 @@
+CoMaps - Gizlilikle Gezin

android/app/src/main/AndroidManifest.xml

@@ -119,7 +119,7 @@
 
         <data android:scheme="http"/>
         <data android:scheme="https"/>
-        <data android:host="comaps.app"/>
+        <data android:host="comaps.at"/>
       </intent-filter>
 
       <intent-filter>

android/app/src/main/java/app/organicmaps/MwmActivity.java

@@ -34,7 +34,6 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.annotation.StyleRes;
 import androidx.annotation.UiThread;
-import androidx.appcompat.widget.Toolbar;
 import androidx.core.app.ActivityCompat;
 import androidx.core.content.ContextCompat;
 import androidx.core.view.ViewCompat;
@@ -120,6 +119,8 @@ import app.organicmaps.widget.menu.MainMenu;
 import app.organicmaps.widget.placepage.PlacePageController;
 import app.organicmaps.widget.placepage.PlacePageData;
 import app.organicmaps.widget.placepage.PlacePageViewModel;
+
+import com.google.android.material.appbar.MaterialToolbar;
 import com.google.android.material.dialog.MaterialAlertDialogBuilder;
 import com.google.android.material.floatingactionbutton.FloatingActionButton;
 
@@ -187,7 +188,7 @@ public class MwmActivity extends BaseMwmFragmentActivity
   private MapFragment mMapFragment;
 
   private View mPointChooser;
-  private Toolbar mPointChooserToolbar;
+  private MaterialToolbar mPointChooserToolbar;
 
   private RoutingPlanInplaceController mRoutingPlanInplaceController;
 

android/app/src/main/java/app/organicmaps/base/BaseMwmFragmentActivity.java

@@ -15,11 +15,12 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.annotation.StyleRes;
 import androidx.appcompat.app.AppCompatActivity;
-import androidx.appcompat.widget.Toolbar;
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentFactory;
 import androidx.fragment.app.FragmentManager;
 
+import com.google.android.material.appbar.MaterialToolbar;
+
 import app.organicmaps.MwmApplication;
 import app.organicmaps.R;
 import app.organicmaps.SplashActivity;
@@ -148,7 +149,7 @@ public abstract class BaseMwmFragmentActivity extends AppCompatActivity
     onBackPressed();
   }
 
-  protected Toolbar getToolbar()
+  protected MaterialToolbar getToolbar()
   {
     return findViewById(R.id.toolbar);
   }

android/app/src/main/java/app/organicmaps/base/BaseMwmRecyclerFragment.java

@@ -10,11 +10,13 @@ import androidx.annotation.CallSuper;
 import androidx.annotation.LayoutRes;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
-import androidx.appcompat.widget.Toolbar;
 import androidx.core.view.ViewCompat;
 import androidx.fragment.app.Fragment;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
+
+import com.google.android.material.appbar.MaterialToolbar;
+
 import app.organicmaps.R;
 import app.organicmaps.util.UiUtils;
 import app.organicmaps.util.Utils;
@@ -23,7 +25,7 @@ import app.organicmaps.widget.PlaceholderView;
 
 public abstract class BaseMwmRecyclerFragment<T extends RecyclerView.Adapter> extends Fragment
 {
-  private Toolbar mToolbar;
+  private MaterialToolbar mToolbar;
 
   @SuppressWarnings("NotNullFieldNotInitialized")
   @NonNull

android/app/src/main/java/app/organicmaps/base/BaseToolbarActivity.java

@@ -6,11 +6,13 @@ import androidx.annotation.CallSuper;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.annotation.StringRes;
-import androidx.appcompat.widget.Toolbar;
 import androidx.core.view.ViewCompat;
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentFactory;
 import androidx.fragment.app.FragmentManager;
+
+import com.google.android.material.appbar.MaterialToolbar;
+
 import app.organicmaps.R;
 import app.organicmaps.util.UiUtils;
 import app.organicmaps.util.WindowInsetUtils.PaddingInsetsListener;
@@ -26,7 +28,7 @@ public abstract class BaseToolbarActivity extends BaseMwmFragmentActivity
   {
     super.onSafeCreate(savedInstanceState);
 
-    Toolbar toolbar = getToolbar();
+    MaterialToolbar toolbar = getToolbar();
     if (toolbar != null)
     {
       int title = getToolbarTitle();
@@ -42,7 +44,7 @@ public abstract class BaseToolbarActivity extends BaseMwmFragmentActivity
     }
   }
 
-  protected void setupHomeButton(@NonNull Toolbar toolbar)
+  protected void setupHomeButton(@NonNull MaterialToolbar toolbar)
   {
     UiUtils.showHomeUpButton(toolbar);
   }
@@ -92,7 +94,7 @@ public abstract class BaseToolbarActivity extends BaseMwmFragmentActivity
 
     if (title != null)
     {
-      Toolbar toolbar = getToolbar();
+      MaterialToolbar toolbar = getToolbar();
       if (toolbar != null && toolbar.getTitle() != null)
       {
         mLastTitle = toolbar.getTitle().toString();

android/app/src/main/java/app/organicmaps/downloader/DownloaderAdapter.java

@@ -480,6 +480,13 @@ class DownloaderAdapter extends RecyclerView.Adapter<DownloaderAdapter.ViewHolde
 
       UiUtils.showIf(mSearchResultsMode && !TextUtils.isEmpty(found), mFoundName);
 
+      long size = getMapDisplaySize();
+      mSize.setText(StringUtils.getFileSizeString(mFragment.requireContext(), size));
+      mStatusIcon.update(mItem);
+    }
+
+    private long getMapDisplaySize()
+    {
       long size;
       if (mItem.status == CountryItem.STATUS_ENQUEUED ||
           mItem.status == CountryItem.STATUS_PROGRESS ||
@@ -487,13 +494,16 @@ class DownloaderAdapter extends RecyclerView.Adapter<DownloaderAdapter.ViewHolde
       {
         size = mItem.enqueuedSize;
       }
+      else if (mItem.status == CountryItem.STATUS_FAILED ||
+          mItem.status == CountryItem.STATUS_DOWNLOADABLE)
+      {
+        size = mItem.totalSize;
+      }
       else
       {
         size = ((!mSearchResultsMode && mMyMapsMode) ? mItem.size : mItem.totalSize);
       }
-
-      mSize.setText(StringUtils.getFileSizeString(mFragment.requireContext(), size));
-      mStatusIcon.update(mItem);
+      return size;
     }
   }
 

android/app/src/main/java/app/organicmaps/editor/EditorFragment.java

@@ -189,6 +189,7 @@ public class EditorFragment extends BaseMwmFragment implements View.OnClickListe
     initMetadataEntry(Metadata.MetadataType.FMD_WEBSITE, R.string.error_enter_correct_web);
     initMetadataEntry(Metadata.MetadataType.FMD_WEBSITE_MENU, R.string.error_enter_correct_web);
     initMetadataEntry(Metadata.MetadataType.FMD_EMAIL, R.string.error_enter_correct_email);
+    initMetadataEntry(Metadata.MetadataType.FMD_LEVEL, R.string.error_enter_correct_level);
     initMetadataEntry(Metadata.MetadataType.FMD_CONTACT_FEDIVERSE, R.string.error_enter_correct_fediverse_page);
     initMetadataEntry(Metadata.MetadataType.FMD_CONTACT_FACEBOOK, R.string.error_enter_correct_facebook_page);
     initMetadataEntry(Metadata.MetadataType.FMD_CONTACT_INSTAGRAM, R.string.error_enter_correct_instagram_page);
@@ -431,8 +432,7 @@ public class EditorFragment extends BaseMwmFragment implements View.OnClickListe
 
     // Details
     View mBlockLevels = view.findViewById(R.id.block_levels);
-    mBuildingLevels = findInputAndInitBlock(mBlockLevels, R.drawable.ic_floor,
-        getString(R.string.editor_storey_number, Editor.nativeGetMaxEditableBuildingLevels()));
+    mBuildingLevels = findInputAndInitBlock(mBlockLevels, R.drawable.ic_floor, R.string.editor_building_levels);
     mBuildingLevels.setInputType(InputType.TYPE_CLASS_NUMBER);
     mInputBuildingLevels = mBlockLevels.findViewById(R.id.custom_input);
     View blockPhone = view.findViewById(R.id.block_phone);
@@ -446,6 +446,8 @@ public class EditorFragment extends BaseMwmFragment implements View.OnClickListe
             R.drawable.ic_website_menu, R.string.website_menu, InputType.TYPE_TEXT_VARIATION_URI);
     View emailBlock = initBlock(view, Metadata.MetadataType.FMD_EMAIL, R.id.block_email,
             R.drawable.ic_email, R.string.email, InputType.TYPE_TEXT_VARIATION_EMAIL_ADDRESS);
+    View levelBlock = initBlock(view, Metadata.MetadataType.FMD_LEVEL, R.id.block_level,
+            R.drawable.ic_level_white, R.string.editor_level, InputType.TYPE_CLASS_NUMBER);
     View fediverseContactBlock = initBlock(view, Metadata.MetadataType.FMD_CONTACT_FEDIVERSE, R.id.block_fediverse,
             R.drawable.ic_mastodon_white, R.string.mastodon, InputType.TYPE_TEXT_VARIATION_URI);
     View facebookContactBlock = initBlock(view, Metadata.MetadataType.FMD_CONTACT_FACEBOOK, R.id.block_facebook,
@@ -503,6 +505,7 @@ public class EditorFragment extends BaseMwmFragment implements View.OnClickListe
     mDetailsBlocks.put(Metadata.MetadataType.FMD_WEBSITE, websiteBlock);
     mDetailsBlocks.put(Metadata.MetadataType.FMD_WEBSITE_MENU, websiteMenuBlock);
     mDetailsBlocks.put(Metadata.MetadataType.FMD_EMAIL, emailBlock);
+    mDetailsBlocks.put(Metadata.MetadataType.FMD_LEVEL, levelBlock);
     mDetailsBlocks.put(Metadata.MetadataType.FMD_OPERATOR, operatorBlock);
 
     mSocialMediaBlocks.put(Metadata.MetadataType.FMD_CONTACT_FEDIVERSE, fediverseContactBlock);

android/app/src/main/java/app/organicmaps/location/LocationHelper.java

@@ -213,7 +213,7 @@ public class LocationHelper implements BaseLocationProvider.Listener
 
     if (mSavedLocation != null)
     {
-      if (!LocationUtils.isFromFusedProvider(location) && !LocationUtils.isLocationBetterThanLast(location, mSavedLocation))
+      if (!LocationUtils.isLocationBetterThanLast(location, mSavedLocation))
       {
         Logger.d(TAG, "The new " + location + " is worse than the last " + mSavedLocation);
         return;

android/app/src/main/java/app/organicmaps/location/RouteSimulationProvider.java

@@ -2,6 +2,7 @@ package app.organicmaps.location;
 
 import android.content.Context;
 import android.location.Location;
+import android.os.SystemClock;
 
 import androidx.annotation.NonNull;
 
@@ -57,6 +58,7 @@ class RouteSimulationProvider extends BaseLocationProvider
     location.setLatitude(mPoints[mCurrentPoint].mLat);
     location.setLongitude(mPoints[mCurrentPoint].mLon);
     location.setAccuracy(1.0f);
+    location.setElapsedRealtimeNanos(SystemClock.elapsedRealtimeNanos());
     mListener.onLocationChanged(location);
     mCurrentPoint += 1;
     UiThread.runLater(this::nextPoint, INTERVAL_MS);

android/app/src/main/java/app/organicmaps/maplayer/MapButtonsController.java

@@ -481,6 +481,11 @@ public class MapButtonsController extends Fragment
         .setAllSides()
         .build();
     ViewCompat.setOnApplyWindowInsetsListener(mFrame, insetsListener);
+    // Fixes insets on older Androids and with a search opened via API on all Androids.
+    if (android.os.Build.VERSION.SDK_INT <= android.os.Build.VERSION_CODES.Q)
+      mFrame.postDelayed(() -> ViewCompat.requestApplyInsets(mFrame), 1250);
+    else
+      mFrame.post(() -> ViewCompat.requestApplyInsets(mFrame));
   }
 
   @Override

android/app/src/main/java/app/organicmaps/routing/RoutingErrorDialogFragment.java

@@ -38,15 +38,17 @@ public class RoutingErrorDialogFragment extends BaseRoutingErrorDialogFragment
         ResultCodesHelper.getDialogTitleSubtitle(requireContext(), mResultCode, mMissingMaps.size());
     Pair<String, String> titleMessage = resHolder.getTitleMessage();
 
-    TextView titleView = new TextView(requireContext());
-    titleView.setText(titleMessage.first);
-    titleView.setPadding(65, 32, 32, 16);
-    titleView.setTextSize(18);
-    titleView.setMaxLines(4);
-    titleView.setEllipsize(TextUtils.TruncateAt.END);
-    titleView.setTypeface(null, Typeface.BOLD);
-    builder.setCustomTitle(titleView);
-
+    if (!TextUtils.isEmpty(titleMessage.first))
+    {
+      TextView titleView = new TextView(requireContext());
+      titleView.setText(titleMessage.first);
+      titleView.setPadding(65, 32, 32, 16);
+      titleView.setTextSize(18);
+      titleView.setMaxLines(4);
+      titleView.setEllipsize(TextUtils.TruncateAt.END);
+      titleView.setTypeface(null, Typeface.BOLD);
+      builder.setCustomTitle(titleView);
+    }
     mMessage = titleMessage.second;
     builder.setNegativeButton(resHolder.getCancelBtnResId(), null);
     if (ResultCodesHelper.isDownloadable(mResultCode, mMissingMaps.size()))

android/app/src/main/java/app/organicmaps/search/SearchFragment.java

@@ -16,7 +16,6 @@ import androidx.activity.result.contract.ActivityResultContracts;
 import androidx.annotation.CallSuper;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
-import androidx.appcompat.widget.Toolbar;
 import androidx.core.view.ViewCompat;
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentManager;
@@ -47,6 +46,7 @@ import app.organicmaps.util.WindowInsetUtils;
 import app.organicmaps.widget.PlaceholderView;
 import app.organicmaps.widget.SearchToolbarController;
 import com.google.android.material.appbar.AppBarLayout;
+import com.google.android.material.appbar.MaterialToolbar;
 import com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton;
 import com.google.android.material.tabs.TabLayout;
 
@@ -226,7 +226,7 @@ public class SearchFragment extends BaseMwmFragment
   private void updateFrames()
   {
     final boolean hasQuery = mToolbarController.hasQuery();
-    Toolbar toolbar = mToolbarController.getToolbar();
+    MaterialToolbar toolbar = mToolbarController.getToolbar();
     AppBarLayout.LayoutParams lp = (AppBarLayout.LayoutParams) toolbar.getLayoutParams();
     lp.setScrollFlags(hasQuery ? AppBarLayout.LayoutParams.SCROLL_FLAG_ENTER_ALWAYS
                                  | AppBarLayout.LayoutParams.SCROLL_FLAG_SCROLL : 0);

android/app/src/main/java/app/organicmaps/util/Constants.java

@@ -13,7 +13,7 @@ public final class Constants
   public static class Url
   {
     public static final String SHORT_SHARE_PREFIX = "cm://";
-    public static final String HTTP_SHARE_PREFIX = "https://comaps.app/";
+    public static final String HTTP_SHARE_PREFIX = "https://comaps.at/";
 
     public static final String MAILTO_SCHEME = "mailto:";
     public static final String MAIL_SUBJECT = "?subject=";
@@ -23,7 +23,6 @@ public final class Constants
     public static final String MASTODON = "https://floss.social/@comaps";
     public static final String FB_OM_COMMUNITY_HTTP = "https://www.facebook.com/profile.php?id=61575286559965";
     public static final String FB_OM_COMMUNITY_NATIVE = "fb://profile/61575286559965";
-    //public static final String TWITTER = "https://twitter.com/user";
 
     public static final String CODE_REPO = "https://codeberg.org/comaps/comaps";
 

android/app/src/main/java/app/organicmaps/util/LocationUtils.java

@@ -84,6 +84,9 @@ public class LocationUtils
 
   public static boolean isLocationBetterThanLast(@NonNull Location newLocation, @NonNull Location lastLocation)
   {
+    if (newLocation.getElapsedRealtimeNanos() < lastLocation.getElapsedRealtimeNanos())
+      return false;
+
     // As described in isAccuracySatisfied, GPS may have zero accuracy "for some reasons".
     if (isFromGpsProvider(lastLocation) && lastLocation.getAccuracy() == 0.0f)
       return true;

android/app/src/main/java/app/organicmaps/util/UiUtils.java

@@ -27,7 +27,6 @@ import androidx.annotation.DimenRes;
 import androidx.annotation.IdRes;
 import androidx.annotation.NonNull;
 import androidx.annotation.StringRes;
-import androidx.appcompat.widget.Toolbar;
 import androidx.core.content.ContextCompat;
 import androidx.core.content.res.ResourcesCompat;
 import androidx.core.graphics.Insets;
@@ -37,6 +36,8 @@ import androidx.core.view.WindowInsetsControllerCompat;
 import androidx.recyclerview.widget.RecyclerView;
 import app.organicmaps.MwmApplication;
 import app.organicmaps.R;
+
+import com.google.android.material.appbar.MaterialToolbar;
 import com.google.android.material.textfield.TextInputLayout;
 
 import java.util.Objects;
@@ -193,7 +194,7 @@ public final class UiUtils
     hide(tv);
   }
 
-  public static void showHomeUpButton(Toolbar toolbar)
+  public static void showHomeUpButton(MaterialToolbar toolbar)
   {
     toolbar.setNavigationIcon(ThemeUtils.getResource(toolbar.getContext(), androidx.appcompat.R.attr.homeAsUpIndicator));
   }
@@ -297,7 +298,7 @@ public final class UiUtils
                     systemInsets.right, view.getPaddingBottom());
   }
 
-  public static void setupNavigationIcon(@NonNull Toolbar toolbar,
+  public static void setupNavigationIcon(@NonNull MaterialToolbar toolbar,
                                          @NonNull View.OnClickListener listener)
   {
     View customNavigationButton = toolbar.findViewById(R.id.back);
@@ -311,14 +312,14 @@ public final class UiUtils
     }
   }
 
-  public static void setupHomeUpButtonAsNavigationIcon(@NonNull Toolbar toolbar,
+  public static void setupHomeUpButtonAsNavigationIcon(@NonNull MaterialToolbar toolbar,
                                                        @NonNull View.OnClickListener listener)
   {
     UiUtils.showHomeUpButton(toolbar);
     toolbar.setNavigationOnClickListener(listener);
   }
 
-  public static void clearHomeUpButton(@NonNull Toolbar toolbar)
+  public static void clearHomeUpButton(@NonNull MaterialToolbar toolbar)
   {
     toolbar.setNavigationIcon(null);
     toolbar.setNavigationOnClickListener(null);

android/app/src/main/java/app/organicmaps/util/bottomsheet/MenuAdapter.java

@@ -3,14 +3,15 @@ package app.organicmaps.util.bottomsheet;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
-import android.widget.ImageView;
 import android.widget.LinearLayout;
-import android.widget.TextView;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.recyclerview.widget.RecyclerView;
 
+import com.google.android.material.imageview.ShapeableImageView;
+import com.google.android.material.textview.MaterialTextView;
+
 import app.organicmaps.R;
 import app.organicmaps.location.TrackRecorder;
 import app.organicmaps.util.Config;
@@ -49,7 +50,7 @@ public class MenuAdapter extends RecyclerView.Adapter<MenuAdapter.ViewHolder>
   public void onBindViewHolder(ViewHolder viewHolder, final int position)
   {
     final MenuBottomSheetItem item = dataSet.get(position);
-    final ImageView iv = viewHolder.getIconImageView();
+    final ShapeableImageView iv = viewHolder.getIconImageView();
     if (item.iconRes == R.drawable.ic_donate && Config.isNY())
     {
       iv.setImageResource(R.drawable.ic_christmas_tree);
@@ -59,7 +60,7 @@ public class MenuAdapter extends RecyclerView.Adapter<MenuAdapter.ViewHolder>
       iv.setImageResource(item.iconRes);
     viewHolder.getContainer().setOnClickListener((v) -> onMenuItemClick(item));
     viewHolder.getTitleTextView().setText(item.titleRes);
-    TextView badge = viewHolder.getBadgeTextView();
+    MaterialTextView badge = viewHolder.getBadgeTextView();
     if (item.badgeCount > 0)
     {
       badge.setText(String.valueOf(item.badgeCount));
@@ -87,9 +88,9 @@ public class MenuAdapter extends RecyclerView.Adapter<MenuAdapter.ViewHolder>
   public static class ViewHolder extends RecyclerView.ViewHolder
   {
     private final LinearLayout container;
-    private final ImageView iconImageView;
-    private final TextView titleTextView;
-    private final TextView badgeTextView;
+    private final ShapeableImageView iconImageView;
+    private final MaterialTextView titleTextView;
+    private final MaterialTextView badgeTextView;
 
     public ViewHolder(View view)
     {
@@ -100,17 +101,17 @@ public class MenuAdapter extends RecyclerView.Adapter<MenuAdapter.ViewHolder>
       badgeTextView = view.findViewById(R.id.bottom_sheet_menu_item_badge);
     }
 
-    public ImageView getIconImageView()
+    public ShapeableImageView getIconImageView()
     {
       return iconImageView;
     }
 
-    public TextView getTitleTextView()
+    public MaterialTextView getTitleTextView()
     {
       return titleTextView;
     }
 
-    public TextView getBadgeTextView()
+    public MaterialTextView getBadgeTextView()
     {
       return badgeTextView;
     }

android/app/src/main/java/app/organicmaps/util/bottomsheet/MenuBottomSheetFragment.java

@@ -7,7 +7,6 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.Window;
-import android.widget.TextView;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
@@ -20,6 +19,7 @@ import androidx.recyclerview.widget.RecyclerView;
 import com.google.android.material.bottomsheet.BottomSheetBehavior;
 import com.google.android.material.bottomsheet.BottomSheetDialog;
 import com.google.android.material.bottomsheet.BottomSheetDialogFragment;
+import com.google.android.material.textview.MaterialTextView;
 
 import java.util.ArrayList;
 import java.util.Objects;
@@ -93,7 +93,7 @@ public class MenuBottomSheetFragment extends BottomSheetDialogFragment
   {
     super.onViewCreated(view, savedInstanceState);
     attachToNearestContext();
-    TextView titleView = view.findViewById(R.id.bottomSheetTitle);
+    MaterialTextView titleView = view.findViewById(R.id.bottomSheetTitle);
     RecyclerView recyclerView = view.findViewById(R.id.bottomSheetMenuContainer);
     if (getArguments() != null)
     {

android/app/src/main/java/app/organicmaps/widget/ToolbarController.java

@@ -9,8 +9,10 @@ import androidx.annotation.Nullable;
 import androidx.annotation.StringRes;
 import androidx.appcompat.app.ActionBar;
 import androidx.appcompat.app.AppCompatActivity;
-import androidx.appcompat.widget.Toolbar;
 import androidx.core.view.ViewCompat;
+
+import com.google.android.material.appbar.MaterialToolbar;
+
 import app.organicmaps.R;
 import app.organicmaps.util.UiUtils;
 import app.organicmaps.util.Utils;
@@ -21,7 +23,7 @@ public class ToolbarController
   @Nullable
   private  Activity mActivity;
   @NonNull
-  private final Toolbar mToolbar;
+  private final MaterialToolbar mToolbar;
   @NonNull
   protected final View.OnClickListener mNavigationClickListener = view -> onUpClick();
 
@@ -39,7 +41,7 @@ public class ToolbarController
     setSupportActionBar(activity, mToolbar);
   }
 
-  private void setSupportActionBar(@NonNull Activity activity, @NonNull Toolbar toolbar)
+  private void setSupportActionBar(@NonNull Activity activity, @NonNull MaterialToolbar toolbar)
   {
     AppCompatActivity appCompatActivity = (AppCompatActivity) activity;
     appCompatActivity.setSupportActionBar(toolbar);
@@ -86,7 +88,7 @@ public class ToolbarController
   }
 
   @NonNull
-  public Toolbar getToolbar()
+  public MaterialToolbar getToolbar()
   {
     return mToolbar;
   }

android/app/src/main/java/app/organicmaps/widget/placepage/EditBookmarkFragment.java

@@ -14,7 +14,6 @@ import android.widget.TextView;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
-import androidx.appcompat.widget.Toolbar;
 import androidx.core.view.ViewCompat;
 import androidx.core.view.WindowCompat;
 import androidx.core.view.WindowInsetsCompat;
@@ -33,6 +32,8 @@ import app.organicmaps.util.Graphics;
 import app.organicmaps.util.InputUtils;
 import app.organicmaps.util.UiUtils;
 import app.organicmaps.util.WindowInsetUtils.PaddingInsetsListener;
+
+import com.google.android.material.appbar.MaterialToolbar;
 import com.google.android.material.textfield.TextInputEditText;
 import com.google.android.material.textfield.TextInputLayout;
 
@@ -203,7 +204,7 @@ public class EditBookmarkFragment extends BaseMwmDialogFragment implements View.
 
   private void initToolbar(View view)
   {
-    Toolbar toolbar = view.findViewById(R.id.toolbar);
+    MaterialToolbar toolbar = view.findViewById(R.id.toolbar);
 
     ViewCompat.setOnApplyWindowInsetsListener(toolbar, PaddingInsetsListener.excludeBottom());
 

android/app/src/main/java/app/organicmaps/widget/placepage/PlacePageView.java

@@ -18,7 +18,6 @@ import android.widget.TextView;
 import androidx.annotation.IdRes;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
-import androidx.appcompat.widget.Toolbar;
 import androidx.core.content.ContextCompat;
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentManager;
@@ -52,6 +51,8 @@ import app.organicmaps.widget.placepage.sections.PlacePageOpeningHoursFragment;
 import app.organicmaps.widget.placepage.sections.PlacePagePhoneFragment;
 import app.organicmaps.widget.placepage.sections.PlacePageProductsFragment;
 import app.organicmaps.widget.placepage.sections.PlacePageWikipediaFragment;
+
+import com.google.android.material.appbar.MaterialToolbar;
 import com.google.android.material.button.MaterialButton;
 
 import java.util.ArrayList;
@@ -86,7 +87,7 @@ public class PlacePageView extends Fragment implements View.OnClickListener,
   private View mFrame;
   // Preview.
   private ViewGroup mPreview;
-  private Toolbar mToolbar;
+  private MaterialToolbar mToolbar;
   private TextView mTvTitle;
   private TextView mTvSecondaryTitle;
   private TextView mTvSubtitle;

android/app/src/main/res/drawable/onmap_downloader_background.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <solid android:color="#FFFFFF"/>
+    <solid android:color="?attr/menuBackground"/>
     <corners android:radius="10dp"/>
     <padding android:left="0dp" android:top="0dp" android:right="0dp" android:bottom="0dp" />
 </shape>

android/app/src/main/res/layout/accept_decline_button_container.xml

@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<merge
-  xmlns:android="http://schemas.android.com/apk/res/android"
-  xmlns:tools="http://schemas.android.com/tools">
-  <LinearLayout
-    android:orientation="vertical"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content">
-    <Button
-      android:id="@+id/accept_btn"
-      style="@style/MwmWidget.Button.Primary"
-      android:layout_width="match_parent"
-      android:layout_height="wrap_content"
-      android:text="@string/accept"/>
-    <FrameLayout
-      android:layout_width="match_parent"
-      android:layout_height="wrap_content"
-      android:layout_marginTop="@dimen/sharing_options_img_size">
-      <TextView
-        android:id="@+id/decline_btn"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center"
-        android:background="?attr/selectableItemBackground"
-        android:fontFamily="@string/robotoMedium"
-        android:gravity="center"
-        android:letterSpacing="0.01"
-        android:textAllCaps="true"
-        android:textAppearance="?android:attr/textAppearanceMedium"
-        android:textSize="@dimen/text_size_body_3"
-        android:textStyle="normal"
-        android:text="@string/learn_more"
-        tools:ignore="UnusedAttribute"
-        tools:text="NOT NOW" />
-    </FrameLayout>
-  </LinearLayout>
-</merge>

android/app/src/main/res/layout/activity_map_placeholder.xml

@@ -8,7 +8,7 @@
   android:gravity="center"
   android:orientation="vertical">
 
-  <androidx.appcompat.widget.AppCompatImageView
+  <com.google.android.material.imageview.ShapeableImageView
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
       android:layout_margin="32dp"
@@ -22,7 +22,7 @@
       android:gravity="center"
       android:orientation="vertical">
 
-    <TextView
+    <com.google.android.material.textview.MaterialTextView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginBottom="8dp"
@@ -31,7 +31,7 @@
         android:textAppearance="@style/TextAppearance.MaterialComponents.Headline4"
         android:textStyle="bold" />
 
-    <TextView
+    <com.google.android.material.textview.MaterialTextView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:text="@string/car_used_on_the_car_screen"
@@ -39,7 +39,7 @@
         android:textAppearance="@style/TextAppearance.MaterialComponents.Body1" />
   </LinearLayout>
 
-  <Button
+  <com.google.android.material.button.MaterialButton
       android:id="@+id/btn_continue"
       style="@style/MwmWidget.Button.Accent"
       android:layout_width="match_parent"

android/app/src/main/res/layout/activity_request_permissions.xml

@@ -7,13 +7,13 @@
     android:gravity="center"
     android:orientation="vertical">
 
-  <ImageView
+  <com.google.android.material.imageview.ShapeableImageView
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
       android:layout_margin="32dp"
       app:srcCompat="@drawable/ic_location_permission_request" />
 
-  <TextView
+  <com.google.android.material.textview.MaterialTextView
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
       android:layout_marginEnd="32dp"
@@ -23,7 +23,7 @@
       android:textAppearance="@style/TextAppearance.MaterialComponents.Headline4"
       android:textStyle="bold" />
 
-  <Button
+  <com.google.android.material.button.MaterialButton
       android:id="@+id/btn_grant_permissions"
       style="@style/MwmWidget.Button.Accent"
       android:layout_width="match_parent"

android/app/src/main/res/layout/bottom_sheet.xml

@@ -13,7 +13,7 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content" />
 
-  <TextView
+  <com.google.android.material.textview.MaterialTextView
     android:id="@+id/bottomSheetTitle"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"

android/app/src/main/res/layout/bottom_sheet_handle.xml

@@ -4,7 +4,7 @@
   android:layout_width="match_parent"
   android:layout_height="wrap_content">
 
-  <ImageView
+  <com.google.android.material.imageview.ShapeableImageView
     android:layout_width="match_parent"
     android:layout_height="4dp"
     android:layout_marginTop="@dimen/margin_quarter"

android/app/src/main/res/layout/bottom_sheet_menu_item.xml

@@ -11,14 +11,14 @@
   android:background="?clickableBackground"
   android:orientation="horizontal">
 
-  <ImageView
+  <com.google.android.material.imageview.ShapeableImageView
     android:id="@+id/bottom_sheet_menu_item_icon"
     android:layout_width="@dimen/bookmark_icon_size"
     android:layout_height="match_parent"
     android:layout_gravity="center_vertical"
     tools:src="@drawable/ic_menu_download"
     app:tint="?android:textColorSecondary"/>
-  <TextView
+  <com.google.android.material.textview.MaterialTextView
     android:id="@+id/bottom_sheet_menu_item_text"
     android:textAppearance="@style/MwmTextAppearance.Body1"
     android:layout_width="0dp"
@@ -29,7 +29,7 @@
     android:gravity="center_vertical"
     android:singleLine="true"
     tools:text="Menu Item" />
-  <TextView
+  <com.google.android.material.textview.MaterialTextView
     android:id="@+id/bottom_sheet_menu_item_badge"
     style="@style/MwmWidget.Counter"
     android:layout_gravity="end|center_vertical"

android/app/src/main/res/layout/dialog_missed_maps.xml

@@ -15,6 +15,7 @@
     android:paddingEnd="@dimen/margin_base_plus"
     android:textAppearance="@style/MwmTextAppearance.Body2"
     android:visibility="gone"
+    tools:text="Select maps to download"
     tools:visibility="visible"/>
 
   <View

android/app/src/main/res/layout/fragment_bookmark_category_settings.xml

@@ -6,7 +6,7 @@
   android:background="?cardBackground"
   android:layout_width="match_parent"
   android:layout_height="match_parent">
-  <androidx.appcompat.widget.Toolbar
+  <com.google.android.material.appbar.MaterialToolbar
     android:id="@+id/toolbar"
     style="@style/MwmWidget.ToolbarStyle"
     android:layout_width="match_parent"

android/app/src/main/res/layout/fragment_driving_options.xml

@@ -6,7 +6,7 @@
   android:orientation="vertical"
   android:layout_width="match_parent"
   android:layout_height="match_parent">
-  <androidx.appcompat.widget.Toolbar
+  <com.google.android.material.appbar.MaterialToolbar
     android:id="@+id/toolbar"
     style="@style/MwmWidget.ToolbarStyle"
     android:layout_width="match_parent"
@@ -15,7 +15,7 @@
     android:gravity="end|center_vertical"
     android:theme="@style/MwmWidget.ToolbarTheme"
     tools:ignore="UnusedAttribute">
-  </androidx.appcompat.widget.Toolbar>
+  </com.google.android.material.appbar.MaterialToolbar>
   <LinearLayout
     android:layout_marginTop="@dimen/margin_half_double_plus"
     android:orientation="horizontal"

android/app/src/main/res/layout/fragment_edit_bookmark.xml

@@ -5,7 +5,7 @@
   android:layout_width="match_parent"
   android:layout_height="match_parent"
   android:background="?windowBackgroundForced">
-  <androidx.appcompat.widget.Toolbar
+  <com.google.android.material.appbar.MaterialToolbar
     android:id="@+id/toolbar"
     style="@style/MwmWidget.ToolbarStyle"
     android:layout_width="match_parent"
@@ -22,7 +22,7 @@
         android:layout_gravity="end|center_vertical"
         android:scaleType="centerInside"
         android:contentDescription="@string/save" />
-  </androidx.appcompat.widget.Toolbar>
+  </com.google.android.material.appbar.MaterialToolbar>
   <FrameLayout
     style="@style/MwmWidget.FrameLayout.Elevation"
     android:layout_width="match_parent"

android/app/src/main/res/layout/fragment_editor.xml

@@ -228,7 +228,9 @@
           android:id="@+id/block_email"
           layout="@layout/item_editor_input"/>
 
-        <!-- ToDo: Level is missing compared with iOS. -->
+        <include
+          android:id="@+id/block_level"
+          layout="@layout/item_editor_input"/>
 
         <RelativeLayout
             android:id="@+id/block_wifi"

android/app/src/main/res/layout/fragment_editor_host.xml

@@ -7,7 +7,7 @@
   xmlns:app="http://schemas.android.com/apk/res-auto"
   android:orientation="vertical">
 
-  <androidx.appcompat.widget.Toolbar
+  <com.google.android.material.appbar.MaterialToolbar
     android:id="@+id/toolbar"
     style="@style/MwmWidget.ToolbarStyle"
     android:layout_width="match_parent"
@@ -43,7 +43,7 @@
 
     </androidx.constraintlayout.widget.ConstraintLayout>
 
-  </androidx.appcompat.widget.Toolbar>
+  </com.google.android.material.appbar.MaterialToolbar>
 
   <FrameLayout
     android:id="@+id/fragment_container"

android/app/src/main/res/layout/fragment_report.xml

@@ -6,7 +6,7 @@
   android:layout_height="match_parent"
   android:orientation="vertical">
 
-  <androidx.appcompat.widget.Toolbar
+  <com.google.android.material.appbar.MaterialToolbar
     android:id="@+id/toolbar"
     style="@style/MwmWidget.ToolbarStyle"
     android:layout_width="match_parent"
@@ -18,7 +18,7 @@
       android:id="@+id/save"
       style="@style/MwmWidget.Downloader.ToolbarButton"
       android:text="@string/editor_report_problem_send_button"/>
-  </androidx.appcompat.widget.Toolbar>
+  </com.google.android.material.appbar.MaterialToolbar>
 
   <ScrollView
     android:id="@+id/scrollView"

android/app/src/main/res/layout/item_bookmark_category.xml

@@ -9,9 +9,10 @@
   <CheckBox
     android:id="@+id/checkbox"
     android:layout_width="@dimen/margin_double_plus"
-    android:layout_height="match_parent"
+    android:layout_height="wrap_content"
     android:layout_centerVertical="true"
-    android:layout_marginStart="@dimen/margin_quarter"
+    android:layout_alignParentTop="true"
+    android:layout_alignBottom="@id/bottom_line_container"
     android:background="@null"
     android:button="@drawable/button_visibility_centre_inset"
     android:buttonTint="?accentColorSelector" />
@@ -32,7 +33,7 @@
     android:layout_height="wrap_content"
     android:layout_below="@id/name"
     android:layout_alignStart="@id/name"
-    android:layout_marginBottom="@dimen/margin_half_plus"
+    android:paddingBottom="@dimen/margin_half_plus"
     android:layout_toStartOf="@id/more"
     android:orientation="horizontal">
     <TextView
@@ -48,9 +49,11 @@
   <ImageView
     android:id="@+id/more"
     android:layout_width="wrap_content"
-    android:layout_height="match_parent"
+    android:layout_height="wrap_content"
     android:layout_alignParentEnd="true"
     android:layout_centerVertical="true"
+    android:layout_alignParentTop="true"
+    android:layout_alignBottom="@id/bottom_line_container"
     android:background="?selectableItemBackgroundBorderless"
     android:importantForAccessibility="no"
     android:paddingHorizontal="@dimen/margin_half"

android/app/src/main/res/layout/onmap_downloader.xml

@@ -16,7 +16,6 @@
     android:clipChildren="false"
     android:layout_gravity="center"
     android:gravity="center_horizontal"
-    android:backgroundTint="?menuBackground"
     android:background="@drawable/onmap_downloader_background"
     tools:ignore="UselessParent">
 

android/app/src/main/res/layout/position_chooser.xml

@@ -6,7 +6,7 @@
   android:layout_height="match_parent"
   android:orientation="vertical">
 
-  <androidx.appcompat.widget.Toolbar
+  <com.google.android.material.appbar.MaterialToolbar
     android:id="@+id/toolbar_point_chooser"
     style="@style/MwmWidget.ToolbarStyle"
     android:layout_width="match_parent"
@@ -41,7 +41,7 @@
 
     </LinearLayout>
 
-  </androidx.appcompat.widget.Toolbar>
+  </com.google.android.material.appbar.MaterialToolbar>
 
   <TextView
     android:layout_width="match_parent"

android/app/src/main/res/layout/routing_plan.xml

@@ -11,7 +11,7 @@
   <FrameLayout android:layout_width="match_parent"
                android:layout_height="wrap_content">
 
-    <androidx.appcompat.widget.Toolbar
+    <com.google.android.material.appbar.MaterialToolbar
       android:id="@+id/toolbar"
       style="@style/MwmWidget.ToolbarStyle"
       android:theme="@style/MwmWidget.ToolbarTheme"
@@ -131,7 +131,7 @@
 
       </RelativeLayout>
 
-    </androidx.appcompat.widget.Toolbar>
+    </com.google.android.material.appbar.MaterialToolbar>
   </FrameLayout>
   <FrameLayout
     android:id="@+id/driving_options_btn_container"

android/app/src/main/res/layout/toolbar_default.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.appcompat.widget.Toolbar
+<com.google.android.material.appbar.MaterialToolbar
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/toolbar"
     style="@style/MwmWidget.ToolbarStyle"

android/app/src/main/res/layout/toolbar_extended.xml

@@ -4,7 +4,7 @@
   android:layout_width="match_parent"
   android:layout_height="wrap_content"
   android:orientation="vertical">
-  <androidx.appcompat.widget.Toolbar
+  <com.google.android.material.appbar.MaterialToolbar
     android:id="@+id/toolbar"
     style="@style/MwmWidget.ToolbarStyle"
     android:layout_width="match_parent"

android/app/src/main/res/layout/toolbar_transparent.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.appcompat.widget.Toolbar
+<com.google.android.material.appbar.MaterialToolbar
   xmlns:android="http://schemas.android.com/apk/res/android"
   android:id="@+id/toolbar"
   style="@style/MwmWidget.ToolbarStyle"

android/app/src/main/res/layout/toolbar_with_optional_search.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.appcompat.widget.Toolbar
+<com.google.android.material.appbar.MaterialToolbar
   xmlns:android="http://schemas.android.com/apk/res/android"
   android:id="@+id/toolbar"
   style="@style/MwmWidget.ToolbarStyle.NoElevation"
@@ -11,4 +11,4 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:visibility="gone"/>
-</androidx.appcompat.widget.Toolbar>
+</com.google.android.material.appbar.MaterialToolbar>

android/app/src/main/res/layout/toolbar_with_search.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.appcompat.widget.Toolbar
+<com.google.android.material.appbar.MaterialToolbar
   xmlns:android="http://schemas.android.com/apk/res/android"
   android:id="@+id/toolbar"
   style="@style/MwmWidget.ToolbarStyle"
@@ -13,4 +13,4 @@
     android:orientation="vertical">
     <include layout="@layout/toolbar_search_controls" />
   </LinearLayout>
-</androidx.appcompat.widget.Toolbar>
+</com.google.android.material.appbar.MaterialToolbar>

android/app/src/main/res/layout/toolbar_with_search_no_elevation.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.appcompat.widget.Toolbar
+<com.google.android.material.appbar.MaterialToolbar
   xmlns:android="http://schemas.android.com/apk/res/android"
   android:id="@+id/toolbar"
   style="@style/MwmWidget.ToolbarStyle.NoElevation"
@@ -12,4 +12,4 @@
     android:orientation="vertical">
     <include layout="@layout/toolbar_search_controls" />
   </LinearLayout>
-</androidx.appcompat.widget.Toolbar>
+</com.google.android.material.appbar.MaterialToolbar>

android/app/src/main/res/values-af/strings.xml

@@ -484,7 +484,6 @@
     <string name="download_over_mobile_header">Laai af oor ’n mobieledataverbinding?</string>
     <string name="download_over_mobile_message">Dit kan behoorlik duur wees met sommige planne of indien dooldata aktief is.</string>
     <string name="error_enter_correct_house_number">Voer ’n geldige gebounommer in</string>
-    <string name="editor_storey_number">Aantal verdiepings (maksimum van %d)</string>
     <!-- Error message in Editor when a user tries to set the number of floors for a building higher than %d floors -->
     <string name="error_enter_correct_storey_number">Die aantal verdiepings mag nie %d oorskry nie</string>
     <string name="editor_zip_code">Poskode</string>

android/app/src/main/res/values-ar/strings.xml

@@ -510,7 +510,6 @@
     <string name="download_over_mobile_header">تنزيل باستخدام بيانات الجوال؟</string>
     <string name="download_over_mobile_message">قد يكون هذا مكلفاً جداً في بعض الاحيان أو عند التجوال.</string>
     <string name="error_enter_correct_house_number">أدخل رقم بناء صحيح</string>
-    <string name="editor_storey_number">عدد الطوابق (بحد أقصى %d)</string>
     <!-- Error message in Editor when a user tries to set the number of floors for a building higher than %d floors -->
     <string name="error_enter_correct_storey_number">يجب ألا يتجاوز عدد طوابق المبنى %d</string>
     <string name="editor_zip_code">الرمز البريدي</string>

android/app/src/main/res/values-ar/types_strings.xml

@@ -45,7 +45,7 @@
     <string name="type.amenity.charging_station">محطة شحن</string>
     <string name="type.amenity.charging_station.bicycle">محطة شحن الدراجات</string>
     <string name="type.amenity.charging_station.motorcar">محطة شحن السيارات</string>
-    <string name="type.amenity.childcare">حضانة</string>
+    <string name="type.amenity.childcare">حضّانة</string>
     <string name="type.amenity.cinema">سينما</string>
     <string name="type.leisure.bowling_alley">صالة بولينج</string>
     <string name="type.amenity.clinic">عيادة</string>
@@ -62,7 +62,7 @@
     <string name="type.amenity.exhibition_centre">مركز المعرض</string>
     <string name="type.amenity.money_transfer">تحويل المال</string>
     <string name="type.amenity.music_school">مدرسة موسيقى</string>
-    <string name="type.amenity.language_school">مدرسة لغة</string>
+    <string name="type.amenity.language_school">مدرسة لغات</string>
     <string name="type.office.diplomatic">سفارة</string>
     <string name="type.amenity.fast_food">وجبات سريعة</string>
     <string name="type.amenity.ferry_terminal">محطة عبّارات</string>
@@ -1278,4 +1278,7 @@
     <string name="type.amenity.dojo">دوجو</string>
     <!-- https://wiki.openstreetmap.org/wiki/Tag:leisure=sports_hall -->
     <string name="type.leisure.sports_hall">الصالة الرياضية</string>
+    <string name="type.aerialway.mixed_lift">رفع مختلط</string>
+    <string name="type.amenity.love_hotel">فندق جب</string>
+    <string name="type.amenity.studio">معرض</string>
 </resources>

android/app/src/main/res/values-az/strings.xml

@@ -499,7 +499,6 @@
     <string name="download_over_mobile_header">Mobil şəbəkə vasitəsilə endirilsin?</string>
     <string name="download_over_mobile_message">Bəzi planlarda və ya rouminqlə bu olduqca bahalı hesab oluna bilərr.</string>
     <string name="error_enter_correct_house_number">Etibarlı bina nömrəsini daxil edin</string>
-    <string name="editor_storey_number">Mərtəbə sayı (maks. %d)</string>
     <!-- Error message in Editor when a user tries to set the number of floors for a building higher than %d floors -->
     <string name="error_enter_correct_storey_number">Mərtəbələrin sayı %d-dən çox olmamalıdır</string>
     <string name="editor_zip_code">Poçt kodu</string>

android/app/src/main/res/values-be/strings.xml

@@ -495,7 +495,6 @@
     <string name="download_over_mobile_header">Спампаваць праз мабільны інтэрнэт?</string>
     <string name="download_over_mobile_message">Гэта можа быць даволі дорага з некаторымі тарыфнымі планамі або ў роўмінгу.</string>
     <string name="error_enter_correct_house_number">Увядзіце правільны нумар дома</string>
-    <string name="editor_storey_number">Колькасць паверхаў (максімум %d)</string>
     <!-- Error message in Editor when a user tries to set the number of floors for a building higher than %d floors -->
     <string name="error_enter_correct_storey_number">Колькасць паверхаў павінна быць не больш за %d</string>
     <string name="editor_zip_code">Паштовы індэкс</string>

android/app/src/main/res/values-bg/strings.xml

@@ -465,7 +465,6 @@
     <string name="download_over_mobile_header">Изтегляне чрез мобилни данни?</string>
     <string name="download_over_mobile_message">Това може да бъде значително скъпо при някои планове или при роуминг.</string>
     <string name="error_enter_correct_house_number">Въведете валиден номер на сграда</string>
-    <string name="editor_storey_number">Брой етажи (максимум %d)</string>
     <!-- Error message in Editor when a user tries to set the number of floors for a building higher than %d floors -->
     <string name="error_enter_correct_storey_number">Броят на етажите не трябва да надвишава %d</string>
     <string name="editor_zip_code">Пощенски код</string>

android/app/src/main/res/values-ca/strings.xml

@@ -498,7 +498,6 @@
     <string name="download_over_mobile_header">Voleu baixar-ho a través d’una connexió de xarxa mòbil?</string>
     <string name="download_over_mobile_message">Podria ser força car amb algunes tarifes o amb itinerància de dades.</string>
     <string name="error_enter_correct_house_number">Introduïu un número d’edifici vàlid</string>
-    <string name="editor_storey_number">Nombre de plantes (màxim %d)</string>
     <!-- Error message in Editor when a user tries to set the number of floors for a building higher than %d floors -->
     <string name="error_enter_correct_storey_number">El nombre de plantes no pot excedir de %d</string>
     <string name="editor_zip_code">Codi postal</string>

android/app/src/main/res/values-cs/strings.xml

@@ -96,7 +96,7 @@
     <!-- Ask user to wait several minutes (some long process in modal dialog). -->
     <string name="wait_several_minutes">Tato akce může trvat několik minut. \nProsím čekejte…</string>
     <!-- Measurement units title in settings activity -->
-    <string name="measurement_units">Měřicí jednotky</string>
+    <string name="measurement_units">Jednotky míry</string>
     <!-- Detailed description of Measurement Units settings button -->
     <string name="measurement_units_summary">Vyberte si míle nebo kilometry</string>
     <!-- SECTION: Search categories -->
@@ -479,7 +479,6 @@
     <string name="download_over_mobile_header">Stáhnout pomocí připojení přes mobilní síť?</string>
     <string name="download_over_mobile_message">Toto by mohlo být s některými tarify nebo roamingem výrazně dražší.</string>
     <string name="error_enter_correct_house_number">Zadejte správné číslo domu</string>
-    <string name="editor_storey_number">Počet poschodí (max. %d)</string>
     <!-- Error message in Editor when a user tries to set the number of floors for a building higher than %d floors -->
     <string name="error_enter_correct_storey_number">Opravte počet poschodí, max. %d</string>
     <string name="editor_zip_code">PSČ</string>
@@ -762,7 +761,7 @@
     <!-- App tip #06 -->
     <string name="app_tip_06">Můžete pomoci přeložit naši aplikaci do vašeho jazyka.</string>
     <!-- App tip #07 -->
-    <string name="app_tip_07">Naše aplikace je vyvinuta několika nadšenci a komunitou.</string>
+    <string name="app_tip_07">Naše aplikace je vyvíjena několika nadšenci a komunitou.</string>
     <!-- App tip #08 -->
     <string name="app_tip_08">Mapová data můžete snadno opravit a vylepšit.</string>
     <!-- App tip #09 -->
@@ -882,4 +881,7 @@
     <string name="saved">Uloženo</string>
     <string name="pref_left_button_disable">Zakázat</string>
     <string name="pref_left_button_title">Nastavení levého tlačítka</string>
+    <string name="error_enter_correct_level">Zadejte platné číslo podlaží</string>
+    <string name="editor_building_levels">Podlaží (vč. přízemí, bez střechy)</string>
+    <string name="editor_level">Podlaží (0 je přízemí)</string>
 </resources>

android/app/src/main/res/values-cs/types_strings.xml

@@ -1028,7 +1028,7 @@
     <string name="type.shop.stationery">Papírnictví</string>
     <string name="type.shop.tattoo">Tetovací salon</string>
     <string name="type.shop.tea">Obchod s čajem</string>
-    <string name="type.shop.ticket">Prodej vstupenek</string>
+    <string name="type.shop.ticket">Prodej vstupenek, jízdenek</string>
     <string name="type.shop.toys">Hračkářství</string>
     <string name="type.shop.travel_agency">Cestovní kancelář</string>
     <string name="type.shop.tyres">Obchod s pneumatikami</string>
@@ -1391,11 +1391,12 @@
     <string name="type.piste_type.downhill.intermediate.area">Středně těžká sjezdovka</string>
     <string name="type.piste_type.sled">Sáňkařská dráha</string>
     <string name="type.piste_type.sled.area">Sáňkařská dráha</string>
-    <string name="type.sport.diving">Potápění se</string>
+    <string name="type.sport.diving">Skoky do vody z velkých výšek</string>
     <string name="type.amenity.studio">Studio</string>
     <string name="type.barrier.guard_rail">Svodidla</string>
     <string name="type.amenity.love_hotel">Love Hotel</string>
     <string name="type.highway.ladder">Žebřík</string>
     <string name="type.landuse.plant_nursery">Pěstitelská školka</string>
     <string name="type.leisure.firepit">Ohniště</string>
+    <string name="type.man_made.crane">Jeřáb</string>
 </resources>

android/app/src/main/res/values-da/strings.xml

@@ -475,7 +475,6 @@
     <string name="download_over_mobile_header">Download ved brug af mobilnetværksforbindelse?</string>
     <string name="download_over_mobile_message">Dette kan være meget dyrt med nogle abonnementer eller ved roaming.</string>
     <string name="error_enter_correct_house_number">Indtast et gyldigt bygningsnummer</string>
-    <string name="editor_storey_number">Antal etager (maks %d)</string>
     <!-- Error message in Editor when a user tries to set the number of floors for a building higher than %d floors -->
     <string name="error_enter_correct_storey_number">Antallet af etager må ikke overstige %d etager</string>
     <string name="editor_zip_code">Postnummer</string>

android/app/src/main/res/values-de/strings.xml

@@ -497,7 +497,6 @@
     <string name="download_over_mobile_header">Über eine Mobilfunknetzverbindung herunterladen?</string>
     <string name="download_over_mobile_message">Das könnte mit einigen Tarifen oder beim Roaming sehr teuer werden.</string>
     <string name="error_enter_correct_house_number">Richtige Hausnummer eingeben</string>
-    <string name="editor_storey_number">Anzahl der Etagen (maximal %d)</string>
     <!-- Error message in Editor when a user tries to set the number of floors for a building higher than %d floors -->
     <string name="error_enter_correct_storey_number">Das Gebäude kann nicht mehr als %d Etagen haben</string>
     <string name="editor_zip_code">Postleitzahl</string>
@@ -891,4 +890,7 @@
     <string name="pref_left_button_title">Einstellung linker Knopf</string>
     <string name="saved">Gespeichert</string>
     <string name="pref_left_button_disable">Deaktivieren</string>
+    <string name="editor_building_levels">Etagen (inkl. Erdgeschoss, ohne Dach)</string>
+    <string name="error_enter_correct_level">Geben Sie eine gültige Etagen Nummer ein</string>
+    <string name="editor_level">Etage (0 ist Erdgeschoss)</string>
 </resources>

android/app/src/main/res/values-de/types_strings.xml

@@ -1392,11 +1392,12 @@
     <string name="type.boundary.administrative.3">Regionale Grenze</string>
     <string name="type.power.pole">Strommast</string>
     <string name="type.man_made.pipeline.overground">Oberirdische Rohrleitung</string>
-    <string name="type.sport.diving">Tauchen</string>
+    <string name="type.sport.diving">Turmspringen</string>
     <string name="type.amenity.love_hotel">Stundenhotel</string>
     <string name="type.landuse.plant_nursery">Gartenbau</string>
     <string name="type.leisure.firepit">Feuerstelle</string>
     <string name="type.barrier.guard_rail">Leitplanke</string>
     <string name="type.highway.ladder">Leiter</string>
     <string name="type.amenity.studio">Studio</string>
+    <string name="type.man_made.crane">Kran</string>
 </resources>

android/app/src/main/res/values-el/strings.xml

@@ -500,7 +500,6 @@
     <string name="download_over_mobile_header">Να γίνει λήψη μέσω δικτύου κινητής τηλεφωνίας;</string>
     <string name="download_over_mobile_message">Αυτό μπορεί να είναι πολύ ακριβό για μερικά πακέτα ή στην περίπτωση roaming.</string>
     <string name="error_enter_correct_house_number">Εισαγάγετε έναν έγκυρο αριθμό κτιρίου</string>
-    <string name="editor_storey_number">Αριθμός ορόφων (μέγιστο %d)</string>
     <!-- Error message in Editor when a user tries to set the number of floors for a building higher than %d floors -->
     <string name="error_enter_correct_storey_number">Ο αριθμός των ορόφων δεν πρέπει να υπερβαίνει τους %d</string>
     <string name="editor_zip_code">Ταχυδρομικός κώδικας</string>

android/app/src/main/res/values-en-rGB/strings.xml

@@ -43,4 +43,10 @@
     <string name="downloader_no_space_message">Please delete any unnecessary data</string>
     <string name="login_osm">Login to OpenStreetMap</string>
     <string name="dialog_routing_location_turn_on">Enable location services</string>
+    <string name="back">Back</string>
+    <string name="download_has_failed">Download has failed. Tap to try again.</string>
+    <string name="downloading">Downloading…</string>
+    <string name="cancel">Cancel</string>
+    <string name="delete">Delete</string>
+    <string name="download_maps">Download Maps</string>
 </resources>

android/app/src/main/res/values-es/strings.xml

@@ -212,7 +212,7 @@
     <!-- Settings information group in settings screen -->
     <string name="prefs_group_information">Información</string>
     <string name="prefs_group_route">Navegación</string>
-    <string name="pref_zoom_title">Botones de zum</string>
+    <string name="pref_zoom_title">Botones de zoom</string>
     <string name="pref_zoom_summary">Visualización en la pantalla</string>
     <!-- Settings «Map» category: «Night style» title -->
     <string name="pref_map_style_title">Modo nocturno</string>
@@ -242,7 +242,7 @@
     <string name="pref_tts_playing_test_voice">Compruebe el volumen o la configuración de texto a voz del sistema si ahora no oye la voz.</string>
     <!-- Settings «Route» category: «Tts unavailable» subtitle -->
     <string name="pref_tts_unavailable">No disponible</string>
-    <string name="pref_map_auto_zoom">Zum automático</string>
+    <string name="pref_map_auto_zoom">Zoom automático</string>
     <string name="placepage_distance">Distancia</string>
     <string name="search_show_on_map">Ver en el mapa</string>
     <!-- Menu button -->
@@ -499,7 +499,6 @@
     <string name="download_over_mobile_header">¿Descargar con conexión de red móvil?</string>
     <string name="download_over_mobile_message">Podría ser muy caro con ciertos planes o con itinerancia de datos.</string>
     <string name="error_enter_correct_house_number">Introducir el número de domicilio correcto</string>
-    <string name="editor_storey_number">Número de plantas (máx. %d)</string>
     <!-- Error message in Editor when a user tries to set the number of floors for a building higher than %d floors -->
     <string name="error_enter_correct_storey_number">El número de plantas no debe superar %d</string>
     <string name="editor_zip_code">Código postal</string>
@@ -894,4 +893,9 @@
     <string name="bluesky">Bluesky</string>
     <string name="error_enter_correct_bluesky_page">Introduce un nombre de usuario o una dirección web de Bluesky válidos</string>
     <string name="telegram_url">https://t.me/CoMapsApp/</string>
+    <string name="pref_left_button_title">Configurar botón izquierdo</string>
+    <string name="pref_left_button_disable">Desactivar</string>
+    <string name="editor_level">Planta (0 es la planta baja)</string>
+    <string name="editor_building_levels">Plantas (incl. planta baja, excl. tejado)</string>
+    <string name="error_enter_correct_level">Introduce un número de planta válido</string>
 </resources>

android/app/src/main/res/values-es/types_strings.xml

@@ -1399,7 +1399,8 @@
     <string name="type.amenity.studio">Estudio</string>
     <string name="type.landuse.plant_nursery">Vivero de plantas</string>
     <string name="type.barrier.guard_rail">Guardarraíl</string>
-    <string name="type.sport.diving">Buceo</string>
+    <string name="type.sport.diving">Salto de trampolín</string>
     <string name="type.leisure.firepit">Fogón</string>
     <string name="type.amenity.love_hotel">Hotel del amor</string>
+    <string name="type.man_made.crane">Grúa</string>
 </resources>

android/app/src/main/res/values-et/strings.xml

@@ -491,7 +491,6 @@
     <string name="download_over_mobile_header">Kas laadime alla mobiilivõrgu kaudu?</string>
     <string name="download_over_mobile_message">See võib mõningate lepingute või rändluse korral olla märgatavalt kallim.</string>
     <string name="error_enter_correct_house_number">Sisesta kehtiv majanumber</string>
-    <string name="editor_storey_number">Korruste arv (maks. %d)</string>
     <!-- Error message in Editor when a user tries to set the number of floors for a building higher than %d floors -->
     <string name="error_enter_correct_storey_number">Korruste arv ei või olla üle %d</string>
     <string name="editor_zip_code">Postiindeks</string>
@@ -886,4 +885,7 @@
     <string name="saved">Salvestatud</string>
     <string name="pref_left_button_disable">Keela</string>
     <string name="pref_left_button_title">Vasaku nupu seadistused</string>
+    <string name="editor_building_levels">Korruseid (sh esimene korrus, kuid katusekorruseta)</string>
+    <string name="editor_level">Korrus (0 on esimene korrus)</string>
+    <string name="error_enter_correct_level">Palun sisesta korruse number</string>
 </resources>

android/app/src/main/res/values-et/types_strings.xml

@@ -1394,11 +1394,12 @@
     <string name="type.hwtag.toll">hwtag-toll</string>
     <string name="type.hwtag.yescar">hwtag-yescar</string>
     <string name="type.hwtag.nobicycle">hwtag-nobicycle</string>
-    <string name="type.sport.diving">Sukeldumine</string>
+    <string name="type.sport.diving">Vettehüpped</string>
     <string name="type.leisure.firepit">Tulease</string>
     <string name="type.amenity.love_hotel">Armuhotell</string>
     <string name="type.landuse.plant_nursery">Puukool</string>
     <string name="type.highway.ladder">Redel</string>
     <string name="type.barrier.guard_rail">Madal maanteepiire</string>
     <string name="type.amenity.studio">Stuudio</string>
+    <string name="type.man_made.crane">Kraana</string>
 </resources>

android/app/src/main/res/values-eu/strings.xml

@@ -497,7 +497,6 @@
     <string name="download_over_mobile_header">Deskargatu sare mugikorreko konexioarekin?</string>
     <string name="download_over_mobile_message">Oso garestia izan daiteke roaming plan batzuekin edo datu-ibiltaritzarekin.</string>
     <string name="error_enter_correct_house_number">Sartu etxeko zenbaki baliozkoa</string>
-    <string name="editor_storey_number">Solairu kopurua (gehienez %d)</string>
     <!-- Error message in Editor when a user tries to set the number of floors for a building higher than %d floors -->
     <string name="error_enter_correct_storey_number">Solairu kopurua ez da %d-tik gorakoa izan behar</string>
     <string name="editor_zip_code">Posta kodea</string>

android/app/src/main/res/values-fa/strings.xml

@@ -470,7 +470,6 @@
     <string name="download_over_mobile_header">دانلود بر روی یک شبکه دیتای موبایل؟</string>
     <string name="download_over_mobile_message">این کار می تواند برای شما در بعضی طرح‌ها و یا حالت رومینگ هزینه اضافی در بر داشته باشد.</string>
     <string name="error_enter_correct_house_number">وارد کردن شماره ساختمان معتبر</string>
-    <string name="editor_storey_number">تعداد طبقات ( حداکثر %d )</string>
     <!-- Error message in Editor when a user tries to set the number of floors for a building higher than %d floors -->
     <string name="error_enter_correct_storey_number">تعداد طبقات نباید بیش از %d باشد</string>
     <string name="editor_zip_code">کدپستی</string>

android/app/src/main/res/values-fi/strings.xml

@@ -501,7 +501,6 @@
     <string name="download_over_mobile_header">Lataa käyttämällä puhelinverkkoyhteyttä?</string>
     <string name="download_over_mobile_message">Tämä vaihtoehto saattaa olla huomattavasti kalliimpi tietyillä sopimuksilla tai roaming-yhteydellä.</string>
     <string name="error_enter_correct_house_number">Syötä oikea talon numero</string>
-    <string name="editor_storey_number">Kerrosten määrä (maks. %d)</string>
     <!-- Error message in Editor when a user tries to set the number of floors for a building higher than %d floors -->
     <string name="error_enter_correct_storey_number">Kerrosten määrä saa olla korkeintaan %d</string>
     <string name="editor_zip_code">Postinumero</string>
@@ -891,4 +890,7 @@
     <string name="pref_left_button_title">Vasemman painikkeen asettelu</string>
     <string name="pref_left_button_disable">Poista käytöstä</string>
     <string name="saved">Tallennettu</string>
+    <string name="error_enter_correct_level">Syötä kerrosnumero</string>
+    <string name="editor_building_levels">Kerrokset (sis. pohjakerroksen, jätä pois katto)</string>
+    <string name="editor_level">Kerros (0 on pohjakerros)</string>
 </resources>

android/app/src/main/res/values-fi/types_strings.xml

@@ -1301,7 +1301,7 @@
     <string name="type.railway.subway.bridge">Metrolinjan silta</string>
     <string name="type.attraction.bumper_car">Törmäilyauto</string>
     <string name="type.railway.tram">Raitiovaunulinja</string>
-    <string name="type.sport.diving">Sukellus</string>
+    <string name="type.sport.diving">Korkeasukellus</string>
     <string name="type.power.line.underground">Maanalainen sähkölinja</string>
     <string name="type.railway">Rautatie</string>
     <string name="type.railway.abandoned.bridge">Hylätty rautatiesilta</string>
@@ -1313,7 +1313,7 @@
     <string name="type.boundary.administrative.3">Alueellinen raja</string>
     <string name="type.boundary.administrative.4">Alueellinen raja</string>
     <string name="type.aeroway">Airspace Infrastructure</string>
-    <string name="type.aeroway.apron">Apron</string>
+    <string name="type.aeroway.apron">Lentokentän asemataso</string>
     <string name="type.amenity.vending_machine.excrement_bags">Koirankakkapussiautomaatti</string>
     <string name="type.hwtag.yescar">hwtag-yescar</string>
     <string name="type.amenity.biergarten">Olutpuutarha</string>
@@ -1338,4 +1338,67 @@
     <string name="type.hwtag.yesbicycle">hwtag-yesbicycle</string>
     <string name="type.leisure.firepit">Tulentekopaikka</string>
     <string name="type.leisure">Leisure</string>
+    <string name="type.internet_access">Internet</string>
+    <string name="type.landuse.vineyard">Viinitarha</string>
+    <string name="type.landuse.village_green">Maa</string>
+    <string name="type.leisure.beach_resort">Rantalomakohde</string>
+    <string name="type.man_made.cairn">Kiviröykkiö</string>
+    <string name="type.man_made.cutline">Hakkuulinja</string>
+    <string name="type.man_made.pipeline">Putki</string>
+    <string name="type.man_made.pipeline.overground">Maanpäällinen putki</string>
+    <string name="type.man_made.storage_tank">Varastosäiliö</string>
+    <string name="type.man_made.breakwater">Aallonmurtaja</string>
+    <string name="type.leisure.recreation_ground">Virkistysalue</string>
+    <string name="type.internet_access.wlan">Internet</string>
+    <string name="type.man_made">Man Made</string>
+    <string name="type.fee.yes">$</string>
+    <string name="type.psurface.paved_bad">psurface-paved_bad</string>
+    <string name="type.mapswithme.grid">mapswithme-grid</string>
+    <string name="type.organic.yes">Luomu</string>
+    <string name="type.mapswithme">mapswithme</string>
+    <string name="type.psurface.paved_good">psurface-paved_good</string>
+    <string name="type.psurface.unpaved_bad">psurface-unpaved_bad</string>
+    <string name="type.psurface">psurface</string>
+    <string name="type.route.shuttle_train">route-shuttle_train</string>
+    <string name="type.psurface.unpaved_good">psurface-unpaved_good</string>
+    <string name="type.leisure.common">Julkinen paikka</string>
+    <string name="type.leisure.track">Juoksurata</string>
+    <string name="type.leisure.track.area">Juoksurata</string>
+    <string name="type.man_made.survey_point">Maanmittauspiste</string>
+    <string name="type.man_made.wastewater_plant">Jätevedenpuhdistamo</string>
+    <string name="type.power.station">Voimalaitos</string>
+    <string name="type.power.pole">Sähköpylväs</string>
+    <string name="type.man_made.crane">Nosturi</string>
+    <string name="type.man_made.works">Tehdas</string>
+    <string name="type.organic.only">Luomu</string>
+    <string name="type.power">Virta</string>
+    <string name="type.power.minor_line">Pienjännitelinja</string>
+    <string name="type.man_made.utility_pole">Pylväs</string>
+    <string name="type.public_transport.platform">Joukkoliikenteen pysäkki/laituri</string>
+    <string name="type.railway.construction">Ratatyö</string>
+    <string name="type.railway.crossing">Raiteiden risteyskohta</string>
+    <string name="type.railway.disused">Käytöstä poistettu rautatie</string>
+    <string name="type.railway.funicular.tunnel">Köysiradan tunneli</string>
+    <string name="type.railway.funicular.bridge">Köysiradan silta</string>
+    <string name="type.railway.light_rail">Pikaraitiotie</string>
+    <string name="type.railway.light_rail.bridge">Pikaraitiotien silta</string>
+    <string name="type.railway.light_rail.tunnel">Pikaraitiotien tunneli</string>
+    <string name="type.railway.monorail.bridge">Yksikiskoisen rautatien silta</string>
+    <string name="type.railway.monorail.tunnel">Yksikiskoisen rautatien tunneli</string>
+    <string name="type.railway.narrow_gauge">Kapearaiteinen rata</string>
+    <string name="type.railway.narrow_gauge.tunnel">Kapearaiteisen radan tunneli</string>
+    <string name="type.railway.preserved">Museorata</string>
+    <string name="type.railway.preserved.bridge">Museoradan silta</string>
+    <string name="type.railway.preserved.tunnel">Museoradan tunneli</string>
+    <string name="type.waterway.drain">Sadevesikaivo</string>
+    <string name="type.natural.water.drain">Sadevesikaivo</string>
+    <string name="type.waterway.weir">Pohjapato</string>
+    <string name="type.aerialway.j.bar">J-tanko vetohissi</string>
+    <string name="type.aerialway.magic_carpet">Mattohissi</string>
+    <string name="type.power.generator">Generaattori</string>
+    <string name="type.railway.narrow_gauge.bridge">Kapearaiteisen radan silta</string>
+    <string name="type.traffic_calming">Hidaste</string>
+    <string name="type.traffic_calming.hump">Hidastustöyssy</string>
+    <string name="type.mountain_pass">Vuoristosola</string>
+    <string name="type.attraction.big_wheel">Maailmanpyörä</string>
 </resources>

android/app/src/main/res/values-fr/strings.xml

@@ -504,7 +504,6 @@
     <string name="download_over_mobile_header">Téléchargement avec une connexion réseau cellulaire ?</string>
     <string name="download_over_mobile_message">Cela pourrait être très cher avec certains abonnements ou si vous êtes en déplacement.</string>
     <string name="error_enter_correct_house_number">Saisir un numéro de maison correct</string>
-    <string name="editor_storey_number">Nombre d\'étages (max %d)</string>
     <!-- Error message in Editor when a user tries to set the number of floors for a building higher than %d floors -->
     <string name="error_enter_correct_storey_number">Le nombre d\'étages ne doit pas dépasser %d</string>
     <string name="editor_zip_code">Code postal</string>
@@ -895,6 +894,9 @@
     <string name="error_enter_correct_bluesky_page">Entrez un nom d\'utilisateur ou une adresse web Bluesky correct</string>
     <string name="error_enter_correct_fediverse_page">Entrez un nom d\'utilisateur ou une adresse web Mastodon correct</string>
     <string name="saved">Enregistré</string>
-    <string name="pref_left_button_title">Configuration du bouton en bas à gauche</string>
+    <string name="pref_left_button_title">Configuration du bouton de gauche</string>
     <string name="pref_left_button_disable">Désactiver</string>
+    <string name="editor_building_levels">Étages (y compris le rez-de-chaussée, sans compter le toit)</string>
+    <string name="editor_level">Étage (0 est le rez-de-chaussée)</string>
+    <string name="error_enter_correct_level">Entrez un numéro d\'étage valide</string>
 </resources>

android/app/src/main/res/values-gl/strings.xml

@@ -354,7 +354,6 @@
     <string name="download_over_mobile_header">Descargar con conexión de rede móbil?</string>
     <string name="download_over_mobile_message">Podería ser moi caro con certos plans ou con itinerancia de datos.</string>
     <string name="error_enter_correct_house_number">Introducir o número de domicilio correcto</string>
-    <string name="editor_storey_number">Número de plantas (máx. %d)</string>
     <string name="error_enter_correct_storey_number">O número de plantas non debe superar %d</string>
     <string name="error_enter_correct_zip_code">Introduza un código postal válido</string>
     <string name="editor_about_osm">As súas edicións cárganse na base de datos pública <a href="https://wiki.openstreetmap.org/wiki/About_OpenStreetMap">OpenStreetMap</a>. Por favor, non engada información persoal ou protexida por dereitos de autor.</string>

android/app/src/main/res/values-hu/strings.xml

@@ -487,7 +487,6 @@
     <string name="download_over_mobile_header">Biztosan letölti mobilhálózati kapcsolaton keresztül?</string>
     <string name="download_over_mobile_message">Ez egyes díjcsomagok vagy roaming esetén jelentős költségekkel járhat.</string>
     <string name="error_enter_correct_house_number">Adjon meg egy érvényes házszámot</string>
-    <string name="editor_storey_number">Emeletek száma (legfeljebb: %d)</string>
     <!-- Error message in Editor when a user tries to set the number of floors for a building higher than %d floors -->
     <string name="error_enter_correct_storey_number">Ez az épület legfeljebb %d emeletes lehet</string>
     <string name="editor_zip_code">Irányítószám</string>

android/app/src/main/res/values-in/strings.xml

@@ -475,7 +475,6 @@
     <string name="download_over_mobile_header">Unduh dengan menggunakan koneksi jaringan seluler?</string>
     <string name="download_over_mobile_message">Ini bisa menjadi jauh mahal pada beberapa paket atau jika roaming.</string>
     <string name="error_enter_correct_house_number">Masukkan nomor rumah yang benar</string>
-    <string name="editor_storey_number">Jumlah lantai (maksimum %d)</string>
     <!-- Error message in Editor when a user tries to set the number of floors for a building higher than %d floors -->
     <string name="error_enter_correct_storey_number">Edit bangunan dengan maksimum %d lantai</string>
     <string name="editor_zip_code">Kode Pos</string>