From 25cd46b59cfc6358c804b89631e0ec0503a00c37 Mon Sep 17 00:00:00 2001
From: Alex <asytnyk0@gmail.com>
Date: Fri, 18 Aug 2017 10:18:39 +0300
Subject: [PATCH] Fix paddings

---
 .../fragment_options_bottom_sheet_dialog.xml  | 12 +++++++++++
 ..._save_as_new_track_bottom_sheet_dialog.xml | 20 ++++++++++++-------
 ...ment_selected_menu_bottom_sheet_dialog.xml | 11 +++++++++-
 ...gment_snap_to_road_bottom_sheet_dialog.xml |  4 ++++
 .../res/layout/list_item_icon_and_title.xml   |  2 ++
 .../res/layout/measure_points_list_item.xml   |  4 ++++
 6 files changed, 45 insertions(+), 8 deletions(-)

diff --git a/OsmAnd/res/layout/fragment_options_bottom_sheet_dialog.xml b/OsmAnd/res/layout/fragment_options_bottom_sheet_dialog.xml
index 7ff121d5f2..44173d60c8 100644
--- a/OsmAnd/res/layout/fragment_options_bottom_sheet_dialog.xml
+++ b/OsmAnd/res/layout/fragment_options_bottom_sheet_dialog.xml
@@ -25,6 +25,8 @@
                 android:layout_height="52dp"
                 android:gravity="center_vertical"
                 android:paddingEnd="16dp"
+                android:paddingLeft="16dp"
+                android:paddingRight="16dp"
                 android:paddingStart="16dp"
                 android:text="@string/shared_string_options"
                 android:textAppearance="@style/TextAppearance.ListItemTitle"
@@ -37,6 +39,8 @@
                 android:background="?attr/selectableItemBackground"
                 android:minHeight="48dp"
                 android:paddingEnd="16dp"
+                android:paddingLeft="16dp"
+                android:paddingRight="16dp"
                 android:paddingStart="16dp">
 
                 <ImageView
@@ -108,6 +112,8 @@
                 android:background="?attr/selectableItemBackground"
                 android:minHeight="48dp"
                 android:paddingEnd="16dp"
+                android:paddingLeft="16dp"
+                android:paddingRight="16dp"
                 android:paddingStart="16dp"
                 android:visibility="gone">
 
@@ -138,6 +144,8 @@
                 android:background="?attr/selectableItemBackground"
                 android:minHeight="48dp"
                 android:paddingEnd="16dp"
+                android:paddingLeft="16dp"
+                android:paddingRight="16dp"
                 android:paddingStart="16dp">
 
                 <ImageView
@@ -167,6 +175,8 @@
                 android:background="?attr/selectableItemBackground"
                 android:minHeight="48dp"
                 android:paddingEnd="16dp"
+                android:paddingLeft="16dp"
+                android:paddingRight="16dp"
                 android:paddingStart="16dp">
 
                 <ImageView
@@ -205,6 +215,8 @@
                 android:background="?attr/selectableItemBackground"
                 android:minHeight="48dp"
                 android:paddingEnd="16dp"
+                android:paddingLeft="16dp"
+                android:paddingRight="16dp"
                 android:paddingStart="16dp">
 
                 <ImageView
diff --git a/OsmAnd/res/layout/fragment_save_as_new_track_bottom_sheet_dialog.xml b/OsmAnd/res/layout/fragment_save_as_new_track_bottom_sheet_dialog.xml
index fef2af6000..6899d619aa 100644
--- a/OsmAnd/res/layout/fragment_save_as_new_track_bottom_sheet_dialog.xml
+++ b/OsmAnd/res/layout/fragment_save_as_new_track_bottom_sheet_dialog.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              xmlns:osmand="http://schemas.android.com/apk/res-auto"
               xmlns:tools="http://schemas.android.com/tools"
               android:layout_width="match_parent"
               android:layout_height="wrap_content"
-              xmlns:osmand="http://schemas.android.com/apk/res-auto"
               android:background="?attr/bg_color"
               android:orientation="vertical">
 
