From ac02dea6f6664e43e30d51c25cae1802ded63b5e Mon Sep 17 00:00:00 2001
From: Alexey Kulish <alexey.kulish@osmand.net>
Date: Sat, 28 Apr 2018 17:53:25 +0300
Subject: [PATCH] Fix choose plan UI

---
 OsmAnd/res/layout/purchase_dialog_active_card.xml | 6 +++---
 OsmAnd/res/layout/purchase_dialog_card.xml        | 6 +++---
 OsmAnd/res/layout/purchase_dialog_fragment.xml    | 6 +++---
 OsmAnd/res/values/sizes.xml                       | 1 +
 4 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/OsmAnd/res/layout/purchase_dialog_active_card.xml b/OsmAnd/res/layout/purchase_dialog_active_card.xml
index c6501a7db5..aacbcfe57b 100644
--- a/OsmAnd/res/layout/purchase_dialog_active_card.xml
+++ b/OsmAnd/res/layout/purchase_dialog_active_card.xml
@@ -6,8 +6,8 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:layout_marginBottom="@dimen/list_header_padding"
-    android:layout_marginLeft="@dimen/list_content_padding"
-    android:layout_marginRight="@dimen/list_content_padding"
+    android:layout_marginLeft="@dimen/card_padding"
+    android:layout_marginRight="@dimen/card_padding"
     android:background="@drawable/dialog_active_card_bg"
     android:orientation="vertical">
 
@@ -43,7 +43,7 @@
     <FrameLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_margin="@dimen/list_content_padding">
+        android:layout_margin="@dimen/card_padding">
 
         <include layout="@layout/purchase_dialog_card_button"/>
 
diff --git a/OsmAnd/res/layout/purchase_dialog_card.xml b/OsmAnd/res/layout/purchase_dialog_card.xml
index 847d5c6e7f..dfbc449d67 100644
--- a/OsmAnd/res/layout/purchase_dialog_card.xml
+++ b/OsmAnd/res/layout/purchase_dialog_card.xml
@@ -5,8 +5,8 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:layout_marginBottom="@dimen/list_header_padding"
-    android:layout_marginLeft="@dimen/list_content_padding"
-    android:layout_marginRight="@dimen/list_content_padding"
+    android:layout_marginLeft="@dimen/card_padding"
+    android:layout_marginRight="@dimen/card_padding"
     android:background="@drawable/dialog_card_bg"
     android:orientation="vertical">
 
@@ -40,7 +40,7 @@
     <FrameLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_margin="@dimen/list_content_padding">
+        android:layout_margin="@dimen/card_padding">
 
         <include layout="@layout/purchase_dialog_card_button"/>
 
diff --git a/OsmAnd/res/layout/purchase_dialog_fragment.xml b/OsmAnd/res/layout/purchase_dialog_fragment.xml
index 9f11de788b..28ab868e73 100644
--- a/OsmAnd/res/layout/purchase_dialog_fragment.xml
+++ b/OsmAnd/res/layout/purchase_dialog_fragment.xml
@@ -84,9 +84,9 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginBottom="@dimen/list_content_padding"
-                android:layout_marginLeft="@dimen/list_content_padding"
-                android:layout_marginRight="@dimen/list_content_padding"
-                android:layout_marginTop="@dimen/list_header_padding"
+                android:layout_marginLeft="@dimen/card_padding"
+                android:layout_marginRight="@dimen/card_padding"
+                android:layout_marginTop="4dp"
                 android:background="@drawable/wikivoyage_search_card_bg">
 
                 <net.osmand.plus.widgets.TextViewEx
diff --git a/OsmAnd/res/values/sizes.xml b/OsmAnd/res/values/sizes.xml
index 5ceee31055..a0deac8714 100644
--- a/OsmAnd/res/values/sizes.xml
+++ b/OsmAnd/res/values/sizes.xml
@@ -9,6 +9,7 @@
     <dimen name="card_row_min_height">48dp</dimen>
 	<dimen name="card_button_min_size">58dp</dimen>
 	<dimen name="card_button_progress_size">32dp</dimen>
+	<dimen name="card_padding">12dp</dimen>
 
 	<dimen name="widget_turn_lane_size">36dp</dimen>
 	<dimen name="widget_turn_lane_border">6dp</dimen>