From c343442829183ce0bf227103f4450af45cecd4d6 Mon Sep 17 00:00:00 2001
From: Conny Duck <git@connyduck.at>
Date: Thu, 9 Jan 2025 20:48:10 +0100
Subject: [PATCH 1/2] fix dialog fragment background

---
 .../com/keylesspalace/tusky/AccountsInListFragment.kt |  2 +-
 app/src/main/res/drawable/dialog_background.xml       | 11 +++++++++++
 app/src/main/res/values/styles.xml                    |  5 +++++
 3 files changed, 17 insertions(+), 1 deletion(-)
 create mode 100644 app/src/main/res/drawable/dialog_background.xml

diff --git a/app/src/main/java/com/keylesspalace/tusky/AccountsInListFragment.kt b/app/src/main/java/com/keylesspalace/tusky/AccountsInListFragment.kt
index 4bb46939b8..d92b92ab08 100644
--- a/app/src/main/java/com/keylesspalace/tusky/AccountsInListFragment.kt
+++ b/app/src/main/java/com/keylesspalace/tusky/AccountsInListFragment.kt
@@ -75,7 +75,7 @@ class AccountsInListFragment : DialogFragment() {
         viewModel.load(listId)
     }
 
-    override fun getTheme() = R.style.TuskyDialogOverlay
+    override fun getTheme() = R.style.TuskyDialogFragment
 
     override fun onStart() {
         super.onStart()
diff --git a/app/src/main/res/drawable/dialog_background.xml b/app/src/main/res/drawable/dialog_background.xml
new file mode 100644
index 0000000000..bde2b56d3b
--- /dev/null
+++ b/app/src/main/res/drawable/dialog_background.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<inset xmlns:android="http://schemas.android.com/apk/res/android"
+    android:insetLeft="16dp"
+    android:insetTop="16dp"
+    android:insetRight="16dp"
+    android:insetBottom="16dp">
+    <shape android:shape="rectangle">
+        <corners android:radius="?attr/dialogCornerRadius" />
+        <solid android:color="@color/colorBackground" />
+    </shape>
+</inset>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index e44f21683c..648ff02660 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -144,6 +144,11 @@
         <item name="android:colorControlNormal">@color/white</item>
     </style>
 
+    <style name="TuskyDialogFragment" parent="@style/ThemeOverlay.Material3.Dialog">
+        <item name="android:windowBackground">@drawable/dialog_background</item>
+        <item name="android:backgroundDimAmount">0.5</item>
+    </style>
+
     <style name="TuskyDialogOverlay" parent="@style/ThemeOverlay.Material3.MaterialAlertDialog">
         <item name="alertDialogStyle">@style/TuskyDialog</item>
         <item name="android:backgroundDimAmount">0.5</item>

From fe38acb93e73870d93b96fa65856e1aa0f3faeec Mon Sep 17 00:00:00 2001
From: Conny Duck <git@connyduck.at>
Date: Fri, 10 Jan 2025 17:22:50 +0100
Subject: [PATCH 2/2] fix background of preference dialogs

---
 app/src/main/res/values/styles.xml | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 648ff02660..caba322696 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -94,9 +94,9 @@
         <item name="snackbarButtonStyle">@style/TuskyButton.TextButton</item>
 
         <!-- for dialogs created with MaterialALertDialogBuilder -->
-        <item name="materialAlertDialogTheme">@style/TuskyDialogOverlay</item>
+        <item name="materialAlertDialogTheme">@style/TuskyMaterialDialogOverlay</item>
         <!-- for dialogs opened from preferences -->
-        <item name="alertDialogTheme">@style/TuskyDialogOverlay</item>
+        <item name="alertDialogTheme">@style/TuskyAlertDialog</item>
         <item name="dialogCornerRadius">16dp</item>
 
         <item name="materialTimePickerTheme">@style/TuskyTimePickerOverlay</item>
@@ -149,12 +149,17 @@
         <item name="android:backgroundDimAmount">0.5</item>
     </style>
 
-    <style name="TuskyDialogOverlay" parent="@style/ThemeOverlay.Material3.MaterialAlertDialog">
-        <item name="alertDialogStyle">@style/TuskyDialog</item>
+    <style name="TuskyAlertDialog" parent="@style/ThemeOverlay.Material3.Dialog.Alert">
+        <item name="android:windowBackground">@drawable/dialog_background</item>
+        <item name="android:backgroundDimAmount">0.5</item>
+    </style>
+
+    <style name="TuskyMaterialDialogOverlay" parent="@style/ThemeOverlay.Material3.MaterialAlertDialog">
+        <item name="alertDialogStyle">@style/TuskyMaterialDialog</item>
         <item name="android:backgroundDimAmount">0.5</item>
     </style>
 
-    <style name="TuskyDialog" parent="@style/MaterialAlertDialog.Material3">
+    <style name="TuskyMaterialDialog" parent="@style/MaterialAlertDialog.Material3">
         <item name="shapeAppearance">@style/ShapeAppearance.Material3.Corner.Large</item>
         <item name="backgroundTint">@color/colorBackground</item>
     </style>