Merge branch 'master' into track_appearance_fixes

# Conflicts:
#	OsmAnd/src/net/osmand/plus/track/TrackColoringCard.java

.github/ISSUE_TEMPLATE/1-support-request.md

@@ -0,0 +1,16 @@
+---
+name: "❓ Support request"
+about: Questions and requests for support
+---
+
+🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑
+
+Please do not file questions or support requests on the GitHub issues tracker.
+
+In case you aren't sure whether to open an issue or not, please send your request to support@osmand.net.
+
+You can get your questions answered using the [Google group](https://groups.google.com/forum/#!forum/osmand) or chat in real-time via our Telegram instances: [English](https://t.me/OsmAndMaps), [German](https://t.me/deosmand), [French](https://t.me/frosmand), [Ukrainian](https://t.me/uaosmand), [Italian](https://t.me/itosmand), [Russian](https://t.me/ruosmand).
+
+Thank you!
+
+🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑

.github/ISSUE_TEMPLATE/2-faq-report.md

@@ -0,0 +1,12 @@
+---
+name: "📚 Outdated FAQ"
+about: Report an issue in FAQ
+
+---
+🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑
+
+Please do not file FAQ issues on the GitHub issues tracker.
+
+Instead use the [Google group](https://groups.google.com/forum/#!forum/osmand) to fix wrong or outdated FAQ.
+
+🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑

.github/ISSUE_TEMPLATE/3-bug-report.md

@@ -0,0 +1,69 @@
+---
+name: "\U0001F41E Bug report"
+about: Report a bug in OsmAnd
+---
+<!--🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅
+
+Oh hi there! 😄
+
+To expedite issue processing please search open and closed issues before submitting a new one.
+Existing issues often contain information about workarounds, resolution, or progress updates.
+
+GitHub is our main development tool for our developers. There are hundreds of requests a month and there are relatively few developers.
+So by opening an issue, please know that your issue will be sent out to all developers and acknowledge that it could be closed without explanation or with just a brief message.
+Comments on the closed issues are also sent to all developers, so you will definitely will be heard.
+However, there is no guarantee that a developer will pick up the issue to work on it.
+
+Please be sure to read our [FAQ](https://osmand.net/help-online) before creating an issue here.
+
+The best way to get help about an OsmAnd issue is to create a valid and detailed issue.
+Please give us the following information so that we can try to **reproduce** your issue:
+
+🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅-->
+
+# 🐞 bug report
+
+### Is this a regression?
+
+<!-- Did this behavior use to work in the previous version? -->
+<!-- ✍️--> Yes, the previous version in which this bug was not present was: ....
+
+
+### Description
+
+<!-- ✍️--> A clear and concise description of the problem...
+
+
+## 🔬 Minimal Reproduction
+<!--
+If the bug is reproducible, please describe steps below:
+-->
+<!-- ✍️--> 1. Open app, and click on ...
+
+## 🔥 Exception or Error
+<pre><code>
+<!-- If the issue is accompanied by an exception or an error, please share it below: -->
+<!-- ✍️-->
+
+</code></pre>
+
+
+## 🌍  Your Environment
+
+**OsmAnd Version:**
+<pre><code>
+<!-- paste version below -->
+<!-- ✍️-->
+
+</code></pre>
+
+**Device and Android/iOS version:**
+
+**Maps used (online or offline):**
+<!-- Please tick the correct box [x] (or both) -->
+- [ ] Offline maps offered within the OsmAnd app for download. 
+  <!-- If you have an issue related to offline maps, tell us the exact name of the map file where the issue occurs and its edition date. -->
+- [ ] Online (tile / raster) maps <!-- Please name it -->
+
+
+**Anything else relevant?**

.github/ISSUE_TEMPLATE/4-routing-report.md

@@ -0,0 +1,66 @@
+---
+name: "\U0001F6A9 Routing report"
+about: Report a routing issue in OsmAnd
+---
+<!--🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅
+
+Oh hi there! 😄
+
+To expedite issue processing please search open and closed issues before submitting a new one.
+Existing issues often contain information about workarounds, resolution, or progress updates.
+
+GitHub is our main development tool for our developers. There are hundreds of requests a month and there are relatively few developers.
+So by opening an issue, please know that your issue will be sent out to all developers and acknowledge that it could be closed without explanation or with just a brief message.
+Comments on the closed issues are also sent to all developers, so you will definitely will be heard.
+However, there is no guarantee that a developer will pick up the issue to work on it.
+
+Please be sure to read our [FAQ](https://osmand.net/help-online) before creating an issue here.
+
+The best way to get help about an OsmAnd issue is to create a valid and detailed issue.
+Please give us the following information so that we can try to **reproduce** your issue:
+
+🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅-->
+
+# 🐞 routing report
+
+### Routing engine
+
+<!-- Which routing provider was used? (please tick the proper box [x]) -->
+- [ ] OsmAnd's in-app offline routing
+- [ ] Any online routing provider (YOURS, OpenRouteService, OSRM, etc.)
+
+### Routing Profile
+<!-- What routing profile is chosen in the OsmAnd app? (car, bike, pedestrian, fastest or shortest, etc.) -->
+
+### Start and end points
+
+<!-- Please specify (as exactly as possible) the start and endpoint of your route by telling us the city and street name so that we can find it via the in-app address search easily.
+Also, a permalink from [openstreetmap.org](https://www.openstreetmap.org/) can be helpful. -->
+
+### Actual and expected routes
+<!-- Tell us your expected routing and how OsmAnd routes, or add screenshots here. -->
+
+### Is this a regression?
+
+<!-- Did this behavior use to work in the previous version? -->
+<!-- ✍️--> Yes, the previous version in which this bug was not present was: ....
+
+## 🌍  Your Environment
+
+**OsmAnd Version:**
+<pre><code>
+<!-- paste version below -->
+<!-- ✍️-->
+
+</code></pre>
+
+**Device and Android/iOS version:**
+
+**Maps used (online or offline):**
+<!-- Please tick the correct box [x] (or both) -->
+- [ ] Offline maps offered within the OsmAnd app for download. 
+  <!-- If you have an issue related to offline maps, tell us the exact name of the map file where the issue occurs and its edition date. -->
+- [ ] Online (tile / raster) maps <!-- Please name it -->
+
+
+**Anything else relevant?**

.github/ISSUE_TEMPLATE/5-feature-request.md

@@ -0,0 +1,33 @@
+---
+name: "\U0001F680 Feature request"
+about: Suggest a feature for OsmAnd
+
+---
+<!--🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅
+
+Oh hi there! 😄 
+
+To expedite issue processing please search open and closed issues before submitting a new one.
+Existing issues often contain information about workarounds, resolution, or progress updates.
+
+GitHub is our main development tool for our developers. There are hundreds of requests a month and there are relatively few developers.
+So by opening an issue, please know that your issue will be sent out to all developers and acknowledge that it could be closed without explanation or with just a brief message.
+Comments on the closed issues are also sent to all developers, so you will definitely will be heard.
+However, there is no guarantee that a developer will pick up the issue to work on it.
+
+Please be sure to read our [FAQ](https://osmand.net/help-online) before creating an issue here.
+
+🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅-->
+
+# 🚀 feature request
+
+### Description
+<!-- ✍️--> A clear and concise description of the problem or missing capability...
+
+
+### Describe the solution you'd like
+<!-- ✍️--> If you have a solution in mind, please describe it.
+
+
+### Describe alternatives you've considered
+<!-- ✍️--> Have you considered any alternative solutions or workarounds?

ISSUE_TEMPLATE.md

@@ -1,32 +0,0 @@
-Before entering an issue, please read the information below.
-
-```GitHub is our main development tool for our developers. There are hundreds of requests a month and there are relatively few developers.
-So by opening an issue, please know that your issue will be sent out to all developers and acknowledge that it could be closed without explanation or with just a brief message.
-Comments on the closed issues are also sent to all developers, so you will definitely will be heard.
-However, there is no guarantee that a developer will pick up the issue to work on it.```
-
-In case you aren't sure whether to open an issue or not, please send your request to support@osmand.net.
-For **general questions** about OsmAnd, please use the [Google group](https://groups.google.com/forum/#!forum/osmand).
-
-Please be sure to read our [FAQ](https://osmand.net/help-online) before creating an issue here.
-(Also, tell us in Google Groups when the FAQ is wrong or outdated.)
-
-The best way to get help about an OsmAnd issue is to create a valid and detailed issue.
-Please give us the following information so that we can try to **reproduce** your issue:
-
-What version of OsmAnd are you using, and on what device and Android/iOS version?
-
-Do you use the offline maps offered within the OsmAnd app for download, or the online (tile / raster) maps?
-
-If you have an issue related to offline maps, tell us the exact name of the map file where the issue occurs and its edition date.
-
-__*In case of wrong routing:*__
-
-Tell us whether you have used OsmAnd's in-app offline routing or any online routing provider like YOURS, OpenRouteService, OSRM, etc.
-
-What routing profile is chosen in the OsmAnd app? (car, bike, pedestrian, fastest or shortest, etc.)
-
-Please specify (as exact as possible) the start and end point of your route by telling us the city and street name so that we can find it via the in-app address search easily.
-Also, a permalink from [openstreetmap.org](https://www.openstreetmap.org/) can be helpful.
-
-Tell us your expected routing and how OsmAnd routes, or add screenshots here.

OsmAnd-api/src/net/osmand/aidlapi/IOsmAndAidlInterface.aidl

@@ -74,6 +74,7 @@ import net.osmand.aidlapi.customization.OsmandSettingsParams;
 import net.osmand.aidlapi.customization.OsmandSettingsInfoParams;
 import net.osmand.aidlapi.customization.CustomizationInfoParams;
 import net.osmand.aidlapi.customization.ProfileSettingsParams;
+import net.osmand.aidlapi.customization.MapMarginsParams;
 
 import net.osmand.aidlapi.gpx.AGpxFile;
 import net.osmand.aidlapi.gpx.AGpxFileDetails;
@@ -864,4 +865,6 @@ interface IOsmAndAidlInterface {
     long registerForKeyEvents(in AKeyEventsParams params, IOsmAndAidlCallback callback);
 
     AppInfoParams getAppInfo();
+
+    boolean setMapMargins(in MapMarginsParams params);
 }

OsmAnd-api/src/net/osmand/aidlapi/customization/MapMarginsParams.aidl

@@ -0,0 +1,3 @@
+package net.osmand.aidlapi.customization;
+
+parcelable MapMarginsParams;

OsmAnd-api/src/net/osmand/aidlapi/customization/MapMarginsParams.java

@@ -0,0 +1,77 @@
+package net.osmand.aidlapi.customization;
+
+import android.os.Bundle;
+import android.os.Parcel;
+
+import net.osmand.aidlapi.AidlParams;
+
+public class MapMarginsParams extends AidlParams {
+
+	private String appModeKey;
+	private int leftMargin;
+	private int topMargin;
+	private int rightMargin;
+	private int bottomMargin;
+
+	public MapMarginsParams(String appModeKey, int leftMargin, int topMargin, int rightMargin, int bottomMargin) {
+		this.appModeKey = appModeKey;
+		this.leftMargin = leftMargin;
+		this.topMargin = topMargin;
+		this.rightMargin = rightMargin;
+		this.bottomMargin = bottomMargin;
+	}
+
+	public MapMarginsParams(Parcel in) {
+		readFromParcel(in);
+	}
+
+	public static final Creator<MapMarginsParams> CREATOR = new Creator<MapMarginsParams>() {
+		@Override
+		public MapMarginsParams createFromParcel(Parcel in) {
+			return new MapMarginsParams(in);
+		}
+
+		@Override
+		public MapMarginsParams[] newArray(int size) {
+			return new MapMarginsParams[size];
+		}
+	};
+
+	public String getAppModeKey() {
+		return appModeKey;
+	}
+
+	public int getLeftMargin() {
+		return leftMargin;
+	}
+
+	public int getTopMargin() {
+		return topMargin;
+	}
+
+	public int getRightMargin() {
+		return rightMargin;
+	}
+
+	public int getBottomMargin() {
+		return bottomMargin;
+	}
+
+	@Override
+	public void writeToBundle(Bundle bundle) {
+		bundle.putString("appModeKey", appModeKey);
+		bundle.putInt("leftMargin", leftMargin);
+		bundle.putInt("topMargin", topMargin);
+		bundle.putInt("rightMargin", rightMargin);
+		bundle.putInt("bottomMargin", bottomMargin);
+	}
+
+	@Override
+	protected void readFromBundle(Bundle bundle) {
+		appModeKey = bundle.getString("appModeKey");
+		leftMargin = bundle.getInt("leftMargin");
+		topMargin = bundle.getInt("topMargin");
+		rightMargin = bundle.getInt("rightMargin");
+		bottomMargin = bundle.getInt("bottomMargin");
+	}
+}

OsmAnd-java/src/main/java/net/osmand/router/RouteExporter.java

@@ -1,7 +1,5 @@
 package net.osmand.router;
 
-import net.osmand.GPXUtilities;
-import net.osmand.GPXUtilities.GPXExtensionsWriter;
 import net.osmand.GPXUtilities.GPXFile;
 import net.osmand.GPXUtilities.RouteSegment;
 import net.osmand.GPXUtilities.RouteType;
@@ -12,12 +10,8 @@ import net.osmand.Location;
 import net.osmand.binary.BinaryMapRouteReaderAdapter.RouteTypeRule;
 import net.osmand.binary.RouteDataBundle;
 import net.osmand.binary.StringBundle;
-import net.osmand.binary.StringBundleWriter;
-import net.osmand.binary.StringBundleXmlWriter;
 import net.osmand.util.Algorithms;
 
-import org.xmlpull.v1.XmlSerializer;
-
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;

OsmAnd-java/src/main/java/net/osmand/router/RoutePlannerFrontEnd.java

@@ -404,7 +404,7 @@ public class RoutePlannerFrontEnd {
 		cleanupResultAndAddTurns(gctx);
 	}
 
-	public RouteSegmentResult generateStraightLineSegment(float averageSpeed, List<LatLon> points) {
+	public static RouteSegmentResult generateStraightLineSegment(float averageSpeed, List<LatLon> points) {
 		RouteRegion reg = new RouteRegion();
 		reg.initRouteEncodingRule(0, "highway", RouteResultPreparation.UNMATCHED_HIGHWAY_TYPE);
 		RouteDataObject rdo = new RouteDataObject(reg);

OsmAnd-telegram/res/values-be/strings.xml

@@ -64,7 +64,7 @@
     <string name="disconnect_from_telegram">Як выключыць назіральнік OsmAnd праз Telegram</string>
     <string name="logout_help_desc">Як выключыць назіральнік OsmAnd праз Тэлеграм</string>
     <string name="connected_account">Падлучаны акаўнт</string>
-    <string name="shared_string_account">Рахунак</string>
+    <string name="shared_string_account">Акаўнт</string>
     <string name="in_time">у %1$s</string>
     <string name="osmand_connect_desc">Абраць версію OsmAnd, якую OsmAnd Tracker будзе выкарыстоўваць для адлюстравання пазіцыі.</string>
     <string name="osmand_connect">Злучэнне з OsmAnd</string>

OsmAnd-telegram/res/values-es-rUS/strings.xml

@@ -206,7 +206,7 @@
     <string name="shared_string_appearance">Aspecto</string>
     <string name="show_gps_points">Mostrar puntos GPS</string>
     <string name="show_gps_points_descr">Muestra la cantidad de puntos GPS recibidos y enviados.</string>
-    <string name="shared_string_ok">Aplicar</string>
+    <string name="shared_string_ok">Aceptar</string>
     <string name="timeline_available_for_free_now">La línea de tiempo es una función disponible ahora de forma gratuita.</string>
     <string name="disable_monitoring">Desactivar la monitorización</string>
     <string name="location_recording_enabled">Grabación de ubicación activada</string>

OsmAnd-telegram/res/values-hu/strings.xml

@@ -267,4 +267,5 @@
     <string name="last_update_from_telegram_duration">Utolsó frissítés a Telegramtól: %1$s</string>
     <string name="last_response_duration">Utolsó válasz: %1$s</string>
     <string name="duration_ago">Ennyivel ezelőtt: %1$s</string>
+    <string name="shared_string_error_short">HIBA</string>
 </resources>

OsmAnd-telegram/res/values-ru/strings.xml

@@ -2,7 +2,7 @@
 <resources>
     <string name="timeline_available_for_free_now">Хронология теперь доступна бесплатно.</string>
     <string name="location_recording_enabled">Запись местоположений включена</string>
-    <string name="privacy_policy_use_telegram">Telegram (менеджер сообщений) используется для связи и общения с людьми.</string>
+    <string name="privacy_policy_use_telegram">Telegram (мессенджер) используется для связи и общения с людьми.</string>
     <string name="privacy_policy_telegram_client">OsmAnd Tracker является одним из клиентов, использующих открытую платформу Telegram. Ваши контакты могут использовать любой другой клиент Telegram.</string>
     <string name="privacy_policy_agree">Нажимая \"Продолжить\", вы соглашаетесь с условиями политики конфиденциальности Telegram и OsmAnd.</string>
     <string name="timeline_description">Включите мониторинг, чтобы сохранять все местоположения в истории.</string>
@@ -106,7 +106,7 @@
     <string name="last_updated_location">Последнее обновление локации:</string>
     <string name="successfully_sent_and_updated">Успешно отправлено и обновлено</string>
     <string name="not_possible_to_send_to_telegram_chats">Невозможно отправить Telegram чаты:</string>
-    <string name="waiting_for_response_from_telegram">Ожидание ответа от Telegram</string>
+    <string name="waiting_for_response_from_telegram">Ожидание ответа Telegram</string>
     <string name="searching_for_gps">Поиск GPS…</string>
     <string name="connecting_to_the_internet">Подключение к Интернету</string>
     <string name="background_work_description">Измените настройки оптимизации батареи, чтобы обеспечить стабильную отправку местоположения.</string>
@@ -166,8 +166,8 @@
     <string name="shared_string_collected">Собрано</string>
     <string name="gps_points">Точки GPS</string>
     <string name="shared_string_sent">Отправлено</string>
-    <string name="monitoring_is_enabled">Мониторинг включен</string>
+    <string name="monitoring_is_enabled">Мониторинг включён</string>
-    <string name="monitoring_is_disabled">Мониторинг отключен</string>
+    <string name="monitoring_is_disabled">Мониторинг отключён</string>
     <string name="time_on_the_move">Время в движении</string>
     <string name="average_altitude">Средняя высота</string>
     <string name="average_speed">Средняя скорость</string>
@@ -211,7 +211,7 @@
     <string name="timeline">Хронология</string>
     <string name="search_contacts">Искать контакты</string>
     <string name="search_contacts_descr">Поиск среди всех ваших групп и контактов.</string>
-    <string name="type_contact_or_group_name">Введите контакт или название группы</string>
+    <string name="type_contact_or_group_name">Имя контакта или название группы</string>
     <string name="shared_string_search">Поиск</string>
     <string name="direction">Направление</string>
     <string name="precision">Точность</string>
@@ -220,8 +220,8 @@
     <string name="proxy_server">Сервер</string>
     <string name="shared_string_connection">Соединение</string>
     <string name="proxy_type">Тип прокси</string>
-    <string name="proxy_connected">Соединено</string>
+    <string name="proxy_connected">Подключено</string>
-    <string name="proxy_disconnected">Разъединено</string>
+    <string name="proxy_disconnected">Отключено</string>
     <string name="proxy_settings">Настройки прокси</string>
     <string name="proxy">Прокси</string>
     <string name="gpx_settings">Настройки GPX</string>
@@ -233,7 +233,7 @@
     <string name="mile">миля</string>
     <string name="mile_per_hour">миль/ч</string>
     <string name="altitude">Высота</string>
-    <string name="bearing">Ориентация</string>
+    <string name="bearing">Пеленг</string>
     <string name="proxy_key">Ключ</string>
     <string name="proxy_password">Пароль</string>
     <string name="proxy_username">Имя пользователя</string>

OsmAnd/AndroidManifest.xml

@@ -408,7 +408,6 @@
 			</intent-filter>
 		</receiver>
 
-		<activity android:name=".activities.ServerActivity" android:label="@string/shared_string_settings" android:configChanges="keyboardHidden|orientation" />
 		<activity android:name="net.osmand.plus.activities.SettingsActivity" android:label="@string/shared_string_settings" android:configChanges="keyboardHidden|orientation" />
 		<activity android:name="net.osmand.plus.activities.SettingsGeneralActivity" android:configChanges="keyboardHidden|orientation" />
 		<activity android:name="net.osmand.plus.activities.SettingsNavigationActivity" android:configChanges="keyboardHidden|orientation" />

OsmAnd/assets/server/css/admin.css

@@ -1,110 +0,0 @@
-body {
-  margin:0;
-  padding:20px;
-  max-width: 1250px;
-}
-
-table {
-  border-collapse: collapse;
-}
-
-.send-private-giveaway, .register-giveaway, .access-server-logs, .update-btc-report {
-	margin: 20px 0px;
-	border: 1px solid #e6e6e6;
-	width: 50%;
-
-}
-.wrapper {
-   list-style-type: none;
-   padding: 0;
-   border-radius: 3px;
-   
-}
-.form-row {
-  display: flex;
-  justify-content: flex-start;
-  align-items: flex-start;
-  padding: 5px;
-  text-align: left;
-}
-
-.form-row > label {
-  flex: 1;
-}
-.form-row > input {
-   flex: 1;
-   width: auto;
-}
-.form-row > button {
-   flex: 1;
-}
-
-th, td {
-  text-align: left;
-  padding: 8px;
-}
-
-tr:nth-child(even){background-color: #f2f2f2}
-tr:hover {background-color: #d5d5d5;}
-
-th {
-  background-color: #4CAF50;
-  color: white;
-}
-.loader,
-.loader:before,
-.loader:after {
-  border-radius: 50%;
-  width: 2.5em;
-  height: 2.5em;
-  -webkit-animation-fill-mode: both;
-  animation-fill-mode: both;
-  -webkit-animation: load7 1.8s infinite ease-in-out;
-  animation: load7 1.8s infinite ease-in-out;
-}
-.loader {
-  color: #00ffff;
-  font-size: 10px;
-  margin: 25px auto;
-  position: relative;
-  text-indent: -9999em;
-  -webkit-transform: translateZ(0);
-  -ms-transform: translateZ(0);
-  transform: translateZ(0);
-  -webkit-animation-delay: -0.16s;
-  animation-delay: -0.16s;
-}
-.loader:before,
-.loader:after {
-  content: '';
-  position: absolute;
-  top: 0;
-}
-.loader:before {
-  left: -3.5em;
-  -webkit-animation-delay: -0.32s;
-  animation-delay: -0.32s;
-}
-.loader:after {
-  left: 3.5em;
-}
-@-webkit-keyframes load7 {
-  0%,
-  80%,
-  100% {
-    box-shadow: 0 2.5em 0 -1.3em;
-  }
-  40% {
-    box-shadow: 0 2.5em 0 0;
-  }
-}
-@keyframes load7 {
-  0%,
-  80%,
-  100% {
-    box-shadow: 0 2.5em 0 -1.3em;
-  }
-  40% {
-    box-shadow: 0 2.5em 0 0;
-  }
-}

OsmAnd/assets/server/css/report.css

@@ -1,606 +0,0 @@
-::-webkit-input-placeholder {color:#000;}
-::-moz-placeholder          {color:#000;}
-:-moz-placeholder           {color:#000;}
-:-ms-input-placeholder      {color:#000;}
-h2, h3 {
-  font-size: 20px;
-}
-.nav-holder {
-  padding: 0 20px;
-  background: #ff8e01;
-}
-.navigation {
-  max-width: 1100px;
-  margin: 0 auto;
-}
-.navigation li {
-  margin-right: 30px;
-}
-.navigation a {
-  display: block;
-  padding: 30px 0;
-  color: rgba(255, 255, 255, 0.5);
-  font-size: 15px;
-  font-weight: bold;
-  text-decoration: none;
-  text-transform: uppercase;
-  border-bottom: 4px solid #ff8e01;
-  outline: none;
-}
-.navigation a:hover {
-  color: #fff;
-}
-.navigation li {
-  display: inline-block;
-  vertical-align: middle;
-}
-.navigation li.active a, 
-.navigation li.active a:focus, 
-.navigation li.active a:hover {
-  color: #fff;
-  border-bottom: 4px solid #4464ad;
-}
-#month-selection {
-  margin-bottom: 10px;
-}
-#region-selection {
-  margin-bottom: 10px;
-}
-.infobox {
-  font-size: 16px;
-  line-height: 150%;
-}
-.infobox h2 {
-  font-size: 33px;
-}
-.infobox h3 {
-  margin-top: 35px;
-  font-weight: bold;
-}
-.infobox ul {
-  list-style-type: disc;
-  list-style-position: inside;
-}
-.report-period-group {
-  padding: 20px;
-  background: #f2f2f2;
-}
-.report-period-group.supporters {
-  float: left;
-  width: 30%;
-  height: 120px;
-}
-.supporters-total {
-  float: right;
-  width: 70%;
-  height: 120px;
-  border: 1px solid #ddd;
-  border-left: 0 none;
-}
-.supporters-total-holder:after {
-  content: '';
-  display: table;
-  clear: both;
-  float: none;
-}
-.report-group {
-  display: inline-block;
-  vertical-align: top;
-}
-.report-group.period {
-  width: 100%;
-  max-width: 250px;
-  margin-right: 40px;
-}
-.supporters .report-group.period {
-  margin-right: 0;
-}
-.report-group.region {
-  width: 100%;
-  max-width: 420px;
-}
-.styled-select {
-  position: relative;
-  width: 100%;
-  height: 42px;
-  overflow: hidden;
-  background: #fff;
-  border: 1px solid #ccc;
-  border-radius: 2px;
-}
-.styled-select:before {
-  z-index: 0;
-  content: '';
-  position: absolute;
-  top: 10px;
-  left: 10px;
-  width: 20px;
-  height: 20px;
-  background: url('../images/main-sprite.png') no-repeat;
-}
-.styled-select:after {
-  z-index: 0;
-  content: '';
-  position: absolute;
-  top: 12px;
-  right: 10px;
-  width: 20px;
-  height: 20px;
-  background: url('../images/main-sprite.png') no-repeat -200px -80px;
-}
-.report-group.period .styled-select:before {
-  background-position: -251px -110px;
-}
-.report-group.region .styled-select:before {
-  background-position: -290px -110px;
-}
-.report-group.round .styled-select:before {
-  background-position: -290px -110px;
-}
-
-.styled-select select {
-  position: relative;
-  z-index: 1;
-  display: block;
-  width: 110%;
-  height: 42px;
-  padding: 10px 45px 10px 35px;
-  border: 0 none;
-  border-radius: 0;
-  background: transparent;
-  text-overflow: ellipsis;
-}
-select {
-  -webkit-appearance: none;
-     -moz-appearance: none;
-          appearance: none;
-}
-select:-moz-focusring {
-  color: transparent;
-  text-shadow: 0 0 0 #000;
-}
-.report-total-div {
-  border: 1px solid #e6e6e6;
-  border-top: 0 none;
-}
-.overview-body {
-  padding: 15px 15px 0;
-}
-.overview-hint {
-  font-weight: bold;
-  margin: 5px 0 20px;
-}
-.overview-hint span {
-  color: #484dde;
-}
-.overview {
-  position: relative;
-  display: inline-block;
-  vertical-align: top;
-  padding-left: 50px;
-  margin-right: 80px;
-  margin-bottom: 20px;
-  text-align: left;
-}
-.overview:last-child {
-  margin-right: 0;
-}
-.overview:before {
-  content: '';
-  position: absolute;
-  top: 0;
-  left: 0;
-  width: 40px;
-  height: 40px;
-  background: url('../images/main-sprite.png') no-repeat;
-}
-.overview-changes:before {
-  background-position: -0px -280px;
-}
-.overview-users:before {
-  background-position: -40px -280px;
-}
-.overview-region:before {
-  background-position: -80px -280px;
-}
-.overview-active_supporters:before {
-  background-position: -40px -280px;
-}
-.overview-register_supporters:before {
-  background-position: -120px -280px;
-}
-.overview-btc:before {
-  background-position: -160px -280px;
-}
-.overview-total_weight:before {
-  background-position: -200px -280px;
-}
-.overview p {
-  margin: 0;
-  margin-bottom: -10px;
-  font-size: 30px;
-  font-weight: bold;
-  line-height: 1.2;
-}
-.overview span {
-  color: #999;
-  font-size: 11px;
-  text-transform: uppercase;
-  letter-spacing: 2px;
-}
-#report-ranking,
-#users-ranking,
-#support-country-table-header,
-#support-table-header,
-#recipients-table-header {
-  margin-top: 50px;
-  font-size: 20px;
-}
-#report-ranking span {
-  display: block;
-  font-size: 13px;
-  font-weight: normal;
-  color: #999;
-  text-transform: uppercase;
-}
-.table {
-  font-size: 14px;
-}
-.table thead span {
-  display: block;
-  color: #999;
-  font-size: 11px;
-  text-transform: uppercase;
-}
-.table tbody tr td {
-  padding: 12px;
-  font-weight: bold;
-}
-.table-bordered > thead > tr > td, 
-.table-bordered > thead > tr > th {
-  vertical-align: middle;
-  border-bottom-color: #ff8f00;
-  font-weight: normal;
-}
-.table-controls.hidden {
-  display: none;
-}
-.table-controls {
-  position: relative;
-  padding-right: 185px;
-}
-.tc.search {
-  position: relative;
-}
-.tc.search:before {
-  content: '';
-  position: absolute;
-  top: 10px;
-  left: 12px;
-  width: 20px;
-  height: 20px;
-  background: url('../images/main-sprite.png') no-repeat -300px -80px;
-}
-.tc.search input {
-  max-width: 350px;
-  height: 42px;
-  padding-left: 40px;
-  border-radius: 2px;
-}
-.tc.entries {
-  position: absolute;
-  top: 0;
-  right: 0;
-  width: 100%;
-  max-width: 180px;
-  font-size: 14px;
-}
-.tc.entries .styled-select {
-  display: inline-block;
-  vertical-align: middle;
-  width: 80px;
-}
-.tc.entries .styled-select:before {
-  content: none;
-}
-.tc.entries label {
-  display: block;
-  text-align: right;
-}
-.tc.entries select {
-  display: inline-block;
-  vertical-align: middle;
-  width: 125%;
-  padding: 10px 0 10px 10px;
-}
-.sorting_desc,
-.sorting_asc,
-.sorting {
-  position: relative;
-}
-.sorting_desc:after,
-.sorting_asc:after {
-  content: '' !important;
-  position: absolute;
-  top: 50%;
-  right: 0;
-  width: 20px;
-  height: 20px;
-  background: url('../images/main-sprite.png') no-repeat;
-  transform: translate(0, -50%);
-}
-.sorting_asc:after {
-  background-position: -160px -140px;
-}
-.sorting_desc:after {
-  background-position: -200px -140px;
-}
-.sorting:after {
-  content: '' !important;
-  position: absolute;
-  top: 50%;
-  right: 0;
-  width: 20px;
-  height: 20px;
-  background: url('../images/main-sprite.png') no-repeat -180px -140px;
-  transform: translate(0, -50%);
-}
-.pagination > .active > a,
-.pagination > .active > a:focus,
-.pagination > .active > a:hover,
-.pagination > .active > span,
-.pagination > .active > span:focus,
-.pagination > .active > span:hover {
-  background-color: #ff8f00;
-  border-color: #ff8f00;
-}
-.pagination > li > a,
-.pagination > li > span {
-  color: #000;
-}
-.pagination > li > a:hover,
-.pagination > li > span:hover {
-  background-color: rgba(255, 143, 0, 0.5);
-  border-color: #ff8f00;
-  color: #fff;
-}
-.registration {
-  display: inline-block;
-  vertical-align: top;
-  width: 49%;
-  min-height: 420px;
-  padding: 20px;
-  margin-top: 20px;
-  margin-right: 1%;
-  background: #f2f2f2;
-}
-.registration.contributor-registration {
-  margin-right: 0;
-}
-.registration h4 {
-  margin-top: 0;
-  font-size: 20px;
-}
-.recipient-registration label {
-  margin-top: 10px;
-  font-size: 14px;
-  font-weight: normal;
-}
-.recipient-registration .form-control {
-  margin: 0;
-  border-radius: 2px;
-  height: 42px;
-  padding-left: 40px;
-}
-.recipient-registration .input-holder {
-  position: relative;
-}
-
-#agree_osm_live {
-  margin-left: 5px;
-  margin-top: 3px;
-}
-.agree_osm_live_label {
-  position: relative;
-  cursor: pointer;
-  font-size: 14px;
-  margin-left: 7px;
-  margin-bottom: 15px;
-  -webkit-user-select: none;
-  -moz-user-select: none;
-  -ms-user-select: none;
-}
-
-.recipient-registration .input-holder:before {
-  content: '';
-  position: absolute;
-  top: 10px;
-  left: 12px;
-  width: 20px;
-  height: 20px;
-  background: url('../images/main-sprite.png') no-repeat;
-}
-.recipient-registration .input-holder.input-user:before {
-  background-position: -180px -80px;
-}
-.recipient-registration .input-holder.input-pass:before {
-  height: 21px;
-  background-position: -172px -109px;
-}
-.recipient-registration .input-holder.input-bitcoin:before {
-  background-position: -210px -110px;
-}
-.recipient-registration .input-hint {
-  color: #999;
-  line-height: 1.4;
-}
-.recipient-registration .btn,
-.recipient-registration .btn:active {
-  background: #575bde;
-  border: 1px solid #3d42bf;
-  color: #fff;
-  font-weight: bold;
-}
-.registration-badges img {
-  border: none;
-  height: 45px;
-  margin-bottom: 20px;
-}
-.contributor-registration p {
-  font-size: 14px;
-  line-height: 1.4;
-}
-.contributor-registration .btc-address {
-  padding: 15px 10px;
-  margin-bottom: 10px;
-  background: #ff8f00;
-  border-radius: 2px;
-  color: #fff;
-  font-size: 14px;
-  font-weight: bold;
-}
-#recipients-info-div {
-  margin-top: 20px;
-  margin-bottom: 20px;
-}
-.maincontainer {
-  background-color: white;
-}
-.full-width-banner {
-  width: 100%;
-  margin: 20px auto;
-}
-.full-width-banner img {
-  display: block;
-  max-width: 100%;
-}
-
-.vlabel {
-  font-size: 16px;
-  font-weight: bold;
-}
-.form-control {
-  margin-bottom: 10px;
-}
-.tab-content {
-  margin-top: 25px;
-}
-.container {
-  max-width: 1135px;
-  margin: 10px auto 50px;
-}
-#recipients-table td:nth-child(7) {
-  word-break: break-all;
-  padding: 8px 5px !important;
-}
-@media screen and (max-width: 1200px) {
-  .nav-holder .navigation{
-    max-width: 940px;
-  }
-}
-@media screen and (max-width: 991px) {
-  .nav-holder .navigation{
-    max-width: 720px;
-  }
-  .report-group.period {
-    max-width: 420px;
-    margin-right: 0;
-  }
-  .supporters-total .overview {
-    margin-right: 20px;
-  }
-}
-@media screen and (max-width: 770px) {
-  .report-period-group.supporters {
-    float: none;
-    width: 100%;
-    height: 120px;
-  }
-  .supporters-total {
-    float: none;
-    width: 100%;
-    height: auto;
-    border: 1px solid #ddd;
-    border-top: 0 none;
-  }
-  .supporters-total:after {
-    content: '';
-    display: table;
-    clear: both;
-    float: none;
-  }
-  .registration {
-    width: 100%;
-    min-height: auto;
-    margin-right: 0;
-    margin-bottom: 20px;
-  }
-}
-@media screen and (max-width: 650px) {
-  #recipients-table th:nth-child(4),
-  #recipients-table td:nth-child(4),
-  #recipients-table th:nth-child(3),
-  #recipients-table td:nth-child(3) {
-    display: none;
-  }
-  .navigation li a,
-  .navigation li.active a,
-  .navigation li.active a:focus,
-  .navigation li.active a:hover {
-    border-bottom: 0 none;
-    padding: 15px 0;
-  }
-}
-@media screen and (max-width: 550px) {
-  .table {
-    font-size: 13px;
-  }
-  .table thead {
-    font-size: 11px;
-  }
-  .table thead span {
-    text-transform: lowercase;
-  }
-  .table th, 
-  .table td {
-    padding: 8px 2px !important;
-    vertical-align: middle !important;
-    font-weight: normal !important;
-    text-align: center;
-
-  }
-  .table th.sorting_asc:before,
-  .table th.sorting_desc:before {
-    content: '';
-    position: absolute;
-    left: 50%;
-    margin-left: -2px;
-    border: 4px solid transparent;
-  }
-  .table th.sorting_asc:before {
-    bottom: 1px;
-    border-top-color: #ff8f00;
-  }
-  .table th.sorting_desc:before {
-    top: 1px;
-    border-bottom-color: #ff8f00;
-  }
-  .table th:after {
-    content: none !important;
-  }
-  .table-controls {
-    padding-right: 145px;
-  }
-  .tc.entries {
-    font-size: 12px;
-  }
-  .tc.entries span {
-    display: inline-block;
-    vertical-align: middle;
-    width: 30%;
-    text-align: center;
-  }
-  .contributor-registration .btc-address {
-    word-break: break-all;
-  }
-}

OsmAnd/assets/server/css/slick.css

@@ -1,117 +0,0 @@
-/* Slider */
-.slick-slider
-{
-    position: relative;
-
-    display: block;
-    box-sizing: border-box;
-
-    -webkit-user-select: none;
-       -moz-user-select: none;
-        -ms-user-select: none;
-            user-select: none;
-
-    -webkit-touch-callout: none;
-    -khtml-user-select: none;
-    -ms-touch-action: pan-y;
-        touch-action: pan-y;
-    -webkit-tap-highlight-color: transparent;
-}
-
-.slick-list
-{
-    position: relative;
-
-    display: block;
-    overflow: hidden;
-
-    margin: 0;
-    padding: 0;
-}
-.slick-list:focus
-{
-    outline: none;
-}
-.slick-list.dragging
-{
-    cursor: pointer;
-    cursor: hand;
-}
-
-.slick-slider .slick-track,
-.slick-slider .slick-list
-{
-    -webkit-transform: translate3d(0, 0, 0);
-       -moz-transform: translate3d(0, 0, 0);
-        -ms-transform: translate3d(0, 0, 0);
-         -o-transform: translate3d(0, 0, 0);
-            transform: translate3d(0, 0, 0);
-}
-
-.slick-track
-{
-    position: relative;
-    top: 0;
-    left: 0;
-
-    display: block;
-}
-.slick-track:before,
-.slick-track:after
-{
-    display: table;
-
-    content: '';
-}
-.slick-track:after
-{
-    clear: both;
-}
-.slick-loading .slick-track
-{
-    visibility: hidden;
-}
-
-.slick-slide
-{
-    display: none;
-    float: left;
-
-    height: 100%;
-    min-height: 1px;
-}
-[dir='rtl'] .slick-slide
-{
-    float: right;
-}
-.slick-slide img
-{
-    display: block;
-}
-.slick-slide.slick-loading img
-{
-    display: none;
-}
-.slick-slide.dragging img
-{
-    pointer-events: none;
-}
-.slick-initialized .slick-slide
-{
-    display: block;
-}
-.slick-loading .slick-slide
-{
-    visibility: hidden;
-}
-.slick-vertical .slick-slide
-{
-    display: block;
-
-    height: auto;
-
-    border: 1px solid transparent;
-}
-.slick-arrow.slick-hidden {
-    display: none;
-}

OsmAnd/assets/server/css/src/slick.less

@@ -1,98 +0,0 @@
-/* Slider */
-
-.slick-slider {
-    position: relative;
-    display: block;
-    box-sizing: border-box;
-    -webkit-touch-callout: none;
-    -webkit-user-select: none;
-    -khtml-user-select: none;
-    -moz-user-select: none;
-    -ms-user-select: none;
-    user-select: none;
-    -ms-touch-action: pan-y;
-    touch-action: pan-y;
-    -webkit-tap-highlight-color: transparent;
-}
-.slick-list {
-    position: relative;
-    overflow: hidden;
-    display: block;
-    margin: 0;
-    padding: 0;
-
-    &:focus {
-        outline: none;
-    }
-
-    &.dragging {
-        cursor: pointer;
-        cursor: hand;
-    }
-}
-.slick-slider .slick-track,
-.slick-slider .slick-list {
-    -webkit-transform: translate3d(0, 0, 0);
-    -moz-transform: translate3d(0, 0, 0);
-    -ms-transform: translate3d(0, 0, 0);
-    -o-transform: translate3d(0, 0, 0);
-    transform: translate3d(0, 0, 0);
-}
-
-.slick-track {
-    position: relative;
-    left: 0;
-    top: 0;
-    display: block;
-
-    &:before,
-    &:after {
-        content: "";
-        display: table;
-    }
-
-    &:after {
-        clear: both;
-    }
-
-    .slick-loading & {
-        visibility: hidden;
-    }
-}
-.slick-slide {
-    float: left;
-    height: 100%;
-    min-height: 1px;
-    [dir="rtl"] & {
-        float: right;
-    }
-    img {
-        display: block;
-    }
-    &.slick-loading img {
-        display: none;
-    }
-
-    display: none;
-
-    &.dragging img {
-        pointer-events: none;
-    }
-
-    .slick-initialized & {
-        display: block;
-    }
-
-    .slick-loading & {
-        visibility: hidden;
-    }
-
-    .slick-vertical & {
-        display: block;
-        height: auto;
-        border: 1px solid transparent;
-    }
-}
-.slick-arrow.slick-hidden {
-    display: none;
-}

OsmAnd/assets/server/css/src/vars.less

@@ -1,43 +0,0 @@
-@font-family: 'Roboto Regular';
-@text-color: #000;
-@oposite-text-color: #fff;
-@header-color: #536dfe;
-@read-more-color: #adadad;
-@brand-orange: #ff8f00;
-@opacity-orange-overlay: 0.9;
-@separator-bg: #ffbb00;
-
-@badge-free: #f3f3f3;
-@badge-free-text: #737373;
-@badge-paid: #62c452;
-@badge-paid-text: #fff;
-
-@footer-bg: #292f33;
-@footer-text-color: #fff;
-@footer-header-color: #698d8f;
-@footer-header-underline-color: #2f4445;
-@footer-copyright-color: #525e66;
-@footer-font-family: Arial;
-@footer-contact-btn-border: #394247;
-
-@index-app-features-header: #ffa516;
-@index-app-features-subheader: #c1c1c1;
-@index-banner-btn-bg: #ffa516;
-@index-header-color: #000;
-@index-subheader-color: #737373;
-@index-slider-btn-active: #ffa516;
-@index-slider-btn-passive: #d4d4d4;
-@index-recomendations-username: #212121;
-@index-recomendations-service: #9e9e9e;
-@index-news-link-color: #266ce0;
-@index-news-read-more-link: #adadad;
-@index-news-timestamp: #adadad;
-@index-poll-btn-bg: #ff8f00;
-@index-poll-result-btn-bg: #ff6c00;
-@index-poll-radio-btn-active: #ff8f00;
-@index-poll-radio-btn-border: #bbb;
-
-@blog-article-header: #536dfe;
-
-@help-question-link: #454ade;
-@help-question-border: #e6e7ec;

OsmAnd/assets/server/css/style.css

@@ -1,2 +0,0 @@
-/***********************EMPTY USED BY HELP inlining but already defined in site.css
-	*********************************************/

OsmAnd/assets/server/go.html

@@ -1,98 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-    <meta http-equiv="cache-control" content="max-age=0"/>
-    <meta http-equiv="cache-control" content="no-cache"/>
-    <meta http-equiv="expires" content="0"/>
-    <meta http-equiv="expires" content="Tue, 01 Jan 1980 1:00:00 GMT"/>
-    <meta http-equiv="pragma" content="no-cache"/>
-    <meta http-equiv="X-UA-Compatible" content="IE=Edge">
-    <meta name="viewport" content="width=device-width, initial-scale=1">
-    <title>OsmAnd - Offline Mobile Maps and Navigation</title>
-    <link rel="stylesheet" type="text/css" href="/css/site.css?v=4"/>
-    <!--  <link rel="stylesheet" href="http://cdn.leafletjs.com/leaflet-0.7.3/leaflet.css" /> -->
-    <link rel="stylesheet" href="https://unpkg.com/leaflet@1.1.0/dist/leaflet.css"/>
-    <script src="https://unpkg.com/leaflet@1.1.0/dist/leaflet.js"></script>
-    <script type="text/javascript" src="/scripts/jquery-3.1.0.min.js"></script>
-    <!--
-      <script src="http://cdn.leafletjs.com/leaflet-0.7.3/leaflet.js"></script>
-    -->
-
-    <script type="text/javascript" src="/scripts/js.cookie.js"></script>
-    <script type="text/javascript" src="/scripts/go.js?v=5"></script>
-
-    <script>
-        function getMarkerContent(feature) {
-		var p = feature.properties;
-		var popupContent = p.title;
-		if(p.opr_id) {
-			popupContent += " (" + p.opr_id+") ";
-		}
-		if(p.tags) {
-			for (var t in p.tags) {
-				popupContent += "<br>" + t + " " + p.tags[t];
-			}
-		}
-		if(p.opr_id) {
-			popupContent += "<br><a href=\'/api/admin?view=objects&browse=type&type=opr.place&subtype=id&key=" +
-				p.opr_id + "\'>OpenPlaceReviews</a>";
-		}
-		if(p.osm_id) {
-			popupContent += "<br><a href=\'https://www.openstreetmap.org/" +
-				p.osm_type + "/" + p.osm_id + "\'>OpenStreetMap</a>";
-		}
-		return popupContent;
-	    }
-
-	    function markerClick(e){
-
-	    }
-
-        function setupMarkers(){
-            $.ajax({
-                type: 'GET',
-                url: "/favorites",
-                async: false,
-                contentType: "application/json",
-                dataType: 'json',
-            complete: function(r) {
-                var points = JSON.parse(r.responseText);
-                points.forEach(e => {
-		    	    window.goMap.map.addPopupMarker(e,markerClick);
-                });
-            },
-            error: function(e) {
-                alert("Error happened while getting favourite points "+e.message);
-            }
-            });
-        }
-
-        $( document ).ready(function() {
-            setupMarkers();
-        });
-
-    </script>
-</head>
-<body>
-<div class="gocontainer" id="gocontainer">
-    <div class="goheader">
-        <a href="/"><img src="/images/logo-grey.png" class="logo"/></a>
-        <div class="coordinatescontainer">
-            <div><span class="title">LAT</span><span class="coordinate latitude"></span></div>
-            <div><span class="title">LON</span><span class="coordinate longitude"></span></div>
-        </div>
-        <div class="clear:both;"></div>
-    </div>
-    <div id="map"></div>
-    <div class="overlay" style="display:none;"></div>
-    <div class="popup" style="display:none;">
-        <div class="logo"></div>
-        <h1>Did you know</h1>
-        <p>OsmAnd has an iOS application</p>
-        <a class="button yes" href="javascript:void(0);">Yep, I've already got it</a>
-        <a class="button no" href="javascript::void(0);">Nope, but I'd love to try it</a>
-        <a class="button cancel" href="javascript:void(0);">Leave me alone</a>
-    </div>
-</div>
-</body>
-</html>

OsmAnd/assets/server/scripts/blog.js

@@ -1,86 +0,0 @@
-var blogArticles = [
-    {title:'OsmAnd for iPhone is released', url:'blog.html?id=osmand-ios', id:'osmand-ios', gatag:'osmand_ios'},	
-    {title:'Nautical charts', url:'blog.html?id=nautical-charts', id:'nautical-charts', gatag:'nautical_charts'},
-	{title:'OsmAnd DVR goes live', url:'blog.html?id=osmand-dvr-goes-live', id:'osmand-dvr-goes-live', gatag:'osmand_dvr_goes_live'},	
-	{title:'OsmAnd 1.9', url:'blog.html?id=osmand-1-9-released', id:'osmand-1-9-released', gatag:'osmand_1_9'},
-	{title:'OsmAnd 1.8', url:'blog.html?id=osmand-1-8-released', id:'osmand-1-8-released', gatag:'osmand_1_8'},
-	{title:'OsmAnd 1.7', url:'blog.html?id=osmand-1-7-released', id:'osmand-1-7-released', gatag:'osmand_1_7'},	
-	{title:'OsmAnd 1.6 Released', url:'blog.html?id=osmand-1-6-released', id:'osmand-1-6-released', gatag:'osmand_1_6'},
-	{title:'OsmAnd 1.5 Released', url:'blog.html?id=osmand-1-5-released', id:'osmand-1-5-released', gatag:'osmand_1_5'}
-];
-
-var webSiteUrl = "http://osmand.net";
-
-$.urlParam = function(url, name){
-    var results = new RegExp('[\?&]' + name + '=([^&#]*)').exec(url);
-    if (results==null){
-       return null;
-    }
-    else{
-       return results[1] || 0;
-    }
-}
-
-function blog(container){
-
-var getFullArticleUrl = function(articleObj){
-	return webSiteUrl + "/" + articleObj.url;
-}
-
-var fixTwitter =function (){ 
-	$('#___plusone_0 iframe').css('height', '21px');
-}
-
-var updateMetaTags = function(articleObj){
-	if (articleObj && articleObj != null){
-		var articleFullUrl = getFullArticleUrl(articleObj);
-		$('meta[property="og:title"]').attr('content', articleObj.title);
-		$('meta[property="og:url"]').attr('content', articleFullUrl);
-		$('meta[property="og:description"]').attr('content', articleObj.title);
-		
-		$('link[rel="canonical"]').attr('href', articleFullUrl);
-		
-		$('div.fb-like').attr('data-href', articleFullUrl);
-		$('.twitter-share-button').attr('data-url', articleFullUrl);
-	}
-}
-
-var getArticleById = function(articleid){
-	for(var i=0; i < blogArticles.length;++i){
-		if (blogArticles[i].id === articleid){
-			return blogArticles[i];
-		}
-	}
-	return null;
-}
-
-var init = function(){
-	container.empty();
-	
-	for(var i=0; i < blogArticles.length; ++i){
-		var link = blogArticles[i];	
-		container.append('<li><a data-gatag="' +link.gatag+ '" data-index="' + link.index+ '" href="' + link.url + '">' + link.title + '</a></li>');
-	}
-	
-	var articleid = $.urlParam(window.location.href, 'id');
-	if (!articleid || articleid == null){
-		articleid = blogArticles[0].id;
-	}
-	//hide share buttons
-	$('.share_buttons').css('display', 'none');
-	updateMetaTags(getArticleById(articleid));
-	var url = 'blog_articles' + '/' + articleid + ".html";
-	$( ".article" ).load(url, function( response, status, xhr) {
-		if ( status != "error" ) {
-			
-			$('.share_buttons').css('display', 'block');			
-			setTimeout(fixTwitter, 5000);
-		}
-	});
-	
-}
-
-init();
-
-
-}

OsmAnd/assets/server/scripts/go.js

@@ -1,268 +0,0 @@
-var requestUtils={
-	'getParamValue':function(paramName){		
-			let value= (location.search.split(paramName + '=')[1]||'').split('&')[0];
-			if (value && value.length > 0){
-				return value;
-			}
-			return null;
-		},
-	'isIOS':function(){
-		return /(iPad|iPhone|iPod)/g.test( navigator.userAgent );
-	},
-	'redirect':function(newUrl){
-		document.location = newUrl;
-	}
-};
-
-var goMap = {
-	'config':{
-		'containerid': 'gocontainer',		
-		'defaults':{
-			'lat':50.27,
-			'lon':30.30,
-			'zoom':13
-			}
-	},
-	'utils':{
-		'getPointFromUrl':function(){
-			let point = {};
-			point.lat = requestUtils.getParamValue('lat');
-			point.lon = requestUtils.getParamValue('lon');
-			point.zoom = requestUtils.getParamValue('z');
-			return point;
-		},
-		'isPointComplete':function(point){		
-			if (!point.lat || !point.lon){
-				return false;
-			}
-			return true;
-		},
-		'extendPoint':function(initialPoint, newPoint){
-			let point={};
-			point.lat=newPoint.lat;
-			if (!point.lat || point.lat == null){
-				point.lat = initialPoint.lat;
-			}
-			point.lon=newPoint.lon;
-			if (!point.lon || point.lon == null){
-				point.lon = initialPoint.lon;
-			}
-			point.zoom=newPoint.zoom;
-			if (!point.zoom || point.zoom == null){
-				point.zoom = initialPoint.zoom;
-			}
-			return point;
-		}
-	},
-	'init': function(config){
-		if (config && typeof (config) == 'object') {
-            $.extend(goMap.config, config);
-        }
-		goMap.$container = $('#' + goMap.config.containerid);
-		goMap.$footer = goMap.$container.find('.gofooter');
-		goMap.$latitude = goMap.$container.find('.latitude');
-		goMap.$longitude = goMap.$container.find('.longitude');
-		
-		let inputPoint = goMap.utils.getPointFromUrl();					
-		goMap.point = goMap.utils.extendPoint(goMap.config.defaults, inputPoint);
-		goMap.refreshCoordinates();
-		
-		goMap.map =$.mapwidget();		
-		goMap.map.showPoint(goMap.point);
-		
-		let inputComplete = goMap.utils.isPointComplete(inputPoint);
-		if (inputComplete){
-			goMap.map.addMarker(goMap.point);
-		}
-		goMap.point = goMap.utils.getPointFromUrl();	
-	},	
-	'refreshCoordinates':function(){
-		goMap.$latitude.text(goMap.point.lat);
-		goMap.$longitude.text(goMap.point.lon);
-	}
-};
-
-function toColor(num) {
-            num >>>= 0;
-            var b = num & 0xFF,
-                g = (num & 0xFF00) >>> 8,
-                r = (num & 0xFF0000) >>> 16,
-                a = ( (num & 0xFF000000) >>> 24 ) / 255 ;
-            return "rgba(" + [r, g, b, a].join(",") + ")";
-         }
-
-(function($) {
-	$.mapwidget = function(config) {
-		var loc = goMap.point.lat + '/' + goMap.point.lon;
-		var lparams = '?mlat='+goMap.point.lat + '&mlon=' + goMap.point.lon;
-		var mapobj={
-			config: $.extend({
-				'mapid':'map',
-                'maxzoom':20,
-				'maxnativezoom':19,
-				'sourceurl':'https://tile.osmand.net/hd/{z}/{x}/{y}.png',
-				'attribution':'&copy; <a href="https://www.openstreetmap.org/'+lparams+'#map=15/'+loc+'">OpenStreetMap</a> contributors'
-            }, config),
-			init:function(){
-				mapobj.map = L.map(mapobj.config.mapid);
-				L.tileLayer(mapobj.config.sourceurl, {
-					attribution: mapobj.config.attribution,
-					maxZoom: mapobj.config.maxzoom,
-					maxNativeZoom: mapobj.config.maxnativezoom
-				}).addTo(mapobj.map);				
-			},
-			showPoint:function(point){
-				mapobj.map.setView([point.lat, point.lon], point.zoom);				
-			},
-			addMarker:function(point){
-				L.marker([point.lat, point.lon]).addTo(mapobj.map);
-			},
-			addPopupMarker:function(favorite,onClickEvent){
-			    window.point = favorite;
-                var point = {};
-		    	    point.lat = favorite.latitude;
-		    	    point.lon = favorite.longitude;
-			    var popup = L.popup().setContent(
-			                "name: <b>" + favorite.name + "</b><br/>" +
-			                "address: <i>" + favorite.address + "</i><br/>"
-			                 + "category: " + favorite.category);
-			    L.marker([point.lat, point.lon])
-			        .bindPopup(popup)
-			        .addTo(mapobj.map)
-			        .on('click', function(e) {
-                        onClickEvent(e);
-                    });
-			}
-		};
-		mapobj.init();
-		return {            
-            showPoint: mapobj.showPoint,
-            addMarker: mapobj.addMarker,
-            addPopupMarker: mapobj.addPopupMarker
-        };
-	};
-})(jQuery);
-
-(function($) {
-	$.timer=function(config){
-		var timerobj={
-			config: $.extend({
-				'timeoutInMs':300,
-                'maxActionDelayInMs':2000,
-				'action':function(){},
-				'actionparams':null
-            }, config),
-			init:function(){
-				timerobj.timer = null;
-				timerobj.startDate = null;
-			},
-			start:function(){
-				timerobj.cancel();
-				timerobj.startDate = new Date();
-				timerobj.timer=setTimeout(timerobj.onTimer, timerobj.config.timeoutInMs);
-			},
-			cancel:function(){
-				if (timerobj.timer != null){
-					clearTimeout(timerobj.timer);
-					timerobj.timer = null;
-					timerobj.startDate = null;
-				}
-			},
-			onTimer:function(){
-				timerobj.timer= null;
-				let now = new Date();
-				if(now - timerobj.startDate < timerobj.config.maxActionDelayInMs){
-					timerobj.config.action(timerobj.config.actionparams);
-				}				
-			}
-		};
-		timerobj.init();
-		return {
-			start:timerobj.start,
-			cancel:timerobj.cancel
-		};
-	};
-})(jQuery);
-
-var iosAppRedirect = {
-	config:{
-		appPrefix:'osmandmaps://',
-		containerid:'gocontainer',
-		cookieName:'OsmAndInstalled',
-		cookieNoExpirationTimeoutInDays:30
-	},
-	init:function(config){
-		if (config && typeof (config) == 'object') {
-            $.extend(iosAppRedirect.config, config);
-        }
-		
-		if (!requestUtils.isIOS()){	
-			return;
-		}
-		iosAppRedirect.$container = $('#' + iosAppRedirect.config.containerid);
-		iosAppRedirect.$overlay = iosAppRedirect.$container.find('.overlay');
-		iosAppRedirect.$popup = iosAppRedirect.$container.find('.popup');
-		iosAppRedirect.$yesBtn =  iosAppRedirect.$container.find('.yes');
-		iosAppRedirect.$noBtn =  iosAppRedirect.$container.find('.no');
-		iosAppRedirect.$cancelBtn =  iosAppRedirect.$container.find('.cancel');
-		iosAppRedirect.applestorelink = iosAppRedirect.$container.find('.gobadges .apple a').attr('href');	
-		iosAppRedirect.applink = iosAppRedirect.config.appPrefix + document.location.search;	
-		
-				
-		if (iosAppRedirect.isAppInstalled() === "yes"){			
-			iosAppRedirect.redirectToApp();			
-			return;
-		}
-		if (iosAppRedirect.isAppInstalled() === "no"){
-			return;
-		}
-		
-		iosAppRedirect.$yesBtn.on('click', function(){		    
-			iosAppRedirect.redirectToApp();
-			iosAppRedirect.closePopup();
-		});
-		
-		iosAppRedirect.$noBtn.on('click', function(){
-			iosAppRedirect.setCookie(true);
-			iosAppRedirect.closePopup();
-			window.open(iosAppRedirect.applestorelink , '_blank');
-		});
-		
-		iosAppRedirect.$cancelBtn.on('click', function(){
-			iosAppRedirect.setCookie(false);
-			iosAppRedirect.closePopup();			
-		});
-		iosAppRedirect.openPopup();
-	},
-	isAppInstalled:function(){
-		return Cookies.get('OsmAndInstalled');		
-	},
-	redirectToApp:function(){
-		iosAppRedirect.timer = $.timer({action:iosAppRedirect.clearCookie});
-		iosAppRedirect.timer.start();
-		requestUtils.redirect(iosAppRedirect.applink);
-	},
-	setCookie:function(appInstalled){
-		if (appInstalled === true){
-			Cookies.set(iosAppRedirect.config.cookieName, "yes");
-		}else{
-			Cookies.set(iosAppRedirect.config.cookieName, "no", { expires: iosAppRedirect.config.cookieNoExpirationTimeoutInDays });
-		}
-	},	
-	clearCookie:function(){
-		Cookies.remove('OsmAndInstalled'); 
-	},
-	openPopup:function(){
-		iosAppRedirect.$overlay.show();
-		iosAppRedirect.$popup.show();
-	},
-	closePopup:function(){
-		iosAppRedirect.$overlay.hide();
-		iosAppRedirect.$popup.hide();
-	}
-};
-
- $( document ).ready(function() {
-    goMap.init();
-	iosAppRedirect.init();
-  });

OsmAnd/assets/server/scripts/jquery.ellipsis.js

@@ -1,38 +0,0 @@
-(function($) {
-	$.fn.ellipsis = function()
-	{
-		return this.each(function()
-		{
-			var el = $(this);
-
-			if(el.css("overflow") == "hidden")
-			{
-				var text = el.html();
-				var multiline = el.hasClass('multiline');
-				var t = $(this.cloneNode(true))
-					.hide()
-					.css('position', 'absolute')
-					.css('overflow', 'visible')
-					.width(multiline ? el.width() : 'auto')
-					.height(multiline ? 'auto' : el.height())
-					;
-
-				el.after(t);
-
-				function height() { return t.height() > el.height(); };
-				function width() { return t.width() > el.width(); };
-
-				var func = multiline ? height : width;
-
-				while (text.length > 0 && func())
-				{
-					text = text.substr(0, text.length - 1);
-					t.html(text + "...");
-				}
-
-				el.html(t.html());
-				t.remove();
-			}
-		});
-	};
-})(jQuery);

OsmAnd/assets/server/scripts/js.cookie.js

@@ -1,165 +0,0 @@
-/*!
- * JavaScript Cookie v2.1.4
- * https://github.com/js-cookie/js-cookie
- *
- * Copyright 2006, 2015 Klaus Hartl & Fagner Brack
- * Released under the MIT license
- */
-;(function (factory) {
-	var registeredInModuleLoader = false;
-	if (typeof define === 'function' && define.amd) {
-		define(factory);
-		registeredInModuleLoader = true;
-	}
-	if (typeof exports === 'object') {
-		module.exports = factory();
-		registeredInModuleLoader = true;
-	}
-	if (!registeredInModuleLoader) {
-		var OldCookies = window.Cookies;
-		var api = window.Cookies = factory();
-		api.noConflict = function () {
-			window.Cookies = OldCookies;
-			return api;
-		};
-	}
-}(function () {
-	function extend () {
-		var i = 0;
-		var result = {};
-		for (; i < arguments.length; i++) {
-			var attributes = arguments[ i ];
-			for (var key in attributes) {
-				result[key] = attributes[key];
-			}
-		}
-		return result;
-	}
-
-	function init (converter) {
-		function api (key, value, attributes) {
-			var result;
-			if (typeof document === 'undefined') {
-				return;
-			}
-
-			// Write
-
-			if (arguments.length > 1) {
-				attributes = extend({
-					path: '/'
-				}, api.defaults, attributes);
-
-				if (typeof attributes.expires === 'number') {
-					var expires = new Date();
-					expires.setMilliseconds(expires.getMilliseconds() + attributes.expires * 864e+5);
-					attributes.expires = expires;
-				}
-
-				// We're using "expires" because "max-age" is not supported by IE
-				attributes.expires = attributes.expires ? attributes.expires.toUTCString() : '';
-
-				try {
-					result = JSON.stringify(value);
-					if (/^[\{\[]/.test(result)) {
-						value = result;
-					}
-				} catch (e) {}
-
-				if (!converter.write) {
-					value = encodeURIComponent(String(value))
-						.replace(/%(23|24|26|2B|3A|3C|3E|3D|2F|3F|40|5B|5D|5E|60|7B|7D|7C)/g, decodeURIComponent);
-				} else {
-					value = converter.write(value, key);
-				}
-
-				key = encodeURIComponent(String(key));
-				key = key.replace(/%(23|24|26|2B|5E|60|7C)/g, decodeURIComponent);
-				key = key.replace(/[\(\)]/g, escape);
-
-				var stringifiedAttributes = '';
-
-				for (var attributeName in attributes) {
-					if (!attributes[attributeName]) {
-						continue;
-					}
-					stringifiedAttributes += '; ' + attributeName;
-					if (attributes[attributeName] === true) {
-						continue;
-					}
-					stringifiedAttributes += '=' + attributes[attributeName];
-				}
-				return (document.cookie = key + '=' + value + stringifiedAttributes);
-			}
-
-			// Read
-
-			if (!key) {
-				result = {};
-			}
-
-			// To prevent the for loop in the first place assign an empty array
-			// in case there are no cookies at all. Also prevents odd result when
-			// calling "get()"
-			var cookies = document.cookie ? document.cookie.split('; ') : [];
-			var rdecode = /(%[0-9A-Z]{2})+/g;
-			var i = 0;
-
-			for (; i < cookies.length; i++) {
-				var parts = cookies[i].split('=');
-				var cookie = parts.slice(1).join('=');
-
-				if (cookie.charAt(0) === '"') {
-					cookie = cookie.slice(1, -1);
-				}
-
-				try {
-					var name = parts[0].replace(rdecode, decodeURIComponent);
-					cookie = converter.read ?
-						converter.read(cookie, name) : converter(cookie, name) ||
-						cookie.replace(rdecode, decodeURIComponent);
-
-					if (this.json) {
-						try {
-							cookie = JSON.parse(cookie);
-						} catch (e) {}
-					}
-
-					if (key === name) {
-						result = cookie;
-						break;
-					}
-
-					if (!key) {
-						result[name] = cookie;
-					}
-				} catch (e) {}
-			}
-
-			return result;
-		}
-
-		api.set = api;
-		api.get = function (key) {
-			return api.call(api, key);
-		};
-		api.getJSON = function () {
-			return api.apply({
-				json: true
-			}, [].slice.call(arguments));
-		};
-		api.defaults = {};
-
-		api.remove = function (key, attributes) {
-			api(key, '', extend(attributes, {
-				expires: -1
-			}));
-		};
-
-		api.withConverter = init;
-
-		return api;
-	}
-
-	return init(function () {});
-}));

OsmAnd/assets/server/scripts/mapselector.js

@@ -1,29 +0,0 @@
-
-
-function mapselector(container){
-var $cnt = $(container);
-var $selectbox = $cnt.find(".selectbox");
-
-$cnt.find("label").on('click', function(){
-		refreshMap();
-	});
-
-	var refreshMap = function(){
-	var selectedStyle = getSelectedStyle().val();
-		var selectedMap = getSelectedMap().val();
-		if (selectedStyle && selectedMap){
-			var imageName = selectedMap + "-" +  selectedStyle + ".png";
-			$cnt.css('background-image', "url('/images/" + imageName + "')");
-		}
-	}
-
-var getSelectedStyle = function(){
-	return $selectbox.find("input[name='style']:checked");
-}
-var getSelectedMap = function(){
-	return $selectbox.find("input[name='show']:checked");
-}
-refreshMap();
-
-
-}

OsmAnd/assets/server/scripts/poll.js

@@ -1,35 +0,0 @@
-function applyPolStyles(){
-
- if ($('.pds-box').length > 0){
-	$('.pds-box').css('border', 'none');
-	$('.pds-vote-button').css('float', 'left');
-	$('.pds-vote-button').css('background', 'none');
-	$('.pds-vote-button').css('background-color', '#FF8F00');
-	$('.pds-vote-button').css('color', '#fff');
-	$('.pds-vote-button').css('border', 'none');
-	$('.pds-vote-button').css('border-radius', '5px');
-	$('.pds-box-outer').css('padding', '0');
-	$('.pds-view-results').on('click', function(){
-		subscribeToReturnToPoll();		
-	});
-	}else{
-	   setTimeout(applyPolStyles, timeout);
-	}
- }
- 
- function subscribeToReturnToPoll(){
- if ($('.pds-return-poll').length > 0){
-	$('.pds-return-poll').on('click', function(){applyStyleOnBackToPoll();});
-	applyPolStyles();
- }else{
-	setTimeout(subscribeToReturnToPoll, timeout);
- }
- }
- 
- function applyStyleOnBackToPoll(){
-  if ($('.pds-view-results').length >0){	
-	applyPolStyles();
- }else{
-	setTimeout(applyStyleOnBackToPoll, timeout);
- }
- }

OsmAnd/assets/server/scripts/slider.js

@@ -1,129 +0,0 @@
-var images_android=[
-"promo-1s.png",
-"promo-2s.png",
-"promo-3s.png",
-"promo-4s.png",
-"promo-5s.png",
-"promo-6s.png",
-"promo-7s.png",
-"promo-8s.png",
-"promo-9s.png",
-"promo-10s.png",
-"promo-11s.png",
-"promo-12s.png"
-];
-
-var images_ios=[
-"ios-1s.png",
-"ios-2s.png",
-"ios-3s.png",
-"ios-4s.png",
-"ios-5s.png"
-];
-
-function slider(container){
-var $cnt = $(container);
-var $img1 = $cnt.find("#screenshot1");
-var $img2 =$cnt.find("#screenshot2");
-var $img3 = $cnt.find("#screenshot3");
-var $img4 = $cnt.find("#screenshot4");
-var $leftarrow =  $cnt.find(".arrow.left");
-var $rightarrow =  $cnt.find(".arrow.right");
-var $btnleft = $cnt.find(".button.left");
-var $btnright = $cnt.find(".button.right");
-var currentPosition =0;
-var count =4;
-
-var images = images_android;
-
-var init = function(){
-	updatePictures();
-	updateArrows();	
-	$leftarrow.on('click', function(){
-		if (currentPosition > 0){
-			currentPosition-=count;
-			updatePictures();
-			updateArrows();	
-		}
-	});
-	$rightarrow.on('click', function(){
-		if (currentPosition + count < images.length){
-			currentPosition+=count;
-			updatePictures();
-			updateArrows();	
-		}
-	});
-	$btnleft.on('click', function(){
-		if (!$btnleft.hasClass("active")){
-			$btnleft.addClass("active");
-			$btnright.removeClass("active");
-			$btnright.addClass
-			images = images_android;
-			currentPosition = 0;
-			updatePictures();
-			updateArrows();
-		}
-		
-		
-	});
-	$btnright.on('click', function(){
-		if (!$btnright.hasClass("active")){
-			$btnright.addClass("active");
-			$btnleft.removeClass("active");
-			images = images_ios;
-			currentPosition = 0;
-			updatePictures();
-			updateArrows();
-		}
-		
-	});
-}
-
-var changePicture = function(img, index){
-	if (index < images.length){
-		img.attr("src", "images/" + images[index]);
-	}else{
-		img.attr("src", "images/empty.png");
-	}
-}
-var updatePictures = function(){
-	changePicture( $img1, currentPosition);
-	changePicture( $img2, currentPosition+1);
-	changePicture( $img3, currentPosition+2);
-	changePicture( $img4, currentPosition+3);
-}
-var updateArrows = function(){
-	if (currentPosition + count < images.length){
-		enableRightArrow();	
-	}else{
-		disableRightArrow();
-	}
-	if (currentPosition== 0 ){
-		disableLeftArrow();	
-	}else{
-		enableLeftArrow();
-	}
-}
-var enableLeftArrow = function(){
-	$leftarrow.attr("src", "images/left_arrow_orange.png");
-	while ($leftarrow.hasClass("disabled")){	
-		$leftarrow.removeClass("disabled");
-	}
-}
-var disableLeftArrow = function(){
-	$leftarrow.attr("src", "images/left_arrow_grey.png");
-	$leftarrow.addClass("disabled");
-}
-var enableRightArrow = function(){
-	$rightarrow.attr("src", "images/right_arrow_orange.png");
-	while ($rightarrow.hasClass("disabled")){	
-		$rightarrow.removeClass("disabled");
-	}
-}
-var disableRightArrow = function(){
-	$rightarrow.attr("src", "images/right_arrow_grey.png");
-	$rightarrow.addClass("disabled");
-}
-init();
-
-}

OsmAnd/build.gradle

@@ -542,7 +542,6 @@ dependencies {
 	//implementation 'com.atilika.kuromoji:kuromoji-ipadic:0.9.0'
 	implementation 'com.squareup.picasso:picasso:2.71828'
 	implementation 'me.zhanghai.android.materialprogressbar:library:1.4.2'
-	implementation 'org.nanohttpd:nanohttpd:2.2.0'
 	// JS core
 	implementation group: 'org.mozilla', name: 'rhino', version: '1.7.9'
 // size restrictions

OsmAnd/res/drawable-v21/purchase_dialog_outline_btn_bg_dark.xml

@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ripple xmlns:android="http://schemas.android.com/apk/res/android"
+    android:color="@color/active_color_primary_dark">
+    <item>
+        <shape>
+            <solid android:color="@color/switch_button_active_dark" />
+            <corners android:radius="@dimen/dlg_button_rect_rad" />
+            <stroke
+                android:width="1dp"
+                android:color="@color/active_color_primary_dark" />
+        </shape>
+    </item>
+    <item
+        android:id="@android:id/mask"
+        android:state_pressed="true">
+        <shape android:shape="rectangle">
+            <solid android:color="@color/switch_button_active_stroke_dark" />
+            <corners android:radius="@dimen/dlg_button_rect_rad" />
+        </shape>
+    </item>
+</ripple>

OsmAnd/res/drawable-v21/purchase_dialog_outline_btn_bg_light.xml

@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ripple xmlns:android="http://schemas.android.com/apk/res/android"
+    android:color="@color/active_color_primary_light">
+    <item>
+        <shape>
+            <solid android:color="@color/switch_button_active_light" />
+            <corners android:radius="@dimen/dlg_button_rect_rad" />
+            <stroke
+                android:width="1dp"
+                android:color="@color/active_color_primary_light" />
+        </shape>
+    </item>
+    <item
+        android:id="@android:id/mask"
+        android:state_pressed="true">
+        <shape android:shape="rectangle">
+            <solid android:color="@color/switch_button_active_stroke_light" />
+            <corners android:radius="@dimen/dlg_button_rect_rad" />
+        </shape>
+    </item>
+</ripple>

OsmAnd/res/drawable/image_text_openstreetmap.xml

@@ -0,0 +1,84 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="232dp"
+    android:height="24dp"
+    android:viewportWidth="232"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M9.234,16.14C8.646,16.14 8.128,16 7.68,15.72C7.232,15.44 6.878,15.076 6.616,14.628V18.982H5.076V8.678H6.434V9.994C6.714,9.555 7.074,9.205 7.512,8.944C7.96,8.683 8.464,8.552 9.024,8.552C9.528,8.552 9.99,8.655 10.41,8.86C10.83,9.065 11.194,9.341 11.502,9.686C11.81,10.031 12.048,10.433 12.216,10.89C12.394,11.347 12.482,11.828 12.482,12.332C12.482,12.864 12.403,13.363 12.244,13.83C12.086,14.287 11.862,14.689 11.572,15.034C11.283,15.37 10.938,15.641 10.536,15.846C10.144,16.042 9.71,16.14 9.234,16.14ZM8.73,14.824C9.057,14.824 9.351,14.754 9.612,14.614C9.883,14.474 10.112,14.287 10.298,14.054C10.494,13.821 10.644,13.555 10.746,13.256C10.849,12.957 10.9,12.649 10.9,12.332C10.9,11.996 10.84,11.679 10.718,11.38C10.606,11.081 10.448,10.82 10.242,10.596C10.046,10.372 9.808,10.195 9.528,10.064C9.248,9.933 8.945,9.868 8.618,9.868C8.422,9.868 8.217,9.905 8.002,9.98C7.788,10.055 7.587,10.157 7.4,10.288C7.214,10.419 7.05,10.573 6.91,10.75C6.77,10.918 6.672,11.105 6.616,11.31V13.228C6.71,13.452 6.831,13.662 6.98,13.858C7.13,14.054 7.293,14.222 7.47,14.362C7.657,14.502 7.858,14.614 8.072,14.698C8.287,14.782 8.506,14.824 8.73,14.824Z"
+      android:fillColor="#BFBFBF"/>
+  <path
+      android:pathData="M17.297,16.14C16.719,16.14 16.196,16.037 15.729,15.832C15.272,15.627 14.88,15.351 14.553,15.006C14.227,14.661 13.975,14.259 13.797,13.802C13.62,13.335 13.531,12.85 13.531,12.346C13.531,11.842 13.62,11.361 13.797,10.904C13.975,10.437 14.227,10.031 14.553,9.686C14.889,9.341 15.286,9.065 15.743,8.86C16.21,8.655 16.728,8.552 17.297,8.552C17.867,8.552 18.38,8.655 18.837,8.86C19.304,9.065 19.701,9.341 20.027,9.686C20.363,10.031 20.62,10.437 20.797,10.904C20.975,11.361 21.063,11.842 21.063,12.346C21.063,12.85 20.975,13.335 20.797,13.802C20.62,14.259 20.363,14.661 20.027,15.006C19.701,15.351 19.304,15.627 18.837,15.832C18.38,16.037 17.867,16.14 17.297,16.14ZM15.113,12.36C15.113,12.715 15.169,13.041 15.281,13.34C15.393,13.639 15.547,13.9 15.743,14.124C15.939,14.339 16.168,14.511 16.429,14.642C16.7,14.763 16.989,14.824 17.297,14.824C17.605,14.824 17.89,14.763 18.151,14.642C18.422,14.511 18.655,14.334 18.851,14.11C19.047,13.886 19.201,13.625 19.313,13.326C19.425,13.027 19.481,12.701 19.481,12.346C19.481,12.001 19.425,11.679 19.313,11.38C19.201,11.072 19.047,10.806 18.851,10.582C18.655,10.358 18.422,10.185 18.151,10.064C17.89,9.933 17.605,9.868 17.297,9.868C16.999,9.868 16.714,9.933 16.443,10.064C16.182,10.195 15.953,10.372 15.757,10.596C15.561,10.82 15.403,11.086 15.281,11.394C15.169,11.693 15.113,12.015 15.113,12.36Z"
+      android:fillColor="#BFBFBF"/>
+  <path
+      android:pathData="M31.437,8.678H32.907L29.827,16H28.553L27.195,12.598L25.837,16H24.563L21.469,8.678H22.939L25.305,14.516L26.369,11.8L25.095,8.692H26.355L27.195,10.988L28.021,8.692H29.281L28.021,11.8L29.085,14.516L31.437,8.678Z"
+      android:fillColor="#BFBFBF"/>
+  <path
+      android:pathData="M37.129,16.14C36.559,16.14 36.041,16.042 35.575,15.846C35.108,15.641 34.707,15.365 34.371,15.02C34.044,14.675 33.787,14.273 33.601,13.816C33.423,13.359 33.335,12.873 33.335,12.36C33.335,11.847 33.423,11.361 33.601,10.904C33.787,10.437 34.044,10.031 34.371,9.686C34.707,9.331 35.108,9.056 35.575,8.86C36.041,8.655 36.564,8.552 37.143,8.552C37.712,8.552 38.225,8.655 38.683,8.86C39.149,9.065 39.546,9.341 39.873,9.686C40.199,10.022 40.447,10.419 40.615,10.876C40.792,11.324 40.881,11.795 40.881,12.29C40.881,12.402 40.876,12.509 40.867,12.612C40.857,12.705 40.848,12.785 40.839,12.85H34.973C35.001,13.177 35.075,13.471 35.197,13.732C35.327,13.993 35.491,14.222 35.687,14.418C35.892,14.605 36.121,14.749 36.373,14.852C36.634,14.955 36.905,15.006 37.185,15.006C37.39,15.006 37.591,14.983 37.787,14.936C37.992,14.88 38.179,14.805 38.347,14.712C38.515,14.609 38.664,14.488 38.795,14.348C38.925,14.208 39.028,14.054 39.103,13.886L40.419,14.264C40.167,14.815 39.747,15.267 39.159,15.622C38.58,15.967 37.903,16.14 37.129,16.14ZM39.355,11.786C39.327,11.478 39.247,11.193 39.117,10.932C38.995,10.671 38.837,10.451 38.641,10.274C38.445,10.087 38.216,9.943 37.955,9.84C37.693,9.737 37.418,9.686 37.129,9.686C36.839,9.686 36.564,9.737 36.303,9.84C36.051,9.943 35.827,10.087 35.631,10.274C35.435,10.451 35.276,10.671 35.155,10.932C35.033,11.193 34.959,11.478 34.931,11.786H39.355Z"
+      android:fillColor="#BFBFBF"/>
+  <path
+      android:pathData="M46.393,10.008C45.796,10.027 45.264,10.167 44.797,10.428C44.34,10.68 44.013,11.044 43.817,11.52V16H42.277V8.678H43.705V10.316C43.957,9.812 44.284,9.411 44.685,9.112C45.096,8.804 45.534,8.636 46.001,8.608C46.094,8.608 46.169,8.608 46.225,8.608C46.29,8.608 46.346,8.613 46.393,8.622V10.008Z"
+      android:fillColor="#BFBFBF"/>
+  <path
+      android:pathData="M50.602,16.14C50.033,16.14 49.515,16.042 49.048,15.846C48.581,15.641 48.18,15.365 47.844,15.02C47.517,14.675 47.261,14.273 47.074,13.816C46.897,13.359 46.808,12.873 46.808,12.36C46.808,11.847 46.897,11.361 47.074,10.904C47.261,10.437 47.517,10.031 47.844,9.686C48.18,9.331 48.581,9.056 49.048,8.86C49.515,8.655 50.037,8.552 50.616,8.552C51.185,8.552 51.699,8.655 52.156,8.86C52.623,9.065 53.019,9.341 53.346,9.686C53.673,10.022 53.92,10.419 54.088,10.876C54.265,11.324 54.354,11.795 54.354,12.29C54.354,12.402 54.349,12.509 54.34,12.612C54.331,12.705 54.321,12.785 54.312,12.85H48.446C48.474,13.177 48.549,13.471 48.67,13.732C48.801,13.993 48.964,14.222 49.16,14.418C49.365,14.605 49.594,14.749 49.846,14.852C50.107,14.955 50.378,15.006 50.658,15.006C50.863,15.006 51.064,14.983 51.26,14.936C51.465,14.88 51.652,14.805 51.82,14.712C51.988,14.609 52.137,14.488 52.268,14.348C52.399,14.208 52.501,14.054 52.576,13.886L53.892,14.264C53.64,14.815 53.22,15.267 52.632,15.622C52.053,15.967 51.377,16.14 50.602,16.14ZM52.828,11.786C52.8,11.478 52.721,11.193 52.59,10.932C52.469,10.671 52.31,10.451 52.114,10.274C51.918,10.087 51.689,9.943 51.428,9.84C51.167,9.737 50.891,9.686 50.602,9.686C50.313,9.686 50.037,9.737 49.776,9.84C49.524,9.943 49.3,10.087 49.104,10.274C48.908,10.451 48.749,10.671 48.628,10.932C48.507,11.193 48.432,11.478 48.404,11.786H52.828Z"
+      android:fillColor="#BFBFBF"/>
+  <path
+      android:pathData="M58.732,16.14C58.238,16.14 57.78,16.042 57.36,15.846C56.94,15.641 56.576,15.365 56.268,15.02C55.96,14.675 55.718,14.273 55.54,13.816C55.372,13.349 55.288,12.85 55.288,12.318C55.288,11.805 55.368,11.324 55.526,10.876C55.694,10.419 55.923,10.017 56.212,9.672C56.511,9.327 56.856,9.056 57.248,8.86C57.65,8.655 58.088,8.552 58.564,8.552C59.152,8.552 59.67,8.697 60.118,8.986C60.566,9.266 60.916,9.625 61.168,10.064V5.78H62.708V14.18C62.708,14.357 62.736,14.483 62.792,14.558C62.858,14.633 62.97,14.675 63.128,14.684V16C62.97,16.028 62.839,16.047 62.736,16.056C62.643,16.065 62.564,16.07 62.498,16.07C62.19,16.07 61.938,15.991 61.742,15.832C61.546,15.673 61.439,15.468 61.42,15.216L61.392,14.67C61.122,15.127 60.753,15.487 60.286,15.748C59.82,16.009 59.302,16.14 58.732,16.14ZM59.11,14.824C59.334,14.824 59.558,14.787 59.782,14.712C60.006,14.637 60.212,14.535 60.398,14.404C60.585,14.273 60.744,14.119 60.874,13.942C61.014,13.765 61.112,13.573 61.168,13.368V11.45C61.084,11.217 60.963,11.002 60.804,10.806C60.655,10.61 60.482,10.442 60.286,10.302C60.09,10.162 59.88,10.055 59.656,9.98C59.442,9.905 59.222,9.868 58.998,9.868C58.69,9.868 58.406,9.938 58.144,10.078C57.892,10.218 57.673,10.405 57.486,10.638C57.3,10.871 57.15,11.137 57.038,11.436C56.936,11.735 56.884,12.043 56.884,12.36C56.884,12.696 56.94,13.013 57.052,13.312C57.174,13.611 57.337,13.872 57.542,14.096C57.748,14.32 57.981,14.497 58.242,14.628C58.513,14.759 58.802,14.824 59.11,14.824Z"
+      android:fillColor="#BFBFBF"/>
+  <path
+      android:pathData="M72.351,16.14C71.791,16.14 71.283,16.009 70.825,15.748C70.377,15.477 70.023,15.118 69.761,14.67V16H68.403V5.78H69.943V10.064C70.233,9.597 70.592,9.229 71.021,8.958C71.46,8.687 71.973,8.552 72.561,8.552C73.047,8.552 73.49,8.659 73.891,8.874C74.293,9.079 74.633,9.359 74.913,9.714C75.203,10.059 75.422,10.465 75.571,10.932C75.73,11.389 75.809,11.87 75.809,12.374C75.809,12.897 75.721,13.387 75.543,13.844C75.366,14.301 75.123,14.703 74.815,15.048C74.507,15.384 74.139,15.65 73.709,15.846C73.289,16.042 72.837,16.14 72.351,16.14ZM71.945,14.824C72.281,14.824 72.589,14.759 72.869,14.628C73.149,14.488 73.387,14.306 73.583,14.082C73.789,13.858 73.947,13.601 74.059,13.312C74.171,13.013 74.227,12.701 74.227,12.374C74.227,12.047 74.171,11.735 74.059,11.436C73.957,11.128 73.807,10.862 73.611,10.638C73.425,10.405 73.196,10.218 72.925,10.078C72.664,9.938 72.375,9.868 72.057,9.868C71.581,9.868 71.157,10.022 70.783,10.33C70.419,10.638 70.139,11.011 69.943,11.45V13.382C69.999,13.597 70.097,13.793 70.237,13.97C70.377,14.138 70.541,14.287 70.727,14.418C70.914,14.549 71.115,14.651 71.329,14.726C71.544,14.791 71.749,14.824 71.945,14.824Z"
+      android:fillColor="#BFBFBF"/>
+  <path
+      android:pathData="M77.34,17.722C77.48,17.75 77.616,17.773 77.746,17.792C77.886,17.811 77.998,17.82 78.082,17.82C78.204,17.82 78.306,17.792 78.39,17.736C78.484,17.689 78.577,17.601 78.67,17.47C78.764,17.339 78.857,17.153 78.95,16.91C79.053,16.677 79.17,16.373 79.3,16L76.29,8.678H77.872L80.14,14.642L82.156,8.678H83.612L80.294,17.694C80.145,18.114 79.884,18.464 79.51,18.744C79.146,19.033 78.675,19.178 78.096,19.178C77.984,19.178 77.868,19.169 77.746,19.15C77.625,19.141 77.49,19.113 77.34,19.066V17.722Z"
+      android:fillColor="#BFBFBF"/>
+  <path
+      android:pathData="M92.427,16.07C91.717,16.07 91.069,15.93 90.481,15.65C89.902,15.361 89.403,14.983 88.983,14.516C88.563,14.04 88.236,13.499 88.003,12.892C87.779,12.285 87.667,11.665 87.667,11.03C87.667,10.367 87.788,9.733 88.031,9.126C88.273,8.519 88.605,7.983 89.025,7.516C89.454,7.049 89.958,6.681 90.537,6.41C91.125,6.13 91.764,5.99 92.455,5.99C93.164,5.99 93.808,6.139 94.387,6.438C94.975,6.727 95.474,7.11 95.885,7.586C96.305,8.062 96.627,8.603 96.851,9.21C97.084,9.807 97.201,10.419 97.201,11.044C97.201,11.707 97.079,12.341 96.837,12.948C96.603,13.555 96.272,14.091 95.843,14.558C95.413,15.015 94.905,15.384 94.317,15.664C93.738,15.935 93.108,16.07 92.427,16.07ZM89.263,11.03C89.263,11.497 89.337,11.949 89.487,12.388C89.636,12.827 89.846,13.214 90.117,13.55C90.397,13.886 90.733,14.157 91.125,14.362C91.517,14.558 91.955,14.656 92.441,14.656C92.945,14.656 93.388,14.553 93.771,14.348C94.163,14.133 94.494,13.853 94.765,13.508C95.035,13.163 95.241,12.775 95.381,12.346C95.521,11.917 95.591,11.478 95.591,11.03C95.591,10.554 95.516,10.101 95.367,9.672C95.217,9.233 95.003,8.851 94.723,8.524C94.452,8.188 94.121,7.922 93.729,7.726C93.346,7.521 92.917,7.418 92.441,7.418C91.937,7.418 91.489,7.525 91.097,7.74C90.705,7.945 90.373,8.216 90.103,8.552C89.832,8.888 89.622,9.275 89.473,9.714C89.333,10.143 89.263,10.582 89.263,11.03Z"
+      android:fillColor="#BFBFBF"/>
+  <path
+      android:pathData="M102.926,16.14C102.338,16.14 101.82,16 101.372,15.72C100.924,15.44 100.569,15.076 100.308,14.628V18.982H98.768V8.678H100.126V9.994C100.406,9.555 100.765,9.205 101.204,8.944C101.652,8.683 102.156,8.552 102.716,8.552C103.22,8.552 103.682,8.655 104.102,8.86C104.522,9.065 104.886,9.341 105.194,9.686C105.502,10.031 105.74,10.433 105.908,10.89C106.085,11.347 106.174,11.828 106.174,12.332C106.174,12.864 106.095,13.363 105.936,13.83C105.777,14.287 105.553,14.689 105.264,15.034C104.975,15.37 104.629,15.641 104.228,15.846C103.836,16.042 103.402,16.14 102.926,16.14ZM102.422,14.824C102.749,14.824 103.043,14.754 103.304,14.614C103.575,14.474 103.803,14.287 103.99,14.054C104.186,13.821 104.335,13.555 104.438,13.256C104.541,12.957 104.592,12.649 104.592,12.332C104.592,11.996 104.531,11.679 104.41,11.38C104.298,11.081 104.139,10.82 103.934,10.596C103.738,10.372 103.5,10.195 103.22,10.064C102.94,9.933 102.637,9.868 102.31,9.868C102.114,9.868 101.909,9.905 101.694,9.98C101.479,10.055 101.279,10.157 101.092,10.288C100.905,10.419 100.742,10.573 100.602,10.75C100.462,10.918 100.364,11.105 100.308,11.31V13.228C100.401,13.452 100.523,13.662 100.672,13.858C100.821,14.054 100.985,14.222 101.162,14.362C101.349,14.502 101.549,14.614 101.764,14.698C101.979,14.782 102.198,14.824 102.422,14.824Z"
+      android:fillColor="#BFBFBF"/>
+  <path
+      android:pathData="M111.017,16.14C110.448,16.14 109.93,16.042 109.463,15.846C108.996,15.641 108.595,15.365 108.259,15.02C107.932,14.675 107.676,14.273 107.489,13.816C107.312,13.359 107.223,12.873 107.223,12.36C107.223,11.847 107.312,11.361 107.489,10.904C107.676,10.437 107.932,10.031 108.259,9.686C108.595,9.331 108.996,9.056 109.463,8.86C109.93,8.655 110.452,8.552 111.031,8.552C111.6,8.552 112.114,8.655 112.571,8.86C113.038,9.065 113.434,9.341 113.761,9.686C114.088,10.022 114.335,10.419 114.503,10.876C114.68,11.324 114.769,11.795 114.769,12.29C114.769,12.402 114.764,12.509 114.755,12.612C114.746,12.705 114.736,12.785 114.727,12.85H108.861C108.889,13.177 108.964,13.471 109.085,13.732C109.216,13.993 109.379,14.222 109.575,14.418C109.78,14.605 110.009,14.749 110.261,14.852C110.522,14.955 110.793,15.006 111.073,15.006C111.278,15.006 111.479,14.983 111.675,14.936C111.88,14.88 112.067,14.805 112.235,14.712C112.403,14.609 112.552,14.488 112.683,14.348C112.814,14.208 112.916,14.054 112.991,13.886L114.307,14.264C114.055,14.815 113.635,15.267 113.047,15.622C112.468,15.967 111.792,16.14 111.017,16.14ZM113.243,11.786C113.215,11.478 113.136,11.193 113.005,10.932C112.884,10.671 112.725,10.451 112.529,10.274C112.333,10.087 112.104,9.943 111.843,9.84C111.582,9.737 111.306,9.686 111.017,9.686C110.728,9.686 110.452,9.737 110.191,9.84C109.939,9.943 109.715,10.087 109.519,10.274C109.323,10.451 109.164,10.671 109.043,10.932C108.922,11.193 108.847,11.478 108.819,11.786H113.243Z"
+      android:fillColor="#BFBFBF"/>
+  <path
+      android:pathData="M122.731,16H121.191V11.898C121.191,11.207 121.079,10.708 120.855,10.4C120.641,10.083 120.319,9.924 119.889,9.924C119.665,9.924 119.441,9.966 119.217,10.05C118.993,10.134 118.783,10.255 118.587,10.414C118.391,10.563 118.214,10.745 118.055,10.96C117.906,11.165 117.789,11.394 117.705,11.646V16H116.165V8.678H117.565V10.148C117.845,9.653 118.251,9.266 118.783,8.986C119.315,8.697 119.903,8.552 120.547,8.552C120.986,8.552 121.345,8.631 121.625,8.79C121.905,8.949 122.125,9.168 122.283,9.448C122.451,9.719 122.568,10.036 122.633,10.4C122.699,10.755 122.731,11.133 122.731,11.534V16Z"
+      android:fillColor="#BFBFBF"/>
+  <path
+      android:pathData="M130.735,8.398C130.641,8.295 130.506,8.188 130.329,8.076C130.151,7.955 129.941,7.843 129.699,7.74C129.465,7.637 129.204,7.553 128.915,7.488C128.635,7.423 128.345,7.39 128.047,7.39C127.384,7.39 126.894,7.511 126.577,7.754C126.269,7.997 126.115,8.333 126.115,8.762C126.115,9.005 126.161,9.205 126.255,9.364C126.357,9.513 126.511,9.649 126.717,9.77C126.922,9.882 127.179,9.985 127.487,10.078C127.795,10.162 128.154,10.255 128.565,10.358C129.069,10.479 129.521,10.615 129.923,10.764C130.333,10.913 130.679,11.095 130.959,11.31C131.239,11.525 131.453,11.791 131.603,12.108C131.761,12.416 131.841,12.794 131.841,13.242C131.841,13.746 131.743,14.18 131.547,14.544C131.36,14.908 131.099,15.207 130.763,15.44C130.436,15.664 130.053,15.832 129.615,15.944C129.176,16.047 128.705,16.098 128.201,16.098C127.445,16.098 126.712,15.986 126.003,15.762C125.303,15.529 124.668,15.193 124.099,14.754L124.813,13.41C124.934,13.531 125.107,13.667 125.331,13.816C125.564,13.965 125.83,14.105 126.129,14.236C126.437,14.357 126.768,14.465 127.123,14.558C127.477,14.642 127.846,14.684 128.229,14.684C128.845,14.684 129.321,14.577 129.657,14.362C129.993,14.147 130.161,13.83 130.161,13.41C130.161,13.158 130.095,12.948 129.965,12.78C129.843,12.612 129.666,12.467 129.433,12.346C129.199,12.215 128.915,12.099 128.579,11.996C128.243,11.893 127.86,11.786 127.431,11.674C126.936,11.543 126.502,11.408 126.129,11.268C125.765,11.119 125.461,10.941 125.219,10.736C124.976,10.531 124.789,10.293 124.659,10.022C124.537,9.742 124.477,9.406 124.477,9.014C124.477,8.529 124.57,8.099 124.757,7.726C124.943,7.343 125.195,7.026 125.513,6.774C125.839,6.513 126.222,6.317 126.661,6.186C127.099,6.055 127.575,5.99 128.089,5.99C128.761,5.99 129.381,6.097 129.951,6.312C130.52,6.527 131.019,6.793 131.449,7.11L130.735,8.398Z"
+      android:fillColor="#BFBFBF"/>
+  <path
+      android:pathData="M137.349,15.622C137.153,15.715 136.883,15.823 136.537,15.944C136.192,16.056 135.823,16.112 135.431,16.112C135.189,16.112 134.96,16.079 134.745,16.014C134.531,15.949 134.339,15.851 134.171,15.72C134.013,15.589 133.887,15.421 133.793,15.216C133.7,15.001 133.653,14.745 133.653,14.446V9.868H132.687V8.678H133.653V6.27H135.193V8.678H136.789V9.868H135.193V13.956C135.212,14.217 135.291,14.409 135.431,14.53C135.581,14.642 135.763,14.698 135.977,14.698C136.192,14.698 136.397,14.661 136.593,14.586C136.789,14.511 136.934,14.451 137.027,14.404L137.349,15.622Z"
+      android:fillColor="#BFBFBF"/>
+  <path
+      android:pathData="M142.672,10.008C142.075,10.027 141.543,10.167 141.076,10.428C140.619,10.68 140.292,11.044 140.096,11.52V16H138.556V8.678H139.984V10.316C140.236,9.812 140.563,9.411 140.964,9.112C141.375,8.804 141.813,8.636 142.28,8.608C142.373,8.608 142.448,8.608 142.504,8.608C142.569,8.608 142.625,8.613 142.672,8.622V10.008Z"
+      android:fillColor="#BFBFBF"/>
+  <path
+      android:pathData="M146.881,16.14C146.312,16.14 145.794,16.042 145.327,15.846C144.86,15.641 144.459,15.365 144.123,15.02C143.796,14.675 143.54,14.273 143.353,13.816C143.176,13.359 143.087,12.873 143.087,12.36C143.087,11.847 143.176,11.361 143.353,10.904C143.54,10.437 143.796,10.031 144.123,9.686C144.459,9.331 144.86,9.056 145.327,8.86C145.794,8.655 146.316,8.552 146.895,8.552C147.464,8.552 147.978,8.655 148.435,8.86C148.902,9.065 149.298,9.341 149.625,9.686C149.952,10.022 150.199,10.419 150.367,10.876C150.544,11.324 150.633,11.795 150.633,12.29C150.633,12.402 150.628,12.509 150.619,12.612C150.61,12.705 150.6,12.785 150.591,12.85H144.725C144.753,13.177 144.828,13.471 144.949,13.732C145.08,13.993 145.243,14.222 145.439,14.418C145.644,14.605 145.873,14.749 146.125,14.852C146.386,14.955 146.657,15.006 146.937,15.006C147.142,15.006 147.343,14.983 147.539,14.936C147.744,14.88 147.931,14.805 148.099,14.712C148.267,14.609 148.416,14.488 148.547,14.348C148.678,14.208 148.78,14.054 148.855,13.886L150.171,14.264C149.919,14.815 149.499,15.267 148.911,15.622C148.332,15.967 147.656,16.14 146.881,16.14ZM149.107,11.786C149.079,11.478 149,11.193 148.869,10.932C148.748,10.671 148.589,10.451 148.393,10.274C148.197,10.087 147.968,9.943 147.707,9.84C147.446,9.737 147.17,9.686 146.881,9.686C146.592,9.686 146.316,9.737 146.055,9.84C145.803,9.943 145.579,10.087 145.383,10.274C145.187,10.451 145.028,10.671 144.907,10.932C144.786,11.193 144.711,11.478 144.683,11.786H149.107Z"
+      android:fillColor="#BFBFBF"/>
+  <path
+      android:pathData="M155.347,16.14C154.778,16.14 154.26,16.042 153.793,15.846C153.327,15.641 152.925,15.365 152.589,15.02C152.263,14.675 152.006,14.273 151.819,13.816C151.642,13.359 151.553,12.873 151.553,12.36C151.553,11.847 151.642,11.361 151.819,10.904C152.006,10.437 152.263,10.031 152.589,9.686C152.925,9.331 153.327,9.056 153.793,8.86C154.26,8.655 154.783,8.552 155.361,8.552C155.931,8.552 156.444,8.655 156.901,8.86C157.368,9.065 157.765,9.341 158.091,9.686C158.418,10.022 158.665,10.419 158.833,10.876C159.011,11.324 159.099,11.795 159.099,12.29C159.099,12.402 159.095,12.509 159.085,12.612C159.076,12.705 159.067,12.785 159.057,12.85H153.191C153.219,13.177 153.294,13.471 153.415,13.732C153.546,13.993 153.709,14.222 153.905,14.418C154.111,14.605 154.339,14.749 154.591,14.852C154.853,14.955 155.123,15.006 155.403,15.006C155.609,15.006 155.809,14.983 156.005,14.936C156.211,14.88 156.397,14.805 156.565,14.712C156.733,14.609 156.883,14.488 157.013,14.348C157.144,14.208 157.247,14.054 157.321,13.886L158.637,14.264C158.385,14.815 157.965,15.267 157.377,15.622C156.799,15.967 156.122,16.14 155.347,16.14ZM157.573,11.786C157.545,11.478 157.466,11.193 157.335,10.932C157.214,10.671 157.055,10.451 156.859,10.274C156.663,10.087 156.435,9.943 156.173,9.84C155.912,9.737 155.637,9.686 155.347,9.686C155.058,9.686 154.783,9.737 154.521,9.84C154.269,9.943 154.045,10.087 153.849,10.274C153.653,10.451 153.495,10.671 153.373,10.932C153.252,11.193 153.177,11.478 153.149,11.786H157.573Z"
+      android:fillColor="#BFBFBF"/>
+  <path
+      android:pathData="M164.515,15.622C164.319,15.715 164.048,15.823 163.703,15.944C163.357,16.056 162.989,16.112 162.597,16.112C162.354,16.112 162.125,16.079 161.911,16.014C161.696,15.949 161.505,15.851 161.337,15.72C161.178,15.589 161.052,15.421 160.959,15.216C160.865,15.001 160.819,14.745 160.819,14.446V9.868H159.853V8.678H160.819V6.27H162.359V8.678H163.955V9.868H162.359V13.956C162.377,14.217 162.457,14.409 162.597,14.53C162.746,14.642 162.928,14.698 163.143,14.698C163.357,14.698 163.563,14.661 163.759,14.586C163.955,14.511 164.099,14.451 164.193,14.404L164.515,15.622Z"
+      android:fillColor="#BFBFBF"/>
+  <path
+      android:pathData="M174.275,16V8.846L171.321,14.264H170.453L167.485,8.846V16H165.917V6.06H167.597L170.887,12.136L174.177,6.06H175.857V16H174.275Z"
+      android:fillColor="#BFBFBF"/>
+  <path
+      android:pathData="M179.921,16.14C179.566,16.14 179.235,16.084 178.927,15.972C178.628,15.851 178.367,15.687 178.143,15.482C177.928,15.277 177.755,15.034 177.625,14.754C177.503,14.474 177.443,14.171 177.443,13.844C177.443,13.499 177.517,13.186 177.667,12.906C177.816,12.626 178.026,12.383 178.297,12.178C178.577,11.973 178.903,11.814 179.277,11.702C179.659,11.59 180.079,11.534 180.537,11.534C180.882,11.534 181.223,11.567 181.559,11.632C181.895,11.688 182.198,11.767 182.469,11.87V11.366C182.469,10.825 182.315,10.405 182.007,10.106C181.699,9.798 181.255,9.644 180.677,9.644C180.285,9.644 179.897,9.719 179.515,9.868C179.141,10.008 178.754,10.213 178.353,10.484L177.877,9.504C178.819,8.869 179.799,8.552 180.817,8.552C181.825,8.552 182.609,8.809 183.169,9.322C183.729,9.835 184.009,10.573 184.009,11.534V14.18C184.009,14.507 184.144,14.675 184.415,14.684V16C184.265,16.028 184.135,16.047 184.023,16.056C183.92,16.065 183.817,16.07 183.715,16.07C183.416,16.07 183.183,15.995 183.015,15.846C182.856,15.697 182.758,15.505 182.721,15.272L182.679,14.81C182.352,15.239 181.946,15.571 181.461,15.804C180.985,16.028 180.471,16.14 179.921,16.14ZM180.341,15.006C180.714,15.006 181.064,14.941 181.391,14.81C181.727,14.67 181.988,14.479 182.175,14.236C182.371,14.068 182.469,13.891 182.469,13.704V12.738C182.207,12.635 181.927,12.556 181.629,12.5C181.339,12.444 181.055,12.416 180.775,12.416C180.224,12.416 179.771,12.537 179.417,12.78C179.071,13.013 178.899,13.326 178.899,13.718C178.899,14.082 179.034,14.39 179.305,14.642C179.575,14.885 179.921,15.006 180.341,15.006Z"
+      android:fillColor="#BFBFBF"/>
+  <path
+      android:pathData="M190.175,16.14C189.587,16.14 189.069,16 188.621,15.72C188.173,15.44 187.818,15.076 187.557,14.628V18.982H186.017V8.678H187.375V9.994C187.655,9.555 188.014,9.205 188.453,8.944C188.901,8.683 189.405,8.552 189.965,8.552C190.469,8.552 190.931,8.655 191.351,8.86C191.771,9.065 192.135,9.341 192.443,9.686C192.751,10.031 192.989,10.433 193.157,10.89C193.334,11.347 193.423,11.828 193.423,12.332C193.423,12.864 193.344,13.363 193.185,13.83C193.026,14.287 192.802,14.689 192.513,15.034C192.224,15.37 191.878,15.641 191.477,15.846C191.085,16.042 190.651,16.14 190.175,16.14ZM189.671,14.824C189.998,14.824 190.292,14.754 190.553,14.614C190.824,14.474 191.052,14.287 191.239,14.054C191.435,13.821 191.584,13.555 191.687,13.256C191.79,12.957 191.841,12.649 191.841,12.332C191.841,11.996 191.78,11.679 191.659,11.38C191.547,11.081 191.388,10.82 191.183,10.596C190.987,10.372 190.749,10.195 190.469,10.064C190.189,9.933 189.886,9.868 189.559,9.868C189.363,9.868 189.158,9.905 188.943,9.98C188.728,10.055 188.528,10.157 188.341,10.288C188.154,10.419 187.991,10.573 187.851,10.75C187.711,10.918 187.613,11.105 187.557,11.31V13.228C187.65,13.452 187.772,13.662 187.921,13.858C188.07,14.054 188.234,14.222 188.411,14.362C188.598,14.502 188.798,14.614 189.013,14.698C189.228,14.782 189.447,14.824 189.671,14.824Z"
+      android:fillColor="#BFBFBF"/>
+  <path
+      android:pathData="M201.529,16.14C201.034,16.14 200.577,16.042 200.157,15.846C199.737,15.641 199.373,15.365 199.065,15.02C198.757,14.675 198.514,14.273 198.337,13.816C198.169,13.349 198.085,12.85 198.085,12.318C198.085,11.805 198.164,11.324 198.323,10.876C198.491,10.419 198.72,10.017 199.009,9.672C199.308,9.327 199.653,9.056 200.045,8.86C200.446,8.655 200.885,8.552 201.361,8.552C201.949,8.552 202.467,8.697 202.915,8.986C203.363,9.266 203.713,9.625 203.965,10.064V5.78H205.505V14.18C205.505,14.357 205.533,14.483 205.589,14.558C205.654,14.633 205.766,14.675 205.925,14.684V16C205.766,16.028 205.636,16.047 205.533,16.056C205.44,16.065 205.36,16.07 205.295,16.07C204.987,16.07 204.735,15.991 204.539,15.832C204.343,15.673 204.236,15.468 204.217,15.216L204.189,14.67C203.918,15.127 203.55,15.487 203.083,15.748C202.616,16.009 202.098,16.14 201.529,16.14ZM201.907,14.824C202.131,14.824 202.355,14.787 202.579,14.712C202.803,14.637 203.008,14.535 203.195,14.404C203.382,14.273 203.54,14.119 203.671,13.942C203.811,13.765 203.909,13.573 203.965,13.368V11.45C203.881,11.217 203.76,11.002 203.601,10.806C203.452,10.61 203.279,10.442 203.083,10.302C202.887,10.162 202.677,10.055 202.453,9.98C202.238,9.905 202.019,9.868 201.795,9.868C201.487,9.868 201.202,9.938 200.941,10.078C200.689,10.218 200.47,10.405 200.283,10.638C200.096,10.871 199.947,11.137 199.835,11.436C199.732,11.735 199.681,12.043 199.681,12.36C199.681,12.696 199.737,13.013 199.849,13.312C199.97,13.611 200.134,13.872 200.339,14.096C200.544,14.32 200.778,14.497 201.039,14.628C201.31,14.759 201.599,14.824 201.907,14.824Z"
+      android:fillColor="#BFBFBF"/>
+  <path
+      android:pathData="M209.547,16.14C209.192,16.14 208.861,16.084 208.553,15.972C208.254,15.851 207.993,15.687 207.769,15.482C207.554,15.277 207.382,15.034 207.251,14.754C207.13,14.474 207.069,14.171 207.069,13.844C207.069,13.499 207.144,13.186 207.293,12.906C207.442,12.626 207.652,12.383 207.923,12.178C208.203,11.973 208.53,11.814 208.903,11.702C209.286,11.59 209.706,11.534 210.163,11.534C210.508,11.534 210.849,11.567 211.185,11.632C211.521,11.688 211.824,11.767 212.095,11.87V11.366C212.095,10.825 211.941,10.405 211.633,10.106C211.325,9.798 210.882,9.644 210.303,9.644C209.911,9.644 209.524,9.719 209.141,9.868C208.768,10.008 208.38,10.213 207.979,10.484L207.503,9.504C208.446,8.869 209.426,8.552 210.443,8.552C211.451,8.552 212.235,8.809 212.795,9.322C213.355,9.835 213.635,10.573 213.635,11.534V14.18C213.635,14.507 213.77,14.675 214.041,14.684V16C213.892,16.028 213.761,16.047 213.649,16.056C213.546,16.065 213.444,16.07 213.341,16.07C213.042,16.07 212.809,15.995 212.641,15.846C212.482,15.697 212.384,15.505 212.347,15.272L212.305,14.81C211.978,15.239 211.572,15.571 211.087,15.804C210.611,16.028 210.098,16.14 209.547,16.14ZM209.967,15.006C210.34,15.006 210.69,14.941 211.017,14.81C211.353,14.67 211.614,14.479 211.801,14.236C211.997,14.068 212.095,13.891 212.095,13.704V12.738C211.834,12.635 211.554,12.556 211.255,12.5C210.966,12.444 210.681,12.416 210.401,12.416C209.85,12.416 209.398,12.537 209.043,12.78C208.698,13.013 208.525,13.326 208.525,13.718C208.525,14.082 208.66,14.39 208.931,14.642C209.202,14.885 209.547,15.006 209.967,15.006Z"
+      android:fillColor="#BFBFBF"/>
+  <path
+      android:pathData="M219.663,15.622C219.467,15.715 219.196,15.823 218.851,15.944C218.505,16.056 218.137,16.112 217.745,16.112C217.502,16.112 217.273,16.079 217.059,16.014C216.844,15.949 216.653,15.851 216.485,15.72C216.326,15.589 216.2,15.421 216.107,15.216C216.013,15.001 215.967,14.745 215.967,14.446V9.868H215.001V8.678H215.967V6.27H217.507V8.678H219.103V9.868H217.507V13.956C217.525,14.217 217.605,14.409 217.745,14.53C217.894,14.642 218.076,14.698 218.291,14.698C218.505,14.698 218.711,14.661 218.907,14.586C219.103,14.511 219.247,14.451 219.341,14.404L219.663,15.622Z"
+      android:fillColor="#BFBFBF"/>
+  <path
+      android:pathData="M222.815,16.14C222.461,16.14 222.129,16.084 221.821,15.972C221.523,15.851 221.261,15.687 221.037,15.482C220.823,15.277 220.65,15.034 220.519,14.754C220.398,14.474 220.337,14.171 220.337,13.844C220.337,13.499 220.412,13.186 220.561,12.906C220.711,12.626 220.921,12.383 221.191,12.178C221.471,11.973 221.798,11.814 222.171,11.702C222.554,11.59 222.974,11.534 223.431,11.534C223.777,11.534 224.117,11.567 224.453,11.632C224.789,11.688 225.093,11.767 225.363,11.87V11.366C225.363,10.825 225.209,10.405 224.901,10.106C224.593,9.798 224.15,9.644 223.571,9.644C223.179,9.644 222.792,9.719 222.409,9.868C222.036,10.008 221.649,10.213 221.247,10.484L220.771,9.504C221.714,8.869 222.694,8.552 223.711,8.552C224.719,8.552 225.503,8.809 226.063,9.322C226.623,9.835 226.903,10.573 226.903,11.534V14.18C226.903,14.507 227.039,14.675 227.309,14.684V16C227.16,16.028 227.029,16.047 226.917,16.056C226.815,16.065 226.712,16.07 226.609,16.07C226.311,16.07 226.077,15.995 225.909,15.846C225.751,15.697 225.653,15.505 225.615,15.272L225.573,14.81C225.247,15.239 224.841,15.571 224.355,15.804C223.879,16.028 223.366,16.14 222.815,16.14ZM223.235,15.006C223.609,15.006 223.959,14.941 224.285,14.81C224.621,14.67 224.883,14.479 225.069,14.236C225.265,14.068 225.363,13.891 225.363,13.704V12.738C225.102,12.635 224.822,12.556 224.523,12.5C224.234,12.444 223.949,12.416 223.669,12.416C223.119,12.416 222.666,12.537 222.311,12.78C221.966,13.013 221.793,13.326 221.793,13.718C221.793,14.082 221.929,14.39 222.199,14.642C222.47,14.885 222.815,15.006 223.235,15.006Z"
+      android:fillColor="#BFBFBF"/>
+</vector>

OsmAnd/res/drawable/image_text_osmand.xml

@@ -0,0 +1,27 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="172dp"
+    android:height="36dp"
+    android:viewportWidth="172"
+    android:viewportHeight="36">
+  <group>
+    <clip-path android:pathData="M0,0h172v36h-172z M 0,0"/>
+    <path
+        android:pathData="M15.4629 34.252C13.2509 34.252 11.2349 33.818 9.41489 32.95C7.59489 32.082 6.0409 30.948 4.7529 29.548C3.4649 28.12 2.4569 26.496 1.7289 24.676C1.0289 22.856 0.678894 20.98 0.678894 19.048C0.678894 17.088 1.0429 15.198 1.7709 13.378C2.5269 11.558 3.56289 9.96203 4.87889 8.59003C6.2229 7.19003 7.8049 6.08403 9.6249 5.27203C11.4449 4.43203 13.4329 4.01203 15.5889 4.01203C17.8009 4.01203 19.8169 4.44603 21.6369 5.31403C23.4569 6.18203 25.0109 7.33003 26.2989 8.75803C27.5869 10.186 28.5809 11.81 29.2809 13.63C29.9809 15.45 30.3309 17.298 30.3309 19.174C30.3309 21.134 29.9529 23.024 29.1969 24.844C28.4689 26.664 27.4469 28.274 26.1309 29.674C24.8149 31.046 23.2469 32.152 21.4269 32.992C19.6069 33.832 17.6189 34.252 15.4629 34.252ZM7.69289 19.132C7.69289 20.28 7.8609 21.4 8.1969 22.492C8.5329 23.556 9.0229 24.508 9.6669 25.348C10.3389 26.188 11.1649 26.86 12.1449 27.364C13.1249 27.868 14.2449 28.12 15.5049 28.12C16.8209 28.12 17.9689 27.854 18.9489 27.322C19.9289 26.79 20.7409 26.104 21.3849 25.264C22.0289 24.396 22.5049 23.43 22.8129 22.366C23.1489 21.274 23.3169 20.168 23.3169 19.048C23.3169 17.9 23.1489 16.794 22.8129 15.73C22.4769 14.638 21.9729 13.686 21.3009 12.874C20.6289 12.034 19.8029 11.376 18.8229 10.9C17.8709 10.396 16.7649 10.144 15.5049 10.144C14.1889 10.144 13.0409 10.41 12.0609 10.942C11.1089 11.446 10.2969 12.118 9.6249 12.958C8.9809 13.798 8.4909 14.764 8.1549 15.856C7.8469 16.92 7.69289 18.012 7.69289 19.132Z"
+        android:fillColor="#BFBFBF"/>
+    <path
+        android:pathData="M42.459 34.42C40.583 34.42 38.7351 34.126 36.9151 33.538C35.0951 32.922 33.555 32.04 32.295 30.892L34.6891 26.776C36.0331 27.7 37.3351 28.414 38.5951 28.918C39.8831 29.422 41.115 29.674 42.291 29.674C43.159 29.674 43.831 29.52 44.307 29.212C44.783 28.904 45.0211 28.456 45.0211 27.868C45.0211 27.28 44.713 26.818 44.097 26.482C43.509 26.118 42.459 25.74 40.947 25.348C39.463 24.928 38.203 24.522 37.167 24.13C36.159 23.738 35.3331 23.304 34.6891 22.828C34.0451 22.352 33.5831 21.806 33.3031 21.19C33.0231 20.574 32.8831 19.846 32.8831 19.006C32.8831 17.886 33.107 16.864 33.555 15.94C34.003 15.016 34.619 14.232 35.403 13.588C36.187 12.944 37.1111 12.44 38.1751 12.076C39.2671 11.712 40.4431 11.53 41.7031 11.53C43.3551 11.53 44.8951 11.754 46.3231 12.202C47.7791 12.65 49.1791 13.462 50.5231 14.638L47.9191 18.67C46.6591 17.802 45.5391 17.172 44.5591 16.78C43.5791 16.388 42.6271 16.192 41.7031 16.192C40.9751 16.192 40.3591 16.346 39.8551 16.654C39.3511 16.934 39.099 17.396 39.099 18.04C39.099 18.656 39.3651 19.118 39.8971 19.426C40.4571 19.734 41.4791 20.07 42.9631 20.434C44.5311 20.854 45.8471 21.274 46.9111 21.694C48.0031 22.114 48.885 22.59 49.557 23.122C50.229 23.626 50.719 24.214 51.0271 24.886C51.3351 25.558 51.4891 26.356 51.4891 27.28C51.4891 29.464 50.6771 31.2 49.0531 32.488C47.4291 33.776 45.231 34.42 42.459 34.42Z"
+        android:fillColor="#BFBFBF"/>
+    <path
+        android:pathData="M89.584 34H82.864V21.61C82.864 20.154 82.598 19.104 82.066 18.46C81.534 17.788 80.848 17.452 80.008 17.452C79.56 17.452 79.098 17.55 78.622 17.746C78.174 17.942 77.754 18.222 77.362 18.586C76.97 18.922 76.606 19.328 76.27 19.804C75.962 20.28 75.71 20.798 75.514 21.358V34H68.794V21.61C68.794 20.154 68.528 19.104 67.996 18.46C67.464 17.788 66.778 17.452 65.938 17.452C65.042 17.452 64.16 17.816 63.292 18.544C62.452 19.244 61.836 20.182 61.444 21.358V34H54.724V11.95H60.772V15.646C61.584 14.302 62.676 13.28 64.048 12.58C65.448 11.88 67.072 11.53 68.92 11.53C69.844 11.53 70.642 11.642 71.314 11.866C72.014 12.09 72.616 12.398 73.12 12.79C73.624 13.182 74.03 13.644 74.338 14.176C74.646 14.68 74.87 15.226 75.01 15.814C75.85 14.442 76.956 13.392 78.328 12.664C79.7 11.908 81.268 11.53 83.032 11.53C84.432 11.53 85.552 11.796 86.392 12.328C87.26 12.832 87.932 13.504 88.408 14.344C88.884 15.156 89.192 16.052 89.332 17.032C89.5 18.012 89.584 18.964 89.584 19.888V34Z"
+        android:fillColor="#BFBFBF"/>
+    <path
+        android:pathData="M102.628 4.18003H108.844L119.722 34H112.666L110.356 27.322H101.074L98.806 34H91.75L102.628 4.18003ZM109.222 22.576L105.736 12.034L102.166 22.576H109.222Z"
+        android:fillColor="#BFBFBF"/>
+    <path
+        android:pathData="M143.365 34H136.645V21.61C136.645 20.154 136.365 19.104 135.805 18.46C135.273 17.788 134.559 17.452 133.663 17.452C133.187 17.452 132.711 17.55 132.235 17.746C131.759 17.942 131.297 18.222 130.849 18.586C130.401 18.922 129.995 19.328 129.631 19.804C129.295 20.28 129.029 20.798 128.833 21.358V34H122.113V11.95H128.161V15.646C128.973 14.33 130.121 13.322 131.605 12.622C133.089 11.894 134.797 11.53 136.729 11.53C138.157 11.53 139.305 11.796 140.173 12.328C141.041 12.832 141.713 13.504 142.189 14.344C142.665 15.156 142.973 16.052 143.113 17.032C143.281 18.012 143.365 18.964 143.365 19.888V34Z"
+        android:fillColor="#BFBFBF"/>
+    <path
+        android:pathData="M156.986 34.42C155.474 34.42 154.074 34.14 152.786 33.58C151.526 32.992 150.434 32.18 149.51 31.144C148.586 30.108 147.858 28.904 147.326 27.532C146.822 26.132 146.57 24.606 146.57 22.954C146.57 21.358 146.808 19.86 147.284 18.46C147.76 17.06 148.431 15.856 149.299 14.848C150.167 13.812 151.189 13 152.365 12.412C153.569 11.824 154.886 11.53 156.314 11.53C157.854 11.53 159.239 11.894 160.471 12.622C161.731 13.35 162.698 14.33 163.37 15.562V3.34003H170.09V26.44C170.09 27.112 170.188 27.588 170.383 27.868C170.607 28.12 170.986 28.274 171.518 28.33V34C170.902 34.14 170.37 34.224 169.922 34.252C169.474 34.308 169.053 34.336 168.661 34.336C167.485 34.336 166.533 34.098 165.805 33.622C165.077 33.118 164.658 32.404 164.546 31.48L164.419 30.346C163.635 31.718 162.572 32.74 161.228 33.412C159.912 34.084 158.498 34.42 156.986 34.42ZM158.792 28.75C159.716 28.75 160.597 28.484 161.438 27.952C162.306 27.392 162.963 26.636 163.411 25.684V21.064C162.991 19.944 162.306 19.034 161.354 18.334C160.43 17.606 159.464 17.242 158.456 17.242C157.728 17.242 157.055 17.41 156.439 17.746C155.851 18.054 155.333 18.474 154.885 19.006C154.437 19.538 154.087 20.154 153.835 20.854C153.611 21.554 153.499 22.296 153.499 23.08C153.499 23.892 153.626 24.648 153.878 25.348C154.158 26.048 154.521 26.65 154.969 27.154C155.445 27.658 156.006 28.05 156.65 28.33C157.322 28.61 158.036 28.75 158.792 28.75Z"
+        android:fillColor="#BFBFBF"/>
+  </group>
+</vector>

OsmAnd/res/drawable/image_text_osmand_inapp.xml

@@ -0,0 +1,37 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="172dp"
+    android:height="72dp"
+    android:viewportWidth="172"
+    android:viewportHeight="72">
+  <group>
+    <clip-path android:pathData="M0,0h172v72h-172z M 0,0"/>
+    <path
+        android:pathData="M152.786 33.58C154.074 34.14 155.474 34.42 156.986 34.42C158.497 34.42 159.912 34.084 161.228 33.412C162.572 32.74 163.635 31.718 164.419 30.346L164.546 31.48C164.658 32.404 165.077 33.118 165.805 33.622C166.533 34.098 167.486 34.336 168.661 34.336C169.053 34.336 169.474 34.308 169.922 34.252C170.37 34.224 170.902 34.14 171.518 34V28.33C170.986 28.274 170.607 28.12 170.383 27.868C170.188 27.588 170.09 27.112 170.09 26.44V3.34003H163.37V15.562C162.698 14.33 161.731 13.35 160.471 12.622C159.24 11.894 157.854 11.53 156.314 11.53C154.886 11.53 153.569 11.824 152.365 12.412C151.189 13 150.167 13.812 149.299 14.848C148.432 15.856 147.76 17.06 147.284 18.46C146.808 19.86 146.57 21.358 146.57 22.954C146.57 24.606 146.822 26.132 147.326 27.532C147.857 28.904 148.586 30.108 149.51 31.144C150.434 32.18 151.526 32.992 152.786 33.58ZM161.438 27.952C160.598 28.484 159.715 28.75 158.792 28.75C158.036 28.75 157.322 28.61 156.65 28.33C156.006 28.05 155.445 27.658 154.969 27.154C154.521 26.65 154.158 26.048 153.878 25.348C153.626 24.648 153.499 23.892 153.499 23.08C153.499 22.296 153.611 21.554 153.835 20.854C154.087 20.154 154.438 19.538 154.885 19.006C155.333 18.474 155.852 18.054 156.439 17.746C157.055 17.41 157.728 17.242 158.456 17.242C159.464 17.242 160.43 17.606 161.354 18.334C162.305 19.034 162.992 19.944 163.411 21.064V25.684C162.964 26.636 162.305 27.392 161.438 27.952Z"
+        android:fillColor="#BFBFBF"
+        android:fillType="evenOdd"/>
+    <path
+        android:pathData="M9.41489 32.95C11.2349 33.818 13.2509 34.252 15.4629 34.252C17.6189 34.252 19.6069 33.832 21.4269 32.992C23.2469 32.152 24.8149 31.046 26.1309 29.674C27.4469 28.274 28.4689 26.664 29.1969 24.844C29.9529 23.024 30.3309 21.134 30.3309 19.174C30.3309 17.298 29.9809 15.45 29.2809 13.63C28.5809 11.81 27.5869 10.186 26.2989 8.75803C25.0109 7.33003 23.4569 6.18203 21.6369 5.31403C19.8169 4.44603 17.8009 4.01203 15.5889 4.01203C13.4329 4.01203 11.4449 4.43203 9.6249 5.27203C7.8049 6.08403 6.2229 7.19003 4.87889 8.59003C3.56289 9.96203 2.5269 11.558 1.7709 13.378C1.0429 15.198 0.678894 17.088 0.678894 19.048C0.678894 20.98 1.0289 22.856 1.7289 24.676C2.4569 26.496 3.4649 28.12 4.7529 29.548C6.0409 30.948 7.59489 32.082 9.41489 32.95ZM8.1969 22.492C7.8609 21.4 7.69289 20.28 7.69289 19.132C7.69289 18.012 7.8469 16.92 8.1549 15.856C8.4909 14.764 8.9809 13.798 9.6249 12.958C10.2969 12.118 11.1089 11.446 12.0609 10.942C13.0409 10.41 14.1889 10.144 15.5049 10.144C16.7649 10.144 17.8709 10.396 18.8229 10.9C19.8029 11.376 20.6289 12.034 21.3009 12.874C21.9729 13.686 22.4769 14.638 22.8129 15.73C23.1489 16.794 23.3169 17.9 23.3169 19.048C23.3169 20.168 23.1489 21.274 22.8129 22.366C22.5049 23.43 22.0289 24.396 21.3849 25.264C20.7409 26.104 19.9289 26.79 18.9489 27.322C17.9689 27.854 16.8209 28.12 15.5049 28.12C14.2449 28.12 13.1249 27.868 12.1449 27.364C11.1649 26.86 10.3389 26.188 9.6669 25.348C9.0229 24.508 8.5329 23.556 8.1969 22.492Z"
+        android:fillColor="#BFBFBF"
+        android:fillType="evenOdd"/>
+    <path
+        android:pathData="M36.9151 33.538C38.7351 34.126 40.583 34.42 42.459 34.42C45.231 34.42 47.4291 33.776 49.0531 32.488C50.6771 31.2 51.4891 29.464 51.4891 27.28C51.4891 26.356 51.335 25.558 51.0271 24.886C50.7191 24.214 50.229 23.626 49.557 23.122C48.885 22.59 48.0031 22.114 46.9111 21.694C45.8471 21.274 44.5311 20.854 42.9631 20.434C41.4791 20.07 40.4571 19.734 39.8971 19.426C39.3651 19.118 39.099 18.656 39.099 18.04C39.099 17.396 39.3511 16.934 39.8551 16.654C40.3591 16.346 40.9751 16.192 41.7031 16.192C42.6271 16.192 43.5791 16.388 44.5591 16.78C45.5391 17.172 46.6591 17.802 47.9191 18.67L50.5231 14.638C49.1791 13.462 47.7791 12.65 46.3231 12.202C44.8951 11.754 43.3551 11.53 41.7031 11.53C40.4431 11.53 39.2671 11.712 38.1751 12.076C37.1111 12.44 36.187 12.944 35.403 13.588C34.619 14.232 34.0031 15.016 33.555 15.94C33.107 16.864 32.8831 17.886 32.8831 19.006C32.8831 19.846 33.0231 20.574 33.3031 21.19C33.583 21.806 34.0451 22.352 34.6891 22.828C35.3331 23.304 36.159 23.738 37.167 24.13C38.203 24.522 39.463 24.928 40.947 25.348C42.459 25.74 43.509 26.118 44.097 26.482C44.7131 26.818 45.0211 27.28 45.0211 27.868C45.0211 28.456 44.783 28.904 44.307 29.212C43.831 29.52 43.159 29.674 42.291 29.674C41.1151 29.674 39.883 29.422 38.5951 28.918C37.3351 28.414 36.0331 27.7 34.6891 26.776L32.295 30.892C33.555 32.04 35.0951 32.922 36.9151 33.538Z"
+        android:fillColor="#BFBFBF"/>
+    <path
+        android:pathData="M89.584 34H82.864V21.61C82.864 20.154 82.598 19.104 82.066 18.46C81.534 17.788 80.848 17.452 80.008 17.452C79.56 17.452 79.098 17.55 78.622 17.746C78.174 17.942 77.754 18.222 77.362 18.586C76.97 18.922 76.606 19.328 76.27 19.804C75.962 20.28 75.71 20.798 75.514 21.358V34H68.794V21.61C68.794 20.154 68.528 19.104 67.996 18.46C67.464 17.788 66.778 17.452 65.938 17.452C65.042 17.452 64.16 17.816 63.292 18.544C62.452 19.244 61.836 20.182 61.444 21.358V34H54.724V11.95H60.772V15.646C61.584 14.302 62.676 13.28 64.048 12.58C65.448 11.88 67.072 11.53 68.92 11.53C69.844 11.53 70.642 11.642 71.314 11.866C72.014 12.09 72.616 12.398 73.12 12.79C73.624 13.182 74.03 13.644 74.338 14.176C74.646 14.68 74.87 15.226 75.01 15.814C75.85 14.442 76.956 13.392 78.328 12.664C79.7 11.908 81.268 11.53 83.032 11.53C84.432 11.53 85.552 11.796 86.392 12.328C87.26 12.832 87.932 13.504 88.408 14.344C88.884 15.156 89.192 16.052 89.332 17.032C89.5 18.012 89.584 18.964 89.584 19.888V34Z"
+        android:fillColor="#BFBFBF"/>
+    <path
+        android:pathData="M108.844 4.18003H102.628L91.75 34H98.806L101.074 27.322H110.356L112.666 34H119.722L108.844 4.18003ZM105.736 12.034L109.222 22.576H102.166L105.736 12.034Z"
+        android:fillColor="#BFBFBF"
+        android:fillType="evenOdd"/>
+    <path
+        android:pathData="M143.365 34H136.645V21.61C136.645 20.154 136.365 19.104 135.805 18.46C135.273 17.788 134.559 17.452 133.663 17.452C133.187 17.452 132.711 17.55 132.235 17.746C131.759 17.942 131.297 18.222 130.849 18.586C130.401 18.922 129.995 19.328 129.631 19.804C129.295 20.28 129.029 20.798 128.833 21.358V34H122.113V11.95H128.161V15.646C128.973 14.33 130.121 13.322 131.605 12.622C133.089 11.894 134.797 11.53 136.729 11.53C138.157 11.53 139.305 11.796 140.173 12.328C141.041 12.832 141.713 13.504 142.189 14.344C142.665 15.156 142.973 16.052 143.113 17.032C143.281 18.012 143.365 18.964 143.365 19.888V34Z"
+        android:fillColor="#BFBFBF"/>
+    <path
+        android:pathData="M159.895 59.016C159.895 58.6333 159.843 58.2833 159.741 57.966C159.638 57.6487 159.489 57.378 159.293 57.154C159.106 56.93 158.873 56.7573 158.593 56.636C158.313 56.5053 158 56.44 157.655 56.44H156.563V61.62H157.655C158.009 61.62 158.327 61.5547 158.607 61.424C158.887 61.2933 159.12 61.1113 159.307 60.878C159.503 60.6447 159.647 60.3693 159.741 60.052C159.843 59.7347 159.895 59.3893 159.895 59.016Z"
+        android:fillColor="#BFBFBF"/>
+    <path
+        android:pathData="M68 49C68 47.8954 68.8954 47 70 47H169C170.105 47 171 47.8954 171 49V69C171 70.1046 170.105 71 169 71H70C68.8954 71 68 70.1046 68 69V49ZM82.9503 61.452C82.7263 61.592 82.4557 61.662 82.1383 61.662C81.821 61.662 81.5503 61.5967 81.3263 61.466C81.1117 61.326 80.9343 61.144 80.7943 60.92C80.6543 60.6867 80.5517 60.4207 80.4863 60.122C80.421 59.814 80.3883 59.4967 80.3883 59.17V54.06H77.6583V59.17C77.6583 59.8327 77.7423 60.4627 77.9103 61.06C78.0783 61.648 78.3443 62.166 78.7083 62.614C79.0723 63.062 79.5343 63.4213 80.0943 63.692C80.6637 63.9533 81.345 64.084 82.1383 64.084C82.9037 64.084 83.5663 63.958 84.1263 63.706C84.6957 63.454 85.167 63.1087 85.5403 62.67C85.9137 62.2313 86.189 61.7133 86.3663 61.116C86.5437 60.5093 86.6323 59.8607 86.6323 59.17V54.06H83.9023V59.17C83.9023 59.4967 83.8697 59.8093 83.8043 60.108C83.739 60.4067 83.6363 60.6727 83.4963 60.906C83.3563 61.13 83.1743 61.312 82.9503 61.452ZM92.0526 64V59.114L96.0006 64H98.1706V54.06H95.4406V59.114L91.4506 54.06H89.3226V64H92.0526ZM100.997 64V54.06H103.727V61.62H108.235V64H100.997ZM110.307 54.06V64H113.037V54.06H110.307ZM123.388 64V58.764L121.722 62.446H120.266L118.6 58.764V64H115.87V54.06H118.852L120.994 58.736L123.15 54.06H126.118V64H123.388ZM128.939 54.06V64H131.669V54.06H128.939ZM142.245 56.44H139.389V64H136.659V56.44H133.789V54.06H142.245V56.44ZM151.443 64V61.62H147.089V60.052H150.701V57.84H147.089V56.44H151.317V54.06H144.359V64H151.443ZM153.833 64V54.06H157.655C158.476 54.06 159.199 54.1907 159.825 54.452C160.45 54.7133 160.973 55.068 161.393 55.516C161.813 55.964 162.13 56.4913 162.345 57.098C162.559 57.6953 162.667 58.3347 162.667 59.016C162.667 59.772 162.545 60.458 162.303 61.074C162.069 61.6807 161.733 62.2033 161.295 62.642C160.856 63.0713 160.329 63.4073 159.713 63.65C159.097 63.8833 158.411 64 157.655 64H153.833Z"
+        android:fillColor="#BFBFBF"
+        android:fillType="evenOdd"/>
+  </group>
+</vector>

OsmAnd/res/drawable/image_text_osmand_osmlive.xml

@@ -0,0 +1,43 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="172dp"
+    android:height="72dp"
+    android:viewportWidth="172"
+    android:viewportHeight="72">
+  <group>
+    <clip-path android:pathData="M0,0h172v72h-172z M 0,0"/>
+    <path
+        android:pathData="M152.786 33.58C154.074 34.14 155.474 34.42 156.986 34.42C158.497 34.42 159.912 34.084 161.228 33.412C162.572 32.74 163.635 31.718 164.419 30.346L164.546 31.48C164.658 32.404 165.077 33.118 165.805 33.622C166.533 34.098 167.486 34.336 168.661 34.336C169.053 34.336 169.474 34.308 169.922 34.252C170.37 34.224 170.902 34.14 171.518 34V28.33C170.986 28.274 170.607 28.12 170.383 27.868C170.188 27.588 170.09 27.112 170.09 26.44V3.34003H163.37V15.562C162.698 14.33 161.731 13.35 160.471 12.622C159.24 11.894 157.854 11.53 156.314 11.53C154.886 11.53 153.569 11.824 152.365 12.412C151.189 13 150.167 13.812 149.299 14.848C148.432 15.856 147.76 17.06 147.284 18.46C146.808 19.86 146.57 21.358 146.57 22.954C146.57 24.606 146.822 26.132 147.326 27.532C147.857 28.904 148.586 30.108 149.51 31.144C150.434 32.18 151.526 32.992 152.786 33.58ZM161.438 27.952C160.598 28.484 159.715 28.75 158.792 28.75C158.036 28.75 157.322 28.61 156.65 28.33C156.006 28.05 155.445 27.658 154.969 27.154C154.521 26.65 154.158 26.048 153.878 25.348C153.626 24.648 153.499 23.892 153.499 23.08C153.499 22.296 153.611 21.554 153.835 20.854C154.087 20.154 154.438 19.538 154.885 19.006C155.333 18.474 155.852 18.054 156.439 17.746C157.055 17.41 157.728 17.242 158.456 17.242C159.464 17.242 160.43 17.606 161.354 18.334C162.305 19.034 162.992 19.944 163.411 21.064V25.684C162.964 26.636 162.305 27.392 161.438 27.952Z"
+        android:fillColor="#BFBFBF"
+        android:fillType="evenOdd"/>
+    <path
+        android:pathData="M9.41489 32.95C11.2349 33.818 13.2509 34.252 15.4629 34.252C17.6189 34.252 19.6069 33.832 21.4269 32.992C23.2469 32.152 24.8149 31.046 26.1309 29.674C27.4469 28.274 28.4689 26.664 29.1969 24.844C29.9529 23.024 30.3309 21.134 30.3309 19.174C30.3309 17.298 29.9809 15.45 29.2809 13.63C28.5809 11.81 27.5869 10.186 26.2989 8.75803C25.0109 7.33003 23.4569 6.18203 21.6369 5.31403C19.8169 4.44603 17.8009 4.01203 15.5889 4.01203C13.4329 4.01203 11.4449 4.43203 9.6249 5.27203C7.8049 6.08403 6.2229 7.19003 4.87889 8.59003C3.56289 9.96203 2.5269 11.558 1.7709 13.378C1.0429 15.198 0.678894 17.088 0.678894 19.048C0.678894 20.98 1.0289 22.856 1.7289 24.676C2.4569 26.496 3.4649 28.12 4.7529 29.548C6.0409 30.948 7.59489 32.082 9.41489 32.95ZM8.1969 22.492C7.8609 21.4 7.69289 20.28 7.69289 19.132C7.69289 18.012 7.8469 16.92 8.1549 15.856C8.4909 14.764 8.9809 13.798 9.6249 12.958C10.2969 12.118 11.1089 11.446 12.0609 10.942C13.0409 10.41 14.1889 10.144 15.5049 10.144C16.7649 10.144 17.8709 10.396 18.8229 10.9C19.8029 11.376 20.6289 12.034 21.3009 12.874C21.9729 13.686 22.4769 14.638 22.8129 15.73C23.1489 16.794 23.3169 17.9 23.3169 19.048C23.3169 20.168 23.1489 21.274 22.8129 22.366C22.5049 23.43 22.0289 24.396 21.3849 25.264C20.7409 26.104 19.9289 26.79 18.9489 27.322C17.9689 27.854 16.8209 28.12 15.5049 28.12C14.2449 28.12 13.1249 27.868 12.1449 27.364C11.1649 26.86 10.3389 26.188 9.6669 25.348C9.0229 24.508 8.5329 23.556 8.1969 22.492Z"
+        android:fillColor="#BFBFBF"
+        android:fillType="evenOdd"/>
+    <path
+        android:pathData="M36.9151 33.538C38.7351 34.126 40.583 34.42 42.459 34.42C45.231 34.42 47.4291 33.776 49.0531 32.488C50.6771 31.2 51.4891 29.464 51.4891 27.28C51.4891 26.356 51.335 25.558 51.0271 24.886C50.7191 24.214 50.229 23.626 49.557 23.122C48.885 22.59 48.0031 22.114 46.9111 21.694C45.8471 21.274 44.5311 20.854 42.9631 20.434C41.4791 20.07 40.4571 19.734 39.8971 19.426C39.3651 19.118 39.099 18.656 39.099 18.04C39.099 17.396 39.3511 16.934 39.8551 16.654C40.3591 16.346 40.9751 16.192 41.7031 16.192C42.6271 16.192 43.5791 16.388 44.5591 16.78C45.5391 17.172 46.6591 17.802 47.9191 18.67L50.5231 14.638C49.1791 13.462 47.7791 12.65 46.3231 12.202C44.8951 11.754 43.3551 11.53 41.7031 11.53C40.4431 11.53 39.2671 11.712 38.1751 12.076C37.1111 12.44 36.187 12.944 35.403 13.588C34.619 14.232 34.0031 15.016 33.555 15.94C33.107 16.864 32.8831 17.886 32.8831 19.006C32.8831 19.846 33.0231 20.574 33.3031 21.19C33.583 21.806 34.0451 22.352 34.6891 22.828C35.3331 23.304 36.159 23.738 37.167 24.13C38.203 24.522 39.463 24.928 40.947 25.348C42.459 25.74 43.509 26.118 44.097 26.482C44.7131 26.818 45.0211 27.28 45.0211 27.868C45.0211 28.456 44.783 28.904 44.307 29.212C43.831 29.52 43.159 29.674 42.291 29.674C41.1151 29.674 39.883 29.422 38.5951 28.918C37.3351 28.414 36.0331 27.7 34.6891 26.776L32.295 30.892C33.555 32.04 35.0951 32.922 36.9151 33.538Z"
+        android:fillColor="#BFBFBF"/>
+    <path
+        android:pathData="M89.584 34H82.864V21.61C82.864 20.154 82.598 19.104 82.066 18.46C81.534 17.788 80.848 17.452 80.008 17.452C79.56 17.452 79.098 17.55 78.622 17.746C78.174 17.942 77.754 18.222 77.362 18.586C76.97 18.922 76.606 19.328 76.27 19.804C75.962 20.28 75.71 20.798 75.514 21.358V34H68.794V21.61C68.794 20.154 68.528 19.104 67.996 18.46C67.464 17.788 66.778 17.452 65.938 17.452C65.042 17.452 64.16 17.816 63.292 18.544C62.452 19.244 61.836 20.182 61.444 21.358V34H54.724V11.95H60.772V15.646C61.584 14.302 62.676 13.28 64.048 12.58C65.448 11.88 67.072 11.53 68.92 11.53C69.844 11.53 70.642 11.642 71.314 11.866C72.014 12.09 72.616 12.398 73.12 12.79C73.624 13.182 74.03 13.644 74.338 14.176C74.646 14.68 74.87 15.226 75.01 15.814C75.85 14.442 76.956 13.392 78.328 12.664C79.7 11.908 81.268 11.53 83.032 11.53C84.432 11.53 85.552 11.796 86.392 12.328C87.26 12.832 87.932 13.504 88.408 14.344C88.884 15.156 89.192 16.052 89.332 17.032C89.5 18.012 89.584 18.964 89.584 19.888V34Z"
+        android:fillColor="#BFBFBF"/>
+    <path
+        android:pathData="M108.844 4.18003H102.628L91.75 34H98.806L101.074 27.322H110.356L112.666 34H119.722L108.844 4.18003ZM105.736 12.034L109.222 22.576H102.166L105.736 12.034Z"
+        android:fillColor="#BFBFBF"
+        android:fillType="evenOdd"/>
+    <path
+        android:pathData="M143.365 34H136.645V21.61C136.645 20.154 136.365 19.104 135.805 18.46C135.273 17.788 134.559 17.452 133.663 17.452C133.187 17.452 132.711 17.55 132.235 17.746C131.759 17.942 131.297 18.222 130.849 18.586C130.401 18.922 129.995 19.328 129.631 19.804C129.295 20.28 129.029 20.798 128.833 21.358V34H122.113V11.95H128.161V15.646C128.973 14.33 130.121 13.322 131.605 12.622C133.089 11.894 134.797 11.53 136.729 11.53C138.157 11.53 139.305 11.796 140.173 12.328C141.041 12.832 141.713 13.504 142.189 14.344C142.665 15.156 142.973 16.052 143.113 17.032C143.281 18.012 143.365 18.964 143.365 19.888V34Z"
+        android:fillColor="#BFBFBF"/>
+    <path
+        android:pathData="M60.08 59.044C60.08 59.38 60.1266 59.7067 60.22 60.024C60.3133 60.332 60.4533 60.6073 60.64 60.85C60.8267 61.0927 61.06 61.2887 61.34 61.438C61.6293 61.5873 61.97 61.662 62.362 61.662C62.754 61.662 63.0947 61.5873 63.384 61.438C63.6733 61.2793 63.9067 61.0787 64.084 60.836C64.2707 60.584 64.406 60.2993 64.49 59.982C64.5833 59.6647 64.63 59.3427 64.63 59.016C64.63 58.68 64.5833 58.358 64.49 58.05C64.3967 57.7327 64.252 57.4573 64.056 57.224C63.8693 56.9813 63.6313 56.79 63.342 56.65C63.062 56.5007 62.7307 56.426 62.348 56.426C61.956 56.426 61.6153 56.5007 61.326 56.65C61.046 56.7993 60.8126 57 60.626 57.252C60.4393 57.4947 60.2993 57.7747 60.206 58.092C60.122 58.4 60.08 58.7173 60.08 59.044Z"
+        android:fillColor="#BFBFBF"/>
+    <path
+        android:pathData="M97.1309 60.234L96.2489 57.154L95.3249 60.234H97.1309Z"
+        android:fillColor="#BFBFBF"/>
+    <path
+        android:pathData="M120.467 57.966C120.57 58.2833 120.621 58.6333 120.621 59.016C120.621 59.3893 120.57 59.7347 120.467 60.052C120.374 60.3693 120.229 60.6447 120.033 60.878C119.847 61.1113 119.613 61.2933 119.333 61.424C119.053 61.5547 118.736 61.62 118.381 61.62H117.289V56.44H118.381C118.727 56.44 119.039 56.5053 119.319 56.636C119.599 56.7573 119.833 56.93 120.019 57.154C120.215 57.378 120.365 57.6487 120.467 57.966Z"
+        android:fillColor="#BFBFBF"/>
+    <path
+        android:pathData="M49 49C49 47.8954 49.8954 47 51 47H169C170.105 47 171 47.8954 171 49V69C171 70.1046 170.105 71 169 71H51C49.8954 71 49 70.1046 49 69V49ZM75.617 57.308C75.337 57.14 75.0477 56.9907 74.749 56.86C74.497 56.748 74.2124 56.6453 73.895 56.552C73.587 56.4493 73.2837 56.398 72.985 56.398C72.7424 56.398 72.5464 56.4353 72.397 56.51C72.257 56.5847 72.187 56.7107 72.187 56.888C72.187 57.0187 72.229 57.126 72.313 57.21C72.397 57.294 72.5184 57.3733 72.677 57.448C72.8357 57.5133 73.027 57.5787 73.251 57.644C73.4844 57.7093 73.7457 57.7887 74.035 57.882C74.4924 58.022 74.903 58.176 75.267 58.344C75.6404 58.512 75.9577 58.7127 76.219 58.946C76.4804 59.17 76.681 59.4453 76.821 59.772C76.961 60.0987 77.031 60.4953 77.031 60.962C77.031 61.5593 76.919 62.0633 76.695 62.474C76.4804 62.8753 76.191 63.1973 75.827 63.44C75.4724 63.6827 75.0664 63.86 74.609 63.972C74.161 64.0747 73.7084 64.126 73.251 64.126C72.887 64.126 72.5137 64.098 72.131 64.042C71.7484 63.986 71.3657 63.9067 70.983 63.804C70.6097 63.7013 70.2457 63.58 69.891 63.44C69.5457 63.3 69.2237 63.1413 68.925 62.964L70.101 60.57C70.4277 60.7753 70.7684 60.9573 71.123 61.116C71.4217 61.256 71.7577 61.382 72.131 61.494C72.5137 61.606 72.901 61.662 73.293 61.662C73.5917 61.662 73.797 61.6247 73.909 61.55C74.0304 61.466 74.091 61.3587 74.091 61.228C74.091 61.088 74.0304 60.9713 73.909 60.878C73.797 60.7753 73.6384 60.6867 73.433 60.612C73.2277 60.5373 72.9897 60.4627 72.719 60.388C72.4577 60.3133 72.1777 60.2247 71.879 60.122C71.4404 59.9727 71.0624 59.814 70.745 59.646C70.4277 59.4687 70.1664 59.2727 69.961 59.058C69.7557 58.834 69.6017 58.582 69.499 58.302C69.4057 58.022 69.359 57.7 69.359 57.336C69.359 56.7853 69.457 56.3 69.653 55.88C69.8584 55.46 70.1337 55.11 70.479 54.83C70.8244 54.55 71.2164 54.34 71.655 54.2C72.103 54.0507 72.5744 53.976 73.069 53.976C73.433 53.976 73.7877 54.0133 74.133 54.088C74.4784 54.1533 74.8097 54.242 75.127 54.354C75.4537 54.4567 75.757 54.5733 76.037 54.704C76.317 54.8253 76.569 54.942 76.793 55.054L75.617 57.308ZM62.334 64.084C61.578 64.084 60.892 63.9393 60.276 63.65C59.66 63.3607 59.1327 62.9827 58.694 62.516C58.2553 62.04 57.9146 61.4987 57.672 60.892C57.4293 60.2853 57.308 59.66 57.308 59.016C57.308 58.3627 57.434 57.7327 57.686 57.126C57.938 56.5193 58.288 55.9873 58.736 55.53C59.1933 55.0633 59.73 54.6947 60.346 54.424C60.9713 54.144 61.6526 54.004 62.39 54.004C63.146 54.004 63.832 54.1487 64.448 54.438C65.064 54.7273 65.5913 55.11 66.03 55.586C66.4687 56.062 66.8046 56.6033 67.038 57.21C67.2807 57.8167 67.402 58.4373 67.402 59.072C67.402 59.7253 67.276 60.3553 67.024 60.962C66.772 61.5593 66.422 62.0913 65.974 62.558C65.526 63.0153 64.9893 63.384 64.364 63.664C63.748 63.944 63.0713 64.084 62.334 64.084ZM86.8757 58.764V64H89.6057V54.06H86.6377L84.4817 58.736L82.3397 54.06H79.3577V64H82.0877V58.764L83.7537 62.446H85.2097L86.8757 58.764ZM95.0029 54.06H97.4949L100.939 64H98.1669L97.5649 62.054H94.9189L94.3309 64H91.5449L95.0029 54.06ZM105.615 64V59.114L109.563 64H111.733V54.06H109.003V59.114L105.013 54.06H102.885V64H105.615ZM114.559 64V54.06H118.381C119.203 54.06 119.926 54.1907 120.551 54.452C121.177 54.7133 121.699 55.068 122.119 55.516C122.539 55.964 122.857 56.4913 123.071 57.098C123.286 57.6953 123.393 58.3347 123.393 59.016C123.393 59.772 123.272 60.458 123.029 61.074C122.796 61.6807 122.46 62.2033 122.021 62.642C121.583 63.0713 121.055 63.4073 120.439 63.65C119.823 63.8833 119.137 64 118.381 64H114.559ZM129.965 54.06V64H137.203V61.62H132.695V54.06H129.965ZM139.275 64V54.06H142.005V64H139.275ZM148.702 60.57L146.756 54.06H143.872L147.568 64H149.836L153.49 54.06H150.62L148.702 60.57ZM162.449 61.62V64H155.365V54.06H162.323V56.44H158.095V57.84H161.707V60.052H158.095V61.62H162.449Z"
+        android:fillColor="#BFBFBF"
+        android:fillType="evenOdd"/>
+  </group>
+</vector>

OsmAnd/res/drawable/image_text_osmand_plus.xml

@@ -0,0 +1,33 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="212dp"
+    android:height="36dp"
+    android:viewportWidth="212"
+    android:viewportHeight="36">
+  <group>
+    <clip-path android:pathData="M0,0h212v36h-212z M 0,0"/>
+    <path
+        android:pathData="M152.786 33.58C154.074 34.14 155.474 34.42 156.986 34.42C158.497 34.42 159.912 34.084 161.228 33.412C162.572 32.74 163.635 31.718 164.419 30.346L164.546 31.48C164.658 32.404 165.077 33.118 165.805 33.622C166.533 34.098 167.486 34.336 168.661 34.336C169.053 34.336 169.474 34.308 169.922 34.252C170.37 34.224 170.902 34.14 171.518 34V28.33C170.986 28.274 170.607 28.12 170.383 27.868C170.188 27.588 170.09 27.112 170.09 26.44V3.34003H163.37V15.562C162.698 14.33 161.731 13.35 160.471 12.622C159.24 11.894 157.854 11.53 156.314 11.53C154.886 11.53 153.569 11.824 152.365 12.412C151.189 13 150.167 13.812 149.299 14.848C148.432 15.856 147.76 17.06 147.284 18.46C146.808 19.86 146.57 21.358 146.57 22.954C146.57 24.606 146.822 26.132 147.326 27.532C147.857 28.904 148.586 30.108 149.51 31.144C150.434 32.18 151.526 32.992 152.786 33.58ZM161.438 27.952C160.598 28.484 159.715 28.75 158.792 28.75C158.036 28.75 157.322 28.61 156.65 28.33C156.006 28.05 155.445 27.658 154.969 27.154C154.521 26.65 154.158 26.048 153.878 25.348C153.626 24.648 153.499 23.892 153.499 23.08C153.499 22.296 153.611 21.554 153.835 20.854C154.087 20.154 154.438 19.538 154.885 19.006C155.333 18.474 155.852 18.054 156.439 17.746C157.055 17.41 157.728 17.242 158.456 17.242C159.464 17.242 160.43 17.606 161.354 18.334C162.305 19.034 162.992 19.944 163.411 21.064V25.684C162.964 26.636 162.305 27.392 161.438 27.952Z"
+        android:fillColor="#BFBFBF"
+        android:fillType="evenOdd"/>
+    <path
+        android:pathData="M9.41489 32.95C11.2349 33.818 13.2509 34.252 15.4629 34.252C17.6189 34.252 19.6069 33.832 21.4269 32.992C23.2469 32.152 24.8149 31.046 26.1309 29.674C27.4469 28.274 28.4689 26.664 29.1969 24.844C29.9529 23.024 30.3309 21.134 30.3309 19.174C30.3309 17.298 29.9809 15.45 29.2809 13.63C28.5809 11.81 27.5869 10.186 26.2989 8.75803C25.0109 7.33003 23.4569 6.18203 21.6369 5.31403C19.8169 4.44603 17.8009 4.01203 15.5889 4.01203C13.4329 4.01203 11.4449 4.43203 9.6249 5.27203C7.8049 6.08403 6.2229 7.19003 4.87889 8.59003C3.56289 9.96203 2.5269 11.558 1.7709 13.378C1.0429 15.198 0.678894 17.088 0.678894 19.048C0.678894 20.98 1.0289 22.856 1.7289 24.676C2.4569 26.496 3.4649 28.12 4.7529 29.548C6.0409 30.948 7.59489 32.082 9.41489 32.95ZM8.1969 22.492C7.8609 21.4 7.69289 20.28 7.69289 19.132C7.69289 18.012 7.8469 16.92 8.1549 15.856C8.4909 14.764 8.9809 13.798 9.6249 12.958C10.2969 12.118 11.1089 11.446 12.0609 10.942C13.0409 10.41 14.1889 10.144 15.5049 10.144C16.7649 10.144 17.8709 10.396 18.8229 10.9C19.8029 11.376 20.6289 12.034 21.3009 12.874C21.9729 13.686 22.4769 14.638 22.8129 15.73C23.1489 16.794 23.3169 17.9 23.3169 19.048C23.3169 20.168 23.1489 21.274 22.8129 22.366C22.5049 23.43 22.0289 24.396 21.3849 25.264C20.7409 26.104 19.9289 26.79 18.9489 27.322C17.9689 27.854 16.8209 28.12 15.5049 28.12C14.2449 28.12 13.1249 27.868 12.1449 27.364C11.1649 26.86 10.3389 26.188 9.6669 25.348C9.0229 24.508 8.5329 23.556 8.1969 22.492Z"
+        android:fillColor="#BFBFBF"
+        android:fillType="evenOdd"/>
+    <path
+        android:pathData="M36.9151 33.538C38.7351 34.126 40.583 34.42 42.459 34.42C45.231 34.42 47.4291 33.776 49.0531 32.488C50.6771 31.2 51.4891 29.464 51.4891 27.28C51.4891 26.356 51.335 25.558 51.0271 24.886C50.7191 24.214 50.229 23.626 49.557 23.122C48.885 22.59 48.0031 22.114 46.9111 21.694C45.8471 21.274 44.5311 20.854 42.9631 20.434C41.4791 20.07 40.4571 19.734 39.8971 19.426C39.3651 19.118 39.099 18.656 39.099 18.04C39.099 17.396 39.3511 16.934 39.8551 16.654C40.3591 16.346 40.9751 16.192 41.7031 16.192C42.6271 16.192 43.5791 16.388 44.5591 16.78C45.5391 17.172 46.6591 17.802 47.9191 18.67L50.5231 14.638C49.1791 13.462 47.7791 12.65 46.3231 12.202C44.8951 11.754 43.3551 11.53 41.7031 11.53C40.4431 11.53 39.2671 11.712 38.1751 12.076C37.1111 12.44 36.187 12.944 35.403 13.588C34.619 14.232 34.0031 15.016 33.555 15.94C33.107 16.864 32.8831 17.886 32.8831 19.006C32.8831 19.846 33.0231 20.574 33.3031 21.19C33.583 21.806 34.0451 22.352 34.6891 22.828C35.3331 23.304 36.159 23.738 37.167 24.13C38.203 24.522 39.463 24.928 40.947 25.348C42.459 25.74 43.509 26.118 44.097 26.482C44.7131 26.818 45.0211 27.28 45.0211 27.868C45.0211 28.456 44.783 28.904 44.307 29.212C43.831 29.52 43.159 29.674 42.291 29.674C41.1151 29.674 39.883 29.422 38.5951 28.918C37.3351 28.414 36.0331 27.7 34.6891 26.776L32.295 30.892C33.555 32.04 35.0951 32.922 36.9151 33.538Z"
+        android:fillColor="#BFBFBF"/>
+    <path
+        android:pathData="M89.584 34H82.864V21.61C82.864 20.154 82.598 19.104 82.066 18.46C81.534 17.788 80.848 17.452 80.008 17.452C79.56 17.452 79.098 17.55 78.622 17.746C78.174 17.942 77.754 18.222 77.362 18.586C76.97 18.922 76.606 19.328 76.27 19.804C75.962 20.28 75.71 20.798 75.514 21.358V34H68.794V21.61C68.794 20.154 68.528 19.104 67.996 18.46C67.464 17.788 66.778 17.452 65.938 17.452C65.042 17.452 64.16 17.816 63.292 18.544C62.452 19.244 61.836 20.182 61.444 21.358V34H54.724V11.95H60.772V15.646C61.584 14.302 62.676 13.28 64.048 12.58C65.448 11.88 67.072 11.53 68.92 11.53C69.844 11.53 70.642 11.642 71.314 11.866C72.014 12.09 72.616 12.398 73.12 12.79C73.624 13.182 74.03 13.644 74.338 14.176C74.646 14.68 74.87 15.226 75.01 15.814C75.85 14.442 76.956 13.392 78.328 12.664C79.7 11.908 81.268 11.53 83.032 11.53C84.432 11.53 85.552 11.796 86.392 12.328C87.26 12.832 87.932 13.504 88.408 14.344C88.884 15.156 89.192 16.052 89.332 17.032C89.5 18.012 89.584 18.964 89.584 19.888V34Z"
+        android:fillColor="#BFBFBF"/>
+    <path
+        android:pathData="M108.844 4.18003H102.628L91.75 34H98.806L101.074 27.322H110.356L112.666 34H119.722L108.844 4.18003ZM105.736 12.034L109.222 22.576H102.166L105.736 12.034Z"
+        android:fillColor="#BFBFBF"
+        android:fillType="evenOdd"/>
+    <path
+        android:pathData="M143.365 34H136.645V21.61C136.645 20.154 136.365 19.104 135.805 18.46C135.273 17.788 134.559 17.452 133.663 17.452C133.187 17.452 132.711 17.55 132.235 17.746C131.759 17.942 131.297 18.222 130.849 18.586C130.401 18.922 129.995 19.328 129.631 19.804C129.295 20.28 129.029 20.798 128.833 21.358V34H122.113V11.95H128.161V15.646C128.973 14.33 130.121 13.322 131.605 12.622C133.089 11.894 134.797 11.53 136.729 11.53C138.157 11.53 139.305 11.796 140.173 12.328C141.041 12.832 141.713 13.504 142.189 14.344C142.665 15.156 142.973 16.052 143.113 17.032C143.281 18.012 143.365 18.964 143.365 19.888V34Z"
+        android:fillColor="#BFBFBF"/>
+    <path
+        android:pathData="M191 4H198V15H209V22H198V33H191V22H180V15H191V4Z"
+        android:fillColor="#BFBFBF"/>
+  </group>
+</vector>

OsmAnd/res/drawable/image_text_osmand_plus_osmlive.xml

@@ -0,0 +1,43 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="212dp"
+    android:height="72dp"
+    android:viewportWidth="212"
+    android:viewportHeight="72">
+  <path
+      android:pathData="M152.786,33.58C154.074,34.14 155.474,34.42 156.986,34.42C158.497,34.42 159.912,34.084 161.228,33.412C162.572,32.74 163.635,31.718 164.419,30.346L164.546,31.48C164.658,32.404 165.077,33.118 165.805,33.622C166.533,34.098 167.486,34.336 168.661,34.336C169.053,34.336 169.474,34.308 169.922,34.252C170.37,34.224 170.902,34.14 171.518,34V28.33C170.986,28.274 170.607,28.12 170.383,27.868C170.188,27.588 170.09,27.112 170.09,26.44V3.34H163.37V15.562C162.698,14.33 161.731,13.35 160.471,12.622C159.24,11.894 157.854,11.53 156.314,11.53C154.886,11.53 153.569,11.824 152.365,12.412C151.189,13 150.167,13.812 149.299,14.848C148.432,15.856 147.76,17.06 147.284,18.46C146.808,19.86 146.57,21.358 146.57,22.954C146.57,24.606 146.822,26.132 147.326,27.532C147.857,28.904 148.586,30.108 149.51,31.144C150.434,32.18 151.526,32.992 152.786,33.58ZM161.438,27.952C160.598,28.484 159.715,28.75 158.792,28.75C158.036,28.75 157.322,28.61 156.65,28.33C156.006,28.05 155.445,27.658 154.969,27.154C154.521,26.65 154.158,26.048 153.878,25.348C153.626,24.648 153.499,23.892 153.499,23.08C153.499,22.296 153.611,21.554 153.835,20.854C154.087,20.154 154.438,19.538 154.885,19.006C155.333,18.474 155.852,18.054 156.439,17.746C157.055,17.41 157.728,17.242 158.456,17.242C159.464,17.242 160.43,17.606 161.354,18.334C162.305,19.034 162.992,19.944 163.411,21.064V25.684C162.964,26.636 162.305,27.392 161.438,27.952Z"
+      android:fillColor="#BFBFBF"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M9.415,32.95C11.235,33.818 13.251,34.252 15.463,34.252C17.619,34.252 19.607,33.832 21.427,32.992C23.247,32.152 24.815,31.046 26.131,29.674C27.447,28.274 28.469,26.664 29.197,24.844C29.953,23.024 30.331,21.134 30.331,19.174C30.331,17.298 29.981,15.45 29.281,13.63C28.581,11.81 27.587,10.186 26.299,8.758C25.011,7.33 23.457,6.182 21.637,5.314C19.817,4.446 17.801,4.012 15.589,4.012C13.433,4.012 11.445,4.432 9.625,5.272C7.805,6.084 6.223,7.19 4.879,8.59C3.563,9.962 2.527,11.558 1.771,13.378C1.043,15.198 0.679,17.088 0.679,19.048C0.679,20.98 1.029,22.856 1.729,24.676C2.457,26.496 3.465,28.12 4.753,29.548C6.041,30.948 7.595,32.082 9.415,32.95ZM8.197,22.492C7.861,21.4 7.693,20.28 7.693,19.132C7.693,18.012 7.847,16.92 8.155,15.856C8.491,14.764 8.981,13.798 9.625,12.958C10.297,12.118 11.109,11.446 12.061,10.942C13.041,10.41 14.189,10.144 15.505,10.144C16.765,10.144 17.871,10.396 18.823,10.9C19.803,11.376 20.629,12.034 21.301,12.874C21.973,13.686 22.477,14.638 22.813,15.73C23.149,16.794 23.317,17.9 23.317,19.048C23.317,20.168 23.149,21.274 22.813,22.366C22.505,23.43 22.029,24.396 21.385,25.264C20.741,26.104 19.929,26.79 18.949,27.322C17.969,27.854 16.821,28.12 15.505,28.12C14.245,28.12 13.125,27.868 12.145,27.364C11.165,26.86 10.339,26.188 9.667,25.348C9.023,24.508 8.533,23.556 8.197,22.492Z"
+      android:fillColor="#BFBFBF"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M36.915,33.538C38.735,34.126 40.583,34.42 42.459,34.42C45.231,34.42 47.429,33.776 49.053,32.488C50.677,31.2 51.489,29.464 51.489,27.28C51.489,26.356 51.335,25.558 51.027,24.886C50.719,24.214 50.229,23.626 49.557,23.122C48.885,22.59 48.003,22.114 46.911,21.694C45.847,21.274 44.531,20.854 42.963,20.434C41.479,20.07 40.457,19.734 39.897,19.426C39.365,19.118 39.099,18.656 39.099,18.04C39.099,17.396 39.351,16.934 39.855,16.654C40.359,16.346 40.975,16.192 41.703,16.192C42.627,16.192 43.579,16.388 44.559,16.78C45.539,17.172 46.659,17.802 47.919,18.67L50.523,14.638C49.179,13.462 47.779,12.65 46.323,12.202C44.895,11.754 43.355,11.53 41.703,11.53C40.443,11.53 39.267,11.712 38.175,12.076C37.111,12.44 36.187,12.944 35.403,13.588C34.619,14.232 34.003,15.016 33.555,15.94C33.107,16.864 32.883,17.886 32.883,19.006C32.883,19.846 33.023,20.574 33.303,21.19C33.583,21.806 34.045,22.352 34.689,22.828C35.333,23.304 36.159,23.738 37.167,24.13C38.203,24.522 39.463,24.928 40.947,25.348C42.459,25.74 43.509,26.118 44.097,26.482C44.713,26.818 45.021,27.28 45.021,27.868C45.021,28.456 44.783,28.904 44.307,29.212C43.831,29.52 43.159,29.674 42.291,29.674C41.115,29.674 39.883,29.422 38.595,28.918C37.335,28.414 36.033,27.7 34.689,26.776L32.295,30.892C33.555,32.04 35.095,32.922 36.915,33.538Z"
+      android:fillColor="#BFBFBF"/>
+  <path
+      android:pathData="M89.584,34H82.864V21.61C82.864,20.154 82.598,19.104 82.066,18.46C81.534,17.788 80.848,17.452 80.008,17.452C79.56,17.452 79.098,17.55 78.622,17.746C78.174,17.942 77.754,18.222 77.362,18.586C76.97,18.922 76.606,19.328 76.27,19.804C75.962,20.28 75.71,20.798 75.514,21.358V34H68.794V21.61C68.794,20.154 68.528,19.104 67.996,18.46C67.464,17.788 66.778,17.452 65.938,17.452C65.042,17.452 64.16,17.816 63.292,18.544C62.452,19.244 61.836,20.182 61.444,21.358V34H54.724V11.95H60.772V15.646C61.584,14.302 62.676,13.28 64.048,12.58C65.448,11.88 67.072,11.53 68.92,11.53C69.844,11.53 70.642,11.642 71.314,11.866C72.014,12.09 72.616,12.398 73.12,12.79C73.624,13.182 74.03,13.644 74.338,14.176C74.646,14.68 74.87,15.226 75.01,15.814C75.85,14.442 76.956,13.392 78.328,12.664C79.7,11.908 81.268,11.53 83.032,11.53C84.432,11.53 85.552,11.796 86.392,12.328C87.26,12.832 87.932,13.504 88.408,14.344C88.884,15.156 89.192,16.052 89.332,17.032C89.5,18.012 89.584,18.964 89.584,19.888V34Z"
+      android:fillColor="#BFBFBF"/>
+  <path
+      android:pathData="M108.844,4.18H102.628L91.75,34H98.806L101.074,27.322H110.356L112.666,34H119.722L108.844,4.18ZM105.736,12.034L109.222,22.576H102.166L105.736,12.034Z"
+      android:fillColor="#BFBFBF"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M143.365,34H136.645V21.61C136.645,20.154 136.365,19.104 135.805,18.46C135.273,17.788 134.559,17.452 133.663,17.452C133.187,17.452 132.711,17.55 132.235,17.746C131.759,17.942 131.297,18.222 130.849,18.586C130.401,18.922 129.995,19.328 129.631,19.804C129.295,20.28 129.029,20.798 128.833,21.358V34H122.113V11.95H128.161V15.646C128.973,14.33 130.121,13.322 131.605,12.622C133.089,11.894 134.797,11.53 136.729,11.53C138.157,11.53 139.305,11.796 140.173,12.328C141.041,12.832 141.713,13.504 142.189,14.344C142.665,15.156 142.973,16.052 143.113,17.032C143.281,18.012 143.365,18.964 143.365,19.888V34Z"
+      android:fillColor="#BFBFBF"/>
+  <path
+      android:pathData="M198,4H191V15H180V22H191V33H198V22H209V15H198V4Z"
+      android:fillColor="#BFBFBF"/>
+  <path
+      android:pathData="M60.22,60.024C60.127,59.707 60.08,59.38 60.08,59.044C60.08,58.717 60.122,58.4 60.206,58.092C60.299,57.775 60.439,57.495 60.626,57.252C60.813,57 61.046,56.799 61.326,56.65C61.615,56.501 61.956,56.426 62.348,56.426C62.731,56.426 63.062,56.501 63.342,56.65C63.631,56.79 63.869,56.981 64.056,57.224C64.252,57.457 64.397,57.733 64.49,58.05C64.583,58.358 64.63,58.68 64.63,59.016C64.63,59.343 64.583,59.665 64.49,59.982C64.406,60.299 64.271,60.584 64.084,60.836C63.907,61.079 63.673,61.279 63.384,61.438C63.095,61.587 62.754,61.662 62.362,61.662C61.97,61.662 61.629,61.587 61.34,61.438C61.06,61.289 60.827,61.093 60.64,60.85C60.453,60.607 60.313,60.332 60.22,60.024Z"
+      android:fillColor="#BFBFBF"/>
+  <path
+      android:pathData="M96.249,57.154L97.131,60.234H95.325L96.249,57.154Z"
+      android:fillColor="#BFBFBF"/>
+  <path
+      android:pathData="M120.621,59.016C120.621,58.633 120.57,58.283 120.467,57.966C120.365,57.649 120.215,57.378 120.019,57.154C119.833,56.93 119.599,56.757 119.319,56.636C119.039,56.505 118.727,56.44 118.381,56.44H117.289V61.62H118.381C118.736,61.62 119.053,61.555 119.333,61.424C119.613,61.293 119.847,61.111 120.033,60.878C120.229,60.645 120.374,60.369 120.467,60.052C120.57,59.735 120.621,59.389 120.621,59.016Z"
+      android:fillColor="#BFBFBF"/>
+  <path
+      android:pathData="M51,47C49.895,47 49,47.895 49,49V69C49,70.105 49.895,71 51,71H169C170.105,71 171,70.105 171,69V49C171,47.895 170.105,47 169,47H51ZM74.749,56.86C75.048,56.991 75.337,57.14 75.617,57.308L76.793,55.054C76.569,54.942 76.317,54.825 76.037,54.704C75.757,54.573 75.454,54.457 75.127,54.354C74.81,54.242 74.478,54.153 74.133,54.088C73.788,54.013 73.433,53.976 73.069,53.976C72.574,53.976 72.103,54.051 71.655,54.2C71.216,54.34 70.824,54.55 70.479,54.83C70.134,55.11 69.858,55.46 69.653,55.88C69.457,56.3 69.359,56.785 69.359,57.336C69.359,57.7 69.406,58.022 69.499,58.302C69.602,58.582 69.756,58.834 69.961,59.058C70.166,59.273 70.428,59.469 70.745,59.646C71.062,59.814 71.44,59.973 71.879,60.122C72.178,60.225 72.458,60.313 72.719,60.388C72.99,60.463 73.228,60.537 73.433,60.612C73.638,60.687 73.797,60.775 73.909,60.878C74.03,60.971 74.091,61.088 74.091,61.228C74.091,61.359 74.03,61.466 73.909,61.55C73.797,61.625 73.592,61.662 73.293,61.662C72.901,61.662 72.514,61.606 72.131,61.494C71.758,61.382 71.422,61.256 71.123,61.116C70.768,60.957 70.428,60.775 70.101,60.57L68.925,62.964C69.224,63.141 69.546,63.3 69.891,63.44C70.246,63.58 70.61,63.701 70.983,63.804C71.366,63.907 71.748,63.986 72.131,64.042C72.514,64.098 72.887,64.126 73.251,64.126C73.708,64.126 74.161,64.075 74.609,63.972C75.066,63.86 75.472,63.683 75.827,63.44C76.191,63.197 76.48,62.875 76.695,62.474C76.919,62.063 77.031,61.559 77.031,60.962C77.031,60.495 76.961,60.099 76.821,59.772C76.681,59.445 76.48,59.17 76.219,58.946C75.958,58.713 75.64,58.512 75.267,58.344C74.903,58.176 74.492,58.022 74.035,57.882C73.746,57.789 73.484,57.709 73.251,57.644C73.027,57.579 72.836,57.513 72.677,57.448C72.518,57.373 72.397,57.294 72.313,57.21C72.229,57.126 72.187,57.019 72.187,56.888C72.187,56.711 72.257,56.585 72.397,56.51C72.546,56.435 72.742,56.398 72.985,56.398C73.284,56.398 73.587,56.449 73.895,56.552C74.212,56.645 74.497,56.748 74.749,56.86ZM60.276,63.65C60.892,63.939 61.578,64.084 62.334,64.084C63.071,64.084 63.748,63.944 64.364,63.664C64.989,63.384 65.526,63.015 65.974,62.558C66.422,62.091 66.772,61.559 67.024,60.962C67.276,60.355 67.402,59.725 67.402,59.072C67.402,58.437 67.281,57.817 67.038,57.21C66.805,56.603 66.469,56.062 66.03,55.586C65.591,55.11 65.064,54.727 64.448,54.438C63.832,54.149 63.146,54.004 62.39,54.004C61.653,54.004 60.971,54.144 60.346,54.424C59.73,54.695 59.193,55.063 58.736,55.53C58.288,55.987 57.938,56.519 57.686,57.126C57.434,57.733 57.308,58.363 57.308,59.016C57.308,59.66 57.429,60.285 57.672,60.892C57.915,61.499 58.255,62.04 58.694,62.516C59.133,62.983 59.66,63.361 60.276,63.65ZM86.876,64V58.764L85.21,62.446H83.754L82.088,58.764V64H79.358V54.06H82.34L84.482,58.736L86.638,54.06H89.606V64H86.876ZM97.495,54.06H95.003L91.545,64H94.331L94.919,62.054H97.565L98.167,64H100.939L97.495,54.06ZM105.615,59.114V64H102.885V54.06H105.013L109.003,59.114V54.06H111.733V64H109.563L105.615,59.114ZM114.559,54.06V64H118.381C119.137,64 119.823,63.883 120.439,63.65C121.055,63.407 121.583,63.071 122.021,62.642C122.46,62.203 122.796,61.681 123.029,61.074C123.272,60.458 123.393,59.772 123.393,59.016C123.393,58.335 123.286,57.695 123.071,57.098C122.857,56.491 122.539,55.964 122.119,55.516C121.699,55.068 121.177,54.713 120.551,54.452C119.926,54.191 119.203,54.06 118.381,54.06H114.559ZM129.965,64V54.06H132.695V61.62H137.203V64H129.965ZM139.275,54.06V64H142.005V54.06H139.275ZM146.756,54.06L148.702,60.57L150.62,54.06H153.49L149.836,64H147.568L143.872,54.06H146.756ZM162.449,64V61.62H158.095V60.052H161.707V57.84H158.095V56.44H162.323V54.06H155.365V64H162.449Z"
+      android:fillColor="#BFBFBF"
+      android:fillType="evenOdd"/>
+</vector>

OsmAnd/res/drawable/purchase_dialog_outline_btn_bg_dark.xml

@@ -1,8 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android">
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <solid android:color="@color/switch_button_active_dark" />
+    <item android:state_pressed="true">
-    <corners android:radius="3dp" />
+        <shape android:shape="rectangle">
-    <stroke
+            <solid android:color="@color/switch_button_active_stroke_dark" />
-        android:width="1dp"
+            <corners android:radius="@dimen/dlg_button_rect_rad" />
-        android:color="@color/active_color_primary_dark" />
+        </shape>
-</shape>
+    </item>
+    <item>
+        <shape>
+            <solid android:color="@color/switch_button_active_dark" />
+            <corners android:radius="@dimen/dlg_button_rect_rad" />
+            <stroke android:width="1dp" android:color="@color/active_color_primary_dark" />
+        </shape>
+    </item>
+</selector>

OsmAnd/res/drawable/purchase_dialog_outline_btn_bg_light.xml

@@ -1,8 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android">
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <solid android:color="@color/switch_button_active_light" />
+    <item android:state_pressed="true">
-    <corners android:radius="3dp" />
+        <shape android:shape="rectangle">
-    <stroke
+            <solid android:color="@color/switch_button_active_stroke_light" />
-        android:width="1dp"
+            <corners android:radius="@dimen/dlg_button_rect_rad" />
-        android:color="@color/active_color_primary_light" />
+        </shape>
-</shape>
+    </item>
+    <item>
+        <shape>
+            <solid android:color="@color/switch_button_active_light" />
+            <corners android:radius="@dimen/dlg_button_rect_rad" />
+            <stroke android:width="1dp" android:color="@color/active_color_primary_light" />
+        </shape>
+    </item>
+</selector>

OsmAnd/res/layout-land/fragment_measurement_tool.xml

@@ -1,20 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:osmand="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@color/color_transparent"
-    android:clickable="true">
+    android:clickable="true"
+    android:focusable="true">
 
     <LinearLayout
         android:id="@+id/main_view"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_gravity="bottom"
-        android:clickable="true"
+        android:focusable="true"
         android:orientation="vertical"
+        android:clickable="true"
         tools:background="@drawable/bg_bottom_menu_dark">
 
         <ProgressBar
@@ -24,7 +25,7 @@
             android:layout_height="wrap_content"
             android:minHeight="0dp"
             android:visibility="gone"
-            tools:visibility="visible"/>
+            tools:visibility="visible" />
 
         <LinearLayout
             android:layout_width="match_parent"
@@ -35,6 +36,7 @@
                 android:layout_width="0dp"
                 android:layout_height="@dimen/measurement_tool_controls_height"
                 android:layout_weight="0.45"
+                android:layout_gravity="center_vertical"
                 android:background="?attr/selectableItemBackground">
 
                 <androidx.appcompat.widget.AppCompatImageView
@@ -69,43 +71,39 @@
                     android:id="@+id/measurement_distance_text_view"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_centerVertical="true"
+                    android:layout_marginStart="@dimen/measurement_tool_text_button_padding"
-                    android:layout_marginEnd="@dimen/measurement_tool_text_margin"
+                    android:layout_marginLeft="@dimen/measurement_tool_text_button_padding"
-                    android:layout_marginLeft="@dimen/measurement_tool_text_margin"
+                    android:layout_marginTop="@dimen/bottom_sheet_title_padding_bottom"
-                    android:layout_marginRight="@dimen/measurement_tool_text_margin"
+                    android:layout_marginEnd="@dimen/text_margin_small"
-                    android:layout_marginStart="@dimen/measurement_tool_text_margin"
+                    android:layout_marginRight="@dimen/text_margin_small"
                     android:layout_toEndOf="@id/main_icon"
                     android:layout_toRightOf="@id/main_icon"
                     android:textAppearance="@style/TextAppearance.ListItemTitle"
-                    tools:text="724 m,"/>
+                    tools:text="724 m," />
 
                 <TextView
                     android:id="@+id/measurement_points_text_view"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_centerVertical="true"
+                    android:layout_alignEnd="@id/up_down_button"
                     android:layout_toEndOf="@id/measurement_distance_text_view"
                     android:layout_toRightOf="@id/measurement_distance_text_view"
-                    android:textColor="?android:textColorSecondary"
+                    android:layout_alignRight="@id/up_down_button"
-                    android:textSize="@dimen/default_list_text_size"
+                    android:layout_marginTop="@dimen/bottom_sheet_title_padding_bottom"
-                    tools:text="points: 3"/>
+                    android:textAppearance="@style/TextAppearance.ListItemCategoryTitle"
+                    tools:text="points: 3" />
 
                 <TextView
                     android:id="@+id/distance_to_center_text_view"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_centerVertical="true"
+                    android:layout_below="@id/measurement_points_text_view"
-                    android:layout_toEndOf="@id/measurement_points_text_view"
+                    android:layout_alignStart="@+id/measurement_distance_text_view"
-                    android:layout_toLeftOf="@id/up_down_button"
+                    android:layout_alignLeft="@+id/measurement_distance_text_view"
-                    android:layout_toRightOf="@id/measurement_points_text_view"
+                    android:maxLines="1"
-                    android:layout_toStartOf="@id/up_down_button"
+                    android:textColor="?android:textColorSecondary"
-                    android:layout_marginEnd="@dimen/measurement_tool_text_margin"
+                    android:textSize="@dimen/default_desc_text_size"
-                    android:layout_marginLeft="@dimen/measurement_tool_text_margin"
+                    tools:text=" – 700 m" />
-                    android:layout_marginRight="@dimen/measurement_tool_text_margin"
-                    android:layout_marginStart="@dimen/measurement_tool_text_margin"
-                    android:textColor="@color/color_distance"
-                    android:textSize="@dimen/default_list_text_size"
-                    tools:text=" – 700 m"/>
 
                 <TextView
                     android:id="@+id/move_point_text"
@@ -143,132 +141,109 @@
                 android:layout_height="match_parent"
                 android:background="?attr/dashboard_divider"/>
 
-            <LinearLayout
+            <RelativeLayout
                 android:id="@+id/measure_mode_controls"
                 android:layout_width="0dp"
                 android:layout_height="@dimen/measurement_tool_controls_height"
-                android:layout_weight="0.55">
+                android:layout_weight="0.55"
+                android:padding="@dimen/content_padding_half">
 
-                <FrameLayout
+                <net.osmand.plus.widgets.TextViewEx
-                    android:layout_width="0dp"
+                    android:id="@+id/options_button"
-                    android:layout_height="match_parent"
-                    android:layout_weight="1">
-
-                    <net.osmand.plus.widgets.TextViewEx
-                        android:id="@+id/options_button"
-                        android:layout_width="wrap_content"
-                        android:layout_height="match_parent"
-                        android:layout_marginTop="@dimen/measurement_tool_button_padding"
-                        android:layout_marginBottom="@dimen/measurement_tool_button_padding"
-                        android:background="?attr/selectableItemBackground"
-                        android:gravity="center_vertical"
-                        android:maxLines="1"
-                        android:paddingEnd="@dimen/measurement_tool_text_button_padding_small"
-                        android:paddingRight="@dimen/measurement_tool_text_button_padding_small"
-                        android:paddingStart="@dimen/measurement_tool_text_button_padding"
-                        android:paddingLeft="@dimen/measurement_tool_text_button_padding"
-                        android:text="@string/shared_string_options"
-                        android:textColor="?attr/color_dialog_buttons"
-                        osmand:typeface="@string/font_roboto_medium"/>
-                </FrameLayout>
-
-                <ImageButton
-                    android:id="@+id/undo_point_button"
                     android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
+                    android:layout_height="@dimen/measurement_tool_button_height"
-                    android:layout_gravity="center_vertical"
+                    android:layout_centerVertical="true"
+                    android:gravity="center_vertical"
                     android:background="?attr/selectableItemBackground"
-                    android:padding="@dimen/measurement_tool_undo_redo_padding_small"
+                    android:maxLines="1"
-                    tools:src="@drawable/ic_action_undo_dark"/>
+                    android:paddingLeft="@dimen/measurement_tool_text_button_padding_small"
+                    android:paddingRight="@dimen/measurement_tool_text_button_padding_small"
+                    android:text="@string/shared_string_options"
+                    android:textColor="?attr/color_dialog_buttons"
+                    osmand:typeface="@string/font_roboto_medium" />
 
-                <ImageButton
+                <RelativeLayout
-                    android:id="@+id/redo_point_button"
                     android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center_vertical"
-                    android:layout_marginLeft="@dimen/measurement_tool_button_padding"
-                    android:layout_marginStart="@dimen/measurement_tool_button_padding"
-                    android:background="?attr/selectableItemBackground"
-                    android:padding="@dimen/measurement_tool_undo_redo_padding_small"
-                    tools:src="@drawable/ic_action_redo_dark"/>
-
-                <FrameLayout
-                    android:layout_width="0dp"
                     android:layout_height="match_parent"
-                    android:layout_weight="1">
+                    android:layout_centerInParent="true">
 
-                    <Button
+                    <ImageButton
-                        android:id="@+id/add_point_button"
+                        android:id="@+id/undo_point_button"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:layout_gravity="end"
+                        android:layout_centerVertical="true"
-                        android:layout_marginBottom="@dimen/measurement_tool_button_margin"
+                        android:background="?attr/selectableItemBackground"
-                        android:layout_marginEnd="@dimen/measurement_tool_button_margin"
+                        android:contentDescription="@string/shared_string_undo"
-                        android:layout_marginRight="@dimen/measurement_tool_button_margin"
+                        android:padding="@dimen/measurement_tool_undo_redo_padding_small"
-                        android:layout_marginTop="@dimen/measurement_tool_button_margin"
+                        tools:src="@drawable/ic_action_undo_dark" />
-                        android:background="?attr/btn_round"
-                        android:maxLines="1"
-                        android:minHeight="@dimen/measurement_tool_button_height"
-                        android:paddingLeft="@dimen/measurement_tool_button_padding"
-                        android:paddingRight="@dimen/measurement_tool_button_padding"
-                        android:text="@string/shared_string_add"
-                        android:textColor="@color/color_white"
-                        android:textAllCaps="false"
-                        android:paddingEnd="@dimen/measurement_tool_button_padding"
-                        android:paddingStart="@dimen/measurement_tool_button_padding" />
-                </FrameLayout>
 
-            </LinearLayout>
+                    <ImageButton
+                        android:id="@+id/redo_point_button"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_centerVertical="true"
+                        android:layout_marginStart="@dimen/measurement_tool_button_padding"
+                        android:layout_marginLeft="@dimen/measurement_tool_button_padding"
+                        android:layout_toRightOf="@id/undo_point_button"
+                        android:layout_toEndOf="@id/undo_point_button"
+                        android:background="?attr/selectableItemBackground"
+                        android:contentDescription="@string/shared_string_redo"
+                        android:padding="@dimen/measurement_tool_undo_redo_padding_small"
+                        tools:src="@drawable/ic_action_redo_dark" />
+                </RelativeLayout>
+
+                <include
+                    android:id="@+id/add_point_button"
+                    layout="@layout/bottom_sheet_dialog_button"
+                    android:layout_width="@dimen/measurement_tool_button_width"
+                    android:layout_height="@dimen/measurement_tool_button_height"
+                    android:layout_centerVertical="true"
+                    android:layout_alignParentEnd="true"
+                    android:layout_alignParentRight="true" />
+            </RelativeLayout>
 
             <RelativeLayout
                 android:id="@+id/move_point_controls"
                 android:layout_width="0dp"
                 android:layout_height="@dimen/measurement_tool_controls_height"
-                android:layout_weight="0.6"
+                android:layout_weight="0.55"
                 android:visibility="gone">
 
-                <Button
+                <include
                     android:id="@+id/apply_move_point_button"
-                    android:layout_width="wrap_content"
+                    android:layout_height="@dimen/measurement_tool_button_height"
-                    android:layout_height="wrap_content"
+                    android:layout_width="@dimen/measurement_tool_button_width"
+                    android:layout_marginEnd="@dimen/measurement_tool_button_margin"
+                    android:layout_marginRight="@dimen/measurement_tool_button_margin"
                     android:layout_alignParentEnd="true"
                     android:layout_alignParentRight="true"
                     android:layout_centerVertical="true"
-                    android:layout_marginBottom="@dimen/measurement_tool_button_margin"
+                    layout="@layout/bottom_sheet_dialog_button" />
-                    android:layout_marginEnd="@dimen/measurement_tool_button_margin"
+
-                    android:layout_marginRight="@dimen/measurement_tool_button_margin"
-                    android:layout_marginTop="@dimen/measurement_tool_button_margin"
-                    android:background="?attr/btn_round"
-                    android:minHeight="@dimen/measurement_tool_button_height"
-                    android:paddingLeft="@dimen/measurement_tool_button_padding"
-                    android:paddingRight="@dimen/measurement_tool_button_padding"
-                    android:text="@string/shared_string_apply"
-                    android:textColor="@color/color_white"
-                    android:textAllCaps="false"
-                    android:paddingEnd="@dimen/measurement_tool_button_padding"
-                    android:paddingStart="@dimen/measurement_tool_button_padding" />
 
                 <net.osmand.plus.widgets.TextViewEx
                     android:id="@+id/cancel_move_point_button"
                     android:layout_width="wrap_content"
-                    android:layout_height="match_parent"
+                    android:layout_height="@dimen/measurement_tool_button_height"
                     android:background="?attr/selectableItemBackground"
+                    android:layout_centerVertical="true"
+                    android:layout_marginStart="@dimen/content_padding_small"
+                    android:layout_marginLeft="@dimen/content_padding_small"
                     android:gravity="center_vertical"
                     android:paddingEnd="@dimen/measurement_tool_text_button_padding_small"
-                    android:paddingLeft="@dimen/measurement_tool_text_button_padding"
+                    android:paddingLeft="@dimen/measurement_tool_text_button_padding_small"
                     android:paddingRight="@dimen/measurement_tool_text_button_padding_small"
-                    android:paddingStart="@dimen/measurement_tool_text_button_padding"
+                    android:paddingStart="@dimen/measurement_tool_text_button_padding_small"
                     android:text="@string/shared_string_cancel"
                     android:textColor="?attr/color_dialog_buttons"
-                    osmand:textAllCapsCompat="true"
+                    osmand:typeface="@string/font_roboto_medium" />
-                    osmand:typeface="@string/font_roboto_medium"/>
             </RelativeLayout>
 
-            <LinearLayout
+            <RelativeLayout
                 android:id="@+id/add_point_before_after_controls"
                 android:layout_width="0dp"
                 android:layout_height="@dimen/measurement_tool_controls_height"
-                android:layout_weight="0.6"
+                android:layout_weight="0.55"
                 android:gravity="center_vertical"
                 android:orientation="horizontal"
                 android:visibility="gone">
@@ -276,59 +251,48 @@
                 <net.osmand.plus.widgets.TextViewEx
                     android:id="@+id/cancel_point_before_after_button"
                     android:layout_width="wrap_content"
-                    android:layout_height="match_parent"
+                    android:layout_height="@dimen/measurement_tool_button_height"
                     android:background="?attr/selectableItemBackground"
+                    android:layout_centerVertical="true"
+                    android:layout_marginStart="@dimen/content_padding_small"
+                    android:layout_marginLeft="@dimen/content_padding_small"
                     android:gravity="center_vertical"
                     android:paddingEnd="@dimen/measurement_tool_text_button_padding_small"
-                    android:paddingLeft="@dimen/measurement_tool_text_button_padding"
+                    android:paddingLeft="@dimen/measurement_tool_text_button_padding_small"
                     android:paddingRight="@dimen/measurement_tool_text_button_padding_small"
-                    android:paddingStart="@dimen/measurement_tool_text_button_padding"
+                    android:paddingStart="@dimen/measurement_tool_text_button_padding_small"
                     android:text="@string/shared_string_cancel"
                     android:textColor="?attr/color_dialog_buttons"
-                    osmand:textAllCapsCompat="true"
+                    osmand:typeface="@string/font_roboto_medium" />
-                    osmand:typeface="@string/font_roboto_medium"/>
 
                 <View
                     android:layout_width="0dp"
-                    android:layout_height="match_parent"
+                    android:layout_height="match_parent" />
-                    android:layout_weight="1"/>
 
-                <Button
+                <include
                     android:id="@+id/apply_point_before_after_point_button"
-                    android:layout_width="wrap_content"
+                    android:layout_height="@dimen/measurement_tool_button_height"
-                    android:layout_height="wrap_content"
+                    android:layout_width="@dimen/measurement_tool_button_width"
-                    android:layout_marginBottom="@dimen/measurement_tool_button_margin"
                     android:layout_marginEnd="@dimen/measurement_tool_button_margin"
                     android:layout_marginRight="@dimen/measurement_tool_button_margin"
                     android:layout_marginTop="@dimen/measurement_tool_button_margin"
-                    android:background="?attr/btn_round_border"
+                    android:layout_toStartOf="@id/add_point_before_after_button"
-                    android:minHeight="@dimen/measurement_tool_button_height"
+                    android:layout_toLeftOf="@id/add_point_before_after_button"
-                    android:paddingLeft="@dimen/measurement_tool_button_padding"
+                    android:layout_centerVertical="true"
-                    android:paddingRight="@dimen/measurement_tool_button_padding"
+                    layout="@layout/bottom_sheet_dialog_button" />
-                    android:text="@string/shared_string_apply"
-                    android:textColor="?attr/color_dialog_buttons"
-                    android:textAllCaps="false"
-                    android:paddingEnd="@dimen/measurement_tool_button_padding"
-                    android:paddingStart="@dimen/measurement_tool_button_padding" />
 
-                <Button
+                <include
                     android:id="@+id/add_point_before_after_button"
-                    android:layout_width="wrap_content"
+                    android:layout_height="@dimen/measurement_tool_button_height"
-                    android:layout_height="wrap_content"
+                    android:layout_width="@dimen/measurement_tool_button_width"
-                    android:layout_marginBottom="@dimen/measurement_tool_button_margin"
+                    android:layout_centerVertical="true"
                     android:layout_marginEnd="@dimen/measurement_tool_button_margin"
                     android:layout_marginRight="@dimen/measurement_tool_button_margin"
-                    android:layout_marginTop="@dimen/measurement_tool_button_margin"
+                    android:layout_alignParentEnd="true"
-                    android:background="?attr/btn_round"
+                    android:layout_alignParentRight="true"
-                    android:minHeight="@dimen/measurement_tool_button_height"
+                    layout="@layout/bottom_sheet_dialog_button" />
-                    android:paddingLeft="@dimen/measurement_tool_button_padding"
+
-                    android:paddingRight="@dimen/measurement_tool_button_padding"
+            </RelativeLayout>
-                    android:text="@string/shared_string_add"
-                    android:textColor="@color/color_white"
-                    android:textAllCaps="false"
-                    android:paddingStart="@dimen/measurement_tool_button_padding"
-                    android:paddingEnd="@dimen/measurement_tool_button_padding" />
-            </LinearLayout>
 
         </LinearLayout>
 

OsmAnd/res/layout-land/map_hud_top.xml

@@ -536,11 +536,11 @@
                     <ImageButton
                         android:id="@+id/widget_top_bar_back_button"
                         style="@style/Widget.AppCompat.ActionButton"
-                        android:layout_width="56dp"
+                        android:layout_width="@dimen/toolbar_height"
-                        android:layout_height="56dp"
+                        android:layout_height="@dimen/toolbar_height"
                         android:layout_gravity="top"
                         android:contentDescription="@string/back_to_search"
-                        osmand:srcCompat="@drawable/ic_arrow_back"/>
+                        osmand:srcCompat="@drawable/ic_arrow_back" />
 
                     <LinearLayout
                         android:id="@+id/widget_top_bar_title_layout"
@@ -549,8 +549,8 @@
                         android:layout_gravity="center_vertical"
                         android:layout_weight="1"
                         android:orientation="vertical"
-                        android:paddingBottom="10dp"
+                        android:paddingBottom="@dimen/toolbar_title_padding_bottom"
-                        android:paddingTop="10dp">
+                        android:paddingTop="@dimen/toolbar_title_padding_top">
 
                         <TextView
                             android:id="@+id/widget_top_bar_title"
@@ -598,7 +598,7 @@
                         android:id="@+id/widget_top_bar_refresh_button"
                         style="@style/Widget.AppCompat.ActionButton"
                         android:layout_width="48dp"
-                        android:layout_height="56dp"
+                        android:layout_height="@dimen/toolbar_height"
                         android:layout_gravity="top"
                         android:contentDescription="@string/shared_string_refresh"
                         osmand:srcCompat="@drawable/ic_action_refresh_dark"
@@ -608,7 +608,7 @@
                         android:id="@+id/widget_top_bar_close_button"
                         style="@style/Widget.AppCompat.ActionButton"
                         android:layout_width="48dp"
-                        android:layout_height="56dp"
+                        android:layout_height="@dimen/toolbar_height"
                         android:layout_gravity="top"
                         android:contentDescription="@string/shared_string_close"
                         osmand:srcCompat="@drawable/ic_action_remove_dark"/>
@@ -616,7 +616,7 @@
                     <net.osmand.plus.widgets.TextViewEx
                         android:id="@+id/widget_top_bar_save"
                         android:layout_width="wrap_content"
-                        android:layout_height="56dp"
+                        android:layout_height="@dimen/toolbar_height"
                         android:background="@null"
                         android:ellipsize="end"
                         android:gravity="center_vertical"
@@ -636,7 +636,7 @@
                     <androidx.appcompat.widget.SwitchCompat
                         android:id="@+id/widget_top_bar_switch"
                         android:layout_width="wrap_content"
-                        android:layout_height="56dp"
+                        android:layout_height="@dimen/toolbar_height"
                         android:paddingEnd="16dp"
                         android:paddingRight="16dp"
                         android:visibility="gone"

OsmAnd/res/layout/fragment_measurement_tool.xml

@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:osmand="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@color/color_transparent"
-    android:clickable="true">
+    android:clickable="true"
+    android:focusable="true">
 
     <LinearLayout
         android:id="@+id/main_view"
@@ -14,8 +14,9 @@
         android:layout_height="wrap_content"
         android:layout_gravity="bottom"
         android:background="@drawable/bg_bottom_menu_dark"
+        android:orientation="vertical"
         android:clickable="true"
-        android:orientation="vertical">
+        android:focusable="true">
 
         <ProgressBar
             android:id="@+id/snap_to_road_progress_bar"
@@ -24,7 +25,7 @@
             android:layout_height="wrap_content"
             android:minHeight="0dp"
             android:visibility="gone"
-            tools:visibility="visible"/>
+            tools:visibility="visible" />
 
         <RelativeLayout
             android:id="@+id/up_down_row"
@@ -81,8 +82,10 @@
                 android:layout_marginTop="@dimen/measurement_tool_button_padding"
                 android:layout_toEndOf="@id/measurement_distance_text_view"
                 android:layout_toRightOf="@id/measurement_distance_text_view"
+                android:layout_alignEnd="@id/up_down_button"
+                android:layout_alignRight="@id/up_down_button"
                 android:textAppearance="@style/TextAppearance.ListItemCategoryTitle"
-                tools:text="points: 3"/>
+                tools:text="points: 3" />
 
             <TextView
                 android:id="@+id/distance_to_center_text_view"
@@ -159,8 +162,8 @@
             android:id="@+id/measure_mode_controls"
             android:layout_width="match_parent"
             android:layout_height="@dimen/measurement_tool_controls_height"
-            android:paddingTop="@dimen/measurement_tool_button_padding_top"
+            android:paddingTop="@dimen/measurement_tool_button_margin"
-            android:paddingBottom="@dimen/measurement_tool_button_padding_top"
+            android:paddingBottom="@dimen/measurement_tool_button_margin"
             android:paddingLeft="@dimen/measurement_tool_button_margin"
             android:paddingRight="@dimen/measurement_tool_button_margin">
 
@@ -189,6 +192,7 @@
                 android:layout_height="wrap_content"
                 android:background="?attr/selectableItemBackground"
                 android:padding="@dimen/measurement_tool_undo_redo_padding_small"
+                android:contentDescription="@string/shared_string_undo"
                 tools:src="@drawable/ic_action_undo_dark"/>
 
             <ImageButton
@@ -199,6 +203,7 @@
                 android:layout_marginStart="@dimen/measurement_tool_button_padding"
                 android:background="?attr/selectableItemBackground"
                 android:padding="@dimen/measurement_tool_undo_redo_padding_small"
+                android:contentDescription="@string/shared_string_redo"
                 tools:src="@drawable/ic_action_redo_dark"/>
 
             <FrameLayout
@@ -206,22 +211,12 @@
                 android:layout_height="match_parent"
                 android:layout_weight="1">
 
-                <Button
+                <include
                     android:id="@+id/add_point_button"
-                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
-                    android:layout_height="wrap_content"
+                    android:layout_width="@dimen/measurement_tool_button_width"
                     android:layout_gravity="end"
-                    android:background="?attr/btn_round"
+                    layout="@layout/bottom_sheet_dialog_button" />
-                    android:ellipsize="end"
-                    android:maxLines="1"
-                    android:minHeight="@dimen/measurement_tool_button_height"
-                    android:paddingLeft="@dimen/measurement_tool_button_padding"
-                    android:paddingRight="@dimen/measurement_tool_button_padding"
-                    android:text="@string/shared_string_add"
-                    android:textColor="@color/color_white"
-                    android:textAllCaps="false"
-                    android:paddingEnd="@dimen/measurement_tool_button_padding"
-                    android:paddingStart="@dimen/measurement_tool_button_padding" />
             </FrameLayout>
 
         </LinearLayout>
@@ -232,26 +227,16 @@
             android:layout_height="@dimen/measurement_tool_controls_height"
             android:visibility="gone">
 
-            <Button
+            <include
                 android:id="@+id/apply_move_point_button"
-                android:layout_width="wrap_content"
+                android:layout_height="@dimen/measurement_tool_button_height"
-                android:layout_height="wrap_content"
+                android:layout_width="@dimen/measurement_tool_button_width"
+                android:layout_marginEnd="@dimen/measurement_tool_button_margin"
+                android:layout_marginRight="@dimen/measurement_tool_button_margin"
                 android:layout_alignParentEnd="true"
                 android:layout_alignParentRight="true"
                 android:layout_centerVertical="true"
-                android:layout_marginBottom="@dimen/measurement_tool_button_margin"
+                layout="@layout/bottom_sheet_dialog_button" />
-                android:layout_marginEnd="@dimen/measurement_tool_button_margin"
-                android:layout_marginRight="@dimen/measurement_tool_button_margin"
-                android:layout_marginTop="@dimen/measurement_tool_button_margin"
-                android:background="?attr/btn_round"
-                android:minHeight="@dimen/measurement_tool_button_height"
-                android:paddingLeft="@dimen/measurement_tool_button_padding"
-                android:paddingRight="@dimen/measurement_tool_button_padding"
-                android:text="@string/shared_string_apply"
-                android:textColor="@color/color_white"
-                android:textAllCaps="false"
-                android:paddingEnd="@dimen/measurement_tool_button_padding"
-                android:paddingStart="@dimen/measurement_tool_button_padding" />
 
             <net.osmand.plus.widgets.TextViewEx
                 android:id="@+id/cancel_move_point_button"
@@ -269,7 +254,7 @@
         <LinearLayout
             android:id="@+id/add_point_before_after_controls"
             android:layout_width="match_parent"
-            android:layout_height="52dp"
+            android:layout_height="@dimen/measurement_tool_controls_height"
             android:gravity="center_vertical"
             android:orientation="horizontal"
             android:visibility="gone">
@@ -291,41 +276,24 @@
                 android:layout_height="match_parent"
                 android:layout_weight="1"/>
 
-            <Button
+            <include
                 android:id="@+id/apply_point_before_after_point_button"
-                android:layout_width="wrap_content"
+                android:layout_height="@dimen/measurement_tool_button_height"
-                android:layout_height="wrap_content"
+                android:layout_gravity="center_vertical"
-                android:layout_marginBottom="@dimen/measurement_tool_button_margin"
+                android:layout_width="@dimen/measurement_tool_button_width"
                 android:layout_marginEnd="@dimen/measurement_tool_button_margin"
                 android:layout_marginRight="@dimen/measurement_tool_button_margin"
-                android:layout_marginTop="@dimen/measurement_tool_button_margin"
+                layout="@layout/bottom_sheet_dialog_button" />
-                android:background="?attr/btn_round_border"
-                android:minHeight="@dimen/measurement_tool_button_height"
-                android:paddingLeft="@dimen/measurement_tool_button_padding"
-                android:paddingRight="@dimen/measurement_tool_button_padding"
-                android:text="@string/shared_string_apply"
-                android:textColor="@color/color_white"
-                android:textAllCaps="false"
-                android:paddingEnd="@dimen/measurement_tool_button_padding"
-                android:paddingStart="@dimen/measurement_tool_button_padding" />
 
-            <Button
+            <include
                 android:id="@+id/add_point_before_after_button"
-                android:layout_width="wrap_content"
+                android:layout_height="@dimen/measurement_tool_button_height"
-                android:layout_height="wrap_content"
+                android:layout_gravity="center_vertical"
-                android:layout_marginBottom="@dimen/measurement_tool_button_margin"
+                android:layout_width="@dimen/measurement_tool_button_width"
                 android:layout_marginEnd="@dimen/measurement_tool_button_margin"
                 android:layout_marginRight="@dimen/measurement_tool_button_margin"
-                android:layout_marginTop="@dimen/measurement_tool_button_margin"
+                layout="@layout/bottom_sheet_dialog_button" />
-                android:background="?attr/btn_round"
+
-                android:minHeight="@dimen/measurement_tool_button_height"
-                android:paddingLeft="@dimen/measurement_tool_button_padding"
-                android:paddingRight="@dimen/measurement_tool_button_padding"
-                android:text="@string/shared_string_add"
-                android:textColor="@color/color_white"
-                android:textAllCaps="false"
-                android:paddingEnd="@dimen/measurement_tool_button_padding"
-                android:paddingStart="@dimen/measurement_tool_button_padding" />
         </LinearLayout>
 
     </LinearLayout>

OsmAnd/res/layout/fragment_route_between_points_bottom_sheet_dialog.xml

@@ -65,23 +65,6 @@
 				android:textSize="@dimen/default_desc_text_size" />
 		</LinearLayout>
 
-		<LinearLayout
-			android:id="@+id/buttons_container"
-			android:layout_width="match_parent"
-			android:layout_height="@dimen/dialog_button_ex_height"
-			android:gravity="center"
-			android:layout_gravity="bottom"
-			android:orientation="horizontal"
-			android:paddingLeft="@dimen/content_padding"
-			android:paddingRight="@dimen/content_padding"
-			android:paddingEnd="@dimen/content_padding"
-			android:paddingStart="@dimen/content_padding">
-
-			<include
-				android:id="@+id/dismiss_button"
-				layout="@layout/bottom_sheet_dialog_button" />
-		</LinearLayout>
-
 	</LinearLayout>
 
 </androidx.core.widget.NestedScrollView>

OsmAnd/res/layout/map_hud_bottom.xml

@@ -116,12 +116,13 @@
                 tools:src="@drawable/ic_action_remove_dark"
                 android:contentDescription="@string/snap_to_road" />
 
-	        <include
+            <include
-		        layout="@layout/map_ruler"
+                layout="@layout/map_ruler"
-		        android:layout_width="@dimen/map_ruler_width"
+                android:layout_width="@dimen/map_ruler_width"
-		        android:layout_height="wrap_content"
+                android:layout_height="wrap_content"
-		        android:layout_marginStart="@dimen/map_button_margin"
+                android:layout_gravity="bottom"
-		        android:layout_marginLeft="@dimen/map_button_margin" />
+                android:layout_marginStart="@dimen/map_button_margin"
+                android:layout_marginLeft="@dimen/map_button_margin" />
 
         </LinearLayout>
 

OsmAnd/res/layout/map_hud_top.xml

@@ -210,8 +210,8 @@
                     android:layout_marginLeft="@dimen/map_button_margin"
                     android:layout_marginRight="@dimen/map_button_margin"
                     tools:src="@drawable/ic_action_remove_dark"
-	                android:layout_marginStart="@dimen/map_button_margin"
+                    android:layout_marginStart="@dimen/map_button_margin"
-	                android:layout_marginEnd="@dimen/map_button_margin" />
+                    android:layout_marginEnd="@dimen/map_button_margin" />
 
                 <LinearLayout
                     android:layout_width="wrap_content"
@@ -322,8 +322,8 @@
                 <ImageButton
                     android:id="@+id/widget_top_bar_back_button"
                     style="@style/Widget.AppCompat.ActionButton"
-                    android:layout_width="56dp"
+                    android:layout_width="@dimen/toolbar_height"
-                    android:layout_height="56dp"
+                    android:layout_height="@dimen/toolbar_height"
                     android:layout_gravity="top"
                     android:contentDescription="@string/back_to_search"
                     osmand:srcCompat="@drawable/ic_arrow_back"/>
@@ -335,8 +335,8 @@
                     android:layout_gravity="center_vertical"
                     android:layout_weight="1"
                     android:orientation="vertical"
-                    android:paddingBottom="10dp"
+                    android:paddingBottom="@dimen/toolbar_title_padding_bottom"
-                    android:paddingTop="10dp">
+                    android:paddingTop="@dimen/toolbar_title_padding_top">
 
                     <TextView
                         android:id="@+id/widget_top_bar_title"
@@ -370,7 +370,7 @@
                         android:background="?attr/selectableItemBackground"
                         android:ellipsize="end"
                         android:maxLines="1"
-                        android:layout_marginTop="8dp"
+                        android:layout_marginTop="@dimen/content_padding_half"
                         android:textColor="?attr/wikivoyage_active_color"
                         android:textSize="@dimen/default_list_text_size"
                         android:visibility="gone"
@@ -384,7 +384,7 @@
                     android:id="@+id/widget_top_bar_refresh_button"
                     style="@style/Widget.AppCompat.ActionButton"
                     android:layout_width="48dp"
-                    android:layout_height="56dp"
+                    android:layout_height="@dimen/toolbar_height"
                     android:layout_gravity="top"
                     android:contentDescription="@string/shared_string_refresh"
                     osmand:srcCompat="@drawable/ic_action_refresh_dark"
@@ -394,7 +394,7 @@
                     android:id="@+id/widget_top_bar_close_button"
                     style="@style/Widget.AppCompat.ActionButton"
                     android:layout_width="48dp"
-                    android:layout_height="56dp"
+                    android:layout_height="@dimen/toolbar_height"
                     android:layout_gravity="top"
                     android:contentDescription="@string/shared_string_close"
                     osmand:srcCompat="@drawable/ic_action_remove_dark"/>
@@ -402,13 +402,13 @@
                 <net.osmand.plus.widgets.TextViewEx
                     android:id="@+id/widget_top_bar_save"
                     android:layout_width="wrap_content"
-                    android:layout_height="56dp"
+                    android:layout_height="@dimen/toolbar_height"
                     android:background="@null"
                     android:ellipsize="end"
                     android:gravity="center_vertical"
                     android:lines="1"
-                    android:paddingRight="16dp"
+                    android:paddingRight="@dimen/content_padding"
-                    android:paddingEnd="16dp"
+                    android:paddingEnd="@dimen/content_padding"
                     android:textAllCaps="true"
                     android:singleLine="true"
                     android:textColor="?android:textColorPrimary"
@@ -422,9 +422,9 @@
                 <androidx.appcompat.widget.SwitchCompat
                     android:id="@+id/widget_top_bar_switch"
                     android:layout_width="wrap_content"
-                    android:layout_height="56dp"
+                    android:layout_height="@dimen/toolbar_height"
-                    android:paddingEnd="16dp"
+                    android:paddingEnd="@dimen/content_padding"
-                    android:paddingRight="16dp"
+                    android:paddingRight="@dimen/content_padding"
                     android:visibility="gone"
                     tools:visibility="visible"/>
 
@@ -435,8 +435,8 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:orientation="vertical"
-				android:animateLayoutChanges="true"
+                android:animateLayoutChanges="true"
-				android:visibility="gone"/>
+                android:visibility="gone"/>
 
             <FrameLayout
                 android:id="@+id/widget_top_bar_shadow"
@@ -594,7 +594,7 @@
                                 android:textColor="@color/marker_top_2nd_line_color"
                                 android:textSize="@dimen/default_list_text_size"
                                 android:textStyle="bold"
-	                            android:layout_toEndOf="@+id/map_marker_dist_2nd" />
+                                android:layout_toEndOf="@+id/map_marker_dist_2nd" />
 
                         </RelativeLayout>
 
@@ -781,8 +781,8 @@
                 android:layout_marginLeft="@dimen/widget_turn_lane_border"
                 android:layout_marginRight="@dimen/widget_turn_lane_border"
                 android:layout_marginTop="@dimen/widget_turn_lane_border"
-	            android:layout_marginStart="@dimen/widget_turn_lane_border"
+                android:layout_marginStart="@dimen/widget_turn_lane_border"
-	            android:layout_marginEnd="@dimen/widget_turn_lane_border" />
+                android:layout_marginEnd="@dimen/widget_turn_lane_border" />
 
             <FrameLayout
                 android:layout_width="wrap_content"
@@ -802,8 +802,8 @@
                     android:textColor="@color/color_black"
                     android:textSize="@dimen/map_button_text_size"
                     tools:text="1048 km"
-	                android:layout_marginEnd="@dimen/widget_turn_lane_border"
+                    android:layout_marginEnd="@dimen/widget_turn_lane_border"
-	                android:layout_marginStart="@dimen/widget_turn_lane_border" />
+                    android:layout_marginStart="@dimen/widget_turn_lane_border" />
 
                 <TextView
                     android:id="@+id/map_lanes_dist_text"
@@ -816,8 +816,8 @@
                     android:textColor="@color/color_black"
                     android:textSize="@dimen/map_button_text_size"
                     tools:text="1048 km"
-	                android:layout_marginEnd="@dimen/widget_turn_lane_border"
+                    android:layout_marginEnd="@dimen/widget_turn_lane_border"
-	                android:layout_marginStart="@dimen/widget_turn_lane_border" />
+                    android:layout_marginStart="@dimen/widget_turn_lane_border" />
 
             </FrameLayout>
 

OsmAnd/res/layout/preference_text_field.xml

@@ -13,6 +13,8 @@
 		android:layout_height="wrap_content"
 		android:layout_weight="1"
 		android:layout_margin="@dimen/list_content_padding"
+		android:focusable="true"
+		android:focusableInTouchMode="true"
 		app:primaryColor="@color/active_color_primary_dark"
 		app:secondaryColor="?android:textColorSecondary"
 		app:errorColor="@color/color_invalid"

OsmAnd/res/layout/preference_toolbar_switch.xml

@@ -39,6 +39,7 @@
 			android:background="@null"
 			android:clickable="false"
 			android:focusable="false"
+			android:saveEnabled="false"
 			android:paddingLeft="@dimen/content_padding"
 			android:paddingRight="@dimen/content_padding"
 			android:paddingStart="@dimen/content_padding"

OsmAnd/res/layout/server_activity.xml

@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
-    android:layout_height="match_parent"
-    android:padding="10px">
-    <RelativeLayout
-        android:id="@+id/RelativeLayout03"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_centerHorizontal="true"
-        android:layout_marginTop="20px"
-        android:layout_marginBottom="40px">
-
-        <TextView
-            android:id="@+id/TextView02"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_centerHorizontal="true"
-            android:autoLink="web"
-            android:text="Click button to start server"></TextView>
-    </RelativeLayout>
-
-    <Button
-        android:id="@+id/Button01"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_below="@+id/RelativeLayout03"
-        android:layout_alignParentLeft="true"
-        android:layout_marginBottom="40px"
-        android:text="Start"></Button>
-
-    <Button
-        android:id="@+id/Button03"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_below="@+id/Button01"
-        android:layout_alignParentRight="true"
-        android:layout_alignParentLeft="true"
-        android:text="Stop"></Button>
-
-    <TextView
-        android:id="@+id/textView1"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignRight="@+id/Button03"
-        android:fitsSystemWindows="true"
-        android:lines="14"
-        android:textAppearance="?android:attr/textAppearanceSmall"
-        android:textSize="8dp" />
-
-</RelativeLayout>

OsmAnd/res/values-ar/strings.xml

@@ -62,7 +62,7 @@
     <string name="incremental_search_city">بحث مدينة تدريجياً</string>
     <string name="safe_mode">الوضع الآمن</string>
     <string name="close_changeset">إغلاق تغيير تعيين</string>
-    <string name="enable_plugin_monitoring_services">تمكين البرنامج المساعد لتسجيل الرحلة باستعمال خدمات تحديد المواقع (تسجيل GPX، وتتبع عبر الإنترنت)</string>
+    <string name="enable_plugin_monitoring_services">تمكين الملحق لتسجيل الرحلة باستعمال خدمات تحديد المواقع (تسجيل GPX، والتتبع عبر الإنترنت)</string>
     <string name="non_optimal_route_calculation">ربما لا يكون من الأحسن حساب الطريق لمسافات طويلة</string>
     <string name="map_widget_show_destination_arrow">عرض اتجاه المقصد</string>
     <string name="map_widget_monitoring_services">خدمات التسجيل</string>
@@ -304,7 +304,7 @@
     <string name="layer_recordings">طبقة التسجيل</string>
     <string name="recording_description">تسجيل %1$s %3$s %2$s</string>
     <string name="map_widget_av_notes">ملاحظات صوت/فيديو</string>
-    <string name="audionotes_plugin_description">هذه الأداة توفر وظائف لتدوين ملاحظات صوتية/مصورة/فيديو خلال الرحلة، سواء باستخدام زر على شاشة الخريطة، أو مباشرة من القائمة لأي موقع على الخريطة.</string>
+    <string name="audionotes_plugin_description">هذا الملحق يوفر وظائف لتدوين ملاحظات صوتية/مصورة/فيديو خلال الرحلة، سواء باستخدام زر على شاشة الخريطة، أو مباشرة من القائمة لأي موقع على الخريطة.</string>
     <string name="audionotes_plugin_name">ملاحظات صوتية/مصورة</string>
     <string name="download_roads_only_maps">خرائط الطرقات فقط</string>
     <string name="rendering_attr_noAdminboundaries_description">منع عرض الحدود الإقليمية (المستويات الإدارية من 5-9).</string>
@@ -448,11 +448,11 @@
     <string name="online_map_settings_descr">حدد مصادر خريطة التجانب المخزنة مؤقتاً عبر الإنترنت.</string>
     <string name="auto_zoom_farthest">إلى مدى بعيد \"٥٠٠م\"</string>
     <string name="use_magnetic_sensor_descr">استخدم الحساس المغناطيسي لتحديد قيمة البوصلة بدلا من حساس الاتجاهات.</string>
-    <string name="osmand_accessibility_description">يجعل هذا البرنامج المساعد ميزات إمكانية الوصول الخاصة بالجهاز متاحة مباشرة في أوسماند. إنه يسهل على سبيل المثال ضبط معدل الكلام لأصوات تحويل النص إلى كلام ، أو تكوين تنقل شاشة لوحة الاتجاه ، باستخدام كرة التتبع للتحكم في التكبير / التصغير ، أو تعليقات تحويل النص إلى كلام ، على سبيل المثال لإعلام موضعك تلقائياً.</string>
+    <string name="osmand_accessibility_description">يجعل هذا الملحق ميزات إمكانية الوصول الخاصة بالجهاز متاحة مباشرة في أوسماند. إنه يسهل على سبيل المثال ضبط معدل الكلام لأصوات تحويل النص إلى كلام ، أو تكوين تنقل شاشة لوحة الاتجاه ، باستخدام كرة التتبع للتحكم في التكبير/التصغير ، أو تعليقات تحويل النص إلى كلام ، على سبيل المثال لإعلام موضعك تلقائياً.</string>
-    <string name="osmand_development_plugin_description">هذه الأداة المساعدة تعرض إعدادات لتطوير وتصحيح الميزات كاختبار أو محاكاة التوجيه، أداء الشاشة، أو الإشعار الصوتي. هذه الإعدادات معدة للمطورين و المستخدم العام لا يحتاجها.</string>
+    <string name="osmand_development_plugin_description">هذا الملحق يعرض إعدادات لتطوير وتصحيح الميزات كاختبار أو محاكاة التوجيه، أداء الشاشة، أو الإشعار الصوتي. هذه الإعدادات معدة للمطورين و المستخدم العام لا يحتاجها.</string>
     <string name="plugins_screen">الملحقات</string>
     <string name="prefs_plugins_descr">تقوم الملحقات بتفعيل إعدادات متقدمة ووظائف إضافية.</string>
-    <string name="osm_editing_plugin_description">عبر هذه الأداة يمكن اسخدام التطبيق للمساهمات في الموقع كإنشاء أو تعديل أماكن الأشياء، تصليح الأعطاب أو التبليغ عنها، والمساهمة بملفات GPX مسجلة. الموقع قائم بفعل المجتمع، مشروع رسم الخرائط على النطاق العام العالمي. للمزيد من التفاصيل انظر https://openstreetmap.org. المشاركة الفعالة جد مقدرة، والمساهمات يمكن إنشاؤها من التطبيق مباشرة إن قمت بإدخال معلوماتك الشخصية في التطبيق.</string>
+    <string name="osm_editing_plugin_description">قدم مساهمات مثل إنشاء أو تعديل كائنات OSM POI ، وفتح ملاحظات OSM أو التعليق عليها ، والمساهمة في ملفات GPX المسجلة في OsmAnd ومن خلال توفير اسم المستخدم وكلمة المرور. OpenStreetMap.org هو مشروع عالمي لرسم خرائط المجال العام يحركه المجتمع.</string>
     <string name="vector_maps_may_display_faster_on_some_devices">عادة تعرض الخرائط الاتجاهية أسرع. ربما لا تعمل جيدا على بعض الأجهزة.</string>
     <string name="play_commands_of_currently_selected_voice">شغل أوامر الصوت المحدد الحالي:</string>
     <string name="switch_to_raster_map_to_see">لا توجد خرائط توجيه لهذا المكان. قم بتحميل إحدها ، أو التغيير لخرائط الإنترنت (فعّل ملحق خرائط الإنترنت).</string>
@@ -557,11 +557,11 @@
     <string name="map_widget_map_rendering">تقديم الخريطة</string>
     <string name="local_osm_changes_delete_all_confirm">هل تريد حذف %1$d من التعديلات؟</string>
     <string name="shared_string_delete_all">احذف الكل</string>
-    <string name="osmand_srtm_long_description_1000_chars">توفر هذه الأداة طبقة خط كنتوري وطبقة للتضاريس ظاهرة على الخريطة الأساسية للتطبيق. هذه الوظيفة ستكوم محل تقدير من طرف الرياضيين، المتنزهين، الرحالة، وكل من هو مهتم بجمال ورخاء الطبيعة. 
+    <string name="osmand_srtm_long_description_1000_chars">يوفر هذا الملحق طبقة خط كنتوري وطبقة للتضاريس ظاهرة على الخريطة الأساسية للتطبيق. هذه الوظيفة ستكون محل تقدير من طرف الرياضيين، المتنزهين، الرحالة، وكل من هو مهتم بجمال ورخاء الطبيعة.
-\n 
+\n
 \nالبيانات العالمية (بين 70 درجة شمالا و70 جنوبا) مبنية حسب قياسات SRTM (مكوك رادار البعثة الطبوغرافية) وASTER (المكوك المتقدم الخاص بالانبعاث الحراري والانعكاس الإشعاعي)، أداة تصوير على متن Terra، القمر الصناعي الرئيسي لنظام رصد الأرض التابع لناسا. ASTER هو جهد تعاوني فيما بين وكالة ناسا، وزارة الاقتصاد اليابانية، التجارة والصناعة (METI)، و أنظمة الفضاء اليابانية (J-spacesystems).</string>
-    <string name="srtm_plugin_description">يوفر هذا الملحق خطوط محيطية وطبقة تضاريس (طبيعية) تظهر على خرائط أوسماند. هذه الوظيفة ستعجب كثيرا الرياضيين، المتجولين، الرحالة، و كل من تهمه بنية التضاريس الطبيعية (يرجى ملاحظة أن بيانات الخطوط المحيطية / أو المساعدة منفصلة ، وتتوفر تنزيلات إضافية بعد تنشيط الملحق.)
+    <string name="srtm_plugin_description">يوفر هذا الملحق خطوط محيطية وطبقة تضاريس (طبيعية) تظهر على خرائط أوسماند. هذه الوظيفة ستعجب كثيرا الرياضيين، المتجولين، الرحالة، و كل من تهمه بنية التضاريس الطبيعية (يرجى ملاحظة أن بيانات الخطوط المحيطية/أو المساعدة منفصلة ، وتتوفر تنزيلات إضافية بعد تنشيط الملحق.)
-\nالبيانات العالمية (ما بين 70 درجة شمالا و70 جنوبا) مبنية على مقاييس SRTM (مكوك رادار البعثة الطبوغرافية) و ASTER (الانبعاث الحراري الفضائي المتقدم والإنعكاس الإشعاعي)، أداة التصوير على متن Terra، القمر الصناعي الرئيسي لنظام رصد الأرض التابع لناسا. 
+\nالبيانات العالمية (ما بين 70 درجة شمالاً و70 جنوباً) مبنية على مقاييس SRTM (مكوك رادار البعثة الطبوغرافية) و ASTER (الانبعاث الحراري الفضائي المتقدم والإنعكاس الإشعاعي)، أداة التصوير على متن Terra، القمر الصناعي الرئيسي لنظام رصد الأرض التابع لناسا.
 \n ASTER هو جهد تعاوني بين كل من وكالة ناسا، وزارة الاقتصاد اليابانية، التجارة والصناعة (METI)، ونظم الفضاء اليابانية (J-spacesystems).</string>
     <string name="osmand_long_description_1000_chars">أوسماند (اتجاهات التنقل الآلية OSM) 
 \n 
@@ -585,28 +585,28 @@
 \n - لا توجد إمكانية الوصول دون اتصال إلى النقاط المهمة في ويكيبيديا 
 \n 
 \n يجري تطوير أوسماند بنشاط ويعتمد مشروعنا والتقدم المستمر على المساهمات المالية لتطوير واختبار وظائف جديدة. يرجى النظر في شراء أوسماند+ ، أو تمويل ميزات جديدة محددة أو تقديم تبرع عام على https://osmand.net.</string>
-    <string name="osmand_rastermaps_plugin_description">عن طريق هذه الأداة يمكنك الوصول إلى أنواع عديدة من خرائط النت (تدعى بالقطع أو النقطية)، من قطع OSM مسبقة ( مثل Mapnik) إلى صور أقمار وطبقات مخصصة كخرائط الطقس، الخرائط الجيولوجية، طبقات التضاريس...إلخ. 
+    <string name="osmand_rastermaps_plugin_description">هذا الملحق يمكنك من الوصول إلى أنواع عديدة من خرائط النت (تدعى بالقطع أو النقطية)، من قطع OSM مسبقة ( مثل Mapnik) إلى صور أقمار وطبقات مخصصة كخرائط الطقس، الخرائط الجيولوجية، طبقات التضاريس...إلخ.
-\n 
+\n
-\nكل من هذه الخرائط يمكن أن تستخدم إما كخرائط رئيسية (قاعدية) تظهر على واجهة التطبيق، أو كطبقة فوقية أو تحتية لخريطة قاعدية آخرى( كخرائط التطبيق المحلية). لجعل أي طبقة تحتية خريطة أكثر وضوحا، بعض عناصر خرائط التطبيق التوجيهيه يمكن إخفاءها في قائمة \'ضبط الخريطة\' حسب الرغبة. 
+\nكل من هذه الخرائط يمكن أن تستخدم إما كخرائط رئيسية (قاعدية) تظهر على واجهة التطبيق، أو كطبقة فوقية أو تحتية لخريطة قاعدية آخرى( كخرائط التطبيق المحلية). لجعل أي طبقة تحتية خريطة أكثر وضوحا، بعض عناصر خرائط التطبيق التوجيهيه يمكن إخفاءها في قائمة \'ضبط الخريطة\' حسب الرغبة.
-\n 
+\n
 \nأجزاء الخرائط يمكن الحصول عليها من مصادر إنترنت، أو تحضيرها للإستخدام دون إنترنت ( ونسخها يدويا إلى مجلد بيانات التطبيق) كقاعدة بيانات SQLite والتي يمكن إنتاجها عن طريق مجموعة متنوعة من أدوات تحضير الخرائط المستقلة.</string>
     <string name="update_poi_does_not_change_indexes">التغييرات POI داخل التطبيق لا تؤثرعلى ملفات الخرائط المحملة، يتم حفظ التغييرات إلى ملف محلي بدلا من ذلك.</string>
     <string name="av_camera_focus_descr">وضع تركيز الكاميرا:</string>
     <string name="osmand_plus_long_description_1000_chars">أوسماند+ (OSM اتجاهات التنقل التلقائية)
-\n عبارة عن تطبيق ملاحة مفتوح المصدر مع إمكانية الوصول إلى العديد من بيانات عالمية للموقع. كل بيانات الخرائط (خرائط التوجيه أو الخرائط الجزئية) يمكن تخزينها في ذاكرة الجهاز للإستخدام دون إنترنت. يوفر التطبيق كذلك وظائف توجيه بما في ذلك التوجيه الصوتي. 
+\n عبارة عن تطبيق ملاحة مفتوح المصدر مع إمكانية الوصول إلى العديد من بيانات عالمية للموقع. كل بيانات الخرائط (خرائط التوجيه أو الخرائط الجزئية) يمكن تخزينها في ذاكرة الجهاز للإستخدام دون إنترنت. يوفر التطبيق كذلك وظائف توجيه بما في ذلك التوجيه الصوتي.
 \n
-\nبعض الميزات الأساسية: 
+\nبعض الميزات الأساسية:
-\n - تشغيل كامل دون إنترنت( خزن الخرائط التوجيه أو الخرائط الجزئية المنزلة في ذاكرة الجهاز) 
+\n - تشغيل كامل دون إنترنت( خزن خرائط التوجيه أو الخرائط الجزئية المنزلة في ذاكرة الجهاز)
-\n - خرائط التوجيه المدمجة للعالم ككل متاحة لتعمل دون إنترنت 
+\n - خرائط التوجيه المدمجة للعالم ككل متاحة لتعمل دون إنترنت
-\n - تحميل غير محدود لخرائط البلدان أو المناطق مباشرة من التطبيق 
+\n - تحميل غير محدود لخرائط البلدان أو المناطق مباشرة من التطبيق
-\n - ميزة ويكيبيديا المحلية ( قم بتحميل POI لويكيبيديا)، الأمثل لمشاهدة المعالم الأثرية 
+\n - ميزة ويكيبيديا المحلية ( قم بتحميل POI لويكيبيديا)، الأمثل لمشاهدة المعالم الأثرية
-\n - يمكن تراكب عدة طبقات للخرائط، ك GPX أو مسارات الملاحة، مواقع ذات الاهتمام (POI)، الأماكن المفضلة، الحدود المحيطية، أماكن توقف النقل العمومي، خرائط إضافية بشفافية قابلة للتعديل 
+\n - يمكن تراكب عدة طبقات للخرائط، ك GPX أو مسارات الملاحة، مواقع ذات الاهتمام (POI)، الأماكن المفضلة، الحدود المحيطية، أماكن توقف النقل العمومي، خرائط إضافية بشفافية قابلة للتعديل
-\n - البحث عن العناوين والأماكن (POI) دون إنترنت 
+\n - البحث عن العناوين والأماكن (POI) دون إنترنت
-\n - تحديد الطريق لمسافات متوسطة المدى 
+\n - تحديد الطريق لمسافات متوسطة المدى
-\n - وضع السيارة، الدراجة والمشاة متوفر مع: 
+\n - وضع السيارة، الدراجة والمشاة متوفر مع:
-\n - تبديل اختياري آلي لوضع الرؤية في الليل/النهار 
+\n - تبديل اختياري آلي لوضع الرؤية في الليل/النهار
-\n - تكبير اختياري حسب السرعة 
+\n - تكبير اختياري حسب السرعة
-\n - محاذاة اختيارية للخريطة حسب البوصلة أو اتجاه الحركة 
+\n - محاذاة اختيارية للخريطة حسب البوصلة أو اتجاه الحركة
 \n - توجيه اختياري للممر، عرض الحد الأقصى للسرعة، أصوات TTS (نص إلى كلام) أو أخرى مسجلة
 \n</string>
     <string name="local_openstreetmap_were_uploaded">{0} POI/الملاحظات تم رفعها</string>
@@ -1605,11 +1605,11 @@
     <string name="route_duration">الزمن :</string>
     <string name="route_tr">انعطف يميناً</string>
     <string name="route_tl">انعطف يسارا واذهب</string>
-    <string name="plugin_nautical_descr">هذه الأداة تثري خريطة التطبيق والملاحة لتوفير خرائط بحرية للزوارق والمراكب الشراعية وأنواع أخرى من الرياضات المائية. 
+    <string name="plugin_nautical_descr">هذا الملحق يوفير خرائط بحرية للزوارق والمراكب الشراعية وأنواع أخرى من الرياضات المائية.
-\n 
+\n
-\nخريطة خاصة إضافية للتطبيق ستقدم كل علامات الملاحة البحرية سواء داخلية أو شاطئية وكذلك جدول للرموز. وصف كل علامة ملاحة يوفر التفاصيل اللازمة للتعرف عليها ومعانيها (الفئة، الشكل، اللون، التسلسل، المرجع...إلخ.). 
+\nخريطة خاصة إضافية للتطبيق ستقدم كل علامات الملاحة البحرية سواء داخلية أو شاطئية وكذلك جدول للرموز. وصف كل علامة ملاحة يوفر التفاصيل اللازمة للتعرف عليها ومعانيها (الفئة، الشكل، اللون، التسلسل، المرجع...إلخ.).
-\n 
+\n
-\nللعودة إلى واحدة من أنماط الخريطة التقليدية، ببساطة إما عطل هذه الأداة مرة أخرى أو غير \'نمط الخريطة\' في \'ضبط الخريطة\' حسب الرغبة.</string>
+\nللعودة إلى واحدة من أنماط الخريطة التقليدية، ببساطة إما عطل هذا الملحق مرة أخرى أو غير \'نمط الخريطة\' في \'ضبط الخريطة\' حسب الرغبة.</string>
     <string name="search_near_map">البحث قرب مركز الخريطة الحالية</string>
     <string name="active_markers">العلامات النشطة</string>
     <string name="map_markers">علامات الخريطة</string>
@@ -1848,7 +1848,7 @@
     <string name="simulate_initial_startup_descr">وضع علامة تشير إلى بدء تشغيل التطبيق الأولي، أبق جميع الإعدادات الأخرى دون تغيير.</string>
     <string name="region_maps">خرائط على مستوى المنطقة</string>
     <string name="hillshade_layer_disabled">طبقة التضاريس غير مفعلة</string>
-    <string name="srtm_plugin_disabled">الخطوط الكنتورية معطلة</string>
+    <string name="srtm_plugin_disabled">الخطوط المحيطية معطلة</string>
     <string name="nm">ميل بحري</string>
     <string name="nm_h">ميل بحري/س</string>
     <string name="simulate_your_location_descr">إجراء محاكاة تخيلية باستخدام توجيه نشط أو مسار مسجل.</string>
@@ -1890,8 +1890,8 @@
     <string name="shared_string_others">أخرى</string>
     <string name="local_index_action_do">%1$s %2$s عنصر ؟</string>
     <string name="amenity_type_geocache">البيانات الجغرافية المؤقتة</string>
-    <string name="record_plugin_description">هذه الأداة المساعدة تفعل وظيفة تسجيل وحفظ المسارات الخاصة بك عبر الضغط على نافذة GPX على شاشة الخريطة، أو كذلك تسجيل كافة طرق الملاحة الخاص بك تلقائيا إلى ملف GPX. 
+    <string name="record_plugin_description">هذا الملحق يفعل وظيفة تسجيل وحفظ المسارات الخاصة بك عبر الضغط على نافذة GPX على شاشة الخريطة، أو كذلك تسجيل كافة طرق الملاحة الخاص بك تلقائيا إلى ملف GPX.
-\n 
+\n
 \nالمسارات المسجلة يمكن مشاركتها مع أصدقائك أو استخدامها كمساهمات ل OSM . الرياضيون يمكنهم استخدام المسارات المسجلة لمتابعة تدريباتهم. بعض تحليل المسار الابتدائية يمكن القيام بها مباشرة في التطبيق، مثل توقيت الدورات، ومتوسط السرعة...الخ، و يمكن أيضا تحليل المسارات باستعمال أدوات تحليل جانبية لاحقا.</string>
     <string name="missing_write_external_storage_permission">أوسماند ليس لديه إذن لاستخدام ذاكرة البطاقة</string>
     <string name="save_poi_without_poi_type_message">هل تريد حقا حفظ POI بدون تحديد نوعه؟</string>
@@ -1987,10 +1987,10 @@
     <string name="number_of_rows_in_dash">عدد الصفوف في الدفعة %1$s</string>
     <string name="poi_deleted_localy">سيتم حذف POI بمجرد إرسال التعديلات</string>
     <string name="downloading_number_of_files">جار التحميل - %1$d ملف</string>
-    <string name="activate_seamarks_plugin">يرجى تفعيل أداة المعالم البحرية</string>
+    <string name="activate_seamarks_plugin">يرجى تفعيل ملحق المعالم البحرية</string>
     <string name="value_downloaded_of_max">%1$.1f من %2$.1f مب</string>
     <string name="file_size_in_mb">%.1f مب</string>
-    <string name="plugin_ski_descr">أداة أوسماند هذه تضع بين يديك تفاصيل منحدرات تزلج عالمية، مسارات تزلج عبر كامل البلاد، التلفريك ومصاعد التزلج. الطرقات والمعابر مبينة بألوان حسب الصعوبة،
+    <string name="plugin_ski_descr">يضع هذا الملحق بين يديك تفاصيل منحدرات تزلج عالمية، مسارات تزلج عبر كامل البلاد، التلفريك ومصاعد التزلج. الطرقات والمعابر مبينة بألوان حسب الصعوبة،
 \n
 \nومصورة بنمط خريطة مميز \'شتوي\' تمثل مناظر الطبيعة بلون مثلج شتوي.</string>
     <string name="rendering_attr_hideOverground_name">أشياء فوق سطح الأرض</string>
@@ -2064,12 +2064,12 @@
     <string name="trip_rec_notification_settings">تشغيل التسجيل السريع</string>
     <string name="trip_rec_notification_settings_desc">عرض نظام الإشعار للسماح بتسجيل الرحلة.</string>
     <string name="shared_string_notifications">الإشعارات</string>
-    <string name="gpx_no_tracks_title_folder">يمكنك أيضا إضافة مسارات إلى المجلد</string>
+    <string name="gpx_no_tracks_title_folder">يمكنك إضافة مسارات إلى المجلد</string>
     <string name="gpx_add_track">أضف المزيد…</string>
     <string name="shared_string_appearance">المظهر</string>
     <string name="upload_poi">رفع POI</string>
     <string name="route_calculation">حساب المسار</string>
-    <string name="gpx_no_tracks_title">ليس لديك مسارات بعد</string>
+    <string name="gpx_no_tracks_title">لايوجد مسارات</string>
     <string name="rendering_value_fine_name">اللون والسمك</string>
     <string name="route_roundabout_short">خذ المخرج %1$d ثم واصل</string>
     <string name="search_map_hint">المدينة أو المنطقة</string>
@@ -2079,8 +2079,8 @@
     <string name="lang_sr_latn">الصربية (اللاتينية)</string>
     <string name="lang_zh_hk">الصينية (هونج كونج)</string>
     <string name="rendering_attr_hideWaterPolygons_description">ماء</string>
-    <string name="rendering_attr_contourWidth_description">عرض الخطوط الكنتورية</string>
+    <string name="rendering_attr_contourWidth_description">عرض الخطوط المحيطية</string>
-    <string name="rendering_attr_contourWidth_name">عرض الخطوط الكنتورية</string>
+    <string name="rendering_attr_contourWidth_name">عرض الخطوط المحيطية</string>
     <string name="rendering_attr_contourDensity_description">كثافة الخط المحيطي</string>
     <string name="rendering_attr_contourDensity_name">كثافة الخط المحيطي</string>
     <string name="rendering_value_high_name">عالي</string>
@@ -2273,7 +2273,7 @@
     <string name="mapillary_widget">ويدجت مابيلاري</string>
     <string name="mapillary_widget_descr">يسمح لك بالمساهمة بسرعة لمابيلاري.</string>
     <string name="mapillary_descr">صور شوارع متاحة على الإنترنت للجميع. اكتشف أماكن، تعاون، والتقط صورا للعالم.</string>
-    <string name="mapillary">صور للشارع</string>
+    <string name="mapillary">مابيلاري</string>
     <string name="plugin_mapillary_descr">صور شوارع متاحة للجميع. اكتشف أماكن، تعاون، والتقط صورا للعالم.</string>
     <string name="private_access_routing_req">الوجهة الخاص بك تقع في منطقة ذات ولوج خاص. هل تسمح بالدخول إلى الطرق الخاصة لهذه الرحلة؟</string>
     <string name="quick_action_showhide_osmbugs_descr">زر يظهر أو يخفي ملاحظات OSM على الخريطة.</string>
@@ -2289,7 +2289,7 @@
     <string name="quick_action_replace_destination_desc">زر لجعل الشاشة مركز الوجهة الجديدة ، مع استبدال الوجهة المحددة مسبقاً (إن وجدت).</string>
     <string name="improve_coverage_install_mapillary_desc">يمكنك التقاط صور خاصة بك أو سلسلة من الصور وإرفاقها إلى هذا الموقع من الخريطة. للقيام بذلك تحتاج إلى تثبيت تطبيق مابيلاري من Google play.</string>
     <string name="hillshade_menu_download_descr">تحتاج إلى تحميل خريطة تراكب التلال لهذه المنطقة.</string>
-    <string name="hillshade_purchase_header">لمشاهدة التضاريس على الخريطة، تحتاج إلى شراء وتثبيت برنامج الخطوط الكنتورية المساعد.</string>
+    <string name="hillshade_purchase_header">لمشاهدة التضاريس على الخريطة، تحتاج إلى شراء وتثبيت برنامج الخطوط المحيطية المساعد.</string>
     <string name="quick_action_add_first_intermediate_desc">زر لجعل مركز الشاشة أول وجهة وسيطة.</string>
     <string name="no_overlay">بدون طبقة</string>
     <string name="no_underlay">بدون طبقة</string>
@@ -2315,7 +2315,7 @@
     <string name="route_is_too_long_v2">قد يكون المسار طويلا جداً للحساب. يرجى إضافة وجهات وسطى إذا لم يتم العثور على نتيجة خلال 10 دقائق.</string>
     <string name="osmand_extended_description_part1">أوسماند(توجيهات OSM للتنقل الآلية) تطبيق خريطة وتنقل مع إمكانية الوصول إلى بيانات (OSM) مجاناً وفي جميع أنحاء العالم، وبجودة عالية
 \n
-\n. استمتع بمستكشف بالصوت والصورة، وعرض POI (نقاط الاهتمام)، إنشاء وإدارة مسارات GPX، استخدام عرض ارتفاع بيانات الخطوط الكنتورية (عن طريق المكون)، اختيار بين نمط القيادة، ركوب الدراجات والمشاة، التعديل على الموقع وغيرها.</string>
+\n. استمتع بمستكشف بالصوت والصورة، وعرض POI (نقاط الاهتمام)، إنشاء وإدارة مسارات GPX، استخدام عرض ارتفاع بيانات الخطوط المحيطية (عن طريق الملحق)، اختيار بين نمط القيادة، ركوب الدراجات والمشاة، التعديل على الموقع وغيرها.</string>
     <string name="osmand_extended_description_part2">التنقل عبر GPS 
 \n• يمكنك أن تختار بين وضع دون اتصال (لا رسوم تجوال عندما تكون في الخارج) أو بالإنترنت (أسرع) 
 \n• التوجيه الصوتي بالتفصيل يوجهك طوال الطريق (مسجل أو مدرج) 
@@ -2338,13 +2338,13 @@
 \n• إظهار نمط خريطة إنترنت متخصص ، صورة قمر صناعي (بينج)، إظهار طبقات خريطة متراكبة مختلفة كالسياحة/مسارات GPX للملاحة وطبقات إضافية مع شفافية قابلة للتعديل
 \n</string>
     <string name="osmand_extended_description_part4">التزلج
-\nالبرنامج المساعد لخرائط تزلج أوسماند للتزلج يمكنك من مشاهدة مسارات التزلج مع مستوى من التعقيد وبعض المعلومات الإضافية، كمواقع المصاعد والمرافق الأخرى.</string>
+\nملحق خرائط أوسماند للتزلج يمكنك من مشاهدة مسارات التزلج مع مستوى من التعقيد وبعض المعلومات الإضافية، كمواقع المصاعد والمرافق الأخرى.</string>
     <string name="osmand_extended_description_part5">ركوب الدراجات الهوائية
 \n• العثورعلى مسار دراجات على الخريطة
 \n• التنقل في وضع ركوب الدراجات تقترح لك مسار دراجات
 \n• يمكنك مشاهدة سرعتك وارتفاعك
 \n• خيار تسجيل GPX يتيح لك تسجيل رحلتك ومشاركتها
-\n• عبر مكون إضافي يمكنك عرض الخطوط الكنتورية والتضاريس</string>
+\n• عبر ملحق إضافي يمكنك عرض الخطوط المحيطية والتضاريس</string>
     <string name="osmand_extended_description_part6">المشي، التنزه، جولة في المدينة 
 \n• الخريطة تظهر لك ممرات المشي والتنزه 
 \n• ويكيبيديا سيخبرك الكثير اثناء جولتك وبلغتك المفضلة 
@@ -2366,11 +2366,11 @@
 \n• أنتاركتيكا: * 
 \nمعظم البلدان في جميع أنحاء العالم متاحة للتحميل! 
 \nاحصل على برنامج تنقل موثوق به في بلدك - سواءاً في فرنسا، ألمانيا، المكسيك، المملكة المتحدة، إسبانيا، هولندا، الولايات المتحدة الأمريكية، روسيا، البرازيل أو أي دولة أخرى.</string>
-    <string name="osmand_plus_extended_description_part1">أوسماند بلس (توجيهات OSM للملاحة الآلية) تطبيق خريطة وملاحة مع إمكانية الوصول إلى بيانات الموقع مجاناً وفي جميع أنحاء العالم، وبجودة عالية. 
+    <string name="osmand_plus_extended_description_part1">أوسماند بلس (توجيهات OSM للملاحة الآلية) تطبيق خريطة وملاحة مع إمكانية الوصول إلى بيانات الموقع مجاناً وفي جميع أنحاء العالم، وبجودة عالية.
-\nاستمتع بالملاحة بصوت والصورة، عرض النقاط المهمة حولك (POI)، وإنشاء وإدارة مسارات GPX باستخدام معلومات عن تصور وعلو الخطوط الكنتورية، خياراً بين القيادة، ركوب الدراجات، وضع المشاة، التعديل على OSM وأكثر من ذلك بكثير. 
+\nاستمتع بالملاحة بصوت والصورة، عرض النقاط المهمة حولك (POI)، وإنشاء وإدارة مسارات GPX باستخدام معلومات عن تصور وعلو الخطوط المحيطية، خياراً بين القيادة، ركوب الدراجات، وضع المشاة، التعديل على OSM وأكثر من ذلك بكثير.
-\n 
+\n
-\nأوسماند بلس هو إصدار للتطبيق مدفوع الأجر. قبل شرائه، ادعم المشروع، بتمويل لتطوير الميزات الجديدة والحصول على آخر التحديثات. 
+\nأوسماند بلس هو إصدار للتطبيق مدفوع الأجر. قبل شرائه، ادعم المشروع، بتمويل لتطوير الميزات الجديدة والحصول على آخر التحديثات.
-\n 
+\n
 \n بعض الميزات الرئيسية:</string>
     <string name="osmand_plus_extended_description_part2">الملاحة
 \n• يعمل على الإنترنت (سريع) أو في وضع غير متصل (لا رسوم تجوال خارج الوطن) 
@@ -2407,7 +2407,7 @@
 \n • محطات نقل عام اختيارية (حافلات، الترامواي، القطار) بما في ذلك أسماء خطوط النقل
 \n • تسجيل رحلة اختياري إلى ملف GPX محلي أو لخدمة على الإنترنت
 \n • عرض اختياري للسرعة والارتفاع
-\n • عرض الخطوط الكنتورية والتضاريس (عن طريق برامج مساعدة إضافية)</string>
+\n • عرض الخطوط المحيطية والتضاريس (عن طريق برامج ملحق إضافي)</string>
     <string name="osmand_plus_extended_description_part7">المساهمة مباشرة في OSM 
 \n• الابلاغ عن الأخطاء في البرنامج 
 \n• رفع مسارات GPX إلى OSM مباشرة من التطبيق 
@@ -2739,7 +2739,7 @@
     <string name="purchase_cancelled_dialog_descr">جدد الاشتراك للاستمرار في استخدام جميع الميزات:</string>
     <string name="maps_you_need_descr">استنادا إلى المقالات التي قمتم بحفظها، الخرائط التالية موصى بتحميلها:</string>
     <string name="paid_app">تطبيق مدفوع</string>
-    <string name="paid_plugin">أداة مدفوعة</string>
+    <string name="paid_plugin">ملحق مدفوع</string>
     <string name="start_editing_card_image_text">دليل السفر إلى جميع أنحاء العالم مجاناً.</string>
     <string name="day_off_label">معطّل</string>
     <string name="unirs_render_descr">تعديل النمط الافتراضي لزيادة تباين المشاة و طرق الدراجات .يستخدم Legasy Mapnik colors .</string>
@@ -2822,7 +2822,7 @@
     <string name="nautical_render_descr">للملاحة البحرية. ميزات العوامات ، المنارات ، مجاري الأنهار ، الممرات البحرية وعلامات ، الموانئ ، خدمات علامة مائية ، وملامح العمق.</string>
     <string name="ski_map_render_descr">للتزلج. يتميز بمناطق التزلج ومصاعد التزلج ومسارات التزلج على الجليد وما إلى ذلك. يعتم كائنات الخريطة الثانوية.</string>
     <string name="light_rs_render_descr">أسلوب قيادة بسيط. الوضع الليلي اللطيف ، وخطوط الكنتور ، مقارنة بالطرق ذات اللون البرتقالي ، يعتم الكائنات في الخريطة الثانوية.</string>
-    <string name="topo_render_descr">على النقيض من نمط مصممة أساسا للمشي والتنزه وركوب الدراجات في الطبيعة. قراءة جيدة في الإضاءة الخارجية المعقدة. الميزات الرئيسية: مقارنة الطرق والأجسام الطبيعية، أنواع مختلفة من طرق، والخطوط الكنتورية مع إعدادات متقدمة، تفاصيل أكثر في مستويات التكبير/التصغير المقابلة من النمط الافتراضي. يسمح الخيار تكامل سطحي التمييز بين نوعية سطح الطريق. لا يوجد وضع ليلي.</string>
+    <string name="topo_render_descr">على النقيض من نمط مصممة أساسا للمشي والتنزه وركوب الدراجات في الطبيعة. قراءة جيدة في الإضاءة الخارجية المعقدة. الميزات الرئيسية: مقارنة الطرق والأجسام الطبيعية، أنواع مختلفة من طرق، والخطوط المحيطية مع إعدادات متقدمة، تفاصيل أكثر في مستويات التكبير/التصغير المقابلة من النمط الافتراضي. يسمح الخيار تكامل سطحي التمييز بين نوعية سطح الطريق. لا يوجد وضع ليلي.</string>
     <string name="mapnik_render_descr">الستايل القديم Mapnik الافتراضي جعل ستايل.السمات الرئيسية: الوان متشابهة إلى Mapnik \'الأسلوب.</string>
     <string name="touring_view_render_descr">أسلوب الملاحة مع التباين العالي والحد الأعلى من التفاصيل. يتضمن كل خيارات النمط الافتراضي أوسماند، مع عرض أكبر قدر ممكن من التفاصيل ، ولا سيما الطرق والمسارات وطرق السفر الأخرى. التمييز الواضح بين \"جولة الأطلس\" بين أنواع الطرق. مناسبة للاستخدام النهاري والليلي وفي الهواء الطلق.</string>
     <string name="default_render_descr">أسلوب الغرض العام. تقديم نظافة مبسطة في المدن المكتظة بالسكان. الملامح الرئيسية: خطوط الكنتور ، والطرق ، وجودة السطح ، والقيود المفروضة على الوصول ، ودروع الطريق ، والمسارات التي تظهر وفقاً لمقياس SAC ، وميزات رياضة الماء الأبيض.</string>
@@ -2878,7 +2878,7 @@
     <string name="show_more">اعرض المزيد</string>
     <string name="tracks_on_map">المسارات على الخريطة</string>
     <string name="quick_action_show_hide_gpx_tracks">إظهار/إخفاء مسارات GPX</string>
-    <string name="quick_action_show_hide_gpx_tracks_descr">زر لإظهار أو إخفاء مسارات GPX المحددة على الخريطة.</string>
+    <string name="quick_action_show_hide_gpx_tracks_descr">إظهار أو إخفاء مسارات GPX المحددة على الخريطة.</string>
     <string name="quick_action_gpx_tracks_hide">إخفاء المسارات</string>
     <string name="quick_action_gpx_tracks_show">عرض المسارات</string>
     <string name="add_destination_query">الرجاء إضافة الوجهة أولاً</string>
@@ -2999,11 +2999,11 @@
     <string name="dialogs_and_notifications_descr">التحكم في النوافذ المنبثقة ، ومربعات الحوار والإشعارات.</string>
     <string name="rendering_value_walkingRoutesOSMCNodes_name">شبكة النقاط</string>
     <string name="suggested_maps">خرائط مقترحة</string>
-    <string name="suggested_maps_descr">هذه الخرائط مطلوبة لاستخدامها مع البرنامج المساعد.</string>
+    <string name="suggested_maps_descr">هذه الخرائط مطلوبة لاستخدامها مع الملحق.</string>
     <string name="added_profiles">إضافة أوضاع</string>
-    <string name="added_profiles_descr">الأوضاع المضافة بواسطة البرنامج المساعد</string>
+    <string name="added_profiles_descr">الأوضاع المضافة بواسطة الملحق</string>
     <string name="shared_string_turn_off">إيقاف</string>
-    <string name="new_plugin_added">تمت تركيب إضافة جديدة</string>
+    <string name="new_plugin_added">ملحق جديد مضاف</string>
     <string name="join_segments">ربط الأجزاء</string>
     <string name="add_new_profile_q">إضافة وضع جديد \'%1$s\'؟</string>
     <string name="save_heading">تضمين العنوان</string>
@@ -3016,15 +3016,15 @@
     <string name="enter_path_to_folder">إدخال مسار المجلد</string>
     <string name="shared_string_select_folder">المجلد…</string>
     <string name="paste_Osmand_data_folder_path">لصق مسار مجلد بيانات أوسماند</string>
-    <string name="change_osmand_data_folder_question">تغيير مجلد البيانات ؟</string>
+    <string name="change_osmand_data_folder_question">تغيير مجلد التخزين ؟</string>
     <string name="move_maps_to_new_destination">نقل للموقع الجديد</string>
     <string name="avoid_in_routing_descr_">تجنب بعض الطرق، أو بعض أنواع الطرق</string>
     <string name="app_mode_utv">جنبًا إلى جنب</string>
     <string name="rendering_attr_piste_difficulty_aerialway_name">طريق تلفريك</string>
     <string name="rendering_attr_piste_difficulty_connection_name">اتصال</string>
     <string name="shared_string_calculate">حساب</string>
-    <string name="shared_string_osmand_usage">استخدام أوسماند</string>
+    <string name="shared_string_osmand_usage">المستخدم</string>
-    <string name="shared_sting_tiles">طبقات</string>
+    <string name="shared_sting_tiles">الطبقات</string>
     <string name="shared_string_maps">الخرائط</string>
     <string name="shared_string_memory_tb_desc">تيرا بايت %1$s TB</string>
     <string name="shared_string_memory_gb_desc">%1$s GB</string>
@@ -3039,7 +3039,7 @@
     <string name="shared_string_memory_used_gb_desc">المستخدم %1$s GB</string>
     <string name="shared_string_memory_used_mb_desc">تم استخدام %1$s MB</string>
     <string name="shared_string_memory_used_kb_desc">تم استخدام %1$s kB</string>
-    <string name="contour_lines_and_hillshade">الخطوط الكنتورية والتضاريس</string>
+    <string name="contour_lines_and_hillshade">الخطوط المحيطية والتضاريس</string>
     <string name="routing_attr_prefer_unpaved_name">تفضيل الطرق الغير معبدة</string>
     <string name="routing_attr_prefer_unpaved_description">تفضيل الطرق الغير معبدة.</string>
     <string name="update_all_maps">تحديث كل الخرائط</string>
@@ -3066,10 +3066,10 @@
     <string name="routing_attr_driving_style_prefer_unpaved_name">تفضيل الطرق الغير معبدة</string>
     <string name="routing_attr_driving_style_prefer_unpaved_description">تفضيل الطرق غير المعبدة عند التوجيه.</string>
     <string name="layer_osm_edits">تحرير خرائط OSM</string>
-    <string name="quick_action_contour_lines_descr">لإظهار وإخفاء الخطوط الكنتورية على الخريطة.</string>
+    <string name="quick_action_contour_lines_descr">لإظهار أو إخفاء الخطوط المحيطية على الخريطة.</string>
-    <string name="quick_action_contour_lines_show">إظهار الخطوط الكنتورية</string>
+    <string name="quick_action_contour_lines_show">إظهار الخطوط المحيطية</string>
-    <string name="quick_action_contour_lines_hide">إخفاء الخطوط الكنتورية</string>
+    <string name="quick_action_contour_lines_hide">إخفاء الخطوط المحيطية</string>
-    <string name="quick_action_show_hide_contour_lines">إظهار/إخفاء الخطوط الكنتورية</string>
+    <string name="quick_action_show_hide_contour_lines">إظهار/إخفاء الخطوط المحيطية</string>
     <string name="quick_action_hillshade_descr">لإظهار وإخفاء التضاريس على الخريطة.</string>
     <string name="quick_action_hillshade_show">إظهار التضاريس</string>
     <string name="quick_action_hillshade_hide">إخفاء التضاريس</string>
@@ -3162,7 +3162,7 @@
     <string name="shared_string_by_default">بشكل افتراضي</string>
     <string name="download_detailed_map">قم بتنزيل خريطة مفصلة%s لعرض هذه المنطقة.</string>
     <string name="internal_app_storage_description">تخزين داخلي ، مخفي عن المستخدم والتطبيقات الأخرى ، يمكن الوصول إليه حصريا من أوسماند.</string>
-    <string name="change_data_storage_folder">تغيير مجلد التخزين</string>
+    <string name="change_data_storage_folder">مجلد التخزين</string>
     <string name="rendering_attr_piste_type_snow_park_name">حديقة التضاريس</string>
     <string name="rendering_attr_piste_type_sleigh_name">زلاجة</string>
     <string name="rendering_attr_piste_type_sled_name">تزلج</string>
@@ -3491,15 +3491,15 @@
     <string name="sort_by_category">الفرز حسب الفئة</string>
     <string name="please_provide_profile_name_message">يرجى اعطاء اسم للملف الشخصي</string>
     <string name="open_settings">افتح الإعدادات</string>
-    <string name="plugin_disabled">البرنامج المساعد معطل</string>
+    <string name="plugin_disabled">الملحق مُعطل</string>
     <string name="shared_string_menu">القائمة</string>
     <string name="shared_string_routing">التوجيه</string>
     <string name="shared_string_include_data">تضمين بيانات إضافية</string>
     <string name="export_profile_dialog_description">يمكنك تحديد بيانات إضافية للتصدير مع الوضع.</string>
     <string name="index_name_antarctica">القارة القطبية الجنوبية</string>
-    <string name="plugin_disabled_descr">هذا البرنامج المساعد هو تطبيق منفصل ، بإمكانك إزالته بشكل منفصل إذا لم تعد تخطط لاستخدامه. 
+    <string name="plugin_disabled_descr">هذا الملحق هو تطبيق منفصل ، بإمكانك إزالته بشكل منفصل إذا لم تعد تخطط لاستخدامه.
-\n 
+\n
-\nسيبقى المكوّن الإضافي على الجهاز بعد إزالة أوسماند.</string>
+\nسيبقى الملحق الإضافي على الجهاز بعد إزالة أوسماند.</string>
     <string name="ltr_or_rtl_triple_combine_via_dash">%1$s — %2$s — %3$s</string>
     <string name="import_profile_dialog_description">يحتوي الوضع المستوردة على بيانات إضافية. انقر فوق \"استيراد\" لاستيراد بيانات الوضع فقط أو حدد بيانات إضافية لاستيرادها.</string>
     <string name="shared_string_app_default_w_val">التطبيق الافتراضي (%s)</string>
@@ -3577,7 +3577,7 @@
     <string name="shared_string_min">الحد الأدنى</string>
     <string name="app_mode_ski_touring">جولة التزلج</string>
     <string name="app_mode_ski_snowmobile">الثلج</string>
-    <string name="custom_osmand_plugin">مخصص البرنامج المساعد أوسماند</string>
+    <string name="custom_osmand_plugin">ملحق مخصص</string>
     <string name="replace_point_descr">استبدل نقطة أخرى بالحالية.</string>
     <string name="changes_applied_to_profile">تم تطبيق التغييرات على %1$s ملف تعريف.</string>
     <string name="settings_item_read_error">لايمكن قراءة %1$s.</string>
@@ -3842,7 +3842,7 @@
     <string name="marker_save_as_track">حفظ كمسار</string>
     <string name="follow_track">تتبع المسار</string>
     <string name="follow_track_descr">اختر مسار للمتابعة</string>
-    <string name="import_track_descr">اختر ملف المسار للمتابعة أو استورده من الجهاز.</string>
+    <string name="import_track_descr">اختر ملف المسار للمتابعة أو قم باستيراده من الجهاز.</string>
     <string name="select_another_track">حدد مسارا آخر</string>
     <string name="navigate_to_track_descr">انتقل من موقعي إلى المسار</string>
     <string name="pass_whole_track_descr">نقطة المسار للتنقل</string>
@@ -3856,4 +3856,23 @@
     <string name="plan_route_trim_after">تهذيب بعد</string>
     <string name="plan_route_change_route_type_before">تغيير نوع المسار قبل</string>
     <string name="plan_route_change_route_type_after">تغيير نوع المسار بعد</string>
+    <string name="number_of_gpx_files_selected_pattern">%s ملفات مسارات محددة</string>
+    <string name="disable_recording_once_app_killed_descrp">سيتم إيقاف تسجيل المسار مؤقتًا عند غلق التطبيق (عبر نافذة التطبيقات المستخدمة مؤخرا). (إشارة تشغيل التطبيق في الخلفية ستختفي من الشريط العلوي.)</string>
+    <string name="save_global_track_interval_descr">حدد الفاصل الزمني للادخال الخاص بالتسجيل العام للمسار (مفعل من خلال ودجت تسجيل الرحلة على الخريطة).</string>
+    <string name="gpx_monitoring_stop">إيقاف تسجيل الرحلة مؤقتًا</string>
+    <string name="gpx_monitoring_start">استئناف تسجيل الرحلة</string>
+    <string name="system_default_theme">النظام الافتراضي</string>
+    <string name="all_next_segments">جميع الأجزاء اللاحقة</string>
+    <string name="previous_segment">المقطع السابق</string>
+    <string name="all_previous_segments">جميع المقاطع السابقة</string>
+    <string name="only_selected_segment_recalc">سيتم إعادة حساب المقطع المحدد فقط باستخدام ملف التعريف المحدد.</string>
+    <string name="all_next_segments_will_be_recalc">سيتم إعادة حساب كافة الشرائح اللاحقة باستخدام ملف التعريف المحدد.</string>
+    <string name="all_previous_segments_will_be_recalc">سيتم إعادة حساب كافة الشرائح السابقة باستخدام ملف التعريف المحدد.</string>
+    <string name="open_saved_track">فتح المسار المحفوظ</string>
+    <string name="shared_string_is_saved">محفوظ</string>
+    <string name="simplified_track">مسار مبسط</string>
+    <string name="simplified_track_description">سيتم حفظ خط التوجيه فقط، وسيتم حذف نقاط الطريق.</string>
+    <string name="shared_string_file_name">اسم الملف</string>
+    <string name="one_point_error">الرجاء إضافة نقطتين على الأقل.</string>
+    <string name="shared_string_redo">إعادة</string>
 </resources>

OsmAnd/res/values-be/phrases.xml

@@ -894,7 +894,7 @@
     <string name="poi_monitoring_station">Станцыя назірання</string>
     <string name="poi_email">Эл. пошта</string>
     <string name="poi_fax">Факс</string>
-    <string name="facebook">Фэйсбук</string>
+    <string name="facebook">Facebook</string>
     <string name="poi_mobile">Мабільны тэлефон</string>
     <string name="poi_animal_shelter_dog">Сабакі</string>
     <string name="poi_animal_shelter_cat">Каты</string>
@@ -1117,7 +1117,7 @@
     <string name="poi_pump_powered">Аўтаматычная</string>
     <string name="poi_pump_no">Без помпы</string>
     <string name="poi_water_characteristic_mineral">Мінеральная</string>
-    <string name="poi_water_characteristic_mud">Характарыстыка вады: брудная</string>
+    <string name="poi_water_characteristic_mud">Бруд</string>
     <string name="poi_water_characteristic_sulfuric">Серная</string>
     <string name="poi_water_point">Пункт водазабеспечэння</string>
     <string name="poi_cuisine">Кухня</string>
@@ -1866,7 +1866,7 @@
     <string name="poi_fuel_91ul">Паліва 91UL</string>
     <string name="poi_fuel_100ll">Паліва 100LL</string>
     <string name="poi_fuel_jeta1">Паліва Jet A-1</string>
-    <string name="poi_fuel_adblue">Паліва AdBlue</string>
+    <string name="poi_fuel_adblue">Дызельная выцяжная вадкасць</string>
     <string name="poi_fuel_wood">Паліва: дровы</string>
     <string name="poi_fuel_charcoal">Паліва: драўняны вугаль</string>
     <string name="poi_fuel_coal">Паліва: каменны вугаль</string>
@@ -3646,4 +3646,192 @@
     <string name="poi_fire_hydrant_pressure_filter">Ціск</string>
     <string name="poi_video_telephone">Відэа</string>
     <string name="poi_sms">SMS</string>
+    <string name="poi_piste_ref">Нумар спасылкі на трасу</string>
+    <string name="poi_bowling_alley">Боўлінг-цэнтр</string>
+    <string name="poi_shop_security">Крама аховы</string>
+    <string name="poi_mountain_rescue">Горнае выратаванне</string>
+    <string name="poi_paintball">Пейнтбол</string>
+    <string name="poi_memorial_ghost_bike">Ровар Ghost</string>
+    <string name="poi_volcano_number_of_eruptions">Колькасць вывяржэнняў</string>
+    <string name="poi_volcano_status_inactive">Неактыўны</string>
+    <string name="poi_volcano_status_active">Актыўны</string>
+    <string name="poi_volcano_status_dormant">Спячы</string>
+    <string name="poi_volcano_status_extinct">Патухлы</string>
+    <string name="poi_volcano_last_eruption">Апошняе вывяржэнне</string>
+    <string name="poi_volcano_type_mud">Брудавы</string>
+    <string name="poi_volcano_type_lava_dome">Купал лавы</string>
+    <string name="poi_volcano_type_caldera">Кальдэра</string>
+    <string name="poi_volcano_type_maar">Маар</string>
+    <string name="poi_volcano_type_shield">Шчытавы</string>
+    <string name="poi_volcano_type_stratovolcano">Стратавулкан</string>
+    <string name="poi_volcano_type_scoria">Скарыя</string>
+    <string name="poi_url">URL</string>
+    <string name="poi_parking_space">Паркоўка</string>
+    <string name="poi_grave">Магіла</string>
+    <string name="poi_community_gender_mixed">Пол супольнасці: змешаны</string>
+    <string name="poi_community_gender_male">Пол супольнасці: мужчынскі</string>
+    <string name="poi_community_gender_female">Пол супольнасці: жаночы</string>
+    <string name="poi_tourist_camp">Турыстычны лагер</string>
+    <string name="poi_monastery_type_clerks_regular">Тып манастыра: звычайны духоўны</string>
+    <string name="poi_monastery_type_hermitage">Тып манастыра: скіт</string>
+    <string name="poi_monastery_type_canonry">Тып манастыра: кананічны</string>
+    <string name="poi_monastery_type_convent">Тып манастыра: жаночы манастыр</string>
+    <string name="poi_monastery_type_monastics">Тып манастыра: манаства</string>
+    <string name="poi_bath_open_air_no">Не</string>
+    <string name="poi_bath_open_air_yes">Так</string>
+    <string name="poi_bath_type_foot_bath">Лазня для ног</string>
+    <string name="poi_bath_type_lake">Возера</string>
+    <string name="poi_bath_type_river">Рака</string>
+    <string name="poi_bath_type_thermal">Тэрмальныя</string>
+    <string name="poi_bath_type_hammam">Хамам (турэцкая лазня)</string>
+    <string name="poi_bath_type_onsen">Онсэн (японская лазня)</string>
+    <string name="poi_bath_type_hot_spring">Гарачая крыніца</string>
+    <string name="poi_cash_withdrawal_postbank">Postbank</string>
+    <string name="poi_cash_withdrawal_fee_no">Камісійныя за зняцце гатоўкі: не</string>
+    <string name="poi_cash_withdrawal_fee_yes">Камісійныя за зняцце гатоўкі: так</string>
+    <string name="poi_cash_withdrawal_girocard">Girocard</string>
+    <string name="poi_cash_withdrawal_migros_bank">Банк Migros</string>
+    <string name="poi_cash_withdrawal_postfinance_card">Картка Postfinance</string>
+    <string name="poi_cash_withdrawal_foreign_cards">Зняцце гатоўкі: замежныя карткі</string>
+    <string name="poi_cash_withdrawal_purchase_minimum">Зняцце гатоўкі: мінімальная пакупка</string>
+    <string name="poi_cash_withdrawal_purchase_required_no">Можна зняць гатоўку: не трэба купляць</string>
+    <string name="poi_cash_withdrawal_purchase_required_yes">Можна зняць гатоўку: патрабуецца пакупка</string>
+    <string name="poi_cash_withdrawal_currency">Валюта зняцця гатоўкі</string>
+    <string name="poi_cash_withdrawal_limit">Ліміт зняцця грашовых сродкаў</string>
+    <string name="poi_cash_withdrawal_type_self_checkout">Можна зняць гатоўку: самаабслугоўванне</string>
+    <string name="poi_cash_withdrawal_type_checkout">Можна зняць гатоўку: каса</string>
+    <string name="poi_cash_withdrawal_operator">Можна зняць гатоўку: аператар</string>
+    <string name="poi_cash_withdrawal">Можна зняць гатоўку</string>
+    <string name="poi_cash_withdrawal_yes">Можна зняць гатоўку: так</string>
+    <string name="poi_pet_grooming">Дагляд хатніх жывёл</string>
+    <string name="poi_charge">Сума аплаты</string>
+    <string name="poi_craft_cabinet_maker">Цясляр па мэблі</string>
+    <string name="poi_craft_bakery">Пякарня</string>
+    <string name="poi_craft_floorer">Майстар па падлозе</string>
+    <string name="poi_craft_distillery">Бровар</string>
+    <string name="poi_craft_joiner">Цясляр</string>
+    <string name="poi_craft_builder">Будаўнік</string>
+    <string name="poi_health_food">Здаровае харчаванне</string>
+    <string name="poi_cellar_entrance">Уваход у склеп</string>
+    <string name="poi_disabled_designated">Прыстасавана</string>
+    <string name="poi_disabled_yes">Так</string>
+    <string name="poi_goods_designated">Прыстасавана</string>
+    <string name="poi_caravan_designated">Прыстасавана</string>
+    <string name="poi_bus_designated">Прыстасавана</string>
+    <string name="poi_snowmobile_designated">Прыстасавана</string>
+    <string name="poi_taxi_designated">Доступ для таксі: прыстасавана</string>
+    <string name="poi_tourist_bus_designated">Доступ для турыстычных аўтобусаў: прыстасавана</string>
+    <string name="poi_psv_designated">Доступ да PSV: прыстасавана</string>
+    <string name="poi_goods_yes">Так</string>
+    <string name="poi_hgv_delivery">Дастаўка</string>
+    <string name="poi_hgv_designated">Прыстасавана</string>
+    <string name="poi_hgv_permissive">З дазволу</string>
+    <string name="poi_hgv_destination">Прыстасавана</string>
+    <string name="poi_hgv_yes">Так</string>
+    <string name="poi_mofa_designated">Прыстасавана</string>
+    <string name="poi_mofa_yes">Так</string>
+    <string name="poi_moped_designated">Прыстасавана</string>
+    <string name="poi_moped_yes">Так</string>
+    <string name="poi_motorcycle_designated">Прыстасавана</string>
+    <string name="poi_motorcycle_destination">Прыстасавана</string>
+    <string name="poi_motorcycle_permissive">З дазволу</string>
+    <string name="poi_motorcycle_yes">Так</string>
+    <string name="poi_trailer_designated">Прыстасавана</string>
+    <string name="poi_trailer_yes">Так</string>
+    <string name="poi_motorhome_designated">Прыстасавана</string>
+    <string name="poi_motorhome_yes">Так</string>
+    <string name="poi_caravan_yes">Так</string>
+    <string name="poi_bus_yes">Так</string>
+    <string name="poi_snowmobile_permissive">З дазволу</string>
+    <string name="poi_snowmobile_yes">Так</string>
+    <string name="poi_disabled_no">Доступ для інвалідаў: не</string>
+    <string name="poi_taxi_no">Доступ для таксі: не</string>
+    <string name="poi_taxi_yes">Доступ для таксі: так</string>
+    <string name="poi_agricultural_no">Доступ для сельскагаспадарчых машын: не</string>
+    <string name="poi_agricultural_yes">Доступ для сельскагаспадарчых машын: так</string>
+    <string name="poi_snowmobile_no">Доступ для снегаходаў: не</string>
+    <string name="poi_snowmobile_private">Доступ для снегаходаў: прыватны</string>
+    <string name="poi_ski_no">Доступ на лыжах: не</string>
+    <string name="poi_ski_yes">Доступ на лыжах: так</string>
+    <string name="poi_coach_no">Доступ для аўтакараў: не</string>
+    <string name="poi_coach_yes">Доступ для аўтакараў: так</string>
+    <string name="poi_tourist_bus_no">Доступ для турыстычных аўтобусаў: не</string>
+    <string name="poi_tourist_bus_yes">Доступ для турыстычных аўтобусаў: так</string>
+    <string name="poi_bus_no">Доступ для аўтобусаў: не</string>
+    <string name="poi_psv_no">Доступ да PSV: не</string>
+    <string name="poi_psv_yes">Доступ да PSV: так</string>
+    <string name="poi_trailer_no">Доступ для трэйлераў: не</string>
+    <string name="poi_motorhome_no">Доступ для дамоў на колах: не</string>
+    <string name="poi_caravan_no">Доступ для дамоў на колах: не</string>
+    <string name="poi_foot_customers">Доступ для пешаходаў: для кліентаў</string>
+    <string name="poi_foot_permissive">Доступ для пешаходаў: з дазволу</string>
+    <string name="poi_foot_destination">Доступ для пешаходаў: пункт прызначэння</string>
+    <string name="poi_foot_no">Доступ для пешаходаў: не</string>
+    <string name="poi_foot_private">Доступ для пешаходаў: прыватны</string>
+    <string name="poi_foot_yes">Доступ для пешаходаў: так</string>
+    <string name="poi_horse_forestry">Доступ для коней: лясная гаспадарка</string>
+    <string name="poi_horse_permissive">Доступ для коней: з дазволу</string>
+    <string name="poi_horse_destination">Доступ для коней: пункт прызначэння</string>
+    <string name="poi_horse_private">Доступ для коней: прыватны</string>
+    <string name="poi_bicycle_customers">Доступ для ровараў: для кліентаў</string>
+    <string name="poi_bicycle_permissive">Доступ для ровараў: з дазволу</string>
+    <string name="poi_bicycle_destination">Доступ для ровараў: пункт прызначэння</string>
+    <string name="poi_bicycle_dismount">Доступ для ровараў: толькі пешшу ў руках</string>
+    <string name="poi_bicycle_private">Доступ для ровараў: прыватны</string>
+    <string name="poi_mofa_no">Доступ для мапедаў Mofa: не</string>
+    <string name="poi_moped_no">Доступ для мапедаў: не</string>
+    <string name="poi_motorcycle_no">Доступ для матацыклаў: не</string>
+    <string name="poi_motorcycle_private">Доступ для матацыклаў: прыватны</string>
+    <string name="poi_goods_no">Доступ для лёгкіх грузавых аўтамабіляў: не</string>
+    <string name="poi_hgv_unsuitable">Доступ для цяжкіх грузавых аўтамабіляў: непрыдатна</string>
+    <string name="poi_hgv_discouraged">Доступ для цяжкіх грузавых аўтамабіляў: не рэкамендуецца</string>
+    <string name="poi_hgv_agricultural">Доступ для цяжкіх грузавых аўтамабіляў: сельская гаспадарка</string>
+    <string name="poi_hgv_no">Доступ для цяжкіх грузавых аўтамабіляў: не</string>
+    <string name="poi_hgv_private">Доступ для цяжкіх грузавых аўтамабіляў: прыватны</string>
+    <string name="poi_motor_vehicle_agricultural">Доступ для механічных транспартных сродкаў: сельская гаспадарка</string>
+    <string name="poi_motor_vehicle_forestry">Доступ для механічных транспартных сродкаў: лясная гаспадарка</string>
+    <string name="poi_motor_vehicle_delivery">Доступ для механічных транспартных сродкаў: кур’еры / дастаўка</string>
+    <string name="poi_motor_vehicle_military">Доступ для механічных транспартных сродкаў: для вайскоўцаў</string>
+    <string name="poi_motor_vehicle_customers">Доступ для механічных транспартных сродкаў: для кліентаў</string>
+    <string name="poi_motor_vehicle_permissive">Доступ для механічных транспартных сродкаў: з дазволу</string>
+    <string name="poi_motor_vehicle_destination">Доступ для механічных транспартных сродкаў: пункт прызначэння</string>
+    <string name="poi_elevator">Ліфт</string>
+    <string name="poi_city_block">Гарадскі квартал</string>
+    <string name="poi_borough">Муніцыпалітэт</string>
+    <string name="poi_give_box">Падарункавая скрынка</string>
+    <string name="poi_traffic_signals_arrow_no">Стрэлка: не</string>
+    <string name="poi_traffic_signals_arrow_yes">Так</string>
+    <string name="poi_traffic_signals_vibration_yes">Так</string>
+    <string name="poi_traffic_signals_vibration_no">Вібрацыя: не</string>
+    <string name="poi_pump_status_missing_beam">Стан помпы: адсутнічае рычаг</string>
+    <string name="poi_osmand_fire_hydrant_pressure_suction">Усмоктванне</string>
+    <string name="poi_osmand_fire_hydrant_pressure_pressurized">Пад ціскам</string>
+    <string name="poi_fire_hydrant_style_water_source_groundwater">Падземныя воды</string>
+    <string name="poi_fire_hydrant_type_pipe">Труба</string>
+    <string name="poi_drinking_water_refill_network">Сетка папаўнення пітной вадой</string>
+    <string name="poi_drinking_water_refill_no">Папаўненне пітной вадой: не</string>
+    <string name="poi_drinking_water_refill_yes">Папаўненне пітной вадой: так</string>
+    <string name="poi_seamark_obstruction">Перашкода</string>
+    <string name="poi_seamark_water_level_below_mwl">Узровень вады: ніжэй сярэдняга ўзроўню</string>
+    <string name="poi_seamark_water_level_above_mwl">Узровень вады: вышэй сярэдняга ўзроўню</string>
+    <string name="poi_seamark_water_level_floating">Узровень вады: плавае</string>
+    <string name="poi_seamark_water_level_floods">Узровень вады: павадак</string>
+    <string name="poi_seamark_water_level_awash">Узровень вады: павадак</string>
+    <string name="poi_seamark_water_level_covers">Узровень вады: пакрыта</string>
+    <string name="poi_seamark_water_level_dry">Узровень вады: суха</string>
+    <string name="poi_seamark_water_level_submerged">Узровень вады: пад вадой</string>
+    <string name="poi_seamark_water_level_part_submerged">Узровень вады: часткова пагружана</string>
+    <string name="poi_tactile_paving_incorrect">Хібнае</string>
+    <string name="poi_tactile_paving_primitive">Прымітыўнае</string>
+    <string name="poi_tactile_paving_contrasted">Кантраснае</string>
+    <string name="poi_traffic_signals_sound_locate">Толькі калі дазволеная хада</string>
+    <string name="poi_internet_access_fee_customers">Доступ да сеціва</string>
+    <string name="poi_video_no">Не</string>
+    <string name="poi_video_yes">Так</string>
+    <string name="poi_booth">Тып стэнда</string>
+    <string name="poi_covered_booth">Стэнд</string>
+    <string name="poi_sms_no">Не</string>
+    <string name="poi_sms_yes">Так</string>
+    <string name="poi_dive_centre">Цэнтр дайвінгу</string>
+    <string name="poi_resort_hunting">Паляўнічая база</string>
 </resources>