From ff6e5157784a0a08dcde22d68a853e1d9801175e Mon Sep 17 00:00:00 2001
From: alex <asytnyk0@gmail.com>
Date: Thu, 9 Nov 2017 18:22:54 +0200
Subject: [PATCH] Fix layout

---
 .../fragment_direction_indication_dialog.xml  | 38 ++++++++++++-------
 OsmAnd/res/values-large/sizes.xml             |  1 +
 OsmAnd/res/values/sizes.xml                   |  1 +
 3 files changed, 26 insertions(+), 14 deletions(-)

diff --git a/OsmAnd/res/layout/fragment_direction_indication_dialog.xml b/OsmAnd/res/layout/fragment_direction_indication_dialog.xml
index c69010e7cb..fc1ef92b67 100644
--- a/OsmAnd/res/layout/fragment_direction_indication_dialog.xml
+++ b/OsmAnd/res/layout/fragment_direction_indication_dialog.xml
@@ -88,7 +88,7 @@
 
                 <LinearLayout
                     android:layout_width="match_parent"
-                    android:layout_height="@dimen/bottom_sheet_list_item_height"
+                    android:layout_height="@dimen/bottom_sheet_title_height"
                     android:layout_marginEnd="@dimen/content_padding"
                     android:layout_marginRight="@dimen/content_padding">
 
@@ -125,8 +125,8 @@
                     android:layout_height="wrap_content"
                     android:layout_marginEnd="@dimen/content_padding"
                     android:layout_marginRight="@dimen/content_padding"
-                    android:paddingBottom="@dimen/content_padding"
-                    android:paddingTop="@dimen/content_padding"
+                    android:paddingBottom="@dimen/content_padding_small"
+                    android:paddingTop="@dimen/content_padding_small"
                     android:text="@string/active_markers_descr"
                     android:textColor="?android:textColorSecondary"
                     android:textSize="@dimen/default_desc_text_size"/>
@@ -145,7 +145,7 @@
                 <LinearLayout
                     android:id="@+id/distance_indication_row"
                     android:layout_width="match_parent"
-                    android:layout_height="@dimen/bottom_sheet_list_item_height"
+                    android:layout_height="@dimen/bottom_sheet_title_height"
                     android:background="?attr/selectableItemBackground"
                     android:paddingLeft="@dimen/content_padding"
                     android:paddingRight="@dimen/content_padding">
@@ -165,6 +165,8 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_gravity="center_vertical|end"
+                        android:layout_marginLeft="@dimen/bottom_sheet_content_margin_small"
+                        android:layout_marginStart="@dimen/bottom_sheet_content_margin_small"
                         android:background="@null"
                         android:clickable="false"
                         android:focusable="false"
@@ -183,8 +185,8 @@
                     android:layout_height="wrap_content"
                     android:layout_marginLeft="@dimen/content_padding"
                     android:layout_marginRight="@dimen/content_padding"
-                    android:paddingBottom="@dimen/content_padding"
-                    android:paddingTop="@dimen/content_padding"
+                    android:paddingBottom="@dimen/content_padding_small"
+                    android:paddingTop="@dimen/content_padding_small"
                     android:text="@string/distance_indication_descr"
                     android:textColor="?android:textColorSecondary"
                     android:textSize="@dimen/default_desc_text_size"/>
@@ -195,8 +197,10 @@
                     android:layout_height="@dimen/bottom_sheet_list_item_height"
                     android:background="?attr/selectableItemBackground"
                     android:gravity="center_vertical"
+                    android:paddingEnd="@dimen/content_padding_small"
                     android:paddingLeft="@dimen/content_padding"
-                    android:paddingRight="@dimen/content_padding">
+                    android:paddingRight="@dimen/content_padding_small"
+                    android:paddingStart="@dimen/content_padding">
 
                     <ImageView
                         android:id="@+id/top_bar_icon"
@@ -233,8 +237,10 @@
                     android:layout_height="@dimen/bottom_sheet_list_item_height"
                     android:background="?attr/selectableItemBackground"
                     android:gravity="center_vertical"
+                    android:paddingEnd="@dimen/content_padding_small"
                     android:paddingLeft="@dimen/content_padding"
-                    android:paddingRight="@dimen/content_padding">
+                    android:paddingRight="@dimen/content_padding_small"
+                    android:paddingStart="@dimen/content_padding">
 
                     <ImageView
                         android:id="@+id/widget_icon"
