From 878056ccebb0e33c6308740a7124aa37507716db Mon Sep 17 00:00:00 2001
From: Dima-1 <softmail32@gmail.com>
Date: Tue, 1 Sep 2020 10:09:25 +0300
Subject: [PATCH] "Done" button style

---
 .../purchase_dialog_outline_btn_bg_dark.xml   | 21 ++++++++++++++++++
 .../purchase_dialog_outline_btn_bg_light.xml  | 21 ++++++++++++++++++
 .../purchase_dialog_outline_btn_bg_dark.xml   | 22 +++++++++++++------
 .../purchase_dialog_outline_btn_bg_light.xml  | 22 +++++++++++++------
 .../MeasurementToolFragment.java              |  4 ++--
 5 files changed, 74 insertions(+), 16 deletions(-)
 create mode 100644 OsmAnd/res/drawable-v21/purchase_dialog_outline_btn_bg_dark.xml
 create mode 100644 OsmAnd/res/drawable-v21/purchase_dialog_outline_btn_bg_light.xml

diff --git a/OsmAnd/res/drawable-v21/purchase_dialog_outline_btn_bg_dark.xml b/OsmAnd/res/drawable-v21/purchase_dialog_outline_btn_bg_dark.xml
new file mode 100644
index 0000000000..e0e60ea3ad
--- /dev/null
+++ b/OsmAnd/res/drawable-v21/purchase_dialog_outline_btn_bg_dark.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ripple xmlns:android="http://schemas.android.com/apk/res/android"
+    android:color="@color/active_color_primary_dark">
+    <item>
+        <shape>
+            <solid android:color="@color/switch_button_active_dark" />
+            <corners android:radius="@dimen/dlg_button_rect_rad" />
+            <stroke
+                android:width="1dp"
+                android:color="@color/active_color_primary_dark" />
+        </shape>
+    </item>
+    <item
+        android:id="@android:id/mask"
+        android:state_pressed="true">
+        <shape android:shape="rectangle">
+            <solid android:color="@color/switch_button_active_stroke_dark" />
+            <corners android:radius="@dimen/dlg_button_rect_rad" />
+        </shape>
+    </item>
+</ripple>
\ No newline at end of file
diff --git a/OsmAnd/res/drawable-v21/purchase_dialog_outline_btn_bg_light.xml b/OsmAnd/res/drawable-v21/purchase_dialog_outline_btn_bg_light.xml
new file mode 100644
index 0000000000..a607fc4dce
--- /dev/null
+++ b/OsmAnd/res/drawable-v21/purchase_dialog_outline_btn_bg_light.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ripple xmlns:android="http://schemas.android.com/apk/res/android"
+    android:color="@color/active_color_primary_light">
+    <item>
+        <shape>
+            <solid android:color="@color/switch_button_active_light" />
+            <corners android:radius="@dimen/dlg_button_rect_rad" />
+            <stroke
+                android:width="1dp"
+                android:color="@color/active_color_primary_light" />
+        </shape>
+    </item>
+    <item
+        android:id="@android:id/mask"
+        android:state_pressed="true">
+        <shape android:shape="rectangle">
+            <solid android:color="@color/switch_button_active_stroke_light" />
+            <corners android:radius="@dimen/dlg_button_rect_rad" />
+        </shape>
+    </item>
+</ripple>
\ No newline at end of file
diff --git a/OsmAnd/res/drawable/purchase_dialog_outline_btn_bg_dark.xml b/OsmAnd/res/drawable/purchase_dialog_outline_btn_bg_dark.xml
index 3a35b91f36..90df5478f3 100644
--- a/OsmAnd/res/drawable/purchase_dialog_outline_btn_bg_dark.xml
+++ b/OsmAnd/res/drawable/purchase_dialog_outline_btn_bg_dark.xml
@@ -1,8 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <solid android:color="@color/switch_button_active_dark" />
-    <corners android:radius="3dp" />
-    <stroke
-        android:width="1dp"
-        android:color="@color/active_color_primary_dark" />
-</shape>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_pressed="true">
+        <shape android:shape="rectangle">
+            <solid android:color="@color/switch_button_active_stroke_dark" />
+            <corners android:radius="@dimen/dlg_button_rect_rad" />
+        </shape>
+    </item>
+    <item>
+        <shape>
+            <solid android:color="@color/switch_button_active_dark" />
+            <corners android:radius="@dimen/dlg_button_rect_rad" />
+            <stroke android:width="1dp" android:color="@color/active_color_primary_dark" />
+        </shape>
+    </item>
+</selector>
\ No newline at end of file
diff --git a/OsmAnd/res/drawable/purchase_dialog_outline_btn_bg_light.xml b/OsmAnd/res/drawable/purchase_dialog_outline_btn_bg_light.xml
index 8116459637..ee1573b3f1 100644
--- a/OsmAnd/res/drawable/purchase_dialog_outline_btn_bg_light.xml
+++ b/OsmAnd/res/drawable/purchase_dialog_outline_btn_bg_light.xml
@@ -1,8 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <solid android:color="@color/switch_button_active_light" />
-    <corners android:radius="3dp" />
-    <stroke
-        android:width="1dp"
-        android:color="@color/active_color_primary_light" />
-</shape>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_pressed="true">
+        <shape android:shape="rectangle">
+            <solid android:color="@color/switch_button_active_stroke_light" />
+            <corners android:radius="@dimen/dlg_button_rect_rad" />
+        </shape>
+    </item>
+    <item>
+        <shape>
+            <solid android:color="@color/switch_button_active_light" />
+            <corners android:radius="@dimen/dlg_button_rect_rad" />
+            <stroke android:width="1dp" android:color="@color/active_color_primary_light" />
+        </shape>
+    </item>
+</selector>
diff --git a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
index 6d911cdb75..f1b42ef8ce 100644
--- a/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
+++ b/OsmAnd/src/net/osmand/plus/measurementtool/MeasurementToolFragment.java
@@ -2027,8 +2027,8 @@ public class MeasurementToolFragment extends BaseOsmAndFragment implements Route
 			int paddingH = ctx.getResources().getDimensionPixelSize(R.dimen.context_menu_padding_margin_large);
 			int paddingV = ctx.getResources().getDimensionPixelSize(R.dimen.context_menu_padding_margin_small);
 			done.setPadding(paddingH, paddingV, paddingH, paddingV);
-			AndroidUtils.setBackground(ctx, done, nightMode, R.drawable.dlg_btn_stroked_light,
-					R.drawable.dlg_btn_stroked_dark);
+			AndroidUtils.setBackground(ctx, done, nightMode, R.drawable.purchase_dialog_outline_btn_bg_light,
+					R.drawable.purchase_dialog_outline_btn_bg_dark);
 		}
 
 		@Override