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

[android] Bottom nav layout fix

Browse source 
Closes: #4189

Signed-off-by: Andrew Shkrob <andrew.shkrob.social@yandex.by>
This commit is contained in:
Andrew Shkrob 2023-03-12 17:47:12 +01:00 • committed by Roman Tsisyk
parent 6925e5193c
commit 3a1dc1f566
4 changed files with 36 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -8,23 +8,25 @@
tools:background="#3000FF00"
tools:ignore="RtlSymmetry">
<!-- Speed -->
<RelativeLayout
android:id="@+id/speed_view_container"
<Space
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:layout_weight="0.5"/>
<!-- Speed -->
<LinearLayout
android:id="@+id/speed_view_container"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:orientation="vertical"
android:background="@drawable/speed_cams_bg"
android:gravity="center"
android:minWidth="@dimen/nav_numbers_side_min_width"
android:paddingStart="@dimen/nav_numbers_margin"
android:paddingEnd="@dimen/nav_numbers_margin">
android:minWidth="@dimen/nav_numbers_side_min_width">
<TextView
android:id="@+id/speed_value"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
android:includeFontPadding="false"
android:lines="1"
android:textAppearance="@style/MwmTextAppearance.NavMenu.Number"
@ -35,30 +37,30 @@
android:id="@+id/speed_dimen"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@id/speed_value"
android:layout_centerHorizontal="true"
android:includeFontPadding="false"
android:lines="1"
android:textAppearance="@style/MwmTextAppearance.NavMenu.Number.Dimension"
tools:background="#20FF0000"
tools:text="km/h" />
</RelativeLayout>
</LinearLayout>
<!-- Time -->
<RelativeLayout
<Space
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1.5"
android:layout_weight="1.25"/>
<!-- Time -->
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:orientation="vertical"
android:gravity="center"
android:minWidth="@dimen/nav_numbers_side_min_width"
android:paddingStart="@dimen/nav_numbers_margin"
android:paddingEnd="@dimen/nav_numbers_margin">
android:minWidth="@dimen/nav_numbers_side_min_width">
<LinearLayout
android:id="@+id/time_values_container"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
tools:background="#20FF0000">
<TextView
@ -104,31 +106,30 @@
android:id="@+id/time_estimate"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/time_values_container"
android:layout_centerHorizontal="true"
android:includeFontPadding="false"
android:lines="1"
android:textAlignment="center"
android:textAppearance="@style/MwmTextAppearance.NavMenu.Number.Dimension"
tools:text="99:99 AM" />
</RelativeLayout>
</LinearLayout>
<!-- Distance -->
<RelativeLayout
<Space
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:layout_weight="1.25"/>
<!-- Distance -->
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:orientation="vertical"
android:gravity="center"
android:minWidth="@dimen/nav_numbers_side_min_width"
android:paddingStart="@dimen/nav_numbers_margin"
android:paddingEnd="@dimen/nav_numbers_margin">
android:minWidth="@dimen/nav_numbers_side_min_width">
<TextView
android:id="@+id/distance_value"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
android:includeFontPadding="false"
android:lines="1"
android:textAppearance="@style/MwmTextAppearance.NavMenu.Number"
@ -138,12 +139,15 @@
android:id="@+id/distance_dimen"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@id/distance_value"
android:layout_centerHorizontal="true"
android:includeFontPadding="false"
android:lines="1"
android:textAppearance="@style/MwmTextAppearance.NavMenu.Number.Dimension"
tools:background="#20FF0000"
tools:text="km" />
</RelativeLayout>
</LinearLayout>
<Space
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="0.5"/>
</LinearLayout>

1
android/res/values-land/dimens.xml
View file

@ -6,7 +6,6 @@
<!-- Nav menu -->
<dimen name="nav_menu_content_height">48dp</dimen>
<dimen name="nav_numbers_margin">16dp</dimen>
<dimen name="nav_bottom_gap">24dp</dimen>
<!-- Altitude chart -->

1
android/res/values-sw720dp-land/dimens.xml
View file

@ -3,7 +3,6 @@
<!-- Nav menu -->
<dimen name="nav_menu_content_height">64dp</dimen>
<dimen name="nav_progress">8dp</dimen>
<dimen name="nav_numbers_margin">32dp</dimen>
<!-- Altitude chart -->
<dimen name="altitude_chart_image_width">328dp</dimen>

1
android/res/values/dimens.xml
View file

@ -105,7 +105,6 @@
<dimen name="nav_next_turn_space">6dp</dimen>
<dimen name="nav_next_turn_sign">64dp</dimen>
<dimen name="nav_next_next_turn_frame">32dp</dimen>
<dimen name="nav_numbers_margin">8dp</dimen>
<dimen name="nav_numbers_side_min_width">90dp</dimen>
<dimen name="nav_progress">4sp</dimen>
<dimen name="nav_progress_head">2dp</dimen>