From 3f0331f1c9e30e1472e330be0a7165122cd3c9a8 Mon Sep 17 00:00:00 2001
From: OxygenCobalt <oxycblt@abstractr.net>
Date: Sun, 28 Feb 2021 15:50:13 -0700
Subject: [PATCH] Redo accents

Collapse amber and yellow into a single accent [Yellow], remove the neutral accent due to UI isuses, and darken light-mode accents across the board to be more visible.
---
 .../auxio/settings/SettingsListFragment.kt    |  2 +-
 .../oxycblt/auxio/settings/SettingsManager.kt | 55 +++++++++++++++++--
 .../main/java/org/oxycblt/auxio/ui/Accent.kt  |  2 -
 app/src/main/res/layout/fragment_detail.xml   |  6 +-
 app/src/main/res/values-de/strings.xml        |  2 -
 app/src/main/res/values-es/strings.xml        |  2 -
 app/src/main/res/values-fr/strings.xml        |  2 -
 app/src/main/res/values-hu/strings.xml        |  1 -
 app/src/main/res/values-it/strings.xml        |  2 -
 app/src/main/res/values-night/colors.xml      |  3 +-
 app/src/main/res/values-nl/strings.xml        |  1 -
 app/src/main/res/values-pl/strings.xml        |  2 -
 app/src/main/res/values/colors.xml            |  9 ++-
 app/src/main/res/values/strings.xml           |  2 -
 app/src/main/res/values/themes.xml            |  5 --
 15 files changed, 59 insertions(+), 37 deletions(-)

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 277bd765d..1828f7838 100644
--- a/app/src/main/java/org/oxycblt/auxio/settings/SettingsListFragment.kt
+++ b/app/src/main/java/org/oxycblt/auxio/settings/SettingsListFragment.kt
@@ -75,7 +75,7 @@ class SettingsListFragment : PreferenceFragmentCompat() {
                     }
                 }
 
