From a6a9af3363b6e6615c2ef0e2fd2b6d150765ec84 Mon Sep 17 00:00:00 2001
From: Jean-Baptiste CHARRON <jeanbaptiste.charron@outlook.fr>
Date: Wed, 22 Feb 2023 17:02:35 +0100
Subject: [PATCH] Fix background dialog

Signed-off-by: Jean-Baptiste CHARRON <jeanbaptiste.charron@outlook.fr>
---
 android/res/values/themes-attrs.xml |  2 ++
 android/res/values/themes-base.xml  |  4 ++++
 android/res/values/themes.xml       | 10 ++++++----
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/android/res/values/themes-attrs.xml b/android/res/values/themes-attrs.xml
index ef5b0adfa1..3e82d4eb99 100644
--- a/android/res/values/themes-attrs.xml
+++ b/android/res/values/themes-attrs.xml
@@ -2,6 +2,8 @@
 <resources>
   <declare-styleable name="ThemeAttrs">
     <attr name="fullscreenDialogTheme" format="reference" />
+    <attr name="titleDialogTheme" format="reference" />
+    <attr name="textDialogTheme" format="reference" />
     <attr name="windowBackgroundForced" format="reference|color" />
     <attr name="cardBackground" format="reference" />
     <attr name="clickableBackground" format="reference" />
diff --git a/android/res/values/themes-base.xml b/android/res/values/themes-base.xml
index 327b85f4de..7c6d4866fa 100644
--- a/android/res/values/themes-base.xml
+++ b/android/res/values/themes-base.xml
@@ -23,6 +23,8 @@
     <item name="alertDialogTheme">@style/MwmTheme.AlertDialog</item>
     <item name="windowBackgroundForced">@color/bg_window</item>
     <item name="cardBackground">@color/bg_cards</item>
+    <item name="titleDialogTheme">@color/black_primary</item>
+    <item name="textDialogTheme">@color/black_secondary</item>
     <item name="fullscreenDialogTheme">@style/MwmTheme.DialogFragment.Fullscreen</item>
     <item name="colorPrimary">@color/bg_primary</item>
     <item name="colorControlNormal">?secondary</item>
@@ -155,6 +157,8 @@
     <item name="alertDialogTheme">@style/MwmTheme.Night.AlertDialog</item>
     <item name="windowBackgroundForced">@color/bg_window_night</item>
     <item name="cardBackground">@color/bg_cards_night</item>
+    <item name="titleDialogTheme">@color/white_primary</item>
+    <item name="textDialogTheme">@color/white_secondary</item>
     <item name="fullscreenDialogTheme">@style/MwmTheme.DialogFragment.Fullscreen.Night</item>
     <item name="colorPrimary">@color/bg_primary_night</item>
     <item name="colorControlNormal">?secondary</item>
diff --git a/android/res/values/themes.xml b/android/res/values/themes.xml
index 49a22348b5..41bbd2c425 100644
--- a/android/res/values/themes.xml
+++ b/android/res/values/themes.xml
@@ -53,7 +53,8 @@
 
   <style name="MwmTheme.AlertDialog" parent="Theme.AppCompat.Light.Dialog.Alert">
     <item name="colorAccent">@color/base_accent</item>
-    <item name="android:textColorPrimary">@color/black_secondary</item>
+    <item name="android:background">?cardBackground</item>
+    <item name="android:textColorPrimary">?textDialogTheme</item>
     <item name="android:textSize">@dimen/text_size_body_1</item>
     <item name="android:windowTitleStyle">@style/MwmTheme.DialogTitleStyle.Light</item>
   </style>
@@ -64,20 +65,21 @@
   </style>
 
   <style name="MwmTheme.DialogTitleStyle.Light" parent="MwmTheme.DialogTitleBase">
-    <item name="android:textColor">@color/black_primary</item>
+    <item name="android:textColor">?titleDialogTheme</item>
   </style>
 
   <style name="MwmTheme.Night.AlertDialog" parent="Theme.AppCompat.Dialog.Alert">
     <item name="colorAccent">@color/base_accent_night</item>
+    <item name="android:background">?cardBackground</item>
     <!-- Used for the message in the dialog -->
-    <item name="android:textColorPrimary">@color/white_secondary</item>
+    <item name="android:textColorPrimary">?textDialogTheme</item>
     <item name="android:textSize">@dimen/text_size_body_1</item>
     <!-- Used for the title in the dialog -->
     <item name="android:windowTitleStyle">@style/MwmTheme.DialogTitleStyle.Night</item>
   </style>
 
   <style name="MwmTheme.DialogTitleStyle.Night" parent="MwmTheme.DialogTitleBase">
-    <item name="android:textColor">@color/white_primary</item>
+    <item name="android:textColor">?titleDialogTheme</item>
   </style>
 
   <style name="MwmTheme.DialogFragment.TitleStyle" parent="Base.DialogWindowTitle.AppCompat">