@@ -24,6 +24,8 @@
                 android:layout_height="52dp"
                 android:gravity="center_vertical"
                 android:paddingEnd="16dp"
+                android:paddingLeft="16dp"
+                android:paddingRight="16dp"
                 android:paddingStart="16dp"
                 android:text="@string/shared_string_save_as_gpx"
                 android:textAppearance="@style/TextAppearance.ListItemTitle"
@@ -33,6 +35,8 @@
                 android:layout_width="match_parent"
                 android:layout_height="44dp"
                 android:paddingEnd="16dp"
+                android:paddingLeft="16dp"
+                android:paddingRight="16dp"
                 android:paddingStart="16dp"
                 android:text="@string/measurement_tool_save_as_new_track_descr"
                 android:textColor="?android:textColorSecondary"
@@ -41,8 +45,8 @@
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:orientation="horizontal"
-                android:layout_marginBottom="16dp">
+                android:layout_marginBottom="16dp"
+                android:orientation="horizontal">
 
                 <RelativeLayout
                     android:layout_width="0dp"
@@ -68,13 +72,12 @@
                         android:layout_height="wrap_content"
                         android:layout_alignLeft="@id/route_point_image"
                         android:layout_alignStart="@id/route_point_image"
-                        android:layout_marginTop="8dp"
                         android:layout_marginLeft="10dp"
                         android:layout_marginStart="10dp"
+                        android:layout_marginTop="8dp"
                         android:text="@string/route_point"
                         android:textColor="?android:textColorSecondary"
                         android:textSize="@dimen/default_split_segments_sub"/>
-
                 </RelativeLayout>
 
                 <RelativeLayout
@@ -101,13 +104,12 @@
                         android:layout_height="wrap_content"
                         android:layout_alignLeft="@id/line_image"
                         android:layout_alignStart="@id/line_image"
-                        android:layout_marginTop="8dp"
                         android:layout_marginLeft="10dp"
                         android:layout_marginStart="10dp"
+                        android:layout_marginTop="8dp"
                         android:text="@string/line"
                         android:textColor="?android:textColorSecondary"
                         android:textSize="@dimen/default_split_segments_sub"/>
-
                 </RelativeLayout>
 
             </LinearLayout>
@@ -119,6 +121,8 @@
                 android:background="?attr/selectableItemBackground"
                 android:minHeight="48dp"
                 android:paddingEnd="16dp"
+                android:paddingLeft="16dp"
+                android:paddingRight="16dp"
                 android:paddingStart="16dp">
 
                 <ImageView
@@ -148,6 +152,8 @@
                 android:background="?attr/selectableItemBackground"
                 android:minHeight="48dp"
                 android:paddingEnd="16dp"
+                android:paddingLeft="16dp"
+                android:paddingRight="16dp"
                 android:paddingStart="16dp">
 
                 <ImageView
diff --git a/OsmAnd/res/layout/fragment_selected_menu_bottom_sheet_dialog.xml b/OsmAnd/res/layout/fragment_selected_menu_bottom_sheet_dialog.xml
index 5c84a80758..03138ed207 100644
--- a/OsmAnd/res/layout/fragment_selected_menu_bottom_sheet_dialog.xml
+++ b/OsmAnd/res/layout/fragment_selected_menu_bottom_sheet_dialog.xml
@@ -23,6 +23,8 @@
                 android:layout_height="56dp"
                 android:minHeight="56dp"
                 android:paddingEnd="16dp"
+                android:paddingLeft="16dp"
+                android:paddingRight="16dp"
                 android:paddingStart="16dp">
 
                 <ImageView
@@ -59,7 +61,6 @@
                         android:textColor="?android:textColorSecondary"
                         android:textSize="@dimen/default_list_text_size"
                         tools:text="386 m"/>
-
                 </LinearLayout>
 
             </RelativeLayout>
@@ -77,6 +78,8 @@
                 android:background="?attr/selectableItemBackground"
                 android:minHeight="48dp"
                 android:paddingEnd="16dp"
