From bf32409d4ed20396148e35bd2aed8b2e52f3ff1a Mon Sep 17 00:00:00 2001
From: Alex Hart <alex@signal.org>
Date: Fri, 3 Apr 2020 11:36:02 -0300
Subject: [PATCH] Split drawable into light and dark.

---
 app/src/main/res/drawable/dialog_corners_dark.xml        | 9 +++++++++
 app/src/main/res/drawable/dialog_corners_light.xml       | 9 +++++++++
 .../res/drawable/permission_rationale_dialog_corners.xml | 5 -----
 app/src/main/res/values/themes.xml                       | 6 +++---
 4 files changed, 21 insertions(+), 8 deletions(-)
 create mode 100644 app/src/main/res/drawable/dialog_corners_dark.xml
 create mode 100644 app/src/main/res/drawable/dialog_corners_light.xml
 delete mode 100644 app/src/main/res/drawable/permission_rationale_dialog_corners.xml

diff --git a/app/src/main/res/drawable/dialog_corners_dark.xml b/app/src/main/res/drawable/dialog_corners_dark.xml
new file mode 100644
index 0000000000..70cffb9b48
--- /dev/null
+++ b/app/src/main/res/drawable/dialog_corners_dark.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:shape="rectangle">
+    <solid
+        android:color="@color/background_material_dark"
+        tools:ignore="PrivateResource" />
+    <corners android:radius="20dp" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/dialog_corners_light.xml b/app/src/main/res/drawable/dialog_corners_light.xml
new file mode 100644
index 0000000000..08f450dca8
--- /dev/null
+++ b/app/src/main/res/drawable/dialog_corners_light.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:shape="rectangle">
+    <solid
+        android:color="@color/background_material_light"
+        tools:ignore="PrivateResource" />
+    <corners android:radius="20dp" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/permission_rationale_dialog_corners.xml b/app/src/main/res/drawable/permission_rationale_dialog_corners.xml
deleted file mode 100644
index 749c9a74bc..0000000000
--- a/app/src/main/res/drawable/permission_rationale_dialog_corners.xml
+++ /dev/null
@@ -1,5 +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="20dp"/>
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index b4331eb68b..ffe2669e32 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -685,13 +685,13 @@
         <item name="shared_contact_details_titlebar">@color/grey_900</item>
         <item name="shared_contact_item_button_color">@color/core_grey_85</item>
     </style>
-    
+
     <style name="RationaleDialogLight" parent="Theme.AppCompat.Light.Dialog.Alert">
-        <item name="android:windowBackground">@drawable/permission_rationale_dialog_corners</item>
+        <item name="android:windowBackground">@drawable/dialog_corners_light</item>
     </style>
 
     <style name="RationaleDialogDark" parent="Theme.AppCompat.Dialog.Alert">
-        <item name="android:windowBackground">@drawable/permission_rationale_dialog_corners</item>
+        <item name="android:windowBackground">@drawable/dialog_corners_dark</item>
     </style>
 
     <style name="RationaleDialogLight.SignalAccent">