From e5db7fc886224caa7462812fba679bb774e3efc9 Mon Sep 17 00:00:00 2001
From: andrew <andrewgallasch@gmail.com>
Date: Mon, 5 Jun 2023 19:15:42 +0930
Subject: [PATCH] Fix dialog theme so it sets window color and not background
 of every child view

---
 .../main/res/drawable/default_dialog_background.xml    | 10 ----------
 .../res/drawable/default_dialog_background_inset.xml   |  6 ------
 app/src/main/res/values/styles.xml                     |  3 +--
 app/src/main/res/values/themes.xml                     |  6 +-----
 4 files changed, 2 insertions(+), 23 deletions(-)
 delete mode 100644 app/src/main/res/drawable/default_dialog_background.xml
 delete mode 100644 app/src/main/res/drawable/default_dialog_background_inset.xml

diff --git a/app/src/main/res/drawable/default_dialog_background.xml b/app/src/main/res/drawable/default_dialog_background.xml
deleted file mode 100644
index 00953c88a4..0000000000
--- a/app/src/main/res/drawable/default_dialog_background.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <solid android:color="?attr/dialog_background_color" />
-
-    <corners android:radius="?dialogCornerRadius" />
-
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/default_dialog_background_inset.xml b/app/src/main/res/drawable/default_dialog_background_inset.xml
deleted file mode 100644
index 0ff315ebd3..0000000000
--- a/app/src/main/res/drawable/default_dialog_background_inset.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<inset
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:drawable="@drawable/default_dialog_background"
-    android:inset="@dimen/medium_spacing">
-</inset>
\ No newline at end of file
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index ffef598093..f57a0d973b 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -23,14 +23,13 @@
     </style>
 
     <style name="ThemeOverlay.Session.AlertDialog" parent="ThemeOverlay.AppCompat.Dialog.Alert">
-        <item name="android:background">@drawable/default_dialog_background</item>
+        <item name="android:colorBackground">?attr/dialog_background_color</item>
         <item name="dialog_background_color">?colorPrimary</item>
         <item name="android:colorBackgroundFloating">?colorPrimary</item>
         <item name="backgroundTint">?colorPrimary</item>
         <item name="android:backgroundDimEnabled">true</item>
         <item name="android:backgroundDimAmount">0.6</item>
         <item name="android:windowContentOverlay">@null</item>
-        <item name="android:windowBackground">@null</item>
         <item name="textColorAlertDialogListItem">?android:textColorPrimary</item>
     </style>
 
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index 59525f7844..37c2e6e150 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -246,12 +246,8 @@
         <item name="windowActionModeOverlay">true</item>
     </style>
 
-    <style name="Theme.TextSecure.Dialog.Rationale" parent="Theme.AppCompat.DayNight.Dialog.Alert">
-        <item name="android:windowBackground">@drawable/default_dialog_background</item>
-    </style>
-
     <style name="Theme.TextSecure.Dialog.MediaSendProgress" parent="@android:style/Theme.Dialog">
-        <item name="android:background">@drawable/default_dialog_background</item>
+        <item name="android:colorBackground">?attr/dialog_background_color</item>
         <item name="android:windowNoTitle">true</item>
     </style>