From 17aaccb9fc9eae780f99d8b84405a8184a8f13de Mon Sep 17 00:00:00 2001
From: Jean-Baptiste <jeanbaptiste.charron@outlook.fr>
Date: Sat, 3 Jan 2026 23:36:28 +0100
Subject: [PATCH] [android] Apply new dark background on bottomsheet and map
 buttons

Signed-off-by: Jean-Baptiste <jeanbaptiste.charron@outlook.fr>
---
 android/app/src/main/res/drawable/bg_nav_next_next_turn.xml | 2 +-
 android/app/src/main/res/layout-land/layout_nav.xml         | 3 +--
 android/app/src/main/res/layout/bottom_sheet.xml            | 6 ++++--
 android/app/src/main/res/layout/layout_nav.xml              | 2 +-
 android/app/src/main/res/layout/place_page.xml              | 1 +
 android/app/src/main/res/values-night/colors.xml            | 3 ++-
 android/app/src/main/res/values/styles.xml                  | 4 ++--
 data/styles/default/dark/symbols/compass.svg                | 2 +-
 8 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/android/app/src/main/res/drawable/bg_nav_next_next_turn.xml b/android/app/src/main/res/drawable/bg_nav_next_next_turn.xml
index c7fae1dbc..e21dafa0d 100644
--- a/android/app/src/main/res/drawable/bg_nav_next_next_turn.xml
+++ b/android/app/src/main/res/drawable/bg_nav_next_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/bg_cards"/>
+  <solid android:color="@color/bg_app"/>
   <corners android:radius="8dp"/>
 </shape>
\ No newline at end of file
diff --git a/android/app/src/main/res/layout-land/layout_nav.xml b/android/app/src/main/res/layout-land/layout_nav.xml
index 6ee0ac8fb..50dcc1feb 100644
--- a/android/app/src/main/res/layout-land/layout_nav.xml
+++ b/android/app/src/main/res/layout-land/layout_nav.xml
@@ -40,6 +40,5 @@
     android:id="@+id/nav_bottom_sheet_nav_bar"
     android:layout_width="0dp"
     android:layout_height="0dp"
-    android:layout_gravity="bottom|start"
-    android:background="?cardBackground"/>
+    android:layout_gravity="bottom|start" />
 </FrameLayout>
diff --git a/android/app/src/main/res/layout/bottom_sheet.xml b/android/app/src/main/res/layout/bottom_sheet.xml
index 8bce3e36a..86c503c89 100644
--- a/android/app/src/main/res/layout/bottom_sheet.xml
+++ b/android/app/src/main/res/layout/bottom_sheet.xml
@@ -3,7 +3,8 @@
   xmlns:tools="http://schemas.android.com/tools"
   android:layout_width="match_parent"
   android:layout_height="match_parent"
-  android:orientation="vertical">
+  android:orientation="vertical"
+  android:background="?appBackground">
 
   <include
     layout="@layout/bottom_sheet_handle" />
@@ -28,6 +29,7 @@
   <androidx.recyclerview.widget.RecyclerView
     android:id="@+id/bottomSheetMenuContainer"
     android:layout_width="match_parent"
-    android:layout_height="match_parent" />
+    android:layout_height="match_parent"
+    android:background="?appBackground"/>
 
 </LinearLayout>
\ No newline at end of file
diff --git a/android/app/src/main/res/layout/layout_nav.xml b/android/app/src/main/res/layout/layout_nav.xml
index d72414c54..0f59d19be 100644
--- a/android/app/src/main/res/layout/layout_nav.xml
+++ b/android/app/src/main/res/layout/layout_nav.xml
@@ -40,5 +40,5 @@
     android:layout_width="0dp"
     android:layout_height="0dp"
     android:layout_gravity="bottom|center"
-    android:background="?cardBackground"/>
+    android:background="?appBackground"/>
 </FrameLayout>
diff --git a/android/app/src/main/res/layout/place_page.xml b/android/app/src/main/res/layout/place_page.xml
index ee276973e..4d0454697 100644
--- a/android/app/src/main/res/layout/place_page.xml
+++ b/android/app/src/main/res/layout/place_page.xml
@@ -4,6 +4,7 @@
   android:layout_width="match_parent"
   android:layout_height="wrap_content"
   android:descendantFocusability="blocksDescendants"
