From d283fd41aeee5239d9d2d0c9dddd7926369917bc Mon Sep 17 00:00:00 2001
From: Jean-Baptiste <jeanbaptiste.charron@outlook.fr>
Date: Sat, 18 Oct 2025 08:52:06 +0200
Subject: [PATCH] [android] Improve colors in navigation UI

Signed-off-by: Jean-Baptiste <jeanbaptiste.charron@outlook.fr>
---
 android/app/src/main/res/drawable/bg_nav_next_turn.xml |  2 +-
 .../app/src/main/res/layout-land/layout_nav_top.xml    | 10 ++++++----
 android/app/src/main/res/layout/layout_nav_top.xml     |  8 +++++---
 android/app/src/main/res/values-night/colors.xml       |  2 +-
 android/app/src/main/res/values-night/themes.xml       |  2 +-
 android/app/src/main/res/values/themes.xml             |  2 +-
 6 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/android/app/src/main/res/drawable/bg_nav_next_turn.xml b/android/app/src/main/res/drawable/bg_nav_next_turn.xml
index 006d0d5a4..862e83c8a 100644
--- a/android/app/src/main/res/drawable/bg_nav_next_turn.xml
+++ b/android/app/src/main/res/drawable/bg_nav_next_turn.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
        android:shape="rectangle">
-  <solid android:color="@color/base_accent"/>
+  <solid android:color="@color/bg_primary"/>
   <corners android:radius="4dp"/>
 </shape>
\ No newline at end of file
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 e6fcfaeb6..403b18323 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
@@ -24,7 +24,7 @@
     app:layout_constraintTop_toBottomOf="@+id/statutbar"
     app:layout_constraintStart_toEndOf="@+id/nav_next_turn_container"
     android:clickable="true"
-    app:cardBackgroundColor="?colorSecondary">
+    app:cardBackgroundColor="?colorPrimary">
     <RelativeLayout
       android:layout_width="match_parent"
       android:layout_height="@dimen/nav_street_height"
@@ -37,7 +37,7 @@
         android:maxLines="2"
         android:layout_gravity="center_horizontal"
         android:gravity="center"
-        android:textColor="?android:textColorPrimaryInverse"
+        android:textColor="@android:color/white"
         tools:text="Sample street name.\nLong looooooooong!!!!"/>
     </RelativeLayout>
   </com.google.android.material.card.MaterialCardView>
@@ -73,12 +73,13 @@
           android:theme="?navigationTheme"
           android:layout_width="@dimen/nav_next_turn_sign"
           android:layout_height="@dimen/nav_next_turn_sign"
-          app:tint="?iconTint"
+          app:tint="@android:color/white"
           tools:background="#400000FF"/>
 
         <com.google.android.material.textview.MaterialTextView
           android:id="@+id/circle_exit"
           style="@style/MwmWidget.TextView.NavNextTurn.Exit"
+          android:textColor="@android:color/white"
           android:layout_width="wrap_content"
           android:layout_height="wrap_content"
           android:layout_gravity="center"
@@ -93,6 +94,7 @@
         android:layout_marginBottom="@dimen/nav_next_turn_bottom"
         android:layout_gravity="center_horizontal"
         android:gravity="center_horizontal"
+        android:textColor="@android:color/white"
         tools:text="9999 ft"/>
     </LinearLayout>
 
@@ -130,7 +132,7 @@
       app:layout_constraintTop_toBottomOf="@id/street_frame"
       app:lanesActiveLaneTintColor="?navLaneArrowActiveColor"
       app:lanesInactiveLaneTintColor="?navLaneArrowInactiveColor"
-      app:lanesBackgroundColor="?colorSecondary"
+      app:lanesBackgroundColor="?colorPrimary"
       app:lanesCornerRadius="@dimen/margin_quarter"
       app:lanesEditModeLanesCount="10"
       tools:visibility="visible" />
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 05a22b681..1c3ec5855 100644
--- a/android/app/src/main/res/layout/layout_nav_top.xml
+++ b/android/app/src/main/res/layout/layout_nav_top.xml
@@ -24,7 +24,7 @@
     android:elevation="@dimen/nav_elevation"
     app:layout_constraintTop_toBottomOf="@+id/statutbar"
     android:clickable="true"
