drifty/comaps
1
0
Fork 0
mirror of https://codeberg.org/comaps/comaps synced 2025-12-21 13:53:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

[android] Improve top UI navigation

Browse Source 
Signed-off-by: Jean-Baptiste <jeanbaptiste.charron@outlook.fr>
This commit is contained in:
Jean-Baptiste
2025-09-21 20:17:26 +02:00
committed by x7z4w
parent d145f3b51b
commit 64f8d751cf
4 changed files with 48 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
android/app/src/main/res/layout-land/layout_nav_top.xml
View File

@@ -9,45 +9,57 @@
tools:background="#20FF0000" tools:background="#20FF0000"
tools:showIn="@layout/layout_nav"> tools:showIn="@layout/layout_nav">
<FrameLayout <FrameLayout
android:id="@+id/street_frame"
android:layout_width="match_parent" android:layout_width="match_parent"
android:id="@+id/statutbar"
android:layout_height="15dp"
app:layout_constraintTop_toTopOf="parent" />
<com.google.android.material.card.MaterialCardView
android:id="@+id/street_frame"
android:layout_width="500dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="@dimen/margin_half_plus_eight"
android:layout_marginEnd="@dimen/margin_quarter"
app:cardCornerRadius="8dp"
android:elevation="@dimen/nav_elevation" android:elevation="@dimen/nav_elevation"
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toBottomOf="@+id/statutbar"
app:layout_constraintStart_toEndOf="@+id/nav_next_turn_container"
android:clickable="true" android:clickable="true"
android:background="?cardBackground"> app:cardBackgroundColor="?colorSecondary">
<RelativeLayout <RelativeLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="@dimen/nav_street_height"
tools:ignore="UselessParent"> tools:ignore="UselessParent">
<com.google.android.material.textview.MaterialTextView <com.google.android.material.textview.MaterialTextView
android:id="@+id/street" android:id="@+id/street"
style="@style/MwmWidget.TextView.NavStreet" style="@style/MwmWidget.TextView.NavStreet"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="match_parent"
android:layout_marginStart="@dimen/nav_street_left"
android:maxLines="2" android:maxLines="2"
android:layout_gravity="center_horizontal" android:layout_gravity="center_horizontal"
android:gravity="center" android:gravity="center"
android:textColor="?android:textColorPrimaryInverse"
tools:text="Sample street name.\nLong looooooooong!!!!"/> tools:text="Sample street name.\nLong looooooooong!!!!"/>
</RelativeLayout> </RelativeLayout>
</FrameLayout> </com.google.android.material.card.MaterialCardView>
<RelativeLayout <RelativeLayout
android:id="@+id/nav_next_turn_container" android:id="@+id/nav_next_turn_container"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
app:layout_constraintTop_toBottomOf="@id/street_frame" app:layout_constraintEnd_toStartOf="@+id/street_frame"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
android:layout_marginTop="-40dp" app:layout_constraintTop_toBottomOf="@+id/statutbar"
android:layout_marginTop="@dimen/margin_half_plus_eight"
android:layout_marginStart="@dimen/margin_quarter"
android:clickable="true" android:clickable="true"
android:elevation="@dimen/nav_elevation"> android:elevation="@dimen/nav_elevation">
<LinearLayout <LinearLayout
android:id="@+id/nav_next_turn_frame" android:id="@+id/nav_next_turn_frame"
android:layout_width="@dimen/nav_next_turn_frame" android:layout_width="@dimen/nav_next_turn_frame"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_margin="@dimen/margin_half"
android:orientation="vertical" android:orientation="vertical"
android:layout_marginBottom="@dimen/margin_half"
android:layout_marginEnd="@dimen/margin_half"
android:background="?navNextTurnFrame" android:background="?navNextTurnFrame"
android:elevation="@dimen/nav_elevation"> android:elevation="@dimen/nav_elevation">
<FrameLayout <FrameLayout

34
android/app/src/main/res/layout/layout_nav_top.xml
View File

