From 46c24c68bbab008da2d87a336813c54e7c12f011 Mon Sep 17 00:00:00 2001
From: Alexander Sytnyk <asytnyk0@gmail.com>
Date: Wed, 7 Mar 2018 18:53:10 +0200
Subject: [PATCH] Replace image button "more" with text button "options" in
 waypoints dialog

---
 OsmAnd/res/layout/waypoint_header.xml           | 17 +++++++++++++++++
 .../plus/helpers/WaypointDialogHelper.java      | 14 ++++++++------
 2 files changed, 25 insertions(+), 6 deletions(-)

diff --git a/OsmAnd/res/layout/waypoint_header.xml b/OsmAnd/res/layout/waypoint_header.xml
index a7c914a77b..57209c83aa 100644
--- a/OsmAnd/res/layout/waypoint_header.xml
+++ b/OsmAnd/res/layout/waypoint_header.xml
@@ -2,6 +2,7 @@
 <LinearLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:osmand="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="fill_parent"
     android:layout_height="match_parent"
     android:layout_marginBottom="5dp"
@@ -38,6 +39,22 @@
 
     </LinearLayout>
 
+    <net.osmand.plus.widgets.TextViewEx
+        android:id="@+id/text_button"
+        android:layout_width="wrap_content"
+        android:layout_height="match_parent"
+        android:background="?attr/selectableItemBackground"
+        android:ellipsize="end"
+        android:gravity="center_vertical"
+        android:maxLines="1"
+        android:paddingLeft="16dp"
+        android:paddingRight="16dp"
+        android:text="@string/shared_string_options"
+        android:visibility="gone"
+        osmand:textAllCapsCompat="true"
+        osmand:typeface="@string/font_roboto_medium"
+        tools:textColor="?attr/color_dialog_buttons"/>
+
     <ImageButton
         android:id="@+id/image_button"
         android:contentDescription="@string/shared_string_more"
diff --git a/OsmAnd/src/net/osmand/plus/helpers/WaypointDialogHelper.java b/OsmAnd/src/net/osmand/plus/helpers/WaypointDialogHelper.java
index 4dbe061f16..22092bfbb1 100644
--- a/OsmAnd/src/net/osmand/plus/helpers/WaypointDialogHelper.java
+++ b/OsmAnd/src/net/osmand/plus/helpers/WaypointDialogHelper.java
@@ -44,6 +44,7 @@ import net.osmand.plus.poi.PoiUIFilter;
 import net.osmand.plus.views.controls.DynamicListView.DragIcon;
 import net.osmand.plus.views.controls.ListDividerShape;
 import net.osmand.plus.views.controls.StableArrayAdapter;
+import net.osmand.plus.widgets.TextViewEx;
 import net.osmand.util.Algorithms;
 import net.osmand.util.MapUtils;
 
@@ -611,11 +612,12 @@ public class WaypointDialogHelper {
 
 		});
 
-		final ImageButton moreBtn = (ImageButton) v.findViewById(R.id.image_button);
+		final TextViewEx optionsButton = (TextViewEx) v.findViewById(R.id.text_button);
 		if (type == WaypointHelper.TARGETS) {
-			moreBtn.setVisibility(View.VISIBLE);
-			moreBtn.setImageDrawable(app.getIconsCache().getIcon(R.drawable.ic_overflow_menu_white, !nightMode));
-			moreBtn.setOnClickListener(new View.OnClickListener() {
+			optionsButton.setVisibility(View.VISIBLE);
+			optionsButton.setTextColor(ContextCompat.getColor(ctx,
+					nightMode ? R.color.color_dialog_buttons_dark : R.color.color_dialog_buttons_light));
+			optionsButton.setOnClickListener(new View.OnClickListener() {
 				@Override
 				public void onClick(View v) {
 					boolean hasActivePoints = false;
@@ -638,7 +640,7 @@ public class WaypointDialogHelper {
 						}
 					}
 
-					final PopupMenu optionsMenu = new PopupMenu(ctx, moreBtn);
+					final PopupMenu optionsMenu = new PopupMenu(ctx, optionsButton);
 					DirectionsDialogs.setupPopUpMenuIcon(optionsMenu);
 					MenuItem item;
 					if (hasActivePoints) {
@@ -673,7 +675,7 @@ public class WaypointDialogHelper {
 				}
 			});
 		} else {
-			moreBtn.setVisibility(View.GONE);
+			optionsButton.setVisibility(View.GONE);
 		}
 
 		TextView tv = (TextView) v.findViewById(R.id.header_text);