From e56f196586f2da62068b77e3fd43107179f4fddc Mon Sep 17 00:00:00 2001
From: Chumva <faiver.unknown@gmail.com>
Date: Fri, 29 Mar 2019 18:00:09 +0200
Subject: [PATCH] Fix rounded background buttons for pre lollipop api in route
 preparation

---
 ..._trans_rounded_dark.xml => btn_trans_rounded_dark.xml} | 8 ++++----
 ...rans_rounded_light.xml => btn_trans_rounded_light.xml} | 8 ++++----
 .../plus/routepreparationmenu/MapRouteInfoMenu.java       | 6 +++---
 3 files changed, 11 insertions(+), 11 deletions(-)
 rename OsmAnd/res/drawable/{btn_border_trans_rounded_dark.xml => btn_trans_rounded_dark.xml} (70%)
 rename OsmAnd/res/drawable/{btn_border_trans_rounded_light.xml => btn_trans_rounded_light.xml} (70%)

diff --git a/OsmAnd/res/drawable/btn_border_trans_rounded_dark.xml b/OsmAnd/res/drawable/btn_trans_rounded_dark.xml
similarity index 70%
rename from OsmAnd/res/drawable/btn_border_trans_rounded_dark.xml
rename to OsmAnd/res/drawable/btn_trans_rounded_dark.xml
index 8f24f9d643..7fb0894253 100644
--- a/OsmAnd/res/drawable/btn_border_trans_rounded_dark.xml
+++ b/OsmAnd/res/drawable/btn_trans_rounded_dark.xml
@@ -2,7 +2,7 @@
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
 	<item android:state_pressed="true">
 		<shape android:shape="rectangle">
-			<corners android:radius="18dp" />
+			<corners android:radius="@dimen/route_info_button_bg_line_radius" />
 			<solid android:color="@color/active_buttons_and_links_trans_dark" />
 			<stroke android:width="1dp" android:color="@color/active_buttons_and_links_dark" />
 		</shape>
@@ -10,13 +10,13 @@
 	<item android:state_enabled="false">
 		<shape android:shape="rectangle">
 			<solid android:color="@color/activity_background_dark" />
-			<corners android:radius="18dp" />
+			<corners android:radius="@dimen/route_info_button_bg_line_radius" />
 		</shape>
 	</item>
 	<item>
 		<shape android:shape="rectangle">
-			<solid android:color="@null" />
-			<corners android:radius="18dp" />
+			<solid android:color="@color/card_and_list_background_dark" />
+			<corners android:radius="@dimen/route_info_button_bg_line_radius" />
 			<stroke android:width="1dp" android:color="@color/divider_dark" />
 		</shape>
 	</item>
diff --git a/OsmAnd/res/drawable/btn_border_trans_rounded_light.xml b/OsmAnd/res/drawable/btn_trans_rounded_light.xml
similarity index 70%
rename from OsmAnd/res/drawable/btn_border_trans_rounded_light.xml
rename to OsmAnd/res/drawable/btn_trans_rounded_light.xml
index 7b9e2b6a1b..af1aab31fa 100644
--- a/OsmAnd/res/drawable/btn_border_trans_rounded_light.xml
+++ b/OsmAnd/res/drawable/btn_trans_rounded_light.xml
@@ -2,7 +2,7 @@
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
 	<item android:state_pressed="true">
 		<shape android:shape="rectangle">
-			<corners android:radius="18dp" />
+			<corners android:radius="@dimen/route_info_button_bg_line_radius" />
 			<solid android:color="@color/active_buttons_and_links_trans_light" />
 			<stroke android:width="1dp" android:color="@color/active_buttons_and_links_light" />
 		</shape>
@@ -10,13 +10,13 @@
 	<item android:state_enabled="false">
 		<shape android:shape="rectangle">
 			<solid android:color="@color/activity_background_light" />
-			<corners android:radius="18dp" />
+			<corners android:radius="@dimen/route_info_button_bg_line_radius" />
 		</shape>
 	</item>
 	<item>
 		<shape android:shape="rectangle">
-			<solid android:color="@null" />
-			<corners android:radius="18dp" />
+			<solid android:color="@color/card_and_list_background_light" />
+			<corners android:radius="@dimen/route_info_button_bg_line_radius" />
 			<stroke android:width="1dp" android:color="@color/divider_light" />
 		</shape>
 	</item>
diff --git a/OsmAnd/src/net/osmand/plus/routepreparationmenu/MapRouteInfoMenu.java b/OsmAnd/src/net/osmand/plus/routepreparationmenu/MapRouteInfoMenu.java
index 4ebb4c47a9..a5920d7492 100644
--- a/OsmAnd/src/net/osmand/plus/routepreparationmenu/MapRouteInfoMenu.java
+++ b/OsmAnd/src/net/osmand/plus/routepreparationmenu/MapRouteInfoMenu.java
@@ -1363,7 +1363,7 @@ public class MapRouteInfoMenu implements IRouteInformationListener, CardListener
 			AndroidUtils.setBackground(app, viaButton, nightMode, R.drawable.btn_rounded_light, R.drawable.btn_rounded_dark);
 			AndroidUtils.setBackground(app, viaButtonContainer, nightMode, R.drawable.ripple_rounded_light, R.drawable.ripple_rounded_dark);
 		} else {
-			AndroidUtils.setBackground(app, viaButtonContainer, nightMode, R.drawable.btn_border_trans_rounded_light, R.drawable.btn_border_trans_rounded_dark);
+			AndroidUtils.setBackground(app, viaButtonContainer, nightMode, R.drawable.btn_trans_rounded_light, R.drawable.btn_trans_rounded_dark);
 		}
 		ImageView viaButtonImageView = (ImageView) mainView.findViewById(R.id.via_button_image_view);
 
@@ -1423,7 +1423,7 @@ public class MapRouteInfoMenu implements IRouteInformationListener, CardListener
 				AndroidUtils.setBackground(app, toButton, nightMode, R.drawable.btn_rounded_light, R.drawable.btn_rounded_dark);
 				AndroidUtils.setBackground(app, toButtonContainer, nightMode, R.drawable.ripple_rounded_light, R.drawable.ripple_rounded_dark);
 			} else {
-				AndroidUtils.setBackground(app, toButtonContainer, nightMode, R.drawable.btn_border_trans_rounded_light, R.drawable.btn_border_trans_rounded_dark);
+				AndroidUtils.setBackground(app, toButtonContainer, nightMode, R.drawable.btn_trans_rounded_light, R.drawable.btn_trans_rounded_dark);
 			}
 			ImageView toButtonImageView = (ImageView) mainView.findViewById(R.id.to_button_image_view);
 
@@ -1495,7 +1495,7 @@ public class MapRouteInfoMenu implements IRouteInformationListener, CardListener
 			AndroidUtils.setBackground(app, fromButton, nightMode, R.drawable.btn_rounded_light, R.drawable.btn_rounded_dark);
 			AndroidUtils.setBackground(app, fromButtonContainer, nightMode, R.drawable.ripple_rounded_light, R.drawable.ripple_rounded_dark);
 		} else {
-			AndroidUtils.setBackground(app, fromButtonContainer, nightMode, R.drawable.btn_border_trans_rounded_light, R.drawable.btn_border_trans_rounded_dark);
+			AndroidUtils.setBackground(app, fromButtonContainer, nightMode, R.drawable.btn_trans_rounded_light, R.drawable.btn_trans_rounded_dark);
 		}
 
 		ImageView swapDirectionView = (ImageView) mainView.findViewById(R.id.from_button_image_view);