@@ -9,44 +9,58 @@
tools:background="#20FF0000" tools:background="#20FF0000"
tools:showIn="@layout/layout_nav"> tools:showIn="@layout/layout_nav">
<FrameLayout <FrameLayout
android:layout_width="match_parent"
android:id="@+id/statutbar"
android:layout_height="25dp"
app:layout_constraintTop_toTopOf="parent" />
<com.google.android.material.card.MaterialCardView
android:id="@+id/street_frame" android:id="@+id/street_frame"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="@dimen/margin_half_plus"
android:layout_marginStart="@dimen/nav_street_left"
android:layout_marginEnd="@dimen/margin_quarter"
app:cardCornerRadius="8dp"
android:elevation="@dimen/nav_elevation" android:elevation="@dimen/nav_elevation"
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toBottomOf="@+id/statutbar"
android:clickable="true" android:clickable="true"
android:background="?cardBackground"> app:cardBackgroundColor="?colorSecondary">
<RelativeLayout <RelativeLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="@dimen/nav_street_height" android:layout_height="match_parent"
android:minHeight="60dp"
tools:ignore="UselessParent"> tools:ignore="UselessParent">
<com.google.android.material.textview.MaterialTextView <com.google.android.material.textview.MaterialTextView
android:id="@+id/street" android:id="@+id/street"
style="@style/MwmWidget.TextView.NavStreet" style="@style/MwmWidget.TextView.NavStreet"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="wrap_content"
android:layout_marginStart="@dimen/nav_street_left"
android:maxLines="2" android:maxLines="2"
android:minHeight="60dp"
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
android:gravity="center" android:gravity="center"
android:textColor="?android:textColorPrimaryInverse"
tools:text="Sample street name.\nLong looooooooong!!!!"/> tools:text="Sample street name.\nLong looooooooong!!!!"/>
</RelativeLayout> </RelativeLayout>
</FrameLayout> </com.google.android.material.card.MaterialCardView>
<RelativeLayout <RelativeLayout
android:id="@+id/nav_next_turn_container" android:id="@+id/nav_next_turn_container"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
app:layout_constraintTop_toBottomOf="@id/street_frame" app:layout_constraintEnd_toStartOf="@+id/street_frame"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
android:layout_marginTop="-40dp" app:layout_constraintTop_toBottomOf="@+id/statutbar"
android:layout_marginStart="@dimen/margin_half"
android:layout_marginTop="@dimen/margin_half_plus"
android:clickable="true" android:clickable="true"
android:elevation="@dimen/nav_elevation"> android:elevation="@dimen/nav_elevation">
<LinearLayout <LinearLayout
android:id="@+id/nav_next_turn_frame" android:id="@+id/nav_next_turn_frame"
android:layout_width="@dimen/nav_next_turn_frame" android:layout_width="@dimen/nav_next_turn_frame"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_margin="@dimen/margin_half" android:layout_marginBottom="@dimen/margin_half"
android:layout_marginEnd="@dimen/margin_half"
android:orientation="vertical" android:orientation="vertical"
android:background="?navNextTurnFrame" android:background="?navNextTurnFrame"
android:elevation="@dimen/nav_elevation"> android:elevation="@dimen/nav_elevation">
@@ -111,7 +125,7 @@
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="68dp" android:layout_height="68dp"
android:layout_marginEnd="@dimen/margin_half" android:layout_marginEnd="@dimen/margin_half"
android:layout_marginTop="@dimen/margin_half" android:layout_marginTop="@dimen/margin_quarter"
android:padding="@dimen/margin_half" android:padding="@dimen/margin_half"
android:visibility="gone" android:visibility="gone"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"

2
android/app/src/main/res/values/dimens.xml
View File

@@ -101,7 +101,7 @@
<!-- Nav menu --> <!-- Nav menu -->
<dimen name="nav_elevation">6dp</dimen> <dimen name="nav_elevation">6dp</dimen>
<dimen name="nav_street_height">44dp</dimen> <dimen name="nav_street_height">44dp</dimen>
<dimen name="nav_street_left">104dp</dimen> <dimen name="nav_street_left">100dp</dimen>
<dimen name="nav_next_turn_frame">88dp</dimen> <dimen name="nav_next_turn_frame">88dp</dimen>
<dimen name="nav_next_turn_top">8dp</dimen> <dimen name="nav_next_turn_top">8dp</dimen>
<dimen name="nav_next_turn_bottom">6dp</dimen> <dimen name="nav_next_turn_bottom">6dp</dimen>

2
android/app/src/main/res/values/font_sizes.xml
View File

@@ -55,7 +55,7 @@
<dimen name="text_size_routing_plan_detail_intermediate">20sp</dimen> <dimen name="text_size_routing_plan_detail_intermediate">20sp</dimen>
<dimen name="text_size_time_picker">56sp</dimen> <dimen name="text_size_time_picker">56sp</dimen>
<dimen name="text_size_nav_street">17sp</dimen> <dimen name="text_size_nav_street">19sp</dimen>
<dimen name="text_size_nav_next_turn">24sp</dimen> <dimen name="text_size_nav_next_turn">24sp</dimen>
<dimen name="text_size_nav_circle_exit">22sp</dimen> <dimen name="text_size_nav_circle_exit">22sp</dimen>
<dimen name="text_size_nav_number">24sp</dimen> <dimen name="text_size_nav_number">24sp</dimen>