From b787262124c2a6c3495a4521ffbb9e49b2e83f47 Mon Sep 17 00:00:00 2001
From: Jean-Baptiste <jeanbaptiste.charron@outlook.fr>
Date: Thu, 1 Jan 2026 08:49:29 +0100
Subject: [PATCH] [android] Use M3 dark background in the app

Signed-off-by: Jean-Baptiste <jeanbaptiste.charron@outlook.fr>
---
 .../res/layout/downloader_item_header.xml     |  1 -
 .../main/res/layout/edit_bookmark_common.xml  |  2 +-
 .../fragment_bookmark_category_settings.xml   |  3 +-
 .../main/res/layout/fragment_downloader.xml   |  2 +-
 .../res/layout/fragment_edit_bookmark.xml     |  2 +-
 .../main/res/layout/fragment_editor_host.xml  |  1 +
 .../src/main/res/layout/fragment_search.xml   |  4 +-
 .../layout/fragment_timetable_advanced.xml    | 50 +++++++++----------
 .../res/layout/item_category_description.xml  |  2 +-
 .../main/res/layout/item_category_title.xml   |  2 +-
 .../layout/item_feature_category_footer.xml   |  2 +-
 android/app/src/main/res/layout/menu.xml      |  2 +-
 .../main/res/layout/menu_route_plan_line.xml  |  2 +-
 .../src/main/res/layout/position_chooser.xml  |  2 +-
 .../src/main/res/layout/recycler_default.xml  |  1 -
 .../main/res/layout/routing_action_panel.xml  |  2 +-
 .../app/src/main/res/values-night/themes.xml  |  2 +-
 android/app/src/main/res/values/themes.xml    |  8 +--
 18 files changed, 42 insertions(+), 48 deletions(-)

diff --git a/android/app/src/main/res/layout/downloader_item_header.xml b/android/app/src/main/res/layout/downloader_item_header.xml
index 00c052ee4..e4c47ea77 100644
--- a/android/app/src/main/res/layout/downloader_item_header.xml
+++ b/android/app/src/main/res/layout/downloader_item_header.xml
@@ -13,7 +13,6 @@
     android:paddingTop="@dimen/margin_half"
     android:paddingBottom="@dimen/margin_half"
     android:layout_marginEnd="@dimen/margin_base"
-    android:background="?cardBackground"
     android:textAppearance="@style/MwmTextAppearance.Caption"
     tools:text="Downloaded"
     tools:background="#80FF0000"/>
diff --git a/android/app/src/main/res/layout/edit_bookmark_common.xml b/android/app/src/main/res/layout/edit_bookmark_common.xml
index 2773898a9..343039239 100644
--- a/android/app/src/main/res/layout/edit_bookmark_common.xml
+++ b/android/app/src/main/res/layout/edit_bookmark_common.xml
@@ -6,7 +6,7 @@
   android:id="@+id/rl__bookmark_details"
   android:layout_width="match_parent"
   android:layout_height="match_parent"
-  android:background="?cardBackground"
+  android:background="?appBackground"
   android:padding="@dimen/margin_half">
   <LinearLayout
     android:id="@+id/ll__bookmark_name"
diff --git a/android/app/src/main/res/layout/fragment_bookmark_category_settings.xml b/android/app/src/main/res/layout/fragment_bookmark_category_settings.xml
index 330463c43..043597d86 100644
--- a/android/app/src/main/res/layout/fragment_bookmark_category_settings.xml
+++ b/android/app/src/main/res/layout/fragment_bookmark_category_settings.xml
@@ -3,7 +3,7 @@
   xmlns:android="http://schemas.android.com/apk/res/android"
   xmlns:app="http://schemas.android.com/apk/res-auto"
   android:orientation="vertical"
-  android:background="?cardBackground"
+  android:background="?appBackground"
   android:layout_width="match_parent"
   android:layout_height="match_parent">
   <com.google.android.material.appbar.MaterialToolbar
@@ -69,7 +69,6 @@
       android:inputType="textMultiLine"/>
     </com.google.android.material.textfield.TextInputLayout>
     <View
-      android:background="?cardBackground"
       android:layout_width="match_parent"
       android:layout_height="match_parent"/>
   </LinearLayout>
diff --git a/android/app/src/main/res/layout/fragment_downloader.xml b/android/app/src/main/res/layout/fragment_downloader.xml
index f34220a9e..365782d97 100644
--- a/android/app/src/main/res/layout/fragment_downloader.xml
+++ b/android/app/src/main/res/layout/fragment_downloader.xml
@@ -4,7 +4,7 @@
   xmlns:app="http://schemas.android.com/apk/res-auto"
   xmlns:tools="http://schemas.android.com/tools"
   style="@style/MwmWidget.Floating"