+                android:paddingLeft="16dp"
+                android:paddingRight="16dp"
                 android:paddingStart="16dp">
 
                 <ImageView
@@ -106,6 +109,8 @@
                 android:background="?attr/selectableItemBackground"
                 android:minHeight="48dp"
                 android:paddingEnd="16dp"
+                android:paddingLeft="16dp"
+                android:paddingRight="16dp"
                 android:paddingStart="16dp">
 
                 <ImageView
@@ -144,6 +149,8 @@
                 android:background="?attr/selectableItemBackground"
                 android:minHeight="48dp"
                 android:paddingEnd="16dp"
+                android:paddingLeft="16dp"
+                android:paddingRight="16dp"
                 android:paddingStart="16dp">
 
                 <ImageView
@@ -173,6 +180,8 @@
                 android:background="?attr/selectableItemBackground"
                 android:minHeight="48dp"
                 android:paddingEnd="16dp"
+                android:paddingLeft="16dp"
+                android:paddingRight="16dp"
                 android:paddingStart="16dp">
 
                 <ImageView
diff --git a/OsmAnd/res/layout/fragment_snap_to_road_bottom_sheet_dialog.xml b/OsmAnd/res/layout/fragment_snap_to_road_bottom_sheet_dialog.xml
index 86e1ad62e5..2092dea9a5 100644
--- a/OsmAnd/res/layout/fragment_snap_to_road_bottom_sheet_dialog.xml
+++ b/OsmAnd/res/layout/fragment_snap_to_road_bottom_sheet_dialog.xml
@@ -24,6 +24,8 @@
                 android:layout_height="52dp"
                 android:gravity="center_vertical"
                 android:paddingEnd="16dp"
+                android:paddingLeft="16dp"
+                android:paddingRight="16dp"
                 android:paddingStart="16dp"
                 android:text="@string/choose_navigation_type"
                 android:textAppearance="@style/TextAppearance.ListItemTitle"/>
@@ -32,6 +34,8 @@
                 android:layout_width="match_parent"
                 android:layout_height="44dp"
                 android:paddingEnd="16dp"
+                android:paddingLeft="16dp"
+                android:paddingRight="16dp"
                 android:paddingStart="16dp"
                 android:text="@string/measurement_tool_snap_to_road_descr"
                 android:textColor="?android:textColorSecondary"
diff --git a/OsmAnd/res/layout/list_item_icon_and_title.xml b/OsmAnd/res/layout/list_item_icon_and_title.xml
index e98a58a395..b2a7b0dfcf 100644
--- a/OsmAnd/res/layout/list_item_icon_and_title.xml
+++ b/OsmAnd/res/layout/list_item_icon_and_title.xml
@@ -7,6 +7,8 @@
     android:background="?attr/selectableItemBackground"
     android:minHeight="48dp"
     android:paddingEnd="16dp"
+    android:paddingLeft="16dp"
+    android:paddingRight="16dp"
     android:paddingStart="16dp">
 
     <ImageView
diff --git a/OsmAnd/res/layout/measure_points_list_item.xml b/OsmAnd/res/layout/measure_points_list_item.xml
index 270a227fef..54d994d669 100644
--- a/OsmAnd/res/layout/measure_points_list_item.xml
+++ b/OsmAnd/res/layout/measure_points_list_item.xml
@@ -20,6 +20,8 @@
             android:layout_centerVertical="true"
             android:paddingBottom="12dp"
             android:paddingEnd="16dp"
+            android:paddingLeft="16dp"
+            android:paddingRight="16dp"
             android:paddingStart="16dp"
             android:paddingTop="12dp"
             android:tint="?attr/secondary_icon_color"
@@ -47,6 +49,8 @@
             android:focusableInTouchMode="true"
             android:paddingBottom="12dp"
             android:paddingEnd="16dp"
+            android:paddingLeft="16dp"
+            android:paddingRight="16dp"
             android:paddingStart="16dp"
             android:paddingTop="12dp"
             tools:src="@drawable/ic_action_remove_dark"/>