From 6cbad3079d8c43bcc6c30e1dcea2c1020950112d Mon Sep 17 00:00:00 2001
From: Jean-Baptiste <jeanbaptiste.charron@outlook.fr>
Date: Sat, 20 Dec 2025 14:54:21 +0100
Subject: [PATCH] [android] Use M3 background in dark mode

Signed-off-by: Jean-Baptiste <jeanbaptiste.charron@outlook.fr>
---
 .../app/organicmaps/settings/BaseXmlSettingsFragment.java   | 3 ---
 .../app/src/main/res/layout-w1020dp/activity_settings.xml   | 6 ++++--
 android/app/src/main/res/layout/activity_settings.xml       | 3 ++-
 android/app/src/main/res/layout/place_page_map_too_old.xml  | 2 +-
 android/app/src/main/res/values-night/themes.xml            | 4 ++--
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/android/app/src/main/java/app/organicmaps/settings/BaseXmlSettingsFragment.java b/android/app/src/main/java/app/organicmaps/settings/BaseXmlSettingsFragment.java
index 3961d2218..37da56f34 100644
--- a/android/app/src/main/java/app/organicmaps/settings/BaseXmlSettingsFragment.java
+++ b/android/app/src/main/java/app/organicmaps/settings/BaseXmlSettingsFragment.java
@@ -6,12 +6,10 @@ import android.view.View;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.annotation.XmlRes;
-import androidx.core.content.ContextCompat;
 import androidx.core.view.ViewCompat;
 import androidx.preference.Preference;
 import androidx.preference.PreferenceFragmentCompat;
 import androidx.recyclerview.widget.RecyclerView;
-import app.organicmaps.R;
 import app.organicmaps.util.Utils;
 import app.organicmaps.util.WindowInsetUtils.ScrollableContentInsetsListener;
 
@@ -44,7 +42,6 @@ abstract class BaseXmlSettingsFragment extends PreferenceFragmentCompat
   public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState)
   {
     super.onViewCreated(view, savedInstanceState);
-    view.setBackgroundColor(ContextCompat.getColor(requireContext(), R.color.bg_cards));
     RecyclerView recyclerView = getListView();
     ViewCompat.setOnApplyWindowInsetsListener(recyclerView, new ScrollableContentInsetsListener(recyclerView));
   }
diff --git a/android/app/src/main/res/layout-w1020dp/activity_settings.xml b/android/app/src/main/res/layout-w1020dp/activity_settings.xml
index 478cd6543..3919e63b3 100644
--- a/android/app/src/main/res/layout-w1020dp/activity_settings.xml
+++ b/android/app/src/main/res/layout-w1020dp/activity_settings.xml
@@ -3,7 +3,8 @@
   xmlns:android="http://schemas.android.com/apk/res/android"
   android:layout_width="match_parent"
   android:layout_height="match_parent"
-  android:orientation="vertical">
+  android:orientation="vertical"
+  android:background="?cardBackground">
 
   <include
     layout="@layout/toolbar_extended"/>
@@ -17,7 +18,8 @@
       android:id="@+id/fragment_container"
       style="@style/MwmWidget.FrameLayout.Elevation"
       android:layout_width="match_parent"
-      android:layout_height="match_parent"/>
+      android:layout_height="match_parent"
+      android:background="?cardBackground"/>
   </com.google.android.material.card.MaterialCardView>
 
 </FrameLayout>
diff --git a/android/app/src/main/res/layout/activity_settings.xml b/android/app/src/main/res/layout/activity_settings.xml
index 4df7f04a2..bd84fd307 100644
--- a/android/app/src/main/res/layout/activity_settings.xml
+++ b/android/app/src/main/res/layout/activity_settings.xml
@@ -3,7 +3,8 @@
   xmlns:android="http://schemas.android.com/apk/res/android"
   android:layout_width="match_parent"
   android:layout_height="match_parent"
-  android:orientation="vertical">
+  android:orientation="vertical"
+  android:background="?cardBackground">
 
   <include
     layout="@layout/toolbar_default"/>
diff --git a/android/app/src/main/res/layout/place_page_map_too_old.xml b/android/app/src/main/res/layout/place_page_map_too_old.xml
index fb41ed5cc..61b4e3d20 100644
--- a/android/app/src/main/res/layout/place_page_map_too_old.xml
+++ b/android/app/src/main/res/layout/place_page_map_too_old.xml
@@ -9,7 +9,7 @@ android:layout_marginHorizontal="@dimen/margin_base"
 android:layout_marginTop="@dimen/margin_half"
 app:strokeWidth="1dp"
 app:strokeColor="@color/base_accent"
-app:cardBackgroundColor="@color/bg_cards">
+app:cardBackgroundColor="?cardBackground">
 
 <LinearLayout
   android:layout_width="match_parent"
diff --git a/android/app/src/main/res/values-night/themes.xml b/android/app/src/main/res/values-night/themes.xml
index fa0b8edad..bb113d8b3 100644
--- a/android/app/src/main/res/values-night/themes.xml
+++ b/android/app/src/main/res/values-night/themes.xml
@@ -23,7 +23,7 @@
 
     <item name="alertDialogTheme">@style/MwmTheme.AlertDialog</item>
     <item name="windowBackgroundForced">@color/bg_window</item>
-    <item name="cardBackground">@color/bg_cards</item>
+    <item name="cardBackground">?android:attr/colorBackground</item>
     <item name="titleDialogTheme">@color/white_primary</item>
     <item name="textDialogTheme">@color/white_secondary</item>
     <item name="fullscreenDialogTheme">@style/MwmTheme.DialogFragment.Fullscreen</item>
@@ -42,7 +42,7 @@
     <item name="secondary">@color/text_light_hint</item>
     <item name="dividerHorizontal">@color/divider</item>
 
-    <item name="ppBackground">@color/bg_cards</item>
+    <item name="ppBackground">?cardBackground</item>
     <item name="ppButtonsBackground">@color/bg_window</item>
     <item name="ppFloatingMarkerIconColor">@color/white_54</item>