From 1a36f437432b88e6118f2dbca0181291084b897f Mon Sep 17 00:00:00 2001
From: Alexander Sytnyk <asytnyk0@gmail.com>
Date: Fri, 6 Oct 2017 17:05:49 +0300
Subject: [PATCH] Add margin for snap to road button; fix gravity of back
 button

---
 .../res/layout-land/fragment_plan_route.xml   |  1 +
 .../layout/fragment_map_markers_dialog.xml    | 75 ++++++++++---------
 .../plus/mapmarkers/PlanRouteFragment.java    |  6 ++
 3 files changed, 48 insertions(+), 34 deletions(-)

diff --git a/OsmAnd/res/layout-land/fragment_plan_route.xml b/OsmAnd/res/layout-land/fragment_plan_route.xml
index a969d9738c..d85da7b8fc 100644
--- a/OsmAnd/res/layout-land/fragment_plan_route.xml
+++ b/OsmAnd/res/layout-land/fragment_plan_route.xml
@@ -21,6 +21,7 @@
             android:layout_width="match_parent"
             android:layout_height="@dimen/dashboard_map_toolbar"
             android:background="?attr/bg_color"
+            android:minHeight="@dimen/dashboard_map_toolbar"
             app:contentInsetLeft="54dp"
             app:contentInsetStart="54dp">
 
diff --git a/OsmAnd/res/layout/fragment_map_markers_dialog.xml b/OsmAnd/res/layout/fragment_map_markers_dialog.xml
index efdbeb931b..fafc9dc53b 100644
--- a/OsmAnd/res/layout/fragment_map_markers_dialog.xml
+++ b/OsmAnd/res/layout/fragment_map_markers_dialog.xml
@@ -7,49 +7,56 @@
     android:layout_height="match_parent"
     android:orientation="vertical">
 
-    <android.support.v7.widget.Toolbar
-        android:id="@+id/map_markers_toolbar"
+    <android.support.design.widget.AppBarLayout
         android:layout_width="match_parent"
-        android:layout_height="@dimen/dashboard_map_toolbar"
-        app:contentInsetLeft="54dp"
-        app:contentInsetStart="54dp">
+        android:layout_height="@dimen/dashboard_map_toolbar">
 
-        <LinearLayout
+        <android.support.v7.widget.Toolbar
+            android:id="@+id/map_markers_toolbar"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:gravity="center_vertical"
-            android:orientation="horizontal">
+            android:minHeight="@dimen/dashboard_map_toolbar"
+            app:contentInsetLeft="54dp"
+            app:contentInsetStart="54dp">
 
-            <net.osmand.plus.widgets.TextViewEx
-                android:layout_width="0dp"
+            <LinearLayout
+                android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                android:layout_weight="1"
-                android:ellipsize="end"
                 android:gravity="center_vertical"
-                android:maxLines="1"
-                android:text="@string/map_markers"
-                android:textColor="@color/color_white"
-                android:textSize="@dimen/dialog_header_text_size"
-                osmand:typeface="@string/font_roboto_medium"/>
+                android:orientation="horizontal">
 
-            <net.osmand.plus.widgets.TextViewEx
-                android:id="@+id/options_button"
-                android:layout_width="wrap_content"
-                android:layout_height="match_parent"
-                android:background="?attr/selectableItemBackground"
-                android:ellipsize="end"
-                android:gravity="center_vertical"
-                android:maxLines="1"
-                android:paddingLeft="16dp"
-                android:paddingRight="16dp"
-                android:text="@string/shared_string_options"
-                android:textAllCaps="true"
-                android:textColor="@color/color_white"
-                android:textSize="@dimen/default_list_text_size"
-                osmand:typeface="@string/font_roboto_regular"/>
-        </LinearLayout>
+                <net.osmand.plus.widgets.TextViewEx
+                    android:layout_width="0dp"
+                    android:layout_height="match_parent"
+                    android:layout_weight="1"
+                    android:ellipsize="end"
+                    android:gravity="center_vertical"
+                    android:maxLines="1"
+                    android:text="@string/map_markers"
+                    android:textColor="@color/color_white"
+                    android:textSize="@dimen/dialog_header_text_size"
+                    osmand:typeface="@string/font_roboto_medium"/>
 
-    </android.support.v7.widget.Toolbar>
+                <net.osmand.plus.widgets.TextViewEx
+                    android:id="@+id/options_button"
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:background="?attr/selectableItemBackground"
+                    android:ellipsize="end"
+                    android:gravity="center_vertical"
+                    android:maxLines="1"
+                    android:paddingLeft="16dp"
+                    android:paddingRight="16dp"
+                    android:text="@string/shared_string_options"
+                    android:textAllCaps="true"
+                    android:textColor="@color/color_white"
+                    android:textSize="@dimen/default_list_text_size"
+                    osmand:typeface="@string/font_roboto_regular"/>
+            </LinearLayout>
+
+        </android.support.v7.widget.Toolbar>
+
+    </android.support.design.widget.AppBarLayout>
 
     <FrameLayout
         android:layout_width="match_parent"
diff --git a/OsmAnd/src/net/osmand/plus/mapmarkers/PlanRouteFragment.java b/OsmAnd/src/net/osmand/plus/mapmarkers/PlanRouteFragment.java
index cdb1f4d5e2..05d1c1a655 100644
--- a/OsmAnd/src/net/osmand/plus/mapmarkers/PlanRouteFragment.java
+++ b/OsmAnd/src/net/osmand/plus/mapmarkers/PlanRouteFragment.java
@@ -21,6 +21,7 @@ import android.view.ViewGroup;
 import android.view.ViewTreeObserver;
 import android.widget.ImageButton;
 import android.widget.ImageView;
+import android.widget.LinearLayout;
 import android.widget.ProgressBar;
 import android.widget.TextView;
 import android.widget.Toast;
@@ -480,6 +481,11 @@ public class PlanRouteFragment extends Fragment {
 					fragment.show(mapActivity.getSupportFragmentManager(), SnapToRoadBottomSheetDialogFragment.TAG);
 				}
 			});
+			if (!portrait) {
+				LinearLayout.LayoutParams params = (LinearLayout.LayoutParams) appModesBtn.getLayoutParams();
+				params.leftMargin = mapActivity.getResources().getDimensionPixelSize(R.dimen.dashboard_land_width);
+				appModesBtn.setLayoutParams(params);
+			}
 			appModesBtn.setVisibility(View.VISIBLE);
 		}
 	}