-  android:background="?cardBackground"
+  android:background="?appBackground"
   android:layout_width="match_parent"
   android:layout_height="match_parent">
   <include layout="@layout/toolbar_with_search"/>
diff --git a/android/app/src/main/res/layout/fragment_edit_bookmark.xml b/android/app/src/main/res/layout/fragment_edit_bookmark.xml
index dad4f9c17..cc0789539 100644
--- a/android/app/src/main/res/layout/fragment_edit_bookmark.xml
+++ b/android/app/src/main/res/layout/fragment_edit_bookmark.xml
@@ -4,7 +4,7 @@
   xmlns:app="http://schemas.android.com/apk/res-auto"
   android:layout_width="match_parent"
   android:layout_height="match_parent"
-  android:background="?cardBackground">
+  android:background="?appBackground">
   <com.google.android.material.appbar.MaterialToolbar
     android:id="@+id/toolbar"
     style="@style/MwmWidget.ToolbarStyle"
diff --git a/android/app/src/main/res/layout/fragment_editor_host.xml b/android/app/src/main/res/layout/fragment_editor_host.xml
index 1d545ba15..9ea3723ec 100644
--- a/android/app/src/main/res/layout/fragment_editor_host.xml
+++ b/android/app/src/main/res/layout/fragment_editor_host.xml
@@ -5,6 +5,7 @@
   android:layout_width="match_parent"
   android:layout_height="match_parent"
   xmlns:app="http://schemas.android.com/apk/res-auto"
+  android:background="?windowBackgroundForced"
   android:orientation="vertical">
 
   <com.google.android.material.appbar.MaterialToolbar
diff --git a/android/app/src/main/res/layout/fragment_search.xml b/android/app/src/main/res/layout/fragment_search.xml
index 9b9b0d8aa..e8977e673 100644
--- a/android/app/src/main/res/layout/fragment_search.xml
+++ b/android/app/src/main/res/layout/fragment_search.xml
@@ -61,12 +61,12 @@
         android:layout_height="match_parent"
         android:clickable="true"
         android:focusable="true"
-        android:background="?cardBackground">
+        android:background="?appBackground">
 
         <androidx.recyclerview.widget.RecyclerView
           android:id="@+id/recycler"
           android:clipToPadding="false"
-          android:background="?cardBackground"
+          android:background="?appBackground"
           android:layout_width="match_parent"
           android:layout_height="match_parent"
           />
diff --git a/android/app/src/main/res/layout/fragment_timetable_advanced.xml b/android/app/src/main/res/layout/fragment_timetable_advanced.xml
index b96765d76..dae72acbd 100644
--- a/android/app/src/main/res/layout/fragment_timetable_advanced.xml
+++ b/android/app/src/main/res/layout/fragment_timetable_advanced.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ScrollView
   xmlns:android="http://schemas.android.com/apk/res/android"
-  xmlns:card_view="http://schemas.android.com/apk/res-auto"
+  xmlns:app="http://schemas.android.com/apk/res-auto"
   xmlns:tools="http://schemas.android.com/tools"
   android:layout_width="match_parent"
   android:layout_height="match_parent"
@@ -13,36 +13,12 @@
     android:orientation="vertical"
     android:padding="@dimen/margin_half">
 
-    <com.google.android.material.card.MaterialCardView
-      android:layout_width="match_parent"
-      android:layout_height="wrap_content"
-      style="@style/MwmWidget.M3.Editor.CardView"
-      card_view:cardBackgroundColor="?cardBackground"
-      card_view:cardCornerRadius="2dp"
-      card_view:cardElevation="4dp">
-
-      <com.google.android.material.textfield.TextInputEditText
-        android:id="@+id/et__timetable"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_alignParentBottom="true"
-        android:background="@null"
-        android:gravity="top|start"
-        android:inputType="textMultiLine"
-        android:padding="@dimen/margin_base"
-        android:textAppearance="@style/MwmTextAppearance.Body3"
-        tools:hint="hint"
-        tools:text="trololo \ntrololo \ntrololo"/>
-
-    </com.google.android.material.card.MaterialCardView>
-
     <com.google.android.material.card.MaterialCardView
       android:layout_width="match_parent"
       android:layout_height="wrap_content"
       android:layout_marginTop="@dimen/margin_half"
