From adf85a8fab3b9cd7ec51748fa52688dc6fb53b50 Mon Sep 17 00:00:00 2001
From: Alexander Capehart <alex@oxycblt.org>
Date: Sat, 24 Sep 2022 15:35:44 -0600
Subject: [PATCH] settings: enable theme customization on >31

Enable theme customization on API 31.

Some people prefer some themes over others, so enable it. Not like it
increases complexity.

Resolves #243.
---
 CHANGELOG.md                                  |  1 +
 .../java/org/oxycblt/auxio/music/Music.kt     | 25 ++++++++++---------
 app/src/main/res/values-v31/settings.xml      |  4 ---
 app/src/main/res/values/settings.xml          |  2 --
 app/src/main/res/xml/prefs_main.xml           |  1 -
 5 files changed, 14 insertions(+), 19 deletions(-)
 delete mode 100644 app/src/main/res/values-v31/settings.xml

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8814586b6..c1f395a24 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -17,6 +17,7 @@
 - Added support for compilation sub-release-types like (DJ) Mix
 - Album dates now start from the earliest date instead of latest date
 - Reshuffling the queue will no longer drop any songs you have added/removed
+- Allowed light/dark theme to be customized on Android 12+
 
 #### What's Fixed
 - Fixed issue where the scroll popup would not display correctly in landscape mode [#230]
diff --git a/app/src/main/java/org/oxycblt/auxio/music/Music.kt b/app/src/main/java/org/oxycblt/auxio/music/Music.kt
index 50e90b381..d5ac7811a 100644
--- a/app/src/main/java/org/oxycblt/auxio/music/Music.kt
+++ b/app/src/main/java/org/oxycblt/auxio/music/Music.kt
@@ -205,20 +205,21 @@ sealed class MusicParent : Music() {
  * @author OxygenCobalt
  */
 class Song constructor(raw: Raw, settings: Settings) : Music() {
-    override val uid = raw.musicBrainzId?.toUuidOrNull()?.let { UID.musicBrainz(MusicMode.SONGS, it) } ?: UID.auxio(MusicMode.SONGS) {
-        // Song UIDs are based on the raw data without parsing so that they remain
-        // consistent across music setting changes. Parents are not held up to the
-        // same standard since grouping is already inherently linked to settings.
-        update(raw.name)
-        update(raw.albumName)
-        update(raw.date)
+    override val uid = raw.musicBrainzId?.toUuidOrNull()?.let { UID.musicBrainz(MusicMode.SONGS, it) }
+        ?: UID.auxio(MusicMode.SONGS) {
+            // Song UIDs are based on the raw data without parsing so that they remain
+            // consistent across music setting changes. Parents are not held up to the
+            // same standard since grouping is already inherently linked to settings.
+            update(raw.name)
+            update(raw.albumName)
+            update(raw.date)
 
-        update(raw.track)
-        update(raw.disc)
+            update(raw.track)
+            update(raw.disc)
 
-        update(raw.artistNames)
-        update(raw.albumArtistNames)
-    }
+            update(raw.artistNames)
+            update(raw.albumArtistNames)
+        }
 
     override val rawName = requireNotNull(raw.name) { "Invalid raw: No title" }
 
diff --git a/app/src/main/res/values-v31/settings.xml b/app/src/main/res/values-v31/settings.xml
deleted file mode 100644
index 4bd8a8884..000000000
--- a/app/src/main/res/values-v31/settings.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/settings.xml b/app/src/main/res/values/settings.xml
index 5b543a269..be6d05c54 100644
--- a/app/src/main/res/values/settings.xml
+++ b/app/src/main/res/values/settings.xml
@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <bool name="enable_theme_settings">true</bool>
-
     <!-- Note: The old way of naming keys was to prefix them with KEY_. Now it's to prefix them with auxio_. -->
     <string name="set_key_theme" translatable="false">KEY_THEME2</string>
     <string name="set_key_black_theme" translatable="false">KEY_BLACK_THEME</string>
diff --git a/app/src/main/res/xml/prefs_main.xml b/app/src/main/res/xml/prefs_main.xml
index 44372d190..4aae24aea 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" />