-    app:cardBackgroundColor="?colorSecondary">
+    app:cardBackgroundColor="?colorPrimary">
     <RelativeLayout
       android:layout_width="match_parent"
       android:layout_height="match_parent"
@@ -39,7 +39,7 @@
         android:minHeight="60dp"
         android:layout_gravity="center_vertical"
         android:gravity="center"
-        android:textColor="?android:textColorPrimaryInverse"
+        android:textColor="@android:color/white"
         tools:text="Sample street name.\nLong looooooooong!!!!"/>
     </RelativeLayout>
   </com.google.android.material.card.MaterialCardView>
@@ -75,7 +75,7 @@
           android:theme="?navigationTheme"
           android:layout_width="@dimen/nav_next_turn_sign"
           android:layout_height="@dimen/nav_next_turn_sign"
-          app:tint="?iconTint"
+          app:tint="@android:color/white"
           tools:background="#400000FF"/>
 
         <com.google.android.material.textview.MaterialTextView
@@ -84,6 +84,7 @@
           android:layout_width="wrap_content"
           android:layout_height="wrap_content"
           android:layout_gravity="center"
+          android:textColor="@android:color/white"
           tools:text="9"/>
       </FrameLayout>
 
@@ -95,6 +96,7 @@
         android:layout_marginBottom="@dimen/nav_next_turn_bottom"
         android:layout_gravity="center_horizontal"
         android:gravity="center_horizontal"
+        android:textColor="@android:color/white"
         tools:text="9999 ft"/>
     </LinearLayout>
 
diff --git a/android/app/src/main/res/values-night/colors.xml b/android/app/src/main/res/values-night/colors.xml
index 6cda6a17c..57442cb92 100644
--- a/android/app/src/main/res/values-night/colors.xml
+++ b/android/app/src/main/res/values-night/colors.xml
@@ -33,7 +33,7 @@
   <color name="button_accent_text_disabled">#4CFFFFFF</color>
 
   <!-- LanesView -->
-  <color name="nav_lane_arrow_active">@color/black_primary</color>
+  <color name="nav_lane_arrow_active">@color/white_primary</color>
 
   <color name="elevation_profile_dot_enabled">#FF9600</color>
   <color name="elevation_profile">@color/base_accent</color>
diff --git a/android/app/src/main/res/values-night/themes.xml b/android/app/src/main/res/values-night/themes.xml
index 3aedf386c..cb9b51569 100644
--- a/android/app/src/main/res/values-night/themes.xml
+++ b/android/app/src/main/res/values-night/themes.xml
@@ -48,7 +48,7 @@
 
     <item name="navNextTurnFrame">@drawable/bg_nav_next_turn</item>
     <item name="navNextNextTurnFrame">@drawable/bg_nav_next_next_turn</item>
-    <item name="navLanesBackgroundColor">@color/base_accent</item>
+    <item name="navLanesBackgroundColor">@color/bg_primary</item>
     <item name="navLaneArrowActiveColor">@color/nav_lane_arrow_active</item>
     <item name="navLaneArrowInactiveColor">@color/nav_lane_arrow_inactive</item>
 
diff --git a/android/app/src/main/res/values/themes.xml b/android/app/src/main/res/values/themes.xml
index 824463200..18d7eb3fa 100644
--- a/android/app/src/main/res/values/themes.xml
+++ b/android/app/src/main/res/values/themes.xml
@@ -47,7 +47,7 @@
 
     <item name="navNextTurnFrame">@drawable/bg_nav_next_turn</item>
     <item name="navNextNextTurnFrame">@drawable/bg_nav_next_next_turn</item>
-    <item name="navLanesBackgroundColor">@color/base_accent</item>
+    <item name="navLanesBackgroundColor">@color/bg_primary</item>
     <item name="navLaneArrowActiveColor">@color/nav_lane_arrow_active</item>
     <item name="navLaneArrowInactiveColor">@color/nav_lane_arrow_inactive</item>