From e12c7cb4196f67b705fc63b2b6d28e58db9e0fab Mon Sep 17 00:00:00 2001
From: OxygenCobalt <oxycblt@abstractr.net>
Date: Fri, 5 Aug 2022 09:58:20 -0600
Subject: [PATCH] ui: rework resource distribution

Try to remove the weird config file and replace it with more
conventional resource files in other places.
---
 .../java/org/oxycblt/auxio/MainActivity.kt    |  3 +
 .../auxio/detail/DetailAppBarLayout.kt        |  5 +-
 .../auxio/settings/SettingsListFragment.kt    |  5 +
 .../layout-sw600dp/fragment_playback_bar.xml  | 97 -------------------
 app/src/main/res/layout/dialog_music_dirs.xml |  6 +-
 app/src/main/res/layout/dialog_tabs.xml       |  4 +-
 app/src/main/res/layout/fragment_detail.xml   |  3 +-
 .../main/res/layout/fragment_home_list.xml    |  8 +-
 app/src/main/res/layout/fragment_queue.xml    |  4 +-
 app/src/main/res/layout/fragment_search.xml   |  3 +-
 app/src/main/res/layout/item_music_dir.xml    |  2 +-
 .../styles_ui.xml                             |  2 +-
 .../main/res/values-sw840dp-land/config.xml   |  4 -
 .../res/values-sw840dp-land/styles_ui.xml     |  7 ++
 app/src/main/res/values-v23/styles_core.xml   |  4 +
 app/src/main/res/values-v31/config.xml        |  4 -
 app/src/main/res/values-v31/styles_core.xml   |  2 +-
 app/src/main/res/values-w640dp/config.xml     |  4 -
 app/src/main/res/values-w640dp/styles_ui.xml  |  7 ++
 app/src/main/res/values/attrs.xml             |  6 ++
 app/src/main/res/values/config.xml            |  6 --
 app/src/main/res/values/ids.xml               | 11 ---
 app/src/main/res/values/styles_core.xml       |  5 +-
 app/src/main/res/values/styles_ui.xml         | 12 ++-
 app/src/main/res/xml/prefs_main.xml           |  1 -
 25 files changed, 59 insertions(+), 156 deletions(-)
 delete mode 100644 app/src/main/res/layout-sw600dp/fragment_playback_bar.xml
 rename app/src/main/res/{values-sw640dp => values-sw600dp}/styles_ui.xml (76%)
 delete mode 100644 app/src/main/res/values-sw840dp-land/config.xml
 create mode 100644 app/src/main/res/values-sw840dp-land/styles_ui.xml
 delete mode 100644 app/src/main/res/values-v31/config.xml
 delete mode 100644 app/src/main/res/values-w640dp/config.xml
 create mode 100644 app/src/main/res/values-w640dp/styles_ui.xml
 delete mode 100644 app/src/main/res/values/config.xml
 delete mode 100644 app/src/main/res/values/ids.xml

diff --git a/app/src/main/java/org/oxycblt/auxio/MainActivity.kt b/app/src/main/java/org/oxycblt/auxio/MainActivity.kt
index 05fdf113a..8e834e3fe 100644
--- a/app/src/main/java/org/oxycblt/auxio/MainActivity.kt
+++ b/app/src/main/java/org/oxycblt/auxio/MainActivity.kt
@@ -44,6 +44,9 @@ import org.oxycblt.auxio.util.systemBarInsetsCompat
  *
  * TODO: Add multi-select
  *
