From 9569b9e73f3a10f897b59fb242aa8ab7eae85b2d Mon Sep 17 00:00:00 2001
From: Alexey Kulish <alexey.kulish@osmand.net>
Date: Tue, 8 Nov 2016 17:54:09 +0300
Subject: [PATCH] Fix #2929

---
 OsmAnd/res/drawable/btn_round_blue.xml        |  4 ++++
 .../res/layout/move_marker_bottom_sheet.xml   | 15 +++++-------
 OsmAnd/res/values/sizes.xml                   |  1 +
 OsmAnd/res/values/strings.xml                 |  2 +-
 OsmAnd/res/values/styles.xml                  | 24 +++++++++++++++++++
 .../osmand/plus/views/ContextMenuLayer.java   |  1 +
 6 files changed, 37 insertions(+), 10 deletions(-)

diff --git a/OsmAnd/res/drawable/btn_round_blue.xml b/OsmAnd/res/drawable/btn_round_blue.xml
index 43eef3f782..713a406728 100644
--- a/OsmAnd/res/drawable/btn_round_blue.xml
+++ b/OsmAnd/res/drawable/btn_round_blue.xml
@@ -5,6 +5,10 @@
         <solid android:color="@color/map_widget_blue_pressed" />
         <corners android:radius="@dimen/map_button_rect_rad" />
     </shape></item>
+    <item android:state_enabled="false"><shape android:shape="rectangle">
+        <solid android:color="@color/searchbar_tab_inactive_light" />
+        <corners android:radius="@dimen/map_button_rect_rad" />
+    </shape></item>
     <item><shape android:shape="rectangle">
         <solid android:color="@color/map_widget_blue" />
         <corners android:radius="@dimen/map_button_rect_rad" />
diff --git a/OsmAnd/res/layout/move_marker_bottom_sheet.xml b/OsmAnd/res/layout/move_marker_bottom_sheet.xml
index 03aaa0de9d..791832a0a2 100644
--- a/OsmAnd/res/layout/move_marker_bottom_sheet.xml
+++ b/OsmAnd/res/layout/move_marker_bottom_sheet.xml
@@ -41,7 +41,7 @@
             android:layout_marginLeft="16dp"
             android:layout_marginRight="16dp"
             android:layout_marginTop="8dp"
-            tools:text="Lat: 50.45375 Lon: 30.48693"/>
+            tools:text="Lat: 50.45375\nLon: 30.48693"/>
 
         <LinearLayout
             android:layout_width="wrap_content"
@@ -50,18 +50,15 @@
             android:layout_marginLeft="12dp"
             android:layout_marginRight="12dp">
 
-            <android.support.v7.widget.AppCompatButton
+            <Button
                 android:id="@+id/apply_button"
-                style="@style/Widget.AppCompat.Button.Colored"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
+                style="@style/DialogActionButton"
+                android:layout_marginRight="8dp"
                 android:text="@string/shared_string_apply"/>
 
-            <android.support.v7.widget.AppCompatButton
+            <Button
                 android:id="@+id/cancel_button"
-                style="@style/Widget.AppCompat.Button.Borderless.Colored"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
+                style="@style/DialogCancelButton"
                 android:text="@string/shared_string_cancel"/>
         </LinearLayout>
 
diff --git a/OsmAnd/res/values/sizes.xml b/OsmAnd/res/values/sizes.xml
index 3b9d351ef8..3c369069ef 100644
--- a/OsmAnd/res/values/sizes.xml
+++ b/OsmAnd/res/values/sizes.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+	<dimen name="dialog_button_height">36dp</dimen>
 	<dimen name="undo_bottom_offset">15dp</dimen>
 	<dimen name="touch_slop">32dp</dimen>
 
diff --git a/OsmAnd/res/values/strings.xml b/OsmAnd/res/values/strings.xml
index 37ca69d2cd..f5ce9971ab 100644
--- a/OsmAnd/res/values/strings.xml
+++ b/OsmAnd/res/values/strings.xml
@@ -569,7 +569,7 @@
     <string name="waypoint_visit_before">Visit before</string>
     <string name="simulate_your_location">Simulate your position</string>
     <string name="drawer">Flat list</string>
-    <string name="short_location_on_map">Lat %1$s\n Lon %2$s</string>
+    <string name="short_location_on_map">Lat %1$s\nLon %2$s</string>
     <string name="tips_and_tricks_descr">Frequently asked questions, recent changes, and others</string>
     <string name="routing_settings_2">Navigation settings</string>
     <string name="general_settings_2">General settings</string>
diff --git a/OsmAnd/res/values/styles.xml b/OsmAnd/res/values/styles.xml
index ff9ab7b647..f2970df9f4 100644
--- a/OsmAnd/res/values/styles.xml
+++ b/OsmAnd/res/values/styles.xml
@@ -50,6 +50,30 @@
         <item name="android:background">?attr/dashboard_button</item>
     </style>
 
+    <style name="DialogActionButton">
+        <item name="android:layout_width">wrap_content</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:minHeight">@dimen/dialog_button_height</item>
+        <item name="android:paddingLeft">16dp</item>
+        <item name="android:paddingRight">16dp</item>
+        <item name="android:paddingTop">8dp</item>
+        <item name="android:paddingBottom">8dp</item>
+        <item name="android:textColor">@color/color_white</item>
+        <item name="android:background">@drawable/btn_round_blue</item>
+    </style>
+
+    <style name="DialogCancelButton">
+        <item name="android:layout_width">wrap_content</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:minHeight">@dimen/dialog_button_height</item>
+        <item name="android:paddingLeft">16dp</item>
+        <item name="android:paddingRight">16dp</item>
+        <item name="android:paddingTop">8dp</item>
+        <item name="android:paddingBottom">8dp</item>
+        <item name="android:textColor">?attr/contextMenuButtonColor</item>
+        <item name="android:background">?attr/selectableItemBackground</item>
+    </style>
+
     <!-- Osmand themes styles -->
     <style name="OsmandLightTheme" parent="Theme.AppCompat.Light">
         <item name="ctx_menu_info_divider">@color/ctx_menu_info_divider_light</item>
diff --git a/OsmAnd/src/net/osmand/plus/views/ContextMenuLayer.java b/OsmAnd/src/net/osmand/plus/views/ContextMenuLayer.java
index 612a6fb247..6bbc1fdd97 100644
--- a/OsmAnd/src/net/osmand/plus/views/ContextMenuLayer.java
+++ b/OsmAnd/src/net/osmand/plus/views/ContextMenuLayer.java
@@ -290,6 +290,7 @@ public class ContextMenuLayer extends OsmandMapLayer {
 					menu.show(ll, pointDescription, newObject);
 					view.refreshMap();
 				}
+				selectedObjectContextMenuProvider = null;
 				applyingMarkerLatLon = null;
 			}