From 1ab34b31d90a2521426c0269f896814f5d7632a0 Mon Sep 17 00:00:00 2001
From: Alexander Sytnyk <asytnyk0@gmail.com>
Date: Mon, 30 Oct 2017 19:07:34 +0200
Subject: [PATCH 01/17] Change the button in the context menu of the marker

---
 OsmAnd/res/drawable/passed_icon_dark.xml           | 14 ++++++++++++++
 OsmAnd/res/drawable/passed_icon_light.xml          | 14 ++++++++++++++
 OsmAnd/res/values/strings.xml                      |  1 +
 .../osmand/plus/mapcontextmenu/MenuController.java |  7 ++++++-
 .../controllers/MapMarkerMenuController.java       |  5 +++--
 5 files changed, 38 insertions(+), 3 deletions(-)
 create mode 100644 OsmAnd/res/drawable/passed_icon_dark.xml
 create mode 100644 OsmAnd/res/drawable/passed_icon_light.xml

diff --git a/OsmAnd/res/drawable/passed_icon_dark.xml b/OsmAnd/res/drawable/passed_icon_dark.xml
new file mode 100644
index 0000000000..5840e824ef
--- /dev/null
+++ b/OsmAnd/res/drawable/passed_icon_dark.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <inset
+            android:insetRight="@dimen/context_menu_first_line_top_margin">
+            <shape
+                xmlns:android="http://schemas.android.com/apk/res/android"
+                android:shape="oval">
+                <solid android:color="@color/osmand_orange"/>
+            </shape>
+        </inset>
+    </item>
+    <item android:drawable="@drawable/ic_action_marker_passed"/>
+</layer-list>
\ No newline at end of file
diff --git a/OsmAnd/res/drawable/passed_icon_light.xml b/OsmAnd/res/drawable/passed_icon_light.xml
new file mode 100644
index 0000000000..dfd857243c
--- /dev/null
+++ b/OsmAnd/res/drawable/passed_icon_light.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <inset
+            android:insetRight="@dimen/context_menu_first_line_top_margin">
+            <shape
+                xmlns:android="http://schemas.android.com/apk/res/android"
+                android:shape="oval">
+                <solid android:color="@color/map_widget_blue"/>
+            </shape>
+        </inset>
+    </item>
+    <item android:drawable="@drawable/ic_action_marker_passed"/>
+</layer-list>
\ No newline at end of file
diff --git a/OsmAnd/res/values/strings.xml b/OsmAnd/res/values/strings.xml
index 5a2cefd2bc..5ee1875254 100644
--- a/OsmAnd/res/values/strings.xml
+++ b/OsmAnd/res/values/strings.xml
@@ -9,6 +9,7 @@
          3. All your modified/created strings are in the top of the file (to make easier find what\'s translated).
     PLEASE: Have a look at http://code.google.com/p/osmand/wiki/UIConsistency, it may really improve your and our work  :-)  Thx - Hardy
     -->
+    <string name="mark_passed">Mark passed</string>
     <string name="import_gpx_file_description">can be imported as Favorites points, or as track file.</string>
     <string name="import_as_gpx">Import as GPX file</string>
     <string name="import_as_favorites">Import as Favorites</string>
diff --git a/OsmAnd/src/net/osmand/plus/mapcontextmenu/MenuController.java b/OsmAnd/src/net/osmand/plus/mapcontextmenu/MenuController.java
index 894018ab7c..bd07191281 100644
--- a/OsmAnd/src/net/osmand/plus/mapcontextmenu/MenuController.java
+++ b/OsmAnd/src/net/osmand/plus/mapcontextmenu/MenuController.java
@@ -3,6 +3,7 @@ package net.osmand.plus.mapcontextmenu;
 import android.graphics.drawable.Drawable;
 import android.os.AsyncTask;
 import android.support.annotation.NonNull;
+import android.support.v4.content.ContextCompat;
 import android.view.View;
 import android.view.View.OnClickListener;
 import android.widget.LinearLayout;
@@ -495,10 +496,14 @@ public abstract class MenuController extends BaseMenuController {
 		public boolean needRightText = false;
 		public String rightTextCaption = "";
 		public boolean visible = true;
+		public boolean needColorizeIcon = true;
 
 		public Drawable getLeftIcon() {
 			if (leftIconId != 0) {
-				return getIcon(leftIconId, isLight() ? R.color.map_widget_blue : R.color.osmand_orange);
+				if (needColorizeIcon) {
+					return getIcon(leftIconId, isLight() ? R.color.map_widget_blue : R.color.osmand_orange);
+				}
+				return ContextCompat.getDrawable(getMapActivity(), leftIconId);
 			} else {
 				return null;
 			}
diff --git a/OsmAnd/src/net/osmand/plus/mapcontextmenu/controllers/MapMarkerMenuController.java b/OsmAnd/src/net/osmand/plus/mapcontextmenu/controllers/MapMarkerMenuController.java
index 875b8f0fdb..ac25b91059 100644
--- a/OsmAnd/src/net/osmand/plus/mapcontextmenu/controllers/MapMarkerMenuController.java
+++ b/OsmAnd/src/net/osmand/plus/mapcontextmenu/controllers/MapMarkerMenuController.java
@@ -28,8 +28,9 @@ public class MapMarkerMenuController extends MenuController {
 				getMapActivity().getContextMenu().close();
 			}
 		};
-		leftTitleButtonController.caption = getMapActivity().getString(R.string.shared_string_remove);
-		leftTitleButtonController.leftIconId = R.drawable.ic_action_delete_dark;
+		leftTitleButtonController.needColorizeIcon = false;
+		leftTitleButtonController.caption = getMapActivity().getString(R.string.mark_passed);
+		leftTitleButtonController.leftIconId = isLight() ? R.drawable.passed_icon_light : R.drawable.passed_icon_dark;
 	}
 
 	@Override

From 381ccc03150fa5989ef1b526c3501e093b3a8d83 Mon Sep 17 00:00:00 2001
From: Alexander Sytnyk <asytnyk0@gmail.com>
Date: Tue, 31 Oct 2017 12:47:45 +0200
Subject: [PATCH 02/17] Add subtitle button to the context menu; add "Show on
 Top Bar" button to the context menu of the marker

---
 .../res/layout/map_context_menu_fragment.xml  | 82 +++++++++++++------
 OsmAnd/res/values/strings.xml                 |  1 +
 .../src/net/osmand/plus/MapMarkersHelper.java | 10 +++
 .../plus/mapcontextmenu/MapContextMenu.java   |  8 ++
 .../MapContextMenuFragment.java               | 30 +++++++
 .../plus/mapcontextmenu/MenuController.java   |  5 ++
 .../controllers/MapMarkerMenuController.java  | 11 +++
 7 files changed, 120 insertions(+), 27 deletions(-)

diff --git a/OsmAnd/res/layout/map_context_menu_fragment.xml b/OsmAnd/res/layout/map_context_menu_fragment.xml
index 1924bf56a3..c55c77ca81 100644
--- a/OsmAnd/res/layout/map_context_menu_fragment.xml
+++ b/OsmAnd/res/layout/map_context_menu_fragment.xml
@@ -166,20 +166,71 @@
 
             <LinearLayout
                 android:id="@+id/title_button_container"
-                android:layout_width="fill_parent"
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:minHeight="@dimen/context_menu_action_buttons_h"
                 android:layout_marginTop="@dimen/context_menu_buttons_top_margin"
                 android:clickable="true"
-                android:orientation="horizontal"
+                android:minHeight="@dimen/context_menu_action_buttons_h"
+                android:orientation="vertical"
                 android:paddingBottom="@dimen/context_menu_buttons_padding_bottom"
                 android:paddingLeft="62dp"
                 android:paddingRight="2dp"
                 android:visibility="gone"
                 tools:visibility="visible">
 
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content">
+
+                    <Button
+                        android:id="@+id/title_button"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:background="?attr/selectableItemBackground"
+                        android:gravity="left|center_vertical"
+                        android:paddingLeft="@dimen/context_menu_button_padding_x"
+                        android:paddingRight="@dimen/context_menu_button_padding_x"
+                        android:text="@string/recording_context_menu_play"
+                        android:textColor="?attr/contextMenuButtonColor"
+                        android:textSize="@dimen/default_desc_text_size"/>
+
+                    <TextView
+                        android:id="@+id/title_button_right_text"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginLeft="-4dp"
+                        android:clickable="true"
+                        android:gravity="center_vertical"
+                        android:textColor="?android:textColorSecondary"
+                        android:textSize="@dimen/default_desc_text_size"
+                        tools:text="— 00:26"/>
+
+                    <Button
+                        android:id="@+id/title_button_right"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:background="?attr/selectableItemBackground"
+                        android:gravity="center"
+                        android:paddingLeft="@dimen/context_menu_button_padding_x"
+                        android:paddingRight="@dimen/context_menu_button_padding_x"
+                        android:text="@string/shared_string_delete"
+                        android:textColor="?attr/contextMenuButtonColor"
+                        android:textSize="@dimen/default_desc_text_size"/>
+                </LinearLayout>
+
+                <View
+                    android:id="@+id/title_divider"
+                    android:layout_width="match_parent"
+                    android:layout_height="1dp"
+                    android:layout_marginBottom="@dimen/bottom_sheet_divider_margin_bottom"
+                    android:layout_marginLeft="10dp"
+                    android:layout_marginTop="@dimen/bottom_sheet_divider_margin_top"
+                    android:background="?attr/dashboard_divider"
+                    android:visibility="gone"
+                    tools:visibility="visible"/>
+
                 <Button
-                    android:id="@+id/title_button"
+                    android:id="@+id/subtitle_button"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:background="?attr/selectableItemBackground"
@@ -190,29 +241,6 @@
                     android:textColor="?attr/contextMenuButtonColor"
                     android:textSize="@dimen/default_desc_text_size"/>
 
-                <TextView
-                    android:id="@+id/title_button_right_text"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginLeft="-4dp"
-                    android:clickable="true"
-                    android:gravity="center_vertical"
-                    tools:text="— 00:26"
-                    android:textColor="?android:textColorSecondary"
-                    android:textSize="@dimen/default_desc_text_size"/>
-
-                <Button
-                    android:id="@+id/title_button_right"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:background="?attr/selectableItemBackground"
-                    android:gravity="center"
-                    android:paddingLeft="@dimen/context_menu_button_padding_x"
-                    android:paddingRight="@dimen/context_menu_button_padding_x"
-                    android:text="@string/shared_string_delete"
-                    android:textColor="?attr/contextMenuButtonColor"
-                    android:textSize="@dimen/default_desc_text_size"/>
-
             </LinearLayout>
 
             <LinearLayout
diff --git a/OsmAnd/res/values/strings.xml b/OsmAnd/res/values/strings.xml
index 5ee1875254..9274f4b88b 100644
--- a/OsmAnd/res/values/strings.xml
+++ b/OsmAnd/res/values/strings.xml
@@ -9,6 +9,7 @@
          3. All your modified/created strings are in the top of the file (to make easier find what\'s translated).
     PLEASE: Have a look at http://code.google.com/p/osmand/wiki/UIConsistency, it may really improve your and our work  :-)  Thx - Hardy
     -->
+    <string name="show_on_top_bar">Show on Top Bar</string>
     <string name="mark_passed">Mark passed</string>
     <string name="import_gpx_file_description">can be imported as Favorites points, or as track file.</string>
     <string name="import_as_gpx">Import as GPX file</string>
diff --git a/OsmAnd/src/net/osmand/plus/MapMarkersHelper.java b/OsmAnd/src/net/osmand/plus/MapMarkersHelper.java
index 4307c25421..cc1964d0e4 100644
--- a/OsmAnd/src/net/osmand/plus/MapMarkersHelper.java
+++ b/OsmAnd/src/net/osmand/plus/MapMarkersHelper.java
@@ -795,6 +795,16 @@ public class MapMarkersHelper {
 		}
 	}
 
+	public void moveMarkerToTop(MapMarker marker) {
+		int i = mapMarkers.indexOf(marker);
+		if (i != -1 && mapMarkers.size() > 1) {
+			mapMarkers.remove(i);
+			mapMarkers.add(0, marker);
+			reorderActiveMarkersIfNeeded();
+			refresh();
+		}
+	}
+
 	public void moveMapMarker(MapMarker marker, LatLon latLon) {
 		if (marker != null) {
 			LatLon point = new LatLon(latLon.getLatitude(), latLon.getLongitude());
diff --git a/OsmAnd/src/net/osmand/plus/mapcontextmenu/MapContextMenu.java b/OsmAnd/src/net/osmand/plus/mapcontextmenu/MapContextMenu.java
index 916fb34fb6..3d989f1929 100644
--- a/OsmAnd/src/net/osmand/plus/mapcontextmenu/MapContextMenu.java
+++ b/OsmAnd/src/net/osmand/plus/mapcontextmenu/MapContextMenu.java
@@ -1035,6 +1035,14 @@ public class MapContextMenu extends MenuTitleController implements StateChangedL
 		}
 	}
 
+	public TitleButtonController getLeftSubtitleButtonController() {
+		if (menuController != null) {
+			return menuController.getLeftSubtitleButtonController();
+		} else {
+			return null;
+		}
+	}
+
 	public TitleButtonController getLeftDownloadButtonController() {
 		if (menuController != null) {
 			return menuController.getLeftDownloadButtonController();
diff --git a/OsmAnd/src/net/osmand/plus/mapcontextmenu/MapContextMenuFragment.java b/OsmAnd/src/net/osmand/plus/mapcontextmenu/MapContextMenuFragment.java
index b0d958737e..9a6b0b6808 100644
--- a/OsmAnd/src/net/osmand/plus/mapcontextmenu/MapContextMenuFragment.java
+++ b/OsmAnd/src/net/osmand/plus/mapcontextmenu/MapContextMenuFragment.java
@@ -175,6 +175,18 @@ public class MapContextMenuFragment extends Fragment implements DownloadEvents {
 			}
 		});
 
+		// Left subtitle button
+		final Button leftSubtitleButton = (Button) view.findViewById(R.id.subtitle_button);
+		leftSubtitleButton.setOnClickListener(new View.OnClickListener() {
+			@Override
+			public void onClick(View v) {
+				TitleButtonController leftSubtitleButtonController = menu.getLeftSubtitleButtonController();
+				if (leftSubtitleButtonController != null) {
+					leftSubtitleButtonController.buttonPressed();
+				}
+			}
+		});
+
 		// Left download button
 		final Button leftDownloadButton = (Button) view.findViewById(R.id.download_button_left);
 		leftDownloadButton.setOnClickListener(new View.OnClickListener() {
@@ -686,14 +698,17 @@ public class MapContextMenuFragment extends Fragment implements DownloadEvents {
 			TitleButtonController leftTitleButtonController = menu.getLeftTitleButtonController();
 			TitleButtonController rightTitleButtonController = menu.getRightTitleButtonController();
 			TitleButtonController topRightTitleButtonController = menu.getTopRightTitleButtonController();
+			TitleButtonController leftSubtitleButtonController = menu.getLeftSubtitleButtonController();
 			TitleButtonController leftDownloadButtonController = menu.getLeftDownloadButtonController();
 			TitleButtonController rightDownloadButtonController = menu.getRightDownloadButtonController();
 			TitleProgressController titleProgressController = menu.getTitleProgressController();
 
 			// Title buttons
 			boolean showTitleButtonsContainer = (leftTitleButtonController != null || rightTitleButtonController != null);
+			boolean showTitleDivider = leftSubtitleButtonController != null;
 			final View titleButtonsContainer = view.findViewById(R.id.title_button_container);
 			titleButtonsContainer.setVisibility(showTitleButtonsContainer ? View.VISIBLE : View.GONE);
+			view.findViewById(R.id.title_divider).setVisibility(showTitleDivider ? View.VISIBLE : View.GONE);
 
 			// Left title button
 			final Button leftTitleButton = (Button) view.findViewById(R.id.title_button);
@@ -745,6 +760,21 @@ public class MapContextMenuFragment extends Fragment implements DownloadEvents {
 				topRightTitleButton.setVisibility(View.GONE);
 			}
 
+			// Left subtitle button
+			final Button leftSubtitleButton = (Button) view.findViewById(R.id.subtitle_button);
+			if (leftSubtitleButtonController != null) {
+				leftSubtitleButton.setText(leftSubtitleButtonController.caption);
+				leftSubtitleButton.setVisibility(leftSubtitleButtonController.visible ? View.VISIBLE : View.GONE);
+
+				Drawable leftIcon = leftSubtitleButtonController.getLeftIcon();
+				if (leftIcon != null) {
+					leftSubtitleButton.setCompoundDrawablesWithIntrinsicBounds(leftIcon, null, null, null);
+					leftSubtitleButton.setCompoundDrawablePadding(dpToPx(4f));
+				}
+			} else {
+				leftSubtitleButton.setVisibility(View.GONE);
+			}
+
 			// Download buttons
 			boolean showDownloadButtonsContainer =
 					((leftDownloadButtonController != null && leftDownloadButtonController.visible)
diff --git a/OsmAnd/src/net/osmand/plus/mapcontextmenu/MenuController.java b/OsmAnd/src/net/osmand/plus/mapcontextmenu/MenuController.java
index bd07191281..69a05d95ab 100644
--- a/OsmAnd/src/net/osmand/plus/mapcontextmenu/MenuController.java
+++ b/OsmAnd/src/net/osmand/plus/mapcontextmenu/MenuController.java
@@ -99,6 +99,7 @@ public abstract class MenuController extends BaseMenuController {
 	protected TitleButtonController leftTitleButtonController;
 	protected TitleButtonController rightTitleButtonController;
 	protected TitleButtonController topRightTitleButtonController;
+	protected TitleButtonController leftSubtitleButtonController;
 
 	protected TitleButtonController leftDownloadButtonController;
 	protected TitleButtonController rightDownloadButtonController;
@@ -322,6 +323,10 @@ public abstract class MenuController extends BaseMenuController {
 		return topRightTitleButtonController;
 	}
 
+	public TitleButtonController getLeftSubtitleButtonController() {
+		return leftSubtitleButtonController;
+	}
+
 	public TitleButtonController getLeftDownloadButtonController() {
 		return leftDownloadButtonController;
 	}
diff --git a/OsmAnd/src/net/osmand/plus/mapcontextmenu/controllers/MapMarkerMenuController.java b/OsmAnd/src/net/osmand/plus/mapcontextmenu/controllers/MapMarkerMenuController.java
index ac25b91059..fcda2dcae1 100644
--- a/OsmAnd/src/net/osmand/plus/mapcontextmenu/controllers/MapMarkerMenuController.java
+++ b/OsmAnd/src/net/osmand/plus/mapcontextmenu/controllers/MapMarkerMenuController.java
@@ -21,6 +21,7 @@ public class MapMarkerMenuController extends MenuController {
 		this.mapMarker = mapMarker;
 		builder.setShowNearestWiki(true);
 		final MapMarkersHelper markersHelper = mapActivity.getMyApplication().getMapMarkersHelper();
+
 		leftTitleButtonController = new TitleButtonController() {
 			@Override
 			public void buttonPressed() {
@@ -31,6 +32,16 @@ public class MapMarkerMenuController extends MenuController {
 		leftTitleButtonController.needColorizeIcon = false;
 		leftTitleButtonController.caption = getMapActivity().getString(R.string.mark_passed);
 		leftTitleButtonController.leftIconId = isLight() ? R.drawable.passed_icon_light : R.drawable.passed_icon_dark;
+
+		leftSubtitleButtonController = new TitleButtonController() {
+			@Override
+			public void buttonPressed() {
+				markersHelper.moveMarkerToTop(getMapMarker());
+				getMapActivity().getContextMenu().close();
+			}
+		};
+		leftSubtitleButtonController.needColorizeIcon = false;
+		leftSubtitleButtonController.caption = getMapActivity().getString(R.string.show_on_top_bar);
 	}
 
 	@Override

From f19dfae177bf0ec62fb971e712e2db4ab5126d4e Mon Sep 17 00:00:00 2001
From: PavelRatushny <pavelratushniy@gmail.com>
Date: Wed, 1 Nov 2017 11:09:29 +0200
Subject: [PATCH 03/17] Replace empty states

---
 .../src/net/osmand/plus/activities/FavoritesTreeFragment.java   | 2 +-
 OsmAnd/src/net/osmand/plus/myplaces/AvailableGPXFragment.java   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/OsmAnd/src/net/osmand/plus/activities/FavoritesTreeFragment.java b/OsmAnd/src/net/osmand/plus/activities/FavoritesTreeFragment.java
index 461f6ff0e6..0f0c1523ff 100644
--- a/OsmAnd/src/net/osmand/plus/activities/FavoritesTreeFragment.java
+++ b/OsmAnd/src/net/osmand/plus/activities/FavoritesTreeFragment.java
@@ -164,7 +164,7 @@ public class FavoritesTreeFragment extends OsmandExpandableListFragment {
 		}
 		View emptyView = view.findViewById(android.R.id.empty);
 		ImageView emptyImageView = (ImageView) emptyView.findViewById(R.id.empty_state_image_view);
-		emptyImageView.setImageResource(app.getSettings().isLightContent() ? R.drawable.ic_empty_state_favorites_day_result : R.drawable.ic_empty_state_favorites_night_result);
+		emptyImageView.setImageResource(app.getSettings().isLightContent() ? R.drawable.ic_empty_state_favorites_day : R.drawable.ic_empty_state_favorites_night);
 		Button importButton = (Button) emptyView.findViewById(R.id.import_button);
 		importButton.setOnClickListener(new View.OnClickListener() {
 			@Override
diff --git a/OsmAnd/src/net/osmand/plus/myplaces/AvailableGPXFragment.java b/OsmAnd/src/net/osmand/plus/myplaces/AvailableGPXFragment.java
index 034001de31..d487fe6961 100644
--- a/OsmAnd/src/net/osmand/plus/myplaces/AvailableGPXFragment.java
+++ b/OsmAnd/src/net/osmand/plus/myplaces/AvailableGPXFragment.java
@@ -330,7 +330,7 @@ public class AvailableGPXFragment extends OsmandExpandableListFragment {
 		listView.addFooterView(footerView);
 		emptyView = v.findViewById(android.R.id.empty);
 		ImageView emptyImageView = (ImageView) emptyView.findViewById(R.id.empty_state_image_view);
-		emptyImageView.setImageResource(app.getSettings().isLightContent() ? R.drawable.ic_empty_state_trip_day_result : R.drawable.ic_empty_state_trip_night_result);
+		emptyImageView.setImageResource(app.getSettings().isLightContent() ? R.drawable.ic_empty_state_trip_day : R.drawable.ic_empty_state_trip_night);
 		Button importButton = (Button) emptyView.findViewById(R.id.import_button);
 		importButton.setOnClickListener(new View.OnClickListener() {
 			@Override

From 3903ed14c06eed6aed4b3f15c2942cea2c16f994 Mon Sep 17 00:00:00 2001
From: Alexander Sytnyk <asytnyk0@gmail.com>
Date: Wed, 1 Nov 2017 11:27:39 +0200
Subject: [PATCH 04/17] Fix indents

---
 OsmAnd/res/drawable/passed_icon_dark.xml            | 13 +++++--------
 OsmAnd/res/drawable/passed_icon_light.xml           | 13 +++++--------
 .../plus/mapcontextmenu/MapContextMenuFragment.java | 12 ++++++------
 3 files changed, 16 insertions(+), 22 deletions(-)

diff --git a/OsmAnd/res/drawable/passed_icon_dark.xml b/OsmAnd/res/drawable/passed_icon_dark.xml
index 5840e824ef..99997007bd 100644
--- a/OsmAnd/res/drawable/passed_icon_dark.xml
+++ b/OsmAnd/res/drawable/passed_icon_dark.xml
@@ -1,14 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
     <item>
-        <inset
-            android:insetRight="@dimen/context_menu_first_line_top_margin">
-            <shape
-                xmlns:android="http://schemas.android.com/apk/res/android"
-                android:shape="oval">
-                <solid android:color="@color/osmand_orange"/>
-            </shape>
-        </inset>
+        <shape
+            xmlns:android="http://schemas.android.com/apk/res/android"
+            android:shape="oval">
+            <solid android:color="@color/osmand_orange"/>
+        </shape>
     </item>
     <item android:drawable="@drawable/ic_action_marker_passed"/>
 </layer-list>
\ No newline at end of file
diff --git a/OsmAnd/res/drawable/passed_icon_light.xml b/OsmAnd/res/drawable/passed_icon_light.xml
index dfd857243c..ac91b37dec 100644
--- a/OsmAnd/res/drawable/passed_icon_light.xml
+++ b/OsmAnd/res/drawable/passed_icon_light.xml
@@ -1,14 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
     <item>
-        <inset
-            android:insetRight="@dimen/context_menu_first_line_top_margin">
-            <shape
-                xmlns:android="http://schemas.android.com/apk/res/android"
-                android:shape="oval">
-                <solid android:color="@color/map_widget_blue"/>
-            </shape>
-        </inset>
+        <shape
+            xmlns:android="http://schemas.android.com/apk/res/android"
+            android:shape="oval">
+            <solid android:color="@color/map_widget_blue"/>
+        </shape>
     </item>
     <item android:drawable="@drawable/ic_action_marker_passed"/>
 </layer-list>
\ No newline at end of file
diff --git a/OsmAnd/src/net/osmand/plus/mapcontextmenu/MapContextMenuFragment.java b/OsmAnd/src/net/osmand/plus/mapcontextmenu/MapContextMenuFragment.java
index 9a6b0b6808..3d3a0a3658 100644
--- a/OsmAnd/src/net/osmand/plus/mapcontextmenu/MapContextMenuFragment.java
+++ b/OsmAnd/src/net/osmand/plus/mapcontextmenu/MapContextMenuFragment.java
@@ -720,7 +720,7 @@ public class MapContextMenuFragment extends Fragment implements DownloadEvents {
 				Drawable leftIcon = leftTitleButtonController.getLeftIcon();
 				if (leftIcon != null) {
 					leftTitleButton.setCompoundDrawablesWithIntrinsicBounds(leftIcon, null, null, null);
-					leftTitleButton.setCompoundDrawablePadding(dpToPx(4f));
+					leftTitleButton.setCompoundDrawablePadding(dpToPx(8f));
 				}
 
 				if (leftTitleButtonController.needRightText) {
@@ -742,7 +742,7 @@ public class MapContextMenuFragment extends Fragment implements DownloadEvents {
 
 				Drawable leftIcon = rightTitleButtonController.getLeftIcon();
 				rightTitleButton.setCompoundDrawablesWithIntrinsicBounds(leftIcon, null, null, null);
-				rightTitleButton.setCompoundDrawablePadding(dpToPx(4f));
+				rightTitleButton.setCompoundDrawablePadding(dpToPx(8f));
 			} else {
 				rightTitleButton.setVisibility(View.GONE);
 			}
@@ -755,7 +755,7 @@ public class MapContextMenuFragment extends Fragment implements DownloadEvents {
 
 				Drawable leftIcon = topRightTitleButtonController.getLeftIcon();
 				topRightTitleButton.setCompoundDrawablesWithIntrinsicBounds(leftIcon, null, null, null);
-				topRightTitleButton.setCompoundDrawablePadding(dpToPx(4f));
+				topRightTitleButton.setCompoundDrawablePadding(dpToPx(8f));
 			} else {
 				topRightTitleButton.setVisibility(View.GONE);
 			}
@@ -769,7 +769,7 @@ public class MapContextMenuFragment extends Fragment implements DownloadEvents {
 				Drawable leftIcon = leftSubtitleButtonController.getLeftIcon();
 				if (leftIcon != null) {
 					leftSubtitleButton.setCompoundDrawablesWithIntrinsicBounds(leftIcon, null, null, null);
-					leftSubtitleButton.setCompoundDrawablePadding(dpToPx(4f));
+					leftSubtitleButton.setCompoundDrawablePadding(dpToPx(8f));
 				}
 			} else {
 				leftSubtitleButton.setVisibility(View.GONE);
@@ -802,7 +802,7 @@ public class MapContextMenuFragment extends Fragment implements DownloadEvents {
 				Drawable leftIcon = leftDownloadButtonController.getLeftIcon();
 				if (leftIcon != null) {
 					leftDownloadButton.setCompoundDrawablesWithIntrinsicBounds(leftIcon, null, null, null);
-					leftDownloadButton.setCompoundDrawablePadding(dpToPx(4f));
+					leftDownloadButton.setCompoundDrawablePadding(dpToPx(8f));
 				}
 			} else {
 				leftDownloadButton.setVisibility(View.GONE);
@@ -816,7 +816,7 @@ public class MapContextMenuFragment extends Fragment implements DownloadEvents {
 
 				Drawable leftIcon = rightDownloadButtonController.getLeftIcon();
 				rightDownloadButton.setCompoundDrawablesWithIntrinsicBounds(leftIcon, null, null, null);
-				rightDownloadButton.setCompoundDrawablePadding(dpToPx(4f));
+				rightDownloadButton.setCompoundDrawablePadding(dpToPx(8f));
 			} else {
 				rightDownloadButton.setVisibility(View.GONE);
 			}

From fe28138a8ca67c87db90679098ac1bf48be72e8d Mon Sep 17 00:00:00 2001
From: Dmitriy Prodchenko <dmpr0.ua@gmail.com>
Date: Wed, 1 Nov 2017 11:28:19 +0200
Subject: [PATCH 05/17] Delete old Empty States image.

---
 .../ic_empty_state_favorites_day_result.webp     | Bin 3320 -> 0 bytes
 .../ic_empty_state_favorites_night_result.webp   | Bin 3402 -> 0 bytes
 .../ic_empty_state_trip_day_result.webp          | Bin 2750 -> 0 bytes
 .../ic_empty_state_trip_night_result.webp        | Bin 3006 -> 0 bytes
 .../ic_empty_state_favorites_day_result.webp     | Bin 2240 -> 0 bytes
 .../ic_empty_state_favorites_night_result.webp   | Bin 2318 -> 0 bytes
 .../ic_empty_state_trip_day_result.webp          | Bin 1770 -> 0 bytes
 .../ic_empty_state_trip_night_result.webp        | Bin 1832 -> 0 bytes
 .../ic_empty_state_favorites_day_result.webp     | Bin 4592 -> 0 bytes
 .../ic_empty_state_favorites_night_result.webp   | Bin 4614 -> 0 bytes
 .../ic_empty_state_trip_day_result.webp          | Bin 3630 -> 0 bytes
 .../ic_empty_state_trip_night_result.webp        | Bin 3880 -> 0 bytes
 .../ic_empty_state_favorites_day_result.webp     | Bin 6888 -> 0 bytes
 .../ic_empty_state_favorites_night_result.webp   | Bin 6902 -> 0 bytes
 .../ic_empty_state_trip_day_result.webp          | Bin 5200 -> 0 bytes
 .../ic_empty_state_trip_night_result.webp        | Bin 5476 -> 0 bytes
 16 files changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 OsmAnd/res/drawable-hdpi/ic_empty_state_favorites_day_result.webp
 delete mode 100644 OsmAnd/res/drawable-hdpi/ic_empty_state_favorites_night_result.webp
 delete mode 100644 OsmAnd/res/drawable-hdpi/ic_empty_state_trip_day_result.webp
 delete mode 100644 OsmAnd/res/drawable-hdpi/ic_empty_state_trip_night_result.webp
 delete mode 100644 OsmAnd/res/drawable-mdpi/ic_empty_state_favorites_day_result.webp
 delete mode 100644 OsmAnd/res/drawable-mdpi/ic_empty_state_favorites_night_result.webp
 delete mode 100644 OsmAnd/res/drawable-mdpi/ic_empty_state_trip_day_result.webp
 delete mode 100644 OsmAnd/res/drawable-mdpi/ic_empty_state_trip_night_result.webp
 delete mode 100644 OsmAnd/res/drawable-xhdpi/ic_empty_state_favorites_day_result.webp
 delete mode 100644 OsmAnd/res/drawable-xhdpi/ic_empty_state_favorites_night_result.webp
 delete mode 100644 OsmAnd/res/drawable-xhdpi/ic_empty_state_trip_day_result.webp
 delete mode 100644 OsmAnd/res/drawable-xhdpi/ic_empty_state_trip_night_result.webp
 delete mode 100644 OsmAnd/res/drawable-xxhdpi/ic_empty_state_favorites_day_result.webp
 delete mode 100644 OsmAnd/res/drawable-xxhdpi/ic_empty_state_favorites_night_result.webp
 delete mode 100644 OsmAnd/res/drawable-xxhdpi/ic_empty_state_trip_day_result.webp
 delete mode 100644 OsmAnd/res/drawable-xxhdpi/ic_empty_state_trip_night_result.webp

diff --git a/OsmAnd/res/drawable-hdpi/ic_empty_state_favorites_day_result.webp b/OsmAnd/res/drawable-hdpi/ic_empty_state_favorites_day_result.webp
deleted file mode 100644
index 6db48f407d9f2928926138aea9b6410858868500..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3320
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
CcXZ+a

diff --git a/OsmAnd/res/drawable-hdpi/ic_empty_state_favorites_night_result.webp b/OsmAnd/res/drawable-hdpi/ic_empty_state_favorites_night_result.webp
deleted file mode 100644
index 0f21da98387a651c73ed9e71bf04bda27effe730..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3402
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

diff --git a/OsmAnd/res/drawable-hdpi/ic_empty_state_trip_day_result.webp b/OsmAnd/res/drawable-hdpi/ic_empty_state_trip_day_result.webp
deleted file mode 100644
index 04f9b45167516db94ecc1d77d1104285fb0c2d4b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2750
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
E0PZedCIA2c

diff --git a/OsmAnd/res/drawable-hdpi/ic_empty_state_trip_night_result.webp b/OsmAnd/res/drawable-hdpi/ic_empty_state_trip_night_result.webp
deleted file mode 100644
index 8714f59f6297f1db9f2f4e349308b58efb4a3ac7..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3006
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
A*8l(j

diff --git a/OsmAnd/res/drawable-mdpi/ic_empty_state_favorites_day_result.webp b/OsmAnd/res/drawable-mdpi/ic_empty_state_favorites_day_result.webp
deleted file mode 100644
index 22a7a3866506a57edbb4d73382b48765b1c68671..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2240
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
OZg1n)=b3VMBOgkIByD5>

diff --git a/OsmAnd/res/drawable-mdpi/ic_empty_state_favorites_night_result.webp b/OsmAnd/res/drawable-mdpi/ic_empty_state_favorites_night_result.webp
deleted file mode 100644
index ef7a84a52b73e82ab9f95aea60f8ce62971c0972..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2318
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

diff --git a/OsmAnd/res/drawable-mdpi/ic_empty_state_trip_day_result.webp b/OsmAnd/res/drawable-mdpi/ic_empty_state_trip_day_result.webp
deleted file mode 100644
index 6ba8fe96042a4a61d8694986dfa0c59aaf969909..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1770
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
MO#Hu5yC4xF08DCNi~s-t

diff --git a/OsmAnd/res/drawable-mdpi/ic_empty_state_trip_night_result.webp b/OsmAnd/res/drawable-mdpi/ic_empty_state_trip_night_result.webp
deleted file mode 100644
index f7785ff47353ef70396c3e446d1efd2b0441e77a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1832
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
WCXO*9DULK|;w{$gK5{-rln4N?#fXmp

diff --git a/OsmAnd/res/drawable-xhdpi/ic_empty_state_favorites_day_result.webp b/OsmAnd/res/drawable-xhdpi/ic_empty_state_favorites_day_result.webp
deleted file mode 100644
index 52526237ed856de3a8b9a61ab666bd7593de5e62..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4592
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
a&Mlx0QM7V0^Ni3)DM<w3inTMH0B->MP3K$y

diff --git a/OsmAnd/res/drawable-xhdpi/ic_empty_state_favorites_night_result.webp b/OsmAnd/res/drawable-xhdpi/ic_empty_state_favorites_night_result.webp
deleted file mode 100644
index 89ce142463d077bc7c674fb3fbf27477cae8d5b5..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4614
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

diff --git a/OsmAnd/res/drawable-xhdpi/ic_empty_state_trip_day_result.webp b/OsmAnd/res/drawable-xhdpi/ic_empty_state_trip_day_result.webp
deleted file mode 100644
index 52f76f28baa1cb98dfba1519662319db2c5cee82..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3630
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
AU;qFB

diff --git a/OsmAnd/res/drawable-xhdpi/ic_empty_state_trip_night_result.webp b/OsmAnd/res/drawable-xhdpi/ic_empty_state_trip_night_result.webp
deleted file mode 100644
index c1bc13c7ba1bdb98587c36e9ed25c6e436b6e879..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3880
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

diff --git a/OsmAnd/res/drawable-xxhdpi/ic_empty_state_favorites_day_result.webp b/OsmAnd/res/drawable-xxhdpi/ic_empty_state_favorites_day_result.webp
deleted file mode 100644
index bc7b7631a7231b47f27358439f1829e7a691bff9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6888
zcmV<E8W-hKNk&HC8UO%SMM6+kP&iD}8UO$<-@$hf)e7V`k{n49(f(Vl=fpoECP22%
z;moxP43_FeGH*aVsJK=)#RJd{Z_vqjywLFqg?L94A69&tFh20#;=wo?gWJJbFwQQG
zPpdDA7*AY4y_prTcK`)FaY4ON*7ZU;%*EKL9IGcO*Ush4p8mD%>)Pf&tGip=-BWjW
zcXxMpcXxMpZ|A<{oUicxe3-nazm>qggk}tD2ww^dA%c^Ig_10kBki_r<IQ#M+O}=m
z?x((H-8hdKJVx@QwjtWK)ik>Q|7kOzi1Y`R^d2?682j%AlBBrV;ffO=yn&+65Yx7{
z?RgS${)hS<!@WhxAAG--y;sHui3|jTl^XpZOlVGuU1lQS002NRnX+x$wr$(CZQHhO
z+s0+vwq24SNpch^ojMI$-0D$?>G{x-BuSBE-T$g~hWr}nsfc>u{#Oer%NWZH!^{j3
zuq8=0ZN=HgxVCLue_-3TZQHhe@0)Ggwrz94VcSTOM5DsJr#rlFy1Fib6-kn9MLZI)
zge)v<_SPql^(7=AQ=&f-0SV#%SRP0qkO1uOw@GN*whixSW6fSL0Xh%_jvyEGf*k=Q
zQb;2m^f1dJdz^7U7k&ULHTeT#X|aWs6qHnIu7cj5`~NO{kOB}`a9}_NThi$YcgN4v
zzhOO$VT<(D^0E0Kqk#kk5;#!I4*y#mKXaSA9i6Ynw<iO~#Wj$jLz6h>w!A%AXN#Xt
zs6#g#49*G&On7mnkMB)y3voq~wD)oH>U!)I4@6jSWOVaeK&08?s(rfi`UViJOLBOW
zq!c1aU&y(9Q_-I#+8dN9=TnkWiX_cWK7w7te+2>pr130CDMpeGzkm4S6{|tA8c9;h
zk)#oh4|RI6K*Rl=cS$*jr2X%ABd<%3h|!{FF78Ou^W~%0BH)l?P!{5kq??CxuRlN`
zNT-Y>5lIgSO}yr`PZY^cDv|W~soK8GdxP5-SxP9<m(d%qFB9Z`%GgmP{d}mbmjphs
z{L0*Er0Jor0cr_gM1Lv<=aKYtx#JZCL|k}P9F8R2&#Pw^7sM1O8i$f}^yKxT!NIH|
zaxUotj!OAPZHzcOipt5P5fT-$v<VQjxK?D&CcU|udsUcYz_X%rI_VIjiulDG;~0PS
z&L`a;RKhQIF76d20qOpr0=^L+f8<t?GLRM@3;z{fLzojqOF<eUQu6Q8U}RnqbC6hs
z(F+Ys+7&ek>G0YM3|Jx*ISYxX;x0kd(B4<<G_;R)SziV;Y$|>n((@ZHravc20f=-`
z$aO9nI(te2iT3^~;h7+sDG?^p?9dD6poJ?LDiYykn;71N+f`48i@wgiSm0`z{ofQA
ziOfPR!wVcw-W&K=g+|=M=>-A@qyMt4do~g|<@rNwcm`-eoI&eF0SzrxYLEyn$sB2v
zxh_SBO>n#rK$FgYX+r#>?nM9(^Hr*ls4l_gLony1lp!vl^vnZ8NtHGv%suPiVxjaQ
zYIFWAIO;r>Lc|Gpo@uX%UoMSkikxQ|WOP)iL?SB3%NroTPANqU=654}Xz)^65f{1L
zDhvV3r55oEpJx;(%Bu7tVeQ!jB_pL7k(J9iS#Yyksu9C^oD7aEx1}4g1(N3vYMZ4T
zahtzsXgKg&+7X{Hc-|0Ir5*_h&ln(bN<l)`vjrqIr6J+qnF98CsYrx)mOx;zbR^Pq
zG#?8RMoUQ|CqE}hnFMG_l;-9H1#_h)QI(g|Ll#R<qCO{cIUap3MTy#c{PGb~r72OJ
zi_-;Tr7BUBhZ8sk@^(%zBHc6K2hE8)rx+3J$@@)p=FUk**m>&6P2D-oBtI96nB1Kc
zjga<~;gGy@s!_^IlAy|O^3KU-2Ck=Si?{5Zla07e^~O+twT<+h(~Vl1tDe7I%ilWT
z=qAZ|9IdD;O=Nm{-Z#*tmf-Z2Cf9q{n&9=cH2U_}dl%a@trgE3x}EplyV%4<N}G;o
zu!RpAq&D3oG#7f&pR|*kh*|@rVy7>R-h{j-VbNRYy$ddp3;5NJ`=SU=w@FMOJ?)F5
zIDPZ@HH$tYlGCZj4vIc2n$xYv4d~rIE285v@@+T0*UX4c?>%OysW;Ur=39FKXR6+0
zH(f?sW7fN_pzPGfv4%i((OtA_%RsA6!qdAbYqG0O%G;g97;@E3dD@Av;7}i=r;F%n
z(%0R?(%xbcTgXyBw5L^M1&jJ3KEWDQ0ohew)W_vKrVy_Fs85TC3S#x?`spc}0@(Lm
z5xRe~7E91ozwTc&+kCm}|9)Zxuy+?nws9}d0?<hm1&#VwfNmnF#=82KK#SlkXlff0
z5IW}dxUEO<)WGb~I>c%_8W3^D1(voY0==;ft=g6fXg4kBwLKMRWmt_>ZBGU-nq3gq
zHf5k|vl?&vPMdcy99yNS_GmijpGT?&Zx2115Z>G$M>Fo>gwUJmD0Pr<+=&vl55_=Y
zS(UvJ3Rb?#s_?y;kNh$#6r>j{=VeyTud<O@c7?3uf|B>LE1O5Th%CcGRBA!sz6{I$
zMJ7DUvb;zv5FC|dd3u)z-7+nI@-R`R<tD8@m2LTyg@&>%$4LbvKV@4!?BpQ4jLV;t
zy5p>j3#WG(&@Ah+l7a5BE*}#LPX5cfEU(28SLS6WT);Uk^YZ8}3Z=3yU!rI#`|>te
zP@I>2Ie!>~OBonkV{Xd8Fcm7;m&?JdMG#aLhR_Js02YSLKp|Qt28rQz%EXW`9NT4L
z*cn_1myP)`6cJ@(?hUNDSKAoY1{OR3BLnX+c$Ja49)`g(GK>r=$oVZJ)87w)VOg1<
zL!6bBIU7(w+?AEN2YhKrm6<_$X~F+^!1S#<i{k-P80)N`KaK}X;p=BtPL2moL9r_+
z@o!<yU2$mm*cF?n>LiYnj%qWL*5jD9-T~95^*HpVcaX8^ypB=tkYm$%9pv=RYn#sN
zc-^x=FzUPx{pl50jT+D6s8?_@YCMl|uP|ZMcpi-PC_q+?=b^FnRF&7q_13^=)ps91
zw+1(>zWW$$4gFSq_p!I7+SICVucrV{VAQm24#;MGQ?ZDECk;0Tdb75fXcy5FfDxJ<
z*tFUlG|k#J;??&UpzsJFpgQ2y1(?2W4hd#$3(;F>^F0K3K%0)<0G7@+$L^U{^Wo7#
z8G9da-vi8d0UBnr+bx&#ZU9QN&F8dhn}=5>C&%6aZUHxe8$j+gfI@C=kxNPpeE^UR
zv;-!p8J`p9M}TEnN+uVQeYsbGE5Ie-0&osE3!DK?0~U+rqex*F8%uJ@E}@)~uq^BO
z6C#Eifx@n98;^&Uxy@47b-;KLP@K%hn)>I2(V^%1G3oo-|Ez6D)V0}EMJ88aL!$m*
z7Fyj#Ma321-7P?R54aD|5)ViPij5#?*R_nt<M{!gXGJAq(ay5($f+*z$Eq%!nhF%o
z#uPesA>x2=92QEWLTOwuNqkva4{PUapGHk}yGloqxTJ`lSbqc{N|4wHj&@zckYTmy
z^$!3dGhP6W<xZ1^hlu?}Rf(dR*o8<VLveJ3hLbdu4uiPRUkLp~-&gW|WY2jG*?AI;
z+~V_86Djuha>~#}Wj7LuP_MWB0Dx55MkuxG+JzF|14MQgaFy5(<&OgwPYuW_jEy~`
zadadOqryNwaJ^%m5zgxv9j0zX3}s3De}TQkr6m#_NQKgkuxHmb3mH1ycL33P4Y&lH
z$exDHc6FI5j)_CVQ8PgBZe#`sVK_;8Lp?ebX~kZmQT9Ec1E@S0UzQ3jz6S0BE~991
z+oMIGiDu&fA`WJW>lOD{aPKtvI<3g)x(k?KD$N}@!=_OvA^R5i3iuqj35bv8O`Uf3
z>W(B0VaTn-#_cRsoBtITeGYKn05X8exjQ(9O`A}oj4OQ(Tm&{(y+6dTG=dC$CD$wN
z_=5W%lb^4ZR~TR_OLrIyn<n8AD&d08dmSdFFf@?&Jrj;^lv%`Pp$en|qdU@uO`{NJ
z2)I(!ePGV;rJ5K!Fw{r(CO*RD3uccDZlZh(5GTN*OLy!Hn--z`s*H>oW4*d78%#Zt
zj<1-yF+p8U7NUZsymcqVuxSu#d<~Qu9smpbuhm5A#`+#f%Xg#|3;QoZL#YXx^3k0h
z!=_D$L0<qbfrr4lwtEeMI`E;p;(i5kt;O<6A29|L(c^CUY;1ebW_SfW0uEGt>M|)^
zpl+)BRVdG4^%4%4!j8LT(;Oa(xX*y6z}4Jepl_BSkoQ;OgDHnC<bavbcPx7bp|m{*
z?g72FcaZ{hS8O-c;?ObXaV%**<(m!AH0=Oy*|P@a904cMZ)|z0dn8>~&En8mamzM#
zRvc48wS;IAfO5*;U|RMJLe9wE$VSlFEJ^lVG>gT+Q2le(^d8GqVYZDWCj>;-kXZJN
zL91T^4}kGAU6>fUXa<Wes@XYp&H%ENSiU^}2`gc#Ac4`cXAeq!F@LO2r*=u(SvOd8
zk-|3xV+J74#`5K^$5eJ;Dj4Cn>=}ftM=qYiCEv*~cr4o8Ivfrb&zNcC!jY^1(LX3!
z_H03&rSvIqHFs)2Rc$qkch$64?1S1Dp@%iE_KL-F)>gNrdiHYwl1Wg&*s^C3PVx|#
zJu>*mLPyi!F>ZgB0gxE+tmVF!OE^GufQMzz95R8=a2JUAKTlF^2g_j5-Y_TnFBF~Z
zyGXITC22N#f1x$_1Trv$2O*X{V^BvQE&r-JSQ?LBG-Xnh*^7>N=F}?cU?6mD`dlJY
z(2plgbpZ+2-qu*OxAdlkql1c;!*Ump^b@B$P!35m-BA-90`3KH7fAfGj5SO<M`O`e
zwO<sEG-<q8?nHX66OfaSXtM0t!b<kAwpv_lW2<(K!eY+e+Cj&N<xW*`BYR@W4l4|z
ziBZd*F?2H1XTTF+TjR4qJhXK+GHo5*#@4MZlWv++-QH|^^3biOr?kx0#@0$?j|N$J
zAsiiyneJ*056L57`gq?`acy12Kx<p4TRP1!sfJ0>O|oW_6q}fI2?-Y;_eo;tNThzJ
z&6q!nrJH*PFVxQRjzrSP-+D}0DY_~7ly2$28Qh9<^b$D497mQtOHfC?1RemrxA!5s
zZIe<A^rO?TgV~gCt3^B8^-G7{ljl=?m+LL}$JOtz3&sop4WX}G?OnHg&`tTaGGsEi
zwe;TJJpd}<7|2mULX5lzB>!4PS*CSbF);IR_CxM31K<zxnFlilw<Re*S7u`18;FRz
zDuKRPyra_7B@-i~>5Gz)FOfMi8kx*`g3e}IgYS(*syjd<vQA2sX<o@lAK5>teeof3
zIYzH`i&O=OOn15l#&-ar+dyqDrKDw=Cz<K2o9mr7?8xMpty=1^=`A4{5VGB4A|h2}
zO3jogv~kt(i4HT4Pn=CCR$Y+DmPieOk~3w>d5MB@%jOO%HgD~eNKRo<VSZDet`a?&
zaxT$W@O$x7&V-z0DbQ>tWn^tGfpSoof6_c$$9ZM)g+ydru>PiSM2!D6h%VzZB`iaV
zk{5tB_;eQKsiaGZN`H}FReX@*W#z|<YBDOL-c%+c@2iBlWzuDVOc%|3Su`Sqw~J<w
zJ?7irOzx{t?u+`lCgEBllj7)~vVkB?va69j`a2qy`=X_puhG=73D*TO!~GS~K_0S4
z7c9>;N;6-wUed?k6v(XF+#yMU?6F?b!}46RFv}I($ewC(G3G|b-4>{v>%JmMjcQQ}
z%zFjJSuQ9zQ^ws0MB>hiZwh`$(#Q}!8i08(s5r~@H8*VRtw5v~OAa&?h#vm}=Dj{b
zEPF=1%Z<4ch|KxA=5Z~3R`yxHyS4N1@Db4?H1FjWXSw?5{Y7X-#@yv-92)IuSJKbf
z(~i}BnkU~m9d?=v0h+}!Xx^(Y&w4S<6&rmokche!FUmjE3+a02t&i*}Hn>cxjeIGR
z$0BIHiz(20ZIRbS)Pq2wt!5~f(U&FPnFli`&4)AZi_$N}$v-F-|AXecw#xFXmpWqc
z<ge+dha80o`!nJi`Xy`HwR}j;NS;no&Sj;H@bU@8qQ9nxFP)(IF10}GmDgjch^r#<
zF-KtQ!Z8DI-0Zmbkv*dquF~PyHh)BL7<no7{3|cfb|L%}6Y-QY6Y-eeX?kYO{y&d=
z6bNq2&a96rW;1?@`7CqpLKJDcE+I}C@su%=a9!+LIizL^HyXm-%LfIc6CFVR>r$fa
zGHq;msAKN4@aODT!=cWcbC>BGD${n={8bb2l!v|KzY^Ye5dE)OnYN1<;A=y4r3ib;
zeianT0ACBx|00gMYkHvSU6)DWwhVpEeic+XK7jt$bk|+tD7W}EBFdF8{V(yXyW$J`
zFV#efNf#k+8Q=L>v0&f=(*KGt+XaZVMd%9;dF6bCi**EC>jEHS*fej~Bg!lyo>=f3
z=Oe{YrWDK`8O%_v>tQ)z)VIqMs+F;~Jm{VCjXbA#LB|cMb$O=kYHh0i`1#rZMWuTz
z?1l3uEB-srQwG+$TJv`CqIHpY#X??L&^yD%DN};BF5bFb%f)T?7J<fJQ7Kjyf5U>`
zc;E-eLYY;e&@FDeL$<Evz+Kw9bP7~ex|Jngu!tvyo<%+~b$+0#Y@n@6`wcJLl|E4T
z8?bb2KvpdjonU5dQvV6ptT;R1lQWWCY;T=naYo);(GAGzV|}@8yV4_f;U|s^;rsKd
z68Whr))Z}Ao|a*WS1k69MLx37S04PviRrSHLWw|Tb-i^~6Dj7;0={+OM|K@t1VlT^
zJ|m{P*x$>Ve5{{vEfgKB$!J3)TRh!nZSDW|&YxEAEsQqAUj>dFpAEo$9sCUKvJjof
zo>nzJ$$eQgB&wQxsv?t1ZzcC-;na#i+?U1Fu9C|D)4odH1G%q~^<6Y>0QW^RziUVj
z-oA$Vc1cC<3R~F)SB?Oj`-1D+^%uCyv2Ryr-!9g^UAuj|lns8aY*(KPebJ-*eXe_d
z&t+inxhniU7m26mnjybu8GJ6GMm5eyUdNlBW$?Mc96i??72ct#j`E?$@v$o?mz^1Q
z1p?n?W^R6VWn!qz%xCXJP??!;-9fs{%;nO6+j}l-f6sO9@44&^?yJDWNEw-FP<h$c
z2z&;W!F|c_x33@u_XP!!vN4Db<!@hZCgRJ)kT@I?Wn#96o7gN1^J@x((6TTOBj79x
zvlcNiRR-qU6bi0oU|xsH!@kTx72|JT^&IRU$(JY)_VqQ9^SdbjdVjVvg#(v)t<_up
z80TJJK<P;+fBSlBUSD1x-DU9Z+k@UtDS^q}zWDmv*J6YF((GIJIB(L*-@b4g+}Cl}
ze#GrMu}tf$JP#L{CZfu)?5CDz_Zsjw*F;v?6|$4dv3rGpHQPi%nUxVP_G8nmUv#<#
zTfT{+vMN8O5z-I|lL>Wicg17;FL`z_hAH8Rq)T`)N@d(@PY7@Bk0ar4L4@#mq)NC~
zrVfT<tHkexsslvKDt@n98N6tA2|rOw2DanEAUIlM6&#vY^zU6(@WwV%O9*{N5j+`J
z@LmENm_1r2a%r3IHLx(R*u6j|&;Z&ebg!2Q+;{{ce{#BjlPD^3uciU)-Nli>O9DVI
zk_y~w?fsjzSTg)xdhg$p$D`l<N-RGjJR(5#IiA_n_jM9e`n}^)>O1nd^tWHO#kY#A
z`rNPL+FMLwOMm-CU3)Q(jJSUGYrOQxkFfgMFZs&boy3@a#ub3_pz}Bp+<EPU7wx!A
z>K@kzx@+TD(>*R1WH()Uyio7Bg0e%?Bi1!8CRF#{qXu;E862XEeOy~~JV+MN-FoC^
z&y|Pf5*Vg-Gv`7?a^F0DGv~TQacPX}l38<^BDiG6zD!eG^l1tX1y4nbS@>z{jp#K%
zG8WA>joeZi*EG{^JMX=Bwe3E7N*euY?_F$D2-W~;X$rk}vBB%9X%4+>?X9P$m2|1C
zJV9?;uhP;SS4(5e#glLn9T!j22y-o^o8Nbys`R<El1=#e$J3QPS6Z^U@{|#qyFjW5
zF`l;ExegP}A^<&Yz*Fb4Of%n)JawRGNn9hzgw6|3A2^2c7D+K-{M2&*BF55INibnH
zpm-iUVmfP?^b+O*s^`LK)?DGqB`gFC&j%=1a~4W1(}3kU@$hrXN{MCfh35riDKF5<
z{?v0LWv&jTa{1Ep<Kj<zv6S+8<~aiPD!f`k`F-kn0+QP3a_MAx;kg17{VJABLQVjA
z#t<D_FqK?--r&e@WW_WReu9JN4(hxI)=VO|yPiMD1?H+$A>lUgdkzKWB2^&gfyVP_
z_*}E<!<TD-Tmnt`z;%;HC_nIw8aP+9;<)<Yd4&cqYB~GnxrHD*S~>sZ`2`uBO8GJM
z9D7Z|vP!N({E=tcDNh>tFQ|LI!Nr0?zQ6aJ+ont(r}v(DnDeTQ{a>Dc@SZ8-`<0i#
z3o`gu#ntYC7Xm6=Ya(3#^m2fP7Da^4=Ux=pepAEQJ1-457}LV#4=<0`*FwxC`)%+%
z@*;t|WjF9|3e9TQi=~NZFc<Wnykrhql#=1{dG3YtRQhqb|K#NZ5Z#iGtN%swA_9>L
zrGSL0J1-_^%Y0lLK<6dZ&?)b6sqk0x!UB$HMNWf+b1$&M9v2dY1|#c=n8b4!z1#pI
z!dbMh%;#|Pwt3NwQQ<z;*Qdhk;n<50Fvk0FzD5o9YvITjnPb9hjIUFH`=_~AgE>Ye
zIxbNT=3W)%Xcy+VV&N9;xmSlV5(POfVAw+vkXMNYXDN>BnS<u_0%D5ddF`I-5fZN)
z1vsvDD##9ESwAj*RLZ}^<@mT3y4jzkN`{Y1BgOvFqrk%J-t;w{RPOP4<CSI%E5(Md
z?1XX-+t_Q)1Yx?YUfrpLp6iL%pUfSXRkaA%rNuHt(T7eX9=$G&;3l2VXZ(tfI<x8B
z$ZJ%C6eo6akkR<8dBp+|!70xv=YIO~&g)kLXLvG8F|$|0W%Fv*-XKFRk16HL&gf0^
z`gV7OBV#FqiT3}USG@J(at=3!`HeMGhDWci$36%E2r~3&lE7kId3pAAHEcd$XhSHF
z!0CiN>u_)~M&fqZe2~!|moOO}*M6g&<zw?fN`MK3fg{KV{a{ZJNfgmY7k$jK%pMo}
i`}+(2&q`j-eE=&j`UZXLe}8PA2K&pq`-cGI1p@#aK}Z?^

diff --git a/OsmAnd/res/drawable-xxhdpi/ic_empty_state_favorites_night_result.webp b/OsmAnd/res/drawable-xxhdpi/ic_empty_state_favorites_night_result.webp
deleted file mode 100644
index e28b0e2c274c0a8b2e99117c7fa568feea48e054..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6902
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

diff --git a/OsmAnd/res/drawable-xxhdpi/ic_empty_state_trip_day_result.webp b/OsmAnd/res/drawable-xxhdpi/ic_empty_state_trip_day_result.webp
deleted file mode 100644
index 3fbe5e418cd2abbb968af51414a0dba39b4af81d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 5200
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
KVbkw0BMKHtu^+bp

diff --git a/OsmAnd/res/drawable-xxhdpi/ic_empty_state_trip_night_result.webp b/OsmAnd/res/drawable-xxhdpi/ic_empty_state_trip_night_result.webp
deleted file mode 100644
index 1aa2b42b4f1abc78bae4e7560351669378cb80df..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 5476
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
a!kFJUfA!4Co3ndQHFxffuNwoQ#sUBq{+c`h


From 9b06da353e2ecf9fc5a1f62b6d86b34e7157f265 Mon Sep 17 00:00:00 2001
From: Alexander Sytnyk <asytnyk0@gmail.com>
Date: Wed, 1 Nov 2017 12:05:51 +0200
Subject: [PATCH 06/17] Add icon to "Show on Top Bar" button

---
 OsmAnd/res/layout/map_context_menu_fragment.xml      |  2 --
 .../osmand/plus/mapcontextmenu/MenuController.java   |  4 ++++
 .../controllers/MapMarkerMenuController.java         | 12 +++++++++++-
 3 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/OsmAnd/res/layout/map_context_menu_fragment.xml b/OsmAnd/res/layout/map_context_menu_fragment.xml
index c55c77ca81..bf1a78ede6 100644
--- a/OsmAnd/res/layout/map_context_menu_fragment.xml
+++ b/OsmAnd/res/layout/map_context_menu_fragment.xml
@@ -222,9 +222,7 @@
                     android:id="@+id/title_divider"
                     android:layout_width="match_parent"
                     android:layout_height="1dp"
-                    android:layout_marginBottom="@dimen/bottom_sheet_divider_margin_bottom"
                     android:layout_marginLeft="10dp"
-                    android:layout_marginTop="@dimen/bottom_sheet_divider_margin_top"
                     android:background="?attr/dashboard_divider"
                     android:visibility="gone"
                     tools:visibility="visible"/>
diff --git a/OsmAnd/src/net/osmand/plus/mapcontextmenu/MenuController.java b/OsmAnd/src/net/osmand/plus/mapcontextmenu/MenuController.java
index 69a05d95ab..b5828dc67b 100644
--- a/OsmAnd/src/net/osmand/plus/mapcontextmenu/MenuController.java
+++ b/OsmAnd/src/net/osmand/plus/mapcontextmenu/MenuController.java
@@ -502,8 +502,12 @@ public abstract class MenuController extends BaseMenuController {
 		public String rightTextCaption = "";
 		public boolean visible = true;
 		public boolean needColorizeIcon = true;
+		public Drawable leftIcon;
 
 		public Drawable getLeftIcon() {
+			if (leftIcon != null) {
+				return leftIcon;
+			}
 			if (leftIconId != 0) {
 				if (needColorizeIcon) {
 					return getIcon(leftIconId, isLight() ? R.color.map_widget_blue : R.color.osmand_orange);
diff --git a/OsmAnd/src/net/osmand/plus/mapcontextmenu/controllers/MapMarkerMenuController.java b/OsmAnd/src/net/osmand/plus/mapcontextmenu/controllers/MapMarkerMenuController.java
index fcda2dcae1..3eeaca8c90 100644
--- a/OsmAnd/src/net/osmand/plus/mapcontextmenu/controllers/MapMarkerMenuController.java
+++ b/OsmAnd/src/net/osmand/plus/mapcontextmenu/controllers/MapMarkerMenuController.java
@@ -1,8 +1,10 @@
 package net.osmand.plus.mapcontextmenu.controllers;
 
 import android.graphics.drawable.Drawable;
+import android.graphics.drawable.LayerDrawable;
 
 import net.osmand.data.PointDescription;
+import net.osmand.plus.IconsCache;
 import net.osmand.plus.MapMarkersHelper;
 import net.osmand.plus.MapMarkersHelper.MapMarker;
 import net.osmand.plus.R;
@@ -40,8 +42,16 @@ public class MapMarkerMenuController extends MenuController {
 				getMapActivity().getContextMenu().close();
 			}
 		};
-		leftSubtitleButtonController.needColorizeIcon = false;
 		leftSubtitleButtonController.caption = getMapActivity().getString(R.string.show_on_top_bar);
+		leftSubtitleButtonController.leftIcon = createShowOnTopbarIcon();
+	}
+
+	private Drawable createShowOnTopbarIcon() {
+		IconsCache ic = getMapActivity().getMyApplication().getIconsCache();
+		Drawable background = ic.getIcon(R.drawable.ic_action_device_top,
+				isLight() ? R.color.on_map_icon_color : R.color.ctx_menu_info_text_dark);
+		Drawable topbar = ic.getIcon(R.drawable.ic_action_device_topbar, R.color.dashboard_blue);
+		return new LayerDrawable(new Drawable[]{background, topbar});
 	}
 
 	@Override

From 9e88a671824adc04666154173a72ce69facd6ea8 Mon Sep 17 00:00:00 2001
From: Alexander Sytnyk <asytnyk0@gmail.com>
Date: Wed, 1 Nov 2017 15:06:56 +0200
Subject: [PATCH 07/17] Enter fullscreen mode after single tap on map

---
 .../net/osmand/plus/views/ContextMenuLayer.java   |  4 +++-
 .../net/osmand/plus/views/MapControlsLayer.java   | 15 ++++++++++++++-
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/OsmAnd/src/net/osmand/plus/views/ContextMenuLayer.java b/OsmAnd/src/net/osmand/plus/views/ContextMenuLayer.java
index 350c284eb4..7f18a1aca0 100644
--- a/OsmAnd/src/net/osmand/plus/views/ContextMenuLayer.java
+++ b/OsmAnd/src/net/osmand/plus/views/ContextMenuLayer.java
@@ -812,7 +812,9 @@ public class ContextMenuLayer extends OsmandMapLayer {
 		boolean processed = hideVisibleMenues();
 		processed |= menu.onSingleTapOnMap();
 		if (!processed) {
-			activity.getMapLayers().getMapControlsLayer().switchMapControlsVisibility();
+			MapControlsLayer controlsLayer = activity.getMapLayers().getMapControlsLayer();
+			controlsLayer.switchMapControlsVisibility();
+			controlsLayer.switchStatusbarAndNavbarVisibility();
 		}
 		return false;
 	}
diff --git a/OsmAnd/src/net/osmand/plus/views/MapControlsLayer.java b/OsmAnd/src/net/osmand/plus/views/MapControlsLayer.java
index 6c397b09d6..35ffbe94e8 100644
--- a/OsmAnd/src/net/osmand/plus/views/MapControlsLayer.java
+++ b/OsmAnd/src/net/osmand/plus/views/MapControlsLayer.java
@@ -48,7 +48,6 @@ import net.osmand.plus.dialogs.DirectionsDialogs;
 import net.osmand.plus.mapcontextmenu.MapContextMenu;
 import net.osmand.plus.mapcontextmenu.other.MapRouteInfoMenu;
 import net.osmand.plus.mapcontextmenu.other.TrackDetailsMenu;
-import net.osmand.plus.measurementtool.MeasurementToolFragment;
 import net.osmand.plus.routing.RoutingHelper;
 import net.osmand.plus.views.corenative.NativeCoreContext;
 
@@ -687,6 +686,20 @@ public class MapControlsLayer extends OsmandMapLayer {
 		}
 	}
 
+	public void switchStatusbarAndNavbarVisibility() {
+		int uiOptions = mapActivity.getWindow().getDecorView().getSystemUiVisibility();
+		if (Build.VERSION.SDK_INT >= 14) {
+			uiOptions ^= View.SYSTEM_UI_FLAG_HIDE_NAVIGATION;
+		}
+		if (Build.VERSION.SDK_INT >= 16) {
+			uiOptions ^= View.SYSTEM_UI_FLAG_FULLSCREEN;
+		}
+		if (Build.VERSION.SDK_INT >= 19) {
+			uiOptions ^= View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY;
+		}
+		mapActivity.getWindow().getDecorView().setSystemUiVisibility(uiOptions);
+	}
+
 	public void startNavigation() {
 		OsmandApplication app = mapActivity.getMyApplication();
 		RoutingHelper routingHelper = app.getRoutingHelper();

From fe803ac326f34f3bbe56aff8b5aab5876ef28a1d Mon Sep 17 00:00:00 2001
From: Alexander Sytnyk <asytnyk0@gmail.com>
Date: Wed, 1 Nov 2017 15:22:32 +0200
Subject: [PATCH 08/17] Enter fullscreen mode only on devices with API >= 19

---
 .../src/net/osmand/plus/views/MapControlsLayer.java | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/OsmAnd/src/net/osmand/plus/views/MapControlsLayer.java b/OsmAnd/src/net/osmand/plus/views/MapControlsLayer.java
index 35ffbe94e8..8b9724a4a1 100644
--- a/OsmAnd/src/net/osmand/plus/views/MapControlsLayer.java
+++ b/OsmAnd/src/net/osmand/plus/views/MapControlsLayer.java
@@ -687,17 +687,14 @@ public class MapControlsLayer extends OsmandMapLayer {
 	}
 
 	public void switchStatusbarAndNavbarVisibility() {
-		int uiOptions = mapActivity.getWindow().getDecorView().getSystemUiVisibility();
-		if (Build.VERSION.SDK_INT >= 14) {
-			uiOptions ^= View.SYSTEM_UI_FLAG_HIDE_NAVIGATION;
-		}
-		if (Build.VERSION.SDK_INT >= 16) {
-			uiOptions ^= View.SYSTEM_UI_FLAG_FULLSCREEN;
-		}
 		if (Build.VERSION.SDK_INT >= 19) {
+			View decorView = mapActivity.getWindow().getDecorView();
+			int uiOptions = decorView.getSystemUiVisibility();
+			uiOptions ^= View.SYSTEM_UI_FLAG_HIDE_NAVIGATION;
+			uiOptions ^= View.SYSTEM_UI_FLAG_FULLSCREEN;
 			uiOptions ^= View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY;
+			decorView.setSystemUiVisibility(uiOptions);
 		}
-		mapActivity.getWindow().getDecorView().setSystemUiVisibility(uiOptions);
 	}
 
 	public void startNavigation() {

From 840dae932faf9c158c1a4fe86ce4586a783e9a3c Mon Sep 17 00:00:00 2001
From: Alexander Sytnyk <asytnyk0@gmail.com>
Date: Wed, 1 Nov 2017 17:08:46 +0200
Subject: [PATCH 09/17] Improve fullscreen mode entering

---
 .../osmand/plus/activities/MapActivity.java   |  1 +
 .../osmand/plus/dashboard/DashboardOnMap.java |  5 +-
 .../MapContextMenuFragment.java               |  5 +-
 .../other/MapRouteInfoMenuFragment.java       |  6 ++-
 .../plus/mapmarkers/PlanRouteFragment.java    |  9 ++--
 .../MeasurementToolFragment.java              |  5 +-
 .../osmand/plus/views/ContextMenuLayer.java   |  2 +-
 .../osmand/plus/views/MapControlsLayer.java   | 50 ++++++++++++++-----
 8 files changed, 61 insertions(+), 22 deletions(-)

diff --git a/OsmAnd/src/net/osmand/plus/activities/MapActivity.java b/OsmAnd/src/net/osmand/plus/activities/MapActivity.java
index df74bc3d06..90edd74513 100644
--- a/OsmAnd/src/net/osmand/plus/activities/MapActivity.java
+++ b/OsmAnd/src/net/osmand/plus/activities/MapActivity.java
@@ -930,6 +930,7 @@ public class MapActivity extends OsmandActionBarActivity implements DownloadEven
 
 	public void readLocationToShow() {
 		mapLayers.getMapControlsLayer().showMapControls();
+		mapLayers.getMapControlsLayer().showSystemUI();
 
 		LatLon cur = new LatLon(mapView.getLatitude(), mapView.getLongitude());
 		LatLon latLonToShow = settings.getAndClearMapLocationToShow();
diff --git a/OsmAnd/src/net/osmand/plus/dashboard/DashboardOnMap.java b/OsmAnd/src/net/osmand/plus/dashboard/DashboardOnMap.java
index 8438311687..36ebf169e2 100644
--- a/OsmAnd/src/net/osmand/plus/dashboard/DashboardOnMap.java
+++ b/OsmAnd/src/net/osmand/plus/dashboard/DashboardOnMap.java
@@ -85,6 +85,7 @@ import net.osmand.plus.srtmplugin.ContourLinesMenu;
 import net.osmand.plus.srtmplugin.HillshadeMenu;
 import net.osmand.plus.srtmplugin.SRTMPlugin;
 import net.osmand.plus.views.DownloadedRegionsLayer;
+import net.osmand.plus.views.MapControlsLayer;
 import net.osmand.plus.views.MapInfoLayer;
 import net.osmand.plus.views.OsmandMapTileView;
 import net.osmand.plus.views.controls.DynamicListView;
@@ -875,7 +876,9 @@ public class DashboardOnMap implements ObservableScrollViewCallbacks, DynamicLis
 				mapActivity.getMapView().refreshMap();
 			}
 
-			mapActivity.getMapLayers().getMapControlsLayer().showMapControls();
+			MapControlsLayer controlsLayer = mapActivity.getMapLayers().getMapControlsLayer();
+			controlsLayer.showMapControls();
+			controlsLayer.showSystemUI();
 			hideActionButton();
 			for (WeakReference<DashBaseFragment> df : fragList) {
 				if (df.get() != null) {
diff --git a/OsmAnd/src/net/osmand/plus/mapcontextmenu/MapContextMenuFragment.java b/OsmAnd/src/net/osmand/plus/mapcontextmenu/MapContextMenuFragment.java
index 3d3a0a3658..362876f104 100644
--- a/OsmAnd/src/net/osmand/plus/mapcontextmenu/MapContextMenuFragment.java
+++ b/OsmAnd/src/net/osmand/plus/mapcontextmenu/MapContextMenuFragment.java
@@ -46,6 +46,7 @@ import net.osmand.plus.mapcontextmenu.MenuController.TitleButtonController;
 import net.osmand.plus.mapcontextmenu.MenuController.TitleProgressController;
 import net.osmand.plus.mapcontextmenu.other.MapRouteInfoMenu;
 import net.osmand.plus.views.AnimateDraggingMapThread;
+import net.osmand.plus.views.MapControlsLayer;
 import net.osmand.plus.views.OsmandMapTileView;
 import net.osmand.plus.views.controls.HorizontalSwipeConfirm;
 import net.osmand.plus.views.controls.SingleTapConfirm;
@@ -904,7 +905,9 @@ public class MapContextMenuFragment extends Fragment implements DownloadEvents {
 			((View) parent).addOnLayoutChangeListener(containerLayoutListener);
 		}
 		menu.updateControlsVisibility(true);
-		getMapActivity().getMapLayers().getMapControlsLayer().showMapControls();
+		MapControlsLayer controlsLayer = getMapActivity().getMapLayers().getMapControlsLayer();
+		controlsLayer.showMapControls();
+		controlsLayer.showSystemUI();
 	}
 
 	@Override
diff --git a/OsmAnd/src/net/osmand/plus/mapcontextmenu/other/MapRouteInfoMenuFragment.java b/OsmAnd/src/net/osmand/plus/mapcontextmenu/other/MapRouteInfoMenuFragment.java
index 1ceedaa33c..93a81e72a7 100644
--- a/OsmAnd/src/net/osmand/plus/mapcontextmenu/other/MapRouteInfoMenuFragment.java
+++ b/OsmAnd/src/net/osmand/plus/mapcontextmenu/other/MapRouteInfoMenuFragment.java
@@ -4,7 +4,6 @@ import android.os.Bundle;
 import android.support.v4.app.Fragment;
 import android.support.v4.app.FragmentActivity;
 import android.support.v4.app.FragmentManager;
-import android.support.v4.app.FragmentTransaction;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -14,6 +13,7 @@ import net.osmand.AndroidUtils;
 import net.osmand.plus.R;
 import net.osmand.plus.activities.MapActivity;
 import net.osmand.plus.helpers.AndroidUiHelper;
+import net.osmand.plus.views.MapControlsLayer;
 
 public class MapRouteInfoMenuFragment extends Fragment {
 	public static final String TAG = "MapRouteInfoMenuFragment";
@@ -55,7 +55,9 @@ public class MapRouteInfoMenuFragment extends Fragment {
 		if (menu == null) {
 			dismiss();
 		}
-		getMapActivity().getMapLayers().getMapControlsLayer().showMapControls();
+		MapControlsLayer controlsLayer = getMapActivity().getMapLayers().getMapControlsLayer();
+		controlsLayer.showMapControls();
+		controlsLayer.showSystemUI();
 	}
 
 	@Override
diff --git a/OsmAnd/src/net/osmand/plus/mapmarkers/PlanRouteFragment.java b/OsmAnd/src/net/osmand/plus/mapmarkers/PlanRouteFragment.java
index 4911ec30d9..ce477804f7 100644
--- a/OsmAnd/src/net/osmand/plus/mapmarkers/PlanRouteFragment.java
+++ b/OsmAnd/src/net/osmand/plus/mapmarkers/PlanRouteFragment.java
@@ -53,6 +53,7 @@ import net.osmand.plus.mapmarkers.adapters.MapMarkersListAdapter;
 import net.osmand.plus.measurementtool.SnapToRoadBottomSheetDialogFragment;
 import net.osmand.plus.measurementtool.SnapToRoadBottomSheetDialogFragment.SnapToRoadFragmentListener;
 import net.osmand.plus.routing.RoutingHelper;
+import net.osmand.plus.views.MapControlsLayer;
 import net.osmand.plus.views.MapMarkersLayer;
 import net.osmand.plus.views.OsmandMapTileView;
 import net.osmand.plus.views.mapwidgets.MapInfoWidgetsFactory;
@@ -362,10 +363,10 @@ public class PlanRouteFragment extends Fragment implements OsmAndLocationListene
 	public void onResume() {
 		super.onResume();
 		MapActivity mapActivity = getMapActivity();
-		if (mapActivity != null) {
-			mapActivity.getMyApplication().getLocationProvider().addLocationListener(this);
-		}
-		getMapActivity().getMapLayers().getMapControlsLayer().showMapControls();
+		mapActivity.getMyApplication().getLocationProvider().addLocationListener(this);
+		MapControlsLayer controlsLayer = mapActivity.getMapLayers().getMapControlsLayer();
+		controlsLayer.showMapControls();
+		controlsLayer.showSystemUI();
 	}
 
 	@Override
diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
index 9008611dd9..37cac1bcf6 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.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.views.MapControlsLayer;
 import net.osmand.plus.views.OsmandMapTileView;
 import net.osmand.plus.views.mapwidgets.MapInfoWidgetsFactory;
 import net.osmand.plus.views.mapwidgets.MapInfoWidgetsFactory.TopToolbarController;
@@ -461,7 +462,9 @@ public class MeasurementToolFragment extends Fragment {
 	@Override
 	public void onResume() {
 		super.onResume();
-		getMapActivity().getMapLayers().getMapControlsLayer().showMapControls();
+		MapControlsLayer controlsLayer = getMapActivity().getMapLayers().getMapControlsLayer();
+		controlsLayer.showMapControls();
+		controlsLayer.showSystemUI();
 	}
 
 	@Override
diff --git a/OsmAnd/src/net/osmand/plus/views/ContextMenuLayer.java b/OsmAnd/src/net/osmand/plus/views/ContextMenuLayer.java
index 7f18a1aca0..8d7fcd75cc 100644
--- a/OsmAnd/src/net/osmand/plus/views/ContextMenuLayer.java
+++ b/OsmAnd/src/net/osmand/plus/views/ContextMenuLayer.java
@@ -814,7 +814,7 @@ public class ContextMenuLayer extends OsmandMapLayer {
 		if (!processed) {
 			MapControlsLayer controlsLayer = activity.getMapLayers().getMapControlsLayer();
 			controlsLayer.switchMapControlsVisibility();
-			controlsLayer.switchStatusbarAndNavbarVisibility();
+			controlsLayer.switchSystemUiVisibility();
 		}
 		return false;
 	}
diff --git a/OsmAnd/src/net/osmand/plus/views/MapControlsLayer.java b/OsmAnd/src/net/osmand/plus/views/MapControlsLayer.java
index 8b9724a4a1..7ae2934282 100644
--- a/OsmAnd/src/net/osmand/plus/views/MapControlsLayer.java
+++ b/OsmAnd/src/net/osmand/plus/views/MapControlsLayer.java
@@ -656,9 +656,17 @@ public class MapControlsLayer extends OsmandMapLayer {
 		zoomOutButton.setOnLongClickListener(listener);
 	}
 
+	private boolean switchMapControlsAndSystemUiVisibilityNotAllowed() {
+		return app.getRoutingHelper().isFollowingMode() || app.getRoutingHelper().isPauseNavigation()
+				|| mapActivity.getMeasurementToolFragment() != null
+				|| mapActivity.getPlanRouteFragment() != null
+				|| mapActivity.getMapLayers().getRulerControlLayer().rulerModeOn();
+	}
+
 	public void showMapControls() {
 		mapActivity.findViewById(R.id.MapHudButtonsOverlay).setVisibility(View.VISIBLE);
 	}
+
 	public void hideMapControls() {
 		mapActivity.findViewById(R.id.MapHudButtonsOverlay).setVisibility(View.INVISIBLE);
 	}
@@ -673,10 +681,7 @@ public class MapControlsLayer extends OsmandMapLayer {
 	}
 
 	public void switchMapControlsVisibility() {
-		if (app.getRoutingHelper().isFollowingMode() || app.getRoutingHelper().isPauseNavigation()
-				|| mapActivity.getMeasurementToolFragment() != null
-				|| mapActivity.getPlanRouteFragment() != null
-				|| mapActivity.getMapLayers().getRulerControlLayer().rulerModeOn()) {
+		if (switchMapControlsAndSystemUiVisibilityNotAllowed()) {
 			return;
 		}
 		if (isMapControlsVisible()) {
@@ -686,17 +691,38 @@ public class MapControlsLayer extends OsmandMapLayer {
 		}
 	}
 
-	public void switchStatusbarAndNavbarVisibility() {
-		if (Build.VERSION.SDK_INT >= 19) {
-			View decorView = mapActivity.getWindow().getDecorView();
-			int uiOptions = decorView.getSystemUiVisibility();
-			uiOptions ^= View.SYSTEM_UI_FLAG_HIDE_NAVIGATION;
-			uiOptions ^= View.SYSTEM_UI_FLAG_FULLSCREEN;
-			uiOptions ^= View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY;
-			decorView.setSystemUiVisibility(uiOptions);
+	public void showSystemUI() {
+		if (Build.VERSION.SDK_INT >= 19 && !isSystemUiVisible()) {
+			switchSystemUiVisibility();
 		}
 	}
 
+	public void hideSystemUI() {
+		if (Build.VERSION.SDK_INT >= 19 && isSystemUiVisible()) {
+			switchSystemUiVisibility();
+		}
+	}
+
+	public boolean isSystemUiVisible() {
+		if (Build.VERSION.SDK_INT >= 19) {
+			int uiOptions = mapActivity.getWindow().getDecorView().getSystemUiVisibility();
+			return !((uiOptions | View.SYSTEM_UI_FLAG_FULLSCREEN) == uiOptions);
+		}
+		return true;
+	}
+
+	public void switchSystemUiVisibility() {
+		if (switchMapControlsAndSystemUiVisibilityNotAllowed() || Build.VERSION.SDK_INT < 19) {
+			return;
+		}
+		View decorView = mapActivity.getWindow().getDecorView();
+		int uiOptions = decorView.getSystemUiVisibility();
+		uiOptions ^= View.SYSTEM_UI_FLAG_HIDE_NAVIGATION;
+		uiOptions ^= View.SYSTEM_UI_FLAG_FULLSCREEN;
+		uiOptions ^= View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY;
+		decorView.setSystemUiVisibility(uiOptions);
+	}
+
 	public void startNavigation() {
 		OsmandApplication app = mapActivity.getMyApplication();
 		RoutingHelper routingHelper = app.getRoutingHelper();

From 793b8793f27db7f9b37ef2652c002aefc08386d6 Mon Sep 17 00:00:00 2001
From: Alexander Sytnyk <asytnyk0@gmail.com>
Date: Wed, 1 Nov 2017 17:32:24 +0200
Subject: [PATCH 10/17] Rename method; extract showing system ui to the
 showMapControls method

---
 .../src/net/osmand/plus/activities/MapActivity.java   |  1 -
 .../src/net/osmand/plus/dashboard/DashboardOnMap.java |  5 +----
 .../plus/mapcontextmenu/MapContextMenuFragment.java   |  5 +----
 .../other/MapRouteInfoMenuFragment.java               |  5 +----
 .../net/osmand/plus/mapmarkers/PlanRouteFragment.java |  5 +----
 .../plus/measurementtool/MeasurementToolFragment.java |  5 +----
 .../src/net/osmand/plus/views/MapControlsLayer.java   | 11 ++++++-----
 7 files changed, 11 insertions(+), 26 deletions(-)

diff --git a/OsmAnd/src/net/osmand/plus/activities/MapActivity.java b/OsmAnd/src/net/osmand/plus/activities/MapActivity.java
index 90edd74513..df74bc3d06 100644
--- a/OsmAnd/src/net/osmand/plus/activities/MapActivity.java
+++ b/OsmAnd/src/net/osmand/plus/activities/MapActivity.java
@@ -930,7 +930,6 @@ public class MapActivity extends OsmandActionBarActivity implements DownloadEven
 
 	public void readLocationToShow() {
 		mapLayers.getMapControlsLayer().showMapControls();
-		mapLayers.getMapControlsLayer().showSystemUI();
 
 		LatLon cur = new LatLon(mapView.getLatitude(), mapView.getLongitude());
 		LatLon latLonToShow = settings.getAndClearMapLocationToShow();
diff --git a/OsmAnd/src/net/osmand/plus/dashboard/DashboardOnMap.java b/OsmAnd/src/net/osmand/plus/dashboard/DashboardOnMap.java
index 36ebf169e2..8438311687 100644
--- a/OsmAnd/src/net/osmand/plus/dashboard/DashboardOnMap.java
+++ b/OsmAnd/src/net/osmand/plus/dashboard/DashboardOnMap.java
@@ -85,7 +85,6 @@ import net.osmand.plus.srtmplugin.ContourLinesMenu;
 import net.osmand.plus.srtmplugin.HillshadeMenu;
 import net.osmand.plus.srtmplugin.SRTMPlugin;
 import net.osmand.plus.views.DownloadedRegionsLayer;
-import net.osmand.plus.views.MapControlsLayer;
 import net.osmand.plus.views.MapInfoLayer;
 import net.osmand.plus.views.OsmandMapTileView;
 import net.osmand.plus.views.controls.DynamicListView;
@@ -876,9 +875,7 @@ public class DashboardOnMap implements ObservableScrollViewCallbacks, DynamicLis
 				mapActivity.getMapView().refreshMap();
 			}
 
-			MapControlsLayer controlsLayer = mapActivity.getMapLayers().getMapControlsLayer();
-			controlsLayer.showMapControls();
-			controlsLayer.showSystemUI();
+			mapActivity.getMapLayers().getMapControlsLayer().showMapControls();
 			hideActionButton();
 			for (WeakReference<DashBaseFragment> df : fragList) {
 				if (df.get() != null) {
diff --git a/OsmAnd/src/net/osmand/plus/mapcontextmenu/MapContextMenuFragment.java b/OsmAnd/src/net/osmand/plus/mapcontextmenu/MapContextMenuFragment.java
index 362876f104..3d3a0a3658 100644
--- a/OsmAnd/src/net/osmand/plus/mapcontextmenu/MapContextMenuFragment.java
+++ b/OsmAnd/src/net/osmand/plus/mapcontextmenu/MapContextMenuFragment.java
@@ -46,7 +46,6 @@ import net.osmand.plus.mapcontextmenu.MenuController.TitleButtonController;
 import net.osmand.plus.mapcontextmenu.MenuController.TitleProgressController;
 import net.osmand.plus.mapcontextmenu.other.MapRouteInfoMenu;
 import net.osmand.plus.views.AnimateDraggingMapThread;
-import net.osmand.plus.views.MapControlsLayer;
 import net.osmand.plus.views.OsmandMapTileView;
 import net.osmand.plus.views.controls.HorizontalSwipeConfirm;
 import net.osmand.plus.views.controls.SingleTapConfirm;
@@ -905,9 +904,7 @@ public class MapContextMenuFragment extends Fragment implements DownloadEvents {
 			((View) parent).addOnLayoutChangeListener(containerLayoutListener);
 		}
 		menu.updateControlsVisibility(true);
-		MapControlsLayer controlsLayer = getMapActivity().getMapLayers().getMapControlsLayer();
-		controlsLayer.showMapControls();
-		controlsLayer.showSystemUI();
+		getMapActivity().getMapLayers().getMapControlsLayer().showMapControls();
 	}
 
 	@Override
diff --git a/OsmAnd/src/net/osmand/plus/mapcontextmenu/other/MapRouteInfoMenuFragment.java b/OsmAnd/src/net/osmand/plus/mapcontextmenu/other/MapRouteInfoMenuFragment.java
index 93a81e72a7..d63975be85 100644
--- a/OsmAnd/src/net/osmand/plus/mapcontextmenu/other/MapRouteInfoMenuFragment.java
+++ b/OsmAnd/src/net/osmand/plus/mapcontextmenu/other/MapRouteInfoMenuFragment.java
@@ -13,7 +13,6 @@ import net.osmand.AndroidUtils;
 import net.osmand.plus.R;
 import net.osmand.plus.activities.MapActivity;
 import net.osmand.plus.helpers.AndroidUiHelper;
-import net.osmand.plus.views.MapControlsLayer;
 
 public class MapRouteInfoMenuFragment extends Fragment {
 	public static final String TAG = "MapRouteInfoMenuFragment";
@@ -55,9 +54,7 @@ public class MapRouteInfoMenuFragment extends Fragment {
 		if (menu == null) {
 			dismiss();
 		}
-		MapControlsLayer controlsLayer = getMapActivity().getMapLayers().getMapControlsLayer();
-		controlsLayer.showMapControls();
-		controlsLayer.showSystemUI();
+		getMapActivity().getMapLayers().getMapControlsLayer().showMapControls();
 	}
 
 	@Override
diff --git a/OsmAnd/src/net/osmand/plus/mapmarkers/PlanRouteFragment.java b/OsmAnd/src/net/osmand/plus/mapmarkers/PlanRouteFragment.java
index ce477804f7..0da40daccd 100644
--- a/OsmAnd/src/net/osmand/plus/mapmarkers/PlanRouteFragment.java
+++ b/OsmAnd/src/net/osmand/plus/mapmarkers/PlanRouteFragment.java
@@ -53,7 +53,6 @@ import net.osmand.plus.mapmarkers.adapters.MapMarkersListAdapter;
 import net.osmand.plus.measurementtool.SnapToRoadBottomSheetDialogFragment;
 import net.osmand.plus.measurementtool.SnapToRoadBottomSheetDialogFragment.SnapToRoadFragmentListener;
 import net.osmand.plus.routing.RoutingHelper;
-import net.osmand.plus.views.MapControlsLayer;
 import net.osmand.plus.views.MapMarkersLayer;
 import net.osmand.plus.views.OsmandMapTileView;
 import net.osmand.plus.views.mapwidgets.MapInfoWidgetsFactory;
@@ -364,9 +363,7 @@ public class PlanRouteFragment extends Fragment implements OsmAndLocationListene
 		super.onResume();
 		MapActivity mapActivity = getMapActivity();
 		mapActivity.getMyApplication().getLocationProvider().addLocationListener(this);
-		MapControlsLayer controlsLayer = mapActivity.getMapLayers().getMapControlsLayer();
-		controlsLayer.showMapControls();
-		controlsLayer.showSystemUI();
+		mapActivity.getMapLayers().getMapControlsLayer().showMapControls();
 	}
 
 	@Override
diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
index 37cac1bcf6..9008611dd9 100644
--- a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
@@ -61,7 +61,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.views.MapControlsLayer;
 import net.osmand.plus.views.OsmandMapTileView;
 import net.osmand.plus.views.mapwidgets.MapInfoWidgetsFactory;
 import net.osmand.plus.views.mapwidgets.MapInfoWidgetsFactory.TopToolbarController;
@@ -462,9 +461,7 @@ public class MeasurementToolFragment extends Fragment {
 	@Override
 	public void onResume() {
 		super.onResume();
-		MapControlsLayer controlsLayer = getMapActivity().getMapLayers().getMapControlsLayer();
-		controlsLayer.showMapControls();
-		controlsLayer.showSystemUI();
+		getMapActivity().getMapLayers().getMapControlsLayer().showMapControls();
 	}
 
 	@Override
diff --git a/OsmAnd/src/net/osmand/plus/views/MapControlsLayer.java b/OsmAnd/src/net/osmand/plus/views/MapControlsLayer.java
index 7ae2934282..14dabd4617 100644
--- a/OsmAnd/src/net/osmand/plus/views/MapControlsLayer.java
+++ b/OsmAnd/src/net/osmand/plus/views/MapControlsLayer.java
@@ -656,15 +656,16 @@ public class MapControlsLayer extends OsmandMapLayer {
 		zoomOutButton.setOnLongClickListener(listener);
 	}
 
-	private boolean switchMapControlsAndSystemUiVisibilityNotAllowed() {
-		return app.getRoutingHelper().isFollowingMode() || app.getRoutingHelper().isPauseNavigation()
+	private boolean isFullscreenModeAllowed() {
+		return !(app.getRoutingHelper().isFollowingMode() || app.getRoutingHelper().isPauseNavigation()
 				|| mapActivity.getMeasurementToolFragment() != null
 				|| mapActivity.getPlanRouteFragment() != null
-				|| mapActivity.getMapLayers().getRulerControlLayer().rulerModeOn();
+				|| mapActivity.getMapLayers().getRulerControlLayer().rulerModeOn());
 	}
 
 	public void showMapControls() {
 		mapActivity.findViewById(R.id.MapHudButtonsOverlay).setVisibility(View.VISIBLE);
+		showSystemUI();
 	}
 
 	public void hideMapControls() {
@@ -681,7 +682,7 @@ public class MapControlsLayer extends OsmandMapLayer {
 	}
 
 	public void switchMapControlsVisibility() {
-		if (switchMapControlsAndSystemUiVisibilityNotAllowed()) {
+		if (!isFullscreenModeAllowed()) {
 			return;
 		}
 		if (isMapControlsVisible()) {
@@ -712,7 +713,7 @@ public class MapControlsLayer extends OsmandMapLayer {
 	}
 
 	public void switchSystemUiVisibility() {
-		if (switchMapControlsAndSystemUiVisibilityNotAllowed() || Build.VERSION.SDK_INT < 19) {
+		if (!isFullscreenModeAllowed() || Build.VERSION.SDK_INT < 19) {
 			return;
 		}
 		View decorView = mapActivity.getWindow().getDecorView();

From d7a7b9aa295edd1278021be2e232b2ae4501ed9b Mon Sep 17 00:00:00 2001
From: Alexander Sytnyk <asytnyk0@gmail.com>
Date: Wed, 1 Nov 2017 17:45:45 +0200
Subject: [PATCH 11/17] Extract methods for work with system UI to AndroidUtils

---
 OsmAnd/src/net/osmand/AndroidUtils.java       | 32 +++++++++++
 .../osmand/plus/views/ContextMenuLayer.java   |  4 +-
 .../osmand/plus/views/MapControlsLayer.java   | 53 ++++---------------
 3 files changed, 43 insertions(+), 46 deletions(-)

diff --git a/OsmAnd/src/net/osmand/AndroidUtils.java b/OsmAnd/src/net/osmand/AndroidUtils.java
index 4961b279be..e676cd4ec3 100644
--- a/OsmAnd/src/net/osmand/AndroidUtils.java
+++ b/OsmAnd/src/net/osmand/AndroidUtils.java
@@ -243,6 +243,38 @@ public class AndroidUtils {
 		return new PointF(centroidX, centroidY);
 	}
 
+	public static void showSystemUI(Activity activity) {
+		if (Build.VERSION.SDK_INT >= 19 && !isSystemUiVisible(activity)) {
+			switchSystemUiVisibility(activity);
+		}
+	}
+
+	public static void hideSystemUI(Activity activity) {
+		if (Build.VERSION.SDK_INT >= 19 && isSystemUiVisible(activity)) {
+			switchSystemUiVisibility(activity);
+		}
+	}
+
+	public static boolean isSystemUiVisible(Activity activity) {
+		if (Build.VERSION.SDK_INT >= 19) {
+			int uiOptions = activity.getWindow().getDecorView().getSystemUiVisibility();
+			return !((uiOptions | View.SYSTEM_UI_FLAG_FULLSCREEN) == uiOptions);
+		}
+		return true;
+	}
+
+	public static void switchSystemUiVisibility(Activity activity) {
+		if (Build.VERSION.SDK_INT < 19) {
+			return;
+		}
+		View decorView = activity.getWindow().getDecorView();
+		int uiOptions = decorView.getSystemUiVisibility();
+		uiOptions ^= View.SYSTEM_UI_FLAG_HIDE_NAVIGATION;
+		uiOptions ^= View.SYSTEM_UI_FLAG_FULLSCREEN;
+		uiOptions ^= View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY;
+		decorView.setSystemUiVisibility(uiOptions);
+	}
+
 	public static <K, V extends Comparable<? super V>> Map<K, V> sortByValue(Map<K, V> map) {
 		List<Map.Entry<K, V>> list = new LinkedList<>(map.entrySet());
 		Collections.sort(list, new Comparator<Map.Entry<K, V>>() {
diff --git a/OsmAnd/src/net/osmand/plus/views/ContextMenuLayer.java b/OsmAnd/src/net/osmand/plus/views/ContextMenuLayer.java
index 8d7fcd75cc..972f862fb9 100644
--- a/OsmAnd/src/net/osmand/plus/views/ContextMenuLayer.java
+++ b/OsmAnd/src/net/osmand/plus/views/ContextMenuLayer.java
@@ -812,9 +812,7 @@ public class ContextMenuLayer extends OsmandMapLayer {
 		boolean processed = hideVisibleMenues();
 		processed |= menu.onSingleTapOnMap();
 		if (!processed) {
-			MapControlsLayer controlsLayer = activity.getMapLayers().getMapControlsLayer();
-			controlsLayer.switchMapControlsVisibility();
-			controlsLayer.switchSystemUiVisibility();
+			activity.getMapLayers().getMapControlsLayer().switchMapControlsVisibility(true);
 		}
 		return false;
 	}
diff --git a/OsmAnd/src/net/osmand/plus/views/MapControlsLayer.java b/OsmAnd/src/net/osmand/plus/views/MapControlsLayer.java
index 14dabd4617..7ebfcfe16e 100644
--- a/OsmAnd/src/net/osmand/plus/views/MapControlsLayer.java
+++ b/OsmAnd/src/net/osmand/plus/views/MapControlsLayer.java
@@ -656,16 +656,9 @@ public class MapControlsLayer extends OsmandMapLayer {
 		zoomOutButton.setOnLongClickListener(listener);
 	}
 
-	private boolean isFullscreenModeAllowed() {
-		return !(app.getRoutingHelper().isFollowingMode() || app.getRoutingHelper().isPauseNavigation()
-				|| mapActivity.getMeasurementToolFragment() != null
-				|| mapActivity.getPlanRouteFragment() != null
-				|| mapActivity.getMapLayers().getRulerControlLayer().rulerModeOn());
-	}
-
 	public void showMapControls() {
 		mapActivity.findViewById(R.id.MapHudButtonsOverlay).setVisibility(View.VISIBLE);
-		showSystemUI();
+		AndroidUtils.showSystemUI(mapActivity);
 	}
 
 	public void hideMapControls() {
@@ -681,49 +674,23 @@ public class MapControlsLayer extends OsmandMapLayer {
 		return mapActivity.findViewById(R.id.MapHudButtonsOverlay).getVisibility() == View.VISIBLE;
 	}
 
-	public void switchMapControlsVisibility() {
-		if (!isFullscreenModeAllowed()) {
+	public void switchMapControlsVisibility(boolean switchSystemUiVisibility) {
+		if (app.getRoutingHelper().isFollowingMode() || app.getRoutingHelper().isPauseNavigation()
+				|| mapActivity.getMeasurementToolFragment() != null
+				|| mapActivity.getPlanRouteFragment() != null
+				|| mapActivity.getMapLayers().getRulerControlLayer().rulerModeOn()) {
 			return;
 		}
 		if (isMapControlsVisible()) {
-			hideMapControls();
+			AndroidUtils.hideSystemUI(mapActivity);
+			if (switchSystemUiVisibility) {
+				hideMapControls();
+			}
 		} else {
 			showMapControls();
 		}
 	}
 
-	public void showSystemUI() {
-		if (Build.VERSION.SDK_INT >= 19 && !isSystemUiVisible()) {
-			switchSystemUiVisibility();
-		}
-	}
-
-	public void hideSystemUI() {
-		if (Build.VERSION.SDK_INT >= 19 && isSystemUiVisible()) {
-			switchSystemUiVisibility();
-		}
-	}
-
-	public boolean isSystemUiVisible() {
-		if (Build.VERSION.SDK_INT >= 19) {
-			int uiOptions = mapActivity.getWindow().getDecorView().getSystemUiVisibility();
-			return !((uiOptions | View.SYSTEM_UI_FLAG_FULLSCREEN) == uiOptions);
-		}
-		return true;
-	}
-
-	public void switchSystemUiVisibility() {
-		if (!isFullscreenModeAllowed() || Build.VERSION.SDK_INT < 19) {
-			return;
-		}
-		View decorView = mapActivity.getWindow().getDecorView();
-		int uiOptions = decorView.getSystemUiVisibility();
-		uiOptions ^= View.SYSTEM_UI_FLAG_HIDE_NAVIGATION;
-		uiOptions ^= View.SYSTEM_UI_FLAG_FULLSCREEN;
-		uiOptions ^= View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY;
-		decorView.setSystemUiVisibility(uiOptions);
-	}
-
 	public void startNavigation() {
 		OsmandApplication app = mapActivity.getMyApplication();
 		RoutingHelper routingHelper = app.getRoutingHelper();

From e0b2ec9bee8ea514d5dc6aa3eae242fff4987075 Mon Sep 17 00:00:00 2001
From: Alexander Sytnyk <asytnyk0@gmail.com>
Date: Wed, 1 Nov 2017 17:53:27 +0200
Subject: [PATCH 12/17] Fix method call

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

diff --git a/OsmAnd/src/net/osmand/plus/views/MapControlsLayer.java b/OsmAnd/src/net/osmand/plus/views/MapControlsLayer.java
index 7ebfcfe16e..0c82a4a19e 100644
--- a/OsmAnd/src/net/osmand/plus/views/MapControlsLayer.java
+++ b/OsmAnd/src/net/osmand/plus/views/MapControlsLayer.java
@@ -682,9 +682,9 @@ public class MapControlsLayer extends OsmandMapLayer {
 			return;
 		}
 		if (isMapControlsVisible()) {
-			AndroidUtils.hideSystemUI(mapActivity);
+			hideMapControls();
 			if (switchSystemUiVisibility) {
-				hideMapControls();
+				AndroidUtils.hideSystemUI(mapActivity);
 			}
 		} else {
 			showMapControls();

From e35c70b5f1d5e016140175c344263f83ecfc953f Mon Sep 17 00:00:00 2001
From: Alexander Sytnyk <asytnyk0@gmail.com>
Date: Wed, 1 Nov 2017 18:22:51 +0200
Subject: [PATCH 13/17] Add setting

---
 OsmAnd/res/values/strings.xml                                   | 2 ++
 OsmAnd/src/net/osmand/plus/OsmandSettings.java                  | 2 ++
 .../src/net/osmand/plus/activities/SettingsGeneralActivity.java | 1 +
 OsmAnd/src/net/osmand/plus/views/ContextMenuLayer.java          | 2 +-
 4 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/OsmAnd/res/values/strings.xml b/OsmAnd/res/values/strings.xml
index 9274f4b88b..683f223088 100644
--- a/OsmAnd/res/values/strings.xml
+++ b/OsmAnd/res/values/strings.xml
@@ -9,6 +9,8 @@
          3. All your modified/created strings are in the top of the file (to make easier find what\'s translated).
     PLEASE: Have a look at http://code.google.com/p/osmand/wiki/UIConsistency, it may really improve your and our work  :-)  Thx - Hardy
     -->
+    <string name="tap_on_map_to_hide_interface_descr">Pressing anywhere on the map hides the interface and toggles the full screen mode.</string>
+    <string name="tap_on_map_to_hide_interface">Tap on map to hide interface</string>
     <string name="show_on_top_bar">Show on Top Bar</string>
     <string name="mark_passed">Mark passed</string>
     <string name="import_gpx_file_description">can be imported as Favorites points, or as track file.</string>
diff --git a/OsmAnd/src/net/osmand/plus/OsmandSettings.java b/OsmAnd/src/net/osmand/plus/OsmandSettings.java
index 9c8fcf4d5e..f9f2980b75 100644
--- a/OsmAnd/src/net/osmand/plus/OsmandSettings.java
+++ b/OsmAnd/src/net/osmand/plus/OsmandSettings.java
@@ -902,6 +902,8 @@ public class OsmandSettings {
 	public final OsmandPreference<Boolean> DO_NOT_USE_ANIMATIONS = new BooleanPreference("do_not_use_animations", false).makeGlobal().cache();
 	public final OsmandPreference<Boolean> DO_NOT_SEND_ANONYMOUS_APP_USAGE = new BooleanPreference("do_not_send_anonymous_app_usage", false).makeGlobal().cache();
 
+	public final OsmandPreference<Boolean> HIDE_INTERFACE_AFTER_TAP_ON_MAP = new BooleanPreference("hide_interface_after_tap_on_map", true).makeGlobal().cache();
+
 
 	public final CommonPreference<Float> TEXT_SCALE = new FloatPreference("text_scale", 1f).makeProfile().cache();
 
diff --git a/OsmAnd/src/net/osmand/plus/activities/SettingsGeneralActivity.java b/OsmAnd/src/net/osmand/plus/activities/SettingsGeneralActivity.java
index 3ccdba5893..0c198ae9eb 100644
--- a/OsmAnd/src/net/osmand/plus/activities/SettingsGeneralActivity.java
+++ b/OsmAnd/src/net/osmand/plus/activities/SettingsGeneralActivity.java
@@ -496,6 +496,7 @@ public class SettingsGeneralActivity extends SettingsBaseActivity implements OnR
 		misc.addPreference(createCheckBoxPreference(settings.DO_NOT_SHOW_STARTUP_MESSAGES, R.string.do_not_show_startup_messages, R.string.do_not_show_startup_messages_desc));
 		misc.addPreference(createCheckBoxPreference(settings.DO_NOT_USE_ANIMATIONS, R.string.do_not_use_animations, R.string.do_not_use_animations_descr));
 		misc.addPreference(createCheckBoxPreference(settings.USE_MAGNETIC_FIELD_SENSOR_COMPASS, R.string.use_magnetic_sensor, R.string.use_magnetic_sensor_descr));
+		misc.addPreference(createCheckBoxPreference(settings.HIDE_INTERFACE_AFTER_TAP_ON_MAP, R.string.tap_on_map_to_hide_interface, R.string.tap_on_map_to_hide_interface_descr));
 	}
 
 
diff --git a/OsmAnd/src/net/osmand/plus/views/ContextMenuLayer.java b/OsmAnd/src/net/osmand/plus/views/ContextMenuLayer.java
index 972f862fb9..c795066703 100644
--- a/OsmAnd/src/net/osmand/plus/views/ContextMenuLayer.java
+++ b/OsmAnd/src/net/osmand/plus/views/ContextMenuLayer.java
@@ -811,7 +811,7 @@ public class ContextMenuLayer extends OsmandMapLayer {
 
 		boolean processed = hideVisibleMenues();
 		processed |= menu.onSingleTapOnMap();
-		if (!processed) {
+		if (!processed && activity.getMyApplication().getSettings().HIDE_INTERFACE_AFTER_TAP_ON_MAP.get()) {
 			activity.getMapLayers().getMapControlsLayer().switchMapControlsVisibility(true);
 		}
 		return false;

From c54c06ac518f3de5ecee023d583aa4586e967d34 Mon Sep 17 00:00:00 2001
From: Alexander Sytnyk <asytnyk0@gmail.com>
Date: Wed, 1 Nov 2017 18:47:26 +0200
Subject: [PATCH 14/17] Rename setting

---
 OsmAnd/src/net/osmand/plus/OsmandSettings.java                  | 2 +-
 .../src/net/osmand/plus/activities/SettingsGeneralActivity.java | 2 +-
 OsmAnd/src/net/osmand/plus/views/ContextMenuLayer.java          | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/OsmAnd/src/net/osmand/plus/OsmandSettings.java b/OsmAnd/src/net/osmand/plus/OsmandSettings.java
index f9f2980b75..12e1a466b8 100644
--- a/OsmAnd/src/net/osmand/plus/OsmandSettings.java
+++ b/OsmAnd/src/net/osmand/plus/OsmandSettings.java
@@ -902,7 +902,7 @@ public class OsmandSettings {
 	public final OsmandPreference<Boolean> DO_NOT_USE_ANIMATIONS = new BooleanPreference("do_not_use_animations", false).makeGlobal().cache();
 	public final OsmandPreference<Boolean> DO_NOT_SEND_ANONYMOUS_APP_USAGE = new BooleanPreference("do_not_send_anonymous_app_usage", false).makeGlobal().cache();
 
-	public final OsmandPreference<Boolean> HIDE_INTERFACE_AFTER_TAP_ON_MAP = new BooleanPreference("hide_interface_after_tap_on_map", true).makeGlobal().cache();
+	public final OsmandPreference<Boolean> MAP_EMPTY_STATE_ENABLED = new BooleanPreference("hide_interface_after_tap_on_map", true).makeGlobal().cache();
 
 
 	public final CommonPreference<Float> TEXT_SCALE = new FloatPreference("text_scale", 1f).makeProfile().cache();
diff --git a/OsmAnd/src/net/osmand/plus/activities/SettingsGeneralActivity.java b/OsmAnd/src/net/osmand/plus/activities/SettingsGeneralActivity.java
index 0c198ae9eb..f2c97f77db 100644
--- a/OsmAnd/src/net/osmand/plus/activities/SettingsGeneralActivity.java
+++ b/OsmAnd/src/net/osmand/plus/activities/SettingsGeneralActivity.java
@@ -496,7 +496,7 @@ public class SettingsGeneralActivity extends SettingsBaseActivity implements OnR
 		misc.addPreference(createCheckBoxPreference(settings.DO_NOT_SHOW_STARTUP_MESSAGES, R.string.do_not_show_startup_messages, R.string.do_not_show_startup_messages_desc));
 		misc.addPreference(createCheckBoxPreference(settings.DO_NOT_USE_ANIMATIONS, R.string.do_not_use_animations, R.string.do_not_use_animations_descr));
 		misc.addPreference(createCheckBoxPreference(settings.USE_MAGNETIC_FIELD_SENSOR_COMPASS, R.string.use_magnetic_sensor, R.string.use_magnetic_sensor_descr));
-		misc.addPreference(createCheckBoxPreference(settings.HIDE_INTERFACE_AFTER_TAP_ON_MAP, R.string.tap_on_map_to_hide_interface, R.string.tap_on_map_to_hide_interface_descr));
+		misc.addPreference(createCheckBoxPreference(settings.MAP_EMPTY_STATE_ENABLED, R.string.tap_on_map_to_hide_interface, R.string.tap_on_map_to_hide_interface_descr));
 	}
 
 
diff --git a/OsmAnd/src/net/osmand/plus/views/ContextMenuLayer.java b/OsmAnd/src/net/osmand/plus/views/ContextMenuLayer.java
index c795066703..e2e227d2f5 100644
--- a/OsmAnd/src/net/osmand/plus/views/ContextMenuLayer.java
+++ b/OsmAnd/src/net/osmand/plus/views/ContextMenuLayer.java
@@ -811,7 +811,7 @@ public class ContextMenuLayer extends OsmandMapLayer {
 
 		boolean processed = hideVisibleMenues();
 		processed |= menu.onSingleTapOnMap();
-		if (!processed && activity.getMyApplication().getSettings().HIDE_INTERFACE_AFTER_TAP_ON_MAP.get()) {
+		if (!processed && activity.getMyApplication().getSettings().MAP_EMPTY_STATE_ENABLED.get()) {
 			activity.getMapLayers().getMapControlsLayer().switchMapControlsVisibility(true);
 		}
 		return false;

From 9698478714da1693e0cabf7db6f0453a9872d936 Mon Sep 17 00:00:00 2001
From: Alexander Sytnyk <asytnyk0@gmail.com>
Date: Wed, 1 Nov 2017 18:50:06 +0200
Subject: [PATCH 15/17] Fix id

---
 OsmAnd/src/net/osmand/plus/OsmandSettings.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/OsmAnd/src/net/osmand/plus/OsmandSettings.java b/OsmAnd/src/net/osmand/plus/OsmandSettings.java
index 12e1a466b8..1ecd7756ec 100644
--- a/OsmAnd/src/net/osmand/plus/OsmandSettings.java
+++ b/OsmAnd/src/net/osmand/plus/OsmandSettings.java
@@ -902,7 +902,7 @@ public class OsmandSettings {
 	public final OsmandPreference<Boolean> DO_NOT_USE_ANIMATIONS = new BooleanPreference("do_not_use_animations", false).makeGlobal().cache();
 	public final OsmandPreference<Boolean> DO_NOT_SEND_ANONYMOUS_APP_USAGE = new BooleanPreference("do_not_send_anonymous_app_usage", false).makeGlobal().cache();
 
-	public final OsmandPreference<Boolean> MAP_EMPTY_STATE_ENABLED = new BooleanPreference("hide_interface_after_tap_on_map", true).makeGlobal().cache();
+	public final OsmandPreference<Boolean> MAP_EMPTY_STATE_ENABLED = new BooleanPreference("map_empty_state_enabled", true).makeGlobal().cache();
 
 
 	public final CommonPreference<Float> TEXT_SCALE = new FloatPreference("text_scale", 1f).makeProfile().cache();

From 438f1cf93d7a835c86b14a1374143f04e58a9516 Mon Sep 17 00:00:00 2001
From: Alexander Sytnyk <asytnyk0@gmail.com>
Date: Wed, 1 Nov 2017 18:51:16 +0200
Subject: [PATCH 16/17] Fix setting name

---
 OsmAnd/src/net/osmand/plus/OsmandSettings.java                  | 2 +-
 .../src/net/osmand/plus/activities/SettingsGeneralActivity.java | 2 +-
 OsmAnd/src/net/osmand/plus/views/ContextMenuLayer.java          | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/OsmAnd/src/net/osmand/plus/OsmandSettings.java b/OsmAnd/src/net/osmand/plus/OsmandSettings.java
index 1ecd7756ec..96dac1b2f4 100644
--- a/OsmAnd/src/net/osmand/plus/OsmandSettings.java
+++ b/OsmAnd/src/net/osmand/plus/OsmandSettings.java
@@ -902,7 +902,7 @@ public class OsmandSettings {
 	public final OsmandPreference<Boolean> DO_NOT_USE_ANIMATIONS = new BooleanPreference("do_not_use_animations", false).makeGlobal().cache();
 	public final OsmandPreference<Boolean> DO_NOT_SEND_ANONYMOUS_APP_USAGE = new BooleanPreference("do_not_send_anonymous_app_usage", false).makeGlobal().cache();
 
-	public final OsmandPreference<Boolean> MAP_EMPTY_STATE_ENABLED = new BooleanPreference("map_empty_state_enabled", true).makeGlobal().cache();
+	public final OsmandPreference<Boolean> MAP_EMPTY_STATE_ALLOWED = new BooleanPreference("map_empty_state_allowed", true).makeGlobal().cache();
 
 
 	public final CommonPreference<Float> TEXT_SCALE = new FloatPreference("text_scale", 1f).makeProfile().cache();
diff --git a/OsmAnd/src/net/osmand/plus/activities/SettingsGeneralActivity.java b/OsmAnd/src/net/osmand/plus/activities/SettingsGeneralActivity.java
index f2c97f77db..69b2de8259 100644
--- a/OsmAnd/src/net/osmand/plus/activities/SettingsGeneralActivity.java
+++ b/OsmAnd/src/net/osmand/plus/activities/SettingsGeneralActivity.java
@@ -496,7 +496,7 @@ public class SettingsGeneralActivity extends SettingsBaseActivity implements OnR
 		misc.addPreference(createCheckBoxPreference(settings.DO_NOT_SHOW_STARTUP_MESSAGES, R.string.do_not_show_startup_messages, R.string.do_not_show_startup_messages_desc));
 		misc.addPreference(createCheckBoxPreference(settings.DO_NOT_USE_ANIMATIONS, R.string.do_not_use_animations, R.string.do_not_use_animations_descr));
 		misc.addPreference(createCheckBoxPreference(settings.USE_MAGNETIC_FIELD_SENSOR_COMPASS, R.string.use_magnetic_sensor, R.string.use_magnetic_sensor_descr));
-		misc.addPreference(createCheckBoxPreference(settings.MAP_EMPTY_STATE_ENABLED, R.string.tap_on_map_to_hide_interface, R.string.tap_on_map_to_hide_interface_descr));
+		misc.addPreference(createCheckBoxPreference(settings.MAP_EMPTY_STATE_ALLOWED, R.string.tap_on_map_to_hide_interface, R.string.tap_on_map_to_hide_interface_descr));
 	}
 
 
diff --git a/OsmAnd/src/net/osmand/plus/views/ContextMenuLayer.java b/OsmAnd/src/net/osmand/plus/views/ContextMenuLayer.java
index e2e227d2f5..84ddef5780 100644
--- a/OsmAnd/src/net/osmand/plus/views/ContextMenuLayer.java
+++ b/OsmAnd/src/net/osmand/plus/views/ContextMenuLayer.java
@@ -811,7 +811,7 @@ public class ContextMenuLayer extends OsmandMapLayer {
 
 		boolean processed = hideVisibleMenues();
 		processed |= menu.onSingleTapOnMap();
-		if (!processed && activity.getMyApplication().getSettings().MAP_EMPTY_STATE_ENABLED.get()) {
+		if (!processed && activity.getMyApplication().getSettings().MAP_EMPTY_STATE_ALLOWED.get()) {
 			activity.getMapLayers().getMapControlsLayer().switchMapControlsVisibility(true);
 		}
 		return false;

From 21e333911473d38b985ba2a0d7bcf6568f1abe20 Mon Sep 17 00:00:00 2001
From: Hardy <hm.gglmail@gmail.com>
Date: Wed, 1 Nov 2017 17:58:34 +0100
Subject: [PATCH 17/17] string improvements

---
 OsmAnd/res/values/strings.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/OsmAnd/res/values/strings.xml b/OsmAnd/res/values/strings.xml
index 683f223088..9ff926981b 100644
--- a/OsmAnd/res/values/strings.xml
+++ b/OsmAnd/res/values/strings.xml
@@ -9,8 +9,8 @@
          3. All your modified/created strings are in the top of the file (to make easier find what\'s translated).
     PLEASE: Have a look at http://code.google.com/p/osmand/wiki/UIConsistency, it may really improve your and our work  :-)  Thx - Hardy
     -->
-    <string name="tap_on_map_to_hide_interface_descr">Pressing anywhere on the map hides the interface and toggles the full screen mode.</string>
-    <string name="tap_on_map_to_hide_interface">Tap on map to hide interface</string>
+    <string name="tap_on_map_to_hide_interface_descr">Tapping anywhere on the map hides the interface and toggles the full screen mode.</string>
+    <string name="tap_on_map_to_hide_interface">Tap on map hides interface</string>
     <string name="show_on_top_bar">Show on Top Bar</string>
     <string name="mark_passed">Mark passed</string>
     <string name="import_gpx_file_description">can be imported as Favorites points, or as track file.</string>
@@ -70,7 +70,7 @@
     <string name="marker_moved_to_active">Map marker moved to active</string>
     <string name="shared_string_list">List</string>
     <string name="shared_string_groups">Groups</string>
-    <string name="passed">Passed: %1$s</string>
+    <string name="passed">Last used: %1$s</string>
     <string name="make_active">Make active</string>
     <string name="today">Today</string>
     <string name="yesterday">Yesterday</string>