AndrewShkrob/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

[android] Fixed issue with broken toolbar in navigation mode. Additionally deleted RTL errors from three layout files I touched.

Browse source 
Signed-off-by: Dzmitry Yarmolenka <dzmitry.yarmolenka.1986@gmail.com>
This commit is contained in:
Dzmitry Yarmolenka 2021-07-09 17:40:57 +02:00 • committed by Alexander Borsuk
parent 73931f7918
commit 15e4931036
3 changed files with 39 additions and 54 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

53
android/res/layout-land/layout_nav_bottom_numbers.xml
View file

@ -1,13 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout
<RelativeLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="@dimen/nav_menu_height"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:paddingLeft="@dimen/nav_numbers_margin"
android:paddingStart="@dimen/nav_numbers_margin"
android:layout_marginRight="@dimen/nav_toggle"
android:layout_marginEnd="@dimen/nav_toggle"
android:background="?clickableBackground"
tools:background="#3000FF00"
@ -16,11 +14,11 @@
<LinearLayout
android:id="@+id/speed_view_container"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_height="wrap_content"
android:minWidth="@dimen/nav_numbers_side_min_width"
android:orientation="horizontal"
android:paddingLeft="@dimen/nav_numbers_margin"
android:paddingRight="@dimen/nav_numbers_margin"
android:paddingStart="@dimen/nav_numbers_margin"
android:paddingEnd="@dimen/nav_numbers_margin"
android:paddingTop="@dimen/margin_eighth"
android:gravity="center_horizontal"
android:background="@drawable/speed_cams_bg"
@ -41,21 +39,20 @@
tools:text="km/h"/>
</LinearLayout>
<Space android:layout_width="0dp"
android:layout_height="0dp"
android:layout_weight="1"/>
<!-- Time -->
<FrameLayout
<RelativeLayout
android:id="@+id/time_frame"
android:layout_width="wrap_content"
android:layout_height="@dimen/nav_menu_height"
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
android:minWidth="@dimen/nav_numbers_center_min_width"
android:paddingTop="@dimen/margin_eighth"
tools:background="#20FF0000">
<LinearLayout
android:layout_width="match_parent"
android:id="@+id/time_values_container"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
android:orientation="horizontal"
android:layout_gravity="center_horizontal"
android:gravity="bottom">
@ -71,7 +68,7 @@
android:id="@+id/time_hour_dimen"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginRight="@dimen/margin_quarter"
android:layout_marginEnd="@dimen/margin_quarter"
android:singleLine="true"
android:textAppearance="@style/MwmTextAppearance.RoutingDimension"
tools:text="h"/>
@ -94,41 +91,41 @@
</LinearLayout>
<LinearLayout
android:layout_below="@id/time_values_container"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
android:theme="?navigationTheme"
android:layout_marginTop="28dp"
android:layout_marginBottom="4dp"
android:layout_gravity="center_horizontal"
android:orientation="horizontal">
<ImageView
android:id="@+id/dot_left"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginRight="@dimen/margin_half"
android:layout_marginEnd="@dimen/margin_half"
android:src="?newsMarker"/>
android:src="?newsMarker"
tools:ignore="ContentDescription" />
<ImageView
android:id="@+id/dot_estimate"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="?newsMarker"/>
android:src="?newsMarker"
tools:ignore="ContentDescription" />
</LinearLayout>
</FrameLayout>
<Space android:layout_width="0dp"
android:layout_height="0dp"
android:layout_weight="1"/>
</RelativeLayout>
<!-- Distance -->
<LinearLayout
android:id="@+id/distance_frame"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentEnd="true"
android:minWidth="@dimen/nav_numbers_side_min_width"
android:orientation="horizontal"
android:paddingLeft="@dimen/nav_numbers_margin"
android:paddingRight="@dimen/nav_numbers_margin"
android:paddingStart="@dimen/nav_numbers_margin"
android:paddingEnd="@dimen/nav_numbers_margin"
android:paddingTop="@dimen/margin_eighth"
android:gravity="center_horizontal"
tools:background="#20FF0000">
@ -148,4 +145,4 @@
android:textAppearance="@style/MwmTextAppearance.RoutingDimension"
tools:text="km"/>
</LinearLayout>
</LinearLayout>
</RelativeLayout>

17
android/res/layout/layout_nav_bottom.xml
View file

