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 1/4] 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 2/4] 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 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 3/4] 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 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 4/4] 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