From 08bd2a8546e35489c4023b4460334fe48011bf9f Mon Sep 17 00:00:00 2001
From: Dima-1 <softmail32@gmail.com>
Date: Tue, 7 Jul 2020 13:51:17 +0300
Subject: [PATCH 01/81] Material theme

---
 .../add_gpx_point_bottom_sheet.xml            | 10 +--
 OsmAnd/res/layout-land/map_hud_bottom.xml     |  1 -
 .../layout-land/move_marker_bottom_sheet.xml  | 17 ++--
 .../res/layout/add_gpx_point_bottom_sheet.xml | 34 ++++----
 OsmAnd/res/layout/adjust_speed_slider.xml     |  1 -
 OsmAnd/res/layout/animate_route.xml           | 15 ++--
 ...bottom_sheet_item_slider_with_two_text.xml |  1 -
 OsmAnd/res/layout/download_tiles.xml          | 41 +++++-----
 .../layout/favorite_category_dialog_item.xml  |  1 +
 OsmAnd/res/layout/fragment_edit_poi.xml       |  5 +-
 OsmAnd/res/layout/fragment_terrain.xml        |  2 -
 OsmAnd/res/layout/list_item_progress.xml      |  3 +-
 OsmAnd/res/layout/map_hud_bottom.xml          |  1 -
 .../res/layout/move_marker_bottom_sheet.xml   | 39 +++++----
 OsmAnd/res/layout/poi_tag_list_item.xml       | 20 +++--
 .../layout/quick_action_add_poi_layout.xml    | 35 ++++----
 .../res/layout/recalculation_angle_dialog.xml |  1 -
 OsmAnd/res/layout/search_dialog_fragment.xml  |  2 +-
 OsmAnd/res/layout/slider.xml                  |  1 -
 OsmAnd/res/layout/zoom_levels_with_descr.xml  |  1 -
 OsmAnd/res/values/styles.xml                  | 82 ++++---------------
 OsmAnd/src/net/osmand/plus/UiUtilities.java   |  8 --
 .../plus/activities/PluginsActivity.java      |  4 +-
 .../editors/PointEditorFragmentNew.java       |  2 +-
 .../EditMapSourceDialogFragment.java          |  5 +-
 .../plus/mapsource/ExpireTimeBottomSheet.java |  2 +-
 .../mapsource/InputZoomLevelsBottomSheet.java |  3 +-
 .../plus/osmedit/AdvancedEditPoiFragment.java | 18 ++--
 .../VehicleParametersBottomSheet.java         |  2 +-
 29 files changed, 149 insertions(+), 208 deletions(-)

diff --git a/OsmAnd/res/layout-land/add_gpx_point_bottom_sheet.xml b/OsmAnd/res/layout-land/add_gpx_point_bottom_sheet.xml
index a6c60491b9..1494750470 100644
--- a/OsmAnd/res/layout-land/add_gpx_point_bottom_sheet.xml
+++ b/OsmAnd/res/layout-land/add_gpx_point_bottom_sheet.xml
@@ -34,8 +34,8 @@
             android:layout_marginRight="@dimen/content_padding"
             android:layout_marginTop="@dimen/content_padding"
             android:text="@string/waypoint_one"
-	        android:layout_marginEnd="@dimen/content_padding"
-	        android:layout_marginStart="@dimen/content_padding" />
+            android:layout_marginEnd="@dimen/content_padding"
+            android:layout_marginStart="@dimen/content_padding" />
 
         <TextView
             android:id="@+id/description"
@@ -47,8 +47,8 @@
             android:layout_marginRight="@dimen/content_padding"
             android:layout_marginTop="@dimen/content_padding_half"
             tools:text="Lat: 50.45375 Lon: 30.48693"
-	        android:layout_marginEnd="@dimen/content_padding"
-	        android:layout_marginStart="@dimen/content_padding" />
+            android:layout_marginEnd="@dimen/content_padding"
+            android:layout_marginStart="@dimen/content_padding" />
 
     </LinearLayout>
 
@@ -68,5 +68,5 @@
         android:layout_marginRight="@dimen/content_padding"
         android:layout_gravity="center_vertical"
         android:text="@string/shared_string_cancel"
-	    android:layout_marginEnd="@dimen/content_padding" />
+        android:layout_marginEnd="@dimen/content_padding" />
 </LinearLayout>
\ No newline at end of file
diff --git a/OsmAnd/res/layout-land/map_hud_bottom.xml b/OsmAnd/res/layout-land/map_hud_bottom.xml
index e2c6d8556f..6c193cf259 100644
--- a/OsmAnd/res/layout-land/map_hud_bottom.xml
+++ b/OsmAnd/res/layout-land/map_hud_bottom.xml
@@ -185,7 +185,6 @@
 
                 <com.google.android.material.slider.Slider
                     android:id="@+id/map_transparency_slider"
-                    style="@style/Widget.Styled.Slider"
                     android:layout_width="@dimen/map_trans_seek_size"
                     android:layout_height="wrap_content"
                     android:layout_gravity="center"/>
diff --git a/OsmAnd/res/layout-land/move_marker_bottom_sheet.xml b/OsmAnd/res/layout-land/move_marker_bottom_sheet.xml
index b18b98d707..df3b13689c 100644
--- a/OsmAnd/res/layout-land/move_marker_bottom_sheet.xml
+++ b/OsmAnd/res/layout-land/move_marker_bottom_sheet.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
-    xmlns:osmand="http://schemas.android.com/apk/res-auto"
+<LinearLayout xmlns:osmand="http://schemas.android.com/apk/res-auto"
     android:id="@+id/move_marker_bottom_sheet"
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
@@ -17,7 +16,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:padding="@dimen/content_padding"
-        osmand:srcCompat="@drawable/ic_action_photo_dark"/>
+        osmand:srcCompat="@drawable/ic_action_photo_dark" />
 
     <LinearLayout
         android:layout_weight="1"
@@ -33,8 +32,8 @@
             android:layout_marginRight="@dimen/content_padding"
             android:layout_marginTop="@dimen/content_padding"
             android:text="@string/move_marker_bottom_sheet_title"
-	        android:layout_marginStart="@dimen/content_padding"
-	        android:layout_marginEnd="@dimen/content_padding" />
+            android:layout_marginStart="@dimen/content_padding"
+            android:layout_marginEnd="@dimen/content_padding" />
 
         <TextView
             android:id="@+id/description"
@@ -46,8 +45,8 @@
             android:layout_marginRight="@dimen/content_padding"
             android:layout_marginTop="@dimen/content_padding_half"
             tools:text="Lat: 50.45375 Lon: 30.48693"
-	        android:layout_marginStart="@dimen/content_padding"
-	        android:layout_marginEnd="@dimen/content_padding" />
+            android:layout_marginStart="@dimen/content_padding"
+            android:layout_marginEnd="@dimen/content_padding" />
 
     </LinearLayout>
 
@@ -57,7 +56,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center_vertical"
-        android:text="@string/shared_string_apply"/>
+        android:text="@string/shared_string_apply" />
 
     <androidx.appcompat.widget.AppCompatButton
         android:id="@+id/cancel_button"
@@ -67,5 +66,5 @@
         android:layout_marginRight="@dimen/content_padding"
         android:layout_gravity="center_vertical"
         android:text="@string/shared_string_cancel"
-	    android:layout_marginEnd="@dimen/content_padding" />
+        android:layout_marginEnd="@dimen/content_padding" />
 </LinearLayout>
\ No newline at end of file
diff --git a/OsmAnd/res/layout/add_gpx_point_bottom_sheet.xml b/OsmAnd/res/layout/add_gpx_point_bottom_sheet.xml
index 1325fab41c..f8b2389831 100644
--- a/OsmAnd/res/layout/add_gpx_point_bottom_sheet.xml
+++ b/OsmAnd/res/layout/add_gpx_point_bottom_sheet.xml
@@ -33,8 +33,8 @@
             android:layout_marginRight="@dimen/content_padding"
             android:layout_marginTop="@dimen/content_padding"
             tools:text="@string/waypoint_one"
-	        android:layout_marginEnd="@dimen/content_padding"
-	        android:layout_marginStart="@dimen/content_padding" />
+            android:layout_marginEnd="@dimen/content_padding"
+            android:layout_marginStart="@dimen/content_padding" />
 
         <TextView
             android:id="@+id/description"
@@ -46,8 +46,8 @@
             android:layout_marginRight="@dimen/content_padding"
             android:layout_marginTop="@dimen/content_padding_half"
             tools:text="Lat: 50.45375\nLon: 30.48693"
-	        android:layout_marginEnd="@dimen/content_padding"
-	        android:layout_marginStart="@dimen/content_padding" />
+            android:layout_marginEnd="@dimen/content_padding"
+            android:layout_marginStart="@dimen/content_padding" />
 
         <LinearLayout
             android:layout_width="wrap_content"
@@ -55,20 +55,26 @@
             android:layout_marginBottom="@dimen/content_padding"
             android:layout_marginLeft="@dimen/content_padding_small"
             android:layout_marginRight="@dimen/content_padding_small"
-	        android:layout_marginStart="@dimen/content_padding_small"
-	        android:layout_marginEnd="@dimen/content_padding_small">
+            android:layout_marginStart="@dimen/content_padding_small"
+            android:layout_marginEnd="@dimen/content_padding_small">
 
-            <Button
+            <androidx.appcompat.widget.AppCompatButton
                 android:id="@+id/create_button"
-                style="@style/DialogActionButton"
-                android:layout_marginRight="@dimen/content_padding_half"
-                android:text="@string/shared_string_add"
-	            android:layout_marginEnd="@dimen/content_padding_half" />
+                style="@style/Widget.AppCompat.Button.Colored"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_vertical"
+                android:text="@string/shared_string_add" />
 
-            <Button
+            <androidx.appcompat.widget.AppCompatButton
                 android:id="@+id/cancel_button"
-                style="@style/DialogCancelButton"
-                android:text="@string/shared_string_cancel"/>
+                style="@style/Widget.AppCompat.Button.Borderless.Colored"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_vertical"
+                android:layout_marginEnd="@dimen/content_padding"
+                android:layout_marginRight="@dimen/content_padding"
+                android:text="@string/shared_string_cancel" />
         </LinearLayout>
 
 
diff --git a/OsmAnd/res/layout/adjust_speed_slider.xml b/OsmAnd/res/layout/adjust_speed_slider.xml
index 6d7b27f58b..a4a396da30 100644
--- a/OsmAnd/res/layout/adjust_speed_slider.xml
+++ b/OsmAnd/res/layout/adjust_speed_slider.xml
@@ -82,7 +82,6 @@
 
 	<com.google.android.material.slider.Slider
 		android:id="@+id/speed_slider"
-		style="@style/Widget.Styled.Slider"
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
 		android:layout_marginLeft="@dimen/content_padding_small"
diff --git a/OsmAnd/res/layout/animate_route.xml b/OsmAnd/res/layout/animate_route.xml
index d085e7a9f9..4da0c1cc87 100644
--- a/OsmAnd/res/layout/animate_route.xml
+++ b/OsmAnd/res/layout/animate_route.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-	android:layout_width="fill_parent"
-	android:layout_height="fill_parent"
+	android:layout_width="match_parent"
+	android:layout_height="match_parent"
 	android:orientation="vertical">
 
 	<TextView
-		android:layout_width="fill_parent"
+		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
 		android:layout_marginLeft="@dimen/dialog_content_margin"
 		android:layout_marginTop="@dimen/content_padding"
@@ -18,12 +18,12 @@
 
 	<LinearLayout
 		android:id="@+id/layout_animate_gpx"
-		android:layout_width="fill_parent"
-		android:layout_height="fill_parent"
+		android:layout_width="match_parent"
+		android:layout_height="match_parent"
 		android:orientation="vertical">
 
 		<TextView
-			android:layout_width="fill_parent"
+			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
 			android:layout_marginLeft="@dimen/dialog_content_margin"
 			android:layout_marginTop="@dimen/map_small_button_margin"
@@ -36,7 +36,6 @@
 
 		<com.google.android.material.slider.Slider
 			android:id="@+id/Speedup"
-			style="@style/Widget.Styled.Slider"
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
 			android:layout_marginLeft="@dimen/dialog_content_margin"
@@ -46,7 +45,7 @@
 			android:layout_marginEnd="@dimen/content_padding" />
 
 		<LinearLayout
-			android:layout_width="fill_parent"
+			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
 			android:layout_marginLeft="@dimen/dialog_content_margin"
 			android:layout_marginTop="@dimen/map_small_button_margin"
diff --git a/OsmAnd/res/layout/bottom_sheet_item_slider_with_two_text.xml b/OsmAnd/res/layout/bottom_sheet_item_slider_with_two_text.xml
index 2464e78695..b5cb11cf49 100644
--- a/OsmAnd/res/layout/bottom_sheet_item_slider_with_two_text.xml
+++ b/OsmAnd/res/layout/bottom_sheet_item_slider_with_two_text.xml
@@ -36,7 +36,6 @@
 
     <com.google.android.material.slider.Slider
         android:id="@+id/slider"
-        style="@style/Widget.Styled.Slider"
         android:layout_marginLeft="@dimen/content_padding"
         android:layout_marginRight="@dimen/content_padding"
         android:layout_width="match_parent"
diff --git a/OsmAnd/res/layout/download_tiles.xml b/OsmAnd/res/layout/download_tiles.xml
index 9dbec76cfd..e911bd61b5 100644
--- a/OsmAnd/res/layout/download_tiles.xml
+++ b/OsmAnd/res/layout/download_tiles.xml
@@ -1,40 +1,39 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
     android:paddingTop="@dimen/content_padding"
     android:paddingLeft="@dimen/content_padding"
     android:paddingRight="@dimen/content_padding"
     android:orientation="vertical"
-	android:paddingEnd="@dimen/content_padding"
-	android:paddingStart="@dimen/content_padding">
+    android:paddingEnd="@dimen/content_padding"
+    android:paddingStart="@dimen/content_padding">
 
     <TextView
         android:text="@string/select_max_zoom_preload_area"
         android:gravity="center"
-        android:layout_width="fill_parent"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:textColor="?android:textColorSecondary"
         android:layout_marginLeft="10dp"
         android:layout_marginRight="10dp"
         android:layout_marginTop="5dp"
-	    android:layout_marginEnd="10dp"
-	    android:layout_marginStart="10dp" />
+        android:layout_marginEnd="10dp"
+        android:layout_marginStart="10dp" />
 
     <com.google.android.material.slider.Slider
         android:id="@+id/ZoomToDownload"
-		style="@style/Widget.Styled.Slider"
-        android:layout_width="fill_parent"
+        android:layout_width="match_parent"
         android:stepSize="1"
         android:layout_height="wrap_content"
         android:layout_marginLeft="@dimen/content_padding"
         android:layout_marginRight="@dimen/content_padding"
         android:layout_marginTop="@dimen/content_padding_small"
-	    android:layout_marginEnd="@dimen/content_padding"
-	    android:layout_marginStart="@dimen/content_padding" />
+        android:layout_marginEnd="@dimen/content_padding"
+        android:layout_marginStart="@dimen/content_padding" />
 
     <LinearLayout
-        android:layout_width="fill_parent"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content">
 
         <TextView
@@ -47,8 +46,8 @@
             android:paddingRight="@dimen/content_padding_small"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-	        android:paddingEnd="@dimen/content_padding_small"
-	        android:paddingStart="@dimen/content_padding_small" />
+            android:paddingEnd="@dimen/content_padding_small"
+            android:paddingStart="@dimen/content_padding_small" />
 
         <TextView
             android:text="15"
@@ -60,8 +59,8 @@
             android:paddingRight="@dimen/content_padding_small"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-	        android:paddingStart="@dimen/content_padding_small"
-	        android:paddingEnd="@dimen/content_padding_small" />
+            android:paddingStart="@dimen/content_padding_small"
+            android:paddingEnd="@dimen/content_padding_small" />
     </LinearLayout>
 
     <TextView
@@ -70,17 +69,17 @@
         android:id="@+id/DownloadDescription"
         android:layout_marginTop="@dimen/content_padding_small"
         android:textColor="?android:textColorSecondary"
-        android:layout_width="fill_parent"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content" />
 
     <androidx.appcompat.widget.AppCompatImageView
-        android:layout_width="fill_parent"
-        android:layout_height="fill_parent"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
         android:layout_marginLeft="10dp"
         android:layout_marginRight="10dp"
         android:layout_marginTop="5dp"
         android:layout_marginBottom="5dp"
         android:id="@+id/AreaPreview"
-	    android:layout_marginEnd="10dp"
-	    android:layout_marginStart="10dp" />
+        android:layout_marginEnd="10dp"
+        android:layout_marginStart="10dp" />
 </LinearLayout>
diff --git a/OsmAnd/res/layout/favorite_category_dialog_item.xml b/OsmAnd/res/layout/favorite_category_dialog_item.xml
index b90dcab69c..92aa731363 100644
--- a/OsmAnd/res/layout/favorite_category_dialog_item.xml
+++ b/OsmAnd/res/layout/favorite_category_dialog_item.xml
@@ -18,6 +18,7 @@
         android:gravity="start|center_vertical"
         android:textSize="@dimen/default_list_text_size"
         android:textAllCaps="false"
+	    android:textColor="?attr/textColorAlertDialogListItem"
 	    android:paddingStart="10dp"
 	    android:paddingEnd="10dp" />
 
diff --git a/OsmAnd/res/layout/fragment_edit_poi.xml b/OsmAnd/res/layout/fragment_edit_poi.xml
index b93c6743f5..f2854b4a77 100644
--- a/OsmAnd/res/layout/fragment_edit_poi.xml
+++ b/OsmAnd/res/layout/fragment_edit_poi.xml
@@ -90,10 +90,13 @@
                     android:layout_weight="1"
                     android:layout_marginStart="24dp">
 
-                    <AutoCompleteTextView
+                    <com.google.android.material.textfield.MaterialAutoCompleteTextView
                         android:id="@+id/poiTypeEditText"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
+                        android:minHeight="@dimen/wpt_list_item_height"
+                        android:gravity="bottom|start"
+                        android:paddingBottom="@dimen/text_margin_small"
                         android:completionThreshold="1"
                         app:drawableRightCompat="@drawable/ic_action_arrow_drop_down"
                         app:drawableEndCompat="@drawable/ic_action_arrow_drop_down"
diff --git a/OsmAnd/res/layout/fragment_terrain.xml b/OsmAnd/res/layout/fragment_terrain.xml
index 11fa1aa1f0..65a8cd0774 100644
--- a/OsmAnd/res/layout/fragment_terrain.xml
+++ b/OsmAnd/res/layout/fragment_terrain.xml
@@ -197,7 +197,6 @@
 
 					<com.google.android.material.slider.Slider
 						android:id="@+id/transparency_slider"
-						style="@style/Widget.Styled.Slider"
 						android:layout_width="match_parent"
 						android:layout_height="wrap_content"
 						android:paddingTop="@dimen/list_header_settings_top_margin"
@@ -277,7 +276,6 @@
 
 						<com.google.android.material.slider.RangeSlider
 							android:id="@+id/zoom_slider"
-							style="@style/Widget.Styled.Slider"
 							android:layout_width="0dp"
 							android:layout_height="wrap_content"
 							android:layout_weight="1"
diff --git a/OsmAnd/res/layout/list_item_progress.xml b/OsmAnd/res/layout/list_item_progress.xml
index 5a0a729274..31f35bf951 100644
--- a/OsmAnd/res/layout/list_item_progress.xml
+++ b/OsmAnd/res/layout/list_item_progress.xml
@@ -2,7 +2,7 @@
 <LinearLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="fill_parent"
+    android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:background="?attr/bg_color"
     android:descendantFocusability="blocksDescendants"
@@ -35,7 +35,6 @@
 
         <com.google.android.material.slider.Slider
             android:id="@+id/slider"
-            style="@style/Widget.Styled.Slider"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:valueFrom="0"
diff --git a/OsmAnd/res/layout/map_hud_bottom.xml b/OsmAnd/res/layout/map_hud_bottom.xml
index acdcc33e56..d6f7272dff 100644
--- a/OsmAnd/res/layout/map_hud_bottom.xml
+++ b/OsmAnd/res/layout/map_hud_bottom.xml
@@ -100,7 +100,6 @@
 
             <com.google.android.material.slider.Slider
                 android:id="@+id/map_transparency_slider"
-                style="@style/Widget.Styled.Slider"
                 android:layout_width="@dimen/map_trans_seek_size"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center"
diff --git a/OsmAnd/res/layout/move_marker_bottom_sheet.xml b/OsmAnd/res/layout/move_marker_bottom_sheet.xml
index 97940c1f6c..677cff3c20 100644
--- a/OsmAnd/res/layout/move_marker_bottom_sheet.xml
+++ b/OsmAnd/res/layout/move_marker_bottom_sheet.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
-    xmlns:osmand="http://schemas.android.com/apk/res-auto"
+<LinearLayout xmlns:osmand="http://schemas.android.com/apk/res-auto"
     android:id="@+id/move_marker_bottom_sheet"
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
@@ -17,7 +16,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:padding="@dimen/content_padding"
-        osmand:srcCompat="@drawable/ic_action_photo_dark"/>
+        osmand:srcCompat="@drawable/ic_action_photo_dark" />
 
     <LinearLayout
         android:layout_width="match_parent"
@@ -32,8 +31,8 @@
             android:layout_marginRight="@dimen/content_padding"
             android:layout_marginTop="@dimen/content_padding"
             android:text="@string/move_marker_bottom_sheet_title"
-	        android:layout_marginEnd="@dimen/content_padding"
-	        android:layout_marginStart="@dimen/content_padding" />
+            android:layout_marginEnd="@dimen/content_padding"
+            android:layout_marginStart="@dimen/content_padding" />
 
         <TextView
             android:id="@+id/description"
@@ -45,8 +44,8 @@
             android:layout_marginRight="@dimen/content_padding"
             android:layout_marginTop="@dimen/content_padding_half"
             tools:text="Lat: 50.45375\nLon: 30.48693"
-	        android:layout_marginEnd="@dimen/content_padding"
-	        android:layout_marginStart="@dimen/content_padding" />
+            android:layout_marginEnd="@dimen/content_padding"
+            android:layout_marginStart="@dimen/content_padding" />
 
         <LinearLayout
             android:layout_width="wrap_content"
@@ -54,22 +53,28 @@
             android:layout_marginBottom="@dimen/content_padding"
             android:layout_marginLeft="@dimen/content_padding_small"
             android:layout_marginRight="@dimen/content_padding_small"
-	        android:layout_marginStart="@dimen/content_padding_small"
-	        android:layout_marginEnd="@dimen/content_padding_small">
+            android:layout_marginStart="@dimen/content_padding_small"
+            android:layout_marginEnd="@dimen/content_padding_small">
 
-            <Button
+            <androidx.appcompat.widget.AppCompatButton
                 android:id="@+id/apply_button"
-                style="@style/DialogActionButton"
+                style="@style/Widget.AppCompat.Button.Colored"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_vertical"
                 android:layout_marginRight="@dimen/content_padding_half"
                 android:text="@string/shared_string_apply"
-	            android:layout_marginEnd="@dimen/content_padding_half" />
+                android:layout_marginEnd="@dimen/content_padding_half" />
 
-            <Button
+            <androidx.appcompat.widget.AppCompatButton
                 android:id="@+id/cancel_button"
-                style="@style/DialogCancelButton"
-                android:text="@string/shared_string_cancel"/>
+                style="@style/Widget.AppCompat.Button.Borderless.Colored"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginRight="@dimen/content_padding"
+                android:layout_gravity="center_vertical"
+                android:layout_marginEnd="@dimen/content_padding"
+                android:text="@string/shared_string_cancel" />
         </LinearLayout>
-
-
     </LinearLayout>
 </LinearLayout>
\ No newline at end of file
diff --git a/OsmAnd/res/layout/poi_tag_list_item.xml b/OsmAnd/res/layout/poi_tag_list_item.xml
index 6a77aa378d..c057b3f0f1 100644
--- a/OsmAnd/res/layout/poi_tag_list_item.xml
+++ b/OsmAnd/res/layout/poi_tag_list_item.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
@@ -14,14 +13,17 @@
         android:layout_marginLeft="@dimen/content_padding_small"
         android:layout_marginRight="@dimen/content_padding"
         android:layout_weight="1"
-	    android:layout_marginStart="@dimen/content_padding_small"
-	    android:layout_marginEnd="@dimen/content_padding">
+        android:layout_marginStart="@dimen/content_padding_small"
+        android:layout_marginEnd="@dimen/content_padding">
 
-        <AutoCompleteTextView
+        <com.google.android.material.textfield.MaterialAutoCompleteTextView
             android:id="@+id/tagEditText"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:minHeight="@dimen/wpt_list_item_height"
             android:hint="@string/hint_tag"
+            android:gravity="bottom"
+            android:paddingBottom="@dimen/text_margin_small"
             tools:text="Tag text"/>
 
     </com.google.android.material.textfield.TextInputLayout>
@@ -31,11 +33,15 @@
         android:layout_height="wrap_content"
         android:layout_weight="1">
 
-        <AutoCompleteTextView
+        <com.google.android.material.textfield.MaterialAutoCompleteTextView
             android:id="@+id/valueEditText"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:hint="@string/hint_value"/>
+            android:minHeight="@dimen/wpt_list_item_height"
+            android:gravity="bottom"
+            android:paddingBottom="@dimen/text_margin_small"
+            android:hint="@string/hint_value"
+            tools:text="Value text"/>
 
     </com.google.android.material.textfield.TextInputLayout>
 
diff --git a/OsmAnd/res/layout/quick_action_add_poi_layout.xml b/OsmAnd/res/layout/quick_action_add_poi_layout.xml
index 9ef2b0e03d..2f6ad6d8b2 100644
--- a/OsmAnd/res/layout/quick_action_add_poi_layout.xml
+++ b/OsmAnd/res/layout/quick_action_add_poi_layout.xml
@@ -1,14 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.core.widget.NestedScrollView
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.core.widget.NestedScrollView 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"
-    xmlns:tools="http://schemas.android.com/tools"
     android:theme="?attr/new_app_theme">
 
     <LinearLayout
-        xmlns:android="http://schemas.android.com/apk/res/android"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="vertical">
@@ -17,12 +15,12 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:background="?attr/bg_color"
-            android:minHeight="56dp"
+            android:minHeight="@dimen/wpt_list_item_height"
             android:orientation="horizontal">
 
             <TextView
                 android:id="@+id/textView3"
-                android:layout_width="match_parent"
+                android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center"
                 android:layout_weight="1"
@@ -38,8 +36,8 @@
                 android:layout_gravity="center_vertical"
                 android:layout_marginLeft="@dimen/content_padding"
                 android:layout_marginRight="@dimen/content_padding"
-	            android:layout_marginEnd="@dimen/content_padding"
-	            android:layout_marginStart="@dimen/content_padding" />
+                android:layout_marginEnd="@dimen/content_padding"
+                android:layout_marginStart="@dimen/content_padding" />
 
         </LinearLayout>
 
@@ -82,12 +80,15 @@
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="@dimen/content_padding"
                 android:layout_weight="1"
-	            android:layout_marginStart="@dimen/content_padding">
+                android:layout_marginStart="@dimen/content_padding">
 
-                <AutoCompleteTextView
+                <com.google.android.material.textfield.MaterialAutoCompleteTextView
                     android:id="@+id/poiTypeEditText"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
+                    android:minHeight="@dimen/wpt_list_item_height"
+                    android:gravity="bottom"
+                    android:paddingBottom="@dimen/text_margin_small"
                     android:completionThreshold="1"
                     osmand:drawableTint="@color/osmand_orange"
                     osmand:drawableRightCompat="@drawable/ic_action_arrow_drop_down"
@@ -95,17 +96,15 @@
                     android:hint="@string/poi_dialog_poi_type"
                     android:imeOptions="actionSend"
                     android:inputType="text"
-                    android:layout_marginLeft="-4dp"
-                    tools:text="@string/lorem_ipsum"
-	                android:layout_marginStart="-4dp" />
+                    tools:text="@string/lorem_ipsum" />
 
             </com.google.android.material.textfield.TextInputLayout>
 
             <ImageButton
                 android:id="@+id/onlineDocumentationButton"
                 android:contentDescription="@string/shared_string_help"
-                android:layout_width="48dp"
-                android:layout_height="48dp"
+                android:layout_width="@dimen/dashboard_parking_icon_size"
+                android:layout_height="@dimen/dashboard_parking_icon_size"
                 android:layout_gravity="bottom"
                 android:background="@null"
                 osmand:srcCompat="@drawable/ic_action_help"/>
@@ -153,9 +152,9 @@
                 android:textColor="@color/color_white"
                 android:textSize="@dimen/default_sub_text_size"
                 osmand:typeface="@string/font_roboto_medium"
-	            android:layout_marginStart="@dimen/content_padding"
-	            android:paddingEnd="@dimen/content_padding"
-	            android:paddingStart="@dimen/content_padding" />
+                android:layout_marginStart="@dimen/content_padding"
+                android:paddingEnd="@dimen/content_padding"
+                android:paddingStart="@dimen/content_padding" />
 
             <!--<net.osmand.plus.widgets.ButtonEx-->
                 <!--android:id="@+id/addTypeButton"-->
diff --git a/OsmAnd/res/layout/recalculation_angle_dialog.xml b/OsmAnd/res/layout/recalculation_angle_dialog.xml
index e8b68e6b3e..19ca192868 100644
--- a/OsmAnd/res/layout/recalculation_angle_dialog.xml
+++ b/OsmAnd/res/layout/recalculation_angle_dialog.xml
@@ -120,7 +120,6 @@
 
             <com.google.android.material.slider.Slider
                 android:id="@+id/angle_slider"
-                style="@style/Widget.Styled.Slider"
                 android:valueTo="90"
                 android:stepSize="5"
                 android:layout_width="match_parent"
diff --git a/OsmAnd/res/layout/search_dialog_fragment.xml b/OsmAnd/res/layout/search_dialog_fragment.xml
index d3998161cd..08ffe68580 100644
--- a/OsmAnd/res/layout/search_dialog_fragment.xml
+++ b/OsmAnd/res/layout/search_dialog_fragment.xml
@@ -105,7 +105,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:background="?attr/activity_background_color"
-                    android:theme="?attr/search_tabbar_layout_theme"
+                    style="?attr/search_tabbar_layout_theme"
                     app:tabGravity="fill"
                     app:tabMaxWidth="0dp"
                     app:tabMode="fixed"/>
diff --git a/OsmAnd/res/layout/slider.xml b/OsmAnd/res/layout/slider.xml
index b5681dcc8a..8640afdda3 100644
--- a/OsmAnd/res/layout/slider.xml
+++ b/OsmAnd/res/layout/slider.xml
@@ -6,7 +6,6 @@
 
     <com.google.android.material.slider.Slider
         android:id="@+id/slider"
-        style="@style/Widget.Styled.Slider"
         android:layout_width="match_parent"
         android:layout_height="wrap_content" />
 
diff --git a/OsmAnd/res/layout/zoom_levels_with_descr.xml b/OsmAnd/res/layout/zoom_levels_with_descr.xml
index 7bc08b0cab..5cfbcde5e9 100644
--- a/OsmAnd/res/layout/zoom_levels_with_descr.xml
+++ b/OsmAnd/res/layout/zoom_levels_with_descr.xml
@@ -73,7 +73,6 @@
 
         <com.google.android.material.slider.RangeSlider
             android:id="@+id/zoom_slider"
-            style="@style/Widget.Styled.Slider"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginLeft="@dimen/content_padding"
diff --git a/OsmAnd/res/values/styles.xml b/OsmAnd/res/values/styles.xml
index 5b4dfd70b0..7af575b04a 100644
--- a/OsmAnd/res/values/styles.xml
+++ b/OsmAnd/res/values/styles.xml
@@ -1,14 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="no"?>
 <resources xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <style name="Dialog_Fullscreen" parent="android:Theme">
-        <item name="android:windowNoTitle">true</item>
-        <item name="android:windowIsTranslucent">true</item>
-        <item name="android:windowBackground">@color/color_transparent</item>
-        <item name="android:windowContentOverlay">@null</item>
-        <item name="android:backgroundDimEnabled">false</item>
-    </style>
-
     <!-- Dashboard styles -->
     <style name="DashboardSubHeader">
         <item name="android:layout_width">0dp</item>
@@ -36,18 +28,6 @@
         <item name="android:background">?attr/dashboard_button</item>
     </style>
 
-    <style name="DashboardSearchButton">
-        <item name="android:paddingTop">@dimen/dashSearchPaddingTop</item>
-        <item name="android:layout_width">0dp</item>
-        <item name="android:layout_height">match_parent</item>
-        <item name="android:layout_weight">1</item>
-        <item name="android:textColor">?android:textColorPrimary</item>
-        <item name="android:textSize">@dimen/default_sub_text_size</item>
-        <item name="android:gravity">bottom|center_horizontal</item>
-        <item name="android:paddingBottom">@dimen/dashSearchPaddingBot</item>
-        <item name="android:background">?attr/dashboard_button</item>
-    </style>
-
     <style name="DialogActionButton">
         <item name="android:layout_width">wrap_content</item>
         <item name="android:layout_height">wrap_content</item>
@@ -60,18 +40,6 @@
         <item name="android:background">?attr/btn_round</item>
     </style>
 
-    <style name="DialogCancelButton">
-        <item name="android:layout_width">wrap_content</item>
-        <item name="android:layout_height">wrap_content</item>
-        <item name="android:minHeight">@dimen/dialog_button_height</item>
-        <item name="android:paddingLeft">16dp</item>
-        <item name="android:paddingRight">16dp</item>
-        <item name="android:paddingTop">8dp</item>
-        <item name="android:paddingBottom">8dp</item>
-        <item name="android:textColor">?attr/contextMenuButtonColor</item>
-        <item name="android:background">?attr/selectableItemBackground</item>
-    </style>
-    
     <style name="FirstSplashScreenCustom" parent="OsmandLightTheme.NoActionbar">
         <item name="android:windowBackground">@drawable/first_splash_screen_free</item>
     </style>
@@ -88,43 +56,14 @@
         <item name="android:windowBackground">@drawable/first_splash_screen_free_dev</item>
     </style>
 
-    <style name="OsmandTextFieldBoxes" parent="OsmandDarkTheme">
-        <item name="android:textColorTertiary">@color/white_50_transparent</item>
-        <item name="primaryColor">@color/white_50_transparent</item>
-        <item name="errorColor">@color/coordinate_input_error_color</item>
-    </style>
-
-    <style name="OsmandLightThemeWithLightStatusBar" parent="OsmandLightTheme">
-        <item name="android:statusBarColor">@color/status_bar_route_light</item>
-    </style>
-
     <style name="TextAppearance.App.DarkTextInputLayout" parent="@android:style/TextAppearance">
         <item name="android:textColor">@color/active_color_primary_dark</item>
     </style>
 
-    <style name="OsmandMaterialLightTheme" parent="Theme.MaterialComponents.Light">
-        <item name="colorPrimary">@color/active_color_primary_light</item>
-        <item name="dashboard_divider">@color/divider_color_light</item>
-        <item name="divider_color">@color/divider_color</item>
-        <item name="android:textColorPrimary">@color/text_color_primary_light</item>
-        <item name="android:textColorSecondary">@color/text_color_secondary_light</item>
-    </style>
-
-    <style name="OsmandMaterialDarkTheme" parent="Theme.MaterialComponents">
-        <item name="colorPrimary">@color/active_color_primary_dark</item>
-        <item name="dashboard_divider">@color/divider_color_dark</item>
-        <item name="divider_color">@color/divider_color_dark</item>
-        <item name="android:textColorPrimary">@color/text_color_primary_dark</item>
-        <item name="android:textColorSecondary">@color/text_color_secondary_dark</item>
-    </style>
-
-    <!-- MaterialComponents Widgets override -->
-    <style name="Widget.Styled.Slider" parent="Widget.MaterialComponents.Slider">
-        <item name="android:theme">@style/Theme.MaterialComponents</item>
-    </style>
-
     <!-- Osmand themes styles -->
-    <style name="OsmandLightTheme" parent="Theme.AppCompat.Light">
+    <style name="OsmandLightTheme" parent="Theme.MaterialComponents.Light">
+        <item name="android:buttonStyle">@style/Widget.AppCompat.Button.Colored</item>
+        <item name="buttonStyle">@style/Widget.AppCompat.Button.Colored</item>
         <item name="bottom_bar_background_color">@color/bottom_bar_background_color_light</item>
         <item name="android:textDirection">locale</item>
         <item name="android:statusBarColor">@color/status_bar_color_light</item>
@@ -188,6 +127,7 @@
         <item name="dashboard_general_button_text_color">@color/active_color_primary_light</item>
         <item name="android:listChoiceIndicatorMultiple">@drawable/check_light</item>
 
+        <item name="android:textColor">@color/text_color_primary_light</item>
         <item name="android:textColorPrimary">@color/text_color_primary_light</item>
         <item name="android:textColorSecondary">@color/text_color_secondary_light</item>
         <item name="android:textColorTertiary">@color/text_color_tertiary_light</item>
@@ -196,7 +136,7 @@
         <item name="spinnerListBackground">@color/spinner_list_background_light</item>
         <item name="colorButtonNormal">@color/color_white</item>
 
-        <item name="colorPrimary">@color/osmand_orange</item>
+        <item name="colorPrimary">@color/active_color_primary_light</item>
         <item name="colorPrimaryDark">@color/osmand_orange_dark</item>
         <item name="colorAccent">@color/active_color_primary_light</item>
 
@@ -339,8 +279,9 @@
         <!--<item name="actionMenuTextColor">@color/color_white</item>-->
     </style>
 
-    <style name="OsmandLightTheme.SearchTabbar">
+    <style name="OsmandLightTheme.SearchTabbar" parent="Widget.MaterialComponents.TabLayout">
         <item name="android:textColorPrimary">@color/osmand_orange</item>
+        <item name="tabTextColor">@color/osmand_orange</item>
         <item name="colorAccent">@color/osmand_orange</item>
         <item name="android:textColorSecondary">@color/text_color_secondary_light</item>
         <item name="android:textColorHint">@color/text_color_secondary_light</item>
@@ -367,8 +308,10 @@
         <item name="colorAccent">@color/color_white</item>
     </style>
 
-    <style name="OsmandDarkTheme.SearchTabbar">
+    <style name="OsmandDarkTheme.SearchTabbar"  parent="Widget.MaterialComponents.TabLayout">
         <item name="android:textColorPrimary">@color/osmand_orange</item>
+        <item name="tabIndicatorColor">@color/osmand_orange</item>
+        <item name="tabTextColor">@color/osmand_orange</item>
         <item name="colorAccent">@color/osmand_orange</item>
         <item name="android:textColorSecondary">@color/text_color_secondary_dark</item>
         <item name="android:textColorHint">@color/text_color_secondary_dark</item>
@@ -416,7 +359,7 @@
         <item name="colorControlNormal">?attr/coordinate_input_edit_text_normal</item>
     </style>
 
-    <style name="OsmandDarkTheme" parent="Theme.AppCompat">
+    <style name="OsmandDarkTheme" parent="Theme.MaterialComponents">
         <item name="bottom_bar_background_color">@color/bottom_bar_background_color_dark</item>
         <item name="android:textDirection">locale</item>
         <item name="android:statusBarColor">@color/status_bar_color_dark</item>
@@ -474,6 +417,7 @@
         <item name="dashboard_general_button_text_color">@color/active_color_primary_dark</item>
         <item name="android:listChoiceIndicatorMultiple">@drawable/check_dark</item>
 
+        <item name="android:textColor">@color/text_color_primary_dark</item>
         <item name="android:textColorPrimary">@color/text_color_primary_dark</item>
         <item name="android:textColorSecondary">@color/text_color_secondary_dark</item>
         <item name="android:textColorTertiary">@color/text_color_tertiary_dark</item>
@@ -497,6 +441,8 @@
         <item name="search_tabbar_layout_theme">@style/OsmandDarkTheme.SearchTabbar</item>
         <item name="toolbar_theme">@style/OsmandDarkTheme</item>
         <item name="new_app_theme">@style/OsmandDarkTheme</item>
+
+        <item name="colorPrimary">@color/active_color_primary_dark</item>
         <item name="colorAccent">@color/active_color_primary_dark</item>
 
         <item name="contextMenuButtonColor">@color/osmand_orange</item>
diff --git a/OsmAnd/src/net/osmand/plus/UiUtilities.java b/OsmAnd/src/net/osmand/plus/UiUtilities.java
index c60117f58c..c8f4c04c29 100644
--- a/OsmAnd/src/net/osmand/plus/UiUtilities.java
+++ b/OsmAnd/src/net/osmand/plus/UiUtilities.java
@@ -655,14 +655,6 @@ public class UiUtilities {
 		}
 	}
 
-	public static LayoutInflater getMaterialInflater(Context ctx, boolean nightMode) {
-		return LayoutInflater.from(getThemedMaterialContext(ctx, nightMode));
-	}
-
-	private static Context getThemedMaterialContext(Context context, boolean nightMode) {
-		return getThemedContext(context, nightMode, R.style.OsmandMaterialLightTheme, R.style.OsmandMaterialDarkTheme);
-	}
-
 	public static LayoutInflater getInflater(Context ctx, boolean nightMode) {
 		return LayoutInflater.from(getThemedContext(ctx, nightMode));
 	}
diff --git a/OsmAnd/src/net/osmand/plus/activities/PluginsActivity.java b/OsmAnd/src/net/osmand/plus/activities/PluginsActivity.java
index df638023c1..ca151c323c 100644
--- a/OsmAnd/src/net/osmand/plus/activities/PluginsActivity.java
+++ b/OsmAnd/src/net/osmand/plus/activities/PluginsActivity.java
@@ -130,7 +130,6 @@ public class PluginsActivity extends OsmandListActivity implements DownloadIndex
 	}
 
 	protected class PluginsListAdapter extends ArrayAdapter<Object> {
-
 		PluginsListAdapter() {
 			super(PluginsActivity.this, R.layout.plugins_list_item, new ArrayList<>());
 			addAll(getMyApplication().getAidlApi().getConnectedApps());
@@ -193,7 +192,8 @@ public class PluginsActivity extends OsmandListActivity implements DownloadIndex
 				AndroidUtils.removeLinkUnderline(pluginDescription);
 
 				OsmandApplication app = getMyApplication();
-				int color = AndroidUtils.getColorFromAttr(app, R.attr.list_background_color);
+				int color = ContextCompat.getColor(PluginsActivity.this,
+						light ? R.color.list_background_color_light : R.color.list_background_color_dark);
 				pluginLogo.setImageDrawable(UiUtilities.tintDrawable(plugin.getLogoResource(), color));
 				pluginLogo.setOnClickListener(new View.OnClickListener() {
 					@Override
diff --git a/OsmAnd/src/net/osmand/plus/mapcontextmenu/editors/PointEditorFragmentNew.java b/OsmAnd/src/net/osmand/plus/mapcontextmenu/editors/PointEditorFragmentNew.java
index 70697426ed..2c0d60e0d2 100644
--- a/OsmAnd/src/net/osmand/plus/mapcontextmenu/editors/PointEditorFragmentNew.java
+++ b/OsmAnd/src/net/osmand/plus/mapcontextmenu/editors/PointEditorFragmentNew.java
@@ -99,7 +99,7 @@ public abstract class PointEditorFragmentNew extends BaseOsmAndFragment {
 
 		app = requireMyApplication();
 		nightMode = app.getDaynightHelper().isNightModeForMapControls();
-		view = UiUtilities.getMaterialInflater(getContext(), nightMode)
+		view = UiUtilities.getInflater(getContext(), nightMode)
 				.inflate(R.layout.point_editor_fragment_new, container, false);
 		AndroidUtils.addStatusBarPadding21v(getActivity(), view);
 
diff --git a/OsmAnd/src/net/osmand/plus/mapsource/EditMapSourceDialogFragment.java b/OsmAnd/src/net/osmand/plus/mapsource/EditMapSourceDialogFragment.java
index 0a1c957c4f..0b710f9f25 100644
--- a/OsmAnd/src/net/osmand/plus/mapsource/EditMapSourceDialogFragment.java
+++ b/OsmAnd/src/net/osmand/plus/mapsource/EditMapSourceDialogFragment.java
@@ -142,7 +142,8 @@ public class EditMapSourceDialogFragment extends BaseOsmAndDialogFragment
 			sqliteDB = savedInstanceState.getBoolean(SQLITE_DB_KEY);
 			fromTemplate = savedInstanceState.getBoolean(FROM_TEMPLATE_KEY);
 		}
-		View root = UiUtilities.getMaterialInflater(requireContext(), nightMode).inflate(R.layout.fragment_edit_map_source, container, false);
+		View root = UiUtilities.getInflater(requireContext(), nightMode)
+				.inflate(R.layout.fragment_edit_map_source, container, false);
 		Toolbar toolbar = root.findViewById(R.id.toolbar);
 		toolbar.setBackgroundColor(ContextCompat.getColor(app, nightMode ? R.color.app_bar_color_dark : R.color.app_bar_color_light));
 		toolbar.setTitleTextColor(ContextCompat.getColor(app, nightMode ? R.color.active_buttons_and_links_text_dark : R.color.active_buttons_and_links_text_light));
@@ -491,7 +492,7 @@ public class EditMapSourceDialogFragment extends BaseOsmAndDialogFragment
 	}
 
 	private void addConfigurationItems(ConfigurationItem... items) {
-		LayoutInflater inflater = UiUtilities.getMaterialInflater(app, nightMode);
+		LayoutInflater inflater = UiUtilities.getInflater(app, nightMode);
 		for (ConfigurationItem item : items) {
 			View view = inflater.inflate(R.layout.list_item_ui_customization, null);
 			((ImageView) view.findViewById(R.id.icon)).setImageDrawable(app.getUIUtilities().getIcon(item.iconRes, nightMode));
diff --git a/OsmAnd/src/net/osmand/plus/mapsource/ExpireTimeBottomSheet.java b/OsmAnd/src/net/osmand/plus/mapsource/ExpireTimeBottomSheet.java
index a0eebe806e..0273dee05b 100644
--- a/OsmAnd/src/net/osmand/plus/mapsource/ExpireTimeBottomSheet.java
+++ b/OsmAnd/src/net/osmand/plus/mapsource/ExpireTimeBottomSheet.java
@@ -51,7 +51,7 @@ public class ExpireTimeBottomSheet extends MenuBottomSheetDialogFragment {
 		if (savedInstanceState != null) {
 			expireValue = savedInstanceState.getInt(EXPIRE_VALUE_KEY, EXPIRE_TIME_NEVER);
 		}
-		LayoutInflater inflater = UiUtilities.getMaterialInflater(getContext(), nightMode);
+		LayoutInflater inflater = UiUtilities.getInflater(getContext(), nightMode);
 		TitleItem titleItem = new TitleItem(getString(R.string.expire_time));
 		items.add(titleItem);
 		final View inputValueLayout = inflater.inflate(R.layout.edit_text_with_descr, null);
diff --git a/OsmAnd/src/net/osmand/plus/mapsource/InputZoomLevelsBottomSheet.java b/OsmAnd/src/net/osmand/plus/mapsource/InputZoomLevelsBottomSheet.java
index 7f453329f2..fcf881c0eb 100644
--- a/OsmAnd/src/net/osmand/plus/mapsource/InputZoomLevelsBottomSheet.java
+++ b/OsmAnd/src/net/osmand/plus/mapsource/InputZoomLevelsBottomSheet.java
@@ -6,7 +6,6 @@ import android.content.DialogInterface;
 import android.os.Bundle;
 import android.text.SpannableString;
 import android.text.Spanned;
-import android.text.style.StyleSpan;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.widget.TextView;
@@ -81,7 +80,7 @@ public class InputZoomLevelsBottomSheet extends MenuBottomSheetDialogFragment {
 			sliderDescrRes = savedInstanceState.getInt(SLIDER_DESCR_RES_KEY);
 			newMapSource = savedInstanceState.getBoolean(NEW_MAP_SOURCE);
 		}
-		LayoutInflater inflater = UiUtilities.getMaterialInflater(app, nightMode);
+		LayoutInflater inflater = UiUtilities.getInflater(app, nightMode);
 		TitleItem titleItem = new TitleItem(getString(R.string.shared_string_zoom_levels));
 		items.add(titleItem);
 		final View sliderView = inflater.inflate(R.layout.zoom_levels_with_descr, null);
diff --git a/OsmAnd/src/net/osmand/plus/osmedit/AdvancedEditPoiFragment.java b/OsmAnd/src/net/osmand/plus/osmedit/AdvancedEditPoiFragment.java
index 3aba617bda..8a963fd248 100644
--- a/OsmAnd/src/net/osmand/plus/osmedit/AdvancedEditPoiFragment.java
+++ b/OsmAnd/src/net/osmand/plus/osmedit/AdvancedEditPoiFragment.java
@@ -7,7 +7,6 @@ import android.text.Editable;
 import android.text.InputFilter;
 import android.text.TextWatcher;
 import android.view.ContextThemeWrapper;
-import android.view.Gravity;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.View.OnFocusChangeListener;
@@ -22,7 +21,8 @@ import android.widget.TextView;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
-import net.osmand.AndroidUtils;
+import com.google.android.material.textfield.MaterialAutoCompleteTextView;
+
 import net.osmand.PlatformUtil;
 import net.osmand.osm.AbstractPoiType;
 import net.osmand.osm.MapPoiTypes;
@@ -205,9 +205,7 @@ public class AdvancedEditPoiFragment extends BaseOsmAndFragment
 		public void addTagView(String tg, String vl) {
 			View convertView = LayoutInflater.from(linearLayout.getContext())
 					.inflate(R.layout.poi_tag_list_item, null, false);
-			final AutoCompleteTextView tagEditText =
-					(AutoCompleteTextView) convertView.findViewById(R.id.tagEditText);
-			AndroidUtils.setTextHorizontalGravity(tagEditText, Gravity.START);
+			final MaterialAutoCompleteTextView tagEditText = convertView.findViewById(R.id.tagEditText);
 			ImageButton deleteItemImageButton =
 					(ImageButton) convertView.findViewById(R.id.deleteItemImageButton);
 			deleteItemImageButton.setImageDrawable(deleteDrawable);
@@ -219,17 +217,15 @@ public class AdvancedEditPoiFragment extends BaseOsmAndFragment
 					editPoiData.removeTag(tagEditText.getText().toString());
 				}
 			});
-			final AutoCompleteTextView valueEditText =
-					(AutoCompleteTextView) convertView.findViewById(R.id.valueEditText);
-			AndroidUtils.setTextHorizontalGravity(valueEditText, Gravity.START);
-			valueEditText.setFilters(new InputFilter[] {
-				new InputFilter.LengthFilter(AMENITY_TEXT_LENGTH)
+			final MaterialAutoCompleteTextView valueEditText = convertView.findViewById(R.id.valueEditText);
+			valueEditText.setFilters(new InputFilter[]{
+					new InputFilter.LengthFilter(AMENITY_TEXT_LENGTH)
 			});
 			tagEditText.setText(tg);
 			tagEditText.setAdapter(tagAdapter);
 			tagEditText.setThreshold(1);
 			tagEditText.setOnFocusChangeListener(new OnFocusChangeListener() {
-			    @Override
+				@Override
 				public void onFocusChange(View v, boolean hasFocus) {
 					if (!hasFocus) {
 						if (!editPoiData.isInEdit()) {
diff --git a/OsmAnd/src/net/osmand/plus/settings/bottomsheets/VehicleParametersBottomSheet.java b/OsmAnd/src/net/osmand/plus/settings/bottomsheets/VehicleParametersBottomSheet.java
index c57d1be8c1..ada5b13921 100644
--- a/OsmAnd/src/net/osmand/plus/settings/bottomsheets/VehicleParametersBottomSheet.java
+++ b/OsmAnd/src/net/osmand/plus/settings/bottomsheets/VehicleParametersBottomSheet.java
@@ -64,7 +64,7 @@ public class VehicleParametersBottomSheet extends BasePreferenceBottomSheet {
 	@SuppressLint("ClickableViewAccessibility")
 	private BaseBottomSheetItem createBottomSheetItem(OsmandApplication app) {
 		final SizePreference preference = (SizePreference) getPreference();
-		View mainView = UiUtilities.getMaterialInflater(getContext(), nightMode)
+		View mainView = UiUtilities.getInflater(getContext(), nightMode)
 				.inflate(R.layout.bottom_sheet_item_edit_with_recyclerview, null);
 		TextView title = mainView.findViewById(R.id.title);
 		title.setText(preference.getTitle().toString());

From 04d8392cab12ac1a7548d64d2d0e6e4a68d4be49 Mon Sep 17 00:00:00 2001
From: Dima-1 <softmail32@gmail.com>
Date: Tue, 7 Jul 2020 17:42:18 +0300
Subject: [PATCH 02/81] Fix getColorFromAttr

---
 .../plus/activities/PluginsActivity.java       |  3 +--
 .../plus/liveupdates/ReportsFragment.java      | 18 +++---------------
 .../plus/myplaces/TrackPointFragment.java      |  2 +-
 .../fragments/BaseSettingsFragment.java        |  2 +-
 4 files changed, 6 insertions(+), 19 deletions(-)

diff --git a/OsmAnd/src/net/osmand/plus/activities/PluginsActivity.java b/OsmAnd/src/net/osmand/plus/activities/PluginsActivity.java
index ca151c323c..a0e731c7bc 100644
--- a/OsmAnd/src/net/osmand/plus/activities/PluginsActivity.java
+++ b/OsmAnd/src/net/osmand/plus/activities/PluginsActivity.java
@@ -192,8 +192,7 @@ public class PluginsActivity extends OsmandListActivity implements DownloadIndex
 				AndroidUtils.removeLinkUnderline(pluginDescription);
 
 				OsmandApplication app = getMyApplication();
-				int color = ContextCompat.getColor(PluginsActivity.this,
-						light ? R.color.list_background_color_light : R.color.list_background_color_dark);
+				int color = AndroidUtils.getColorFromAttr(PluginsActivity.this, R.attr.list_background_color);
 				pluginLogo.setImageDrawable(UiUtilities.tintDrawable(plugin.getLogoResource(), color));
 				pluginLogo.setOnClickListener(new View.OnClickListener() {
 					@Override
diff --git a/OsmAnd/src/net/osmand/plus/liveupdates/ReportsFragment.java b/OsmAnd/src/net/osmand/plus/liveupdates/ReportsFragment.java
index 6bec905698..e28c828fb6 100644
--- a/OsmAnd/src/net/osmand/plus/liveupdates/ReportsFragment.java
+++ b/OsmAnd/src/net/osmand/plus/liveupdates/ReportsFragment.java
@@ -3,11 +3,9 @@ package net.osmand.plus.liveupdates;
 import android.annotation.SuppressLint;
 import android.content.Context;
 import android.content.Intent;
-import android.content.res.Resources;
 import android.net.Uri;
 import android.os.AsyncTask;
 import android.os.Bundle;
-import android.util.TypedValue;
 import android.view.LayoutInflater;
 import android.view.MotionEvent;
 import android.view.View;
@@ -21,8 +19,6 @@ import android.widget.ProgressBar;
 import android.widget.Spinner;
 import android.widget.TextView;
 
-import androidx.annotation.AttrRes;
-import androidx.annotation.ColorInt;
 import androidx.annotation.NonNull;
 
 import com.google.gson.Gson;
@@ -205,9 +201,9 @@ public class ReportsFragment extends BaseOsmAndFragment implements CountrySelect
 		};
 		monthReportsSpinner.setOnItemSelectedListener(onItemSelectedListener);
 
-		inactiveColor = getColorFromAttr(R.attr.plugin_details_install_header_bg);
-		textColorPrimary = getColorFromAttr(android.R.attr.textColorPrimary);
-		textColorSecondary = getColorFromAttr(android.R.attr.textColorSecondary);
+		inactiveColor = AndroidUtils.getColorFromAttr(container.getContext(), R.attr.plugin_details_install_header_bg);
+		textColorPrimary = AndroidUtils.getColorFromAttr(container.getContext(), android.R.attr.textColorPrimary);
+		textColorSecondary = AndroidUtils.getColorFromAttr(container.getContext(), android.R.attr.textColorSecondary);
 
 		return view;
 	}
@@ -427,12 +423,4 @@ public class ReportsFragment extends BaseOsmAndFragment implements CountrySelect
 		donationsTotalTextView.setTextColor(textColorPrimary);
 		recipientsTextView.setTextColor(textColorPrimary);
 	}
-
-	@ColorInt
-	private int getColorFromAttr(@AttrRes int colorAttribute) {
-		TypedValue typedValue = new TypedValue();
-		Resources.Theme theme = getActivity().getTheme();
-		theme.resolveAttribute(colorAttribute, typedValue, true);
-		return typedValue.data;
-	}
 }
diff --git a/OsmAnd/src/net/osmand/plus/myplaces/TrackPointFragment.java b/OsmAnd/src/net/osmand/plus/myplaces/TrackPointFragment.java
index d865a4a04b..5d90e7acad 100644
--- a/OsmAnd/src/net/osmand/plus/myplaces/TrackPointFragment.java
+++ b/OsmAnd/src/net/osmand/plus/myplaces/TrackPointFragment.java
@@ -973,7 +973,7 @@ public class TrackPointFragment extends OsmandExpandableListFragment implements
 					categoryName = getString(R.string.shared_string_waypoints);
 				}
 				SpannableStringBuilder text = new SpannableStringBuilder(categoryName).append(" (").append(String.valueOf(getChildrenCount(groupPosition))).append(")");
-				text.setSpan(new ForegroundColorSpan(AndroidUtils.getColorFromAttr(app, R.attr.wikivoyage_primary_text_color)),
+				text.setSpan(new ForegroundColorSpan(AndroidUtils.getColorFromAttr(mainView.getContext(), R.attr.wikivoyage_primary_text_color)),
 						0, categoryName.length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
 				text.setSpan(new ForegroundColorSpan(ContextCompat.getColor(app, R.color.wikivoyage_secondary_text)),
 						categoryName.length() + 1, text.length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
diff --git a/OsmAnd/src/net/osmand/plus/settings/fragments/BaseSettingsFragment.java b/OsmAnd/src/net/osmand/plus/settings/fragments/BaseSettingsFragment.java
index f0da066fbe..e416d2c32e 100644
--- a/OsmAnd/src/net/osmand/plus/settings/fragments/BaseSettingsFragment.java
+++ b/OsmAnd/src/net/osmand/plus/settings/fragments/BaseSettingsFragment.java
@@ -933,7 +933,7 @@ public abstract class BaseSettingsFragment extends PreferenceFragmentCompat impl
 	public void setupPrefRoundedBg(PreferenceViewHolder holder) {
 		View selectableView = holder.itemView.findViewById(R.id.selectable_list_item);
 		if (selectableView != null) {
-			int color = AndroidUtils.getColorFromAttr(app, R.attr.activity_background_color);
+			int color = AndroidUtils.getColorFromAttr(holder.itemView.getContext(), R.attr.activity_background_color);
 			int selectedColor = UiUtilities.getColorWithAlpha(getActiveProfileColor(), 0.3f);
 
 			Drawable bgDrawable = getPaintedIcon(R.drawable.rectangle_rounded, color);

From 86e21603d24d53820aff4804d1c38da9e17fabcc Mon Sep 17 00:00:00 2001
From: Dima-1 <softmail32@gmail.com>
Date: Wed, 5 Aug 2020 12:41:41 +0300
Subject: [PATCH 03/81] Dialog exit without saving

---
 OsmAnd/res/layout/bottom_sheet_button.xml     | 38 ++++++++
 OsmAnd/res/values/sizes.xml                   |  1 +
 OsmAnd/res/values/strings.xml                 |  1 +
 .../bottomsheetmenu/BaseBottomSheetItem.java  |  2 +-
 .../BottomSheetItemButton.java                | 76 +++++++++++++++
 .../ExitBottomSheetDialogFragment.java        | 90 ++++++++++++++++++
 .../MeasurementToolFragment.java              | 95 ++++++-------------
 7 files changed, 237 insertions(+), 66 deletions(-)
 create mode 100644 OsmAnd/res/layout/bottom_sheet_button.xml
 create mode 100644 OsmAnd/src/net/osmand/plus/base/bottomsheetmenu/BottomSheetItemButton.java
 create mode 100644 OsmAnd/src/net/osmand/plus/measurementtool/ExitBottomSheetDialogFragment.java

diff --git a/OsmAnd/res/layout/bottom_sheet_button.xml b/OsmAnd/res/layout/bottom_sheet_button.xml
new file mode 100644
index 0000000000..04affc5879
--- /dev/null
+++ b/OsmAnd/res/layout/bottom_sheet_button.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:tools="http://schemas.android.com/tools"
+	xmlns:osmand="http://schemas.android.com/apk/res-auto"
+	android:id="@+id/button"
+	android:orientation="vertical"
+	android:layout_width="match_parent"
+	android:layout_height="@dimen/dialog_button_height"
+	android:layout_marginStart="@dimen/content_padding"
+	android:layout_marginEnd="@dimen/content_padding"
+	android:layout_marginLeft="@dimen/content_padding"
+	android:layout_marginRight="@dimen/content_padding">
+
+	<LinearLayout
+		android:id="@+id/button_container"
+		android:layout_width="match_parent"
+		android:layout_height="match_parent"
+
+		android:duplicateParentState="true"
+		tools:ignore="UselessParent">
+
+		<net.osmand.plus.widgets.TextViewEx
+			android:id="@+id/button_text"
+			android:layout_width="match_parent"
+			android:layout_height="match_parent"
+			android:paddingLeft="@dimen/content_padding_small"
+			android:paddingRight="@dimen/content_padding_small"
+			android:gravity="center"
+			android:textSize="@dimen/default_desc_text_size"
+			osmand:typeface="@string/font_roboto_medium"
+			android:duplicateParentState="true"
+			tools:text="Button"
+			android:paddingStart="@dimen/content_padding_small"
+			android:paddingEnd="@dimen/content_padding_small" />
+
+	</LinearLayout>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/OsmAnd/res/values/sizes.xml b/OsmAnd/res/values/sizes.xml
index a9ab89109c..091f8fe562 100644
--- a/OsmAnd/res/values/sizes.xml
+++ b/OsmAnd/res/values/sizes.xml
@@ -242,6 +242,7 @@
 
 	<dimen name="measurement_tool_select_radius">20dp</dimen>
 	<dimen name="bottom_sheet_content_margin">16dp</dimen>
+	<dimen name="bottom_sheet_exit_button_margin">18dp</dimen>
 	<dimen name="bottom_sheet_content_margin_small">8dp</dimen>
 	<dimen name="content_padding">16dp</dimen>
 	<dimen name="content_padding_small">12dp</dimen>
diff --git a/OsmAnd/res/values/strings.xml b/OsmAnd/res/values/strings.xml
index a31be91aa8..428a0a4562 100644
--- a/OsmAnd/res/values/strings.xml
+++ b/OsmAnd/res/values/strings.xml
@@ -11,6 +11,7 @@
 	Thx - Hardy
 
 -->
+    <string name="plan_route_exit_dialog_descr">Are you sure you want to close Plan route without saving? You will lost all changes.</string>
     <string name="overwrite_track">Overwrite track</string>
     <string name="shared_string_done">Done</string>
     <string name="plan_route_select_track_file_for_open">Select a track file for open.</string>
diff --git a/OsmAnd/src/net/osmand/plus/base/bottomsheetmenu/BaseBottomSheetItem.java b/OsmAnd/src/net/osmand/plus/base/bottomsheetmenu/BaseBottomSheetItem.java
index d57467a7e9..1914756d21 100644
--- a/OsmAnd/src/net/osmand/plus/base/bottomsheetmenu/BaseBottomSheetItem.java
+++ b/OsmAnd/src/net/osmand/plus/base/bottomsheetmenu/BaseBottomSheetItem.java
@@ -21,7 +21,7 @@ public class BaseBottomSheetItem {
 	protected int layoutId = INVALID_ID;
 	private Object tag;
 	private boolean disabled;
-	private View.OnClickListener onClickListener;
+	protected View.OnClickListener onClickListener;
 	protected int position = INVALID_POSITION;
 
 	public View getView() {
diff --git a/OsmAnd/src/net/osmand/plus/base/bottomsheetmenu/BottomSheetItemButton.java b/OsmAnd/src/net/osmand/plus/base/bottomsheetmenu/BottomSheetItemButton.java
new file mode 100644
index 0000000000..286ca832dc
--- /dev/null
+++ b/OsmAnd/src/net/osmand/plus/base/bottomsheetmenu/BottomSheetItemButton.java
@@ -0,0 +1,76 @@
+package net.osmand.plus.base.bottomsheetmenu;
+
+import android.content.Context;
+import android.graphics.drawable.Drawable;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.LinearLayout;
+
+import androidx.annotation.ColorRes;
+import androidx.annotation.LayoutRes;
+
+import net.osmand.plus.R;
+
+import static net.osmand.plus.UiUtilities.*;
+import static net.osmand.plus.UiUtilities.DialogButtonType.PRIMARY;
+
+public class BottomSheetItemButton extends SimpleBottomSheetItem {
+
+	protected CharSequence description;
+
+	DialogButtonType buttonType;
+
+	LinearLayout buttonView;
+
+	public BottomSheetItemButton(View customView,
+	                             @LayoutRes int layoutId,
+	                             Object tag,
+	                             boolean disabled,
+	                             View.OnClickListener onClickListener,
+	                             int position,
+	                             Drawable icon,
+	                             Drawable background,
+	                             CharSequence title,
+	                             @ColorRes int titleColorId,
+	                             boolean iconHidden,
+	                             DialogButtonType buttonType) {
+		super(customView, layoutId, tag, disabled, onClickListener, position, icon, background, title,
+				titleColorId, iconHidden);
+		this.buttonType = buttonType;
+	}
+
+	@Override
+	public void inflate(Context context, ViewGroup container, boolean nightMode) {
+		super.inflate(context, container, nightMode);
+		buttonView = view.findViewById(R.id.button);
+		if (buttonView != null) {
+			setupDialogButton(nightMode, buttonView, buttonType, title);
+			buttonView.setOnClickListener(onClickListener);
+		}
+	}
+
+	public static class Builder extends SimpleBottomSheetItem.Builder {
+
+		protected DialogButtonType buttonType = PRIMARY;
+
+		public Builder setButtonType(DialogButtonType buttonType) {
+			this.buttonType = buttonType;
+			return this;
+		}
+
+		public BottomSheetItemButton create() {
+			return new BottomSheetItemButton(customView,
+					layoutId,
+					tag,
+					disabled,
+					onClickListener,
+					position,
+					icon,
+					background,
+					title,
+					titleColorId,
+					iconHidden,
+					buttonType);
+		}
+	}
+}
diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/ExitBottomSheetDialogFragment.java b/OsmAnd/src/net/osmand/plus/measurementtool/ExitBottomSheetDialogFragment.java
new file mode 100644
index 0000000000..d32bc0ca0b
--- /dev/null
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/ExitBottomSheetDialogFragment.java
@@ -0,0 +1,90 @@
+package net.osmand.plus.measurementtool;
+
+import android.os.Bundle;
+import android.view.View;
+
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentManager;
+
+import net.osmand.plus.R;
+import net.osmand.plus.UiUtilities;
+import net.osmand.plus.base.MenuBottomSheetDialogFragment;
+import net.osmand.plus.base.bottomsheetmenu.BottomSheetItemButton;
+import net.osmand.plus.base.bottomsheetmenu.simpleitems.DividerSpaceItem;
+import net.osmand.plus.base.bottomsheetmenu.simpleitems.ShortDescriptionItem;
+import net.osmand.plus.base.bottomsheetmenu.simpleitems.TitleItem;
+
+public class ExitBottomSheetDialogFragment extends MenuBottomSheetDialogFragment {
+
+	public static final String TAG = ExitBottomSheetDialogFragment.class.getSimpleName();
+
+	@Override
+	public void createMenuItems(Bundle savedInstanceState) {
+
+		items.add(new TitleItem(getString(R.string.exit_without_saving)));
+
+		items.add(new ShortDescriptionItem.Builder()
+				.setDescription(getString(R.string.plan_route_exit_dialog_descr))
+				.setDescriptionColorId(nightMode ? R.color.text_color_primary_dark : R.color.text_color_primary_light)
+				.setLayoutId(R.layout.bottom_sheet_item_description_long)
+				.create());
+
+		items.add(new DividerSpaceItem(getContext(),
+				getResources().getDimensionPixelSize(R.dimen.bottom_sheet_exit_button_margin)));
+
+		items.add(new BottomSheetItemButton.Builder()
+				.setButtonType(UiUtilities.DialogButtonType.SECONDARY)
+				.setTitle(getString(R.string.shared_string_exit))
+				.setLayoutId(R.layout.bottom_sheet_button)
+				.setOnClickListener(new View.OnClickListener() {
+					@Override
+					public void onClick(View v) {
+						Fragment target = getTargetFragment();
+						if (target instanceof ExitFragmentListener) {
+							((ExitFragmentListener) target).exitOnClick();
+						}
+						dismiss();
+					}
+				})
+				.create());
+
+		items.add(new DividerSpaceItem(getContext(),
+				getResources().getDimensionPixelSize(R.dimen.bottom_sheet_icon_margin)));
+
+		items.add(new BottomSheetItemButton.Builder()
+				.setTitle(getString(R.string.shared_string_save))
+				.setLayoutId(R.layout.bottom_sheet_button)
+				.setOnClickListener(new View.OnClickListener() {
+					@Override
+					public void onClick(View v) {
+						Fragment target = getTargetFragment();
+						if (target instanceof ExitFragmentListener) {
+							((ExitFragmentListener) target).saveOnClick();
+						}
+						dismiss();
+					}
+				})
+				.create());
+	}
+
+	@Override
+	protected int getDismissButtonTextId() {
+		return R.string.shared_string_close;
+	}
+
+	public static void showInstance(FragmentManager fragmentManager, Fragment target) {
+		if (!fragmentManager.isStateSaved()) {
+			ExitBottomSheetDialogFragment fragment = new ExitBottomSheetDialogFragment();
+			fragment.setUsedOnMap(true);
+			fragment.setTargetFragment(target, 0);
+			fragment.show(fragmentManager, TAG);
+		}
+	}
+
+	interface ExitFragmentListener {
+
+		void exitOnClick();
+
+		void saveOnClick();
+	}
+}
diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
index bc28b3995e..71fcfb71a6 100644
--- a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
@@ -78,7 +78,6 @@ import net.osmand.plus.settings.backend.ApplicationMode;
 import net.osmand.plus.settings.backend.OsmandSettings;
 import net.osmand.plus.views.MapControlsLayer;
 import net.osmand.plus.views.controls.ReorderItemTouchHelperCallback;
-import net.osmand.plus.views.mapwidgets.MapInfoWidgetsFactory;
 import net.osmand.plus.views.mapwidgets.MapInfoWidgetsFactory.TopToolbarController;
 import net.osmand.plus.views.mapwidgets.MapInfoWidgetsFactory.TopToolbarControllerType;
 import net.osmand.plus.views.mapwidgets.MapInfoWidgetsFactory.TopToolbarView;
@@ -96,9 +95,10 @@ import static net.osmand.plus.measurementtool.SelectFileBottomSheet.SelectFileLi
 import static net.osmand.plus.measurementtool.StartPlanRouteBottomSheet.StartPlanRouteListener;
 
 
-public class MeasurementToolFragment extends BaseOsmAndFragment {
+public class MeasurementToolFragment extends BaseOsmAndFragment
+		implements ExitBottomSheetDialogFragment.ExitFragmentListener {
 
-	public static final String TAG = "MeasurementToolFragment";
+	public static final String TAG = MeasurementToolFragment.class.getSimpleName();
 
 	private RecyclerView pointsRv;
 	private String previousToolBarTitle = "";
@@ -123,6 +123,7 @@ public class MeasurementToolFragment extends BaseOsmAndFragment {
 	private boolean progressBarVisible;
 	private boolean pointsListOpened;
 	private boolean planRouteMode = false;
+	private boolean firstShow = true;
 	private Boolean saved;
 	private boolean portrait;
 	private boolean nightMode;
@@ -154,6 +155,9 @@ public class MeasurementToolFragment extends BaseOsmAndFragment {
 	@Override
 	public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
 		final MapActivity mapActivity = (MapActivity) getActivity();
+		if (mapActivity == null) {
+			return null;
+		}
 		final MeasurementToolLayer measurementLayer = mapActivity.getMapLayers().getMeasurementToolLayer();
 
 		editingCtx.setApplication(mapActivity.getMyApplication());
@@ -434,13 +438,7 @@ public class MeasurementToolFragment extends BaseOsmAndFragment {
 				if (editingCtx.getPointsCount() > 0) {
 					if (newGpxData != null && newGpxData.getActionType() == ActionType.EDIT_SEGMENT
 							&& editingCtx.isInSnapToRoadMode()) {
-						if (mapActivity != null) {
-							if (editingCtx.getPointsCount() > 0) {
 								openSaveAsNewTrackMenu(mapActivity);
-							} else {
-								Toast.makeText(mapActivity, getString(R.string.none_point_error), Toast.LENGTH_SHORT).show();
-							}
-						}
 					} else {
 						if (newGpxData == null) {
 							final File dir = mapActivity.getMyApplication().getAppPath(IndexConstants.GPX_INDEX_DIR);
@@ -480,9 +478,10 @@ public class MeasurementToolFragment extends BaseOsmAndFragment {
 
 		initMeasurementMode(newGpxData);
 
-		if (planRouteMode) {
+		if (planRouteMode && firstShow) {
 			StartPlanRouteBottomSheet.showInstance(mapActivity.getSupportFragmentManager(),
 					createStartPlanRouteListener());
+			firstShow = false;
 		}
 		return view;
 	}
@@ -582,6 +581,16 @@ public class MeasurementToolFragment extends BaseOsmAndFragment {
 		return getIcon(id, nightMode ? R.color.osmand_orange : R.color.color_myloc_distance);
 	}
 
+	@Override
+	public void exitOnClick() {
+		dismiss(getMapActivity());
+	}
+
+	@Override
+	public void saveOnClick() {
+		openSaveAsNewTrackMenu(getMapActivity());
+	}
+
 	private void showProgressBar() {
 		ProgressBar progressBar = (ProgressBar) mainView.findViewById(R.id.snap_to_road_progress_bar);
 		progressBar.setVisibility(View.VISIBLE);
@@ -647,13 +656,7 @@ public class MeasurementToolFragment extends BaseOsmAndFragment {
 
 			@Override
 			public void saveAsNewTrackOnClick() {
-				if (mapActivity != null && measurementLayer != null) {
-					if (editingCtx.getPointsCount() > 0) {
 						openSaveAsNewTrackMenu(mapActivity);
-					} else {
-						Toast.makeText(mapActivity, getString(R.string.none_point_error), Toast.LENGTH_SHORT).show();
-					}
-				}
 			}
 
 			@Override
@@ -1006,10 +1009,16 @@ public class MeasurementToolFragment extends BaseOsmAndFragment {
 	}
 
 	private void openSaveAsNewTrackMenu(MapActivity mapActivity) {
-		SaveAsNewTrackBottomSheetDialogFragment fragment = new SaveAsNewTrackBottomSheetDialogFragment();
-		fragment.setUsedOnMap(true);
-		fragment.setListener(createSaveAsNewTrackFragmentListener());
-		fragment.show(mapActivity.getSupportFragmentManager(), SaveAsNewTrackBottomSheetDialogFragment.TAG);
+		if (mapActivity != null) {
+			if (editingCtx.getPointsCount() > 0) {
+				SaveAsNewTrackBottomSheetDialogFragment fragment = new SaveAsNewTrackBottomSheetDialogFragment();
+				fragment.setUsedOnMap(true);
+				fragment.setListener(createSaveAsNewTrackFragmentListener());
+				fragment.show(mapActivity.getSupportFragmentManager(), SaveAsNewTrackBottomSheetDialogFragment.TAG);
+			} else {
+				Toast.makeText(mapActivity, getString(R.string.none_point_error), Toast.LENGTH_SHORT).show();
+			}
+		}
 	}
 
 	private AlertDialog showAddToTrackDialog(final MapActivity mapActivity) {
@@ -1718,51 +1727,7 @@ public class MeasurementToolFragment extends BaseOsmAndFragment {
 				dismiss(mapActivity);
 				return;
 			}
-			AlertDialog.Builder builder = new AlertDialog.Builder(UiUtilities.getThemedContext(mapActivity, nightMode));
-			if (editingCtx.getNewGpxData() == null) {
-				final File dir = mapActivity.getMyApplication().getAppPath(IndexConstants.GPX_INDEX_DIR);
-				final View view = UiUtilities.getInflater(mapActivity, nightMode).inflate(R.layout.close_measurement_tool_dialog, null);
-				final SwitchCompat showOnMapToggle = (SwitchCompat) view.findViewById(R.id.toggle_show_on_map);
-
-				view.setOnClickListener(new View.OnClickListener() {
-					@Override
-					public void onClick(View v) {
-						showOnMapToggle.setChecked(!showOnMapToggle.isChecked());
-					}
-				});
-
-				builder.setView(view);
-				builder.setPositiveButton(R.string.shared_string_ok, new DialogInterface.OnClickListener() {
-					@Override
-					public void onClick(DialogInterface dialog, int which) {
-						if (showOnMapToggle.isChecked()) {
-							final String name = new SimpleDateFormat("yyyy-MM-dd_HH-mm_EEE", Locale.US).format(new Date());
-							String fileName = name + GPX_FILE_EXT;
-							File fout = new File(dir, fileName);
-							int ind = 1;
-							while (fout.exists()) {
-								fileName = name + "_" + (++ind) + GPX_FILE_EXT;
-								fout = new File(dir, fileName);
-							}
-							saveNewGpx(dir, fileName, true, SaveType.LINE, true);
-						} else {
-							dismiss(mapActivity);
-						}
-					}
-				});
-				UiUtilities.setupCompoundButton(showOnMapToggle, nightMode, UiUtilities.CompoundButtonType.GLOBAL);
-			} else {
-				builder.setPositiveButton(R.string.shared_string_ok, new DialogInterface.OnClickListener() {
-					@Override
-					public void onClick(DialogInterface dialogInterface, int i) {
-						dismiss(mapActivity);
-					}
-				});
-			}
-			builder.setTitle(getString(R.string.exit_without_saving))
-					.setMessage(getString(R.string.unsaved_changes_will_be_lost))
-					.setNegativeButton(R.string.shared_string_cancel, null);
-			builder.show();
+			ExitBottomSheetDialogFragment.showInstance(mapActivity.getSupportFragmentManager(), this);
 		}
 	}
 

From a9bb3d49a4e319d847b936364bf88c37ba27bed6 Mon Sep 17 00:00:00 2001
From: Dima-1 <softmail32@gmail.com>
Date: Thu, 6 Aug 2020 14:17:34 +0300
Subject: [PATCH 04/81] Fix first show

---
 .../plus/measurementtool/MeasurementToolFragment.java | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
index 71fcfb71a6..2638521845 100644
--- a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
@@ -94,7 +94,6 @@ import static net.osmand.IndexConstants.GPX_FILE_EXT;
 import static net.osmand.plus.measurementtool.SelectFileBottomSheet.SelectFileListener;
 import static net.osmand.plus.measurementtool.StartPlanRouteBottomSheet.StartPlanRouteListener;
 
-
 public class MeasurementToolFragment extends BaseOsmAndFragment
 		implements ExitBottomSheetDialogFragment.ExitFragmentListener {
 
@@ -123,7 +122,6 @@ public class MeasurementToolFragment extends BaseOsmAndFragment
 	private boolean progressBarVisible;
 	private boolean pointsListOpened;
 	private boolean planRouteMode = false;
-	private boolean firstShow = true;
 	private Boolean saved;
 	private boolean portrait;
 	private boolean nightMode;
@@ -153,7 +151,8 @@ public class MeasurementToolFragment extends BaseOsmAndFragment
 
 	@Nullable
 	@Override
-	public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
+	public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container,
+	                         @Nullable Bundle savedInstanceState) {
 		final MapActivity mapActivity = (MapActivity) getActivity();
 		if (mapActivity == null) {
 			return null;
@@ -219,7 +218,8 @@ public class MeasurementToolFragment extends BaseOsmAndFragment
 		downIcon = getContentIcon(R.drawable.ic_action_arrow_down);
 		pointsSt = getString(R.string.shared_string_gpx_points).toLowerCase();
 
-		View view = UiUtilities.getInflater(getContext(), nightMode).inflate(R.layout.fragment_measurement_tool, null);
+		View view = UiUtilities.getInflater(getContext(), nightMode).inflate(R.layout.fragment_measurement_tool,
+				container,false);
 
 		mainView = view.findViewById(R.id.main_view);
 		AndroidUtils.setBackground(mapActivity, mainView, nightMode, R.drawable.bg_bottom_menu_light, R.drawable.bg_bottom_menu_dark);
@@ -478,10 +478,9 @@ public class MeasurementToolFragment extends BaseOsmAndFragment
 
 		initMeasurementMode(newGpxData);
 
-		if (planRouteMode && firstShow) {
+		if (planRouteMode && savedInstanceState == null) {
 			StartPlanRouteBottomSheet.showInstance(mapActivity.getSupportFragmentManager(),
 					createStartPlanRouteListener());
-			firstShow = false;
 		}
 		return view;
 	}

From 83c99e01b7d3270f8ae02d5589b9cc42c8c454c3 Mon Sep 17 00:00:00 2001
From: Nazar-Kutz <vitamikuna@gmail.com>
Date: Fri, 7 Aug 2020 13:28:48 +0300
Subject: [PATCH 05/81] Material theme (2)

---
 OsmAnd/src/net/osmand/plus/UiUtilities.java       | 15 +++++++++++++++
 .../plus/download/ui/LocalIndexesFragment.java    |  3 ++-
 .../osmand/plus/liveupdates/OsmLiveActivity.java  | 11 ++++++++++-
 .../article/WikivoyageArticleDialogFragment.java  |  4 +++-
 4 files changed, 30 insertions(+), 3 deletions(-)

diff --git a/OsmAnd/src/net/osmand/plus/UiUtilities.java b/OsmAnd/src/net/osmand/plus/UiUtilities.java
index c8f4c04c29..e671509c2a 100644
--- a/OsmAnd/src/net/osmand/plus/UiUtilities.java
+++ b/OsmAnd/src/net/osmand/plus/UiUtilities.java
@@ -35,6 +35,7 @@ import androidx.appcompat.content.res.AppCompatResources;
 import androidx.appcompat.view.ContextThemeWrapper;
 import androidx.appcompat.widget.ListPopupWindow;
 import androidx.appcompat.widget.SwitchCompat;
+import androidx.appcompat.widget.Toolbar;
 import androidx.core.content.ContextCompat;
 import androidx.core.graphics.drawable.DrawableCompat;
 import androidx.core.view.ViewCompat;
@@ -510,6 +511,20 @@ public class UiUtilities {
 		compoundButton.setBackgroundColor(Color.TRANSPARENT);
 	}
 
+	public static void setupToolbarOverflowIcon(Toolbar toolbar, @DrawableRes int iconId, @ColorRes int colorId) {
+		Context ctx = toolbar.getContext();
+		if (ctx != null) {
+			return;
+		}
+		Drawable icon = ContextCompat.getDrawable(ctx, iconId);
+		toolbar.setOverflowIcon(icon);
+		if (icon != null) {
+			int color = ContextCompat.getColor(ctx, colorId);
+			DrawableCompat.setTint(icon.mutate(), color);
+			toolbar.setOverflowIcon(icon);
+		}
+	}
+
 	public static ViewGroup createSliderView(@NonNull Context ctx, boolean nightMode) {
 		return (ViewGroup) getInflater(ctx, nightMode).inflate(R.layout.slider, null, false);
 	}
diff --git a/OsmAnd/src/net/osmand/plus/download/ui/LocalIndexesFragment.java b/OsmAnd/src/net/osmand/plus/download/ui/LocalIndexesFragment.java
index 3edcfbcece..f920f2dec2 100644
--- a/OsmAnd/src/net/osmand/plus/download/ui/LocalIndexesFragment.java
+++ b/OsmAnd/src/net/osmand/plus/download/ui/LocalIndexesFragment.java
@@ -600,8 +600,9 @@ public class LocalIndexesFragment extends OsmandExpandableListFragment implement
 			ContextMenuItem contextMenuItem = optionsMenuAdapter.getItem(j);
 			if (j + 1 >= max && optionsMenuAdapter.length() > max) {
 				if (split == null) {
+					Drawable icOverflowMenu = getMyApplication().getUIUtilities().getThemedIcon(R.drawable.ic_overflow_menu_white);
 					split = menu.addSubMenu(0, 1, j + 1, R.string.shared_string_more_actions);
-					split.setIcon(R.drawable.ic_overflow_menu_white);
+					split.setIcon(icOverflowMenu);
 					split.getItem();
 					MenuItemCompat.setShowAsAction(split.getItem(), MenuItemCompat.SHOW_AS_ACTION_ALWAYS);
 				}
diff --git a/OsmAnd/src/net/osmand/plus/liveupdates/OsmLiveActivity.java b/OsmAnd/src/net/osmand/plus/liveupdates/OsmLiveActivity.java
index ce708fc3ab..d6e0406904 100644
--- a/OsmAnd/src/net/osmand/plus/liveupdates/OsmLiveActivity.java
+++ b/OsmAnd/src/net/osmand/plus/liveupdates/OsmLiveActivity.java
@@ -8,6 +8,7 @@ import android.view.MenuItem;
 import android.view.View;
 
 import androidx.appcompat.app.ActionBar;
+import androidx.core.content.ContextCompat;
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentManager;
 import androidx.fragment.app.FragmentPagerAdapter;
@@ -45,7 +46,8 @@ public class OsmLiveActivity extends AbstractDownloadActivity implements Downloa
 
 	@Override
 	protected void onCreate(Bundle savedInstanceState) {
-		getMyApplication().applyTheme(this);
+		OsmandApplication app = getMyApplication();
+		app.applyTheme(this);
 		super.onCreate(savedInstanceState);
 		setContentView(R.layout.activity_livie_updates);
 
@@ -69,6 +71,13 @@ public class OsmLiveActivity extends AbstractDownloadActivity implements Downloa
 			getLastUpdateDateTask = new GetLastUpdateDateTask(this);
 			getLastUpdateDateTask.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
 		}
+
+		boolean nightMode = !app.getSettings().isLightContent();
+		int normalTabColor = ContextCompat.getColor(app,
+				nightMode ? R.color.searchbar_tab_inactive_dark : R.color.searchbar_tab_inactive_light);
+		int selectedTabColor = ContextCompat.getColor(app,
+				nightMode ? R.color.text_color_tab_active_dark : R.color.text_color_tab_active_light);
+		tabLayout.setTabTextColors(normalTabColor, selectedTabColor);
 	}
 
 	@Override
diff --git a/OsmAnd/src/net/osmand/plus/wikivoyage/article/WikivoyageArticleDialogFragment.java b/OsmAnd/src/net/osmand/plus/wikivoyage/article/WikivoyageArticleDialogFragment.java
index 60cf378a9b..be9d3f2e58 100644
--- a/OsmAnd/src/net/osmand/plus/wikivoyage/article/WikivoyageArticleDialogFragment.java
+++ b/OsmAnd/src/net/osmand/plus/wikivoyage/article/WikivoyageArticleDialogFragment.java
@@ -30,6 +30,7 @@ import net.osmand.AndroidUtils;
 import net.osmand.IndexConstants;
 import net.osmand.plus.OsmandApplication;
 import net.osmand.plus.OsmandPlugin;
+import net.osmand.plus.UiUtilities;
 import net.osmand.plus.settings.backend.OsmandSettings;
 import net.osmand.plus.R;
 import net.osmand.plus.activities.TrackActivity;
@@ -442,8 +443,9 @@ public class WikivoyageArticleDialogFragment extends WikiArticleBaseDialogFragme
 	@Override
 	protected void setupToolbar(Toolbar toolbar) {
 		super.setupToolbar(toolbar);
-		toolbar.setOverflowIcon(getIcon(R.drawable.ic_overflow_menu_white, R.color.icon_color_default_light));
 
+		UiUtilities.setupToolbarOverflowIcon(
+				toolbar, R.drawable.ic_overflow_menu_white, R.color.icon_color_default_light);
 		Menu menu = toolbar.getMenu();
 		MenuItem.OnMenuItemClickListener itemClickListener = new MenuItem.OnMenuItemClickListener() {
 			@Override

From 6335db433e2b08244f0e63c216a26e8b659a0e59 Mon Sep 17 00:00:00 2001
From: kotlin <sasafaoifgasofguaiosgfuia@hgmail.com>
Date: Mon, 10 Aug 2020 17:33:13 +0300
Subject: [PATCH 06/81] Update map_context_menu_fragment.xml

---
 OsmAnd/res/layout/map_context_menu_fragment.xml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/OsmAnd/res/layout/map_context_menu_fragment.xml b/OsmAnd/res/layout/map_context_menu_fragment.xml
index 631a901de4..6128ba2754 100644
--- a/OsmAnd/res/layout/map_context_menu_fragment.xml
+++ b/OsmAnd/res/layout/map_context_menu_fragment.xml
@@ -467,6 +467,8 @@
                     android:text="@string/get_directions"
                     android:textAllCaps="true"
                     android:textSize="@dimen/default_desc_text_size"
+                    android:maxLines="1"
+                    android:autoSizeTextType="uniform"
                     osmand:typeface="@string/font_roboto_medium"
                     tools:textColor="?attr/contextMenuButtonColor" />
 

From 0afa59ee4e9b76f1c62101ad46915374ce5078a9 Mon Sep 17 00:00:00 2001
From: Vitaliy <chumva.forever@gmail.com>
Date: Mon, 10 Aug 2020 19:09:44 +0300
Subject: [PATCH 07/81] Fix compilation

---
 OsmAnd/res/layout/plan_route_threshold_slider.xml            | 1 -
 OsmAnd/res/layout/track_split_interval.xml                   | 1 -
 OsmAnd/res/layout/track_width_card.xml                       | 1 -
 OsmAnd/src/net/osmand/plus/track/CustomColorBottomSheet.java | 2 +-
 4 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/OsmAnd/res/layout/plan_route_threshold_slider.xml b/OsmAnd/res/layout/plan_route_threshold_slider.xml
index 7debd5d104..ec5bca3104 100644
--- a/OsmAnd/res/layout/plan_route_threshold_slider.xml
+++ b/OsmAnd/res/layout/plan_route_threshold_slider.xml
@@ -37,7 +37,6 @@
 
 	<com.google.android.material.slider.Slider
 		android:id="@+id/slider"
-		style="@style/Widget.Styled.Slider"
 		android:layout_marginLeft="@dimen/content_padding"
 		android:layout_marginRight="@dimen/content_padding"
 		android:layout_width="match_parent"
diff --git a/OsmAnd/res/layout/track_split_interval.xml b/OsmAnd/res/layout/track_split_interval.xml
index d81c89a0a8..ae823012cd 100644
--- a/OsmAnd/res/layout/track_split_interval.xml
+++ b/OsmAnd/res/layout/track_split_interval.xml
@@ -96,7 +96,6 @@
 
 		<com.google.android.material.slider.Slider
 			android:id="@+id/split_slider"
-			style="@style/Widget.Styled.Slider"
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
 			android:layout_marginLeft="@dimen/content_padding"
diff --git a/OsmAnd/res/layout/track_width_card.xml b/OsmAnd/res/layout/track_width_card.xml
index 8c99b94fd0..032afdd279 100644
--- a/OsmAnd/res/layout/track_width_card.xml
+++ b/OsmAnd/res/layout/track_width_card.xml
@@ -95,7 +95,6 @@
 
 			<com.google.android.material.slider.Slider
 				android:id="@+id/width_slider"
-				style="@style/Widget.Styled.Slider"
 				android:layout_width="0dp"
 				android:layout_height="wrap_content"
 				android:layout_marginLeft="@dimen/content_padding"
diff --git a/OsmAnd/src/net/osmand/plus/track/CustomColorBottomSheet.java b/OsmAnd/src/net/osmand/plus/track/CustomColorBottomSheet.java
index 5096978208..a5db15c147 100644
--- a/OsmAnd/src/net/osmand/plus/track/CustomColorBottomSheet.java
+++ b/OsmAnd/src/net/osmand/plus/track/CustomColorBottomSheet.java
@@ -79,7 +79,7 @@ public class CustomColorBottomSheet extends MenuBottomSheetDialogFragment implem
 	}
 
 	private View createPickerView() {
-		LayoutInflater themedInflater = UiUtilities.getMaterialInflater(getActivity(), nightMode);
+		LayoutInflater themedInflater = UiUtilities.getInflater(getActivity(), nightMode);
 		View colorView = themedInflater.inflate(R.layout.custom_color_picker, null);
 		colorPicker = colorView.findViewById(R.id.color_picker_view);
 		newColorPanel = colorView.findViewById(R.id.color_panel_new);

From 84ddaa0a483043f3decbb3d8f04762994d061da7 Mon Sep 17 00:00:00 2001
From: kotlin <sasafaoifgasofguaiosgfuia@hgmail.com>
Date: Tue, 11 Aug 2020 00:09:17 +0300
Subject: [PATCH 08/81] Fix #9610

---
 OsmAnd/res/layout/map_context_menu_fragment.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/OsmAnd/res/layout/map_context_menu_fragment.xml b/OsmAnd/res/layout/map_context_menu_fragment.xml
index 6128ba2754..fc9af7de29 100644
--- a/OsmAnd/res/layout/map_context_menu_fragment.xml
+++ b/OsmAnd/res/layout/map_context_menu_fragment.xml
@@ -457,7 +457,7 @@
                     android:id="@+id/context_menu_directions_button"
                     android:layout_width="0dp"
                     android:layout_height="match_parent"
-                    android:layout_weight="1"
+                    android:layout_weight="2"
                     android:background="?attr/selectableItemBackground"
                     android:gravity="end|center_vertical"
                     android:paddingLeft="@dimen/context_menu_padding_margin_default"

From 64216d19f02cbc23666cd322f2f7b27ef19f73b7 Mon Sep 17 00:00:00 2001
From: kotlin <sasafaoifgasofguaiosgfuia@hgmail.com>
Date: Tue, 11 Aug 2020 00:10:24 +0300
Subject: [PATCH 09/81] Fix #9610

---
 OsmAnd/res/layout/map_context_menu_fragment.xml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/OsmAnd/res/layout/map_context_menu_fragment.xml b/OsmAnd/res/layout/map_context_menu_fragment.xml
index fc9af7de29..d7200d47fb 100644
--- a/OsmAnd/res/layout/map_context_menu_fragment.xml
+++ b/OsmAnd/res/layout/map_context_menu_fragment.xml
@@ -467,8 +467,6 @@
                     android:text="@string/get_directions"
                     android:textAllCaps="true"
                     android:textSize="@dimen/default_desc_text_size"
-                    android:maxLines="1"
-                    android:autoSizeTextType="uniform"
                     osmand:typeface="@string/font_roboto_medium"
                     tools:textColor="?attr/contextMenuButtonColor" />
 

From 5865dbe54a1c2613e560b05f1d95a819e4585420 Mon Sep 17 00:00:00 2001
From: Nazar-Kutz <vitamikuna@gmail.com>
Date: Tue, 11 Aug 2020 13:18:28 +0300
Subject: [PATCH 10/81] small refactoring

---
 OsmAnd/src/net/osmand/plus/UiUtilities.java | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/OsmAnd/src/net/osmand/plus/UiUtilities.java b/OsmAnd/src/net/osmand/plus/UiUtilities.java
index e671509c2a..445ea97b9c 100644
--- a/OsmAnd/src/net/osmand/plus/UiUtilities.java
+++ b/OsmAnd/src/net/osmand/plus/UiUtilities.java
@@ -514,14 +514,13 @@ public class UiUtilities {
 	public static void setupToolbarOverflowIcon(Toolbar toolbar, @DrawableRes int iconId, @ColorRes int colorId) {
 		Context ctx = toolbar.getContext();
 		if (ctx != null) {
-			return;
-		}
-		Drawable icon = ContextCompat.getDrawable(ctx, iconId);
-		toolbar.setOverflowIcon(icon);
-		if (icon != null) {
-			int color = ContextCompat.getColor(ctx, colorId);
-			DrawableCompat.setTint(icon.mutate(), color);
+			Drawable icon = ContextCompat.getDrawable(ctx, iconId);
 			toolbar.setOverflowIcon(icon);
+			if (icon != null) {
+				int color = ContextCompat.getColor(ctx, colorId);
+				DrawableCompat.setTint(icon.mutate(), color);
+				toolbar.setOverflowIcon(icon);
+			}
 		}
 	}
 

From 89fa1bea313d8a48cec5ac907dd4fc60499f1ad1 Mon Sep 17 00:00:00 2001
From: Dima-1 <softmail32@gmail.com>
Date: Tue, 11 Aug 2020 16:34:08 +0300
Subject: [PATCH 11/81] Fix merge conflicts, small refactoring

---
 .../ExitBottomSheetDialogFragment.java        | 30 ++++----
 .../MeasurementToolFragment.java              | 71 ++++++++++---------
 .../SnapTrackWarningBottomSheet.java          |  8 +--
 3 files changed, 56 insertions(+), 53 deletions(-)

diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/ExitBottomSheetDialogFragment.java b/OsmAnd/src/net/osmand/plus/measurementtool/ExitBottomSheetDialogFragment.java
index d32bc0ca0b..a7c946cf00 100644
--- a/OsmAnd/src/net/osmand/plus/measurementtool/ExitBottomSheetDialogFragment.java
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/ExitBottomSheetDialogFragment.java
@@ -3,6 +3,8 @@ package net.osmand.plus.measurementtool;
 import android.os.Bundle;
 import android.view.View;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentManager;
 
@@ -16,6 +18,10 @@ import net.osmand.plus.base.bottomsheetmenu.simpleitems.TitleItem;
 
 public class ExitBottomSheetDialogFragment extends MenuBottomSheetDialogFragment {
 
+	public static final int REQUEST_CODE = 1001;
+	public static final int SAVE_RESULT_CODE = 2;
+	public static final int EXIT_RESULT_CODE = 3;
+
 	public static final String TAG = ExitBottomSheetDialogFragment.class.getSimpleName();
 
 	@Override
@@ -39,9 +45,9 @@ public class ExitBottomSheetDialogFragment extends MenuBottomSheetDialogFragment
 				.setOnClickListener(new View.OnClickListener() {
 					@Override
 					public void onClick(View v) {
-						Fragment target = getTargetFragment();
-						if (target instanceof ExitFragmentListener) {
-							((ExitFragmentListener) target).exitOnClick();
+						Fragment targetFragment = getTargetFragment();
+						if (targetFragment != null) {
+							targetFragment.onActivityResult(REQUEST_CODE, EXIT_RESULT_CODE, null);
 						}
 						dismiss();
 					}
@@ -57,9 +63,9 @@ public class ExitBottomSheetDialogFragment extends MenuBottomSheetDialogFragment
 				.setOnClickListener(new View.OnClickListener() {
 					@Override
 					public void onClick(View v) {
-						Fragment target = getTargetFragment();
-						if (target instanceof ExitFragmentListener) {
-							((ExitFragmentListener) target).saveOnClick();
+						Fragment targetFragment = getTargetFragment();
+						if (targetFragment != null) {
+							targetFragment.onActivityResult(REQUEST_CODE, SAVE_RESULT_CODE, null);
 						}
 						dismiss();
 					}
@@ -72,19 +78,11 @@ public class ExitBottomSheetDialogFragment extends MenuBottomSheetDialogFragment
 		return R.string.shared_string_close;
 	}
 
-	public static void showInstance(FragmentManager fragmentManager, Fragment target) {
+	public static void showInstance(@NonNull FragmentManager fragmentManager, @Nullable Fragment targetFragment) {
 		if (!fragmentManager.isStateSaved()) {
 			ExitBottomSheetDialogFragment fragment = new ExitBottomSheetDialogFragment();
-			fragment.setUsedOnMap(true);
-			fragment.setTargetFragment(target, 0);
+			fragment.setTargetFragment(targetFragment, REQUEST_CODE);
 			fragment.show(fragmentManager, TAG);
 		}
 	}
-
-	interface ExitFragmentListener {
-
-		void exitOnClick();
-
-		void saveOnClick();
-	}
 }
diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
index 69e2d9070b..fd36871325 100644
--- a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
@@ -103,8 +103,6 @@ import static net.osmand.plus.measurementtool.SelectFileBottomSheet.Mode.OPEN_TR
 import static net.osmand.plus.measurementtool.SelectFileBottomSheet.SelectFileListener;
 import static net.osmand.plus.measurementtool.StartPlanRouteBottomSheet.StartPlanRouteListener;
 
-public class MeasurementToolFragment extends BaseOsmAndFragment
-		implements ExitBottomSheetDialogFragment.ExitFragmentListener {
 public class MeasurementToolFragment extends BaseOsmAndFragment implements RouteBetweenPointsFragmentListener,
 		GpxApproximationFragmentListener, OptionsFragmentListener {
 
@@ -222,14 +220,16 @@ public class MeasurementToolFragment extends BaseOsmAndFragment implements Route
 		downIcon = getContentIcon(R.drawable.ic_action_arrow_down);
 		pointsSt = getString(R.string.shared_string_gpx_points).toLowerCase();
 
-		View view = UiUtilities.getInflater(getContext(), nightMode).inflate(R.layout.fragment_measurement_tool,
-				container,false);
+		View view = UiUtilities.getInflater(getContext(), nightMode)
+				.inflate(R.layout.fragment_measurement_tool, container, false);
 
 		mainView = view.findViewById(R.id.main_view);
 		AndroidUtils.setBackground(mapActivity, mainView, nightMode, R.drawable.bg_bottom_menu_light, R.drawable.bg_bottom_menu_dark);
 		pointsListContainer = view.findViewById(R.id.points_list_container);
 		if (portrait && pointsListContainer != null) {
-			final int backgroundColor = ContextCompat.getColor(mapActivity, nightMode ? R.color.activity_background_color_dark : R.color.activity_background_color_light);
+			final int backgroundColor = ContextCompat.getColor(mapActivity, nightMode
+					? R.color.activity_background_color_dark
+					: R.color.activity_background_color_light);
 			pointsListContainer.setBackgroundColor(backgroundColor);
 		}
 
@@ -605,16 +605,6 @@ public class MeasurementToolFragment extends BaseOsmAndFragment implements Route
 		return getIcon(id, nightMode ? R.color.osmand_orange : R.color.color_myloc_distance);
 	}
 
-	@Override
-	public void exitOnClick() {
-		dismiss(getMapActivity());
-	}
-
-	@Override
-	public void saveOnClick() {
-		openSaveAsNewTrackMenu(getMapActivity());
-	}
-
 	private void showProgressBar() {
 		ProgressBar progressBar = (ProgressBar) mainView.findViewById(R.id.snap_to_road_progress_bar);
 		progressBar.setVisibility(View.VISIBLE);
@@ -659,25 +649,38 @@ public class MeasurementToolFragment extends BaseOsmAndFragment implements Route
 	@Override
 	public void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) {
 		super.onActivityResult(requestCode, resultCode, data);
-		if (requestCode == SnapTrackWarningBottomSheet.REQUEST_CODE) {
-			switch (resultCode) {
-				case SnapTrackWarningBottomSheet.CANCEL_REQUEST_CODE:
-					toolBarController.setSaveViewVisible(true);
-					updateToolbar();
-					break;
-				case SnapTrackWarningBottomSheet.CONTINUE_REQUEST_CODE:
-					MapActivity mapActivity = getMapActivity();
-					if (mapActivity != null) {
-						try {
-							gpxApproximator = new GpxApproximator(requireMyApplication(), new LocationsHolder(editingCtx.getPoints()));
-							GpxApproximationFragment.showInstance(mapActivity.getSupportFragmentManager(),
-									this, gpxApproximator.getMode(), (int) gpxApproximator.getPointApproximation());
-						} catch (IOException e) {
+		switch (requestCode) {
+			case SnapTrackWarningBottomSheet.REQUEST_CODE:
+				switch (resultCode) {
+					case SnapTrackWarningBottomSheet.CANCEL_RESULT_CODE:
+						toolBarController.setSaveViewVisible(true);
+						updateToolbar();
+						break;
+					case SnapTrackWarningBottomSheet.CONTINUE_RESULT_CODE:
+						MapActivity mapActivity = getMapActivity();
+						if (mapActivity != null) {
+							try {
+								gpxApproximator = new GpxApproximator(requireMyApplication(),
+										new LocationsHolder(editingCtx.getPoints()));
+								GpxApproximationFragment.showInstance(mapActivity.getSupportFragmentManager(),
+										this, gpxApproximator.getMode(),
+										(int) gpxApproximator.getPointApproximation());
+							} catch (IOException e) {
 
+							}
 						}
-					}
-					break;
-			}
+						break;
+				}
+				break;
+			case ExitBottomSheetDialogFragment.REQUEST_CODE:
+				switch (resultCode) {
+					case ExitBottomSheetDialogFragment.EXIT_RESULT_CODE:
+						dismiss(getMapActivity());
+						break;
+					case ExitBottomSheetDialogFragment.SAVE_RESULT_CODE:
+						openSaveAsNewTrackMenu(getMapActivity());
+						break;
+				}
 		}
 	}
 
@@ -725,7 +728,7 @@ public class MeasurementToolFragment extends BaseOsmAndFragment implements Route
 
 			@Override
 			public void saveAsNewTrackOnClick() {
-						openSaveAsNewTrackMenu(mapActivity);
+				openSaveAsNewTrackMenu(getMapActivity());
 			}
 
 	@Override
@@ -857,6 +860,7 @@ public class MeasurementToolFragment extends BaseOsmAndFragment implements Route
 			@Override
 			public void openLastEditTrackOnClick(String gpxFileName) {
 				addNewGpxData(getGpxFile(gpxFileName));
+				saved = true;
 			}
 
 			@Override
@@ -871,6 +875,7 @@ public class MeasurementToolFragment extends BaseOsmAndFragment implements Route
 			@Override
 			public void selectFileOnCLick(String gpxFileName) {
 				addNewGpxData(getGpxFile(gpxFileName));
+				saved = true;
 			}
 
 			@Override
diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/SnapTrackWarningBottomSheet.java b/OsmAnd/src/net/osmand/plus/measurementtool/SnapTrackWarningBottomSheet.java
index f91aba9464..666cb58b3f 100644
--- a/OsmAnd/src/net/osmand/plus/measurementtool/SnapTrackWarningBottomSheet.java
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/SnapTrackWarningBottomSheet.java
@@ -23,8 +23,8 @@ import org.apache.commons.logging.Log;
 public class SnapTrackWarningBottomSheet extends MenuBottomSheetDialogFragment {
 
 	public static final int REQUEST_CODE = 1000;
-	public static final int CANCEL_REQUEST_CODE = 2;
-	public static final int CONTINUE_REQUEST_CODE = 3;
+	public static final int CANCEL_RESULT_CODE = 2;
+	public static final int CONTINUE_RESULT_CODE = 3;
 
 	public static final String TAG = SnapTrackWarningBottomSheet.class.getSimpleName();
 	private static final Log LOG = PlatformUtil.getLog(SnapTrackWarningBottomSheet.class);
@@ -58,7 +58,7 @@ public class SnapTrackWarningBottomSheet extends MenuBottomSheetDialogFragment {
 	protected void onRightBottomButtonClick() {
 		Fragment fragment = getTargetFragment();
 		if (fragment != null) {
-			fragment.onActivityResult(REQUEST_CODE, CONTINUE_REQUEST_CODE, null);
+			fragment.onActivityResult(REQUEST_CODE, CONTINUE_RESULT_CODE, null);
 		}
 		dismiss();
 	}
@@ -77,7 +77,7 @@ public class SnapTrackWarningBottomSheet extends MenuBottomSheetDialogFragment {
 		}
 		Fragment fragment = getTargetFragment();
 		if (fragment != null) {
-			fragment.onActivityResult(REQUEST_CODE, CANCEL_REQUEST_CODE, null);
+			fragment.onActivityResult(REQUEST_CODE, CANCEL_RESULT_CODE, null);
 		}
 	}
 

From 910255dd2c34e91152e109fcf85508807001fa3f Mon Sep 17 00:00:00 2001
From: kotlin <sasafaoifgasofguaiosgfuia@hgmail.com>
Date: Tue, 11 Aug 2020 17:43:03 +0300
Subject: [PATCH 12/81] Fix #6003

---
 OsmAnd/res/values/strings.xml                             | 4 ++--
 OsmAnd/src/net/osmand/plus/mapillary/MapillaryPlugin.java | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/OsmAnd/res/values/strings.xml b/OsmAnd/res/values/strings.xml
index 0981dc27a2..f3a1ebf203 100644
--- a/OsmAnd/res/values/strings.xml
+++ b/OsmAnd/res/values/strings.xml
@@ -11,7 +11,7 @@
 	Thx - Hardy
 
 -->
-    <string name="street_level_imagery">Street-level imagery</string>
+
     <string name="rourte_between_points_add_track_desc">Select a track file for which a new segment will be added.</string>
     <string name="navigation_profile">Navigation profile</string>
     <string name="threshold_distance">Threshold distance</string>
@@ -1245,7 +1245,7 @@
     <string name="mapillary_widget">Mapillary widget</string>
     <string name="mapillary_widget_descr">Allows quick contributions to Mapillary.</string>
     <string name="mapillary_descr">Online street-level photos for everyone. Discover places, collaborate, capture the world.</string>
-    <string name="mapillary">Mapillary</string>
+    <string name="mapillary">Street-level imagery</string>
     <string name="plugin_mapillary_descr">Street-level photos for everyone. Discover places, collaborate, capture the world.</string>
     <string name="private_access_routing_req">Your destination is located in an area with private access. Allow using private roads for this trip?</string>
     <string name="restart_search">Restart search</string>
diff --git a/OsmAnd/src/net/osmand/plus/mapillary/MapillaryPlugin.java b/OsmAnd/src/net/osmand/plus/mapillary/MapillaryPlugin.java
index 189a039a54..8b77d4e5bc 100644
--- a/OsmAnd/src/net/osmand/plus/mapillary/MapillaryPlugin.java
+++ b/OsmAnd/src/net/osmand/plus/mapillary/MapillaryPlugin.java
@@ -181,7 +181,7 @@ public class MapillaryPlugin extends OsmandPlugin {
 		}
 		adapter.addItem(new ContextMenuItem.ItemBuilder()
 				.setId(MAPILLARY)
-				.setTitleId(R.string.street_level_imagery, mapActivity)
+				.setTitleId(R.string.mapillary, mapActivity)
 				.setDescription("Mapillary")
 				.setSelected(settings.SHOW_MAPILLARY.get())
 				.setColor(settings.SHOW_MAPILLARY.get() ? R.color.osmand_orange : ContextMenuItem.INVALID_ID)

From b561165eb10134b653fc977c4c5c7ff8068c1fc4 Mon Sep 17 00:00:00 2001
From: Dima-1 <softmail32@gmail.com>
Date: Tue, 11 Aug 2020 18:18:08 +0300
Subject: [PATCH 13/81] Fix material theme

---
 OsmAnd/res/layout/my_places_fabs.xml          |  4 +++
 OsmAnd/res/layout/poi_filter_list_item.xml    | 12 ++++-----
 OsmAnd/res/values/sizes.xml                   |  5 +++-
 OsmAnd/res/values/styles.xml                  | 25 +++++++++++++++----
 .../plus/osmedit/AdvancedEditPoiFragment.java |  6 ++---
 5 files changed, 36 insertions(+), 16 deletions(-)

diff --git a/OsmAnd/res/layout/my_places_fabs.xml b/OsmAnd/res/layout/my_places_fabs.xml
index f7b32cac25..05c18d6425 100644
--- a/OsmAnd/res/layout/my_places_fabs.xml
+++ b/OsmAnd/res/layout/my_places_fabs.xml
@@ -16,6 +16,7 @@
         android:contentDescription="@string/quick_action_new_action"
         app:srcCompat="@drawable/ic_action_plus"
         app:backgroundTint="?attr/active_color_basic"
+        app:tint="@color/active_buttons_and_links_text_light"
         app:fabSize="normal"
         app:useCompatPadding="true"/>
 
@@ -33,6 +34,7 @@
         app:srcCompat="@drawable/ic_action_marker_dark"
         android:visibility="gone"
         app:backgroundTint="@color/fab_green"
+        app:tint="@color/active_buttons_and_links_text_light"
         app:fabSize="mini"
         app:useCompatPadding="true"
         tools:visibility="visible"/>
@@ -78,6 +80,7 @@
         app:srcCompat="@drawable/ic_action_markers_dark"
         android:visibility="gone"
         app:backgroundTint="@color/fab_green"
+        app:tint="@color/active_buttons_and_links_text_light"
         app:fabSize="mini"
         app:useCompatPadding="true"
         tools:visibility="visible"/>
@@ -123,6 +126,7 @@
         app:srcCompat="@drawable/ic_action_polygom_dark"
         android:visibility="gone"
         app:backgroundTint="@color/fab_green"
+        app:tint="@color/active_buttons_and_links_text_light"
         app:fabSize="mini"
         app:useCompatPadding="true"
         tools:visibility="visible"/>
diff --git a/OsmAnd/res/layout/poi_filter_list_item.xml b/OsmAnd/res/layout/poi_filter_list_item.xml
index d143f5ef5d..52e1ac077a 100644
--- a/OsmAnd/res/layout/poi_filter_list_item.xml
+++ b/OsmAnd/res/layout/poi_filter_list_item.xml
@@ -6,17 +6,17 @@
     android:layout_height="wrap_content"
     xmlns:osmand="http://schemas.android.com/apk/res-auto"
     android:background="?attr/bg_color"
-    android:minHeight="48dp"
+    android:minHeight="@dimen/card_row_min_height"
     android:clickable="false"
     android:orientation="vertical">
 
     <LinearLayout
         android:layout_width="match_parent"
-        android:layout_height="48dp"
+        android:layout_height="@dimen/card_row_min_height"
         android:gravity="center"
         android:orientation="horizontal"
         android:paddingRight="@dimen/content_padding"
-	    android:paddingEnd="@dimen/content_padding">
+        android:paddingEnd="@dimen/content_padding">
 
         <LinearLayout
             android:layout_width="54dp"
@@ -25,8 +25,8 @@
 
             <androidx.appcompat.widget.AppCompatImageView
                 android:id="@+id/icon"
-                android:layout_width="24dp"
-                android:layout_height="24dp"
+                android:layout_width="@dimen/standard_icon_size"
+                android:layout_height="@dimen/standard_icon_size"
                 osmand:srcCompat="@drawable/ic_action_search_dark"/>
 
         </LinearLayout>
@@ -107,6 +107,6 @@
         android:layout_height="1dp"
         android:layout_marginLeft="54dp"
         android:background="?attr/dashboard_divider"
-	    android:layout_marginStart="54dp" />
+        android:layout_marginStart="54dp" />
 
 </LinearLayout>
\ No newline at end of file
diff --git a/OsmAnd/res/values/sizes.xml b/OsmAnd/res/values/sizes.xml
index 463dd511b2..1b0adf805a 100644
--- a/OsmAnd/res/values/sizes.xml
+++ b/OsmAnd/res/values/sizes.xml
@@ -44,7 +44,7 @@
 
     <dimen name="subHeaderPadding">2dp</dimen>
     <dimen name="subHeaderMarginLeft">15dp</dimen>
-		<dimen name = "subHeaderMarginRight">15dp</dimen>
+	<dimen name="subHeaderMarginRight">15dp</dimen>
     <dimen name="showAllButtonMarginRight">14dp</dimen>
     <dimen name="showAllButtonHeight">36dp</dimen>
     <dimen name="dashFavIconSize">28dp</dimen>
@@ -396,4 +396,7 @@
 	<dimen name="info_description_line_spacing_multiplier" format="float">1.4</dimen>
 
 	<dimen name="screen_alert_big_warning_icon_size">92dp</dimen>
+
+	<dimen name="radioButtonSize">32dp</dimen>
+	<dimen name="checkBoxSize">24dp</dimen>
 </resources>
\ No newline at end of file
diff --git a/OsmAnd/res/values/styles.xml b/OsmAnd/res/values/styles.xml
index eb59f4b1e3..6642003e06 100644
--- a/OsmAnd/res/values/styles.xml
+++ b/OsmAnd/res/values/styles.xml
@@ -240,6 +240,8 @@
         <item name="btn_radio_button_left">@drawable/radio_button_left_light</item>
         <item name="btn_radio_button_right">@drawable/radio_button_right_light</item>
         <item name="btn_radio_button_center">@drawable/radio_button_center_light</item>
+        <item name="checkboxStyle">@style/CheckboxStyle</item>
+        <item name="radioButtonStyle">@style/RadioButtonStyle</item>
     </style>
 
     <style name="ToolbarStyle" parent="@style/Widget.AppCompat.Toolbar">
@@ -284,9 +286,10 @@
     </style>
 
     <style name="OsmandLightTheme.SearchTabbar" parent="Widget.MaterialComponents.TabLayout">
-        <item name="android:textColorPrimary">@color/osmand_orange</item>
-        <item name="tabTextColor">@color/osmand_orange</item>
+        <item name="tabIndicatorColor">@color/app_bar_main_light</item>
+        <item name="tabTextColor">@color/text_color_secondary_light</item>
         <item name="colorAccent">@color/osmand_orange</item>
+        <item name="tabSelectedTextColor">@color/osmand_orange</item>
         <item name="android:textColorSecondary">@color/text_color_secondary_light</item>
         <item name="android:textColorHint">@color/text_color_secondary_light</item>
     </style>
@@ -313,10 +316,10 @@
     </style>
 
     <style name="OsmandDarkTheme.SearchTabbar"  parent="Widget.MaterialComponents.TabLayout">
-        <item name="android:textColorPrimary">@color/osmand_orange</item>
-        <item name="tabIndicatorColor">@color/osmand_orange</item>
-        <item name="tabTextColor">@color/osmand_orange</item>
+        <item name="tabIndicatorColor">@color/app_bar_main_light</item>
+        <item name="tabTextColor">@color/text_color_secondary_dark</item>
         <item name="colorAccent">@color/osmand_orange</item>
+        <item name="tabSelectedTextColor">@color/osmand_orange</item>
         <item name="android:textColorSecondary">@color/text_color_secondary_dark</item>
         <item name="android:textColorHint">@color/text_color_secondary_dark</item>
     </style>
@@ -530,6 +533,8 @@
         <item name="btn_radio_button_left">@drawable/radio_button_left_dark</item>
         <item name="btn_radio_button_right">@drawable/radio_button_right_dark</item>
         <item name="btn_radio_button_center">@drawable/radio_button_center_dark</item>
+        <item name="checkboxStyle">@style/CheckboxStyle</item>
+        <item name="radioButtonStyle">@style/RadioButtonStyle</item>
     </style>
 
     <style name="FreeVersionBanner" parent="OsmandDarkTheme">
@@ -580,6 +585,16 @@
         <item name="elevation">0dp</item>
     </style>
 
+    <style name="CheckboxStyle" parent="Widget.AppCompat.CompoundButton.CheckBox">
+        <item name="android:height">@dimen/checkBoxSize</item>
+        <item name="android:width">@dimen/checkBoxSize</item>
+    </style>
+
+    <style name="RadioButtonStyle" parent="Widget.AppCompat.CompoundButton.RadioButton">
+        <item name="android:height">@dimen/radioButtonSize</item>
+        <item name="android:width">@dimen/radioButtonSize</item>
+    </style>
+
     <style name="Widget.Styled.LightActionBarTitle" parent="TextAppearance.AppCompat.Widget.ActionBar.Title">
         <item name="android:textColor">@color/color_white</item>
     </style>
diff --git a/OsmAnd/src/net/osmand/plus/osmedit/AdvancedEditPoiFragment.java b/OsmAnd/src/net/osmand/plus/osmedit/AdvancedEditPoiFragment.java
index a637c76412..3eabf35f6c 100644
--- a/OsmAnd/src/net/osmand/plus/osmedit/AdvancedEditPoiFragment.java
+++ b/OsmAnd/src/net/osmand/plus/osmedit/AdvancedEditPoiFragment.java
@@ -22,8 +22,6 @@ import android.widget.TextView;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
-import com.google.android.material.textfield.MaterialAutoCompleteTextView;
-
 import net.osmand.PlatformUtil;
 import net.osmand.osm.AbstractPoiType;
 import net.osmand.osm.MapPoiTypes;
@@ -215,7 +213,7 @@ public class AdvancedEditPoiFragment extends BaseOsmAndFragment
 		public void addTagView(String tg, String vl) {
 			View convertView = LayoutInflater.from(linearLayout.getContext())
 					.inflate(R.layout.poi_tag_list_item, null, false);
-			final MaterialAutoCompleteTextView tagEditText = convertView.findViewById(R.id.tagEditText);
+			final AutoCompleteTextView tagEditText = convertView.findViewById(R.id.tagEditText);
 			ImageButton deleteItemImageButton =
 					(ImageButton) convertView.findViewById(R.id.deleteItemImageButton);
 			deleteItemImageButton.setImageDrawable(deleteDrawable);
@@ -227,7 +225,7 @@ public class AdvancedEditPoiFragment extends BaseOsmAndFragment
 					editPoiData.removeTag(tagEditText.getText().toString());
 				}
 			});
-			final MaterialAutoCompleteTextView valueEditText = convertView.findViewById(R.id.valueEditText);
+			final AutoCompleteTextView valueEditText = convertView.findViewById(R.id.valueEditText);
 			valueEditText.setFilters(new InputFilter[]{
 					new InputFilter.LengthFilter(AMENITY_TEXT_LENGTH)
 			});

From 6a4bdd3575de940463b595b4a9945865931cada3 Mon Sep 17 00:00:00 2001
From: Dima-1 <softmail32@gmail.com>
Date: Tue, 11 Aug 2020 18:43:05 +0300
Subject: [PATCH 14/81] Fix material theme

---
 OsmAnd/res/layout/my_places_fabs.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/OsmAnd/res/layout/my_places_fabs.xml b/OsmAnd/res/layout/my_places_fabs.xml
index 05c18d6425..3e0f70789e 100644
--- a/OsmAnd/res/layout/my_places_fabs.xml
+++ b/OsmAnd/res/layout/my_places_fabs.xml
@@ -16,7 +16,7 @@
         android:contentDescription="@string/quick_action_new_action"
         app:srcCompat="@drawable/ic_action_plus"
         app:backgroundTint="?attr/active_color_basic"
-        app:tint="@color/active_buttons_and_links_text_light"
+        app:tint="?attr/app_bar_primary_item_color"
         app:fabSize="normal"
         app:useCompatPadding="true"/>
 
@@ -34,7 +34,7 @@
         app:srcCompat="@drawable/ic_action_marker_dark"
         android:visibility="gone"
         app:backgroundTint="@color/fab_green"
-        app:tint="@color/active_buttons_and_links_text_light"
+        app:tint="?attr/app_bar_primary_item_color"
         app:fabSize="mini"
         app:useCompatPadding="true"
         tools:visibility="visible"/>
@@ -80,7 +80,7 @@
         app:srcCompat="@drawable/ic_action_markers_dark"
         android:visibility="gone"
         app:backgroundTint="@color/fab_green"
-        app:tint="@color/active_buttons_and_links_text_light"
+        app:tint="?attr/app_bar_primary_item_color"
         app:fabSize="mini"
         app:useCompatPadding="true"
         tools:visibility="visible"/>
@@ -126,7 +126,7 @@
         app:srcCompat="@drawable/ic_action_polygom_dark"
         android:visibility="gone"
         app:backgroundTint="@color/fab_green"
-        app:tint="@color/active_buttons_and_links_text_light"
+        app:tint="?attr/app_bar_primary_item_color"
         app:fabSize="mini"
         app:useCompatPadding="true"
         tools:visibility="visible"/>

From 2ab38a54b5eb4be76cadb2e12aa05ad22a414a08 Mon Sep 17 00:00:00 2001
From: max-klaus <max.klaus@osmand.net>
Date: Tue, 11 Aug 2020 23:03:13 +0300
Subject: [PATCH 15/81] Gpx approximation in progress

---
 .../main/java/net/osmand/LocationsHolder.java |   6 +-
 .../osmand/router/RoutePlannerFrontEnd.java   |  50 ++++--
 ..._gpx_approximation_bottom_sheet_dialog.xml |   5 +-
 OsmAnd/src/net/osmand/AndroidUtils.java       |   7 +-
 .../GpxApproximationFragment.java             | 165 +++++++++++++++---
 .../MeasurementToolFragment.java              |  66 +++----
 .../plus/measurementtool/SliderCard.java      |  16 +-
 .../osmand/plus/routing/GpxApproximator.java  | 138 +++++++++++++--
 .../osmand/plus/routing/RouteProvider.java    |  10 +-
 .../osmand/plus/routing/RoutingHelper.java    |   5 +-
 10 files changed, 358 insertions(+), 110 deletions(-)

diff --git a/OsmAnd-java/src/main/java/net/osmand/LocationsHolder.java b/OsmAnd-java/src/main/java/net/osmand/LocationsHolder.java
index 875f481644..5cecf9b8e6 100644
--- a/OsmAnd-java/src/main/java/net/osmand/LocationsHolder.java
+++ b/OsmAnd-java/src/main/java/net/osmand/LocationsHolder.java
@@ -25,15 +25,15 @@ public class LocationsHolder {
 		this.locationType = resolveLocationType(locations);
 		switch (locationType) {
 			case LOCATION_TYPE_LATLON:
-				latLonList = (List<LatLon>) locations;
+				latLonList = new ArrayList<>((List<LatLon>) locations);
 				size = locations.size();
 				break;
 			case LOCATION_TYPE_LOCATION:
-				locationList = (List<Location>) locations;
+				locationList = new ArrayList<>((List<Location>) locations);
 				size = locations.size();
 				break;
 			case LOCATION_TYPE_WPTPT:
-				wptPtList = (List<WptPt>) locations;
+				wptPtList = new ArrayList<>((List<WptPt>) locations);
 				size = locations.size();
 				break;
 		}
diff --git a/OsmAnd-java/src/main/java/net/osmand/router/RoutePlannerFrontEnd.java b/OsmAnd-java/src/main/java/net/osmand/router/RoutePlannerFrontEnd.java
index 22cf7b434d..c6f18ab427 100644
--- a/OsmAnd-java/src/main/java/net/osmand/router/RoutePlannerFrontEnd.java
+++ b/OsmAnd-java/src/main/java/net/osmand/router/RoutePlannerFrontEnd.java
@@ -4,6 +4,7 @@ package net.osmand.router;
 import net.osmand.LocationsHolder;
 import net.osmand.NativeLibrary;
 import net.osmand.PlatformUtil;
+import net.osmand.ResultMatcher;
 import net.osmand.binary.BinaryMapIndexReader;
 import net.osmand.binary.BinaryMapRouteReaderAdapter;
 import net.osmand.binary.BinaryMapRouteReaderAdapter.RouteRegion;
@@ -62,17 +63,29 @@ public class RoutePlannerFrontEnd {
 		public int routeDistance;
 		public int routeGapDistance;
 		public int routeDistanceUnmatched;
-		
+
+		public boolean calculationCancelled;
+		private boolean calculationDone;
+
 		public GpxRouteApproximation(RoutingContext ctx) {
 			this.ctx = ctx;
 		}
 		
+		public GpxRouteApproximation(GpxRouteApproximation gctx) {
+			this.ctx = gctx.ctx;
+			this.routeDistance = gctx.routeDistance;
+		}
+
 		@Override
 		public String toString() {
 			return String.format(">> GPX approximation (%d of %d m route calcs, %d route points searched) for %d m: %d m umatched",
 					routeCalculations, routeDistCalculations, routePointsSearched, routeDistance, routeDistanceUnmatched);
 		}
 
+		public boolean isCalculationDone() {
+			return calculationDone;
+		}
+
 		public double distFromLastPoint(LatLon startPoint) {
 			if (result.size() > 0) {
 				return MapUtils.getDistance(getLastPoint(), startPoint);
@@ -87,7 +100,7 @@ public class RoutePlannerFrontEnd {
 			return null;
 		}
 	}
-	
+
 	public static class GpxPoint {
 		public int ind;
 		public LatLon loc;
@@ -97,6 +110,15 @@ public class RoutePlannerFrontEnd {
 		public List<RouteSegmentResult> stepBackRoute;
 		public int targetInd = -1;
 		public boolean straightLine = false;
+
+		public GpxPoint() {
+		}
+
+		public GpxPoint(GpxPoint point) {
+			this.ind = point.ind;
+			this.loc = point.loc;
+			this.cumDist = point.cumDist;
+		}
 	}
 
 	public RoutingContext buildRoutingContext(RoutingConfiguration config, NativeLibrary nativeLibrary, BinaryMapIndexReader[] map, RouteCalculationMode rm) {
@@ -206,7 +228,6 @@ public class RoutePlannerFrontEnd {
 		return null;
 	}
 
-
 	public List<RouteSegmentResult> searchRoute(final RoutingContext ctx, LatLon start, LatLon end, List<LatLon> intermediates) throws IOException, InterruptedException {
 		return searchRoute(ctx, start, end, intermediates, null);
 	}
@@ -215,19 +236,16 @@ public class RoutePlannerFrontEnd {
 		useSmartRouteRecalculation = use;
 	}
 
-	public GpxRouteApproximation searchGpxRoute(GpxRouteApproximation gctx, List<GpxPoint> gpxPoints) throws IOException, InterruptedException {
+	public GpxRouteApproximation searchGpxRoute(GpxRouteApproximation gctx, List<GpxPoint> gpxPoints, ResultMatcher<GpxRouteApproximation> resultMatcher) throws IOException, InterruptedException {
 		long timeToCalculate = System.nanoTime();
-		if (gctx.ctx.calculationProgress == null) {
-			gctx.ctx.calculationProgress = new RouteCalculationProgress();
-		}
 		gctx.ctx.keepNativeRoutingContext = true;
 		GpxPoint start = null;
 		GpxPoint prev = null;
-		if(gpxPoints.size() > 0) {
+		if (gpxPoints.size() > 0) {
 			gctx.ctx.calculationProgress.totalIterations = (int) (gpxPoints.get(gpxPoints.size() - 1).cumDist / gctx.MAXIMUM_STEP_APPROXIMATION + 1); 
 			start = gpxPoints.get(0); 
 		}
-		while (start != null) {
+		while (start != null && !gctx.calculationCancelled) {
 			double routeDist = gctx.MAXIMUM_STEP_APPROXIMATION;
 			GpxPoint next = findNextGpxPointWithin(gctx, gpxPoints, start, routeDist);
 			boolean routeFound = false;
@@ -287,10 +305,14 @@ public class RoutePlannerFrontEnd {
 		gctx.ctx.deleteNativeRoutingContext();
 		BinaryRoutePlanner.printDebugMemoryInformation(gctx.ctx);
 		calculateGpxRoute(gctx, gpxPoints);
-		if (!gctx.result.isEmpty()) {
+		if (!gctx.result.isEmpty() && !gctx.calculationCancelled) {
 			new RouteResultPreparation().printResults(gctx.ctx, gpxPoints.get(0).loc, gpxPoints.get(gpxPoints.size() - 1).loc, gctx.result);
 			System.out.println(gctx);
 		}
+		if (resultMatcher != null) {
+			resultMatcher.publish(gctx);
+		}
+		gctx.calculationDone = true;
 		return gctx;
 	}
 
@@ -343,7 +365,7 @@ public class RoutePlannerFrontEnd {
 		reg.initRouteEncodingRule(0, "highway", RouteResultPreparation.UNMATCHED_HIGHWAY_TYPE);
 		List<LatLon> lastStraightLine = null;
 		GpxPoint straightPointStart = null;
-		for (int i = 0; i < gpxPoints.size(); ) {
+		for (int i = 0; i < gpxPoints.size() && !gctx.calculationCancelled; ) {
 			GpxPoint pnt = gpxPoints.get(i);
 			if (pnt.routeToTarget != null && !pnt.routeToTarget.isEmpty()) {
 				LatLon startPoint = pnt.routeToTarget.get(0).getStartPoint();
@@ -402,7 +424,7 @@ public class RoutePlannerFrontEnd {
 	private void cleanupResultAndAddTurns(GpxRouteApproximation gctx) {
 		// cleanup double joints
 		int LOOK_AHEAD = 4;
-		for(int i = 0; i < gctx.result.size(); i++) {
+		for(int i = 0; i < gctx.result.size() && !gctx.calculationCancelled; i++) {
 			RouteSegmentResult s = gctx.result.get(i);
 			for(int j = i + 2; j <= i + LOOK_AHEAD && j < gctx.result.size(); j++) {
 				RouteSegmentResult e = gctx.result.get(j);
@@ -419,7 +441,9 @@ public class RoutePlannerFrontEnd {
 			r.setTurnType(null);
 			r.setDescription("");
 		}
-		preparation.prepareTurnResults(gctx.ctx, gctx.result);
+		if (!gctx.calculationCancelled) {
+			preparation.prepareTurnResults(gctx.ctx, gctx.result);
+		}
 	}
 
 	private void addStraightLine(GpxRouteApproximation gctx, List<LatLon> lastStraightLine, GpxPoint strPnt, RouteRegion reg) {
diff --git a/OsmAnd/res/layout/fragment_gpx_approximation_bottom_sheet_dialog.xml b/OsmAnd/res/layout/fragment_gpx_approximation_bottom_sheet_dialog.xml
index 2699fa722f..086fb5a66f 100644
--- a/OsmAnd/res/layout/fragment_gpx_approximation_bottom_sheet_dialog.xml
+++ b/OsmAnd/res/layout/fragment_gpx_approximation_bottom_sheet_dialog.xml
@@ -18,8 +18,6 @@
 			android:layout_width="match_parent"
 			android:layout_height="match_parent">
 
-			<include layout="@layout/plan_route_progress_bar"/>
-
 			<net.osmand.plus.LockableScrollView
 				android:id="@+id/route_menu_bottom_scroll"
 				android:layout_width="match_parent"
@@ -37,6 +35,9 @@
 				</LinearLayout>
 
 			</net.osmand.plus.LockableScrollView>
+
+			<include layout="@layout/plan_route_progress_bar"/>
+
 		</FrameLayout>
 
 	</LinearLayout>
diff --git a/OsmAnd/src/net/osmand/AndroidUtils.java b/OsmAnd/src/net/osmand/AndroidUtils.java
index a38825956c..63956aa36b 100644
--- a/OsmAnd/src/net/osmand/AndroidUtils.java
+++ b/OsmAnd/src/net/osmand/AndroidUtils.java
@@ -54,6 +54,7 @@ import androidx.annotation.ColorInt;
 import androidx.annotation.ColorRes;
 import androidx.annotation.DrawableRes;
 import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import androidx.appcompat.content.res.AppCompatResources;
 import androidx.core.content.ContextCompat;
 import androidx.core.content.FileProvider;
@@ -169,11 +170,11 @@ public class AndroidUtils {
 		return intent.resolveActivity(context.getPackageManager()) != null;
 	}
 
-	public static boolean isActivityNotDestroyed(Activity activity) {
+	public static boolean isActivityNotDestroyed(@Nullable Activity activity) {
 		if (Build.VERSION.SDK_INT >= 17) {
-			return !activity.isFinishing() && !activity.isDestroyed();
+			return activity != null && !activity.isFinishing() && !activity.isDestroyed();
 		}
-		return !activity.isFinishing();
+		return activity != null && !activity.isFinishing();
 	}
 
 	public static Spannable replaceCharsWithIcon(String text, Drawable icon, String[] chars) {
diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/GpxApproximationFragment.java b/OsmAnd/src/net/osmand/plus/measurementtool/GpxApproximationFragment.java
index 3aade669ef..3873ad22b7 100644
--- a/OsmAnd/src/net/osmand/plus/measurementtool/GpxApproximationFragment.java
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/GpxApproximationFragment.java
@@ -7,6 +7,7 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.widget.FrameLayout;
 import android.widget.LinearLayout;
+import android.widget.ProgressBar;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
@@ -15,18 +16,25 @@ import androidx.fragment.app.FragmentActivity;
 import androidx.fragment.app.FragmentManager;
 
 import net.osmand.AndroidUtils;
+import net.osmand.LocationsHolder;
 import net.osmand.PlatformUtil;
+import net.osmand.ResultMatcher;
+import net.osmand.plus.OsmandApplication;
 import net.osmand.plus.R;
 import net.osmand.plus.UiUtilities;
 import net.osmand.plus.activities.MapActivity;
 import net.osmand.plus.base.ContextMenuScrollFragment;
 import net.osmand.plus.helpers.AndroidUiHelper;
+import net.osmand.plus.routing.GpxApproximator;
 import net.osmand.plus.settings.backend.ApplicationMode;
+import net.osmand.router.RoutePlannerFrontEnd.GpxRouteApproximation;
 
 import org.apache.commons.logging.Log;
 
-import static net.osmand.plus.measurementtool.ProfileCard.*;
-import static net.osmand.plus.measurementtool.SliderCard.*;
+import java.io.IOException;
+
+import static net.osmand.plus.measurementtool.ProfileCard.ProfileCardListener;
+import static net.osmand.plus.measurementtool.SliderCard.SliderCardListener;
 
 public class GpxApproximationFragment extends ContextMenuScrollFragment
 		implements SliderCardListener, ProfileCardListener {
@@ -36,9 +44,16 @@ public class GpxApproximationFragment extends ContextMenuScrollFragment
 	public static final String DISTANCE_THRESHOLD_KEY = "distance_threshold";
 	public static final String SNAP_TO_ROAD_APP_MODE_STRING_KEY = "snap_to_road_app_mode";
 
+	public static final int REQUEST_CODE = 1100;
+
 	private int menuTitleHeight;
 	private ApplicationMode snapToRoadAppMode = ApplicationMode.CAR;
-	private int distanceThreshold = 30;
+	private int distanceThreshold = 50;
+
+	private LocationsHolder locationsHolder;
+	@Nullable
+	private GpxApproximator gpxApproximator;
+	private ProgressBar progressBar;
 
 	@Override
 	public int getMainLayoutId() {
@@ -85,6 +100,43 @@ public class GpxApproximationFragment extends ContextMenuScrollFragment
 			distanceThreshold = savedInstanceState.getInt(DISTANCE_THRESHOLD_KEY);
 			snapToRoadAppMode = ApplicationMode.valueOfStringKey(
 					savedInstanceState.getString(SNAP_TO_ROAD_APP_MODE_STRING_KEY), ApplicationMode.CAR);
+			try {
+				gpxApproximator = new GpxApproximator(requireMyApplication(), snapToRoadAppMode, distanceThreshold, locationsHolder);
+			} catch (Exception e) {
+				LOG.error(e.getMessage(), e);
+			}
+		} else {
+			try {
+				gpxApproximator = new GpxApproximator(requireMyApplication(), locationsHolder);
+			} catch (Exception e) {
+				LOG.error(e.getMessage(), e);
+			}
+		}
+
+		if (gpxApproximator != null) {
+			gpxApproximator.setApproximationProgress(new GpxApproximator.GpxApproximationProgressCallback() {
+
+				@Override
+				public void start() {
+					if (isResumed()) {
+						startProgress();
+					}
+				}
+
+				@Override
+				public void updateProgress(int progress) {
+					if (isResumed()) {
+						GpxApproximationFragment.this.updateProgress(progress);
+					}
+				}
+
+				@Override
+				public void finish() {
+					if (isResumed()) {
+						finishProgress();
+					}
+				}
+			});
 		}
 
 		if (isPortrait()) {
@@ -93,6 +145,12 @@ public class GpxApproximationFragment extends ContextMenuScrollFragment
 		updateCards();
 		updateButtons(mainView);
 
+		progressBar = mainView.findViewById(R.id.progress_bar);
+		if (progressBar != null) {
+			requireMapActivity().setupRouteCalculationProgressBar(progressBar);
+			progressBar.setIndeterminate(false);
+		}
+
 		if (!isPortrait()) {
 			int widthNoShadow = getLandscapeNoShadowWidth();
 			FrameLayout.LayoutParams params = new FrameLayout.LayoutParams(widthNoShadow, ViewGroup.LayoutParams.WRAP_CONTENT);
@@ -102,6 +160,8 @@ public class GpxApproximationFragment extends ContextMenuScrollFragment
 		enterGpxApproximationMode();
 		runLayoutListener();
 
+		calculateGpxApproximation();
+
 		return mainView;
 	}
 
@@ -159,7 +219,7 @@ public class GpxApproximationFragment extends ContextMenuScrollFragment
 			public void onClick(View v) {
 				Fragment fragment = getTargetFragment();
 				if (fragment instanceof GpxApproximationFragmentListener) {
-					((GpxApproximationFragmentListener) fragment).onApplyGpxApproximation(snapToRoadAppMode, distanceThreshold);
+					((GpxApproximationFragmentListener) fragment).onApplyGpxApproximation();
 				}
 				dismiss();
 			}
@@ -226,13 +286,13 @@ public class GpxApproximationFragment extends ContextMenuScrollFragment
 		return (menuState & (MenuState.HEADER_ONLY | MenuState.HALF_SCREEN)) != 0;
 	}
 
-	public static void showInstance(@NonNull FragmentManager fm, @Nullable Fragment targetFragment, @NonNull ApplicationMode initialAppMode, int initialDistanceThreshold) {
+	public static void showInstance(@NonNull FragmentManager fm, @Nullable Fragment targetFragment, @NonNull LocationsHolder locationsHolder) {
 		try {
 			if (!fm.isStateSaved()) {
 				GpxApproximationFragment fragment = new GpxApproximationFragment();
-				fragment.setTargetFragment(targetFragment, 0);
-				fragment.snapToRoadAppMode = initialAppMode;
-				fragment.distanceThreshold = initialDistanceThreshold;
+				fragment.setRetainInstance(true);
+				fragment.setTargetFragment(targetFragment, REQUEST_CODE);
+				fragment.setLocationsHolder(locationsHolder);
 				fm.beginTransaction()
 						.replace(R.id.fragmentContainer, fragment, TAG)
 						.addToBackStack(TAG)
@@ -254,29 +314,94 @@ public class GpxApproximationFragment extends ContextMenuScrollFragment
 		}
 	}
 
-	@Override
-	public void onSliderChange(int sliderValue) {
-		Fragment fragment = getTargetFragment();
-		if (fragment instanceof GpxApproximationFragmentListener) {
-			((GpxApproximationFragmentListener) fragment).onChangeGpxApproxDistanceThreshold(snapToRoadAppMode, sliderValue);
-			distanceThreshold = sliderValue;
+	public void calculateGpxApproximation() {
+		if (gpxApproximator != null) {
+			try {
+				gpxApproximator.setMode(snapToRoadAppMode);
+				gpxApproximator.setPointApproximation(distanceThreshold);
+				approximateGpx();
+			} catch (Exception e) {
+				LOG.error(e.getMessage(), e);
+			}
 		}
 	}
 
+	@Override
+	public void onSliderChange(int sliderValue) {
+		distanceThreshold = sliderValue;
+		calculateGpxApproximation();
+	}
+
 	@Override
 	public void onProfileSelect(ApplicationMode applicationMode) {
-		Fragment fragment = getTargetFragment();
-		if (fragment instanceof GpxApproximationFragmentListener) {
-			((GpxApproximationFragmentListener) fragment).onChangeGpxApproxDistanceThreshold(applicationMode, distanceThreshold);
-			snapToRoadAppMode = applicationMode;
+		snapToRoadAppMode = applicationMode;
+		calculateGpxApproximation();
+	}
+
+	public LocationsHolder getLocationsHolder() {
+		return locationsHolder;
+	}
+
+	public void setLocationsHolder(LocationsHolder locationsHolder) {
+		this.locationsHolder = locationsHolder;
+	}
+
+	public void startProgress() {
+		if (progressBar != null) {
+			progressBar.setProgress(0);
+			progressBar.setVisibility(View.VISIBLE);
+		}
+	}
+
+	public void finishProgress() {
+		if (progressBar != null) {
+			progressBar.setVisibility(View.GONE);
+		}
+	}
+
+	public void updateProgress(int progress) {
+		if (progressBar != null) {
+			if (progressBar.getVisibility() != View.VISIBLE) {
+				progressBar.setVisibility(View.VISIBLE);
+			}
+			progressBar.setProgress(progress);
+		}
+	}
+
+	private void approximateGpx() {
+		if (gpxApproximator != null) {
+			gpxApproximator.calculateGpxApproximation(new ResultMatcher<GpxRouteApproximation>() {
+				@Override
+				public boolean publish(final GpxRouteApproximation gpxApproximation) {
+					OsmandApplication app = getMyApplication();
+					if (app != null) {
+						app.runInUIThread(new Runnable() {
+							@Override
+							public void run() {
+								Fragment fragment = getTargetFragment();
+								if (fragment instanceof GpxApproximationFragmentListener) {
+									((GpxApproximationFragmentListener) fragment).onGpxApproximationDone(gpxApproximation);
+								}
+							}
+						});
+						return true;
+					}
+					return false;
+				}
+
+				@Override
+				public boolean isCancelled() {
+					return false;
+				}
+			});
 		}
 	}
 
 	public interface GpxApproximationFragmentListener {
 
-		void onChangeGpxApproxDistanceThreshold(ApplicationMode mode, int distanceThreshold);
+		void onGpxApproximationDone(GpxRouteApproximation gpxApproximation);
 
-		void onApplyGpxApproximation(ApplicationMode mode, int distanceThreshold);
+		void onApplyGpxApproximation();
 
 		void onCancelGpxApproximation();
 	}
diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
index a0590f77f7..1b289e0149 100644
--- a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
@@ -61,6 +61,7 @@ import net.osmand.plus.activities.MapActivity;
 import net.osmand.plus.activities.TrackActivity;
 import net.osmand.plus.base.BaseOsmAndFragment;
 import net.osmand.plus.helpers.AndroidUiHelper;
+import net.osmand.plus.measurementtool.GpxApproximationFragment.GpxApproximationFragmentListener;
 import net.osmand.plus.measurementtool.NewGpxData.ActionType;
 import net.osmand.plus.measurementtool.OptionsBottomSheetDialogFragment.OptionsFragmentListener;
 import net.osmand.plus.measurementtool.RouteBetweenPointsBottomSheetDialogFragment.RouteBetweenPointsFragmentListener;
@@ -73,7 +74,6 @@ import net.osmand.plus.measurementtool.command.ClearPointsCommand;
 import net.osmand.plus.measurementtool.command.MovePointCommand;
 import net.osmand.plus.measurementtool.command.RemovePointCommand;
 import net.osmand.plus.measurementtool.command.ReorderPointCommand;
-import net.osmand.plus.routing.GpxApproximator;
 import net.osmand.plus.settings.backend.ApplicationMode;
 import net.osmand.plus.settings.backend.OsmandSettings;
 import net.osmand.plus.views.controls.ReorderItemTouchHelperCallback;
@@ -84,7 +84,6 @@ import net.osmand.plus.views.mapwidgets.MapInfoWidgetsFactory.TopToolbarView;
 import net.osmand.router.RoutePlannerFrontEnd.GpxRouteApproximation;
 
 import java.io.File;
-import java.io.IOException;
 import java.lang.ref.WeakReference;
 import java.text.MessageFormat;
 import java.text.SimpleDateFormat;
@@ -94,7 +93,6 @@ import java.util.List;
 import java.util.Locale;
 
 import static net.osmand.IndexConstants.GPX_FILE_EXT;
-import static net.osmand.plus.measurementtool.GpxApproximationFragment.GpxApproximationFragmentListener;
 import static net.osmand.plus.measurementtool.MeasurementEditingContext.CalculationType;
 import static net.osmand.plus.measurementtool.MeasurementEditingContext.ExportAsGpxListener;
 import static net.osmand.plus.measurementtool.MeasurementEditingContext.SnapToRoadProgressListener;
@@ -104,7 +102,7 @@ import static net.osmand.plus.measurementtool.SelectFileBottomSheet.SelectFileLi
 import static net.osmand.plus.measurementtool.StartPlanRouteBottomSheet.StartPlanRouteListener;
 
 public class MeasurementToolFragment extends BaseOsmAndFragment implements RouteBetweenPointsFragmentListener,
-		GpxApproximationFragmentListener, OptionsFragmentListener {
+		OptionsFragmentListener, GpxApproximationFragmentListener {
 
 	public static final String TAG = MeasurementToolFragment.class.getSimpleName();
 
@@ -138,7 +136,6 @@ public class MeasurementToolFragment extends BaseOsmAndFragment implements Route
 	private boolean gpxPointsAdded;
 
 	private MeasurementEditingContext editingCtx = new MeasurementEditingContext();
-	private GpxApproximator gpxApproximator;
 
 	private LatLon initialPoint;
 
@@ -547,39 +544,6 @@ public class MeasurementToolFragment extends BaseOsmAndFragment implements Route
 		return R.color.status_bar_transparent_gradient;
 	}
 
-	private void approximateGpx() {
-		if (gpxApproximator != null) {
-			try {
-				GpxRouteApproximation gpxApproximation = gpxApproximator.calculateGpxApproximation();
-				displayApproximatedPoints(gpxApproximation);
-			} catch (IOException e) {
-			} catch (InterruptedException e) {
-			}
-		}
-	}
-
-	@Override
-	public void onChangeGpxApproxDistanceThreshold(ApplicationMode mode, int distanceThreshold) {
-		if (gpxApproximator != null) {
-			try {
-				gpxApproximator.setMode(mode);
-				gpxApproximator.setPointApproximation(distanceThreshold);
-				approximateGpx();
-			} catch (IOException e) {
-			}
-		}
-	}
-
-	@Override
-	public void onApplyGpxApproximation(ApplicationMode mode, int distanceThreshold) {
-
-	}
-
-	@Override
-	public void onCancelGpxApproximation() {
-
-	}
-
 	@Nullable
 	private MapActivity getMapActivity() {
 		Activity activity = getActivity();
@@ -659,13 +623,8 @@ public class MeasurementToolFragment extends BaseOsmAndFragment implements Route
 				case SnapTrackWarningBottomSheet.CONTINUE_REQUEST_CODE:
 					MapActivity mapActivity = getMapActivity();
 					if (mapActivity != null) {
-						try {
-							gpxApproximator = new GpxApproximator(requireMyApplication(), new LocationsHolder(editingCtx.getPoints()));
-							GpxApproximationFragment.showInstance(mapActivity.getSupportFragmentManager(),
-									this, gpxApproximator.getMode(), (int) gpxApproximator.getPointApproximation());
-						} catch (IOException e) {
-
-						}
+						GpxApproximationFragment.showInstance(mapActivity.getSupportFragmentManager(),
+								this, new LocationsHolder(editingCtx.getPoints()));
 					}
 					break;
 			}
@@ -1098,7 +1057,7 @@ public class MeasurementToolFragment extends BaseOsmAndFragment implements Route
 		}
 	}
 
-	private void displayApproximatedPoints(GpxRouteApproximation gpxApproximation) {
+	public void displayApproximatedPoints(GpxRouteApproximation gpxApproximation) {
 		MeasurementToolLayer measurementLayer = getMeasurementLayer();
 		if (measurementLayer != null) {
 			editingCtx.setPoints(gpxApproximation);
@@ -1968,4 +1927,19 @@ public class MeasurementToolFragment extends BaseOsmAndFragment implements Route
 			return NO_COLOR;
 		}
 	}
+
+	@Override
+	public void onGpxApproximationDone(GpxRouteApproximation gpxApproximation) {
+		displayApproximatedPoints(gpxApproximation);
+	}
+
+	@Override
+	public void onApplyGpxApproximation() {
+
+	}
+
+	@Override
+	public void onCancelGpxApproximation() {
+
+	}
 }
diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/SliderCard.java b/OsmAnd/src/net/osmand/plus/measurementtool/SliderCard.java
index ce4e098716..b496c935fb 100644
--- a/OsmAnd/src/net/osmand/plus/measurementtool/SliderCard.java
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/SliderCard.java
@@ -46,9 +46,19 @@ public class SliderCard extends BaseCard {
 				if (fromUser) {
 					String valueStr = getStringValueWithMetric((int) value);
 					thresholdDistanceValue.setText(valueStr);
-					if (listener != null) {
-						listener.onSliderChange((int) value);
-					}
+				}
+			}
+		});
+		slider.addOnSliderTouchListener(new Slider.OnSliderTouchListener() {
+			@Override
+			public void onStartTrackingTouch(@NonNull Slider slider) {
+
+			}
+
+			@Override
+			public void onStopTrackingTouch(@NonNull Slider slider) {
+				if (listener != null) {
+					listener.onSliderChange((int) slider.getValue());
 				}
 			}
 		});
diff --git a/OsmAnd/src/net/osmand/plus/routing/GpxApproximator.java b/OsmAnd/src/net/osmand/plus/routing/GpxApproximator.java
index 318fbd63e9..60f43050b8 100644
--- a/OsmAnd/src/net/osmand/plus/routing/GpxApproximator.java
+++ b/OsmAnd/src/net/osmand/plus/routing/GpxApproximator.java
@@ -1,18 +1,35 @@
 package net.osmand.plus.routing;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
 import net.osmand.LocationsHolder;
+import net.osmand.PlatformUtil;
+import net.osmand.ResultMatcher;
 import net.osmand.data.LatLon;
 import net.osmand.plus.OsmandApplication;
+import net.osmand.plus.measurementtool.GpxApproximationFragment;
 import net.osmand.plus.routing.RouteProvider.RoutingEnvironment;
 import net.osmand.plus.settings.backend.ApplicationMode;
+import net.osmand.router.RouteCalculationProgress;
+import net.osmand.router.RoutePlannerFrontEnd;
 import net.osmand.router.RoutePlannerFrontEnd.GpxPoint;
 import net.osmand.router.RoutePlannerFrontEnd.GpxRouteApproximation;
+import net.osmand.search.core.SearchResult;
+
+import org.apache.commons.logging.Log;
 
 import java.io.IOException;
+import java.util.ArrayList;
 import java.util.List;
+import java.util.concurrent.LinkedBlockingQueue;
+import java.util.concurrent.ThreadPoolExecutor;
+import java.util.concurrent.TimeUnit;
 
 public class GpxApproximator {
 
+	protected static final Log log = PlatformUtil.getLog(GpxApproximator.class);
+
 	private OsmandApplication ctx;
 	private RoutingHelper routingHelper;
 
@@ -23,8 +40,21 @@ public class GpxApproximator {
 	private List<GpxPoint> points;
 	private LatLon start;
 	private LatLon end;
+	private double pointApproximation = 50;
 
-	public GpxApproximator(OsmandApplication ctx, LocationsHolder locationsHolder) throws IOException {
+	private ThreadPoolExecutor singleThreadedExecutor;
+	private GpxApproximationProgressCallback approximationProgress;
+
+	public interface GpxApproximationProgressCallback {
+
+		void start();
+
+		void updateProgress(int progress);
+
+		void finish();
+	}
+
+	public GpxApproximator(@NonNull OsmandApplication ctx, @NonNull LocationsHolder locationsHolder) throws IOException {
 		this.ctx = ctx;
 		this.locationsHolder = locationsHolder;
 		this.routingHelper = ctx.getRoutingHelper();
@@ -33,26 +63,48 @@ public class GpxApproximator {
 			start = locationsHolder.getLatLon(0);
 			end = locationsHolder.getLatLon(locationsHolder.getSize() - 1);
 			prepareEnvironment(ctx, mode);
-			this.points = routingHelper.generateGpxPoints(env, gctx, locationsHolder);
 		}
+		init();
 	}
 
-	public GpxApproximator(OsmandApplication ctx, ApplicationMode mode, double pointApproximation, LocationsHolder locationsHolder) throws IOException {
+	public GpxApproximator(@NonNull OsmandApplication ctx, @NonNull ApplicationMode mode, double pointApproximation, @NonNull LocationsHolder locationsHolder) throws IOException {
 		this.ctx = ctx;
+		this.locationsHolder = locationsHolder;
+		this.pointApproximation = pointApproximation;
 		this.routingHelper = ctx.getRoutingHelper();
 		this.mode = mode;
 		if (locationsHolder.getSize() > 1) {
 			start = locationsHolder.getLatLon(0);
 			end = locationsHolder.getLatLon(locationsHolder.getSize() - 1);
 			prepareEnvironment(ctx, mode);
-			gctx.MINIMUM_POINT_APPROXIMATION = pointApproximation;
-			this.points = routingHelper.generateGpxPoints(env, gctx, locationsHolder);
 		}
+		init();
 	}
 
-	private void prepareEnvironment(OsmandApplication ctx, ApplicationMode mode) throws IOException {
+	private void init() {
+		singleThreadedExecutor = new ThreadPoolExecutor(1, 1, 0L, TimeUnit.MILLISECONDS, new LinkedBlockingQueue<Runnable>());
+	}
+
+	private void prepareEnvironment(@NonNull OsmandApplication ctx, @NonNull ApplicationMode mode) throws IOException {
 		this.env = routingHelper.getRoutingEnvironment(ctx, mode, start, end);
-		this.gctx = new GpxRouteApproximation(env.getCtx());
+	}
+
+	private GpxRouteApproximation getNewGpxApproximationContext(@Nullable GpxRouteApproximation gctx) {
+		GpxRouteApproximation newContext = gctx != null ? new GpxRouteApproximation(gctx) : new GpxRouteApproximation(env.getCtx());
+		newContext.ctx.calculationProgress = new RouteCalculationProgress();
+		newContext.MINIMUM_POINT_APPROXIMATION = pointApproximation;
+		return newContext;
+	}
+
+	private List<GpxPoint> getPoints() {
+		if (points == null) {
+			points = routingHelper.generateGpxPoints(env, getNewGpxApproximationContext(null), locationsHolder);
+		}
+		List<GpxPoint> points = new ArrayList<>(this.points.size());
+		for (GpxPoint p : this.points) {
+			points.add(new GpxPoint(p));
+		}
+		return points;
 	}
 
 	public ApplicationMode getMode() {
@@ -68,18 +120,82 @@ public class GpxApproximator {
 	}
 
 	public double getPointApproximation() {
-		return gctx.MINIMUM_POINT_APPROXIMATION;
+		return pointApproximation;
 	}
 
 	public void setPointApproximation(double pointApproximation) {
-		gctx.MINIMUM_POINT_APPROXIMATION = pointApproximation;
+		this.pointApproximation = pointApproximation;
 	}
 
 	public LocationsHolder getLocationsHolder() {
 		return locationsHolder;
 	}
 
-	public GpxRouteApproximation calculateGpxApproximation() throws IOException, InterruptedException {
-		return routingHelper.calculateGpxApproximation(env, gctx, points);
+	public GpxApproximationProgressCallback getApproximationProgress() {
+		return approximationProgress;
+	}
+
+	public void setApproximationProgress(GpxApproximationProgressCallback approximationProgress) {
+		this.approximationProgress = approximationProgress;
+	}
+
+	public void calculateGpxApproximation(@NonNull final ResultMatcher<GpxRouteApproximation> resultMatcher) {
+		if (gctx != null) {
+			gctx.calculationCancelled = true;
+		}
+		final GpxRouteApproximation gctx = getNewGpxApproximationContext(this.gctx);
+		this.gctx = gctx;
+		startProgress();
+		updateProgress(gctx);
+		singleThreadedExecutor.submit(new Runnable() {
+			@Override
+			public void run() {
+				try {
+					routingHelper.calculateGpxApproximation(env, gctx, getPoints(), resultMatcher);
+				} catch (Exception e) {
+					resultMatcher.publish(null);
+					log.error(e.getMessage(), e);
+				}
+			}
+		});
+	}
+
+	private void startProgress() {
+		final GpxApproximationProgressCallback approximationProgress = this.approximationProgress;
+		if (approximationProgress != null) {
+			approximationProgress.start();
+		}
+	}
+
+	private void finishProgress() {
+		final GpxApproximationProgressCallback approximationProgress = this.approximationProgress;
+		if (approximationProgress != null) {
+			approximationProgress.finish();
+		}
+	}
+
+	private void updateProgress(@NonNull final GpxRouteApproximation gctx) {
+		final GpxApproximationProgressCallback approximationProgress = this.approximationProgress;
+		if (approximationProgress != null) {
+			ctx.runInUIThread(new Runnable() {
+
+				@Override
+				public void run() {
+					RouteCalculationProgress calculationProgress = gctx.ctx.calculationProgress;
+					if (gctx.isCalculationDone() && GpxApproximator.this.gctx == gctx) {
+						finishProgress();
+					}
+					if (!gctx.isCalculationDone() && calculationProgress != null && !calculationProgress.isCancelled) {
+						float pr = calculationProgress.getLinearProgress();
+						approximationProgress.updateProgress((int) pr);
+						if (GpxApproximator.this.gctx != gctx) {
+							// different calculation started
+						} else {
+							updateProgress(gctx);
+						}
+					}
+				}
+			}, 300);
+		}
 	}
 }
diff --git a/OsmAnd/src/net/osmand/plus/routing/RouteProvider.java b/OsmAnd/src/net/osmand/plus/routing/RouteProvider.java
index 6aaac45c1d..9433e325f6 100644
--- a/OsmAnd/src/net/osmand/plus/routing/RouteProvider.java
+++ b/OsmAnd/src/net/osmand/plus/routing/RouteProvider.java
@@ -15,6 +15,7 @@ import net.osmand.GPXUtilities.WptPt;
 import net.osmand.Location;
 import net.osmand.LocationsHolder;
 import net.osmand.PlatformUtil;
+import net.osmand.ResultMatcher;
 import net.osmand.binary.BinaryMapIndexReader;
 import net.osmand.data.LatLon;
 import net.osmand.data.LocationPoint;
@@ -716,13 +717,8 @@ public class RouteProvider {
 		return env.router.generateGpxPoints(gctx, locationsHolder);
 	}
 
-	public GpxRouteApproximation calculateGpxPointsApproximation(RoutingEnvironment env, GpxRouteApproximation gctx, List<GpxPoint> points) throws IOException, InterruptedException {
-		if (points != null && points.size() > 1) {
-			if (!Algorithms.isEmpty(points)) {
-				return env.router.searchGpxRoute(gctx, points);
-			}
-		}
-		return null;
+	public GpxRouteApproximation calculateGpxPointsApproximation(RoutingEnvironment env, GpxRouteApproximation gctx, List<GpxPoint> points, ResultMatcher<GpxRouteApproximation> resultMatcher) throws IOException, InterruptedException {
+		return env.router.searchGpxRoute(gctx, points, resultMatcher);
 	}
 
 	protected RoutingEnvironment calculateRoutingEnvironment(RouteCalculationParams params, boolean calcGPXRoute, boolean skipComplex) throws IOException {
diff --git a/OsmAnd/src/net/osmand/plus/routing/RoutingHelper.java b/OsmAnd/src/net/osmand/plus/routing/RoutingHelper.java
index 0899b586a9..25727f86ea 100644
--- a/OsmAnd/src/net/osmand/plus/routing/RoutingHelper.java
+++ b/OsmAnd/src/net/osmand/plus/routing/RoutingHelper.java
@@ -7,6 +7,7 @@ import net.osmand.GPXUtilities.WptPt;
 import net.osmand.Location;
 import net.osmand.LocationsHolder;
 import net.osmand.PlatformUtil;
+import net.osmand.ResultMatcher;
 import net.osmand.ValueHolder;
 import net.osmand.binary.RouteDataObject;
 import net.osmand.data.LatLon;
@@ -1364,8 +1365,8 @@ public class RoutingHelper {
 		return provider.generateGpxPoints(env, gctx, locationsHolder);
 	}
 
-	public GpxRouteApproximation calculateGpxApproximation(RoutingEnvironment env, GpxRouteApproximation gctx, List<GpxPoint> points) throws IOException, InterruptedException {
-		return provider.calculateGpxPointsApproximation(env, gctx, points);
+	public GpxRouteApproximation calculateGpxApproximation(RoutingEnvironment env, GpxRouteApproximation gctx, List<GpxPoint> points, ResultMatcher<GpxRouteApproximation> resultMatcher) throws IOException, InterruptedException {
+		return provider.calculateGpxPointsApproximation(env, gctx, points, resultMatcher);
 	}
 
 	public void notifyIfRouteIsCalculated() {

From 9bed3254b6a7b9d1fc664102c23ea4f6547d49b7 Mon Sep 17 00:00:00 2001
From: TacoTheDank <SkytkRSfan3895@gmail.com>
Date: Tue, 11 Aug 2020 16:52:54 -0400
Subject: [PATCH 16/81] Fix a bunch of deprecations

---
 .../CacheFragmentStatePagerAdapter.java       |  2 +-
 .../activities/EditPOIFilterActivity.java     |  3 +--
 .../activities/FavoritesTreeFragment.java     | 17 ++++++++---------
 .../activities/NavigatePointFragment.java     |  3 +--
 .../OsmandExpandableListActivity.java         |  4 +---
 .../plus/activities/OsmandListActivity.java   |  4 +---
 .../osmand/plus/activities/TabActivity.java   |  2 +-
 .../plus/activities/actions/ShareDialog.java  |  2 +-
 .../search/SearchAddressFragment.java         |  7 +++----
 .../activities/search/SearchPOIActivity.java  | 11 +++++------
 ...AudioVideoNoteRecordingMenuFullScreen.java |  3 +--
 .../audionotes/AudioVideoNotesPlugin.java     |  6 +++---
 .../osmand/plus/base/ContextMenuFragment.java |  2 +-
 .../plus/base/MapViewTrackingUtilities.java   |  2 +-
 .../base/OsmandExpandableListFragment.java    |  3 +--
 .../plus/dashboard/DashBaseFragment.java      | 19 ++++++++++---------
 .../plus/dashboard/DashErrorFragment.java     | 10 ++++------
 .../osmand/plus/dashboard/DashboardOnMap.java |  2 +-
 .../DashboardSettingsDialogFragment.java      |  7 +++----
 .../plus/development/TestVoiceActivity.java   | 10 +++++-----
 .../dialogs/HelpArticleDialogFragment.java    | 17 +----------------
 .../plus/download/DownloadActivity.java       |  2 +-
 .../ui/DownloadResourceGroupFragment.java     |  5 ++---
 .../download/ui/LocalIndexesFragment.java     |  4 ++--
 .../plus/liveupdates/OsmLiveActivity.java     |  2 +-
 .../plus/mapcontextmenu/MenuBuilder.java      |  2 +-
 .../mapmarkers/MapMarkersDialogFragment.java  |  2 +-
 .../adapters/MapMarkersActiveAdapter.java     |  3 +--
 .../adapters/MapMarkersListAdapter.java       |  3 +--
 .../adapter/MeasurementToolAdapter.java       |  3 +--
 .../plus/myplaces/AvailableGPXFragment.java   | 19 +++++++++----------
 .../plus/myplaces/TrackPointFragment.java     |  3 +--
 .../plus/myplaces/TrackSegmentFragment.java   | 10 ++++------
 .../plus/osmedit/EditPoiDialogFragment.java   |  8 +-------
 .../plus/poi/RearrangePoiFiltersFragment.java |  3 +--
 .../plus/profiles/EditProfilesFragment.java   |  3 +--
 .../quickaction/QuickActionListFragment.java  |  3 +--
 .../plus/quickaction/SwitchableAction.java    |  3 +--
 .../ChooseRouteFragment.java                  |  2 +-
 .../search/QuickSearchDialogFragment.java     |  2 +-
 .../fragments/RearrangeMenuItemsAdapter.java  |  3 +--
 .../plus/views/controls/DynamicListView.java  |  2 +-
 .../views/controls/PagerSlidingTabStrip.java  |  9 ++++-----
 .../SwipeDismissListViewTouchListener.java    |  8 ++++----
 .../plus/views/layers/MapControlsLayer.java   |  4 ++--
 .../mapwidgets/MapInfoWidgetsFactory.java     |  2 +-
 .../plus/widgets/InterceptorFrameLayout.java  |  4 +---
 .../tools/ExtendedBottomSheetBehavior.java    |  8 ++++----
 .../tools/SwipeDismissTouchListener.java      |  4 ++--
 .../mapcontextmenu/ContextMenuHelper.java     | 19 ++-----------------
 .../sample1/mapcontextmenu/MenuBuilder.java   |  2 +-
 51 files changed, 109 insertions(+), 174 deletions(-)

diff --git a/OsmAnd/src/com/github/ksoichiro/android/observablescrollview/CacheFragmentStatePagerAdapter.java b/OsmAnd/src/com/github/ksoichiro/android/observablescrollview/CacheFragmentStatePagerAdapter.java
index cade4e117e..ae5719d99a 100644
--- a/OsmAnd/src/com/github/ksoichiro/android/observablescrollview/CacheFragmentStatePagerAdapter.java
+++ b/OsmAnd/src/com/github/ksoichiro/android/observablescrollview/CacheFragmentStatePagerAdapter.java
@@ -43,7 +43,7 @@ public abstract class CacheFragmentStatePagerAdapter extends FragmentStatePagerA
     private SparseArray<Fragment> mPages;
 
     public CacheFragmentStatePagerAdapter(FragmentManager fm) {
-        super(fm);
+        super(fm, BEHAVIOR_RESUME_ONLY_CURRENT_FRAGMENT);
         mPages = new SparseArray<Fragment>();
         mFm = fm;
     }
diff --git a/OsmAnd/src/net/osmand/plus/activities/EditPOIFilterActivity.java b/OsmAnd/src/net/osmand/plus/activities/EditPOIFilterActivity.java
index 5daa64977f..336e53aa7d 100644
--- a/OsmAnd/src/net/osmand/plus/activities/EditPOIFilterActivity.java
+++ b/OsmAnd/src/net/osmand/plus/activities/EditPOIFilterActivity.java
@@ -19,7 +19,6 @@ import android.widget.ListView;
 import android.widget.TextView;
 
 import androidx.appcompat.app.AlertDialog;
-import androidx.core.view.MenuItemCompat;
 
 import net.osmand.osm.PoiCategory;
 import net.osmand.osm.PoiType;
@@ -102,7 +101,7 @@ public class EditPOIFilterActivity extends OsmandListActivity {
 		createMenuItem(menu, FILTER, R.string.filter_current_poiButton, 
 				R.drawable.ic_action_done, 
 				//R.drawable.a_1_navigation_accept_light, R.drawable.a_1_navigation_accept_dark,
-				MenuItemCompat.SHOW_AS_ACTION_WITH_TEXT | MenuItemCompat.SHOW_AS_ACTION_ALWAYS);
+				MenuItem.SHOW_AS_ACTION_WITH_TEXT | MenuItem.SHOW_AS_ACTION_ALWAYS);
 		return super.onCreateOptionsMenu(menu);
 	}	
 	
diff --git a/OsmAnd/src/net/osmand/plus/activities/FavoritesTreeFragment.java b/OsmAnd/src/net/osmand/plus/activities/FavoritesTreeFragment.java
index f04b727d5f..696f6cc26c 100644
--- a/OsmAnd/src/net/osmand/plus/activities/FavoritesTreeFragment.java
+++ b/OsmAnd/src/net/osmand/plus/activities/FavoritesTreeFragment.java
@@ -32,7 +32,6 @@ import androidx.appcompat.app.AlertDialog;
 import androidx.appcompat.content.res.AppCompatResources;
 import androidx.appcompat.view.ActionMode;
 import androidx.core.content.ContextCompat;
-import androidx.core.view.MenuItemCompat;
 
 import net.osmand.AndroidUtils;
 import net.osmand.Location;
@@ -435,7 +434,7 @@ public class FavoritesTreeFragment extends OsmandExpandableListFragment implemen
 	@Override
 	public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
 		menu.clear();
-		MenuItem mi = createMenuItem(menu, SEARCH_ID, R.string.search_poi_filter, R.drawable.ic_action_search_dark, MenuItemCompat.SHOW_AS_ACTION_ALWAYS | MenuItemCompat.SHOW_AS_ACTION_COLLAPSE_ACTION_VIEW);
+		MenuItem mi = createMenuItem(menu, SEARCH_ID, R.string.search_poi_filter, R.drawable.ic_action_search_dark, MenuItem.SHOW_AS_ACTION_ALWAYS | MenuItem.SHOW_AS_ACTION_COLLAPSE_ACTION_VIEW);
 		mi.setOnMenuItemClickListener(new MenuItem.OnMenuItemClickListener() {
 			@Override
 			public boolean onMenuItemClick(MenuItem item) {
@@ -452,11 +451,11 @@ public class FavoritesTreeFragment extends OsmandExpandableListFragment implemen
 		((FavoritesActivity) getActivity()).updateListViewFooter(footerView);
 
 
-		if (!MenuItemCompat.isActionViewExpanded(mi)) {
-			createMenuItem(menu, IMPORT_FAVOURITES_ID, R.string.shared_string_add_to_favorites, R.drawable.ic_action_plus, MenuItemCompat.SHOW_AS_ACTION_ALWAYS);
-			createMenuItem(menu, SHARE_ID, R.string.shared_string_share, R.drawable.ic_action_gshare_dark, MenuItemCompat.SHOW_AS_ACTION_ALWAYS, true);
-			createMenuItem(menu, SELECT_MAP_MARKERS_ID, R.string.select_map_markers, R.drawable.ic_action_flag, MenuItemCompat.SHOW_AS_ACTION_ALWAYS);
-			createMenuItem(menu, DELETE_ID, R.string.shared_string_delete, R.drawable.ic_action_delete_dark, MenuItemCompat.SHOW_AS_ACTION_ALWAYS);
+		if (!mi.isActionViewExpanded()) {
+			createMenuItem(menu, IMPORT_FAVOURITES_ID, R.string.shared_string_add_to_favorites, R.drawable.ic_action_plus, MenuItem.SHOW_AS_ACTION_ALWAYS);
+			createMenuItem(menu, SHARE_ID, R.string.shared_string_share, R.drawable.ic_action_gshare_dark, MenuItem.SHOW_AS_ACTION_ALWAYS, true);
+			createMenuItem(menu, SELECT_MAP_MARKERS_ID, R.string.select_map_markers, R.drawable.ic_action_flag, MenuItem.SHOW_AS_ACTION_ALWAYS);
+			createMenuItem(menu, DELETE_ID, R.string.shared_string_delete, R.drawable.ic_action_delete_dark, MenuItem.SHOW_AS_ACTION_ALWAYS);
 		}
 	}
 
@@ -483,7 +482,7 @@ public class FavoritesTreeFragment extends OsmandExpandableListFragment implemen
 				enableSelectionMode(true);
 				createMenuItem(menu, SELECT_MAP_MARKERS_ACTION_MODE_ID, R.string.select_map_markers,
 						R.drawable.ic_action_flag,
-						MenuItemCompat.SHOW_AS_ACTION_IF_ROOM);
+						MenuItem.SHOW_AS_ACTION_IF_ROOM);
 				favoritesSelected.clear();
 				groupsToDelete.clear();
 				favouritesAdapter.notifyDataSetInvalidated();
@@ -546,7 +545,7 @@ public class FavoritesTreeFragment extends OsmandExpandableListFragment implemen
 				enableSelectionMode(true);
 				createMenuItem(menu, DELETE_ACTION_ID, R.string.shared_string_delete,
 						R.drawable.ic_action_delete_dark,
-						MenuItemCompat.SHOW_AS_ACTION_IF_ROOM);
+						MenuItem.SHOW_AS_ACTION_IF_ROOM);
 				favoritesSelected.clear();
 				groupsToDelete.clear();
 				favouritesAdapter.notifyDataSetInvalidated();
diff --git a/OsmAnd/src/net/osmand/plus/activities/NavigatePointFragment.java b/OsmAnd/src/net/osmand/plus/activities/NavigatePointFragment.java
index 1fa7cc88b0..0d88642e4b 100644
--- a/OsmAnd/src/net/osmand/plus/activities/NavigatePointFragment.java
+++ b/OsmAnd/src/net/osmand/plus/activities/NavigatePointFragment.java
@@ -18,7 +18,6 @@ import android.widget.EditText;
 import android.widget.Spinner;
 import android.widget.TextView;
 
-import androidx.core.view.MenuItemCompat;
 import androidx.fragment.app.Fragment;
 
 import com.jwetherell.openmap.common.LatLonPoint;
@@ -106,7 +105,7 @@ public class NavigatePointFragment extends Fragment implements SearchActivityChi
 			light = false;
 		}
 		MenuItem menuItem = menu.add(0, SHOW_ON_MAP, 0, R.string.shared_string_show_on_map);
-		MenuItemCompat.setShowAsAction(menuItem, MenuItemCompat.SHOW_AS_ACTION_ALWAYS);
+		menuItem.setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS);
 		menuItem = menuItem.setIcon(app.getUIUtilities().getIcon(R.drawable.ic_action_marker_dark, light));
 
 		menuItem.setOnMenuItemClickListener(new OnMenuItemClickListener() {
diff --git a/OsmAnd/src/net/osmand/plus/activities/OsmandExpandableListActivity.java b/OsmAnd/src/net/osmand/plus/activities/OsmandExpandableListActivity.java
index c1548e4add..a0d46c50e0 100644
--- a/OsmAnd/src/net/osmand/plus/activities/OsmandExpandableListActivity.java
+++ b/OsmAnd/src/net/osmand/plus/activities/OsmandExpandableListActivity.java
@@ -10,8 +10,6 @@ import android.view.MenuItem;
 import android.view.View;
 import android.widget.ExpandableListView;
 
-import androidx.core.view.MenuItemCompat;
-
 import net.osmand.plus.OsmandApplication;
 import net.osmand.plus.R;
 
@@ -64,7 +62,7 @@ public abstract class OsmandExpandableListActivity extends
 				return onOptionsItemSelected(item);
 			}
 		});
-		MenuItemCompat.setShowAsAction(menuItem, menuItemType);
+		menuItem.setShowAsAction(menuItemType);
 		return menuItem;
 	}
 
diff --git a/OsmAnd/src/net/osmand/plus/activities/OsmandListActivity.java b/OsmAnd/src/net/osmand/plus/activities/OsmandListActivity.java
index c601f735a6..0416827447 100644
--- a/OsmAnd/src/net/osmand/plus/activities/OsmandListActivity.java
+++ b/OsmAnd/src/net/osmand/plus/activities/OsmandListActivity.java
@@ -10,8 +10,6 @@ import android.widget.HeaderViewListAdapter;
 import android.widget.ListAdapter;
 import android.widget.ListView;
 
-import androidx.core.view.MenuItemCompat;
-
 import net.osmand.AndroidUtils;
 import net.osmand.plus.OsmandApplication;
 import net.osmand.plus.R;
@@ -68,7 +66,7 @@ public abstract class OsmandListActivity extends
 				return onOptionsItemSelected(item);
 			}
 		});
-		MenuItemCompat.setShowAsAction(menuItem, menuItemType);
+		menuItem.setShowAsAction(menuItemType);
 		return menuItem;
 	}
 
diff --git a/OsmAnd/src/net/osmand/plus/activities/TabActivity.java b/OsmAnd/src/net/osmand/plus/activities/TabActivity.java
index 9dcd547b1e..eca5b2244a 100644
--- a/OsmAnd/src/net/osmand/plus/activities/TabActivity.java
+++ b/OsmAnd/src/net/osmand/plus/activities/TabActivity.java
@@ -39,7 +39,7 @@ public class TabActivity extends ActionBarProgressActivity {
 		private List<TabItem> mTabs;
 
 		public OsmandFragmentPagerAdapter(FragmentManager fm, List<TabItem> items) {
-			super(fm);
+			super(fm, BEHAVIOR_RESUME_ONLY_CURRENT_FRAGMENT);
 			mTabs = items;
 		}
 
diff --git a/OsmAnd/src/net/osmand/plus/activities/actions/ShareDialog.java b/OsmAnd/src/net/osmand/plus/activities/actions/ShareDialog.java
index 5b81f8b505..4858e3ccfe 100644
--- a/OsmAnd/src/net/osmand/plus/activities/actions/ShareDialog.java
+++ b/OsmAnd/src/net/osmand/plus/activities/actions/ShareDialog.java
@@ -2,6 +2,7 @@ package net.osmand.plus.activities.actions;
 
 import android.app.Activity;
 import android.content.ActivityNotFoundException;
+import android.content.ClipboardManager;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
@@ -9,7 +10,6 @@ import android.content.pm.PackageManager;
 import android.content.pm.ResolveInfo;
 import android.net.Uri;
 import android.os.Bundle;
-import android.text.ClipboardManager;
 import android.text.Html;
 import android.widget.Toast;
 
diff --git a/OsmAnd/src/net/osmand/plus/activities/search/SearchAddressFragment.java b/OsmAnd/src/net/osmand/plus/activities/search/SearchAddressFragment.java
index 77864a482d..1e0639a5f6 100644
--- a/OsmAnd/src/net/osmand/plus/activities/search/SearchAddressFragment.java
+++ b/OsmAnd/src/net/osmand/plus/activities/search/SearchAddressFragment.java
@@ -16,7 +16,6 @@ import android.widget.RadioGroup;
 import android.widget.TextView;
 import android.widget.Toast;
 
-import androidx.core.view.MenuItemCompat;
 import androidx.fragment.app.Fragment;
 
 import net.osmand.data.LatLon;
@@ -82,7 +81,7 @@ public class SearchAddressFragment extends Fragment {
 		}
 		if(getActivity() instanceof SearchAddressActivity) {
 			MenuItem menuItem = menu.add(0, SELECT_POINT, 0, "");
-			MenuItemCompat.setShowAsAction(menuItem, MenuItemCompat.SHOW_AS_ACTION_ALWAYS);
+			menuItem.setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS);
 			if (getApplication().accessibilityEnabled())
 				menuItem.setTitle(R.string.shared_string_ok);
 			menuItem = menuItem.setIcon(R.drawable.ic_action_done);
@@ -95,7 +94,7 @@ public class SearchAddressFragment extends Fragment {
 			});
 		} else {
 			MenuItem menuItem = menu.add(0, SHOW_ON_MAP, 0, R.string.shared_string_show_on_map);
-			MenuItemCompat.setShowAsAction(menuItem, MenuItemCompat.SHOW_AS_ACTION_ALWAYS);
+			menuItem.setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS);
 			menuItem = menuItem.setIcon(R.drawable.ic_action_marker_dark);
 
 			menuItem.setOnMenuItemClickListener(new OnMenuItemClickListener() {
@@ -107,7 +106,7 @@ public class SearchAddressFragment extends Fragment {
 			});
 			if (ENABLE_ONLINE_ADDRESS) {
 				menuItem = menu.add(0, ONLINE_SEARCH, 0, R.string.search_online_address);
-				MenuItemCompat.setShowAsAction(menuItem, MenuItemCompat.SHOW_AS_ACTION_ALWAYS);
+				menuItem.setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS);
 				menuItem = menuItem.setIcon(R.drawable.ic_world_globe_dark);
 				menuItem.setOnMenuItemClickListener(new OnMenuItemClickListener() {
 					@Override
diff --git a/OsmAnd/src/net/osmand/plus/activities/search/SearchPOIActivity.java b/OsmAnd/src/net/osmand/plus/activities/search/SearchPOIActivity.java
index 727c67ce43..2fe94a5ed9 100644
--- a/OsmAnd/src/net/osmand/plus/activities/search/SearchPOIActivity.java
+++ b/OsmAnd/src/net/osmand/plus/activities/search/SearchPOIActivity.java
@@ -34,7 +34,6 @@ import android.widget.Toast;
 import androidx.appcompat.app.AlertDialog;
 import androidx.appcompat.widget.PopupMenu;
 import androidx.appcompat.widget.Toolbar;
-import androidx.core.view.MenuItemCompat;
 import androidx.core.view.ViewCompat;
 
 import net.osmand.Location;
@@ -124,7 +123,7 @@ public class SearchPOIActivity extends OsmandListActivity implements OsmAndCompa
 	public boolean onCreateOptionsMenu(Menu omenu) {
 		Menu menu = getClearToolbar(true).getMenu();
 		searchPOILevel = menu.add(0, SEARCH_MORE, 0, R.string.search_POI_level_btn);
-		MenuItemCompat.setShowAsAction(searchPOILevel, MenuItemCompat.SHOW_AS_ACTION_ALWAYS);
+		searchPOILevel.setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS);
 		searchPOILevel.setOnMenuItemClickListener(new OnMenuItemClickListener() {
 			@Override
 			public boolean onMenuItemClick(MenuItem item) {
@@ -133,7 +132,7 @@ public class SearchPOIActivity extends OsmandListActivity implements OsmAndCompa
 
 		});
 		showFilterItem = menu.add(0, FILTER, 0, R.string.search_poi_filter);
-		MenuItemCompat.setShowAsAction(showFilterItem, MenuItemCompat.SHOW_AS_ACTION_ALWAYS);
+		showFilterItem.setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS);
 		showFilterItem = showFilterItem.setIcon(getMyApplication().getUIUtilities().getIcon(
 				R.drawable.ic_action_filter_dark));
 		showFilterItem.setOnMenuItemClickListener(new OnMenuItemClickListener() {
@@ -156,7 +155,7 @@ public class SearchPOIActivity extends OsmandListActivity implements OsmAndCompa
 		});
 
 		showOnMapItem = menu.add(0, SHOW_ON_MAP, 0, R.string.shared_string_show_on_map);
-		MenuItemCompat.setShowAsAction(showOnMapItem, MenuItemCompat.SHOW_AS_ACTION_ALWAYS);
+		showOnMapItem.setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS);
 		showOnMapItem = showOnMapItem.setIcon(getMyApplication().getUIUtilities().getIcon(
 				R.drawable.ic_show_on_map));
 		showOnMapItem.setOnMenuItemClickListener(new OnMenuItemClickListener() {
@@ -176,10 +175,10 @@ public class SearchPOIActivity extends OsmandListActivity implements OsmAndCompa
 		showOnMapItem.setEnabled(!isNameSearch() || amenityAdapter.getCount() > 0);
 		if (filter != null && !isNameSearch()) {
 			createMenuItem(omenu, SAVE_FILTER, R.string.edit_filter_save_as_menu_item, R.drawable.ic_action_favorite,
-					MenuItemCompat.SHOW_AS_ACTION_IF_ROOM);
+					MenuItem.SHOW_AS_ACTION_IF_ROOM);
 			if (!filter.isStandardFilter()) {
 				createMenuItem(omenu, DELETE_FILTER, R.string.shared_string_delete, R.drawable.ic_action_delete_dark,
-						MenuItemCompat.SHOW_AS_ACTION_IF_ROOM);
+						MenuItem.SHOW_AS_ACTION_IF_ROOM);
 			}
 		}
 		updateButtonState(false);
diff --git a/OsmAnd/src/net/osmand/plus/audionotes/AudioVideoNoteRecordingMenuFullScreen.java b/OsmAnd/src/net/osmand/plus/audionotes/AudioVideoNoteRecordingMenuFullScreen.java
index 1f6953928d..0a859ed167 100644
--- a/OsmAnd/src/net/osmand/plus/audionotes/AudioVideoNoteRecordingMenuFullScreen.java
+++ b/OsmAnd/src/net/osmand/plus/audionotes/AudioVideoNoteRecordingMenuFullScreen.java
@@ -12,7 +12,6 @@ import android.view.animation.LinearInterpolator;
 import android.widget.ImageView;
 import android.widget.ProgressBar;
 
-import androidx.core.view.ViewCompat;
 import androidx.fragment.app.Fragment;
 
 import net.osmand.plus.R;
@@ -129,7 +128,7 @@ public class AudioVideoNoteRecordingMenuFullScreen extends AudioVideoNoteRecordi
 		stopProgress();
 
 		progressBar.setProgress(0);
-		ViewCompat.setAlpha(progressBar, 1f);
+		progressBar.setAlpha(1f);
 		progressBar.setVisibility(View.VISIBLE);
 
 		animatorCompat = ValueAnimator.ofInt(0);
diff --git a/OsmAnd/src/net/osmand/plus/audionotes/AudioVideoNotesPlugin.java b/OsmAnd/src/net/osmand/plus/audionotes/AudioVideoNotesPlugin.java
index b62e1152af..e57d86139a 100644
--- a/OsmAnd/src/net/osmand/plus/audionotes/AudioVideoNotesPlugin.java
+++ b/OsmAnd/src/net/osmand/plus/audionotes/AudioVideoNotesPlugin.java
@@ -1036,11 +1036,11 @@ public class AudioVideoNotesPlugin extends OsmandPlugin {
 			try {
 				Method m = mr.getClass().getDeclaredMethod("setOrientationHint", Integer.TYPE);
 				Display display = ((WindowManager) mapActivity.getSystemService(Context.WINDOW_SERVICE)).getDefaultDisplay();
-				if (display.getOrientation() == Surface.ROTATION_0) {
+				if (display.getRotation() == Surface.ROTATION_0) {
 					m.invoke(mr, 90);
-				} else if (display.getOrientation() == Surface.ROTATION_270) {
+				} else if (display.getRotation() == Surface.ROTATION_270) {
 					m.invoke(mr, 180);
-				} else if (display.getOrientation() == Surface.ROTATION_180) {
+				} else if (display.getRotation() == Surface.ROTATION_180) {
 					m.invoke(mr, 270);
 				}
 			} catch (Exception e) {
diff --git a/OsmAnd/src/net/osmand/plus/base/ContextMenuFragment.java b/OsmAnd/src/net/osmand/plus/base/ContextMenuFragment.java
index ed85cad88e..de3068cf5a 100644
--- a/OsmAnd/src/net/osmand/plus/base/ContextMenuFragment.java
+++ b/OsmAnd/src/net/osmand/plus/base/ContextMenuFragment.java
@@ -4,10 +4,10 @@ import android.animation.Animator;
 import android.animation.AnimatorListenerAdapter;
 import android.annotation.TargetApi;
 import android.app.Activity;
+import android.content.ClipboardManager;
 import android.content.Context;
 import android.os.Build;
 import android.os.Bundle;
-import android.text.ClipboardManager;
 import android.util.TypedValue;
 import android.view.GestureDetector;
 import android.view.LayoutInflater;
diff --git a/OsmAnd/src/net/osmand/plus/base/MapViewTrackingUtilities.java b/OsmAnd/src/net/osmand/plus/base/MapViewTrackingUtilities.java
index 47bfce169d..d02aa52492 100644
--- a/OsmAnd/src/net/osmand/plus/base/MapViewTrackingUtilities.java
+++ b/OsmAnd/src/net/osmand/plus/base/MapViewTrackingUtilities.java
@@ -101,7 +101,7 @@ public class MapViewTrackingUtilities implements OsmAndLocationListener, IMapLoc
 		if (mapView != null) {
 			WindowManager wm = (WindowManager) app.getSystemService(Context.WINDOW_SERVICE);
 			if (wm != null) {
-				int orientation = wm.getDefaultDisplay().getOrientation();
+				int orientation = wm.getDefaultDisplay().getRotation();
 				app.getLocationProvider().updateScreenOrientation(orientation);
 				mapView.setMapLocationListener(this);
 			}
diff --git a/OsmAnd/src/net/osmand/plus/base/OsmandExpandableListFragment.java b/OsmAnd/src/net/osmand/plus/base/OsmandExpandableListFragment.java
index cc2f0b47af..1db87051fa 100644
--- a/OsmAnd/src/net/osmand/plus/base/OsmandExpandableListFragment.java
+++ b/OsmAnd/src/net/osmand/plus/base/OsmandExpandableListFragment.java
@@ -13,7 +13,6 @@ import android.widget.ExpandableListView;
 import android.widget.ExpandableListView.OnChildClickListener;
 
 import androidx.annotation.NonNull;
-import androidx.core.view.MenuItemCompat;
 
 import net.osmand.AndroidUtils;
 import net.osmand.plus.OsmandApplication;
@@ -106,7 +105,7 @@ public abstract class OsmandExpandableListFragment extends BaseOsmAndFragment
 				return onOptionsItemSelected(item);
 			}
 		});
-		MenuItemCompat.setShowAsAction(menuItem, menuItemType);
+		menuItem.setShowAsAction(menuItemType);
 		return menuItem;
 	}
 
diff --git a/OsmAnd/src/net/osmand/plus/dashboard/DashBaseFragment.java b/OsmAnd/src/net/osmand/plus/dashboard/DashBaseFragment.java
index 7a48d799ee..837dc99f6e 100644
--- a/OsmAnd/src/net/osmand/plus/dashboard/DashBaseFragment.java
+++ b/OsmAnd/src/net/osmand/plus/dashboard/DashBaseFragment.java
@@ -1,6 +1,7 @@
 package net.osmand.plus.dashboard;
 
 import android.app.Activity;
+import android.content.Context;
 import android.content.Intent;
 import android.location.Location;
 import android.os.Bundle;
@@ -9,8 +10,8 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.widget.FrameLayout;
 
+import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
-import androidx.core.view.ViewCompat;
 import androidx.fragment.app.Fragment;
 
 import com.google.android.material.snackbar.Snackbar;
@@ -37,10 +38,10 @@ public abstract class DashBaseFragment extends Fragment {
 	}
 
 	@Override
-	public void onAttach(Activity activity) {
-		super.onAttach(activity);
-		if (activity instanceof MapActivity) {
-			dashboard = ((MapActivity) activity).getDashboard();
+	public void onAttach(@NonNull Context context) {
+		super.onAttach(context);
+		if (context instanceof MapActivity) {
+			dashboard = ((MapActivity) context).getDashboard();
 			dashboard.onAttach(this);
 		}
 	}
@@ -171,8 +172,8 @@ public abstract class DashBaseFragment extends Fragment {
 		@Override
 		public void onDismiss() {
 			dashboardOnMap.blacklistFragmentByTag(fragmentTag);
-			ViewCompat.setTranslationX(fragmentView, 0);
-			ViewCompat.setAlpha(fragmentView, 1);
+			fragmentView.setTranslationX(0);
+			fragmentView.setAlpha(1);
 			Snackbar.make(parentView, dashboardOnMap.getMyApplication().getResources()
 					.getString(R.string.shared_string_card_was_hidden), Snackbar.LENGTH_LONG)
 					.setAction(R.string.shared_string_undo, new View.OnClickListener() {
@@ -186,8 +187,8 @@ public abstract class DashBaseFragment extends Fragment {
 
 		public void onUndo() {
 			dashboardOnMap.unblacklistFragmentClass(fragmentTag);
-			ViewCompat.setTranslationX(fragmentView, 0);
-			ViewCompat.setAlpha(fragmentView, 1);
+			fragmentView.setTranslationX(0);
+			fragmentView.setAlpha(1);
 		}
 	}
 }
diff --git a/OsmAnd/src/net/osmand/plus/dashboard/DashErrorFragment.java b/OsmAnd/src/net/osmand/plus/dashboard/DashErrorFragment.java
index bfc835d510..e41659fb24 100644
--- a/OsmAnd/src/net/osmand/plus/dashboard/DashErrorFragment.java
+++ b/OsmAnd/src/net/osmand/plus/dashboard/DashErrorFragment.java
@@ -9,8 +9,6 @@ import android.widget.Button;
 import android.widget.ImageView;
 import android.widget.TextView;
 
-import androidx.core.view.ViewCompat;
-
 import com.google.android.material.snackbar.Snackbar;
 
 import net.osmand.plus.OsmandApplication;
@@ -98,8 +96,8 @@ public class DashErrorFragment extends DashBaseFragment {
 		@Override
 		public void onDismiss() {
 			dashboardOnMap.hideFragmentByTag(fragmentTag);
-			ViewCompat.setTranslationX(fragmentView, 0);
-			ViewCompat.setAlpha(fragmentView, 1);
+			fragmentView.setTranslationX(0);
+			fragmentView.setAlpha(1);
 			Snackbar.make(parentView, dashboardOnMap.getMyApplication().getResources()
 					.getString(R.string.shared_string_card_was_hidden), Snackbar.LENGTH_LONG)
 					.setAction(R.string.shared_string_undo, new View.OnClickListener() {
@@ -113,8 +111,8 @@ public class DashErrorFragment extends DashBaseFragment {
 
 		public void onUndo() {
 			dashboardOnMap.unhideFragmentByTag(fragmentTag);
-			ViewCompat.setTranslationX(fragmentView, 0);
-			ViewCompat.setAlpha(fragmentView, 1);
+			fragmentView.setTranslationX(0);
+			fragmentView.setAlpha(1);
 		}
 	}
 }
diff --git a/OsmAnd/src/net/osmand/plus/dashboard/DashboardOnMap.java b/OsmAnd/src/net/osmand/plus/dashboard/DashboardOnMap.java
index 25683f23ce..e1ebc1cc4d 100644
--- a/OsmAnd/src/net/osmand/plus/dashboard/DashboardOnMap.java
+++ b/OsmAnd/src/net/osmand/plus/dashboard/DashboardOnMap.java
@@ -1217,7 +1217,7 @@ public class DashboardOnMap implements ObservableScrollViewCallbacks, IRouteInfo
 	}
 
 	private void setTranslationY(View v, int y) {
-		ViewCompat.setTranslationY(v, y);
+		v.setTranslationY(y);
 	}
 
 	@SuppressLint("NewApi")
diff --git a/OsmAnd/src/net/osmand/plus/dashboard/tools/DashboardSettingsDialogFragment.java b/OsmAnd/src/net/osmand/plus/dashboard/tools/DashboardSettingsDialogFragment.java
index 8b7e47a941..1689a4e298 100644
--- a/OsmAnd/src/net/osmand/plus/dashboard/tools/DashboardSettingsDialogFragment.java
+++ b/OsmAnd/src/net/osmand/plus/dashboard/tools/DashboardSettingsDialogFragment.java
@@ -1,6 +1,5 @@
 package net.osmand.plus.dashboard.tools;
 
-import android.app.Activity;
 import android.app.Dialog;
 import android.content.Context;
 import android.content.DialogInterface;
@@ -51,9 +50,9 @@ public class DashboardSettingsDialogFragment extends DialogFragment
 	private static final int DEFAULT_NUMBER_OF_ROWS = 5;
 
 	@Override
-	public void onAttach(Activity activity) {
-		super.onAttach(activity);
-		mapActivity = (MapActivity) activity;
+	public void onAttach(@NonNull Context context) {
+		super.onAttach(context);
+		mapActivity = (MapActivity) context;
 		mFragmentsData = new ArrayList<>();
 		for (DashFragmentData fragmentData : mapActivity.getDashboard().getFragmentsData()) {
 			if (fragmentData.canBeDisabled()) mFragmentsData.add(fragmentData);
diff --git a/OsmAnd/src/net/osmand/plus/development/TestVoiceActivity.java b/OsmAnd/src/net/osmand/plus/development/TestVoiceActivity.java
index 3d29541be4..f1cddde833 100644
--- a/OsmAnd/src/net/osmand/plus/development/TestVoiceActivity.java
+++ b/OsmAnd/src/net/osmand/plus/development/TestVoiceActivity.java
@@ -65,12 +65,12 @@ public class TestVoiceActivity extends OsmandActionBarActivity {
 		tv.setPadding(0, 5, 0, 7);
 		
 		ScrollView sv = new ScrollView(this);
-		gl.addView(sv, new LayoutParams(android.view.ViewGroup.LayoutParams.FILL_PARENT, 
-				android.view.ViewGroup.LayoutParams.FILL_PARENT));
+		gl.addView(sv, new LayoutParams(android.view.ViewGroup.LayoutParams.MATCH_PARENT,
+				android.view.ViewGroup.LayoutParams.MATCH_PARENT));
 		final LinearLayout ll = new LinearLayout(this);
 		ll.setOrientation(LinearLayout.VERTICAL);
-		sv.addView(ll, new LayoutParams(android.view.ViewGroup.LayoutParams.FILL_PARENT, 
-				android.view.ViewGroup.LayoutParams.FILL_PARENT));
+		sv.addView(ll, new LayoutParams(android.view.ViewGroup.LayoutParams.MATCH_PARENT,
+				android.view.ViewGroup.LayoutParams.MATCH_PARENT));
 		
 		// add buttons
 		setContentView(gl);
@@ -271,7 +271,7 @@ public class TestVoiceActivity extends OsmandActionBarActivity {
 		button.setGravity(Gravity.LEFT);
 		button.setTransformationMethod(null); //or else button text is all upper case
 		button.setText(description);
-		button.setLayoutParams(new LayoutParams(LayoutParams.FILL_PARENT, LayoutParams.WRAP_CONTENT));
+		button.setLayoutParams(new LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.WRAP_CONTENT));
 		if (!description.startsWith("\u25BA (")) {
 			// Section headline buttons
 			button.setPadding(10, 20, 10, 5);
diff --git a/OsmAnd/src/net/osmand/plus/dialogs/HelpArticleDialogFragment.java b/OsmAnd/src/net/osmand/plus/dialogs/HelpArticleDialogFragment.java
index 88bfd6f59d..fc1a917058 100644
--- a/OsmAnd/src/net/osmand/plus/dialogs/HelpArticleDialogFragment.java
+++ b/OsmAnd/src/net/osmand/plus/dialogs/HelpArticleDialogFragment.java
@@ -6,7 +6,6 @@ import android.os.Bundle;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
-import android.webkit.WebSettings;
 import android.webkit.WebView;
 import android.webkit.WebViewClient;
 
@@ -82,21 +81,7 @@ public class HelpArticleDialogFragment extends DialogFragment {
 
 		//Scale web view font size with system font size
 		float scale = getActivity().getResources().getConfiguration().fontScale;
-		if (android.os.Build.VERSION.SDK_INT >= 14) {
-			webView.getSettings().setTextZoom((int) (scale * 100f));
-		} else {
-			if (scale <= 0.7f) {
-				webView.getSettings().setTextSize(WebSettings.TextSize.SMALLEST);
-			} else if (scale <= 0.85f) {
-				webView.getSettings().setTextSize(WebSettings.TextSize.SMALLER);
-			} else if (scale <= 1.0f) {
-				webView.getSettings().setTextSize(WebSettings.TextSize.NORMAL);
-			} else if (scale <= 1.15f) {
-				webView.getSettings().setTextSize(WebSettings.TextSize.LARGER);
-			} else {
-				webView.getSettings().setTextSize(WebSettings.TextSize.LARGEST);
-			}
-		}
+		webView.getSettings().setTextZoom((int) (scale * 100f));
 
 		if (assetName != null) {
 			String fileContents = getAssetAsString(assetName, getActivity());
diff --git a/OsmAnd/src/net/osmand/plus/download/DownloadActivity.java b/OsmAnd/src/net/osmand/plus/download/DownloadActivity.java
index c11810383d..3ebd06b4b4 100644
--- a/OsmAnd/src/net/osmand/plus/download/DownloadActivity.java
+++ b/OsmAnd/src/net/osmand/plus/download/DownloadActivity.java
@@ -20,6 +20,7 @@ import android.widget.ImageButton;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.ProgressBar;
+import android.widget.Space;
 import android.widget.TextView;
 import android.widget.Toast;
 
@@ -32,7 +33,6 @@ import androidx.core.content.ContextCompat;
 import androidx.fragment.app.DialogFragment;
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentActivity;
-import androidx.legacy.widget.Space;
 import androidx.viewpager.widget.ViewPager;
 
 import net.osmand.AndroidUtils;
diff --git a/OsmAnd/src/net/osmand/plus/download/ui/DownloadResourceGroupFragment.java b/OsmAnd/src/net/osmand/plus/download/ui/DownloadResourceGroupFragment.java
index 9381a50db6..388efca2bb 100644
--- a/OsmAnd/src/net/osmand/plus/download/ui/DownloadResourceGroupFragment.java
+++ b/OsmAnd/src/net/osmand/plus/download/ui/DownloadResourceGroupFragment.java
@@ -21,7 +21,6 @@ import android.widget.TextView;
 
 import androidx.appcompat.app.AlertDialog;
 import androidx.appcompat.widget.Toolbar;
-import androidx.core.view.MenuItemCompat;
 import androidx.fragment.app.DialogFragment;
 
 import net.osmand.AndroidNetworkUtils;
@@ -540,12 +539,12 @@ public class DownloadResourceGroupFragment extends DialogFragment implements Dow
 			MenuItem itemReload = menu.add(0, RELOAD_ID, 0, R.string.shared_string_refresh);
 			Drawable icReload = app.getUIUtilities().getIcon(R.drawable.ic_action_refresh_dark, colorResId);
 			itemReload.setIcon(icReload);
-			MenuItemCompat.setShowAsAction(itemReload, MenuItemCompat.SHOW_AS_ACTION_ALWAYS);
+			itemReload.setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS);
 
 			MenuItem itemSearch = menu.add(0, SEARCH_ID, 1, R.string.shared_string_search);
 			Drawable icSearch = app.getUIUtilities().getIcon(R.drawable.ic_action_search_dark, colorResId);
 			itemSearch.setIcon(icSearch);
-			MenuItemCompat.setShowAsAction(itemSearch, MenuItemCompat.SHOW_AS_ACTION_ALWAYS);
+			itemSearch.setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS);
 		}
 	}
 
diff --git a/OsmAnd/src/net/osmand/plus/download/ui/LocalIndexesFragment.java b/OsmAnd/src/net/osmand/plus/download/ui/LocalIndexesFragment.java
index f920f2dec2..99f5e9b642 100644
--- a/OsmAnd/src/net/osmand/plus/download/ui/LocalIndexesFragment.java
+++ b/OsmAnd/src/net/osmand/plus/download/ui/LocalIndexesFragment.java
@@ -695,8 +695,8 @@ public class LocalIndexesFragment extends OsmandExpandableListFragment implement
 					Drawable icon = getMyApplication().getUIUtilities().getIcon(actionIconId, colorResId);
 					it.setIcon(icon);
 				}
-				MenuItemCompat.setShowAsAction(it, MenuItemCompat.SHOW_AS_ACTION_IF_ROOM |
-						MenuItemCompat.SHOW_AS_ACTION_WITH_TEXT);
+				it.setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM |
+						MenuItem.SHOW_AS_ACTION_WITH_TEXT);
 				return true;
 			}
 
diff --git a/OsmAnd/src/net/osmand/plus/liveupdates/OsmLiveActivity.java b/OsmAnd/src/net/osmand/plus/liveupdates/OsmLiveActivity.java
index d6e0406904..6014ebbc88 100644
--- a/OsmAnd/src/net/osmand/plus/liveupdates/OsmLiveActivity.java
+++ b/OsmAnd/src/net/osmand/plus/liveupdates/OsmLiveActivity.java
@@ -194,7 +194,7 @@ public class OsmLiveActivity extends AbstractDownloadActivity implements Downloa
 		private final boolean showSettingsOnly;
 
 		LiveUpdatesFragmentPagerAdapter(FragmentManager fm, Resources res, boolean showSettingsOnly) {
-			super(fm);
+			super(fm, BEHAVIOR_RESUME_ONLY_CURRENT_FRAGMENT);
 			this.showSettingsOnly = showSettingsOnly;
 			titles = new String[titleIds.length];
 			for (int i = 0; i < titleIds.length; i++) {
diff --git a/OsmAnd/src/net/osmand/plus/mapcontextmenu/MenuBuilder.java b/OsmAnd/src/net/osmand/plus/mapcontextmenu/MenuBuilder.java
index 5d3a560ddc..d197ae51e6 100644
--- a/OsmAnd/src/net/osmand/plus/mapcontextmenu/MenuBuilder.java
+++ b/OsmAnd/src/net/osmand/plus/mapcontextmenu/MenuBuilder.java
@@ -1,6 +1,7 @@
 package net.osmand.plus.mapcontextmenu;
 
 import android.app.Activity;
+import android.content.ClipboardManager;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
@@ -11,7 +12,6 @@ import android.graphics.drawable.Drawable;
 import android.graphics.drawable.GradientDrawable;
 import android.net.Uri;
 import android.os.AsyncTask;
-import android.text.ClipboardManager;
 import android.text.SpannableStringBuilder;
 import android.text.Spanned;
 import android.text.TextUtils;
diff --git a/OsmAnd/src/net/osmand/plus/mapmarkers/MapMarkersDialogFragment.java b/OsmAnd/src/net/osmand/plus/mapmarkers/MapMarkersDialogFragment.java
index 4d5dc5d0e3..45c57ed935 100644
--- a/OsmAnd/src/net/osmand/plus/mapmarkers/MapMarkersDialogFragment.java
+++ b/OsmAnd/src/net/osmand/plus/mapmarkers/MapMarkersDialogFragment.java
@@ -551,7 +551,7 @@ public class MapMarkersDialogFragment extends DialogFragment implements OnGroupS
 		private final List<Fragment> fragments;
 
 		MapMarkersViewPagerAdapter(FragmentManager fm) {
-			super(fm);
+			super(fm, BEHAVIOR_RESUME_ONLY_CURRENT_FRAGMENT);
 			fragments = Arrays.asList(activeFragment, groupsFragment, historyFragment);
 		}
 
diff --git a/OsmAnd/src/net/osmand/plus/mapmarkers/adapters/MapMarkersActiveAdapter.java b/OsmAnd/src/net/osmand/plus/mapmarkers/adapters/MapMarkersActiveAdapter.java
index b288a39ffe..4b6eee036b 100644
--- a/OsmAnd/src/net/osmand/plus/mapmarkers/adapters/MapMarkersActiveAdapter.java
+++ b/OsmAnd/src/net/osmand/plus/mapmarkers/adapters/MapMarkersActiveAdapter.java
@@ -8,7 +8,6 @@ import android.widget.ImageView;
 
 import androidx.appcompat.content.res.AppCompatResources;
 import androidx.core.content.ContextCompat;
-import androidx.core.view.MotionEventCompat;
 import androidx.recyclerview.widget.RecyclerView;
 
 import com.google.android.material.snackbar.Snackbar;
@@ -122,7 +121,7 @@ public class MapMarkersActiveAdapter extends RecyclerView.Adapter<MapMarkerItemV
 		holder.iconReorder.setOnTouchListener(new View.OnTouchListener() {
 			@Override
 			public boolean onTouch(View view, MotionEvent event) {
-				if (MotionEventCompat.getActionMasked(event) == MotionEvent.ACTION_DOWN) {
+				if (event.getActionMasked() == MotionEvent.ACTION_DOWN) {
 					listener.onDragStarted(holder);
 				}
 				return false;
diff --git a/OsmAnd/src/net/osmand/plus/mapmarkers/adapters/MapMarkersListAdapter.java b/OsmAnd/src/net/osmand/plus/mapmarkers/adapters/MapMarkersListAdapter.java
index ec8d8a618c..31695a085a 100644
--- a/OsmAnd/src/net/osmand/plus/mapmarkers/adapters/MapMarkersListAdapter.java
+++ b/OsmAnd/src/net/osmand/plus/mapmarkers/adapters/MapMarkersListAdapter.java
@@ -9,7 +9,6 @@ import android.view.ViewGroup;
 
 import androidx.appcompat.content.res.AppCompatResources;
 import androidx.core.content.ContextCompat;
-import androidx.core.view.MotionEventCompat;
 import androidx.recyclerview.widget.RecyclerView;
 
 import net.osmand.GPXUtilities.WptPt;
@@ -183,7 +182,7 @@ public class MapMarkersListAdapter extends RecyclerView.Adapter<MapMarkerItemVie
 			holder.iconReorder.setOnTouchListener(new View.OnTouchListener() {
 				@Override
 				public boolean onTouch(View view, MotionEvent event) {
-					if (MotionEventCompat.getActionMasked(event) == MotionEvent.ACTION_DOWN) {
+					if (event.getActionMasked() == MotionEvent.ACTION_DOWN) {
 						inDragAndDrop = true;
 						if (showRoundTripItem) {
 							int roundTripItemPos = finishPos;
diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/adapter/MeasurementToolAdapter.java b/OsmAnd/src/net/osmand/plus/measurementtool/adapter/MeasurementToolAdapter.java
index dbf5197f92..945dcef416 100644
--- a/OsmAnd/src/net/osmand/plus/measurementtool/adapter/MeasurementToolAdapter.java
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/adapter/MeasurementToolAdapter.java
@@ -11,7 +11,6 @@ import android.widget.TextView;
 
 import androidx.annotation.NonNull;
 import androidx.core.content.ContextCompat;
-import androidx.core.view.MotionEventCompat;
 import androidx.recyclerview.widget.RecyclerView;
 
 import net.osmand.GPXUtilities.WptPt;
@@ -67,7 +66,7 @@ public class MeasurementToolAdapter extends RecyclerView.Adapter<MeasurementTool
 		holder.iconReorder.setOnTouchListener(new View.OnTouchListener() {
 			@Override
 			public boolean onTouch(View view, MotionEvent event) {
-				if (MotionEventCompat.getActionMasked(event) == MotionEvent.ACTION_DOWN) {
+				if (event.getActionMasked() == MotionEvent.ACTION_DOWN) {
 					listener.onDragStarted(holder);
 				}
 				return false;
diff --git a/OsmAnd/src/net/osmand/plus/myplaces/AvailableGPXFragment.java b/OsmAnd/src/net/osmand/plus/myplaces/AvailableGPXFragment.java
index e6bd01b3f8..e570ca400b 100644
--- a/OsmAnd/src/net/osmand/plus/myplaces/AvailableGPXFragment.java
+++ b/OsmAnd/src/net/osmand/plus/myplaces/AvailableGPXFragment.java
@@ -43,7 +43,6 @@ import androidx.appcompat.app.AlertDialog;
 import androidx.appcompat.view.ActionMode;
 import androidx.appcompat.widget.SearchView;
 import androidx.core.content.ContextCompat;
-import androidx.core.view.MenuItemCompat;
 
 import net.osmand.AndroidUtils;
 import net.osmand.FileUtils;
@@ -430,11 +429,11 @@ public class AvailableGPXFragment extends OsmandExpandableListFragment implement
 	@Override
 	public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
 		menu.clear();
-		MenuItem mi = createMenuItem(menu, SEARCH_ID, R.string.search_poi_filter, R.drawable.ic_action_search_dark, MenuItemCompat.SHOW_AS_ACTION_ALWAYS
-						| MenuItemCompat.SHOW_AS_ACTION_COLLAPSE_ACTION_VIEW);
+		MenuItem mi = createMenuItem(menu, SEARCH_ID, R.string.search_poi_filter, R.drawable.ic_action_search_dark, MenuItem.SHOW_AS_ACTION_ALWAYS
+						| MenuItem.SHOW_AS_ACTION_COLLAPSE_ACTION_VIEW);
 		SearchView searchView = new SearchView(getActivity());
 		FavoritesActivity.updateSearchView(getActivity(), searchView);
-		MenuItemCompat.setActionView(mi, searchView);
+		mi.setActionView(searchView);
 		searchView.setOnQueryTextListener(new SearchView.OnQueryTextListener() {
 
 			@Override
@@ -449,7 +448,7 @@ public class AvailableGPXFragment extends OsmandExpandableListFragment implement
 				return true;
 			}
 		});
-		MenuItemCompat.setOnActionExpandListener(mi, new MenuItemCompat.OnActionExpandListener() {
+		mi.setOnActionExpandListener(new MenuItem.OnActionExpandListener() {
 			@Override
 			public boolean onMenuItemActionExpand(MenuItem item) {
 				return true;
@@ -518,7 +517,7 @@ public class AvailableGPXFragment extends OsmandExpandableListFragment implement
 			final MenuItem item;
 			ContextMenuItem contextMenuItem = optionsMenuAdapter.getItem(j);
 			item = menu.add(0, contextMenuItem.getTitleId(), j + 1, contextMenuItem.getTitle());
-			MenuItemCompat.setShowAsAction(item, MenuItemCompat.SHOW_AS_ACTION_ALWAYS);
+			item.setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS);
 			if (AndroidUiHelper.isOrientationPortrait(getActivity())) {
 				item.setOnMenuItemClickListener(new MenuItem.OnMenuItemClickListener() {
 					@Override
@@ -617,8 +616,8 @@ public class AvailableGPXFragment extends OsmandExpandableListFragment implement
 				updateSelectionMode(mode);
 				MenuItem it = menu.add(R.string.shared_string_show_on_map);
 				it.setIcon(R.drawable.ic_action_done);
-				MenuItemCompat.setShowAsAction(it, MenuItemCompat.SHOW_AS_ACTION_IF_ROOM
-						| MenuItemCompat.SHOW_AS_ACTION_WITH_TEXT);
+				it.setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM
+						| MenuItem.SHOW_AS_ACTION_WITH_TEXT);
 				updateCurrentTrack();
 				return true;
 			}
@@ -686,8 +685,8 @@ public class AvailableGPXFragment extends OsmandExpandableListFragment implement
 				if (actionIconId != 0) {
 					it.setIcon(actionIconId);
 				}
-				MenuItemCompat.setShowAsAction(it, MenuItemCompat.SHOW_AS_ACTION_IF_ROOM
-						| MenuItemCompat.SHOW_AS_ACTION_WITH_TEXT);
+				it.setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM
+						| MenuItem.SHOW_AS_ACTION_WITH_TEXT);
 				return true;
 			}
 
diff --git a/OsmAnd/src/net/osmand/plus/myplaces/TrackPointFragment.java b/OsmAnd/src/net/osmand/plus/myplaces/TrackPointFragment.java
index eb3365c37d..72526e92ba 100644
--- a/OsmAnd/src/net/osmand/plus/myplaces/TrackPointFragment.java
+++ b/OsmAnd/src/net/osmand/plus/myplaces/TrackPointFragment.java
@@ -35,7 +35,6 @@ import androidx.appcompat.app.AlertDialog;
 import androidx.appcompat.view.ActionMode;
 import androidx.appcompat.widget.SearchView;
 import androidx.core.content.ContextCompat;
-import androidx.core.view.MenuItemCompat;
 import androidx.fragment.app.FragmentActivity;
 import androidx.fragment.app.FragmentManager;
 
@@ -449,7 +448,7 @@ public class TrackPointFragment extends OsmandExpandableListFragment implements
 				setSelectionMode(true);
 				createMenuItem(menu, DELETE_ACTION_ID, R.string.shared_string_delete,
 						R.drawable.ic_action_delete_dark,
-						MenuItemCompat.SHOW_AS_ACTION_IF_ROOM);
+						MenuItem.SHOW_AS_ACTION_IF_ROOM);
 				selectedItems.clear();
 				selectedGroups.clear();
 				adapter.notifyDataSetInvalidated();
diff --git a/OsmAnd/src/net/osmand/plus/myplaces/TrackSegmentFragment.java b/OsmAnd/src/net/osmand/plus/myplaces/TrackSegmentFragment.java
index dd4cdb4d84..43f915b7ea 100644
--- a/OsmAnd/src/net/osmand/plus/myplaces/TrackSegmentFragment.java
+++ b/OsmAnd/src/net/osmand/plus/myplaces/TrackSegmentFragment.java
@@ -28,8 +28,6 @@ import androidx.annotation.Nullable;
 import androidx.appcompat.app.AlertDialog;
 import androidx.appcompat.widget.SwitchCompat;
 import androidx.core.content.ContextCompat;
-import androidx.core.view.MenuItemCompat;
-import androidx.core.view.ViewCompat;
 import androidx.viewpager.widget.PagerAdapter;
 
 import com.github.mikephil.charting.charts.LineChart;
@@ -170,7 +168,7 @@ public class TrackSegmentFragment extends OsmAndListFragment implements TrackBit
 								return true;
 							}
 						});
-				MenuItemCompat.setShowAsAction(item, MenuItemCompat.SHOW_AS_ACTION_ALWAYS);
+				item.setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS);
 			}
 			if (gpxFile.showCurrentTrack) {
 				MenuItem item = menu.add(R.string.shared_string_refresh).setIcon(R.drawable.ic_action_refresh_dark)
@@ -184,7 +182,7 @@ public class TrackSegmentFragment extends OsmAndListFragment implements TrackBit
 								return true;
 							}
 						});
-				MenuItemCompat.setShowAsAction(item, MenuItemCompat.SHOW_AS_ACTION_ALWAYS);
+				item.setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS);
 			}
 		}
 	}
@@ -1099,7 +1097,7 @@ public class TrackSegmentFragment extends OsmAndListFragment implements TrackBit
 			int imageId = getImageId(tabType);
 			switch (tabs.getTabSelectionType()) {
 				case ALPHA:
-					ViewCompat.setAlpha(img, tabs.getTabTextSelectedAlpha());
+					img.setAlpha(tabs.getTabTextSelectedAlpha());
 					break;
 				case SOLID_COLOR:
 					img.setImageDrawable(app.getUIUtilities().getPaintedIcon(imageId, tabs.getTextColor()));
@@ -1114,7 +1112,7 @@ public class TrackSegmentFragment extends OsmAndListFragment implements TrackBit
 			int imageId = getImageId(tabType);
 			switch (tabs.getTabSelectionType()) {
 				case ALPHA:
-					ViewCompat.setAlpha(img, tabs.getTabTextAlpha());
+					img.setAlpha(tabs.getTabTextAlpha());
 					break;
 				case SOLID_COLOR:
 					img.setImageDrawable(app.getUIUtilities().getPaintedIcon(imageId, tabs.getTabInactiveTextColor()));
diff --git a/OsmAnd/src/net/osmand/plus/osmedit/EditPoiDialogFragment.java b/OsmAnd/src/net/osmand/plus/osmedit/EditPoiDialogFragment.java
index 932ef59db5..3ea1aac66c 100644
--- a/OsmAnd/src/net/osmand/plus/osmedit/EditPoiDialogFragment.java
+++ b/OsmAnd/src/net/osmand/plus/osmedit/EditPoiDialogFragment.java
@@ -215,12 +215,6 @@ public class EditPoiDialogFragment extends BaseOsmAndDialogFragment {
 
 				@Override
 				public void onGlobalLayout() {
-
-					ViewTreeObserver obs = view.getViewTreeObserver();
-					if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN) {
-						obs.removeGlobalOnLayoutListener(this);
-					}
-
 					if (getActivity() != null) {
 						tabLayout.setupWithViewPager(viewPager);
 					}
@@ -781,7 +775,7 @@ public class EditPoiDialogFragment extends BaseOsmAndDialogFragment {
 		private final String[] titles;
 
 		PoiInfoPagerAdapter(FragmentManager fm, String basicTitle, String extendedTitle) {
-			super(fm);
+			super(fm, BEHAVIOR_RESUME_ONLY_CURRENT_FRAGMENT);
 			titles = new String[]{basicTitle, extendedTitle};
 		}
 
diff --git a/OsmAnd/src/net/osmand/plus/poi/RearrangePoiFiltersFragment.java b/OsmAnd/src/net/osmand/plus/poi/RearrangePoiFiltersFragment.java
index 97ad08899d..8ddd677be2 100644
--- a/OsmAnd/src/net/osmand/plus/poi/RearrangePoiFiltersFragment.java
+++ b/OsmAnd/src/net/osmand/plus/poi/RearrangePoiFiltersFragment.java
@@ -20,7 +20,6 @@ import android.widget.TextView;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.core.content.ContextCompat;
-import androidx.core.view.MotionEventCompat;
 import androidx.core.view.ViewCompat;
 import androidx.fragment.app.DialogFragment;
 import androidx.fragment.app.FragmentActivity;
@@ -642,7 +641,7 @@ public class RearrangePoiFiltersFragment extends DialogFragment implements Selec
 					h.moveIcon.setOnTouchListener(new View.OnTouchListener() {
 						@Override
 						public boolean onTouch(View view, MotionEvent event) {
-							if (MotionEventCompat.getActionMasked(event) == MotionEvent.ACTION_DOWN) {
+							if (event.getActionMasked() == MotionEvent.ACTION_DOWN) {
 								listener.onDragStarted(holder);
 							}
 							return false;
diff --git a/OsmAnd/src/net/osmand/plus/profiles/EditProfilesFragment.java b/OsmAnd/src/net/osmand/plus/profiles/EditProfilesFragment.java
index 192357d12c..c20d7f60f1 100644
--- a/OsmAnd/src/net/osmand/plus/profiles/EditProfilesFragment.java
+++ b/OsmAnd/src/net/osmand/plus/profiles/EditProfilesFragment.java
@@ -17,7 +17,6 @@ import android.widget.TextView;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.core.content.ContextCompat;
-import androidx.core.view.MotionEventCompat;
 import androidx.fragment.app.FragmentActivity;
 import androidx.recyclerview.widget.ItemTouchHelper;
 import androidx.recyclerview.widget.LinearLayoutManager;
@@ -392,7 +391,7 @@ public class EditProfilesFragment extends BaseOsmAndFragment {
 					profileViewHolder.moveButton.setOnTouchListener(new View.OnTouchListener() {
 						@Override
 						public boolean onTouch(View view, MotionEvent event) {
-							if (MotionEventCompat.getActionMasked(event) == MotionEvent.ACTION_DOWN) {
+							if (event.getActionMasked() == MotionEvent.ACTION_DOWN) {
 								listener.onDragStarted(holder);
 							}
 							return false;
diff --git a/OsmAnd/src/net/osmand/plus/quickaction/QuickActionListFragment.java b/OsmAnd/src/net/osmand/plus/quickaction/QuickActionListFragment.java
index 3e21c21dca..036b60230f 100644
--- a/OsmAnd/src/net/osmand/plus/quickaction/QuickActionListFragment.java
+++ b/OsmAnd/src/net/osmand/plus/quickaction/QuickActionListFragment.java
@@ -23,7 +23,6 @@ import androidx.annotation.Nullable;
 import androidx.appcompat.widget.SwitchCompat;
 import androidx.appcompat.widget.Toolbar;
 import androidx.core.content.ContextCompat;
-import androidx.core.view.MotionEventCompat;
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentActivity;
 import androidx.fragment.app.FragmentManager;
@@ -513,7 +512,7 @@ public class QuickActionListFragment extends BaseOsmAndFragment
                     h.moveButton.setOnTouchListener(new View.OnTouchListener() {
                         @Override
                         public boolean onTouch(View v, MotionEvent event) {
-                            if (MotionEventCompat.getActionMasked(event) ==
+                            if (event.getActionMasked() ==
                                     MotionEvent.ACTION_DOWN) {
                                 onStartDragListener.onStartDrag(h);
                             }
diff --git a/OsmAnd/src/net/osmand/plus/quickaction/SwitchableAction.java b/OsmAnd/src/net/osmand/plus/quickaction/SwitchableAction.java
index 3d4c3a9269..526c16a285 100644
--- a/OsmAnd/src/net/osmand/plus/quickaction/SwitchableAction.java
+++ b/OsmAnd/src/net/osmand/plus/quickaction/SwitchableAction.java
@@ -16,7 +16,6 @@ import androidx.annotation.ColorRes;
 import androidx.annotation.DrawableRes;
 import androidx.annotation.StringRes;
 import androidx.appcompat.widget.SwitchCompat;
-import androidx.core.view.MotionEventCompat;
 import androidx.fragment.app.FragmentManager;
 import androidx.recyclerview.widget.ItemTouchHelper;
 import androidx.recyclerview.widget.RecyclerView;
@@ -171,7 +170,7 @@ public abstract class SwitchableAction<T> extends QuickAction {
 			holder.handleView.setOnTouchListener(new View.OnTouchListener() {
 				@Override
 				public boolean onTouch(View v, MotionEvent event) {
-					if (MotionEventCompat.getActionMasked(event) ==
+					if (event.getActionMasked() ==
 							MotionEvent.ACTION_DOWN) {
 						onStartDragListener.onStartDrag(holder);
 					}
diff --git a/OsmAnd/src/net/osmand/plus/routepreparationmenu/ChooseRouteFragment.java b/OsmAnd/src/net/osmand/plus/routepreparationmenu/ChooseRouteFragment.java
index c046cca7f7..c94c6e2968 100644
--- a/OsmAnd/src/net/osmand/plus/routepreparationmenu/ChooseRouteFragment.java
+++ b/OsmAnd/src/net/osmand/plus/routepreparationmenu/ChooseRouteFragment.java
@@ -865,7 +865,7 @@ public class ChooseRouteFragment extends BaseOsmAndFragment implements ContextMe
 		private int routesCount;
 
 		RoutesPagerAdapter(FragmentManager fm, int routesCount) {
-			super(fm);
+			super(fm, BEHAVIOR_RESUME_ONLY_CURRENT_FRAGMENT);
 			this.routesCount = routesCount;
 		}
 
diff --git a/OsmAnd/src/net/osmand/plus/search/QuickSearchDialogFragment.java b/OsmAnd/src/net/osmand/plus/search/QuickSearchDialogFragment.java
index f8dbd7745d..fb2e32080c 100644
--- a/OsmAnd/src/net/osmand/plus/search/QuickSearchDialogFragment.java
+++ b/OsmAnd/src/net/osmand/plus/search/QuickSearchDialogFragment.java
@@ -2369,7 +2369,7 @@ public class QuickSearchDialogFragment extends DialogFragment implements OsmAndC
 		private final String[] titles;
 
 		public SearchFragmentPagerAdapter(FragmentManager fm, Resources res) {
-			super(fm);
+			super(fm, BEHAVIOR_RESUME_ONLY_CURRENT_FRAGMENT);
 			titles = new String[titleIds.length];
 			for (int i = 0; i < titleIds.length; i++) {
 				titles[i] = res.getString(titleIds[i]);
diff --git a/OsmAnd/src/net/osmand/plus/settings/fragments/RearrangeMenuItemsAdapter.java b/OsmAnd/src/net/osmand/plus/settings/fragments/RearrangeMenuItemsAdapter.java
index 0f64f93475..3f97398e44 100644
--- a/OsmAnd/src/net/osmand/plus/settings/fragments/RearrangeMenuItemsAdapter.java
+++ b/OsmAnd/src/net/osmand/plus/settings/fragments/RearrangeMenuItemsAdapter.java
@@ -15,7 +15,6 @@ import androidx.annotation.DrawableRes;
 import androidx.annotation.NonNull;
 import androidx.annotation.StringRes;
 import androidx.core.content.ContextCompat;
-import androidx.core.view.MotionEventCompat;
 import androidx.recyclerview.widget.RecyclerView;
 
 import net.osmand.AndroidUtils;
@@ -190,7 +189,7 @@ public class RearrangeMenuItemsAdapter extends RecyclerView.Adapter<RecyclerView
 			h.moveButton.setOnTouchListener(new View.OnTouchListener() {
 				@Override
 				public boolean onTouch(View view, MotionEvent event) {
-					if (MotionEventCompat.getActionMasked(event) == MotionEvent.ACTION_DOWN) {
+					if (event.getActionMasked() == MotionEvent.ACTION_DOWN) {
 						listener.onDragStarted(holder);
 					}
 					return false;
diff --git a/OsmAnd/src/net/osmand/plus/views/controls/DynamicListView.java b/OsmAnd/src/net/osmand/plus/views/controls/DynamicListView.java
index a90d5ed65c..e5b927886f 100644
--- a/OsmAnd/src/net/osmand/plus/views/controls/DynamicListView.java
+++ b/OsmAnd/src/net/osmand/plus/views/controls/DynamicListView.java
@@ -458,7 +458,7 @@ public class DynamicListView extends ObservableListView {
 					int switchViewNewTop = switchView.getTop();
 					int delta = switchViewStartTop - switchViewNewTop;
 
-					ViewCompat.setTranslationY(switchView, delta);
+					switchView.setTranslationY(delta);
 
 					if (android.os.Build.VERSION.SDK_INT < 12) {
 						ViewCompat.animate(switchView)
diff --git a/OsmAnd/src/net/osmand/plus/views/controls/PagerSlidingTabStrip.java b/OsmAnd/src/net/osmand/plus/views/controls/PagerSlidingTabStrip.java
index 53b228c6a7..a92d2c5e0a 100644
--- a/OsmAnd/src/net/osmand/plus/views/controls/PagerSlidingTabStrip.java
+++ b/OsmAnd/src/net/osmand/plus/views/controls/PagerSlidingTabStrip.java
@@ -45,7 +45,6 @@ import androidx.annotation.ColorRes;
 import androidx.annotation.DrawableRes;
 import androidx.annotation.NonNull;
 import androidx.core.util.Pair;
-import androidx.core.view.ViewCompat;
 import androidx.viewpager.widget.ViewPager;
 import androidx.viewpager.widget.ViewPager.OnPageChangeListener;
 
@@ -345,11 +344,11 @@ public class PagerSlidingTabStrip extends HorizontalScrollView {
 				switch (tabSelectionType) {
 					case ALPHA:
 						float alpha = pager.getCurrentItem() == i ? tabTextSelectedAlpha : tabTextAlpha;
-						ViewCompat.setAlpha(tab_title, alpha);
+						tab_title.setAlpha(alpha);
 						tab_title.setTextColor(tabTextColor);
 						break;
 					case SOLID_COLOR:
-						ViewCompat.setAlpha(tab_title, OPAQUE);
+						tab_title.setAlpha(OPAQUE);
 						tab_title.setTextColor(pager.getCurrentItem() == i ? tabTextColor : tabInactiveTextColor);
 						break;
 				}
@@ -564,7 +563,7 @@ public class PagerSlidingTabStrip extends HorizontalScrollView {
 				title.setTypeface(tabTypeface, tabTypefaceStyle);
 				switch (tabSelectionType) {
 					case ALPHA:
-						ViewCompat.setAlpha(title, tabTextAlpha);
+						title.setAlpha(tabTextAlpha);
 						break;
 					case SOLID_COLOR:
 						title.setTextColor(tabInactiveTextColor);
@@ -584,7 +583,7 @@ public class PagerSlidingTabStrip extends HorizontalScrollView {
 				title.setTypeface(tabTypeface, tabTypefaceSelectedStyle);
 				switch (tabSelectionType) {
 					case ALPHA:
-						ViewCompat.setAlpha(title, tabTextSelectedAlpha);
+						title.setAlpha(tabTextSelectedAlpha);
 						break;
 					case SOLID_COLOR:
 						title.setTextColor(tabTextColor);
diff --git a/OsmAnd/src/net/osmand/plus/views/controls/SwipeDismissListViewTouchListener.java b/OsmAnd/src/net/osmand/plus/views/controls/SwipeDismissListViewTouchListener.java
index f944f2dbbb..7f15fed90b 100644
--- a/OsmAnd/src/net/osmand/plus/views/controls/SwipeDismissListViewTouchListener.java
+++ b/OsmAnd/src/net/osmand/plus/views/controls/SwipeDismissListViewTouchListener.java
@@ -725,8 +725,8 @@ public class SwipeDismissListViewTouchListener implements View.OnTouchListener {
 				}
 
 				if (mSwiping) {
-					ViewCompat.setTranslationX(mSwipeDownView, deltaX);
-					ViewCompat.setAlpha(mSwipeDownView, Math.max(0f, Math.min(1f,
+					mSwipeDownView.setTranslationX(deltaX);
+					mSwipeDownView.setAlpha(Math.max(0f, Math.min(1f,
 							1f - 2f * Math.abs(deltaX) / mViewWidth)));
 					return true;
 				}
@@ -824,8 +824,8 @@ public class SwipeDismissListViewTouchListener implements View.OnTouchListener {
 
 			ViewGroup.LayoutParams lp;
 			for (PendingDismissData pendingDismiss : mPendingDismisses) {
-				ViewCompat.setAlpha(pendingDismiss.view, 1f);
-				ViewCompat.setTranslationX(pendingDismiss.view, 0);
+				pendingDismiss.view.setAlpha(1f);
+				pendingDismiss.view.setTranslationX(0);
 				lp = pendingDismiss.childView.getLayoutParams();
 				lp.height = originalLayoutHeight;
 				pendingDismiss.childView.setLayoutParams(lp);
diff --git a/OsmAnd/src/net/osmand/plus/views/layers/MapControlsLayer.java b/OsmAnd/src/net/osmand/plus/views/layers/MapControlsLayer.java
index fd23e617a4..e6ce1ce4f1 100644
--- a/OsmAnd/src/net/osmand/plus/views/layers/MapControlsLayer.java
+++ b/OsmAnd/src/net/osmand/plus/views/layers/MapControlsLayer.java
@@ -1114,14 +1114,14 @@ public class MapControlsLayer extends OsmandMapLayer {
 					@Override
 					public void onAnimationEnd(View view) {
 						iv.setVisibility(View.GONE);
-						ViewCompat.setAlpha(iv, 1f);
+						iv.setAlpha(1f);
 						hideAnimator = null;
 					}
 
 					@Override
 					public void onAnimationCancel(View view) {
 						iv.setVisibility(View.GONE);
-						ViewCompat.setAlpha(iv, 1f);
+						iv.setAlpha(1f);
 						hideAnimator = null;
 					}
 				});
diff --git a/OsmAnd/src/net/osmand/plus/views/mapwidgets/MapInfoWidgetsFactory.java b/OsmAnd/src/net/osmand/plus/views/mapwidgets/MapInfoWidgetsFactory.java
index 24e2081945..d01f042bd8 100644
--- a/OsmAnd/src/net/osmand/plus/views/mapwidgets/MapInfoWidgetsFactory.java
+++ b/OsmAnd/src/net/osmand/plus/views/mapwidgets/MapInfoWidgetsFactory.java
@@ -2,6 +2,7 @@ package net.osmand.plus.views.mapwidgets;
 
 import android.annotation.SuppressLint;
 import android.app.Activity;
+import android.content.ClipboardManager;
 import android.content.Context;
 import android.content.Intent;
 import android.graphics.Bitmap;
@@ -10,7 +11,6 @@ import android.graphics.Paint;
 import android.graphics.Typeface;
 import android.graphics.drawable.Drawable;
 import android.os.Bundle;
-import android.text.ClipboardManager;
 import android.util.TypedValue;
 import android.view.View;
 import android.view.View.OnClickListener;
diff --git a/OsmAnd/src/net/osmand/plus/widgets/InterceptorFrameLayout.java b/OsmAnd/src/net/osmand/plus/widgets/InterceptorFrameLayout.java
index b4c6e44f32..166af03c87 100644
--- a/OsmAnd/src/net/osmand/plus/widgets/InterceptorFrameLayout.java
+++ b/OsmAnd/src/net/osmand/plus/widgets/InterceptorFrameLayout.java
@@ -8,8 +8,6 @@ import android.view.MotionEvent;
 import android.view.ViewConfiguration;
 import android.widget.FrameLayout;
 
-import androidx.core.view.MotionEventCompat;
-
 import net.osmand.plus.widgets.tools.SwipeDismissTouchListener;
 
 public class InterceptorFrameLayout extends FrameLayout {
@@ -47,7 +45,7 @@ public class InterceptorFrameLayout extends FrameLayout {
 
 	@Override
 	public boolean onInterceptTouchEvent(MotionEvent ev) {
-		final int action = MotionEventCompat.getActionMasked(ev);
+		final int action = ev.getActionMasked();
 
 		if (action == MotionEvent.ACTION_CANCEL || action == MotionEvent.ACTION_UP) {
 			mIsScrolling = false;
diff --git a/OsmAnd/src/net/osmand/plus/widgets/tools/ExtendedBottomSheetBehavior.java b/OsmAnd/src/net/osmand/plus/widgets/tools/ExtendedBottomSheetBehavior.java
index eded286b13..e01ec9d621 100644
--- a/OsmAnd/src/net/osmand/plus/widgets/tools/ExtendedBottomSheetBehavior.java
+++ b/OsmAnd/src/net/osmand/plus/widgets/tools/ExtendedBottomSheetBehavior.java
@@ -228,7 +228,7 @@ public class ExtendedBottomSheetBehavior<V extends View> extends CoordinatorLayo
 	@Override
 	public boolean onLayoutChild(CoordinatorLayout parent, V child, int layoutDirection) {
 		if (ViewCompat.getFitsSystemWindows(parent) && !ViewCompat.getFitsSystemWindows(child)) {
-			ViewCompat.setFitsSystemWindows(child, true);
+			child.setFitsSystemWindows(true);
 		}
 		int savedTop = child.getTop();
 		// First let the parent lay it out
@@ -348,7 +348,7 @@ public class ExtendedBottomSheetBehavior<V extends View> extends CoordinatorLayo
 
 	@Override
 	public boolean onStartNestedScroll(CoordinatorLayout coordinatorLayout, V child,
-									   View directTargetChild, View target, int nestedScrollAxes) {
+									   View directTargetChild, View target, int nestedScrollAxes, int type) {
 		mLastNestedScrollDy = 0;
 		mNestedScrolled = false;
 		return (nestedScrollAxes & ViewCompat.SCROLL_AXIS_VERTICAL) != 0;
@@ -356,7 +356,7 @@ public class ExtendedBottomSheetBehavior<V extends View> extends CoordinatorLayo
 
 	@Override
 	public void onNestedPreScroll(CoordinatorLayout coordinatorLayout, V child, View target, int dx,
-								  int dy, int[] consumed) {
+								  int dy, int[] consumed, int type) {
 		View scrollingChild = mNestedScrollingChildRef.get();
 		if (target != scrollingChild) {
 			return;
@@ -392,7 +392,7 @@ public class ExtendedBottomSheetBehavior<V extends View> extends CoordinatorLayo
 	}
 
 	@Override
-	public void onStopNestedScroll(CoordinatorLayout coordinatorLayout, V child, View target) {
+	public void onStopNestedScroll(CoordinatorLayout coordinatorLayout, V child, View target, int type) {
 		if (child.getTop() == mMinOffset) {
 			setStateInternal(STATE_EXPANDED);
 			return;
diff --git a/OsmAnd/src/net/osmand/plus/widgets/tools/SwipeDismissTouchListener.java b/OsmAnd/src/net/osmand/plus/widgets/tools/SwipeDismissTouchListener.java
index 6c70bb1943..9b2c659f4a 100644
--- a/OsmAnd/src/net/osmand/plus/widgets/tools/SwipeDismissTouchListener.java
+++ b/OsmAnd/src/net/osmand/plus/widgets/tools/SwipeDismissTouchListener.java
@@ -227,9 +227,9 @@ public class SwipeDismissTouchListener implements View.OnTouchListener {
 
 				if (mSwiping) {
 					mTranslationX = deltaX;
-					ViewCompat.setTranslationX(mView, deltaX - mSwipingSlop);
+					mView.setTranslationX(deltaX - mSwipingSlop);
 					// TODO: use an ease-out interpolator or such
-					ViewCompat.setAlpha(mView, Math.max(0f, Math.min(1f,
+					mView.setAlpha(Math.max(0f, Math.min(1f,
 							1f - 2f * Math.abs(deltaX) / mViewWidth)));
 					return true;
 				}
diff --git a/OsmAndCore-sample/src/net/osmand/core/samples/android/sample1/mapcontextmenu/ContextMenuHelper.java b/OsmAndCore-sample/src/net/osmand/core/samples/android/sample1/mapcontextmenu/ContextMenuHelper.java
index 273dd86d9e..1b15512e99 100644
--- a/OsmAndCore-sample/src/net/osmand/core/samples/android/sample1/mapcontextmenu/ContextMenuHelper.java
+++ b/OsmAndCore-sample/src/net/osmand/core/samples/android/sample1/mapcontextmenu/ContextMenuHelper.java
@@ -21,7 +21,6 @@ import android.widget.TextView;
 import androidx.appcompat.widget.PopupMenu;
 import androidx.appcompat.widget.Toolbar;
 import androidx.core.content.ContextCompat;
-import androidx.core.view.MenuItemCompat;
 
 import net.osmand.AndroidUtils;
 import net.osmand.core.samples.android.sample1.OsmandResources;
@@ -91,7 +90,7 @@ public class ContextMenuHelper {
 				return true;
 			}
 		});
-		MenuItemCompat.setShowAsAction(mi, MenuItem.SHOW_AS_ACTION_ALWAYS);
+		mi.setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS);
 		topBar.setNavigationOnClickListener(new View.OnClickListener() {
 			@Override
 			public void onClick(final View v) {
@@ -108,21 +107,7 @@ public class ContextMenuHelper {
 
 		//Scale web view font size with system font size
 		float scale = ctx.getResources().getConfiguration().fontScale;
-		if (android.os.Build.VERSION.SDK_INT >= 14) {
-			settings.setTextZoom((int) (scale * 100f));
-		} else {
-			if (scale <= 0.7f) {
-				settings.setTextSize(WebSettings.TextSize.SMALLEST);
-			} else if (scale <= 0.85f) {
-				settings.setTextSize(WebSettings.TextSize.SMALLER);
-			} else if (scale <= 1.0f) {
-				settings.setTextSize(WebSettings.TextSize.NORMAL);
-			} else if (scale <= 1.15f) {
-				settings.setTextSize(WebSettings.TextSize.LARGER);
-			} else {
-				settings.setTextSize(WebSettings.TextSize.LARGEST);
-			}
-		}
+		settings.setTextZoom((int) (scale * 100f));
 
 		wv.loadDataWithBaseURL(null, content, "text/html", "UTF-8", null);
 //		wv.loadUrl(OsMoService.SIGN_IN_URL + app.getSettings().OSMO_DEVICE_KEY.get());
diff --git a/OsmAndCore-sample/src/net/osmand/core/samples/android/sample1/mapcontextmenu/MenuBuilder.java b/OsmAndCore-sample/src/net/osmand/core/samples/android/sample1/mapcontextmenu/MenuBuilder.java
index 67e48710ca..82294a15ed 100644
--- a/OsmAndCore-sample/src/net/osmand/core/samples/android/sample1/mapcontextmenu/MenuBuilder.java
+++ b/OsmAndCore-sample/src/net/osmand/core/samples/android/sample1/mapcontextmenu/MenuBuilder.java
@@ -1,13 +1,13 @@
 package net.osmand.core.samples.android.sample1.mapcontextmenu;
 
 import android.app.Activity;
+import android.content.ClipboardManager;
 import android.content.Context;
 import android.content.Intent;
 import android.content.res.Resources;
 import android.graphics.PorterDuff;
 import android.graphics.drawable.Drawable;
 import android.net.Uri;
-import android.text.ClipboardManager;
 import android.text.TextUtils;
 import android.text.util.Linkify;
 import android.util.TypedValue;

From 678a9ae57428d86df735b039d881aadf11815564 Mon Sep 17 00:00:00 2001
From: josep constanti <jconstanti@yahoo.es>
Date: Tue, 11 Aug 2020 21:05:11 +0000
Subject: [PATCH 17/81] Translated using Weblate (Catalan)

Currently translated at 96.6% (3335 of 3450 strings)
---
 OsmAnd/res/values-ca/strings.xml | 49 +++++++++++++++++++++++++++++---
 1 file changed, 45 insertions(+), 4 deletions(-)

diff --git a/OsmAnd/res/values-ca/strings.xml b/OsmAnd/res/values-ca/strings.xml
index eb41126080..36b1866e7a 100644
--- a/OsmAnd/res/values-ca/strings.xml
+++ b/OsmAnd/res/values-ca/strings.xml
@@ -3610,10 +3610,10 @@ Abasta l\'àrea: %1$s x %2$s</string>
     <string name="download_slope_maps">Pistes</string>
     <string name="custom_osmand_plugin">Connector d\'OsmAnd adaptat</string>
     <string name="replace_point_descr">Substitueix un altre punt per aquest</string>
-    <string name="changes_applied_to_profile">S\'han fet els canvis al perfil %1$s.</string>
-    <string name="settings_item_read_error">No s\'ha pogut llegir %1$s.</string>
+    <string name="changes_applied_to_profile">S\'han fet els canvis al perfil \'%1$s\'.</string>
+    <string name="settings_item_read_error">No s\'ha pogut llegir des de \'%1$s\'.</string>
     <string name="settings_item_write_error">No s\'ha pogut escriure %1$s.</string>
-    <string name="settings_item_import_error">No s\'ha pogut importar %1$s.</string>
+    <string name="settings_item_import_error">No s\'ha pogut importar des de \'%1$s\'.</string>
     <string name="select_track_file">Seleccioneu fitxer de la traça</string>
     <string name="shared_string_languages">Idiomes</string>
     <string name="shared_string_language">Llengua</string>
@@ -3626,7 +3626,7 @@ Abasta l\'àrea: %1$s x %2$s</string>
     <string name="divider_descr">Elements per sota d’aquest punt separats per un divisor.</string>
     <string name="shared_string_hidden">Amagat</string>
     <string name="hidden_items_descr">Aquests elements no es mostren al menú, però les opcions o els connectors que representen continuaran funcionant.</string>
-    <string name="reset_items_descr">La configuració es restablirà a l\'estat original després d\'amagar-se.</string>
+    <string name="reset_items_descr">Si s\'amaga la configuració es restablirà al seus valors originals.</string>
     <string name="main_actions_descr">Les accions principals només contenen 4 botons.</string>
     <string name="main_actions">Accions principals</string>
     <string name="move_inside_category">Només podeu moure els elements dins d\'aquesta categoria.</string>
@@ -3748,4 +3748,45 @@ Abasta l\'àrea: %1$s x %2$s</string>
     <string name="next_segment">Següent segment</string>
     <string name="threshold_distance">Llindar de distància</string>
     <string name="navigation_profile">Perfil de navegació</string>
+    <string name="additional_actions_descr">Podeu accedir a aquestes accions prement el botó \"%1$s\".</string>
+    <string name="ltr_or_rtl_combine_via_slash_with_space">%1$s / %2$s</string>
+    <string name="search_poi_types">Cerca per tipus de PDI</string>
+    <string name="download_unsupported_action">L\'acció %1$s no s\'admet</string>
+    <string name="mapillary_item">OsmAnd + Mapillary</string>
+    <string name="quick_action_item">Acció directa</string>
+    <string name="radius_ruler_item">Radi de distància</string>
+    <string name="measure_distance_item">Mesura la distància</string>
+    <string name="travel_item">Viatges (Viquiviatges i Viquipèdia)</string>
+    <string name="map_markers_item">Marcadors de mapa</string>
+    <string name="favorites_item">Preferits</string>
+    <string name="subscription_osmandlive_item">Subscripció - OsmAnd Live</string>
+    <string name="osmand_purchases_item">Compres OsmAnd</string>
+    <string name="navigation_profiles_item">Perfils de navegació</string>
+    <string name="quick_action_transport_hide">Amaga el transport públic</string>
+    <string name="quick_action_show_hide_transport">Mostra/amaga el transport públic</string>
+    <string name="quick_action_transport_descr">Botó que mostra o oculta el transport públic al mapa.</string>
+    <string name="create_edit_poi">Crea / Edita PDI</string>
+    <string name="parking_positions">Posicions d’aparcament</string>
+    <string name="add_edit_favorite">Afegeix / Edita Preferits</string>
+    <string name="reset_deafult_order">Restableix la ordenació dels elements predeterminats</string>
+    <string name="back_to_editing">Torna a l\'edició</string>
+    <string name="turn_screen_on_navigation_instructions_descr">A cada instrucció de navegació s\'activarà la pantalla.</string>
+    <string name="turn_screen_on_navigation_instructions">Instruccions de navegació</string>
+    <string name="turn_screen_on_proximity_sensor">Sensor de proximitat</string>
+    <string name="keep_screen_on">Manté la pantalla activada</string>
+    <string name="pseudo_mercator_projection">Projecció Pseudo-Mercator</string>
+    <string name="one_image_per_tile">Un fitxer d\'imatge per tessel·la</string>
+    <string name="sqlite_db_file">Fitxer SQLiteDB</string>
+    <string name="online_map_name_helper_text">Proporcioneu un nom per a l’origen del mapa en línia.</string>
+    <string name="online_map_url_helper_text">Introduïu o enganxeu l’URL de la font en línia.</string>
+    <string name="edit_online_source">Edita la font en línia</string>
+    <string name="expire_time">Caducitat</string>
+    <string name="mercator_projection">Projecció de Mercator</string>
+    <string name="storage_format">Format d\'emmagatzematge</string>
+    <string name="map_source_zoom_levels">Establiu un nivell de zoom mínim i màxim per a mostrar o carregar el mapa en línia.</string>
+    <string name="expire_time_descr">Les tessel·les de la memòria cau s\'actualitzaran transcorregut el nombre de minuts especificat. Deixeu aquest camp buit per no actualitzar mai les tessel·les d\'aquesta font.
+\n
+\nUn dia equival a 1.440 minuts.
+\nUna setmana té 10.080 minuts.
+\nUn mes dura 43.829 minuts.</string>
 </resources>
\ No newline at end of file

From b81c573604bc14442c85bf1bcac0e766424c8c0b Mon Sep 17 00:00:00 2001
From: Razvan D <razvan.net@gmail.com>
Date: Mon, 10 Aug 2020 20:45:23 +0000
Subject: [PATCH 18/81] Translated using Weblate (Romanian)

Currently translated at 65.6% (2266 of 3450 strings)
---
 OsmAnd/res/values-ro/strings.xml | 155 +++++++++++++++++++++----------
 1 file changed, 108 insertions(+), 47 deletions(-)

diff --git a/OsmAnd/res/values-ro/strings.xml b/OsmAnd/res/values-ro/strings.xml
index 60006cc446..6632507265 100644
--- a/OsmAnd/res/values-ro/strings.xml
+++ b/OsmAnd/res/values-ro/strings.xml
@@ -58,7 +58,7 @@
 	</string>
     <string name="filterpoi_activity">Creează filtru POI</string>
     <string name="recalculate_route_to_your_location">Mod de transport:</string>
-    <string name="select_navigation_mode">Selectează modul de transport</string>
+    <string name="select_navigation_mode">Mod transport:</string>
     <string name="day_night_info_description">Răsărit : %1$s \nApus : %2$s</string>
     <string name="day_night_info">Info zi/noapte</string>
     <string name="map_widget_vector_attributes">Atribute randare</string>
@@ -99,12 +99,12 @@
     <string name="show_cameras">Arată camerele radar</string>
     <string name="show_traffic_warnings">Arată atenționări de trafic</string>
     <string name="avoid_toll_roads">Evită drumuri cu taxă</string>
-    <string name="continue_follow_previous_route_auto">"Navigarea anterioară nu s-a încheiat. Doriți s-o continuați (implicit \'Da\')?  (%1$s seconds)"</string>
+    <string name="continue_follow_previous_route_auto">Continuați să urmați navigarea anterioară neterminată\? (%1$s seconds)</string>
     <string name="route_updated_loc_found">Ruta va fi calculată când se va stabili poziția curentă</string>
     <string name="osmand_parking_hours">Ore</string>
     <string name="osmand_parking_minutes">Minute</string>
-    <string name="osmand_parking_position_description_add_time">Mașina a fost parcată la:</string>
-    <string name="select_animate_speedup">Selecție accelerare simulare rută</string>
+    <string name="osmand_parking_position_description_add_time">Mașina este parcată la</string>
+    <string name="select_animate_speedup">Viteză simulare rută:</string>
     <string name="global_app_allocated_memory_descr">Memorie alocată %1$s MB (limita Android %2$s MB, Dalvik %3$s MB).</string>
     <string name="global_app_allocated_memory">Memorie alocată</string>
     <string name="native_app_allocated_memory_descr">Total memorie nativă alocată de aplicație %1$s MB (Dalvik %2$s MB, other %3$s MB).
@@ -150,7 +150,7 @@
     <string name="rendering_attr_hmRendered_description">Crește nivelul de detalii ale hărții</string>
     <string name="rendering_attr_hmRendered_name">Mai multe detalii pe hartă</string>
     <string name="local_index_routing_data">Date despre rutare</string>
-    <string name="navigate_point_format">Format:</string>
+    <string name="navigate_point_format">Format</string>
     <string name="poi_search_desc">Caută POI (Puncte de Interes)</string>
     <string name="address_search_desc">Căutare adresă</string>
     <string name="navpoint_search_desc">Coordonate</string>
@@ -183,7 +183,7 @@
     <string name="prefs_plugins">Manager de plugin-uri</string>
     <string name="osm_editing_plugin_description">Arată setările necesare pentru colectarea/modificarea de date openstreetmaps.org (POI, bug-uri, trasee) - necesită specificarea datelor de acces la OSM.</string>
     <string name="vector_maps_may_display_faster_on_some_devices">Hărțile vectoriale se afișează mai rapid de regulă. Posibil să nu funcționeze bine pe anumite dispozitive.</string>
-    <string name="play_commands_of_currently_selected_voice">Exemple de comenzi ale vocii selectate</string>
+    <string name="play_commands_of_currently_selected_voice">Selectează o voce și testează redând anunțuri:</string>
     <string name="debugging_and_development">Dezvoltare OsmAnd</string>
     <string name="native_rendering">Randare nativă</string>
     <string name="test_voice_prompts">Testare instrucțiuni vocale</string>
@@ -329,7 +329,7 @@
     <string name="file_can_not_be_renamed">Fișierul nu poate fi redenumit.</string>
     <string name="file_with_name_already_exists">Există un fișier cu același nume.</string>
     <string name="shared_string_gpx_route">Rută GPX</string>
-    <string name="poi_query_by_name_matches_categories">Au foste găsite câteva categorii de POI care satisfac condițiile:</string>
+    <string name="poi_query_by_name_matches_categories">Au fost găsite câteva categorii asemănătoare de POI.</string>
     <string name="data_to_search_poi_not_available">Nu există date offline salvate pentru efectuarea căutării.</string>
     <string name="poi_filter_by_name">Căutare după nume</string>
     <string name="old_poi_file_should_be_deleted">Fișierul de date POI \'%1$s\' este redundant și poate fi șters.</string>
@@ -389,7 +389,7 @@
     <string name="local_indexes_cat_poi">Date despre POI</string>
     <string name="ttsvoice">Voce TTS</string>
     <string name="search_offline_clear_search">Căutare nouă</string>
-    <string name="map_text_size_descr">Selecția mărimii textului pentru denumirile afișate pe hartă</string>
+    <string name="map_text_size_descr">Mărimea textului pentru denumirile afișate pe hartă:</string>
     <string name="map_text_size">Mărime font hartă</string>
     <string name="trace_rendering">Info depanare randare</string>
     <string name="trace_rendering_descr">Afișare date despre performanțele procesului de randare</string>
@@ -549,7 +549,7 @@
     <string name="rotate_map_compass_opt">Către direcție busolă</string>
     <string name="rotate_map_bearing_opt">În direcția deplasării</string>
     <string name="rotate_map_none_opt">Nord întotdeauna sus</string>
-    <string name="rotate_map_to_bearing_descr">Aliniere hartă la ecran</string>
+    <string name="rotate_map_to_bearing_descr">Aliniere hartă:</string>
     <string name="rotate_map_to_bearing">Orientare hartă</string>
     <string name="show_route">Detalii rută</string>
     <string name="fav_imported_sucessfully">Puncte favorite importate cu succes</string>
@@ -581,9 +581,9 @@
     <string name="gps_provider">GPS</string>
     <string name="int_seconds">secunde</string>
     <string name="int_min">min.</string>
-    <string name="background_service_int_descr">Alegeți intervalul de timp pentru menținerea activă a serviciilor folosite în fundal</string>
+    <string name="background_service_int_descr">Intervalul de timp pentru menținerea activă a serviciilor folosite în fundal:</string>
     <string name="background_service_int">Interval menținere activă GPS</string>
-    <string name="background_service_provider_descr">Alege furnizorul serviciului de localizare pe timpul navigării în fundal</string>
+    <string name="background_service_provider_descr">Metodă localizare folosită de serviciul în fundal:</string>
     <string name="background_service_provider">Furnizorul serviciului de localizare</string>
     <string name="background_router_service_descr">Rulează OsmAnd în fundal pentru determinarea poziției în timp ce ecranul este oprit</string>
     <string name="background_router_service">Rulează în fundal</string>
@@ -699,7 +699,7 @@
     <string name="empty_route_calculated">Eroare: ruta calculată este vidă</string>
     <string name="new_route_calculated_dist">O nouă rută a fost calculată, distanța</string>
     <string name="arrived_at_destination">Ați ajuns la destinație</string>
-    <string name="invalid_locations">Coordonatele nu sunt valide!</string>
+    <string name="invalid_locations">Coordonate invalide</string>
     <string name="go_back_to_osmand">Înapoi la harta OsmAnd</string>
     <string name="shared_string_close">Închideți</string>
     <string name="loading_data">Se încarcă date…</string>
@@ -794,7 +794,7 @@
     <string name="osb_comment_dialog_message">Mesaj</string>
     <string name="osb_comment_dialog_author">Nume autor</string>
     <string name="osb_comment_dialog_success">Comentariu adăugat</string>
-    <string name="osb_comment_dialog_error">Nu s-a putut adăuga comentariul</string>
+    <string name="osb_comment_dialog_error">Nu s-a putut adăuga comentariul.</string>
     <string name="poi_edit_title">Editare POI</string>
     <string name="poi_create_title">Creează POI</string>
     <string name="poi_error_poi_not_found">POI-ul nu poate fi găsit sau punctul de interes nu este singular</string>
@@ -825,7 +825,7 @@
     <string name="native_library_not_running">Aplicația rulează în safe mode (se poate dezactiva de la Setări).</string>
     <string name="rendering_attr_showRoadMaps_description">Specificați când anume să fie afișate hărțile exclusiv cu drumuri:</string>
     <string name="rendering_attr_showRoadMaps_name">Hărți doar pentru drumuri</string>
-    <string name="download_roads_only_item">"Drumuri "</string>
+    <string name="download_roads_only_item">Doar drumuri</string>
     <string name="download_regular_maps">Hărți complete</string>
     <string name="download_roads_only_maps">Hărți exclusiv drumuri</string>
     <string name="incomplete_locale">incomplet</string>
@@ -868,11 +868,11 @@
     <string name="srtm_paid_version_title">Plugin linii de nivel</string>
     <string name="av_def_action_video">Înregistrare video</string>
     <string name="av_def_action_audio">Înregistrare audio</string>
-    <string name="av_widget_action_descr">Selectați acțiunea implicită a iconiței</string>
+    <string name="av_widget_action_descr">Acțiune implicită a iconiței:</string>
     <string name="av_widget_action">Acțiune implicită iconiță</string>
-    <string name="av_video_format_descr">Selectați formatul video</string>
+    <string name="av_video_format_descr">Format ieșire video:</string>
     <string name="av_video_format">Format video</string>
-    <string name="av_use_external_recorder_descr">Folosește aplicația sistemului pt înregistrare video</string>
+    <string name="av_use_external_recorder_descr">Folosește aplicația sistemului pt înregistrare video.</string>
     <string name="av_use_external_recorder">Folosește aplicație externă pentru înregistrare</string>
     <string name="av_settings_descr">Configurarea setărilor audio și video</string>
     <string name="av_settings">Setări audio/video </string>
@@ -888,7 +888,7 @@
     <string name="routing_attr_avoid_toll_name">Evită drumurile cu taxă</string>
     <string name="routing_attr_avoid_toll_description">Evită drumurile cu taxă</string>
     <string name="routing_attr_avoid_unpaved_name">Evită drumurile neasfaltate</string>
-    <string name="routing_attr_avoid_unpaved_description">Evită drumurile neasfaltate.</string>
+    <string name="routing_attr_avoid_unpaved_description">Evită drumurile neasfaltate</string>
     <string name="routing_attr_avoid_ferries_name">Evită feriboturile</string>
     <string name="routing_attr_avoid_ferries_description">Evită feriboturile</string>
     <string name="routing_attr_avoid_motorway_name">Evită autostrăzile</string>
@@ -995,7 +995,7 @@
     <string name="shared_string_map">Hartă</string>
     <string name="prefer_motorways">Preferă autostrăzi</string>
     <string name="prefer_in_routing_title">Preferă…</string>
-    <string name="prefer_in_routing_descr">Preferă autostrăzi</string>
+    <string name="prefer_in_routing_descr">Preferă autostrăzi.</string>
     <string name="max_speed_none">nici una</string>
     <string name="index_name_openmaps">OpenMaps EU</string>
     <string name="local_indexes_cat_srtm">Date linii de contur</string>
@@ -1111,7 +1111,7 @@
     <string name="gpx_selection_segment_title">Segment</string>
     <string name="record_plugin_description">Salvează înregistrările cu o singură atingere a ecranului. Arată setările pentru înregistrarea traseelor și stocarea locală în fișiere GPX folosind un serviciu web.</string>
     <string name="av_camera_focus">Tip de focalizare al camerei</string>
-    <string name="av_camera_focus_descr">Selectați modul de focalizare al camerei interne.</string>
+    <string name="av_camera_focus_descr">Mod focalizare cameră:</string>
     <string name="av_camera_focus_auto">Auto focalizare</string>
     <string name="av_camera_focus_hiperfocal">Focalizare hiperfocală</string>
     <string name="av_camera_focus_infinity">Focalizarea este setata la infinit</string>
@@ -1206,8 +1206,8 @@
     <string name="gpx_file_is_empty">Fișier GPX gol</string>
     <string name="shared_string_tracks">Traseele mele</string>
     <string name="navigation_intent_invalid">Format invalid: %s</string>
-    <string name="osb_author_dialog_password">"Parolă OSM  (opţional)"</string>
-    <string name="shared_string_downloading">Se descarcă</string>
+    <string name="osb_author_dialog_password">Parolă OSM (opţională)</string>
+    <string name="shared_string_downloading">Se descarcă…</string>
     <string name="rendering_value_germanRoadAtlas_name">Atlas rutier german</string>
     <string name="version_settings">Versiuni</string>
     <string name="rendering_attr_tramRoutes_name">Rute tramvai</string>
@@ -1366,9 +1366,9 @@
     <string name="osn_reopen_dialog_title">Redeschide nota</string>
     <string name="osn_close_dialog_title">Închideți nota</string>
     <string name="osn_add_dialog_success">Notă creată</string>
-    <string name="osn_add_dialog_error">Nu s-a putut crea nota</string>
+    <string name="osn_add_dialog_error">Nu s-a putut crea nota.</string>
     <string name="osn_close_dialog_success">Notă închisă</string>
-    <string name="osn_close_dialog_error">Nota nu a putut fi închisă</string>
+    <string name="osn_close_dialog_error">Nota nu a putut fi închisă.</string>
     <string name="shared_string_commit">Comite</string>
     <string name="context_menu_item_delete_waypoint">Ștergi punctul de referință GPX?</string>
     <string name="context_menu_item_edit_waypoint">Editează punctul de referință GPX</string>
@@ -1678,7 +1678,7 @@
     <string name="notes_by_date">Note după dată</string>
     <string name="by_date">După dată</string>
     <string name="by_type">După tip</string>
-    <string name="looking_for_tracks_with_waypoints">"Se caută  trasee cu puncte intermediare"</string>
+    <string name="looking_for_tracks_with_waypoints">Se caută trasee cu puncte intermediare</string>
     <string name="shared_string_more_without_dots">Mai mult</string>
     <string name="appearance_on_the_map">Aspectul pe hartă</string>
     <string name="add_track_to_markers_descr">Selectați un traseu pentru a-i adăuga un punct intermediar la marcaje.</string>
@@ -1723,7 +1723,7 @@
     <string name="route_is_calculated">Ruta a fost calculată</string>
     <string name="round_trip">Dus-întors</string>
     <string name="plan_route_no_markers_toast">Trebuie sa adăugați cel puțin un marcaj pentru a utilza această funcție.</string>
-    <string name="osn_modify_dialog_error">Nu s-a putut modifica nota</string>
+    <string name="osn_modify_dialog_error">Nu s-a putut modifica nota.</string>
     <string name="osn_modify_dialog_title">Modifică nota</string>
     <string name="context_menu_item_modify_note">Modifică nota OMS</string>
     <string name="make_round_trip_descr">Copiază punctul de pornire ca destinație.</string>
@@ -1778,7 +1778,7 @@
     <string name="mapillary_menu_title_dates">Dată</string>
     <string name="mapillary_menu_edit_text_hint">Scrie nume utilizator</string>
     <string name="mapillary_menu_descr_username">Vedeți doar imaginile adaugate de</string>
-    <string name="mapillary_menu_filter_description">"Filtrați imaginile după utilizator,  după dată sau după tip. Active doar pentru zoom apropiat."</string>
+    <string name="mapillary_menu_filter_description">Filtrați imaginile după utilizator, după dată sau după tip. Active doar pentru zoom apropiat.</string>
     <string name="import_gpx_failed_descr">Osmand nu poate importa fișierul. Vă rugăm să verificați dacă OsmAnd are permisiuni de citire din această locație.</string>
     <string name="distance_moving">Distanța corectată</string>
     <string name="mapillary_image">Imagine Mapillary</string>
@@ -1835,7 +1835,7 @@
     <string name="restore_purchases">Restaurare cumpărături</string>
     <string name="fonts_header">Fonturi hartă</string>
     <string name="right_side_navigation">Conducere pe dreapta</string>
-    <string name="driving_region_automatic">Automatic</string>
+    <string name="driving_region_automatic">Automat</string>
     <string name="do_not_send_anonymous_app_usage">Nu trimite statistici de utilizare anonime ale aplicației</string>
     <string name="do_not_send_anonymous_app_usage_desc">OsmAnd colectează informații despre părțile din aplicatie folosite. Locația dumneavoastră și datele introduse în aplicație nu vor fi niciodată trimise, sau detalii despre zona în care vă aflați, căutari sau descărcări.</string>
     <string name="do_not_show_startup_messages">Nu arăta mesaje la pornire</string>
@@ -2305,7 +2305,7 @@
     <string name="searching_gps">Căutare GPS</string>
     <string name="rate_dialog_descr">Acordați-ne 30 de secunde, trimiteți părerea dvs. și evaluați munca noastră pe Google Play.</string>
     <string name="shared_string_privacy_policy">Politica de confidențialitate</string>
-    <string name="help_us_make_osmand_better">Ajutați-ne să facem OsmAnd mai bun!</string>
+    <string name="help_us_make_osmand_better">Ajutați-ne să facem OsmAnd mai bun</string>
     <string name="choose_data_to_share">Alegeți ce tip de date doriți să partajați:</string>
     <string name="downloaded_maps">Hărți descărcate</string>
     <string name="visited_screens">Ecrane vizitate</string>
@@ -2335,7 +2335,7 @@
     <string name="profile_type_base_string">Profil de bază</string>
     <string name="profile_alert_need_routing_type_title">Selectați tipul navigației</string>
     <string name="profile_alert_need_profile_name_title">Introduceți numele profilului</string>
-    <string name="profile_alert_need_profile_name_msg">Numele profilului nu trebuie să fie gol!</string>
+    <string name="profile_alert_need_profile_name_msg">Trebuie să specificați mai întâi un nume de profil.</string>
     <string name="profile_alert_duplicate_name_title">Nume deja existent</string>
     <string name="profile_alert_duplicate_name_msg">Există deja un profil cu un astfel de nume</string>
     <string name="profile_alert_cant_delete_base">Nu puteți șterge profile de bază OsmAnd</string>
@@ -2369,12 +2369,12 @@
     <string name="arrival_distance_descr">Cât de repede vrei să se anunțe sosirea\?</string>
     <string name="press_again_to_change_the_map_orientation">Apăsați din nou pentru a schimba orientarea hărții</string>
     <string name="shared_string_min_speed">Viteza min.</string>
-    <string name="shared_string_max_speed">Viteza max.</string>
+    <string name="shared_string_max_speed">Viteză max.</string>
     <string name="default_speed_setting_title">Viteză implicită</string>
     <string name="default_speed_setting_descr">Modificați setările de viteză implicită</string>
     <string name="minmax_speed_dialog_title">Setați viteza min/max</string>
     <string name="new_profile">Profil nou</string>
-    <string name="apply_preference_to_all_profiles">Poţi aplica aceasta modificare pe toate profilele sau doar pe cel selectat</string>
+    <string name="apply_preference_to_all_profiles">Poţi aplica aceasta modificare pe toate profilele sau doar pe cel selectat.</string>
     <string name="shared_preference">Partajat</string>
     <string name="routing_attr_driving_style_prefer_unpaved_name">Prefer drumurile nepavate</string>
     <string name="routing_attr_driving_style_prefer_unpaved_description">Prefer drumurile nepavate</string>
@@ -2390,12 +2390,12 @@
     <string name="tts_initialization_error">Motorul text-to-speech nu porneste.</string>
     <string name="export_profile">Exportă profilul</string>
     <string name="exported_osmand_profile">Profil osmand exportat %1$s</string>
-    <string name="overwrite_profile_q">Profil \'%1$s\' deja existent, îl rescrii\?</string>
+    <string name="overwrite_profile_q">\'%1$s\' există deja. Îl suprascriu\?</string>
     <string name="export_profile_failed">Profilul nu se poate exporta.</string>
-    <string name="profile_import">Importare de profil:</string>
+    <string name="profile_import">Importare profil</string>
     <string name="profile_import_descr">Pentru a importa profilul, selectați fișierul din dispozitiv, și deschideți-l cu OsmAnd.</string>
     <string name="file_import_error">%1$s Eroare de incarcare al fisierului. %1$s: %2$s</string>
-    <string name="file_imported_successfully">%1$s Incarcat cu succes.</string>
+    <string name="file_imported_successfully">%1$s importat.</string>
     <string name="rendering_value_white_name">Alb</string>
     <string name="route_start_point">Punct de plecare</string>
     <string name="unirs_render_descr">Modifica stilul implicit pentru a crește contrastul dintre drumurile pietonale și biciclete. Utilizează culori Mapnik.</string>
@@ -2427,7 +2427,7 @@
     <string name="change_osmand_data_folder_question">Schimbați dosarul de date ale OsmAnd\?</string>
     <string name="move_maps_to_new_destination">Mută la noua destinație</string>
     <string name="internal_app_storage_description">Stocare internă, ascunsă de utilizator și alte aplicații, accesibilă exclusiv pentru OsmAnd</string>
-    <string name="change_data_storage_folder">Schimbați folderul de stocare a datelor</string>
+    <string name="change_data_storage_folder">Schimbați folderul de stocare</string>
     <string name="rendering_attr_piste_type_snow_park_name">Parc</string>
     <string name="rendering_attr_piste_type_sleigh_name">Sanie</string>
     <string name="rendering_attr_piste_type_sled_name">Sanie</string>
@@ -2640,16 +2640,16 @@
     <string name="voice_announces_descr">Instrucțiuni și anunțuri de navigație</string>
     <string name="rendering_attr_showCycleNodeNetworkRoutes_name">Arată rutele pentru biciclete</string>
     <string name="download_map_dialog">Dialogul de descărcare a hărții</string>
-    <string name="dialogs_and_notifications_descr">Control popups, dialoguri și notificări pe care OsmAnd le arată în timpul utilizării.</string>
+    <string name="dialogs_and_notifications_descr">Control popups, dialoguri și notificări.</string>
     <string name="rendering_value_walkingRoutesOSMCNodes_name">Rețele de noduri</string>
     <string name="suggested_maps">Hărți sugerate</string>
-    <string name="suggested_maps_descr">Aceste hărți trebuie să fie utilizate cu pluginul</string>
+    <string name="suggested_maps_descr">Aceste hărți sunt necesare pentru plugin.</string>
     <string name="added_profiles">Profiluri adăugate</string>
-    <string name="added_profiles_descr">Pluginul adaugă un nou profil la OsmAnd</string>
+    <string name="added_profiles_descr">Profiluri adăugate de plugin</string>
     <string name="shared_string_turn_off">Opriți</string>
     <string name="new_plugin_added">A fost adăugat un plugin nou</string>
     <string name="join_segments">Alăturați segmente</string>
-    <string name="add_new_profile_q">Adăugați un profil nou \'%1$s\'\?</string>
+    <string name="add_new_profile_q">Adăugați profilul nou \'%1$s\'\?</string>
     <string name="save_heading">Includeți titlu</string>
     <string name="save_heading_descr">Salvați poziția fiecarui punct al traseului în timpul înregistrării.</string>
     <string name="ltr_or_rtl_combine_via_bold_point">%1$s • %2$s</string>
@@ -2657,17 +2657,17 @@
     <string name="personal_category_name">Personal</string>
     <string name="shared_string_downloading_formatted">Descarcarea %s</string>
     <string name="rendering_value_thick_name">Gros</string>
-    <string name="desert_render_descr">Pentru deșerturi și alte zone slab populate.</string>
-    <string name="select_navigation_icon">Selecteaza iconul pentru navigatie</string>
-    <string name="select_map_icon">Selecteaza iconul pentru harta</string>
-    <string name="delete_profiles_descr">Dupa ce apasati Apply ,profilul sters va fi pierdut definitiv.</string>
+    <string name="desert_render_descr">Pentru deșerturi și alte zone slab populate. Mai detaliat.</string>
+    <string name="select_navigation_icon">Selectează icoana pentru navigație</string>
+    <string name="select_map_icon">Poziționare icoană în timpul repausului</string>
+    <string name="delete_profiles_descr">Apăsând pe \'Aplică\' se vor șterge permanent profilurile eliminate.</string>
     <string name="master_profile">Profil de baza</string>
-    <string name="select_color">Selecteaza culoarea</string>
+    <string name="select_color">Selectează culoarea</string>
     <string name="edit_profiles_descr">Nu puteți șterge profilurile OsmAnd implicite, dar aveți posibilitatea să le dezactivați în ecranul anterior sau să le mutați în partea de jos.</string>
     <string name="edit_profiles">Editarea profilurilor</string>
     <string name="select_nav_profile_dialog_message">Tipul de navigație afectează regulile pentru calcularea rutei.</string>
     <string name="profile_appearance">Aspectul profilului</string>
-    <string name="choose_icon_color_name">Alegeți pictograma, culoarea și numele</string>
+    <string name="choose_icon_color_name">Pictograma, culoarea și numele</string>
     <string name="reorder_profiles">Editează lista de profiluri</string>
     <string name="selected_profile">Profil selectat</string>
     <string name="nautical_render_descr">Pentru navigare nautică.Caracteristici de geamanduri, faruri, râuri, benzi și mărci de mare, porturi, servicii de marinari, și contururi de adâncime.</string>
@@ -2747,7 +2747,7 @@
     <string name="route_recalculation">Recalculare rută</string>
     <string name="accessibility_announce">Anunț</string>
     <string name="login_and_pass">Utilizator și parolă</string>
-    <string name="plugin_global_prefs_info">Aceste setări se aplică la toate profilurile.</string>
+    <string name="plugin_global_prefs_info">Aceste setări se aplicp la toate profilurile.</string>
     <string name="osm_editing">Editare OSM</string>
     <string name="app_mode_osm">OSM</string>
     <string name="permission_is_required">E nevoie de permisiune pentru a utiliza această opțiune.</string>
@@ -2797,4 +2797,65 @@
     <string name="shared_string_importing">Se importă</string>
     <string name="items_added">Articole adăugate</string>
     <string name="shared_string_import_complete">Importarea s-a finalizat</string>
+    <string name="edit_online_source">Editare sursă online</string>
+    <string name="mercator_projection">Proiecție Mercator</string>
+    <string name="speed_camera_pois">POI-uri Camere viteză</string>
+    <string name="speed_cameras_legal_descr">În unele țări sau regiuni, utilizarea aplicațiilor de avertizare a camerelor de viteză este interzisă de lege.
+\n
+\nTrebuie să faceți o alegere în funcție de legea țării dvs.
+\n
+\nSelectați %1$s și veți primi alerte și avertismente cu privire la camerele de viteză.
+\n
+\nSelectați %2$s. Toate datele legate de camerele de viteză: alerte, notificări, POI-uri vor fi șterse până când OsmAnd este reinstalat din nou.</string>
+    <string name="speed_cameras_alert">Alertele camerelor de viteză în unele țări sunt interzise de lege.</string>
+    <string name="use_volume_buttons_as_zoom">Butoane volum ca și zoom</string>
+    <string name="set_working_days_to_continue">Trebuie să setați zile lucrătoare pentru a continua</string>
+    <string name="track_show_start_finish_icons">Afișare icoane start finish</string>
+    <string name="select_track_width">Selecție lățime</string>
+    <string name="keep_screen_on">Țineți ecranul pornit</string>
+    <string name="keep_screen_off">Țineți ecranul oprit</string>
+    <string name="pseudo_mercator_projection">Proiecție pseudo-Mercator</string>
+    <string name="sqlite_db_file">Fișier SQLiteDB</string>
+    <string name="expire_time">Timp expirare</string>
+    <string name="storage_format">Format stocare</string>
+    <string name="shared_string_delete_all_q">Șterg tot\?</string>
+    <string name="uninstall_speed_cameras">Dezinstalare camere radar</string>
+    <string name="shared_string_legal">Legal</string>
+    <string name="keep_active">Mențineți activ</string>
+    <string name="shared_string_uninstall">Dezinstalare</string>
+    <string name="shared_string_tones">tone</string>
+    <string name="shared_string_meters">metrii</string>
+    <string name="add_online_source">Adăugare surse online</string>
+    <string name="quick_action_showhide_mapillary_title">Afișare/ascundere Mapillary</string>
+    <string name="quick_action_mapillary_hide">Ascundere Mapillary</string>
+    <string name="quick_action_mapillary_show">Afișare Mapillary</string>
+    <string name="quick_action_showhide_mapillary_descr">O comutare pentru a afișa sau ascunde stratul Mapillary pe hartă.</string>
+    <string name="routing_attr_length_description">Specificați lungimea vehiculului care trebuie permisă pe rute.</string>
+    <string name="routing_attr_length_name">Limită lungime</string>
+    <string name="shared_string_bearing">Direcție</string>
+    <string name="item_deleted">%1$s șters</string>
+    <string name="shared_string_uninstall_and_restart">Dezinstalare și repornire</string>
+    <string name="quick_action_remove_next_destination">Ștergeți următorul punct de destinație</string>
+    <string name="please_provide_point_name_error">Vă rugăm să furnizați un nume pentru acest punct</string>
+    <string name="search_download_wikipedia_maps">Descărcare hărți Wikipedia</string>
+    <string name="app_mode_enduro_motorcycle">Motocicletă enduro</string>
+    <string name="app_mode_wheelchair">Scaun cu rotile</string>
+    <string name="osm_edit_closed_note">Notă OSM închisă</string>
+    <string name="plan_a_route">Planificați o rută</string>
+    <string name="add_to_a_track">Adăugați la traseu</string>
+    <string name="shared_string_custom">Personalizat</string>
+    <string name="gpx_direction_arrows">Săgeți direcționale</string>
+    <string name="track_coloring_solid">Solid</string>
+    <string name="plan_route_last_edited">Ultima modificare</string>
+    <string name="plan_route_import_track">Importare traseu</string>
+    <string name="plan_route_open_existing_track">Deschideți o rută existentă</string>
+    <string name="plan_route_create_new_route">Creați o rută nouă</string>
+    <string name="shared_string_done">Gata</string>
+    <string name="overwrite_track">Suprascriere traseu</string>
+    <string name="save_as_new_track">Salvați ca și traseu nou</string>
+    <string name="reverse_route">Inversare rută</string>
+    <string name="whole_track">Întreg traseul</string>
+    <string name="next_segment">Segmentul următor</string>
+    <string name="navigation_profile">Profil navigație</string>
+    <string name="routing_attr_height_obstacles_name">Utilizare date altitudine</string>
 </resources>
\ No newline at end of file

From db3d10d8a164e9a65adca78993420f621ba5837f Mon Sep 17 00:00:00 2001
From: Ldm Public <ldmpub@gmail.com>
Date: Tue, 11 Aug 2020 22:46:47 +0000
Subject: [PATCH 19/81] Translated using Weblate (French)

Currently translated at 100.0% (3450 of 3450 strings)
---
 OsmAnd/res/values-fr/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/OsmAnd/res/values-fr/strings.xml b/OsmAnd/res/values-fr/strings.xml
index 5c3be1db87..4a796604eb 100644
--- a/OsmAnd/res/values-fr/strings.xml
+++ b/OsmAnd/res/values-fr/strings.xml
@@ -1373,7 +1373,7 @@
     <string name="use_opengl_render">Utiliser le rendu OpenGL</string>
     <string name="use_opengl_render_descr">Utiliser le rendu matériel accéléré OpenGL (peut consommer plus de batterie et ne pas fonctionner sur les anciens appareils).</string>
     <string name="everything_up_to_date">Tous les fichiers sont à jour</string>
-    <string name="shared_string_dismiss">Ignorer</string>
+    <string name="shared_string_dismiss">Arrêter</string>
     <string name="no_internet_connection">Téléchargement impossible, veuillez vérifier votre connexion Internet.</string>
     <string name="download_tab_downloads">Tous les téléchargements</string>
     <string name="download_tab_updates">Mises à jour</string>

From caae02d1f788929df6b1309ad78da5d7436195b1 Mon Sep 17 00:00:00 2001
From: Dimitris Spingos <dmtrs32@gmail.com>
Date: Wed, 12 Aug 2020 04:54:37 +0000
Subject: [PATCH 20/81] Translated using Weblate (Greek)

Currently translated at 100.0% (3450 of 3450 strings)
---
 OsmAnd/res/values-el/strings.xml | 247 +++++++++++++++++++++++--------
 1 file changed, 186 insertions(+), 61 deletions(-)

diff --git a/OsmAnd/res/values-el/strings.xml b/OsmAnd/res/values-el/strings.xml
index d83a0a8b6f..6a8005cfae 100644
--- a/OsmAnd/res/values-el/strings.xml
+++ b/OsmAnd/res/values-el/strings.xml
@@ -1015,23 +1015,23 @@
     <string name="driving_region_japan">Ιαπωνία</string>
     <string name="driving_region_us">ΗΠΑ</string>
     <string name="driving_region_canada">Καναδάς</string>
-    <string name="driving_region_europe_asia">Ευρώπη, Ασία, Λατινική Αμερική κ.ο.κ.</string>
-    <string name="driving_region_uk">ΗΒ, Ινδία κ.ο.κ</string>
+    <string name="driving_region_europe_asia">Ευρώπη, Ασία, Λατινική Αμερική και παρόμοια</string>
+    <string name="driving_region_uk">ΗΒ, Ινδία και παρόμοια</string>
     <string name="about_version">Έκδοση:</string>
     <string name="shared_string_about">Περί</string>
     <string name="about_settings_descr">Πληροφορίες έκδοσης, άδειες, μέλη έργου</string>
-    <string name="local_index_tile_data_expire">Λήξη (λεπτά): %1$s</string>
+    <string name="local_index_tile_data_expire">Χρόνος λήξης (σε λεπτά): %1$s</string>
     <string name="local_index_tile_data_maxzoom">Μέγιστη εστίαση: %1$s</string>
     <string name="local_index_tile_data_minzoom">Ελάχιστη εστίαση: %1$s</string>
     <string name="edit_tilesource_maxzoom">Μέγιστη εστίαση</string>
-    <string name="edit_tilesource_expiration_time">Λήξη (λεπτά)</string>
+    <string name="edit_tilesource_expiration_time">Χρόνος λήξης (σε λεπτά)</string>
     <string name="edit_tilesource_minzoom">Ελάχιστη εστίαση</string>
     <string name="maps_define_edit">Καθορισμός/Επεξεργασία…</string>
     <string name="local_index_tile_data_downloadable">Διαθέσιμο για λήψη: %1$s</string>
-    <string name="local_index_tile_data_zooms">Μεγεθύνσεις που ελήφθησαν: %1$s</string>
+    <string name="local_index_tile_data_zooms">Μεταφορτωμένα επίπεδα εστίασης: %1$s</string>
     <string name="local_index_tile_data_name">Δεδομένα πλακιδίου: %1$s</string>
-    <string name="edit_tilesource_successfully">Πάροχος πλακιδίων %1$s αποθηκεύτηκε</string>
-    <string name="edit_tilesource_elliptic_tile">Ελλειπτικό Μερκάτωρ</string>
+    <string name="edit_tilesource_successfully">Αποθηκεύτηκε η πηγή πλακιδίων %1$s</string>
+    <string name="edit_tilesource_elliptic_tile">Ελλειπτική μερκατορική προβολή</string>
     <string name="edit_tilesource_url_to_load">URL</string>
     <string name="edit_tilesource_choose_existing">Επιλογή υπάρχοντος…</string>
     <string name="driving_region_descr">Επιλέξτε περιοχή οδήγησης: ΗΠΑ, Ευρώπη, ΗΒ, Ασία κλπ.</string>
@@ -1074,13 +1074,14 @@
     <string name="selected_gpx_info_show">"
 \n
 \nΠαρατεταμένο πάτημα για προβολή στον χάρτη"</string>
-    <string name="gpx_info_start_time">"Χρόνος έναρξης: %1$tF, %1$tT "</string>
-    <string name="gpx_info_end_time">"Χρόνος λήξης: %1$tF, %1$tT "</string>
+    <string name="gpx_info_start_time">Χρόνος έναρξης: %1$tF, %1$tT</string>
+    <string name="gpx_info_end_time">Χρόνος λήξης: %1$tF, %1$tT</string>
     <string name="gpx_info_diff_altitude">Εύρος υψομέτρου: %1$s</string>
     <string name="gpx_info_asc_altitude">Κατηφόρα/Ανηφόρα: %1$s</string>
     <string name="gpx_selection_number_of_points">%1$s σημεία</string>
-    <string name="gpx_selection_point">"Σημείο  %1$s"</string>
-    <string name="gpx_selection_route_points">"%1$s\nΣημεία διαδρομής  %2$s"</string>
+    <string name="gpx_selection_point">Σημείο %1$s</string>
+    <string name="gpx_selection_route_points">%1$s
+\nΣημεία διαδρομής %2$s</string>
     <string name="gpx_selection_points">%1$s\nΣημεία</string>
     <string name="osmo_edit_color">Χρώμα εμφάνισης</string>
     <string name="int_days">ημέρες</string>
@@ -1089,7 +1090,7 @@
     <string name="select_destination_and_intermediate_points">Ορίστε προορισμούς</string>
     <string name="shared_string_waypoint">Σημείο διαδρομής</string>
     <string name="gpx_info_subtracks">Υποδεέστερα ίχνη: %1$s</string>
-    <string name="gpx_info_waypoints">"Σημεία διαδρομής: %1$s "</string>
+    <string name="gpx_info_waypoints">Σημεία διαδρομής: %1$s</string>
     <string name="gpx_timespan">Χρονική διάρκεια: %1$s</string>
     <string name="gpx_timemoving">Χρόνος σε κίνηση: %1$s</string>
     <string name="gpx_selection_segment_title">Τμήμα</string>
@@ -1226,7 +1227,7 @@
     <string name="rendering_value_car_name">Αυτοκίνητο</string>
     <string name="rendering_value_bicycle_name">Ποδήλατο</string>
     <string name="rendering_value_pedestrian_name">Πεζοπόρος</string>
-    <string name="gpx_monitoring_start">Έναρξη καταγραφής GPX</string>
+    <string name="gpx_monitoring_start">Συνέχιση καταγραφής GPX</string>
     <string name="gpx_monitoring_stop">Παύση καταγραφής GPX</string>
     <string name="gpx_start_new_segment">Έναρξη νέου τμήματος</string>
     <string name="shared_string_all">Όλα</string>
@@ -1393,7 +1394,7 @@
     <string name="share_note">Κοινή χρήση σημείωσης</string>
     <string name="notes">Σημειώσεις A/V</string>
     <string name="roads_only">Μόνο δρόμοι</string>
-    <string name="free">"Ελεύθερο %1$s "</string>
+    <string name="free">Ελεύθερο %1$s</string>
     <string name="device_memory">Μνήμη συσκευής</string>
     <string name="rendering_attr_streetLighting_name">Φωτισμός οδών</string>
     <string name="rendering_attr_subwayMode_name">Διαδρομές μετρό</string>
@@ -1589,8 +1590,8 @@
     <string name="one_tap_active_descr">Πατήστε ένα δείκτη στο χάρτη για να τον μετακινήσετε στην κορυφή των ενεργών δεικτών χωρίς να ανοίξει το συναφές μενού.</string>
     <string name="one_tap_active">Ενεργό το \'Ένα πάτημα\'</string>
     <string name="empty_state_av_notes">Κρατήστε σημειώσεις!</string>
-    <string name="empty_state_av_notes_desc">Προσθέστε ήχο, βίντεο ή φωτοσημείωση για κάθε σημείο στο χάρτη, χρησιμοποιώντας το widget ή το συναφές μενού.</string>
-    <string name="notes_by_date">Σημειώσεις OSM κατά ημερομηνία</string>
+    <string name="empty_state_av_notes_desc">Προσθέστε ήχο, βίντεο ή φωτοσημειώσεις για κάθε σημείο στο χάρτη, χρησιμοποιώντας τα γραφικά στοιχεία ή τα μενού περιβάλλοντος.</string>
+    <string name="notes_by_date">Σημειώσεις ήχου/βίντεο κατά ημερομηνία</string>
     <string name="download_maps_travel">Ταξιδιωτικοί οδηγοί</string>
     <string name="article_removed">Το άρθρο αφαιρέθηκε</string>
     <string name="wikivoyage_search_hint">Αναζήτηση για χώρα, πόλη, ή επαρχία</string>
@@ -1665,7 +1666,7 @@
     <string name="show_guide_line_descr">Εμφάνιση κατευθυντήριας γραμμής από τη θέση σας προς τις ενεργές τοποθεσίες δείκτη.</string>
     <string name="show_arrows_descr">Εμφάνιση ενός ή δύο βελών που δείχνουν την κατεύθυνση προς τους ενεργούς δείκτες.</string>
     <string name="distance_indication_descr">Επιλέξτε πώς θα εμφανίζεται η απόσταση προς τους ενεργούς δείκτες.</string>
-    <string name="active_markers_descr">Προσδιορίστε τον αριθμό των δεικτών κατεύθυνσης:</string>
+    <string name="active_markers_descr">Προσδιορίστε τον αριθμό των δεικτών κατεύθυνσης.</string>
     <string name="digits_quantity">Αριθμός δεκαδικών ψηφίων</string>
     <string name="shared_string_right">Δεξιά</string>
     <string name="shared_string_left">Αριστερά</string>
@@ -1726,7 +1727,7 @@
     <string name="order_by">Ταξινόμηση κατά:</string>
     <string name="marker_show_distance_descr">Επιλογή υπόδειξης απόστασης και κατεύθυνσης σε σημειωτές χαρτών στον χάρτη:</string>
     <string name="map_orientation_change_in_accordance_with_speed">Όριο προσανατολισμού χάρτη</string>
-    <string name="map_orientation_change_in_accordance_with_speed_descr">Επιλογή παρακάτω της ταχύτητας εναλλαγής προσανατολισμού από \'Κατεύθυνση κίνησης\' σε \'Κατεύθυνση πυξίδας\'.</string>
+    <string name="map_orientation_change_in_accordance_with_speed_descr">Επιλέξτε την ταχύτητα εναλλαγής προσανατολισμού από \'Κατεύθυνση κίνησης\' σε \'Κατεύθυνση πυξίδας\' παρακάτω.</string>
     <string name="all_markers_moved_to_history">Όλοι οι δείκτες χάρτη μετακινήθηκαν στο ιστορικό</string>
     <string name="marker_moved_to_history">Ο δείκτης χάρτη μετακινήθηκε στο ιστορικό</string>
     <string name="marker_moved_to_active">Ο δείκτης χάρτη ενεργοποιήθηκε</string>
@@ -1775,7 +1776,7 @@
     <string name="import_gpx_failed_descr">Δεν μπορούσε να εισαχθεί το αρχείο. Παρακαλώ διαβεβαιώστε πως το OsmAnd επιτρέπεται να το αναγνώσει.</string>
     <string name="mapillary_image">Εικόνα Mapillary</string>
     <string name="improve_coverage_mapillary">Βελτίωση κάλυψης φωτογραφίας με Mapillary</string>
-    <string name="improve_coverage_install_mapillary_desc">Εγκαταστήστε το Mapillary για να προσθέσετε μία ή περισσότερες φωτογραφίες σε αυτήν την τοποθεσία του χάρτη.</string>
+    <string name="improve_coverage_install_mapillary_desc">Εγκαταστήστε το Mapillary για να προσθέσετε φωτογραφίες σε αυτήν την τοποθεσία του χάρτη.</string>
     <string name="no_photos_descr">Χωρίς φωτογραφίες εδώ.</string>
     <string name="mapillary_action_descr">Μοιραστείτε την θέα σας στο δρόμο μέσω του Mapillary.</string>
     <string name="mapillary_widget">Γραφικό στοιχείο Mapillary</string>
@@ -1927,7 +1928,7 @@
     <string name="gpx_add_track">Προσθήκη περισσότερων…</string>
     <string name="shared_string_appearance">Εμφάνιση</string>
     <string name="trip_rec_notification_settings">Ενεργοποίηση γρήγορης καταγραφής</string>
-    <string name="trip_rec_notification_settings_desc">Εμφάνιση ειδοποίησης συστήματος που επιτρέπει την καταγραφή ταξιδιού.</string>
+    <string name="trip_rec_notification_settings_desc">Εμφάνιση ειδοποίησης συστήματος που επιτρέπει την έναρξη καταγραφής ταξιδιού.</string>
     <string name="shared_string_notifications">Ειδοποιήσεις</string>
     <string name="shared_string_continue">Συνέχεια</string>
     <string name="shared_string_pause">Παύση</string>
@@ -1965,7 +1966,7 @@
     <string name="delete_filter">Διαγραφή φίλτρου</string>
     <string name="new_filter">Νέο φίλτρο</string>
     <string name="new_filter_desc">Παρακαλούμε, εισάγετε όνομα για το νέο φίλτρο, αυτό θα προστεθεί στην δική σας καρτέλα \'Κατηγορίες\'.</string>
-    <string name="osm_live_payment_desc">Τα τέλη εγγραφής επιβαρύνονται μηνιαία. Μπορείτε να ακυρώσετε την εγγραφή σας στο Google Play οποτεδήποτε.</string>
+    <string name="osm_live_payment_desc">Η συνδρομή επιβαρύνεται ανά επιλεγμένη περίοδο. Μπορείτε να την ακυρώσετε στο Google Play οποτεδήποτε.</string>
     <string name="donation_to_osm">Δωρεά στην κοινότητα OSM</string>
     <string name="donation_to_osm_desc">Μέρος της δωρεάς σας θα σταλεί στους συντελεστές OSM. Το κόστος της εγγραφής παραμένει το ίδιο.</string>
     <string name="osm_live_subscription_desc">Η εγγραφή ενεργοποιεί ωριαίες, ημερήσιες και εβδομαδιαίες ενημερώσεις και απεριόριστες λήψεις για όλους τους χάρτες παγκοσμίως.</string>
@@ -2005,7 +2006,7 @@
     <string name="back_to_search">Πίσω στην αναζήτηση</string>
     <string name="confirmation_to_delete_history_items">Να αφαιρεθούν τα επιλεγμένα στοιχεία από το \'Ιστορικό\';</string>
     <string name="show_something_on_map">Εμφάνιση του %1$s στον χάρτη</string>
-    <string name="dist_away_from_my_location">"Αναζήτηση %1$s μακριά "</string>
+    <string name="dist_away_from_my_location">Αναζήτηση %1$s μακριά</string>
     <string name="share_history_subject">κοινόχρηστο μέσω του OsmAnd</string>
     <string name="search_categories">Κατηγορίες</string>
     <string name="postcode">Ταχυδρομικός κώδικας</string>
@@ -2329,7 +2330,7 @@
     <string name="search_radius_proximity">Μέσα σε</string>
     <string name="fav_point_emoticons_message">Το αγαπημενο μετονομάστηκε σε \'%1$s\' για να προφυλάξει την συμβολοσειρά που περιέχει emoticons σε αρχείο.</string>
     <string name="fav_point_dublicate">Ορίστηκε διπλογραφή ονόματος Αγαπημένου</string>
-    <string name="traffic_warning_calming">Ήπια κυκλοφορία</string>
+    <string name="traffic_warning_calming">Χαλάρωση κυκλοφορίας</string>
     <string name="save_global_track_interval_descr">Ορίστε τα χρονικά διαστήματα καταγραφής για τη γενική εγγραφή ιχνών (ενεργό μέσω του γραφικού στοιχείου καταγραφής GPX στον χάρτη).</string>
     <string name="save_track_to_gpx_globally_headline">Καταγραφή ίχνους κατ΄ απαίτηση</string>
     <string name="enable_proxy_descr">Διαμόρφωση μεσολαβητή HTTP για όλες τις αιτήσεις δικτύου.</string>
@@ -2412,31 +2413,36 @@
 \n</string>
     <string name="osmand_extended_description_part4">Χιονοδρομίες
 \nΤο πρόσθετο χαρτών χιονοδρομιών σας επιτρέπει να δείτε ίχνη χιονοδρομιών με επίπεδο δυσκολίας και κάποιες πρόσθετες πληροφορίες, όπως τοποθεσίες αναβατορίων και άλλων εγκαταστάσεων.</string>
-    <string name="osmand_extended_description_part6">"Περπάτημα, πεζοπορία, γύρος της πόλης 
+    <string name="osmand_extended_description_part6">Περπάτημα, πεζοπορία, γύρος της πόλης 
+\n
 \n • Ο χάρτης σας εμφανίζει διαδρομές περπατήματος και πεζοπορίας 
-\n • Η βικιπαίδεια στην προτιμώμενη  γλώσσα σας μπορεί να σας πει πολλά στον γύρο της πόλης 
+\n
+\n • Η βικιπαίδεια στην προτιμώμενη γλώσσα σας μπορεί να σας πει πολλά στον γύρο της πόλης 
+\n
 \n • Οι στάσεις των δημόσιων συγκοινωνιών (λεωφορείου, τροχιόδρομου, σιδηρόδρομου), συμπεριλαμβάνοντας τα ονόματα γραμμών, βοηθούν στην πλοήγηση σε μια νέα πόλη 
+\n
 \n • Η πλοήγηση GPS σε κατάσταση πεζού δημιουργεί τη διαδρομή σας χρησιμοποιώντας πεζοπορικές διαδρομές 
-\n • Ανεβάσετε και ακολουθήσετε μια διαδρομή GPX ή καταγράψετε και μοιραστείτε τη δική σας 
-\n"</string>
+\n
+\n • Ανεβάσετε και ακολουθήσετε μια διαδρομή GPX ή καταγράψετε και μοιραστείτε τη δική σας
+\n</string>
     <string name="osmand_extended_description_part7">Συνεισφέρετε στο OSM
 \n • Αναφέρετε σφάλματα δεδομένων
 \n • Ανεβάστε ίχνη GPX στο OSM απευθείας από την εφαρμογή
 \n • Προσθέστε ΣΕ και ανεβάστε τα απευθείας στο OSM (ή αργότερα εάν είσαστε χωρίς σύνδεση)
 \n</string>
-    <string name="osmand_extended_description_part8">Το OsmAnd αναπτύσσεται ενεργά από λογισμικό ανοικτού κώδικα. Καθένας μπορεί να συνεισφέρει στην εφαρμογή αναφέροντας σφάλματα, βελτιώνοντας μεταφράσεις ή κωδικοποιώντας νέα χαρακτηριστικά. Επιπλέον, το έργο βασίζεται στις οικονομικές συνδρομές για να . Η πρόοδος του έργου βασίζεται επίσης στις οικονομικές συνεισφορές για να τροφοδοτήσει την κωδικοποίηση και τον έλεγχο των νέων λειτουργιών. 
-\n Προσεγγιστική κάλυψη χάρτη και ποιότητας: 
-\n • Δυτική Ευρώπη: **** 
-\n • Ανατολική Ευρώπη: *** 
-\n • Ρωσία: *** 
-\n • Βόρεια Αμερική: *** 
-\n • Νότια Αμερική: ** 
-\n • Ασία: ** 
-\n • Ιαπωνία &amp; Κορέα: *** 
-\n • Μέση Ανατολή ** 
-\n • Αφρική: ** 
-\n • Ανταρκτική * 
-\n Οι περισσότερες χώρες της Γης είναι διαθέσιμες για κατέβασμα! 
+    <string name="osmand_extended_description_part8">Το OsmAnd αναπτύσσεται ενεργά από λογισμικό ανοικτού κώδικα. Καθένας μπορεί να συνεισφέρει στην εφαρμογή αναφέροντας σφάλματα, βελτιώνοντας μεταφράσεις ή κωδικοποιώντας νέα χαρακτηριστικά. Επιπλέον, το έργο βασίζεται στις οικονομικές συνδρομές για χρηματοδότηση του κώδικα και των νέων λειτουργιών.
+\n Προσεγγιστική κάλυψη χάρτη και ποιότητας:
+\n • Δυτική Ευρώπη: ****
+\n • Ανατολική Ευρώπη: ***
+\n • Ρωσία: ***
+\n • Βόρεια Αμερική: ***
+\n • Νότια Αμερική: **
+\n • Ασία: **
+\n • Ιαπωνία &amp; Κορέα: ***
+\n • Μέση Ανατολή **
+\n • Αφρική: **
+\n • Ανταρκτική *
+\n Οι περισσότερες χώρες της Γης είναι διαθέσιμες για κατέβασμα!
 \n Πάρτε έναν αξιόπιστο πλοηγητή για τη χώρα σας - είτε είναι η Γαλλία, η Γερμανία, το Μεξικό, το Ενωμένο Βασίλειο, η Ισπανία, οι Κάτω Χώρες, οι ΗΠΑ, η Ρωσία, η Βραζιλία είτε οποιαδήποτε άλλη.</string>
     <string name="osmand_plus_extended_description_part1">Το OsmAnd+ (OSM Automated Navigation Directions) είναι χάρτης και εφαρμογή πλοήγησης με πρόσβαση στα ελεύθερα, παγκόσμια και υψηλής ποιότητας δεδομένα του OSM. 
 \n Απολαύστε φωνητική και οπτική καθοδήγηση, προβολή ΣΕ (σημείων ενδιαφέροντος), δημιουργία και διαχείριση ιχνών GPX, χρησιμοποιώντας ισοϋψείς γραμμές απεικόνισης και πληροφορίες υψομέτρου, επιλογή μεταξύ καταστάσεων οδήγησης, ποδηλάτου, πεζοπορίας, επεξεργασίας OSM και πολλών άλλων. 
@@ -2482,11 +2488,16 @@
 \n • Προαιρετική εμφάνιση ταχύτητας και υψομέτρου 
 \n • Εμφάνιση ισοϋψών γραμμών και σκίαση αναγλύφου (μέσω προσθέτου)</string>
     <string name="osmand_plus_extended_description_part7">"Απευθείας συνεισφορά στο OSM 
+\n
 \n • Αναφορά σφαλμάτων δεδομένων 
+\n
 \n• Ανέβασμα ιχνών GPX στο OSM απευθείας από την εφαρμογή 
-\n • Προσθήκη ΣΕ και απευθείας ανέβασμα τους  στο OSM (ή αργότερα εάν είναι χωρίς σύνδεση) 
+\n
+\n • Προσθήκη ΣΕ και απευθείας ανέβασμα τους στο OSM (ή αργότερα εάν είναι χωρίς σύνδεση) 
+\n
 \n • Επίσης, προαιρετική καταγραφή ταξιδιού σε κατάσταση παρασκηνίου (ενώ η συσκευή είναι σε κατάσταση ύπνωσης) 
-\n Το OsmAnd είναι ενεργά αναπτυσσόμενο λογισμικό ανοικτού κώδικα. Καθένας μπορεί να συνεισφέρει στην εφαρμογή αναφέροντας σφάλματα, βελτιώνοντας τις μεταφράσεις, ή κωδικοποιόντας  νέα χαρακτηριστικά. Επιπλέον, το έργο βασίζεται επίσης στις χρηματικές συνεισφορές για χρηματοδότηση κωδικοποίησης και ελέγχου των νέων λειτουργιών.
+\n
+\n Το OsmAnd είναι ενεργά αναπτυσσόμενο λογισμικό ανοικτού κώδικα. Καθένας μπορεί να συνεισφέρει στην εφαρμογή αναφέροντας σφάλματα, βελτιώνοντας τις μεταφράσεις, ή κωδικοποιώντας  νέα χαρακτηριστικά. Επιπλέον, το έργο βασίζεται επίσης στις χρηματικές συνεισφορές για χρηματοδότηση κωδικοποίησης και ελέγχου των νέων λειτουργιών.
 \n"</string>
     <string name="osmand_plus_extended_description_part8">Προσεγγιστική κάλυψη χαρτών και ποιότητα:
 \n • Δυτική Ευρώπη: ****
@@ -2499,7 +2510,8 @@
 \n • Μέση Ανατολή: **
 \n • Αφρική **
 \n • Ανταρκτική: *
-\n Οι περισσότερες χώρες της Γης είναι διαθέσεις για λήψη! Από το Αφγανιστάν μέχρι τη Ζιμπάμπουε, από την Αυστραλία μέχρι τις ΗΠΑ. Αργεντινή, Βραζιλία, Καναδάς, Γαλλία, Γερμανία, Μεξικό, Ενωμένο Βασίλειο, Ισπανία, …
+\n Οι περισσότερες χώρες της Γης είναι διαθέσεις για λήψη
+\n Από το Αφγανιστάν μέχρι τη Ζιμπάμπουε, από την Αυστραλία μέχρι τις ΗΠΑ. Αργεντινή, Βραζιλία, Καναδάς, Γαλλία, Γερμανία, Μεξικό, Ενωμένο Βασίλειο, Ισπανία, …
 \n</string>
     <string name="share_route_subject">Διαμοιρασμένη διαδρομή μέσω OsmAnd</string>
     <string name="local_index_description">Πατήστε οποιοδήποτε υφιστάμενο στοιχείο για να δείτε περισσότερες λεπτομέρειες, παρατεταμένο πάτημα για απενεργοποίηση ή διαγραφή. Τρέχοντα δεδομένα στη συσκευή (%1$s ελεύθερα):</string>
@@ -2708,7 +2720,7 @@
     <string name="empty_state_my_tracks">Προσθήκη αρχείων GPX</string>
     <string name="empty_state_my_tracks_desc">Εισαγωγή αρχείων GPX, ή καταγραφή ιχνών.</string>
     <string name="empty_state_favourites">Προσθήκη αγαπημένων</string>
-    <string name="empty_state_favourites_desc">Εισαγωγή αγαπημένων, ή προσθήκη μέσω σημείων επισήμανσης στον χάρτη.</string>
+    <string name="empty_state_favourites_desc">Εισαγωγή αγαπημένων, ή προσθήκη τους μέσω σημείων επισήμανσης στον χάρτη.</string>
     <string name="import_track">Εισαγωγή αρχείου GPX</string>
     <string name="import_track_desc">Το αρχείο %1$s δεν περιέχει σημεία διαδρομής, να εισαχθεί ως ίχνος;</string>
     <string name="move_point">Μετακίνηση σημείου</string>
@@ -2744,7 +2756,7 @@
     <string name="update_is_available">Υπάρχει διαθέσιμη ενημέρωση</string>
     <string name="download_file">Λήψη αρχείου</string>
     <string name="start_editing_card_image_text">Ο ελεύθερος παγκόσμιος ταξιδιωτικός οδηγός που οποιοσδήποτε μπορεί να επεξεργαστεί.</string>
-    <string name="welcome_to_open_beta_description">"Το OsmAnd Travel βασίζεται, προς το παρόν, στα βικιταξίδια.  Ελέγξτε όλα τα χαρακτηριστικά δωρεάν κατά την ανοικτή βήμα δοκιμή. Κατόπιν, οι οδηγοί ταξιδιού θα είναι διαθέσιμοι στους συνδρομητές του απεριόριστου OsmAnd και στους κατόχους του OsmAnd+."</string>
+    <string name="welcome_to_open_beta_description">Το OsmAnd Travel βασίζεται, προς το παρόν, στα βικιταξίδια. Ελέγξτε όλα τα χαρακτηριστικά δωρεάν κατά την ανοικτή βήμα δοκιμή. Κατόπιν, οι οδηγοί ταξιδιού θα είναι διαθέσιμοι στους συνδρομητές του απεριόριστου OsmAnd και στους κατόχους του OsmAnd+.</string>
     <string name="start_editing_card_description">Μπορείτε και πρέπει να επεξεργαστείτε οποιοδήποτε άρθρο στο βικιταξίδια, Μοιραστείτε τη γνώση, την εμπειρία, το ταλέντο και την προσοχή σας.</string>
     <string name="start_editing">Έναρξη επεξεργασίας</string>
     <string name="get_unlimited_access">Πάρτε απεριόριστη πρόσβαση</string>
@@ -2824,7 +2836,7 @@
     <string name="test_voice_desrc">Πιέστε ένα κουμπί και ακούστε την φωνητική προτροπή για να ταυτοποιήσετε αν απουσιάζει ή είναι εσφαλμένη</string>
     <string name="osm_live_subscriptions">Συνδρομές</string>
     <string name="powered_by_osmand">Από το OsmAnd</string>
-    <string name="osm_live_plan_pricing">"Δυνατότητες  και τιμές"</string>
+    <string name="osm_live_plan_pricing">Δυνατότητες και τιμές</string>
     <string name="osm_live_payment_monthly_title">Μηνιαία</string>
     <string name="osm_live_payment_3_months_title">Τριμηνιαία</string>
     <string name="osm_live_payment_annual_title">Ετήσια</string>
@@ -3078,7 +3090,7 @@
     <string name="turn_screen_on_router">Ενεργοποίηση στη στροφή</string>
     <string name="turn_screen_on_time_descr">Ορίστε για πόσο χρόνο θα είναι ενεργοποιημένη η οθόνη.</string>
     <string name="turn_screen_on_sensor">Χρήση του αισθητήρα προσέγγισης</string>
-    <string name="turn_screen_on_sensor_descr">Κουνήστε το χέρι σας πάνω από την οθόνη για να την ενεργοποιήσετε κατά την πλοήγηση.</string>
+    <string name="turn_screen_on_sensor_descr">Η κίνηση του χεριού σας πάνω από την οθόνη θα την ενεργοποιήσει.</string>
     <string name="turn_on_profile_desc">Παρακαλώ ενεργοποιήστε τουλάχιστον ένα προφίλ για τη χρήση αυτής της ρύθμισης.</string>
     <string name="rendering_attr_winter_road_name">Δρόμος του Χειμώνα</string>
     <string name="rendering_attr_ice_road_name">Παγωμένος δρόμος</string>
@@ -3245,7 +3257,7 @@
     <string name="analytics_pref_title">Αναλυτικά στοιχεία</string>
     <string name="turn_screen_on_info">Εμφάνιση χάρτη στην οθόνη κλειδώματος κατά την πλοήγηση.</string>
     <string name="route_parameters_info">Ρυθμίσεις δρομολόγησης στο επιλεγμένο προφίλ \"%1$s\".</string>
-    <string name="wake_time">Ώρα αφύπνισης</string>
+    <string name="wake_time">Αναμονή μετά την αφύπνιση</string>
     <string name="units_and_formats">Μονάδες μέτρησης &amp; φορμά</string>
     <string name="appearance">Εμφάνιση</string>
     <string name="map_look_descr">Εμφάνιση χάρτη</string>
@@ -3267,7 +3279,7 @@
     <string name="map_during_navigation_info">Χάρτης κατά την πλοήγηση</string>
     <string name="map_during_navigation">Χάρτης κατά την πλοήγηση</string>
     <string name="shared_string_other">Άλλα</string>
-    <string name="vehicle_parameters_descr">Βάρος, ύψος, ταχύτητα</string>
+    <string name="vehicle_parameters_descr">Βάρος, ύψος, μήκος, ταχύτητα</string>
     <string name="vehicle_parameters">Παράμετροι οχήματος</string>
     <string name="voice_announces_info">Οι φωνητικές ανακοινώσεις να γίνονται μόνο κατά την πλοήγηση.</string>
     <string name="voice_announces_descr">Οδηγίες πλοήγησης και ανακοινώσεις</string>
@@ -3466,7 +3478,7 @@
     <string name="monitoring_min_speed_descr_side_effect">Παράπλευρο φαινόμενο: Θα λείπουν από τη διαδρομή σας όλες οι ενότητες όπου δεν καλύπτονται από το κριτήριο της ελάχιστης ταχύτητας (π.χ. όταν σπρώχνετε το μηχανάκι σας σε απότομο λόφο). Επίσης, δεν θα υπάρχουν πληροφορίες για περιόδους ακινησίας, όπως φρένα. Αυτό έχει συνέπειες στην ανάλυση ή την μετεπεξεργασία, όπως όταν προσπαθείτε να καθορίσετε το συνολικό μήκος του ταξιδιού σας, τον χρόνο κίνησης, ή την μέση ταχύτητά σας.</string>
     <string name="monitoring_min_speed_descr_recommendation">Σύσταση: Προσπαθήστε να χρησιμοποιήσετε τον εντοπισμό ταχύτητας μέσω του φίλτρου μετατόπισης ελάχιστης καταγραφής (Β) πρώτα, μπορεί να παράξει καλύτερα αποτελέσματα και θα χάσετε λιγότερα δεδομένα. Εάν οι διαδρομές σας παραμένουν θορυβώδεις σε χαμηλές ταχύτητες, δοκιμάστε μη μηδενικές τιμές εδώ. Σημειώστε ότι κάποιες μετρήσεις μπορεί να μην αναφέρουν καθόλου τιμή ταχύτητας (κάποιες μέθοδοι που βασίζονται σε δίκτυα), οπότε δεν θα μπορέσετε να εγγράψετε τίποτα.</string>
     <string name="monitoring_min_speed_descr_remark">Σημείωση: ταχύτητα &gt; 0 ελέγξτε: Τα περισσότερα κυκλώματα GPS αναφέρουν τιμή ταχύτητας μόνο εάν ο αλγόριθμος καθορίζει ότι κινείστε και καμία όταν δεν κινείστε. Συνεπώς χρησιμοποιώντας τη ρύθμιση &gt; 0 σε αυτό το φίλτρο χρησιμοποιεί τον εντοπισμό κίνησης του κυκλώματος GPS. Αλλά ακόμα κι αν δεν φιλτραριστεί εδώ κατά τον χρόνο εγγραφής, εξακολουθούμε να χρησιμοποιούμε αυτό το γνώρισμα στην ανάλυση GPX για τον καθορισμό της διορθωμένης απόστασης, δηλ. η εμφανιζόμενη τιμή σε αυτό το πεδίο είναι η καταγραφόμενη απόσταση κατά την κίνηση.</string>
-    <string name="monitoring_min_accuracy_descr">Αυτό θα καταγράψει μόνο μετρημένα σημεία με ελάχιστη ένδειξη ακρίβειας (σε μέτρα/πόδια, όπως αναφέρεται από το Android για το κύκλωμά σας). Η ακρίβεια αναφέρεται στη διασπορά των επαναλαμβανόμενων μετρήσεων και δεν σχετίζεται άμεσα με την ακρίβεια, που καθορίζει πόσο κοντά είναι οι μετρήσεις σας με την πραγματική σας θέση.</string>
+    <string name="monitoring_min_accuracy_descr">Αυτό θα καταγράψει μόνο μετρημένα σημεία με ελάχιστη ένδειξη ακρίβειας (σε μέτρα/πόδια, όπως αναφέρεται από το Android για το κύκλωμά σας). Ακρίβεια είναι η εγγύτητα των μετρήσεων με την πραγματική θέση και δεν σχετίζεται άμεσα με τη διακύμανση που είναι η διασπορά των επαναλαμβανόμενων μετρήσεων.</string>
     <string name="monitoring_min_accuracy_descr_side_effect">Παράπλευρο φαινόμενο: Ως αποτέλεσμα φιλτραρίσματος από ακρίβεια, μπορεί να λείπουν πλήρως σημεία, π.χ. κάτω από γέφυρες, κάτω από δένδρα, μεταξύ υψηλών κτιρίων, ή με συγκεκριμένες συνθήκες καιρού.</string>
     <string name="monitoring_min_accuracy_descr_recommendation">Σύσταση: Είναι δύσκολο να προβλεφθεί τι θα εγγραφεί και τι όχι, ίσως είναι καλύτερο να απενεργοποιήσετε αυτό το φίλτρο.</string>
     <string name="monitoring_min_accuracy_descr_remark">Παρατήρηση: Εάν το GPS είχε απενεργοποιηθεί αμέσως πριν μια εγγραφή, το πρώτο μετρούμενο σημείο μπορεί να έχει μειωμένη ακρίβεια, έτσι μπορεί να θέλουμε να περιμένουμε λιγάκι πριν την καταγραφή σημείου (ή να εγγράψουμε τα καλύτερα 3 διαδοχικά σημεία, κλπ.), αλλά αυτό δεν έχει ακόμα υλοποιηθεί.</string>
@@ -3478,32 +3490,32 @@
     <string name="live_monitoring_tracking_interval">Χρονικά διαστήματα ιχνηλάτησης</string>
     <string name="search_offline_geo_error">Αδυναμία ανάλυσης γεωγραφικού στόχου \'%s\'.</string>
     <string name="rearrange_categories">Αναδιάταξη κατηγοριών</string>
-    <string name="create_custom_categories_list_promo">Μπορείτε να προσθέσετε προσαρμοσμένες κατηγορίες να απόκρυψεται κατηγορίες που δεν βρίσκεται απαραίτητες και να αλλάξετε τη σειρά ταξινόμησης του καταλόγου. Ο κατάλογος μπορεί να εισαχθεί και να εξαχθεί με προφίλ.</string>
-    <string name="add_new_custom_category_button_promo">Μπορείτε να προσθέσετε μια νέα προσαρμοσμένη κατηγορία επιλέγοντας μία ή μερικές απαιτούμενες κατηγορίες.</string>
-    <string name="reset_to_default_category_button_promo">Επαναφορά στην προεπιλογή θα επαναφέρει τη ταξινόμηση στην προεπιλεγμένη κατάσταση μετά την εγκατάσταση.</string>
+    <string name="create_custom_categories_list_promo">Η αλλαγή της σειράς διάταξης του καταλόγου, αποκρύπτει τις κατηγορίες. Μπορείτε να εισάγετε ή να εξάγετε όλες τις αλλαγές με κατατομές (προφίλ).</string>
+    <string name="add_new_custom_category_button_promo">Μπορείτε να προσθέσετε μια νέα προσαρμοσμένη κατηγορία επιλέγοντας μία ή περισσότερες κατηγορίες.</string>
+    <string name="reset_to_default_category_button_promo">Το \'Επαναφορά στην προεπιλογή\' θα επαναφέρει τη σειρά ταξινόμησης στην προεπιλεγμένη εγκατάσταση.</string>
     <string name="shared_string_available">Διαθέσιμα</string>
     <string name="add_custom_category">Προσθήκη προσαρμοσμένης κατηγορίας</string>
     <string name="rendering_attr_streetLightingNight_name">Εμφάνιση μόνο τη νύχτα</string>
-    <string name="plugin_prefs_reset_successful">Όλες οι ρυθμίσεις πρόσθετων επαναφέρθηκαν στην προεπιλεγμένη κατάσταση.</string>
-    <string name="profile_prefs_reset_successful">Όλες οι ρυθμίσεις προφίλ επαναφέρθηκαν στην προεπιλεγμένη κατάσταση.</string>
+    <string name="plugin_prefs_reset_successful">Όλες οι ρυθμίσεις πρόσθετων επαναφέρθηκαν στην προεπιλογή.</string>
+    <string name="profile_prefs_reset_successful">Όλες οι ρυθμίσεις κατατομών (προφίλ) επαναφέρθηκαν στην προεπιλογή.</string>
     <string name="ltr_or_rtl_combine_via_slash">%1$s/%2$s</string>
     <string name="sunset_at">Ηλιοβασίλεμα στις %1$s</string>
     <string name="sunrise_at">Ανατολή του ηλίου στις %1$s</string>
-    <string name="accessibility_mode_disabled">Η λειτουργία προσβασιμότητας απενεργοποιήθηκε στο σύστημά σας.</string>
-    <string name="use_system_screen_timeout">Χρήση χρονικού ορίου της οθόνης από το σύστημα</string>
+    <string name="accessibility_mode_disabled">Η λειτουργία προσβασιμότητας απενεργοποιήθηκε στο Android σύστημά σας.</string>
+    <string name="use_system_screen_timeout">Χρήση του χρονικού ορίου της οθόνης του συστήματος</string>
     <string name="clear_recorded_data">Εκκαθάριση κατεγραμμένων δεδομένων</string>
     <string name="copy_coordinates">Αντέγραψε συντεταγμένες</string>
     <string name="routing_profile_direct_to">Άμεσα-στο-σημείο</string>
     <string name="please_provide_profile_name_message">Καταχωρίστε ένα όνομα για το προφίλ</string>
     <string name="open_settings">Άνοιγμα ρυθμίσεων</string>
-    <string name="plugin_disabled">Πρόσθετο απενεργοποιημένο</string>
-    <string name="plugin_disabled_descr">Αυτο το πρόσθετο είναι ξεχωριστή εφαρμογή, θα πρέπει να το απεγκαταστήσετε ξεχωριστά αν πλέον δεν το χρησιμοποιήτε.
+    <string name="plugin_disabled">Ανενεργό πρόσθετο</string>
+    <string name="plugin_disabled_descr">Αυτό το πρόσθετο είναι ξεχωριστή εφαρμογή, θα πρέπει να το αφαιρέσετε ξεχωριστά εάν πλέον δεν σκοπεύετε να το χρησιμοποιήσετε.
 \n
 \nΤο πρόσθετο θα παραμείνει στη συσκευή μετά την απεγκατάσταση του OsmAnd.</string>
     <string name="shared_string_menu">Μενού</string>
     <string name="ltr_or_rtl_triple_combine_via_dash">%1$s — %2$s — %3$s</string>
     <string name="shared_string_app_default_w_val">Προεπιλογή της εφαρμογής (%s)</string>
-    <string name="no_recalculation_setting">Απενεργοποίησε τον επανυπολογισμό</string>
+    <string name="no_recalculation_setting">Χωρίς επανυπολογισμό</string>
     <string name="route_recalculation_dist_title">Ελάχιστη απόσταση για επανυπολογισμό διαδρομής</string>
     <string name="route_recalculation_dist_descr">Η διαδρομή θα επανυπολογισθεί αν η απόσταση από την διαδρομή είναι μακρύτερη από μια συγκεκριμένη παράμετρο</string>
     <string name="profile_type_custom_string">Προσαρμοσμένη κατανομή</string>
@@ -3520,7 +3532,7 @@
     <string name="replace_all_desc">Τα τρέχοντα αντικείμενα θα αντικατασταθούν με αντικείμενα από το αρχείο</string>
     <string name="replace_all">Αντικατάσταση όλων</string>
     <string name="keep_both">Διατήρηση και των δύο</string>
-    <string name="keep_both_desc">Τα εισαχθέντα αντικείμενα θα προστεθούν με πρόθεμα</string>
+    <string name="keep_both_desc">Τα εισαχθέντα στοιχεία θα προστεθούν με πρόθεμα</string>
     <string name="import_duplicates_description">Το OsmAnd έχει ήδη στοιχεία με το ίδιο όνομα όπως τα εισηχθέντα.
 \n
 \nΕπιλέξτε μια ενέργεια.</string>
@@ -3736,4 +3748,117 @@
     <string name="lang_uz">Ουζμπέκικα</string>
     <string name="lang_ur">Ουρντού</string>
     <string name="lang_tt">Ταταρικά</string>
+    <string name="use_system_screen_timeout_promo">Προεπιλεγμένη απενεργοποίηση: Όσο εκτελείται το OsmAnd στο προσκήνιο, η οθόνη δεν θα σβήσει.
+\n
+\nΕάν είναι ενεργό, το OsmAnd θα χρησιμοποιήσει τη ρύθμιση χρόνου αδράνειας του συστήματος.</string>
+    <string name="release_3_6">• Κατατομές (προφίλ): τώρα μπορείτε να αλλάξετε τη σειρά, να ορίσετε εικονίδιο για τον χάρτη, να αλλάξετε όλες τις ρυθμίσεις για κατατομές βάσης και να τις επαναφέρετε στις προεπιλογές.
+\n
+\n • Προστέθηκε αριθμός εξόδου στην πλοήγηση
+\n
+\n • Ξαναδουλεύτηκαν οι ρυθμίσεις προσθέτου
+\n
+\n • Ξαναδουλεύτηκε η οθόνη ρυθμίσεων για γρήγορη πρόσβαση σε όλες τις κατατομές
+\n
+\n • Προστέθηκε επιλογή αντιγραφής ρυθμίσεων από άλλη κατατομή
+\n
+\n • Προστέθηκε η δυνατότητα αλλαγής σειράς ή απόκρυψης κατηγοριών ΣΕ στην αναζήτηση
+\n
+\n • Καλύτερη στοίχιση εικονιδίων ΣΕ στον χάρτη
+\n
+\n • Προστέθηκαν δεδομένα δύσης / ανατολής για τον χάρτη διαμόρφωσης
+\n
+\n • Προστέθηκαν εικονίδια οικίας/εργασίας στον χάρτη
+\n
+\n • Προστέθηκε υποστήριξη για περιγραφή πολλών γραμμών στις ρυθμίσεις
+\n
+\n • Προστέθηκε σωστή μεταγραφή στον χάρτη Ιαπωνίας
+\n
+\n • Προστέθηκε χάρτης της Ανταρκτικής
+\n
+\n</string>
+    <string name="index_name_antarctica">Ανταρκτική</string>
+    <string name="sort_by_category">Ταξινόμηση κατά κατηγορία</string>
+    <string name="shared_string_resume">Συνέχιση</string>
+    <string name="export_profile_dialog_description">Μπορείτε να επιλέξετε πρόσθετα δεδομένα για εξαγωγή μαζί με την κατατομή (προφίλ).</string>
+    <string name="import_profile_dialog_description">Η εισαγόμενη κατατομή (προφίλ) περιέχει πρόσθετα δεδομένα. Πατήστε \"Εισαγωγή\" για να εισάγετε μόνο δεδομένα κατατομής, ή επιλέξτε πρόσθετα δεδομένα.</string>
+    <string name="shared_string_include_data">Να συμπεριλαμβάνονται πρόσθετα δεδομένα</string>
+    <string name="shared_string_rendering_style">Τεχνοτροπία απόδοσης</string>
+    <string name="shared_string_routing">Δρομολόγηση</string>
+    <string name="import_rendering_file">Εισαγωγή αρχείου απόδοσης</string>
+    <string name="shared_string_terrain">Έδαφος</string>
+    <string name="hillshade_description">Η σκίαση αναγλύφου με σκούρες σκιές για την εμφάνιση κλίσεων, κορυφών και πεδινών.</string>
+    <string name="slope_description">Η κλίση χρησιμοποιεί χρώματα για να οπτικοποιήσει την κλίση του εδάφους.</string>
+    <string name="terrain_slider_description">Ορίστε το μέγιστο και το ελάχιστο επίπεδο εστίασης στον οποίο θα εμφανίζεται η στρώση.</string>
+    <string name="hillshade_download_description">Απαιτούνται πρόσθετοι χάρτες για να προβάλετε τη σκίαση αναγλύφου στον χάρτη.</string>
+    <string name="slope_download_description">Απαιτούνται πρόσθετοι χάρτες για να προβάλετε τις κλίσεις στον χάρτη.</string>
+    <string name="slope_read_more">Μπορείτε να διαβάσετε περισσότερα για τις κλίσεις στο %1$s.</string>
+    <string name="shared_string_transparency">Διαφάνεια</string>
+    <string name="shared_string_zoom_levels">Επίπεδα εστίασης</string>
+    <string name="shared_string_legend">Υπόμνημα</string>
+    <string name="terrain_empty_state_text">Ενεργοποιήστε το για να προβάλετε σκίαση αναγλύφου ή χάρτη κλίσεων. Μπορείτε να διαβάσετε περισσότερα για αυτούς τους τύπους χάρτη στον ιστότοπό μας.</string>
+    <string name="shared_string_hillshade">Σκίαση ανάγλυφου</string>
+    <string name="import_complete_description">Εισήχθησαν όλα τα δεδομένα από το %1$s, μπορείτε να χρησιμοποιήσετε τα παρακάτω πλήκτρα για να ανοίξετε το απαιτούμενο τμήμα της εφαρμογής για να το διαχειριστείτε.</string>
+    <string name="shared_string_import_complete">Ολοκλήρωση εισαγωγής</string>
+    <string name="items_added">Προστέθηκαν στοιχεία</string>
+    <string name="checking_for_duplicate_description">Το OsmAnd ελέγχει το %1$s για διπλότυπα με υφιστάμενα στοιχεία στην εφαρμογή.
+\n
+\nΜπορεί να πάρει κάποιο χρόνο.</string>
+    <string name="shared_string_importing">Εισάγεται</string>
+    <string name="importing_from">Εισαγωγή δεδομένων από το %1$s</string>
+    <string name="profile_backup_failed">Αδυναμία δημιουργίας αντιγράφου κατατομής.</string>
+    <string name="saving_new_profile">Αποθήκευση νέας κατατομής (προφίλ)</string>
+    <string name="restore_all_profile_settings">Να επαναφερθούν όλες οι ρυθμίσεις κατατομών (προφίλ);</string>
+    <string name="restore_all_profile_settings_descr">Όλες οι ρυθμίσεις κατατομής (προφίλ) θα επαναφερθούν στην αρχική τους κατάσταση μετά τη δημιουργία/εισαγωγή αυτής της κατατομής.</string>
+    <string name="clear_recorded_data_warning">Είσαστε σίγουρος ότι θέλετε να καθαρίσετε τα καταγεγραμμένα δεδομένα;</string>
+    <string name="recalculate_route_in_deviation">Επανυπολογισμός διαδρομής σε περίπτωση απόκλισης</string>
+    <string name="select_distance_route_will_recalc">Επιλέξτε την απόσταση μετά την οποία η διαδρομή θα επανυπολογιστεί.</string>
+    <string name="recalculate_route_distance_promo">Η διαδρομή θα επανυπολογιστεί εάν η απόσταση από τη διαδρομή στην τρέχουσα θέση είναι μεγαλύτερη από την επιλεγμένη τιμή.</string>
+    <string name="n_items_of_z">%1$s από %2$s</string>
+    <string name="download_slope_maps">Πλαγιές</string>
+    <string name="quick_action_show_hide_terrain">Εμφάνιση / απόκρυψη εδάφους</string>
+    <string name="quick_action_terrain_hide">Απόκρυψη εδάφους</string>
+    <string name="quick_action_terrain_show">Εμφάνιση εδάφους</string>
+    <string name="quick_action_terrain_descr">Ένα πλήκτρο εμφάνισης ή απόκρυψης της στρώσης εδάφους στον χάρτη.</string>
+    <string name="delete_description">Διαγραφή περιγραφής</string>
+    <string name="add_description">Προσθήκη περιγραφής</string>
+    <string name="select_group">Επιλογή ομάδας</string>
+    <string name="select_shape">Επιλογή σχήματος</string>
+    <string name="shared_string_circle">Κύκλος</string>
+    <string name="shared_string_octagon">Οκτάγωνο</string>
+    <string name="shared_string_square">Τετράγωνο</string>
+    <string name="shared_string_min">Ελαχ</string>
+    <string name="ui_customization_description">Προσαρμογή της ποσότητας στοιχείων στον \"Σχεδιαστή\", \"Χάρτη διαμόρφωσης\" και \"Μενού περιβάλλοντος\".
+\n
+\nΑπενεργοποιήστε τα μη χρησιμοποιούμενα πρόσθετα για να αποκρύψετε όλα τα στοιχεία ελέγχου τους. %1$s.</string>
+    <string name="ui_customization_short_descr">Στοιχεία σχεδιαστή, μενού περιβάλλοντος</string>
+    <string name="ui_customization">Προσαρμογή UI</string>
+    <string name="shared_string_drawer">Σχεδιαστής</string>
+    <string name="context_menu_actions">Ενέργειες μενού περιβάλλοντος</string>
+    <string name="reorder_or_hide_from">Αναδιάταξη ή απόκρυψη στοιχείων από το %1$s.</string>
+    <string name="shared_string_divider">Διαχωριστικό</string>
+    <string name="divider_descr">Τα στοιχεία κάτω από αυτό το σημείο χωρίζονται με διαχωριστικό.</string>
+    <string name="shared_string_hidden">Κρυφά</string>
+    <string name="hidden_items_descr">Αυτά τα στοιχεία κρύβονται από το μενού, αλλά οι αντίστοιχες επιλογές ή πρόσθετα θα συνεχίσουν να δουλεύουν.</string>
+    <string name="reset_items_descr">Η απόκρυψη ρυθμίσεων τις επαναφέρει στην αρχική τους κατάσταση.</string>
+    <string name="main_actions_descr">Έχει μόνο τέσσερα πλήκτρα.</string>
+    <string name="main_actions">Κύριες ενέργειες</string>
+    <string name="additional_actions_descr">Μπορείτε να προσπελάσετε αυτές τις ενέργειες πατώντας το πλήκτρο “%1$s”.</string>
+    <string name="move_inside_category">Μπορείτε να μετακινήσετε στοιχεία μόνο μέσα σε αυτήν τη κατηγορία.</string>
+    <string name="developer_plugin">Πρόσθετο ανάπτυξης</string>
+    <string name="replace_point_descr">Αντικατάσταση σημείου με αυτό.</string>
+    <string name="app_mode_ski_touring">Χιονοδρομικές βόλτες</string>
+    <string name="app_mode_ski_snowmobile">Χιονοόχημα</string>
+    <string name="custom_osmand_plugin">Προσαρμοσμένο πρόσθετο OsmAnd</string>
+    <string name="shared_string_items">Στοιχεία</string>
+    <string name="changes_applied_to_profile">Αλλαγές που εφαρμόστηκαν στην κατατομή (προφίλ) \'%1$s\'.</string>
+    <string name="settings_item_read_error">Αδυναμία ανάγνωσης από το \'%1$s\'.</string>
+    <string name="settings_item_write_error">Αδυναμία εγγραφής στο \'%1$s\'.</string>
+    <string name="settings_item_import_error">Αδυναμία εισαγωγής από \'%1$s\'.</string>
+    <string name="select_track_file">Επιλέξτε αρχείο ίχνους</string>
+    <string name="shared_string_languages">Γλώσσες</string>
+    <string name="shared_string_language">Γλώσσα</string>
+    <string name="shared_string_all_languages">Όλες οι γλώσσες</string>
+    <string name="wiki_menu_download_descr">Απαιτούνται πρόσθετοι χάρτες για να προβάλετε τα ΣΕ της Wikipedia στον χάρτη.</string>
+    <string name="select_wikipedia_article_langs">Επιλέξτε τις γλώσσες για τα άρθρα Wikipedia στον χάρτη. Αλλάξτε σε οποιαδήποτε διαθέσιμη γλώσσα κατά την ανάγνωση του άρθρου.</string>
+    <string name="radius_ruler_item">Χάρακας ακτίνας</string>
 </resources>
\ No newline at end of file

From fd195258fdb03d8df5d00fa44e2f23117b0948f9 Mon Sep 17 00:00:00 2001
From: Alexander Gabilondo <alexgabi@openmailbox.org>
Date: Mon, 10 Aug 2020 21:22:57 +0000
Subject: [PATCH 21/81] Translated using Weblate (Basque)

Currently translated at 98.1% (3385 of 3450 strings)
---
 OsmAnd/res/values-eu/strings.xml | 42 ++++++++++++++++++++++++++++----
 1 file changed, 37 insertions(+), 5 deletions(-)

diff --git a/OsmAnd/res/values-eu/strings.xml b/OsmAnd/res/values-eu/strings.xml
index b82a922dad..f69c786cee 100644
--- a/OsmAnd/res/values-eu/strings.xml
+++ b/OsmAnd/res/values-eu/strings.xml
@@ -590,7 +590,7 @@
     <string name="show_more_map_detail_descr">Erakutsi bektore mapen xehetasun gehiago (bideak etab.) zoom maila baxuetan.</string>
     <string name="favourites_delete_multiple_succesful">Gogoko puntuak ezabatu dira.</string>
     <string name="favorite_delete_multiple">Ziur %1$d gogoko eta %2$d gogokoen talde ezabatu nahi dituzula\?</string>
-    <string name="favorite_home_category">Hasiera</string>
+    <string name="favorite_home_category">Etxea</string>
     <string name="favorite_friends_category">Lagunak</string>
     <string name="favorite_places_category">Lekuak</string>
     <string name="shared_string_name">Izena</string>
@@ -1772,7 +1772,7 @@ Lorratza %2$s</string>
     <string name="use_opengl_render">Erabili OpenGL marrazketa</string>
     <string name="use_opengl_render_descr">Erabili hardware bidez azkartutako OpenGL marrazketa (bateria gehiago erabili lezake, eta ez dabil gailu oso zaharretan).</string>
     <string name="error_avoid_specific_road">Ez da saihesbiderik aurkitu</string>
-    <string name="home_button">Hasiera</string>
+    <string name="home_button">Etxea</string>
     <string name="map_update">Eguneraketak eskuragarri %1$s mapentzako</string>
     <string name="search_for">Bilatu</string>
     <string name="coordinates">Koordenatuak</string>
@@ -2903,8 +2903,8 @@ Area honi dagokio: %1$s x %2$s</string>
     <string name="routeInfo_smoothness_name">Lausotasuna</string>
     <string name="routeInfo_steepness_name">Aldapa</string>
     <string name="add_home">Gehitu etxea</string>
-    <string name="add_work">Gehitu lana</string>
-    <string name="work_button">Lana</string>
+    <string name="add_work">Gehitu lantokia</string>
+    <string name="work_button">Lantokia</string>
     <string name="avoid_roads_descr">Hautatu saihestu nahi duzun bidea mapan edo beheko zerrendan:</string>
     <string name="quick_action_switch_day_night_descr">OsmAnd egun eta gau moduen artean txandakatzeko botoia.</string>
     <string name="use_osm_live_public_transport_description">Gaitu garraio publikoa OsmAnd Live aldaketetan.</string>
@@ -3484,7 +3484,7 @@ Area honi dagokio: %1$s x %2$s</string>
 \n
 \n• Ilunabarra / egunsentia datuak gehitu da maparen konfigurazioan
 \n
-\n• Hasiera/Lana ikonoak mapara gehitu dira
+\n• Etxea/Lantokia ikonoak mapara gehitu dira
 \n
 \n• Hainbat lerroko deskripzioa gehitzeko euskarria gehitu da ezarpenetan
 \n
@@ -3787,4 +3787,36 @@ Area honi dagokio: %1$s x %2$s</string>
     <string name="quick_action_mapillary_hide">Ezkutatu Mapillary</string>
     <string name="quick_action_mapillary_show">Erakutsi Mapillary</string>
     <string name="shared_string_done">Egina</string>
+    <string name="quick_action_remove_next_destination">Ezabatu hurrengo norako puntua.</string>
+    <string name="use_volume_buttons_as_zoom">Bolumen botoiak zoom egiteko</string>
+    <string name="quick_action_remove_next_destination_descr">Uneko ibilbidearen norako puntua ezabatuko da. Ibilbidearen helmuga bada nabigazioa geldituko da.</string>
+    <string name="plugin_wikipedia_description">Eskuratu interesguneei buruzko Wikipediaren informazioa. Zure poltsikoko lineaz kanpoko gida da. Aski duzu Wikipediako plugina gaitu eta gozatu inguruko objektuen inguruko artikuluez.</string>
+    <string name="app_mode_enduro_motorcycle">Enduro motozikleta</string>
+    <string name="app_mode_wheelchair">Gurpil-aulkia</string>
+    <string name="app_mode_go_cart">Kart</string>
+    <string name="route_between_points">Puntuen arteko ibilbidea</string>
+    <string name="add_to_a_track">Gehitu arrasto batera</string>
+    <string name="select_track_width">Hautatu zabalera</string>
+    <string name="gpx_split_interval_none_descr">Hautatu zatiketa aukera: denboraren arabera edo distantziaren arabera.</string>
+    <string name="gpx_direction_arrows">Norabideko geziak</string>
+    <string name="plan_route_create_new_route">Sortu ibilbide berria</string>
+    <string name="threshold_distance">Distantzia margena</string>
+    <string name="rourte_between_points_warning_desc">Aukera hau erabiltzeko OsmAnd-ek zure arrastoak mapako errepideetara atxiki behar ditu.
+\n
+\nHurrengo urratsean, nabigazio profila hautatu beharko duzu baimendutako errepideak eta zure arrastoa errepideetara hurbiltzeko distantzia tartea atzemateko.</string>
+    <string name="plan_route_last_edited">Editatutako azkena</string>
+    <string name="plan_route_import_track">Inportatu arrastoa</string>
+    <string name="plan_route_open_existing_track">Ireki dagoen arrasto bat</string>
+    <string name="plan_route_select_track_file_for_open">Hautatu irekitzeko arrasto fitxategia</string>
+    <string name="overwrite_track">Gainidatzi arrastoa</string>
+    <string name="save_as_new_track">Gorde arrasto berri gisa</string>
+    <string name="reverse_route">Alderantzizko ibilbidea</string>
+    <string name="rourte_between_points_whole_track_button_desc">Arrasto osoa birkalkulatuko da hautatutako profilaren bidez.</string>
+    <string name="rourte_between_points_next_segment_button_desc">Bakarrik hurrengo segmentua birkalkulatuko da hautatutako profilaren bidez.</string>
+    <string name="rourte_between_points_desc">Hautatu nola konektatu puntuak, lerro zuzen batez, edo kalkulatu horien arteko ibilbidea hautatutako profilarekin.</string>
+    <string name="whole_track">Arrasto osoa</string>
+    <string name="next_segment">Hurrengo segmentua</string>
+    <string name="navigation_profile">Nabigazio profila</string>
+    <string name="rourte_between_points_add_track_desc">Hautatu zein arrasto fitxategiari gehituko zaion segmentu berria.</string>
+    <string name="set_working_days_to_continue">Ezarri behar dituzu lanegunak jarraitzeko</string>
 </resources>
\ No newline at end of file

From 43eedfd72e3f7d492f6d27daee7369988110f727 Mon Sep 17 00:00:00 2001
From: Bruce Cowan <bruce@bcowan.me.uk>
Date: Mon, 10 Aug 2020 11:33:38 +0000
Subject: [PATCH 22/81] Translated using Weblate (English (United Kingdom))

Currently translated at 2.9% (101 of 3450 strings)
---
 OsmAnd/res/values-en-rGB/strings.xml | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/OsmAnd/res/values-en-rGB/strings.xml b/OsmAnd/res/values-en-rGB/strings.xml
index adaca42746..97aedb7ad8 100644
--- a/OsmAnd/res/values-en-rGB/strings.xml
+++ b/OsmAnd/res/values-en-rGB/strings.xml
@@ -26,7 +26,7 @@
     <string name="add_group_descr">You can import groups from favourites or track waypoints.</string>
     <string name="empty_state_markers_groups_desc">You can import favourite groups or track waypoints as markers.</string>
     <string name="empty_state_favourites">Add Favourites</string>
-    <string name="empty_state_favourites_desc">Add favourites on the map or import them from a file.</string>
+    <string name="empty_state_favourites_desc">Import Favourites or add them by marking points on the map.</string>
     <string name="import_gpx_file_description">can be imported as Favourites points, or as track file.</string>
     <string name="import_as_favorites">Import as Favourites</string>
     <string name="search_favorites">Search favourites</string>
@@ -99,8 +99,10 @@
     <string name="quick_action_showhide_favorites_title">Show/hide favourites</string>
     <string name="quick_action_favorites_show">Show Favourites</string>
     <string name="quick_action_favorites_hide">Hide Favourites</string>
-    <string name="quick_action_category_descr">Select the category to save the favourite in.</string>
+    <string name="quick_action_category_descr">Category to save the Favourite in:</string>
     <string name="analyze_on_map">Analyse on map</string>
     <string name="purchase_cancelled_dialog_title">You have cancelled your OsmAnd Live subscription</string>
     <string name="show_transparency_seekbar">Show transparency slider</string>
-</resources>
+    <string name="app_mode_camper">Camper</string>
+    <string name="osm_live_payment_discount_descr">Save %1$s</string>
+</resources>
\ No newline at end of file

From b3628d5e6a68e440c7afed40531395aec0a59063 Mon Sep 17 00:00:00 2001
From: Kahina Messaoudi <messaoudikahina02@gmail.com>
Date: Mon, 10 Aug 2020 10:37:17 +0000
Subject: [PATCH 23/81] Translated using Weblate (Kabyle)

Currently translated at 38.0% (1313 of 3450 strings)
---
 OsmAnd/res/values-b+kab/strings.xml | 29 +++++++++++++++++++----------
 1 file changed, 19 insertions(+), 10 deletions(-)

diff --git a/OsmAnd/res/values-b+kab/strings.xml b/OsmAnd/res/values-b+kab/strings.xml
index 3b8d364496..bda77e7bfd 100644
--- a/OsmAnd/res/values-b+kab/strings.xml
+++ b/OsmAnd/res/values-b+kab/strings.xml
@@ -41,7 +41,7 @@
     <string name="shared_string_ok">Γas</string>
     <string name="shared_string_yes">Ih</string>
     <string name="shared_string_no">Ala</string>
-    <string name="shared_string_never">Warǧin</string>
+    <string name="shared_string_never">Werǧin</string>
     <string name="shared_string_none">Ulac</string>
     <string name="shared_string_and">d</string>
     <string name="shared_string_or">naɣ</string>
@@ -260,7 +260,7 @@
     <string name="mapillary_menu_title_username">Isem n useqdac</string>
     <string name="nearest_cities">Timdinin ig qarben</string>
     <string name="shared_string_add_to_map_markers">Rnu ar ticṛaḍ</string>
-    <string name="map_markers">Ticṛaḍ</string>
+    <string name="map_markers">Ticraḍ n tkarḍa</string>
     <string name="lang_kab">Taqbaylit</string>
     <string name="lang_ber">Tifinaɣ</string>
     <string name="shared_string_cancel">Sefsex</string>
@@ -273,7 +273,7 @@
     <string name="rendering_category_details">Talqayt</string>
     <string name="rendering_category_transport">Amesni</string>
     <string name="text_size">Tiddi n waḍris</string>
-    <string name="speak_street_names">Ismawen n iberdan (TTS)</string>
+    <string name="speak_street_names">Ismawen n yiberdan (TTS)</string>
     <string name="context_menu_item_directions_to">Iwellihen ɣer</string>
     <string name="context_menu_item_directions_from">Tinilwin seg</string>
     <string name="street_name">Isem n webrid</string>
@@ -468,7 +468,7 @@
     <string name="home">Tafelwit n usenqed</string>
     <string name="rendering_attr_moreDetailed_name">Ugar n telqayt</string>
     <string name="sort_by_name">Smizzwer s yisem</string>
-    <string name="map_widget_plain_time">Tasaɛet imir-a</string>
+    <string name="map_widget_plain_time">Akud amiran</string>
     <string name="selected_gpx_info_show">"
 \n
 \nAsiti ɣezzifen akken ad d-sekneḍ ɣef tkarḍa"</string>
@@ -505,7 +505,7 @@
     <string name="distance_measurement_start_editing">Bdu taẓrigt</string>
     <string name="other_location">Nniḍen</string>
     <string name="website">Asmel n web</string>
-    <string name="prefer_in_routing_title">Smenyifi …</string>
+    <string name="prefer_in_routing_title">Smenyif…</string>
     <string name="recording_unavailable">ulac</string>
     <string name="recording_context_menu_play">Urar</string>
     <string name="poi_filter_parking">Aneɣsar</string>
@@ -1143,8 +1143,8 @@
     <string name="local_openstreetmap_delete">Kkes</string>
     <string name="local_openstreetmap_uploadall">Ali</string>
     <string name="local_openstreetmap_were_uploaded">{0} POI/Tizmilin ulin</string>
-    <string name="arrival_distance_factor_late">Aneḍru yettwaheggan iɛedda fell-as lḥal</string>
-    <string name="arrival_distance_factor_early">Détection SKIP précoce sur images P</string>
+    <string name="arrival_distance_factor_late">Iɛedda lḥal</string>
+    <string name="arrival_distance_factor_early">Zik</string>
     <string name="no_info">talɣut</string>
     <string name="front_left">ɣer zdat</string>
     <string name="zoomIs">Seggem aswir n usemɣer/asemẓi</string>
@@ -1153,8 +1153,8 @@
     <string name="map_widget_next_turn">ar zdat</string>
     <string name="map_widget_monitoring">Aɣmis</string>
     <string name="int_continuosly">A_maɣlal</string>
-    <string name="avoid_in_routing_title">Zgel tulsa n wawalen d yisekkilen.</string>
-    <string name="show_warnings_title">Ilɣa</string>
+    <string name="avoid_in_routing_title">Zgel…</string>
+    <string name="show_warnings_title">Sken ilɣa…</string>
     <string name="poi_filter_food_shop">Tuččit</string>
     <string name="poi_filter_emergency">Annar n trusi n utrab</string>
     <string name="btn_advanced_mode">Talqayt…</string>
@@ -1197,7 +1197,7 @@
     <string name="traffic_warning_stop">Seḥbes</string>
     <string name="search_radius_proximity">Deg</string>
     <string name="configure_map">Swel…</string>
-    <string name="map_widget_left">Tafelwit n yiri, tattayt, ukessar, ufella, ɣumm, tiddi, amrussu</string>
+    <string name="map_widget_left">Agalis azelmaḍ</string>
     <string name="download_tab_downloads">Sken akkw isidar</string>
     <string name="rendering_attr_roadStyle_description">Aɣanib:</string>
     <string name="rendering_attr_roadStyle_name">Aɣanib:</string>
@@ -1329,4 +1329,13 @@
     <string name="select_track_width">Fren tehri</string>
     <string name="gpx_direction_arrows">Ineccaben n tnila</string>
     <string name="plan_route_create_new_route">Rnu abrid amaynut</string>
+    <string name="default_speed_system">Tayunt n urured</string>
+    <string name="screen_alerts">Ilɣa n ugdil</string>
+    <string name="fast_route_mode">Abrid arurad akk</string>
+    <string name="arrival_distance_factor_at_last">Deg lmitrat tineggura</string>
+    <string name="speak_speed_limit">Talast n urured</string>
+    <string name="show_lanes">Izirigen</string>
+    <string name="layer_map_appearance">Swel agdil</string>
+    <string name="map_widget_right">Agalis ayeffus</string>
+    <string name="map_widget_appearance_rem">Iferdisen i d-iqqimen</string>
 </resources>
\ No newline at end of file

From 104cd398f0b3df2cc53af2387e8da52b33031529 Mon Sep 17 00:00:00 2001
From: Dimitris Spingos <dmtrs32@gmail.com>
Date: Wed, 12 Aug 2020 05:11:18 +0000
Subject: [PATCH 24/81] Translated using Weblate (Greek)

Currently translated at 96.7% (3688 of 3812 strings)
---
 OsmAnd/res/values-el/phrases.xml | 137 +++++++++++++++++++++++++++++--
 1 file changed, 132 insertions(+), 5 deletions(-)

diff --git a/OsmAnd/res/values-el/phrases.xml b/OsmAnd/res/values-el/phrases.xml
index 3033f226c4..f81cdb4eda 100644
--- a/OsmAnd/res/values-el/phrases.xml
+++ b/OsmAnd/res/values-el/phrases.xml
@@ -806,7 +806,7 @@
     <string name="poi_internet_access_service">Πρόσβαση διαδικτύου: υπηρεσία</string>
     <string name="poi_internet_access_yes">Πρόσβαση διαδικτύου: ναι</string>
     <string name="poi_internet_access_no">Πρόσβαση διαδικτύου: όχι</string>
-    <string name="poi_internet_access_fee_yes">Πρόσβαση διαδικτύου - με χρέωση</string>
+    <string name="poi_internet_access_fee_yes">Πρόσβαση διαδικτύου : με χρέωση</string>
     <string name="poi_internet_access_fee_no">Πρόσβαση διαδικτύου - χωρίς χρέωση</string>
     <string name="poi_monastery">Μοναστήρι</string>
     <string name="poi_religious">Θρησκευτική περιοχή</string>
@@ -1371,7 +1371,7 @@
     <string name="poi_pump_no">Χωρίς αντλία</string>
     <string name="poi_pump_yes">Ναι</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_information_guidepost">Οδοδείκτης</string>
@@ -1411,7 +1411,7 @@
     <string name="poi_tactile_paving_yes">Ναι</string>
     <string name="poi_tactile_paving_no">Χωρίς απτικό πλακόστρωτο</string>
     <string name="poi_traffic_signals_sound_yes">Ναι</string>
-    <string name="poi_traffic_signals_sound_no">Όχι</string>
+    <string name="poi_traffic_signals_sound_no">Ήχος: όχι</string>
     <string name="poi_traffic_signals_sound_walk">Μόνο όταν επιτρέπεται το περπάτημα</string>
     <string name="poi_rescue_station">Σταθμός διάσωσης</string>
     <string name="poi_services">ΣΕΑ</string>
@@ -1706,7 +1706,7 @@
     <string name="poi_service_electrical">Επισκευή ηλεκτρικών οχημάτων</string>
     <string name="poi_motorcycle_repair">Επισκευή μοτοσικλετών</string>
     <string name="poi_self_service_yes">Ναι</string>
-    <string name="poi_self_service_no">Χωρίς αυτοεξυπηρέτηση</string>
+    <string name="poi_self_service_no">Όχι</string>
     <string name="poi_automated_yes">Ναι</string>
     <string name="poi_automated_no">Μη αυτόματο</string>
     <string name="poi_full_service_yes">Πλήρης εξυπηρέτηση</string>
@@ -2060,7 +2060,7 @@
     <string name="poi_fuel_100ll">Καύσιμο 100LL</string>
     <string name="poi_fuel_autogas">Υγραέριο κίνησης</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>
@@ -3565,4 +3565,131 @@
     <string name="poi_bath_type">Πληκτρολογήστε</string>
     <string name="poi_volcano_type">Πληκτρολογήστε</string>
     <string name="poi_volcano_status">Κατάσταση</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_designated">Δηλωμένη</string>
+    <string name="poi_caravan_yes">Ναι</string>
+    <string name="poi_bus_designated">Δηλωμένη</string>
+    <string name="poi_bus_yes">Ναι</string>
+    <string name="poi_snowmobile_permissive">Ανεκτή</string>
+    <string name="poi_snowmobile_designated">Δηλωμένη</string>
+    <string name="poi_snowmobile_yes">Ναι</string>
+    <string name="poi_disabled_no">Πρόσβαση αναπήρων: όχι</string>
+    <string name="poi_taxi_no">Πρόσβαση ταξί: όχι</string>
+    <string name="poi_taxi_designated">Πρόσβαση ταξί: δηλωμένη</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_ski_no">Χιονοδρομική πρόσβαση: όχι</string>
+    <string name="poi_rtsa_scale_3b_asterisk">3Б*</string>
+    <string name="poi_rtsa_scale_3a_asterisk">3А*</string>
+    <string name="poi_rtsa_scale_2b_asterisk">2Б*</string>
+    <string name="poi_rtsa_scale_2a_asterisk">2А*</string>
+    <string name="poi_rtsa_scale_1b_asterisk">1Б*</string>
+    <string name="poi_rtsa_scale_1a_asterisk">1А*</string>
+    <string name="poi_rtsa_scale_nc_asterisk">н/к*</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_designated">Πρόσβαση τουριστικών λεωφορείων: δηλωμένη</string>
+    <string name="poi_tourist_bus_yes">Πρόσβαση τουριστικών λεωφορείων: ναι</string>
+    <string name="poi_bus_no">Πρόσβαση λεωφορείων: όχι</string>
+    <string name="poi_psv_no">Πρόσβαση δημόσιων συγκοινωνιών: όχι</string>
+    <string name="poi_psv_designated">Πρόσβαση δημόσιων συγκοινωνιών: δηλωμένη</string>
+    <string name="poi_psv_yes">Πρόσβαση δημόσιων συγκοινωνιών: ναι</string>
+    <string name="poi_trailer_no">Πρόσβαση καρότσας: όχι</string>
+    <string name="poi_caravan_no">Πρόσβαση καραβανιού: όχι</string>
+    <string name="poi_motorhome_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">Πρόσβαση μικρών μοτοποδηλάτων: όχι</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_motor_vehicle_no">Πρόσβαση μηχανοκίνητου οχήματος: όχι</string>
+    <string name="poi_motor_vehicle_private">Πρόσβαση μηχανοκίνητου οχήματος: ιδιωτική</string>
+    <string name="poi_flare">Φλόγα υψικαμίνου;Πυρσός καύσης</string>
+    <string name="poi_motor_vehicle_yes">Πρόσβαση μηχανοκίνητου οχήματος: ναι</string>
+    <string name="poi_motorcar_forestry">Πρόσβαση αυτοκινήτου: δασοκομική</string>
+    <string name="poi_motorcar_customers">Πρόσβαση αυτοκινήτου: πελάτες</string>
+    <string name="poi_motorcar_permissive">Πρόσβαση αυτοκινήτου: ανεκτή</string>
+    <string name="poi_motorcar_destination">Πρόσβαση αυτοκινήτου: προορισμός</string>
+    <string name="poi_motorcar_no">Πρόσβαση αυτοκινήτου: όχι</string>
+    <string name="poi_motorcar_private">Πρόσβαση αυτοκινήτου: ιδιωτική</string>
+    <string name="poi_motorcar_yes">Πρόσβαση αυτοκινήτου:</string>
+    <string name="poi_vehicle_forestry">Πρόσβαση οχήματος: δασοκομική</string>
+    <string name="poi_vehicle_delivery">Πρόσβαση οχήματος: διανομή</string>
+    <string name="poi_vehicle_military">Πρόσβαση οχήματος: στρατιωτική</string>
+    <string name="poi_vehicle_customers">Πρόσβαση οχήματος: πελάτες</string>
+    <string name="poi_vehicle_permissive">Πρόσβαση οχήματος: ανεκτική</string>
+    <string name="poi_vehicle_destination">Πρόσβαση οχήματος: προορισμός</string>
+    <string name="poi_vehicle_no">Πρόσβαση οχήματος: όχι</string>
+    <string name="poi_vehicle_private">Πρόσβαση οχήματος: ιδιωτική</string>
+    <string name="poi_vehicle_yes">Πρόσβαση οχήματος: ναι</string>
+    <string name="poi_taxi_office">Γραφείο ταξί</string>
+    <string name="poi_hookah_lounge">Αίθουσα ναργιλέ</string>
+    <string name="poi_charcoal_pile">Σωρός κάρβουνου</string>
+    <string name="poi_changing_table_fee_no">Αλλαξιέρα με πληρωμή: όχι</string>
+    <string name="poi_changing_table_fee_yes">Αλλαξιέρα με πληρωμή: ναι</string>
+    <string name="poi_changing_table_count">Αριθμός αλλαξιέρων</string>
+    <string name="poi_changing_table_location_unisex_toilet">Τοποθεσία αλλαξιέρας: μικτή τουαλέτα</string>
+    <string name="poi_changing_table_location_female_toilet">Τοποθεσία αλλαξιέρας: τουαλέτα γυναικών</string>
+    <string name="poi_changing_table_location_male_toilet">Τοποθεσία αλλαξιέρας: τουαλέτα ανδρών</string>
+    <string name="poi_changing_table_location_room">Τοποθεσία αλλαξιέρας: δωμάτιο</string>
+    <string name="poi_changing_table_limited">Αλλαξιέρα: περιορισμένη</string>
+    <string name="poi_changing_table_no">Αλλαξιέρα: όχι</string>
+    <string name="poi_changing_table_yes">Αλλαξιέρα: ναι</string>
+    <string name="poi_defibrillator_location">Τοποθεσία</string>
+    <string name="poi_hazard_additional_contamination">Κίνδυνος: μόλυνση</string>
+    <string name="poi_hazard_additional_minefield">Κίνδυνος: ναρκοπέδιο</string>
+    <string name="poi_hazard_additional_avalanche">Κίνδυνος: χιονοστιβάδα</string>
+    <string name="poi_hazard_additional_flood">Κίνδυνος; πλημμύρα</string>
+    <string name="poi_hazard_additional_nuclear">Κίνδυνος: πυρηνικά</string>
+    <string name="poi_hazard_additional_rockfall">Κίνδυνος: πτώση βράχων</string>
+    <string name="poi_hazard_additional_erosion">Κίνδυνος: διάβρωση</string>
+    <string name="poi_rescue_box">Κουτί διάσωσης</string>
+    <string name="poi_change_delete">Διαγραμμένο αντικείμενο</string>
+    <string name="poi_park_ride_hov">Όχημα υψηλής πληρότητας</string>
+    <string name="poi_traffic_signals_arrow">Βέλος</string>
+    <string name="poi_traffic_signals_vibration">Δόνηση</string>
+    <string name="poi_fire_hydrant_pressure_filter">Πίεση</string>
+    <string name="poi_video_telephone">Βίντεο</string>
+    <string name="poi_sms">SMS</string>
+    <string name="poi_bath_open_air">Σε ανοιχτό χώρο</string>
 </resources>
\ No newline at end of file

From d65733803596d148a70fcdfb21d1cc9bb3588f29 Mon Sep 17 00:00:00 2001
From: Dmitry <dmpr0.ua@gmail.com>
Date: Wed, 12 Aug 2020 12:36:04 +0300
Subject: [PATCH 25/81] Added new icons for Developer plugin and builds menu
 item

---
 OsmAnd/res/drawable/ic_action_apk.xml         | 21 ++++++++++++
 OsmAnd/res/drawable/ic_action_laptop.xml      | 32 +++++++++++++++++++
 .../development/OsmandDevelopmentPlugin.java  |  4 +--
 3 files changed, 55 insertions(+), 2 deletions(-)
 create mode 100644 OsmAnd/res/drawable/ic_action_apk.xml
 create mode 100644 OsmAnd/res/drawable/ic_action_laptop.xml

diff --git a/OsmAnd/res/drawable/ic_action_apk.xml b/OsmAnd/res/drawable/ic_action_apk.xml
new file mode 100644
index 0000000000..21da34bd79
--- /dev/null
+++ b/OsmAnd/res/drawable/ic_action_apk.xml
@@ -0,0 +1,21 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M10,16L8.5,11H7.5L6,16H7L7.3,15H8.7L9,16H10ZM8.4,14L8,12.6667L7.6,14H8.4Z"
+      android:fillColor="#ffffff"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M16,11V13.3333L17,11H18L16.75,13.9167L18,16H17L16.1,14.5H16V16H15V11H16Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M13,11H11V16H12V15H13C13.5523,15 14,14.5523 14,14V12C14,11.4477 13.5523,11 13,11ZM12,14H13V12H12V14Z"
+      android:fillColor="#ffffff"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M3.3167,6.3666C3.1084,6.7831 3,7.2425 3,7.7082V19C3,20.1046 3.8954,21 5,21H19C20.1046,21 21,20.1046 21,19V7.7082C21,7.2425 20.8916,6.7831 20.6833,6.3666L19.4472,3.8944C19.1731,3.3463 18.6129,3 18,3H6C5.3871,3 4.8269,3.3463 4.5528,3.8944L3.3167,6.3666ZM5,8L5,19H19V8H5Z"
+      android:fillColor="#ffffff"
+      android:fillType="evenOdd"/>
+</vector>
diff --git a/OsmAnd/res/drawable/ic_action_laptop.xml b/OsmAnd/res/drawable/ic_action_laptop.xml
new file mode 100644
index 0000000000..c11bf0f8eb
--- /dev/null
+++ b/OsmAnd/res/drawable/ic_action_laptop.xml
@@ -0,0 +1,32 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M4,6H20V18H4V6Z"
+      android:strokeAlpha="0.3"
+      android:fillColor="#ffffff"
+      android:fillAlpha="0.3"/>
+  <path
+      android:pathData="M20,6H4V18H20V6ZM4,4C2.8954,4 2,4.8954 2,6V20H22V6C22,4.8954 21.1046,4 20,4H4Z"
+      android:strokeAlpha="0.7"
+      android:fillColor="#ffffff"
+      android:fillType="evenOdd"
+      android:fillAlpha="0.7"/>
+  <path
+      android:pathData="M1,18H23V19C23,19.5523 22.5523,20 22,20H2C1.4477,20 1,19.5523 1,19V18Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M14,8H6V10H14V8Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M18,8H16V10H18V8Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M6,12H9V14H6V12Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M18,12H11V14H18V12Z"
+      android:fillColor="#ffffff"/>
+</vector>
diff --git a/OsmAnd/src/net/osmand/plus/development/OsmandDevelopmentPlugin.java b/OsmAnd/src/net/osmand/plus/development/OsmandDevelopmentPlugin.java
index cbd2fcba13..6786e78d70 100644
--- a/OsmAnd/src/net/osmand/plus/development/OsmandDevelopmentPlugin.java
+++ b/OsmAnd/src/net/osmand/plus/development/OsmandDevelopmentPlugin.java
@@ -62,7 +62,7 @@ public class OsmandDevelopmentPlugin extends OsmandPlugin {
 			helper.addItem(new ContextMenuItem.ItemBuilder()
 					.setId(DRAWER_BUILDS_ID)
 					.setTitleId(R.string.version_settings, mapActivity)
-					.setIcon(R.drawable.ic_action_info_dark)
+					.setIcon(R.drawable.ic_action_apk)
 					.setListener(new ContextMenuAdapter.ItemClickListener() {
 						@Override
 						public boolean onContextMenuClick(ArrayAdapter<ContextMenuItem> adapter, int itemId, int pos, boolean isChecked, int[] viewCoordinates) {
@@ -133,7 +133,7 @@ public class OsmandDevelopmentPlugin extends OsmandPlugin {
 
 	@Override
 	public int getLogoResourceId() {
-		return R.drawable.ic_plugin_developer;
+		return R.drawable.ic_action_laptop;
 	}
 
 	@Override

From 25f564393bc9f2dc6cf0421be3f36e4db9d323e5 Mon Sep 17 00:00:00 2001
From: Dima-1 <softmail32@gmail.com>
Date: Wed, 12 Aug 2020 16:50:54 +0300
Subject: [PATCH 26/81] Fix plan route options

---
 .../main/java/net/osmand/GPXUtilities.java    |   6 +-
 .../MeasurementEditingContext.java            |  64 +++++---
 .../MeasurementToolFragment.java              | 149 ++++++++----------
 ...etweenPointsBottomSheetDialogFragment.java |  43 +++--
 .../command/AddPointCommand.java              |   1 +
 .../command/ChangeRouteModeCommand.java       |  92 +++++++++++
 .../command/MeasurementModeCommand.java       |   3 +-
 7 files changed, 228 insertions(+), 130 deletions(-)
 create mode 100644 OsmAnd/src/net/osmand/plus/measurementtool/command/ChangeRouteModeCommand.java

diff --git a/OsmAnd-java/src/main/java/net/osmand/GPXUtilities.java b/OsmAnd-java/src/main/java/net/osmand/GPXUtilities.java
index 3b003d1735..0df9a0b5e0 100644
--- a/OsmAnd-java/src/main/java/net/osmand/GPXUtilities.java
+++ b/OsmAnd-java/src/main/java/net/osmand/GPXUtilities.java
@@ -315,10 +315,14 @@ public class GPXUtilities {
 			getExtensionsToWrite().put(PROFILE_TYPE_EXTENSION, profileType);
 		}
 
+		public void removeProfileType() {
+			getExtensionsToWrite().remove(PROFILE_TYPE_EXTENSION);
+		}
+
 		public int getTrkPtIndex() {
 			try {
 				return Integer.parseInt(getExtensionsToRead().get(TRKPT_INDEX_EXTENSION));
-			}catch(NumberFormatException e){
+			} catch (NumberFormatException e) {
 				return -1;
 			}
 		}
diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementEditingContext.java b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementEditingContext.java
index cbec11bf82..a8aa4d32d1 100644
--- a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementEditingContext.java
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementEditingContext.java
@@ -17,7 +17,6 @@ import net.osmand.plus.routing.RouteCalculationResult;
 import net.osmand.plus.routing.RoutingHelper;
 import net.osmand.plus.settings.backend.ApplicationMode;
 import net.osmand.router.RouteCalculationProgress;
-import net.osmand.router.RoutePlannerFrontEnd;
 import net.osmand.router.RoutePlannerFrontEnd.GpxPoint;
 import net.osmand.router.RoutePlannerFrontEnd.GpxRouteApproximation;
 import net.osmand.router.RouteSegmentResult;
@@ -32,11 +31,11 @@ import java.util.Queue;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentLinkedQueue;
 
-import static net.osmand.plus.measurementtool.MeasurementEditingContext.CalculationType.*;
+import static net.osmand.plus.measurementtool.MeasurementEditingContext.CalculationMode.*;
 
 public class MeasurementEditingContext {
 
-	public enum CalculationType {
+	public enum CalculationMode {
 		NEXT_SEGMENT,
 		WHOLE_TRACK
 	}
@@ -58,8 +57,7 @@ public class MeasurementEditingContext {
 	private boolean inSnapToRoadMode;
 	private boolean needUpdateCacheForSnap;
 	private int calculatedPairs;
-	private CalculationType calculationType = WHOLE_TRACK;
-
+	private CalculationMode calculationMode = WHOLE_TRACK;
 	private SnapToRoadProgressListener progressListener;
 	private ApplicationMode snapToRoadAppMode;
 	private RouteCalculationProgress calculationProgress;
@@ -91,7 +89,7 @@ public class MeasurementEditingContext {
 		updateCacheForSnapIfNeeded(true);
 	}
 
-	int getSelectedPointPosition() {
+	public int getSelectedPointPosition() {
 		return selectedPointPosition;
 	}
 
@@ -111,7 +109,7 @@ public class MeasurementEditingContext {
 		this.inAddPointMode = inAddPointMode;
 	}
 
-	void setInSnapToRoadMode(boolean inSnapToRoadMode) {
+	public void setInSnapToRoadMode(boolean inSnapToRoadMode) {
 		this.inSnapToRoadMode = inSnapToRoadMode;
 	}
 
@@ -131,12 +129,12 @@ public class MeasurementEditingContext {
 		return newGpxData != null && newGpxData.getGpxFile() != null && newGpxData.getGpxFile().hasRtePt();
 	}
 
-	public CalculationType getCalculationType() {
-		return calculationType;
+	public CalculationMode getCalculationMode() {
+		return calculationMode;
 	}
 
-	public void setCalculationType(CalculationType calculationType) {
-		this.calculationType = calculationType;
+	public void setCalculationMode(CalculationMode calculationMode) {
+		this.calculationMode = calculationMode;
 	}
 
 	void setProgressListener(SnapToRoadProgressListener progressListener) {
@@ -147,17 +145,15 @@ public class MeasurementEditingContext {
 		return snapToRoadAppMode;
 	}
 
-	void setSnapToRoadAppMode(ApplicationMode snapToRoadAppMode) {
-		if (this.snapToRoadAppMode != null && snapToRoadAppMode != null
-				&& !this.snapToRoadAppMode.getStringKey().equals(snapToRoadAppMode.getStringKey())) {
-			if (calculationType == WHOLE_TRACK) {
-				snappedToRoadPoints.clear();
-				updateCacheForSnapIfNeeded(true);
-			}
-		}
+	public void setSnapToRoadAppMode(ApplicationMode snapToRoadAppMode) {
 		this.snapToRoadAppMode = snapToRoadAppMode;
 	}
 
+	public void clearSnappedToRoadPoints() {
+		snappedToRoadPoints.clear();
+	}
+
+
 	TrkSegment getBeforeTrkSegmentLine() {
 		if (beforeCacheForSnap != null) {
 			return beforeCacheForSnap;
@@ -241,7 +237,7 @@ public class MeasurementEditingContext {
 		}
 	}
 
-	void scheduleRouteCalculateIfNotEmpty() {
+	public void scheduleRouteCalculateIfNotEmpty() {
 		needUpdateCacheForSnap = true;
 		if (application == null || (before.points.size() == 0 && after.points.size() == 0)) {
 			return;
@@ -411,9 +407,23 @@ public class MeasurementEditingContext {
 		final RouteCalculationParams params = new RouteCalculationParams();
 		params.inSnapToRoadMode = true;
 		params.start = start;
+
+		ApplicationMode currentPointSnapToRoadMode;
+		if (calculationMode == NEXT_SEGMENT) {
+			currentPointSnapToRoadMode = ApplicationMode.valueOfStringKey(currentPair.first.getProfileType(),
+					null);
+		} else {
+			currentPointSnapToRoadMode = snapToRoadAppMode;
+		}
 		params.end = end;
-		RoutingHelper.applyApplicationSettings(params, application.getSettings(), snapToRoadAppMode);
-		params.mode = snapToRoadAppMode;
+		if (currentPointSnapToRoadMode == null) {
+			ApplicationMode straightLine = ApplicationMode.AIRCRAFT;
+			RoutingHelper.applyApplicationSettings(params, application.getSettings(), straightLine);
+			params.mode = straightLine;
+		} else {
+			RoutingHelper.applyApplicationSettings(params, application.getSettings(), currentPointSnapToRoadMode);
+			params.mode = currentPointSnapToRoadMode;
+		}
 		params.ctx = application;
 		params.calculationProgress = calculationProgress = new RouteCalculationProgress();
 		params.calculationProgressCallback = new RoutingHelper.RouteCalculationProgressCallback() {
@@ -539,8 +549,14 @@ public class MeasurementEditingContext {
 		params.start = start;
 		params.end = end;
 		params.intermediates = intermediates;
-		RoutingHelper.applyApplicationSettings(params, application.getSettings(), snapToRoadAppMode);
-		params.mode = snapToRoadAppMode;
+		if (snapToRoadAppMode == null) {
+			ApplicationMode straightLine = ApplicationMode.AIRCRAFT;
+			RoutingHelper.applyApplicationSettings(params, application.getSettings(), straightLine);
+			params.mode = straightLine;
+		} else {
+			RoutingHelper.applyApplicationSettings(params, application.getSettings(), snapToRoadAppMode);
+			params.mode = snapToRoadAppMode;
+		}
 		params.ctx = application;
 		params.calculationProgress = calculationProgress = new RouteCalculationProgress();
 		params.calculationProgressCallback = new RoutingHelper.RouteCalculationProgressCallback() {
diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
index a0590f77f7..c135baf0bc 100644
--- a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
@@ -16,7 +16,6 @@ import android.util.TypedValue;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
-import android.widget.CompoundButton;
 import android.widget.EditText;
 import android.widget.ImageButton;
 import android.widget.ImageView;
@@ -69,6 +68,7 @@ import net.osmand.plus.measurementtool.SelectedPointBottomSheetDialogFragment.Se
 import net.osmand.plus.measurementtool.adapter.MeasurementToolAdapter;
 import net.osmand.plus.measurementtool.adapter.MeasurementToolAdapter.MeasurementAdapterListener;
 import net.osmand.plus.measurementtool.command.AddPointCommand;
+import net.osmand.plus.measurementtool.command.ChangeRouteModeCommand;
 import net.osmand.plus.measurementtool.command.ClearPointsCommand;
 import net.osmand.plus.measurementtool.command.MovePointCommand;
 import net.osmand.plus.measurementtool.command.RemovePointCommand;
@@ -95,7 +95,7 @@ import java.util.Locale;
 
 import static net.osmand.IndexConstants.GPX_FILE_EXT;
 import static net.osmand.plus.measurementtool.GpxApproximationFragment.GpxApproximationFragmentListener;
-import static net.osmand.plus.measurementtool.MeasurementEditingContext.CalculationType;
+import static net.osmand.plus.measurementtool.MeasurementEditingContext.CalculationMode;
 import static net.osmand.plus.measurementtool.MeasurementEditingContext.ExportAsGpxListener;
 import static net.osmand.plus.measurementtool.MeasurementEditingContext.SnapToRoadProgressListener;
 import static net.osmand.plus.measurementtool.SelectFileBottomSheet.Mode.ADD_TO_TRACK;
@@ -224,7 +224,9 @@ public class MeasurementToolFragment extends BaseOsmAndFragment implements Route
 		AndroidUtils.setBackground(mapActivity, mainView, nightMode, R.drawable.bg_bottom_menu_light, R.drawable.bg_bottom_menu_dark);
 		pointsListContainer = view.findViewById(R.id.points_list_container);
 		if (portrait && pointsListContainer != null) {
-			final int backgroundColor = ContextCompat.getColor(mapActivity, nightMode ? R.color.activity_background_color_dark : R.color.activity_background_color_light);
+			final int backgroundColor = ContextCompat.getColor(mapActivity, nightMode
+					? R.color.activity_background_color_dark
+					: R.color.activity_background_color_light);
 			pointsListContainer.setBackgroundColor(backgroundColor);
 		}
 
@@ -311,13 +313,8 @@ public class MeasurementToolFragment extends BaseOsmAndFragment implements Route
 			public void onClick(View view) {
 				editingCtx.getCommandManager().undo();
 				updateUndoRedoButton(editingCtx.getCommandManager().canUndo(), undoBtn);
-				hidePointsListIfNoPoints();
-				if (editingCtx.getPointsCount() > 0) {
-					enable(upDownBtn);
-				}
-				adapter.notifyDataSetChanged();
 				updateUndoRedoButton(true, redoBtn);
-				updateDistancePointsText();
+				updateUndoRedoCommonStuff();
 			}
 		});
 
@@ -328,13 +325,8 @@ public class MeasurementToolFragment extends BaseOsmAndFragment implements Route
 			public void onClick(View view) {
 				editingCtx.getCommandManager().redo();
 				updateUndoRedoButton(editingCtx.getCommandManager().canRedo(), redoBtn);
-				hidePointsListIfNoPoints();
-				if (editingCtx.getPointsCount() > 0) {
-					enable(upDownBtn);
-				}
-				adapter.notifyDataSetChanged();
 				updateUndoRedoButton(true, undoBtn);
-				updateDistancePointsText();
+				updateUndoRedoCommonStuff();
 			}
 		});
 
@@ -447,14 +439,6 @@ public class MeasurementToolFragment extends BaseOsmAndFragment implements Route
 				}
 			}
 		});
-		toolBarController.setOnSwitchCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
-			@Override
-			public void onCheckedChanged(CompoundButton compoundButton, boolean checked) {
-				if (!checked) {
-					disableSnapToRoadMode();
-				}
-			}
-		});
 		mapActivity.showTopToolbar(toolBarController);
 
 		adapter = new MeasurementToolAdapter(getMapActivity(), editingCtx.getPoints(),
@@ -470,6 +454,16 @@ public class MeasurementToolFragment extends BaseOsmAndFragment implements Route
 		pointsRv.setLayoutManager(new LinearLayoutManager(getContext()));
 		pointsRv.setAdapter(adapter);
 
+		ImageButton snapToRoadBtn = (ImageButton) mapActivity.findViewById(R.id.snap_to_road_image_button);
+		snapToRoadBtn.setBackgroundResource(nightMode ? R.drawable.btn_circle_night : R.drawable.btn_circle);
+		snapToRoadBtn.setOnClickListener(new View.OnClickListener() {
+			@Override
+			public void onClick(View view) {
+				startSnapToRoad(false);
+			}
+		});
+		snapToRoadBtn.setVisibility(View.VISIBLE);
+
 		initMeasurementMode(newGpxData);
 
 		if (planRouteMode && savedInstanceState == null) {
@@ -479,19 +473,28 @@ public class MeasurementToolFragment extends BaseOsmAndFragment implements Route
 		return view;
 	}
 
+	private void updateUndoRedoCommonStuff() {
+		hidePointsListIfNoPoints();
+		if (editingCtx.getPointsCount() > 0) {
+			enable(upDownBtn);
+		}
+		adapter.notifyDataSetChanged();
+		updateDistancePointsText();
+		updateSnapToRoadControls();
+	}
+
 	private void initMeasurementMode(NewGpxData newGpxData) {
 		editingCtx.getCommandManager().resetMeasurementLayer(getMapActivity().getMapLayers().getMeasurementToolLayer());
 		enterMeasurementMode();
-		showSnapToRoadControls();
+		updateSnapToRoadControls();
 		if (newGpxData != null && !gpxPointsAdded) {
 			List<WptPt> points = newGpxData.getGpxFile().getRoutePoints();
+			ApplicationMode snapToRoadAppMode = null;
 			if (!points.isEmpty()) {
-				ApplicationMode snapToRoadAppMode = ApplicationMode
+				snapToRoadAppMode = ApplicationMode
 						.valueOfStringKey(points.get(points.size() - 1).getProfileType(), null);
-				if (snapToRoadAppMode != null) {
-					enableSnapToRoadMode(snapToRoadAppMode);
-				}
 			}
+			enableSnapToRoadMode(snapToRoadAppMode);
 			ActionType actionType = newGpxData.getActionType();
 			if (actionType == ActionType.ADD_ROUTE_POINTS) {
 				displayRoutePoints();
@@ -639,7 +642,7 @@ public class MeasurementToolFragment extends BaseOsmAndFragment implements Route
 
 			if (editingCtx.isNewData() || editingCtx.hasRoutePoints()) {
 				RouteBetweenPointsBottomSheetDialogFragment.showInstance(mapActivity.getSupportFragmentManager(),
-						this, editingCtx.getCalculationType(),
+						this, editingCtx.getCalculationMode(),
 						editingCtx.getSnapToRoadAppMode());
 			} else {
 				SnapTrackWarningBottomSheet.showInstance(mapActivity.getSupportFragmentManager(), this);
@@ -772,9 +775,7 @@ public class MeasurementToolFragment extends BaseOsmAndFragment implements Route
 
 			@Override
 			public void deleteOnClick() {
-				if (measurementLayer != null) {
-					removePoint(measurementLayer, editingCtx.getSelectedPointPosition());
-				}
+				removePoint(measurementLayer, editingCtx.getSelectedPointPosition());
 				editingCtx.setSelectedPointPosition(-1);
 			}
 
@@ -826,21 +827,17 @@ public class MeasurementToolFragment extends BaseOsmAndFragment implements Route
 	}
 
 	@Override
-	public void onChangeApplicationMode(ApplicationMode mode) {
-		if (mode == null) {
-			disableSnapToRoadMode();
-			editingCtx.setSnapToRoadAppMode(null);
-			showSnapToRoadControls();
-		} else {
-			enableSnapToRoadMode(mode);
+	public void onChangeApplicationMode(ApplicationMode mode, CalculationMode calculationMode) {
+		MeasurementToolLayer measurementLayer = getMeasurementLayer();
+		if (measurementLayer != null) {
+			editingCtx.getCommandManager().execute(new ChangeRouteModeCommand(measurementLayer, mode, calculationMode));
+			updateUndoRedoButton(false, redoBtn);
+			disable(upDownBtn);
+			updateSnapToRoadControls();
+			updateDistancePointsText();
 		}
 	}
 
-	@Override
-	public void onChangeCalculationType(CalculationType calculationType) {
-		editingCtx.setCalculationType(calculationType);
-	}
-
 	private StartPlanRouteListener createStartPlanRouteListener() {
 		return new StartPlanRouteListener() {
 			@Override
@@ -946,14 +943,16 @@ public class MeasurementToolFragment extends BaseOsmAndFragment implements Route
 		return null;
 	}
 
-	private void removePoint(MeasurementToolLayer layer, int position) {
-		editingCtx.getCommandManager().execute(new RemovePointCommand(layer, position));
-		adapter.notifyDataSetChanged();
-		updateUndoRedoButton(true, undoBtn);
-		updateUndoRedoButton(false, redoBtn);
-		updateDistancePointsText();
-		saved = false;
-		hidePointsListIfNoPoints();
+	private void removePoint(MeasurementToolLayer measurementLayer, int position) {
+		if (measurementLayer != null) {
+			editingCtx.getCommandManager().execute(new RemovePointCommand(measurementLayer, position));
+			adapter.notifyDataSetChanged();
+			updateUndoRedoButton(true, undoBtn);
+			updateUndoRedoButton(false, redoBtn);
+			updateDistancePointsText();
+			saved = false;
+			hidePointsListIfNoPoints();
+		}
 	}
 
 	private SaveAsNewTrackFragmentListener createSaveAsNewTrackFragmentListener() {
@@ -980,9 +979,7 @@ public class MeasurementToolFragment extends BaseOsmAndFragment implements Route
 
 			@Override
 			public void onRemoveClick(int position) {
-				if (measurementLayer != null) {
-					removePoint(measurementLayer, position);
-				}
+				removePoint(measurementLayer, position);
 			}
 
 			@Override
@@ -1026,10 +1023,10 @@ public class MeasurementToolFragment extends BaseOsmAndFragment implements Route
 		editingCtx.setSnapToRoadAppMode(appMode);
 		editingCtx.setInSnapToRoadMode(true);
 		editingCtx.scheduleRouteCalculateIfNotEmpty();
-		showSnapToRoadControls();
+		updateSnapToRoadControls();
 	}
 
-	private void showSnapToRoadControls() {
+	private void updateSnapToRoadControls() {
 		final MapActivity mapActivity = getMapActivity();
 		final ApplicationMode appMode = editingCtx.getSnapToRoadAppMode();
 		if (mapActivity != null) {
@@ -1040,15 +1037,7 @@ public class MeasurementToolFragment extends BaseOsmAndFragment implements Route
 				icon = getIcon(appMode.getIconRes(), appMode.getIconColorInfo().getColor(nightMode));
 			}
 			ImageButton snapToRoadBtn = (ImageButton) mapActivity.findViewById(R.id.snap_to_road_image_button);
-			snapToRoadBtn.setBackgroundResource(nightMode ? R.drawable.btn_circle_night : R.drawable.btn_circle);
 			snapToRoadBtn.setImageDrawable(icon);
-			snapToRoadBtn.setOnClickListener(new View.OnClickListener() {
-				@Override
-				public void onClick(View view) {
-					startSnapToRoad(false);
-				}
-			});
-			snapToRoadBtn.setVisibility(View.VISIBLE);
 			mapActivity.refreshMap();
 		}
 	}
@@ -1124,7 +1113,7 @@ public class MeasurementToolFragment extends BaseOsmAndFragment implements Route
 	private void showAddToTrackDialog(final MapActivity mapActivity) {
 		if (mapActivity != null) {
 			SelectFileBottomSheet.showInstance(mapActivity.getSupportFragmentManager(),
-					createAddToTrackFileListener(),ADD_TO_TRACK);
+					createAddToTrackFileListener(), ADD_TO_TRACK);
 		}
 	}
 
@@ -1223,14 +1212,14 @@ public class MeasurementToolFragment extends BaseOsmAndFragment implements Route
 				toolBarController.setBackBtnIconIds(R.drawable.ic_action_remove_dark, R.drawable.ic_action_remove_dark);
 			}
 			mapActivity.showTopToolbar(toolBarController);
+			markGeneralComponents(enable ? View.GONE : View.VISIBLE);
+			AndroidUiHelper.setVisibility(mapActivity, enable ? View.VISIBLE : View.GONE,
+					R.id.move_point_text,
+					R.id.move_point_controls);
+			mainIcon.setImageDrawable(getActiveIcon(enable
+					? R.drawable.ic_action_move_point
+					: R.drawable.ic_action_ruler));
 		}
-		markGeneralComponents(enable ? View.GONE : View.VISIBLE);
-		AndroidUiHelper.setVisibility(mapActivity, enable ? View.VISIBLE : View.GONE,
-				R.id.move_point_text,
-				R.id.move_point_controls);
-		mainIcon.setImageDrawable(getActiveIcon(enable
-				? R.drawable.ic_action_move_point
-				: R.drawable.ic_action_ruler));
 	}
 
 	private void switchAddPointBeforeAfterMode(boolean enable) {
@@ -1243,13 +1232,13 @@ public class MeasurementToolFragment extends BaseOsmAndFragment implements Route
 				toolBarController.setBackBtnIconIds(R.drawable.ic_action_remove_dark, R.drawable.ic_action_remove_dark);
 			}
 			mapActivity.showTopToolbar(toolBarController);
-		}
-		markGeneralComponents(enable ? View.GONE : View.VISIBLE);
-		AndroidUiHelper.setVisibility(mapActivity,enable ? View.VISIBLE : View.GONE,
-				R.id.add_point_before_after_text,
-				R.id.add_point_before_after_controls);
-		if (!enable) {
-			mainIcon.setImageDrawable(getActiveIcon(R.drawable.ic_action_ruler));
+			markGeneralComponents(enable ? View.GONE : View.VISIBLE);
+			AndroidUiHelper.setVisibility(mapActivity, enable ? View.VISIBLE : View.GONE,
+					R.id.add_point_before_after_text,
+					R.id.add_point_before_after_controls);
+			if (!enable) {
+				mainIcon.setImageDrawable(getActiveIcon(R.drawable.ic_action_ruler));
+			}
 		}
 	}
 
diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/RouteBetweenPointsBottomSheetDialogFragment.java b/OsmAnd/src/net/osmand/plus/measurementtool/RouteBetweenPointsBottomSheetDialogFragment.java
index a8c88baace..8c43b02c0a 100644
--- a/OsmAnd/src/net/osmand/plus/measurementtool/RouteBetweenPointsBottomSheetDialogFragment.java
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/RouteBetweenPointsBottomSheetDialogFragment.java
@@ -26,7 +26,7 @@ import net.osmand.plus.R;
 import net.osmand.plus.UiUtilities;
 import net.osmand.plus.base.BottomSheetDialogFragment;
 import net.osmand.plus.helpers.AndroidUiHelper;
-import net.osmand.plus.measurementtool.MeasurementEditingContext.CalculationType;
+import net.osmand.plus.measurementtool.MeasurementEditingContext.CalculationMode;
 import net.osmand.plus.settings.backend.ApplicationMode;
 
 import org.apache.commons.logging.Log;
@@ -35,22 +35,22 @@ import java.util.ArrayList;
 import java.util.List;
 
 import static net.osmand.plus.UiUtilities.CustomRadioButtonType.*;
-import static net.osmand.plus.measurementtool.MeasurementEditingContext.CalculationType.NEXT_SEGMENT;
-import static net.osmand.plus.measurementtool.MeasurementEditingContext.CalculationType.WHOLE_TRACK;
+import static net.osmand.plus.measurementtool.MeasurementEditingContext.CalculationMode.NEXT_SEGMENT;
+import static net.osmand.plus.measurementtool.MeasurementEditingContext.CalculationMode.WHOLE_TRACK;
 
 public class RouteBetweenPointsBottomSheetDialogFragment extends BottomSheetDialogFragment {
 
 	private static final Log LOG = PlatformUtil.getLog(RouteBetweenPointsBottomSheetDialogFragment.class);
 	public static final String TAG = RouteBetweenPointsBottomSheetDialogFragment.class.getSimpleName();
 	public static final int STRAIGHT_LINE_TAG = -1;
-	public static final String CALCULATION_TYPE_KEY = "calculation_type";
+	public static final String CALCULATION_MODE_KEY = "calculation_type";
 	public static final String ROUTE_APP_MODE_KEY = "route_app_mode";
 
 	private boolean nightMode;
 	private boolean portrait;
-	private boolean snapToRoadEnabled;
+	private boolean snapToRoadEnabled = true;
 	private TextView btnDescription;
-	private CalculationType calculationType = WHOLE_TRACK;
+	private CalculationMode calculationMode = WHOLE_TRACK;
 	private ApplicationMode snapToRoadAppMode;
 
 	private LinearLayout customRadioButton;
@@ -61,10 +61,10 @@ public class RouteBetweenPointsBottomSheetDialogFragment extends BottomSheetDial
 		Bundle args = getArguments();
 		if (args != null) {
 			snapToRoadAppMode = ApplicationMode.valueOfStringKey(args.getString(ROUTE_APP_MODE_KEY), null);
-			calculationType = (CalculationType) args.get(CALCULATION_TYPE_KEY);
+			calculationMode = (CalculationMode) args.get(CALCULATION_MODE_KEY);
 		}
 		if (savedInstanceState != null) {
-			calculationType = (CalculationType) savedInstanceState.get(CALCULATION_TYPE_KEY);
+			calculationMode = (CalculationMode) savedInstanceState.get(CALCULATION_MODE_KEY);
 		}
 		OsmandApplication app = requiredMyApplication();
 		nightMode = app.getDaynightHelper().isNightModeForMapControls();
@@ -108,7 +108,7 @@ public class RouteBetweenPointsBottomSheetDialogFragment extends BottomSheetDial
 				}
 				Fragment fragment = getTargetFragment();
 				if (fragment instanceof RouteBetweenPointsFragmentListener) {
-					((RouteBetweenPointsFragmentListener) fragment).onChangeApplicationMode(mode);
+					((RouteBetweenPointsFragmentListener) fragment).onChangeApplicationMode(mode, calculationMode);
 				}
 				dismiss();
 			}
@@ -137,7 +137,7 @@ public class RouteBetweenPointsBottomSheetDialogFragment extends BottomSheetDial
 				updateModeButtons(WHOLE_TRACK);
 			}
 		});
-		updateModeButtons(calculationType);
+		updateModeButtons(calculationMode);
 		return mainView;
 	}
 
@@ -150,19 +150,15 @@ public class RouteBetweenPointsBottomSheetDialogFragment extends BottomSheetDial
 		container.addView(row);
 	}
 
-	private void updateModeButtons(CalculationType calculationType) {
-		if (calculationType == NEXT_SEGMENT) {
+	private void updateModeButtons(CalculationMode calculationMode) {
+		if (calculationMode == NEXT_SEGMENT) {
 			UiUtilities.updateCustomRadioButtons(getMyApplication(), customRadioButton, nightMode, LEFT);
 			btnDescription.setText(R.string.rourte_between_points_next_segment_button_desc);
 		} else {
 			btnDescription.setText(R.string.rourte_between_points_whole_track_button_desc);
 			UiUtilities.updateCustomRadioButtons(getMyApplication(), customRadioButton, nightMode, RIGHT);
 		}
-		setCalculationType(calculationType);
-		Fragment fragment = getTargetFragment();
-		if (fragment instanceof RouteBetweenPointsFragmentListener) {
-			((RouteBetweenPointsFragmentListener) fragment).onChangeCalculationType(calculationType);
-		}
+		setCalculationMode(calculationMode);
 	}
 
 	private void addProfileView(LinearLayout container, View.OnClickListener onClickListener, Object tag,
@@ -197,7 +193,7 @@ public class RouteBetweenPointsBottomSheetDialogFragment extends BottomSheetDial
 	@Override
 	public void onSaveInstanceState(@NonNull Bundle outState) {
 		super.onSaveInstanceState(outState);
-		outState.putSerializable(CALCULATION_TYPE_KEY, calculationType);
+		outState.putSerializable(CALCULATION_MODE_KEY, calculationMode);
 	}
 
 	@Override
@@ -209,18 +205,18 @@ public class RouteBetweenPointsBottomSheetDialogFragment extends BottomSheetDial
 		super.onDestroyView();
 	}
 
-	public void setCalculationType(CalculationType calculationType) {
-		this.calculationType = calculationType;
+	public void setCalculationMode(CalculationMode calculationMode) {
+		this.calculationMode = calculationMode;
 	}
 
-	public static void showInstance(FragmentManager fm, Fragment targetFragment, CalculationType calculationType,
+	public static void showInstance(FragmentManager fm, Fragment targetFragment, CalculationMode calculationMode,
 	                                ApplicationMode applicationMode) {
 		try {
 			if (!fm.isStateSaved()) {
 				RouteBetweenPointsBottomSheetDialogFragment fragment = new RouteBetweenPointsBottomSheetDialogFragment();
 				Bundle args = new Bundle();
 				args.putString(ROUTE_APP_MODE_KEY, applicationMode != null ? applicationMode.getStringKey() : null);
-				args.putSerializable(CALCULATION_TYPE_KEY, calculationType);
+				args.putSerializable(CALCULATION_MODE_KEY, calculationMode);
 				fragment.setArguments(args);
 				fragment.setTargetFragment(targetFragment, 0);
 				fragment.show(fm, TAG);
@@ -234,8 +230,7 @@ public class RouteBetweenPointsBottomSheetDialogFragment extends BottomSheetDial
 
 		void onCloseRouteDialog(boolean snapToRoadEnabled);
 
-		void onChangeApplicationMode(ApplicationMode mode);
+		void onChangeApplicationMode(ApplicationMode mode, CalculationMode calculationMode);
 
-		void onChangeCalculationType(CalculationType calculationType);
 	}
 }
diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/command/AddPointCommand.java b/OsmAnd/src/net/osmand/plus/measurementtool/command/AddPointCommand.java
index 8eba2c1532..5781081288 100644
--- a/OsmAnd/src/net/osmand/plus/measurementtool/command/AddPointCommand.java
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/command/AddPointCommand.java
@@ -24,6 +24,7 @@ public class AddPointCommand extends MeasurementModeCommand {
 			point = new WptPt();
 			point.lat = latLon.getLatitude();
 			point.lon = latLon.getLongitude();
+			point.setProfileType(measurementLayer.getEditingCtx().getSnapToRoadAppMode().getStringKey());
 		}
 		this.center = center;
 		position = measurementLayer.getEditingCtx().getPointsCount();
diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/command/ChangeRouteModeCommand.java b/OsmAnd/src/net/osmand/plus/measurementtool/command/ChangeRouteModeCommand.java
new file mode 100644
index 0000000000..80d8648480
--- /dev/null
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/command/ChangeRouteModeCommand.java
@@ -0,0 +1,92 @@
+package net.osmand.plus.measurementtool.command;
+
+import net.osmand.GPXUtilities.WptPt;
+import net.osmand.plus.measurementtool.MeasurementEditingContext;
+import net.osmand.plus.measurementtool.MeasurementToolLayer;
+import net.osmand.plus.settings.backend.ApplicationMode;
+
+import java.util.LinkedList;
+import java.util.List;
+
+import static net.osmand.plus.measurementtool.MeasurementEditingContext.*;
+
+public class ChangeRouteModeCommand extends MeasurementModeCommand {
+
+	private List<WptPt> points;
+	int pointIdx;
+	ApplicationMode oldMode;
+	ApplicationMode newMode;
+	CalculationMode oldCalculationMode;
+	CalculationMode newCalculationMode;
+
+
+	public ChangeRouteModeCommand(MeasurementToolLayer measurementLayer, ApplicationMode newMode,
+	                              CalculationMode newCalculationMode) {
+		this.measurementLayer = measurementLayer;
+		this.newMode = newMode;
+		this.newCalculationMode = newCalculationMode;
+		MeasurementEditingContext editingCtx = measurementLayer.getEditingCtx();
+		oldMode = editingCtx.getSnapToRoadAppMode();
+		oldCalculationMode = editingCtx.getCalculationMode();
+	}
+
+	@Override
+	public boolean execute() {
+		MeasurementEditingContext editingCtx = measurementLayer.getEditingCtx();
+		points = new LinkedList<>(editingCtx.getPoints());
+		pointIdx = points.size() - 1;
+		if (pointIdx > 0 && newCalculationMode != CalculationMode.WHOLE_TRACK) {
+			if (newMode != null) {
+				points.get(pointIdx).setProfileType(newMode.getStringKey());
+			} else {
+				points.get(pointIdx).removeProfileType();
+			}
+		}
+		editingCtx.setCalculationMode(newCalculationMode);
+		editingCtx.setInSnapToRoadMode(true);
+		editingCtx.setSnapToRoadAppMode(newMode);
+		if (newCalculationMode == CalculationMode.WHOLE_TRACK) {
+			editingCtx.clearSnappedToRoadPoints();
+		}
+		editingCtx.setNeedUpdateCacheForSnap(true);
+		return true;
+	}
+
+	@Override
+	public void undo() {
+		MeasurementEditingContext editingCtx = measurementLayer.getEditingCtx();
+		editingCtx.getPoints().clear();
+		editingCtx.addPoints(points);
+		editingCtx.setSnapToRoadAppMode(oldMode);
+		if (newCalculationMode == CalculationMode.WHOLE_TRACK) {
+			editingCtx.clearSnappedToRoadPoints();
+		}
+		editingCtx.setCalculationMode(oldCalculationMode);
+		editingCtx.setInSnapToRoadMode(true);
+		editingCtx.setNeedUpdateCacheForSnap(true);
+	}
+
+	@Override
+	public void redo() {
+		MeasurementEditingContext editingCtx = measurementLayer.getEditingCtx();
+		if (pointIdx > 0) {
+			if (newMode != null) {
+				points.get(pointIdx).setProfileType(newMode.getStringKey());
+			} else {
+				points.get(pointIdx).removeProfileType();
+			}
+		}
+		editingCtx.setInSnapToRoadMode(true);
+		editingCtx.setCalculationMode(newCalculationMode);
+		editingCtx.setSnapToRoadAppMode(newMode);
+		if (newCalculationMode == CalculationMode.WHOLE_TRACK) {
+			editingCtx.clearSnappedToRoadPoints();
+		}
+		editingCtx.setNeedUpdateCacheForSnap(true);
+	}
+
+	@Override
+	MeasurementCommandType getType() {
+		return MeasurementCommandType.CHANGE_ROUTE_MODE;
+	}
+}
diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/command/MeasurementModeCommand.java b/OsmAnd/src/net/osmand/plus/measurementtool/command/MeasurementModeCommand.java
index f0fb2133ea..725ac13e36 100644
--- a/OsmAnd/src/net/osmand/plus/measurementtool/command/MeasurementModeCommand.java
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/command/MeasurementModeCommand.java
@@ -18,6 +18,7 @@ public abstract class MeasurementModeCommand implements Command {
 		MOVE_POINT,
 		REMOVE_POINT,
 		REORDER_POINT,
-		SNAP_TO_ROAD
+		SNAP_TO_ROAD,
+		CHANGE_ROUTE_MODE
 	}
 }

From 2a9083d3c9855feec568dd23c965d3bea9b1aded Mon Sep 17 00:00:00 2001
From: Dmitry <dmpr0.ua@gmail.com>
Date: Wed, 12 Aug 2020 18:02:32 +0300
Subject: [PATCH 27/81] Added icons for trim track

---
 OsmAnd/res/drawable/ic_action_trim_left.xml  | 21 ++++++++++++++++++++
 OsmAnd/res/drawable/ic_action_trim_right.xml | 21 ++++++++++++++++++++
 2 files changed, 42 insertions(+)
 create mode 100644 OsmAnd/res/drawable/ic_action_trim_left.xml
 create mode 100644 OsmAnd/res/drawable/ic_action_trim_right.xml

diff --git a/OsmAnd/res/drawable/ic_action_trim_left.xml b/OsmAnd/res/drawable/ic_action_trim_left.xml
new file mode 100644
index 0000000000..74b91e92e1
--- /dev/null
+++ b/OsmAnd/res/drawable/ic_action_trim_left.xml
@@ -0,0 +1,21 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <group>
+    <clip-path android:pathData="M0,0h24v24h-24z M 0,0"/>
+    <path
+        android:pathData="M10.5212 4.12217C10.0363 4.38663 9.85769 4.99407 10.1222 5.47892L13.8609 12.3332L12.6736 14.51C12.1955 14.188 11.6196 14.0001 10.9999 14.0001C9.34303 14.0001 7.99988 15.3432 7.99988 17.0001C7.99988 18.6569 9.34303 20.0001 10.9999 20.0001C12.6567 20.0001 13.9999 18.6569 13.9999 17.0001V16.2551L15 14.4216L16 16.2551V17.0001C16 18.6569 17.3432 20.0001 19 20.0001C20.6569 20.0001 22 18.6569 22 17.0001C22 15.3432 20.6569 14.0001 19 14.0001C18.3803 14.0001 17.8044 14.188 17.3264 14.51L16.5027 13H21C21.5523 13 22 12.5523 22 12C22 11.4477 21.5523 11 21 11H16.8663L19.8778 5.47892C20.1422 4.99407 19.9636 4.38663 19.4787 4.12217C18.9939 3.85771 18.3864 4.03637 18.122 4.52122L15 10.2449L11.8779 4.52121C11.6135 4.03637 11.006 3.85771 10.5212 4.12217ZM18.9999 18C18.4476 18 17.9999 17.5523 17.9999 17C17.9999 16.4477 18.4476 16 18.9999 16C19.5522 16 19.9999 16.4477 19.9999 17C19.9999 17.5523 19.5522 18 18.9999 18ZM11 18C11.5523 18 12 17.5523 12 17C12 16.4477 11.5523 16 11 16C10.4477 16 10 16.4477 10 17C10 17.5523 10.4477 18 11 18Z"
+        android:strokeAlpha="0.5"
+        android:fillColor="#ffffff"
+        android:fillType="evenOdd"
+        android:fillAlpha="0.5"/>
+    <path
+        android:pathData="M3 11C2.44772 11 2 11.4477 2 12C2 12.5523 2.44772 13 3 13H5C5.55228 13 6 12.5523 6 12C6 11.4477 5.55228 11 5 11H3Z"
+        android:fillColor="#ffffff"/>
+    <path
+        android:pathData="M9 11C8.44772 11 8 11.4477 8 12C8 12.5523 8.44772 13 9 13H11C11.5523 13 12 12.5523 12 12C12 11.4477 11.5523 11 11 11H9Z"
+        android:fillColor="#ffffff"/>
+  </group>
+</vector>
diff --git a/OsmAnd/res/drawable/ic_action_trim_right.xml b/OsmAnd/res/drawable/ic_action_trim_right.xml
new file mode 100644
index 0000000000..f9bc488218
--- /dev/null
+++ b/OsmAnd/res/drawable/ic_action_trim_right.xml
@@ -0,0 +1,21 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <group>
+    <clip-path android:pathData="M0,0h24v24h-24z M 0,0"/>
+    <path
+        android:pathData="M13.4789 4.12217C13.9637 4.38663 14.1424 4.99407 13.8779 5.47892L10.1392 12.3332L11.3265 14.51C11.8046 14.188 12.3804 14.0001 13.0002 14.0001C14.657 14.0001 16.0002 15.3432 16.0002 17.0001C16.0002 18.6569 14.657 20.0001 13.0002 20.0001C11.3433 20.0001 10.0002 18.6569 10.0002 17.0001V16.2551L9.00008 14.4216L8 16.2551V17.0001C8 18.6569 6.65685 20.0001 5 20.0001C3.34315 20.0001 2 18.6569 2 17.0001C2 15.3432 3.34315 14.0001 5 14.0001C5.61975 14.0001 6.1956 14.188 6.67369 14.51L7.61085 12.7918C7.44191 12.9224 7.23005 13 7.00005 13H3.00005C2.44777 13 2.00005 12.5523 2.00005 12C2.00005 11.4477 2.44777 11 3.00005 11H7.00005C7.0472 11 7.09358 11.0033 7.139 11.0096L4.12227 5.47892C3.85781 4.99407 4.03647 4.38663 4.52132 4.12217C5.00617 3.85771 5.6136 4.03637 5.87807 4.52122L9.00008 10.2449L12.1221 4.52121C12.3866 4.03637 12.994 3.85771 13.4789 4.12217ZM5.00012 18C5.55241 18 6.00012 17.5523 6.00012 17C6.00012 16.4477 5.55241 16 5.00012 16C4.44784 16 4.00012 16.4477 4.00012 17C4.00012 17.5523 4.44784 18 5.00012 18ZM13 18C12.4478 18 12 17.5523 12 17C12 16.4477 12.4478 16 13 16C13.5523 16 14 16.4477 14 17C14 17.5523 13.5523 18 13 18Z"
+        android:strokeAlpha="0.5"
+        android:fillColor="#ffffff"
+        android:fillType="evenOdd"
+        android:fillAlpha="0.5"/>
+    <path
+        android:pathData="M21.0001 11C21.5523 11 22.0001 11.4477 22.0001 12C22.0001 12.5523 21.5523 13 21.0001 13H19.0001C18.4478 13 18.0001 12.5523 18.0001 12C18.0001 11.4477 18.4478 11 19.0001 11H21.0001Z"
+        android:fillColor="#ffffff"/>
+    <path
+        android:pathData="M15.0001 11C15.5523 11 16.0001 11.4477 16.0001 12C16.0001 12.5523 15.5523 13 15.0001 13H13.0001C12.4478 13 12.0001 12.5523 12.0001 12C12.0001 11.4477 12.4478 11 13.0001 11H15.0001Z"
+        android:fillColor="#ffffff"/>
+  </group>
+</vector>

From 79615bbf74f6fe74a0f0390505f3b5c0ea143bdb Mon Sep 17 00:00:00 2001
From: Dmitry <dmpr0.ua@gmail.com>
Date: Wed, 12 Aug 2020 18:13:42 +0300
Subject: [PATCH 28/81] Update save to file icon, added new save as new file
 icon

---
 .../res/drawable/ic_action_save_as_new_file.xml   | 15 +++++++++++++++
 OsmAnd/res/drawable/ic_action_save_to_file.xml    | 10 ++++------
 2 files changed, 19 insertions(+), 6 deletions(-)
 create mode 100644 OsmAnd/res/drawable/ic_action_save_as_new_file.xml

diff --git a/OsmAnd/res/drawable/ic_action_save_as_new_file.xml b/OsmAnd/res/drawable/ic_action_save_as_new_file.xml
new file mode 100644
index 0000000000..9457316943
--- /dev/null
+++ b/OsmAnd/res/drawable/ic_action_save_as_new_file.xml
@@ -0,0 +1,15 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M4,4C4,2.8954 4.8954,2 6,2H14V6C14,7.1046 14.8954,8 16,8H20V20C20,21.1046 19.1046,22 18,22H6C4.8954,22 4,21.1046 4,20V4ZM11,10H13V13H16V15H13V18H11V15H8V13H11V10Z"
+      android:fillColor="#ffffff"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M14,2L20,8H16C14.8954,8 14,7.1046 14,6V2Z"
+      android:strokeAlpha="0.5"
+      android:fillColor="#ffffff"
+      android:fillAlpha="0.5"/>
+</vector>
diff --git a/OsmAnd/res/drawable/ic_action_save_to_file.xml b/OsmAnd/res/drawable/ic_action_save_to_file.xml
index eeaa54ca2e..ddf1e32c0d 100644
--- a/OsmAnd/res/drawable/ic_action_save_to_file.xml
+++ b/OsmAnd/res/drawable/ic_action_save_to_file.xml
@@ -4,14 +4,12 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
   <path
-      android:pathData="M14,2L16,4L20,8H16C14.8954,8 14,7.1046 14,6V2Z"
-      android:fillColor="#ffffff"/>
-  <path
-      android:pathData="M14,4H6V20H18V8H20V20C20,21.1046 19.1046,22 18,22H6C4.8954,22 4,21.1046 4,20V4C4,2.8954 4.8954,2 6,2H14V4Z"
+      android:pathData="M14,2L20,8H16C14.8954,8 14,7.1046 14,6V2Z"
       android:strokeAlpha="0.5"
       android:fillColor="#ffffff"
       android:fillAlpha="0.5"/>
   <path
-      android:pathData="M13,9H11V14H9L12,18L15,14H13V9Z"
-      android:fillColor="#ffffff"/>
+      android:pathData="M4,4C4,2.8954 4.8954,2 6,2H14V6C14,7.1046 14.8954,8 16,8H20V20C20,21.1046 19.1046,22 18,22H6C4.8954,22 4,21.1046 4,20V4ZM11,9H13V14H15L12,18L9,14H11V9Z"
+      android:fillColor="#ffffff"
+      android:fillType="evenOdd"/>
 </vector>

From 7e2dfb43447cc88314530f16a33890192efd7ca1 Mon Sep 17 00:00:00 2001
From: Dmitry <dmpr0.ua@gmail.com>
Date: Wed, 12 Aug 2020 18:20:12 +0300
Subject: [PATCH 29/81] Added icon for save complete

---
 OsmAnd/res/drawable/ic_action_save_complete.xml | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 OsmAnd/res/drawable/ic_action_save_complete.xml

diff --git a/OsmAnd/res/drawable/ic_action_save_complete.xml b/OsmAnd/res/drawable/ic_action_save_complete.xml
new file mode 100644
index 0000000000..5ca6381e21
--- /dev/null
+++ b/OsmAnd/res/drawable/ic_action_save_complete.xml
@@ -0,0 +1,15 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M4,4C4,2.8954 4.8954,2 6,2H14V6C14,7.1046 14.8954,8 16,8H20V20C20,21.1046 19.1046,22 18,22H6C4.8954,22 4,21.1046 4,20V4ZM17.7071,11.7071L16.2929,10.2929L11,15.5858L8.7071,13.2929L7.2929,14.7071L11,18.4142L17.7071,11.7071Z"
+      android:fillColor="#ffffff"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M14,2L20,8H16C14.8954,8 14,7.1046 14,6V2Z"
+      android:strokeAlpha="0.5"
+      android:fillColor="#ffffff"
+      android:fillAlpha="0.5"/>
+</vector>

From 03bee1df46c998b73a32c6384b62f231fd928db8 Mon Sep 17 00:00:00 2001
From: kotlin <sasafaoifgasofguaiosgfuia@hgmail.com>
Date: Wed, 12 Aug 2020 19:15:32 +0300
Subject: [PATCH 30/81] Fix #9582

---
 .../net/osmand/plus/parkingpoint/ParkingPositionPlugin.java    | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/OsmAnd/src/net/osmand/plus/parkingpoint/ParkingPositionPlugin.java b/OsmAnd/src/net/osmand/plus/parkingpoint/ParkingPositionPlugin.java
index 15cf579e62..8583190f30 100644
--- a/OsmAnd/src/net/osmand/plus/parkingpoint/ParkingPositionPlugin.java
+++ b/OsmAnd/src/net/osmand/plus/parkingpoint/ParkingPositionPlugin.java
@@ -268,10 +268,11 @@ public class ParkingPositionPlugin extends OsmandPlugin {
 
 	void showContextMenuIfNeeded(final MapActivity mapActivity, boolean animated) {
 		MapContextMenu menu = mapActivity.getContextMenu();
+		FavouritePoint pnt = app.getFavorites().getSpecialPoint(SpecialPointType.PARKING);
 		if (menu.isVisible()) {
 			menu.hide(animated);
 			menu.show(new LatLon(parkingPosition.getLatitude(), parkingPosition.getLongitude()),
-					getObjectName(parkingPosition), parkingPosition);
+					getObjectName(parkingPosition), pnt);
 		}
 	}
 

From babe4bc6c61116021a41747ae1eca473cbc358a2 Mon Sep 17 00:00:00 2001
From: sergdevosm <androidkotlin@protonmail.ch>
Date: Thu, 13 Aug 2020 12:04:58 +0300
Subject: [PATCH 31/81] Fix #6003

---
 OsmAnd/src/net/osmand/plus/mapillary/MapillaryPlugin.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/OsmAnd/src/net/osmand/plus/mapillary/MapillaryPlugin.java b/OsmAnd/src/net/osmand/plus/mapillary/MapillaryPlugin.java
index 189a039a54..7883e2c5f0 100644
--- a/OsmAnd/src/net/osmand/plus/mapillary/MapillaryPlugin.java
+++ b/OsmAnd/src/net/osmand/plus/mapillary/MapillaryPlugin.java
@@ -150,7 +150,7 @@ public class MapillaryPlugin extends OsmandPlugin {
 
 			@Override
 			public boolean onRowItemClick(ArrayAdapter<ContextMenuItem> adapter, View view, int itemId, int position) {
-				if (itemId == R.string.mapillary) {
+				if (itemId == R.string.street_level_imagery) {
 					mapActivity.getDashboard().setDashboardVisibility(true, DashboardOnMap.DashboardType.MAPILLARY, AndroidUtils.getCenterViewCoordinates(view));
 					return false;
 				}
@@ -160,7 +160,7 @@ public class MapillaryPlugin extends OsmandPlugin {
 			@Override
 			public boolean onContextMenuClick(final ArrayAdapter<ContextMenuItem> adapter, int itemId, final int pos, boolean isChecked, int[] viewCoordinates) {
 				final OsmandSettings settings = mapActivity.getMyApplication().getSettings();
-				if (itemId == R.string.mapillary) {
+				if (itemId == R.string.street_level_imagery) {
 					OsmandMapTileView mapView = mapActivity.getMapView();
 					MapActivityLayers mapLayers = mapActivity.getMapLayers();
 					settings.SHOW_MAPILLARY.set(!settings.SHOW_MAPILLARY.get());

From 56bc3a14c2492638d540350b8904ce0181659006 Mon Sep 17 00:00:00 2001
From: Victor Shcherb <victor.shcherb@gmail.com>
Date: Thu, 13 Aug 2020 14:18:15 +0200
Subject: [PATCH 32/81] Fix strange problems with empty set

---
 .../main/java/net/osmand/osm/edit/OsmMapUtils.java | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/OsmAnd-java/src/main/java/net/osmand/osm/edit/OsmMapUtils.java b/OsmAnd-java/src/main/java/net/osmand/osm/edit/OsmMapUtils.java
index 0189ff0a97..5e19d09658 100644
--- a/OsmAnd-java/src/main/java/net/osmand/osm/edit/OsmMapUtils.java
+++ b/OsmAnd-java/src/main/java/net/osmand/osm/edit/OsmMapUtils.java
@@ -556,6 +556,9 @@ public class OsmMapUtils {
         
         // take centroid as the first best guess
         Cell bestCell = getCentroidCell(rings);
+        if(bestCell == null) {
+        	 return new LatLon(minX, minY);
+        }
 
         // special case for rectangular polygons
         Cell bboxCell = new Cell(minX + width / 2, minY + height / 2, 0, rings);
@@ -606,10 +609,13 @@ public class OsmMapUtils {
             area += f * 3;
         }
 
-        if (area == 0) {
-            LatLon p = points.get(0);
-            return new Cell(p.getLatitude(), p.getLongitude(), 0, rings);
-        }
+		if (area == 0) {
+			if (points.size() == 0) {
+				return null;
+			}
+			LatLon p = points.get(0);
+			return new Cell(p.getLatitude(), p.getLongitude(), 0, rings);
+		}
 
         return new Cell(x / area, y / area, 0, rings);
     }

From 0ef83b4f9ccc36db4937d1afc681f8a5f6e69044 Mon Sep 17 00:00:00 2001
From: ssantos <ssantos@web.de>
Date: Wed, 12 Aug 2020 15:27:38 +0000
Subject: [PATCH 33/81] Translated using Weblate (Portuguese)

Currently translated at 100.0% (3450 of 3450 strings)
---
 OsmAnd/res/values-pt/strings.xml | 53 +++++++++++++++++++-------------
 1 file changed, 32 insertions(+), 21 deletions(-)

diff --git a/OsmAnd/res/values-pt/strings.xml b/OsmAnd/res/values-pt/strings.xml
index 55827b09aa..fd6f061ac5 100644
--- a/OsmAnd/res/values-pt/strings.xml
+++ b/OsmAnd/res/values-pt/strings.xml
@@ -917,8 +917,7 @@
     <string name="index_srtm_ele">Curvas de nível</string>
     <string name="recording_photo_description">Foto %1$s de %2$s</string>
     <string name="av_def_action_picture">Capture uma foto</string>
-    <string name="osmand_srtm_long_description_1000_chars">Este suplemento disponibiliza \'Curvas de Nível\' e \'Sombras de relevo\', que podem ser aplicadas nos mapas padrão do OsmAnd.
-\nEstas funcionalidades podem ser apreciadas por atletas, caminhantes e qualquer pessoa interessada na informação de relevo de uma paisagem.
+    <string name="osmand_srtm_long_description_1000_chars">Este suplemento disponibiliza \'Curvas de Nível\' e \'Sombras de relevo\', que podem ser aplicadas nos mapas padrão do OsmAnd. Estas funcionalidades podem ser apreciadas por atletas, caminhantes e qualquer pessoa interessada na informação de relevo de uma paisagem.
 \n
 \n Os dados globais (entre as latitudes 70° norte e 70° sul) são baseados nas medições do SRTM (Shuttle Radar Topography Mission) e do ASTER (Advanced Spaceborn Thermal Emission and Reflection Radiometer), um instrumento de imagens no \'Terra\', o satélite principal do Sistema de Observação da Terra da NASA. O ASTER é um esforço conjunto da NASA, do Ministério da Economia, Comércio e Indústria do Japão e do Sistema Espacial Japonês (J-spacesystems).</string>
     <string name="srtm_plugin_description">Este suplemento disponibiliza \'Curvas de Nível\' e \'Sombras de relevo\', que podem ser aplicadas nos mapas padrão do OsmAnd. Estas funcionalidades podem ser apreciadas por atletas, caminhantes, e qualquer pessoa interessada na informação de relevo de uma paisagem.
@@ -1052,26 +1051,25 @@
     <string name="map_widget_fps_info">Depuração FPS</string>
     <string name="map_magnifier">Lupa do mapa</string>
     <string name="base_world_map">Mapa mundial</string>
-    <string name="osmand_plus_long_description_1000_chars">OsmAnd+ (Direções de Navegação Automatizada do OSM) 
+    <string name="osmand_plus_long_description_1000_chars">OsmAnd+ (Direções de Navegação Automatizada do OSM)
 \n
-\n OsmAnd+ é uma aplicação de navegação livre, com acesso a uma ampla variedade de dados globais do OSM. Todos os dados dos mapas (mapas vetoriais ou imagens raster) podem ser armazenados no cartão de memória do telemóvel para usar desligado da Internet. O OsmAnd também permite roteamento, tanto ligado como desligado da Internet, incluindo a funcionalidade de roteamento curva a curva com orientação por voz. 
+\n OsmAnd+ é uma aplicação de navegação livre, com acesso a uma ampla variedade de dados globais do OSM. Todos os dados dos mapas (mapas vetoriais ou imagens raster) podem ser armazenados no cartão de memória do telemóvel para usar desligado da Internet. O OsmAnd também permite roteamento, tanto ligado como desligado da Internet, incluindo a funcionalidade de roteamento curva a curva com orientação por voz.
 \n
-\n OsmAnd+ é a versão paga da aplicação, ao comprá-lo está a apoiar o projeto, a financiar o desenvolvimento de novas funcionalidades e a receber as últimas atualizações. 
+\n OsmAnd+ é a versão paga da aplicação, ao comprá-lo está a apoiar o projeto, a financiar o desenvolvimento de novas funcionalidades e a receber as últimas atualizações.
 \n
-\n Algumas das características principais: 
-\n - Funcionalidade totalmente desligado da Internet (guarda os mapas obtidos, sejam eles vetoriais ou imagens, numa pasta selecionável). 
-\n - Mapas vetoriais compactados do mundo inteiro disponíveis. 
-\n - Descarregamento de mapas de países ou regiões diretamente na aplicação. 
-\n - Recurso Wikipédia desligado da Internet (descarregamento de POIs da Wikipédia), ótimo para passeios turísticos. 
-\n - Possibilidade de sobreposição de várias camadas de mapas, como trilhos GPX ou navegação, pontos de Interesse, favoritos, curvas de nível, paragens de transporte público, mapas adicionais com transparência personalizável. 
-\n 
+\n Algumas das características principais:
+\n - Funcionalidade totalmente desligado da Internet (guarda os mapas obtidos, sejam eles vetoriais ou imagens, numa pasta selecionável).
+\n - Mapas vetoriais compactados do mundo inteiro disponíveis.
+\n - Descarregamento de mapas de países ou regiões diretamente na aplicação.
+\n - Recurso Wikipédia desligado da Internet (descarregamento de POIs da Wikipédia), ótimo para passeios turísticos.
+\n - Possibilidade de sobreposição de várias camadas de mapas, como trilhos GPX ou navegação, pontos de Interesse, favoritos, curvas de nível, paragens de transporte público, mapas adicionais com transparência personalizável.
 \n
-\n - Pesquisa desligado da Internet para endereços e locais (POIs). 
-\n - Encaminhamento desligado da Internet para distâncias médias. 
-\n - Modos de carro, bicicleta e pedestre com os opcionais: 
-\n - Mudança automática de visualização dia/noite 
-\n - Ampliação do mapa conforme a velocidade 
-\n - Orientação do mapa de acordo com a bússola ou a direção do movimento. 
+\n - Pesquisa desligado da Internet para endereços e locais (POIs).
+\n - Encaminhamento desligado da Internet para distâncias médias.
+\n - Modos de carro, bicicleta e pedestre com os opcionais:
+\n - Mudança automática de visualização dia/noite
+\n - Ampliação do mapa conforme a velocidade
+\n - Orientação do mapa de acordo com a bússola ou a direção do movimento.
 \n - Orientação por faixas de rodagem, indicação do limite de velocidade, vozes gravadas e vozes de conversão de texto em voz.
 \n</string>
     <string name="auto_zoom_none">Sem ampliação automático</string>
@@ -1250,7 +1248,7 @@
     <string name="traffic_warning_border_control">Posto alfandegário</string>
     <string name="traffic_warning_payment">Portagem</string>
     <string name="traffic_warning_stop">Sinal de stop</string>
-    <string name="traffic_warning_calming">Choque de velocidade</string>
+    <string name="traffic_warning_calming">Moderação de trafego</string>
     <string name="traffic_warning_speed_camera">Radar de velocidade</string>
     <string name="traffic_warning">Aviso de tráfego</string>
     <string name="speak_favorites">Favoritos pertos</string>
@@ -1921,7 +1919,7 @@
     <string name="mapillary_widget">Widget Mapillary</string>
     <string name="mapillary_widget_descr">Permite contribuir rapidamente para Mapillary.</string>
     <string name="mapillary_descr">Fotos on-line ao nível da rua para todos. Descubra locais, colabore, capture o mundo.</string>
-    <string name="mapillary">Mapillary</string>
+    <string name="mapillary">Imagens de nível de rua</string>
     <string name="plugin_mapillary_descr">Fotos ao nível da rua para todos. Descubra locais, colabore, capture o mundo.</string>
     <string name="private_access_routing_req">O seu destino está localizado numa área de acesso privado. Permitir uso de estradas privadas para esta viagem\?</string>
     <string name="restart_search">Reiniciar pesquisa</string>
@@ -3382,7 +3380,7 @@
     <string name="edit_profiles_descr">Perfis padrão do OsmAnd não podem ser apagados, mas desativados (na tela anterior) ou classificados na parte inferior.</string>
     <string name="edit_profiles">Editar perfis</string>
     <string name="select_nav_profile_dialog_message">O \'Tipo de navegação\' controla como as rotas são calculadas.</string>
-    <string name="profile_appearance">Aspecto do perfil</string>
+    <string name="profile_appearance">Aspeto do perfil</string>
     <string name="layer_osm_edits">Edições OSM</string>
     <string name="quick_action_contour_lines_descr">Botão que mostra ou oculta curvas de nível no mapa.</string>
     <string name="quick_action_contour_lines_show">Mostrar curvas de nível</string>
@@ -3846,4 +3844,17 @@
     <string name="plan_route_create_new_route">Criar rota</string>
     <string name="shared_string_done">Pronto</string>
     <string name="overwrite_track">Sobrescrever trilho</string>
+    <string name="save_as_new_track">Gravar como novo trilho</string>
+    <string name="reverse_route">Rota inversa</string>
+    <string name="rourte_between_points_whole_track_button_desc">O trilho inteiro será recalculado a usar o perfil selecionado.</string>
+    <string name="rourte_between_points_next_segment_button_desc">Somente o próximo segmento será recalculado a usar o perfil selecionado.</string>
+    <string name="rourte_between_points_desc">Selecione como ligar pontos, com uma linha reta ou calcule uma rota entre eles com o perfil selecionado.</string>
+    <string name="whole_track">Trilho inteiro</string>
+    <string name="next_segment">Próximo segmento</string>
+    <string name="rourte_between_points_warning_desc">Para usar esta opção o OsmAnd precisa de encaixar o seu trilho nas estradas do mapa.
+\n
+\n No passo seguinte, terá de selecionar o perfil de navegação para detetar estradas permitidas e a distância limiar para se aproximar do seu trilho com as estradas.</string>
+    <string name="threshold_distance">Distância limiar</string>
+    <string name="navigation_profile">Perfil de navegação</string>
+    <string name="rourte_between_points_add_track_desc">Selecione um ficheiro de faixa para o qual um novo segmento será adicionado.</string>
 </resources>
\ No newline at end of file

From 07a7fb9c3cf1b9f6c702f9d78ee17c49f342f29c Mon Sep 17 00:00:00 2001
From: Ldm Public <ldmpub@gmail.com>
Date: Thu, 13 Aug 2020 09:13:11 +0000
Subject: [PATCH 34/81] Translated using Weblate (French)

Currently translated at 100.0% (3450 of 3450 strings)
---
 OsmAnd/res/values-fr/strings.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/OsmAnd/res/values-fr/strings.xml b/OsmAnd/res/values-fr/strings.xml
index 4a796604eb..166647fee0 100644
--- a/OsmAnd/res/values-fr/strings.xml
+++ b/OsmAnd/res/values-fr/strings.xml
@@ -2372,7 +2372,7 @@
     <string name="online_photos">Photos en ligne</string>
     <string name="no_photos_descr">Aucune photo pour ce lieu.</string>
     <string name="shared_string_install">Installer</string>
-    <string name="mapillary">Mapillary</string>
+    <string name="mapillary">Photos des rues</string>
     <string name="open_mapillary">Ouvrir Mapillary</string>
     <string name="improve_coverage_mapillary">Améliorez la couverture photo avec Mapillary</string>
     <string name="improve_coverage_install_mapillary_desc">Installez Mapillary pour ajouter des photos à cet emplacement de la carte.</string>
@@ -2527,7 +2527,7 @@
     <string name="add_location_as_first_point_descr">Ajoutez votre position comme point de départ pour calculer l\'itinéraire.</string>
     <string name="my_location">Ma position</string>
     <string name="shared_string_finish">Terminer</string>
-    <string name="plan_route">Itinéraire planifié</string>
+    <string name="plan_route">Planifier un itinéraire</string>
     <string name="shared_string_sort">Trier</string>
     <string name="coordinate_input">Saisie des coordonnées</string>
     <string name="marker_save_as_track_descr">Exporter vos marques dans le fichier GPX suivant :</string>
@@ -3102,7 +3102,7 @@
     <string name="rendering_attr_tracktype_grade4_name">Principalement non-compact</string>
     <string name="rendering_attr_tracktype_grade5_name">Non-compact</string>
     <string name="routeInfo_tracktype_name">Dureté de la surface</string>
-    <string name="shared_string_file_is_saved">Gain de %s</string>
+    <string name="shared_string_file_is_saved">%s enregistré</string>
     <string name="shared_string_open_track">Ouvrir la trace</string>
     <string name="shared_string_track_is_saved">Trace %s enregistrée</string>
     <string name="shared_string_crash">Oups</string>

From e9d2c21566ebe21c8455b5b5eef0a6be41ca8eb0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?O=C4=9Fuz=20Ersen?= <oguzersen@protonmail.com>
Date: Wed, 12 Aug 2020 10:07:54 +0000
Subject: [PATCH 35/81] Translated using Weblate (Turkish)

Currently translated at 100.0% (3450 of 3450 strings)
---
 OsmAnd/res/values-tr/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/OsmAnd/res/values-tr/strings.xml b/OsmAnd/res/values-tr/strings.xml
index 46994c59ed..081dfab57b 100644
--- a/OsmAnd/res/values-tr/strings.xml
+++ b/OsmAnd/res/values-tr/strings.xml
@@ -2255,7 +2255,7 @@
     <string name="mapillary_widget">Mapillary widget\'ı</string>
     <string name="mapillary_widget_descr">Mapillary\'ye hızlıca katkıda bulunmanıza imkan verir.</string>
     <string name="mapillary_descr">Herkes için sokak seviyesinde fotoğraflar. Yerler keşfedin, katkıda bulunun, dünyayı yakalatın.</string>
-    <string name="mapillary">Mapillary</string>
+    <string name="mapillary">Sokak seviyesi görüntüleri</string>
     <string name="plugin_mapillary_descr">Herkes için sokak seviyesinde fotoğraflar. Yerler keşfedin, katkıda bulunun, dünyayı yakalayın.</string>
     <string name="parking_options">Park etme seçenekleri</string>
     <string name="routing_attr_allow_motorway_name">Otoyolları kullan</string>

From d3449df00adac0e8c3f50a05a638080304d4718a Mon Sep 17 00:00:00 2001
From: Dimitris Spingos <dmtrs32@gmail.com>
Date: Wed, 12 Aug 2020 09:13:58 +0000
Subject: [PATCH 36/81] Translated using Weblate (Greek)

Currently translated at 100.0% (3450 of 3450 strings)
---
 OsmAnd/res/values-el/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/OsmAnd/res/values-el/strings.xml b/OsmAnd/res/values-el/strings.xml
index 6a8005cfae..59b6b8c2b4 100644
--- a/OsmAnd/res/values-el/strings.xml
+++ b/OsmAnd/res/values-el/strings.xml
@@ -1782,7 +1782,7 @@
     <string name="mapillary_widget">Γραφικό στοιχείο Mapillary</string>
     <string name="mapillary_widget_descr">Επιτρέπει γρήγορες συνεισφορές στο Mapillary.</string>
     <string name="mapillary_descr">Διαδικτυακές φωτογραφίες δρόμου για όλους. Ανακαλύψτε θέσεις, συνεργαστείτε, αποτυπώστε τον κόσμο.</string>
-    <string name="mapillary">Mapillary</string>
+    <string name="mapillary">Εικόνες επιπέδου οδού</string>
     <string name="plugin_mapillary_descr">Φωτογραφίες δρόμου για όλους. Ανακαλύψτε θέσεις, συνεργαστείτε, αποτυπώστε τον κόσμο.</string>
     <string name="private_access_routing_req">Ο προορισμός σας βρίσκεται σε ιδιωτική περιοχή. Να επιτραπεί η πρόσβαση σε ιδιωτικούς δρόμους για αυτό το ταξίδι;</string>
     <string name="restart_search">Επανεκκίνηση αναζήτησης</string>

From 827b2188ca9c5bb155c2839eac9f0618b012047f Mon Sep 17 00:00:00 2001
From: D M <emid308@yandex.ru>
Date: Wed, 12 Aug 2020 16:29:36 +0000
Subject: [PATCH 37/81] Translated using Weblate (Serbian)

Currently translated at 100.0% (3450 of 3450 strings)
---
 OsmAnd/res/values-sr/strings.xml | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/OsmAnd/res/values-sr/strings.xml b/OsmAnd/res/values-sr/strings.xml
index 8d44c18bfc..70aaf6757b 100644
--- a/OsmAnd/res/values-sr/strings.xml
+++ b/OsmAnd/res/values-sr/strings.xml
@@ -684,7 +684,7 @@
     <string name="shared_string_not_selected">Није означено</string>
     <string name="osmand_parking_hour">h</string>
     <string name="osmand_parking_minute">min</string>
-    <string name="traffic_warning_calming">Лежећи полицајац</string>
+    <string name="traffic_warning_calming">Смиривање саобраћаја</string>
     <string name="way_alarms">Упозорења о гужвама у саобраћају</string>
     <string name="background_service_is_enabled_question">Позадинске услуге OsmAnd-а су и даље покренуте. Прекинути и њих?</string>
     <string name="sleep_mode_stop_dialog">Прекинути позадински режим GPS-а?</string>
@@ -1251,7 +1251,7 @@
     <string name="mapillary_widget_descr">Омогућава брзи допринос Мапилару.</string>
     <string name="open_mapillary">Отвори Мапилар</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="restart_search">Препокрени претрагу</string>
@@ -3836,4 +3836,17 @@
     <string name="plan_route_select_track_file_for_open">Изаберите фајл путање за отварање.</string>
     <string name="shared_string_done">Завршено</string>
     <string name="overwrite_track">Замени стазу</string>
+    <string name="save_as_new_track">Сачувај као нову стазу</string>
+    <string name="reverse_route">Обрнута рута</string>
+    <string name="rourte_between_points_whole_track_button_desc">Читава стаза ће се прерачунати користећи одабрани профил.</string>
+    <string name="rourte_between_points_next_segment_button_desc">Само ће се следећи сегмент прерачунати користећи одабрани профил.</string>
+    <string name="rourte_between_points_desc">Изаберите како повезати тачке, са правом линијом, или израчунајте руту између њих са одабраним профилом.</string>
+    <string name="whole_track">Цела стаза</string>
+    <string name="next_segment">Следећи сегмент</string>
+    <string name="rourte_between_points_warning_desc">Да бисте користили ову опцију, ОсмАнд мора да прилагоди вашу стазу путевима на мапи.
+\n
+\n На следећем кораку мора ћете одабрати навигацијски профил како бисте открили дозвољене путеве и праг удаљености и тиме приближили вашу стазу путевима.</string>
+    <string name="threshold_distance">Праг удаљености</string>
+    <string name="navigation_profile">Навигацијски профил</string>
+    <string name="rourte_between_points_add_track_desc">Изаберите датотеку записа којој ће се додати нови сегмент.</string>
 </resources>
\ No newline at end of file

From 7ee99f3e73b6e39d2ed5206f923502a6ffcecdef Mon Sep 17 00:00:00 2001
From: Yaron Shahrabani <sh.yaron@gmail.com>
Date: Wed, 12 Aug 2020 11:09:27 +0000
Subject: [PATCH 38/81] Translated using Weblate (Hebrew)

Currently translated at 100.0% (3450 of 3450 strings)
---
 OsmAnd/res/values-iw/strings.xml | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/OsmAnd/res/values-iw/strings.xml b/OsmAnd/res/values-iw/strings.xml
index 6072b3bab5..f65af94475 100644
--- a/OsmAnd/res/values-iw/strings.xml
+++ b/OsmAnd/res/values-iw/strings.xml
@@ -1127,7 +1127,7 @@
     <string name="mapillary_widget">וידג׳ט Mapillary</string>
     <string name="mapillary_widget_descr">מאפשר תרומה במהירות ל־Mapillary.</string>
     <string name="mapillary_descr">תמונות מקוונות ברמת רחוב לכולם. היכרות עם מקומות חדשים, שיתוף פעולה וצילום העולם.</string>
-    <string name="mapillary">Mapillary</string>
+    <string name="mapillary">תמונות ברמת רחוב</string>
     <string name="plugin_mapillary_descr">תמונות ברמת הרחוב לכולם. להכיר מקומות, לשתף פעולה ולצלם את העולם.</string>
     <string name="private_access_routing_req">היעד שלך ממוקם באיזור עם גישה פרטית. לאשר שימוש בכבישים פרטיים לצורך טיול זה\?</string>
     <string name="restart_search">חיפוש מחדש</string>
@@ -3854,4 +3854,10 @@
     <string name="threshold_distance">סף מרחק</string>
     <string name="navigation_profile">פרופיל ניווט</string>
     <string name="rourte_between_points_add_track_desc">נא לבחור קובץ מסלול שבו יתווסף המקטע החדש.</string>
+    <string name="rourte_between_points_whole_track_button_desc">כל המסלול יחושב מחדש באמצעות הפרופיל הנבחר.</string>
+    <string name="rourte_between_points_next_segment_button_desc">רק המקטע הבא יחושב מחודש באמצעות הפרופיל הנבחר.</string>
+    <string name="rourte_between_points_desc">נא לבחור כיצד לחבר נקודות, בקו ישר, או לחבר מסלול ביניהן עם הפרופיל הנבחר.</string>
+    <string name="rourte_between_points_warning_desc">כדי להשתמש באפשרות זו על OsmAnd להצמיד את המסלול שלך לדרכים שעל המפה.
+\n
+\n בשלב הבא יהיה עליך לבחור בפרופיל ניווט כדי לזהות את הדרכים המורשות ואת סף המרחק כדי להעריך את המסלול שלך ביחס לדרכים.</string>
 </resources>
\ No newline at end of file

From 79aa1d2c3381f6ae0f752b3a83a654fab5dced37 Mon Sep 17 00:00:00 2001
From: Ahmad Alfrhood <rlo927@gmail.com>
Date: Wed, 12 Aug 2020 12:03:33 +0000
Subject: [PATCH 39/81] Translated using Weblate (Arabic)

Currently translated at 100.0% (3450 of 3450 strings)
---
 OsmAnd/res/values-ar/strings.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/OsmAnd/res/values-ar/strings.xml b/OsmAnd/res/values-ar/strings.xml
index 5f25673db3..b7aacd66a9 100644
--- a/OsmAnd/res/values-ar/strings.xml
+++ b/OsmAnd/res/values-ar/strings.xml
@@ -764,7 +764,7 @@
     <string name="incomplete_locale">ناقص</string>
     <string name="shared_string_next">التالي</string>
     <string name="shared_string_previous">السابق</string>
-    <string name="unit_of_length_descr">اختيار الوحدات: كم، ميل، ميل بحري.. إلخ.</string>
+    <string name="unit_of_length_descr">اختيار الوحدات: كم، ميل، ميلٌ بحري.. إلخ.</string>
     <string name="unit_of_length">وحدات الطول</string>
     <string name="si_mi_feet">ميل ، قدم</string>
     <string name="si_mi_yard">ميل ، ياردة</string>
@@ -1964,8 +1964,8 @@
     <string name="show_poi_over_map_description">عرض POI على الخريطة (استخدم آخر تصفية مستخدمة).</string>
     <string name="navigate_point_top_text">أدخل خط العرض وخط الطول في النمط المحدد (د - درجات، د - دقائق، ث - ثواني)</string>
     <string name="navigate_point_format_D">DDD.DD</string>
-    <string name="navigate_point_format_DM">DDD MM.MM</string>
-    <string name="navigate_point_format_DMS">DDD MM SS.SS</string>
+    <string name="navigate_point_format_DM">DDD MM.MMM</string>
+    <string name="navigate_point_format_DMS">DDD MM SS.S</string>
     <string name="plugin_touringview_descr">تفعيل هذه الرؤية يغير نمط خريطة أوسماند إلى \'نمط التجوال\'، هذا النمط يوفر رؤية غنية بالتفاصيل للمسافرين والسائقين المحترفين. 
 \n 
 \nتوفر هذه الرؤية في أي تكبير معين للخريطة أكبر قدر ممكن من تفاصيل السفر المتاحة في بيانات الخريطة (خاصة الطرق، المسارات، المعابر وعلامات التوجيه). 
@@ -2288,7 +2288,7 @@
     <string name="mapillary_widget">ويدجت مابيلاري</string>
     <string name="mapillary_widget_descr">يسمح لك بالمساهمة بسرعة لمابيلاري.</string>
     <string name="mapillary_descr">صور شوارع متاحة على الإنترنت للجميع. اكتشف أماكن، تعاون، والتقط صورا للعالم.</string>
-    <string name="mapillary">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>

From 514f8bf6ad21d3c51bf20c0d04eb71726513d156 Mon Sep 17 00:00:00 2001
From: Eduardo Addad de Oliveira <duduaddad@gmail.com>
Date: Wed, 12 Aug 2020 18:15:16 +0000
Subject: [PATCH 40/81] Translated using Weblate (Portuguese (Brazil))

Currently translated at 100.0% (3450 of 3450 strings)
---
 OsmAnd/res/values-pt-rBR/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/OsmAnd/res/values-pt-rBR/strings.xml b/OsmAnd/res/values-pt-rBR/strings.xml
index 0b2886241f..3cd9b3bb10 100644
--- a/OsmAnd/res/values-pt-rBR/strings.xml
+++ b/OsmAnd/res/values-pt-rBR/strings.xml
@@ -2063,7 +2063,7 @@
     <string name="mapillary_widget">Ferramenta Mapillary</string>
     <string name="mapillary_widget_descr">Permite contribuições rápidas ao Mapillary.</string>
     <string name="mapillary_descr">Fotos ao nível da rua, online, para todos. Descobrir lugares, colaborar, capturar o mundo.</string>
-    <string name="mapillary">Mapillary</string>
+    <string name="mapillary">Imagens de rua</string>
     <string name="plugin_mapillary_descr">Fotos ao nível da rua para todos. Descubra lugares, colabore, capture o mundo.</string>
     <string name="private_access_routing_req">Seu destino está localizado numa área de acesso privado. Permitir uso de vias privadas para esta viagem\?</string>
     <string name="restart_search">Reiniciar pesquisa</string>

From d2fd2615dc203ad3d0ac5f001da4791b9f81a2c0 Mon Sep 17 00:00:00 2001
From: Jeff Huang <s8321414@gmail.com>
Date: Thu, 13 Aug 2020 06:02:06 +0000
Subject: [PATCH 41/81] Translated using Weblate (Chinese (Traditional))

Currently translated at 100.0% (3450 of 3450 strings)
---
 OsmAnd/res/values-zh-rTW/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/OsmAnd/res/values-zh-rTW/strings.xml b/OsmAnd/res/values-zh-rTW/strings.xml
index d8b201c442..8e960687ae 100644
--- a/OsmAnd/res/values-zh-rTW/strings.xml
+++ b/OsmAnd/res/values-zh-rTW/strings.xml
@@ -2416,7 +2416,7 @@
     <string name="increase_search_radius">增加搜尋半徑</string>
     <string name="nothing_found">没有找到</string>
     <string name="nothing_found_descr">變更搜尋或增加搜尋半徑。</string>
-    <string name="mapillary">Mapillary</string>
+    <string name="mapillary">街道級照片</string>
     <string name="mapillary_widget">Mapillary 小工具</string>
     <string name="mapillary_widget_descr">允許快速的提供給 Mapillary。</string>
     <string name="mapillary_descr">把線上街道平面照片給每個人。發覺地點、協作、抓取世界。</string>

From c57753cc5d03669f32b15ea0b557e29ac0696ce7 Mon Sep 17 00:00:00 2001
From: Dimitris Spingos <dmtrs32@gmail.com>
Date: Thu, 13 Aug 2020 08:33:29 +0000
Subject: [PATCH 42/81] Translated using Weblate (Greek)

Currently translated at 99.0% (3775 of 3812 strings)
---
 OsmAnd/res/values-el/phrases.xml | 88 +++++++++++++++++++++++++++++++-
 1 file changed, 87 insertions(+), 1 deletion(-)

diff --git a/OsmAnd/res/values-el/phrases.xml b/OsmAnd/res/values-el/phrases.xml
index f81cdb4eda..1fa37f7270 100644
--- a/OsmAnd/res/values-el/phrases.xml
+++ b/OsmAnd/res/values-el/phrases.xml
@@ -1711,7 +1711,7 @@
     <string name="poi_automated_no">Μη αυτόματο</string>
     <string name="poi_full_service_yes">Πλήρης εξυπηρέτηση</string>
     <string name="poi_brushless_yes">Ναι</string>
-    <string name="poi_car_wash_no">Πλύσιμο αυτοκινήτου: όχι</string>
+    <string name="poi_car_wash_no">Όχι</string>
     <string name="poi_public_bath">Δημόσια λουτρά</string>
     <string name="poi_male_yes">Άνδρες</string>
     <string name="poi_male_no">Απαγορευμένο για άνδρες</string>
@@ -3692,4 +3692,90 @@
     <string name="poi_video_telephone">Βίντεο</string>
     <string name="poi_sms">SMS</string>
     <string name="poi_bath_open_air">Σε ανοιχτό χώρο</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">Ποδήλατο φάντασμα</string>
+    <string name="poi_volcano_number_of_eruptions">Αριθμός εκρήξεων</string>
+    <string name="poi_volcano_status_active">Ενεργό</string>
+    <string name="poi_volcano_status_extinct">Εσβεσμένο</string>
+    <string name="poi_volcano_type_mud">Λάσπη</string>
+    <string name="poi_volcano_type_caldera">Κρατήρας</string>
+    <string name="poi_volcano_type_shield">Ασπίδα</string>
+    <string name="poi_url">URL</string>
+    <string name="poi_monastery_type_canonry">Τύπος μονής: κανονική</string>
+    <string name="poi_community_gender_female">Είδος κοινοβίου: γυναικείο</string>
+    <string name="poi_community_gender_male">Είδος κοινοβίου: ανδρικό</string>
+    <string name="poi_bath_open_air_no">Όχι</string>
+    <string name="poi_cash_withdrawal_foreign_cards">Ανάληψη μετρητών: ξένες κάρτες</string>
+    <string name="poi_cash_withdrawal_purchase_required_no">Ανάληψη μετρητών: δεν απαιτείται αγορά</string>
+    <string name="poi_cash_withdrawal_type_self_checkout">Τύπος ανάληψης μετρητών: αυτόματη ολοκλήρωση</string>
+    <string name="poi_craft_floorer">Πατωματζής</string>
+    <string name="poi_goods_yes">Ναι</string>
+    <string name="poi_volcano_status_inactive">Ανενεργό</string>
+    <string name="poi_volcano_status_dormant">Ανενεργό</string>
+    <string name="poi_volcano_last_eruption">Τελευταία έκρηξη</string>
+    <string name="poi_volcano_type_lava_dome">Ηφαιστειακός θόλος</string>
+    <string name="poi_volcano_type_maar">Ηφαιστειακή λίμνη</string>
+    <string name="poi_volcano_type_stratovolcano">Στρωματοηφαίστειο</string>
+    <string name="poi_grave">Τάφος</string>
+    <string name="poi_tourist_camp">Τουριστικό κατάλυμα</string>
+    <string name="poi_monastery_type_convent">Τύπος μονής: γυναικεία</string>
+    <string name="poi_cash_withdrawal_migros_bank">Τράπεζα Migros</string>
+    <string name="poi_cash_withdrawal_fee_no">Τέλος ανάληψης μετρητών: όχι</string>
+    <string name="poi_cash_withdrawal_currency">Νόμισμα ανάληψης μετρητών</string>
+    <string name="poi_cash_withdrawal_operator">Χειριστής ανάληψης μετρητών</string>
+    <string name="poi_disabled_yes">Ναι</string>
+    <string name="poi_hgv_permissive">Ανεκτή</string>
+    <string name="poi_volcano_type_scoria">Σκουριά</string>
+    <string name="poi_parking_space">Χώρος στάθμευσης</string>
+    <string name="poi_community_gender_mixed">Είδος κοινότητας: μικτή</string>
+    <string name="poi_monastery_type_clerks_regular">Τύπος μονής: κανονικοί κληρικοί</string>
+    <string name="poi_monastery_type_hermitage">Τύπος μονής: ερημητήριο</string>
+    <string name="poi_monastery_type_monastics">Τύπος μονής: μοναστική</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_girocard">Girocard</string>
+    <string name="poi_cash_withdrawal_postfinance_card">Κάρτα Postfinance</string>
+    <string name="poi_cash_withdrawal_purchase_minimum">Ανάληψη μετρητών: ελάχιστη αγορά</string>
+    <string name="poi_cash_withdrawal_fee_yes">Τέλος ανάληψης μετρητών: ναι</string>
+    <string name="poi_cash_withdrawal_purchase_required_yes">Ανάληψη μετρητών: απαιτείται αγορά</string>
+    <string name="poi_cash_withdrawal_limit">Όριο ανάληψης μετρητών</string>
+    <string name="poi_cash_withdrawal_type_checkout">Τύπος ανάληψης μετρητών: ταμείο</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_joiner">Ξυλουργός</string>
+    <string name="poi_craft_distillery">Αποστακτήριο</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_goods_designated">Δηλωμένη</string>
+    <string name="poi_hgv_delivery">Διανομή</string>
+    <string name="poi_hgv_designated">Δηλωμένη</string>
+    <string name="poi_hgv_destination">Προορισμός</string>
+    <string name="poi_hgv_yes">Ναι</string>
+    <string name="poi_mofa_designated">Δηλωμένη</string>
+    <string name="poi_snowmobile_private">Πρόσβαση χιονοοχήματος: ιδιωτική</string>
+    <string name="poi_ski_yes">Χιονοδρομική σύμβαση: ναι</string>
+    <string name="poi_rtsa_scale_3b">3Б</string>
+    <string name="poi_rtsa_scale_3a">3А</string>
+    <string name="poi_rtsa_scale_2b">2Б</string>
+    <string name="poi_rtsa_scale_2a">2А</string>
+    <string name="poi_rtsa_scale_1b">1Б</string>
+    <string name="poi_rtsa_scale_1a">1А</string>
+    <string name="poi_rtsa_scale_nc">н/к</string>
 </resources>
\ No newline at end of file

From e3bfea198f5ba815c0e44b774d8ae0e7d56e0433 Mon Sep 17 00:00:00 2001
From: Ahmad Alfrhood <rlo927@gmail.com>
Date: Wed, 12 Aug 2020 12:03:32 +0000
Subject: [PATCH 43/81] Translated using Weblate (Arabic)

Currently translated at 100.0% (267 of 267 strings)

Translation: OsmAnd/Telegram
Translate-URL: https://hosted.weblate.org/projects/osmand/telegram/ar/
---
 OsmAnd-telegram/res/values-ar/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/OsmAnd-telegram/res/values-ar/strings.xml b/OsmAnd-telegram/res/values-ar/strings.xml
index 03d5de2dc8..1fb4149e0b 100644
--- a/OsmAnd-telegram/res/values-ar/strings.xml
+++ b/OsmAnd-telegram/res/values-ar/strings.xml
@@ -67,7 +67,7 @@
     <string name="shared_string_apply">تطبيق</string>
     <string name="shared_string_enabled">مفعل</string>
     <string name="units_and_formats">الوحدات والأشكال</string>
-    <string name="unit_of_length_descr">اختيار الوحدات: كم، ميل، ميل بحري.. إلخ.</string>
+    <string name="unit_of_length_descr">اختيار الوحدات: كم، ميل، ميلٌ بحري.. إلخ.</string>
     <string name="unit_of_length">وحدات الطول</string>
     <string name="last_update_from_telegram_date">آخر تحديث من تيليجرام: %1$s</string>
     <string name="last_response_date">الرد الأخير:٪ 1 $ s</string>

From 8d9e5423dfb5d58a54358d5e7f681fb71f08cae9 Mon Sep 17 00:00:00 2001
From: Dmitry <dmpr0.ua@gmail.com>
Date: Thu, 13 Aug 2020 15:43:16 +0300
Subject: [PATCH 44/81] Update icon for Minimal distance, add new for reverse
 direction option

---
 .../res/drawable/ic_action_minimal_distance.xml  | 16 ++++++++--------
 .../res/drawable/ic_action_reverse_direction.xml | 14 ++++++++++++++
 2 files changed, 22 insertions(+), 8 deletions(-)
 create mode 100644 OsmAnd/res/drawable/ic_action_reverse_direction.xml

diff --git a/OsmAnd/res/drawable/ic_action_minimal_distance.xml b/OsmAnd/res/drawable/ic_action_minimal_distance.xml
index e46c3e9a61..a4c37214d9 100644
--- a/OsmAnd/res/drawable/ic_action_minimal_distance.xml
+++ b/OsmAnd/res/drawable/ic_action_minimal_distance.xml
@@ -4,17 +4,17 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
   <path
-      android:pathData="M10.5646,1.0929C11.0348,1.0316 11.514,1 12,1C12.486,1 12.9652,1.0316 13.4354,1.0929L13.1767,3.0761C12.7921,3.0259 12.3993,3 12,3C11.6007,3 11.2079,3.0259 10.8233,3.0761L10.5646,1.0929ZM16.2109,1.8351C17.1057,2.2061 17.9406,2.6917 18.6972,3.2731L17.4785,4.8589C16.8589,4.3828 16.176,3.9857 15.4448,3.6825L16.2109,1.8351ZM5.3028,3.2731C6.0595,2.6917 6.8942,2.2062 7.7891,1.8351L8.5552,3.6825C7.824,3.9857 7.1411,4.3828 6.5215,4.8589L5.3028,3.2731ZM20.7269,5.3028C21.3083,6.0595 21.7939,6.8942 22.1649,7.7891L20.3175,8.5552C20.0143,7.824 19.6172,7.1411 19.1411,6.5215L20.7269,5.3028ZM1.8351,7.7891C2.2061,6.8942 2.6917,6.0595 3.2731,5.3028L4.8589,6.5215C4.3828,7.1411 3.9857,7.824 3.6825,8.5552L1.8351,7.7891ZM22.9071,10.5646C22.9684,11.0348 23,11.514 23,12C23,12.486 22.9684,12.9652 22.9071,13.4354L20.9239,13.1767C20.9741,12.7921 21,12.3993 21,12C21,11.6007 20.9741,11.2079 20.9239,10.8233L22.9071,10.5646ZM1,12C1,11.514 1.0316,11.0348 1.0929,10.5646L3.0761,10.8233C3.0259,11.2079 3,11.6007 3,12C3,12.3993 3.0259,12.7921 3.0761,13.1767L1.0929,13.4354C1.0316,12.9652 1,12.486 1,12ZM22.1649,16.2109C21.7939,17.1057 21.3083,17.9406 20.7269,18.6972L19.1411,17.4785C19.6172,16.8589 20.0143,16.176 20.3175,15.4448L22.1649,16.2109ZM3.2731,18.6972C2.6917,17.9406 2.2062,17.1058 1.8351,16.2109L3.6825,15.4448C3.9857,16.176 4.3828,16.8589 4.8589,17.4785L3.2731,18.6972ZM7.7891,22.1649C6.8942,21.7939 6.0595,21.3083 5.3028,20.7269L6.5215,19.1411C7.1411,19.6172 7.824,20.0143 8.5552,20.3175L7.7891,22.1649ZM18.6972,20.7269C17.9406,21.3083 17.1058,21.7939 16.2109,22.1649L15.4448,20.3175C16.176,20.0143 16.8589,19.6172 17.4785,19.1411L18.6972,20.7269ZM12,23C11.514,23 11.0348,22.9684 10.5646,22.9071L10.8233,20.9239C11.2079,20.9741 11.6007,21 12,21C12.3993,21 12.7921,20.9741 13.1767,20.9239L13.4354,22.9071C12.9652,22.9684 12.486,23 12,23Z"
+      android:pathData="M10.5646,1.0929C11.0348,1.0316 11.514,1 12,1C12.486,1 12.9652,1.0316 13.4354,1.0929C13.9831,1.1644 14.3691,1.6662 14.2977,2.2139C14.2263,2.7615 13.7244,3.1476 13.1767,3.0761C12.7921,3.0259 12.3993,3 12,3C11.6007,3 11.2079,3.0259 10.8233,3.0761C10.2756,3.1476 9.7737,2.7615 9.7023,2.2139C9.6309,1.6662 10.0169,1.1644 10.5646,1.0929ZM17.2949,3.4567C17.6314,3.0188 18.2593,2.9366 18.6972,3.2731C19.4588,3.8584 20.1416,4.5412 20.7269,5.3028C21.0634,5.7407 20.9812,6.3686 20.5433,6.7051C20.1054,7.0416 19.4776,6.9594 19.1411,6.5215C18.6617,5.8976 18.1024,5.3383 17.4785,4.8589C17.0406,4.5224 16.9584,3.8946 17.2949,3.4567ZM6.7051,3.4567C7.0416,3.8946 6.9594,4.5224 6.5215,4.8589C5.8976,5.3383 5.3383,5.8976 4.8589,6.5215C4.5224,6.9594 3.8946,7.0416 3.4567,6.7051C3.0188,6.3686 2.9366,5.7407 3.2731,5.3028C3.8584,4.5412 4.5412,3.8584 5.3028,3.2731C5.7407,2.9366 6.3686,3.0188 6.7051,3.4567ZM21.7861,9.7023C22.3338,9.6309 22.8356,10.0169 22.9071,10.5646C22.9684,11.0348 23,11.514 23,12C23,12.486 22.9684,12.9652 22.9071,13.4354C22.8356,13.9831 22.3338,14.3691 21.7861,14.2977C21.2385,14.2263 20.8524,13.7244 20.9239,13.1767C20.9741,12.7921 21,12.3993 21,12C21,11.6007 20.9741,11.2079 20.9239,10.8233C20.8524,10.2756 21.2385,9.7737 21.7861,9.7023ZM2.2139,9.7023C2.7615,9.7737 3.1476,10.2756 3.0761,10.8233C3.0259,11.2079 3,11.6007 3,12C3,12.3993 3.0259,12.7921 3.0761,13.1767C3.1476,13.7244 2.7615,14.2263 2.2139,14.2977C1.6662,14.3691 1.1644,13.9831 1.0929,13.4354C1.0316,12.9652 1,12.486 1,12C1,11.514 1.0316,11.0348 1.0929,10.5646C1.1644,10.0169 1.6662,9.6309 2.2139,9.7023ZM20.5433,17.2949C20.9812,17.6314 21.0634,18.2593 20.7269,18.6972C20.1416,19.4588 19.4588,20.1416 18.6972,20.7269C18.2593,21.0634 17.6314,20.9812 17.2949,20.5433C16.9584,20.1054 17.0406,19.4776 17.4785,19.1411C18.1024,18.6617 18.6617,18.1024 19.1411,17.4785C19.4776,17.0406 20.1054,16.9584 20.5433,17.2949ZM3.4567,17.2949C3.8946,16.9584 4.5224,17.0406 4.8589,17.4785C5.3383,18.1024 5.8976,18.6617 6.5215,19.1411C6.9594,19.4776 7.0416,20.1054 6.7051,20.5433C6.3686,20.9812 5.7407,21.0634 5.3028,20.7269C4.5412,20.1416 3.8584,19.4588 3.2731,18.6972C2.9366,18.2593 3.0188,17.6314 3.4567,17.2949ZM9.7023,21.7861C9.7737,21.2385 10.2756,20.8524 10.8233,20.9239C11.2079,20.9741 11.6007,21 12,21C12.3993,21 12.7921,20.9741 13.1767,20.9239C13.7244,20.8524 14.2263,21.2385 14.2977,21.7861C14.3691,22.3338 13.9831,22.8356 13.4354,22.9071C12.9652,22.9684 12.486,23 12,23C11.514,23 11.0348,22.9684 10.5646,22.9071C10.0169,22.8356 9.6309,22.3338 9.7023,21.7861Z"
       android:strokeAlpha="0.3"
-      android:fillColor="#000000"
+      android:fillColor="#ffffff"
       android:fillType="evenOdd"
       android:fillAlpha="0.3"/>
   <path
-      android:pathData="M12,6L7,17L12,15V6Z"
-      android:fillColor="#727272"/>
+      android:pathData="M12,15L9.1325,15.9559C9.0447,15.9851 8.9529,16 8.8604,16H8.809C8.3622,16 8,15.6378 8,15.191C8,15.0654 8.0292,14.9415 8.0854,14.8292L11.2764,8.4472C11.4134,8.1731 11.6936,8 12,8C12.3064,8 12.5866,8.1732 12.7236,8.4472L15.9146,14.8292C15.9708,14.9415 16,15.0654 16,15.191C16,15.6378 15.6378,16 15.191,16H15.1396C15.0471,16 14.9553,15.9851 14.8675,15.9559L12,15Z"
+      android:fillColor="#ffffff"/>
   <path
-      android:pathData="M12,6V15L17,17L12,6Z"
-      android:strokeAlpha="0.7"
-      android:fillColor="#727272"
-      android:fillAlpha="0.7"/>
+      android:pathData="M9,2C9,0.8954 9.8954,0 11,0H13C14.1046,0 15,0.8954 15,2V22C15,23.1046 14.1046,24 13,24H11C9.8954,24 9,23.1046 9,22V2Z"
+      android:strokeAlpha="0.2"
+      android:fillColor="#ffffff"
+      android:fillAlpha="0.2"/>
 </vector>
diff --git a/OsmAnd/res/drawable/ic_action_reverse_direction.xml b/OsmAnd/res/drawable/ic_action_reverse_direction.xml
new file mode 100644
index 0000000000..58b0c9cdfe
--- /dev/null
+++ b/OsmAnd/res/drawable/ic_action_reverse_direction.xml
@@ -0,0 +1,14 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M15.5,6L13,6C12.4477,6 12,5.5523 12,5C12,4.4477 12.4477,4 13,4L15.5001,4C17.9853,4.0001 20,6.0148 20,8.5C20,10.9853 17.9853,13 15.5,13H8.5C7.1193,13 6,14.1193 6,15.5C6,16.8807 7.1193,18 8.5,18H16.2676C16.6134,17.4022 17.2597,17 18,17C19.1046,17 20,17.8954 20,19C20,20.1046 19.1046,21 18,21C17.2597,21 16.6134,20.5978 16.2676,20H8.5C6.0147,20 4,17.9853 4,15.5C4,13.0147 6.0147,11 8.5,11H15.5C16.8807,11 18,9.8807 18,8.5C18,7.1193 16.8807,6 15.5,6Z"
+      android:strokeAlpha="0.7"
+      android:fillColor="#ffffff"
+      android:fillAlpha="0.7"/>
+  <path
+      android:pathData="M9.9999,5L10.9146,6.8292C10.9708,6.9415 11,7.0654 11,7.191C11,7.6378 10.6378,8 10.191,8H10.1666C10.0566,8 9.9476,7.9782 9.8461,7.9359L4.4622,5.6926C4.1823,5.576 3.9999,5.3025 3.9999,4.9992C3.9999,4.6967 4.1813,4.4238 4.4602,4.3066L9.7876,2.0682C9.8948,2.0232 10.0099,2 10.1261,2L10.191,2C10.6378,2 11,2.3622 11,2.8091C10.9999,2.9346 10.9707,3.0585 10.9145,3.1708L9.9999,5Z"
+      android:fillColor="#ffffff"/>
+</vector>

From 58d005bdf7db46b1626162f6df7ddf744a63c104 Mon Sep 17 00:00:00 2001
From: simon <myhosting2012@gmail.com>
Date: Thu, 13 Aug 2020 16:40:20 +0300
Subject: [PATCH 45/81] no route recalculation wrong direction issue fix

---
 OsmAnd/res/values/strings.xml                 |  1 +
 OsmAnd/res/xml/accessibility_settings.xml     | 23 -----------
 .../osmand/plus/routing/RoutingHelper.java    |  4 +-
 .../plus/settings/backend/OsmandSettings.java |  4 +-
 .../fragments/RouteParametersFragment.java    | 38 +++++++++++++++++--
 5 files changed, 40 insertions(+), 30 deletions(-)

diff --git a/OsmAnd/res/values/strings.xml b/OsmAnd/res/values/strings.xml
index f3a1ebf203..25ee7cc407 100644
--- a/OsmAnd/res/values/strings.xml
+++ b/OsmAnd/res/values/strings.xml
@@ -12,6 +12,7 @@
 
 -->
 
+    <string name="in_case_of_reverse_direction">In case of reverse direction</string>
     <string name="rourte_between_points_add_track_desc">Select a track file for which a new segment will be added.</string>
     <string name="navigation_profile">Navigation profile</string>
     <string name="threshold_distance">Threshold distance</string>
diff --git a/OsmAnd/res/xml/accessibility_settings.xml b/OsmAnd/res/xml/accessibility_settings.xml
index 3c1096fe37..0afc4fae17 100644
--- a/OsmAnd/res/xml/accessibility_settings.xml
+++ b/OsmAnd/res/xml/accessibility_settings.xml
@@ -47,29 +47,6 @@
 		android:layout="@layout/simple_divider_item"
 		android:selectable="false" />
 
-	<PreferenceCategory
-		android:key="route_recalculation"
-		android:layout="@layout/preference_category_with_descr"
-		android:title="@string/route_recalculation" />
-
-	<net.osmand.plus.settings.preferences.SwitchPreferenceEx
-		android:key="disable_offroute_recalc"
-		android:layout="@layout/preference_with_descr_dialog_and_switch"
-		android:summaryOff="@string/shared_string_disabled"
-		android:summaryOn="@string/shared_string_enabled"
-		android:title="@string/access_disable_offroute_recalc" />
-
-	<net.osmand.plus.settings.preferences.SwitchPreferenceEx
-		android:key="disable_wrong_direction_recalc"
-		android:layout="@layout/preference_with_descr_dialog_and_switch"
-		android:summaryOff="@string/shared_string_disabled"
-		android:summaryOn="@string/shared_string_enabled"
-		android:title="@string/access_disable_wrong_direction_recalc" />
-
-	<Preference
-		android:layout="@layout/simple_divider_item"
-		android:selectable="false" />
-
 	<net.osmand.plus.settings.preferences.ListPreferenceEx
 		android:key="direction_style"
 		android:layout="@layout/preference_with_descr"
diff --git a/OsmAnd/src/net/osmand/plus/routing/RoutingHelper.java b/OsmAnd/src/net/osmand/plus/routing/RoutingHelper.java
index 25727f86ea..9a29bd355d 100644
--- a/OsmAnd/src/net/osmand/plus/routing/RoutingHelper.java
+++ b/OsmAnd/src/net/osmand/plus/routing/RoutingHelper.java
@@ -477,8 +477,8 @@ public class RoutingHelper {
 				boolean isStraight =
 						route.getRouteService() == RouteService.DIRECT_TO || route.getRouteService() == RouteService.STRAIGHT;
 				boolean wrongMovementDirection = checkWrongMovementDirection(currentLocation, next);
-				if (allowableDeviation > 0 && wrongMovementDirection && !isStraight
-						&& (currentLocation.distanceTo(routeNodes.get(currentRoute)) > allowableDeviation)) {
+				if ((allowableDeviation > 0 && wrongMovementDirection && !isStraight
+						&& (currentLocation.distanceTo(routeNodes.get(currentRoute)) > allowableDeviation)) && !settings.DISABLE_WRONG_DIRECTION_RECALC.get()) {
 					log.info("Recalculate route, because wrong movement direction: " + currentLocation.distanceTo(routeNodes.get(currentRoute))); //$NON-NLS-1$
 					isDeviatedFromRoute = true;
 					calculateRoute = true;
diff --git a/OsmAnd/src/net/osmand/plus/settings/backend/OsmandSettings.java b/OsmAnd/src/net/osmand/plus/settings/backend/OsmandSettings.java
index e584c367a1..70f6110928 100644
--- a/OsmAnd/src/net/osmand/plus/settings/backend/OsmandSettings.java
+++ b/OsmAnd/src/net/osmand/plus/settings/backend/OsmandSettings.java
@@ -1892,8 +1892,8 @@ public class OsmandSettings {
 		new BooleanAccessibilityPreference("disable_offroute_recalc", false).makeProfile();
 	
 	// this value string is synchronized with settings_pref.xml preference name
-//	public final OsmandPreference<Boolean> DISABLE_WRONG_DIRECTION_RECALC =
-//		new BooleanAccessibilityPreference("disable_wrong_direction_recalc", false).makeProfile();
+	public final OsmandPreference<Boolean> DISABLE_WRONG_DIRECTION_RECALC =
+		new BooleanAccessibilityPreference("disable_wrong_direction_recalc", false).makeProfile();
 	
 	// this value string is synchronized with settings_pref.xml preference name
 	public final OsmandPreference<Boolean> DIRECTION_AUDIO_FEEDBACK =
diff --git a/OsmAnd/src/net/osmand/plus/settings/fragments/RouteParametersFragment.java b/OsmAnd/src/net/osmand/plus/settings/fragments/RouteParametersFragment.java
index 360e98e845..8c7052983e 100644
--- a/OsmAnd/src/net/osmand/plus/settings/fragments/RouteParametersFragment.java
+++ b/OsmAnd/src/net/osmand/plus/settings/fragments/RouteParametersFragment.java
@@ -8,6 +8,7 @@ import android.os.Build;
 import android.os.Bundle;
 import android.view.LayoutInflater;
 import android.view.View;
+import android.view.ViewGroup;
 import android.widget.ImageView;
 import android.widget.TextView;
 
@@ -16,6 +17,7 @@ import androidx.appcompat.app.AlertDialog;
 import androidx.core.content.ContextCompat;
 import androidx.fragment.app.FragmentManager;
 import androidx.preference.Preference;
+import androidx.preference.PreferenceCategory;
 import androidx.preference.PreferenceScreen;
 import androidx.preference.PreferenceViewHolder;
 
@@ -61,6 +63,7 @@ public class RouteParametersFragment extends BaseSettingsFragment implements OnP
 	private static final String RELIEF_SMOOTHNESS_FACTOR = "relief_smoothness_factor";
 	private static final String ROUTING_SHORT_WAY = "prouting_short_way";
 	private static final String ROUTING_RECALC_DISTANCE= "routing_recalc_distance";
+	private static final String ROUTING_RECALC_WRONG_DIRECTION= "disable_wrong_direction_recalc";
 
 	public static final float DISABLE_MODE = -1.0f;
 	public static final float DEFAULT_MODE = 0.0f;
@@ -156,8 +159,6 @@ public class RouteParametersFragment extends BaseSettingsFragment implements OnP
 		fastRoute.setSummaryOn(R.string.shared_string_on);
 		fastRoute.setSummaryOff(R.string.shared_string_off);
 
-		setupSelectRouteRecalcDistance(screen);
-
 		if (am.getRouteService() == RouteProvider.RouteService.OSMAND){
 			GeneralRouter router = app.getRouter(am);
 			clearParameters();
@@ -260,6 +261,36 @@ public class RouteParametersFragment extends BaseSettingsFragment implements OnP
 			straightAngle.setIcon(getRoutingPrefIcon("routing_recalc_distance")); //TODO change for appropriate icon when available
 			getPreferenceScreen().addPreference(straightAngle);
 		}
+
+		addDivider(screen);
+		addRouteRecalcHeader(screen);
+		setupSelectRouteRecalcDistance(screen);
+		setupReverseDirectionRecalculation(screen);
+	}
+
+	private void addDivider(PreferenceScreen screen) {
+		Preference divider = new Preference(requireContext());
+		divider.setLayoutResource(R.layout.simple_divider_item);
+		screen.addPreference(divider);
+	}
+
+	private void setupReverseDirectionRecalculation(PreferenceScreen screen) {
+		SwitchPreferenceEx recalcRouteReverseDirectionPreference =
+				createSwitchPreferenceEx(app.getSettings().DISABLE_WRONG_DIRECTION_RECALC.getId(),
+						R.string.in_case_of_reverse_direction,
+						R.layout.preference_with_descr_dialog_and_switch);
+		recalcRouteReverseDirectionPreference.setIcon(
+				getRoutingPrefIcon(app.getSettings().DISABLE_WRONG_DIRECTION_RECALC.getId()));
+		recalcRouteReverseDirectionPreference.setSummaryOn(R.string.shared_string_on);
+		recalcRouteReverseDirectionPreference.setSummaryOff(R.string.shared_string_off);
+		screen.addPreference(recalcRouteReverseDirectionPreference);
+	}
+
+	private void addRouteRecalcHeader(PreferenceScreen screen) {
+		PreferenceCategory routingCategory = new PreferenceCategory(requireContext());
+		routingCategory.setLayoutResource(R.layout.preference_category_with_descr);
+		routingCategory.setTitle(R.string.recalculate_route);
+		screen.addPreference(routingCategory);
 	}
 
 	@Override
@@ -544,7 +575,8 @@ public class RouteParametersFragment extends BaseSettingsFragment implements OnP
 				return getPersistentPrefIcon(R.drawable.ic_action_road_works_dark);
 			case ROUTING_RECALC_DISTANCE:
 				return getPersistentPrefIcon(R.drawable.ic_action_minimal_distance);
-
+			case ROUTING_RECALC_WRONG_DIRECTION:
+				return getPersistentPrefIcon(R.drawable.ic_action_reverse_direction);
 			default:
 				return null;
 		}

From 40e03c0521a8bcace7b3163b9acd33eaf0e46384 Mon Sep 17 00:00:00 2001
From: Hakim Oubouali <hakim.oubouali.skr@gmail.com>
Date: Thu, 13 Aug 2020 20:27:02 +0200
Subject: [PATCH 46/81] Added translation using Weblate (Berber)

---
 OsmAnd/res/values-ber/strings.xml | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 OsmAnd/res/values-ber/strings.xml

diff --git a/OsmAnd/res/values-ber/strings.xml b/OsmAnd/res/values-ber/strings.xml
new file mode 100644
index 0000000000..a6b3daec93
--- /dev/null
+++ b/OsmAnd/res/values-ber/strings.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources></resources>
\ No newline at end of file

From e4f67834d62d0bc3bf6cb2340dde3cb091b600a4 Mon Sep 17 00:00:00 2001
From: Dimitris Spingos <dmtrs32@gmail.com>
Date: Thu, 13 Aug 2020 14:20:49 +0000
Subject: [PATCH 47/81] Translated using Weblate (Greek)

Currently translated at 99.8% (3808 of 3812 strings)
---
 OsmAnd/res/values-el/phrases.xml | 33 ++++++++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)

diff --git a/OsmAnd/res/values-el/phrases.xml b/OsmAnd/res/values-el/phrases.xml
index 1fa37f7270..ceec6766ec 100644
--- a/OsmAnd/res/values-el/phrases.xml
+++ b/OsmAnd/res/values-el/phrases.xml
@@ -3778,4 +3778,37 @@
     <string name="poi_rtsa_scale_1b">1Б</string>
     <string name="poi_rtsa_scale_1a">1А</string>
     <string name="poi_rtsa_scale_nc">н/к</string>
+    <string name="poi_borough">Διαμέρισμα</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_booth">Τύπος θαλάμου</string>
+    <string name="poi_covered_booth">Θάλαμος</string>
+    <string name="poi_sms_yes">Ναι</string>
+    <string name="poi_dive_centre">Κέντρο αυτόνομης κατάδυσης</string>
+    <string name="poi_resort_hunting">Βάση κυνηγιού</string>
 </resources>
\ No newline at end of file

From 9d4c5a7e6a54c2fae214e5fb723762b9203db905 Mon Sep 17 00:00:00 2001
From: Hakim Oubouali <hakim.oubouali.skr@gmail.com>
Date: Thu, 13 Aug 2020 20:28:14 +0200
Subject: [PATCH 48/81] Added translation using Weblate (Berber)

---
 OsmAnd/res/values-ber/phrases.xml | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 OsmAnd/res/values-ber/phrases.xml

diff --git a/OsmAnd/res/values-ber/phrases.xml b/OsmAnd/res/values-ber/phrases.xml
new file mode 100644
index 0000000000..a6b3daec93
--- /dev/null
+++ b/OsmAnd/res/values-ber/phrases.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources></resources>
\ No newline at end of file

From 90ec2ddd7980aeb9d6e45d3befc029d8b27060c1 Mon Sep 17 00:00:00 2001
From: Everton Hermann <everton.hermann@gmail.com>
Date: Thu, 13 Aug 2020 22:33:04 +0200
Subject: [PATCH 49/81] Fix: ask to unlock device if it requires keyboard
 interaction while in FLAG_SHOW_WHEN_LOCKED mode.

---
 OsmAnd/src/net/osmand/AndroidUtils.java                | 10 +++++++---
 .../plus/activities/FavoritesSearchFragment.java       |  2 +-
 .../src/net/osmand/plus/dialogs/FavoriteDialogs.java   |  2 +-
 .../editors/EditCategoryDialogFragment.java            |  2 +-
 .../mapcontextmenu/editors/PointEditorFragment.java    |  2 +-
 .../mapcontextmenu/editors/PointEditorFragmentNew.java |  4 ++--
 .../plus/mapmarkers/CoordinateInputDialogFragment.java |  8 ++++----
 .../net/osmand/plus/osmedit/EditPoiDialogFragment.java |  2 +-
 OsmAnd/src/net/osmand/plus/osmedit/OsmBugsLayer.java   |  2 +-
 .../plus/search/QuickSearchCustomPoiFragment.java      |  2 +-
 .../osmand/plus/search/QuickSearchDialogFragment.java  |  2 +-
 .../plus/search/QuickSearchSubCategoriesFragment.java  |  2 +-
 .../settings/fragments/ProfileAppearanceFragment.java  |  2 +-
 13 files changed, 23 insertions(+), 19 deletions(-)

diff --git a/OsmAnd/src/net/osmand/AndroidUtils.java b/OsmAnd/src/net/osmand/AndroidUtils.java
index a38825956c..de0e4cad45 100644
--- a/OsmAnd/src/net/osmand/AndroidUtils.java
+++ b/OsmAnd/src/net/osmand/AndroidUtils.java
@@ -96,20 +96,24 @@ public class AndroidUtils {
 		return context.getResources().getConfiguration().keyboard != Configuration.KEYBOARD_NOKEYS;
 	}
 
-	public static void softKeyboardDelayed(final View view) {
+	public static void softKeyboardDelayed(final Activity activity, final View view) {
 		view.post(new Runnable() {
 			@Override
 			public void run() {
 				if (!isHardwareKeyboardAvailable(view.getContext())) {
-					showSoftKeyboard(view);
+					showSoftKeyboard(activity,view);
 				}
 			}
 		});
 	}
 
-	public static void showSoftKeyboard(final View view) {
+	public static void showSoftKeyboard(final Activity activity, final View view) {
 		InputMethodManager imm = (InputMethodManager) view.getContext().getSystemService(Context.INPUT_METHOD_SERVICE);
 		if (imm != null) {
+			if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+				KeyguardManager keyguardManager = (KeyguardManager) view.getContext().getSystemService(Context.KEYGUARD_SERVICE);
+				keyguardManager.requestDismissKeyguard(activity,null);
+			}
 			imm.showSoftInput(view, InputMethodManager.SHOW_IMPLICIT);
 		}
 	}
diff --git a/OsmAnd/src/net/osmand/plus/activities/FavoritesSearchFragment.java b/OsmAnd/src/net/osmand/plus/activities/FavoritesSearchFragment.java
index 06f478ff7b..82bcc813b1 100644
--- a/OsmAnd/src/net/osmand/plus/activities/FavoritesSearchFragment.java
+++ b/OsmAnd/src/net/osmand/plus/activities/FavoritesSearchFragment.java
@@ -249,7 +249,7 @@ public class FavoritesSearchFragment extends DialogFragment {
 
 	private void openKeyboard() {
 		searchEditText.requestFocus();
-		AndroidUtils.softKeyboardDelayed(searchEditText);
+		AndroidUtils.softKeyboardDelayed(getActivity(), searchEditText);
 	}
 
 	public void hideKeyboard() {
diff --git a/OsmAnd/src/net/osmand/plus/dialogs/FavoriteDialogs.java b/OsmAnd/src/net/osmand/plus/dialogs/FavoriteDialogs.java
index 3924bcdcb8..b6817fab05 100644
--- a/OsmAnd/src/net/osmand/plus/dialogs/FavoriteDialogs.java
+++ b/OsmAnd/src/net/osmand/plus/dialogs/FavoriteDialogs.java
@@ -113,7 +113,7 @@ public class FavoriteDialogs {
 		editText.requestFocus();
 		final AutoCompleteTextView cat =  (AutoCompleteTextView) dialog.findViewById(R.id.Category);
 		cat.setText(point.getCategory());
-		AndroidUtils.softKeyboardDelayed(editText);
+		AndroidUtils.softKeyboardDelayed(activity, editText);
 	}
 	
 	public  static Dialog createAddFavouriteDialog(final Activity activity, final Bundle args) {
diff --git a/OsmAnd/src/net/osmand/plus/mapcontextmenu/editors/EditCategoryDialogFragment.java b/OsmAnd/src/net/osmand/plus/mapcontextmenu/editors/EditCategoryDialogFragment.java
index f27e9066d6..5cf20a9f10 100644
--- a/OsmAnd/src/net/osmand/plus/mapcontextmenu/editors/EditCategoryDialogFragment.java
+++ b/OsmAnd/src/net/osmand/plus/mapcontextmenu/editors/EditCategoryDialogFragment.java
@@ -78,7 +78,7 @@ public class EditCategoryDialogFragment extends DialogFragment {
 		nameEdit = (EditText)v.findViewById(R.id.edit_name);
 		nameEdit.setText(name);
 		nameEdit.requestFocus();
-		AndroidUtils.softKeyboardDelayed(nameEdit);
+		AndroidUtils.softKeyboardDelayed(getActivity(), nameEdit);
 		colorSpinner = (Spinner)v.findViewById(R.id.edit_color);
 		final TIntArrayList colors = new TIntArrayList();
 		final int intColor = color;
diff --git a/OsmAnd/src/net/osmand/plus/mapcontextmenu/editors/PointEditorFragment.java b/OsmAnd/src/net/osmand/plus/mapcontextmenu/editors/PointEditorFragment.java
index d7940a77d5..44e9e8546e 100644
--- a/OsmAnd/src/net/osmand/plus/mapcontextmenu/editors/PointEditorFragment.java
+++ b/OsmAnd/src/net/osmand/plus/mapcontextmenu/editors/PointEditorFragment.java
@@ -207,7 +207,7 @@ public abstract class PointEditorFragment extends BaseOsmAndFragment {
 		if (editor != null && editor.isNew()) {
 			nameEdit.selectAll();
 			nameEdit.requestFocus();
-			AndroidUtils.softKeyboardDelayed(nameEdit);
+			AndroidUtils.softKeyboardDelayed(getActivity(), nameEdit);
 		}
 	}
 
diff --git a/OsmAnd/src/net/osmand/plus/mapcontextmenu/editors/PointEditorFragmentNew.java b/OsmAnd/src/net/osmand/plus/mapcontextmenu/editors/PointEditorFragmentNew.java
index 6751c9181c..799e5216cf 100644
--- a/OsmAnd/src/net/osmand/plus/mapcontextmenu/editors/PointEditorFragmentNew.java
+++ b/OsmAnd/src/net/osmand/plus/mapcontextmenu/editors/PointEditorFragmentNew.java
@@ -235,7 +235,7 @@ public abstract class PointEditorFragmentNew extends BaseOsmAndFragment {
 					addDelDescription.setText(view.getResources().getString(R.string.delete_description));
 					View descriptionEdit = view.findViewById(R.id.description_edit);
 					descriptionEdit.requestFocus();
-					AndroidUtils.softKeyboardDelayed(descriptionEdit);
+					AndroidUtils.softKeyboardDelayed(getActivity(), descriptionEdit);
 				} else {
 					descriptionCaption.setVisibility(View.GONE);
 					addDelDescription.setText(view.getResources().getString(R.string.add_description));
@@ -267,7 +267,7 @@ public abstract class PointEditorFragmentNew extends BaseOsmAndFragment {
 			deleteIcon.setVisibility(View.GONE);
 			nameEdit.selectAll();
 			nameEdit.requestFocus();
-			AndroidUtils.softKeyboardDelayed(nameEdit);
+			AndroidUtils.softKeyboardDelayed(getActivity(), nameEdit);
 		} else {
 			toolbarAction.setImageDrawable(app.getUIUtilities().getIcon(R.drawable.ic_action_delete_dark, activeColorResId));
 			deleteButton.setVisibility(View.VISIBLE);
diff --git a/OsmAnd/src/net/osmand/plus/mapmarkers/CoordinateInputDialogFragment.java b/OsmAnd/src/net/osmand/plus/mapmarkers/CoordinateInputDialogFragment.java
index f37a4c1693..8c36930451 100644
--- a/OsmAnd/src/net/osmand/plus/mapmarkers/CoordinateInputDialogFragment.java
+++ b/OsmAnd/src/net/osmand/plus/mapmarkers/CoordinateInputDialogFragment.java
@@ -391,7 +391,7 @@ public class CoordinateInputDialogFragment extends DialogFragment implements Osm
 				}
 				final View focusedView = getDialog().getCurrentFocus();
 				if (focusedView != null) {
-					AndroidUtils.softKeyboardDelayed(focusedView);
+					AndroidUtils.softKeyboardDelayed(getActivity(), focusedView);
 				}
 			}
 		});
@@ -707,7 +707,7 @@ public class CoordinateInputDialogFragment extends DialogFragment implements Osm
 		final View focusedView = getDialog().getCurrentFocus();
 		if (focusedView != null) {
 			if (!isOsmandKeyboardOn()) {
-				AndroidUtils.softKeyboardDelayed(focusedView);
+				AndroidUtils.softKeyboardDelayed(getActivity(), focusedView);
 			}
 		}
 	}
@@ -1039,7 +1039,7 @@ public class CoordinateInputDialogFragment extends DialogFragment implements Osm
 				new Handler().postDelayed(new Runnable() {
 					@Override
 					public void run() {
-						AndroidUtils.showSoftKeyboard(focusedView);
+						AndroidUtils.showSoftKeyboard(getActivity(), focusedView);
 					}
 				}, 200);
 			}
@@ -1271,7 +1271,7 @@ public class CoordinateInputDialogFragment extends DialogFragment implements Osm
 				changeOsmandKeyboardVisibility(true);
 			}
 		} else if (!softKeyboardShown && focusedView != null) {
-			AndroidUtils.softKeyboardDelayed(focusedView);
+			AndroidUtils.softKeyboardDelayed(getActivity(), focusedView);
 		}
 	}
 
diff --git a/OsmAnd/src/net/osmand/plus/osmedit/EditPoiDialogFragment.java b/OsmAnd/src/net/osmand/plus/osmedit/EditPoiDialogFragment.java
index 932ef59db5..ec0083ce19 100644
--- a/OsmAnd/src/net/osmand/plus/osmedit/EditPoiDialogFragment.java
+++ b/OsmAnd/src/net/osmand/plus/osmedit/EditPoiDialogFragment.java
@@ -281,7 +281,7 @@ public class EditPoiDialogFragment extends BaseOsmAndDialogFragment {
 		});
 		poiNameEditText.setText(editPoiData.getTag(OSMSettings.OSMTagKey.NAME.getValue()));
 		poiNameEditText.requestFocus();
-		AndroidUtils.showSoftKeyboard(poiNameEditText);
+		AndroidUtils.showSoftKeyboard(getActivity(), poiNameEditText);
 		poiTypeTextInputLayout = (TextInputLayout) view.findViewById(R.id.poiTypeTextInputLayout);
 		poiTypeEditText = (AutoCompleteTextView) view.findViewById(R.id.poiTypeEditText);
 		AndroidUtils.setTextHorizontalGravity(poiTypeEditText, Gravity.START);
diff --git a/OsmAnd/src/net/osmand/plus/osmedit/OsmBugsLayer.java b/OsmAnd/src/net/osmand/plus/osmedit/OsmBugsLayer.java
index 8c3b9be15f..da6dd2bdd3 100644
--- a/OsmAnd/src/net/osmand/plus/osmedit/OsmBugsLayer.java
+++ b/OsmAnd/src/net/osmand/plus/osmedit/OsmBugsLayer.java
@@ -450,7 +450,7 @@ public class OsmBugsLayer extends OsmandMapLayer implements IContextMenuProvider
 			((EditText) view.findViewById(R.id.message_field)).setText(text);
 		}
 		view.findViewById(R.id.message_field).requestFocus();
-		AndroidUtils.softKeyboardDelayed(view.findViewById(R.id.message_field));
+		AndroidUtils.softKeyboardDelayed(activity, view.findViewById(R.id.message_field));
 
 		final AlertDialog.Builder builder = new AlertDialog.Builder(activity);
 		builder.setTitle(R.string.shared_string_commit);
diff --git a/OsmAnd/src/net/osmand/plus/search/QuickSearchCustomPoiFragment.java b/OsmAnd/src/net/osmand/plus/search/QuickSearchCustomPoiFragment.java
index c00d36237d..4b0f54a25e 100644
--- a/OsmAnd/src/net/osmand/plus/search/QuickSearchCustomPoiFragment.java
+++ b/OsmAnd/src/net/osmand/plus/search/QuickSearchCustomPoiFragment.java
@@ -223,7 +223,7 @@ public class QuickSearchCustomPoiFragment extends DialogFragment implements OnFi
 			@Override
 			public void onClick(View view) {
 				searchEditText.requestFocus();
-				AndroidUtils.showSoftKeyboard(searchEditText);
+				AndroidUtils.showSoftKeyboard(getActivity(), searchEditText);
 			}
 		});
 		searchCloseIcon = view.findViewById(R.id.search_close);
diff --git a/OsmAnd/src/net/osmand/plus/search/QuickSearchDialogFragment.java b/OsmAnd/src/net/osmand/plus/search/QuickSearchDialogFragment.java
index f8dbd7745d..575afec783 100644
--- a/OsmAnd/src/net/osmand/plus/search/QuickSearchDialogFragment.java
+++ b/OsmAnd/src/net/osmand/plus/search/QuickSearchDialogFragment.java
@@ -1928,7 +1928,7 @@ public class QuickSearchDialogFragment extends DialogFragment implements OsmAndC
 
 	private void openKeyboard() {
 		searchEditText.requestFocus();
-		AndroidUtils.softKeyboardDelayed(searchEditText);
+		AndroidUtils.softKeyboardDelayed(getActivity(), searchEditText);
 	}
 
 	public void replaceQueryWithText(String txt) {
diff --git a/OsmAnd/src/net/osmand/plus/search/QuickSearchSubCategoriesFragment.java b/OsmAnd/src/net/osmand/plus/search/QuickSearchSubCategoriesFragment.java
index e61b4631c2..6b6f21aba1 100644
--- a/OsmAnd/src/net/osmand/plus/search/QuickSearchSubCategoriesFragment.java
+++ b/OsmAnd/src/net/osmand/plus/search/QuickSearchSubCategoriesFragment.java
@@ -210,7 +210,7 @@ public class QuickSearchSubCategoriesFragment extends BaseOsmAndDialogFragment {
 			@Override
 			public void onClick(View view) {
 				searchEditText.requestFocus();
-				AndroidUtils.showSoftKeyboard(searchEditText);
+				AndroidUtils.showSoftKeyboard(getActivity(), searchEditText);
 			}
 		});
 		ImageView searchCloseIcon = root.findViewById(R.id.search_close);
diff --git a/OsmAnd/src/net/osmand/plus/settings/fragments/ProfileAppearanceFragment.java b/OsmAnd/src/net/osmand/plus/settings/fragments/ProfileAppearanceFragment.java
index 87ab84b3d2..9ea296e925 100644
--- a/OsmAnd/src/net/osmand/plus/settings/fragments/ProfileAppearanceFragment.java
+++ b/OsmAnd/src/net/osmand/plus/settings/fragments/ProfileAppearanceFragment.java
@@ -368,7 +368,7 @@ public class ProfileAppearanceFragment extends BaseSettingsFragment {
 				public void onFocusChange(View v, boolean hasFocus) {
 					if(hasFocus){
 						profileName.setSelection(profileName.getText().length());
-						AndroidUtils.showSoftKeyboard(profileName);
+						AndroidUtils.showSoftKeyboard(getMyActivity(), profileName);
 					}
 				}
 			});

From 8f7a7993cf487987a932e5a7045f3f5ae7b2a14a Mon Sep 17 00:00:00 2001
From: Ldm Public <ldmpub@gmail.com>
Date: Thu, 13 Aug 2020 22:09:07 +0000
Subject: [PATCH 50/81] Translated using Weblate (French)

Currently translated at 100.0% (3450 of 3450 strings)
---
 OsmAnd/res/values-fr/strings.xml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/OsmAnd/res/values-fr/strings.xml b/OsmAnd/res/values-fr/strings.xml
index 166647fee0..a424fa2c19 100644
--- a/OsmAnd/res/values-fr/strings.xml
+++ b/OsmAnd/res/values-fr/strings.xml
@@ -1121,7 +1121,7 @@
     <string name="shared_string_favorite">Favori</string>
     <string name="route_preferences">Préférences d\'itinéraire</string>
     <string name="route_info">Informations sur l\'itinéraire</string>
-    <string name="keep_and_add_destination_point">Ajouter comme destination suivante</string>
+    <string name="keep_and_add_destination_point">Ajouter comme destination</string>
     <string name="use_displayed_track_for_navigation">Souhaitez-vous suivre la trace affichée à l\'écran ?</string>
     <string name="gpx_option_calculate_first_last_segment">Calculer un itinéraire OsmAnd pour le début et la fin de l\'itinéraire</string>
     <string name="calculate_osmand_route_without_internet">Calcul de l\'itinéraire hors-ligne</string>
@@ -2660,9 +2660,9 @@
     <string name="tunnel_warning">En approche d\'un tunnel</string>
     <string name="show_tunnels">Tunnels</string>
     <string name="shared_string_current">Actuelle</string>
-    <string name="last_intermediate_dest_description">Ajoute une étape</string>
-    <string name="first_intermediate_dest_description">Ajoute comme première étape</string>
-    <string name="subsequent_dest_description">Monter et définir comme Arrivée</string>
+    <string name="last_intermediate_dest_description">Ajouter comme dernière étape</string>
+    <string name="first_intermediate_dest_description">Ajouter comme première étape</string>
+    <string name="subsequent_dest_description">Ajouter comme arrivée (l\'arrivée précédente devient la dernière étape)</string>
     <string name="make_as_start_point">Utiliser ce point comme départ</string>
     <string name="map_import_error">Erreur d\'import de la carte</string>
     <string name="map_imported_successfully">Carte importée</string>
@@ -2911,7 +2911,7 @@
     <string name="sit_on_the_stop">Panneau d\'affichage à l\'arrêt</string>
     <string name="quick_action_show_hide_gpx_tracks_descr">Bouton affichant ou masquant les traces GPX sélectionnées sur la carte.</string>
     <string name="transfers_size">%1$d transferts</string>
-    <string name="add_start_and_end_points">Ajouter un point de départ et d\'arrivée</string>
+    <string name="add_start_and_end_points">Ajoutez un point de départ et d\'arrivée</string>
     <string name="route_add_start_point">Ajouter un point de départ</string>
     <string name="route_descr_select_start_point">Sélectionnez un point de départ</string>
     <string name="rendering_attr_surface_unpaved_name">Non revêtu</string>

From 8dab763f794a7c7d2476b59b80abd999db8e1973 Mon Sep 17 00:00:00 2001
From: Ldm Public <ldmpub@gmail.com>
Date: Thu, 13 Aug 2020 21:50:42 +0000
Subject: [PATCH 51/81] Translated using Weblate (French)

Currently translated at 99.9% (3809 of 3812 strings)
---
 OsmAnd/res/values-fr/phrases.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/OsmAnd/res/values-fr/phrases.xml b/OsmAnd/res/values-fr/phrases.xml
index 40afcf7e35..19e13b3f34 100644
--- a/OsmAnd/res/values-fr/phrases.xml
+++ b/OsmAnd/res/values-fr/phrases.xml
@@ -722,7 +722,7 @@
     <string name="poi_landuse_railway">Zone ferroviaire</string>
     <string name="poi_village_green">Village green (GB)</string>
     <string name="poi_sailing">Navigation à voile</string>
-    <string name="poi_charity">Magasin caritatif</string>
+    <string name="poi_charity">Boutique caritative</string>
     <string name="poi_tomb">Sépulture</string>
     <string name="poi_wilderness_hut">Refuge de bivouac non gardé</string>
     <string name="poi_payment_terminal">Terminal de paiement</string>

From e356be22ce96db63c97c7591f46cba8dad2cadbd Mon Sep 17 00:00:00 2001
From: Hakim Oubouali <hakim.oubouali.skr@gmail.com>
Date: Thu, 13 Aug 2020 18:45:52 +0000
Subject: [PATCH 52/81] Translated using Weblate (Berber)

Currently translated at 0.3% (13 of 3812 strings)
---
 OsmAnd/res/values-ber/phrases.xml | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/OsmAnd/res/values-ber/phrases.xml b/OsmAnd/res/values-ber/phrases.xml
index a6b3daec93..1bce009405 100644
--- a/OsmAnd/res/values-ber/phrases.xml
+++ b/OsmAnd/res/values-ber/phrases.xml
@@ -1,2 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources></resources>
\ No newline at end of file
+<resources>
+    <string name="poi_shop">ⵜⴰⵃⴰⵏⵓⵜ</string>
+    <string name="poi_video_telephone">ⴰⴼⵉⴷⵢⵓ</string>
+    <string name="poi_climbing_crag">ⵢⴰⵀ</string>
+    <string name="poi_books_type">ⵉⴷⵍⵉⵙⵏ</string>
+    <string name="poi_glacier_type">ⴰⵙⵔⵜⵓ ⴰⴳⵔⵙⴰⵏ</string>
+    <string name="poi_dish">ⴰⵟⴱⵙⵉⵍ</string>
+    <string name="poi_tents">ⴰⵅⵅⴰⵎ</string>
+    <string name="poi_shelter_type">ⴰⵙⵔⵜⵓ</string>
+    <string name="poi_recycling_type">ⴰⵙⵔⵜⵓ</string>
+    <string name="poi_covered">ⵉⵜⵜⵡⴰⴷⵍ</string>
+    <string name="poi_traffic_signals_sound">ⴰⵎⵙⵍⴰⵢ</string>
+    <string name="poi_fire_hydrant_water_source">ⴰⵖⴱⴰⵍⵓ ⵏ ⵡⴰⵎⴰⵏ</string>
+    <string name="poi_fire_hydrant_position">ⴰⵏⵙⴰ</string>
+</resources>
\ No newline at end of file

From e7c5332b009cdc302db180a7472803ee0a8110d1 Mon Sep 17 00:00:00 2001
From: sergdevosm <androidkotlin@protonmail.ch>
Date: Fri, 14 Aug 2020 15:50:30 +0300
Subject: [PATCH 53/81] Update map_context_menu_fragment.xml

---
 OsmAnd/res/layout/map_context_menu_fragment.xml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/OsmAnd/res/layout/map_context_menu_fragment.xml b/OsmAnd/res/layout/map_context_menu_fragment.xml
index d7200d47fb..837a03a781 100644
--- a/OsmAnd/res/layout/map_context_menu_fragment.xml
+++ b/OsmAnd/res/layout/map_context_menu_fragment.xml
@@ -455,9 +455,8 @@
 
                 <net.osmand.plus.widgets.TextViewEx
                     android:id="@+id/context_menu_directions_button"
-                    android:layout_width="0dp"
+                    android:layout_width="wrap_content"
                     android:layout_height="match_parent"
-                    android:layout_weight="2"
                     android:background="?attr/selectableItemBackground"
                     android:gravity="end|center_vertical"
                     android:paddingLeft="@dimen/context_menu_padding_margin_default"

From 08690f3c8517335a2aac3629a248c84910ef0be6 Mon Sep 17 00:00:00 2001
From: sergdevosm <androidkotlin@protonmail.ch>
Date: Fri, 14 Aug 2020 16:23:10 +0300
Subject: [PATCH 54/81] Fix #9552

---
 .../plus/monitoring/OnSaveCurrentTrackFragment.java    | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/OsmAnd/src/net/osmand/plus/monitoring/OnSaveCurrentTrackFragment.java b/OsmAnd/src/net/osmand/plus/monitoring/OnSaveCurrentTrackFragment.java
index 77be5ca614..334b8db8ce 100644
--- a/OsmAnd/src/net/osmand/plus/monitoring/OnSaveCurrentTrackFragment.java
+++ b/OsmAnd/src/net/osmand/plus/monitoring/OnSaveCurrentTrackFragment.java
@@ -216,10 +216,18 @@ public class OnSaveCurrentTrackFragment extends BottomSheetDialogFragment {
 	}
 
 	public static void showInstance(FragmentManager fragmentManager, List<String> filenames) {
+		if (fragmentManager.isStateSaved()) {
+			return;
+		}
 		OnSaveCurrentTrackFragment f = new OnSaveCurrentTrackFragment();
 		Bundle b = new Bundle();
 		b.putStringArrayList(SAVED_TRACKS_KEY, new ArrayList<>(filenames));
 		f.setArguments(b);
-		f.show(fragmentManager, TAG);
+		try {
+			f.show(fragmentManager, TAG);
+		} catch (IllegalStateException e) {
+			//java.lang.IllegalStateException: Can not perform this action after onSaveInstanceState
+			e.printStackTrace();
+		}
 	}
 }

From 7f3c1e2c094d998f1bc540e8112c3a387ccd104c Mon Sep 17 00:00:00 2001
From: Dmitry <dmpr0.ua@gmail.com>
Date: Fri, 14 Aug 2020 16:28:20 +0300
Subject: [PATCH 55/81] Added 16x16dp icons: description, location, search,
 trash basket

---
 .../res/drawable/ic_action_description_16.xml  | 18 ++++++++++++++++++
 OsmAnd/res/drawable/ic_action_location_16.xml  | 14 ++++++++++++++
 OsmAnd/res/drawable/ic_action_search_16.xml    | 10 ++++++++++
 .../res/drawable/ic_action_trash_basket_16.xml | 12 ++++++++++++
 4 files changed, 54 insertions(+)
 create mode 100644 OsmAnd/res/drawable/ic_action_description_16.xml
 create mode 100644 OsmAnd/res/drawable/ic_action_location_16.xml
 create mode 100644 OsmAnd/res/drawable/ic_action_search_16.xml
 create mode 100644 OsmAnd/res/drawable/ic_action_trash_basket_16.xml

diff --git a/OsmAnd/res/drawable/ic_action_description_16.xml b/OsmAnd/res/drawable/ic_action_description_16.xml
new file mode 100644
index 0000000000..285731fc0d
--- /dev/null
+++ b/OsmAnd/res/drawable/ic_action_description_16.xml
@@ -0,0 +1,18 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="16dp"
+    android:height="16dp"
+    android:viewportWidth="16"
+    android:viewportHeight="16">
+  <path
+      android:pathData="M13,3H3V5H13V3Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M13,7H3V9H13V7Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M13,13H7V11H13V13Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M3,13H5V11H3V13Z"
+      android:fillColor="#ffffff"/>
+</vector>
diff --git a/OsmAnd/res/drawable/ic_action_location_16.xml b/OsmAnd/res/drawable/ic_action_location_16.xml
new file mode 100644
index 0000000000..aac95d6959
--- /dev/null
+++ b/OsmAnd/res/drawable/ic_action_location_16.xml
@@ -0,0 +1,14 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="16dp"
+    android:height="16dp"
+    android:viewportWidth="16"
+    android:viewportHeight="16">
+  <path
+      android:pathData="M8,15C8,15 13,9.5714 13,6C13,3.1429 10.7614,1 8,1C5.2386,1 3,3.1429 3,6C3,9.5714 8,15 8,15ZM8,8C9.1046,8 10,7.1046 10,6C10,4.8954 9.1046,4 8,4C6.8954,4 6,4.8954 6,6C6,7.1046 6.8954,8 8,8Z"
+      android:fillColor="#ffffff"
+      android:fillType="evenOdd"/>
+  <path
+      android:pathData="M8,15C8,15 13,9.5714 13,6C13,3.1429 10.7614,1 8,1C5.2386,1 3,3.1429 3,6C3,9.5714 8,15 8,15ZM8,8C9.1046,8 10,7.1046 10,6C10,4.8954 9.1046,4 8,4C6.8954,4 6,4.8954 6,6C6,7.1046 6.8954,8 8,8Z"
+      android:fillColor="#ffffff"
+      android:fillType="evenOdd"/>
+</vector>
diff --git a/OsmAnd/res/drawable/ic_action_search_16.xml b/OsmAnd/res/drawable/ic_action_search_16.xml
new file mode 100644
index 0000000000..fa4d5b9648
--- /dev/null
+++ b/OsmAnd/res/drawable/ic_action_search_16.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="16dp"
+    android:height="16dp"
+    android:viewportWidth="16"
+    android:viewportHeight="16">
+  <path
+      android:pathData="M8.8957,10.31C8.202,10.7471 7.3805,11 6.5,11C4.0147,11 2,8.9853 2,6.5C2,4.0147 4.0147,2 6.5,2C8.9853,2 11,4.0147 11,6.5C11,7.3805 10.7471,8.202 10.31,8.8957L13.7071,12.2929L12.2929,13.7071L8.8957,10.31ZM9,6.5C9,7.8807 7.8807,9 6.5,9C5.1193,9 4,7.8807 4,6.5C4,5.1193 5.1193,4 6.5,4C7.8807,4 9,5.1193 9,6.5Z"
+      android:fillColor="#ffffff"
+      android:fillType="evenOdd"/>
+</vector>
diff --git a/OsmAnd/res/drawable/ic_action_trash_basket_16.xml b/OsmAnd/res/drawable/ic_action_trash_basket_16.xml
new file mode 100644
index 0000000000..6f3b6f2979
--- /dev/null
+++ b/OsmAnd/res/drawable/ic_action_trash_basket_16.xml
@@ -0,0 +1,12 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="16dp"
+    android:height="16dp"
+    android:viewportWidth="16"
+    android:viewportHeight="16">
+  <path
+      android:pathData="M6,1H10V3H13V5H3V3H6V1Z"
+      android:fillColor="#ffffff"/>
+  <path
+      android:pathData="M12,7H4V14C4,14.5523 4.4477,15 5,15H11C11.5523,15 12,14.5523 12,14V7Z"
+      android:fillColor="#ffffff"/>
+</vector>

From ea83bc6d5d8c3c10727002d13538d03f8f4aa8bc Mon Sep 17 00:00:00 2001
From: max-klaus <max.klaus@osmand.net>
Date: Fri, 14 Aug 2020 17:18:16 +0300
Subject: [PATCH 56/81] Finished gpx approximation

---
 .../osmand/router/RoutePlannerFrontEnd.java   |  2 +-
 .../GpxApproximationFragment.java             | 50 ++++++++----
 .../MeasurementEditingContext.java            | 49 +++++++-----
 .../MeasurementToolFragment.java              | 80 ++++++++++---------
 .../command/AddPointCommand.java              | 15 ++--
 .../command/ApplyGpxApproximationCommand.java | 77 ++++++++++++++++++
 .../command/ClearPointsCommand.java           | 23 +++---
 .../plus/measurementtool/command/Command.java |  4 +
 .../command/MeasurementCommandManager.java    |  7 +-
 .../command/MeasurementModeCommand.java       | 23 +++++-
 .../command/MovePointCommand.java             | 14 ++--
 .../command/RemovePointCommand.java           | 14 ++--
 .../command/ReorderPointCommand.java          | 12 +--
 .../osmand/plus/routing/GpxApproximator.java  | 11 ++-
 14 files changed, 265 insertions(+), 116 deletions(-)
 create mode 100644 OsmAnd/src/net/osmand/plus/measurementtool/command/ApplyGpxApproximationCommand.java

diff --git a/OsmAnd-java/src/main/java/net/osmand/router/RoutePlannerFrontEnd.java b/OsmAnd-java/src/main/java/net/osmand/router/RoutePlannerFrontEnd.java
index c6f18ab427..9336c7241c 100644
--- a/OsmAnd-java/src/main/java/net/osmand/router/RoutePlannerFrontEnd.java
+++ b/OsmAnd-java/src/main/java/net/osmand/router/RoutePlannerFrontEnd.java
@@ -310,7 +310,7 @@ public class RoutePlannerFrontEnd {
 			System.out.println(gctx);
 		}
 		if (resultMatcher != null) {
-			resultMatcher.publish(gctx);
+			resultMatcher.publish(gctx.calculationCancelled ? null : gctx);
 		}
 		gctx.calculationDone = true;
 		return gctx;
diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/GpxApproximationFragment.java b/OsmAnd/src/net/osmand/plus/measurementtool/GpxApproximationFragment.java
index 3873ad22b7..7c19d0db33 100644
--- a/OsmAnd/src/net/osmand/plus/measurementtool/GpxApproximationFragment.java
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/GpxApproximationFragment.java
@@ -31,8 +31,6 @@ import net.osmand.router.RoutePlannerFrontEnd.GpxRouteApproximation;
 
 import org.apache.commons.logging.Log;
 
-import java.io.IOException;
-
 import static net.osmand.plus.measurementtool.ProfileCard.ProfileCardListener;
 import static net.osmand.plus.measurementtool.SliderCard.SliderCardListener;
 
@@ -40,7 +38,7 @@ public class GpxApproximationFragment extends ContextMenuScrollFragment
 		implements SliderCardListener, ProfileCardListener {
 
 	private static final Log LOG = PlatformUtil.getLog(GpxApproximationFragment.class);
-	public static final String TAG = GpxApproximationFragment.class.getSimpleName();
+	public static final String TAG = GpxApproximationFragment.class.getName();
 	public static final String DISTANCE_THRESHOLD_KEY = "distance_threshold";
 	public static final String SNAP_TO_ROAD_APP_MODE_STRING_KEY = "snap_to_road_app_mode";
 
@@ -49,11 +47,14 @@ public class GpxApproximationFragment extends ContextMenuScrollFragment
 	private int menuTitleHeight;
 	private ApplicationMode snapToRoadAppMode = ApplicationMode.CAR;
 	private int distanceThreshold = 50;
+	private boolean applyApproximation;
 
 	private LocationsHolder locationsHolder;
 	@Nullable
 	private GpxApproximator gpxApproximator;
 	private ProgressBar progressBar;
+	private View cancelButton;
+	private View applyButton;
 
 	@Override
 	public int getMainLayoutId() {
@@ -139,6 +140,8 @@ public class GpxApproximationFragment extends ContextMenuScrollFragment
 			});
 		}
 
+		applyButton = mainView.findViewById(R.id.right_bottom_button);
+		cancelButton = mainView.findViewById(R.id.dismiss_button);
 		if (isPortrait()) {
 			updateCardsLayout();
 		}
@@ -182,10 +185,15 @@ public class GpxApproximationFragment extends ContextMenuScrollFragment
 	@Override
 	public void onDestroyView() {
 		super.onDestroyView();
+		if (gpxApproximator != null) {
+			gpxApproximator.cancelApproximation();
+		}
 		exitGpxApproximationMode();
-		Fragment fragment = getTargetFragment();
-		if (fragment instanceof GpxApproximationFragmentListener) {
-			((GpxApproximationFragmentListener) fragment).onCancelGpxApproximation();
+		if (!applyApproximation) {
+			Fragment fragment = getTargetFragment();
+			if (fragment instanceof GpxApproximationFragmentListener) {
+				((GpxApproximationFragmentListener) fragment).onCancelGpxApproximation();
+			}
 		}
 	}
 
@@ -213,7 +221,6 @@ public class GpxApproximationFragment extends ContextMenuScrollFragment
 	private void updateButtons(View view) {
 		View buttonsContainer = view.findViewById(R.id.buttons_container);
 		buttonsContainer.setBackgroundColor(AndroidUtils.getColorFromAttr(view.getContext(), R.attr.route_info_bg));
-		View applyButton = view.findViewById(R.id.right_bottom_button);
 		applyButton.setOnClickListener(new View.OnClickListener() {
 			@Override
 			public void onClick(View v) {
@@ -221,11 +228,10 @@ public class GpxApproximationFragment extends ContextMenuScrollFragment
 				if (fragment instanceof GpxApproximationFragmentListener) {
 					((GpxApproximationFragmentListener) fragment).onApplyGpxApproximation();
 				}
+				applyApproximation = true;
 				dismiss();
 			}
 		});
-
-		View cancelButton = view.findViewById(R.id.dismiss_button);
 		cancelButton.setOnClickListener(new View.OnClickListener() {
 			@Override
 			public void onClick(View v) {
@@ -235,14 +241,18 @@ public class GpxApproximationFragment extends ContextMenuScrollFragment
 				}
 			}
 		});
-
 		UiUtilities.setupDialogButton(isNightMode(), cancelButton, UiUtilities.DialogButtonType.SECONDARY, R.string.shared_string_cancel);
 		UiUtilities.setupDialogButton(isNightMode(), applyButton, UiUtilities.DialogButtonType.PRIMARY, R.string.shared_string_apply);
-
 		AndroidUiHelper.updateVisibility(applyButton, true);
 		AndroidUiHelper.updateVisibility(view.findViewById(R.id.buttons_divider), true);
 	}
 
+	private void setApplyButtonEnabled(boolean enabled) {
+		if (applyButton != null) {
+			applyButton.setEnabled(enabled);
+		}
+	}
+
 	private void updateCards() {
 		MapActivity mapActivity = getMapActivity();
 		if (mapActivity != null) {
@@ -328,14 +338,18 @@ public class GpxApproximationFragment extends ContextMenuScrollFragment
 
 	@Override
 	public void onSliderChange(int sliderValue) {
-		distanceThreshold = sliderValue;
-		calculateGpxApproximation();
+		if (distanceThreshold != sliderValue) {
+			distanceThreshold = sliderValue;
+			calculateGpxApproximation();
+		}
 	}
 
 	@Override
 	public void onProfileSelect(ApplicationMode applicationMode) {
-		snapToRoadAppMode = applicationMode;
-		calculateGpxApproximation();
+		if (snapToRoadAppMode != applicationMode) {
+			snapToRoadAppMode = applicationMode;
+			calculateGpxApproximation();
+		}
 	}
 
 	public LocationsHolder getLocationsHolder() {
@@ -370,6 +384,7 @@ public class GpxApproximationFragment extends ContextMenuScrollFragment
 
 	private void approximateGpx() {
 		if (gpxApproximator != null) {
+			setApplyButtonEnabled(false);
 			gpxApproximator.calculateGpxApproximation(new ResultMatcher<GpxRouteApproximation>() {
 				@Override
 				public boolean publish(final GpxRouteApproximation gpxApproximation) {
@@ -380,8 +395,9 @@ public class GpxApproximationFragment extends ContextMenuScrollFragment
 							public void run() {
 								Fragment fragment = getTargetFragment();
 								if (fragment instanceof GpxApproximationFragmentListener) {
-									((GpxApproximationFragmentListener) fragment).onGpxApproximationDone(gpxApproximation);
+									((GpxApproximationFragmentListener) fragment).onGpxApproximationDone(gpxApproximation, gpxApproximator.getMode());
 								}
+								setApplyButtonEnabled(gpxApproximation != null);
 							}
 						});
 						return true;
@@ -399,7 +415,7 @@ public class GpxApproximationFragment extends ContextMenuScrollFragment
 
 	public interface GpxApproximationFragmentListener {
 
-		void onGpxApproximationDone(GpxRouteApproximation gpxApproximation);
+		void onGpxApproximationDone(GpxRouteApproximation gpxApproximation, ApplicationMode mode);
 
 		void onApplyGpxApproximation();
 
diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementEditingContext.java b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementEditingContext.java
index cbec11bf82..ac1a5469b6 100644
--- a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementEditingContext.java
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementEditingContext.java
@@ -17,7 +17,6 @@ import net.osmand.plus.routing.RouteCalculationResult;
 import net.osmand.plus.routing.RoutingHelper;
 import net.osmand.plus.settings.backend.ApplicationMode;
 import net.osmand.router.RouteCalculationProgress;
-import net.osmand.router.RoutePlannerFrontEnd;
 import net.osmand.router.RoutePlannerFrontEnd.GpxPoint;
 import net.osmand.router.RoutePlannerFrontEnd.GpxRouteApproximation;
 import net.osmand.router.RouteSegmentResult;
@@ -32,7 +31,7 @@ import java.util.Queue;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentLinkedQueue;
 
-import static net.osmand.plus.measurementtool.MeasurementEditingContext.CalculationType.*;
+import static net.osmand.plus.measurementtool.MeasurementEditingContext.CalculationType.WHOLE_TRACK;
 
 public class MeasurementEditingContext {
 
@@ -111,7 +110,7 @@ public class MeasurementEditingContext {
 		this.inAddPointMode = inAddPointMode;
 	}
 
-	void setInSnapToRoadMode(boolean inSnapToRoadMode) {
+	public void setInSnapToRoadMode(boolean inSnapToRoadMode) {
 		this.inSnapToRoadMode = inSnapToRoadMode;
 	}
 
@@ -147,7 +146,7 @@ public class MeasurementEditingContext {
 		return snapToRoadAppMode;
 	}
 
-	void setSnapToRoadAppMode(ApplicationMode snapToRoadAppMode) {
+	public void setSnapToRoadAppMode(ApplicationMode snapToRoadAppMode) {
 		if (this.snapToRoadAppMode != null && snapToRoadAppMode != null
 				&& !this.snapToRoadAppMode.getStringKey().equals(snapToRoadAppMode.getStringKey())) {
 			if (calculationType == WHOLE_TRACK) {
@@ -327,36 +326,50 @@ public class MeasurementEditingContext {
 		}
 	}
 
-	void setPoints(GpxRouteApproximation gpxApproximation) {
+	public void setPoints(GpxRouteApproximation gpxApproximation) {
 		if (gpxApproximation == null || Algorithms.isEmpty(gpxApproximation.finalPoints) || Algorithms.isEmpty(gpxApproximation.result)) {
 			return;
 		}
-		clearSegments();
-		List<GpxPoint> routePoints = gpxApproximation.finalPoints;
-		for (int i = 0; i < routePoints.size() - 1; i++) {
-			GpxPoint rp1 = routePoints.get(i);
-			GpxPoint rp2 = routePoints.get(i + 1);
+		snappedToRoadPoints.clear();
+		List<WptPt> routePoints = new ArrayList<>();
+		List<GpxPoint> gpxPoints = gpxApproximation.finalPoints;
+		for (int i = 0; i < gpxPoints.size() - 1; i++) {
+			GpxPoint rp1 = gpxPoints.get(i);
+			GpxPoint rp2 = gpxPoints.get(i + 1);
 			WptPt p1 = new WptPt();
 			p1.lat = rp1.loc.getLatitude();
 			p1.lon = rp1.loc.getLongitude();
+			if (i == 0) {
+				routePoints.add(p1);
+			}
 			WptPt p2 = new WptPt();
 			p2.lat = rp2.loc.getLatitude();
 			p2.lon = rp2.loc.getLongitude();
+			routePoints.add(p2);
 			Pair<WptPt, WptPt> pair = new Pair<>(p1, p2);
 			List<WptPt> cacheSegment = new ArrayList<>();
 			for (RouteSegmentResult seg : rp1.routeToTarget) {
-				int start = seg.isForwardDirection() ? seg.getStartPointIndex() : seg.getEndPointIndex();
-				int end = seg.isForwardDirection() ? seg.getEndPointIndex() : seg.getStartPointIndex();
-				for (int ik = start; ik <= end; ik++) {
-					LatLon l = seg.getPoint(ik);
-					WptPt pt = new WptPt();
-					pt.lat = l.getLatitude();
-					pt.lon = l.getLongitude();
-					cacheSegment.add(pt);
+				if (seg.isForwardDirection()) {
+					for (int ik = seg.getStartPointIndex(); ik <= seg.getEndPointIndex(); ik++) {
+						LatLon l = seg.getPoint(ik);
+						WptPt pt = new WptPt();
+						pt.lat = l.getLatitude();
+						pt.lon = l.getLongitude();
+						cacheSegment.add(pt);
+					}
+				} else {
+					for (int ik = seg.getEndPointIndex(); ik >= seg.getStartPointIndex(); ik--) {
+						LatLon l = seg.getPoint(ik);
+						WptPt pt = new WptPt();
+						pt.lat = l.getLatitude();
+						pt.lon = l.getLongitude();
+						cacheSegment.add(pt);
+					}
 				}
 			}
 			snappedToRoadPoints.put(pair, cacheSegment);
 		}
+		addPoints(routePoints);
 	}
 
 	private int findPointIndex(WptPt point, List<WptPt> points, int firstIndex) {
diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
index 1b289e0149..cbf6823ede 100644
--- a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
@@ -70,6 +70,7 @@ import net.osmand.plus.measurementtool.SelectedPointBottomSheetDialogFragment.Se
 import net.osmand.plus.measurementtool.adapter.MeasurementToolAdapter;
 import net.osmand.plus.measurementtool.adapter.MeasurementToolAdapter.MeasurementAdapterListener;
 import net.osmand.plus.measurementtool.command.AddPointCommand;
+import net.osmand.plus.measurementtool.command.ApplyGpxApproximationCommand;
 import net.osmand.plus.measurementtool.command.ClearPointsCommand;
 import net.osmand.plus.measurementtool.command.MovePointCommand;
 import net.osmand.plus.measurementtool.command.RemovePointCommand;
@@ -477,32 +478,35 @@ public class MeasurementToolFragment extends BaseOsmAndFragment implements Route
 	}
 
 	private void initMeasurementMode(NewGpxData newGpxData) {
-		editingCtx.getCommandManager().resetMeasurementLayer(getMapActivity().getMapLayers().getMeasurementToolLayer());
-		enterMeasurementMode();
-		showSnapToRoadControls();
-		if (newGpxData != null && !gpxPointsAdded) {
-			List<WptPt> points = newGpxData.getGpxFile().getRoutePoints();
-			if (!points.isEmpty()) {
-				ApplicationMode snapToRoadAppMode = ApplicationMode
-						.valueOfStringKey(points.get(points.size() - 1).getProfileType(), null);
-				if (snapToRoadAppMode != null) {
-					enableSnapToRoadMode(snapToRoadAppMode);
+		MapActivity mapActivity = getMapActivity();
+		if (mapActivity != null) {
+			editingCtx.getCommandManager().setMeasurementLayer(mapActivity.getMapLayers().getMeasurementToolLayer());
+			enterMeasurementMode();
+			showSnapToRoadControls();
+			if (newGpxData != null && !gpxPointsAdded) {
+				List<WptPt> points = newGpxData.getGpxFile().getRoutePoints();
+				if (!points.isEmpty()) {
+					ApplicationMode snapToRoadAppMode = ApplicationMode
+							.valueOfStringKey(points.get(points.size() - 1).getProfileType(), null);
+					if (snapToRoadAppMode != null) {
+						enableSnapToRoadMode(snapToRoadAppMode);
+					}
+				}
+				ActionType actionType = newGpxData.getActionType();
+				if (actionType == ActionType.ADD_ROUTE_POINTS) {
+					displayRoutePoints();
+					gpxPointsAdded = true;
+				} else if (actionType == ActionType.EDIT_SEGMENT) {
+					displaySegmentPoints();
+					gpxPointsAdded = true;
 				}
 			}
-			ActionType actionType = newGpxData.getActionType();
-			if (actionType == ActionType.ADD_ROUTE_POINTS) {
-				displayRoutePoints();
-				gpxPointsAdded = true;
-			} else if (actionType == ActionType.EDIT_SEGMENT) {
-				displaySegmentPoints();
-				gpxPointsAdded = true;
+			if (saved == null) {
+				saved = newGpxData != null
+						&& (newGpxData.getActionType() == ActionType.ADD_ROUTE_POINTS
+						|| newGpxData.getActionType() == ActionType.EDIT_SEGMENT);
 			}
 		}
-		if (saved == null) {
-			saved = newGpxData != null
-					&& (newGpxData.getActionType() == ActionType.ADD_ROUTE_POINTS
-					|| newGpxData.getActionType() == ActionType.EDIT_SEGMENT);
-		}
 	}
 
 	@Override
@@ -547,7 +551,7 @@ public class MeasurementToolFragment extends BaseOsmAndFragment implements Route
 	@Nullable
 	private MapActivity getMapActivity() {
 		Activity activity = getActivity();
-		if (activity instanceof MapActivity && !activity.isFinishing()) {
+		if (AndroidUtils.isActivityNotDestroyed(activity)) {
 			return (MapActivity) activity;
 		}
 		return null;
@@ -601,7 +605,7 @@ public class MeasurementToolFragment extends BaseOsmAndFragment implements Route
 			toolBarController.setTitle(getString(R.string.route_between_points));
 			mapActivity.refreshMap();
 
-			if (editingCtx.isNewData() || editingCtx.hasRoutePoints()) {
+			if (editingCtx.isNewData() || editingCtx.hasRoutePoints() || editingCtx.isInSnapToRoadMode()) {
 				RouteBetweenPointsBottomSheetDialogFragment.showInstance(mapActivity.getSupportFragmentManager(),
 						this, editingCtx.getCalculationType(),
 						editingCtx.getSnapToRoadAppMode());
@@ -1057,15 +1061,6 @@ public class MeasurementToolFragment extends BaseOsmAndFragment implements Route
 		}
 	}
 
-	public void displayApproximatedPoints(GpxRouteApproximation gpxApproximation) {
-		MeasurementToolLayer measurementLayer = getMeasurementLayer();
-		if (measurementLayer != null) {
-			editingCtx.setPoints(gpxApproximation);
-			adapter.notifyDataSetChanged();
-			updateDistancePointsText();
-		}
-	}
-
 	private void openSelectedPointMenu(MapActivity mapActivity) {
 		SelectedPointBottomSheetDialogFragment fragment = new SelectedPointBottomSheetDialogFragment();
 		fragment.setUsedOnMap(true);
@@ -1929,17 +1924,28 @@ public class MeasurementToolFragment extends BaseOsmAndFragment implements Route
 	}
 
 	@Override
-	public void onGpxApproximationDone(GpxRouteApproximation gpxApproximation) {
-		displayApproximatedPoints(gpxApproximation);
+	public void onGpxApproximationDone(GpxRouteApproximation gpxApproximation, ApplicationMode mode) {
+		MeasurementToolLayer measurementLayer = getMeasurementLayer();
+		if (measurementLayer != null) {
+			ApplyGpxApproximationCommand command = new ApplyGpxApproximationCommand(measurementLayer, gpxApproximation, mode);
+			if (!editingCtx.getCommandManager().update(command)) {
+				editingCtx.getCommandManager().execute(command);
+			}
+			if (pointsListOpened) {
+				hidePointsList();
+			}
+			showSnapToRoadControls();
+		}
 	}
 
 	@Override
 	public void onApplyGpxApproximation() {
-
+		doAddOrMovePointCommonStuff();
 	}
 
 	@Override
 	public void onCancelGpxApproximation() {
-
+		editingCtx.getCommandManager().undo();
+		showSnapToRoadControls();
 	}
 }
diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/command/AddPointCommand.java b/OsmAnd/src/net/osmand/plus/measurementtool/command/AddPointCommand.java
index 8eba2c1532..cf49ecfed9 100644
--- a/OsmAnd/src/net/osmand/plus/measurementtool/command/AddPointCommand.java
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/command/AddPointCommand.java
@@ -11,15 +11,16 @@ public class AddPointCommand extends MeasurementModeCommand {
 	private boolean center;
 
 	public AddPointCommand(MeasurementToolLayer measurementLayer, boolean center) {
+		super(measurementLayer);
 		init(measurementLayer, null, center);
 	}
 
 	public AddPointCommand(MeasurementToolLayer measurementLayer, LatLon latLon) {
+		super(measurementLayer);
 		init(measurementLayer, latLon, false);
 	}
 
 	private void init(MeasurementToolLayer measurementLayer, LatLon latLon, boolean center) {
-		this.measurementLayer = measurementLayer;
 		if (latLon != null) {
 			point = new WptPt();
 			point.lat = latLon.getLatitude();
@@ -32,27 +33,27 @@ public class AddPointCommand extends MeasurementModeCommand {
 	@Override
 	public boolean execute() {
 		if (point != null) {
-			measurementLayer.getEditingCtx().addPoint(point);
+			getEditingCtx().addPoint(point);
 			measurementLayer.moveMapToPoint(position);
 		} else if (center) {
 			point = measurementLayer.addCenterPoint();
 		} else {
 			point = measurementLayer.addPoint();
 		}
-		measurementLayer.refreshMap();
+		refreshMap();
 		return point != null;
 	}
 
 	@Override
 	public void undo() {
-		measurementLayer.getEditingCtx().removePoint(position, true);
-		measurementLayer.refreshMap();
+		getEditingCtx().removePoint(position, true);
+		refreshMap();
 	}
 
 	@Override
 	public void redo() {
-		measurementLayer.getEditingCtx().addPoint(position, point);
-		measurementLayer.refreshMap();
+		getEditingCtx().addPoint(position, point);
+		refreshMap();
 		measurementLayer.moveMapToPoint(position);
 	}
 
diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/command/ApplyGpxApproximationCommand.java b/OsmAnd/src/net/osmand/plus/measurementtool/command/ApplyGpxApproximationCommand.java
new file mode 100644
index 0000000000..d05060ed0a
--- /dev/null
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/command/ApplyGpxApproximationCommand.java
@@ -0,0 +1,77 @@
+package net.osmand.plus.measurementtool.command;
+
+import androidx.annotation.NonNull;
+
+import net.osmand.GPXUtilities.WptPt;
+import net.osmand.plus.measurementtool.MeasurementToolLayer;
+import net.osmand.plus.settings.backend.ApplicationMode;
+import net.osmand.router.RoutePlannerFrontEnd.GpxRouteApproximation;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class ApplyGpxApproximationCommand extends MeasurementModeCommand {
+
+	private ApplicationMode mode;
+	private GpxRouteApproximation approximation;
+	private List<WptPt> points;
+	private boolean needUpdateCache;
+
+	public ApplyGpxApproximationCommand(MeasurementToolLayer measurementLayer, GpxRouteApproximation approximation, ApplicationMode mode) {
+		super(measurementLayer);
+		this.approximation = approximation;
+		this.mode = mode;
+	}
+
+	@Override
+	MeasurementCommandType getType() {
+		return MeasurementCommandType.APPROXIMATE_POINTS;
+	}
+
+	@Override
+	public boolean execute() {
+		List<WptPt> pts = getEditingCtx().getPoints();
+		needUpdateCache = getEditingCtx().isNeedUpdateCacheForSnap();
+		points = new ArrayList<>(pts);
+		applyApproximation();
+		refreshMap();
+		return true;
+	}
+
+	@Override
+	public boolean update(@NonNull Command command) {
+		if (command instanceof ApplyGpxApproximationCommand) {
+			ApplyGpxApproximationCommand approxCommand = (ApplyGpxApproximationCommand) command;
+			approximation = approxCommand.approximation;
+			applyApproximation();
+			refreshMap();
+			return true;
+		}
+		return false;
+	}
+
+	@Override
+	public void undo() {
+		getEditingCtx().setInSnapToRoadMode(false);
+		getEditingCtx().clearSegments();
+		getEditingCtx().setSnapToRoadAppMode(null);
+		getEditingCtx().addPoints(points);
+		if (needUpdateCache) {
+			getEditingCtx().setNeedUpdateCacheForSnap(true);
+		}
+		refreshMap();
+	}
+
+	@Override
+	public void redo() {
+		applyApproximation();
+		refreshMap();
+	}
+
+	public void applyApproximation() {
+		getEditingCtx().setInSnapToRoadMode(true);
+		getEditingCtx().clearSegments();
+		getEditingCtx().setSnapToRoadAppMode(mode);
+		getEditingCtx().setPoints(approximation);
+	}
+}
diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/command/ClearPointsCommand.java b/OsmAnd/src/net/osmand/plus/measurementtool/command/ClearPointsCommand.java
index b4b7e71dab..9023675105 100644
--- a/OsmAnd/src/net/osmand/plus/measurementtool/command/ClearPointsCommand.java
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/command/ClearPointsCommand.java
@@ -3,6 +3,7 @@ package net.osmand.plus.measurementtool.command;
 import net.osmand.GPXUtilities.WptPt;
 import net.osmand.plus.measurementtool.MeasurementToolLayer;
 
+import java.util.ArrayList;
 import java.util.LinkedList;
 import java.util.List;
 
@@ -12,33 +13,33 @@ public class ClearPointsCommand extends MeasurementModeCommand {
 	private boolean needUpdateCache;
 
 	public ClearPointsCommand(MeasurementToolLayer measurementLayer) {
-		this.measurementLayer = measurementLayer;
+		super(measurementLayer);
 	}
 
 	@Override
 	public boolean execute() {
-		List<WptPt> pts = measurementLayer.getEditingCtx().getPoints();
-		needUpdateCache = measurementLayer.getEditingCtx().isNeedUpdateCacheForSnap();
-		points = new LinkedList<>(pts);
+		List<WptPt> pts = getEditingCtx().getPoints();
+		needUpdateCache = getEditingCtx().isNeedUpdateCacheForSnap();
+		points = new ArrayList<>(pts);
 		pts.clear();
-		measurementLayer.getEditingCtx().clearSegments();
-		measurementLayer.refreshMap();
+		getEditingCtx().clearSegments();
+		refreshMap();
 		return true;
 	}
 
 	@Override
 	public void undo() {
-		measurementLayer.getEditingCtx().addPoints(points);
+		getEditingCtx().addPoints(points);
 		if (needUpdateCache) {
-			measurementLayer.getEditingCtx().setNeedUpdateCacheForSnap(true);
+			getEditingCtx().setNeedUpdateCacheForSnap(true);
 		}
-		measurementLayer.refreshMap();
+		refreshMap();
 	}
 
 	@Override
 	public void redo() {
-		measurementLayer.getEditingCtx().clearSegments();
-		measurementLayer.refreshMap();
+		getEditingCtx().clearSegments();
+		refreshMap();
 	}
 
 	@Override
diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/command/Command.java b/OsmAnd/src/net/osmand/plus/measurementtool/command/Command.java
index ef0424ebb6..74bb32c8d7 100644
--- a/OsmAnd/src/net/osmand/plus/measurementtool/command/Command.java
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/command/Command.java
@@ -1,9 +1,13 @@
 package net.osmand.plus.measurementtool.command;
 
+import androidx.annotation.NonNull;
+
 interface Command {
 
 	boolean execute();
 
+	boolean update(@NonNull Command command);
+
 	void undo();
 
 	void redo();
diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/command/MeasurementCommandManager.java b/OsmAnd/src/net/osmand/plus/measurementtool/command/MeasurementCommandManager.java
index f1548ada12..ca30828503 100644
--- a/OsmAnd/src/net/osmand/plus/measurementtool/command/MeasurementCommandManager.java
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/command/MeasurementCommandManager.java
@@ -30,6 +30,11 @@ public class MeasurementCommandManager {
 		return false;
 	}
 
+	public boolean update(MeasurementModeCommand command) {
+		MeasurementModeCommand prevCommand = undoCommands.peek();
+		return prevCommand != null && prevCommand.update(command);
+	}
+
 	@Nullable
 	public MeasurementCommandType undo() {
 		if (canUndo()) {
@@ -52,7 +57,7 @@ public class MeasurementCommandManager {
 		return null;
 	}
 
-	public void resetMeasurementLayer(MeasurementToolLayer layer) {
+	public void setMeasurementLayer(MeasurementToolLayer layer) {
 		for (MeasurementModeCommand command : undoCommands) {
 			command.setMeasurementLayer(layer);
 		}
diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/command/MeasurementModeCommand.java b/OsmAnd/src/net/osmand/plus/measurementtool/command/MeasurementModeCommand.java
index f0fb2133ea..5192f92f8f 100644
--- a/OsmAnd/src/net/osmand/plus/measurementtool/command/MeasurementModeCommand.java
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/command/MeasurementModeCommand.java
@@ -1,23 +1,44 @@
 package net.osmand.plus.measurementtool.command;
 
+import androidx.annotation.NonNull;
+
+import net.osmand.plus.measurementtool.MeasurementEditingContext;
 import net.osmand.plus.measurementtool.MeasurementToolLayer;
 
 public abstract class MeasurementModeCommand implements Command {
 
 	MeasurementToolLayer measurementLayer;
 
+	public MeasurementModeCommand(MeasurementToolLayer measurementLayer) {
+		this.measurementLayer = measurementLayer;
+	}
+
 	void setMeasurementLayer(MeasurementToolLayer layer) {
 		this.measurementLayer = layer;
 	}
 
+	@Override
+	public boolean update(@NonNull Command command) {
+		return false;
+	}
+
 	abstract MeasurementCommandType getType();
 
+	MeasurementEditingContext getEditingCtx() {
+		return measurementLayer.getEditingCtx();
+	}
+
+	void refreshMap() {
+		measurementLayer.refreshMap();
+	}
+
 	public enum MeasurementCommandType {
 		ADD_POINT,
 		CLEAR_POINTS,
 		MOVE_POINT,
 		REMOVE_POINT,
 		REORDER_POINT,
-		SNAP_TO_ROAD
+		SNAP_TO_ROAD,
+		APPROXIMATE_POINTS
 	}
 }
diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/command/MovePointCommand.java b/OsmAnd/src/net/osmand/plus/measurementtool/command/MovePointCommand.java
index 8ac3379fa7..c734e6810a 100644
--- a/OsmAnd/src/net/osmand/plus/measurementtool/command/MovePointCommand.java
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/command/MovePointCommand.java
@@ -10,7 +10,7 @@ public class MovePointCommand extends MeasurementModeCommand {
 	private final int position;
 
 	public MovePointCommand(MeasurementToolLayer measurementLayer, WptPt oldPoint, WptPt newPoint, int position) {
-		this.measurementLayer = measurementLayer;
+		super(measurementLayer);
 		this.oldPoint = oldPoint;
 		this.newPoint = newPoint;
 		this.position = position;
@@ -23,16 +23,16 @@ public class MovePointCommand extends MeasurementModeCommand {
 
 	@Override
 	public void undo() {
-		measurementLayer.getEditingCtx().removePoint(position, false);
-		measurementLayer.getEditingCtx().addPoint(position, oldPoint);
-		measurementLayer.refreshMap();
+		getEditingCtx().removePoint(position, false);
+		getEditingCtx().addPoint(position, oldPoint);
+		refreshMap();
 	}
 
 	@Override
 	public void redo() {
-		measurementLayer.getEditingCtx().removePoint(position, false);
-		measurementLayer.getEditingCtx().addPoint(position, newPoint);
-		measurementLayer.refreshMap();
+		getEditingCtx().removePoint(position, false);
+		getEditingCtx().addPoint(position, newPoint);
+		refreshMap();
 	}
 
 	@Override
diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/command/RemovePointCommand.java b/OsmAnd/src/net/osmand/plus/measurementtool/command/RemovePointCommand.java
index 6362626a36..d112b8dfbf 100644
--- a/OsmAnd/src/net/osmand/plus/measurementtool/command/RemovePointCommand.java
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/command/RemovePointCommand.java
@@ -9,28 +9,28 @@ public class RemovePointCommand extends MeasurementModeCommand {
 	private WptPt point;
 
 	public RemovePointCommand(MeasurementToolLayer measurementLayer, int position) {
-		this.measurementLayer = measurementLayer;
+		super(measurementLayer);
 		this.position = position;
 	}
 
 	@Override
 	public boolean execute() {
-		point = measurementLayer.getEditingCtx().removePoint(position, true);
-		measurementLayer.refreshMap();
+		point = getEditingCtx().removePoint(position, true);
+		refreshMap();
 		return true;
 	}
 
 	@Override
 	public void undo() {
-		measurementLayer.getEditingCtx().addPoint(position, point);
-		measurementLayer.refreshMap();
+		getEditingCtx().addPoint(position, point);
+		refreshMap();
 		measurementLayer.moveMapToPoint(position);
 	}
 
 	@Override
 	public void redo() {
-		measurementLayer.getEditingCtx().removePoint(position, true);
-		measurementLayer.refreshMap();
+		getEditingCtx().removePoint(position, true);
+		refreshMap();
 	}
 
 	@Override
diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/command/ReorderPointCommand.java b/OsmAnd/src/net/osmand/plus/measurementtool/command/ReorderPointCommand.java
index 5e7f476655..abc1888480 100644
--- a/OsmAnd/src/net/osmand/plus/measurementtool/command/ReorderPointCommand.java
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/command/ReorderPointCommand.java
@@ -11,15 +11,15 @@ public class ReorderPointCommand extends MeasurementModeCommand {
 	private final int to;
 
 	public ReorderPointCommand(MeasurementToolLayer measurementLayer, int from, int to) {
-		this.measurementLayer = measurementLayer;
+		super(measurementLayer);
 		this.from = from;
 		this.to = to;
 	}
 
 	@Override
 	public boolean execute() {
-		measurementLayer.getEditingCtx().setNeedUpdateCacheForSnap(true);
-		measurementLayer.refreshMap();
+		getEditingCtx().setNeedUpdateCacheForSnap(true);
+		refreshMap();
 		return true;
 	}
 
@@ -34,10 +34,10 @@ public class ReorderPointCommand extends MeasurementModeCommand {
 	}
 
 	private void reorder(int addTo, int removeFrom) {
-		List<WptPt> points = measurementLayer.getEditingCtx().getPoints();
+		List<WptPt> points = getEditingCtx().getPoints();
 		points.add(addTo, points.remove(removeFrom));
-		measurementLayer.getEditingCtx().setNeedUpdateCacheForSnap(true);
-		measurementLayer.refreshMap();
+		getEditingCtx().setNeedUpdateCacheForSnap(true);
+		refreshMap();
 	}
 
 	@Override
diff --git a/OsmAnd/src/net/osmand/plus/routing/GpxApproximator.java b/OsmAnd/src/net/osmand/plus/routing/GpxApproximator.java
index 60f43050b8..a3fb41c2f2 100644
--- a/OsmAnd/src/net/osmand/plus/routing/GpxApproximator.java
+++ b/OsmAnd/src/net/osmand/plus/routing/GpxApproximator.java
@@ -112,9 +112,8 @@ public class GpxApproximator {
 	}
 
 	public void setMode(ApplicationMode mode) throws IOException {
-		boolean changed = this.mode != mode;
-		this.mode = mode;
-		if (changed) {
+		if (this.mode != mode) {
+			this.mode = mode;
 			prepareEnvironment(ctx, mode);
 		}
 	}
@@ -139,6 +138,12 @@ public class GpxApproximator {
 		this.approximationProgress = approximationProgress;
 	}
 
+	public void cancelApproximation() {
+		if (gctx != null) {
+			gctx.calculationCancelled = true;
+		}
+	}
+
 	public void calculateGpxApproximation(@NonNull final ResultMatcher<GpxRouteApproximation> resultMatcher) {
 		if (gctx != null) {
 			gctx.calculationCancelled = true;

From e969309f811346a7fd8c831aed824cf1d5487bcc Mon Sep 17 00:00:00 2001
From: sergdevosm <androidkotlin@protonmail.ch>
Date: Fri, 14 Aug 2020 18:02:37 +0300
Subject: [PATCH 57/81] Fix #9552

---
 .../plus/monitoring/OnSaveCurrentTrackFragment.java      | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/OsmAnd/src/net/osmand/plus/monitoring/OnSaveCurrentTrackFragment.java b/OsmAnd/src/net/osmand/plus/monitoring/OnSaveCurrentTrackFragment.java
index 334b8db8ce..68c000bd1c 100644
--- a/OsmAnd/src/net/osmand/plus/monitoring/OnSaveCurrentTrackFragment.java
+++ b/OsmAnd/src/net/osmand/plus/monitoring/OnSaveCurrentTrackFragment.java
@@ -27,6 +27,7 @@ import net.osmand.FileUtils;
 import net.osmand.GPXUtilities;
 import net.osmand.GPXUtilities.WptPt;
 import net.osmand.IndexConstants;
+import net.osmand.PlatformUtil;
 import net.osmand.plus.OsmandApplication;
 import net.osmand.plus.R;
 import net.osmand.plus.UiUtilities;
@@ -39,6 +40,8 @@ import net.osmand.plus.views.OsmandMapTileView;
 import net.osmand.plus.widgets.OsmandTextFieldBoxes;
 import net.osmand.util.Algorithms;
 
+import org.apache.commons.logging.Log;
+
 import java.io.File;
 import java.util.ArrayList;
 import java.util.List;
@@ -49,6 +52,7 @@ public class OnSaveCurrentTrackFragment extends BottomSheetDialogFragment {
 
 	public static final String TAG = "OnSaveCurrentTrackBottomSheetFragment";
 	public static final String SAVED_TRACKS_KEY = "saved_track_filename";
+	private static final Log LOG = PlatformUtil.getLog(MapActivity.class);
 
 	private boolean openTrack = false;
 	private File file;
@@ -225,9 +229,8 @@ public class OnSaveCurrentTrackFragment extends BottomSheetDialogFragment {
 		f.setArguments(b);
 		try {
 			f.show(fragmentManager, TAG);
-		} catch (IllegalStateException e) {
-			//java.lang.IllegalStateException: Can not perform this action after onSaveInstanceState
-			e.printStackTrace();
+		} catch (IllegalStateException ex) {
+			LOG.error("Can not perform this action after onSaveInstanceState");
 		}
 	}
 }

From 7276d8878f14af7a31cac4f157da21e2bddbfa9d Mon Sep 17 00:00:00 2001
From: vuod <vuod@vivaldi.net>
Date: Thu, 13 Aug 2020 23:06:56 +0000
Subject: [PATCH 58/81] Translated using Weblate (French)

Currently translated at 100.0% (3450 of 3450 strings)
---
 OsmAnd/res/values-fr/strings.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/OsmAnd/res/values-fr/strings.xml b/OsmAnd/res/values-fr/strings.xml
index a424fa2c19..2b83519689 100644
--- a/OsmAnd/res/values-fr/strings.xml
+++ b/OsmAnd/res/values-fr/strings.xml
@@ -87,7 +87,7 @@
     <string name="old_poi_file_should_be_deleted">Le fichier de points d\'intérêt \'%1$s\' est obsolète et peut être supprimé.</string>
     <string name="update_poi_file_not_found">Fichier local de gestion des modifications de points d\'intérêt introuvable, et ne peut être créé.</string>
     <string name="button_upgrade_osmandplus">Mettre à jour OsmAnd+</string>
-    <string name="map_version_changed_info">Téléchargez la nouvelle version de l\'application pour utiliser les nouvelle cartes.</string>
+    <string name="map_version_changed_info">Téléchargez la nouvelle version de l\'application pour utiliser les nouvelles cartes.</string>
     <string name="shared_string_rename">Renommer</string>
     <string name="poi_filter_nominatim">Recherche OSM en ligne</string>
     <string name="search_position_current_location_search">Recherche de la position…</string>
@@ -1340,7 +1340,7 @@
 \n- Synchroniser les groupes et les appareils avec le serveur ;
 \n- Gérer les groupes et les appareils depuis un espace privé sur le site Web.</string>
     <string name="anonymous_user">Utilisateur anonyme</string>
-    <string name="logged_as">Connecté entant que %1$s</string>
+    <string name="logged_as">Connecté en tant que %1$s</string>
     <string name="rendering_category_details">Détails</string>
     <string name="rendering_category_transport">Transports en commun</string>
     <string name="rendering_category_others">Autres caractéristiques de la carte</string>
@@ -3446,7 +3446,7 @@
     <string name="multimedia_photo_play_sound">Son de la prise de vue</string>
     <string name="osm_authorization_success">L\'autorisation a été accordée</string>
     <string name="search_offline_geo_error">Impossible d\'analyser le geo intent \'%s\'.</string>
-    <string name="monitoring_min_speed_descr">Filtre interrompant l\'enregistrement en dessous d\'une certaines vitesse. Rend les traces enregistrées plus régulières lorsqu\'elles sont affichées sur la carte.</string>
+    <string name="monitoring_min_speed_descr">Filtre interrompant l\'enregistrement en dessous d\'une certaine vitesse. Rend les traces enregistrées plus régulières lorsqu\'elles sont affichées sur la carte.</string>
     <string name="live_monitoring_time_buffer">Durée de la mémoire tampon</string>
     <string name="live_monitoring_adress_descr">Indiquez l\'adresse web avec la syntaxe suivante pour les paramètres : lat = {0}, lon = {1}, horodatage = {2}, hdop = {3}, altitude = {4}, vitesse = {5}, direction = {6}.</string>
     <string name="monitoring_min_accuracy_descr_recommendation">Recommandation : il est difficile de prédire ce qui sera enregistré et ce qui ne le sera pas, il peut être préférable de désactiver ce filtre.</string>

From 4e50bd5b5af88311dc1e5a2d005400d16161edd8 Mon Sep 17 00:00:00 2001
From: Andrei Safranovich <asafr@yandex.ru>
Date: Fri, 14 Aug 2020 15:27:05 +0000
Subject: [PATCH 59/81] Translated using Weblate (Russian)

Currently translated at 99.9% (3448 of 3450 strings)
---
 OsmAnd/res/values-ru/strings.xml | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/OsmAnd/res/values-ru/strings.xml b/OsmAnd/res/values-ru/strings.xml
index 4c9826bc40..4cd39c6ecf 100644
--- a/OsmAnd/res/values-ru/strings.xml
+++ b/OsmAnd/res/values-ru/strings.xml
@@ -3838,4 +3838,17 @@
     <string name="plan_route_select_track_file_for_open">Выберите файл трека для открытия.</string>
     <string name="shared_string_done">Готово</string>
     <string name="overwrite_track">Перезаписать трек</string>
+    <string name="rourte_between_points_add_track_desc">Выбрать трек к которому будет добавлен новый сегмент.</string>
+    <string name="navigation_profile">Профиль</string>
+    <string name="threshold_distance">Предельная дистанция</string>
+    <string name="save_as_new_track">Сохранить как новый трек</string>
+    <string name="reverse_route">Обратный маршрут</string>
+    <string name="rourte_between_points_whole_track_button_desc">Весь трек будет перестроен с использованием выбранного профиля.</string>
+    <string name="rourte_between_points_next_segment_button_desc">Только следующий сегмент будет перестроен с использованием выбранного профиля.</string>
+    <string name="next_segment">Следующий сегмент</string>
+    <string name="whole_track">Весь трек</string>
+    <string name="rourte_between_points_warning_desc">Для использования данной опции OsmAnd проложет ваш трек по дорогам.
+\n
+\nДалее вам следует выбрать профиль для построения маршрута с учётом ограничений этого профиля.</string>
+    <string name="rourte_between_points_desc">Выберите как соединять точки: по прямой линии или построением маршрута.</string>
 </resources>
\ No newline at end of file

From a3e21b63aa35f587c55fd9011f3ecd220e8b64f3 Mon Sep 17 00:00:00 2001
From: Franco <francobenedetti.59+github1@gmail.com>
Date: Fri, 14 Aug 2020 01:27:21 +0000
Subject: [PATCH 60/81] Translated using Weblate (Spanish (Argentina))

Currently translated at 99.9% (3449 of 3450 strings)
---
 OsmAnd/res/values-es-rAR/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/OsmAnd/res/values-es-rAR/strings.xml b/OsmAnd/res/values-es-rAR/strings.xml
index 74d6bfd4a1..071e869143 100644
--- a/OsmAnd/res/values-es-rAR/strings.xml
+++ b/OsmAnd/res/values-es-rAR/strings.xml
@@ -2424,7 +2424,7 @@
     <string name="nothing_found">Nada encontrado</string>
     <string name="nothing_found_descr">Cambiar la búsqueda o aumentar su radio.</string>
     <string name="private_access_routing_req">El destino se ubica en un área de acceso privado. ¿Permitir el uso de caminos privados para este viaje\?</string>
-    <string name="mapillary">Mapillary</string>
+    <string name="mapillary">Imágenes a nivel de calle</string>
     <string name="mapillary_widget">Widget de Mapillary</string>
     <string name="mapillary_widget_descr">Permite realizar contribuciones rápidas a Mapillary.</string>
     <string name="mapillary_descr">Fotos a nivel de calle en línea para todos. Descubre sitios, colabora, captura el mundo.</string>

From 0b55462240ea96765fc49ac3da539c3782936df9 Mon Sep 17 00:00:00 2001
From: Verdulo <tomek@disroot.org>
Date: Fri, 14 Aug 2020 22:38:43 +0000
Subject: [PATCH 61/81] Translated using Weblate (Esperanto)

Currently translated at 100.0% (3450 of 3450 strings)
---
 OsmAnd/res/values-eo/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/OsmAnd/res/values-eo/strings.xml b/OsmAnd/res/values-eo/strings.xml
index 80a2ed4f75..2d7cfa0b63 100644
--- a/OsmAnd/res/values-eo/strings.xml
+++ b/OsmAnd/res/values-eo/strings.xml
@@ -2419,7 +2419,7 @@
     <string name="nothing_found">Trovis nenion</string>
     <string name="nothing_found_descr">Ŝanĝu serĉpeton aŭ pliigu radiuson de serĉo.</string>
     <string name="private_access_routing_req">Via celo troviĝas en privata tereno. Ĉu permesi aliron al privataj vojoj por tiu ĉi kurso\?</string>
-    <string name="mapillary">Mapillary</string>
+    <string name="mapillary">Strat-nivela fotaro</string>
     <string name="mapillary_widget">Mapillary-fenestraĵo</string>
     <string name="mapillary_widget_descr">Ebligas rapide kontribui al Mapillary.</string>
     <string name="mapillary_descr">Enretaj strat-nivelaj fotoj por ĉiuj. Esplori lokojn, kunlabori kaj foti la mondon.</string>

From 8af1103b5ed62814f3ab2c6ac7e51c5aec859180 Mon Sep 17 00:00:00 2001
From: Simon Yakymovych <myhosting2012@gmail.com>
Date: Sat, 15 Aug 2020 13:13:41 +0300
Subject: [PATCH 62/81] switch bug fix

---
 .../plus/settings/backend/OsmandSettings.java |  8 +++---
 .../fragments/RouteParametersFragment.java    | 25 ++++++++++++++-----
 2 files changed, 23 insertions(+), 10 deletions(-)

diff --git a/OsmAnd/src/net/osmand/plus/settings/backend/OsmandSettings.java b/OsmAnd/src/net/osmand/plus/settings/backend/OsmandSettings.java
index 70f6110928..51a0325c45 100644
--- a/OsmAnd/src/net/osmand/plus/settings/backend/OsmandSettings.java
+++ b/OsmAnd/src/net/osmand/plus/settings/backend/OsmandSettings.java
@@ -1886,14 +1886,14 @@ public class OsmandSettings {
 	// this value string is synchronized with settings_pref.xml preference name
 	// cache of metrics constants as they are used very often
 	public final OsmandPreference<Integer> ACCESSIBILITY_AUTOANNOUNCE_PERIOD = new IntPreference("accessibility_autoannounce_period", 10000).makeProfile().cache();
-	
+
 	// this value string is synchronized with settings_pref.xml preference name
 	public final OsmandPreference<Boolean> DISABLE_OFFROUTE_RECALC =
-		new BooleanAccessibilityPreference("disable_offroute_recalc", false).makeProfile();
-	
+		new BooleanPreference("disable_offroute_recalc", false).makeProfile();
+
 	// this value string is synchronized with settings_pref.xml preference name
 	public final OsmandPreference<Boolean> DISABLE_WRONG_DIRECTION_RECALC =
-		new BooleanAccessibilityPreference("disable_wrong_direction_recalc", false).makeProfile();
+		new BooleanPreference("disable_wrong_direction_recalc", false).makeProfile();
 	
 	// this value string is synchronized with settings_pref.xml preference name
 	public final OsmandPreference<Boolean> DIRECTION_AUDIO_FEEDBACK =
diff --git a/OsmAnd/src/net/osmand/plus/settings/fragments/RouteParametersFragment.java b/OsmAnd/src/net/osmand/plus/settings/fragments/RouteParametersFragment.java
index 8c7052983e..b2707ef0a8 100644
--- a/OsmAnd/src/net/osmand/plus/settings/fragments/RouteParametersFragment.java
+++ b/OsmAnd/src/net/osmand/plus/settings/fragments/RouteParametersFragment.java
@@ -20,6 +20,7 @@ import androidx.preference.Preference;
 import androidx.preference.PreferenceCategory;
 import androidx.preference.PreferenceScreen;
 import androidx.preference.PreferenceViewHolder;
+import androidx.recyclerview.widget.RecyclerView;
 
 import com.google.android.material.slider.Slider;
 
@@ -95,6 +96,15 @@ public class RouteParametersFragment extends BaseSettingsFragment implements OnP
 		};
 	}
 
+	@Override
+	public RecyclerView onCreateRecyclerView(LayoutInflater inflater, ViewGroup parent, Bundle savedInstanceState) {
+		final RecyclerView view = super.onCreateRecyclerView(inflater, parent, savedInstanceState);
+		//To prevent icons from flashing when the user turns switch on/off
+		view.setItemAnimator(null);
+		view.setLayoutAnimation(null);
+		return view;
+	}
+
 	@Override
 	protected void setupPreferences() {
 		setupRouteParametersImage();
@@ -263,7 +273,7 @@ public class RouteParametersFragment extends BaseSettingsFragment implements OnP
 		}
 
 		addDivider(screen);
-		addRouteRecalcHeader(screen);
+		setupRouteRecalcHeader(screen);
 		setupSelectRouteRecalcDistance(screen);
 		setupReverseDirectionRecalculation(screen);
 	}
@@ -276,17 +286,17 @@ public class RouteParametersFragment extends BaseSettingsFragment implements OnP
 
 	private void setupReverseDirectionRecalculation(PreferenceScreen screen) {
 		SwitchPreferenceEx recalcRouteReverseDirectionPreference =
-				createSwitchPreferenceEx(app.getSettings().DISABLE_WRONG_DIRECTION_RECALC.getId(),
+				createSwitchPreferenceEx(settings.DISABLE_WRONG_DIRECTION_RECALC.getId(),
 						R.string.in_case_of_reverse_direction,
 						R.layout.preference_with_descr_dialog_and_switch);
 		recalcRouteReverseDirectionPreference.setIcon(
-				getRoutingPrefIcon(app.getSettings().DISABLE_WRONG_DIRECTION_RECALC.getId()));
-		recalcRouteReverseDirectionPreference.setSummaryOn(R.string.shared_string_on);
-		recalcRouteReverseDirectionPreference.setSummaryOff(R.string.shared_string_off);
+				getRoutingPrefIcon(settings.DISABLE_WRONG_DIRECTION_RECALC.getId()));
+		recalcRouteReverseDirectionPreference.setSummaryOn(R.string.shared_string_enabled);
+		recalcRouteReverseDirectionPreference.setSummaryOff(R.string.shared_string_disabled);
 		screen.addPreference(recalcRouteReverseDirectionPreference);
 	}
 
-	private void addRouteRecalcHeader(PreferenceScreen screen) {
+	private void setupRouteRecalcHeader(PreferenceScreen screen) {
 		PreferenceCategory routingCategory = new PreferenceCategory(requireContext());
 		routingCategory.setLayoutResource(R.layout.preference_category_with_descr);
 		routingCategory.setTitle(R.string.recalculate_route);
@@ -464,6 +474,9 @@ public class RouteParametersFragment extends BaseSettingsFragment implements OnP
 			applyPreference(ROUTING_RECALC_DISTANCE, applyToAllProfiles, valueToSave);
 			applyPreference(settings.DISABLE_OFFROUTE_RECALC.getId(), applyToAllProfiles, !enabled);
 			updateRouteRecalcDistancePref();
+		} else if (settings.DISABLE_WRONG_DIRECTION_RECALC.getId().equals(prefId)){
+			applyPreference(settings.DISABLE_WRONG_DIRECTION_RECALC.getId(), applyToAllProfiles, newValue);
+			//updateRouteRecalcWrongDirectionPref();
 		} else {
 			super.onApplyPreferenceChange(prefId, applyToAllProfiles, newValue);
 		}

From 09f9dab6a3ad56b2871b6d4020d2c5fb1de76de5 Mon Sep 17 00:00:00 2001
From: Yaron Shahrabani <sh.yaron@gmail.com>
Date: Sun, 16 Aug 2020 11:05:35 +0300
Subject: [PATCH 63/81] Fix typo

lost all changes -> lose all changes
---
 OsmAnd/res/values/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/OsmAnd/res/values/strings.xml b/OsmAnd/res/values/strings.xml
index cf0510f67b..90990a2b78 100644
--- a/OsmAnd/res/values/strings.xml
+++ b/OsmAnd/res/values/strings.xml
@@ -12,7 +12,7 @@
 
 -->
     <string name="in_case_of_reverse_direction">In case of reverse direction</string>
-    <string name="plan_route_exit_dialog_descr">Are you sure you want to close Plan route without saving? You will lost all changes.</string>
+    <string name="plan_route_exit_dialog_descr">Are you sure you want to close Plan route without saving? You will lose all changes.</string>
     <string name="street_level_imagery">Street-level imagery</string>
     <string name="rourte_between_points_add_track_desc">Select a track file for which a new segment will be added.</string>
     <string name="navigation_profile">Navigation profile</string>

From 4300297667c4bd2abb6811bb56a7e8f11f58c9a8 Mon Sep 17 00:00:00 2001
From: sergdevosm <androidkotlin@protonmail.ch>
Date: Sun, 16 Aug 2020 11:09:27 +0300
Subject: [PATCH 64/81] Update OnSaveCurrentTrackFragment.java

---
 .../net/osmand/plus/monitoring/OnSaveCurrentTrackFragment.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/OsmAnd/src/net/osmand/plus/monitoring/OnSaveCurrentTrackFragment.java b/OsmAnd/src/net/osmand/plus/monitoring/OnSaveCurrentTrackFragment.java
index 68c000bd1c..e84c89ffb5 100644
--- a/OsmAnd/src/net/osmand/plus/monitoring/OnSaveCurrentTrackFragment.java
+++ b/OsmAnd/src/net/osmand/plus/monitoring/OnSaveCurrentTrackFragment.java
@@ -52,7 +52,7 @@ public class OnSaveCurrentTrackFragment extends BottomSheetDialogFragment {
 
 	public static final String TAG = "OnSaveCurrentTrackBottomSheetFragment";
 	public static final String SAVED_TRACKS_KEY = "saved_track_filename";
-	private static final Log LOG = PlatformUtil.getLog(MapActivity.class);
+	private static final Log LOG = PlatformUtil.getLog(OnSaveCurrentTrackFragment.class);
 
 	private boolean openTrack = false;
 	private File file;

From 9b51f796bd700ed0a50d78d658d0c26b955c73bd Mon Sep 17 00:00:00 2001
From: solokot <solokot@gmail.com>
Date: Sun, 16 Aug 2020 08:41:38 +0000
Subject: [PATCH 65/81] Translated using Weblate (Russian)

Currently translated at 99.9% (3451 of 3453 strings)
---
 OsmAnd/res/values-ru/strings.xml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/OsmAnd/res/values-ru/strings.xml b/OsmAnd/res/values-ru/strings.xml
index 4cd39c6ecf..dcf88d12aa 100644
--- a/OsmAnd/res/values-ru/strings.xml
+++ b/OsmAnd/res/values-ru/strings.xml
@@ -3838,7 +3838,7 @@
     <string name="plan_route_select_track_file_for_open">Выберите файл трека для открытия.</string>
     <string name="shared_string_done">Готово</string>
     <string name="overwrite_track">Перезаписать трек</string>
-    <string name="rourte_between_points_add_track_desc">Выбрать трек к которому будет добавлен новый сегмент.</string>
+    <string name="rourte_between_points_add_track_desc">Выбрать трек, к которому будет добавлен новый сегмент.</string>
     <string name="navigation_profile">Профиль</string>
     <string name="threshold_distance">Предельная дистанция</string>
     <string name="save_as_new_track">Сохранить как новый трек</string>
@@ -3851,4 +3851,6 @@
 \n
 \nДалее вам следует выбрать профиль для построения маршрута с учётом ограничений этого профиля.</string>
     <string name="rourte_between_points_desc">Выберите как соединять точки: по прямой линии или построением маршрута.</string>
+    <string name="in_case_of_reverse_direction">В случае обратного направления</string>
+    <string name="plan_route_exit_dialog_descr">Закрыть план маршрута без сохранения\? Все изменения будут потеряны.</string>
 </resources>
\ No newline at end of file

From 45dc302c24b7f5d9d9bc8109edcabc8c942ec879 Mon Sep 17 00:00:00 2001
From: josep constanti <jconstanti@yahoo.es>
Date: Sat, 15 Aug 2020 21:05:32 +0000
Subject: [PATCH 66/81] Translated using Weblate (Catalan)

Currently translated at 96.5% (3335 of 3453 strings)
---
 OsmAnd/res/values-ca/strings.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/OsmAnd/res/values-ca/strings.xml b/OsmAnd/res/values-ca/strings.xml
index 36b1866e7a..c945812712 100644
--- a/OsmAnd/res/values-ca/strings.xml
+++ b/OsmAnd/res/values-ca/strings.xml
@@ -3789,4 +3789,5 @@ Abasta l\'àrea: %1$s x %2$s</string>
 \nUn dia equival a 1.440 minuts.
 \nUna setmana té 10.080 minuts.
 \nUn mes dura 43.829 minuts.</string>
+    <string name="in_case_of_reverse_direction">Cas de sentit invers</string>
 </resources>
\ No newline at end of file

From 20fd8d14782b07ccd099836c0e12e4f13aed6b91 Mon Sep 17 00:00:00 2001
From: Hinagiku Zeppeki <Zeppeki.Hinagiku@gmail.com>
Date: Sat, 15 Aug 2020 08:52:23 +0000
Subject: [PATCH 67/81] Translated using Weblate (Japanese)

Currently translated at 95.6% (3304 of 3453 strings)
---
 OsmAnd/res/values-ja/strings.xml | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/OsmAnd/res/values-ja/strings.xml b/OsmAnd/res/values-ja/strings.xml
index f3a25fe9ea..89f05af146 100644
--- a/OsmAnd/res/values-ja/strings.xml
+++ b/OsmAnd/res/values-ja/strings.xml
@@ -1355,7 +1355,7 @@ POIの更新は利用できません</string>
     <string name="fav_point_dublicate_message">そのお気に入りは、重複を避けるために%1$sという名前に変更されました。</string>
     <string name="text_size_descr">マップ上の文字サイズを設定します。</string>
     <string name="text_size">文字サイズ</string>
-    <string name="rendering_attr_tramTrainRoutes_name">路面電車と鉄道の路線</string>
+    <string name="rendering_attr_tramTrainRoutes_name">路面電車＆鉄道路線</string>
     <string name="lock_screen_request_explanation">省電力機能で画面をオフにするには%1$s の権限が必要です。</string>
     <string name="wake_on_voice">画面の電源オン設定</string>
     <string name="wake_on_voice_descr">方向転換地点に近づいたらデバイスの画面を(オフの場合指定時間)オンにします</string>
@@ -3683,7 +3683,7 @@ POIの更新は利用できません</string>
     <string name="hillshade_download_description">マップ上で起伏の陰影表示をするには、追加マップが必要です。</string>
     <string name="shared_string_drawer">ドロワーメニュー</string>
     <string name="shared_string_octagon">八角形</string>
-    <string name="context_menu_actions">コンテキストメニューアクション</string>
+    <string name="context_menu_actions">コンテキストメニュー</string>
     <string name="reorder_or_hide_from">項目の並べ替えや非表示するものを指定できます。</string>
     <string name="shared_string_divider">分割</string>
     <string name="divider_descr">分割線で区切られた部分より下にある項目が適用されます。</string>
@@ -3724,4 +3724,17 @@ POIの更新は利用できません</string>
     <string name="lang_gu">グジャラート語</string>
     <string name="lang_cv">チュヴァシ語</string>
     <string name="gpx_parse_error">OsmAnd GPXの形式が正しくありません。サポートチームに連絡しての調査をおすすめします</string>
+    <string name="screen_timeout">画面のタイムアウト</string>
+    <string name="turn_screen_on_descr">画面復帰オプションを選択します(端末設定でロックされる場合は、OsmAndがバックグラウンド動作でないことを確認してください):</string>
+    <string name="system_screen_timeout_descr">端末側の画面オフ(省電力)設定に従って画面を消灯します。</string>
+    <string name="system_screen_timeout">端末側の画面オフ設定を使用</string>
+    <string name="turn_screen_on_wake_time_descr">画面がオンになった後からオフまでの時間を指定します。(\"%1$s\"有効時は適用されません)</string>
+    <string name="keep_screen_on">画面を常に表示</string>
+    <string name="turn_screen_on_proximity_sensor">近接センサー</string>
+    <string name="turn_screen_on_navigation_instructions_descr">ナビゲーション指示がある時だけ画面がオンになります。</string>
+    <string name="turn_screen_on_navigation_instructions">ナビゲーション指示</string>
+    <string name="turn_screen_on_power_button_descr">端末の電源ボタンを押すと、画面がオンになり、ロック画面上にOsmAndが表示されます。</string>
+    <string name="turn_screen_on_power_button">電源ボタン</string>
+    <string name="use_volume_buttons_as_zoom_descr">端末の音量ボタンでマップのズームレベルを変更できるようにします。</string>
+    <string name="use_volume_buttons_as_zoom">音量ボタンでズーム</string>
 </resources>
\ No newline at end of file

From c161a6806efaf5e2a8436cc8b82cd1d976476b6e Mon Sep 17 00:00:00 2001
From: Ldm Public <ldmpub@gmail.com>
Date: Sat, 15 Aug 2020 05:54:09 +0000
Subject: [PATCH 68/81] Translated using Weblate (French)

Currently translated at 100.0% (3453 of 3453 strings)
---
 OsmAnd/res/values-fr/strings.xml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/OsmAnd/res/values-fr/strings.xml b/OsmAnd/res/values-fr/strings.xml
index 2b83519689..3750c8f27e 100644
--- a/OsmAnd/res/values-fr/strings.xml
+++ b/OsmAnd/res/values-fr/strings.xml
@@ -3834,4 +3834,7 @@
     <string name="next_segment">Segment suivant</string>
     <string name="threshold_distance">Seuil de distance</string>
     <string name="navigation_profile">Profil de navigation</string>
+    <string name="street_level_imagery">Photos des rues</string>
+    <string name="plan_route_exit_dialog_descr">Voulez-vous vraiment fermer l\'itinéraire planifié sans enregistrer \? Vous perdrez toutes les modifications.</string>
+    <string name="in_case_of_reverse_direction">Si inversion du sens</string>
 </resources>
\ No newline at end of file

From b157f9879fa4def2777babfd0461b86a7d9ee569 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?O=C4=9Fuz=20Ersen?= <oguzersen@protonmail.com>
Date: Sat, 15 Aug 2020 05:50:47 +0000
Subject: [PATCH 69/81] Translated using Weblate (Turkish)

Currently translated at 100.0% (3453 of 3453 strings)
---
 OsmAnd/res/values-tr/strings.xml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/OsmAnd/res/values-tr/strings.xml b/OsmAnd/res/values-tr/strings.xml
index 081dfab57b..2c6667edc8 100644
--- a/OsmAnd/res/values-tr/strings.xml
+++ b/OsmAnd/res/values-tr/strings.xml
@@ -2151,7 +2151,7 @@
     <string name="modify_the_search_query">Arama sorgunuzu değiştirin.</string>
     <string name="add_favourites_group_to_markers_descr">İşaretleyicilere eklemek için bir Sık Kullanılanlar kategorisi seçin.</string>
     <string name="import_as_gpx">GPX dosyası olarak içe aktar</string>
-    <string name="plan_route">Rotayı planla</string>
+    <string name="plan_route">Güzergah planla</string>
     <string name="shared_string_list">Liste</string>
     <string name="shared_string_groups">Gruplar</string>
     <string name="passed">Son kullanılan: %1$s</string>
@@ -3810,4 +3810,7 @@
     <string name="threshold_distance">Eşik mesafesi</string>
     <string name="navigation_profile">Navigasyon profili</string>
     <string name="rourte_between_points_add_track_desc">Kendisine yeni bir bölümün ekleneceği bir yol dosyası seçin.</string>
+    <string name="street_level_imagery">Sokak seviyesi görüntüleri</string>
+    <string name="plan_route_exit_dialog_descr">Kaydetmeden güzergah planlamayı kapatmak istediğinize emin misiniz\? Tüm değişiklikleri kaybedeceksiniz.</string>
+    <string name="in_case_of_reverse_direction">Ters yön durumunda</string>
 </resources>
\ No newline at end of file

From de93805517a7b1b48a370f3a4febd50a166d64af Mon Sep 17 00:00:00 2001
From: ace shadow <acelists@atlas.sk>
Date: Sat, 15 Aug 2020 12:36:59 +0000
Subject: [PATCH 70/81] Translated using Weblate (Slovak)

Currently translated at 100.0% (3453 of 3453 strings)
---
 OsmAnd/res/values-sk/strings.xml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/OsmAnd/res/values-sk/strings.xml b/OsmAnd/res/values-sk/strings.xml
index f4f1341fd3..0e96d61ab3 100644
--- a/OsmAnd/res/values-sk/strings.xml
+++ b/OsmAnd/res/values-sk/strings.xml
@@ -2418,7 +2418,7 @@
     <string name="increase_search_radius">Zväčšiť okruh hľadania</string>
     <string name="nothing_found">Nič sa nenašlo</string>
     <string name="nothing_found_descr">Zmeňte vyhľadávacie kritérium alebo zväčšite polomer hľadania.</string>
-    <string name="mapillary">Mapillary</string>
+    <string name="mapillary">Snímky z úrovne ulice</string>
     <string name="open_mapillary">Otvoriť Mapillary</string>
     <string name="shared_string_install">Inštalovať</string>
     <string name="improve_coverage_mapillary">Zlepšiť pokrytie fotografií s Mapillary</string>
@@ -3852,4 +3852,7 @@
     <string name="threshold_distance">Hraničná vzdialenosť</string>
     <string name="navigation_profile">Navigačný profil</string>
     <string name="rourte_between_points_add_track_desc">Zvoľte súbor stopy, pre ktorú bude pridaný nový úsek.</string>
+    <string name="street_level_imagery">Snímky z úrovne ulice</string>
+    <string name="plan_route_exit_dialog_descr">Naozaj chcete zatvoriť plánovanie trasy bez uloženia\? Všetky zmeny sa stratia.</string>
+    <string name="in_case_of_reverse_direction">V prípade opačného smeru</string>
 </resources>
\ No newline at end of file

From 8849a2f63eedfac641df54d6b01fea93437225f5 Mon Sep 17 00:00:00 2001
From: D M <emid308@yandex.ru>
Date: Sat, 15 Aug 2020 20:52:36 +0000
Subject: [PATCH 71/81] Translated using Weblate (Serbian)

Currently translated at 100.0% (3453 of 3453 strings)
---
 OsmAnd/res/values-sr/strings.xml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/OsmAnd/res/values-sr/strings.xml b/OsmAnd/res/values-sr/strings.xml
index 70aaf6757b..400b27ab58 100644
--- a/OsmAnd/res/values-sr/strings.xml
+++ b/OsmAnd/res/values-sr/strings.xml
@@ -3849,4 +3849,7 @@
     <string name="threshold_distance">Праг удаљености</string>
     <string name="navigation_profile">Навигацијски профил</string>
     <string name="rourte_between_points_add_track_desc">Изаберите датотеку записа којој ће се додати нови сегмент.</string>
+    <string name="street_level_imagery">Слике на нивоу улице</string>
+    <string name="plan_route_exit_dialog_descr">Јесте ли сигурни да желите затворити План руте без чувања\? Изгуби ћете све промене.</string>
+    <string name="in_case_of_reverse_direction">У случају обрнутог правца</string>
 </resources>
\ No newline at end of file

From 8a72f0f536abb2bf7b241d2d9704de4dbd0f15f2 Mon Sep 17 00:00:00 2001
From: Yaron Shahrabani <sh.yaron@gmail.com>
Date: Sun, 16 Aug 2020 08:04:02 +0000
Subject: [PATCH 72/81] Translated using Weblate (Hebrew)

Currently translated at 100.0% (3453 of 3453 strings)
---
 OsmAnd/res/values-iw/strings.xml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/OsmAnd/res/values-iw/strings.xml b/OsmAnd/res/values-iw/strings.xml
index f65af94475..5741405350 100644
--- a/OsmAnd/res/values-iw/strings.xml
+++ b/OsmAnd/res/values-iw/strings.xml
@@ -3860,4 +3860,7 @@
     <string name="rourte_between_points_warning_desc">כדי להשתמש באפשרות זו על OsmAnd להצמיד את המסלול שלך לדרכים שעל המפה.
 \n
 \n בשלב הבא יהיה עליך לבחור בפרופיל ניווט כדי לזהות את הדרכים המורשות ואת סף המרחק כדי להעריך את המסלול שלך ביחס לדרכים.</string>
+    <string name="street_level_imagery">תמונות ברמת רחוב</string>
+    <string name="plan_route_exit_dialog_descr">לסגור את תכנון המסלול בלי לשמור\? כל השינויים שלך יאבדו.</string>
+    <string name="in_case_of_reverse_direction">במקרה של כיוון הפוך</string>
 </resources>
\ No newline at end of file

From d3b8ae34ecca0e73cb38d5f61eaeada81d56ac95 Mon Sep 17 00:00:00 2001
From: Ahmad Alfrhood <rlo927@gmail.com>
Date: Sat, 15 Aug 2020 08:39:37 +0000
Subject: [PATCH 73/81] Translated using Weblate (Arabic)

Currently translated at 100.0% (3453 of 3453 strings)
---
 OsmAnd/res/values-ar/strings.xml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/OsmAnd/res/values-ar/strings.xml b/OsmAnd/res/values-ar/strings.xml
index b7aacd66a9..d01c8b1ae4 100644
--- a/OsmAnd/res/values-ar/strings.xml
+++ b/OsmAnd/res/values-ar/strings.xml
@@ -3842,4 +3842,7 @@
 \n
 \nفي الخطوة التالية ، ستحتاج إلى تحديد ملف تعريف الملاحة لاكتشاف الطرق المسموح بها وبداية المسافة لتقريب تتبعك بالطرق.</string>
     <string name="threshold_distance">بداية المسافة</string>
+    <string name="street_level_imagery">صور للشارع</string>
+    <string name="plan_route_exit_dialog_descr">هل أنت متأكد أنك تريد إغلاق مسار الخطة دون حفظ؟ سوف تفقد كل التغييرات.</string>
+    <string name="in_case_of_reverse_direction">في حالة الاتجاه المعاكس</string>
 </resources>
\ No newline at end of file

From 795f85e11d5d4324691a825042dcc4215e148a2b Mon Sep 17 00:00:00 2001
From: Franco <francobenedetti.59+github1@gmail.com>
Date: Sat, 15 Aug 2020 20:41:02 +0000
Subject: [PATCH 74/81] Translated using Weblate (Spanish (Argentina))

Currently translated at 100.0% (3453 of 3453 strings)
---
 OsmAnd/res/values-es-rAR/strings.xml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/OsmAnd/res/values-es-rAR/strings.xml b/OsmAnd/res/values-es-rAR/strings.xml
index 071e869143..be30562515 100644
--- a/OsmAnd/res/values-es-rAR/strings.xml
+++ b/OsmAnd/res/values-es-rAR/strings.xml
@@ -3857,4 +3857,7 @@
     <string name="threshold_distance">Distancia de umbral</string>
     <string name="navigation_profile">Perfil de navegación</string>
     <string name="rourte_between_points_add_track_desc">Elige un archivo de traza al que se añadirá un nuevo segmento.</string>
+    <string name="street_level_imagery">Imágenes a nivel de calle</string>
+    <string name="plan_route_exit_dialog_descr">¿Cerrar el plan de ruta sin guardar\? Se perderán todos los cambios.</string>
+    <string name="in_case_of_reverse_direction">En caso de dirección inversa</string>
 </resources>
\ No newline at end of file

From 0bdf001d26d15e172e32d516babac0d08f7daf7c Mon Sep 17 00:00:00 2001
From: Eduardo Addad de Oliveira <duduaddad@gmail.com>
Date: Sat, 15 Aug 2020 17:04:16 +0000
Subject: [PATCH 75/81] Translated using Weblate (Portuguese (Brazil))

Currently translated at 100.0% (3453 of 3453 strings)
---
 OsmAnd/res/values-pt-rBR/strings.xml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/OsmAnd/res/values-pt-rBR/strings.xml b/OsmAnd/res/values-pt-rBR/strings.xml
index 3cd9b3bb10..35dafc2ea7 100644
--- a/OsmAnd/res/values-pt-rBR/strings.xml
+++ b/OsmAnd/res/values-pt-rBR/strings.xml
@@ -3883,4 +3883,7 @@
     <string name="threshold_distance">Distância limite</string>
     <string name="navigation_profile">Perfil de navegação</string>
     <string name="rourte_between_points_add_track_desc">Selecione um arquivo de trilha para o qual um novo segmento será adicionado.</string>
+    <string name="street_level_imagery">Imagens de rua</string>
+    <string name="plan_route_exit_dialog_descr">Tem certeza de que deseja fechar plano de rota sem salvar\? Você perderá todas as alterações.</string>
+    <string name="in_case_of_reverse_direction">Em caso de direção reversa</string>
 </resources>
\ No newline at end of file

From bfc61a5c128adc2d10f6d3ce6d39e06b6dd7c7ad Mon Sep 17 00:00:00 2001
From: Verdulo <tomek@disroot.org>
Date: Sat, 15 Aug 2020 12:42:37 +0000
Subject: [PATCH 76/81] Translated using Weblate (Esperanto)

Currently translated at 100.0% (3453 of 3453 strings)
---
 OsmAnd/res/values-eo/strings.xml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/OsmAnd/res/values-eo/strings.xml b/OsmAnd/res/values-eo/strings.xml
index 2d7cfa0b63..d0c4f7ddb7 100644
--- a/OsmAnd/res/values-eo/strings.xml
+++ b/OsmAnd/res/values-eo/strings.xml
@@ -3852,4 +3852,7 @@
     <string name="threshold_distance">Sojla distanco</string>
     <string name="navigation_profile">Profilo de navigo</string>
     <string name="rourte_between_points_add_track_desc">Elektu dosieron de spuro al kiu nova segmento estos aldonita.</string>
+    <string name="street_level_imagery">Strat-nivela fotaro</string>
+    <string name="plan_route_exit_dialog_descr">Ĉu vi certe volas fermi planadon de kurso sen konservi\? Ĉiuj viaj ŝanĝoj perdiĝos.</string>
+    <string name="in_case_of_reverse_direction">Kiam en inversa direkto</string>
 </resources>
\ No newline at end of file

From 7328c7fd952b270664c8b26d51109679bd44afda Mon Sep 17 00:00:00 2001
From: Jeff Huang <s8321414@gmail.com>
Date: Sat, 15 Aug 2020 02:52:41 +0000
Subject: [PATCH 77/81] Translated using Weblate (Chinese (Traditional))

Currently translated at 100.0% (3453 of 3453 strings)
---
 OsmAnd/res/values-zh-rTW/strings.xml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/OsmAnd/res/values-zh-rTW/strings.xml b/OsmAnd/res/values-zh-rTW/strings.xml
index 8e960687ae..6ce458b8a0 100644
--- a/OsmAnd/res/values-zh-rTW/strings.xml
+++ b/OsmAnd/res/values-zh-rTW/strings.xml
@@ -3849,4 +3849,7 @@
     <string name="threshold_distance">門檻距離</string>
     <string name="navigation_profile">導航設定檔</string>
     <string name="rourte_between_points_add_track_desc">選取要加入新片段的軌道檔案。</string>
+    <string name="street_level_imagery">街道級照片</string>
+    <string name="plan_route_exit_dialog_descr">您確定要不儲存就關閉計劃錄線嗎？您將會失去所有變更。</string>
+    <string name="in_case_of_reverse_direction">反向時</string>
 </resources>
\ No newline at end of file

From 66f0b4cd77232800ceaad31508b327c0d68d523b Mon Sep 17 00:00:00 2001
From: max-klaus <max.klaus@osmand.net>
Date: Sun, 16 Aug 2020 18:26:22 +0300
Subject: [PATCH 78/81] Fix read / write gpx route extensions

---
 .../main/java/net/osmand/GPXUtilities.java    | 190 +++++++++++++-----
 .../java/net/osmand/binary/StringBundle.java  |  54 ++---
 .../net/osmand/binary/StringBundleWriter.java |   4 +-
 .../osmand/binary/StringBundleXmlWriter.java  |  18 +-
 .../java/net/osmand/router/RouteImporter.java | 138 +++++--------
 5 files changed, 225 insertions(+), 179 deletions(-)

diff --git a/OsmAnd-java/src/main/java/net/osmand/GPXUtilities.java b/OsmAnd-java/src/main/java/net/osmand/GPXUtilities.java
index 3b003d1735..48b8a9fbee 100644
--- a/OsmAnd-java/src/main/java/net/osmand/GPXUtilities.java
+++ b/OsmAnd-java/src/main/java/net/osmand/GPXUtilities.java
@@ -2,6 +2,9 @@
 package net.osmand;
 
 
+import net.osmand.binary.StringBundle;
+import net.osmand.binary.StringBundleWriter;
+import net.osmand.binary.StringBundleXmlWriter;
 import net.osmand.data.QuadRect;
 import net.osmand.util.Algorithms;
 
@@ -13,7 +16,6 @@ import org.xmlpull.v1.XmlSerializer;
 import java.io.BufferedInputStream;
 import java.io.File;
 import java.io.FileInputStream;
-import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
@@ -437,6 +439,44 @@ public class GPXUtilities {
 		public double maxlon;
 	}
 
+	public static class RouteSegment {
+		public String id;
+		public String length;
+		public String segmentTime;
+		public String speed;
+		public String turnType;
+		public String turnAngle;
+		public String types;
+		public String pointTypes;
+		public String names;
+
+		public StringBundle getStringBundle() {
+			StringBundle bundle = new StringBundle();
+			bundle.putString("id", id);
+			bundle.putString("length", length);
+			bundle.putString("segmentTime", segmentTime);
+			bundle.putString("speed", speed);
+			bundle.putString("turnType", turnType);
+			bundle.putString("turnAngle", turnAngle);
+			bundle.putString("types", types);
+			bundle.putString("pointTypes", pointTypes);
+			bundle.putString("names", names);
+			return bundle;
+		}
+	}
+
+	public static class RouteType {
+		public String tag;
+		public String value;
+
+		public StringBundle getStringBundle() {
+			StringBundle bundle = new StringBundle();
+			bundle.putString("t", tag);
+			bundle.putString("v", value);
+			return bundle;
+		}
+	}
+
 	public static class GPXTrackAnalysis {
 		public float totalDistance = 0;
 		public float totalDistanceWithoutGaps = 0;
@@ -1006,6 +1046,9 @@ public class GPXUtilities {
 		private List<WptPt> points = new ArrayList<>();
 		public List<Route> routes = new ArrayList<>();
 
+		public List<RouteSegment> routeSegments = new ArrayList<>();
+		public List<RouteType> routeTypes = new ArrayList<>();
+
 		public Exception error = null;
 		public String path = "";
 		public boolean showCurrentTrack;
@@ -1032,6 +1075,10 @@ public class GPXUtilities {
 			}
 		}
 
+		public boolean hasRoute() {
+			return !routeSegments.isEmpty() && !routeTypes.isEmpty();
+		}
+
 		public List<WptPt> getPoints() {
 			return Collections.unmodifiableList(points);
 		}
@@ -1744,6 +1791,7 @@ public class GPXUtilities {
 				serializer.endTag(null, "wpt"); //$NON-NLS-1$
 			}
 
+			assignRouteExtensionWriter(file);
 			writeExtensions(serializer, file);
 
 			serializer.endTag(null, "gpx"); //$NON-NLS-1$
@@ -1756,6 +1804,29 @@ public class GPXUtilities {
 		return null;
 	}
 
+	private static void assignRouteExtensionWriter(final GPXFile gpxFile) {
+		if (gpxFile.hasRoute() && gpxFile.getExtensionsWriter() == null) {
+			gpxFile.setExtensionsWriter(new GPXExtensionsWriter() {
+				@Override
+				public void writeExtensions(XmlSerializer serializer) {
+					StringBundle bundle = new StringBundle();
+					List<StringBundle> segmentsBundle = new ArrayList<>();
+					for (RouteSegment segment : gpxFile.routeSegments) {
+						segmentsBundle.add(segment.getStringBundle());
+					}
+					bundle.putBundleList("route", "segment", segmentsBundle);
+					List<StringBundle> typesBundle = new ArrayList<>();
+					for (RouteType routeType : gpxFile.routeTypes) {
+						typesBundle.add(routeType.getStringBundle());
+					}
+					bundle.putBundleList("types", "type", typesBundle);
+					StringBundleWriter bundleWriter = new StringBundleXmlWriter(bundle, serializer);
+					bundleWriter.writeBundle();
+				}
+			});
+		}
+	}
+
 	private static String getFilename(String path) {
 		if(path != null) {
 			int i = path.lastIndexOf('/');
@@ -1973,23 +2044,7 @@ public class GPXUtilities {
 	}
 
 	public static GPXFile loadGPXFile(InputStream f) {
-		return loadGPXFile(f, null, null);
-	}
-
-	public static GPXFile loadGPXFile(InputStream f, GPXFile gpxFile, GPXExtensionsReader extensionsReader) {
-		boolean readExtensionsOnly = false;
-		if (gpxFile == null) {
-			gpxFile = new GPXFile(null);
-		} else {
-			if (f == null) {
-				try {
-					f = new FileInputStream(new File(gpxFile.path));
-				} catch (FileNotFoundException e) {
-					return gpxFile;
-				}
-			}
-			readExtensionsOnly = extensionsReader != null;
-		}
+		GPXFile gpxFile = new GPXFile(null);
 		SimpleDateFormat format = new SimpleDateFormat(GPX_TIME_FORMAT, Locale.US);
 		format.setTimeZone(TimeZone.getTimeZone("UTC"));
 		SimpleDateFormat formatMillis = new SimpleDateFormat(GPX_TIME_FORMAT_MILLIS, Locale.US);
@@ -2003,6 +2058,10 @@ public class GPXUtilities {
 			Stack<GPXExtensions> parserState = new Stack<>();
 			boolean extensionReadMode = false;
 			boolean routePointExtension = false;
+			List<RouteSegment> routeSegments = gpxFile.routeSegments;
+			List<RouteType> routeTypes = gpxFile.routeTypes;
+			boolean routeExtension = false;
+			boolean typesExtension = false;
 			parserState.push(gpxFile);
 			int tok;
 			while ((tok = parser.next()) != XmlPullParser.END_DOCUMENT) {
@@ -2011,37 +2070,50 @@ public class GPXUtilities {
 					String tag = parser.getName();
 					if (extensionReadMode && parse != null && !routePointExtension) {
 						String tagName = tag.toLowerCase();
-						boolean extensionsRead = false;
-						if (extensionsReader != null) {
-							extensionsRead = extensionsReader.readExtensions(gpxFile, parser);
+						if (routeExtension) {
+							if (tagName.equals("segment")) {
+								RouteSegment segment = parseRouteSegmentAttributes(parser);
+								routeSegments.add(segment);
+							}
+						} else if (typesExtension) {
+							if (tagName.equals("type")) {
+								RouteType type = parseRouteTypeAttributes(parser);
+								routeTypes.add(type);
+							}
 						}
-						if (!readExtensionsOnly && !extensionsRead) {
-							switch (tagName) {
-								case "routepointextension":
-									routePointExtension = true;
-									if (parse instanceof WptPt) {
-										parse.getExtensionsToWrite().put("offset", routeTrackSegment.points.size() + "");
-									}
-									break;
+						switch (tagName) {
+							case "routepointextension":
+								routePointExtension = true;
+								if (parse instanceof WptPt) {
+									parse.getExtensionsToWrite().put("offset", routeTrackSegment.points.size() + "");
+								}
+								break;
 
-								default:
-									Map<String, String> values = readTextMap(parser, tag);
-									if (values.size() > 0) {
-										for (Entry<String, String> entry : values.entrySet()) {
-											String t = entry.getKey().toLowerCase();
-											String value = entry.getValue();
-											parse.getExtensionsToWrite().put(t, value);
-											if (tag.equals("speed") && parse instanceof WptPt) {
-												try {
-													((WptPt) parse).speed = Float.parseFloat(value);
-												} catch (NumberFormatException e) {
-													log.debug(e.getMessage(), e);
-												}
+							case "route":
+								routeExtension = true;
+								break;
+
+							case "types":
+								typesExtension = true;
+								break;
+
+							default:
+								Map<String, String> values = readTextMap(parser, tag);
+								if (values.size() > 0) {
+									for (Entry<String, String> entry : values.entrySet()) {
+										String t = entry.getKey().toLowerCase();
+										String value = entry.getValue();
+										parse.getExtensionsToWrite().put(t, value);
+										if (tag.equals("speed") && parse instanceof WptPt) {
+											try {
+												((WptPt) parse).speed = Float.parseFloat(value);
+											} catch (NumberFormatException e) {
+												log.debug(e.getMessage(), e);
 											}
 										}
 									}
-									break;
-							}
+								}
+								break;
 						}
 					} else if (parse != null && tag.equals("extensions")) {
 						extensionReadMode = true;
@@ -2051,7 +2123,7 @@ public class GPXUtilities {
 							routeTrackSegment.points.add(wptPt);
 							parserState.push(wptPt);
 						}
-					} else if (!readExtensionsOnly) {
+					} else {
 						if (parse instanceof GPXFile) {
 							if (tag.equals("gpx")) {
 								((GPXFile) parse).author = parser.getAttributeValue("", "creator");
@@ -2247,7 +2319,12 @@ public class GPXUtilities {
 					if (parse != null && tag.equals("extensions")) {
 						extensionReadMode = false;
 					}
-					if (readExtensionsOnly) {
+					if (extensionReadMode && tag.equals("route")) {
+						routeExtension = false;
+						continue;
+					}
+					if (extensionReadMode && tag.equals("types")) {
+						typesExtension = false;
 						continue;
 					}
 
@@ -2327,6 +2404,27 @@ public class GPXUtilities {
 		return wpt;
 	}
 
+	private static RouteSegment parseRouteSegmentAttributes(XmlPullParser parser) {
+		RouteSegment segment = new RouteSegment();
+		segment.id = parser.getAttributeValue("", "id");
+		segment.length = parser.getAttributeValue("", "length");
+		segment.segmentTime = parser.getAttributeValue("", "segmentTime");
+		segment.speed = parser.getAttributeValue("", "speed");
+		segment.turnType = parser.getAttributeValue("", "turnType");
+		segment.turnAngle = parser.getAttributeValue("", "turnAngle");
+		segment.types = parser.getAttributeValue("", "types");
+		segment.pointTypes = parser.getAttributeValue("", "pointTypes");
+		segment.names = parser.getAttributeValue("", "names");
+		return segment;
+	}
+
+	private static RouteType parseRouteTypeAttributes(XmlPullParser parser) {
+		RouteType type = new RouteType();
+		type.tag = parser.getAttributeValue("", "t");
+		type.value = parser.getAttributeValue("", "v");
+		return type;
+	}
+
 	private static Bounds parseBoundsAttributes(XmlPullParser parser) {
 		Bounds bounds = new Bounds();
 		try {
diff --git a/OsmAnd-java/src/main/java/net/osmand/binary/StringBundle.java b/OsmAnd-java/src/main/java/net/osmand/binary/StringBundle.java
index dd66cfc969..ad54015c07 100644
--- a/OsmAnd-java/src/main/java/net/osmand/binary/StringBundle.java
+++ b/OsmAnd-java/src/main/java/net/osmand/binary/StringBundle.java
@@ -21,7 +21,7 @@ public class StringBundle {
 	private static final DecimalFormat FIVE_DIGITS_FORMATTER = new DecimalFormat("#.#####");
 	private static final DecimalFormat SIX_DIGITS_FORMATTER = new DecimalFormat("#.######");
 
-	private Map<String, Item> map = new LinkedHashMap<>();
+	private Map<String, Item<?>> map = new LinkedHashMap<>();
 
 	public enum ItemType {
 		STRING,
@@ -32,7 +32,7 @@ public class StringBundle {
 	public StringBundle() {
 	}
 
-	protected StringBundle(Map<String, Item> map) {
+	protected StringBundle(Map<String, Item<?>> map) {
 		this.map = map;
 	}
 
@@ -156,16 +156,16 @@ public class StringBundle {
 		}
 	}
 
-	public static class StringListItem extends Item<List<Item>> {
+	public static class StringListItem extends Item<List<Item<?>>> {
 
-		private StringListItem(String name, List<Item> list) {
+		private StringListItem(String name, List<Item<?>> list) {
 			super(name, ItemType.LIST, list);
 		}
 	}
 
-	public static class StringMapItem extends Item<Map<String, Item>> {
+	public static class StringMapItem extends Item<Map<String, Item<?>>> {
 
-		private StringMapItem(String name, Map<String, Item> map) {
+		private StringMapItem(String name, Map<String, Item<?>> map) {
 			super(name, ItemType.MAP, map);
 		}
 	}
@@ -177,11 +177,11 @@ public class StringBundle {
 		}
 	}
 
-	public Map<String, Item> getMap() {
+	public Map<String, Item<?>> getMap() {
 		return Collections.unmodifiableMap(map);
 	}
 
-	public Item getItem(String key) {
+	public Item<?> getItem(String key) {
 		return map.get(key);
 	}
 
@@ -190,7 +190,7 @@ public class StringBundle {
 	}
 
 	public int getInt(String key, int defaultValue) {
-		Item item = map.get(key);
+		Item<?> item = map.get(key);
 		return item instanceof StringItem ? ((StringItem) item).asInt(defaultValue) : defaultValue;
 	}
 
@@ -199,7 +199,7 @@ public class StringBundle {
 	}
 
 	public long getLong(String key, long defaultValue) {
-		Item item = map.get(key);
+		Item<?> item = map.get(key);
 		return item instanceof StringItem ? ((StringItem) item).asLong(defaultValue) : defaultValue;
 	}
 
@@ -212,7 +212,7 @@ public class StringBundle {
 	}
 
 	public float getFloat(String key, float defaultValue) {
-		Item item = map.get(key);
+		Item<?> item = map.get(key);
 		return item instanceof StringItem ? ((StringItem) item).asFloat(defaultValue) : defaultValue;
 	}
 
@@ -221,7 +221,7 @@ public class StringBundle {
 	}
 
 	public boolean getBoolean(String key, boolean defaultValue) {
-		Item item = map.get(key);
+		Item<?> item = map.get(key);
 		return item instanceof StringItem ? ((StringItem) item).asBoolean(defaultValue) : defaultValue;
 	}
 
@@ -232,35 +232,13 @@ public class StringBundle {
 	}
 
 	public String getString(String key, String defaultValue) {
-		Item item = map.get(key);
+		Item<?> item = map.get(key);
 		return item instanceof StringItem ? ((StringItem) item).getValue() : defaultValue;
 	}
 
-	public void putObject(String key, StringExternalizable object) {
-		if (object != null) {
-			StringBundle bundle = newInstance();
-			object.writeToBundle(bundle);
-			map.put(key, new StringBundleItem(key, bundle));
-		}
-	}
-
-	public void putList(String key, String itemName, List<? extends StringExternalizable> list) {
-		if (list != null) {
-			List<Item> itemList = new ArrayList<>();
-			for (StringExternalizable ex : list) {
-				if (ex != null) {
-					StringBundle bundle = newInstance();
-					ex.writeToBundle(bundle);
-					itemList.add(new StringBundleItem(itemName, bundle));
-				}
-			}
-			map.put(key, new StringListItem(key, itemList));
-		}
-	}
-
 	public void putBundleList(String key, String itemName, List<StringBundle> list) {
 		if (list != null) {
-			List<Item> itemList = new ArrayList<>();
+			List<Item<?>> itemList = new ArrayList<>();
 			for (StringBundle bundle : list) {
 				itemList.add(new StringBundleItem(itemName, bundle));
 			}
@@ -279,7 +257,7 @@ public class StringBundle {
 	}
 
 	public int[] getIntArray(String key, int[] defaultValue) {
-		Item item = map.get(key);
+		Item<?> item = map.get(key);
 		return item instanceof StringItem ? ((StringItem) item).asIntArray(defaultValue) : defaultValue;
 	}
 
@@ -290,7 +268,7 @@ public class StringBundle {
 	}
 
 	public int[][] getIntIntArray(String key, int[][] defaultValue) {
-		Item item = map.get(key);
+		Item<?> item = map.get(key);
 		return item instanceof StringItem ? ((StringItem) item).asIntIntArray(defaultValue) : defaultValue;
 	}
 
diff --git a/OsmAnd-java/src/main/java/net/osmand/binary/StringBundleWriter.java b/OsmAnd-java/src/main/java/net/osmand/binary/StringBundleWriter.java
index 36edaf268c..2f607aef3a 100644
--- a/OsmAnd-java/src/main/java/net/osmand/binary/StringBundleWriter.java
+++ b/OsmAnd-java/src/main/java/net/osmand/binary/StringBundleWriter.java
@@ -16,10 +16,10 @@ public abstract class StringBundleWriter {
 		return bundle;
 	}
 
-	protected abstract void writeItem(String name, Item item);
+	protected abstract void writeItem(String name, Item<?> item);
 
 	public void writeBundle() {
-		for (Entry<String, Item> entry : bundle.getMap().entrySet()) {
+		for (Entry<String, Item<?>> entry : bundle.getMap().entrySet()) {
 			writeItem(entry.getKey(), entry.getValue());
 		}
 	}
diff --git a/OsmAnd-java/src/main/java/net/osmand/binary/StringBundleXmlWriter.java b/OsmAnd-java/src/main/java/net/osmand/binary/StringBundleXmlWriter.java
index a676f20c88..f1c8dc1054 100644
--- a/OsmAnd-java/src/main/java/net/osmand/binary/StringBundleXmlWriter.java
+++ b/OsmAnd-java/src/main/java/net/osmand/binary/StringBundleXmlWriter.java
@@ -25,7 +25,7 @@ public class StringBundleXmlWriter extends StringBundleWriter {
 	}
 
 	@Override
-	protected void writeItem(String name, Item item) {
+	protected void writeItem(String name, Item<?> item) {
 		if (serializer != null) {
 			try {
 				writeItemImpl(name, item);
@@ -47,7 +47,7 @@ public class StringBundleXmlWriter extends StringBundleWriter {
 		}
 	}
 
-	private void writeItemImpl(String name, Item item) throws IOException {
+	private void writeItemImpl(String name, Item<?> item) throws IOException {
 		if (serializer != null && item != null) {
 			switch (item.getType()) {
 				case STRING: {
@@ -58,13 +58,13 @@ public class StringBundleXmlWriter extends StringBundleWriter {
 				case LIST: {
 					StringListItem listItem = (StringListItem) item;
 					serializer.startTag(null, name);
-					List<Item> list = listItem.getValue();
-					for (Item i : list) {
+					List<Item<?>> list = listItem.getValue();
+					for (Item<?> i : list) {
 						if (i.getType() == StringBundle.ItemType.STRING) {
 							writeItemImpl(i.getName(), i);
 						}
 					}
-					for (Item i : list) {
+					for (Item<?> i : list) {
 						if (i.getType() != StringBundle.ItemType.STRING) {
 							writeItemImpl(i.getName(), i);
 						}
@@ -75,14 +75,14 @@ public class StringBundleXmlWriter extends StringBundleWriter {
 				case MAP: {
 					StringMapItem mapItem = (StringMapItem) item;
 					serializer.startTag(null, name);
-					for (Entry<String, Item> entry : mapItem.getValue().entrySet()) {
-						Item i = entry.getValue();
+					for (Entry<String, Item<?>> entry : mapItem.getValue().entrySet()) {
+						Item<?> i = entry.getValue();
 						if (i.getType() == StringBundle.ItemType.STRING) {
 							writeItemImpl(entry.getKey(), i);
 						}
 					}
-					for (Entry<String, Item> entry : mapItem.getValue().entrySet()) {
-						Item i = entry.getValue();
+					for (Entry<String, Item<?>> entry : mapItem.getValue().entrySet()) {
+						Item<?> i = entry.getValue();
 						if (i.getType() != StringBundle.ItemType.STRING) {
 							writeItemImpl(entry.getKey(), i);
 						}
diff --git a/OsmAnd-java/src/main/java/net/osmand/router/RouteImporter.java b/OsmAnd-java/src/main/java/net/osmand/router/RouteImporter.java
index db6e14a31f..9c790229a1 100644
--- a/OsmAnd-java/src/main/java/net/osmand/router/RouteImporter.java
+++ b/OsmAnd-java/src/main/java/net/osmand/router/RouteImporter.java
@@ -1,8 +1,9 @@
 package net.osmand.router;
 
 import net.osmand.GPXUtilities;
-import net.osmand.GPXUtilities.GPXExtensionsReader;
 import net.osmand.GPXUtilities.GPXFile;
+import net.osmand.GPXUtilities.RouteSegment;
+import net.osmand.GPXUtilities.RouteType;
 import net.osmand.GPXUtilities.WptPt;
 import net.osmand.Location;
 import net.osmand.PlatformUtil;
@@ -10,11 +11,8 @@ import net.osmand.binary.BinaryMapRouteReaderAdapter.RouteRegion;
 import net.osmand.binary.RouteDataBundle;
 import net.osmand.binary.RouteDataObject;
 import net.osmand.binary.StringBundle;
-import net.osmand.binary.StringBundleReader;
-import net.osmand.binary.StringBundleXmlReader;
 
 import org.apache.commons.logging.Log;
-import org.xmlpull.v1.XmlPullParser;
 
 import java.io.File;
 import java.io.FileInputStream;
@@ -31,6 +29,10 @@ public class RouteImporter {
 	private File file;
 	private GPXFile gpxFile;
 
+	private List<RouteSegmentResult> route = new ArrayList<>();
+	private RouteRegion region = new RouteRegion();
+	private RouteDataResources resources = new RouteDataResources();
+
 	public RouteImporter(File file) {
 		this.file = file;
 	}
@@ -40,90 +42,14 @@ public class RouteImporter {
 	}
 
 	public List<RouteSegmentResult> importRoute() {
-
-		final List<RouteSegmentResult> route = new ArrayList<>();
-		final RouteRegion region = new RouteRegion();
-		final RouteDataResources resources = new RouteDataResources();
-
-		GPXExtensionsReader extensionsReader = new GPXExtensionsReader() {
-			@Override
-			public boolean readExtensions(GPXFile res, XmlPullParser parser) throws Exception {
-				if (!resources.hasLocations()) {
-					List<Location> locations = resources.getLocations();
-					double lastElevation = HEIGHT_UNDEFINED;
-					if (res.tracks.size() > 0 && res.tracks.get(0).segments.size() > 0 && res.tracks.get(0).segments.get(0).points.size() > 0) {
-						for (WptPt point : res.tracks.get(0).segments.get(0).points) {
-							Location loc = new Location("", point.getLatitude(), point.getLongitude());
-							if (!Double.isNaN(point.ele)) {
-								loc.setAltitude(point.ele);
-								lastElevation = point.ele;
-							} else if (lastElevation != HEIGHT_UNDEFINED) {
-								loc.setAltitude(lastElevation);
-							}
-							locations.add(loc);
-						}
-					}
-				}
-				String tag = parser.getName();
-				if ("route".equals(tag)) {
-					int tok;
-					while ((tok = parser.next()) != XmlPullParser.END_DOCUMENT) {
-						if (tok == XmlPullParser.START_TAG) {
-							tag = parser.getName();
-							if ("segment".equals(tag)) {
-								StringBundleReader bundleReader = new StringBundleXmlReader(parser);
-								RouteDataObject object = new RouteDataObject(region);
-								RouteSegmentResult segment = new RouteSegmentResult(object);
-								bundleReader.readBundle();
-								segment.readFromBundle(new RouteDataBundle(resources, bundleReader.getBundle()));
-								route.add(segment);
-							}
-						} else if (tok == XmlPullParser.END_TAG) {
-							tag = parser.getName();
-							if ("route".equals(tag)) {
-								return true;
-							}
-						}
-					}
-				} else if ("types".equals(tag)) {
-					int tok;
-					int i = 0;
-					while ((tok = parser.next()) != XmlPullParser.END_DOCUMENT) {
-						if (tok == XmlPullParser.START_TAG) {
-							tag = parser.getName();
-							if ("type".equals(tag)) {
-								StringBundleReader bundleReader = new StringBundleXmlReader(parser);
-								bundleReader.readBundle();
-								StringBundle bundle = bundleReader.getBundle();
-								String t = bundle.getString("t", null);
-								String v = bundle.getString("v", null);
-								region.initRouteEncodingRule(i++, t, v);
-							}
-						} else if (tok == XmlPullParser.END_TAG) {
-							tag = parser.getName();
-							if ("types".equals(tag)) {
-								return true;
-							}
-						}
-					}
-				}
-				return false;
-			}
-		};
-
 		if (gpxFile != null) {
-			GPXUtilities.loadGPXFile(null, gpxFile, extensionsReader);
-			for (RouteSegmentResult segment : route) {
-				segment.fillNames(resources);
-			}
+			parseRoute();
 		} else if (file != null) {
 			FileInputStream fis = null;
 			try {
 				fis = new FileInputStream(file);
-				GPXFile gpxFile = GPXUtilities.loadGPXFile(fis, null, extensionsReader);
-				for (RouteSegmentResult segment : route) {
-					segment.fillNames(resources);
-				}
+				gpxFile = GPXUtilities.loadGPXFile(fis);
+				parseRoute();
 				gpxFile.path = file.getAbsolutePath();
 				gpxFile.modifiedTime = file.lastModified();
 			} catch (IOException e) {
@@ -139,7 +65,51 @@ public class RouteImporter {
 				}
 			}
 		}
-
 		return route;
 	}
+
+	private void parseRoute() {
+		collectLocations();
+		collectSegments();
+		collectTypes();
+		for (RouteSegmentResult segment : route) {
+			segment.fillNames(resources);
+		}
+	}
+
+	private void collectLocations() {
+		List<Location> locations = resources.getLocations();
+		double lastElevation = HEIGHT_UNDEFINED;
+		if (gpxFile.tracks.size() > 0 && gpxFile.tracks.get(0).segments.size() > 0 && gpxFile.tracks.get(0).segments.get(0).points.size() > 0) {
+			for (WptPt point : gpxFile.tracks.get(0).segments.get(0).points) {
+				Location loc = new Location("", point.getLatitude(), point.getLongitude());
+				if (!Double.isNaN(point.ele)) {
+					loc.setAltitude(point.ele);
+					lastElevation = point.ele;
+				} else if (lastElevation != HEIGHT_UNDEFINED) {
+					loc.setAltitude(lastElevation);
+				}
+				locations.add(loc);
+			}
+		}
+	}
+
+	private void collectSegments() {
+		for (RouteSegment segment : gpxFile.routeSegments) {
+			RouteDataObject object = new RouteDataObject(region);
+			RouteSegmentResult segmentResult = new RouteSegmentResult(object);
+			segmentResult.readFromBundle(new RouteDataBundle(resources, segment.getStringBundle()));
+			route.add(segmentResult);
+		}
+	}
+
+	private void collectTypes() {
+		int i = 0;
+		for (RouteType routeType : gpxFile.routeTypes) {
+			StringBundle bundle = routeType.getStringBundle();
+			String t = bundle.getString("t", null);
+			String v = bundle.getString("v", null);
+			region.initRouteEncodingRule(i++, t, v);
+		}
+	}
 }

From e76ce2dc1dcc040cb2c50b61a6621144978d44e7 Mon Sep 17 00:00:00 2001
From: simon <myhosting2012@gmail.com>
Date: Mon, 17 Aug 2020 11:11:54 +0300
Subject: [PATCH 79/81] style issues

---
 .../osmand/plus/settings/fragments/RouteParametersFragment.java  | 1 -
 1 file changed, 1 deletion(-)

diff --git a/OsmAnd/src/net/osmand/plus/settings/fragments/RouteParametersFragment.java b/OsmAnd/src/net/osmand/plus/settings/fragments/RouteParametersFragment.java
index b2707ef0a8..608c016901 100644
--- a/OsmAnd/src/net/osmand/plus/settings/fragments/RouteParametersFragment.java
+++ b/OsmAnd/src/net/osmand/plus/settings/fragments/RouteParametersFragment.java
@@ -476,7 +476,6 @@ public class RouteParametersFragment extends BaseSettingsFragment implements OnP
 			updateRouteRecalcDistancePref();
 		} else if (settings.DISABLE_WRONG_DIRECTION_RECALC.getId().equals(prefId)){
 			applyPreference(settings.DISABLE_WRONG_DIRECTION_RECALC.getId(), applyToAllProfiles, newValue);
-			//updateRouteRecalcWrongDirectionPref();
 		} else {
 			super.onApplyPreferenceChange(prefId, applyToAllProfiles, newValue);
 		}

From e528262d66e3076308ff49968fa587c204d16ad1 Mon Sep 17 00:00:00 2001
From: Dima-1 <softmail32@gmail.com>
Date: Mon, 17 Aug 2020 14:23:10 +0300
Subject: [PATCH 80/81] Merge with master

---
 .../plus/measurementtool/command/ChangeRouteModeCommand.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/command/ChangeRouteModeCommand.java b/OsmAnd/src/net/osmand/plus/measurementtool/command/ChangeRouteModeCommand.java
index 80d8648480..d41c11f0d0 100644
--- a/OsmAnd/src/net/osmand/plus/measurementtool/command/ChangeRouteModeCommand.java
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/command/ChangeRouteModeCommand.java
@@ -22,7 +22,7 @@ public class ChangeRouteModeCommand extends MeasurementModeCommand {
 
 	public ChangeRouteModeCommand(MeasurementToolLayer measurementLayer, ApplicationMode newMode,
 	                              CalculationMode newCalculationMode) {
-		this.measurementLayer = measurementLayer;
+		super(measurementLayer);
 		this.newMode = newMode;
 		this.newCalculationMode = newCalculationMode;
 		MeasurementEditingContext editingCtx = measurementLayer.getEditingCtx();

From 1f1b1b33ab740379e22250279b36509b9d99a87b Mon Sep 17 00:00:00 2001
From: Dima-1 <softmail32@gmail.com>
Date: Mon, 17 Aug 2020 14:37:15 +0300
Subject: [PATCH 81/81] ChangeRouteModeCommand refactoring

---
 .../command/ChangeRouteModeCommand.java       | 40 +++++++------------
 1 file changed, 15 insertions(+), 25 deletions(-)

diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/command/ChangeRouteModeCommand.java b/OsmAnd/src/net/osmand/plus/measurementtool/command/ChangeRouteModeCommand.java
index d41c11f0d0..064c3bf103 100644
--- a/OsmAnd/src/net/osmand/plus/measurementtool/command/ChangeRouteModeCommand.java
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/command/ChangeRouteModeCommand.java
@@ -19,42 +19,28 @@ public class ChangeRouteModeCommand extends MeasurementModeCommand {
 	CalculationMode oldCalculationMode;
 	CalculationMode newCalculationMode;
 
-
 	public ChangeRouteModeCommand(MeasurementToolLayer measurementLayer, ApplicationMode newMode,
 	                              CalculationMode newCalculationMode) {
 		super(measurementLayer);
 		this.newMode = newMode;
 		this.newCalculationMode = newCalculationMode;
-		MeasurementEditingContext editingCtx = measurementLayer.getEditingCtx();
+		MeasurementEditingContext editingCtx = getEditingCtx();
 		oldMode = editingCtx.getSnapToRoadAppMode();
 		oldCalculationMode = editingCtx.getCalculationMode();
 	}
 
 	@Override
 	public boolean execute() {
-		MeasurementEditingContext editingCtx = measurementLayer.getEditingCtx();
+		MeasurementEditingContext editingCtx = getEditingCtx();
 		points = new LinkedList<>(editingCtx.getPoints());
 		pointIdx = points.size() - 1;
-		if (pointIdx > 0 && newCalculationMode != CalculationMode.WHOLE_TRACK) {
-			if (newMode != null) {
-				points.get(pointIdx).setProfileType(newMode.getStringKey());
-			} else {
-				points.get(pointIdx).removeProfileType();
-			}
-		}
-		editingCtx.setCalculationMode(newCalculationMode);
-		editingCtx.setInSnapToRoadMode(true);
-		editingCtx.setSnapToRoadAppMode(newMode);
-		if (newCalculationMode == CalculationMode.WHOLE_TRACK) {
-			editingCtx.clearSnappedToRoadPoints();
-		}
-		editingCtx.setNeedUpdateCacheForSnap(true);
+		executeCommand();
 		return true;
 	}
 
 	@Override
 	public void undo() {
-		MeasurementEditingContext editingCtx = measurementLayer.getEditingCtx();
+		MeasurementEditingContext editingCtx = getEditingCtx();
 		editingCtx.getPoints().clear();
 		editingCtx.addPoints(points);
 		editingCtx.setSnapToRoadAppMode(oldMode);
@@ -68,8 +54,17 @@ public class ChangeRouteModeCommand extends MeasurementModeCommand {
 
 	@Override
 	public void redo() {
-		MeasurementEditingContext editingCtx = measurementLayer.getEditingCtx();
-		if (pointIdx > 0) {
+		executeCommand();
+	}
+
+	@Override
+	MeasurementCommandType getType() {
+		return MeasurementCommandType.CHANGE_ROUTE_MODE;
+	}
+
+	private void executeCommand() {
+		MeasurementEditingContext editingCtx = getEditingCtx();
+		if (pointIdx > 0 && newCalculationMode != CalculationMode.WHOLE_TRACK) {
 			if (newMode != null) {
 				points.get(pointIdx).setProfileType(newMode.getStringKey());
 			} else {
@@ -84,9 +79,4 @@ public class ChangeRouteModeCommand extends MeasurementModeCommand {
 		}
 		editingCtx.setNeedUpdateCacheForSnap(true);
 	}
-
-	@Override
-	MeasurementCommandType getType() {
-		return MeasurementCommandType.CHANGE_ROUTE_MODE;
-	}
 }