style: use colorAccent

Use colorAccent instead of colorPrimary and colorSecondary.
2021-08-06 17:47:11 -06:00 · 2021-08-06 17:47:11 -06:00 · a566a30c15
commit a566a30c15
parent 1d828c7b0a
62 changed files with 223 additions and 280 deletions
--- a/app/src/main/java/org/oxycblt/auxio/ui/Accent.kt
+++ b/app/src/main/java/org/oxycblt/auxio/ui/Accent.kt
@ -16,24 +16,14 @@ import org.oxycblt.auxio.R
 val ACCENTS = arrayOf(
    Accent(R.color.red, R.style.Theme_Red, R.style.Theme_Red_Black, R.string.clr_red),
    Accent(R.color.pink, R.style.Theme_Pink, R.style.Theme_Pink_Black, R.string.clr_pink),
-    Accent(
-        R.color.purple,
-        R.style.Theme_Purple,
-        R.style.Theme_Purple_Black,
-        R.string.clr_purple
-    ),
+    Accent(R.color.purple, R.style.Theme_Purple, R.style.Theme_Purple_Black, R.string.clr_purple),
    Accent(
        R.color.deep_purple,
        R.style.Theme_DeepPurple,
        R.style.Theme_DeepPurple_Black,
        R.string.clr_deep_purple
    ),
-    Accent(
-        R.color.indigo,
-        R.style.Theme_Indigo,
-        R.style.Theme_Indigo_Black,
-        R.string.clr_indigo
-    ),
+    Accent(R.color.indigo, R.style.Theme_Indigo, R.style.Theme_Indigo_Black, R.string.clr_indigo),
    Accent(R.color.blue, R.style.Theme_Blue, R.style.Theme_Blue_Black, R.string.clr_blue),
    Accent(
        R.color.light_blue,
@ -48,21 +38,11 @@ val ACCENTS = arrayOf(
        R.color.light_green,
        R.style.Theme_LightGreen,
        R.style.Theme_LightGreen_Black,
-        R.string.color_light_green
-    ),
-    Accent(R.color.lime, R.style.Theme_Lime, R.style.Theme_Lime_Black, R.string.color_lime),
-    Accent(
-        R.color.yellow,
-        R.style.Theme_Yellow,
-        R.style.Theme_Yellow_Black,
-        R.string.color_yellow
-    ),
-    Accent(
-        R.color.orange,
-        R.style.Theme_Orange,
-        R.style.Theme_Orange_Black,
-        R.string.clr_orange
+        R.string.clr_light_green
    ),
+    Accent(R.color.lime, R.style.Theme_Lime, R.style.Theme_Lime_Black, R.string.clr_lime),
+    Accent(R.color.yellow, R.style.Theme_Yellow, R.style.Theme_Yellow_Black, R.string.clr_yellow),
+    Accent(R.color.orange, R.style.Theme_Orange, R.style.Theme_Orange_Black, R.string.clr_orange),
    Accent(
        R.color.deep_orange,
        R.style.Theme_DeepOrange,
--- a/app/src/main/java/org/oxycblt/auxio/widgets/Forms.kt
+++ b/app/src/main/java/org/oxycblt/auxio/widgets/Forms.kt
@ -9,7 +9,7 @@ import org.oxycblt.auxio.playback.system.PlaybackService
 import org.oxycblt.auxio.ui.newBroadcastIntent
 import org.oxycblt.auxio.ui.newMainIntent

-private fun createBaseView(
+private fun createViews(
    context: Context,
    @LayoutRes layout: Int,
    state: WidgetState
@ -56,33 +56,23 @@ private fun createBaseView(

    if (state.albumArt != null) {
        views.setImageViewBitmap(R.id.widget_cover, state.albumArt)
-        views.setCharSequence(
-            R.id.widget_cover, "setContentDescription",
-            context.getString(R.string.desc_album_cover, state.song.album.name)
+        views.setContentDescription(
+            R.id.widget_cover, context.getString(R.string.desc_album_cover, state.song.album.name)
        )
    } else {
        views.setImageViewResource(R.id.widget_cover, R.drawable.ic_song)
-        views.setCharSequence(
-            R.id.widget_cover,
-            "setContentDescription",
-            context.getString(R.string.desc_no_cover)
-        )
+        views.setContentDescription(R.id.widget_cover, context.getString(R.string.desc_no_cover))
    }

    return views
 }

 fun createSmallWidget(context: Context, state: WidgetState): RemoteViews {
-    return createBaseView(context, R.layout.widget_small, state)
+    return createViews(context, R.layout.widget_small, state)
 }

 fun createFullWidget(context: Context, state: WidgetState): RemoteViews {
-    val views = createBaseView(context, R.layout.widget_full, state)
-
-    // The main way the large widget differs from the other widgets is the addition of extra
-    // controls. However, since the context we use to load attributes is from the main process,
-    // attempting to dynamically color anything will result in an error. More duplicate
-    // resources it is. This is getting really tiring.
+    val views = createViews(context, R.layout.widget_full, state)

    views.setOnClickPendingIntent(
        R.id.widget_loop,
@ -98,10 +88,15 @@ fun createFullWidget(context: Context, state: WidgetState): RemoteViews {
        )
    )

-    val shuffleRes = if (state.isShuffled)
-        R.drawable.ic_shuffle_tinted
-    else
-        R.drawable.ic_shuffle
+    // The main way the large widget differs from the other widgets is the addition of extra
+    // controls. However, since the context we use to load attributes is from the main process,
+    // attempting to dynamically color anything will result in an error. More duplicate
+    // resources it is. This is getting really tiring.
+
+    val shuffleRes = when {
+        state.isShuffled -> R.drawable.ic_shuffle_tinted
+        else -> R.drawable.ic_shuffle
+    }

    val loopRes = when (state.loopMode) {
        LoopMode.NONE -> R.drawable.ic_loop
--- a/app/src/main/java/org/oxycblt/auxio/widgets/WidgetProvider.kt
+++ b/app/src/main/java/org/oxycblt/auxio/widgets/WidgetProvider.kt
@ -64,8 +64,6 @@ class WidgetProvider : AppWidgetProvider() {
            return
        }

-        // FIXME: Fix the race conditions with the bitmap loading.
-
        loadBitmap(context, song) { bitmap ->
            val state = WidgetState(
                song,
@ -85,6 +83,15 @@ class WidgetProvider : AppWidgetProvider() {
        }
    }

+    /*
+     * Revert this widget to its default view
+     */
+    fun reset(context: Context) {
+        logD("Resetting widget")
+
+        applyDefaultViews(context, AppWidgetManager.getInstance(context))
+    }
+
    private fun AppWidgetManager.applyViewsCompat(
        context: Context,
        views: Map<SizeF, RemoteViews>
@ -125,7 +132,8 @@ class WidgetProvider : AppWidgetProvider() {
                    // Widget dimens pre-12 are weird. Basically, they correspond to columns
                    // but with 2 columns worth of DiP added for some insane reason. Take
                    // the dimens, normalize them into cells, and then turn them back into dimens.
-                    // This is super lossy and may result in wonky layouts, but it *seems* to work.
+                    // This may result in wonky layouts, but it *seems* to work well enough
+                    // in practice.
                    width = normalizeDimen(width)
                    height = normalizeDimen(height)

@ -153,7 +161,6 @@ class WidgetProvider : AppWidgetProvider() {
                }

                // No layout fits. Just use the smallest view.
-
                logD("No widget layout found")

                val minimum = requireNotNull(
@ -175,15 +182,6 @@ class WidgetProvider : AppWidgetProvider() {
        return 70 * (cells - 2) - 30
    }

-    /*
-     * Revert this widget to its default view
-     */
-    fun reset(context: Context) {
-        logD("Resetting widget")
-
-        applyDefaultViews(context, AppWidgetManager.getInstance(context))
-    }
-
    @SuppressLint("RemoteViewLayout")
    private fun applyDefaultViews(context: Context, manager: AppWidgetManager) {
        val views = RemoteViews(context.packageName, R.layout.widget_default)
--- a/app/src/main/res/drawable/ic_accent.xml
+++ b/app/src/main/res/drawable/ic_accent.xml
@ -5,6 +5,6 @@
    android:viewportWidth="24"
    android:viewportHeight="24">
    <path
-        android:fillColor="?attr/colorPrimary"
+        android:fillColor="?attr/colorAccent"
        android:pathData="M12 3c-4.97 0-9 4.03-9 9s4.03 9 9 9c0.83 0 1.5-0.67 1.5-1.5 0-0.39-0.15-0.74-0.39-1.01-0.23-0.26-0.38-0.61-0.38-0.99 0-0.83 0.67-1.5 1.5-1.5H16c2.76 0 5-2.24 5-5 0-4.42-4.03-8-9-8zm-5.5 9C5.67 12 5 11.33 5 10.5S5.67 9 6.5 9 8 9.67 8 10.5 7.33 12 6.5 12zm3-4C8.67 8 8 7.33 8 6.5S8.67 5 9.5 5 11 5.67 11 6.5 10.33 8 9.5 8zm5 0C13.67 8 13 7.33 13 6.5S13.67 5 14.5 5 16 5.67 16 6.5 15.33 8 14.5 8zm3 4c-0.83 0-1.5-0.67-1.5-1.5S16.67 9 17.5 9 19 9.67 19 10.5 18.33 12 17.5 12z" />
 </vector>
--- a/app/src/main/res/drawable/ic_album.xml
+++ b/app/src/main/res/drawable/ic_album.xml
@ -2,7 +2,7 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
    android:width="24dp"
    android:height="24dp"
-    android:tint="?attr/colorPrimary"
+    android:tint="?attr/colorAccent"
    android:viewportWidth="24"
    android:viewportHeight="24">
    <path
--- a/app/src/main/res/drawable/ic_artist.xml
+++ b/app/src/main/res/drawable/ic_artist.xml
@ -2,7 +2,7 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
    android:width="24dp"
    android:height="24dp"
-    android:tint="?attr/colorPrimary"
+    android:tint="?attr/colorAccent"
    android:viewportWidth="24"
    android:viewportHeight="24">
    <path
--- a/app/src/main/res/drawable/ic_auto.xml
+++ b/app/src/main/res/drawable/ic_auto.xml
@ -2,7 +2,7 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
    android:width="24dp"
    android:height="24dp"
-    android:tint="?attr/colorPrimary"
+    android:tint="?attr/colorAccent"
    android:viewportWidth="24"
    android:viewportHeight="24">
    <path
--- a/app/src/main/res/drawable/ic_clear.xml
+++ b/app/src/main/res/drawable/ic_clear.xml
@ -2,7 +2,7 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
    android:width="24dp"
    android:height="24dp"
-    android:tint="?attr/colorPrimary"
+    android:tint="?attr/colorAccent"
    android:viewportWidth="24"
    android:viewportHeight="24">
    <path
--- a/app/src/main/res/drawable/ic_day.xml
+++ b/app/src/main/res/drawable/ic_day.xml
@ -2,7 +2,7 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
    android:width="24dp"
    android:height="24dp"
-    android:tint="?attr/colorPrimary"
+    android:tint="?attr/colorAccent"
    android:viewportWidth="24"
    android:viewportHeight="24">
    <path
--- a/app/src/main/res/drawable/ic_error.xml
+++ b/app/src/main/res/drawable/ic_error.xml
@ -2,7 +2,7 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
    android:width="24dp"
    android:height="24dp"
-    android:tint="?attr/colorPrimary"
+    android:tint="?attr/colorAccent"
    android:viewportWidth="24"
    android:viewportHeight="24">
    <path
--- a/app/src/main/res/drawable/ic_genre.xml
+++ b/app/src/main/res/drawable/ic_genre.xml
@ -2,7 +2,7 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
    android:width="24dp"
    android:height="24dp"
-    android:tint="?attr/colorPrimary"
+    android:tint="?attr/colorAccent"
    android:viewportWidth="24"
    android:viewportHeight="24">
    <path
--- a/app/src/main/res/drawable/ic_library.xml
+++ b/app/src/main/res/drawable/ic_library.xml
@ -2,7 +2,7 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
    android:width="24dp"
    android:height="24dp"
-    android:tint="?attr/colorPrimary"
+    android:tint="?attr/colorAccent"
    android:viewportWidth="24"
    android:viewportHeight="24">
    <path
--- a/app/src/main/res/drawable/ic_loop_all_tinted.xml
+++ b/app/src/main/res/drawable/ic_loop_all_tinted.xml
@ -2,7 +2,7 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
    android:width="24dp"
    android:height="24dp"
-    android:tint="?attr/colorPrimary"
+    android:tint="?attr/colorAccent"
    android:viewportWidth="24"
    android:viewportHeight="24">
    <path
--- a/app/src/main/res/drawable/ic_loop_one_tinted.xml
+++ b/app/src/main/res/drawable/ic_loop_one_tinted.xml
@ -2,7 +2,7 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
    android:width="24dp"
    android:height="24dp"
-    android:tint="?attr/colorPrimary"
+    android:tint="?attr/colorAccent"
    android:viewportWidth="24"
    android:viewportHeight="24">
    <path
--- a/app/src/main/res/drawable/ic_night.xml
+++ b/app/src/main/res/drawable/ic_night.xml
@ -2,7 +2,7 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
    android:width="24dp"
    android:height="24dp"
-    android:tint="?attr/colorPrimary"
+    android:tint="?attr/colorAccent"
    android:viewportWidth="24"
    android:viewportHeight="24">
    <path
--- a/app/src/main/res/drawable/ic_shuffle_tinted.xml
+++ b/app/src/main/res/drawable/ic_shuffle_tinted.xml
@ -2,7 +2,7 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
    android:width="24dp"
    android:height="24dp"
-    android:tint="?attr/colorPrimary"
+    android:tint="?attr/colorAccent"
    android:viewportWidth="24"
    android:viewportHeight="24">
    <path
--- a/app/src/main/res/drawable/ic_song.xml
+++ b/app/src/main/res/drawable/ic_song.xml
@ -1,7 +1,7 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
    android:width="24dp"
    android:height="24dp"
-    android:tint="?attr/colorPrimary"
+    android:tint="?attr/colorAccent"
    android:viewportWidth="24"
    android:viewportHeight="24">
    <path
--- a/app/src/main/res/drawable/ic_sort_alpha_down.xml
+++ b/app/src/main/res/drawable/ic_sort_alpha_down.xml
@ -1,7 +1,7 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
    android:width="24dp"
    android:height="24dp"
-    android:tint="?attr/colorPrimary"
+    android:tint="?attr/colorAccent"
    android:viewportWidth="24"
    android:viewportHeight="24">
    <path
--- a/app/src/main/res/drawable/ic_sort_alpha_up.xml
+++ b/app/src/main/res/drawable/ic_sort_alpha_up.xml
@ -1,7 +1,7 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
    android:width="24dp"
    android:height="24dp"
-    android:tint="?attr/colorPrimary"
+    android:tint="?attr/colorAccent"
    android:viewportWidth="24"
    android:viewportHeight="24">
    <path
--- a/app/src/main/res/drawable/ic_sort_numeric_down.xml
+++ b/app/src/main/res/drawable/ic_sort_numeric_down.xml
@ -2,7 +2,7 @@
    xmlns:tools="http://schemas.android.com/tools"
    android:width="24dp"
    android:height="24dp"
-    android:tint="?android:attr/colorPrimary"
+    android:tint="?android:attr/colorAccent"
    android:viewportWidth="24"
    android:viewportHeight="24">
    <path
--- a/app/src/main/res/drawable/ic_sort_numeric_up.xml
+++ b/app/src/main/res/drawable/ic_sort_numeric_up.xml
@ -2,7 +2,7 @@
    xmlns:tools="http://schemas.android.com/tools"
    android:width="24dp"
    android:height="24dp"
-    android:tint="?attr/colorPrimary"
+    android:tint="?attr/colorAccent"
    android:viewportWidth="24"
    android:viewportHeight="24">
    <path
--- a/app/src/main/res/drawable/ui_cursor.xml
+++ b/app/src/main/res/drawable/ui_cursor.xml
@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?><!--Custom cursor shape that reflects the current accent color. https://stackoverflow.com/a/28311351/14143986-->
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
    android:shape="rectangle">
-    <solid android:color="?attr/colorPrimary" />
+    <solid android:color="?attr/colorAccent" />
    <size android:width="2dp" />
 </shape>
--- a/app/src/main/res/layout-land/item_album_header.xml
+++ b/app/src/main/res/layout-land/item_album_header.xml
@ -99,7 +99,7 @@
            style="@style/Widget.Button.Vibrant.Primary"
            android:layout_marginStart="@dimen/spacing_small"
            android:layout_marginEnd="@dimen/spacing_medium"
-            android:backgroundTint="?attr/colorPrimary"
+            android:backgroundTint="?attr/colorAccent"
            android:onClick="@{() -> playbackModel.playAlbum(album, true)}"
            android:text="@string/lbl_shuffle"
            app:layout_constraintBottom_toBottomOf="@+id/album_play_button"
--- a/app/src/main/res/layout-land/item_artist_header.xml
+++ b/app/src/main/res/layout-land/item_artist_header.xml
@ -89,7 +89,7 @@
        <com.google.android.material.button.MaterialButton
            android:id="@+id/artist_shuffle_button"
            style="@style/Widget.Button.Vibrant.Primary"
-            android:backgroundTint="?attr/colorPrimary"
+            android:backgroundTint="?attr/colorAccent"
            android:onClick="@{() -> playbackModel.playArtist(artist, true)}"
            android:text="@string/lbl_shuffle"
            android:layout_marginStart="@dimen/spacing_small"
--- a/app/src/main/res/layout-land/item_genre_header.xml
+++ b/app/src/main/res/layout-land/item_genre_header.xml
@ -80,7 +80,7 @@
        <com.google.android.material.button.MaterialButton
            android:id="@+id/genre_shuffle_button"
            style="@style/Widget.Button.Vibrant.Primary"
-            android:backgroundTint="?attr/colorPrimary"
+            android:backgroundTint="?attr/colorAccent"
            android:onClick="@{() -> playbackModel.playGenre(genre, true)}"
            android:text="@string/lbl_shuffle"
            android:layout_marginStart="@dimen/spacing_small"
--- a/app/src/main/res/layout-large/item_album_header.xml
+++ b/app/src/main/res/layout-large/item_album_header.xml
@ -97,7 +97,7 @@
        <com.google.android.material.button.MaterialButton
            android:id="@+id/album_shuffle_button"
            style="@style/Widget.Button.Vibrant.Primary"
-            android:backgroundTint="?attr/colorPrimary"
+            android:backgroundTint="?attr/colorAccent"
            android:onClick="@{() -> playbackModel.playAlbum(album, true)}"
            android:text="@string/lbl_shuffle"
            android:layout_marginStart="@dimen/spacing_small"
--- a/app/src/main/res/layout-large/item_artist_header.xml
+++ b/app/src/main/res/layout-large/item_artist_header.xml
@ -89,7 +89,7 @@
        <com.google.android.material.button.MaterialButton
            android:id="@+id/artist_shuffle_button"
            style="@style/Widget.Button.Vibrant.Primary"
-            android:backgroundTint="?attr/colorPrimary"
+            android:backgroundTint="?attr/colorAccent"
            android:onClick="@{() -> playbackModel.playArtist(artist, true)}"
            android:text="@string/lbl_shuffle"
            android:layout_marginStart="@dimen/spacing_small"
--- a/app/src/main/res/layout-large/item_genre_header.xml
+++ b/app/src/main/res/layout-large/item_genre_header.xml
@ -80,7 +80,7 @@
        <com.google.android.material.button.MaterialButton
            android:id="@+id/genre_shuffle_button"
            style="@style/Widget.Button.Vibrant.Primary"
-            android:backgroundTint="?attr/colorPrimary"
+            android:backgroundTint="?attr/colorAccent"
            android:onClick="@{() -> playbackModel.playGenre(genre, true)}"
            android:text="@string/lbl_shuffle"
            android:layout_marginStart="@dimen/spacing_small"
--- a/app/src/main/res/layout/fragment_search.xml
+++ b/app/src/main/res/layout/fragment_search.xml
@ -27,7 +27,7 @@
                android:layout_width="match_parent"
                android:layout_height="wrap_content"
                app:boxBackgroundMode="filled"
-                app:boxStrokeColor="?attr/colorPrimary"
+                app:boxStrokeColor="?attr/colorAccent"
                app:boxStrokeWidth="0dp"
                app:boxStrokeWidthFocused="2dp"
                app:endIconContentDescription="@string/desc_clear_search"
--- a/app/src/main/res/layout/item_accent.xml
+++ b/app/src/main/res/layout/item_accent.xml
@ -17,7 +17,7 @@
            android:padding="@dimen/spacing_medium"
            android:scaleType="fitCenter"
            android:src="@drawable/ic_check"
-            tools:backgroundTint="?attr/colorPrimary"
+            tools:backgroundTint="?attr/colorAccent"
            tools:ignore="contentDescription" />

    </FrameLayout>
--- a/app/src/main/res/layout/item_album_header.xml
+++ b/app/src/main/res/layout/item_album_header.xml
@ -93,7 +93,7 @@
            style="@style/Widget.Button.Vibrant.Primary"
            android:layout_marginStart="@dimen/spacing_small"
            android:layout_marginEnd="@dimen/spacing_medium"
-            android:backgroundTint="?attr/colorPrimary"
+            android:backgroundTint="?attr/colorAccent"
            android:onClick="@{() -> playbackModel.playAlbum(album, true)}"
            android:text="@string/lbl_shuffle"
            app:layout_constraintBottom_toBottomOf="@+id/album_play_button"
--- a/app/src/main/res/layout/item_artist_header.xml
+++ b/app/src/main/res/layout/item_artist_header.xml
@ -88,7 +88,7 @@
            style="@style/Widget.Button.Vibrant.Primary"
            android:layout_marginStart="@dimen/spacing_small"
            android:layout_marginEnd="@dimen/spacing_medium"
-            android:backgroundTint="?attr/colorPrimary"
+            android:backgroundTint="?attr/colorAccent"
            android:onClick="@{() -> playbackModel.playArtist(artist, true)}"
            android:text="@string/lbl_shuffle"
            app:layout_constraintBottom_toBottomOf="@+id/artist_play_button"
--- a/app/src/main/res/layout/item_genre_header.xml
+++ b/app/src/main/res/layout/item_genre_header.xml
@ -91,7 +91,7 @@
        <com.google.android.material.button.MaterialButton
            android:id="@+id/genre_shuffle_button"
            style="@style/Widget.Button.Vibrant.Primary"
-            android:backgroundTint="?attr/colorPrimary"
+            android:backgroundTint="?attr/colorAccent"
            android:onClick="@{() -> playbackModel.playGenre(genre, true)}"
            android:text="@string/lbl_shuffle"
            app:layout_constraintBottom_toBottomOf="@+id/genre_play_button"
--- a/app/src/main/res/layout/view_fast_scroll.xml
+++ b/app/src/main/res/layout/view_fast_scroll.xml
@ -13,7 +13,7 @@
            android:layout_width="@dimen/size_scroll_thumb"
            android:layout_height="@dimen/size_scroll_thumb"
            android:background="@drawable/ui_circle"
-            android:backgroundTint="?attr/colorPrimary"
+            android:backgroundTint="?attr/colorAccent"
            android:elevation="@dimen/elevation_small"
            android:stateListAnimator="@animator/animator_thumb"
            app:layout_constraintEnd_toStartOf="@+id/scroll_indicator_text">
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@ -79,12 +79,12 @@
    <string name="set_plug_mgt">Kopfhörerafokus</string>
    <string name="set_plug_mgt_desc">Abspielen/Pausieren wenn der Kopfhöreranschluss ändern</string>

-    <string name="setting_behavior">Verhalten</string>
-    <string name="setting_behavior_song_playback_mode">Wenn ein Lied ausgewählt hat</string>
-    <string name="setting_behavior_keep_shuffle">Zufällig-Einstellung merken</string>
-    <string name="setting_behavior_keep_shuffle_desc">Lassen zufällig an, wenn ein neues Lied anspielen</string>
-    <string name="setting_behavior_rewind_prev">Zurückspulen bevor zurück springen</string>
-    <string name="setting_behavior_rewind_prev_desc">Zurückspulen bevor zum vorheriger Lied springen</string>
+    <string name="set_behavior">Verhalten</string>
+    <string name="set_song_mode">Wenn ein Lied ausgewählt hat</string>
+    <string name="set_keep_shuffle">Zufällig-Einstellung merken</string>
+    <string name="set_keep_shuffle_desc">Lassen zufällig an, wenn ein neues Lied anspielen</string>
+    <string name="set_rewind_prev">Zurückspulen bevor zurück springen</string>
+    <string name="set_rewind_prev_desc">Zurückspulen bevor zum vorheriger Lied springen</string>

    <string name="set_content">Content</string>
    <string name="set_save">Wiedergabezustand abspeichern</string>
@ -137,9 +137,9 @@
    <string name="clr_cyan">Türkis</string>
    <string name="clr_teal">Blaugrün</string>
    <string name="clr_green">Grün</string>
-    <string name="color_light_green">Hellgrün</string>
-    <string name="color_lime">Lindgrün</string>
-    <string name="color_yellow">Gelb</string>
+    <string name="clr_light_green">Hellgrün</string>
+    <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_label_brown">Braun</string>
--- a/app/src/main/res/values-el/strings.xml
+++ b/app/src/main/res/values-el/strings.xml
@ -50,7 +50,7 @@

    <string name="set_audio">Ήχος</string>

-    <string name="setting_behavior">Συμπεριφορά</string>
+    <string name="set_behavior">Συμπεριφορά</string>

    <!-- Description Namespace | Accessibility Strings -->
    <string name="desc_track_number">Κομμάτι %d</string>
@ -72,9 +72,9 @@
    <string name="clr_light_blue">Ανοιχτός Γαλάζιος</string>
    <string name="clr_teal">Γαλάζιος Πράσινος</string>
    <string name="clr_green">Πράσινος</string>
-    <string name="color_light_green">Ανοιχτός Πράσινος</string>
-    <string name="color_lime">Πράσινος Κίτρινος</string>
-    <string name="color_yellow">Κίτρινος</string>
+    <string name="clr_light_green">Ανοιχτός Πράσινος</string>
+    <string name="clr_lime">Πράσινος Κίτρινος</string>
+    <string name="clr_yellow">Κίτρινος</string>
    <string name="clr_orange">Πορτοκαλής</string>
    <string name="clr_label_brown">Καφέ</string>
    <string name="clr_label_grey">Γκρί</string>
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@ -82,12 +82,12 @@
    <string name="set_plug_mgt">Conexión de auriculares</string>
    <string name="set_plug_mgt_desc">Reproducir/Pausar cuando la conexión de los auriculares cambie</string>

-    <string name="setting_behavior">Funcionamiento</string>
-    <string name="setting_behavior_song_playback_mode">Cuando una canción es seleccionada</string>
-    <string name="setting_behavior_keep_shuffle">Recordar orden aleatorio</string>
-    <string name="setting_behavior_keep_shuffle_desc">Mantener la reproducción aleatoria cuando se reproduce una nueva canción</string>
-    <string name="setting_behavior_rewind_prev">Rebobinar antes de saltar al anterior</string>
-    <string name="setting_behavior_rewind_prev_desc">Rebobinar antes de saltar a la canción anterior</string>
+    <string name="set_behavior">Funcionamiento</string>
+    <string name="set_song_mode">Cuando una canción es seleccionada</string>
+    <string name="set_keep_shuffle">Recordar orden aleatorio</string>
+    <string name="set_keep_shuffle_desc">Mantener la reproducción aleatoria cuando se reproduce una nueva canción</string>
+    <string name="set_rewind_prev">Rebobinar antes de saltar al anterior</string>
+    <string name="set_rewind_prev_desc">Rebobinar antes de saltar a la canción anterior</string>

    <string name="set_content">Contenido</string>
    <string name="set_save">Guardar estado de reproducción</string>
@ -141,9 +141,9 @@
    <string name="clr_cyan">Cyan</string>
    <string name="clr_teal">Teal</string>
    <string name="clr_green">Verde</string>
-    <string name="color_light_green">Verde Claro</string>
-    <string name="color_lime">Lima</string>
-    <string name="color_yellow">Amarillo</string>
+    <string name="clr_light_green">Verde Claro</string>
+    <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_label_brown">Café</string>
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@ -56,7 +56,7 @@
    <string name="set_focus">Audio Focus</string>
    <string name="set_plug_mgt">Branchement du casque</string>

-    <string name="setting_behavior">Comportement</string>
+    <string name="set_behavior">Comportement</string>

    <!-- Error Namespace | Error Labels -->
    <string name="err_no_music">Pas de musique trouvée</string>
@ -81,9 +81,9 @@
    <string name="clr_light_blue">Bleu Clair</string>
    <string name="clr_teal">Bleu Vert</string>
    <string name="clr_green">Vert</string>
-    <string name="color_light_green">Vert Clair</string>
-    <string name="color_lime">Vert Citron</string>
-    <string name="color_yellow">Jaune</string>
+    <string name="clr_light_green">Vert Clair</string>
+    <string name="clr_lime">Vert Citron</string>
+    <string name="clr_yellow">Jaune</string>
    <string name="clr_orange">Orange</string>
    <string name="clr_label_brown">Brun</string>
    <string name="clr_label_grey">Gris</string>
--- a/app/src/main/res/values-hi/strings.xml
+++ b/app/src/main/res/values-hi/strings.xml
@ -46,7 +46,7 @@
    <string name="set_focus">ऑडियो फोकस</string>
    <string name="set_plug_mgt">हेडसेट प्लग</string>

-    <string name="setting_behavior">चाल चलन</string>
+    <string name="set_behavior">चाल चलन</string>

    <!-- Error Namespace | Error Labels -->
    <string name="err_no_music">कोई संगीत नहीं मिला</string>
--- a/app/src/main/res/values-hu/strings.xml
+++ b/app/src/main/res/values-hu/strings.xml
@ -54,7 +54,7 @@
    <string name="set_focus">Hangfókusz</string>
    <string name="set_plug_mgt">Fejhallgató csatlakozó</string>

-    <string name="setting_behavior">Működés</string>
+    <string name="set_behavior">Működés</string>

    <!-- Error Namespace | Error Labels -->
    <string name="err_no_music">Nem található zene</string>
@ -81,9 +81,9 @@
    <string name="clr_light_blue">Világoskék</string>
    <string name="clr_teal">Kékeszöld</string>
    <string name="clr_green">Zöld</string>
-    <string name="color_light_green">Világoszöld</string>
-    <string name="color_lime">Sárgazöld</string>
-    <string name="color_yellow">Sárga</string>
+    <string name="clr_light_green">Világoszöld</string>
+    <string name="clr_lime">Sárgazöld</string>
+    <string name="clr_yellow">Sárga</string>
    <string name="clr_orange">Narancs</string>
    <string name="clr_label_brown">Barna</string>
    <string name="clr_label_grey">Szürke</string>
--- a/app/src/main/res/values-in/strings.xml
+++ b/app/src/main/res/values-in/strings.xml
@ -53,8 +53,8 @@
    <string name="set_audio">Audio</string>
    <string name="set_focus">Fokus audio</string>

-    <string name="setting_behavior">Perilaku</string>
-    <string name="setting_behavior_keep_shuffle">Ingat putar acak</string>
+    <string name="set_behavior">Perilaku</string>
+    <string name="set_keep_shuffle">Ingat putar acak</string>

    <!-- Error Namespace | Error Labels -->
    <string name="err_no_music">Musik tidak ditemukan</string>
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@ -55,8 +55,8 @@
    <string name="set_focus">Focus audio</string>
    <string name="set_plug_mgt">Inserimento cuffie</string>

-    <string name="setting_behavior">Comportamento</string>
-    <string name="setting_behavior_keep_shuffle">Ricorda casuale</string>
+    <string name="set_behavior">Comportamento</string>
+    <string name="set_keep_shuffle">Ricorda casuale</string>

    <!-- Error Namespace | Error Labels -->
    <string name="err_no_music">Nessuna canzone trovata</string>
@ -82,9 +82,9 @@
    <string name="clr_light_blue">Azzurro Chiaro</string>
    <string name="clr_teal">Azzurro Verde</string>
    <string name="clr_green">Verde</string>
-    <string name="color_light_green">Verde Chiaro</string>
-    <string name="color_lime">Verde Giallo</string>
-    <string name="color_yellow">Giallo</string>
+    <string name="clr_light_green">Verde Chiaro</string>
+    <string name="clr_lime">Verde Giallo</string>
+    <string name="clr_yellow">Giallo</string>
    <string name="clr_orange">Arancio</string>
    <string name="clr_label_brown">Bruno</string>
    <string name="clr_label_grey">Grigio</string>
--- a/app/src/main/res/values-ko/strings.xml
+++ b/app/src/main/res/values-ko/strings.xml
@ -53,7 +53,7 @@
    <string name="set_focus">오디오 포커스</string>
    <string name="set_plug_mgt">헤드셋 연결</string>

-    <string name="setting_behavior">동작</string>
+    <string name="set_behavior">동작</string>

    <!-- Error Namespace | Error Labels -->
    <string name="err_no_music">노래를 찾을 수 없습니다</string>
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@ -80,12 +80,12 @@
    <string name="set_plug_mgt">Headset-pluggen</string>
    <string name="set_plug_mgt_desc">Afspelen/Pauzeren wanneer de headsetaansluiting verandert</string>

-    <string name="setting_behavior">Gedrag</string>
-    <string name="setting_behavior_song_playback_mode">Wanneer een liedje is geselecteerd</string>
-    <string name="setting_behavior_keep_shuffle">Onthoud shuffle</string>
-    <string name="setting_behavior_keep_shuffle_desc">Houd shuffle aan bij het afspelen van een nieuw nummer</string>
-    <string name="setting_behavior_rewind_prev">Terugspoelen voordat je terugspoelt</string>
-    <string name="setting_behavior_rewind_prev_desc">Terugspoelen voordat u naar het vorige nummer gaat</string>
+    <string name="set_behavior">Gedrag</string>
+    <string name="set_song_mode">Wanneer een liedje is geselecteerd</string>
+    <string name="set_keep_shuffle">Onthoud shuffle</string>
+    <string name="set_keep_shuffle_desc">Houd shuffle aan bij het afspelen van een nieuw nummer</string>
+    <string name="set_rewind_prev">Terugspoelen voordat je terugspoelt</string>
+    <string name="set_rewind_prev_desc">Terugspoelen voordat u naar het vorige nummer gaat</string>

    <string name="set_content">Inhoud</string>
    <string name="set_save">Afspeelstatus opslaan</string>
@ -138,10 +138,10 @@
    <string name="clr_light_blue">Lichtblauw</string>
    <string name="clr_teal">Blauwgroen</string>
    <string name="clr_green">Groen</string>
-    <string name="color_light_green">Lichtgroen</string>
+    <string name="clr_light_green">Lichtgroen</string>
    <string name="clr_cyan">Cyaan</string>
-    <string name="color_lime">Geelgroen</string>
-    <string name="color_yellow">Geel</string>
+    <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_label_brown">Bruin</string>
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@ -54,7 +54,7 @@
    <string name="set_focus">Wyciszanie otoczenia</string>
    <string name="set_plug_mgt">Podłączanie słuchawek</string>

-    <string name="setting_behavior">Zachowanie</string>
+    <string name="set_behavior">Zachowanie</string>

    <!-- Error Namespace | Error Labels -->
    <string name="err_no_music">Nie znaleziono muzyki</string>
@ -79,9 +79,9 @@
    <string name="clr_blue">Błękit</string>
    <string name="clr_light_blue">Jasnobłękit</string>
    <string name="clr_green">Zielony</string>
-    <string name="color_light_green">Jasnozielony</string>
-    <string name="color_lime">Żółtyzielony</string>
-    <string name="color_yellow">Żółty</string>
+    <string name="clr_light_green">Jasnozielony</string>
+    <string name="clr_lime">Żółtyzielony</string>
+    <string name="clr_yellow">Żółty</string>
    <string name="clr_orange">Pomarańczowy</string>
    <string name="clr_label_brown">Brązowy</string>
    <string name="clr_label_grey">Szary</string>
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@ -54,8 +54,8 @@
    <string name="set_focus">Foco do áudio</string>
    <string name="set_plug_mgt">Entrada do fone de ouvido</string>

-    <string name="setting_behavior">Comportamento</string>
-    <string name="setting_behavior_keep_shuffle">Memorizar aleatorização</string>
+    <string name="set_behavior">Comportamento</string>
+    <string name="set_keep_shuffle">Memorizar aleatorização</string>

    <!-- Error Namespace | Error Labels -->
    <string name="err_no_music">Nenhuma música encontrada</string>
@ -80,9 +80,9 @@
    <string name="clr_light_blue">Azul-claro</string>
    <string name="clr_teal">Azul-verde</string>
    <string name="clr_green">Verde</string>
-    <string name="color_light_green">Verde-claro</string>
-    <string name="color_lime">Verde-amarelo</string>
-    <string name="color_yellow">Amarelo</string>
+    <string name="clr_light_green">Verde-claro</string>
+    <string name="clr_lime">Verde-amarelo</string>
+    <string name="clr_yellow">Amarelo</string>
    <string name="clr_orange">Laranja</string>
    <string name="clr_label_brown">Moreno</string>
    <string name="clr_label_grey">Grisalho</string>
--- a/app/src/main/res/values-pt-rPT/strings.xml
+++ b/app/src/main/res/values-pt-rPT/strings.xml
@ -55,8 +55,8 @@
    <string name="set_focus">Foco de áudio</string>
    <string name="set_plug_mgt">Entrada do fone de ouvido</string>

-    <string name="setting_behavior">Comportamento</string>
-    <string name="setting_behavior_keep_shuffle">Memorizar aleatorização</string>
+    <string name="set_behavior">Comportamento</string>
+    <string name="set_keep_shuffle">Memorizar aleatorização</string>

    <!-- Error Namespace | Error Labels -->
    <string name="err_no_music">Nenhuma música encontrada</string>
@ -81,9 +81,9 @@
    <string name="clr_light_blue">Azul-claro</string>
    <string name="clr_teal">Azul-verde</string>
    <string name="clr_green">Verde</string>
-    <string name="color_light_green">Verde-claro</string>
-    <string name="color_lime">Verde-amarelo</string>
-    <string name="color_yellow">Amarelo</string>
+    <string name="clr_light_green">Verde-claro</string>
+    <string name="clr_lime">Verde-amarelo</string>
+    <string name="clr_yellow">Amarelo</string>
    <string name="clr_orange">Laranja</string>
    <string name="clr_label_brown">Moreno</string>
    <string name="clr_label_grey">Grisalho</string>
--- a/app/src/main/res/values-ro/strings.xml
+++ b/app/src/main/res/values-ro/strings.xml
@ -55,7 +55,7 @@
    <string name="set_focus">Concentrare audio</string>
    <string name="set_plug_mgt">Conexiune cu cască</string>

-    <string name="setting_behavior">Comportament</string>
+    <string name="set_behavior">Comportament</string>

    <!-- Error Namespace | Error Labels -->
    <string name="err_no_music">Nu s-a găsit nici o muzică</string>
@ -80,9 +80,9 @@
    <string name="clr_light_blue">Albastru Deschis</string>
    <string name="clr_teal">Albastru Verde</string>
    <string name="clr_green">Verde</string>
-    <string name="color_light_green">Verde Deschis</string>
-    <string name="color_lime">Verde Galben</string>
-    <string name="color_yellow">Galben</string>
+    <string name="clr_light_green">Verde Deschis</string>
+    <string name="clr_lime">Verde Galben</string>
+    <string name="clr_yellow">Galben</string>
    <string name="clr_orange">Portocaliu</string>
    <string name="clr_label_brown">Brun</string>
    <string name="clr_label_grey">Gri</string>
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@ -54,8 +54,8 @@
    <string name="set_focus">Фокусировка аудио</string>
    <string name="set_plug_mgt">Гарнитура</string>

-    <string name="setting_behavior">Поведение</string>
-    <string name="setting_behavior_keep_shuffle">Запомнить перемешивание</string>
+    <string name="set_behavior">Поведение</string>
+    <string name="set_keep_shuffle">Запомнить перемешивание</string>

    <!-- Error Namespace | Error Labels -->
    <string name="err_no_music">Музыка не найдена</string>
@ -79,8 +79,8 @@
    <string name="clr_light_blue">Голубой</string>
    <string name="clr_teal">Зелёный</string>
    <string name="clr_green">Светло-Зелёный</string>
-    <string name="color_yellow">Оранжевый</string>
-    <string name="color_light_green">Жёлтый</string>
+    <string name="clr_yellow">Оранжевый</string>
+    <string name="clr_light_green">Жёлтый</string>
    <string name="clr_orange">Коричневый</string>
    <string name="clr_label_brown">Седой</string>
    <string name="clr_blue_grey">Нейтральный</string>
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@ -53,7 +53,7 @@
    <string name="set_audio">Ses</string>
    <string name="set_focus">Ses odaklama</string>

-    <string name="setting_behavior">Tercihler</string>
+    <string name="set_behavior">Tercihler</string>

    <!-- Error Namespace | Error Labels -->
    <string name="err_no_music">Müzik bulunamadı</string>
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@ -47,7 +47,7 @@

    <string name="set_audio">Аудіо</string>

-    <string name="setting_behavior">Поведінка</string>
+    <string name="set_behavior">Поведінка</string>

    <!-- Error Namespace | Error Labels -->
    <string name="err_no_music">Музику не знайдено</string>
--- a/app/src/main/res/values-v31/styles_core.xml
+++ b/app/src/main/res/values-v31/styles_core.xml
@ -2,7 +2,7 @@
 <resources>

    <style name="Theme.Widget" parent="@android:style/Theme.DeviceDefault.DayNight">
-        <item name="colorPrimary">?android:attr/colorAccent</item>
+        <item name="colorAccent">?android:attr/colorAccent</item>
        <item name="colorSecondary">?android:attr/colorAccent</item>
        <item name="colorControlNormal">?android:attr/colorControlNormal</item>
        <item name="colorControlHighlight">?android:attr/colorControlHighlight</item>
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@ -48,7 +48,7 @@

    <string name="set_audio">音频</string>

-    <string name="setting_behavior">行为</string>
+    <string name="set_behavior">行为</string>

    <!-- Hint Namespace | EditText Hints -->
    <string name="hint_search_library">正在扫描…</string>
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@ -53,8 +53,8 @@
    <string name="set_focus">音頻焦點</string>
    <string name="set_plug_mgt">耳機插頭</string>

-    <string name="setting_behavior">行為</string>
-    <string name="setting_behavior_keep_shuffle">記住隨機播放</string>
+    <string name="set_behavior">行為</string>
+    <string name="set_keep_shuffle">記住隨機播放</string>

    <!-- Error Namespace | Error Labels -->
    <string name="err_no_music">找不到音樂</string>
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@ -85,14 +85,14 @@
    <string name="set_plug_mgt">Headset focus</string>
    <string name="set_plug_mgt_desc">Play/Pause when the headset connection changes</string>

-    <string name="setting_behavior">Behavior</string>
-    <string name="setting_behavior_song_playback_mode">When a song is selected</string>
-    <string name="setting_behavior_keep_shuffle">Remember shuffle</string>
-    <string name="setting_behavior_keep_shuffle_desc">Keep shuffle on when playing a new song</string>
-    <string name="setting_behavior_rewind_prev">Rewind before skipping back</string>
-    <string name="setting_behavior_rewind_prev_desc">Rewind before skipping to the previous song</string>
-    <string name="setting_behavior_loop_pause">Pause on repeat</string>
-    <string name="setting_behavior_loop_pause_desc">Pause when a song repeats</string>
+    <string name="set_behavior">Behavior</string>
+    <string name="set_song_mode">When a song is selected</string>
+    <string name="set_keep_shuffle">Remember shuffle</string>
+    <string name="set_keep_shuffle_desc">Keep shuffle on when playing a new song</string>
+    <string name="set_rewind_prev">Rewind before skipping back</string>
+    <string name="set_rewind_prev_desc">Rewind before skipping to the previous song</string>
+    <string name="set_loop_pause">Pause on repeat</string>
+    <string name="set_loop_pause_desc">Pause when a song repeats</string>

    <string name="set_content">Content</string>
    <string name="set_save">Save playback state</string>
@ -151,9 +151,9 @@
    <string name="clr_cyan">Cyan</string>
    <string name="clr_teal">Teal</string>
    <string name="clr_green">Green</string>
-    <string name="color_light_green">Light Green</string>
-    <string name="color_lime">Lime</string>
-    <string name="color_yellow">Yellow</string>
+    <string name="clr_light_green">Light Green</string>
+    <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_label_brown">Brown</string>
--- a/app/src/main/res/values/styles_component.xml
+++ b/app/src/main/res/values/styles_component.xml
@ -7,7 +7,7 @@
        <item name="android:layout_height">@dimen/size_play_pause</item>
        <item name="android:layout_width">@dimen/size_play_pause</item>
        <item name="android:background">@drawable/ui_circle_ripple</item>
-        <item name="android:backgroundTint">?attr/colorPrimary</item>
+        <item name="android:backgroundTint">?attr/colorAccent</item>
        <item name="android:elevation">@dimen/elevation_normal</item>
        <item name="android:contentDescription">@string/desc_play_pause</item>
        <item name="android:tint">?android:attr/windowBackground</item>
--- a/app/src/main/res/values/styles_core.xml
+++ b/app/src/main/res/values/styles_core.xml
@ -7,24 +7,27 @@

    <!-- Base theme -->
    <style name="Theme.Base" parent="Theme.Template">
+        <!-- Colors -->
+        <item name="colorSurface">@color/surface_color</item>
+        <item name="colorAccent">@color/design_default_color_primary</item>
+
+        <item name="colorPrimary">?attr/colorSurface</item>
+        <item name="colorSecondary">?attr/colorSurface</item>
+        <item name="colorControlNormal">@color/control_color</item>
+        <item name="colorControlHighlight">@color/selection_color</item>
+        <item name="colorControlActivated">?attr/colorAccent</item>
+
+        <!-- Appearance -->
        <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>
        <item name="android:textCursorDrawable">@drawable/ui_cursor</item>
-
-        <!-- Default values for the accents. -->
-        <item name="colorPrimary">@color/design_default_color_primary</item>
-        <item name="colorSecondary">@color/design_default_color_primary</item>
-
-        <item name="popupMenuStyle">@style/Widget.CustomPopup</item>
-        <item name="colorControlNormal">@color/control_color</item>
-        <item name="colorControlHighlight">@color/selection_color</item>
-        <item name="colorControlActivated">?attr/colorPrimary</item>
        <item name="cornerRadius">0dp</item>

-        <item name="colorSurface">@color/surface_color</item>
+        <!-- System-specific magic -->
+        <item name="android:scrollbars">none</item>
+        <item name="android:windowIsFloating">false</item>
+        <item name="popupMenuStyle">@style/Widget.CustomPopup</item>

        <!--
        These exact flags, in this exact order, in this exact formatting somehow make
--- a/app/src/main/res/values/styles_ui.xml
+++ b/app/src/main/res/values/styles_ui.xml
@ -11,7 +11,7 @@
        <item name="popupTheme">@style/ThemeOverlay.ToolbarPopup</item>

        <item name="titleTextAppearance">@style/TextAppearance.Toolbar.Header</item>
-        <item name="titleTextColor">?attr/colorPrimary</item>
+        <item name="titleTextColor">?attr/colorAccent</item>
        <item name="contentInsetStartWithNavigation">0dp</item>
    </style>

@ -29,7 +29,7 @@
        <item name="android:layout_width">match_parent</item>
        <item name="android:layout_height">@dimen/height_compact_progress</item>
        <item name="android:progressBackgroundTint">?attr/colorControlNormal</item>
-        <item name="android:progressTint">?attr/colorPrimary</item>
+        <item name="android:progressTint">?attr/colorAccent</item>
    </style>

    <style name="Widget.SeekBar.Full" parent="@style/Widget.AppCompat.SeekBar">
@ -38,10 +38,10 @@
        <item name="android:paddingStart">@dimen/spacing_mid_large</item>
        <item name="android:paddingEnd">@dimen/spacing_mid_large</item>
        <item name="android:progressBackgroundTint">?android:attr/colorControlNormal</item>
-        <item name="android:progressTint">?attr/colorPrimary</item>
+        <item name="android:progressTint">?attr/colorAccent</item>
        <item name="android:splitTrack">false</item>
        <item name="android:thumbOffset">@dimen/offset_thumb</item>
-        <item name="android:thumbTint">?attr/colorPrimary</item>
+        <item name="android:thumbTint">?attr/colorAccent</item>
    </style>

    <style name="Widget.ImageView.Compact" parent="">
@ -161,7 +161,7 @@
        <item name="android:textAlignment">viewStart</item>
        <item name="android:gravity">center_vertical</item>
        <item name="android:fontFamily">@font/inter_bold</item>
-        <item name="android:textColor">?attr/colorPrimary</item>
+        <item name="android:textColor">?attr/colorAccent</item>

        <item name="autoSizeMaxTextSize">@dimen/text_size_detail_header_max</item>
        <item name="autoSizeMinTextSize">@dimen/text_size_min</item>
@ -196,7 +196,7 @@

    <style name="Widget.Button.Unbounded.Text" parent="Widget.AppCompat.Button.Borderless.Colored">
        <item name="android:fontFamily">@font/inter_semibold</item>
-        <item name="android:textColor">?attr/colorPrimary</item>
+        <item name="android:textColor">?attr/colorAccent</item>
    </style>

    <style name="Widget.Button.Unbounded.Small" parent="Widget.AppCompat.Button.Borderless">
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@ -4,97 +4,78 @@
    All the base themes/accents.
    -->
    <style name="Theme.Red" parent="Theme.Base">
-        <item name="colorPrimary">@color/red</item>
-        <item name="colorSecondary">@color/red</item>
+        <item name="colorAccent">@color/red</item>
    </style>

    <style name="Theme.Pink" parent="Theme.Base">
-        <item name="colorPrimary">@color/pink</item>
-        <item name="colorSecondary">@color/pink</item>
+        <item name="colorAccent">@color/pink</item>
    </style>

    <style name="Theme.Purple" parent="Theme.Base">
-        <item name="colorPrimary">@color/purple</item>
-        <item name="colorSecondary">@color/purple</item>
+        <item name="colorAccent">@color/purple</item>
    </style>

    <style name="Theme.DeepPurple" parent="Theme.Base">
-        <item name="colorPrimary">@color/deep_purple</item>
-        <item name="colorSecondary">@color/deep_purple</item>
+        <item name="colorAccent">@color/deep_purple</item>
    </style>

    <style name="Theme.Indigo" parent="Theme.Base">
-        <item name="colorPrimary">@color/indigo</item>
-        <item name="colorSecondary">@color/indigo</item>
+        <item name="colorAccent">@color/indigo</item>
    </style>

    <style name="Theme.Blue" parent="Theme.Base">
-        <item name="colorPrimary">@color/blue</item>
-        <item name="colorSecondary">@color/blue</item>
+        <item name="colorAccent">@color/blue</item>
    </style>

    <style name="Theme.LightBlue" parent="Theme.Base">
-        <item name="colorPrimary">@color/light_blue</item>
-        <item name="colorSecondary">@color/light_blue</item>
+        <item name="colorAccent">@color/light_blue</item>
    </style>

    <style name="Theme.Cyan" parent="Theme.Base">
-        <item name="colorPrimary">@color/cyan</item>
-        <item name="colorSecondary">@color/cyan</item>
+        <item name="colorAccent">@color/cyan</item>
    </style>

    <style name="Theme.Teal" parent="Theme.Base">
-        <item name="colorPrimary">@color/teal</item>
-        <item name="colorSecondary">@color/teal</item>
+        <item name="colorAccent">@color/teal</item>
    </style>

    <style name="Theme.Green" parent="Theme.Base">
-        <item name="colorPrimary">@color/green</item>
-        <item name="colorSecondary">@color/green</item>
+        <item name="colorAccent">@color/green</item>
    </style>

    <style name="Theme.LightGreen" parent="Theme.Base">
-        <item name="colorPrimary">@color/light_green</item>
-        <item name="colorSecondary">@color/light_green</item>
+        <item name="colorAccent">@color/light_green</item>
    </style>

    <style name="Theme.Lime" parent="Theme.Base">
-        <item name="colorPrimary">@color/lime</item>
-        <item name="colorSecondary">@color/lime</item>
+        <item name="colorAccent">@color/lime</item>
    </style>

    <style name="Theme.Yellow" parent="Theme.Base">
-        <item name="colorPrimary">@color/yellow</item>
-        <item name="colorSecondary">@color/yellow</item>
+        <item name="colorAccent">@color/yellow</item>
    </style>

    <style name="Theme.Orange" parent="Theme.Base">
-        <item name="colorPrimary">@color/orange</item>
-        <item name="colorSecondary">@color/orange</item>
+        <item name="colorAccent">@color/orange</item>
    </style>

    <style name="Theme.DeepOrange" parent="Theme.Base">
-        <item name="colorPrimary">@color/deep_orange</item>
-        <item name="colorSecondary">@color/deep_orange</item>
+        <item name="colorAccent">@color/deep_orange</item>
    </style>

    <style name="Theme.Brown" parent="Theme.Base">
-        <item name="colorPrimary">@color/brown</item>
-        <item name="colorSecondary">@color/brown</item>
+        <item name="colorAccent">@color/brown</item>
    </style>

    <style name="Theme.Grey" parent="Theme.Base">
-        <item name="colorPrimary">@color/grey</item>
-        <item name="colorSecondary">@color/grey</item>
+        <item name="colorAccent">@color/grey</item>
    </style>

    <style name="Theme.BlueGrey" parent="Theme.Base">
-        <item name="colorPrimary">@color/blue_grey</item>
-        <item name="colorSecondary">@color/blue_grey</item>
+        <item name="colorAccent">@color/blue_grey</item>
    </style>

    <style name="Theme.Neutral" parent="Theme.Base">
-        <item name="colorPrimary">@color/control_color</item>
-        <item name="colorSecondary">@color/control_color</item>
+        <item name="colorAccent">@color/control_color</item>
    </style>
 </resources>
--- a/app/src/main/res/values/themes_black.xml
+++ b/app/src/main/res/values/themes_black.xml
@ -1,96 +1,81 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
    <!--
-    All the base themes/accents for black mode.
+    All the base themes/accents.
    -->
    <style name="Theme.Red.Black" parent="Theme.Base.Black">
-        <item name="colorPrimary">@color/red</item>
-        <item name="colorSecondary">@color/red</item>
+        <item name="colorAccent">@color/red</item>
    </style>

    <style name="Theme.Pink.Black" parent="Theme.Base.Black">
-        <item name="colorPrimary">@color/pink</item>
-        <item name="colorSecondary">@color/pink</item>
+        <item name="colorAccent">@color/pink</item>
    </style>

    <style name="Theme.Purple.Black" parent="Theme.Base.Black">
-        <item name="colorPrimary">@color/purple</item>
-        <item name="colorSecondary">@color/purple</item>
+        <item name="colorAccent">@color/purple</item>
    </style>

    <style name="Theme.DeepPurple.Black" parent="Theme.Base.Black">
-        <item name="colorPrimary">@color/deep_purple</item>
-        <item name="colorSecondary">@color/deep_purple</item>
+        <item name="colorAccent">@color/deep_purple</item>
    </style>

    <style name="Theme.Indigo.Black" parent="Theme.Base.Black">
-        <item name="colorPrimary">@color/indigo</item>
-        <item name="colorSecondary">@color/indigo</item>
+        <item name="colorAccent">@color/indigo</item>
    </style>

    <style name="Theme.Blue.Black" parent="Theme.Base.Black">
-        <item name="colorPrimary">@color/blue</item>
-        <item name="colorSecondary">@color/blue</item>
+        <item name="colorAccent">@color/blue</item>
    </style>

    <style name="Theme.LightBlue.Black" parent="Theme.Base.Black">
-        <item name="colorPrimary">@color/light_blue</item>
-        <item name="colorSecondary">@color/light_blue</item>
+        <item name="colorAccent">@color/light_blue</item>
    </style>

    <style name="Theme.Cyan.Black" parent="Theme.Base.Black">
-        <item name="colorPrimary">@color/cyan</item>
-        <item name="colorSecondary">@color/cyan</item>
+        <item name="colorAccent">@color/cyan</item>
    </style>

    <style name="Theme.Teal.Black" parent="Theme.Base.Black">
-        <item name="colorPrimary">@color/teal</item>
-        <item name="colorSecondary">@color/teal</item>
+        <item name="colorAccent">@color/teal</item>
    </style>

    <style name="Theme.Green.Black" parent="Theme.Base.Black">
-        <item name="colorPrimary">@color/green</item>
-        <item name="colorSecondary">@color/green</item>
+        <item name="colorAccent">@color/green</item>
    </style>

    <style name="Theme.LightGreen.Black" parent="Theme.Base.Black">
-        <item name="colorPrimary">@color/light_green</item>
-        <item name="colorSecondary">@color/light_green</item>
+        <item name="colorAccent">@color/light_green</item>
    </style>

    <style name="Theme.Lime.Black" parent="Theme.Base.Black">
-        <item name="colorPrimary">@color/lime</item>
-        <item name="colorSecondary">@color/lime</item>
+        <item name="colorAccent">@color/lime</item>
    </style>

    <style name="Theme.Yellow.Black" parent="Theme.Base.Black">
-        <item name="colorPrimary">@color/yellow</item>
-        <item name="colorSecondary">@color/yellow</item>
+        <item name="colorAccent">@color/yellow</item>
    </style>

    <style name="Theme.Orange.Black" parent="Theme.Base.Black">
-        <item name="colorPrimary">@color/orange</item>
-        <item name="colorSecondary">@color/orange</item>
+        <item name="colorAccent">@color/orange</item>
    </style>

    <style name="Theme.DeepOrange.Black" parent="Theme.Base.Black">
-        <item name="colorPrimary">@color/deep_orange</item>
-        <item name="colorSecondary">@color/deep_orange</item>
+        <item name="colorAccent">@color/deep_orange</item>
    </style>

    <style name="Theme.Brown.Black" parent="Theme.Base.Black">
-        <item name="colorPrimary">@color/brown</item>
-        <item name="colorSecondary">@color/brown</item>
+        <item name="colorAccent">@color/brown</item>
    </style>

    <style name="Theme.Grey.Black" parent="Theme.Base.Black">
-        <item name="colorPrimary">@color/grey</item>
-        <item name="colorSecondary">@color/grey</item>
+        <item name="colorAccent">@color/grey</item>
    </style>

    <style name="Theme.BlueGrey.Black" parent="Theme.Base.Black">
-        <item name="colorPrimary">@color/blue_grey</item>
-        <item name="colorSecondary">@color/blue_grey</item>
+        <item name="colorAccent">@color/blue_grey</item>
    </style>

+    <style name="Theme.Neutral.Black" parent="Theme.Base.Black">
+        <item name="colorAccent">@color/control_color</item>
+    </style>
 </resources>
--- a/app/src/main/res/xml/prefs_main.xml
+++ b/app/src/main/res/xml/prefs_main.xml
@ -100,7 +100,7 @@

    <PreferenceCategory
        app:layout="@layout/item_header"
-        app:title="@string/setting_behavior">
+        app:title="@string/set_behavior">

        <org.oxycblt.auxio.settings.ui.IntListPreference
            app:defaultValue="@integer/play_mode_songs"
@ -108,31 +108,31 @@
            app:entryValues="@array/values_song_playback_mode"
            app:iconSpaceReserved="false"
            app:key="KEY_SONG_PLAY_MODE2"
-            app:title="@string/setting_behavior_song_playback_mode"
+            app:title="@string/set_song_mode"
            app:useSimpleSummaryProvider="true" />

        <SwitchPreferenceCompat
            app:defaultValue="true"
            app:iconSpaceReserved="false"
            app:key="KEY_KEEP_SHUFFLE"
-            app:summary="@string/setting_behavior_keep_shuffle_desc"
-            app:title="@string/setting_behavior_keep_shuffle" />
+            app:summary="@string/set_keep_shuffle_desc"
+            app:title="@string/set_keep_shuffle" />

        <SwitchPreference
            app:allowDividerBelow="false"
            app:defaultValue="true"
            app:iconSpaceReserved="false"
            app:key="KEY_PREV_REWIND"
-            app:summary="@string/setting_behavior_rewind_prev_desc"
-            app:title="@string/setting_behavior_rewind_prev" />
+            app:summary="@string/set_rewind_prev_desc"
+            app:title="@string/set_rewind_prev" />

        <SwitchPreference
            app:allowDividerBelow="false"
            app:defaultValue="false"
            app:iconSpaceReserved="false"
            app:key="KEY_LOOP_PAUSE"
-            app:summary="@string/setting_behavior_loop_pause_desc"
-            app:title="@string/setting_behavior_loop_pause" />
+            app:summary="@string/set_loop_pause_desc"
+            app:title="@string/set_loop_pause" />

    </PreferenceCategory>

--- a/info/ARCHITECTURE.md
+++ b/info/ARCHITECTURE.md
@ -107,7 +107,8 @@ org.oxycblt.auxio  # Main UI's and logging utilities
 │  ├──.accent      # Accent UI + Systems
 │  └──.ui          # Settings-Related UIs
 ├──.songs          # Songs UI
-└──.ui             # Shared user interface utilities
+├──.ui             # Shared user interface utilities
+└──.widget         # Widgets
 ```

 #### `.coil`