From 36a1f2a2ec792ecfc7ac9281e34423544111ddf0 Mon Sep 17 00:00:00 2001
From: PixelyIon <pixelyion@protonmail.com>
Date: Thu, 11 Nov 2021 16:32:21 +0530
Subject: [PATCH] Make all `Dialog`s use `@color/backgroundColor` as the
 background color

We wanted the color of the modals used by the dialogs to be the same as our regular background color rather than a lighter grey. This has now been enforced with style attributes in the case of `AlertDialog` and `setBackground` in the case of `BottomSheetDialog`.
---
 app/src/main/java/emu/skyline/AppDialog.kt                 | 1 +
 app/src/main/java/emu/skyline/input/dialog/ButtonDialog.kt | 1 +
 app/src/main/java/emu/skyline/input/dialog/RumbleDialog.kt | 1 +
 app/src/main/java/emu/skyline/input/dialog/StickDialog.kt  | 1 +
 app/src/main/java/emu/skyline/preference/LicenseDialog.kt  | 2 ++
 app/src/main/res/values-night/colors.xml                   | 1 -
 app/src/main/res/values/colors.xml                         | 1 -
 app/src/main/res/values/styles.xml                         | 4 ----
 app/src/main/res/values/themes.xml                         | 7 +++----
 9 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/app/src/main/java/emu/skyline/AppDialog.kt b/app/src/main/java/emu/skyline/AppDialog.kt
