From 804c38d7ce066f3525d88488aef09b48e688ae1b Mon Sep 17 00:00:00 2001
From: OxygenCobalt <oxycblt@abstractr.net>
Date: Mon, 24 May 2021 19:26:54 -0600
Subject: [PATCH] style: Use colorSurface everywhere

Instead of using @color/background directly, use ?attr/colorSurface
so that changes can be made to the theming easier. This also
resolves some more minor issues regarding certain widget's
backgrounds.
---
 app/src/main/java/org/oxycblt/auxio/MainActivity.kt   |  8 ++++----
 app/src/main/java/org/oxycblt/auxio/MainFragment.kt   |  5 +++++
 app/src/main/res/drawable/ic_check.xml                |  2 +-
 app/src/main/res/drawable/ui_background_ripple.xml    |  2 +-
 app/src/main/res/layout-land/fragment_main.xml        |  4 ++--
 app/src/main/res/layout-land/fragment_playback.xml    |  2 +-
 .../main/res/layout-xlarge-land/fragment_playback.xml |  2 +-
 app/src/main/res/layout-xlarge/fragment_playback.xml  |  2 +-
 app/src/main/res/layout/dialog_about.xml              |  2 +-
 app/src/main/res/layout/dialog_blacklist.xml          |  2 +-
 app/src/main/res/layout/fragment_detail.xml           |  5 +++--
 app/src/main/res/layout/fragment_main.xml             |  3 +--
 app/src/main/res/layout/fragment_playback.xml         |  2 +-
 app/src/main/res/layout/fragment_queue.xml            |  2 +-
 app/src/main/res/layout/fragment_search.xml           |  6 +++---
 app/src/main/res/values-night-v27/styles.xml          |  2 +-
 app/src/main/res/values/styles.xml                    | 11 ++++++++---
 17 files changed, 36 insertions(+), 26 deletions(-)

diff --git a/app/src/main/java/org/oxycblt/auxio/MainActivity.kt b/app/src/main/java/org/oxycblt/auxio/MainActivity.kt
index 003783e31..bde3581de 100644
--- a/app/src/main/java/org/oxycblt/auxio/MainActivity.kt
+++ b/app/src/main/java/org/oxycblt/auxio/MainActivity.kt
@@ -25,16 +25,16 @@ class MainActivity : AppCompatActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
 
-        val binding = DataBindingUtil.setContentView<ActivityMainBinding>(
-            this, R.layout.activity_main
-        )
-
         val settingsManager = SettingsManager.getInstance()
         val newAccent = Accent.set(settingsManager.accent)
 
         AppCompatDelegate.setDefaultNightMode(settingsManager.theme)
         setTheme(newAccent.theme)
 
+        val binding = DataBindingUtil.setContentView<ActivityMainBinding>(
+            this, R.layout.activity_main
+        )
+
         if (isEdgeOn()) {
             setupEdgeToEdge(binding)
         }
diff --git a/app/src/main/java/org/oxycblt/auxio/MainFragment.kt b/app/src/main/java/org/oxycblt/auxio/MainFragment.kt
index 9e844c332..11375c68e 100644
--- a/app/src/main/java/org/oxycblt/auxio/MainFragment.kt
+++ b/app/src/main/java/org/oxycblt/auxio/MainFragment.kt
@@ -21,6 +21,7 @@ import org.oxycblt.auxio.playback.PlaybackViewModel
 import org.oxycblt.auxio.ui.Accent
 import org.oxycblt.auxio.ui.isLandscape
 import org.oxycblt.auxio.ui.isTablet