-                SettingsManager.Keys.KEY_ACCENT -> {
+                SettingsManager.Keys.KEY_ACCENT_OLD -> {
                     onPreferenceClickListener = Preference.OnPreferenceClickListener {
                         showAccentDialog()
                         true
diff --git a/app/src/main/java/org/oxycblt/auxio/settings/SettingsManager.kt b/app/src/main/java/org/oxycblt/auxio/settings/SettingsManager.kt
index bd322e70a..1974e9248 100644
--- a/app/src/main/java/org/oxycblt/auxio/settings/SettingsManager.kt
+++ b/app/src/main/java/org/oxycblt/auxio/settings/SettingsManager.kt
@@ -2,7 +2,9 @@ package org.oxycblt.auxio.settings
 
 import android.content.Context
 import android.content.SharedPreferences
+import androidx.core.content.edit
 import androidx.preference.PreferenceManager
+import org.oxycblt.auxio.logD
 import org.oxycblt.auxio.playback.state.PlaybackMode
 import org.oxycblt.auxio.recycler.DisplayMode
 import org.oxycblt.auxio.recycler.SortMode
@@ -30,7 +32,21 @@ class SettingsManager private constructor(context: Context) :
     /** The current accent. */
     var accent: Accent
         get() {
-            // Accent is stored as an index [to be efficient], so retrieve it when done.
+            if (sharedPrefs.contains(Keys.KEY_ACCENT_OLD)) {
+                logD("Migrating from old accent to new accent.")
+
+                val newAccent = handleAccentCompat(
+                    sharedPrefs.getInt(Keys.KEY_ACCENT_OLD, 5)
+                )
+
+                // When converted, write them to the new accent pref and delete the old one.
+                sharedPrefs.edit {
+                    putInt(Keys.KEY_ACCENT, newAccent)
+                    remove(Keys.KEY_ACCENT_OLD)
+                    apply()
+                }
+            }
+
             return ACCENTS[sharedPrefs.getInt(Keys.KEY_ACCENT, 5)]
         }
         set(value) {
@@ -171,10 +187,37 @@ class SettingsManager private constructor(context: Context) :
         }
     }
 
-    /** SharedPreferences keys. */
+    /**
+     * Convert the old accent format of <1.3.1 to the accent format of 1.3.2-Onwards,
+     * where many accents were changed or removed.
+     */
+    private fun handleAccentCompat(oldAccent: Int): Int {
+        var newAccent = oldAccent
+
+        // Correct any accents over yellow to their correct positions
+        if (oldAccent > 12) {
+            newAccent--
+        }
+
+        // Correct neutral accents to the closest accent [Grey]
+        if (newAccent == 18) {
+            newAccent = 16
+        }
+
+        // If there are still any issues with indices, just correct them so a crash doesnt occur.
+        if (newAccent > ACCENTS.lastIndex) {
+            newAccent = ACCENTS.lastIndex
+        }
+
+        return newAccent
+    }
+
+    /**
+     * SharedPreferences keys.
+     */
     object Keys {
         const val KEY_THEME = "KEY_THEME"
-        const val KEY_ACCENT = "KEY_ACCENT"
+        const val KEY_ACCENT = "KEY_ACCENT2"
         const val KEY_EDGE_TO_EDGE = "KEY_EDGE"
         const val KEY_LIBRARY_DISPLAY_MODE = "KEY_LIBRARY_DISPLAY_MODE"
         const val KEY_SHOW_COVERS = "KEY_SHOW_COVERS"
@@ -191,9 +234,13 @@ class SettingsManager private constructor(context: Context) :
         const val KEY_LIBRARY_SORT_MODE = "KEY_LIBRARY_SORT_MODE"
         const val KEY_SEARCH_FILTER_MODE = "KEY_SEARCH"
         const val KEY_DEBUG_SAVE = "KEY_SAVE_STATE"
+
+        const val KEY_ACCENT_OLD = "KEY_ACCENT"
     }
 
-    /** Values for some settings entries that cant be enums/ints.*/
+    /**
+     * Values for some settings entries that arent important enough to recieve an enum.
+     */
     object EntryValues {
         const val THEME_AUTO = "AUTO"
         const val THEME_LIGHT = "LIGHT"
diff --git a/app/src/main/java/org/oxycblt/auxio/ui/Accent.kt b/app/src/main/java/org/oxycblt/auxio/ui/Accent.kt
index 3f4d7bc0f..5295a14c7 100644
--- a/app/src/main/java/org/oxycblt/auxio/ui/Accent.kt
+++ b/app/src/main/java/org/oxycblt/auxio/ui/Accent.kt
@@ -30,13 +30,11 @@ val ACCENTS = arrayOf(
     Accent(R.color.light_green, R.style.Theme_LightGreen, R.string.color_label_light_green),
     Accent(R.color.lime, R.style.Theme_Lime, R.string.color_label_lime),
     Accent(R.color.yellow, R.style.Theme_Yellow, R.string.color_label_yellow),
-    Accent(R.color.amber, R.style.Theme_Amber, R.string.color_label_amber),
     Accent(R.color.orange, R.style.Theme_Orange, R.string.color_label_orange),
     Accent(R.color.deep_orange, R.style.Theme_DeepOrange, R.string.color_label_deep_orange),
     Accent(R.color.brown, R.style.Theme_Brown, R.string.color_label_brown),
     Accent(R.color.grey, R.style.Theme_Gray, R.string.color_label_grey),
     Accent(R.color.blue_grey, R.style.Theme_BlueGrey, R.string.color_label_blue_grey),
-    Accent(R.color.control_color, R.style.Theme_Neutral, R.string.color_label_neutral)
 )
 
 /**
diff --git a/app/src/main/res/layout/fragment_detail.xml b/app/src/main/res/layout/fragment_detail.xml
index e8d6cfdae..3845f7901 100644
--- a/app/src/main/res/layout/fragment_detail.xml
+++ b/app/src/main/res/layout/fragment_detail.xml
@@ -2,7 +2,7 @@
 <layout 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"
-    tools:context=".detail.GenreDetailFragment">
+    tools:context=".detail.DetailFragment">
 
     <androidx.coordinatorlayout.widget.CoordinatorLayout
         android:layout_width="match_parent"
@@ -28,9 +28,7 @@
             android:layout_height="match_parent"
             android:layout_marginTop="?attr/actionBarSize"
             app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/genre_song_header"
             tools:listitem="@layout/item_artist_header" />
+
     </androidx.coordinatorlayout.widget.CoordinatorLayout>
 </layout>
\ No newline at end of file
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index f93ec577d..a67aac4c1 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -138,13 +138,11 @@
     <string name="color_label_light_green">Hellgrün</string>
     <string name="color_label_lime">Lindgrün</string>
     <string name="color_label_yellow">Gelb</string>
-    <string name="color_label_amber">Bernsteingelb</string>
     <string name="color_label_orange">Orange</string>
     <string name="color_label_deep_orange">Tieforange</string>
     <string name="color_label_brown">Braun</string>
     <string name="color_label_grey">Grau</string>
     <string name="color_label_blue_grey">Blaugrau</string>
-    <string name="color_label_neutral">Neutral</string>
 
     <!-- Format Namespace | Value formatting/plurals -->
     <string name="format_next_from">Nächsten von: %s</string>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 49c18fdee..c21151902 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -89,12 +89,10 @@
     <string name="color_label_light_green">Verde Claro</string>
     <string name="color_label_lime">Verde Amarillo</string>
     <string name="color_label_yellow">Amarillo</string>
-    <string name="color_label_amber">Ambar</string>
     <string name="color_label_orange">Naranja</string>
     <string name="color_label_brown">Marrón</string>
     <string name="color_label_grey">Gris</string>
     <string name="color_label_blue_grey">Azul Gris</string>
-    <string name="color_label_neutral">Neutro</string>
 
     <!-- Format Namespace | Value formatting/plurals -->
     <string name="format_songs_loaded">Canciones encontradas: %d</string>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index a869e0586..33dd21681 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -88,12 +88,10 @@
     <string name="color_label_light_green">Vert Clair</string>
     <string name="color_label_lime">Vert Citron</string>
     <string name="color_label_yellow">Jaune</string>
-    <string name="color_label_amber">Ambre</string>
     <string name="color_label_orange">Orange</string>
     <string name="color_label_brown">Brun</string>
     <string name="color_label_grey">Gris</string>
     <string name="color_label_blue_grey">Bleu Gris</string>
-    <string name="color_label_neutral">Neutre</string>
 
     <!-- Format Namespace | Value formatting/plurals -->
     <string name="format_songs_loaded">Titres chargés: %d</string>
diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml
index 9fd90a53b..261166527 100644
--- a/app/src/main/res/values-hu/strings.xml
+++ b/app/src/main/res/values-hu/strings.xml
@@ -91,7 +91,6 @@
     <string name="color_label_brown">Barna</string>
     <string name="color_label_grey">Szürke</string>
     <string name="color_label_blue_grey">Kékszürke</string>
-    <string name="color_label_neutral">Semleges</string>
 
     <!-- Format Namespace | Value formatting/plurals -->
     <plurals name="format_song_count">
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index 105703be8..edf36319d 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -89,12 +89,10 @@
     <string name="color_label_light_green">Verde Chiaro</string>
     <string name="color_label_lime">Verde Giallo</string>
     <string name="color_label_yellow">Giallo</string>
-    <string name="color_label_amber">Ambra</string>
     <string name="color_label_orange">Arancio</string>
     <string name="color_label_brown">Bruno</string>
     <string name="color_label_grey">Grigio</string>
     <string name="color_label_blue_grey">Azzurro Grigio</string>
-    <string name="color_label_neutral">Neutrale</string>
 
     <!-- Format Namespace | Value formatting/plurals -->
     <string name="format_songs_loaded">Brani caricate: %d</string>
diff --git a/app/src/main/res/values-night/colors.xml b/app/src/main/res/values-night/colors.xml
index 739419fdb..c5943d9f8 100644
--- a/app/src/main/res/values-night/colors.xml
+++ b/app/src/main/res/values-night/colors.xml
@@ -23,8 +23,7 @@
     <color name="green">#a5d6a7</color>
     <color name="light_green">#c5e1a5</color>
     <color name="lime">#e6ee9c</color>
-    <color name="yellow">#fff59d</color>
-    <color name="amber">#ffe082</color>
+    <color name="yellow">#ffe082</color>
     <color name="orange">#ffcc80</color>
     <color name="deep_orange">#ffab91</color>
     <color name="brown">#bcaaa4</color>
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index e137c0771..844c3180a 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -95,7 +95,6 @@
     <string name="color_label_brown">Bruin</string>
     <string name="color_label_grey">Grijis</string>
     <string name="color_label_blue_grey">Blauwgrijis</string>
-    <string name="color_label_neutral">Neutraal</string>
 
     <!-- Format Namespace | Value formatting/plurals -->
     <string name="format_songs_loaded">Nummers geladen: %d</string>
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index c79f0b309..4ca7fa0c2 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -85,12 +85,10 @@
     <string name="color_label_light_green">Jasnozielony</string>
     <string name="color_label_lime">Żółtyzielony</string>
     <string name="color_label_yellow">Żółty</string>
-    <string name="color_label_amber">Bursztynowy</string>
     <string name="color_label_orange">Pomarańczowy</string>
     <string name="color_label_brown">Brązowy</string>
     <string name="color_label_grey">Szary</string>
     <string name="color_label_blue_grey">Błękitszary</string>
-    <string name="color_label_neutral">Neutralny</string>
 
     <!-- Format Namespace | Value formatting/plurals -->
     <string name="format_songs_loaded">Utwory uruchamia się: %d</string>
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 29416d1a4..4a7ff6bb1 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -22,12 +22,11 @@
     <color name="teal">#009688</color>
     <color name="green">#4caf50</color>
     <color name="light_green">#8bc34a</color>
-    <color name="lime">#cddc39</color>
-    <color name="yellow">#f1ca00</color>
-    <color name="amber">#ffc107</color>
-    <color name="orange">#ff9800</color>
+    <color name="lime">#B7C534</color>
+    <color name="yellow">#E4AC00</color>
+    <color name="orange">#E68A01</color>
     <color name="deep_orange">#ff5722</color>
     <color name="brown">#795548</color>
-    <color name="grey">#9e9e9e</color>
+    <color name="grey">#808080</color>
     <color name="blue_grey">#607d8b</color>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index eb7aae8dd..33bb1fc17 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -141,13 +141,11 @@
     <string name="color_label_light_green">Light Green</string>
     <string name="color_label_lime">Lime</string>
     <string name="color_label_yellow">Yellow</string>
-    <string name="color_label_amber">Amber</string>
     <string name="color_label_orange">Orange</string>
     <string name="color_label_deep_orange">Deep Orange</string>
     <string name="color_label_brown">Brown</string>
     <string name="color_label_grey">Grey</string>
     <string name="color_label_blue_grey">Blue Grey</string>
-    <string name="color_label_neutral">Neutral</string>
 
     <!-- Format Namespace | Value formatting/plurals -->
     <string name="format_next_from">Next From: %s</string>
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index 1afd231c2..b9b8e7426 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -68,11 +68,6 @@
         <item name="colorSecondary">@color/yellow</item>
     </style>
 
-    <style name="Theme.Amber" parent="Theme.Base">
-        <item name="colorPrimary">@color/amber</item>
-        <item name="colorSecondary">@color/amber</item>
-    </style>
-
     <style name="Theme.Orange" parent="Theme.Base">
         <item name="colorPrimary">@color/orange</item>
         <item name="colorSecondary">@color/orange</item>