accent: simplify accents

Simplify the accent scheme:
- Light Blue was re-generated to be a weird darker-on-light-mode
lighter-on-dark-mode blue that looked really similar to how blue-grey
turned out. These have been merged into a new color scheme called
deep blue.
- Deep Orange and Red were too similar after being re-generated, so
they have been merged to become a simple red accent.

app/src/main/java/org/oxycblt/auxio/accent/Accent.kt

@@ -18,13 +18,7 @@
 
 package org.oxycblt.auxio.accent
 
-import android.annotation.SuppressLint
-import android.content.Context
-import android.content.res.ColorStateList
-import android.text.Spanned
-import androidx.core.text.HtmlCompat
 import org.oxycblt.auxio.R
-import org.oxycblt.auxio.util.resolveStateList
 
 val ACCENT_PRIMARY_COLORS = arrayOf(
     R.color.red_primary,
@@ -41,10 +35,8 @@ val ACCENT_PRIMARY_COLORS = arrayOf(
     R.color.lime_primary,
     R.color.yellow_primary,
     R.color.orange_primary,
-    R.color.deep_orange_primary,
     R.color.brown_primary,
     R.color.grey_primary,
-    R.color.blue_grey_primary
 )
 
 val ACCENT_THEMES = arrayOf(
@@ -62,10 +54,8 @@ val ACCENT_THEMES = arrayOf(
     R.style.Theme_Auxio_Lime,
     R.style.Theme_Auxio_Yellow,
     R.style.Theme_Auxio_Orange,
-    R.style.Theme_Auxio_DeepOrange,
     R.style.Theme_Auxio_Brown,
     R.style.Theme_Auxio_Grey,
-    R.style.Theme_Auxio_BlueGrey
 )
 
 val ACCENT_BLACK_THEMES = arrayOf(
@@ -83,10 +73,8 @@ val ACCENT_BLACK_THEMES = arrayOf(
     R.style.Theme_Auxio_Black_Lime,
     R.style.Theme_Auxio_Black_Yellow,
     R.style.Theme_Auxio_Black_Orange,
-    R.style.Theme_Auxio_Black_DeepOrange,
     R.style.Theme_Auxio_Black_Brown,
     R.style.Theme_Auxio_Black_Grey,
-    R.style.Theme_Auxio_Black_BlueGrey
 )
 
 val ACCENT_NAMES = arrayOf(
@@ -104,44 +92,23 @@ val ACCENT_NAMES = arrayOf(
     R.string.clr_lime,
     R.string.clr_yellow,
     R.string.clr_orange,
-    R.string.clr_deep_orange,
     R.string.clr_brown,
     R.string.clr_grey,
-    R.string.clr_blue_grey
 )
 
 /**
  * The data object for an accent.
- * @property color The primary color resource for this accent
+ * @property name  The name of this accent
  * @property theme The theme resource for this accent
  * @property blackTheme The black theme resource for this accent
- * @property name  The name of this accent
+ * @property primary The primary color resource for this accent
  * @author OxygenCobalt
  */
 data class Accent(val index: Int) {
-    val color: Int get() = ACCENT_PRIMARY_COLORS[index]
+    val name: Int get() = ACCENT_NAMES[index]
     val theme: Int get() = ACCENT_THEMES[index]
     val blackTheme: Int get() = ACCENT_BLACK_THEMES[index]
-    val name: Int get() = ACCENT_NAMES[index]
+    val primary: Int get() = ACCENT_PRIMARY_COLORS[index]
-
-    /**
-     * Get a [ColorStateList] of the accent
-     */
-    fun getStateList(context: Context) = color.resolveStateList(context)
-
-    /**
-     * Get the name (in bold) and the hex value of a accent.
-     */
-    @SuppressLint("ResourceType")
-    fun getDetailedSummary(context: Context): Spanned {
-        val name = context.getString(name)
-        val hex = context.getString(color).uppercase()
-
-        return HtmlCompat.fromHtml(
-            context.getString(R.string.fmt_accent_desc, name, hex),
-            HtmlCompat.FROM_HTML_MODE_COMPACT
-        )
-    }
 
     companion object {
         @Volatile

app/src/main/java/org/oxycblt/auxio/accent/AccentAdapter.kt

@@ -26,6 +26,7 @@ import org.oxycblt.auxio.R
 import org.oxycblt.auxio.databinding.ItemAccentBinding
 import org.oxycblt.auxio.util.inflater
 import org.oxycblt.auxio.util.resolveAttr
+import org.oxycblt.auxio.util.resolveColor
 import org.oxycblt.auxio.util.resolveStateList
 
 /**
@@ -62,8 +63,8 @@ class AccentAdapter(
             setSelected(accent == curAccent)
 
             binding.accent.apply {
+                backgroundTintList = ColorStateList.valueOf(accent.primary.resolveColor(context))
                 contentDescription = context.getString(accent.name)
-                backgroundTintList = accent.getStateList(context)
                 TooltipCompat.setTooltipText(this, contentDescription)
             }
 

app/src/main/java/org/oxycblt/auxio/settings/SettingsCompat.kt

@@ -56,8 +56,8 @@ fun handleThemeCompat(prefs: SharedPreferences): Int {
 }
 
 fun handleAccentCompat(prefs: SharedPreferences): Accent {
-    if (prefs.contains(OldKeys.KEY_ACCENT)) {
+    if (prefs.contains(OldKeys.KEY_ACCENT1)) {
-        var accent = prefs.getInt(OldKeys.KEY_ACCENT, 5)
+        var accent = prefs.getInt(OldKeys.KEY_ACCENT1, 5)
 
         // Correct any accents over yellow to their correct positions
         if (accent > 12) {
@@ -74,15 +74,42 @@ fun handleAccentCompat(prefs: SharedPreferences): Accent {
             accent = ACCENT_PRIMARY_COLORS.lastIndex
         }
 
+        // Move this to the [also legacy] ACCENT2 field. This makes it easier to convert in the
+        // next step.
         prefs.edit {
-            putInt(SettingsManager.KEY_ACCENT, accent)
+            putInt(OldKeys.KEY_ACCENT2, accent)
-            remove(OldKeys.KEY_ACCENT)
+            remove(OldKeys.KEY_ACCENT1)
             apply()
         }
 
         return Accent(accent)
     }
 
+    if (prefs.contains(OldKeys.KEY_ACCENT2)) {
+        var accent = prefs.getInt(OldKeys.KEY_ACCENT2, 5)
+
+        // Blue grey was merged with Light Blue in 2.0.0
+        if (accent >= 17) {
+            accent = 6
+        }
+
+        // Deep Orange was merged with red in 2.0.0
+        if (accent == 14) {
+            accent = 0
+        }
+
+        // Correct accents beyond deep orange (Brown/Grey)
+        if (accent > 14) {
+            accent--
+        }
+
+        prefs.edit {
+            putInt(SettingsManager.KEY_ACCENT, accent)
+            remove(OldKeys.KEY_ACCENT2)
+            apply()
+        }
+    }
+
     return Accent(prefs.getInt(SettingsManager.KEY_ACCENT, 5))
 }
 
@@ -119,7 +146,8 @@ private fun SharedPreferences.getStringOrNull(key: String): String? = getString(
  * Cache of the old keys used in Auxio.
  */
 private object OldKeys {
-    const val KEY_ACCENT = "KEY_ACCENT"
+    const val KEY_ACCENT1 = "KEY_ACCENT"
+    const val KEY_ACCENT2 = "KEY_ACCENT2"
     const val KEY_THEME = "KEY_THEME"
     const val KEY_SONG_PLAYBACK_MODE = "KEY_SONG_PLAY_MODE"
 }

app/src/main/java/org/oxycblt/auxio/settings/SettingsListFragment.kt

@@ -18,7 +18,6 @@
 
 package org.oxycblt.auxio.settings
 
-import android.os.Build
 import android.os.Bundle
 import android.view.View
 import androidx.annotation.DrawableRes
@@ -32,7 +31,6 @@ import androidx.preference.children
 import androidx.recyclerview.widget.RecyclerView
 import coil.Coil
 import org.oxycblt.auxio.R
-import org.oxycblt.auxio.accent.Accent
 import org.oxycblt.auxio.accent.AccentDialog
 import org.oxycblt.auxio.excluded.ExcludedDialog
 import org.oxycblt.auxio.playback.PlaybackViewModel
@@ -91,6 +89,10 @@ class SettingsListFragment : PreferenceFragmentCompat() {
      * Recursively call [handlePreference] on a preference.
      */
     private fun recursivelyHandleChildren(preference: Preference) {
+        if (!preference.isVisible) {
+            return
+        }
+
         if (preference is PreferenceCategory) {
             // If this preference is a category of its own, handle its own children
             preference.children.forEach { pref ->
@@ -108,8 +110,6 @@ class SettingsListFragment : PreferenceFragmentCompat() {
         pref.apply {
             when (key) {
                 SettingsManager.KEY_THEME -> {
-                    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) return
-
                     setIcon(AppCompatDelegate.getDefaultNightMode().toThemeIcon())
 
                     onPreferenceChangeListener = Preference.OnPreferenceChangeListener { _, value ->
@@ -120,8 +120,6 @@ class SettingsListFragment : PreferenceFragmentCompat() {
                 }
 
                 SettingsManager.KEY_BLACK_THEME -> {
-                    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) return
-
                     onPreferenceClickListener = Preference.OnPreferenceClickListener {
                         if (requireContext().isNight) {
                             requireActivity().recreate()
@@ -132,14 +130,12 @@ class SettingsListFragment : PreferenceFragmentCompat() {
                 }
 
                 SettingsManager.KEY_ACCENT -> {
-                    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) return
-
                     onPreferenceClickListener = Preference.OnPreferenceClickListener {
                         AccentDialog().show(childFragmentManager, AccentDialog.TAG)
                         true
                     }
 
-                    summary = Accent.get().getDetailedSummary(context)
+                    summary = context.getString(settingsManager.accent.name)
                 }
 
                 SettingsManager.KEY_LIB_TABS -> {

app/src/main/java/org/oxycblt/auxio/settings/SettingsManager.kt

@@ -251,7 +251,7 @@ class SettingsManager private constructor(context: Context) :
     companion object {
         const val KEY_THEME = "KEY_THEME2"
         const val KEY_BLACK_THEME = "KEY_BLACK_THEME"
-        const val KEY_ACCENT = "KEY_ACCENT2"
+        const val KEY_ACCENT = "KEY_ACCENT3"
 
         const val KEY_LIB_TABS = "KEY_LIB_TABS"
         const val KEY_SHOW_COVERS = "KEY_SHOW_COVERS"

app/src/main/res/color/overlay_seekbar_halo.xml

@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:alpha="0.24" android:color="?attr/colorPrimary" />
-</selector>

app/src/main/res/drawable/ic_launcher_foreground.xml

@@ -6,5 +6,5 @@
     <path
         android:fillColor="#ffffff"
         android:pathData="M 53.999797,30.00003 V 56.66727 H 52.765254 48.82459 44.568872 l -6.567779,6.56803 v 4.05833 c -4.8e-5,0.0136 -0.0011,0.0269 -0.0011,0.0405 0,0.0136 0.0011,0.027 0.0011,0.0405 v 4.0573 l 6.567779,6.56804 h 8.196382 l 6.567788,-6.56804 v -4.0573 c 5e-5,-0.0133 9.92e-4,-0.0269 9.92e-4,-0.0405 V 40.667439 H 70.000006 V 30.001057 Z"
-        android:strokeColor="#00000000"></path>
+        android:strokeColor="#00000000" />
 </vector>

app/src/main/res/drawable/ui_accent_circle.xml

@@ -1,12 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ripple xmlns:android="http://schemas.android.com/apk/res/android"
-    android:color="?attr/colorSurface">
+    android:color="?attr/colorControlHighlight">
     <item android:id="@android:id/background">
-        <shape
+        <shape android:shape="rectangle">
-            android:shape="rectangle"
-            android:tint="@color/sel_accented">
             <corners android:radius="@dimen/spacing_large" />
-            <solid android:color="@android:color/white" />
+            <solid android:color="?attr/colorPrimary" />
         </shape>
     </item>
 </ripple>

app/src/main/res/drawable/ui_play_pause_circle.xml

@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<ripple xmlns:android="http://schemas.android.com/apk/res/android"
-    android:color="@color/mtrl_btn_ripple_color">
-    <item android:id="@android:id/background">
-        <shape
-            android:shape="rectangle"
-            android:tint="@color/sel_accented">
-            <corners android:radius="@dimen/spacing_large" />
-            <solid android:color="@android:color/white" />
-        </shape>
-    </item>
-</ripple>

app/src/main/res/layout/dialog_accent.xml

@@ -11,6 +11,7 @@
         android:paddingStart="@dimen/spacing_medium"
         android:paddingTop="@dimen/spacing_medium"
         android:paddingEnd="@dimen/spacing_medium"
+        android:paddingBottom="@dimen/spacing_small"
         app:layoutManager="org.oxycblt.auxio.accent.AutoGridLayoutManager"
         app:layout_constraintBottom_toTopOf="@+id/accent_cancel"
         app:layout_constraintTop_toBottomOf="@+id/accent_header"

app/src/main/res/values-cs/strings.xml

@@ -134,10 +134,8 @@
     <string name="clr_lime">"Limetková"</string>
     <string name="clr_yellow">"Žlutá"</string>
     <string name="clr_orange">"Oranžová"</string>
-    <string name="clr_deep_orange">"Tmavě oranžová"</string>
     <string name="clr_brown">"Hnědá"</string>
     <string name="clr_grey">"Šedá"</string>
-    <string name="clr_blue_grey">"Modrá šedá"</string>
 
     <!-- Format Namespace | Value formatting/plurals -->
     <string name="fmt_next_from">"Další z: %s"</string>

app/src/main/res/values-de/strings.xml

@@ -133,10 +133,8 @@
     <string name="clr_lime">Lindgrün</string>
     <string name="clr_yellow">Gelb</string>
     <string name="clr_orange">Orange</string>
-    <string name="clr_deep_orange">Tieforange</string>
     <string name="clr_brown">Braun</string>
     <string name="clr_grey">Grau</string>
-    <string name="clr_blue_grey">Blaugrau</string>
 
     <!-- Format Namespace | Value formatting/plurals -->
     <string name="fmt_next_from">Nächsten von: %s</string>

app/src/main/res/values-el/strings.xml

@@ -74,7 +74,6 @@
     <string name="clr_orange">Πορτοκαλής</string>
     <string name="clr_brown">Καφέ</string>
     <string name="clr_grey">Γκρί</string>
-    <string name="clr_blue_grey">Γαλάζιος Γκρί</string>
 
     <!-- Format Namespace | Value formatting/plurals -->
     <string name="fmt_songs_loaded">Τραγούδια φορτώθηκε: %d</string>

app/src/main/res/values-es/strings.xml

@@ -137,10 +137,8 @@
     <string name="clr_lime">Lima</string>
     <string name="clr_yellow">Amarillo</string>
     <string name="clr_orange">Naranja</string>
-    <string name="clr_deep_orange">Naranja Profundo</string>
     <string name="clr_brown">Café</string>
     <string name="clr_grey">Gris</string>
-    <string name="clr_blue_grey">Azul Gris</string>
 
     <!-- Format Namespace | Value formatting/plurals -->
     <string name="fmt_next_from">Siguiente de: %s</string>

app/src/main/res/values-fr/strings.xml

@@ -83,7 +83,6 @@
     <string name="clr_orange">Orange</string>
     <string name="clr_brown">Brun</string>
     <string name="clr_grey">Gris</string>
-    <string name="clr_blue_grey">Bleu Gris</string>
 
     <!-- Format Namespace | Value formatting/plurals -->
     <string name="fmt_songs_loaded">Titres chargés: %d</string>

app/src/main/res/values-hu/strings.xml

@@ -83,7 +83,6 @@
     <string name="clr_orange">Narancs</string>
     <string name="clr_brown">Barna</string>
     <string name="clr_grey">Szürke</string>
-    <string name="clr_blue_grey">Kékszürke</string>
 
     <!-- Format Namespace | Value formatting/plurals -->
     <plurals name="fmt_song_count">

app/src/main/res/values-it/strings.xml

@@ -84,7 +84,6 @@
     <string name="clr_orange">Arancio</string>
     <string name="clr_brown">Bruno</string>
     <string name="clr_grey">Grigio</string>
-    <string name="clr_blue_grey">Azzurro Grigio</string>
 
     <!-- Format Namespace | Value formatting/plurals -->
     <string name="fmt_songs_loaded">Brani caricate: %d</string>

app/src/main/res/values-night/colors.xml

@@ -145,30 +145,30 @@
     <color name="blue_on_surface_variant">#C3C7D0</color>
     <color name="blue_surface_inverse">#E2E2E6</color>
     <color name="blue_on_surface_inverse">#1B1B1B</color>
-
+    
-    <color name="light_blue_primary">#8BCEFF</color>
+    <color name="light_blue_primary">#62D3FF</color>
-    <color name="light_blue_on_primary">#003450</color>
+    <color name="light_blue_on_primary">#003546</color>
-    <color name="light_blue_primary_container">#004B71</color>
+    <color name="light_blue_primary_container">#004D64</color>
-    <color name="light_blue_on_primary_container">#C8E6FF</color>
+    <color name="light_blue_on_primary_container">#BAE9FF</color>
-    <color name="light_blue_primary_inverse">#006494</color>
+    <color name="light_blue_primary_inverse">#006684</color>
-    <color name="light_blue_secondary">#B7C8D8</color>
+    <color name="light_blue_secondary">#B4CAD6</color>
-    <color name="light_blue_on_secondary">#22323F</color>
+    <color name="light_blue_on_secondary">#1F333C</color>
-    <color name="light_blue_secondary_container">#384956</color>
+    <color name="light_blue_secondary_container">#354A53</color>
-    <color name="light_blue_on_secondary_container">#D3E4F5</color>
+    <color name="light_blue_on_secondary_container">#D0E6F2</color>
-    <color name="light_blue_tertiary">#CFBFE8</color>
+    <color name="light_blue_tertiary">#C5C2EA</color>
-    <color name="light_blue_on_tertiary">#362B4B</color>
+    <color name="light_blue_on_tertiary">#2E2D4C</color>
-    <color name="light_blue_tertiary_container">#4D4162</color>
+    <color name="light_blue_tertiary_container">#454365</color>
-    <color name="light_blue_on_tertiary_container">#ECDCFF</color>
+    <color name="light_blue_on_tertiary_container">#E3DFFF</color>
     <color name="light_blue_error">#FFB4A9</color>
     <color name="light_blue_on_error">#680003</color>
     <color name="light_blue_error_container">#930006</color>
     <color name="light_blue_on_error_container">#FFDAD4</color>
-    <color name="light_blue_surface">#1A1C1E</color>
+    <color name="light_blue_surface">#191C1E</color>
-    <color name="light_blue_on_surface">#E2E2E5</color>
+    <color name="light_blue_on_surface">#E1E2E4</color>
-    <color name="light_blue_surface_variant">#41474D</color>
+    <color name="light_blue_surface_variant">#40484C</color>
-    <color name="light_blue_on_surface_variant">#C1C7CE</color>
+    <color name="light_blue_on_surface_variant">#C0C8CD</color>
-    <color name="light_blue_surface_inverse">#E2E2E5</color>
+    <color name="light_blue_surface_inverse">#E1E2E4</color>
-    <color name="light_blue_on_surface_inverse">#1A1C1E</color>
+    <color name="light_blue_on_surface_inverse">#191C1E</color>
 
     <color name="cyan_primary">#44D8F1</color>
     <color name="cyan_on_primary">#00363F</color>
@@ -338,30 +338,6 @@
     <color name="orange_surface_inverse">#EBE0D9</color>
     <color name="orange_on_surface_inverse">#1F1B17</color>
 
-    <color name="deep_orange_primary">#FFB49D</color>
-    <color name="deep_orange_on_primary">#611300</color>
-    <color name="deep_orange_primary_container">#881F00</color>
-    <color name="deep_orange_on_primary_container">#FFDACF</color>
-    <color name="deep_orange_primary_inverse">#B22C00</color>
-    <color name="deep_orange_secondary">#E7BDB2</color>
-    <color name="deep_orange_on_secondary">#442A22</color>
-    <color name="deep_orange_secondary_container">#5D3F37</color>
-    <color name="deep_orange_on_secondary_container">#FFDACF</color>
-    <color name="deep_orange_tertiary">#D8C58D</color>
-    <color name="deep_orange_on_tertiary">#3A2F04</color>
-    <color name="deep_orange_tertiary_container">#534619</color>
-    <color name="deep_orange_on_tertiary_container">#F6E1A6</color>
-    <color name="deep_orange_error">#FFB4A9</color>
-    <color name="deep_orange_on_error">#680003</color>
-    <color name="deep_orange_error_container">#930006</color>
-    <color name="deep_orange_on_error_container">#FFDAD4</color>
-    <color name="deep_orange_surface">#201A18</color>
-    <color name="deep_orange_on_surface">#EDE0DD</color>
-    <color name="deep_orange_surface_variant">#53433F</color>
-    <color name="deep_orange_on_surface_variant">#D8C2BC</color>
-    <color name="deep_orange_surface_inverse">#EDE0DD</color>
-    <color name="deep_orange_on_surface_inverse">#201A18</color>
-
     <color name="brown_primary">#E7BEB0</color>
     <color name="brown_on_primary">#442A20</color>
     <color name="brown_primary_container">#5D4035</color>
@@ -379,13 +355,10 @@
     <color name="brown_on_error">#680003</color>
     <color name="brown_error_container">#930006</color>
     <color name="brown_on_error_container">#FFDAD4</color>
-    <color name="brown_background">#201A18</color>
-    <color name="brown_on_background">#EDE0DC</color>
     <color name="brown_surface">#201A18</color>
     <color name="brown_on_surface">#EDE0DC</color>
     <color name="brown_surface_variant">#52433E</color>
     <color name="brown_on_surface_variant">#D8C2BB</color>
-    <color name="brown_outline">#A08C86</color>
     <color name="brown_surface_inverse">#EDE0DC</color>
     <color name="brown_on_surface_inverse">#201A18</color>
     
@@ -412,28 +385,4 @@
     <color name="grey_on_surface_variant">#C8C8C8</color>
     <color name="grey_surface_inverse">#fafafa</color>
     <color name="grey_on_surface_inverse">#191919</color>
-
-    <color name="blue_grey_primary">#62D3FF</color>
-    <color name="blue_grey_on_primary">#003546</color>
-    <color name="blue_grey_primary_container">#004D64</color>
-    <color name="blue_grey_on_primary_container">#BAE9FF</color>
-    <color name="blue_grey_primary_inverse">#006684</color>
-    <color name="blue_grey_secondary">#B4CAD6</color>
-    <color name="blue_grey_on_secondary">#1F333C</color>
-    <color name="blue_grey_secondary_container">#354A53</color>
-    <color name="blue_grey_on_secondary_container">#D0E6F2</color>
-    <color name="blue_grey_tertiary">#C5C2EA</color>
-    <color name="blue_grey_on_tertiary">#2E2D4C</color>
-    <color name="blue_grey_tertiary_container">#454365</color>
-    <color name="blue_grey_on_tertiary_container">#E3DFFF</color>
-    <color name="blue_grey_error">#FFB4A9</color>
-    <color name="blue_grey_on_error">#680003</color>
-    <color name="blue_grey_error_container">#930006</color>
-    <color name="blue_grey_on_error_container">#FFDAD4</color>
-    <color name="blue_grey_surface">#191C1E</color>
-    <color name="blue_grey_on_surface">#E1E2E4</color>
-    <color name="blue_grey_surface_variant">#40484C</color>
-    <color name="blue_grey_on_surface_variant">#C0C8CD</color>
-    <color name="blue_grey_surface_inverse">#E1E2E4</color>
-    <color name="blue_grey_on_surface_inverse">#191C1E</color>
 </resources>

app/src/main/res/values-nl/strings.xml

@@ -135,10 +135,8 @@
     <string name="clr_lime">Geelgroen</string>
     <string name="clr_yellow">Geel</string>
     <string name="clr_orange">Oranje</string>
-    <string name="clr_deep_orange">Dieporanje</string>
     <string name="clr_brown">Bruin</string>
     <string name="clr_grey">Grijis</string>
-    <string name="clr_blue_grey">Blauwgrijis</string>
 
     <!-- Format Namespace | Value formatting/plurals -->
     <string name="fmt_next_from">Volgende van: %s</string>

app/src/main/res/values-pl/strings.xml

@@ -81,7 +81,6 @@
     <string name="clr_orange">Pomarańczowy</string>
     <string name="clr_brown">Brązowy</string>
     <string name="clr_grey">Szary</string>
-    <string name="clr_blue_grey">Błękitszary</string>
 
     <!-- Format Namespace | Value formatting/plurals -->
     <string name="fmt_songs_loaded">Utwory uruchamia się: %d</string>

app/src/main/res/values-pt-rBR/strings.xml

@@ -82,7 +82,6 @@
     <string name="clr_orange">Laranja</string>
     <string name="clr_brown">Moreno</string>
     <string name="clr_grey">Grisalho</string>
-    <string name="clr_blue_grey">Azul-grisalho</string>
 
     <!-- Format Namespace | Value formatting/plurals -->
     <string name="fmt_songs_loaded">Músicas carregado: %d</string>

app/src/main/res/values-pt-rPT/strings.xml

@@ -83,7 +83,6 @@
     <string name="clr_orange">Laranja</string>
     <string name="clr_brown">Moreno</string>
     <string name="clr_grey">Grisalho</string>
-    <string name="clr_blue_grey">Azul-grisalho</string>
 
     <!-- Format Namespace | Value formatting/plurals -->
     <string name="fmt_songs_loaded">Músicas carregado: %d</string>

app/src/main/res/values-ro/strings.xml

@@ -82,7 +82,6 @@
     <string name="clr_orange">Portocaliu</string>
     <string name="clr_brown">Brun</string>
     <string name="clr_grey">Gri</string>
-    <string name="clr_blue_grey">Albastru Gri</string>
 
     <!-- Format Namespace | Value formatting/plurals -->
     <plurals name="fmt_song_count">

app/src/main/res/values-ru/strings.xml

@@ -79,7 +79,6 @@
     <string name="clr_light_green">Жёлтый</string>
     <string name="clr_orange">Коричневый</string>
     <string name="clr_brown">Седой</string>
-    <string name="clr_blue_grey">Нейтральный</string>
 
     <!-- Format Namespace | Value formatting/plurals -->
     <string name="fmt_songs_loaded">Треки загружено: %d</string>

app/src/main/res/values/colors.xml

@@ -47,7 +47,6 @@
     <color name="pink_on_surface">#201A1B</color>
     <color name="pink_surface_variant">#F4DDDF</color>
     <color name="pink_on_surface_variant">#524345</color>
-    <color name="pink_outline">#847375</color>
     <color name="pink_surface_inverse">#362F30</color>
     <color name="pink_on_surface_inverse">#FAEEEE</color>
 
@@ -72,7 +71,6 @@
     <color name="purple_on_surface">#1E1A1D</color>
     <color name="purple_surface_variant">#ECDEE8</color>
     <color name="purple_on_surface_variant">#4D444C</color>
-    <color name="purple_outline">#7E747C</color>
     <color name="purple_surface_inverse">#332F32</color>
     <color name="purple_on_surface_inverse">#F7EEF3</color>
 
@@ -147,30 +145,30 @@
     <color name="blue_on_surface_variant">#42474E</color>
     <color name="blue_surface_inverse">#2F3033</color>
     <color name="blue_on_surface_inverse">#F1F0F4</color>
-
+    
-    <color name="light_blue_primary">#006494</color>
+    <color name="light_blue_primary">#006684</color>
     <color name="light_blue_on_primary">#FFFFFF</color>
-    <color name="light_blue_primary_container">#C8E6FF</color>
+    <color name="light_blue_primary_container">#BAE9FF</color>
-    <color name="light_blue_on_primary_container">#001E31</color>
+    <color name="light_blue_on_primary_container">#001F2A</color>
-    <color name="light_blue_primary_inverse">#8BCEFF</color>
+    <color name="light_blue_primary_inverse">#62D3FF</color>
-    <color name="light_blue_secondary">#50606E</color>
+    <color name="light_blue_secondary">#4D616B</color>
     <color name="light_blue_on_secondary">#FFFFFF</color>
-    <color name="light_blue_secondary_container">#D3E4F5</color>
+    <color name="light_blue_secondary_container">#D0E6F2</color>
-    <color name="light_blue_on_secondary_container">#0C1D29</color>
+    <color name="light_blue_on_secondary_container">#081E27</color>
-    <color name="light_blue_tertiary">#65597B</color>
+    <color name="light_blue_tertiary">#5D5B7E</color>
     <color name="light_blue_on_tertiary">#FFFFFF</color>
-    <color name="light_blue_tertiary_container">#ECDCFF</color>
+    <color name="light_blue_tertiary_container">#E3DFFF</color>
-    <color name="light_blue_on_tertiary_container">#201634</color>
+    <color name="light_blue_on_tertiary_container">#191836</color>
     <color name="light_blue_error">#BA1B1B</color>
     <color name="light_blue_on_error">#FFFFFF</color>
     <color name="light_blue_error_container">#FFDAD4</color>
     <color name="light_blue_on_error_container">#410001</color>
-    <color name="light_blue_surface">#FCFCFF</color>
+    <color name="light_blue_surface">#FBFCFE</color>
-    <color name="light_blue_on_surface">#1A1C1E</color>
+    <color name="light_blue_on_surface">#191C1E</color>
-    <color name="light_blue_surface_variant">#DEE3EA</color>
+    <color name="light_blue_surface_variant">#DCE4E9</color>
-    <color name="light_blue_on_surface_variant">#41474D</color>
+    <color name="light_blue_on_surface_variant">#40484C</color>
-    <color name="light_blue_surface_inverse">#2F3032</color>
+    <color name="light_blue_surface_inverse">#2E3133</color>
-    <color name="light_blue_on_surface_inverse">#F0F0F3</color>
+    <color name="light_blue_on_surface_inverse">#F0F1F3</color>
 
     <color name="cyan_primary">#006877</color>
     <color name="cyan_on_primary">#FFFFFF</color>
@@ -340,30 +338,6 @@
     <color name="orange_surface_inverse">#352F2A</color>
     <color name="orange_on_surface_inverse">#FAEFE7</color>
 
-    <color name="deep_orange_primary">#B22C00</color>
-    <color name="deep_orange_on_primary">#FFFFFF</color>
-    <color name="deep_orange_primary_container">#FFDACF</color>
-    <color name="deep_orange_on_primary_container">#3C0800</color>
-    <color name="deep_orange_primary_inverse">#FFB49D</color>
-    <color name="deep_orange_secondary">#77574E</color>
-    <color name="deep_orange_on_secondary">#FFFFFF</color>
-    <color name="deep_orange_secondary_container">#FFDACF</color>
-    <color name="deep_orange_on_secondary_container">#2C150F</color>
-    <color name="deep_orange_tertiary">#6C5D2F</color>
-    <color name="deep_orange_on_tertiary">#FFFFFF</color>
-    <color name="deep_orange_tertiary_container">#F6E1A6</color>
-    <color name="deep_orange_on_tertiary_container">#231B00</color>
-    <color name="deep_orange_error">#BA1B1B</color>
-    <color name="deep_orange_on_error">#FFFFFF</color>
-    <color name="deep_orange_error_container">#FFDAD4</color>
-    <color name="deep_orange_on_error_container">#410001</color>
-    <color name="deep_orange_surface">#FCFCFC</color>
-    <color name="deep_orange_on_surface">#201A18</color>
-    <color name="deep_orange_surface_variant">#F5DED8</color>
-    <color name="deep_orange_on_surface_variant">#53433F</color>
-    <color name="deep_orange_surface_inverse">#362F2D</color>
-    <color name="deep_orange_on_surface_inverse">#FBEEEB</color>
-
     <color name="brown_primary">#77574C</color>
     <color name="brown_on_primary">#FFFFFF</color>
     <color name="brown_primary_container">#FFDBCD</color>
@@ -381,13 +355,10 @@
     <color name="brown_on_error">#FFFFFF</color>
     <color name="brown_error_container">#FFDAD4</color>
     <color name="brown_on_error_container">#410001</color>
-    <color name="brown_background">#FCFCFC</color>
-    <color name="brown_on_background">#201A18</color>
     <color name="brown_surface">#FCFCFC</color>
     <color name="brown_on_surface">#201A18</color>
     <color name="brown_surface_variant">#F5DED6</color>
     <color name="brown_on_surface_variant">#52433E</color>
-    <color name="brown_outline">#85736D</color>
     <color name="brown_surface_inverse">#362F2D</color>
     <color name="brown_on_surface_inverse">#FCEEEA</color>
 
@@ -398,8 +369,8 @@
     <color name="grey_on_primary_container">#212121</color>
     <color name="grey_secondary">#4D4D4D</color>
     <color name="grey_on_secondary">#FFFFFF</color>
-    <color name="grey_secondary_container">#D0E6F2</color>
+    <color name="grey_secondary_container">#D0D0D0</color>
-    <color name="grey_on_secondary_container">#081E27</color>
+    <color name="grey_on_secondary_container">#080808</color>
     <color name="grey_tertiary">#5D5D5D</color>
     <color name="grey_on_tertiary">#FFFFFF</color>
     <color name="grey_tertiary_container">#E3E3E3</color>
@@ -414,28 +385,4 @@
     <color name="grey_on_surface_variant">#484848</color>
     <color name="grey_surface_inverse">#1f1f1f</color>
     <color name="grey_on_surface_inverse">#F0F0F0</color>
-
-    <color name="blue_grey_primary">#006684</color>
-    <color name="blue_grey_on_primary">#FFFFFF</color>
-    <color name="blue_grey_primary_container">#BAE9FF</color>
-    <color name="blue_grey_on_primary_container">#001F2A</color>
-    <color name="blue_grey_primary_inverse">#62D3FF</color>
-    <color name="blue_grey_secondary">#4D616B</color>
-    <color name="blue_grey_on_secondary">#FFFFFF</color>
-    <color name="blue_grey_secondary_container">#D0E6F2</color>
-    <color name="blue_grey_on_secondary_container">#081E27</color>
-    <color name="blue_grey_tertiary">#5D5B7E</color>
-    <color name="blue_grey_on_tertiary">#FFFFFF</color>
-    <color name="blue_grey_tertiary_container">#E3DFFF</color>
-    <color name="blue_grey_on_tertiary_container">#191836</color>
-    <color name="blue_grey_error">#BA1B1B</color>
-    <color name="blue_grey_on_error">#FFFFFF</color>
-    <color name="blue_grey_error_container">#FFDAD4</color>
-    <color name="blue_grey_on_error_container">#410001</color>
-    <color name="blue_grey_surface">#FBFCFE</color>
-    <color name="blue_grey_on_surface">#191C1E</color>
-    <color name="blue_grey_surface_variant">#DCE4E9</color>
-    <color name="blue_grey_on_surface_variant">#40484C</color>
-    <color name="blue_grey_surface_inverse">#2E3133</color>
-    <color name="blue_grey_on_surface_inverse">#F0F1F3</color>
 </resources>

app/src/main/res/values/dimens.xml

@@ -17,8 +17,6 @@
     <dimen name="size_cover_huge_land">128dp</dimen>
     <dimen name="size_cover_huge">256dp</dimen>
 
-    <dimen name="size_stroke_large">1dp</dimen>
-
     <dimen name="size_small_unb_ripple">20dp</dimen>
     <dimen name="size_unb_ripple">24dp</dimen>
 
@@ -29,8 +27,6 @@
     <dimen name="elevation_small">2dp</dimen>
     <dimen name="elevation_normal">4dp</dimen>
 
-    <dimen name="offset_thumb">4dp</dimen>
-
     <dimen name="popup_min_width">78dp</dimen>
     <dimen name="popup_padding_end">28dp</dimen>
 

app/src/main/res/values/strings.xml

@@ -65,7 +65,8 @@
     <string name="set_theme_auto">Automatic</string>
     <string name="set_theme_day">Light</string>
     <string name="set_theme_night">Dark</string>
-    <string name="set_accent">Accent</string>
+    <string name="set_accent">Color scheme</string>
+    <string name="set_accent_desc">Colors to be used in the app</string>
     <string name="set_black_mode">Black theme</string>
     <string name="setting_black_mode_desc">Use a pure-black dark theme</string>
 
@@ -81,7 +82,7 @@
     <string name="set_alt_shuffle">Prefer shuffle action</string>
 
     <string name="set_audio">Audio</string>
-    <string name="set_focus">Audio Focus</string>
+    <string name="set_focus">Audio focus</string>
     <string name="set_focus_desc">Pause when other audio plays [ex. Calls]</string>
     <string name="set_plug_mgt">Headset focus</string>
     <string name="set_plug_mgt_desc">Play/Pause when the headset connection changes</string>
@@ -98,7 +99,7 @@
     <string name="set_content">Content</string>
     <string name="set_save">Save playback state</string>
     <string name="set_save_desc">Save the current playback state now</string>
-    <string name="set_excluded">Excluded Folders</string>
+    <string name="set_excluded">Excluded folders</string>
     <string name="set_excluded_desc">The content of excluded folders is hidden from your library</string>
 
     <!-- Error Namespace | Error Labels -->
@@ -149,7 +150,7 @@
     <string name="clr_deep_purple">Deep Purple</string>
     <string name="clr_indigo">Indigo</string>
     <string name="clr_blue">Blue</string>
-    <string name="clr_light_blue">Light Blue</string>
+    <string name="clr_light_blue">Deep Blue</string>
     <string name="clr_cyan">Cyan</string>
     <string name="clr_teal">Teal</string>
     <string name="clr_green">Green</string>
@@ -157,10 +158,8 @@
     <string name="clr_lime">Lime</string>
     <string name="clr_yellow">Yellow</string>
     <string name="clr_orange">Orange</string>
-    <string name="clr_deep_orange">Deep Orange</string>
     <string name="clr_brown">Brown</string>
     <string name="clr_grey">Grey</string>
-    <string name="clr_blue_grey">Blue Grey</string>
 
     <!-- Format Namespace | Value formatting/plurals -->
     <string name="fmt_next_from">Next From: %s</string>

app/src/main/res/values/styles_ui.xml

@@ -19,19 +19,6 @@
         <item name="navigationIcon">@drawable/ic_down</item>
     </style>
 
-    <style name="Widget.Auxio.SeekBar" parent="Widget.AppCompat.SeekBar">
-        <item name="android:progressTint">?attr/colorPrimary</item>
-        <item name="android:progressBackgroundTint">?attr/colorSecondary</item>
-        <item name="android:thumbOffset">@dimen/offset_thumb</item>
-        <item name="android:thumbTint">?attr/colorPrimary</item>
-        <item name="android:minHeight">@dimen/size_btn_small</item>
-        <item name="android:theme">@style/ThemeOverlay.SeekbarHalo</item>
-    </style>
-
-    <style name="ThemeOverlay.SeekbarHalo" parent="">
-        <item name="colorControlHighlight">@color/overlay_seekbar_halo</item>
-    </style>
-
     <style name="Widget.Auxio.Image.Compact" parent="">
         <item name="android:layout_width">@dimen/size_cover_compact</item>
         <item name="android:layout_height">@dimen/size_cover_compact</item>

app/src/main/res/values/themes.xml

@@ -423,36 +423,6 @@
         <item name="colorOnSurfaceVariant">@color/orange_on_surface_variant</item>
     </style>
 
-    <style name="Theme.Auxio.DeepOrange" parent="Theme.Auxio.App">
-        <item name="colorPrimary">@color/deep_orange_primary</item>
-        <item name="colorOnPrimary">@color/deep_orange_on_primary</item>
-        <item name="colorPrimaryInverse">@color/deep_orange_primary_inverse</item>
-        <item name="colorPrimaryContainer">@color/deep_orange_primary_container</item>
-        <item name="colorOnPrimaryContainer">@color/deep_orange_on_primary_container</item>
-
-        <item name="colorSecondary">@color/deep_orange_secondary</item>
-        <item name="colorOnSecondary">@color/deep_orange_on_secondary</item>
-        <item name="colorSecondaryContainer">@color/deep_orange_secondary_container</item>
-        <item name="colorOnSecondaryContainer">@color/deep_orange_on_secondary_container</item>
-
-        <item name="colorTertiary">@color/deep_orange_tertiary</item>
-        <item name="colorOnTertiary">@color/deep_orange_on_tertiary</item>
-        <item name="colorTertiaryContainer">@color/deep_orange_tertiary_container</item>
-        <item name="colorOnTertiaryContainer">@color/deep_orange_on_tertiary_container</item>
-
-        <item name="colorError">@color/deep_orange_error</item>
-        <item name="colorOnError">@color/deep_orange_on_error</item>
-        <item name="colorErrorContainer">@color/deep_orange_error_container</item>
-        <item name="colorOnErrorContainer">@color/deep_orange_on_error_container</item>
-
-        <item name="colorSurface">@color/deep_orange_surface</item>
-        <item name="colorOnSurface">@color/deep_orange_on_surface</item>
-        <item name="colorSurfaceInverse">@color/deep_orange_surface_inverse</item>
-        <item name="colorOnSurfaceInverse">@color/deep_orange_on_surface_inverse</item>
-        <item name="colorSurfaceVariant">@color/deep_orange_surface_variant</item>
-        <item name="colorOnSurfaceVariant">@color/deep_orange_on_surface_variant</item>
-    </style>
-
     <style name="Theme.Auxio.Brown" parent="Theme.Auxio.App">
         <item name="colorPrimary">@color/brown_primary</item>
         <item name="colorOnPrimary">@color/brown_on_primary</item>
@@ -513,36 +483,6 @@
         <item name="colorOnSurfaceVariant">@color/grey_on_surface_variant</item>
     </style>
 
-    <style name="Theme.Auxio.BlueGrey" parent="Theme.Auxio.App">
-        <item name="colorPrimary">@color/blue_grey_primary</item>
-        <item name="colorOnPrimary">@color/blue_grey_on_primary</item>
-        <item name="colorPrimaryInverse">@color/blue_grey_primary_inverse</item>
-        <item name="colorPrimaryContainer">@color/blue_grey_primary_container</item>
-        <item name="colorOnPrimaryContainer">@color/blue_grey_on_primary_container</item>
-
-        <item name="colorSecondary">@color/blue_grey_secondary</item>
-        <item name="colorOnSecondary">@color/blue_grey_on_secondary</item>
-        <item name="colorSecondaryContainer">@color/blue_grey_secondary_container</item>
-        <item name="colorOnSecondaryContainer">@color/blue_grey_on_secondary_container</item>
-
-        <item name="colorTertiary">@color/blue_grey_tertiary</item>
-        <item name="colorOnTertiary">@color/blue_grey_on_tertiary</item>
-        <item name="colorTertiaryContainer">@color/blue_grey_tertiary_container</item>
-        <item name="colorOnTertiaryContainer">@color/blue_grey_on_tertiary_container</item>
-
-        <item name="colorError">@color/blue_grey_error</item>
-        <item name="colorOnError">@color/blue_grey_on_error</item>
-        <item name="colorErrorContainer">@color/blue_grey_error_container</item>
-        <item name="colorOnErrorContainer">@color/blue_grey_on_error_container</item>
-
-        <item name="colorSurface">@color/blue_grey_surface</item>
-        <item name="colorOnSurface">@color/blue_grey_on_surface</item>
-        <item name="colorSurfaceInverse">@color/blue_grey_surface_inverse</item>
-        <item name="colorOnSurfaceInverse">@color/blue_grey_on_surface_inverse</item>
-        <item name="colorSurfaceVariant">@color/blue_grey_surface_variant</item>
-        <item name="colorOnSurfaceVariant">@color/blue_grey_on_surface_variant</item>
-    </style>
-
     <style name="Theme.Auxio.Neutral" parent="Theme.Auxio.App">
         <item name="colorPrimary">?attr/colorControlNormal</item>
         <item name="colorOnPrimary">?attr/colorControlNormal</item>

app/src/main/res/values/themes_black.xml

@@ -56,10 +56,6 @@
         <item name="colorSurface">@android:color/black</item>
     </style>
 
-    <style name="Theme.Auxio.Black.DeepOrange" parent="Theme.Auxio.DeepOrange">
-        <item name="colorSurface">@android:color/black</item>
-    </style>
-
     <style name="Theme.Auxio.Black.Brown" parent="Theme.Auxio.Brown">
         <item name="colorSurface">@android:color/black</item>
     </style>
@@ -67,8 +63,4 @@
     <style name="Theme.Auxio.Black.Grey" parent="Theme.Auxio.Grey">
         <item name="colorSurface">@android:color/black</item>
     </style>
-
-    <style name="Theme.Auxio.Black.BlueGrey" parent="Theme.Auxio.BlueGrey">
-        <item name="colorSurface">@android:color/black</item>
-    </style>
 </resources>

app/src/main/res/xml/prefs_main.xml

@@ -16,8 +16,8 @@
 
         <Preference
             app:icon="@drawable/ic_accent"
-            app:key="KEY_ACCENT2"
+            app:key="KEY_ACCENT3"
-            app:summary="@string/clr_blue"
+            app:summary="@string/set_accent_desc"
             app:title="@string/set_accent" />
 
         <SwitchPreferenceCompat

info/FAQ.md

@@ -1,7 +1,5 @@
 # Auxio - Frequently Asked Questions
 
-For a list of **supported formats** read [Supported Formats](FORMATS.md)
-
 This FAQ will be continually updated as new changes and updates are made to Auxio.
 
 #### Where can I download Auxio?