[ios] Release version 2025.06.25-1

Signed-off-by: Yannik Bloscheck <git@yannikbloscheck.com>
2026-01-07 21:13:55 +00:00 · 2025-06-25 23:14:35 +02:00
944 changed files with 80402 additions and 29998 deletions
--- a/4
+++ b/4
@@ -7,11 +7,7 @@ CoMaps contributors:
 (in alphabetic order)
 --------------------------------------------------------------------------------

-Bastian Greshake Tzovaras
 clover sage
-Harry Bond <me@hbond.xyz>
-vikiawv
-Yannik Bloscheck

 --------------------------------------------------------------------------------
 Organic Maps (formerly OMaps) contributors:
--- a/README.md
+++ b/README.md
@@ -1,85 +1,66 @@
-<!-- Navigation Bar -->
-<p align="center">
-  <a href="https://codeberg.org/comaps#comaps">Project Intro</a> |
-  <a href="https://codeberg.org/comaps/Governance#comaps-project-governance-docs">Governance</a> |
-  <a href="https://codeberg.org/comaps/Governance/src/branch/main/FAQ.md">FAQ</a> |
-  <a href="#contributing">Contribute</a> |
-  <a href="https://www.comaps.app/donate">Donate</a> |
-  <a href="https://codeberg.org/comaps#keep-connected">Keep Connected</a>
+<!--<div align="center">
+  <img src="qt/res/logo.png" height="100"/>
+</div>-->
+
+<!-- a nav bar -->
+[Project Intro](https://codeberg.org/comaps#comaps)
+ | [Governance](https://codeberg.org/comaps/Governance#comaps-project-governance-docs)
+ | [FAQ](https://codeberg.org/comaps/Governance/src/branch/main/FAQ.md)
+ | [Contribute](#contributing)
+ | [Donate](https://www.comaps.app/donate)
+ | [Keep Connected](https://codeberg.org/comaps#keep-connected)
+
+# [CoMaps](https://comaps.app) – Hike, Bike, Drive Offline – Easy Map Navigation with Privacy
+
+[
+  ![GitHub Actions Workflow Android Status](https://img.shields.io/github/actions/workflow/status/comaps/comaps/.github%2Fworkflows%2Fandroid-check.yaml?style=flat&label=Android%20Build)
+](https://github.com/comaps/comaps/actions/workflows/android-check.yaml)
+[
+  ![GitHub Actions Workflow iOS Status](https://img.shields.io/github/actions/workflow/status/comaps/comaps/.github%2Fworkflows%2Fios-check.yaml?style=flat&label=iOS%20Build)
+](https://github.com/comaps/comaps/actions/workflows/ios-check.yaml)
+[
+  ![Donate via OpenCollective](https://img.shields.io/opencollective/all/comaps?color=blue&label=Open%20Collective%20Donors)
+](https://opencollective.com/comaps)
+[
+  ![Donate via Liberapay](https://img.shields.io/liberapay/patrons/CoMaps.svg?logo=liberapay&label=Liberapay%20Patrons)
+](https://liberapay.com/CoMaps)
+
+
+
+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.
+
+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.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">
+  <img src="android/app/src/fdroid/play/listings/en-US/graphics/phone-screenshots/1.jpg" width="180" />
+  <img src="android/app/src/fdroid/play/listings/en-US/graphics/phone-screenshots/2.jpg" width="180" />
+  <img src="android/app/src/fdroid/play/listings/en-US/graphics/phone-screenshots/3.jpg" width="180" />
+  <img src="android/app/src/fdroid/play/listings/en-US/graphics/phone-screenshots/4.jpg" width="180" />
 </p>

+**Offline-focused**: Plan and navigate your trip abroad without the need for cellular service, search waypoints while on a distant hike, etc. All app functions are designed to work offline.

+**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.

-<div align="center">
-<h1><a href="https://comaps.app/">CoMaps</a></h1>
-<h2>Hike, Bike, Drive Offline - Easy Map Navigation with Privacy</h2>
-</div>
-<div align="center">
-  <p align="center">
-    <a href="https://codeberg.org/comaps/comaps/releases">
-      <img src="https://img.shields.io/github/license/comaps/comaps?style=for-the-badge&logo=opensourceinitiative&logoColor=white&color=588157" alt="License" style="width: 90%; max-width: 150px;"/>
-    </a>
-    <a href="https://github.com/comaps/comaps/actions/workflows/android-check.yaml">
-      <img src="https://img.shields.io/github/actions/workflow/status/comaps/comaps/.github/workflows/android-check.yaml?label=Android%20Build&logo=android&logoColor=white&style=for-the-badge&color=588157" alt="Android Build Status" style="width: 90%; max-width: 170px;"/>
-    </a>
-    <a href="https://github.com/comaps/comaps/actions/workflows/ios-check.yaml">
-      <img src="https://img.shields.io/github/actions/workflow/status/comaps/comaps/.github/workflows/ios-check.yaml?label=iOS%20Build&logo=apple&logoColor=white&style=for-the-badge&color=588157" alt="iOS Build Status" style="width: 90%; max-width: 145px;"/>
-    </a>
-    <a href="https://opencollective.com/comaps">
-      <img src="https://img.shields.io/opencollective/all/comaps?label=Open%20Collective%20Donors&logo=opencollective&logoColor=white&style=for-the-badge&color=588157" alt="Open Collective Donors" style="width: 90%; max-width: 191px;"/>
-    </a>
-    <a href="https://liberapay.com/CoMaps">
-      <img src="https://img.shields.io/liberapay/patrons/CoMaps.svg?label=Liberapay%20Patrons&logo=liberapay&logoColor=white&style=for-the-badge&color=588157" alt="Liberapay Patrons" style="width: 90%; max-width: 160px;"/>
-    </a>
-  </p>
-</div>
+**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.

-A community-led free & open source maps app based on [OpenStreetMap](https://www.openstreetmap.org), built for transparency, privacy, and not-for-profit values. A fork of Organic Maps, originally based on Maps.ME.
+**Free and Built by the Community**: People like you helped build the app by adding places to [OpenStreetMap](https://www.openstreetmap.org), testing and giving feedback on features and contributing their development skills and money.

-**Available for:** Android, iOS, ARM macOS, and alpha Linux/macOS desktop builds (also usable on Linux phones).
+**Open and Transparent Decision-making and Financials, Not-for-profit and Fully Open Source.**

-<p align="center">
-  <a href="https://apps.apple.com/app/comaps/id6747180809">
-    <img src="docs/badges/apple-appstore.png" alt="App Store" width="160"/>
-  </a>
-  <a href="https://play.google.com/store/apps/details?id=app.comaps.google">
-    <img src="docs/badges/google-play.png" alt="Google Play" width="160"/>
-  </a>
-  <a href="https://f-droid.org/en/packages/app.comaps.fdroid/">
-    <img src="docs/badges/fdroid.png" alt="F-Droid" width="160"/>
-  </a>
-  <a href="https://codeberg.org/comaps/comaps/releases">
-    <img src="docs/badges/codeberg.png" alt="Codeberg" width="160"/>
-  </a>
-</p>
-
-
-<!-- Screenshots -->
-<p align="center">
-  <img src="android/app/src/fdroid/play/listings/en-US/graphics/phone-screenshots/1.png" width="180" />
-  <img src="android/app/src/fdroid/play/listings/en-US/graphics/phone-screenshots/2.png" width="180" />
-  <img src="android/app/src/fdroid/play/listings/en-US/graphics/phone-screenshots/3.png" width="180" />
-  <img src="android/app/src/fdroid/play/listings/en-US/graphics/phone-screenshots/4.png" width="180" />
-  <img src="android/app/src/fdroid/play/listings/en-US/graphics/phone-screenshots/5.png" width="180" />
-  <img src="android/app/src/fdroid/play/listings/en-US/graphics/phone-screenshots/6.png" width="180" />
-</p>
-
---
-
-## ⚡️ Highlights
-
- **Offline-first**: Navigate without a connection
- **Privacy-respecting**: No tracking, Ads or data collection
- **Lightweight**: Battery- and space-efficient
- **Simple**: Polished, user-focused interface
- **Community-built**: Free, open source, and collaborative
- **Transparent**: Open finances and governance
-
---
-
-## 🚀 Main Features
+### Main Features

 - Downloadable detailed maps with places which are not available with Google Maps

@@ -109,46 +90,37 @@ A community-led free & open source maps app based on [OpenStreetMap](https://www

 - Android Auto and CarPlay support

- ***Freedom Is Here – Navigate the world with privacy and community at the forefront.***
+*Freedom Is Here - Discover your journey, navigate the world with privacy and community at the forefront!*

---
-
-## 🤝 Contributing
+## Contributing

 You can help by donating, contributing code, translating, or by telling others about it. To build the best maps app there is a need for software development, design, product, community development, and other areas. Reach out to us and let us know how you want to help.

- Build instructions: [docs/INSTALL.md](docs/INSTALL.md)  
- Contribution guide: [docs/CONTRIBUTING.md](docs/CONTRIBUTING.md)
-> [!NOTE]  
-> Some docs might be outdated, contain broken links or old references to Organic Maps, etc. Its a work in progress and help is much appreciated!
+If you want to build the project, check [docs/INSTALL.md](docs/INSTALL.md). If you want to help the project,
+see [docs/CONTRIBUTING.md](docs/CONTRIBUTING.md). You can help in many ways, the ability to code is not necessary.

-There is a dedicated Zulip chat for active contributors: [Zulip](https://comaps.zulipchat.com)
+Some docs might be outdated, contain broken links or old references to Organic Maps, etc. Its a work in progress and help is much appreciated!

---
+There is a dedicated Zulip chat for active contributors: [comaps.zulipchat.com](https://comaps.zulipchat.com)

-## 💬 Feedback
+### Feedback

- Rate us on [App Store](https://apps.apple.com/app/comaps/id6747180809) and [Google Play](https://play.google.com/store/apps/details?id=app.comaps.google)
- Star our repos on Codeberg 
- Report bugs or request features on the [issue tracker](https://codeberg.org/comaps/comaps/issues)
+<!-- uncomment when linked resources are ready
+- **Rate us on the [App Store](https://apps.apple.com/app/comaps/id1567437057)
+and [Google Play](https://play.google.com/store/apps/details?id=app.comaps)**. -->
+- Star our repos on Codeberg
+- Report bugs and discuss features at [the issue tracker](https://codeberg.org/comaps/comaps/issues)

---
+## How is development funded?

-## 💸 Funding
+The app is free for everyone, so we rely on donations. Please [donate](https://opencollective.com/comaps/donate) to support the CoMaps community and see this open project thrive!

-CoMaps is free. To stay that way, it relies on your support.  
-Donate via [OpenCollective](https://opencollective.com/comaps/donate) or [Liberapay](https://liberapay.com/CoMaps).  
 The project's financial information is completely open and transparent at [our Open Collective](https://opencollective.com/comaps).

---
+## License and Copyright

-## 🔒 Privacy
-
-The Android app has been reviewed by [Exodus Privacy](https://reports.exodus-privacy.eu.org/fr/reports/app.comaps.google/latest/).
-
---
-
-## ⚖️ License
-
-Licensed under the Apache License 2.0.  
-See [LICENSE](LICENSE), [NOTICE](NOTICE), and [data/copyright.html](data/copyright.html). 
+Licensed under the Apache License, Version 2.0. See
+[LICENSE](LICENSE),
+[NOTICE](NOTICE)
+and [data/copyright.html](data/copyright.html)
+for more information.
--- a/android/app/src/fdroid/play/listings/cs-CZ/short-description.txt
+++ b/android/app/src/fdroid/play/listings/cs-CZ/short-description.txt
@@ -1 +1 @@
-Jednoduchá navigace v mapě – Objevte více na své cestě – Vyvíjeno komunitou
+Jednoduchá navigace v mapě - Objevte více na své cestě ‐ Vyvíjeno komunitou
--- a/android/app/src/fdroid/play/listings/de-DE/release-notes.txt
+++ b/android/app/src/fdroid/play/listings/de-DE/release-notes.txt
@@ -1,6 +1,8 @@
-• OpenStreetMap-Daten vom 22. Juni
-• Optionale automatische Backups von Lesezeichen & Tracks
-• Neue 100m-Höhenlinien für Regionen die vorher gröbere/keine Isolinien hatten
-• Vegetation & Spielplätze werden früher angezeigt, neue Farben für Campingplätze & andere Einrichtungen
-• Pfade & Tracks werden standardmäßig bei höherem Zoom angezeigt, Outdoor-Stil für Detailübersicht
-• Aktion des linken Button nichtm mehr im Hamburger-Menü, stattdessen werden "Über & Hilfe" dort angezeigt
+• Kartenfarben aufgefrischt – heller, wärmer, freundlicher!
+• OSM-Editor: „Stockwerk“ Feld hinzugefügt
+• Symbole für Tankstellen und Ladestationen aktualisiert
+• Farben einiger UI Elemente überarbeitet
+• Funktionierende Links zum Teilen von Orten
+• Falsch angezeigte Kartengröße nach Downloadfehlern korrigiert
+• Kleine Sprünge des Standortpfeils in bestimmten Fällen behoben
+• Bugfixes für Android 5 & 6
--- a/android/app/src/fdroid/play/listings/en-US/graphics/phone-screenshots/1.jpg
+++ b/android/app/src/fdroid/play/listings/en-US/graphics/phone-screenshots/1.jpg
--- a/android/app/src/fdroid/play/listings/en-US/graphics/phone-screenshots/1.png
+++ b/android/app/src/fdroid/play/listings/en-US/graphics/phone-screenshots/1.png
--- a/android/app/src/fdroid/play/listings/en-US/graphics/phone-screenshots/2.jpg
+++ b/android/app/src/fdroid/play/listings/en-US/graphics/phone-screenshots/2.jpg
--- a/android/app/src/fdroid/play/listings/en-US/graphics/phone-screenshots/2.png
+++ b/android/app/src/fdroid/play/listings/en-US/graphics/phone-screenshots/2.png
--- a/android/app/src/fdroid/play/listings/en-US/graphics/phone-screenshots/3.jpg
+++ b/android/app/src/fdroid/play/listings/en-US/graphics/phone-screenshots/3.jpg
--- a/android/app/src/fdroid/play/listings/en-US/graphics/phone-screenshots/3.png
+++ b/android/app/src/fdroid/play/listings/en-US/graphics/phone-screenshots/3.png
--- a/android/app/src/fdroid/play/listings/en-US/graphics/phone-screenshots/4.jpg
+++ b/android/app/src/fdroid/play/listings/en-US/graphics/phone-screenshots/4.jpg
--- a/android/app/src/fdroid/play/listings/en-US/graphics/phone-screenshots/4.png
+++ b/android/app/src/fdroid/play/listings/en-US/graphics/phone-screenshots/4.png
--- a/android/app/src/fdroid/play/listings/en-US/graphics/phone-screenshots/5.png
+++ b/android/app/src/fdroid/play/listings/en-US/graphics/phone-screenshots/5.png
--- a/android/app/src/fdroid/play/listings/en-US/graphics/phone-screenshots/6.png
+++ b/android/app/src/fdroid/play/listings/en-US/graphics/phone-screenshots/6.png
--- a/android/app/src/fdroid/play/listings/en-US/release-notes.txt
+++ b/android/app/src/fdroid/play/listings/en-US/release-notes.txt
@@ -1,7 +1,8 @@
-• OpenStreetMap data as of June 22
-• a setting for automatic bookmarks and tracks backup
-• added 100m-step altitude isolines to all regions that had worse or no isolines
-• display vegetation and playground color fills earlier, add fills to camp sites and some amenities
-• paths & tracks appear on the map later by default - still appear earlier in the outdoor style
-• hide active custom button action from the hamburger menu, move there About & Help from the settings
-• update map transport icons
+• refresh map colors - lighter, warmer, friendlier!
+• OSM editor: add a "level" field
+• update gas and charging stations icons
+• update colors of some UI elements
+• fix location sharing links
+• fix wrong displayed map size after download errors
+• fix small location arrow jumps in some cases
+• android 5&6 bugfixes
--- a/android/app/src/fdroid/play/listings/en-US/video-url.txt
+++ b/android/app/src/fdroid/play/listings/en-US/video-url.txt
--- a/android/app/src/fdroid/play/listings/es-ES/release-notes.txt
+++ b/android/app/src/fdroid/play/listings/es-ES/release-notes.txt
@@ -1,6 +1,8 @@
-• datos de OpenStreetMap a 22 de junio
-• añadido ajuste para la copia de seguridad automática de marcadores y trazas
-• añadidas isolíneas de 100 m a las regiones que tenían isolíneas peores o no tenían isolíneas
-• se muestra antes la vegetación y zonas de juego, añadidas áreas a campings y otros servicios
-• los senderos y pistas aparecen más tarde - siguen igual en estilo de outdoors
-• se oculta botón personalizado del menú y se mueve allí Acerca de y Ayuda desde los ajustes
+• colores del mapa renovados - más claros, cálidos y amigables!
+• editor OSM: campo "nivel" agregado
+• actualización de íconos de carga de combustible y electricidad
+• actualización de colores de algunos elementos de IU
+• corrección de links para compartir ubicación
+• corrección de tamaño incorrecto del mapa luego de errores de descarga
+• corrección de pequeños saltos de flechas de posición en algunos casos
+• corrección de bugs en Android 5 y 6
--- a/android/app/src/fdroid/play/listings/eu-ES/full-description.txt
+++ b/android/app/src/fdroid/play/listings/eu-ES/full-description.txt
@@ -1,32 +0,0 @@
-Komunitateko doako eta iturburu irekiko aplikazioa OpenStreetMap datuetan oinarrituta eta gardentasuna, pribatutasuna eta irabazi asmorik gabeko konpromisoarekin indartua. Comaps Organic Maps-en fork edo aldaera bat da, eta hori, aldi berean, maps.me-ren forka da.
-
-Irakurri proiektuaren zergatia eta haren norabidea <b> <i> codeberg.org/comaps </ i> </ b>.
-Sartu komunitatean eta lagundu maparik onena aplikatzen
-• Erabili aplikazioa eta horren berri eman
-• Eman feedbacka eta txostenetako gaiak
-• Eguneratu maparen datuak aplikazioan edo OpenStreetMap webgunean
-
-‣ <b> Konexiorik gabe fokatuta </ b> Planifikatu eta nabigatu atzerrira bidaiatzea, telefono zerbitzu beharrik gabe, bilaketa-biderapenak urruneko ibilaldian eta abar. Aplikazio funtzio guztiak lineaz kanpo lan egiteko diseinatuta daude.
-‣ <b> Pribatutasuna errespetatzea </ b> errespetatzea: aplikazioa pribatutasunarekin diseinatuta dago, ez du pertsonak identifikatzen, ez du jarraipena egiten, eta ez du informazio pertsonala biltzen. Iragarkirik ez.
-‣ <b> Sinplea eta leundua </ b>: Ezinbestekoa da funtzionatzen duten ezaugarriak erabiltzeko.
-‣ <b> Zure bateria eta espazioa gordetzen ditu </ b>: ez du bateria xahutzen beste nabigazio aplikazioak bezala. Mapa trinkoak. Gorde espazio preziatua zure telefonoan.
-‣ <b> Librea eta komunitateak eraikitakoa: Jendeak aplikazioa eraikitzen lagundu zuen aplikazioa eraikitzen lagunduz OpenStreetMap, probatu eta funtzioei buruzko iritzia emanez eta garapen trebetasunak eta dirua lagunduz.
-‣ <b> Erabakiak eta finantza irekiak eta gardena, irabazi asmorik gabeko eta guztiz irekitako iturria. </ B>
-
-<b> Ezaugarri nagusiak </ b>:
-• Deskargatu mapa zehatzak Google Maps-ekin eskuragarri ez dauden lekuekin
-• Mendiko modua nabarmendutako mendi ibilbideak, kanpinak, ur iturriak, gailurrak, sestra-lerroak, etab
-• Bideak eta bidegorriak
-• Jatetxe, gas geltokiak, hotelak, dendak, bisitak eta bestelako interesguneak
-• Bilatu izenaren edo helbide baten arabera edo interes-kategoriaren arabera
-• Oinez, txirrinduaz edo gidatzeko ahots-oharrekin nabigazioa
-• Markatu zure gogoko lekuak sakatze bakarrarekin
-• Lineaz kanpoko Wikipedia artikuluak
-• Metroaren garraio geruza eta jarraibideak
-• Arrastoen grabazioa
-• Laster-markak eta ibilbideak esportatu eta inportatu KML, KMZ, GPX formatuetan
-• Gauean erabiltzeko modu iluna
-• Hobetu mapako datuak guztiontzat oinarrizko editore integratua erabiliz
-
-<b> Askatasuna hemen </ b> da
-Ezagutu zure bidaia, nabigatu munduan pribatutasunarekin eta komunitatez abangoardian!
--- a/android/app/src/fdroid/play/listings/eu-ES/title.txt
+++ b/android/app/src/fdroid/play/listings/eu-ES/title.txt
@@ -1 +1 @@
-CoMaps- Mendia, bizikleta, autoa, dena offline
+CoMaps- Mendia, bizikleta, autoa. Dena offline eta pribatutasunearekin
--- a/android/app/src/fdroid/play/listings/fr-FR/graphics/phone-screenshots/1.jpg
+++ b/android/app/src/fdroid/play/listings/fr-FR/graphics/phone-screenshots/1.jpg
--- a/android/app/src/fdroid/play/listings/fr-FR/graphics/phone-screenshots/1.png
+++ b/android/app/src/fdroid/play/listings/fr-FR/graphics/phone-screenshots/1.png
--- a/android/app/src/fdroid/play/listings/fr-FR/graphics/phone-screenshots/2.jpg
+++ b/android/app/src/fdroid/play/listings/fr-FR/graphics/phone-screenshots/2.jpg
--- a/android/app/src/fdroid/play/listings/fr-FR/graphics/phone-screenshots/2.png
+++ b/android/app/src/fdroid/play/listings/fr-FR/graphics/phone-screenshots/2.png
--- a/android/app/src/fdroid/play/listings/fr-FR/graphics/phone-screenshots/3.jpg
+++ b/android/app/src/fdroid/play/listings/fr-FR/graphics/phone-screenshots/3.jpg
--- a/android/app/src/fdroid/play/listings/fr-FR/graphics/phone-screenshots/3.png
+++ b/android/app/src/fdroid/play/listings/fr-FR/graphics/phone-screenshots/3.png
--- a/android/app/src/fdroid/play/listings/fr-FR/graphics/phone-screenshots/4.jpg
+++ b/android/app/src/fdroid/play/listings/fr-FR/graphics/phone-screenshots/4.jpg
--- a/android/app/src/fdroid/play/listings/fr-FR/graphics/phone-screenshots/4.png
+++ b/android/app/src/fdroid/play/listings/fr-FR/graphics/phone-screenshots/4.png
--- a/android/app/src/fdroid/play/listings/fr-FR/graphics/phone-screenshots/5.png
+++ b/android/app/src/fdroid/play/listings/fr-FR/graphics/phone-screenshots/5.png
--- a/android/app/src/fdroid/play/listings/fr-FR/graphics/phone-screenshots/6.png
+++ b/android/app/src/fdroid/play/listings/fr-FR/graphics/phone-screenshots/6.png
--- a/android/app/src/fdroid/play/listings/fr-FR/release-notes.txt
+++ b/android/app/src/fdroid/play/listings/fr-FR/release-notes.txt
@@ -1,6 +1,8 @@
-• Données OpenStreetMap du 22 juin
-• Sauvegarde automatique des signets et traces GPS en local
-• Ajout des courbes d'altitude avec un précision de 100 mètres dans toutes les régions qui avaient peu de courbes ou aucune
-• Ajustements des styles notamment sur la végétation, les aires de jeu et les chemins
-• Masque l’action active du bouton personnalisé dans le menu hamburger
-• Correction de certains plantages et bugs
+• Mise à jour des couleurs de la carte, plus claires, plus chaudes et plus conviviales
+• Editeur OSM: ajout du champ "level"
+• Mise à jour des icônes des stations-service et bornes de recharge
+• Mise à jour des couleurs de certains éléments d'interface
+• Correction de lien de partage
+• Correction de la taille d'une carte suite à une erreur de téléchargement
+• Correction de saut de la localisation dans certaines situations
+• Corrections de bug sur Android 5&6
--- a/android/app/src/fdroid/play/listings/gl-ES/full-description.txt
+++ b/android/app/src/fdroid/play/listings/gl-ES/full-description.txt
@@ -1,32 +0,0 @@
-Aplicación de mapas gratuíta, de código aberto e xestionada pola comunidade, obtén os datos desde OpenStreetMap e co compromiso reforzado coa transparencia, privacidade e non ter o beneficio económico como obxectivo. CoMaps é unha bifurcación ou derivada de Organic Maps, que pola súa parte ven sendo unha bifurcación de Maps.ME.
-
-Vai a <b><i>codeberg.org/comaps</i></b> e coñece as razóns da necesidade deste proxecto e as decisións tomadas.
-Únete alí á comunidade e axuda a que teñamos a mellor aplicación de mapas
-• Usa a aplicación e dille a outras persoas que o fas
-• Informa de fallos e publica túa experiencia
-• Actualiza os datos do mapa na aplicación ou no sitio web OpenStreetMap
-
-‣ <b>Sen conexión de datos</b>: planea a viaxe e sigue a ruta sen precisar unha conexión á rede móbil, busca lugares relevantes nas andainas máis longas, etc. Todas as características da aplicación están deseñadas para funcionar sen precisar conexión de datos.
-‣ <b>Respecto pola privacidade</b>: a aplicación está deseñada coa privacidade en primeiro plano - non identifica ás persoas, non te segue, non recolle información sobre ti. Non ten publicidade.
-‣ <b>Simple e organizada</b>: características esenciais, fáciles de usar e que funcionan.
-‣ <b>Aforra batería e espazo</b>: non esgota a batería como outras aplicacións de navegación. Os mapas compactos aforran espazo na memoria do dispositivo.
-‣ <b>Gratuíta e feita pola comunidade</b>: persoas coma ti que axudan a crear a aplicación engadindo lugares en OpenStreetMap, probando novas características e dando a súa opinión, colaborando ao seu desenvolvemento con código ou financiamento.
-‣ <b>Proceso de toma de decisións Aberto e Transparente para os temas económicos, Sen ánimo de lucro e totalmente de Código Aberto</b>
-
-<b>Características principais</b>:
-• Mapas detallados descargables con lugares que non están dispoñibles en Google Maps
-• Modo para actividades en exterior con camiños para andainas, lugares para acampar, fontes de auga, picos dos montes, curvas de nivel, etc
-• Rutas a pé e en bicicleta
-• Puntos de interese como restaurantes, gasoliñeiras, hoteis, tendas, miradores e moitos máis
-• Busca polo nome ou polo enderezo ou por categoría do punto de interese
-• Navegación con anuncios por voz para camiñar, ir en bicicleta ou conducir
-• Marca os lugares favoritos cun só toque
-• Artigos da Wikipedia sen conexión
-• Mapas do transporte por Metro
-• Gravación das rutas
-• Exportación e Importación de marcadores e rutas nos formatos KML, KMZ e GPX
-• Modo escuro para a noite
-• Contribúe a mellorar o mapa para todas as persoas usando o editor básico incluído
-
-<b>Aquí es Libre</b>
-Atopa o teu camiño, navega polo mundo con privacidade e coa comunidade como prioridade!
--- a/android/app/src/fdroid/play/listings/gl-ES/short-description.txt
+++ b/android/app/src/fdroid/play/listings/gl-ES/short-description.txt
@@ -1 +0,0 @@
-Navegación doada - Descubre máis sobre o teu camiño - Creada pola comunidade
--- a/android/app/src/fdroid/play/listings/gl-ES/title.txt
+++ b/android/app/src/fdroid/play/listings/gl-ES/title.txt
@@ -1 +0,0 @@
-CoMaps - Aplicación de mapas privada, sen conexión
--- a/android/app/src/fdroid/play/listings/nl-NL/full-description.txt
+++ b/android/app/src/fdroid/play/listings/nl-NL/full-description.txt
@@ -1,32 +0,0 @@
-Een door de community ontwikkelde, gratis en open source kaartenapp, gebaseerd op OpenStreetMap-gegevens, met een sterke focus op transparantie en privacy, en zonder winstoogmerk. CoMaps is een fork/spin-off van Organic Maps, welke is afgeleid van Maps.ME.
-
-Meer informatie over de redenen voor het project en de richting ervan vindt u op <b><i>codeberg.org/comaps</i></b>.
-Sluit je aan bij de community en help mee aan de ontwikkeling van de beste kaartenapp:
-• Gebruik de app en deel je ervaringen met anderen
-• Geef feedback en meld eventuele problemen
-• Houd de kaarten up-to-date, zowel in de app als op de OpenStreetMap-website
-
-‣ <b>Offline-georiënteerd</b>: Plan en navigeer je reis in het buitenland zonder internet, zoek waypoints tijdens een lange wandeling, enzovoort. Alle functies zijn ontworpen om offline te functioneren.
-‣ <b>Respect voor privacy</b>: De app is ontworpen met privacy in gedachten - geen gegevensverzameling en advertentievrij.
-‣ <b>Eenvoudig en verfijnd</b>: essentiële, gebruiksvriendelijke functies die gewoon werken.
-‣ <b>Bespaar je batterij en opslag</b>: De app verbruikt minder batterij dan andere navigatie-apps. Compacte kaarten besparen ruimte op je telefoon.
-‣ <b>Gratis en gebouwd door de community</b>: Mensen zoals jij helpen de app door plaatsen toe te voegen aan OpenStreetMap, functies te testen en feedback te geven, en hun programmervaardigheden bij te dragen of te doneren.
-‣ <b>Open en transparant besluitvormings- en financieel beleid, geen winstoogmerk en volledig open source.</b>
-
-<b>Hoofdfuncties</b>:
-• Downloadbare gedetailleerde kaarten met plaatsen die niet beschikbaar zijn bij Google Maps
-• Buitenmodus met gemarkeerde wandelpaden, campings, waterbronnen, toppen, hoogtelijnen, enz.
-• Wandelpaden en fietspaden
-• Bezienswaardigheden zoals restaurants, tankstations, hotels, winkels en nog veel meer
-• Zoeken op naam of adres of op categorie
-• Navigatie met spraakmeldingen voor wandelen, fietsen of autorijden
-• Sla je favoriete plaatsen op met een enkele klik
-• Offline Wikipedia-artikelen
-• Metro laag en routebeschrijvingen
-• Trackregistratie
-• Exporteer en importeer bladwijzers en tracks in KML, KMZ, GPX-formaten
-• Een donkere modus voor gebruik 's nachts
-• Verbeter kaartgegevens voor iedereen met een eenvoudige ingebouwde editor
-
-<b>Vrijheid is hier/b>
-Ontdek je reis, navigeer over de wereld met privacy en community voorop!
--- a/android/app/src/fdroid/play/listings/nl-NL/short-description.txt
+++ b/android/app/src/fdroid/play/listings/nl-NL/short-description.txt
@@ -1 +0,0 @@
-Eenvoudige kaartnavigatie - Ontdek meer van je reis - Gemaakt door de community
--- a/android/app/src/fdroid/play/listings/pt-BR/release-notes.txt
+++ b/android/app/src/fdroid/play/listings/pt-BR/release-notes.txt
@@ -0,0 +1,8 @@
+• Atualizadas as cores do mapa - mais claras, quentes e amigáveis!
+• Editor OSM: adicionado um campo de "andar"
+• Atualizados ícones de postos de gasolina e recarga
+• Atualizadas cores de alguns elementos da interface do usuário
+• Correção de links de compartilhamento de localização
+• Correção de erros de tamanho de mapa exibidos incorretamente após download
+• Correção de pequenos saltos na seta de localização em alguns casos
+• Correções de bugs do Android 5 e 6
--- a/android/app/src/fdroid/play/listings/pt/full-description.txt
+++ b/android/app/src/fdroid/play/listings/pt/full-description.txt
@@ -1,32 +1,55 @@
 Um aplicativo de mapas gratuito e de código aberto, liderado pela comunidade, baseado em dados do OpenStreetMap e reforçado pelo compromisso com a transparência, privacidade e sem fins lucrativos. O CoMaps é um fork/spin-off do Organic Maps, que por sua vez é um fork do Maps.ME.

 Leia mais sobre os motivos do projeto e sua direção em <b><i>codeberg.org/comaps</i></b>.
+
 Junte-se à comunidade e ajude a criar o melhor aplicativo de mapas.
+
 • Use o aplicativo e divulgue-o.
+
 • Envie feedback e relate problemas.
+
 • Atualize os dados do mapa no aplicativo ou no site do OpenStreetMap.

 ‣ <b>Foco offline</b>: Planeje e navegue em sua viagem ao exterior sem a necessidade de sinal de celular, pesquise pontos de referência durante uma caminhada distante, etc. Todas as funções do aplicativo foram projetadas para funcionar offline.
+
 ‣ <b>Respeitando a privacidade</b>: O aplicativo foi projetado com a privacidade em mente - não identifica pessoas, não rastreia e não coleta informações pessoais. Sem anúncios.
+
 ‣ <b>Simples e sofisticado</b>: recursos essenciais e fáceis de usar que simplesmente funcionam.
+
 ‣ <b>Economiza bateria e espaço</b>: Não consome muita bateria como outros aplicativos de navegação. Mapas compactos economizam espaço precioso no seu celular.
+
 ‣ <b>Gratuito e desenvolvido pela comunidade</b>: Pessoas como você ajudaram a desenvolver o aplicativo adicionando lugares ao OpenStreetMap, testando e dando feedback sobre os recursos e contribuindo com suas habilidades de desenvolvimento e dinheiro.
+
 ‣ <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>:
+
 • 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 por categoria de ponto de interesse
+
 • Navegação com anúncios de voz para caminhadas, ciclismo ou direção
+
 • Marque seus lugares favoritos com um único toque
+
 • Artigos offline da Wikipédia
+
 • Camada e direções de transporte público do metrô
+
 • Gravação de trilhas
+
 • Exporte e importe favoritos e trilhas nos formatos KML, KMZ e 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!
--- a/android/app/src/fdroid/play/listings/pt/short-description.txt
+++ b/android/app/src/fdroid/play/listings/pt/short-description.txt
@@ -1 +1 @@
-Navegação fácil nos mapas - Descubra mais sobre o seu percurso - Feito por todos
+Navegação fácil nos mapas - Descobre mais sobre o teu percurso - Feito por todos
--- a/android/app/src/fdroid/play/listings/ru-RU/full-description.txt
+++ b/android/app/src/fdroid/play/listings/ru-RU/full-description.txt
@@ -1,6 +1,7 @@
 Бесплатное и свободное картографическое приложение, основанное на данных OpenStreetMap и подкреплённое обязательствами по прозрачности, конфиденциальности и некоммерческой направленности. CoMaps — это ответвление от Organic Maps, которое, в свою очередь, является ответвлением от Maps.ME.

-Подробнее о причинах проекта и его направлении читайте на сайте <b><i> codeberg.org/comaps </i><b>.
+Подробнее о причинах проекта и его направлении читайте на <a href="https://codeberg.org/comaps">сайте</a>.
+
 Присоединяйтесь к сообществу и помогите создать лучшее приложение с картами
 • Используйте приложение и распространяйте информацию о нём
 • Оставляйте отзывы и сообщайте о проблемах
--- a/android/app/src/fdroid/play/listings/ru-RU/release-notes.txt
+++ b/android/app/src/fdroid/play/listings/ru-RU/release-notes.txt
@@ -1,6 +1,8 @@
-• карты OpenStreetMap от 22 июня
-• автоматическое резервное копирование меток и треков
-• линии высот с шагом 100м для всех регионов, где линии с этим шагом отсутствовали
-• цветная заливка растительности и игровых площадок отображается раньше, добавлена заливка для кемпингов и других объектов
-• тропы и грунтовки отображаются позже в стиле по умолчанию - используйте стиль «Активный отдых» для обзора троп
-• выбранная функция настраиваемой кнопки больше не дублируется в пунктах меню
+• обновлены цвета карты — теперь они светлее, теплее и дружелюбнее
+• редактор OSM: добавлено поле «этаж»
+• обновлены иконки заправок и зарядных станций
+• обновлены цвета некоторых элементов интерфейса
+• исправлена ссылка на карту при попытке поделиться местоположением
+• исправлено неверное отображение размера карты после ошибок загрузки
+• исправлены мелкие скачки стрелки местоположения в некоторых случаях
+• исправления ошибок для Android 5 и 6
--- a/android/app/src/fdroid/play/listings/ru-RU/short-description.txt
+++ b/android/app/src/fdroid/play/listings/ru-RU/short-description.txt
@@ -1 +1 @@
-Простая навигация по карте — Откройте больше за ваше путешествие — От сообщества
+Простая навигация по карте — Откройте больше за ваше путешествие. От сообщества
--- a/android/app/src/fdroid/play/listings/sr/full-description.txt
+++ b/android/app/src/fdroid/play/listings/sr/full-description.txt
@@ -1,17 +1,18 @@
-Бесплатна апликација отвореног кода коју је обављала заједница и заснива се на ОpenStreetMap-у подацима, усмерени транспарентност, приватност и непрофитни. CoMaps је Апликације за органске карте виљушка, које је пак форк Maps.ME.
+Бесплатна апликација отвореног кода коју је обављала заједница и заснива се на ОпенСтреетМап-у подацима, усмерени транспарентност, приватност и непрофитни. ЦОМПАПС је Апликације за органске карте виљушка, које је пак форк мапс.ме.

 Прочитајте о разлозима пројекта и његовог правца на <b><i>codeberg.org/comaps</i></b>
 Придружите се отвореној заједници и помозите да направимо најбољу апликацију за мапе
 • Користите апликацију и проширите глас о томе
 • Дајте повратне информације и пријавите проблеме
 • Ажурирајте податке на мапи у апликацији или на веб локацији OpenStreetMap
+‣<b>фокусирано на офлајн Вар </b>: Планирајте и управљајте путовањем у иностранству без потребе за мобилним услугама, тражите путне тачке док је на даљинском покрету, итд. 

-‣ <b> фокусирано на офлајн Вар </b>: Планирајте и управљајте путовањем у иностранству без потребе за мобилним услугама, тражите путне тачке док је на даљинском покрету, итд. Све апликације су дизајниране за рад ван мреже.
-‣ <b> Поштовање приватности </b>: Апликација је осмишљена задржавања у уму приватност - не идентификује људе, не прати или прикупља личне податке. Нема реклама.
+Све апликације су дизајниране за рад ван мреже.
+‣<b> Поштовање приватности </b>: Апликација је осмишљена задржавања у уму приватност - не идентификује људе, не прати или прикупља личне податке. Нема реклама.
 ‣ <b> Једноставно и елегантно </b>: Апликација је тривијална за употребу и једноставно функционише.
 ‣ <b> Чува вашу батерију и простор </b>: не конзумира батерију као остале навигационе апликације. Компактне картице сачувајте драгоцени простор на вашем телефону.
 ‣ <b> Отворено и направио је заједницу </b>: Људи попут вас је помогли да додају апликацију додавањем локација на OpenStreetMap-у, тестирању и давање повратних информација о апликацији и доприносе вашим развојним вештинама и новцу.
-‣ <b> Отворено и транспарентно доношење одлука и употреба финансија, непрофитна и потпуно отворена извора. </b>
+‣ <b> Отворено и транспарентно доношење одлука и употреба финансија, непрофитна и потпуно отворена извора. </ Б>

 <b> Главне карактеристике </b>:
 • Преузмите детаљне мапе са локацијама које нису доступне са Гоогле мапама
--- a/android/app/src/fdroid/play/listings/sr/release-notes.txt
+++ b/android/app/src/fdroid/play/listings/sr/release-notes.txt
@@ -0,0 +1,8 @@
+• освежене су боје мапе – светлије, топлије, пријатније!
+• у OSM едитору је додато поље „спрат“
+• ажуриране су иконице бензинских пумпи и станица за пуњење
+• ажуриране су боје неких елемената корисничког интерфејса
+• поправљени су линкови за дељење локације
+• поправљена је погрешно приказана величина мапе након грешака при преузимању
+• исправљена су мала поскакивања стрелице локације у неким случајевима
+• исправљене су грешке за Android 5 и 6
--- a/android/app/src/fdroid/play/listings/tr-TR/short-description.txt
+++ b/android/app/src/fdroid/play/listings/tr-TR/short-description.txt
@@ -1 +1 @@
-Kullanımı kolay harita - Yolculuğun ötesine geçin - topluluğun katkılarıyla
+Kolayca gezinin - Seyahat etmenin ötesini bulun - Gönüllüler tarafından yapıldı
--- a/android/app/src/fdroid/play/listings/tr-TR/title.txt
+++ b/android/app/src/fdroid/play/listings/tr-TR/title.txt
@@ -1 +1 @@
-CoMaps - Gizlilikle Yürüyün, Sürün, Gezin
+CoMaps - İnternetsiz Seyahat Edin
--- a/android/app/src/fdroid/play/listings/zh-CN/release-notes.txt
+++ b/android/app/src/fdroid/play/listings/zh-CN/release-notes.txt
@@ -0,0 +1,8 @@
+• 刷新地图颜色－更浅、更暖、更友好！
+• OSM 编辑器：添加“楼层”字段
+• 更新加油站和充电站图标
+• 更新部分用户界面组件的颜色
+• 修复位置共享的链接
+• 修复下载后错误显示地图大小的问题
+• 修复定位箭头偶尔轻微跳动的问题
+• Android 5&6 错误修复
--- a/android/app/src/fdroid/play/listings/zh-TW/release-notes.txt
+++ b/android/app/src/fdroid/play/listings/zh-TW/release-notes.txt
@@ -0,0 +1,8 @@
+• 刷新地圖顏色－更淺、更暖、更友好！
+• OSM 編輯器：新增「樓層」欄位
+• 更新加油站和充電站圖示
+• 更新某些使用者介面元件的顏色
+• 修正位置分享的連結
+• 修正下載後錯誤顯示地圖尺寸的問題
+• 修正定位箭頭偶爾輕微跳動的問題
+• Android 5&6 錯誤修正
--- a/android/app/src/google/play/listings/cs-CZ/short-description.txt
+++ b/android/app/src/google/play/listings/cs-CZ/short-description.txt
@@ -1 +1 @@
-Jednoduchá navigace v mapě – Objevte více na své cestě – Vyvíjeno komunitou
+Jednoduchá navigace v mapě - Objevte více na své cestě ‐ Vyvíjeno komunitou
--- a/android/app/src/google/play/listings/en-US/release-notes.txt
+++ b/android/app/src/google/play/listings/en-US/release-notes.txt
--- a/android/app/src/google/play/listings/en-US/video-url.txt
+++ b/android/app/src/google/play/listings/en-US/video-url.txt
--- a/android/app/src/google/play/listings/eu-ES/short-description.txt
+++ b/android/app/src/google/play/listings/eu-ES/short-description.txt
@@ -1 +0,0 @@
-Mapa nabigazio erraza - Ezagutu gehiago zure bidaiaz - Komunitatean egina
--- a/android/app/src/google/play/listings/gl-ES/full-description.txt
+++ b/android/app/src/google/play/listings/gl-ES/full-description.txt
@@ -1,35 +0,0 @@
-Aplicación de mapas gratuíta, de código aberto e xestionada pola comunidade, obtén os datos desde OpenStreetMap e co compromiso reforzado coa transparencia, privacidade e non ter o beneficio económico como obxectivo.
-
-Únete á comunidade e axuda a que teñamos a mellor aplicación de mapas
-• Usa a aplicación e dille a outras persoas que o fas
-• Informa de fallos e publica túa experiencia
-• Actualiza os datos do mapa na aplicación ou no sitio web OpenStreetMap
-
-<i>Os teus comentarios e recensións de 5 estrelas son a mellor axuda para nós!
-
-‣ <b>Sen conexión de datos</b>: planea a viaxe e sigue a ruta sen precisar unha conexión á rede móbil, busca lugares relevantes nas andainas máis longas, etc. Todas as características da aplicación están deseñadas para funcionar sen precisar conexión de datos.
-‣ <b>Respecto pola privacidade</b>: a aplicación está deseñada coa privacidade en primeiro plano - non identifica ás persoas, non te segue, non recolle información sobre ti. Non ten publicidade.
-‣ <b>Simple e organizada</b>: características esenciais, fáciles de usar e que funcionan.
-‣ <b>Aforra batería e espazo</b>: non esgota a batería como outras aplicacións de navegación. Os mapas compactos aforran espazo na memoria do dispositivo.
-‣ <b>Gratuíta e feita pola comunidade</b>: persoas coma ti que axudan a crear a aplicación engadindo lugares en OpenStreetMap, probando novas características e dando a súa opinión, colaborando ao seu desenvolvemento con código ou financiamento.
-‣ <b>Proceso de toma de decisións Aberto e Transparente para os temas económicos, Sen ánimo de lucro e totalmente de Código Aberto</b>
-
-<b>Características principais</b>:
-• Mapas detallados descargables con lugares que non están dispoñibles en Google Maps
-• Modo para actividades en exterior con camiños para andainas, lugares para acampar, fontes de auga, picos dos montes, curvas de nivel, etc
-• Rutas a pé e en bicicleta
-• Puntos de interese como restaurantes, gasoliñeiras, hoteis, tendas, miradores e moitos máis
-• Busca polo nome ou polo enderezo ou por categoría do punto de interese
-• Navegación con anuncios por voz para camiñar, ir en bicicleta ou conducir
-• Marca os lugares favoritos cun só toque
-• Artigos da Wikipedia sen conexión
-• Mapas do transporte por Metro
-• Gravación das rutas
-• Exportación e Importación de marcadores e rutas nos formatos KML, KMZ e GPX
-• Modo escuro para a noite
-• Contribúe a mellorar o mapa para todas as persoas usando o editor básico incluído
-
-Por favor informa de calquera incidencia que xurda así como suxire novas funcións na nosa comunidade en <b><i>comaps.app</i></b>
-
-<b>Aquí es Libre</b>
-Atopa o teu camiño, navega polo mundo con privacidade e coa comunidade como prioridade!
--- a/android/app/src/google/play/listings/gl-ES/short-description.txt
+++ b/android/app/src/google/play/listings/gl-ES/short-description.txt
@@ -1 +0,0 @@
-Navegación doada - Descubre máis sobre o teu camiño - Creada pola comunidade
--- a/android/app/src/google/play/listings/gl-ES/title.txt
+++ b/android/app/src/google/play/listings/gl-ES/title.txt
@@ -1 +0,0 @@
-CoMaps -Navega con Privacidade
--- a/android/app/src/google/play/listings/nl-NL/full-description.txt
+++ b/android/app/src/google/play/listings/nl-NL/full-description.txt
@@ -1,36 +0,0 @@
-Een door de community ontwikkelde, gratis en open source kaartenapp, gebaseerd op OpenStreetMap-gegevens, met een sterke focus op transparantie en privacy, en zonder winstoogmerk.
-
-Sluit je aan bij de community en help mee aan de ontwikkeling van de beste kaartenapp:
-• Gebruik de app en deel je ervaringen met anderen
-• Geef feedback en meld eventuele problemen
-• Houd de kaarten up-to-date, zowel in de app als op de OpenStreetMap-website
-
-<i>Jouw feedback en 5-sterrenbeoordelingen zijn de beste steun voor ons!!</i>
-
-‣ <b>Eenvoudig en verfijnd</b>: essentiële, gebruiksvriendelijke functies die gewoon werken.
-‣ <b>Offline-georiënteerd</b>: Plan en navigeer je reis in het buitenland zonder internet, zoek waypoints tijdens een lange wandeling, enzovoort. Alle functies zijn ontworpen om offline te functioneren.
-‣ <b>Respect voor privacy</b>: De app is ontworpen met privacy in gedachten - geen gegevensverzameling en advertentievrij.
-‣ <b>Bespaar je batterij en opslag</b>: De app verbruikt minder batterij dan andere navigatie-apps. Compacte kaarten besparen ruimte op je telefoon.
-‣ <b>Gratis en gebouwd door de community</b>: Mensen zoals jij helpen de app door plaatsen toe te voegen aan OpenStreetMap, functies te testen en feedback te geven, en hun programmervaardigheden bij te dragen of te doneren.
-‣ <b>Open en transparant besluitvormings- en financieel beleid, geen winstoogmerk en volledig open source.</b>
-
-<b>Hoofdfuncties</b>:
-• Downloadbare gedetailleerde kaarten met plaatsen die niet beschikbaar zijn bij Google Maps
-• Buitenmodus met gemarkeerde wandelpaden, campings, waterbronnen, toppen, hoogtelijnen, enz.
-• Wandelpaden en fietspaden
-• Bezienswaardigheden zoals restaurants, tankstations, hotels, winkels en nog veel meer
-• Zoeken op naam of adres of op categorie
-• Navigatie met spraakmeldingen voor wandelen, fietsen of autorijden
-• Sla je favoriete plaatsen op met een enkele klik
-• Offline Wikipedia-artikelen
-• Metro laag en routebeschrijvingen
-• Trackregistratie
-• Exporteer en importeer bladwijzers en tracks in KML, KMZ, GPX-formaten
-• Een donkere modus voor gebruik 's nachts
-• Verbeter kaartgegevens voor iedereen met een eenvoudige ingebouwde editor
-• Ondersteuning voor Android Auto
-
-Meld app-problemen, stel nieuwe functies voor en sluit je aan bij onze community op de <b><i>comaps.app</i></b> website.
-
-<b>Vrijheid is hier/b>
-Ontdek je reis, navigeer over de wereld met privacy en community voorop!
--- a/android/app/src/google/play/listings/pt-PT/short-description.txt
+++ b/android/app/src/google/play/listings/pt-PT/short-description.txt
@@ -1 +0,0 @@
-Navegação fácil nos mapas - Descubra mais sobre o seu percurso - Feito por todos
--- a/android/app/src/google/play/listings/pt-PT/title.txt
+++ b/android/app/src/google/play/listings/pt-PT/title.txt
@@ -1 +0,0 @@
-CoMaps - Viaje com Privacidade
--- a/android/app/src/google/play/listings/ru-RU/short-description.txt
+++ b/android/app/src/google/play/listings/ru-RU/short-description.txt
@@ -1 +1 @@
-Простая навигация по карте — Откройте больше за ваше путешествие — От сообщества
+Простая навигация по карте — Откройте больше за ваше путешествие. От сообщества
--- a/android/app/src/google/play/listings/tr-TR/full-description.txt
+++ b/android/app/src/google/play/listings/tr-TR/full-description.txt
@@ -1,36 +0,0 @@
-OpenStreetMap verilerine dayanan, kâr amacı gütmeyen, gizlilik ve şeffaflık odaklı, topluluk tarafından yönetilen, özgür ve açık kaynak kodlu bir harita uygulaması.
-
-Topluluğa katılın ve en iyi harita uygulamasını oluşturmamıza yardım edin
-• Uygulamayı kullanın ve çevrenize yayın
-• Geri bildirim verin ve sorunları bildirin
-• Harita verilerini uygulamadan veya OpenStreetMap üzerinden düzenleyin 
-
-<i>Geri bildirimleriniz ve 5 yıldızlı yorumlarınız bizim için en iyi destektir!</i>
-
-‣ <b>Basit ve Temiz</b>: Sadece temel, kullanımı basit, işe yarayan özellikler.
-‣ <b>Çevrimdışı Odaklı</b>: Mobil veriye ihtiyaç duymadan yurt dışı seyahatinizi planlayın ve gezin, uzun bir yürüyüş sırasında rotanızdaki noktaları bulun ve daha fazlası . Tüm özellikler çevrimdışı çalışmak üzere tasarlanmıştır.
-‣ <b>Gizliliğe Saygılı</b>: Uygulama gizliliğe saygılı olarak tasarlanmıştır. Kullanıcı profilinizi çıkarmaz, sizi takip etmez ve kişisel bilgi toplamaz. Üstelik tamamen reklamsızdır.
-‣ <b>Pil ve Depolamanızdan Tasarruf Eder</b>: Diğer navigasyon uygulamaları gibi pilinizi sömürmez. Compact maps değerli depolama alanınızdan tasarruf eder.
-‣ <b>Ücretsizdir ve Gücünü Topluluktan Alır</b>: Sizin gibi insanlar OpenStreetMap'e yer ekleyerek, yeni özellikleri test ederek, geri bildirimde bulunarak, program geliştirme becerileri ve bağışlarla katkıda bulunarak uygulamanın oluşturulmasına yardımcı oldu.
-‣ <b>Açık ve Şeffaf Şekilde Yürütülen Karar Alma ve Fonlama Süreçleri, Kâr Amacı Gütmez ve Tamamen Açık Kaynaklı.</b>
-
-<b>Ana Özellikler</b>:
-• Google Haritalar'da bulunmayan yerleri içeren, çevrimdışı detaylı haritalar
-• Yürüyüş parkurları, kamp alanları, su kaynakları, zirveler, kontur çizgileri vb. nesneleri vurgulayan açık hava modu
-• Yürüyüş ve bisiklet yolları
-• Restoran, benzin istasyonu, otel, mağaza, görülecek yerler ve çok daha fazla harita noktası
-• İsim, adres veya harita noktası kategorisine göre arama yapın
-• Sesli yönlendirmeye sahip yürüyüş, bisiklet ve araç navigasyonu
-• En sevdiğiniz mekanları tek dokunuşla yer imlerinize kaydedin
-• Çevrimdışı Vikipedi makaleleri
-• Metro ulaşım katmanı ve rotaları
-• GPS izinizi kaydedin
-• Yer imi ve GPS izlerinizi KML, KMZ ve GPX biçimlerinde dışa veya içe aktarın
-• Gece boyunca kullanmanızı sağlayacak koyu mod
-• Uygulama içi düzenleyiciyi kullanarak harita verilerini herkes için daha iyi hale getirin
-• Android Auto desteği
-
-Lütfen <b><i>comaps.app</i></b> adresinden uygulama sorunlarını bildirin, önerilerinizi paylaşın ve topluluğumuza katılın.
-
-<b>Özgürlük Buradan Başlıyor</b>
-Yolculuğunuzun ötesine geçin, gizlilik ve topluluğu ön planda tutarak dünyada gezinin!
--- a/android/app/src/google/play/listings/tr-TR/short-description.txt
+++ b/android/app/src/google/play/listings/tr-TR/short-description.txt
@@ -1 +1 @@
-Kullanımı kolay harita - Yolculuğun ötesine geçin - topluluğun katkılarıyla
+Kolayca gezinin - Seyahat etmenin ötesini bulun - Gönüllüler tarafından yapıldı
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@@ -20,9 +20,6 @@
  <uses-feature
      android:name="android.hardware.location.gps"
      android:required="false"/>
-  <uses-permission
-      android:name="android.permission.READ_EXTERNAL_STORAGE"
-      android:maxSdkVersion="22" />
  <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"/>
  <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
  <uses-permission android:name="android.permission.ACCESS_LOCATION_EXTRA_COMMANDS" />
--- a/android/app/src/main/cpp/app/organicmaps/DownloadResourcesLegacyActivity.cpp
+++ b/android/app/src/main/cpp/app/organicmaps/DownloadResourcesLegacyActivity.cpp
@@ -171,7 +171,7 @@ extern "C"
          curFile.GetRemoteSize(),
          std::bind(&DownloadFileFinished, ptr, _1),
          std::bind(&DownloadFileProgress, ptr, _1),
-          0, false));
+          512 * 1024, false));
    });

    return ERR_FILE_IN_PROGRESS;
--- a/android/app/src/main/cpp/app/organicmaps/Framework.cpp
+++ b/android/app/src/main/cpp/app/organicmaps/Framework.cpp
@@ -1804,4 +1804,74 @@ Java_app_organicmaps_Framework_nativeMemoryWarning(JNIEnv *, jclass)
  return frm()->MemoryWarning();
 }

+JNIEXPORT jboolean JNICALL
+Java_app_organicmaps_Framework_nativeShouldShowProducts(JNIEnv * env, jclass)
+{
+  return frm()->ShouldShowProducts();
+}
+
+JNIEXPORT jobject JNICALL
+Java_app_organicmaps_Framework_nativeGetProductsConfiguration(JNIEnv * env, jclass)
+{
+  auto config = frm()->GetProductsConfiguration();
+  if (!config) return nullptr;
+
+  static jclass const productClass = jni::GetGlobalClassRef(
+    env,
+    "app/organicmaps/products/Product"
+  );
+  static jmethodID const productConstructor = jni::GetConstructorID(
+    env,
+    productClass,
+    "(Ljava/lang/String;Ljava/lang/String;)V"
+  );
+
+  jobjectArray products = jni::ToJavaArray(
+    env,
+    productClass,
+    config->GetProducts(),
+    [](JNIEnv * env, products::ProductsConfig::Product const & product)
+    {
+      jni::TScopedLocalRef const title(env, jni::ToJavaString(env, product.GetTitle()));
+      jni::TScopedLocalRef const link(env, jni::ToJavaString(env, product.GetLink()));
+
+      return env->NewObject(
+        productClass,
+        productConstructor,
+        title.get(),
+        link.get()
+      );
+    });
+
+  static jclass const productsConfigClass = jni::GetGlobalClassRef(
+    env,
+    "app/organicmaps/products/ProductsConfig"
+  );
+  static jmethodID const productsConfigConstructor = jni::GetConstructorID(
+    env,
+    productsConfigClass,
+    "(Ljava/lang/String;[Lapp/organicmaps/products/Product;)V"
+  );
+
+  jni::TScopedLocalRef const placePagePrompt(env, jni::ToJavaString(env, config->GetPlacePagePrompt()));
+  return env->NewObject(productsConfigClass, productsConfigConstructor, placePagePrompt.get(), products);
+}
+
+JNIEXPORT void JNICALL
+Java_app_organicmaps_Framework_nativeDidCloseProductsPopup(JNIEnv * env, jclass, jstring reason)
+{
+  frm()->DidCloseProductsPopup(frm()->FromString(jni::ToNativeString(env, reason)));
+}
+
+JNIEXPORT void JNICALL
+Java_app_organicmaps_Framework_nativeDidSelectProduct(JNIEnv * env, jclass, jstring title, jstring link)
+{
+  products::ProductsConfig::Product product(
+    jni::ToNativeString(env, title),
+    jni::ToNativeString(env, link)
+  );
+
+  frm()->DidSelectProduct(product);
+}
+
 }  // extern "C"
--- a/android/app/src/main/cpp/app/organicmaps/editor/OpeningHours.cpp
+++ b/android/app/src/main/cpp/app/organicmaps/editor/OpeningHours.cpp
@@ -321,30 +321,4 @@ Java_app_organicmaps_editor_OpeningHours_nativeIsTimetableStringValid(JNIEnv * e
 {
  return OpeningHours(jni::ToNativeString(env, jSource)).IsValid();
 }
-
-
-JNIEXPORT jobject JNICALL
-Java_app_organicmaps_editor_OpeningHours_nativeCurrentState(JNIEnv * env, jclass clazz, jobjectArray jTts)
-{
-  TimeTableSet tts = NativeTimetableSet(env, jTts);
-  time_t const now = time(nullptr);
-
-  /// @todo We should check closed/open time for specific feature's timezone.
-  OpeningHours::InfoT ohInfo = MakeOpeningHours(tts).GetInfo(now);
-  jclass ohStateClass = jni::GetGlobalClassRef(env, "app/organicmaps/editor/OhState");
-  jclass ruleStateClass = jni::GetGlobalClassRef(env, "app/organicmaps/editor/OhState$State");
-
-  static const std::unordered_map<RuleState, const char*> ruleState = {
-      {RuleState::Open, "Open"},
-      {RuleState::Closed, "Closed"},
-      {RuleState::Unknown, "Unknown"}
-  };
-
-  jfieldID stateField = env->GetStaticFieldID(ruleStateClass, ruleState.at(ohInfo.state), "Lapp/organicmaps/editor/OhState$State;");
-  jobject stateObj = env->GetStaticObjectField(ruleStateClass, stateField);
-  jmethodID constructor = env->GetMethodID(ohStateClass, "<init>", "(Lapp/organicmaps/editor/OhState$State;JJ)V");
-  jobject javaOhState = env->NewObject(ohStateClass, constructor, stateObj, (jlong) ohInfo.nextTimeOpen, (jlong) ohInfo.nextTimeClosed);
-
-  return javaOhState;
-}
 } // extern "C"
--- a/android/app/src/main/cpp/app/organicmaps/editor/OsmOAuth.cpp
+++ b/android/app/src/main/cpp/app/organicmaps/editor/OsmOAuth.cpp
@@ -17,9 +17,17 @@ using namespace jni;

 bool LoadOsmUserPreferences(std::string const & oauthToken, UserPreferences & outPrefs)
 {
-  ServerApi06 const api(OsmOAuth::ServerAuth(oauthToken));
-  outPrefs = api.GetUserPreferences();
-  return (outPrefs.m_id != 0);
+  try
+  {
+    ServerApi06 const api(OsmOAuth::ServerAuth(oauthToken));
+    outPrefs = api.GetUserPreferences();
+    return true;
+  }
+  catch (std::exception const & ex)
+  {
+    LOG(LWARNING, ("Can't load user preferences from server: ", ex.what()));
+  }
+  return false;
 }
 }  // namespace

--- a/android/app/src/main/java/app/organicmaps/Framework.java
+++ b/android/app/src/main/java/app/organicmaps/Framework.java
@@ -13,6 +13,7 @@ import app.organicmaps.api.RequestType;
 import app.organicmaps.bookmarks.data.DistanceAndAzimut;
 import app.organicmaps.bookmarks.data.FeatureId;
 import app.organicmaps.bookmarks.data.MapObject;
+import app.organicmaps.products.ProductsConfig;
 import app.organicmaps.sdk.routing.JunctionInfo;
 import app.organicmaps.sdk.routing.RouteMarkData;
 import app.organicmaps.sdk.routing.RouteMarkType;
@@ -346,5 +347,15 @@ public class Framework
  public static native boolean nativeHasPlacePageInfo();

  public static native void nativeMemoryWarning();
+
+  public static native boolean nativeShouldShowProducts();
+
+  @Nullable
+  public static native ProductsConfig nativeGetProductsConfiguration();
+
+  public static native void nativeDidCloseProductsPopup(String reason);
+
+  public static native void nativeDidSelectProduct(String title, String link);
+
  public static native void nativeSaveRoute();
 }
--- a/android/app/src/main/java/app/organicmaps/MapFragment.java
+++ b/android/app/src/main/java/app/organicmaps/MapFragment.java
@@ -41,9 +41,9 @@ public class MapFragment extends BaseMwmFragment implements View.OnTouchListener
    mMap.updateMyPositionRoutingOffset(offsetY);
  }

-  public void destroySurface(boolean activityIsChangingConfigurations)
+  public void destroySurface()
  {
-    mMap.onSurfaceDestroyed(activityIsChangingConfigurations, isAdded());
+    mMap.onSurfaceDestroyed(requireActivity().isChangingConfigurations(), isAdded());
  }

  public boolean isContextCreated()
--- a/android/app/src/main/java/app/organicmaps/MwmActivity.java
+++ b/android/app/src/main/java/app/organicmaps/MwmActivity.java
@@ -44,7 +44,6 @@ import androidx.fragment.app.FragmentManager;
 import androidx.fragment.app.FragmentTransaction;
 import androidx.lifecycle.ViewModelProvider;
 import app.organicmaps.api.Const;
-import app.organicmaps.backup.PeriodicBackupRunner;
 import app.organicmaps.base.BaseMwmFragmentActivity;
 import app.organicmaps.base.OnBackPressListener;
 import app.organicmaps.bookmarks.BookmarkCategoriesActivity;
@@ -140,7 +139,6 @@ import static app.organicmaps.leftbutton.LeftButtonsHolder.BUTTON_HELP_CODE;
 import static app.organicmaps.leftbutton.LeftButtonsHolder.BUTTON_RECORD_TRACK_CODE;
 import static app.organicmaps.leftbutton.LeftButtonsHolder.BUTTON_SETTINGS_CODE;
 import static app.organicmaps.util.PowerManagment.POWER_MANAGEMENT_TAG;
-import static app.organicmaps.util.concurrency.UiThread.runLater;

 public class MwmActivity extends BaseMwmFragmentActivity
    implements PlacePageActivationListener,
@@ -255,8 +253,6 @@ public class MwmActivity extends BaseMwmFragmentActivity
  @NonNull
  private DisplayManager mDisplayManager;

-  private PeriodicBackupRunner backupRunner;
-
  ManageRouteBottomSheet mManageRouteBottomSheet;

  private boolean mRemoveDisplayListener = true;
@@ -611,8 +607,6 @@ public class MwmActivity extends BaseMwmFragmentActivity
     */
    if (Map.isEngineCreated())
      onRenderingInitializationFinished();
-
-    backupRunner = new PeriodicBackupRunner(this);
  }

  private void onSettingsResult(ActivityResult activityResult)
@@ -844,7 +838,7 @@ public class MwmActivity extends BaseMwmFragmentActivity
      @Override
      public String getPrefsName()
      {
-        return getString(R.string.about_help);
+        return getString(R.string.help);
      }

      @Override
@@ -1303,7 +1297,7 @@ public class MwmActivity extends BaseMwmFragmentActivity
  {
    // Explicitly destroy surface before activity recreation.
    if (mMapFragment != null)
-      mMapFragment.destroySurface(true);
+      mMapFragment.destroySurface();
    super.recreate();
  }

@@ -1358,11 +1352,6 @@ public class MwmActivity extends BaseMwmFragmentActivity
    final String backUrl = Framework.nativeGetParsedBackUrl();
    if (!TextUtils.isEmpty(backUrl))
      Utils.openUri(this, Uri.parse(backUrl), null);
-
-    if (backupRunner != null && !backupRunner.isAlreadyChecked() && backupRunner.isTimeToBackup())
-    {
-      backupRunner.doBackup();
-    }
  }

  @CallSuper
@@ -2595,28 +2584,20 @@ public class MwmActivity extends BaseMwmFragmentActivity
  {
    if (id.equals(MAIN_MENU_ID))
    {
-      final String activeLeftButton = buttonsHolder.getActiveButtonCode();
      ArrayList<MenuBottomSheetItem> items = new ArrayList<>();
-
-      if (!BUTTON_ADD_PLACE_CODE.equals(activeLeftButton))
-        items.add(new MenuBottomSheetItem(R.string.placepage_add_place_button, R.drawable.ic_plus, this::onAddPlaceOptionSelected));
-
-      items.add(new MenuBottomSheetItem(R.string.download_maps, R.drawable.ic_download, getDownloadMapsCounter(), this::onDownloadMapsOptionSelected));
-
-      if (!Config.getDonateUrl(getApplicationContext()).isEmpty())
+      items.add(new MenuBottomSheetItem(R.string.placepage_add_place_button, R.drawable.ic_plus, this::onAddPlaceOptionSelected));
+      items.add(new MenuBottomSheetItem(
+          R.string.download_maps,
+          R.drawable.ic_download,
+          getDownloadMapsCounter(),
+          this::onDownloadMapsOptionSelected
+      ));
+      mDonatesUrl = Config.getDonateUrl(getApplicationContext());
+      if (!TextUtils.isEmpty(mDonatesUrl))
        items.add(new MenuBottomSheetItem(R.string.donate, R.drawable.ic_donate, this::onDonateOptionSelected));
-
-      if (!BUTTON_SETTINGS_CODE.equals(activeLeftButton))
-        items.add(new MenuBottomSheetItem(R.string.settings, R.drawable.ic_settings, this::onSettingsOptionSelected));
-
-      if (!BUTTON_RECORD_TRACK_CODE.equals(activeLeftButton))
-        items.add(new MenuBottomSheetItem(R.string.start_track_recording, R.drawable.ic_track_recording_off, -1, this::onTrackRecordingOptionSelected));
-
+      items.add(new MenuBottomSheetItem(R.string.settings, R.drawable.ic_settings, this::onSettingsOptionSelected));
+      items.add(new MenuBottomSheetItem(R.string.start_track_recording, R.drawable.ic_track_recording_off, -1, this::onTrackRecordingOptionSelected));
      items.add(new MenuBottomSheetItem(R.string.share_my_location, R.drawable.ic_share, this::onShareLocationOptionSelected));
-
-      if (!BUTTON_HELP_CODE.equals(activeLeftButton))
-        items.add(new MenuBottomSheetItem(R.string.about_help, R.drawable.ic_question_mark, this::showHelp));
-
      return items;
    }
    return null;
--- a/android/app/src/main/java/app/organicmaps/SplashActivity.java
+++ b/android/app/src/main/java/app/organicmaps/SplashActivity.java
@@ -8,7 +8,6 @@ import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
 import android.util.Log;
-import android.view.View;

 import androidx.activity.result.ActivityResultLauncher;
 import androidx.activity.result.contract.ActivityResultContracts;
@@ -17,10 +16,6 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.annotation.StringRes;
 import androidx.appcompat.app.AppCompatActivity;
-import androidx.core.graphics.Insets;
-import androidx.core.view.OnApplyWindowInsetsListener;
-import androidx.core.view.ViewCompat;
-import androidx.core.view.WindowInsetsCompat;

 import app.organicmaps.display.DisplayManager;
 import app.organicmaps.downloader.DownloaderActivity;
@@ -74,17 +69,6 @@ public class SplashActivity extends AppCompatActivity

    UiThread.cancelDelayedTasks(mInitCoreDelayedTask);
    setContentView(R.layout.activity_splash);
-
-    ViewCompat.setOnApplyWindowInsetsListener(findViewById(R.id.root_view), new OnApplyWindowInsetsListener() {
-      @NonNull
-      @Override
-      public WindowInsetsCompat onApplyWindowInsets(@NonNull View v, @NonNull WindowInsetsCompat insets)
-      {
-        Insets systemBars = insets.getInsets(WindowInsetsCompat.Type.systemBars());
-        v.setPadding(0, 0, 0, systemBars.bottom);
-        return insets;
-      }
-    });
    mPermissionRequest = registerForActivityResult(new ActivityResultContracts.RequestMultiplePermissions(),
        result -> Config.setLocationRequested());
    mApiRequest = registerForActivityResult(new ActivityResultContracts.StartActivityForResult(), result -> {
--- a/android/app/src/main/java/app/organicmaps/backup/BackupUtils.java
+++ b/android/app/src/main/java/app/organicmaps/backup/BackupUtils.java
@@ -1,114 +0,0 @@
-package app.organicmaps.backup;
-
-import static app.organicmaps.settings.BackupSettingsFragment.MAX_BACKUPS_DEFAULT_COUNT;
-import static app.organicmaps.settings.BackupSettingsFragment.MAX_BACKUPS_KEY;
-import static app.organicmaps.util.StorageUtils.isFolderWritable;
-
-import android.app.Activity;
-import android.content.Context;
-import android.content.SharedPreferences;
-import android.net.Uri;
-import android.provider.DocumentsContract;
-import android.text.SpannableStringBuilder;
-import android.text.Spanned;
-import android.text.TextUtils;
-import android.text.style.AbsoluteSizeSpan;
-
-import androidx.annotation.NonNull;
-import androidx.documentfile.provider.DocumentFile;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.time.LocalDateTime;
-import java.time.format.DateTimeFormatter;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Locale;
-
-import app.organicmaps.R;
-import app.organicmaps.util.UiUtils;
-import app.organicmaps.util.log.Logger;
-
-public class BackupUtils
-{
-  private static final String BACKUP_PREFIX = "backup_";
-  private static final String BACKUP_EXTENSION = ".kmz";
-  private static final DateTimeFormatter DATE_FORMATTER = DateTimeFormatter.ofPattern("yyyy-MM-dd_HH-mm-ss").withLocale(Locale.US);
-  private static final String TAG = BackupUtils.class.getSimpleName();
-
-  public static CharSequence formatReadableFolderPath(Context context, @NonNull Uri uri)
-  {
-    String docId = DocumentsContract.getTreeDocumentId(uri);
-    String volumeId;
-    String subPath = "";
-
-    int colonIndex = docId.indexOf(':');
-    if (colonIndex >= 0)
-    {
-      volumeId = docId.substring(0, colonIndex);
-      subPath = docId.substring(colonIndex + 1);
-    }
-    else
-    {
-      volumeId = docId;
-    }
-
-    String volumeName;
-    if ("primary".equalsIgnoreCase(volumeId))
-      volumeName = context.getString(R.string.maps_storage_shared);
-    else
-      volumeName = context.getString(R.string.maps_storage_removable);
-
-    SpannableStringBuilder sb = new SpannableStringBuilder();
-    sb.append(volumeName + ": \n", new AbsoluteSizeSpan(UiUtils.dimen(context, R.dimen.text_size_body_3)), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
-    sb.append("/" + subPath, new AbsoluteSizeSpan(UiUtils.dimen(context, R.dimen.text_size_body_4)), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
-    return sb;
-  }
-
-  public static int getMaxBackups(SharedPreferences prefs)
-  {
-    String rawValue = prefs.getString(MAX_BACKUPS_KEY, String.valueOf(MAX_BACKUPS_DEFAULT_COUNT));
-    try
-    {
-      return Integer.parseInt(rawValue);
-    } catch (NumberFormatException e)
-    {
-      Logger.e(TAG, "Failed to parse max backups count, raw value: " + rawValue + " set to default: " + MAX_BACKUPS_DEFAULT_COUNT, e);
-      prefs.edit()
-          .putString(MAX_BACKUPS_KEY, String.valueOf(MAX_BACKUPS_DEFAULT_COUNT))
-          .apply();
-      return MAX_BACKUPS_DEFAULT_COUNT;
-    }
-  }
-
-  public static DocumentFile createUniqueBackupFolder(@NonNull DocumentFile parentDir, LocalDateTime backupTime)
-  {
-    String folderName = BACKUP_PREFIX + backupTime.format(DATE_FORMATTER);
-    return parentDir.createDirectory(folderName);
-  }
-
-  public static String getBackupName(LocalDateTime backupTime)
-  {
-    String formattedBackupTime = backupTime.format(DATE_FORMATTER);
-    return BACKUP_PREFIX + formattedBackupTime + BACKUP_EXTENSION;
-  }
-
-  public static DocumentFile[] getBackupFolders(DocumentFile parentDir)
-  {
-    List<DocumentFile> backupFolders = new ArrayList<>();
-    for (DocumentFile file : parentDir.listFiles())
-    {
-      if (file.isDirectory() && file.getName() != null && file.getName().startsWith(BACKUP_PREFIX))
-        backupFolders.add(file);
-    }
-    return backupFolders.toArray(new DocumentFile[0]);
-  }
-
-  public static boolean isBackupFolderAvailable(Context context, String storedFolderPath)
-  {
-    return !TextUtils.isEmpty(storedFolderPath) && isFolderWritable(context, storedFolderPath);
-  }
-}
--- a/android/app/src/main/java/app/organicmaps/backup/LocalBackupManager.java
+++ b/android/app/src/main/java/app/organicmaps/backup/LocalBackupManager.java
@@ -1,189 +0,0 @@
-package app.organicmaps.backup;
-
-import static app.organicmaps.backup.BackupUtils.getBackupName;
-import static app.organicmaps.backup.BackupUtils.getBackupFolders;
-import static app.organicmaps.util.StorageUtils.copyFileToDocumentFile;
-import static app.organicmaps.util.StorageUtils.deleteDirectoryRecursive;
-
-import android.app.Activity;
-import android.net.Uri;
-
-import androidx.annotation.NonNull;
-import androidx.documentfile.provider.DocumentFile;
-
-import java.io.File;
-import java.time.LocalDateTime;
-import java.util.Arrays;
-import java.util.Comparator;
-import java.util.List;
-
-import app.organicmaps.bookmarks.data.BookmarkCategory;
-import app.organicmaps.bookmarks.data.BookmarkManager;
-import app.organicmaps.bookmarks.data.BookmarkSharingResult;
-import app.organicmaps.bookmarks.data.KmlFileType;
-import app.organicmaps.util.concurrency.ThreadPool;
-import app.organicmaps.util.concurrency.UiThread;
-import app.organicmaps.util.log.Logger;
-
-public class LocalBackupManager implements BookmarkManager.BookmarksSharingListener
-{
-  public static final String TAG = LocalBackupManager.class.getSimpleName();
-
-  private final Activity activity;
-  private final String backupFolderPath;
-  private final int maxBackups;
-  private Listener listener;
-
-  public LocalBackupManager(@NonNull Activity activity, @NonNull String backupFolderPath, int maxBackups)
-  {
-    this.activity = activity;
-    this.backupFolderPath = backupFolderPath;
-    this.maxBackups = maxBackups;
-  }
-
-  public void doBackup()
-  {
-    BookmarkManager.INSTANCE.addSharingListener(this);
-
-    prepareBookmarkCategoriesForSharing();
-
-    if (listener != null)
-      listener.onBackupStarted();
-  }
-
-  public void setListener(@NonNull Listener listener)
-  {
-    this.listener = listener;
-  }
-
-  @Override
-  public void onPreparedFileForSharing(@NonNull BookmarkSharingResult result)
-  {
-    BookmarkManager.INSTANCE.removeSharingListener(this);
-
-    ThreadPool.getWorker().execute(() -> {
-      ErrorCode errorCode = null;
-      switch (result.getCode())
-      {
-      case BookmarkSharingResult.SUCCESS ->
-      {
-        if (!saveBackup(result))
-        {
-          Logger.e(TAG, "Failed to save backup. See system log above");
-          errorCode = ErrorCode.FILE_ERROR;
-        }
-        else
-        {
-          Logger.i(TAG, "Backup was created and saved successfully");
-        }
-      }
-      case BookmarkSharingResult.EMPTY_CATEGORY ->
-      {
-        errorCode = ErrorCode.EMPTY_CATEGORY;
-        Logger.e(TAG, "Failed to create backup. Category is empty");
-      }
-      case BookmarkSharingResult.ARCHIVE_ERROR ->
-      {
-        errorCode = ErrorCode.ARCHIVE_ERROR;
-        Logger.e(TAG, "Failed to create archive of bookmarks");
-      }
-      case BookmarkSharingResult.FILE_ERROR ->
-      {
-        errorCode = ErrorCode.FILE_ERROR;
-        Logger.e(TAG, "Failed create file for archive");
-      }
-      default ->
-      {
-        errorCode = ErrorCode.UNSUPPORTED;
-        Logger.e(TAG, "Failed to create backup. Unknown error");
-      }
-      }
-
-      ErrorCode finalErrorCode = errorCode;
-      UiThread.run(() -> {
-        if (listener != null)
-        {
-          if (finalErrorCode == null)
-            listener.onBackupFinished();
-          else
-            listener.onBackupFailed(finalErrorCode);
-        }
-      });
-    });
-  }
-
-  private boolean saveBackup(@NonNull BookmarkSharingResult result)
-  {
-    boolean isSuccess = false;
-    Uri folderUri = Uri.parse(backupFolderPath);
-    try
-    {
-      DocumentFile parentFolder = DocumentFile.fromTreeUri(activity, folderUri);
-      if (parentFolder != null && parentFolder.canWrite())
-      {
-        LocalDateTime now = LocalDateTime.now();
-        DocumentFile backupFolder = BackupUtils.createUniqueBackupFolder(parentFolder, now);
-        if (backupFolder != null)
-        {
-          String backupName = getBackupName(now);
-          DocumentFile backupFile = backupFolder.createFile(result.getMimeType(), backupName);
-          if (backupFile != null && copyFileToDocumentFile(activity, new File(result.getSharingPath()), backupFile))
-          {
-            Logger.i(TAG, "Backup saved to " + backupFile.getUri());
-            isSuccess = true;
-          }
-        }
-        else
-        {
-          Logger.e(TAG, "Failed to create backup folder");
-        }
-      }
-      cleanOldBackups(parentFolder);
-
-    } catch (Exception e)
-    {
-      Logger.e(TAG, "Failed to save backup", e);
-    }
-    return isSuccess;
-  }
-
-  public void cleanOldBackups(DocumentFile parentDir)
-  {
-    DocumentFile[] backupFolders = getBackupFolders(parentDir);
-    if (backupFolders.length > maxBackups)
-    {
-      Arrays.sort(backupFolders, Comparator.comparing(DocumentFile::getName));
-      for (int i = 0; i < backupFolders.length - maxBackups; i++)
-      {
-        Logger.i(TAG, "Delete old backup " + backupFolders[i].getUri());
-        deleteDirectoryRecursive(backupFolders[i]);
-      }
-    }
-  }
-
-  private void prepareBookmarkCategoriesForSharing()
-  {
-    List<BookmarkCategory> categories = BookmarkManager.INSTANCE.getCategories();
-    long[] categoryIds = new long[categories.size()];
-    for (int i = 0; i < categories.size(); i++)
-      categoryIds[i] = categories.get(i).getId();
-    BookmarkManager.INSTANCE.prepareCategoriesForSharing(categoryIds, KmlFileType.Text);
-  }
-
-  public interface Listener
-  {
-    void onBackupStarted();
-
-    void onBackupFinished();
-
-    void onBackupFailed(ErrorCode errorCode);
-  }
-
-  public enum ErrorCode
-  {
-    EMPTY_CATEGORY,
-    ARCHIVE_ERROR,
-    FILE_ERROR,
-    UNSUPPORTED,
-  }
-}
--- a/android/app/src/main/java/app/organicmaps/backup/PeriodicBackupRunner.java
+++ b/android/app/src/main/java/app/organicmaps/backup/PeriodicBackupRunner.java
@@ -1,104 +0,0 @@
-package app.organicmaps.backup;
-
-import static app.organicmaps.backup.BackupUtils.getMaxBackups;
-import static app.organicmaps.backup.BackupUtils.isBackupFolderAvailable;
-import static app.organicmaps.settings.BackupSettingsFragment.BACKUP_FOLDER_PATH_KEY;
-import static app.organicmaps.settings.BackupSettingsFragment.BACKUP_INTERVAL_KEY;
-import static app.organicmaps.settings.BackupSettingsFragment.LAST_BACKUP_TIME_KEY;
-import static app.organicmaps.util.StorageUtils.isFolderWritable;
-
-import android.app.Activity;
-import android.content.SharedPreferences;
-
-import androidx.preference.PreferenceManager;
-
-import app.organicmaps.util.log.Logger;
-
-public class PeriodicBackupRunner
-{
-  private final Activity activity;
-  private static final String TAG = PeriodicBackupRunner.class.getSimpleName();
-  private final SharedPreferences prefs;
-  private boolean alreadyChecked = false;
-
-  public PeriodicBackupRunner(Activity activity)
-  {
-    this.activity = activity;
-    this.prefs = PreferenceManager.getDefaultSharedPreferences(activity);
-  }
-
-  public boolean isAlreadyChecked()
-  {
-    return alreadyChecked;
-  }
-
-  public boolean isTimeToBackup()
-  {
-    long intervalMs = getBackupIntervalMs();
-
-    if (intervalMs <= 0)
-      return false;
-
-    long lastBackupTime = prefs.getLong(LAST_BACKUP_TIME_KEY, 0);
-    long now = System.currentTimeMillis();
-
-    alreadyChecked = true;
-
-    return (now - lastBackupTime) >= intervalMs;
-  }
-
-  public void doBackup()
-  {
-    String storedFolderPath = prefs.getString(BACKUP_FOLDER_PATH_KEY, null);
-
-    if (isBackupFolderAvailable(activity, storedFolderPath))
-    {
-      Logger.i(TAG, "Performing periodic backup");
-      performBackup(storedFolderPath, getMaxBackups(prefs));
-    }
-    else
-    {
-      Logger.w(TAG, "Backup folder is not writable, passed path: " + storedFolderPath);
-    }
-  }
-
-  private long getBackupIntervalMs()
-  {
-    String defaultValue = "0";
-    try
-    {
-      return Long.parseLong(prefs.getString(BACKUP_INTERVAL_KEY, defaultValue));
-    } catch (NumberFormatException e)
-    {
-      return 0;
-    }
-  }
-
-  private void performBackup(String backupFolderPath, int maxBackups)
-  {
-    LocalBackupManager backupManager = new LocalBackupManager(activity, backupFolderPath, maxBackups);
-    backupManager.setListener(new LocalBackupManager.Listener()
-    {
-      @Override
-      public void onBackupStarted()
-      {
-        Logger.i(TAG, "Periodic backup started");
-      }
-
-      @Override
-      public void onBackupFinished()
-      {
-        prefs.edit().putLong(LAST_BACKUP_TIME_KEY, System.currentTimeMillis()).apply();
-        Logger.i(TAG, "Periodic backup finished");
-      }
-
-      @Override
-      public void onBackupFailed(LocalBackupManager.ErrorCode errorCode)
-      {
-        Logger.e(TAG, "Periodic backup was failed with code: " + errorCode);
-      }
-    });
-
-    backupManager.doBackup();
-  }
-}
--- a/android/app/src/main/java/app/organicmaps/bookmarks/BookmarkCategorySettingsFragment.java
+++ b/android/app/src/main/java/app/organicmaps/bookmarks/BookmarkCategorySettingsFragment.java
@@ -11,6 +11,7 @@ import android.view.MenuInflater;
 import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.TextView;

 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
@@ -171,7 +172,7 @@ public class BookmarkCategorySettingsFragment extends BaseMwmToolbarFragment
    return !TextUtils.equals(mCategory.getDescription(), categoryDesc);
  }

-  private void clearAndFocus(TextInputEditText textView)
+  private void clearAndFocus(TextView textView)
  {
    textView.getEditableText().clear();
    textView.requestFocus();
--- a/android/app/src/main/java/app/organicmaps/bookmarks/BookmarkListAdapter.java
+++ b/android/app/src/main/java/app/organicmaps/bookmarks/BookmarkListAdapter.java
@@ -4,13 +4,12 @@ import android.content.res.Resources;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.TextView;

 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.recyclerview.widget.RecyclerView;

-import com.google.android.material.textview.MaterialTextView;
-
 import app.organicmaps.R;
 import app.organicmaps.bookmarks.data.BookmarkCategory;
 import app.organicmaps.bookmarks.data.BookmarkInfo;
@@ -440,14 +439,14 @@ public class BookmarkListAdapter extends RecyclerView.Adapter<Holders.BaseBookma
        holder = bookmarkHolder;
        break;
      case TYPE_SECTION:
-        MaterialTextView tv = (MaterialTextView) inflater.inflate(R.layout.item_category_title, parent, false);
+        TextView tv = (TextView) inflater.inflate(R.layout.item_category_title, parent, false);
        holder = new Holders.SectionViewHolder(tv);
        break;
      case TYPE_DESC:
        View desc = inflater.inflate(R.layout.item_category_description, parent, false);
-        MaterialTextView moreBtn = desc.findViewById(R.id.more_btn);
-        MaterialTextView text = desc.findViewById(R.id.text);
-        MaterialTextView title = desc.findViewById(R.id.title);
+        TextView moreBtn = desc.findViewById(R.id.more_btn);
+        TextView text = desc.findViewById(R.id.text);
+        TextView title = desc.findViewById(R.id.title);
        setMoreButtonVisibility(text, moreBtn);
        holder = new Holders.DescriptionViewHolder(desc, mSectionsDataSource.getCategory());
        text.setOnClickListener(v -> onMoreButtonClicked(text, moreBtn));
@@ -538,12 +537,12 @@ public class BookmarkListAdapter extends RecyclerView.Adapter<Holders.BaseBookma
    }
  }

-  private void setMoreButtonVisibility(MaterialTextView text, MaterialTextView moreBtn)
+  private void setMoreButtonVisibility(TextView text, TextView moreBtn)
  {
    text.post(() -> setShortModeDescription(text, moreBtn));
  }

-  private void onMoreButtonClicked(MaterialTextView textView, MaterialTextView moreBtn)
+  private void onMoreButtonClicked(TextView textView, TextView moreBtn)
  {
    if (isShortModeDescription(textView))
    {
@@ -555,18 +554,18 @@ public class BookmarkListAdapter extends RecyclerView.Adapter<Holders.BaseBookma
    }
  }

-  private boolean isShortModeDescription(MaterialTextView text)
+  private boolean isShortModeDescription(TextView text)
  {
    return text.getMaxLines() == MAX_VISIBLE_LINES;
  }

-  private void setExpandedModeDescription(MaterialTextView textView, MaterialTextView moreBtn)
+  private void setExpandedModeDescription(TextView textView, TextView moreBtn)
  {
    textView.setMaxLines(Integer.MAX_VALUE);
    moreBtn.setVisibility(View.GONE);
  }

-  private void setShortModeDescription(MaterialTextView textView, MaterialTextView moreBtn)
+  private void setShortModeDescription(TextView textView, TextView moreBtn)
  {
    textView.setMaxLines(MAX_VISIBLE_LINES);

--- a/android/app/src/main/java/app/organicmaps/bookmarks/BookmarksListFragment.java
+++ b/android/app/src/main/java/app/organicmaps/bookmarks/BookmarksListFragment.java
@@ -11,6 +11,7 @@ import android.view.MenuInflater;
 import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.ImageView;

 import androidx.activity.result.ActivityResultLauncher;
 import androidx.activity.result.contract.ActivityResultContracts;
@@ -52,7 +53,6 @@ import app.organicmaps.widget.placepage.BookmarkColorDialogFragment;
 import app.organicmaps.widget.placepage.EditBookmarkFragment;
 import app.organicmaps.widget.recycler.DividerItemDecorationWithPadding;
 import com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton;
-import com.google.android.material.imageview.ShapeableImageView;

 import java.util.ArrayList;
 import java.util.List;
@@ -599,7 +599,7 @@ public class BookmarksListFragment extends BaseMwmRecyclerFragment<ConcatAdapter
    i.putExtra(MwmActivity.EXTRA_BOOKMARK_ID, bookmark.getBookmarkId());
  }

-  private void showColorDialog(ShapeableImageView v, int position)
+  private void showColorDialog(ImageView v, int position)
  {
    BookmarkListAdapter adapter = getBookmarkListAdapter();

--- a/android/app/src/main/java/app/organicmaps/bookmarks/ChooseBookmarkCategoryAdapter.java
+++ b/android/app/src/main/java/app/organicmaps/bookmarks/ChooseBookmarkCategoryAdapter.java
@@ -4,13 +4,12 @@ import android.content.Context;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.RadioButton;
+import android.widget.TextView;

 import androidx.annotation.NonNull;
 import androidx.recyclerview.widget.RecyclerView;

-import com.google.android.material.radiobutton.MaterialRadioButton;
-import com.google.android.material.textview.MaterialTextView;
-
 import app.organicmaps.R;
 import app.organicmaps.bookmarks.data.BookmarkCategory;

@@ -102,8 +101,8 @@ public class ChooseBookmarkCategoryAdapter extends BaseBookmarkCategoryAdapter<C

  static class SingleChoiceHolder extends RecyclerView.ViewHolder
  {
-    MaterialTextView name;
-    MaterialRadioButton checked;
+    TextView name;
+    RadioButton checked;

    public SingleChoiceHolder(View convertView)
    {
--- a/android/app/src/main/java/app/organicmaps/bookmarks/Holders.java
+++ b/android/app/src/main/java/app/organicmaps/bookmarks/Holders.java
@@ -6,16 +6,15 @@ import android.location.Location;
 import android.text.Spanned;
 import android.text.TextUtils;
 import android.view.View;
+import android.widget.CheckBox;
+import android.widget.ImageView;
+import android.widget.TextView;

 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.annotation.PluralsRes;
 import androidx.recyclerview.widget.RecyclerView;

-import com.google.android.material.imageview.ShapeableImageView;
-import com.google.android.material.textview.MaterialTextView;
-import com.google.android.material.checkbox.MaterialCheckBox;
-
 import app.organicmaps.R;
 import app.organicmaps.adapter.OnItemClickListener;
 import app.organicmaps.bookmarks.data.BookmarkCategory;
@@ -35,9 +34,9 @@ public class Holders
  public static class GeneralViewHolder extends RecyclerView.ViewHolder
  {
    @NonNull
-    private final MaterialTextView mText;
+    private final TextView mText;
    @NonNull
-    private final ShapeableImageView mImage;
+    private final ImageView mImage;

    GeneralViewHolder(@NonNull View itemView)
    {
@@ -47,13 +46,13 @@ public class Holders
    }

    @NonNull
-    public MaterialTextView getText()
+    public TextView getText()
    {
      return mText;
    }

    @NonNull
-    public ShapeableImageView getImage()
+    public ImageView getImage()
    {
      return mImage;
    }
@@ -62,9 +61,9 @@ public class Holders
  public static class HeaderViewHolder extends RecyclerView.ViewHolder
  {
    @NonNull
-    private final MaterialTextView mButton;
+    private final TextView mButton;
    @NonNull
-    private final MaterialTextView mText;
+    private final TextView mText;


    HeaderViewHolder(@NonNull View itemView)
@@ -75,13 +74,13 @@ public class Holders
    }

    @NonNull
-    public MaterialTextView getText()
+    public TextView getText()
    {
      return mText;
    }

    @NonNull
-    public MaterialTextView getButton()
+    public TextView getButton()
    {
      return mButton;
    }
@@ -169,7 +168,7 @@ public class Holders
    protected BookmarkCategory mEntity;

    @NonNull
-    protected final MaterialTextView mSize;
+    protected final TextView mSize;

    public CategoryViewHolderBase(@NonNull View root)
    {
@@ -230,9 +229,9 @@ public class Holders
    @NonNull
    private final View mView;
    @NonNull
-    private final MaterialTextView mName;
+    private final TextView mName;
    @NonNull
-    private final MaterialCheckBox mVisibilityMarker;
+    private final CheckBox mVisibilityMarker;

    CollectionViewHolder(@NonNull View root)
    {
@@ -269,11 +268,11 @@ public class Holders
  static class CategoryViewHolder extends CategoryViewHolderBase
  {
    @NonNull
-    private final MaterialTextView mName;
+    private final TextView mName;
    @NonNull
-    MaterialCheckBox mVisibilityMarker;
+    CheckBox mVisibilityMarker;
    @NonNull
-    ShapeableImageView mMoreButton;
+    ImageView mMoreButton;

    CategoryViewHolder(@NonNull View root)
    {
@@ -339,11 +338,11 @@ public class Holders
  static class BookmarkViewHolder extends BaseBookmarkHolder
  {
    @NonNull
-    private final ShapeableImageView mIcon;
+    private final ImageView mIcon;
    @NonNull
-    private final MaterialTextView mName;
+    private final TextView mName;
    @NonNull
-    private final MaterialTextView mDistance;
+    private final TextView mDistance;

    BookmarkViewHolder(@NonNull View itemView)
    {
@@ -385,12 +384,12 @@ public class Holders
  static class TrackViewHolder extends BaseBookmarkHolder
  {
    @NonNull
-    private final ShapeableImageView mIcon;
+    private final ImageView mIcon;
    @NonNull
-    private final MaterialTextView mName;
+    private final TextView mName;
    @NonNull
-    private final MaterialTextView mDistance;
-    private final ShapeableImageView mMoreButton;
+    private final TextView mDistance;
+    private final ImageView mMoreButton;

    TrackViewHolder(@NonNull View itemView)
    {
@@ -425,16 +424,16 @@ public class Holders

    public void setTrackIconClickListener(IconClickListener listener)
    {
-      mIcon.setOnClickListener(v -> listener.onItemClick((ShapeableImageView) v, getBindingAdapterPosition()));
+      mIcon.setOnClickListener(v -> listener.onItemClick((ImageView) v, getBindingAdapterPosition()));
    }
  }

  public static class SectionViewHolder extends BaseBookmarkHolder
  {
    @NonNull
-    private final MaterialTextView mView;
+    private final TextView mView;

-    SectionViewHolder(@NonNull MaterialTextView itemView)
+    SectionViewHolder(@NonNull TextView itemView)
    {
      super(itemView);
      mView = itemView;
@@ -453,9 +452,9 @@ public class Holders
    static final float SPACING_MULTIPLE = 1.0f;
    static final float SPACING_ADD = 0.0f;
    @NonNull
-    private final MaterialTextView mTitle;
+    private final TextView mTitle;
    @NonNull
-    private final MaterialTextView mDescText;
+    private final TextView mDescText;

    DescriptionViewHolder(@NonNull View itemView, @NonNull BookmarkCategory category)
    {
--- a/android/app/src/main/java/app/organicmaps/bookmarks/IconsAdapter.java
+++ b/android/app/src/main/java/app/organicmaps/bookmarks/IconsAdapter.java
@@ -6,8 +6,7 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ArrayAdapter;
-
-import com.google.android.material.imageview.ShapeableImageView;
+import android.widget.ImageView;

 import app.organicmaps.R;
 import app.organicmaps.bookmarks.data.Icon;
@@ -62,7 +61,7 @@ public class IconsAdapter extends ArrayAdapter<Icon>

  private static class SpinnerViewHolder
  {
-    final ShapeableImageView icon;
+    final ImageView icon;

    SpinnerViewHolder(View convertView)
    {
--- a/android/app/src/main/java/app/organicmaps/bookmarks/data/IconClickListener.java
+++ b/android/app/src/main/java/app/organicmaps/bookmarks/data/IconClickListener.java
@@ -1,8 +1,8 @@
 package app.organicmaps.bookmarks.data;

-import com.google.android.material.imageview.ShapeableImageView;
+import android.widget.ImageView;

 public interface IconClickListener
 {
-  void onItemClick(ShapeableImageView v, int position);
+  void onItemClick(ImageView v, int position);
 }
--- a/android/app/src/main/java/app/organicmaps/bookmarks/data/Metadata.java
+++ b/android/app/src/main/java/app/organicmaps/bookmarks/data/Metadata.java
@@ -69,8 +69,7 @@ public class Metadata implements Parcelable
    FMD_OUTDOOR_SEATING(48),
    FMD_NETWORK(49),
    FMD_CONTACT_FEDIVERSE(50),
-    FMD_CONTACT_BLUESKY(51),
-    FMD_PANORAMAX(52);
+    FMD_CONTACT_BLUESKY(51);
    private final int mMetaType;

    MetadataType(int metadataType)
--- a/android/app/src/main/java/app/organicmaps/car/screens/settings/HelpScreen.java
+++ b/android/app/src/main/java/app/organicmaps/car/screens/settings/HelpScreen.java
@@ -41,7 +41,7 @@ public class HelpScreen extends BaseMapScreen
  {
    final Header.Builder builder = new Header.Builder();
    builder.setStartHeaderAction(Action.BACK);
-    builder.setTitle(getCarContext().getString(R.string.about_help));
+    builder.setTitle(getCarContext().getString(R.string.help));
    return builder.build();
  }

--- a/android/app/src/main/java/app/organicmaps/car/screens/settings/SettingsScreen.java
+++ b/android/app/src/main/java/app/organicmaps/car/screens/settings/SettingsScreen.java
@@ -109,7 +109,7 @@ public class SettingsScreen extends BaseMapScreen
  private Item createHelpItem()
  {
    final Row.Builder builder = new Row.Builder();
-    builder.setTitle(getCarContext().getString(R.string.about_help));
+    builder.setTitle(getCarContext().getString(R.string.help));
    builder.setOnClickListener(() -> getScreenManager().push(new HelpScreen(getCarContext(), getSurfaceRenderer())));
    builder.setBrowsable(true);
    return builder.build();
--- a/android/app/src/main/java/app/organicmaps/downloader/BottomPanel.java
+++ b/android/app/src/main/java/app/organicmaps/downloader/BottomPanel.java
@@ -1,8 +1,8 @@
 package app.organicmaps.downloader;

 import android.view.View;
+import android.widget.Button;

-import com.google.android.material.button.MaterialButton;
 import com.google.android.material.floatingactionbutton.FloatingActionButton;
 import app.organicmaps.R;
 import app.organicmaps.util.StringUtils;
@@ -14,7 +14,7 @@ class BottomPanel
 {
  private final DownloaderFragment mFragment;
  private final FloatingActionButton mFab;
-  private final MaterialButton mButton;
+  private final Button mButton;

  private final View.OnClickListener mDownloadListener = new View.OnClickListener()
  {
@@ -45,15 +45,6 @@ class BottomPanel
    }
  };

-  private final View.OnClickListener mRetryListener = new View.OnClickListener()
-  {
-    @Override
-    public void onClick(View v)
-    {
-      MapManager.warn3gAndRetry(mFragment.requireActivity(), mFragment.getCurrentRoot(), null);
-    }
-  };
-
  BottomPanel(DownloaderFragment fragment, View frame)
  {
    mFragment = fragment;
@@ -81,12 +72,6 @@ class BottomPanel
    mButton.setOnClickListener(mDownloadListener);
  }

-  private void setRetryFailedStates()
-  {
-    mButton.setText(R.string.downloader_retry);
-    mButton.setOnClickListener(mRetryListener);
-  }
-
  private void setCancelState()
  {
    mButton.setText(R.string.downloader_cancel_all);
@@ -116,7 +101,7 @@ class BottomPanel
          }  // Special case for "Countries" node when no maps currently downloaded.
          case STATUS_DOWNLOADABLE, STATUS_DONE, STATUS_PARTLY -> show = false;
          case STATUS_PROGRESS, STATUS_APPLYING, STATUS_ENQUEUED -> setCancelState();
-          case STATUS_FAILED -> setRetryFailedStates();
+          case STATUS_FAILED -> setDownloadAllState();
          default -> throw new IllegalArgumentException("Inappropriate status for \"" + root + "\": " + status);
        }
      }
@@ -134,7 +119,6 @@ class BottomPanel
            }
            case STATUS_DONE -> show = false;
            case STATUS_PROGRESS, STATUS_APPLYING, STATUS_ENQUEUED -> setCancelState();
-            case STATUS_FAILED -> setRetryFailedStates();
            default -> setDownloadAllState();
          }
        }
--- a/android/app/src/main/java/app/organicmaps/downloader/ChunkTask.java
+++ b/android/app/src/main/java/app/organicmaps/downloader/ChunkTask.java
@@ -209,7 +209,7 @@ class ChunkTask extends AsyncTask<Void, byte[], Integer>
        // @TODO Else display received web page to user - router is redirecting us to some page
      }

-      return downloadFromStream(new BufferedInputStream(urlConnection.getInputStream(), 128 * Constants.KB));
+      return downloadFromStream(new BufferedInputStream(urlConnection.getInputStream(), 65536));
    } catch (final MalformedURLException ex)
    {
      Logger.e(TAG, "Invalid url: " + mUrl, ex);
@@ -229,7 +229,7 @@ class ChunkTask extends AsyncTask<Void, byte[], Integer>
  {
    // Because of timeouts in InputStream.read (for bad connection),
    // try to introduce dynamic buffer size to read in one query.
-    final int[] arrSize = {128, 32, 1};
+    final int[] arrSize = {64, 32, 1};
    int ret = IO_EXCEPTION;

    for (int size : arrSize)
@@ -240,7 +240,7 @@ class ChunkTask extends AsyncTask<Void, byte[], Integer>
        break;
      } catch (final IOException ex)
      {
-        Logger.e(TAG, "IOException in downloadFromStream for buffer size: " + size, ex);
+        Logger.e(TAG, "IOException in downloadFromStream for chunk size: " + size, ex);
      }
    }

--- a/android/app/src/main/java/app/organicmaps/downloader/CountrySuggestFragment.java
+++ b/android/app/src/main/java/app/organicmaps/downloader/CountrySuggestFragment.java
@@ -6,14 +6,13 @@ import android.text.TextUtils;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.Button;
 import android.widget.LinearLayout;
+import android.widget.TextView;

 import androidx.annotation.Nullable;
 import androidx.fragment.app.FragmentActivity;

-import com.google.android.material.button.MaterialButton;
-import com.google.android.material.textview.MaterialTextView;
-
 import app.organicmaps.R;
 import app.organicmaps.base.BaseMwmFragment;
 import app.organicmaps.base.BaseMwmFragmentActivity;
@@ -31,10 +30,10 @@ public class CountrySuggestFragment extends BaseMwmFragment implements View.OnCl
  private LinearLayout mLlSelectDownload;
  private LinearLayout mLlActiveDownload;
  private WheelProgressView mWpvDownloadProgress;
-  private MaterialTextView mTvCountry;
-  private MaterialTextView mTvActiveCountry;
-  private MaterialTextView mTvProgress;
-  private MaterialButton mBtnDownloadMap;
+  private TextView mTvCountry;
+  private TextView mTvActiveCountry;
+  private TextView mTvProgress;
+  private Button mBtnDownloadMap;

  private CountryItem mCurrentCountry;
  private CountryItem mDownloadingCountry;
@@ -151,7 +150,7 @@ public class CountrySuggestFragment extends BaseMwmFragment implements View.OnCl
    mLlNoLocation = view.findViewById(R.id.ll__location_unknown);
    mBtnDownloadMap = view.findViewById(R.id.btn__download_map);
    mBtnDownloadMap.setOnClickListener(this);
-    MaterialButton selectMap = view.findViewById(R.id.btn__select_map);
+    Button selectMap = view.findViewById(R.id.btn__select_map);
    selectMap.setOnClickListener(this);
    mWpvDownloadProgress = view.findViewById(R.id.wpv__download_progress);
    mWpvDownloadProgress.setOnClickListener(this);
--- a/android/app/src/main/java/app/organicmaps/downloader/DownloaderAdapter.java
+++ b/android/app/src/main/java/app/organicmaps/downloader/DownloaderAdapter.java
@@ -11,6 +11,7 @@ import android.text.style.StyleSpan;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.TextView;

 import androidx.annotation.LayoutRes;
 import androidx.annotation.NonNull;
@@ -27,7 +28,6 @@ import app.organicmaps.util.UiUtils;
 import app.organicmaps.util.bottomsheet.MenuBottomSheetFragment;
 import app.organicmaps.util.bottomsheet.MenuBottomSheetItem;
 import com.google.android.material.dialog.MaterialAlertDialogBuilder;
-import com.google.android.material.textview.MaterialTextView;

 import java.util.ArrayList;
 import java.util.Collection;
@@ -362,10 +362,10 @@ class DownloaderAdapter extends RecyclerView.Adapter<DownloaderAdapter.ViewHolde
  private class ItemViewHolder extends BaseInnerViewHolder<CountryItem>
  {
    private final DownloaderStatusIcon mStatusIcon;
-    private final MaterialTextView mName;
-    private final MaterialTextView mSubtitle;
-    private final MaterialTextView mFoundName;
-    private final MaterialTextView mSize;
+    private final TextView mName;
+    private final TextView mSubtitle;
+    private final TextView mFoundName;
+    private final TextView mSize;

    private void processClick(boolean clickOnStatus)
    {
@@ -510,7 +510,7 @@ class DownloaderAdapter extends RecyclerView.Adapter<DownloaderAdapter.ViewHolde
  static class HeaderViewHolder extends BaseInnerViewHolder<String>
  {
    @NonNull
-    private final MaterialTextView mTitle;
+    private final TextView mTitle;

    HeaderViewHolder(@NonNull View frame)
    {
--- a/android/app/src/main/java/app/organicmaps/downloader/DownloaderNotifier.java
+++ b/android/app/src/main/java/app/organicmaps/downloader/DownloaderNotifier.java
@@ -124,7 +124,7 @@ public class DownloaderNotifier
    return new NotificationCompat.Builder(mContext, CHANNEL_ID)
            .setAutoCancel(true)
            .setVisibility(NotificationCompat.VISIBILITY_PUBLIC)
-            .setSmallIcon(R.drawable.ic_launcher_small)
+            .setSmallIcon(R.drawable.ic_launcher)
            .setColor(ContextCompat.getColor(mContext, R.color.notification))
            .setShowWhen(true)
            .setContentTitle(title)
--- a/android/app/src/main/java/app/organicmaps/downloader/DownloaderStatusIcon.java
+++ b/android/app/src/main/java/app/organicmaps/downloader/DownloaderStatusIcon.java
@@ -2,12 +2,11 @@ package app.organicmaps.downloader;

 import android.util.SparseIntArray;
 import android.view.View;
+import android.widget.ImageView;

 import androidx.annotation.AttrRes;
 import androidx.annotation.DrawableRes;

-import com.google.android.material.imageview.ShapeableImageView;
-
 import app.organicmaps.R;
 import app.organicmaps.widget.WheelProgressView;
 import app.organicmaps.util.ThemeUtils;
@@ -16,7 +15,7 @@ import app.organicmaps.util.UiUtils;
 public class DownloaderStatusIcon
 {
  private final View mFrame;
-  protected final ShapeableImageView mIcon;
+  protected final ImageView mIcon;
  private final WheelProgressView mProgress;

  private static final SparseIntArray sIconsCache = new SparseIntArray();
--- a/android/app/src/main/java/app/organicmaps/downloader/OnmapDownloader.java
+++ b/android/app/src/main/java/app/organicmaps/downloader/OnmapDownloader.java
@@ -4,13 +4,11 @@ import android.location.Location;
 import android.text.TextUtils;
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.Button;
+import android.widget.TextView;

 import androidx.annotation.Nullable;
 import androidx.core.view.ViewCompat;
-
-import com.google.android.material.button.MaterialButton;
-import com.google.android.material.textview.MaterialTextView;
-
 import app.organicmaps.MwmActivity;
 import app.organicmaps.R;
 import app.organicmaps.location.LocationHelper;
@@ -30,11 +28,11 @@ public class OnmapDownloader implements MwmActivity.LeftAnimationTrackListener

  private final MwmActivity mActivity;
  private final View mFrame;
-  private final MaterialTextView mParent;
-  private final MaterialTextView mTitle;
-  private final MaterialTextView mSize;
+  private final TextView mParent;
+  private final TextView mTitle;
+  private final TextView mSize;
  private final WheelProgressView mProgress;
-  private final MaterialButton mButton;
+  private final Button mButton;

  private int mStorageSubscriptionSlot;

--- a/android/app/src/main/java/app/organicmaps/editor/AdvancedTimetableFragment.java
+++ b/android/app/src/main/java/app/organicmaps/editor/AdvancedTimetableFragment.java
@@ -7,6 +7,8 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.webkit.WebView;
+import android.widget.ImageView;
+import android.widget.TextView;

 import androidx.annotation.DrawableRes;
 import androidx.annotation.NonNull;
@@ -18,10 +20,7 @@ import app.organicmaps.util.Constants;
 import app.organicmaps.util.Graphics;
 import app.organicmaps.util.InputUtils;
 import app.organicmaps.util.UiUtils;
-
-import com.google.android.material.imageview.ShapeableImageView;
 import com.google.android.material.textfield.TextInputEditText;
-import com.google.android.material.textview.MaterialTextView;

 public class AdvancedTimetableFragment extends BaseMwmFragment
                                       implements View.OnClickListener, TimetableProvider
@@ -29,8 +28,8 @@ public class AdvancedTimetableFragment extends BaseMwmFragment
  private boolean mIsExampleShown;
  private TextInputEditText mInput;
  private WebView mExample;
-  private MaterialTextView mExamplesTitle;
-  private static ShapeableImageView mSaveButton;
+  private TextView mExamplesTitle;
+  private static ImageView mSaveButton;
  @Nullable
  private String mInitTimetables;
  @Nullable
--- a/android/app/src/main/java/app/organicmaps/editor/CuisineAdapter.java
+++ b/android/app/src/main/java/app/organicmaps/editor/CuisineAdapter.java
@@ -3,14 +3,13 @@ package app.organicmaps.editor;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.CheckBox;
 import android.widget.CompoundButton;
+import android.widget.TextView;

 import androidx.annotation.NonNull;
 import androidx.recyclerview.widget.RecyclerView;

-import com.google.android.material.checkbox.MaterialCheckBox;
-import com.google.android.material.textview.MaterialTextView;
-
 import app.organicmaps.R;

 import java.util.ArrayList;
@@ -101,8 +100,8 @@ public class CuisineAdapter extends RecyclerView.Adapter<CuisineAdapter.ViewHold

  protected class ViewHolder extends RecyclerView.ViewHolder implements CompoundButton.OnCheckedChangeListener
  {
-    final MaterialTextView cuisine;
-    final MaterialCheckBox selected;
+    final TextView cuisine;
+    final CheckBox selected;

    public ViewHolder(View itemView)
    {
--- a/android/app/src/main/java/app/organicmaps/editor/EditorFragment.java
+++ b/android/app/src/main/java/app/organicmaps/editor/EditorFragment.java
@@ -8,6 +8,8 @@ import android.text.method.LinkMovementMethod;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.ImageView;
+import android.widget.TextView;

 import androidx.annotation.CallSuper;
 import androidx.annotation.DrawableRes;
@@ -20,11 +22,8 @@ import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;

 import com.google.android.material.dialog.MaterialAlertDialogBuilder;
-import com.google.android.material.imageview.ShapeableImageView;
 import com.google.android.material.textfield.TextInputLayout;
 import com.google.android.material.textfield.TextInputEditText;
-import com.google.android.material.textview.MaterialTextView;
-
 import app.organicmaps.Framework;
 import app.organicmaps.R;
 import app.organicmaps.base.BaseMwmFragment;
@@ -47,7 +46,7 @@ public class EditorFragment extends BaseMwmFragment implements View.OnClickListe
 {
  final static String LAST_INDEX_OF_NAMES_ARRAY = "LastIndexOfNamesArray";

-  private MaterialTextView mCategory;
+  private TextView mCategory;
  private View mCardName;
  private View mCardAddress;
  private View mCardDetails;
@@ -90,20 +89,20 @@ public class EditorFragment extends BaseMwmFragment implements View.OnClickListe
  };

  private MultilanguageAdapter mNamesAdapter;
-  private MaterialTextView mNamesCaption;
-  private MaterialTextView mAddLanguage;
-  private MaterialTextView mMoreLanguages;
+  private TextView mNamesCaption;
+  private TextView mAddLanguage;
+  private TextView mMoreLanguages;

-  private MaterialTextView mStreet;
+  private TextView mStreet;
  private TextInputEditText mHouseNumber;
  private TextInputEditText mBuildingLevels;

  // Define Metadata entries, that have more tricky logic, separately.
-  private MaterialTextView mPhone;
-  private MaterialTextView mEditPhoneLink;
-  private MaterialTextView mCuisine;
+  private TextView mPhone;
+  private TextView mEditPhoneLink;
+  private TextView mCuisine;
  private SwitchCompat mWifi;
-  private MaterialTextView mSelfService;
+  private TextView mSelfService;
  private SwitchCompat mOutdoorSeating;

  // Default Metadata entries.
@@ -133,12 +132,12 @@ public class EditorFragment extends BaseMwmFragment implements View.OnClickListe
  private TextInputLayout mInputBuildingLevels;

  private View mEmptyOpeningHours;
-  private MaterialTextView mOpeningHours;
+  private TextView mOpeningHours;
  private View mEditOpeningHours;
  private TextInputEditText mDescription;
  private final Map<Metadata.MetadataType, View> mDetailsBlocks = new HashMap<>();
  private final Map<Metadata.MetadataType, View> mSocialMediaBlocks = new HashMap<>();
-  private MaterialTextView mReset;
+  private TextView mReset;

  private EditorHostFragment mParent;

@@ -490,7 +489,7 @@ public class EditorFragment extends BaseMwmFragment implements View.OnClickListe
    mOpeningHours.setOnClickListener(this);
    final View cardMore = view.findViewById(R.id.cv__more);
    mDescription = findInput(cardMore);
-    MaterialTextView osmInfo = view.findViewById(R.id.osm_info);
+    TextView osmInfo = view.findViewById(R.id.osm_info);
    osmInfo.setMovementMethod(LinkMovementMethod.getInstance());
    mReset = view.findViewById(R.id.reset);
    mReset.setOnClickListener(this);
@@ -530,7 +529,7 @@ public class EditorFragment extends BaseMwmFragment implements View.OnClickListe

  private static TextInputEditText findInputAndInitBlock(View blockWithInput, @DrawableRes int icon, String hint)
  {
-    ((ShapeableImageView) blockWithInput.findViewById(R.id.icon)).setImageResource(icon);
+    ((ImageView) blockWithInput.findViewById(R.id.icon)).setImageResource(icon);
    final TextInputLayout input = blockWithInput.findViewById(R.id.custom_input);
    input.setHint(hint);
    return input.findViewById(R.id.input);
--- a/android/app/src/main/java/app/organicmaps/editor/FeatureCategoryAdapter.java
+++ b/android/app/src/main/java/app/organicmaps/editor/FeatureCategoryAdapter.java
@@ -4,13 +4,12 @@ import android.text.method.LinkMovementMethod;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.TextView;

 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.recyclerview.widget.RecyclerView;

-import com.google.android.material.textview.MaterialTextView;
-
 import app.organicmaps.R;
 import app.organicmaps.editor.data.FeatureCategory;
 import app.organicmaps.util.UiUtils;
@@ -79,7 +78,7 @@ public class FeatureCategoryAdapter extends RecyclerView.Adapter<RecyclerView.Vi
  protected class FeatureViewHolder extends RecyclerView.ViewHolder
  {
    @NonNull
-    private final MaterialTextView mName;
+    private final TextView mName;
    @NonNull
    private final View mSelected;

@@ -107,7 +106,7 @@ public class FeatureCategoryAdapter extends RecyclerView.Adapter<RecyclerView.Vi
    FooterViewHolder(@NonNull View itemView)
    {
      super(itemView);
-      MaterialTextView categoryUnsuitableText = itemView.findViewById(R.id.editor_category_unsuitable_text);
+      TextView categoryUnsuitableText = itemView.findViewById(R.id.editor_category_unsuitable_text);
      categoryUnsuitableText.setMovementMethod(LinkMovementMethod.getInstance());
    }
  }
--- a/android/app/src/main/java/app/organicmaps/editor/HoursMinutesPickerFragment.java
+++ b/android/app/src/main/java/app/organicmaps/editor/HoursMinutesPickerFragment.java
@@ -9,6 +9,7 @@ import android.text.format.DateFormat;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.widget.Button;
+import android.widget.TextView;
 import android.widget.TimePicker;

 import androidx.annotation.IntRange;
@@ -20,8 +21,6 @@ import androidx.fragment.app.FragmentManager;

 import com.google.android.material.dialog.MaterialAlertDialogBuilder;
 import com.google.android.material.tabs.TabLayout;
-import com.google.android.material.textview.MaterialTextView;
-
 import app.organicmaps.R;
 import app.organicmaps.base.BaseMwmDialogFragment;
 import app.organicmaps.editor.data.HoursMinutes;
@@ -135,19 +134,19 @@ public class HoursMinutesPickerFragment extends BaseMwmDialogFragment
    if (id != 0)
    {
      mPickerHoursLabel = mPicker.findViewById(id);
-      if (!(mPickerHoursLabel instanceof MaterialTextView))
+      if (!(mPickerHoursLabel instanceof TextView))
        mPickerHoursLabel = null;
    }

    mTabs = root.findViewById(R.id.tabs);
-    MaterialTextView tabView = (MaterialTextView) inflater.inflate(R.layout.tab_timepicker, mTabs, false);
+    TextView tabView = (TextView) inflater.inflate(R.layout.tab_timepicker, mTabs, false);
    tabView.setText(getResources().getString(R.string.editor_time_from));
    final ColorStateList textColor = AppCompatResources.getColorStateList(requireContext(),
        ThemeUtils.isNightTheme(requireContext()) ? R.color.accent_color_selector_night
                                                  : R.color.accent_color_selector);
    tabView.setTextColor(textColor);
    mTabs.addTab(mTabs.newTab().setCustomView(tabView), true);
-    tabView = (MaterialTextView) inflater.inflate(R.layout.tab_timepicker, mTabs, false);
+    tabView = (TextView) inflater.inflate(R.layout.tab_timepicker, mTabs, false);
    tabView.setText(getResources().getString(R.string.editor_time_to));
    tabView.setTextColor(textColor);
    mTabs.addTab(mTabs.newTab().setCustomView(tabView), true);
--- a/android/app/src/main/java/app/organicmaps/editor/LanguagesAdapter.java
+++ b/android/app/src/main/java/app/organicmaps/editor/LanguagesAdapter.java
@@ -3,12 +3,11 @@ package app.organicmaps.editor;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.TextView;

 import androidx.annotation.NonNull;
 import androidx.recyclerview.widget.RecyclerView;

-import com.google.android.material.textview.MaterialTextView;
-
 import app.organicmaps.R;
 import app.organicmaps.editor.data.Language;

@@ -43,12 +42,12 @@ public class LanguagesAdapter extends RecyclerView.Adapter<LanguagesAdapter.Hold

  protected class Holder extends RecyclerView.ViewHolder
  {
-    MaterialTextView name;
+    TextView name;

    public Holder(View itemView)
    {
      super(itemView);
-      name = (MaterialTextView) itemView;
+      name = (TextView) itemView;
      itemView.setOnClickListener(v -> mFragment.onLanguageSelected(mLanguages[getBindingAdapterPosition()]));
    }

--- a/android/app/src/main/java/app/organicmaps/editor/OhState.java
+++ b/android/app/src/main/java/app/organicmaps/editor/OhState.java
@@ -1,30 +0,0 @@
-package app.organicmaps.editor;
-
-import androidx.annotation.Keep;
-
-// Used by JNI.
-@Keep
-public class OhState
-{
-    public enum State
-    {
-        Open,
-        Closed,
-        Unknown
-    }
-
-    public State state;
-    /** Unix timestamp in seconds**/
-    public long nextTimeOpen;
-    /** Unix timestamp in seconds **/
-    public long nextTimeClosed;
-
-    // Used by JNI.
-    @Keep
-    public OhState(State state, long nextTimeOpen, long nextTimeClosed)
-    {
-        this.state = state;
-        this.nextTimeOpen = nextTimeOpen;
-        this.nextTimeClosed = nextTimeClosed;
-    }
-}
--- a/android/app/src/main/java/app/organicmaps/editor/OpeningHours.java
+++ b/android/app/src/main/java/app/organicmaps/editor/OpeningHours.java
@@ -60,6 +60,4 @@ public final class OpeningHours
   * @return true if timetable string is valid OSM timetable.
   */
  public static native boolean nativeIsTimetableStringValid(String source);
-
-  public static native OhState nativeCurrentState(@NonNull Timetable[] timetables);
 }
--- a/android/app/src/main/java/app/organicmaps/editor/PhoneListAdapter.java
+++ b/android/app/src/main/java/app/organicmaps/editor/PhoneListAdapter.java
@@ -4,11 +4,11 @@ import android.text.TextUtils;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.ImageView;

 import androidx.annotation.NonNull;
 import androidx.recyclerview.widget.RecyclerView;

-import com.google.android.material.imageview.ShapeableImageView;
 import com.google.android.material.textfield.TextInputLayout;
 import com.google.android.material.textfield.TextInputEditText;
 import app.organicmaps.R;
@@ -94,7 +94,7 @@ public class PhoneListAdapter extends RecyclerView.Adapter<PhoneListAdapter.View
  {
    private int mPosition = -1;
    private final TextInputEditText mInput;
-    private final ShapeableImageView deleteButton;
+    private final ImageView deleteButton;

    public ViewHolder(@NonNull View itemView)
    {
@@ -116,7 +116,7 @@ public class PhoneListAdapter extends RecyclerView.Adapter<PhoneListAdapter.View
      deleteButton.setOnClickListener(this);
      // TODO: setting icons from code because icons defined in layout XML are white.
      deleteButton.setImageResource(R.drawable.ic_delete);
-      ((ShapeableImageView) itemView.findViewById(R.id.phone_icon)).setImageResource(R.drawable.ic_phone);
+      ((ImageView) itemView.findViewById(R.id.phone_icon)).setImageResource(R.drawable.ic_phone);
    }

    public void setPosition(int position)
--- a/android/app/src/main/java/app/organicmaps/editor/SelfServiceAdapter.java
+++ b/android/app/src/main/java/app/organicmaps/editor/SelfServiceAdapter.java
@@ -4,13 +4,12 @@ import android.content.Context;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.CompoundButton;
+import android.widget.TextView;

 import androidx.annotation.NonNull;
 import androidx.recyclerview.widget.RecyclerView;

-import com.google.android.material.radiobutton.MaterialRadioButton;
-import com.google.android.material.textview.MaterialTextView;
-
 import app.organicmaps.R;
 import app.organicmaps.util.Utils;

@@ -52,8 +51,8 @@ public class SelfServiceAdapter extends RecyclerView.Adapter<SelfServiceAdapter.

  protected class ViewHolder extends RecyclerView.ViewHolder implements View.OnClickListener
  {
-    final MaterialTextView selfServiceDef;
-    final MaterialRadioButton selected;
+    final TextView selfServiceDef;
+    final CompoundButton selected;

    public ViewHolder(View itemView)
    {
--- a/android/app/src/main/java/app/organicmaps/editor/SimpleTimetableAdapter.java
+++ b/android/app/src/main/java/app/organicmaps/editor/SimpleTimetableAdapter.java
@@ -4,8 +4,11 @@ import android.util.SparseArray;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.Button;
+import android.widget.CheckBox;
 import android.widget.CompoundButton;
 import android.widget.LinearLayout;
+import android.widget.TextView;

 import androidx.annotation.IdRes;
 import androidx.annotation.IntRange;
@@ -14,10 +17,6 @@ import androidx.appcompat.widget.SwitchCompat;
 import androidx.fragment.app.Fragment;
 import androidx.recyclerview.widget.RecyclerView;

-import com.google.android.material.button.MaterialButton;
-import com.google.android.material.checkbox.MaterialCheckBox;
-import com.google.android.material.textview.MaterialTextView;
-
 import app.organicmaps.R;
 import app.organicmaps.editor.data.HoursMinutes;
 import app.organicmaps.editor.data.TimeFormatUtils;
@@ -186,15 +185,15 @@ class SimpleTimetableAdapter extends RecyclerView.Adapter<SimpleTimetableAdapter
    // Limit closed spans to avoid dynamic inflation of views in recycler's children. Yeah, its a hack.
    static final int MAX_CLOSED_SPANS = 10;

-    SparseArray<MaterialCheckBox> days = new SparseArray<>(7);
+    SparseArray<CheckBox> days = new SparseArray<>(7);
    View allday;
    SwitchCompat swAllday;
    View schedule;
    View openClose;
    View open;
    View close;
-    MaterialTextView tvOpen;
-    MaterialTextView tvClose;
+    TextView tvOpen;
+    TextView tvClose;
    View[] closedHours = new View[MAX_CLOSED_SPANS];
    View addClosed;
    View deleteTimetable;
@@ -317,7 +316,7 @@ class SimpleTimetableAdapter extends RecyclerView.Adapter<SimpleTimetableAdapter
        else
        {
          UiUtils.show(closedHours[i]);
-          ((MaterialTextView) closedHours[i].findViewById(R.id.tv__closed)).setText(timespan.toString());
+          ((TextView) closedHours[i].findViewById(R.id.tv__closed)).setText(timespan.toString());
        }

        i++;
@@ -334,18 +333,18 @@ class SimpleTimetableAdapter extends RecyclerView.Adapter<SimpleTimetableAdapter
    private void addDay(@IntRange(from = 1, to = 7) final int dayIndex, @IdRes int id)
    {
      final View day = itemView.findViewById(id);
-      final MaterialCheckBox checkBox = day.findViewById(R.id.chb__day);
+      final CheckBox checkBox = day.findViewById(R.id.chb__day);
      // Save index of the day to get it back when checkbox will be toggled.
      checkBox.setTag(dayIndex);
      days.put(dayIndex, checkBox);
      day.setOnClickListener(v -> checkBox.toggle());

-      ((MaterialTextView) day.findViewById(R.id.tv__day)).setText(TimeFormatUtils.formatShortWeekday(dayIndex));
+      ((TextView) day.findViewById(R.id.tv__day)).setText(TimeFormatUtils.formatShortWeekday(dayIndex));
    }

    private void switchWorkingDay(@IntRange(from = 1, to = 7) int dayIndex)
    {
-      final MaterialCheckBox checkBox = days.get(dayIndex);
+      final CheckBox checkBox = days.get(dayIndex);
      if (checkBox.isChecked())
        addWorkingDay(dayIndex, getBindingAdapterPosition());
      else
@@ -362,7 +361,7 @@ class SimpleTimetableAdapter extends RecyclerView.Adapter<SimpleTimetableAdapter

  private class AddTimetableViewHolder extends BaseTimetableViewHolder
  {
-    private final MaterialButton mAdd;
+    private final Button mAdd;

    AddTimetableViewHolder(View itemView)
    {
--- a/Show More
+++ b/Show More
				`@@ -1 +0,0 @@`
				`Navegación doada - Descubre máis sobre o teu camiño - Creada pola comunidade`
				`@@ -1 +0,0 @@`
				`CoMaps - Aplicación de mapas privada, sen conexión`
				`@@ -1 +0,0 @@`
				`Eenvoudige kaartnavigatie - Ontdek meer van je reis - Gemaakt door de community`
				`@@ -1 +0,0 @@`
				`Mapa nabigazio erraza - Ezagutu gehiago zure bidaiaz - Komunitatean egina`
				`@@ -1 +0,0 @@`
				`Navegação fácil nos mapas - Descubra mais sobre o seu percurso - Feito por todos`