-      card_view:cardBackgroundColor="?cardBackground"
-      card_view:cardCornerRadius="2dp"
-      card_view:cardElevation="4dp">
+      style="@style/MwmWidget.M3.Editor.CardView"
+      app:cardBackgroundColor="?cardBackground">
 
       <LinearLayout
         android:id="@+id/examples"
@@ -50,6 +26,26 @@
         android:layout_height="match_parent"
         android:orientation="vertical"
         android:animateLayoutChanges="true">
+          <com.google.android.material.textfield.TextInputLayout
+              android:layout_width="match_parent"
+              android:layout_height="wrap_content"
+              android:layout_marginBottom="@dimen/margin_half"
+              app:boxStrokeWidth="0dp"
+              app:hintEnabled="false">
+
+          <com.google.android.material.textfield.TextInputEditText
+              android:id="@+id/et__timetable"
+              android:layout_width="match_parent"
+              android:layout_height="wrap_content"
+              android:layout_alignParentBottom="true"
+              android:background="@null"
+              android:gravity="top|start"
+              android:inputType="textMultiLine"
+              android:padding="@dimen/margin_base"
+              android:textAppearance="@style/MwmTextAppearance.Body3"
+              tools:hint="hint"
+              tools:text="trololo \ntrololo \ntrololo"/>
+          </com.google.android.material.textfield.TextInputLayout>
 
         <com.google.android.material.textview.MaterialTextView
           android:id="@+id/tv__examples_title"
diff --git a/android/app/src/main/res/layout/item_category_description.xml b/android/app/src/main/res/layout/item_category_description.xml
index 48282dc9e..f1b1eae4c 100644
--- a/android/app/src/main/res/layout/item_category_description.xml
+++ b/android/app/src/main/res/layout/item_category_description.xml
@@ -3,7 +3,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="?cardBackground"
+    android:background="?appBackground"
     android:padding="@dimen/margin_base">
 
   <LinearLayout
diff --git a/android/app/src/main/res/layout/item_category_title.xml b/android/app/src/main/res/layout/item_category_title.xml
index 148aaf3e9..efd983d99 100644
--- a/android/app/src/main/res/layout/item_category_title.xml
+++ b/android/app/src/main/res/layout/item_category_title.xml
@@ -5,7 +5,7 @@
   style="@style/MwmTextAppearance.Headline6"
   android:layout_width="match_parent"
   android:layout_height="wrap_content"
-  android:background="?windowBackgroundForced"
+  android:background="?appBackground"
   android:gravity="start|center_vertical"
   android:paddingStart="@dimen/margin_base"
   android:paddingTop="@dimen/margin_base_plus"
diff --git a/android/app/src/main/res/layout/item_feature_category_footer.xml b/android/app/src/main/res/layout/item_feature_category_footer.xml
index cb7c3de0d..11297f4a6 100644
--- a/android/app/src/main/res/layout/item_feature_category_footer.xml
+++ b/android/app/src/main/res/layout/item_feature_category_footer.xml
@@ -6,7 +6,7 @@
   xmlns:app="http://schemas.android.com/apk/res-auto"
   android:layout_gravity="center"
   android:orientation="vertical"
-  android:background="?cardBackground"
+  android:background="?appBackground"
   android:padding="@dimen/margin_base">
   <com.google.android.material.textview.MaterialTextView
     android:layout_width="match_parent"
diff --git a/android/app/src/main/res/layout/menu.xml b/android/app/src/main/res/layout/menu.xml
index fc915095b..995b50acd 100644
--- a/android/app/src/main/res/layout/menu.xml
+++ b/android/app/src/main/res/layout/menu.xml
@@ -4,7 +4,7 @@
   android:id="@+id/menu_frame"
   android:layout_width="match_parent"
   android:layout_height="wrap_content"
-  android:background="?cardBackground"
+  android:background="?appBackground"
   android:clickable="true"
   android:visibility="gone"
   tools:visibility="visible">
diff --git a/android/app/src/main/res/layout/menu_route_plan_line.xml b/android/app/src/main/res/layout/menu_route_plan_line.xml
index 7f5eb7ff3..78712f60b 100644
--- a/android/app/src/main/res/layout/menu_route_plan_line.xml
+++ b/android/app/src/main/res/layout/menu_route_plan_line.xml
@@ -2,7 +2,7 @@
 <LinearLayout
   xmlns:android="http://schemas.android.com/apk/res/android"
   android:orientation="horizontal"
-  android:background="?cardBackground"
+  android:background="?appBackground"
   android:layout_width="match_parent"
   android:layout_height="wrap_content">
 
