From 95296314652a23bcf7b23a38a0ee59de8cd675cf 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>
---
 .../organicmaps/util/bottomsheet/MenuBottomSheetFragment.java | 2 +-
 android/app/src/main/res/layout-land/layout_nav.xml           | 2 +-
 android/app/src/main/res/layout/bottom_sheet_menu_item.xml    | 1 -
 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              | 1 +
 android/app/src/main/res/values/styles.xml                    | 4 ++--
 7 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/android/app/src/main/java/app/organicmaps/util/bottomsheet/MenuBottomSheetFragment.java b/android/app/src/main/java/app/organicmaps/util/bottomsheet/MenuBottomSheetFragment.java
index aadc44847..5e746eb44 100644
--- a/android/app/src/main/java/app/organicmaps/util/bottomsheet/MenuBottomSheetFragment.java
+++ b/android/app/src/main/java/app/organicmaps/util/bottomsheet/MenuBottomSheetFragment.java
@@ -53,7 +53,7 @@ public class MenuBottomSheetFragment extends BottomSheetDialogFragment
   @Override
   public Dialog onCreateDialog(@Nullable Bundle savedInstanceState)
   {
-    return new BottomSheetDialog(requireContext(), getTheme()) {
+    return new BottomSheetDialog(requireContext(), R.style.MwmTheme_BottomSheetDialog) {
       @Override
       public void onAttachedToWindow()
       {
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..aae4b0489 100644
--- a/android/app/src/main/res/layout-land/layout_nav.xml
+++ b/android/app/src/main/res/layout-land/layout_nav.xml
@@ -41,5 +41,5 @@
     android:layout_width="0dp"
     android:layout_height="0dp"
     android:layout_gravity="bottom|start"
-    android:background="?cardBackground"/>
+    android:background="?colorSurfaceContainerLow"/>
 </FrameLayout>
diff --git a/android/app/src/main/res/layout/bottom_sheet_menu_item.xml b/android/app/src/main/res/layout/bottom_sheet_menu_item.xml
index a0a6f33c1..b1b804cfe 100644
--- a/android/app/src/main/res/layout/bottom_sheet_menu_item.xml
+++ b/android/app/src/main/res/layout/bottom_sheet_menu_item.xml
@@ -8,7 +8,6 @@
   android:paddingStart="@dimen/margin_base"
   android:paddingEnd="@dimen/margin_base"
   android:gravity="center_vertical"
-  android:background="?clickableBackground"
   android:orientation="horizontal">
 
   <com.google.android.material.imageview.ShapeableImageView
diff --git a/android/app/src/main/res/layout/layout_nav.xml b/android/app/src/main/res/layout/layout_nav.xml
index d72414c54..f494d73fa 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="?colorSurfaceContainerLow"/>
 </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..8a69135d6 100644
--- a/android/app/src/main/res/values-night/colors.xml
+++ b/android/app/src/main/res/values-night/colors.xml
@@ -15,6 +15,7 @@
   <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>
 
diff --git a/android/app/src/main/res/values/styles.xml b/android/app/src/main/res/values/styles.xml
index a414bb5a3..34336ecfe 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">?colorSurfaceContainerLow</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">?colorSurfaceContainerLow</item>
     <item name="behavior_hideable">false</item>
   </style>