From 88cb8fcea3c01e2190b1b2fb8fe87d13bc776757 Mon Sep 17 00:00:00 2001
From: Alex Sytnyk <asytnyk0@gmail.com>
Date: Mon, 23 Apr 2018 12:39:48 +0300
Subject: [PATCH] Fix margins in wikivoyage search screen

---
 .../res/layout/fragment_wikivoyage_search_dialog.xml |  5 +----
 OsmAnd/res/layout/wikivoyage_search_list_item.xml    | 12 ++++++------
 OsmAnd/res/values-large/sizes.xml                    |  3 +++
 OsmAnd/res/values/sizes.xml                          |  5 ++++-
 .../search/WikivoyageSearchDialogFragment.java       |  3 +++
 5 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/OsmAnd/res/layout/fragment_wikivoyage_search_dialog.xml b/OsmAnd/res/layout/fragment_wikivoyage_search_dialog.xml
index deb610a3cf..d7a8cc9a85 100644
--- a/OsmAnd/res/layout/fragment_wikivoyage_search_dialog.xml
+++ b/OsmAnd/res/layout/fragment_wikivoyage_search_dialog.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout
 	xmlns:android="http://schemas.android.com/apk/res/android"
-	xmlns:app="http://schemas.android.com/apk/res-auto"
 	android:layout_width="match_parent"
 	android:layout_height="match_parent"
 	android:background="?attr/wikivoyage_bg_color"
@@ -16,9 +15,7 @@
 			android:layout_width="match_parent"
 			android:layout_height="@dimen/dashboard_map_toolbar"
 			android:background="?attr/wikivoyage_card_bg_color"
-			android:minHeight="@dimen/dashboard_map_toolbar"
-			app:contentInsetLeft="54dp"
-			app:contentInsetStart="54dp">
+			android:minHeight="@dimen/dashboard_map_toolbar">
 
 			<include layout="@layout/search_text_layout"/>
 
diff --git a/OsmAnd/res/layout/wikivoyage_search_list_item.xml b/OsmAnd/res/layout/wikivoyage_search_list_item.xml
index 6054c31bc4..2c50d1643a 100644
--- a/OsmAnd/res/layout/wikivoyage_search_list_item.xml
+++ b/OsmAnd/res/layout/wikivoyage_search_list_item.xml
@@ -17,16 +17,16 @@
 			android:layout_height="wrap_content"
 			android:background="?attr/selectableItemBackground"
 			android:minHeight="@dimen/bottom_sheet_selected_item_title_height"
-			android:paddingLeft="@dimen/content_padding"
-			android:paddingRight="@dimen/content_padding">
+			android:paddingLeft="@dimen/wikivoyage_search_icon_margin_left"
+			android:paddingRight="@dimen/wikivoyage_search_icon_margin_left">
 
 			<ImageView
 				android:id="@+id/icon"
 				android:layout_width="28dp"
 				android:layout_height="28dp"
 				android:layout_gravity="center_vertical"
-				android:layout_marginEnd="@dimen/content_padding"
-				android:layout_marginRight="@dimen/content_padding"
+				android:layout_marginEnd="@dimen/wikivoyage_search_icon_margin_right"
+				android:layout_marginRight="@dimen/wikivoyage_search_icon_margin_right"
 				tools:src="@drawable/ic_action_placeholder_city"/>
 
 			<LinearLayout
@@ -80,8 +80,8 @@
 			android:id="@+id/divider"
 			android:layout_width="match_parent"
 			android:layout_height="1dp"
-			android:layout_marginLeft="@dimen/bottom_sheet_selected_item_title_height"
-			android:layout_marginStart="@dimen/bottom_sheet_selected_item_title_height"
+			android:layout_marginLeft="@dimen/wikivoyage_search_divider_margin_start"
+			android:layout_marginStart="@dimen/wikivoyage_search_divider_margin_start"
 			android:background="?attr/wikivoyage_card_divider_color"
 			android:focusable="false"/>
 
diff --git a/OsmAnd/res/values-large/sizes.xml b/OsmAnd/res/values-large/sizes.xml
index 728434fef4..f5a70a767c 100644
--- a/OsmAnd/res/values-large/sizes.xml
+++ b/OsmAnd/res/values-large/sizes.xml
@@ -203,4 +203,7 @@
 	<dimen name="wikivoyage_welcome_title_bottom_margin">23dp</dimen>
 	<dimen name="wikivoyage_welcome_content_margin">48dp</dimen>
 	<dimen name="wikivoyage_card_button_height">54dp</dimen>
+	<dimen name="wikivoyage_search_icon_margin_left">21dp</dimen>
+	<dimen name="wikivoyage_search_icon_margin_right">33dp</dimen>
+	<dimen name="wikivoyage_search_divider_margin_start">82dp</dimen>
 </resources>
\ No newline at end of file
diff --git a/OsmAnd/res/values/sizes.xml b/OsmAnd/res/values/sizes.xml
index 1d42b81c7a..8e64ef25e5 100644
--- a/OsmAnd/res/values/sizes.xml
+++ b/OsmAnd/res/values/sizes.xml
@@ -286,6 +286,9 @@
 	<dimen name="wikivoyage_welcome_title_bottom_margin">15dp</dimen>
 	<dimen name="wikivoyage_welcome_content_margin">32dp</dimen>
 	<dimen name="wikivoyage_card_button_height">36dp</dimen>
-	
+	<dimen name="wikivoyage_search_icon_margin_left">14dp</dimen>
+	<dimen name="wikivoyage_search_icon_margin_right">22dp</dimen>
+	<dimen name="wikivoyage_search_divider_margin_start">64dp</dimen>
+
 	<dimen name="text_button_letter_spacing" format="float">0.01</dimen>
 </resources>
\ No newline at end of file
diff --git a/OsmAnd/src/net/osmand/plus/wikivoyage/search/WikivoyageSearchDialogFragment.java b/OsmAnd/src/net/osmand/plus/wikivoyage/search/WikivoyageSearchDialogFragment.java
index 3081fb0149..25a7266da4 100644
--- a/OsmAnd/src/net/osmand/plus/wikivoyage/search/WikivoyageSearchDialogFragment.java
+++ b/OsmAnd/src/net/osmand/plus/wikivoyage/search/WikivoyageSearchDialogFragment.java
@@ -55,6 +55,9 @@ public class WikivoyageSearchDialogFragment extends WikivoyageBaseDialogFragment
 
 		Toolbar toolbar = (Toolbar) mainView.findViewById(R.id.toolbar);
 		setupToolbar(toolbar);
+		toolbar.setContentInsetStartWithNavigation(
+				getResources().getDimensionPixelOffset(R.dimen.wikivoyage_search_divider_margin_start)
+		);
 
 		searchEt = (EditText) toolbar.findViewById(R.id.searchEditText);
 		searchEt.setHint(R.string.shared_string_search);