index 869e7e9b..46cda3dd 100644
--- a/app/src/main/java/emu/skyline/AppDialog.kt
+++ b/app/src/main/java/emu/skyline/AppDialog.kt
@@ -70,6 +70,7 @@ class AppDialog : BottomSheetDialogFragment() {
 
     override fun onViewCreated(view : View, savedInstanceState : Bundle?) {
         super.onViewCreated(view, savedInstanceState)
+        view.setBackgroundColor(requireContext().getColor(R.color.backgroundColor))
 
         val missingIcon = ContextCompat.getDrawable(requireActivity(), R.drawable.default_icon)!!.toBitmap(256, 256)
 
diff --git a/app/src/main/java/emu/skyline/input/dialog/ButtonDialog.kt b/app/src/main/java/emu/skyline/input/dialog/ButtonDialog.kt
index f763700a..346d3fc2 100644
--- a/app/src/main/java/emu/skyline/input/dialog/ButtonDialog.kt
+++ b/app/src/main/java/emu/skyline/input/dialog/ButtonDialog.kt
@@ -48,6 +48,7 @@ class ButtonDialog @JvmOverloads constructor(private val item : ControllerButton
 
     override fun onViewCreated(view : View, savedInstanceState : Bundle?) {
         super.onViewCreated(view, savedInstanceState)
+        view.setBackgroundColor(requireContext().getColor(R.color.backgroundColor))
 
         if (item != null && context is ControllerActivity) {
             val context = requireContext() as ControllerActivity
diff --git a/app/src/main/java/emu/skyline/input/dialog/RumbleDialog.kt b/app/src/main/java/emu/skyline/input/dialog/RumbleDialog.kt
index 96ddef16..4f6b3ed2 100644
--- a/app/src/main/java/emu/skyline/input/dialog/RumbleDialog.kt
+++ b/app/src/main/java/emu/skyline/input/dialog/RumbleDialog.kt
@@ -47,6 +47,7 @@ class RumbleDialog @JvmOverloads constructor(val item : ControllerGeneralViewIte
 
     override fun onViewCreated(view : View, savedInstanceState : Bundle?) {
         super.onViewCreated(view, savedInstanceState)
+        view.setBackgroundColor(requireContext().getColor(R.color.backgroundColor))
 
         if (item != null && context is ControllerActivity) {
             val context = requireContext() as ControllerActivity
diff --git a/app/src/main/java/emu/skyline/input/dialog/StickDialog.kt b/app/src/main/java/emu/skyline/input/dialog/StickDialog.kt
index e4065dca..96aeb15c 100644
--- a/app/src/main/java/emu/skyline/input/dialog/StickDialog.kt
+++ b/app/src/main/java/emu/skyline/input/dialog/StickDialog.kt
@@ -225,6 +225,7 @@ class StickDialog @JvmOverloads constructor(val item : ControllerStickViewItem?
 
     override fun onViewCreated(view : View, savedInstanceState : Bundle?) {
         super.onViewCreated(view, savedInstanceState)
+        view.setBackgroundColor(requireContext().getColor(R.color.backgroundColor))
 
         if (item != null && context is ControllerActivity) {
             val context = requireContext() as ControllerActivity
diff --git a/app/src/main/java/emu/skyline/preference/LicenseDialog.kt b/app/src/main/java/emu/skyline/preference/LicenseDialog.kt
index 8b620f1d..4f69ace2 100644
--- a/app/src/main/java/emu/skyline/preference/LicenseDialog.kt
+++ b/app/src/main/java/emu/skyline/preference/LicenseDialog.kt
@@ -9,6 +9,7 @@ import android.graphics.Rect
 import android.os.Bundle
 import android.view.*
 import com.google.android.material.bottomsheet.BottomSheetDialogFragment
+import emu.skyline.R
 import emu.skyline.databinding.LicenseDialogBinding
 
 /**
@@ -34,6 +35,7 @@ class LicenseDialog : BottomSheetDialogFragment() {
 
     override fun onViewCreated(view : View, savedInstanceState : Bundle?) {
         super.onViewCreated(view, savedInstanceState)
+        view.setBackgroundColor(requireContext().getColor(R.color.backgroundColor))
 
         binding.libraryTitle.text = requireArguments().getString(LicensePreference.LIBRARY_TITLE_ARG)
         binding.libraryUrl.text = requireArguments().getString(LicensePreference.LIBRARY_URL_ARG)
diff --git a/app/src/main/res/values-night/colors.xml b/app/src/main/res/values-night/colors.xml
index 43ad152e..5d4e8f62 100644
--- a/app/src/main/res/values-night/colors.xml
+++ b/app/src/main/res/values-night/colors.xml
@@ -3,5 +3,4 @@
     <color name="colorPrimary">#FF4285F4</color>
     <color name="backgroundColor">#FF121212</color>
     <color name="backgroundColorVariant">#323232</color>
-    <color name="dialogSurface">#FF121213</color>
 </resources>
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 715d34ed..3e238d9d 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -4,5 +4,4 @@
     <color name="colorPrimary">#FF1E58F0</color>
     <color name="backgroundColor">@android:color/white</color>
     <color name="backgroundColorVariant">#F8F8F8</color>
-    <color name="dialogSurface">@android:color/white</color>
 </resources>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 639924ba..e9818aa1 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -18,8 +18,4 @@
         <item name="materialThemeOverlay">@style/ChipChoice.Material</item>
         <item name="shapeAppearance">@style/ShapeAppearance.MaterialComponents.LargeComponent</item>
     </style>
-
-    <style name="ModalBottomSheetDialog" parent="Widget.MaterialComponents.BottomSheet.Modal">
-        <item name="backgroundTint">@color/dialogSurface</item>
-    </style>
 </resources>
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index 43fbac62..ce853a11 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -9,18 +9,17 @@
         <item name="android:statusBarColor">@color/backgroundColor</item>
         <item name="android:navigationBarColor">@color/backgroundColor</item>
         <item name="android:colorBackground">@color/backgroundColor</item>
+        <item name="colorBackgroundFloating">@color/backgroundColor</item>
+        <item name="colorSurface">@color/backgroundColor</item>
 
         <item name="chipChoiceStyle">@style/ChipChoice</item>
 
         <item name="alertDialogTheme">@style/ThemeOverlay.MaterialComponents.MaterialAlertDialog</item>
+        <item name="bottomSheetDialogTheme">@style/ThemeOverlay.MaterialComponents.BottomSheetDialog</item>
     </style>
 
     <style name="AppTheme" parent="BaseAppTheme">
         <item name="android:windowLightStatusBar">true</item>
         <item name="android:windowLightNavigationBar">true</item>
     </style>
-
-    <style name="ThemeOverlay.AppTheme.BottomSheetDialog" parent="ThemeOverlay.MaterialComponents.BottomSheetDialog">
-        <item name="bottomSheetStyle">@style/ModalBottomSheetDialog</item>
-    </style>
 </resources>