+  android:background="?cardBackground"
   android:orientation="vertical">
   <include
     android:id="@+id/pp__preview"
diff --git a/android/app/src/main/res/values-night/colors.xml b/android/app/src/main/res/values-night/colors.xml
index c6d756e20..46d8814f9 100644
--- a/android/app/src/main/res/values-night/colors.xml
+++ b/android/app/src/main/res/values-night/colors.xml
@@ -15,8 +15,9 @@
   <color name="bg_cards">#FF3C4044</color>
   <color name="bg_panel">@color/bg_window</color>
   <color name="bg_primary_dark">#FF588157</color>
+  <color name="bg_app">#10140F</color>
 
-  <color name="bg_menu">#CC2D3237</color>
+  <color name="bg_menu">#CC10140F</color>
 
   <color name="bg_statusbar">#004120</color>
 
diff --git a/android/app/src/main/res/values/styles.xml b/android/app/src/main/res/values/styles.xml
index a414bb5a3..a2f9b4ce5 100644
--- a/android/app/src/main/res/values/styles.xml
+++ b/android/app/src/main/res/values/styles.xml
@@ -290,13 +290,13 @@
   </style>
 
   <style name="MwmWidget.BottomSheetDialog" parent="Widget.Material3.BottomSheet.Modal">
-    <item name="backgroundTint">?cardBackground</item>
+    <item name="backgroundTint">?appBackground</item>
     <item name="elevationOverlayEnabled">false</item>
     <item name="shapeAppearance">@style/ShapeAppearance.Material3.LargeComponent</item>
   </style>
 
   <style name="MwmWidget.BottomSheet" parent="MwmWidget.BottomSheetDialog">
-    <item name="android:background">?cardBackground</item>
+    <item name="android:background">?appBackground</item>
     <item name="behavior_hideable">false</item>
   </style>
 
diff --git a/data/styles/default/dark/symbols/compass.svg b/data/styles/default/dark/symbols/compass.svg
index 69e306fab..d3d557dce 100644
--- a/data/styles/default/dark/symbols/compass.svg
+++ b/data/styles/default/dark/symbols/compass.svg
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg width="40" height="40" version="1.1" viewBox="0 0 40 40" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
- <path d="m20 1.9866a18.013 18.013 0 0 0-18.013 18.013 18.013 18.013 0 0 0 18.013 18.013 18.013 18.013 0 0 0 18.013-18.013 18.013 18.013 0 0 0-18.013-18.013zm-5.0402 18.013h3.0653c-1.42e-4 1.0908 0.88413 1.975 1.9749 1.9749 1.0908 1.41e-4 1.975-0.88413 1.9749-1.9749h3.0653l-5.0402 13.727z" fill="#3c3f44" opacity=".8"/>
+ <path d="m20 1.9866a18.013 18.013 0 0 0-18.013 18.013 18.013 18.013 0 0 0 18.013 18.013 18.013 18.013 0 0 0 18.013-18.013 18.013 18.013 0 0 0-18.013-18.013zm-5.0402 18.013h3.0653c-1.42e-4 1.0908 0.88413 1.975 1.9749 1.9749 1.0908 1.41e-4 1.975-0.88413 1.9749-1.9749h3.0653l-5.0402 13.727z" fill="#10140FFF" opacity=".8"/>
  <path d="m20 6.2729-5.0402 13.727h3.0653c-1.42e-4 -1.0908 0.88413-1.975 1.9749-1.9749 1.0908-1.42e-4 1.975 0.88413 1.9749 1.9749h3.0653z" fill="#c2352b"/>
  <path d="m14.96 20 5.0402 13.727 5.0402-13.727m-3.0653 0c1.41e-4 1.0908-0.88413 1.975-1.9749 1.9749-1.0908 1.41e-4 -1.975-0.88413-1.9749-1.9749" fill="#7f8085" opacity=".69"/>
 </svg>