From d55e046e9c6462e39fc5b4315d0d413fb0fe1cdd Mon Sep 17 00:00:00 2001
From: Dima-1 <softmail32@gmail.com>
Date: Mon, 22 Jun 2020 09:57:37 +0300
Subject: [PATCH] Fix #5187 zoom factor and context menu zoom button position
 on tablet

---
 OsmAnd/res/layout/map_context_menu_fragment.xml | 8 +++-----
 OsmAnd/res/layout/map_hud_bottom.xml            | 9 +++++----
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/OsmAnd/res/layout/map_context_menu_fragment.xml b/OsmAnd/res/layout/map_context_menu_fragment.xml
index 225efaa39b..631a901de4 100644
--- a/OsmAnd/res/layout/map_context_menu_fragment.xml
+++ b/OsmAnd/res/layout/map_context_menu_fragment.xml
@@ -541,9 +541,7 @@
         android:alpha="0">
 
         <androidx.appcompat.widget.Toolbar
-            xmlns:android="http://schemas.android.com/apk/res/android"
             xmlns:app="http://schemas.android.com/apk/res-auto"
-            xmlns:tools="http://schemas.android.com/tools"
             android:id="@+id/context_menu_toolbar"
             android:layout_width="fill_parent"
             android:layout_height="@dimen/dashboard_map_toolbar"
@@ -597,15 +595,15 @@
 
         <LinearLayout
             android:id="@+id/context_menu_zoom_buttons"
-            android:layout_width="@dimen/fab_size_with_shadow"
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="end"
-            android:layout_marginRight="@dimen/fab_margin_right"
+            android:layout_marginRight="@dimen/map_button_margin"
             android:gravity="center"
             android:orientation="vertical"
             android:visibility="gone"
             tools:visibility="visible"
-	        android:layout_marginEnd="@dimen/fab_margin_right">
+            android:layout_marginEnd="@dimen/map_button_margin">
 
             <ImageButton
                 android:id="@+id/context_menu_zoom_in_button"
diff --git a/OsmAnd/res/layout/map_hud_bottom.xml b/OsmAnd/res/layout/map_hud_bottom.xml
index 68e7c9d52f..acdcc33e56 100644
--- a/OsmAnd/res/layout/map_hud_bottom.xml
+++ b/OsmAnd/res/layout/map_hud_bottom.xml
@@ -84,9 +84,9 @@
             android:layout_height="wrap_content"
             android:gravity="center_horizontal"
             tools:text="13.44"
-            android:layout_marginBottom="56dp"
-            android:layout_marginLeft="8dp"
-            android:layout_marginStart="8dp"
+            android:layout_marginBottom="@dimen/map_button_shadow_width"
+            android:layout_marginLeft="@dimen/map_alarm_bottom_text_margin"
+            android:layout_marginStart="@dimen/map_alarm_bottom_text_margin"
             android:layout_gravity="bottom|start"
             android:textSize="@dimen/map_button_text_size"/>
 
@@ -142,7 +142,8 @@
                 android:layout_gravity="bottom"
                 android:background="@drawable/btn_circle"
                 android:visibility="gone"
-                tools:src="@drawable/ic_action_remove_dark"/>
+                tools:src="@drawable/ic_action_remove_dark"
+                android:contentDescription="@string/snap_to_road" />
 
             <FrameLayout
                 android:id="@+id/map_ruler_layout"