@@ -278,7 +284,7 @@
                 <LinearLayout
                     android:id="@+id/show_arrows_row"
                     android:layout_width="match_parent"
-                    android:layout_height="@dimen/bottom_sheet_list_item_height"
+                    android:layout_height="@dimen/bottom_sheet_title_height"
                     android:background="?attr/selectableItemBackground"
                     android:paddingLeft="@dimen/content_padding"
                     android:paddingRight="@dimen/content_padding">
@@ -298,6 +304,8 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_gravity="center_vertical|end"
+                        android:layout_marginLeft="@dimen/bottom_sheet_content_margin_small"
+                        android:layout_marginStart="@dimen/bottom_sheet_content_margin_small"
                         android:background="@null"
                         android:clickable="false"
                         android:focusable="false"
@@ -316,8 +324,8 @@
                     android:layout_height="wrap_content"
                     android:layout_marginLeft="@dimen/content_padding"
                     android:layout_marginRight="@dimen/content_padding"
-                    android:paddingBottom="@dimen/content_padding"
-                    android:paddingTop="@dimen/content_padding"
+                    android:paddingBottom="@dimen/content_padding_small"
+                    android:paddingTop="@dimen/content_padding_small"
                     android:text="@string/show_arrows_descr"
                     android:textColor="?android:textColorSecondary"
                     android:textSize="@dimen/default_desc_text_size"/>
@@ -335,7 +343,7 @@
                 <LinearLayout
                     android:id="@+id/show_guide_line_row"
                     android:layout_width="match_parent"
-                    android:layout_height="@dimen/bottom_sheet_list_item_height"
+                    android:layout_height="@dimen/bottom_sheet_title_height"
                     android:background="?attr/selectableItemBackground"
                     android:paddingLeft="@dimen/content_padding"
                     android:paddingRight="@dimen/content_padding">
@@ -355,6 +363,8 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_gravity="center_vertical|end"
+                        android:layout_marginLeft="@dimen/bottom_sheet_content_margin_small"
+                        android:layout_marginStart="@dimen/bottom_sheet_content_margin_small"
                         android:background="@null"
                         android:clickable="false"
                         android:focusable="false"
@@ -373,8 +383,8 @@
                     android:layout_height="wrap_content"
                     android:layout_marginLeft="@dimen/content_padding"
                     android:layout_marginRight="@dimen/content_padding"
-                    android:paddingBottom="@dimen/content_padding"
-                    android:paddingTop="@dimen/content_padding"
+                    android:paddingBottom="@dimen/content_padding_small"
+                    android:paddingTop="@dimen/content_padding_small"
                     android:text="@string/show_guide_line_descr"
                     android:textColor="?android:textColorSecondary"
                     android:textSize="@dimen/default_desc_text_size"/>
diff --git a/OsmAnd/res/values-large/sizes.xml b/OsmAnd/res/values-large/sizes.xml
index 1cc118a1f1..cbc1ce5530 100644
--- a/OsmAnd/res/values-large/sizes.xml
+++ b/OsmAnd/res/values-large/sizes.xml
@@ -100,6 +100,7 @@
 	<dimen name="bottom_sheet_content_margin">24dp</dimen>
 	<dimen name="bottom_sheet_content_margin_small">12dp</dimen>
 	<dimen name="content_padding">24dp</dimen>
+	<dimen name="content_padding_small">18dp</dimen>
 	<dimen name="bottom_sheet_content_padding_small">12dp</dimen>
 	<dimen name="measurement_tool_divider_margin">12dp</dimen>
 	<dimen name="measurement_tool_content_padding_medium">18dp</dimen>
diff --git a/OsmAnd/res/values/sizes.xml b/OsmAnd/res/values/sizes.xml
index 9718ebcbd5..18dce59e43 100644
--- a/OsmAnd/res/values/sizes.xml
+++ b/OsmAnd/res/values/sizes.xml
@@ -163,6 +163,7 @@
 	<dimen name="bottom_sheet_content_margin">16dp</dimen>
 	<dimen name="bottom_sheet_content_margin_small">8dp</dimen>
 	<dimen name="content_padding">16dp</dimen>
+	<dimen name="content_padding_small">12dp</dimen>
 	<dimen name="bottom_sheet_content_padding_small">8dp</dimen>
 	<dimen name="measurement_tool_divider_margin">8dp</dimen>
 	<dimen name="measurement_tool_content_padding_medium">12dp</dimen>