From 793ac948910d4c218f876a98f05671a6509b8248 Mon Sep 17 00:00:00 2001
From: Moreno <154519856+morenotropical@users.noreply.github.com>
Date: Wed, 5 Jun 2024 05:51:33 -0300
Subject: [PATCH] Improve alert dialog style

---
 AnkiDroid/src/main/res/values/styles.xml      | 10 ++++++++++
 AnkiDroid/src/main/res/values/theme_black.xml |  4 ----
 AnkiDroid/src/main/res/values/theme_dark.xml  |  4 +---
 AnkiDroid/src/main/res/values/theme_light.xml |  3 +--
 4 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/AnkiDroid/src/main/res/values/styles.xml b/AnkiDroid/src/main/res/values/styles.xml
index 48d925bbac..1f553c52ef 100644
--- a/AnkiDroid/src/main/res/values/styles.xml
+++ b/AnkiDroid/src/main/res/values/styles.xml
@@ -218,6 +218,16 @@
         <item name="checkboxStyle">@style/AlertDialogCheckBox.Style</item>
     </style>
 
+    <style name="ThemeOverlay.AnkiDroid.AlertDialog" parent="ThemeOverlay.Material3.MaterialAlertDialog">
+        <item name="dialogCornerRadius">@dimen/m3_alert_dialog_corner_size</item>
+        <item name="materialAlertDialogBodyTextStyle">@style/AnkiDroid.AlertDialog.Body.Text</item>
+    </style>
+
+    <style name="AnkiDroid.AlertDialog.Body.Text" parent="MaterialAlertDialog.Material3.Body.Text">
+        <!-- The default style uses onSurfaceVariant, which isn't defined yet -->
+        <item name="android:textColor">?android:attr/textColor</item>
+    </style>
+
     <style name="CustomButtonBarButtonStyle" parent="Widget.AppCompat.Button.ButtonBar.AlertDialog">
         <item name="android:textColor">?attr/progressDialogButtonTextColor</item>
     </style>
diff --git a/AnkiDroid/src/main/res/values/theme_black.xml b/AnkiDroid/src/main/res/values/theme_black.xml
index 02bf482681..67773db994 100644
--- a/AnkiDroid/src/main/res/values/theme_black.xml
+++ b/AnkiDroid/src/main/res/values/theme_black.xml
@@ -103,10 +103,6 @@
         <!-- ProgressDialog-->
         <item name="dialogBackground">@color/theme_black_primary_light</item>
         <item name="progressDialogButtonTextColor">@color/material_light_blue_400</item>
-
-        <!-- AlertDialogTheme-->
-        <item name="alertDialogTheme">@style/AlertDialogStyle</item>
-
     </style>
 
     <style name="SnackbarTextStyleBlack" parent="@style/Widget.MaterialComponents.Snackbar.TextView">
diff --git a/AnkiDroid/src/main/res/values/theme_dark.xml b/AnkiDroid/src/main/res/values/theme_dark.xml
index 94fb689d27..353b25c9e4 100644
--- a/AnkiDroid/src/main/res/values/theme_dark.xml
+++ b/AnkiDroid/src/main/res/values/theme_dark.xml
@@ -108,8 +108,6 @@
         <item name="navDrawerImage">@drawable/nav_drawer_logo_dark_theme</item>
         <!-- Dialog styles -->
         <item name="android:listPreferredItemHeight">56dip</item>
-        <item name="dialogCornerRadius">@dimen/dialog_corner_radius</item>
-        <item name="android:dialogCornerRadius" tools:targetApi="p">@dimen/dialog_corner_radius</item>
         <item name="textAllCaps">false</item>
         <!--Custom Tabs colors-->
         <item name="customTabNavBarColor">@color/material_grey_800</item>
@@ -149,7 +147,7 @@
         <item name="checkMediaListForeground">@color/white</item>
 
         <!-- AlertDialogTheme-->
-        <item name="alertDialogTheme">@style/AlertDialogStyle</item>
+        <item name="alertDialogTheme">@style/ThemeOverlay.AnkiDroid.AlertDialog</item>
         <item name="tabStyle">@style/Widget.MaterialComponents.TabLayout</item>
     </style>
 
diff --git a/AnkiDroid/src/main/res/values/theme_light.xml b/AnkiDroid/src/main/res/values/theme_light.xml
index 34e3c5b046..a6db73e9a3 100644
--- a/AnkiDroid/src/main/res/values/theme_light.xml
+++ b/AnkiDroid/src/main/res/values/theme_light.xml
@@ -101,8 +101,6 @@
         <item name="navDrawerImage">@drawable/nav_drawer_logo</item>
         <!-- Dialog styles -->
         <item name="android:listPreferredItemHeight">56dip</item>
-        <item name="dialogCornerRadius">@dimen/dialog_corner_radius</item>
-        <item name="android:dialogCornerRadius" tools:targetApi="p">@dimen/dialog_corner_radius</item>
         <item name="textAllCaps">false</item>
         <!--Custom Tabs colors-->
         <item name="customTabNavBarColor">@color/material_light_blue_500</item>
@@ -131,6 +129,7 @@
         <item name="switchPreferenceCompatStyle">@style/Preference.SwitchPreferenceCompat.Material3</item>
         <item name="sliderStyle">@style/SliderStyle</item>
         <item name="preferenceTheme">@style/PreferenceThemeOverlay.AnkiDroid</item>
+        <item name="alertDialogTheme">@style/ThemeOverlay.AnkiDroid.AlertDialog</item>
 
         <!-- ProgressDialog-->
         <item name="dialogBackground">@color/white</item>