diff --git a/android/app/src/main/res/layout/position_chooser.xml b/android/app/src/main/res/layout/position_chooser.xml
index 2375768de..44fe7d07e 100644
--- a/android/app/src/main/res/layout/position_chooser.xml
+++ b/android/app/src/main/res/layout/position_chooser.xml
@@ -29,7 +29,7 @@
   <com.google.android.material.textview.MaterialTextView
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="?cardBackground"
+    android:background="?appBackground"
     android:padding="@dimen/margin_base"
     android:text="@string/editor_focus_map_on_location"
     app:layout_constraintTop_toBottomOf="@+id/toolbar_point_chooser" />
diff --git a/android/app/src/main/res/layout/recycler_default.xml b/android/app/src/main/res/layout/recycler_default.xml
index a00ff5978..0549bda31 100644
--- a/android/app/src/main/res/layout/recycler_default.xml
+++ b/android/app/src/main/res/layout/recycler_default.xml
@@ -4,5 +4,4 @@
   android:id="@+id/recycler"
   android:layout_width="match_parent"
   android:layout_height="wrap_content"
-  android:background="?cardBackground"
   android:scrollbars="vertical"/>
diff --git a/android/app/src/main/res/layout/routing_action_panel.xml b/android/app/src/main/res/layout/routing_action_panel.xml
index 40ade18a9..ef6e9408e 100644
--- a/android/app/src/main/res/layout/routing_action_panel.xml
+++ b/android/app/src/main/res/layout/routing_action_panel.xml
@@ -6,7 +6,7 @@
   android:layout_width="match_parent"
   android:layout_height="wrap_content"
   android:minHeight="@dimen/height_block_base"
-  android:background="?cardBackground"
+  android:background="?appBackground"
   android:baselineAligned="false">
   <LinearLayout
     android:id="@+id/btn__search_point"
diff --git a/android/app/src/main/res/values-night/themes.xml b/android/app/src/main/res/values-night/themes.xml
index 4082b98aa..7d84b24a4 100644
--- a/android/app/src/main/res/values-night/themes.xml
+++ b/android/app/src/main/res/values-night/themes.xml
@@ -11,7 +11,7 @@
     <item name="android:textColorPrimary">@color/text_light</item>
     <item name="android:textColorPrimaryInverse">@color/text_dark</item>
     <item name="android:textColorSecondary">@color/text_light_subtitle</item>
-    <item name="android:windowBackground">?windowBackgroundForced</item>
+    <item name="android:windowBackground">?appBackground</item>
     <item name="android:colorPrimaryDark">@color/bg_primary_dark</item>
     <item name="android:windowSoftInputMode">stateUnspecified|adjustPan</item>
     <item name="android:fontFamily">@string/robotoRegular</item>
diff --git a/android/app/src/main/res/values/themes.xml b/android/app/src/main/res/values/themes.xml
index c46c15e74..0eece2642 100644
--- a/android/app/src/main/res/values/themes.xml
+++ b/android/app/src/main/res/values/themes.xml
@@ -12,7 +12,7 @@
     <item name="android:textColorPrimary">@color/text_dark</item>
     <item name="android:textColorPrimaryInverse">@color/text_light</item>
     <item name="android:textColorSecondary">@color/text_dark_subtitle</item>
-    <item name="android:windowBackground">?windowBackgroundForced</item>
+    <item name="android:windowBackground">?appBackground</item>
     <item name="android:colorPrimaryDark">@color/bg_primary_dark</item>
     <item name="android:windowSoftInputMode">stateUnspecified|adjustPan</item>
     <item name="android:fontFamily">@string/robotoRegular</item>
@@ -185,11 +185,11 @@
   </style>
 
   <style name="MwmTheme.CardBg">
-    <item name="android:windowBackground">@color/bg_cards</item>
+    <item name="android:windowBackground">?appBackground</item>
   </style>
 
   <style name="MwmTheme.WindowBg">
-    <item name="android:windowBackground">@color/bg_window</item>
+    <item name="android:windowBackground">?appBackground</item>
   </style>
 
   <style name="MwmTheme.AlertDialog" parent="Theme.Material3.DayNight.Dialog.Alert">
@@ -243,7 +243,7 @@
 
   <style name="MwmTheme.FullScreenDialog">
     <item name="android:windowIsFloating">false</item>
-    <item name="android:windowBackground">@android:color/white</item>
+    <item name="android:windowBackground">?appBackground</item>
   </style>
 
   <style name="MwmTheme.MaterialTimePicker" parent="ThemeOverlay.MaterialComponents.TimePicker">