+ * LEFT-OFF: Add RecyclerView styles, queue issue is caused by tiny scroll and then replace op, not
+ * enough to change scroll apparently
+ *
  * @author OxygenCobalt
  */
 class MainActivity : AppCompatActivity() {
diff --git a/app/src/main/java/org/oxycblt/auxio/detail/DetailAppBarLayout.kt b/app/src/main/java/org/oxycblt/auxio/detail/DetailAppBarLayout.kt
index 91d1436ed..6305f68d1 100644
--- a/app/src/main/java/org/oxycblt/auxio/detail/DetailAppBarLayout.kt
+++ b/app/src/main/java/org/oxycblt/auxio/detail/DetailAppBarLayout.kt
@@ -111,8 +111,7 @@ constructor(context: Context, attrs: AttributeSet? = null, @AttrRes defStyleAttr
         this.titleAnimator =
             ValueAnimator.ofFloat(from, to).apply {
                 addUpdateListener { titleView?.alpha = it.animatedValue as Float }
-                duration =
-                    resources.getInteger(R.integer.detail_app_bar_title_anim_duration).toLong()
+                duration = TOOLBAR_FADE_DURATION
                 start()
             }
     }
@@ -143,6 +142,8 @@ constructor(context: Context, attrs: AttributeSet? = null, @AttrRes defStyleAttr
     }
 
     companion object {
+        private const val TOOLBAR_FADE_DURATION = 150L
+
         private val TOOLBAR_TITLE_TEXT_FIELD: Field by
             lazyReflectedField(Toolbar::class, "mTitleTextView")
     }
diff --git a/app/src/main/java/org/oxycblt/auxio/settings/SettingsListFragment.kt b/app/src/main/java/org/oxycblt/auxio/settings/SettingsListFragment.kt
index 6c1f1f475..a6f8387ce 100644
--- a/app/src/main/java/org/oxycblt/auxio/settings/SettingsListFragment.kt
+++ b/app/src/main/java/org/oxycblt/auxio/settings/SettingsListFragment.kt
@@ -17,6 +17,7 @@
  
 package org.oxycblt.auxio.settings
 
+import android.os.Build
 import android.os.Bundle
 import android.view.View
 import androidx.annotation.DrawableRes
@@ -161,6 +162,10 @@ class SettingsListFragment : PreferenceFragmentCompat() {
         preference.apply {
             when (key) {
                 context.getString(R.string.set_key_theme) -> {
+                    // Android 12 is the first version I deem to have universal dark and light
+                    // mode toggles. No need for our setting.
+                    isVisible = Build.VERSION.SDK_INT < Build.VERSION_CODES.S
+
                     onPreferenceChangeListener =
                         Preference.OnPreferenceChangeListener { _, value ->
                             AppCompatDelegate.setDefaultNightMode(value as Int)
diff --git a/app/src/main/res/layout-sw600dp/fragment_playback_bar.xml b/app/src/main/res/layout-sw600dp/fragment_playback_bar.xml
deleted file mode 100644
index d9f1dcb58..000000000
--- a/app/src/main/res/layout-sw600dp/fragment_playback_bar.xml
+++ /dev/null
@@ -1,97 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    tools:parentTag="androidx.constraintlayout.widget.ConstraintLayout">
-
-    <org.oxycblt.auxio.image.StyledImageView
-        android:id="@+id/playback_cover"
-        style="@style/Widget.Auxio.Image.Medium"
-        android:layout_margin="@dimen/spacing_small"
-        app:layout_constraintBottom_toTopOf="@+id/playback_progress_container"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        tools:staticIcon="@drawable/ic_song_24" />
-
-    <TextView
-        android:id="@+id/playback_song"
-        style="@style/Widget.Auxio.TextView.Primary.Compact"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="@dimen/spacing_small"
-        android:layout_marginEnd="@dimen/spacing_tiny"
-        app:layout_constraintBottom_toTopOf="@+id/playback_info"
-        app:layout_constraintEnd_toStartOf="@+id/playback_controls_wrapper"
-        app:layout_constraintStart_toEndOf="@+id/playback_cover"
-        app:layout_constraintTop_toTopOf="@+id/playback_cover"
-        app:layout_constraintVertical_chainStyle="packed"
-        tools:text="Song Name" />
-
-    <TextView
-        android:id="@+id/playback_info"
-        style="@style/Widget.Auxio.TextView.Secondary.Compact"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="@dimen/spacing_small"
-        android:layout_marginEnd="@dimen/spacing_tiny"
-        android:ellipsize="end"
-        app:layout_constraintBottom_toBottomOf="@+id/playback_cover"
-        app:layout_constraintEnd_toStartOf="@+id/playback_controls_wrapper"
-        app:layout_constraintStart_toEndOf="@+id/playback_cover"
-        app:layout_constraintTop_toBottomOf="@+id/playback_song"
-        tools:text="Artist Name / Album Name" />
-
-    <org.oxycblt.auxio.playback.ForcedLTRFrameLayout
-        android:id="@+id/playback_controls_wrapper"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginEnd="@dimen/spacing_tiny"
-        app:layout_constraintBottom_toTopOf="@+id/playback_progress_container"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toTopOf="parent">
-
-        <LinearLayout
-            android:id="@+id/playback_controls_container"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent">
-
-            <Button
-                android:id="@+id/playback_play_pause"
-                style="@style/Widget.Auxio.Button.Icon.Small"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:contentDescription="@string/desc_play_pause"
-                app:icon="@drawable/sel_playing_state_24" />
-
-            <Button
-                android:id="@+id/playback_skip_next"
-                style="@style/Widget.Auxio.Button.Icon.Small"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:contentDescription="@string/desc_play_pause"
-                app:icon="@drawable/ic_skip_next_24" />
-        </LinearLayout>
-
-    </org.oxycblt.auxio.playback.ForcedLTRFrameLayout>
-
-    <org.oxycblt.auxio.playback.ForcedLTRFrameLayout
-        android:id="@+id/playback_progress_container"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent">
-
-        <com.google.android.material.progressindicator.LinearProgressIndicator
-            android:id="@+id/playback_progress_bar"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="@dimen/spacing_small"
-            android:layout_marginEnd="@dimen/spacing_small"
-            tools:progress="70" />
-
-    </org.oxycblt.auxio.playback.ForcedLTRFrameLayout>
-
-</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/dialog_music_dirs.xml b/app/src/main/res/layout/dialog_music_dirs.xml
index 4fd002f73..a8eb3e006 100644
--- a/app/src/main/res/layout/dialog_music_dirs.xml
+++ b/app/src/main/res/layout/dialog_music_dirs.xml
@@ -14,13 +14,12 @@
 
         <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/dirs_recycler"
+            style="@style/Widget.Auxio.RecyclerView.Linear"
             android:layout_width="match_parent"
             android:layout_height="0dp"
             android:layout_gravity="center"
             android:layout_weight="1"
             android:overScrollMode="never"
-            app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
-            tools:itemCount="1"
             tools:listitem="@layout/item_music_dir" />
 
         <TextView
@@ -34,7 +33,8 @@
             android:text="@string/err_no_dirs"
             android:textAlignment="center"
             android:textAppearance="@style/TextAppearance.Auxio.LabelLarge"
-            android:textColor="?android:attr/textColorSecondary" />
+            android:textColor="?android:attr/textColorSecondary"
+            tools:visibility="gone" />
 
         <TextView
             style="@style/Widget.Auxio.TextView.Header"
diff --git a/app/src/main/res/layout/dialog_tabs.xml b/app/src/main/res/layout/dialog_tabs.xml
index 25ac3a5d7..343c4052f 100644
--- a/app/src/main/res/layout/dialog_tabs.xml
+++ b/app/src/main/res/layout/dialog_tabs.xml
@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <org.oxycblt.auxio.ui.recycler.DialogRecyclerView xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/tab_recycler"
+    style="@style/Widget.Auxio.RecyclerView.Linear"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
-    tools:itemCount="5"
     tools:listitem="@layout/item_tab" />
diff --git a/app/src/main/res/layout/fragment_detail.xml b/app/src/main/res/layout/fragment_detail.xml
index dc86227b5..a915838f3 100644
--- a/app/src/main/res/layout/fragment_detail.xml
+++ b/app/src/main/res/layout/fragment_detail.xml
@@ -22,10 +22,9 @@
 
     <org.oxycblt.auxio.ui.recycler.AuxioRecyclerView
         android:id="@+id/detail_recycler"
+        style="@style/Widget.Auxio.RecyclerView.Grid"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        app:layoutManager="androidx.recyclerview.widget.GridLayoutManager"
-        app:spanCount="@integer/recycler_spans"
         app:layout_behavior="com.google.android.material.appbar.AppBarLayout$ScrollingViewBehavior"
         tools:listitem="@layout/item_detail" />
 
diff --git a/app/src/main/res/layout/fragment_home_list.xml b/app/src/main/res/layout/fragment_home_list.xml
index 15bd17a2a..138fef24c 100644
--- a/app/src/main/res/layout/fragment_home_list.xml
+++ b/app/src/main/res/layout/fragment_home_list.xml
@@ -1,12 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <org.oxycblt.auxio.home.fastscroll.FastScrollRecyclerView xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/home_recycler"
-    style="@style/Widget.Auxio.RecyclerView.WithAdaptiveFab"
+    style="@style/Widget.Auxio.RecyclerView.Grid.WithAdaptiveFab"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    app:layoutManager="androidx.recyclerview.widget.GridLayoutManager"
-    app:spanCount="@integer/recycler_spans"
-    app:layout_behavior="com.google.android.material.appbar.AppBarLayout$ScrollingViewBehavior"
-    tools:listitem="@layout/item_parent" />
+    tools:listitem="@layout/item_song" />
diff --git a/app/src/main/res/layout/fragment_queue.xml b/app/src/main/res/layout/fragment_queue.xml
index a9dd9dfe7..6178934a0 100644
--- a/app/src/main/res/layout/fragment_queue.xml
+++ b/app/src/main/res/layout/fragment_queue.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/queue_layout"
     android:layout_width="match_parent"
@@ -8,10 +7,9 @@
 
     <org.oxycblt.auxio.ui.recycler.AuxioRecyclerView
         android:id="@+id/queue_recycler"
+        style="@style/Widget.Auxio.RecyclerView.Linear"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
-        app:layout_behavior="com.google.android.material.appbar.AppBarLayout$ScrollingViewBehavior"
         tools:listitem="@layout/item_queue_song" />
 
     <com.google.android.material.divider.MaterialDivider
diff --git a/app/src/main/res/layout/fragment_search.xml b/app/src/main/res/layout/fragment_search.xml
index cc889e414..bc3010db9 100644
--- a/app/src/main/res/layout/fragment_search.xml
+++ b/app/src/main/res/layout/fragment_search.xml
@@ -47,10 +47,9 @@
 
     <org.oxycblt.auxio.ui.recycler.AuxioRecyclerView
         android:id="@+id/search_recycler"
+        style="@style/Widget.Auxio.RecyclerView.Grid"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        app:layoutManager="androidx.recyclerview.widget.GridLayoutManager"
-        app:spanCount="@integer/recycler_spans"
         app:layout_behavior="com.google.android.material.appbar.AppBarLayout$ScrollingViewBehavior"
         tools:listitem="@layout/item_song" />
 
diff --git a/app/src/main/res/layout/item_music_dir.xml b/app/src/main/res/layout/item_music_dir.xml
index 38c51efc1..aeed696bc 100644
--- a/app/src/main/res/layout/item_music_dir.xml
+++ b/app/src/main/res/layout/item_music_dir.xml
@@ -20,7 +20,7 @@
         android:paddingTop="@dimen/spacing_small"
         android:paddingBottom="@dimen/spacing_small"
         android:textAppearance="@style/TextAppearance.Auxio.BodyLarge"
-        tools:text="/storage/emulated/0/directory" />
+        tools:text="primary:path/to/music" />
 
     <Button
         android:id="@+id/dir_delete"
diff --git a/app/src/main/res/values-sw640dp/styles_ui.xml b/app/src/main/res/values-sw600dp/styles_ui.xml
similarity index 76%
rename from app/src/main/res/values-sw640dp/styles_ui.xml
rename to app/src/main/res/values-sw600dp/styles_ui.xml
index 8da4ba26d..3a3175896 100644
--- a/app/src/main/res/values-sw640dp/styles_ui.xml
+++ b/app/src/main/res/values-sw600dp/styles_ui.xml
@@ -5,7 +5,7 @@
         <item name="fabSize">normal</item>
     </style>
 
-    <style name="Widget.Auxio.RecyclerView.WithAdaptiveFab" parent="">
+    <style name="Widget.Auxio.RecyclerView.Grid.WithAdaptiveFab" parent="Widget.Auxio.RecyclerView.Grid">
         <item name="android:paddingBottom">@dimen/recycler_fab_space_large</item>
     </style>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-sw840dp-land/config.xml b/app/src/main/res/values-sw840dp-land/config.xml
deleted file mode 100644
index dcaecfb66..000000000
--- a/app/src/main/res/values-sw840dp-land/config.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <integer name="recycler_spans">3</integer>
-</resources>
diff --git a/app/src/main/res/values-sw840dp-land/styles_ui.xml b/app/src/main/res/values-sw840dp-land/styles_ui.xml
new file mode 100644
index 000000000..5dff51dbb
--- /dev/null
+++ b/app/src/main/res/values-sw840dp-land/styles_ui.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <style name="Widget.Auxio.RecyclerView.Grid" parent="Widget.Auxio.RecyclerView.Grid.Base">
+        <item name="spanCount">3</item>
+    </style>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-v23/styles_core.xml b/app/src/main/res/values-v23/styles_core.xml
index 1ce41ebe2..c3bd17685 100644
--- a/app/src/main/res/values-v23/styles_core.xml
+++ b/app/src/main/res/values-v23/styles_core.xml
@@ -5,5 +5,9 @@
 
         <!-- Fix dumb default android behavior -->
         <item name="colorControlHighlight">@color/sel_compat_ripple</item>
+
+        <!-- Work around hard-coded text highlight colors in the default Material3 theme -->
+        <item name="android:textColorHighlight">@color/overlay_text_highlight</item>
+        <item name="android:textColorHighlightInverse">@color/overlay_text_highlight_inverse</item>
     </style>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-v31/config.xml b/app/src/main/res/values-v31/config.xml
deleted file mode 100644
index 4bd8a8884..000000000
--- a/app/src/main/res/values-v31/config.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <bool name="enable_theme_settings">false</bool>
-</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-v31/styles_core.xml b/app/src/main/res/values-v31/styles_core.xml
index fba22fa86..219d52838 100644
--- a/app/src/main/res/values-v31/styles_core.xml
+++ b/app/src/main/res/values-v31/styles_core.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-
+    <!-- Use dynamic colors since that's assumed to be the setting used. -->
     <style name="Theme.Auxio.App" parent="Theme.Auxio.Base" />
 
     <style name="Theme.Auxio.Widget" parent="@android:style/Theme.DeviceDefault.DayNight">
diff --git a/app/src/main/res/values-w640dp/config.xml b/app/src/main/res/values-w640dp/config.xml
deleted file mode 100644
index d32b032d7..000000000
--- a/app/src/main/res/values-w640dp/config.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <integer name="recycler_spans">2</integer>
-</resources>
diff --git a/app/src/main/res/values-w640dp/styles_ui.xml b/app/src/main/res/values-w640dp/styles_ui.xml
new file mode 100644
index 000000000..4d091a1e2
--- /dev/null
+++ b/app/src/main/res/values-w640dp/styles_ui.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <style name="Widget.Auxio.RecyclerView.Grid" parent="Widget.Auxio.RecyclerView.Grid.Base">
+        <item name="spanCount">2</item>
+    </style>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml
index 0214d3662..628fe91ab 100644
--- a/app/src/main/res/values/attrs.xml
+++ b/app/src/main/res/values/attrs.xml
@@ -1,5 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+    <!-- This is for HomeFragment's AppBarLayout. Explanations for these can be found there. -->
+    <item name="home_song_list" type="id" />
+    <item name="home_album_list" type="id" />
+    <item name="home_artist_list" type="id" />
+    <item name="home_genre_list" type="id" />
+
     <declare-styleable name="StyledImageView">
         <attr name="cornerRadius" format="dimension" />
         <attr name="staticIcon" format="reference" />
diff --git a/app/src/main/res/values/config.xml b/app/src/main/res/values/config.xml
deleted file mode 100644
index 1f8fb8828..000000000
--- a/app/src/main/res/values/config.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <bool name="enable_theme_settings">true</bool>
-    <integer name="recycler_spans">1</integer>
-    <integer name="detail_app_bar_title_anim_duration">150</integer>
-</resources>
diff --git a/app/src/main/res/values/ids.xml b/app/src/main/res/values/ids.xml
deleted file mode 100644
index 461891bbf..000000000
--- a/app/src/main/res/values/ids.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <!-- This is for BottomSheetLayout -->
-    <item name="bottom_sheet_view" type="id" />
-
-    <!-- This is for HomeFragment's AppBarLayout. Explanations for these can be found there. -->
-    <item name="home_song_list" type="id" />
-    <item name="home_album_list" type="id" />
-    <item name="home_artist_list" type="id" />
-    <item name="home_genre_list" type="id" />
-</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/styles_core.xml b/app/src/main/res/values/styles_core.xml
index 342b15b40..733fd82a8 100644
--- a/app/src/main/res/values/styles_core.xml
+++ b/app/src/main/res/values/styles_core.xml
@@ -42,10 +42,6 @@
         <item name="textAppearanceBodyMedium">@style/TextAppearance.Auxio.BodyMedium</item>
         <item name="textAppearanceBodySmall">@style/TextAppearance.Auxio.BodySmall</item>
 
-        <!-- Work around hard-coded text highlight colors in the default Material3 theme -->
-        <item name="android:textColorHighlight">@color/overlay_text_highlight</item>
-        <item name="android:textColorHighlightInverse">@color/overlay_text_highlight_inverse</item>
-
         <!-- Fix dumb default android behavior -->
         <item name="android:scrollbars">none</item>
         <item name="windowActionBar">false</item>
@@ -63,6 +59,7 @@
         <item name="actionOverflowButtonStyle">@style/Widget.Auxio.Button.Overflow</item>
     </style>
 
+    <!-- Make sure blue is the default style instead of material purple -->
     <style name="Theme.Auxio.App" parent="@style/Theme.Auxio.Blue" />
 
     <!--
diff --git a/app/src/main/res/values/styles_ui.xml b/app/src/main/res/values/styles_ui.xml
index a7734a6d0..ef0b9ced9 100644
--- a/app/src/main/res/values/styles_ui.xml
+++ b/app/src/main/res/values/styles_ui.xml
@@ -79,7 +79,17 @@
         <item name="android:focusable">true</item>
     </style>
 
-    <style name="Widget.Auxio.RecyclerView.WithAdaptiveFab" parent="">
+    <style name="Widget.Auxio.RecyclerView.Linear" parent="">
+        <item name="layoutManager">androidx.recyclerview.widget.LinearLayoutManager</item>
+    </style>
+
+    <style name="Widget.Auxio.RecyclerView.Grid.Base" parent="">
+        <item name="layoutManager">androidx.recyclerview.widget.GridLayoutManager</item>
+    </style>
+
+    <style name="Widget.Auxio.RecyclerView.Grid" parent="Widget.Auxio.RecyclerView.Grid.Base" />
+
+    <style name="Widget.Auxio.RecyclerView.Grid.WithAdaptiveFab" parent="Widget.Auxio.RecyclerView.Grid">
         <item name="android:paddingBottom">@dimen/recycler_fab_space_normal</item>
     </style>
 
diff --git a/app/src/main/res/xml/prefs_main.xml b/app/src/main/res/xml/prefs_main.xml
index 00acf5a83..a34bd64a3 100644
--- a/app/src/main/res/xml/prefs_main.xml
+++ b/app/src/main/res/xml/prefs_main.xml
@@ -8,7 +8,6 @@
             app:entryIcons="@array/icons_theme"
             app:entryValues="@array/values_theme"
             app:icon="@drawable/ic_light_24"
-            app:isPreferenceVisible="@bool/enable_theme_settings"
             app:key="@string/set_key_theme"
             app:title="@string/set_theme" />