+import org.oxycblt.auxio.ui.resolveAttr
 import org.oxycblt.auxio.ui.toColor
 
 /**
@@ -76,6 +77,10 @@ class MainFragment : Fragment() {
                     navigateWithItem(controller, item)
                 }
             }
+
+            // BottomNavigationView is a special little snowflake and doesn't like it when
+            // we set the background in XML
+            setBackgroundColor(R.attr.colorSurface.resolveAttr(requireContext()))
         }
 
         // --- VIEWMODEL SETUP ---
diff --git a/app/src/main/res/drawable/ic_check.xml b/app/src/main/res/drawable/ic_check.xml
index 8d9e328e8..fe2e57ae2 100644
--- a/app/src/main/res/drawable/ic_check.xml
+++ b/app/src/main/res/drawable/ic_check.xml
@@ -2,7 +2,7 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
-    android:tint="@color/background"
+    android:tint="?attr/colorSurface"
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
diff --git a/app/src/main/res/drawable/ui_background_ripple.xml b/app/src/main/res/drawable/ui_background_ripple.xml
index e7c0e0f1b..1c6a4919c 100644
--- a/app/src/main/res/drawable/ui_background_ripple.xml
+++ b/app/src/main/res/drawable/ui_background_ripple.xml
@@ -2,7 +2,7 @@
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
     <item>
         <shape android:shape="rectangle">
-            <solid android:color="@color/background" />
+            <solid android:color="?attr/colorSurface" />
         </shape>
     </item>
     <item>
diff --git a/app/src/main/res/layout-land/fragment_main.xml b/app/src/main/res/layout-land/fragment_main.xml
index 5fd4d19a7..735ce6141 100644
--- a/app/src/main/res/layout-land/fragment_main.xml
+++ b/app/src/main/res/layout-land/fragment_main.xml
@@ -28,7 +28,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:animateLayoutChanges="true"
-            android:background="?android:attr/windowBackground"
+            android:background="?android:attr/colorBackground"
             android:baselineAligned="false"
             android:elevation="@dimen/elevation_normal"
             android:orientation="horizontal"
@@ -39,7 +39,7 @@
                 android:layout_width="0dp"
                 android:layout_height="match_parent"
                 android:layout_weight="1.5"
-                android:background="@color/background"
+                android:background="?android:attr/colorBackground"
                 android:elevation="0dp"
                 app:elevation="0dp"
                 app:menu="@menu/menu_nav" />
diff --git a/app/src/main/res/layout-land/fragment_playback.xml b/app/src/main/res/layout-land/fragment_playback.xml
index 5d63416da..eb536b73c 100644
--- a/app/src/main/res/layout-land/fragment_playback.xml
+++ b/app/src/main/res/layout-land/fragment_playback.xml
@@ -24,7 +24,7 @@
         android:id="@+id/playback_layout"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:background="@color/background"
+        android:background="?attr/colorSurface"
         android:fitsSystemWindows="true">
 
         <androidx.appcompat.widget.Toolbar
diff --git a/app/src/main/res/layout-xlarge-land/fragment_playback.xml b/app/src/main/res/layout-xlarge-land/fragment_playback.xml
index e59a3f896..e86b9de65 100644
--- a/app/src/main/res/layout-xlarge-land/fragment_playback.xml
+++ b/app/src/main/res/layout-xlarge-land/fragment_playback.xml
@@ -24,7 +24,7 @@
         android:id="@+id/playback_layout"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:background="@color/background"
+        android:background="?attr/colorSurface"
         android:fitsSystemWindows="true">
 
         <androidx.appcompat.widget.Toolbar
diff --git a/app/src/main/res/layout-xlarge/fragment_playback.xml b/app/src/main/res/layout-xlarge/fragment_playback.xml
index 0adb434f3..3c50bc5ff 100644
--- a/app/src/main/res/layout-xlarge/fragment_playback.xml
+++ b/app/src/main/res/layout-xlarge/fragment_playback.xml
@@ -24,7 +24,7 @@
         android:id="@+id/playback_layout"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:background="@color/background"
+        android:background="?attr/colorSurface"
         android:fitsSystemWindows="true">
 
         <androidx.appcompat.widget.Toolbar
diff --git a/app/src/main/res/layout/dialog_about.xml b/app/src/main/res/layout/dialog_about.xml
index a74b03033..2a5d27c91 100644
--- a/app/src/main/res/layout/dialog_about.xml
+++ b/app/src/main/res/layout/dialog_about.xml
@@ -12,7 +12,7 @@
         <androidx.constraintlayout.widget.ConstraintLayout
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:background="@color/background"
+            android:background="?attr/colorSurface"
             android:theme="@style/Theme.Neutral">
 
             <ImageView
diff --git a/app/src/main/res/layout/dialog_blacklist.xml b/app/src/main/res/layout/dialog_blacklist.xml
index c2d008b05..5354944b9 100644
--- a/app/src/main/res/layout/dialog_blacklist.xml
+++ b/app/src/main/res/layout/dialog_blacklist.xml
@@ -7,7 +7,7 @@
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="@color/background"
+        android:background="?attr/colorSurface"
         android:orientation="vertical"
         android:paddingTop="@dimen/spacing_medium"
         android:theme="@style/Theme.Neutral">
diff --git a/app/src/main/res/layout/fragment_detail.xml b/app/src/main/res/layout/fragment_detail.xml
index 035a0c839..10ce8813e 100644
--- a/app/src/main/res/layout/fragment_detail.xml
+++ b/app/src/main/res/layout/fragment_detail.xml
@@ -12,12 +12,13 @@
             android:id="@+id/detail_appbar"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:background="?attr/colorSurface"
             app:liftOnScroll="true">
 
-            <com.google.android.material.appbar.MaterialToolbar
+            <androidx.appcompat.widget.Toolbar
                 android:id="@+id/detail_toolbar"
                 style="@style/Toolbar.Style.Icon"
-                android:background="?android:attr/windowBackground"
+                android:background="?attr/colorSurface"
                 android:elevation="@dimen/elevation_normal" />
 
         </com.google.android.material.appbar.AppBarLayout>
diff --git a/app/src/main/res/layout/fragment_main.xml b/app/src/main/res/layout/fragment_main.xml
index 2cf65c643..95a87bd4d 100644
--- a/app/src/main/res/layout/fragment_main.xml
+++ b/app/src/main/res/layout/fragment_main.xml
@@ -26,7 +26,6 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:animateLayoutChanges="true"
-            android:background="?android:attr/windowBackground"
             android:elevation="@dimen/elevation_normal"
             android:orientation="vertical"
             app:layout_constraintBottom_toBottomOf="parent">
@@ -43,7 +42,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_gravity="bottom"
-                android:background="@color/background"
+                android:background="?attr/colorSurface"
                 android:elevation="0dp"
                 app:elevation="0dp"
                 app:menu="@menu/menu_nav" />
diff --git a/app/src/main/res/layout/fragment_playback.xml b/app/src/main/res/layout/fragment_playback.xml
index 1c4bab60f..91a051fe6 100644
--- a/app/src/main/res/layout/fragment_playback.xml
+++ b/app/src/main/res/layout/fragment_playback.xml
@@ -24,7 +24,7 @@
         android:id="@+id/playback_layout"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:background="@color/background"
+        android:background="?attr/colorSurface"
         android:fitsSystemWindows="true">
 
         <androidx.appcompat.widget.Toolbar
diff --git a/app/src/main/res/layout/fragment_queue.xml b/app/src/main/res/layout/fragment_queue.xml
index f95f058ad..6a79d07e5 100644
--- a/app/src/main/res/layout/fragment_queue.xml
+++ b/app/src/main/res/layout/fragment_queue.xml
@@ -8,7 +8,7 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:animateLayoutChanges="true"
-        android:background="@color/background"
+        android:background="?attr/colorSurface"
         android:orientation="vertical">
 
         <androidx.appcompat.widget.Toolbar
diff --git a/app/src/main/res/layout/fragment_search.xml b/app/src/main/res/layout/fragment_search.xml
index 2a1df7e13..3ac746ef9 100644
--- a/app/src/main/res/layout/fragment_search.xml
+++ b/app/src/main/res/layout/fragment_search.xml
@@ -11,13 +11,13 @@
             android:id="@+id/search_appbar"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:background="@color/background"
+            android:background="?attr/colorSurface"
             android:elevation="@dimen/elevation_normal">
 
             <androidx.appcompat.widget.Toolbar
                 android:id="@+id/search_toolbar"
                 style="@style/Toolbar.Style"
-                android:elevation="@dimen/elevation_normal"
+                android:background="?attr/colorSurface"
                 app:layout_scrollFlags="scroll|enterAlways"
                 app:menu="@menu/menu_search"
                 app:title="@string/label_search" />
@@ -40,7 +40,7 @@
                     android:id="@+id/search_edit_text"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:background="@android:color/transparent"
+                    android:background="?attr/colorSurface"
                     android:hint="@string/hint_search_library"
                     android:imeOptions="actionSearch|flagNoExtractUi"
                     android:inputType="textFilter"
diff --git a/app/src/main/res/values-night-v27/styles.xml b/app/src/main/res/values-night-v27/styles.xml
index 26a1b5a43..4fa318afd 100644
--- a/app/src/main/res/values-night-v27/styles.xml
+++ b/app/src/main/res/values-night-v27/styles.xml
@@ -11,7 +11,7 @@
     <style name="Theme.BottomSheetFix" parent="@style/Theme.Design.BottomSheetDialog">
         <item name="android:windowIsFloating">false</item>
         <item name="android:statusBarColor">@android:color/transparent</item>
-        <item name="android:navigationBarColor">@color/background</item>
+        <item name="android:navigationBarColor">?attr/colorSurface</item>
         <item name="android:windowLightStatusBar">false</item>
         <item name="bottomSheetStyle">@style/Theme.BottomSheetHeightFix</item>
     </style>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index b00ebc3a4..aa647d81e 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -7,7 +7,8 @@
 
     <!-- Base theme -->
     <style name="Theme.Base" parent="Theme.Template">
-        <item name="android:windowBackground">@color/background</item>
+        <item name="android:windowBackground">?attr/colorSurface</item>
+        <item name="android:colorBackground">?attr/colorSurface</item>
         <item name="android:fontFamily">@font/inter</item>
         <item name="android:scrollbars">none</item>
         <item name="android:windowIsFloating">false</item>
@@ -23,14 +24,18 @@
         <item name="colorControlActivated">?attr/colorPrimary</item>
         <item name="cornerRadius">0dp</item>
 
+        <item name="colorSurface">@color/background</item>
+
         <!--
         These exact flags, in this exact order, in this exact formatting somehow make
         the dialogs use the nicer material style. Please do not touch them.
         -->
-        <item name="viewInflaterClass">com.google.android.material.theme.MaterialComponentsViewInflater</item>
+        <item name="viewInflaterClass">
+            com.google.android.material.theme.MaterialComponentsViewInflater
+        </item>
         <item name="alertDialogTheme">@style/ThemeOverlay.MaterialComponents.Dialog.Alert</item>
         <item name="materialAlertDialogTheme">@style/Theme.CustomDialog</item>
-  </style>
+    </style>
 
     <!-- Toolbar theme -->
     <style name="Toolbar.Style" parent="ThemeOverlay.MaterialComponents.ActionBar">