From 64f8d751cf880410e88dc9d11328a31155144fff Mon Sep 17 00:00:00 2001
From: Jean-Baptiste <jeanbaptiste.charron@outlook.fr>
Date: Sun, 21 Sep 2025 20:17:26 +0200
Subject: [PATCH] [android] Improve top UI navigation

Signed-off-by: Jean-Baptiste <jeanbaptiste.charron@outlook.fr>
---
 .../main/res/layout-land/layout_nav_top.xml   | 32 +++++++++++------
 .../src/main/res/layout/layout_nav_top.xml    | 34 +++++++++++++------
 android/app/src/main/res/values/dimens.xml    |  2 +-
 .../app/src/main/res/values/font_sizes.xml    |  2 +-
 4 files changed, 48 insertions(+), 22 deletions(-)

diff --git a/android/app/src/main/res/layout-land/layout_nav_top.xml b/android/app/src/main/res/layout-land/layout_nav_top.xml
index 8ee90433e..69183fd2d 100644
--- a/android/app/src/main/res/layout-land/layout_nav_top.xml
+++ b/android/app/src/main/res/layout-land/layout_nav_top.xml
@@ -9,45 +9,57 @@
   tools:background="#20FF0000"
   tools:showIn="@layout/layout_nav">
   <FrameLayout
-    android:id="@+id/street_frame"
     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_marginTop="@dimen/margin_half_plus_eight"
+    android:layout_marginEnd="@dimen/margin_quarter"
+    app:cardCornerRadius="8dp"
     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:background="?cardBackground">
+    app:cardBackgroundColor="?colorSecondary">
     <RelativeLayout
       android:layout_width="match_parent"
-      android:layout_height="wrap_content"
+      android:layout_height="@dimen/nav_street_height"
       tools:ignore="UselessParent">
       <com.google.android.material.textview.MaterialTextView
         android:id="@+id/street"
         style="@style/MwmWidget.TextView.NavStreet"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="@dimen/nav_street_left"
+        android:layout_height="match_parent"
         android:maxLines="2"
         android:layout_gravity="center_horizontal"
         android:gravity="center"
+        android:textColor="?android:textColorPrimaryInverse"
         tools:text="Sample street name.\nLong looooooooong!!!!"/>
     </RelativeLayout>
-  </FrameLayout>
+  </com.google.android.material.card.MaterialCardView>
 
   <RelativeLayout
     android:id="@+id/nav_next_turn_container"
     android:layout_width="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"
-    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:elevation="@dimen/nav_elevation">
     <LinearLayout
       android:id="@+id/nav_next_turn_frame"
       android:layout_width="@dimen/nav_next_turn_frame"
       android:layout_height="wrap_content"
-      android:layout_margin="@dimen/margin_half"
       android:orientation="vertical"
+      android:layout_marginBottom="@dimen/margin_half"
+      android:layout_marginEnd="@dimen/margin_half"
       android:background="?navNextTurnFrame"
       android:elevation="@dimen/nav_elevation">
       <FrameLayout
diff --git a/android/app/src/main/res/layout/layout_nav_top.xml b/android/app/src/main/res/layout/layout_nav_top.xml
index e71475c1e..05a22b681 100644
--- a/android/app/src/main/res/layout/layout_nav_top.xml
+++ b/android/app/src/main/res/layout/layout_nav_top.xml
@@ -9,44 +9,58 @@
   tools:background="#20FF0000"
   tools:showIn="@layout/layout_nav">
   <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:layout_width="match_parent"
     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"
-    app:layout_constraintTop_toTopOf="parent"
+    app:layout_constraintTop_toBottomOf="@+id/statutbar"
     android:clickable="true"
-    android:background="?cardBackground">
+    app:cardBackgroundColor="?colorSecondary">
     <RelativeLayout
       android:layout_width="match_parent"
-      android:layout_height="@dimen/nav_street_height"
+      android:layout_height="match_parent"
+      android:minHeight="60dp"
       tools:ignore="UselessParent">
       <com.google.android.material.textview.MaterialTextView
         android:id="@+id/street"
         style="@style/MwmWidget.TextView.NavStreet"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_marginStart="@dimen/nav_street_left"
+        android:layout_height="wrap_content"
         android:maxLines="2"
+        android:minHeight="60dp"
         android:layout_gravity="center_vertical"
         android:gravity="center"
+        android:textColor="?android:textColorPrimaryInverse"
         tools:text="Sample street name.\nLong looooooooong!!!!"/>
     </RelativeLayout>
-  </FrameLayout>
+  </com.google.android.material.card.MaterialCardView>
 
   <RelativeLayout
     android:id="@+id/nav_next_turn_container"
     android:layout_width="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"
-    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:elevation="@dimen/nav_elevation">
     <LinearLayout
       android:id="@+id/nav_next_turn_frame"
       android:layout_width="@dimen/nav_next_turn_frame"
       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:background="?navNextTurnFrame"
       android:elevation="@dimen/nav_elevation">
@@ -111,7 +125,7 @@
       android:layout_width="0dp"
       android:layout_height="68dp"
       android:layout_marginEnd="@dimen/margin_half"
-      android:layout_marginTop="@dimen/margin_half"
+      android:layout_marginTop="@dimen/margin_quarter"
       android:padding="@dimen/margin_half"
       android:visibility="gone"
       app:layout_constraintEnd_toEndOf="parent"
diff --git a/android/app/src/main/res/values/dimens.xml b/android/app/src/main/res/values/dimens.xml
index 8d80993bc..77c248fdb 100644
--- a/android/app/src/main/res/values/dimens.xml
+++ b/android/app/src/main/res/values/dimens.xml
@@ -101,7 +101,7 @@
   <!-- Nav menu -->
   <dimen name="nav_elevation">6dp</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_top">8dp</dimen>
   <dimen name="nav_next_turn_bottom">6dp</dimen>
diff --git a/android/app/src/main/res/values/font_sizes.xml b/android/app/src/main/res/values/font_sizes.xml
index 3277b1530..6ff60ffd3 100644
--- a/android/app/src/main/res/values/font_sizes.xml
+++ b/android/app/src/main/res/values/font_sizes.xml
@@ -55,7 +55,7 @@
   <dimen name="text_size_routing_plan_detail_intermediate">20sp</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_circle_exit">22sp</dimen>
   <dimen name="text_size_nav_number">24sp</dimen>