Fix #5187 zoom factor and context menu zoom button position on tablet

This commit is contained in:
Dima-1 2020-06-22 09:57:37 +03:00
parent 55a377cb47
commit d55e046e9c
2 changed files with 8 additions and 9 deletions

View file

@ -541,9 +541,7 @@
android:alpha="0"> android:alpha="0">
<androidx.appcompat.widget.Toolbar <androidx.appcompat.widget.Toolbar
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/context_menu_toolbar" android:id="@+id/context_menu_toolbar"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="@dimen/dashboard_map_toolbar" android:layout_height="@dimen/dashboard_map_toolbar"
@ -597,15 +595,15 @@
<LinearLayout <LinearLayout
android:id="@+id/context_menu_zoom_buttons" 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_height="wrap_content"
android:layout_gravity="end" android:layout_gravity="end"
android:layout_marginRight="@dimen/fab_margin_right" android:layout_marginRight="@dimen/map_button_margin"
android:gravity="center" android:gravity="center"
android:orientation="vertical" android:orientation="vertical"
android:visibility="gone" android:visibility="gone"
tools:visibility="visible" tools:visibility="visible"
android:layout_marginEnd="@dimen/fab_margin_right"> android:layout_marginEnd="@dimen/map_button_margin">
<ImageButton <ImageButton
android:id="@+id/context_menu_zoom_in_button" android:id="@+id/context_menu_zoom_in_button"

View file

@ -84,9 +84,9 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:gravity="center_horizontal" android:gravity="center_horizontal"
tools:text="13.44" tools:text="13.44"
android:layout_marginBottom="56dp" android:layout_marginBottom="@dimen/map_button_shadow_width"
android:layout_marginLeft="8dp" android:layout_marginLeft="@dimen/map_alarm_bottom_text_margin"
android:layout_marginStart="8dp" android:layout_marginStart="@dimen/map_alarm_bottom_text_margin"
android:layout_gravity="bottom|start" android:layout_gravity="bottom|start"
android:textSize="@dimen/map_button_text_size"/> android:textSize="@dimen/map_button_text_size"/>
@ -142,7 +142,8 @@
android:layout_gravity="bottom" android:layout_gravity="bottom"
android:background="@drawable/btn_circle" android:background="@drawable/btn_circle"
android:visibility="gone" android:visibility="gone"
tools:src="@drawable/ic_action_remove_dark"/> tools:src="@drawable/ic_action_remove_dark"
android:contentDescription="@string/snap_to_road" />
<FrameLayout <FrameLayout
android:id="@+id/map_ruler_layout" android:id="@+id/map_ruler_layout"