@ -17,7 +17,7 @@
<FrameLayout
android:id="@+id/line_frame"
android:layout_width="match_parent"
android:layout_height="@dimen/nav_menu_height">
android:layout_height="wrap_content">
<include layout="@layout/layout_nav_bottom_numbers"/>
<ImageView
@ -27,7 +27,7 @@
android:layout_gravity="end|center_vertical"
android:background="?clickableBackground"
android:scaleType="center"
android:tint="?iconTint"
app:tint="?iconTint"
tools:src="@drawable/ic_menu_close"/>
</FrameLayout>
@ -46,9 +46,7 @@
android:id="@+id/content_frame"
android:layout_width="match_parent"
android:layout_height="@dimen/nav_menu_content_height"
android:paddingLeft="@dimen/nav_bottom_gap"
android:paddingStart="@dimen/nav_bottom_gap"
android:paddingRight="@dimen/nav_bottom_gap"
android:paddingEnd="@dimen/nav_bottom_gap"
android:orientation="horizontal"
android:gravity="center_vertical"
@ -63,14 +61,6 @@
android:src="@drawable/ic_voice_on"
android:background="?selectableItemBackgroundBorderless"/>
<!-- <ImageView-->
<!-- android:id="@+id/traffic"-->
<!-- android:layout_weight="0.2"-->
<!-- android:layout_width="0dp"-->
<!-- android:layout_height="@dimen/nav_icon_size"-->
<!-- android:scaleType="center"-->
<!-- android:background="?selectableItemBackgroundBorderless"/>-->
<ImageView
android:id="@+id/subway"
android:layout_weight="0.2"
@ -94,12 +84,11 @@
android:layout_weight="0.2"
android:layout_width="0dp"
android:layout_height="@dimen/nav_icon_size"
android:layout_marginRight="@dimen/nav_bottom_gap"
android:layout_marginEnd="@dimen/nav_bottom_gap"
android:scaleType="center"
android:src="@drawable/ic_menu_settings"
android:background="?selectableItemBackgroundBorderless"
android:tint="?iconTint"/>
app:tint="?iconTint" />
<Button
android:id="@+id/stop"

23
android/res/layout/layout_nav_bottom_numbers.xml
View file

@ -3,9 +3,8 @@
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="@dimen/nav_menu_height"
android:layout_height="wrap_content"
android:orientation="vertical"
android:layout_marginRight="@dimen/nav_toggle"
android:layout_marginEnd="@dimen/nav_toggle"
android:background="?clickableBackground"
tools:background="#3000FF00"
@ -25,8 +24,8 @@
android:minWidth="@dimen/nav_numbers_side_min_width"
android:paddingBottom="@dimen/margin_eighth"
android:paddingTop="@dimen/margin_eighth"
android:paddingLeft="@dimen/nav_numbers_margin"
android:paddingRight="@dimen/nav_numbers_margin">
android:paddingStart="@dimen/nav_numbers_margin"
android:paddingEnd="@dimen/nav_numbers_margin">
<TextView
android:id="@+id/speed_value"
android:layout_centerHorizontal="true"
@ -59,8 +58,8 @@
android:minWidth="@dimen/nav_numbers_side_min_width"
android:paddingBottom="@dimen/margin_eighth"
android:paddingTop="@dimen/margin_eighth"
android:paddingLeft="@dimen/nav_numbers_margin"
android:paddingRight="@dimen/nav_numbers_margin">
android:paddingStart="@dimen/nav_numbers_margin"
android:paddingEnd="@dimen/nav_numbers_margin">
<LinearLayout
android:id="@+id/time_values_container"
android:layout_width="wrap_content"
@ -80,7 +79,6 @@
android:id="@+id/time_hour_dimen"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginRight="@dimen/margin_quarter"
android:layout_marginEnd="@dimen/margin_quarter"
android:lines="1"
android:includeFontPadding="false"
@ -119,14 +117,15 @@
android:id="@+id/dot_left"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginRight="@dimen/margin_half"
android:layout_marginEnd="@dimen/margin_half"
android:src="?newsMarker"/>
android:src="?newsMarker"
tools:ignore="ContentDescription" />
<ImageView
android:id="@+id/dot_estimate"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="?newsMarker"/>
android:src="?newsMarker"
tools:ignore="ContentDescription" />
</LinearLayout>
</RelativeLayout>
@ -139,8 +138,8 @@
android:minWidth="@dimen/nav_numbers_side_min_width"
android:paddingBottom="@dimen/margin_eighth"
android:paddingTop="@dimen/margin_eighth"
android:paddingLeft="@dimen/nav_numbers_margin"
android:paddingRight="@dimen/nav_numbers_margin">
android:paddingStart="@dimen/nav_numbers_margin"
android:paddingEnd="@dimen/nav_numbers_margin">
<TextView
android:id="@+id/distance_value"
android:layout_width="wrap_content"