styles: refactor styles

Refactor styles again, this time trying to seperate the more
layout-specific attributes so that layouts become more re-usable.
This also updates the naming conventions of styles.

app/src/main/java/org/oxycblt/auxio/detail/AlbumDetailFragment.kt

@@ -58,7 +58,7 @@ class AlbumDetailFragment : DetailFragment() {
         setupToolbar(R.menu.menu_album_detail) { itemId ->
             if (itemId == R.id.action_queue_add) {
                 playbackModel.addToUserQueue(detailModel.currentAlbum.value!!)
-                requireContext().showToast(R.string.label_queue_added)
+                requireContext().showToast(R.string.lbl_queue_added)
                 true
             } else {
                 false

app/src/main/java/org/oxycblt/auxio/detail/ArtistDetailFragment.kt

@@ -87,7 +87,7 @@ class ArtistDetailFragment : DetailFragment() {
             data.add(
                 Header(
                     id = -2,
-                    name = getString(R.string.label_songs),
+                    name = getString(R.string.lbl_songs),
                     isAction = true
                 )
             )

app/src/main/java/org/oxycblt/auxio/loading/LoadingFragment.kt

@@ -144,17 +144,17 @@ class LoadingFragment : Fragment() {
         when (error) {
             MusicStore.Response.NO_MUSIC -> {
                 binding.loadingRetryButton.visibility = View.VISIBLE
-                binding.loadingErrorText.text = getString(R.string.error_no_music)
+                binding.loadingErrorText.text = getString(R.string.err_no_music)
             }
 
             MusicStore.Response.NO_PERMS -> {
                 binding.loadingGrantButton.visibility = View.VISIBLE
-                binding.loadingErrorText.text = getString(R.string.error_no_perms)
+                binding.loadingErrorText.text = getString(R.string.err_no_perms)
             }
 
             MusicStore.Response.FAILED -> {
                 binding.loadingRetryButton.visibility = View.VISIBLE
-                binding.loadingErrorText.text = getString(R.string.error_load_failed)
+                binding.loadingErrorText.text = getString(R.string.err_load_failed)
             }
 
             else -> {}

app/src/main/java/org/oxycblt/auxio/music/MusicLoader.kt

@@ -107,8 +107,8 @@ class MusicLoader(private val context: Context) {
             Albums.DEFAULT_SORT_ORDER
         )
 
-        val albumPlaceholder = context.getString(R.string.placeholder_album)
+        val albumPlaceholder = context.getString(R.string.def_album)
-        val artistPlaceholder = context.getString(R.string.placeholder_artist)
+        val artistPlaceholder = context.getString(R.string.def_artist)
 
         albumCursor?.use { cursor ->
             val idIndex = cursor.getColumnIndexOrThrow(Albums._ID)
@@ -191,8 +191,8 @@ class MusicLoader(private val context: Context) {
         val songsByAlbum = songs.groupBy { it.albumId }
         val unknownAlbum = Album(
             id = -1,
-            name = context.getString(R.string.placeholder_album),
+            name = context.getString(R.string.def_album),
-            artistName = context.getString(R.string.placeholder_artist),
+            artistName = context.getString(R.string.def_artist),
             coverUri = Uri.EMPTY,
             year = 0
         )
@@ -300,7 +300,7 @@ class MusicLoader(private val context: Context) {
         if (songsWithoutGenres.isNotEmpty()) {
             val unknownGenre = Genre(
                 id = -2,
-                name = context.getString(R.string.placeholder_genre)
+                name = context.getString(R.string.def_genre)
             )
 
             songsWithoutGenres.forEach { song ->

app/src/main/java/org/oxycblt/auxio/music/MusicUtils.kt

@@ -111,7 +111,7 @@ fun Int.toYear(context: Context): String {
     return if (this > 0) {
         toString()
     } else {
-        context.getString(R.string.placeholder_no_date)
+        context.getString(R.string.def_date)
     }
 }
 
@@ -122,7 +122,7 @@ fun Int.toYear(context: Context): String {
  */
 @BindingAdapter("artistGenre")
 fun TextView.bindArtistGenre(artist: Artist) {
-    text = artist.genre?.resolvedName ?: context.getString(R.string.placeholder_genre)
+    text = artist.genre?.resolvedName ?: context.getString(R.string.def_genre)
 }
 
 /**
@@ -130,8 +130,8 @@ fun TextView.bindArtistGenre(artist: Artist) {
  */
 @BindingAdapter("artistCounts")
 fun TextView.bindArtistCounts(artist: Artist) {
-    val albums = context.getPlural(R.plurals.format_album_count, artist.albums.size)
+    val albums = context.getPlural(R.plurals.fmt_album_count, artist.albums.size)
-    val songs = context.getPlural(R.plurals.format_song_count, artist.songs.size)
+    val songs = context.getPlural(R.plurals.fmt_song_count, artist.songs.size)
 
     text = context.getString(R.string.format_double_counts, albums, songs)
 }
@@ -144,7 +144,7 @@ fun TextView.bindAllAlbumDetails(album: Album) {
     text = context.getString(
         R.string.format_double_info,
         album.year.toYear(context),
-        context.getPlural(R.plurals.format_song_count, album.songs.size),
+        context.getPlural(R.plurals.fmt_song_count, album.songs.size),
         album.totalDuration
     )
 }
@@ -157,7 +157,7 @@ fun TextView.bindAlbumInfo(album: Album) {
     text = context.getString(
         R.string.format_info,
         album.artist.name,
-        context.getPlural(R.plurals.format_song_count, album.songs.size),
+        context.getPlural(R.plurals.fmt_song_count, album.songs.size),
     )
 }
 

app/src/main/java/org/oxycblt/auxio/playback/queue/QueueAdapter.kt

@@ -171,7 +171,7 @@ class QueueAdapter(
             binding.headerButton.apply {
                 setImageResource(R.drawable.ic_clear)
 
-                contentDescription = context.getString(R.string.description_clear_user_queue)
+                contentDescription = context.getString(R.string.desc_clear_user_queue)
                 TooltipCompat.setTooltipText(this, contentDescription)
 
                 setOnClickListener {

app/src/main/java/org/oxycblt/auxio/playback/queue/QueueFragment.kt

@@ -142,7 +142,7 @@ class QueueFragment : Fragment() {
         if (userQueue.isNotEmpty()) {
             queue += Header(
                 id = -2,
-                name = getString(R.string.label_next_user_queue),
+                name = getString(R.string.lbl_next_user_queue),
                 isAction = true
             )
 
@@ -152,7 +152,7 @@ class QueueFragment : Fragment() {
         if (nextQueue.isNotEmpty()) {
             queue += Header(
                 id = -3,
-                name = getString(R.string.format_next_from, getParentName()),
+                name = getString(R.string.fmt_next_from, getParentName()),
                 isAction = false
             )
 
@@ -163,6 +163,6 @@ class QueueFragment : Fragment() {
     }
 
     private fun getParentName(): String {
-        return playbackModel.parent.value?.displayName ?: getString(R.string.label_all_songs)
+        return playbackModel.parent.value?.displayName ?: getString(R.string.lbl_all_songs)
     }
 }

app/src/main/java/org/oxycblt/auxio/playback/system/PlaybackNotification.kt

@@ -112,7 +112,7 @@ class PlaybackNotification private constructor(
         if (Build.VERSION.SDK_INT < Build.VERSION_CODES.N) return
 
         // A blank parent always means that the mode is ALL_SONGS
-        setSubText(parent?.displayName ?: context.getString(R.string.label_all_songs))
+        setSubText(parent?.displayName ?: context.getString(R.string.lbl_all_songs))
     }
 
     // --- NOTIFICATION ACTION BUILDERS ---

app/src/main/java/org/oxycblt/auxio/search/SearchViewModel.kt

@@ -54,28 +54,28 @@ class SearchViewModel : ViewModel() {
 
             if (mFilterMode.isAllOr(DisplayMode.SHOW_ARTISTS)) {
                 musicStore.artists.filterByOrNull(query)?.let { artists ->
-                    results.add(Header(id = -2, name = context.getString(R.string.label_artists)))
+                    results.add(Header(id = -2, name = context.getString(R.string.lbl_artists)))
                     results.addAll(artists)
                 }
             }
 
             if (mFilterMode.isAllOr(DisplayMode.SHOW_ALBUMS)) {
                 musicStore.albums.filterByOrNull(query)?.let { albums ->
-                    results.add(Header(id = -3, name = context.getString(R.string.label_albums)))
+                    results.add(Header(id = -3, name = context.getString(R.string.lbl_albums)))
                     results.addAll(albums)
                 }
             }
 
             if (mFilterMode.isAllOr(DisplayMode.SHOW_GENRES)) {
                 musicStore.genres.filterByOrNull(query)?.let { genres ->
-                    results.add(Header(id = -4, name = context.getString(R.string.label_genres)))
+                    results.add(Header(id = -4, name = context.getString(R.string.lbl_genres)))
                     results.addAll(genres)
                 }
             }
 
             if (mFilterMode.isAllOr(DisplayMode.SHOW_SONGS)) {
                 musicStore.songs.filterByOrNull(query)?.let { songs ->
-                    results.add(Header(id = -5, name = context.getString(R.string.label_songs)))
+                    results.add(Header(id = -5, name = context.getString(R.string.lbl_songs)))
                     results.addAll(songs)
                 }
             }

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

@@ -40,7 +40,7 @@ class AboutFragment : Fragment() {
         binding.aboutFaq.setOnClickListener { openLinkInBrowser(LINK_FAQ) }
         binding.aboutLicenses.setOnClickListener { openLinkInBrowser(LINK_LICENSES) }
         binding.aboutSongCount.text = getString(
-            R.string.format_songs_loaded, musicStore.songs.size
+            R.string.fmt_songs_loaded, musicStore.songs.size
         )
 
         logD("Dialog created.")
@@ -76,7 +76,7 @@ class AboutFragment : Fragment() {
             }
         } else {
             // No app installed to open the link
-            requireContext().showToast(R.string.error_no_browser)
+            requireContext().showToast(R.string.err_no_app)
         }
     }
 

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

@@ -141,7 +141,7 @@ class SettingsListFragment : PreferenceFragmentCompat() {
                 SettingsManager.KEY_SAVE_STATE -> {
                     onPreferenceClickListener = Preference.OnPreferenceClickListener {
                         playbackModel.savePlaybackState(requireContext()) {
-                            requireContext().showToast(R.string.label_state_saved)
+                            requireContext().showToast(R.string.lbl_state_saved)
                         }
 
                         true

app/src/main/java/org/oxycblt/auxio/settings/accent/AccentDialog.kt

@@ -57,7 +57,7 @@ class AccentDialog : LifecycleDialog() {
     }
 
     override fun onConfigDialog(builder: AlertDialog.Builder) {
-        builder.setTitle(R.string.setting_accent)
+        builder.setTitle(R.string.set_accent)
 
         builder.setPositiveButton(android.R.string.ok) { _, _ ->
             if (pendingAccent != Accent.get()) {

app/src/main/java/org/oxycblt/auxio/settings/blacklist/BlacklistDialog.kt

@@ -86,11 +86,11 @@ class BlacklistDialog : LifecycleDialog() {
     }
 
     override fun onConfigDialog(builder: AlertDialog.Builder) {
-        builder.setTitle(R.string.setting_content_blacklist)
+        builder.setTitle(R.string.set_blacklist)
 
         // Dont set the click listener here, we do some custom black magic in onCreateView instead.
-        builder.setNeutralButton(R.string.label_add, null)
+        builder.setNeutralButton(R.string.lbl_add, null)
-        builder.setPositiveButton(R.string.label_save, null)
+        builder.setPositiveButton(R.string.lbl_save, null)
         builder.setNegativeButton(android.R.string.cancel, null)
     }
 
@@ -105,7 +105,7 @@ class BlacklistDialog : LifecycleDialog() {
         if (path != null) {
             blacklistModel.addPath(path)
         } else {
-            requireContext().showToast(R.string.error_bad_dir)
+            requireContext().showToast(R.string.err_bad_dir)
         }
     }
 

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

@@ -14,68 +14,68 @@ import org.oxycblt.auxio.R
  * A list of all possible accents.
  */
 val ACCENTS = arrayOf(
-    Accent(R.color.red, R.style.Theme_Red, R.style.Theme_Red_Black, R.string.color_label_red),
+    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.color_label_pink),
+    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.color_label_purple
+        R.string.clr_purple
     ),
     Accent(
         R.color.deep_purple,
         R.style.Theme_DeepPurple,
         R.style.Theme_DeepPurple_Black,
-        R.string.color_label_deep_purple
+        R.string.clr_deep_purple
     ),
     Accent(
         R.color.indigo,
         R.style.Theme_Indigo,
         R.style.Theme_Indigo_Black,
-        R.string.color_label_indigo
+        R.string.clr_indigo
     ),
-    Accent(R.color.blue, R.style.Theme_Blue, R.style.Theme_Blue_Black, R.string.color_label_blue),
+    Accent(R.color.blue, R.style.Theme_Blue, R.style.Theme_Blue_Black, R.string.clr_blue),
     Accent(
         R.color.light_blue,
         R.style.Theme_LightBlue,
         R.style.Theme_LightBlue_Black,
-        R.string.color_label_light_blue
+        R.string.clr_light_blue
     ),
-    Accent(R.color.cyan, R.style.Theme_Cyan, R.style.Theme_Cyan_Black, R.string.color_label_cyan),
+    Accent(R.color.cyan, R.style.Theme_Cyan, R.style.Theme_Cyan_Black, R.string.clr_cyan),
-    Accent(R.color.teal, R.style.Theme_Teal, R.style.Theme_Teal_Black, R.string.color_label_teal),
+    Accent(R.color.teal, R.style.Theme_Teal, R.style.Theme_Teal_Black, R.string.clr_teal),
-    Accent(R.color.green, R.style.Theme_Green, R.style.Theme_Green_Black, R.string.color_label_green),
+    Accent(R.color.green, R.style.Theme_Green, R.style.Theme_Green_Black, R.string.clr_green),
     Accent(
         R.color.light_green,
         R.style.Theme_LightGreen,
         R.style.Theme_LightGreen_Black,
-        R.string.color_label_light_green
+        R.string.color_light_green
     ),
-    Accent(R.color.lime, R.style.Theme_Lime, R.style.Theme_Lime_Black, R.string.color_label_lime),
+    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_label_yellow
+        R.string.color_yellow
     ),
     Accent(
         R.color.orange,
         R.style.Theme_Orange,
         R.style.Theme_Orange_Black,
-        R.string.color_label_orange
+        R.string.clr_orange
     ),
     Accent(
         R.color.deep_orange,
         R.style.Theme_DeepOrange,
         R.style.Theme_DeepOrange_Black,
-        R.string.color_label_deep_orange
+        R.string.clr_deep_orange
     ),
-    Accent(R.color.brown, R.style.Theme_Brown, R.style.Theme_Brown_Black, R.string.color_label_brown),
+    Accent(R.color.brown, R.style.Theme_Brown, R.style.Theme_Brown_Black, R.string.clr_label_brown),
-    Accent(R.color.grey, R.style.Theme_Grey, R.style.Theme_Grey_Black, R.string.color_label_grey),
+    Accent(R.color.grey, R.style.Theme_Grey, R.style.Theme_Grey_Black, R.string.clr_label_grey),
     Accent(
         R.color.blue_grey,
         R.style.Theme_BlueGrey,
         R.style.Theme_BlueGrey_Black,
-        R.string.color_label_blue_grey
+        R.string.clr_blue_grey
     ),
 )
 

app/src/main/java/org/oxycblt/auxio/ui/ActionMenu.kt

@@ -129,12 +129,12 @@ class ActionMenu(
                 when (data) {
                     is Song -> {
                         playbackModel.addToUserQueue(data)
-                        context.showToast(R.string.label_queue_added)
+                        context.showToast(R.string.lbl_queue_added)
                     }
 
                     is Album -> {
                         playbackModel.addToUserQueue(data)
-                        context.showToast(R.string.label_queue_added)
+                        context.showToast(R.string.lbl_queue_added)
                     }
 
                     else -> {}

app/src/main/java/org/oxycblt/auxio/widgets/WidgetProvider.kt

@@ -25,8 +25,6 @@ import org.oxycblt.auxio.widgets.forms.WidgetForm
  * Auxio's one and only appwidget. This widget follows a more unorthodox approach, effectively
  * packing what could be considered 3 or 4 widgets into a single responsive widget. More specifically:
  *
- * - TODO?: For widgets 3x1 or lower, show a text-only view with minimal controls
- * - TODO?: For widgets 4x1, show a minimized view with album art
  * - For widgets Wx2 or higher, show an expanded view with album art and basic controls
  * - For widgets 4x2 or higher, show a complete view with all playback controls
  *
@@ -105,7 +103,7 @@ class WidgetProvider : AppWidgetProvider() {
         super.onAppWidgetOptionsChanged(context, appWidgetManager, appWidgetId, newOptions)
 
         if (Build.VERSION.SDK_INT < Build.VERSION_CODES.S) {
-            // We can't resize the widget until we can generate the views, request an update
+            // We can't resize the widget until we can generate the views, so request an update
             // from PlaybackService.
             requestUpdate(context)
         }

app/src/main/java/org/oxycblt/auxio/widgets/forms/FullWidgetForm.kt

@@ -63,14 +63,14 @@ class FullWidgetForm : WidgetForm(R.layout.widget_full) {
             views.setImageViewBitmap(R.id.widget_cover, state.albumArt)
             views.setCharSequence(
                 R.id.widget_cover, "setContentDescription",
-                context.getString(R.string.description_album_cover, state.song.album.name)
+                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.description_no_cover)
+                context.getString(R.string.desc_no_cover)
             )
         }
 

app/src/main/java/org/oxycblt/auxio/widgets/forms/SmallWidgetForm.kt

@@ -48,14 +48,14 @@ class SmallWidgetForm : WidgetForm(R.layout.widget_small) {
             views.setImageViewBitmap(R.id.widget_cover, state.albumArt)
             views.setCharSequence(
                 R.id.widget_cover, "setContentDescription",
-                context.getString(R.string.description_album_cover, state.song.album.name)
+                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.description_no_cover)
+                context.getString(R.string.desc_no_cover)
             )
         }
 

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

@@ -7,5 +7,5 @@
     android:viewportHeight="24">
     <path
         android:fillColor="@android:color/white"
-        android:pathData="M11 18h2v-2h-2v2zm1-16C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2zm0 18c-4.41 0-8-3.59-8-8s3.59-8 8-8 8 3.59 8 8-3.59 8-8 8zm0-14c-2.21 0-4 1.79-4 4h2c0-1.1 0.9-2 2-2s2 0.9 2 2c0 2-3 1.75-3 5h2c0-2.25 3-2.5 3-5 0-2.21-1.79-4-4-4z" />
+        android:pathData="M11 7h2v2h-2zm0 4h2v6h-2zm1-9C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2zm0 18c-4.41 0-8-3.59-8-8s3.59-8 8-8 8 3.59 8 8-3.59 8-8 8z" />
 </vector>

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

@@ -7,5 +7,5 @@
     android:viewportHeight="24">
     <path
         android:fillColor="@android:color/white"
-        android:pathData="M11 7h2v2h-2zm0 4h2v6h-2zm1-9C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2zm0 18c-4.41 0-8-3.59-8-8s3.59-8 8-8 8 3.59 8 8-3.59 8-8 8z" />
+        android:pathData="M11 18h2v-2h-2v2zm1-16C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2zm0 18c-4.41 0-8-3.59-8-8s3.59-8 8-8 8 3.59 8 8-3.59 8-8 8zm0-14c-2.21 0-4 1.79-4 4h2c0-1.1 0.9-2 2-2s2 0.9 2 2c0 2-3 1.75-3 5h2c0-2.25 3-2.5 3-5 0-2.21-1.79-4-4-4z" />
 </vector>

app/src/main/res/layout-land/fragment_compact_playback.xml

@@ -26,8 +26,9 @@
 
         <ImageView
             android:id="@+id/playback_cover"
-            style="@style/CompactImageView"
+            style="@style/Widget.ImageView.Compact"
-            android:contentDescription="@{@string/description_album_cover(song.name)}"
+            android:layout_margin="@dimen/spacing_small"
+            android:contentDescription="@{@string/desc_album_cover(song.name)}"
             app:albumArt="@{song}"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintStart_toStartOf="parent"
@@ -37,6 +38,8 @@
         <TextView
             android:id="@+id/playback_song"
             style="@style/Widget.TextView.Compact.Primary"
+            android:layout_marginStart="@dimen/spacing_small"
+            android:layout_marginEnd="@dimen/spacing_small"
             android:text="@{song.name}"
             app:layout_constraintBottom_toTopOf="@+id/playback_info"
             app:layout_constraintEnd_toStartOf="@+id/playback_play_pause"
@@ -48,6 +51,8 @@
         <TextView
             android:id="@+id/playback_info"
             style="@style/Widget.TextView.Compact.Secondary"
+            android:layout_marginStart="@dimen/spacing_small"
+            android:layout_marginEnd="@dimen/spacing_small"
             android:text="@{@string/format_info(song.album.artist.name, song.album.name)}"
             app:layout_constraintBottom_toBottomOf="@+id/playback_cover"
             app:layout_constraintEnd_toStartOf="@+id/playback_play_pause"
@@ -57,8 +62,10 @@
 
         <org.oxycblt.auxio.playback.PlayPauseButton
             android:id="@+id/playback_play_pause"
-            style="@style/Widget.Button.Unbounded.PlayPause"
+            style="@style/Widget.Button.Unbounded"
-            android:contentDescription="@string/description_play_pause"
+            android:padding="0dp"
+            android:layout_margin="@dimen/spacing_small"
+            android:contentDescription="@string/desc_play_pause"
             android:onClick="@{() -> playbackModel.invertPlayingStatus()}"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"

app/src/main/res/layout-land/fragment_playback.xml

@@ -29,18 +29,18 @@
 
         <androidx.appcompat.widget.Toolbar
             android:id="@+id/playback_toolbar"
-            style="@style/Toolbar.Style.Icon.Down"
+            style="@style/Widget.Toolbar.Icon.Down"
             android:elevation="0dp"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent"
             app:menu="@menu/menu_playback"
-            app:title="@string/label_playback" />
+            app:title="@string/lbl_playback" />
 
         <ImageView
             android:id="@+id/playback_cover"
-            style="@style/ElevatedImageView"
+            style="@style/Widget.ImageView.Full"
             android:layout_margin="@dimen/spacing_large"
-            android:contentDescription="@{@string/description_album_cover(song.name)}"
+            android:contentDescription="@{@string/desc_album_cover(song.name)}"
             app:albumArt="@{song}"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintDimensionRatio="1"
@@ -65,7 +65,7 @@
 
             <TextView
                 android:id="@+id/playback_song"
-                style="@style/Widget.TextView.Playback.Primary"
+                style="@style/Widget.TextView.Primary"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 android:onClick="@{() -> detailModel.navToItem(playbackModel.song)}"
@@ -76,7 +76,7 @@
 
         <TextView
             android:id="@+id/playback_artist"
-            style="@style/Widget.TextView.Playback.Secondary"
+            style="@style/Widget.TextView.Secondary"
             android:layout_marginStart="@dimen/spacing_mid_large"
             android:layout_marginEnd="@dimen/spacing_mid_large"
             android:onClick="@{() -> detailModel.navToItem(playbackModel.song.album.artist)}"
@@ -89,7 +89,7 @@
 
         <TextView
             android:id="@+id/playback_album"
-            style="@style/Widget.TextView.Playback.Secondary"
+            style="@style/Widget.TextView.Secondary"
             android:layout_marginStart="@dimen/spacing_mid_large"
             android:layout_marginEnd="@dimen/spacing_mid_large"
             android:onClick="@{() -> detailModel.navToItem(playbackModel.song.album)}"
@@ -137,7 +137,7 @@
             android:id="@+id/playback_loop"
             style="@style/Widget.Button.Unbounded"
             android:layout_marginStart="@dimen/spacing_small"
-            android:contentDescription="@string/description_change_loop"
+            android:contentDescription="@string/desc_change_loop"
             android:onClick="@{() -> playbackModel.incrementLoopStatus()}"
             android:src="@drawable/ic_loop"
             app:layout_constraintBottom_toBottomOf="@+id/playback_skip_prev"
@@ -148,7 +148,7 @@
         <ImageButton
             android:id="@+id/playback_skip_prev"
             style="@style/Widget.Button.Unbounded"
-            android:contentDescription="@string/description_skip_prev"
+            android:contentDescription="@string/desc_skip_prev"
             android:onClick="@{() -> playbackModel.skipPrev()}"
             android:src="@drawable/ic_skip_prev"
             app:layout_constraintBottom_toBottomOf="@+id/playback_play_pause"
@@ -158,7 +158,7 @@
 
         <org.oxycblt.auxio.playback.PlayPauseButton
             android:id="@+id/playback_play_pause"
-            style="@style/PlayPause"
+            style="@style/Widget.Component.Playback.PlayPause"
             android:onClick="@{() -> playbackModel.invertPlayingStatus()}"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="@+id/playback_song_duration"
@@ -169,7 +169,7 @@
         <ImageButton
             android:id="@+id/playback_skip_next"
             style="@style/Widget.Button.Unbounded"
-            android:contentDescription="@string/description_skip_next"
+            android:contentDescription="@string/desc_skip_next"
             android:onClick="@{() -> playbackModel.skipNext()}"
             android:src="@drawable/ic_skip_next"
             app:layout_constraintBottom_toBottomOf="@+id/playback_play_pause"
@@ -181,7 +181,7 @@
             android:id="@+id/playback_shuffle"
             style="@style/Widget.Button.Unbounded"
             android:layout_marginEnd="@dimen/spacing_small"
-            android:contentDescription="@string/description_shuffle"
+            android:contentDescription="@string/desc_shuffle"
             android:onClick="@{() -> playbackModel.invertShuffleStatus()}"
             android:src="@drawable/ic_shuffle"
             app:layout_constraintBottom_toBottomOf="@+id/playback_skip_next"

app/src/main/res/layout-land/item_album_header.xml

@@ -29,8 +29,8 @@
             android:layout_height="@dimen/size_cover_detail_land"
             android:layout_marginStart="@dimen/spacing_medium"
             android:layout_marginTop="@dimen/spacing_medium"
-            android:contentDescription="@{@string/description_album_cover(album.name)}"
+            android:contentDescription="@{@string/desc_album_cover(album.name)}"
-            style="@style/ElevatedImageView"
+            style="@style/Widget.ImageView.Full"
             app:albumArt="@{album}"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent"
@@ -38,7 +38,7 @@
 
         <TextView
             android:id="@+id/album_name"
-            style="@style/DetailTitleText"
+            style="@style/Widget.TextView.Detail"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginStart="@dimen/spacing_medium"
@@ -83,9 +83,12 @@
 
         <com.google.android.material.button.MaterialButton
             android:id="@+id/album_play_button"
-            style="@style/Widget.MaterialComponents.Button.Unimportant"
+            style="@style/Widget.Button.Vibrant.Secondary"
             android:onClick="@{() -> playbackModel.playAlbum(album, false)}"
-            android:text="@string/label_play"
+            android:text="@string/lbl_play"
+            android:layout_marginTop="@dimen/spacing_small"
+            android:layout_marginEnd="@dimen/spacing_small"
+            android:layout_marginStart="@dimen/spacing_medium"
             app:layout_constraintEnd_toStartOf="@+id/album_shuffle_button"
             app:layout_constraintHorizontal_bias="0.5"
             app:layout_constraintStart_toStartOf="parent"
@@ -93,10 +96,12 @@
 
         <com.google.android.material.button.MaterialButton
             android:id="@+id/album_shuffle_button"
-            style="@style/Widget.MaterialComponents.Button.Highlighted"
+            style="@style/Widget.Button.Vibrant.Primary"
             android:backgroundTint="?attr/colorPrimary"
             android:onClick="@{() -> playbackModel.playAlbum(album, true)}"
-            android:text="@string/label_shuffle"
+            android:text="@string/lbl_shuffle"
+            android:layout_marginStart="@dimen/spacing_small"
+            android:layout_marginEnd="@dimen/spacing_medium"
             app:layout_constraintBottom_toBottomOf="@+id/album_play_button"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toEndOf="@+id/album_play_button"
@@ -104,21 +109,29 @@
 
         <TextView
             android:id="@+id/album_song_header"
-            style="@style/HeaderText"
+            style="@style/Widget.TextView.Header"
-            android:layout_marginTop="8dp"
+            android:layout_width="match_parent"
-            android:text="@string/label_songs"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/spacing_small"
+            android:background="@drawable/ui_header_dividers"
+            android:text="@string/lbl_songs"
+            app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/album_play_button" />
 
         <ImageButton
             android:id="@+id/album_sort_button"
-            style="@style/HeaderAction"
+            android:layout_width="0dp"
-            android:contentDescription="@string/description_sort_button"
+            android:layout_height="wrap_content"
+            style="@style/Widget.Button.Unbounded.Small"
+            android:contentDescription="@string/desc_sort_button"
             android:onClick="@{() -> detailModel.incrementAlbumSortMode()}"
             app:layout_constraintBottom_toBottomOf="@+id/album_song_header"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toTopOf="@+id/album_song_header"
             app:sortIcon="@{detailModel.albumSortMode}"
             tools:src="@drawable/ic_sort_numeric_down" />
+
+
     </androidx.constraintlayout.widget.ConstraintLayout>
 </layout>

app/src/main/res/layout-land/item_artist_header.xml

@@ -24,8 +24,8 @@
             android:layout_width="@dimen/size_cover_detail_land"
             android:layout_height="@dimen/size_cover_detail_land"
             android:layout_margin="@dimen/spacing_medium"
-            android:contentDescription="@{@string/description_artist_image(artist.name)}"
+            android:contentDescription="@{@string/desc_artist_image(artist.name)}"
-            style="@style/ElevatedImageView"
+            style="@style/Widget.ImageView.Full"
             app:artistImage="@{artist}"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent"
@@ -33,7 +33,7 @@
 
         <TextView
             android:id="@+id/artist_name"
-            style="@style/DetailTitleText"
+            style="@style/Widget.TextView.Detail"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginStart="@dimen/spacing_medium"
@@ -75,9 +75,12 @@
 
         <com.google.android.material.button.MaterialButton
             android:id="@+id/artist_play_button"
-            style="@style/Widget.MaterialComponents.Button.Unimportant"
+            style="@style/Widget.Button.Vibrant.Secondary"
             android:onClick="@{() -> playbackModel.playArtist(artist, false)}"
-            android:text="@string/label_play"
+            android:text="@string/lbl_play"
+            android:layout_marginTop="@dimen/spacing_small"
+            android:layout_marginEnd="@dimen/spacing_small"
+            android:layout_marginStart="@dimen/spacing_medium"
             app:layout_constraintEnd_toStartOf="@+id/artist_shuffle_button"
             app:layout_constraintHorizontal_bias="0.5"
             app:layout_constraintStart_toStartOf="parent"
@@ -85,10 +88,12 @@
 
         <com.google.android.material.button.MaterialButton
             android:id="@+id/artist_shuffle_button"
-            style="@style/Widget.MaterialComponents.Button.Highlighted"
+            style="@style/Widget.Button.Vibrant.Primary"
             android:backgroundTint="?attr/colorPrimary"
             android:onClick="@{() -> playbackModel.playArtist(artist, true)}"
-            android:text="@string/label_shuffle"
+            android:text="@string/lbl_shuffle"
+            android:layout_marginStart="@dimen/spacing_small"
+            android:layout_marginEnd="@dimen/spacing_medium"
             app:layout_constraintBottom_toBottomOf="@+id/artist_play_button"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toEndOf="@+id/artist_play_button"
@@ -96,9 +101,11 @@
 
         <TextView
             android:id="@+id/artist_album_header"
-            style="@style/HeaderText"
+            android:layout_height="wrap_content"
+            android:layout_width="match_parent"
+            style="@style/Widget.TextView.Header"
             android:layout_marginTop="@dimen/spacing_small"
-            android:text="@string/label_albums"
+            android:text="@string/lbl_albums"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/artist_play_button" />
 

app/src/main/res/layout-land/item_genre_header.xml

@@ -28,8 +28,8 @@
             android:layout_width="@dimen/size_cover_detail_land"
             android:layout_height="@dimen/size_cover_detail_land"
             android:layout_margin="@dimen/spacing_medium"
-            android:contentDescription="@{@string/description_genre_image(genre.name)}"
+            android:contentDescription="@{@string/desc_genre_image(genre.name)}"
-            style="@style/ElevatedImageView"
+            style="@style/Widget.ImageView.Full"
             app:genreImage="@{genre}"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent"
@@ -37,7 +37,7 @@
 
         <TextView
             android:id="@+id/genre_name"
-            style="@style/DetailTitleText"
+            style="@style/Widget.TextView.Detail"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginStart="@dimen/spacing_medium"
@@ -56,7 +56,7 @@
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginStart="@dimen/spacing_medium"
-            android:text="@{@plurals/format_song_count(genre.songs.size(), genre.songs.size())}"
+            android:text="@{@plurals/fmt_song_count(genre.songs.size(), genre.songs.size())}"
             android:textAppearance="?android:attr/textAppearanceListItem"
             android:textColor="?android:attr/textColorSecondary"
             app:layout_constraintBottom_toTopOf="@+id/genre_duration"
@@ -66,9 +66,12 @@
 
         <com.google.android.material.button.MaterialButton
             android:id="@+id/genre_play_button"
-            style="@style/Widget.MaterialComponents.Button.Unimportant"
+            style="@style/Widget.Button.Vibrant.Secondary"
             android:onClick="@{() -> playbackModel.playGenre(genre, false)}"
-            android:text="@string/label_play"
+            android:text="@string/lbl_play"
+                        android:layout_marginTop="@dimen/spacing_small"
+            android:layout_marginEnd="@dimen/spacing_small"
+            android:layout_marginStart="@dimen/spacing_medium"
             app:layout_constraintEnd_toStartOf="@+id/genre_shuffle_button"
             app:layout_constraintHorizontal_bias="0.5"
             app:layout_constraintStart_toStartOf="parent"
@@ -76,10 +79,12 @@
 
         <com.google.android.material.button.MaterialButton
             android:id="@+id/genre_shuffle_button"
-            style="@style/Widget.MaterialComponents.Button.Highlighted"
+            style="@style/Widget.Button.Vibrant.Primary"
             android:backgroundTint="?attr/colorPrimary"
             android:onClick="@{() -> playbackModel.playGenre(genre, true)}"
-            android:text="@string/label_shuffle"
+            android:text="@string/lbl_shuffle"
+            android:layout_marginStart="@dimen/spacing_small"
+            android:layout_marginEnd="@dimen/spacing_medium"
             app:layout_constraintBottom_toBottomOf="@+id/genre_play_button"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toEndOf="@+id/genre_play_button"
@@ -98,18 +103,23 @@
             app:layout_constraintTop_toBottomOf="@+id/genre_song_count"
             tools:text="16:16" />
 
+
         <TextView
             android:id="@+id/genre_song_header"
-            style="@style/HeaderText"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            style="@style/Widget.TextView.Header"
             android:layout_marginTop="@dimen/spacing_small"
-            android:text="@string/label_songs"
+            android:text="@string/lbl_songs"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/genre_play_button" />
 
         <ImageButton
             android:id="@+id/genre_sort_button"
-            style="@style/HeaderAction"
+            android:layout_width="0dp"
-            android:contentDescription="@string/description_sort_button"
+            android:layout_height="wrap_content"
+            style="@style/Widget.Button.Unbounded.Small"
+            android:contentDescription="@string/desc_sort_button"
             android:onClick="@{() -> detailModel.incrementGenreSortMode()}"
             app:layout_constraintBottom_toBottomOf="@+id/genre_song_header"
             app:layout_constraintEnd_toEndOf="parent"

app/src/main/res/layout-large/item_album_header.xml

@@ -29,8 +29,8 @@
             android:layout_height="@dimen/size_cover_detail"
             android:layout_marginStart="@dimen/spacing_medium"
             android:layout_marginTop="@dimen/spacing_medium"
-            android:contentDescription="@{@string/description_album_cover(album.name)}"
+            android:contentDescription="@{@string/desc_album_cover(album.name)}"
-            style="@style/ElevatedImageView"
+            style="@style/Widget.ImageView.Full"
             app:albumArt="@{album}"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent"
@@ -38,7 +38,7 @@
 
         <TextView
             android:id="@+id/album_name"
-            style="@style/DetailTitleText"
+            style="@style/Widget.TextView.Detail"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginStart="@dimen/spacing_medium"
@@ -83,9 +83,12 @@
 
         <com.google.android.material.button.MaterialButton
             android:id="@+id/album_play_button"
-            style="@style/Widget.MaterialComponents.Button.Unimportant"
+            style="@style/Widget.Button.Vibrant.Secondary"
             android:onClick="@{() -> playbackModel.playAlbum(album, false)}"
-            android:text="@string/label_play"
+            android:text="@string/lbl_play"
+            android:layout_marginTop="@dimen/spacing_small"
+            android:layout_marginEnd="@dimen/spacing_small"
+            android:layout_marginStart="@dimen/spacing_medium"
             app:layout_constraintEnd_toStartOf="@+id/album_shuffle_button"
             app:layout_constraintHorizontal_bias="0.5"
             app:layout_constraintStart_toStartOf="parent"
@@ -93,10 +96,12 @@
 
         <com.google.android.material.button.MaterialButton
             android:id="@+id/album_shuffle_button"
-            style="@style/Widget.MaterialComponents.Button.Highlighted"
+            style="@style/Widget.Button.Vibrant.Primary"
             android:backgroundTint="?attr/colorPrimary"
             android:onClick="@{() -> playbackModel.playAlbum(album, true)}"
-            android:text="@string/label_shuffle"
+            android:text="@string/lbl_shuffle"
+            android:layout_marginStart="@dimen/spacing_small"
+            android:layout_marginEnd="@dimen/spacing_medium"
             app:layout_constraintBottom_toBottomOf="@+id/album_play_button"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toEndOf="@+id/album_play_button"
@@ -104,21 +109,28 @@
 
         <TextView
             android:id="@+id/album_song_header"
-            style="@style/HeaderText"
+            style="@style/Widget.TextView.Header"
-            android:layout_marginTop="8dp"
+            android:layout_width="match_parent"
-            android:text="@string/label_songs"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/spacing_small"
+            android:background="@drawable/ui_header_dividers"
+            android:text="@string/lbl_songs"
+            app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/album_play_button" />
 
         <ImageButton
             android:id="@+id/album_sort_button"
-            style="@style/HeaderAction"
+            android:layout_width="0dp"
-            android:contentDescription="@string/description_sort_button"
+            android:layout_height="wrap_content"
+            style="@style/Widget.Button.Unbounded.Small"
+            android:contentDescription="@string/desc_sort_button"
             android:onClick="@{() -> detailModel.incrementAlbumSortMode()}"
             app:layout_constraintBottom_toBottomOf="@+id/album_song_header"
-            app:layout_constraintEnd_toEndOf="@+id/album_song_header"
+            app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toTopOf="@+id/album_song_header"
             app:sortIcon="@{detailModel.albumSortMode}"
             tools:src="@drawable/ic_sort_numeric_down" />
+
     </androidx.constraintlayout.widget.ConstraintLayout>
 </layout>

app/src/main/res/layout-large/item_artist_header.xml

@@ -24,8 +24,8 @@
             android:layout_width="@dimen/size_cover_detail"
             android:layout_height="@dimen/size_cover_detail"
             android:layout_margin="@dimen/spacing_medium"
-            android:contentDescription="@{@string/description_artist_image(artist.name)}"
+            android:contentDescription="@{@string/desc_artist_image(artist.name)}"
-            style="@style/ElevatedImageView"
+            style="@style/Widget.ImageView.Full"
             app:artistImage="@{artist}"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent"
@@ -33,7 +33,7 @@
 
         <TextView
             android:id="@+id/artist_name"
-            style="@style/DetailTitleText"
+            style="@style/Widget.TextView.Detail"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginStart="@dimen/spacing_medium"
@@ -75,9 +75,12 @@
 
         <com.google.android.material.button.MaterialButton
             android:id="@+id/artist_play_button"
-            style="@style/Widget.MaterialComponents.Button.Unimportant"
+            style="@style/Widget.Button.Vibrant.Secondary"
             android:onClick="@{() -> playbackModel.playArtist(artist, false)}"
-            android:text="@string/label_play"
+            android:text="@string/lbl_play"
+            android:layout_marginTop="@dimen/spacing_small"
+            android:layout_marginEnd="@dimen/spacing_small"
+            android:layout_marginStart="@dimen/spacing_medium"
             app:layout_constraintEnd_toStartOf="@+id/artist_shuffle_button"
             app:layout_constraintHorizontal_bias="0.5"
             app:layout_constraintStart_toStartOf="parent"
@@ -85,10 +88,12 @@
 
         <com.google.android.material.button.MaterialButton
             android:id="@+id/artist_shuffle_button"
-            style="@style/Widget.MaterialComponents.Button.Highlighted"
+            style="@style/Widget.Button.Vibrant.Primary"
             android:backgroundTint="?attr/colorPrimary"
             android:onClick="@{() -> playbackModel.playArtist(artist, true)}"
-            android:text="@string/label_shuffle"
+            android:text="@string/lbl_shuffle"
+            android:layout_marginStart="@dimen/spacing_small"
+            android:layout_marginEnd="@dimen/spacing_medium"
             app:layout_constraintBottom_toBottomOf="@+id/artist_play_button"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toEndOf="@+id/artist_play_button"
@@ -96,9 +101,11 @@
 
         <TextView
             android:id="@+id/artist_album_header"
-            style="@style/HeaderText"
+            android:layout_height="wrap_content"
+            android:layout_width="match_parent"
+            style="@style/Widget.TextView.Header"
             android:layout_marginTop="@dimen/spacing_small"
-            android:text="@string/label_albums"
+            android:text="@string/lbl_albums"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/artist_play_button" />
 

app/src/main/res/layout-large/item_genre_header.xml

@@ -28,8 +28,8 @@
             android:layout_width="@dimen/size_cover_detail"
             android:layout_height="@dimen/size_cover_detail"
             android:layout_margin="@dimen/spacing_medium"
-            android:contentDescription="@{@string/description_genre_image(genre.name)}"
+            android:contentDescription="@{@string/desc_genre_image(genre.name)}"
-            style="@style/ElevatedImageView"
+            style="@style/Widget.ImageView.Full"
             app:genreImage="@{genre}"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent"
@@ -37,7 +37,7 @@
 
         <TextView
             android:id="@+id/genre_name"
-            style="@style/DetailTitleText"
+            style="@style/Widget.TextView.Detail"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginStart="@dimen/spacing_medium"
@@ -56,7 +56,7 @@
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginStart="@dimen/spacing_medium"
-            android:text="@{@plurals/format_song_count(genre.songs.size(), genre.songs.size())}"
+            android:text="@{@plurals/fmt_song_count(genre.songs.size(), genre.songs.size())}"
             android:textAppearance="?android:attr/textAppearanceListItem"
             android:textColor="?android:attr/textColorSecondary"
             app:layout_constraintBottom_toTopOf="@+id/genre_duration"
@@ -66,9 +66,12 @@
 
         <com.google.android.material.button.MaterialButton
             android:id="@+id/genre_play_button"
-            style="@style/Widget.MaterialComponents.Button.Unimportant"
+            style="@style/Widget.Button.Vibrant.Secondary"
             android:onClick="@{() -> playbackModel.playGenre(genre, false)}"
-            android:text="@string/label_play"
+            android:text="@string/lbl_play"
+                        android:layout_marginTop="@dimen/spacing_small"
+            android:layout_marginEnd="@dimen/spacing_small"
+            android:layout_marginStart="@dimen/spacing_medium"
             app:layout_constraintEnd_toStartOf="@+id/genre_shuffle_button"
             app:layout_constraintHorizontal_bias="0.5"
             app:layout_constraintStart_toStartOf="parent"
@@ -76,10 +79,12 @@
 
         <com.google.android.material.button.MaterialButton
             android:id="@+id/genre_shuffle_button"
-            style="@style/Widget.MaterialComponents.Button.Highlighted"
+            style="@style/Widget.Button.Vibrant.Primary"
             android:backgroundTint="?attr/colorPrimary"
             android:onClick="@{() -> playbackModel.playGenre(genre, true)}"
-            android:text="@string/label_shuffle"
+            android:text="@string/lbl_shuffle"
+            android:layout_marginStart="@dimen/spacing_small"
+            android:layout_marginEnd="@dimen/spacing_medium"
             app:layout_constraintBottom_toBottomOf="@+id/genre_play_button"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toEndOf="@+id/genre_play_button"
@@ -100,22 +105,25 @@
 
         <TextView
             android:id="@+id/genre_song_header"
-            style="@style/HeaderText"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            style="@style/Widget.TextView.Header"
             android:layout_marginTop="@dimen/spacing_small"
-            android:text="@string/label_songs"
+            android:text="@string/lbl_songs"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/genre_play_button" />
 
         <ImageButton
             android:id="@+id/genre_sort_button"
-            style="@style/HeaderAction"
+            android:layout_width="0dp"
-            android:contentDescription="@string/description_sort_button"
+            android:layout_height="wrap_content"
+            style="@style/Widget.Button.Unbounded.Small"
+            android:contentDescription="@string/desc_sort_button"
             android:onClick="@{() -> detailModel.incrementGenreSortMode()}"
             app:layout_constraintBottom_toBottomOf="@+id/genre_song_header"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toTopOf="@+id/genre_song_header"
             app:sortIcon="@{detailModel.genreSortMode}"
             tools:src="@drawable/ic_sort_alpha_down" />
-
     </androidx.constraintlayout.widget.ConstraintLayout>
 </layout>

app/src/main/res/layout-xlarge-land/fragment_playback.xml

@@ -29,20 +29,20 @@
 
         <androidx.appcompat.widget.Toolbar
             android:id="@+id/playback_toolbar"
-            style="@style/Toolbar.Style.Icon.Down"
+            style="@style/Widget.Toolbar.Icon.Down"
             android:elevation="0dp"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent"
             app:menu="@menu/menu_playback"
-            app:title="@string/label_playback" />
+            app:title="@string/lbl_playback" />
 
         <ImageView
             android:id="@+id/playback_cover"
-            style="@style/ElevatedImageView"
+            style="@style/Widget.ImageView.Full"
             android:layout_marginStart="@dimen/spacing_large"
             android:layout_marginTop="@dimen/spacing_insane"
             android:layout_marginBottom="@dimen/spacing_insane"
-            android:contentDescription="@{@string/description_album_cover(song.name)}"
+            android:contentDescription="@{@string/desc_album_cover(song.name)}"
             app:albumArt="@{song}"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintDimensionRatio="1"
@@ -66,7 +66,7 @@
 
             <TextView
                 android:id="@+id/playback_song"
-                style="@style/Widget.TextView.Playback.Primary"
+                style="@style/Widget.TextView.Primary"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 android:onClick="@{() -> detailModel.navToItem(playbackModel.song)}"
@@ -77,7 +77,7 @@
 
         <TextView
             android:id="@+id/playback_artist"
-            style="@style/Widget.TextView.Playback.Secondary"
+            style="@style/Widget.TextView.Secondary"
             android:layout_marginStart="@dimen/spacing_mid_large"
             android:layout_marginEnd="@dimen/spacing_mid_large"
             android:onClick="@{() -> detailModel.navToItem(playbackModel.song.album.artist)}"
@@ -90,7 +90,7 @@
 
         <TextView
             android:id="@+id/playback_album"
-            style="@style/Widget.TextView.Playback.Secondary"
+            style="@style/Widget.TextView.Secondary"
             android:layout_marginStart="@dimen/spacing_mid_large"
             android:layout_marginEnd="@dimen/spacing_mid_large"
             android:onClick="@{() -> detailModel.navToItem(playbackModel.song.album)}"
@@ -138,7 +138,7 @@
             android:id="@+id/playback_loop"
             style="@style/Widget.Button.Unbounded"
             android:layout_marginEnd="@dimen/spacing_large"
-            android:contentDescription="@string/description_change_loop"
+            android:contentDescription="@string/desc_change_loop"
             android:onClick="@{() -> playbackModel.incrementLoopStatus()}"
             android:src="@drawable/ic_loop"
             app:layout_constraintBottom_toBottomOf="@+id/playback_skip_prev"
@@ -150,7 +150,7 @@
             android:id="@+id/playback_skip_prev"
             style="@style/Widget.Button.Unbounded"
             android:layout_marginEnd="@dimen/spacing_large"
-            android:contentDescription="@string/description_skip_prev"
+            android:contentDescription="@string/desc_skip_prev"
             android:onClick="@{() -> playbackModel.skipPrev()}"
             android:src="@drawable/ic_skip_prev"
             app:layout_constraintBottom_toBottomOf="@+id/playback_play_pause"
@@ -159,7 +159,7 @@
 
         <org.oxycblt.auxio.playback.PlayPauseButton
             android:id="@+id/playback_play_pause"
-            style="@style/PlayPause"
+            style="@style/Widget.Component.Playback.PlayPause"
             android:onClick="@{() -> playbackModel.invertPlayingStatus()}"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="@+id/playback_song_container_duration"
@@ -171,7 +171,7 @@
             android:id="@+id/playback_skip_next"
             style="@style/Widget.Button.Unbounded"
             android:layout_marginStart="@dimen/spacing_large"
-            android:contentDescription="@string/description_skip_next"
+            android:contentDescription="@string/desc_skip_next"
             android:onClick="@{() -> playbackModel.skipNext()}"
             android:src="@drawable/ic_skip_next"
             app:layout_constraintBottom_toBottomOf="@+id/playback_play_pause"
@@ -182,7 +182,7 @@
             android:id="@+id/playback_shuffle"
             style="@style/Widget.Button.Unbounded"
             android:layout_marginStart="@dimen/spacing_large"
-            android:contentDescription="@string/description_shuffle"
+            android:contentDescription="@string/desc_shuffle"
             android:onClick="@{() -> playbackModel.invertShuffleStatus()}"
             android:src="@drawable/ic_shuffle"
             app:layout_constraintBottom_toBottomOf="@+id/playback_skip_next"

app/src/main/res/layout-xlarge/fragment_playback.xml

@@ -29,18 +29,18 @@
 
         <androidx.appcompat.widget.Toolbar
             android:id="@+id/playback_toolbar"
-            style="@style/Toolbar.Style.Icon.Down"
+            style="@style/Widget.Toolbar.Icon.Down"
             android:elevation="0dp"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent"
             app:menu="@menu/menu_playback"
-            app:title="@string/label_playback" />
+            app:title="@string/lbl_playback" />
 
         <ImageView
             android:id="@+id/playback_cover"
-            style="@style/ElevatedImageView"
+            style="@style/Widget.ImageView.Full"
             android:layout_margin="@dimen/spacing_mid_huge"
-            android:contentDescription="@{@string/description_album_cover(song.name)}"
+            android:contentDescription="@{@string/desc_album_cover(song.name)}"
             app:albumArt="@{song}"
             app:layout_constraintBottom_toTopOf="@+id/playback_song"
             app:layout_constraintDimensionRatio="1:1"
@@ -51,7 +51,7 @@
 
         <TextView
             android:id="@+id/playback_song"
-            style="@style/Widget.TextView.Playback.Primary"
+            style="@style/Widget.TextView.Primary"
             android:layout_marginStart="@dimen/spacing_mid_huge"
             android:layout_marginEnd="@dimen/spacing_mid_huge"
             android:onClick="@{() -> detailModel.navToItem(playbackModel.song)}"
@@ -64,7 +64,7 @@
 
         <TextView
             android:id="@+id/playback_artist"
-            style="@style/Widget.TextView.Playback.Secondary"
+            style="@style/Widget.TextView.Secondary"
             android:layout_marginStart="@dimen/spacing_mid_huge"
             android:layout_marginEnd="@dimen/spacing_mid_huge"
             android:onClick="@{() -> detailModel.navToItem(playbackModel.song.album.artist)}"
@@ -76,7 +76,7 @@
 
         <TextView
             android:id="@+id/playback_album"
-            style="@style/Widget.TextView.Playback.Secondary"
+            style="@style/Widget.TextView.Secondary"
             android:layout_marginStart="@dimen/spacing_mid_huge"
             android:layout_marginEnd="@dimen/spacing_mid_huge"
             android:layout_marginBottom="@dimen/spacing_medium"
@@ -125,7 +125,7 @@
             android:id="@+id/playback_loop"
             style="@style/Widget.Button.Unbounded"
             android:layout_marginEnd="@dimen/spacing_large"
-            android:contentDescription="@string/description_change_loop"
+            android:contentDescription="@string/desc_change_loop"
             android:onClick="@{() -> playbackModel.incrementLoopStatus()}"
             android:src="@drawable/ic_loop"
             app:layout_constraintBottom_toBottomOf="@+id/playback_skip_prev"
@@ -137,7 +137,7 @@
             android:id="@+id/playback_skip_prev"
             style="@style/Widget.Button.Unbounded"
             android:layout_marginEnd="@dimen/spacing_large"
-            android:contentDescription="@string/description_skip_prev"
+            android:contentDescription="@string/desc_skip_prev"
             android:onClick="@{() -> playbackModel.skipPrev()}"
             android:src="@drawable/ic_skip_prev"
             app:layout_constraintBottom_toBottomOf="@+id/playback_play_pause"
@@ -146,7 +146,7 @@
 
         <org.oxycblt.auxio.playback.PlayPauseButton
             android:id="@+id/playback_play_pause"
-            style="@style/PlayPause"
+            style="@style/Widget.Component.Playback.PlayPause"
             android:layout_marginBottom="@dimen/spacing_large"
             android:onClick="@{() -> playbackModel.invertPlayingStatus()}"
             app:layout_constraintBottom_toBottomOf="parent"
@@ -158,7 +158,7 @@
             android:id="@+id/playback_skip_next"
             style="@style/Widget.Button.Unbounded"
             android:layout_marginStart="@dimen/spacing_large"
-            android:contentDescription="@string/description_skip_next"
+            android:contentDescription="@string/desc_skip_next"
             android:onClick="@{() -> playbackModel.skipNext()}"
             android:src="@drawable/ic_skip_next"
             app:layout_constraintBottom_toBottomOf="@+id/playback_play_pause"
@@ -169,7 +169,7 @@
             android:id="@+id/playback_shuffle"
             style="@style/Widget.Button.Unbounded"
             android:layout_marginStart="@dimen/spacing_large"
-            android:contentDescription="@string/description_shuffle"
+            android:contentDescription="@string/desc_shuffle"
             android:onClick="@{() -> playbackModel.invertShuffleStatus()}"
             android:src="@drawable/ic_shuffle"
             app:layout_constraintBottom_toBottomOf="@+id/playback_skip_next"

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

@@ -26,7 +26,7 @@
             android:layout_height="wrap_content"
             android:fontFamily="@font/inter_semibold"
             android:padding="@dimen/spacing_medium"
-            android:text="@string/label_no_dirs"
+            android:text="@string/lbl_no_dirs"
             android:textAlignment="center"
             android:textAppearance="?android:attr/textAppearanceLarge"
             android:textColor="?android:attr/textColorSecondary" />

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

@@ -13,8 +13,8 @@
 
         <androidx.appcompat.widget.Toolbar
             android:id="@+id/about_toolbar"
-            style="@style/Toolbar.Style.Icon.Down"
+            style="@style/Widget.Toolbar.Icon.Down"
-            app:title="@string/label_about" />
+            app:title="@string/lbl_about" />
 
         <androidx.core.widget.NestedScrollView
             android:layout_width="match_parent"
@@ -40,7 +40,7 @@
                         android:layout_height="@dimen/size_app_icon"
                         android:layout_marginStart="@dimen/spacing_medium"
                         android:layout_marginTop="@dimen/spacing_medium"
-                        android:contentDescription="@string/description_auxio_icon"
+                        android:contentDescription="@string/desc_auxio_icon"
                         android:src="@mipmap/ic_launcher"
                         app:layout_constraintEnd_toStartOf="@+id/about_app_name"
                         app:layout_constraintHorizontal_chainStyle="packed"
@@ -80,15 +80,14 @@
                         android:layout_height="0dp"
                         android:padding="@dimen/spacing_medium"
                         app:layout_constraintTop_toBottomOf="@+id/about_desc"
-                        app:layout_constraintVertical_chainStyle="packed"
+                        app:layout_constraintVertical_chainStyle="packed">
-                        tools:layout_editor_absoluteX="-16dp">
 
                         <ImageView
                             android:id="@+id/about_version_icon"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:contentDescription="@string/label_version"
+                            android:contentDescription="@string/lbl_version"
-                            android:src="@drawable/ic_version"
+                            android:src="@drawable/ic_about"
                             app:layout_constraintBottom_toBottomOf="parent"
                             app:layout_constraintStart_toStartOf="parent"
                             app:layout_constraintTop_toTopOf="parent" />
@@ -98,7 +97,7 @@
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:layout_marginStart="@dimen/spacing_medium"
-                            android:text="@string/label_version"
+                            android:text="@string/lbl_version"
                             android:textAppearance="@style/TextAppearance.AppCompat.Subhead"
                             app:layout_constraintBottom_toTopOf="@+id/about_version"
                             app:layout_constraintStart_toEndOf="@+id/about_version_icon"
@@ -119,8 +118,8 @@
 
                     <TextView
                         android:id="@+id/about_code"
-                        style="@style/Widget.TextView.About.Clickable"
+                        style="@style/Widget.TextView.Icon.Clickable"
-                        android:text="@string/label_code"
+                        android:text="@string/lbl_code"
                         app:drawableStartCompat="@drawable/ic_code"
                         app:layout_constraintBottom_toTopOf="@+id/about_faq"
                         app:layout_constraintEnd_toEndOf="parent"
@@ -129,8 +128,8 @@
 
                     <TextView
                         android:id="@+id/about_licenses"
-                        style="@style/Widget.TextView.About.Clickable"
+                        style="@style/Widget.TextView.Icon.Clickable"
-                        android:text="@string/label_licenses"
+                        android:text="@string/lbl_licenses"
                         app:drawableStartCompat="@drawable/ic_license"
                         app:layout_constraintEnd_toEndOf="parent"
                         app:layout_constraintStart_toStartOf="parent"
@@ -138,9 +137,9 @@
 
                     <TextView
                         android:id="@+id/about_faq"
-                        style="@style/Widget.TextView.About.Clickable"
+                        style="@style/Widget.TextView.Icon.Clickable"
-                        android:text="@string/label_faq"
+                        android:text="@string/lbl_faq"
-                        app:drawableStartCompat="@drawable/ic_about"
+                        app:drawableStartCompat="@drawable/ic_faq"
                         app:layout_constraintBottom_toTopOf="@+id/about_licenses"
                         app:layout_constraintEnd_toEndOf="parent"
                         app:layout_constraintStart_toStartOf="parent"
@@ -148,7 +147,7 @@
 
                     <TextView
                         android:id="@+id/about_song_count"
-                        style="@style/Widget.TextView.About"
+                        style="@style/Widget.TextView.Icon"
                         android:theme="@style/Theme.Neutral"
                         app:drawableStartCompat="@drawable/ic_song"
                         app:layout_constraintEnd_toEndOf="parent"
@@ -158,8 +157,8 @@
 
                     <TextView
                         android:id="@+id/about_author"
-                        style="@style/Widget.TextView.About"
+                        style="@style/Widget.TextView.Icon"
-                        android:text="@string/label_author"
+                        android:text="@string/lbl_author"
                         app:drawableStartCompat="@drawable/ic_author"
                         app:layout_constraintEnd_toEndOf="parent"
                         app:layout_constraintStart_toStartOf="parent"

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

@@ -34,8 +34,9 @@
 
         <ImageView
             android:id="@+id/playback_cover"
-            style="@style/CompactImageView"
+            style="@style/Widget.ImageView.Compact"
-            android:contentDescription="@{@string/description_album_cover(song.name)}"
+            android:layout_margin="@dimen/spacing_small"
+            android:contentDescription="@{@string/desc_album_cover(song.name)}"
             app:albumArt="@{song}"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintStart_toStartOf="parent"
@@ -46,6 +47,8 @@
             android:id="@+id/playback_song"
             style="@style/Widget.TextView.Compact.Primary"
             android:text="@{song.name}"
+            android:layout_marginStart="@dimen/spacing_small"
+            android:layout_marginEnd="@dimen/spacing_small"
             app:layout_constraintBottom_toTopOf="@+id/playback_info"
             app:layout_constraintEnd_toStartOf="@+id/playback_play_pause"
             app:layout_constraintStart_toEndOf="@+id/playback_cover"
@@ -56,6 +59,8 @@
         <TextView
             android:id="@+id/playback_info"
             style="@style/Widget.TextView.Compact.Secondary"
+            android:layout_marginStart="@dimen/spacing_small"
+            android:layout_marginEnd="@dimen/spacing_small"
             android:text="@{@string/format_info(song.album.artist.name, song.album.name)}"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toStartOf="@+id/playback_play_pause"
@@ -65,13 +70,15 @@
 
         <org.oxycblt.auxio.playback.PlayPauseButton
             android:id="@+id/playback_play_pause"
-            style="@style/Widget.Button.Unbounded.PlayPause"
+            style="@style/Widget.Button.Unbounded"
-            android:contentDescription="@string/description_play_pause"
+            android:padding="0dp"
+            android:layout_margin="@dimen/spacing_small"
+            android:contentDescription="@string/desc_play_pause"
             android:onClick="@{() -> playbackModel.invertPlayingStatus()}"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toTopOf="parent"
-            tools:src="@drawable/ic_play_large" />
+            tools:src="@drawable/ic_pause_large" />
 
     </androidx.constraintlayout.widget.ConstraintLayout>
 </layout>

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

@@ -17,7 +17,7 @@
 
             <androidx.appcompat.widget.Toolbar
                 android:id="@+id/detail_toolbar"
-                style="@style/Toolbar.Style.Icon" />
+                style="@style/Widget.Toolbar.Icon" />
 
         </com.google.android.material.appbar.AppBarLayout>
 

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

@@ -12,12 +12,12 @@
 
         <androidx.appcompat.widget.Toolbar
             android:id="@+id/library_toolbar"
-            style="@style/Toolbar.Style"
+            style="@style/Widget.Toolbar"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent"
             app:menu="@menu/menu_library"
-            app:title="@string/label_library" />
+            app:title="@string/lbl_library" />
 
         <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/library_recycler"

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

@@ -29,7 +29,7 @@
             android:layout_width="@dimen/size_error_icon"
             android:layout_height="@dimen/size_error_icon"
             android:layout_margin="@dimen/spacing_small"
-            android:contentDescription="@string/description_error"
+            android:contentDescription="@string/desc_error"
             android:src="@drawable/ic_error"
             android:visibility="gone"
             tools:visibility="visible" />
@@ -46,17 +46,21 @@
 
         <Button
             android:id="@+id/loading_retry_button"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
             style="@style/Widget.Button.Unbounded.Text"
             android:onClick="@{() -> loadingModel.load(context)}"
-            android:text="@string/label_retry"
+            android:text="@string/lbl_retry"
             android:visibility="gone"
             tools:visibility="visible" />
 
         <Button
             android:id="@+id/loading_grant_button"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
             style="@style/Widget.Button.Unbounded.Text"
             android:onClick="@{() -> loadingModel.grant()}"
-            android:text="@string/label_grant"
+            android:text="@string/lbl_grant"
             android:visibility="gone"
             tools:visibility="visible" />
 

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

@@ -28,18 +28,18 @@
 
         <androidx.appcompat.widget.Toolbar
             android:id="@+id/playback_toolbar"
-            style="@style/Toolbar.Style.Icon.Down"
+            style="@style/Widget.Toolbar.Icon.Down"
             android:elevation="0dp"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent"
             app:menu="@menu/menu_playback"
-            app:title="@string/label_playback" />
+            app:title="@string/lbl_playback" />
 
         <ImageView
             android:id="@+id/playback_cover"
-            style="@style/ElevatedImageView"
+            style="@style/Widget.ImageView.Full"
             android:layout_margin="@dimen/spacing_mid_large"
-            android:contentDescription="@{@string/description_album_cover(song.name)}"
+            android:contentDescription="@{@string/desc_album_cover(song.name)}"
             app:albumArt="@{song}"
             app:layout_constraintBottom_toTopOf="@+id/playback_song"
             app:layout_constraintDimensionRatio="1:1"
@@ -50,7 +50,7 @@
 
         <TextView
             android:id="@+id/playback_song"
-            style="@style/Widget.TextView.Playback.Primary"
+            style="@style/Widget.TextView.Primary"
             android:layout_marginStart="@dimen/spacing_mid_large"
             android:layout_marginEnd="@dimen/spacing_mid_large"
             android:onClick="@{() -> detailModel.navToItem(playbackModel.song)}"
@@ -63,7 +63,7 @@
 
         <TextView
             android:id="@+id/playback_artist"
-            style="@style/Widget.TextView.Playback.Secondary"
+            style="@style/Widget.TextView.Secondary"
             android:layout_marginStart="@dimen/spacing_mid_large"
             android:layout_marginEnd="@dimen/spacing_mid_large"
             android:onClick="@{() -> detailModel.navToItem(playbackModel.song.album.artist)}"
@@ -75,7 +75,7 @@
 
         <TextView
             android:id="@+id/playback_album"
-            style="@style/Widget.TextView.Playback.Secondary"
+            style="@style/Widget.TextView.Secondary"
             android:layout_marginStart="@dimen/spacing_mid_large"
             android:layout_marginEnd="@dimen/spacing_mid_large"
             android:layout_marginBottom="@dimen/spacing_medium"
@@ -122,7 +122,7 @@
             android:id="@+id/playback_loop"
             style="@style/Widget.Button.Unbounded"
             android:layout_marginStart="@dimen/spacing_small"
-            android:contentDescription="@string/description_change_loop"
+            android:contentDescription="@string/desc_change_loop"
             android:onClick="@{() -> playbackModel.incrementLoopStatus()}"
             android:src="@drawable/ic_loop"
             app:layout_constraintBottom_toBottomOf="@+id/playback_skip_prev"
@@ -132,7 +132,7 @@
         <ImageButton
             android:id="@+id/playback_skip_prev"
             style="@style/Widget.Button.Unbounded"
-            android:contentDescription="@string/description_skip_prev"
+            android:contentDescription="@string/desc_skip_prev"
             android:onClick="@{() -> playbackModel.skipPrev()}"
             android:src="@drawable/ic_skip_prev"
             app:layout_constraintBottom_toBottomOf="@+id/playback_play_pause"
@@ -142,7 +142,7 @@
 
         <org.oxycblt.auxio.playback.PlayPauseButton
             android:id="@+id/playback_play_pause"
-            style="@style/PlayPause"
+            style="@style/Widget.Component.Playback.PlayPause"
             android:layout_marginBottom="@dimen/spacing_medium"
             android:onClick="@{() -> playbackModel.invertPlayingStatus()}"
             app:layout_constraintBottom_toBottomOf="parent"
@@ -153,7 +153,7 @@
         <ImageButton
             android:id="@+id/playback_skip_next"
             style="@style/Widget.Button.Unbounded"
-            android:contentDescription="@string/description_skip_next"
+            android:contentDescription="@string/desc_skip_next"
             android:onClick="@{() -> playbackModel.skipNext()}"
             android:src="@drawable/ic_skip_next"
             app:layout_constraintBottom_toBottomOf="@+id/playback_play_pause"
@@ -165,7 +165,7 @@
             android:id="@+id/playback_shuffle"
             style="@style/Widget.Button.Unbounded"
             android:layout_marginEnd="@dimen/spacing_small"
-            android:contentDescription="@string/description_shuffle"
+            android:contentDescription="@string/desc_shuffle"
             android:onClick="@{() -> playbackModel.invertShuffleStatus()}"
             android:src="@drawable/ic_shuffle"
             app:layout_constraintBottom_toBottomOf="@+id/playback_skip_next"

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

@@ -13,9 +13,9 @@
 
         <androidx.appcompat.widget.Toolbar
             android:id="@+id/queue_toolbar"
-            style="@style/Toolbar.Style.Icon.Down"
+            style="@style/Widget.Toolbar.Icon.Down"
             app:navigationIcon="@drawable/ic_down"
-            app:title="@string/label_queue" />
+            app:title="@string/lbl_queue" />
 
         <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/queue_recycler"

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

@@ -16,11 +16,11 @@
 
             <androidx.appcompat.widget.Toolbar
                 android:id="@+id/search_toolbar"
-                style="@style/Toolbar.Style"
+                style="@style/Widget.Toolbar"
                 android:elevation="0dp"
                 app:layout_scrollFlags="scroll|enterAlways"
                 app:menu="@menu/menu_search"
-                app:title="@string/label_search" />
+                app:title="@string/lbl_search" />
 
             <com.google.android.material.textfield.TextInputLayout
                 android:id="@+id/search_text_layout"
@@ -30,7 +30,7 @@
                 app:boxStrokeColor="?attr/colorPrimary"
                 app:boxStrokeWidth="0dp"
                 app:boxStrokeWidthFocused="2dp"
-                app:endIconContentDescription="@string/description_clear_search"
+                app:endIconContentDescription="@string/desc_clear_search"
                 app:endIconDrawable="@drawable/ic_close"
                 app:endIconTint="?attr/colorControlNormal"
                 app:endIconMode="clear_text"

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

@@ -11,9 +11,9 @@
 
         <androidx.appcompat.widget.Toolbar
             android:id="@+id/settings_toolbar"
-            style="@style/Toolbar.Style"
+            style="@style/Widget.Toolbar"
             app:menu="@menu/menu_settings"
-            app:title="@string/setting_title" />
+            app:title="@string/set_title" />
 
         <androidx.fragment.app.FragmentContainerView
             android:id="@+id/settings_list_fragment"

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

@@ -12,11 +12,11 @@
 
         <androidx.appcompat.widget.Toolbar
             android:id="@+id/song_toolbar"
-            style="@style/Toolbar.Style"
+            style="@style/Widget.Toolbar"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent"
             app:menu="@menu/menu_songs"
-            app:title="@string/label_all_songs" />
+            app:title="@string/lbl_all_songs" />
 
         <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/song_recycler"

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

@@ -18,7 +18,9 @@
 
         <TextView
             android:id="@+id/header_title"
-            style="@style/HeaderText"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            style="@style/Widget.TextView.Header"
             android:text="@{header.name}"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent"
@@ -26,7 +28,9 @@
 
         <ImageButton
             android:id="@+id/header_button"
-            style="@style/HeaderAction"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            style="@style/Widget.Button.Unbounded.Small"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toTopOf="@+id/header_title"

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

@@ -11,13 +11,12 @@
             type="org.oxycblt.auxio.music.Album" />
     </data>
 
-    <androidx.constraintlayout.widget.ConstraintLayout style="@style/ItemSurroundings">
+    <androidx.constraintlayout.widget.ConstraintLayout style="@style/ItemLayout">
 
         <ImageView
             android:id="@+id/album_cover"
-            android:layout_width="@dimen/size_cover_normal"
+            style="@style/Widget.ImageView.Normal"
-            android:layout_height="@dimen/size_cover_normal"
+            android:contentDescription="@{@string/desc_album_cover(album.name)}"
-            android:contentDescription="@{@string/description_album_cover(album.name)}"
             app:albumArt="@{album}"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintStart_toStartOf="parent"

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

@@ -25,11 +25,11 @@
 
         <ImageView
             android:id="@+id/album_cover"
-            style="@style/ElevatedImageView"
+            style="@style/Widget.ImageView.Full"
             android:layout_width="@dimen/size_cover_detail"
             android:layout_height="@dimen/size_cover_detail"
             android:layout_marginTop="@dimen/spacing_medium"
-            android:contentDescription="@{@string/description_album_cover(album.name)}"
+            android:contentDescription="@{@string/desc_album_cover(album.name)}"
             app:albumArt="@{album}"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
@@ -38,7 +38,7 @@
 
         <TextView
             android:id="@+id/album_name"
-            style="@style/DetailTitleText"
+            style="@style/Widget.TextView.Detail"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginStart="@dimen/spacing_medium"
@@ -78,19 +78,24 @@
 
         <com.google.android.material.button.MaterialButton
             android:id="@+id/album_play_button"
-            style="@style/Widget.MaterialComponents.Button.Unimportant"
+            style="@style/Widget.Button.Vibrant.Secondary"
             android:onClick="@{() -> playbackModel.playAlbum(album, false)}"
-            android:text="@string/label_play"
+            android:text="@string/lbl_play"
+            android:layout_marginTop="@dimen/spacing_small"
+            android:layout_marginEnd="@dimen/spacing_small"
+            android:layout_marginStart="@dimen/spacing_medium"
             app:layout_constraintEnd_toStartOf="@+id/album_shuffle_button"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/album_details" />
 
         <com.google.android.material.button.MaterialButton
             android:id="@+id/album_shuffle_button"
-            style="@style/Widget.MaterialComponents.Button.Highlighted"
+            style="@style/Widget.Button.Vibrant.Primary"
             android:backgroundTint="?attr/colorPrimary"
             android:onClick="@{() -> playbackModel.playAlbum(album, true)}"
-            android:text="@string/label_shuffle"
+            android:text="@string/lbl_shuffle"
+            android:layout_marginStart="@dimen/spacing_small"
+            android:layout_marginEnd="@dimen/spacing_medium"
             app:layout_constraintBottom_toBottomOf="@+id/album_play_button"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toEndOf="@+id/album_play_button"
@@ -98,17 +103,21 @@
 
         <TextView
             android:id="@+id/album_song_header"
-            style="@style/HeaderText"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            style="@style/Widget.TextView.Header"
             android:layout_marginTop="@dimen/spacing_small"
             android:background="@drawable/ui_header_dividers"
-            android:text="@string/label_songs"
+            android:text="@string/lbl_songs"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/album_play_button" />
 
         <ImageButton
             android:id="@+id/album_sort_button"
-            style="@style/HeaderAction"
+            android:layout_height="wrap_content"
-            android:contentDescription="@string/description_sort_button"
+            android:layout_width="0dp"
+            style="@style/Widget.Button.Unbounded.Small"
+            android:contentDescription="@string/desc_sort_button"
             android:onClick="@{() -> detailModel.incrementAlbumSortMode()}"
             app:layout_constraintBottom_toBottomOf="@+id/album_song_header"
             app:layout_constraintEnd_toEndOf="parent"

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

@@ -11,13 +11,13 @@
             type="org.oxycblt.auxio.music.Song" />
     </data>
 
-    <androidx.constraintlayout.widget.ConstraintLayout style="@style/ItemSurroundings">
+    <androidx.constraintlayout.widget.ConstraintLayout style="@style/ItemLayout">
 
         <TextView
             android:id="@+id/song_track"
             android:layout_width="@dimen/width_track_number"
             android:layout_height="wrap_content"
-            android:contentDescription="@{@string/description_track_number(song.track)}"
+            android:contentDescription="@{@string/desc_track_number(song.track)}"
             android:gravity="center"
             android:maxLines="1"
             android:text="@{String.valueOf(song.track)}"

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

@@ -11,13 +11,12 @@
             type="org.oxycblt.auxio.music.Artist" />
     </data>
 
-    <androidx.constraintlayout.widget.ConstraintLayout style="@style/ItemSurroundings">
+    <androidx.constraintlayout.widget.ConstraintLayout style="@style/ItemLayout">
 
         <ImageView
             android:id="@+id/artist_image"
-            android:layout_width="@dimen/size_cover_normal"
+            style="@style/Widget.ImageView.Normal"
-            android:layout_height="@dimen/size_cover_normal"
+            android:contentDescription="@{@string/desc_artist_image(artist.name)}"
-            android:contentDescription="@{@string/description_artist_image(artist.name)}"
             app:artistImage="@{artist}"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintStart_toStartOf="parent"

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

@@ -11,13 +11,12 @@
             type="org.oxycblt.auxio.music.Album" />
     </data>
 
-    <androidx.constraintlayout.widget.ConstraintLayout style="@style/ItemSurroundings">
+    <androidx.constraintlayout.widget.ConstraintLayout style="@style/ItemLayout">
 
         <ImageView
             android:id="@+id/album_cover"
-            android:layout_width="@dimen/size_cover_large"
+            style="@style/Widget.ImageView.Large"
-            android:layout_height="@dimen/size_cover_large"
+            android:contentDescription="@{@string/desc_album_cover(album.name)}"
-            android:contentDescription="@{@string/description_album_cover(album.name)}"
             app:albumArt="@{album}"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintStart_toStartOf="parent"

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

@@ -24,8 +24,8 @@
             android:layout_width="@dimen/size_cover_detail"
             android:layout_height="@dimen/size_cover_detail"
             android:layout_marginTop="@dimen/spacing_medium"
-            android:contentDescription="@{@string/description_artist_image(artist.name)}"
+            android:contentDescription="@{@string/desc_artist_image(artist.name)}"
-            style="@style/ElevatedImageView"
+            style="@style/Widget.ImageView.Full"
             app:artistImage="@{artist}"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
@@ -34,7 +34,7 @@
 
         <TextView
             android:id="@+id/artist_name"
-            style="@style/DetailTitleText"
+            style="@style/Widget.TextView.Detail"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginStart="@dimen/spacing_medium"
@@ -73,32 +73,42 @@
 
         <com.google.android.material.button.MaterialButton
             android:id="@+id/artist_play_button"
-            style="@style/Widget.MaterialComponents.Button.Unimportant"
+            style="@style/Widget.Button.Vibrant.Secondary"
             android:onClick="@{() -> playbackModel.playArtist(artist, false)}"
-            android:text="@string/label_play"
+            android:text="@string/lbl_play"
+            android:layout_marginTop="@dimen/spacing_small"
+            android:layout_marginEnd="@dimen/spacing_small"
+            android:layout_marginStart="@dimen/spacing_medium"
             app:layout_constraintEnd_toStartOf="@+id/artist_shuffle_button"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/artist_counts" />
 
         <com.google.android.material.button.MaterialButton
             android:id="@+id/artist_shuffle_button"
-            style="@style/Widget.MaterialComponents.Button.Highlighted"
+            style="@style/Widget.Button.Vibrant.Primary"
             android:backgroundTint="?attr/colorPrimary"
             android:onClick="@{() -> playbackModel.playArtist(artist, true)}"
-            android:text="@string/label_shuffle"
+            android:text="@string/lbl_shuffle"
+            android:layout_marginStart="@dimen/spacing_small"
+            android:layout_marginEnd="@dimen/spacing_medium"
             app:layout_constraintBottom_toBottomOf="@+id/artist_play_button"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toEndOf="@+id/artist_play_button"
             app:layout_constraintTop_toTopOf="@+id/artist_play_button" />
 
         <TextView
-            android:id="@+id/artist_album_header"
+            android:id="@+id/artist_song_header"
-            style="@style/HeaderText"
+            style="@style/Widget.TextView.Header"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
             android:layout_marginTop="@dimen/spacing_small"
-            android:text="@string/label_albums"
+            android:background="@drawable/ui_header_dividers"
+            android:text="@string/lbl_songs"
+            app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/artist_play_button" />
 
+
     </androidx.constraintlayout.widget.ConstraintLayout>
 
 </layout>

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

@@ -11,18 +11,16 @@
             type="org.oxycblt.auxio.music.Song" />
     </data>
 
-    <androidx.constraintlayout.widget.ConstraintLayout style="@style/ItemSurroundings">
+    <androidx.constraintlayout.widget.ConstraintLayout style="@style/ItemLayout">
 
         <ImageView
             android:id="@+id/album_cover"
-            android:layout_width="@dimen/size_cover_compact"
+            style="@style/Widget.ImageView.Compact"
-            android:layout_height="@dimen/size_cover_compact"
+            android:contentDescription="@{@string/desc_album_cover(song.name)}"
-            android:contentDescription="@{@string/description_album_cover(song.name)}"
             app:albumArt="@{song}"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent"
-            tools:ignore="ContentDescription"
             tools:src="@drawable/ic_song" />
 
         <TextView

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

@@ -4,7 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools">
 
     <androidx.constraintlayout.widget.ConstraintLayout
-        style="@style/ItemSurroundings"
+        style="@style/ItemLayout"
         android:clickable="false"
         android:focusable="false">
 
@@ -26,7 +26,7 @@
             android:tint="?attr/colorControlNormal"
             android:layout_width="@dimen/size_clear"
             android:layout_height="@dimen/size_clear"
-            android:contentDescription="@string/description_blacklist_delete"
+            android:contentDescription="@string/desc_blacklist_delete"
             android:src="@drawable/ic_clear"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"

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

@@ -11,13 +11,12 @@
             type="org.oxycblt.auxio.music.Genre" />
     </data>
 
-    <androidx.constraintlayout.widget.ConstraintLayout style="@style/ItemSurroundings">
+    <androidx.constraintlayout.widget.ConstraintLayout style="@style/ItemLayout">
 
         <ImageView
             android:id="@+id/genre_image"
-            android:layout_width="@dimen/size_cover_normal"
+            style="@style/Widget.ImageView.Normal"
-            android:layout_height="@dimen/size_cover_normal"
+            android:contentDescription="@{@string/desc_genre_image(genre.name)}"
-            android:contentDescription="@{@string/description_genre_image(genre.name)}"
             app:genreImage="@{genre}"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintStart_toStartOf="parent"
@@ -38,7 +37,7 @@
         <TextView
             android:id="@+id/genre_count"
             style="@style/ItemText.Secondary"
-            android:text="@{@plurals/format_song_count(genre.songs.size(), genre.songs.size())}"
+            android:text="@{@plurals/fmt_song_count(genre.songs.size(), genre.songs.size())}"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toEndOf="@+id/genre_image"

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

@@ -29,8 +29,8 @@
             android:layout_width="@dimen/size_cover_detail"
             android:layout_height="@dimen/size_cover_detail"
             android:layout_marginTop="@dimen/spacing_medium"
-            android:contentDescription="@{@string/description_genre_image(genre.name)}"
+            android:contentDescription="@{@string/desc_genre_image(genre.name)}"
-            style="@style/ElevatedImageView"
+            style="@style/Widget.ImageView.Full"
             app:genreImage="@{genre}"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
@@ -39,7 +39,7 @@
 
         <androidx.appcompat.widget.AppCompatTextView
             android:id="@+id/genre_name"
-            style="@style/DetailTitleText"
+            style="@style/Widget.TextView.Detail"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginStart="@dimen/spacing_medium"
@@ -57,7 +57,7 @@
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginStart="@dimen/spacing_medium"
-            android:text="@{@plurals/format_song_count(genre.songs.size(), genre.songs.size())}"
+            android:text="@{@plurals/fmt_song_count(genre.songs.size(), genre.songs.size())}"
             android:textAppearance="?android:attr/textAppearanceListItem"
             android:textColor="?android:attr/textColorSecondary"
             app:layout_constraintStart_toStartOf="parent"
@@ -78,19 +78,22 @@
 
         <com.google.android.material.button.MaterialButton
             android:id="@+id/genre_play_button"
-            style="@style/Widget.MaterialComponents.Button.Unimportant"
+            style="@style/Widget.Button.Vibrant.Secondary"
             android:onClick="@{() -> playbackModel.playGenre(genre, false)}"
-            android:text="@string/label_play"
+            android:text="@string/lbl_play"
+            android:layout_marginTop="@dimen/spacing_small"
+            android:layout_marginEnd="@dimen/spacing_small"
+            android:layout_marginStart="@dimen/spacing_medium"
             app:layout_constraintEnd_toStartOf="@+id/genre_shuffle_button"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/genre_duration" />
 
         <com.google.android.material.button.MaterialButton
             android:id="@+id/genre_shuffle_button"
-            style="@style/Widget.MaterialComponents.Button.Highlighted"
+            style="@style/Widget.Button.Vibrant.Primary"
             android:backgroundTint="?attr/colorPrimary"
             android:onClick="@{() -> playbackModel.playGenre(genre, true)}"
-            android:text="@string/label_shuffle"
+            android:text="@string/lbl_shuffle"
             app:layout_constraintBottom_toBottomOf="@+id/genre_play_button"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toEndOf="@+id/genre_play_button"
@@ -98,16 +101,20 @@
 
         <TextView
             android:id="@+id/genre_song_header"
-            style="@style/HeaderText"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            style="@style/Widget.TextView.Header"
             android:layout_marginTop="@dimen/spacing_small"
-            android:text="@string/label_songs"
+            android:text="@string/lbl_songs"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/genre_play_button" />
 
         <ImageButton
             android:id="@+id/genre_sort_button"
-            style="@style/HeaderAction"
+            android:layout_width="0dp"
-            android:contentDescription="@string/description_sort_button"
+            android:layout_height="wrap_content"
+            style="@style/Widget.Button.Unbounded.Small"
+            android:contentDescription="@string/desc_sort_button"
             android:onClick="@{() -> detailModel.incrementGenreSortMode()}"
             app:layout_constraintBottom_toBottomOf="@+id/genre_song_header"
             app:layout_constraintEnd_toEndOf="parent"

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

@@ -11,13 +11,12 @@
             type="org.oxycblt.auxio.music.Song" />
     </data>
 
-    <androidx.constraintlayout.widget.ConstraintLayout style="@style/ItemSurroundings">
+    <androidx.constraintlayout.widget.ConstraintLayout style="@style/ItemLayout">
 
         <ImageView
             android:id="@+id/album_cover"
-            android:layout_width="@dimen/size_cover_compact"
+            style="@style/Widget.ImageView.Compact"
-            android:layout_height="@dimen/size_cover_compact"
+            android:contentDescription="@{@string/desc_album_cover(song.name)}"
-            android:contentDescription="@{@string/description_album_cover(song.name)}"
             app:albumArt="@{song}"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintStart_toStartOf="parent"

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

@@ -12,7 +12,9 @@
 
     <TextView
         android:id="@android:id/title"
-        style="@style/HeaderText"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        style="@style/Widget.TextView.Header"
         android:text="@{header.name}"
         tools:text="Songs" />
 </layout>

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

@@ -18,14 +18,12 @@
 
         <ImageView
             android:id="@+id/album_cover"
-            android:layout_width="@dimen/size_cover_compact"
+            style="@style/Widget.ImageView.Compact"
-            android:layout_height="@dimen/size_cover_compact"
+            android:contentDescription="@{@string/desc_album_cover(song.name)}"
-            android:contentDescription="@{@string/description_album_cover(song.name)}"
             app:albumArt="@{song}"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent"
-            tools:ignore="ContentDescription"
             tools:src="@drawable/ic_song" />
 
         <TextView

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

@@ -11,13 +11,12 @@
             type="org.oxycblt.auxio.music.Song" />
     </data>
 
-    <androidx.constraintlayout.widget.ConstraintLayout style="@style/ItemSurroundings">
+    <androidx.constraintlayout.widget.ConstraintLayout style="@style/ItemLayout">
 
         <ImageView
             android:id="@+id/album_cover"
-            android:layout_width="@dimen/size_cover_compact"
+            style="@style/Widget.ImageView.Compact"
-            android:layout_height="@dimen/size_cover_compact"
+            android:contentDescription="@{@string/desc_album_cover(song.name)}"
-            android:contentDescription="@{@string/description_album_cover(song.name)}"
             app:albumArt="@{song}"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintStart_toStartOf="parent"

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

@@ -10,7 +10,7 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:alpha="0.3"
-        android:contentDescription="@string/description_no_cover"
+        android:contentDescription="@string/desc_no_cover"
         android:scaleType="centerCrop"
         android:src="@drawable/ic_song" />
 
@@ -21,7 +21,7 @@
         android:fontFamily="@font/inter"
         android:gravity="center"
         android:padding="@dimen/spacing_medium"
-        android:text="@string/placeholder_playback"
+        android:text="@string/def_playback"
         android:textAppearance="@style/TextAppearance.MaterialComponents.Headline6"
         android:textColor="?android:attr/textColorPrimary"
         android:textStyle="bold" />

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

@@ -9,22 +9,22 @@
 
     <ImageView
         android:id="@+id/widget_cover"
-        style="@style/FluidImageView"
+        style="@style/Widget.Component.AppWidget.ImageView"
-        android:contentDescription="@string/description_no_cover"
+        android:contentDescription="@string/desc_no_cover"
         android:src="@drawable/ic_song" />
 
     <LinearLayout
-        style="@style/WidgetPanel">
+        style="@style/Widget.Component.AppWidget.Panel.Base">
 
         <TextView
             android:id="@+id/widget_song"
-            style="@style/Widget.TextView.Widget.Primary"
+            style="@style/Widget.Component.AppWidget.TextView.Primary"
-            android:text="@string/placeholder_widget_song" />
+            android:text="@string/def_widget_song" />
 
         <TextView
             android:id="@+id/widget_artist"
-            style="@style/Widget.TextView.Widget.Secondary"
+            style="@style/Widget.Component.AppWidget.TextView.Secondary"
-            android:text="@string/placeholder_widget_artist" />
+            android:text="@string/def_widget_artist" />
 
         <LinearLayout
             android:layout_width="match_parent"
@@ -34,32 +34,32 @@
 
             <ImageButton
                 android:id="@+id/widget_loop"
-                style="@style/Widget.Button.Unbounded.Widget"
+                style="@style/Widget.Component.AppWidget.Button"
-                android:contentDescription="@string/description_change_loop"
+                android:contentDescription="@string/desc_change_loop"
                 android:src="@drawable/ic_loop" />
 
             <ImageButton
                 android:id="@+id/widget_skip_prev"
-                style="@style/Widget.Button.Unbounded.Widget"
+                style="@style/Widget.Component.AppWidget.Button"
-                android:contentDescription="@string/description_skip_prev"
+                android:contentDescription="@string/desc_skip_prev"
                 android:src="@drawable/ic_skip_prev" />
 
             <ImageButton
                 android:id="@+id/widget_play_pause"
-                style="@style/Widget.Button.Unbounded.Widget"
+                style="@style/Widget.Component.AppWidget.Button"
-                android:contentDescription="@string/description_play_pause"
+                android:contentDescription="@string/desc_play_pause"
                 android:src="@drawable/ic_play" />
 
             <ImageButton
                 android:id="@+id/widget_skip_next"
-                style="@style/Widget.Button.Unbounded.Widget"
+                style="@style/Widget.Component.AppWidget.Button"
-                android:contentDescription="@string/description_skip_next"
+                android:contentDescription="@string/desc_skip_next"
                 android:src="@drawable/ic_skip_next" />
 
             <ImageButton
                 android:id="@+id/widget_shuffle"
-                style="@style/Widget.Button.Unbounded.Widget"
+                style="@style/Widget.Component.AppWidget.Button"
-                android:contentDescription="@string/description_shuffle"
+                android:contentDescription="@string/desc_shuffle"
                 android:src="@drawable/ic_shuffle" />
 
         </LinearLayout>

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

@@ -9,22 +9,22 @@
 
     <ImageView
         android:id="@+id/widget_cover"
-        style="@style/FluidImageView"
+        style="@style/Widget.Component.AppWidget.ImageView"
-        android:contentDescription="@string/description_no_cover"
+        android:contentDescription="@string/desc_no_cover"
         android:src="@drawable/ic_song" />
 
     <LinearLayout
-        style="@style/WidgetPanel">
+        style="@style/Widget.Component.AppWidget.Panel.Base">
 
         <TextView
             android:id="@+id/widget_song"
-            style="@style/Widget.TextView.Widget.Primary"
+            style="@style/Widget.Component.AppWidget.TextView.Primary"
-            android:text="@string/placeholder_widget_song" />
+            android:text="@string/def_widget_song" />
 
         <TextView
             android:id="@+id/widget_artist"
-            style="@style/Widget.TextView.Widget.Secondary"
+            style="@style/Widget.Component.AppWidget.TextView.Secondary"
-            android:text="@string/placeholder_widget_artist" />
+            android:text="@string/def_widget_artist" />
 
         <LinearLayout
             android:layout_width="match_parent"
@@ -33,20 +33,20 @@
 
             <ImageButton
                 android:id="@+id/widget_skip_prev"
-                style="@style/Widget.Button.Unbounded.Widget"
+                style="@style/Widget.Component.AppWidget.Button"
-                android:contentDescription="@string/description_skip_prev"
+                android:contentDescription="@string/desc_skip_prev"
                 android:src="@drawable/ic_skip_prev" />
 
             <ImageButton
                 android:id="@+id/widget_play_pause"
-                style="@style/Widget.Button.Unbounded.Widget"
+                style="@style/Widget.Component.AppWidget.Button"
-                android:contentDescription="@string/description_play_pause"
+                android:contentDescription="@string/desc_play_pause"
                 android:src="@drawable/ic_play" />
 
             <ImageButton
                 android:id="@+id/widget_skip_next"
-                style="@style/Widget.Button.Unbounded.Widget"
+                style="@style/Widget.Component.AppWidget.Button"
-                android:contentDescription="@string/description_skip_next"
+                android:contentDescription="@string/desc_skip_next"
                 android:src="@drawable/ic_skip_next" />
 
         </LinearLayout>

app/src/main/res/menu/menu_album_actions.xml

@@ -2,14 +2,14 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android">
     <item
         android:id="@+id/action_play"
-        android:title="@string/label_play" />
+        android:title="@string/lbl_play" />
     <item
         android:id="@+id/action_shuffle"
-        android:title="@string/label_shuffle" />
+        android:title="@string/lbl_shuffle" />
     <item
         android:id="@+id/action_queue_add"
-        android:title="@string/label_queue_add" />
+        android:title="@string/lbl_queue_add" />
     <item
         android:id="@+id/action_go_artist"
-        android:title="@string/label_go_artist" />
+        android:title="@string/lbl_go_artist" />
 </menu>

app/src/main/res/menu/menu_album_detail.xml

@@ -3,6 +3,6 @@
     xmlns:app="http://schemas.android.com/apk/res-auto">
     <item
         android:id="@+id/action_queue_add"
-        android:title="@string/label_queue_add"
+        android:title="@string/lbl_queue_add"
         app:showAsAction="never" />
 </menu>

app/src/main/res/menu/menu_album_song_actions.xml

@@ -2,8 +2,8 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android">
     <item
         android:id="@+id/action_queue_add"
-        android:title="@string/label_queue_add" />
+        android:title="@string/lbl_queue_add" />
     <item
         android:id="@+id/action_go_artist"
-        android:title="@string/label_go_artist" />
+        android:title="@string/lbl_go_artist" />
 </menu>

app/src/main/res/menu/menu_artist_actions.xml

@@ -2,8 +2,8 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android">
     <item
         android:id="@+id/action_play"
-        android:title="@string/label_play" />
+        android:title="@string/lbl_play" />
     <item
         android:id="@+id/action_shuffle"
-        android:title="@string/label_shuffle" />
+        android:title="@string/lbl_shuffle" />
 </menu>

app/src/main/res/menu/menu_artist_album_actions.xml

@@ -3,14 +3,14 @@
     xmlns:app="http://schemas.android.com/apk/res-auto">
     <item
         android:id="@+id/action_play"
-        android:title="@string/label_play"
+        android:title="@string/lbl_play"
         app:showAsAction="never" />
     <item
         android:id="@+id/action_shuffle"
-        android:title="@string/label_shuffle"
+        android:title="@string/lbl_shuffle"
         app:showAsAction="never" />
     <item
         android:id="@+id/action_queue_add"
-        android:title="@string/label_queue_add"
+        android:title="@string/lbl_queue_add"
         app:showAsAction="never" />
 </menu>

app/src/main/res/menu/menu_artist_song_actions.xml

@@ -2,9 +2,9 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android">
     <item
         android:id="@+id/action_queue_add"
-        android:title="@string/label_queue_add" />
+        android:title="@string/lbl_queue_add" />
     <item
         android:id="@+id/action_go_album"
         android:icon="@drawable/ic_album"
-        android:title="@string/label_go_album" />
+        android:title="@string/lbl_go_album" />
 </menu>

app/src/main/res/menu/menu_genre_actions.xml

@@ -2,8 +2,8 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android">
     <item
         android:id="@+id/action_play"
-        android:title="@string/label_play" />
+        android:title="@string/lbl_play" />
     <item
         android:id="@+id/action_shuffle"
-        android:title="@string/label_shuffle" />
+        android:title="@string/lbl_shuffle" />
 </menu>

app/src/main/res/menu/menu_library.xml

@@ -5,16 +5,16 @@
     <item
         android:id="@+id/submenu_sorting"
         android:icon="@drawable/ic_sort_none"
-        android:title="@string/label_sort"
+        android:title="@string/lbl_sort"
         app:showAsAction="always">
         <menu>
             <group android:checkableBehavior="single">
                 <item
                     android:id="@+id/option_sort_alpha_down"
-                    android:title="@string/label_sort_alpha_down" />
+                    android:title="@string/lbl_sort_alpha_down" />
                 <item
                     android:id="@+id/option_sort_alpha_up"
-                    android:title="@string/label_sort_alpha_up" />
+                    android:title="@string/lbl_sort_alpha_up" />
             </group>
         </menu>
     </item>

app/src/main/res/menu/menu_nav.xml

@@ -3,17 +3,17 @@
     <item
         android:id="@+id/library_fragment"
         android:icon="@drawable/ic_library"
-        android:title="@string/label_library" />
+        android:title="@string/lbl_library" />
     <item
         android:id="@+id/songs_fragment"
         android:icon="@drawable/ic_song"
-        android:title="@string/label_songs" />
+        android:title="@string/lbl_songs" />
     <item
         android:id="@+id/search_fragment"
         android:icon="@drawable/ic_search"
-        android:title="@string/label_search" />
+        android:title="@string/lbl_search" />
     <item
         android:id="@+id/settings_fragment"
         android:icon="@drawable/ic_settings"
-        android:title="@string/setting_title" />
+        android:title="@string/set_title" />
 </menu>

app/src/main/res/menu/menu_playback.xml

@@ -4,6 +4,6 @@
     <item
         android:id="@+id/action_queue"
         android:icon="@drawable/ic_queue"
-        android:title="@string/label_queue"
+        android:title="@string/lbl_queue"
         app:showAsAction="ifRoom" />
 </menu>

app/src/main/res/menu/menu_search.xml

@@ -4,29 +4,29 @@
     <item
         android:id="@+id/submenu_filtering"
         android:icon="@drawable/ic_filter"
-        android:title="@string/label_filter"
+        android:title="@string/lbl_filter"
         app:showAsAction="ifRoom">
         <menu>
             <group android:checkableBehavior="single">
                 <item
                     android:id="@+id/option_filter_all"
-                    android:title="@string/label_filter_all"
+                    android:title="@string/lbl_filter_all"
                     app:showAsAction="never" />
                 <item
                     android:id="@+id/option_filter_songs"
-                    android:title="@string/label_songs"
+                    android:title="@string/lbl_songs"
                     app:showAsAction="never" />
                 <item
                     android:id="@+id/option_filter_albums"
-                    android:title="@string/label_albums"
+                    android:title="@string/lbl_albums"
                     app:showAsAction="never" />
                 <item
                     android:id="@+id/option_filter_artists"
-                    android:title="@string/label_artists"
+                    android:title="@string/lbl_artists"
                     app:showAsAction="never" />
                 <item
                     android:id="@+id/option_filter_genres"
-                    android:title="@string/label_genres"
+                    android:title="@string/lbl_genres"
                     app:showAsAction="never" />
             </group>
         </menu>

app/src/main/res/menu/menu_settings.xml

@@ -3,6 +3,6 @@
     xmlns:app="http://schemas.android.com/apk/res-auto">
     <item
         android:icon="@drawable/ic_about"
-        android:title="@string/label_about"
+        android:title="@string/lbl_about"
         app:showAsAction="always" />
 </menu>

app/src/main/res/menu/menu_song_actions.xml

@@ -2,13 +2,13 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android">
     <item
         android:id="@+id/action_queue_add"
-        android:title="@string/label_queue_add" />
+        android:title="@string/lbl_queue_add" />
     <item
         android:id="@+id/action_go_artist"
         android:icon="@drawable/ic_artist"
-        android:title="@string/label_go_artist" />
+        android:title="@string/lbl_go_artist" />
     <item
         android:id="@+id/action_go_album"
         android:icon="@drawable/ic_album"
-        android:title="@string/label_go_album" />
+        android:title="@string/lbl_go_album" />
 </menu>

app/src/main/res/menu/menu_songs.xml

@@ -4,6 +4,6 @@
     <item
         android:id="@+id/action_shuffle"
         android:icon="@drawable/ic_shuffle"
-        android:title="@string/label_shuffle"
+        android:title="@string/lbl_shuffle"
         app:showAsAction="always" />
 </menu>

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

@@ -4,80 +4,80 @@
     <string name="info_channel_name">Musikwiedergabe</string>
 
     <!-- Label Namespace | Static Labels -->
-    <string name="label_retry">Wieder Versuchen</string>
+    <string name="lbl_retry">Wieder Versuchen</string>
-    <string name="label_grant">Gewähren</string>
+    <string name="lbl_grant">Gewähren</string>
 
-    <string name="label_library">Bibliothek</string>
+    <string name="lbl_library">Bibliothek</string>
-    <string name="label_genres">Genres</string>
+    <string name="lbl_genres">Genres</string>
-    <string name="label_artists">Künstler</string>
+    <string name="lbl_artists">Künstler</string>
-    <string name="label_albums">Alben</string>
+    <string name="lbl_albums">Alben</string>
-    <string name="label_songs">Lieder</string>
+    <string name="lbl_songs">Lieder</string>
-    <string name="label_all_songs">Alle Lieder</string>
+    <string name="lbl_all_songs">Alle Lieder</string>
 
-    <string name="label_search">Suchen</string>
+    <string name="lbl_search">Suchen</string>
-    <string name="label_filter">Filtern</string>
+    <string name="lbl_filter">Filtern</string>
-    <string name="label_filter_all">Alles</string>
+    <string name="lbl_filter_all">Alles</string>
 
-    <string name="label_sort">Sortierung</string>
+    <string name="lbl_sort">Sortierung</string>
-    <string name="label_sort_alpha_down">Aufsteigend</string>
+    <string name="lbl_sort_alpha_down">Aufsteigend</string>
-    <string name="label_sort_alpha_up">Absteigend</string>
+    <string name="lbl_sort_alpha_up">Absteigend</string>
 
-    <string name="label_play">Abspielen</string>
+    <string name="lbl_play">Abspielen</string>
-    <string name="label_shuffle">Zufällig</string>
+    <string name="lbl_shuffle">Zufällig</string>
-    <string name="label_play_all_songs">Von alle Lieder abspielen</string>
+    <string name="lbl_play_all">Von alle Lieder abspielen</string>
-    <string name="label_play_album">Vom Album abspielen</string>
+    <string name="lbl_play_album">Vom Album abspielen</string>
-    <string name="label_play_artist">Vom Künstler abspielen</string>
+    <string name="lbl_play_artist">Vom Künstler abspielen</string>
-    <string name="label_play_genre">Vom Genre abspielen</string>
+    <string name="lbl_play_genre">Vom Genre abspielen</string>
-    <string name="label_playback">Aktuelle Wiedergabe</string>
+    <string name="lbl_playback">Aktuelle Wiedergabe</string>
 
-    <string name="label_queue">Warteschlange</string>
+    <string name="lbl_queue">Warteschlange</string>
-    <string name="label_queue_add">Zur Warteschlange hinzufügen</string>
+    <string name="lbl_queue_add">Zur Warteschlange hinzufügen</string>
-    <string name="label_queue_added">Der Warteschlange hinzugefügt</string>
+    <string name="lbl_queue_added">Der Warteschlange hinzugefügt</string>
-    <string name="label_next_user_queue">Nächsten im Warteschlange</string>
+    <string name="lbl_next_user_queue">Nächsten im Warteschlange</string>
 
-    <string name="label_go_artist">Zum Künstler gehen</string>
+    <string name="lbl_go_artist">Zum Künstler gehen</string>
-    <string name="label_go_album">Zum Album gehen</string>
+    <string name="lbl_go_album">Zum Album gehen</string>
 
-    <string name="label_state_saved">Wiedergabezustand abgespeichert</string>
+    <string name="lbl_state_saved">Wiedergabezustand abgespeichert</string>
 
-    <string name="label_add">Hinzufügen</string>
+    <string name="lbl_add">Hinzufügen</string>
-    <string name="label_save">Abspeichern</string>
+    <string name="lbl_save">Abspeichern</string>
-    <string name="label_no_dirs">Keine Ordner</string>
+    <string name="lbl_no_dirs">Keine Ordner</string>
 
-    <string name="label_about">Über</string>
+    <string name="lbl_about">Über</string>
-    <string name="label_version">Version</string>
+    <string name="lbl_version">Version</string>
-    <string name="label_code">Auf GitHub ansehen</string>
+    <string name="lbl_code">Auf GitHub ansehen</string>
-    <string name="label_faq">FAQ</string>
+    <string name="lbl_faq">FAQ</string>
-    <string name="label_licenses">Lizenzen</string>
+    <string name="lbl_licenses">Lizenzen</string>
-    <string name="label_author">Entwickelt von OxygenCobalt</string>
+    <string name="lbl_author">Entwickelt von OxygenCobalt</string>
 
     <!-- Settings namespace | Settings-related labels -->
-    <string name="setting_title">Einstellungen</string>
+    <string name="set_title">Einstellungen</string>
 
-    <string name="setting_ui">Aussehen</string>
+    <string name="set_ui">Aussehen</string>
-    <string name="setting_theme">Thema</string>
+    <string name="set_theme">Thema</string>
-    <string name="setting_theme_auto">Automatisch</string>
+    <string name="set_theme_auto">Automatisch</string>
-    <string name="setting_theme_day">Hell</string>
+    <string name="set_theme_day">Hell</string>
-    <string name="setting_theme_night">Dunkel</string>
+    <string name="set_theme_night">Dunkel</string>
-    <string name="setting_accent">Akzentfarbe</string>
+    <string name="set_accent">Akzentfarbe</string>
 
-    <string name="setting_display">Anzeige</string>
+    <string name="set_display">Anzeige</string>
-    <string name="setting_lib_display">Musikbibliothekitems</string>
+    <string name="set_lib_display">Musikbibliothekitems</string>
-    <string name="setting_color_notif">Benachrichtigung farblich anpassen</string>
+    <string name="set_color_notif">Benachrichtigung farblich anpassen</string>
-    <string name="setting_color_desc">Albumcover am Benachrichtigung zeigen</string>
+    <string name="set_color_notif_desc">Albumcover am Benachrichtigung zeigen</string>
     <string name="setting_show_covers">Albumcover anzeigen</string>
-    <string name="setting_show_covers_desc">Ausschalten zu Speicherverbrauch sparen</string>
+    <string name="set_show_covers_desc">Ausschalten zu Speicherverbrauch sparen</string>
-    <string name="setting_quality_covers">MediaStore Cover ignorieren</string>
+    <string name="set_quality_covers">MediaStore Cover ignorieren</string>
-    <string name="setting_quality_covers_desc">Verbesst die Albumcover Qualität, jedoch länger Ladezeit und höher Speicherverbrauch beeinträchtigt</string>
+    <string name="set_quality_covers_desc">Verbesst die Albumcover Qualität, jedoch länger Ladezeit und höher Speicherverbrauch beeinträchtigt</string>
-    <string name="setting_use_alt_action">Ändere Aktionstaste verwenden</string>
+    <string name="set_alt_action">Ändere Aktionstaste verwenden</string>
-    <string name="setting_use_alt_loop">Wiederholen-Aktionstaste Vorziehen</string>
+    <string name="set_alt_loop">Wiederholen-Aktionstaste Vorziehen</string>
-    <string name="setting_use_alt_shuffle">Zufällig-Aktionstaste Vorziehen</string>
+    <string name="set_alt_shuffle">Zufällig-Aktionstaste Vorziehen</string>
 
-    <string name="setting_audio">Audio</string>
+    <string name="set_audio">Audio</string>
-    <string name="setting_audio_focus">Audiofokus</string>
+    <string name="set_focus">Audiofokus</string>
-    <string name="setting_audio_focus_desc">Pausieren wenn anderes Audio abspielt [Bsp. Anrufe]</string>
+    <string name="set_focus_desc">Pausieren wenn anderes Audio abspielt [Bsp. Anrufe]</string>
-    <string name="setting_audio_plug_mgt">Kopfhörerafokus</string>
+    <string name="set_plug_mgt">Kopfhörerafokus</string>
-    <string name="setting_audio_plug_mgt_desc">Abspielen/Pausieren wenn der Kopfhöreranschluss ändern</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>
@@ -86,76 +86,76 @@
     <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="setting_content">Content</string>
+    <string name="set_content">Content</string>
-    <string name="setting_content_save">Wiedergabezustand abspeichern</string>
+    <string name="set_save">Wiedergabezustand abspeichern</string>
-    <string name="setting_content_save_desc">Der aktuell Wiedergabezustand jetzt abspeichern</string>
+    <string name="set_save_desc">Der aktuell Wiedergabezustand jetzt abspeichern</string>
-    <string name="setting_content_blacklist">Ausgeschlossene Ordner</string>
+    <string name="set_blacklist">Ausgeschlossene Ordner</string>
-    <string name="setting_content_blacklist_desc">Die Inhalte der ausgeschlossene Ordner sind versteckt von deiner Musikbibliothek</string>
+    <string name="set_blacklist_desc">Die Inhalte der ausgeschlossene Ordner sind versteckt von deiner Musikbibliothek</string>
 
     <!-- Error Namespace | Error Labels -->
-    <string name="error_no_music">Keine Musik gefunden</string>
+    <string name="err_no_music">Keine Musik gefunden</string>
-    <string name="error_load_failed">Laden die Musik fehlgeschlagen</string>
+    <string name="err_load_failed">Laden die Musik fehlgeschlagen</string>
-    <string name="error_no_perms">Auxio braucht Berechtigung, zu lesen deine Musikbibliothek</string>
+    <string name="err_no_perms">Auxio braucht Berechtigung, zu lesen deine Musikbibliothek</string>
-    <string name="error_no_browser">Link könnte nicht geöffnet werden</string>
+    <string name="err_no_app">Link könnte nicht geöffnet werden</string>
-    <string name="error_bad_dir">Das Verzeichnis ist nicht gestützt</string>
+    <string name="err_bad_dir">Das Verzeichnis ist nicht gestützt</string>
 
     <!-- Hint Namespace | EditText Hints -->
     <string name="hint_search_library">Durchsuche deine Musikbibliothek…</string>
 
     <!-- Description Namespace | Accessibility Strings -->
-    <string name="description_sort_button">Reihenfolge ändern</string>
+    <string name="desc_sort_button">Reihenfolge ändern</string>
-    <string name="description_track_number">Titel %d</string>
+    <string name="desc_track_number">Titel %d</string>
 
-    <string name="description_play_pause">Abspielen oder Pausieren</string>
+    <string name="desc_play_pause">Abspielen oder Pausieren</string>
-    <string name="description_skip_prev">Zu letzter Lied springen</string>
+    <string name="desc_skip_prev">Zu letzter Lied springen</string>
-    <string name="description_skip_next">Zu nächster Lied springen</string>
+    <string name="desc_skip_next">Zu nächster Lied springen</string>
-    <string name="description_change_loop">Art die Wiederholung ändern</string>
+    <string name="desc_change_loop">Art die Wiederholung ändern</string>
 
-    <string name="description_clear_search">Suchanfrage löschen</string>
+    <string name="desc_clear_search">Suchanfrage löschen</string>
-    <string name="description_clear_user_queue">Warteschlange entleeren</string>
+    <string name="desc_clear_user_queue">Warteschlange entleeren</string>
 
-    <string name="description_error">Fehler</string>
+    <string name="desc_error">Fehler</string>
-    <string name="description_auxio_icon">Auxio-Icon</string>
+    <string name="desc_auxio_icon">Auxio-Icon</string>
-    <string name="description_album_cover">Albumcover für %s</string>
+    <string name="desc_album_cover">Albumcover für %s</string>
-    <string name="description_artist_image">Künstlerbild für %s</string>
+    <string name="desc_artist_image">Künstlerbild für %s</string>
-    <string name="description_genre_image">Genrebild für %s</string>
+    <string name="desc_genre_image">Genrebild für %s</string>
 
     <!-- Placeholder Namespace | Placeholder values -->
-    <string name="placeholder_genre">Unbekanntes Genre</string>
+    <string name="def_genre">Unbekanntes Genre</string>
-    <string name="placeholder_artist">Unbekannter Künstler</string>
+    <string name="def_artist">Unbekannter Künstler</string>
-    <string name="placeholder_album">Unbekanntes Album</string>
+    <string name="def_album">Unbekanntes Album</string>
-    <string name="placeholder_no_date">Kein Datum</string>
+    <string name="def_date">Kein Datum</string>
 
     <!-- Color Label namespace | Accent names -->
-    <string name="color_label_red">Rot</string>
+    <string name="clr_red">Rot</string>
-    <string name="color_label_pink">Rosa</string>
+    <string name="clr_pink">Rosa</string>
-    <string name="color_label_purple">Lila</string>
+    <string name="clr_purple">Lila</string>
-    <string name="color_label_deep_purple">Dunkellila</string>
+    <string name="clr_deep_purple">Dunkellila</string>
-    <string name="color_label_indigo">Indigoblau</string>
+    <string name="clr_indigo">Indigoblau</string>
-    <string name="color_label_blue">Blau</string>
+    <string name="clr_blue">Blau</string>
-    <string name="color_label_light_blue">Hellblau</string>
+    <string name="clr_light_blue">Hellblau</string>
-    <string name="color_label_cyan">Türkis</string>
+    <string name="clr_cyan">Türkis</string>
-    <string name="color_label_teal">Blaugrün</string>
+    <string name="clr_teal">Blaugrün</string>
-    <string name="color_label_green">Grün</string>
+    <string name="clr_green">Grün</string>
-    <string name="color_label_light_green">Hellgrün</string>
+    <string name="color_light_green">Hellgrün</string>
-    <string name="color_label_lime">Lindgrün</string>
+    <string name="color_lime">Lindgrün</string>
-    <string name="color_label_yellow">Gelb</string>
+    <string name="color_yellow">Gelb</string>
-    <string name="color_label_orange">Orange</string>
+    <string name="clr_orange">Orange</string>
-    <string name="color_label_deep_orange">Tieforange</string>
+    <string name="clr_deep_orange">Tieforange</string>
-    <string name="color_label_brown">Braun</string>
+    <string name="clr_label_brown">Braun</string>
-    <string name="color_label_grey">Grau</string>
+    <string name="clr_label_grey">Grau</string>
-    <string name="color_label_blue_grey">Blaugrau</string>
+    <string name="clr_blue_grey">Blaugrau</string>
 
     <!-- Format Namespace | Value formatting/plurals -->
-    <string name="format_next_from">Nächsten von: %s</string>
+    <string name="fmt_next_from">Nächsten von: %s</string>
-    <string name="format_songs_loaded">Lieder geladen: %d</string>
+    <string name="fmt_songs_loaded">Lieder geladen: %d</string>
 
-    <plurals name="format_song_count">
+    <plurals name="fmt_song_count">
         <item quantity="one">%d Lied</item>
         <item quantity="other">%d Lieder</item>
     </plurals>
 
-    <plurals name="format_album_count">
+    <plurals name="fmt_album_count">
         <item quantity="one">%d Album</item>
         <item quantity="other">%d Alben</item>
     </plurals>

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

@@ -1,94 +1,94 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <!-- Label Namespace | Static Labels -->
-    <string name="label_retry">Προσπάθεια εκ νέου</string>
+    <string name="lbl_retry">Προσπάθεια εκ νέου</string>
-    <string name="label_grant">Χορήγησε</string>
+    <string name="lbl_grant">Χορήγησε</string>
 
-    <string name="label_library">Βιβλιοθήκη</string>
+    <string name="lbl_library">Βιβλιοθήκη</string>
-    <string name="label_genres">Είδη</string>
+    <string name="lbl_genres">Είδη</string>
-    <string name="label_artists">Καλλιτέχνες</string>
+    <string name="lbl_artists">Καλλιτέχνες</string>
-    <string name="label_albums">Άλμπουμ</string>
+    <string name="lbl_albums">Άλμπουμ</string>
-    <string name="label_songs">Τραγούδια</string>
+    <string name="lbl_songs">Τραγούδια</string>
-    <string name="label_all_songs">Όλοι Τραγούδια</string>
+    <string name="lbl_all_songs">Όλοι Τραγούδια</string>
 
-    <string name="label_search">Αναζήτηση</string>
+    <string name="lbl_search">Αναζήτηση</string>
-    <string name="label_filter">Φίλτρο</string>
+    <string name="lbl_filter">Φίλτρο</string>
-    <string name="label_filter_all">Όλα</string>
+    <string name="lbl_filter_all">Όλα</string>
 
-    <string name="label_sort">Σειρά Διάταξης</string>
+    <string name="lbl_sort">Σειρά Διάταξης</string>
 
-    <string name="label_play">Αναπαραγωγή</string>
+    <string name="lbl_play">Αναπαραγωγή</string>
-    <string name="label_shuffle">Τυχαία</string>
+    <string name="lbl_shuffle">Τυχαία</string>
-    <string name="label_playback">Παίζει τώρα</string>
+    <string name="lbl_playback">Παίζει τώρα</string>
 
-    <string name="label_queue">Ουρά αναπαραγωγής</string>
+    <string name="lbl_queue">Ουρά αναπαραγωγής</string>
-    <string name="label_queue_add">Προσθήκη στην ουρά αναπ/γής</string>
+    <string name="lbl_queue_add">Προσθήκη στην ουρά αναπ/γής</string>
-    <string name="label_queue_added">Προστέθηκε ένας τίτλος στην ουρά αναπαραγωγής</string>
+    <string name="lbl_queue_added">Προστέθηκε ένας τίτλος στην ουρά αναπαραγωγής</string>
-    <string name="label_next_user_queue">Επόμενο</string>
+    <string name="lbl_next_user_queue">Επόμενο</string>
 
-    <string name="label_go_artist">Πήγαινε στον καλλιτέχνη</string>
+    <string name="lbl_go_artist">Πήγαινε στον καλλιτέχνη</string>
-    <string name="label_go_album">Πήγαινε στο άλμπουμ</string>
+    <string name="lbl_go_album">Πήγαινε στο άλμπουμ</string>
 
-    <string name="label_about">Σχετικά με</string>
+    <string name="lbl_about">Σχετικά με</string>
-    <string name="label_version">Έκδοση</string>
+    <string name="lbl_version">Έκδοση</string>
-    <string name="label_code">Δείτε το στο GitHub</string>
+    <string name="lbl_code">Δείτε το στο GitHub</string>
-    <string name="label_faq">FAQ</string>
+    <string name="lbl_faq">FAQ</string>
-    <string name="label_licenses">Άδειες</string>
+    <string name="lbl_licenses">Άδειες</string>
 
     <!-- Settings namespace | Settings-related labels -->
-    <string name="setting_title">Ρυθμίσεις</string>
+    <string name="set_title">Ρυθμίσεις</string>
 
-    <string name="setting_ui">Εμφάνιση</string>
+    <string name="set_ui">Εμφάνιση</string>
-    <string name="setting_theme">Θέμα</string>
+    <string name="set_theme">Θέμα</string>
-    <string name="setting_theme_auto">Αυτόματο</string>
+    <string name="set_theme_auto">Αυτόματο</string>
-    <string name="setting_theme_day">Φωτεινό</string>
+    <string name="set_theme_day">Φωτεινό</string>
-    <string name="setting_theme_night">Σκοτεινό</string>
+    <string name="set_theme_night">Σκοτεινό</string>
-    <string name="setting_accent">Χρώμα χαρακτήρων</string>
+    <string name="set_accent">Χρώμα χαρακτήρων</string>
 
-    <string name="setting_color_notif">Χρωματισμός ειδοποιήσεων</string>
+    <string name="set_color_notif">Χρωματισμός ειδοποιήσεων</string>
-    <string name="setting_quality_covers">Παράληψη των Media Store εξωφύλλων</string>
+    <string name="set_quality_covers">Παράληψη των Media Store εξωφύλλων</string>
 
-    <string name="setting_audio">Ήχος</string>
+    <string name="set_audio">Ήχος</string>
 
     <string name="setting_behavior">Συμπεριφορά</string>
 
     <!-- Description Namespace | Accessibility Strings -->
-    <string name="description_track_number">Κομμάτι %d</string>
+    <string name="desc_track_number">Κομμάτι %d</string>
 
-    <string name="description_play_pause">Αναπαραγωγή/Παύση</string>
+    <string name="desc_play_pause">Αναπαραγωγή/Παύση</string>
 
-    <string name="description_clear_user_queue">Εκκαθάριση ουράς αναπαραγωγής</string>
+    <string name="desc_clear_user_queue">Εκκαθάριση ουράς αναπαραγωγής</string>
 
-    <string name="description_error">Εμφάνιση σφάλματος</string>
+    <string name="desc_error">Εμφάνιση σφάλματος</string>
 
     <!-- Hint Namespace | EditText Hints -->
     <string name="hint_search_library">Αναζήτηση στη βιβλιοθήκη…</string>
 
     <!-- Color Label namespace | Accent names -->
-    <string name="color_label_red">Κόκκινος</string>
+    <string name="clr_red">Κόκκινος</string>
-    <string name="color_label_pink">Ροζ</string>
+    <string name="clr_pink">Ροζ</string>
-    <string name="color_label_purple">Ερυθροκυανός</string>
+    <string name="clr_purple">Ερυθροκυανός</string>
-    <string name="color_label_blue">Γαλάζιος</string>
+    <string name="clr_blue">Γαλάζιος</string>
-    <string name="color_label_light_blue">Ανοιχτός Γαλάζιος</string>
+    <string name="clr_light_blue">Ανοιχτός Γαλάζιος</string>
-    <string name="color_label_teal">Γαλάζιος Πράσινος</string>
+    <string name="clr_teal">Γαλάζιος Πράσινος</string>
-    <string name="color_label_green">Πράσινος</string>
+    <string name="clr_green">Πράσινος</string>
-    <string name="color_label_light_green">Ανοιχτός Πράσινος</string>
+    <string name="color_light_green">Ανοιχτός Πράσινος</string>
-    <string name="color_label_lime">Πράσινος Κίτρινος</string>
+    <string name="color_lime">Πράσινος Κίτρινος</string>
-    <string name="color_label_yellow">Κίτρινος</string>
+    <string name="color_yellow">Κίτρινος</string>
-    <string name="color_label_orange">Πορτοκαλής</string>
+    <string name="clr_orange">Πορτοκαλής</string>
-    <string name="color_label_brown">Καφέ</string>
+    <string name="clr_label_brown">Καφέ</string>
-    <string name="color_label_grey">Γκρί</string>
+    <string name="clr_label_grey">Γκρί</string>
-    <string name="color_label_blue_grey">Γαλάζιος Γκρί</string>
+    <string name="clr_blue_grey">Γαλάζιος Γκρί</string>
 
     <!-- Format Namespace | Value formatting/plurals -->
-    <string name="format_songs_loaded">Τραγούδια φορτώθηκε: %d</string>
+    <string name="fmt_songs_loaded">Τραγούδια φορτώθηκε: %d</string>
 
-    <plurals name="format_song_count">
+    <plurals name="fmt_song_count">
         <item quantity="one">%d Τραγούδι</item>
         <item quantity="other">%d Τραγούδια</item>
     </plurals>
 
-    <plurals name="format_album_count">
+    <plurals name="fmt_album_count">
         <item quantity="one">%d Άλμπουμ</item>
         <item quantity="other">%d Άλμπουμ</item>
     </plurals>

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

@@ -5,82 +5,82 @@
     <string name="info_channel_name">Reproductor de música</string>
 
     <!-- Label Namespace | Static Labels -->
-    <string name="label_retry">Reintentar</string>
+    <string name="lbl_retry">Reintentar</string>
-    <string name="label_grant">Permitir</string>
+    <string name="lbl_grant">Permitir</string>
 
-    <string name="label_library">Biblioteca</string>
+    <string name="lbl_library">Biblioteca</string>
-    <string name="label_genres">Géneros</string>
+    <string name="lbl_genres">Géneros</string>
-    <string name="label_artists">Artistas</string>
+    <string name="lbl_artists">Artistas</string>
-    <string name="label_albums">Álbum</string>
+    <string name="lbl_albums">Álbum</string>
-    <string name="label_songs">Canciones</string>
+    <string name="lbl_songs">Canciones</string>
-    <string name="label_all_songs">Todas las canciones</string>
+    <string name="lbl_all_songs">Todas las canciones</string>
 
-    <string name="label_search">Buscar</string>
+    <string name="lbl_search">Buscar</string>
-    <string name="label_filter">Filtro</string>
+    <string name="lbl_filter">Filtro</string>
-    <string name="label_filter_all">Todo</string>
+    <string name="lbl_filter_all">Todo</string>
 
-    <string name="label_sort">Ordenar</string>
+    <string name="lbl_sort">Ordenar</string>
-    <string name="label_sort_alpha_down">Ascendente</string>
+    <string name="lbl_sort_alpha_down">Ascendente</string>
-    <string name="label_sort_alpha_up">Descendente</string>
+    <string name="lbl_sort_alpha_up">Descendente</string>
 
-    <string name="label_play">Reproducir</string>
+    <string name="lbl_play">Reproducir</string>
-    <string name="label_shuffle">Aleatorio</string>
+    <string name="lbl_shuffle">Aleatorio</string>
-    <string name="label_play_all_songs">Reproducir todas las canciones</string>
+    <string name="lbl_play_all">Reproducir todas las canciones</string>
-    <string name="label_play_album">Reproducir por álbum</string>
+    <string name="lbl_play_album">Reproducir por álbum</string>
-    <string name="label_play_artist">Reproducir por artista</string>
+    <string name="lbl_play_artist">Reproducir por artista</string>
-    <string name="label_play_genre">Reproducir por género</string>
+    <string name="lbl_play_genre">Reproducir por género</string>
-    <string name="label_playback">Reproducción actual</string>
+    <string name="lbl_playback">Reproducción actual</string>
 
-    <string name="label_queue">Cola</string>
+    <string name="lbl_queue">Cola</string>
-    <string name="label_queue_add">Agregar a la cola</string>
+    <string name="lbl_queue_add">Agregar a la cola</string>
-    <string name="label_queue_added">Agregada a la cola</string>
+    <string name="lbl_queue_added">Agregada a la cola</string>
-    <string name="label_next_user_queue">A continuación…</string>
+    <string name="lbl_next_user_queue">A continuación…</string>
 
-    <string name="label_go_artist">Ir al artista</string>
+    <string name="lbl_go_artist">Ir al artista</string>
-    <string name="label_go_album">Ir al álbum</string>
+    <string name="lbl_go_album">Ir al álbum</string>
 
-    <string name="label_state_saved">Estado guardado</string>
+    <string name="lbl_state_saved">Estado guardado</string>
 
-    <string name="label_add">Añadir</string>
+    <string name="lbl_add">Añadir</string>
-    <string name="label_save">Guardar</string>
+    <string name="lbl_save">Guardar</string>
-    <string name="label_no_dirs">No hay carpetas</string>
+    <string name="lbl_no_dirs">No hay carpetas</string>
 
-    <string name="label_about">Acerca de</string>
+    <string name="lbl_about">Acerca de</string>
-    <string name="label_version">Versión</string>
+    <string name="lbl_version">Versión</string>
-    <string name="label_code">Ver en Github</string>
+    <string name="lbl_code">Ver en Github</string>
-    <string name="label_faq">FAQ</string>
+    <string name="lbl_faq">FAQ</string>
-    <string name="label_licenses">Licencias</string>
+    <string name="lbl_licenses">Licencias</string>
-    <string name="label_author">Desarrollado por OxygenCobalt</string>
+    <string name="lbl_author">Desarrollado por OxygenCobalt</string>
 
     <!-- Settings namespace | Settings-related labels -->
-    <string name="setting_title">Preferencias</string>
+    <string name="set_title">Preferencias</string>
 
-    <string name="setting_ui">Apariencia</string>
+    <string name="set_ui">Apariencia</string>
-    <string name="setting_theme">Tema</string>
+    <string name="set_theme">Tema</string>
-    <string name="setting_theme_auto">Automático</string>
+    <string name="set_theme_auto">Automático</string>
-    <string name="setting_theme_day">Claro</string>
+    <string name="set_theme_day">Claro</string>
-    <string name="setting_theme_night">Oscuro</string>
+    <string name="set_theme_night">Oscuro</string>
-    <string name="setting_accent">Acento</string>
+    <string name="set_accent">Acento</string>
-    <string name="setting_black_mode">Tema negro</string>
+    <string name="set_black_mode">Tema negro</string>
     <string name="setting_black_mode_desc">Usar tema negro puro</string>
 
-    <string name="setting_display">Pantalla</string>
+    <string name="set_display">Pantalla</string>
-    <string name="setting_lib_display">Ítem de biblioteca</string>
+    <string name="set_lib_display">Ítem de biblioteca</string>
-    <string name="setting_color_notif">Ajustar color de notificación</string>
+    <string name="set_color_notif">Ajustar color de notificación</string>
-    <string name="setting_color_desc">Mostrar imagen de álbum en la notificación</string>
+    <string name="set_color_notif_desc">Mostrar imagen de álbum en la notificación</string>
     <string name="setting_show_covers">Mostrar carátula de álbum</string>
-    <string name="setting_show_covers_desc">Desactivar para ahorrar uso de memoria</string>
+    <string name="set_show_covers_desc">Desactivar para ahorrar uso de memoria</string>
-    <string name="setting_quality_covers">Ignorar carátulas de MediaStore</string>
+    <string name="set_quality_covers">Ignorar carátulas de MediaStore</string>
-    <string name="setting_quality_covers_desc">Mejora la calidad de las carátulas de álbum, pero resulta en tiempos de carga lentos y un mayor uso de memoria</string>
+    <string name="set_quality_covers_desc">Mejora la calidad de las carátulas de álbum, pero resulta en tiempos de carga lentos y un mayor uso de memoria</string>
-    <string name="setting_use_alt_action">Usar acción de notificación alternativa</string>
+    <string name="set_alt_action">Usar acción de notificación alternativa</string>
-    <string name="setting_use_alt_loop">Preferir acción modo repetir</string>
+    <string name="set_alt_loop">Preferir acción modo repetir</string>
-    <string name="setting_use_alt_shuffle">Preferir acción aleatoria</string>
+    <string name="set_alt_shuffle">Preferir acción aleatoria</string>
 
-    <string name="setting_audio">Audio</string>
+    <string name="set_audio">Audio</string>
-    <string name="setting_audio_focus">Enfoque de audio</string>
+    <string name="set_focus">Enfoque de audio</string>
-    <string name="setting_audio_focus_desc">Pausar cuando se reproduce otro audio (ej. Llamadas)</string>
+    <string name="set_focus_desc">Pausar cuando se reproduce otro audio (ej. Llamadas)</string>
-    <string name="setting_audio_plug_mgt">Conexión de auriculares</string>
+    <string name="set_plug_mgt">Conexión de auriculares</string>
-    <string name="setting_audio_plug_mgt_desc">Reproducir/Pausar cuando la conexión de los auriculares cambie</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>
@@ -89,77 +89,77 @@
     <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="setting_content">Contenido</string>
+    <string name="set_content">Contenido</string>
-    <string name="setting_content_save">Guardar estado de reproducción</string>
+    <string name="set_save">Guardar estado de reproducción</string>
-    <string name="setting_content_save_desc">Guardar el estado actual de la reproducción ahora</string>
+    <string name="set_save_desc">Guardar el estado actual de la reproducción ahora</string>
-    <string name="setting_content_blacklist">Carpetas excluidas</string>
+    <string name="set_blacklist">Carpetas excluidas</string>
-    <string name="setting_content_blacklist_desc">El contenido de las carpetas excluidas se oculta de la biblioteca</string>
+    <string name="set_blacklist_desc">El contenido de las carpetas excluidas se oculta de la biblioteca</string>
 
     <!-- Error Namespace | Error Labels -->
-    <string name="error_no_music">No se encontró música</string>
+    <string name="err_no_music">No se encontró música</string>
-    <string name="error_load_failed">Error al cargar música</string>
+    <string name="err_load_failed">Error al cargar música</string>
-    <string name="error_no_perms">Auxio necesita permiso para leer tu biblioteca musical</string>
+    <string name="err_no_perms">Auxio necesita permiso para leer tu biblioteca musical</string>
-    <string name="error_no_browser">Ninguna aplicación puede abrir este enlace</string>
+    <string name="err_no_app">Ninguna aplicación puede abrir este enlace</string>
-    <string name="error_bad_dir">Este directorio no es compatible</string>
+    <string name="err_bad_dir">Este directorio no es compatible</string>
 
     <!-- Hint Namespace | EditText Hints -->
     <string name="hint_search_library">Busca en tu biblioteca…</string>
 
     <!-- Description Namespace | Accessibility Strings -->
-    <string name="description_sort_button">Cambiar el orden de clasificación</string>
+    <string name="desc_sort_button">Cambiar el orden de clasificación</string>
-    <string name="description_track_number">Pista %d</string>
+    <string name="desc_track_number">Pista %d</string>
 
-    <string name="description_play_pause">Reproducir o Pausar</string>
+    <string name="desc_play_pause">Reproducir o Pausar</string>
-    <string name="description_skip_next">Saltar a la siguiente canción</string>
+    <string name="desc_skip_next">Saltar a la siguiente canción</string>
-    <string name="description_skip_prev">Saltar a la última canción</string>
+    <string name="desc_skip_prev">Saltar a la última canción</string>
-    <string name="description_change_loop">Cambiar el modo de repetición</string>
+    <string name="desc_change_loop">Cambiar el modo de repetición</string>
 
-    <string name="description_clear_user_queue">Limpiar cola</string>
+    <string name="desc_clear_user_queue">Limpiar cola</string>
-    <string name="description_clear_search">Borrar historial de búsqueda</string>
+    <string name="desc_clear_search">Borrar historial de búsqueda</string>
-    <string name="description_blacklist_delete">Eliminar directorio excluido</string>
+    <string name="desc_blacklist_delete">Eliminar directorio excluido</string>
 
-    <string name="description_error">Error</string>
+    <string name="desc_error">Error</string>
-    <string name="description_auxio_icon">Auxio icon</string>
+    <string name="desc_auxio_icon">Auxio icon</string>
-    <string name="description_album_cover">Carátula de álbum para %s</string>
+    <string name="desc_album_cover">Carátula de álbum para %s</string>
-    <string name="description_artist_image">Imagen de artista para %s</string>
+    <string name="desc_artist_image">Imagen de artista para %s</string>
-    <string name="description_genre_image">Imagen de género para %s</string>
+    <string name="desc_genre_image">Imagen de género para %s</string>
 
     <!-- Placeholder Namespace | Placeholder values -->
-    <string name="placeholder_genre">Género desconocido</string>
+    <string name="def_genre">Género desconocido</string>
-    <string name="placeholder_artist">Artista desconocido</string>
+    <string name="def_artist">Artista desconocido</string>
-    <string name="placeholder_album">Álbum desconocido</string>
+    <string name="def_album">Álbum desconocido</string>
-    <string name="placeholder_no_date">Sin fecha</string>
+    <string name="def_date">Sin fecha</string>
 
     <!-- Color Label namespace | Accent names -->
-    <string name="color_label_red">Rojo</string>
+    <string name="clr_red">Rojo</string>
-    <string name="color_label_pink">Rosa</string>
+    <string name="clr_pink">Rosa</string>
-    <string name="color_label_purple">Púrpura</string>
+    <string name="clr_purple">Púrpura</string>
-    <string name="color_label_deep_purple">Púrpura Profundo</string>
+    <string name="clr_deep_purple">Púrpura Profundo</string>
-    <string name="color_label_indigo">Índigo</string>
+    <string name="clr_indigo">Índigo</string>
-    <string name="color_label_blue">Azul</string>
+    <string name="clr_blue">Azul</string>
-    <string name="color_label_light_blue">Azul Claro</string>
+    <string name="clr_light_blue">Azul Claro</string>
-    <string name="color_label_cyan">Cyan</string>
+    <string name="clr_cyan">Cyan</string>
-    <string name="color_label_teal">Teal</string>
+    <string name="clr_teal">Teal</string>
-    <string name="color_label_green">Verde</string>
+    <string name="clr_green">Verde</string>
-    <string name="color_label_light_green">Verde Claro</string>
+    <string name="color_light_green">Verde Claro</string>
-    <string name="color_label_lime">Lima</string>
+    <string name="color_lime">Lima</string>
-    <string name="color_label_yellow">Amarillo</string>
+    <string name="color_yellow">Amarillo</string>
-    <string name="color_label_orange">Naranja</string>
+    <string name="clr_orange">Naranja</string>
-    <string name="color_label_deep_orange">Naranja Profundo</string>
+    <string name="clr_deep_orange">Naranja Profundo</string>
-    <string name="color_label_brown">Café</string>
+    <string name="clr_label_brown">Café</string>
-    <string name="color_label_grey">Gris</string>
+    <string name="clr_label_grey">Gris</string>
-    <string name="color_label_blue_grey">Azul Gris</string>
+    <string name="clr_blue_grey">Azul Gris</string>
 
     <!-- Format Namespace | Value formatting/plurals -->
-    <string name="format_next_from">Siguiente de: %s</string>
+    <string name="fmt_next_from">Siguiente de: %s</string>
-    <string name="format_songs_loaded">Canciones encontradas: %d</string>
+    <string name="fmt_songs_loaded">Canciones encontradas: %d</string>
 
-    <plurals name="format_song_count">
+    <plurals name="fmt_song_count">
         <item quantity="one">%d Canción</item>
         <item quantity="other">%d Canciones</item>
     </plurals>
 
-    <plurals name="format_album_count">
+    <plurals name="fmt_album_count">
         <item quantity="one">%d Álbum</item>
         <item quantity="other">%d Álbumes</item>
     </plurals>

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

@@ -1,103 +1,103 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <!-- Label Namespace | Static Labels -->
-    <string name="label_retry">Réessayer</string>
+    <string name="lbl_retry">Réessayer</string>
-    <string name="label_grant">Accorder</string>
+    <string name="lbl_grant">Accorder</string>
 
-    <string name="label_library">Bibliothèque</string>
+    <string name="lbl_library">Bibliothèque</string>
-    <string name="label_genres">Genres</string>
+    <string name="lbl_genres">Genres</string>
-    <string name="label_artists">Artistes</string>
+    <string name="lbl_artists">Artistes</string>
-    <string name="label_albums">Albums</string>
+    <string name="lbl_albums">Albums</string>
-    <string name="label_songs">Titres</string>
+    <string name="lbl_songs">Titres</string>
-    <string name="label_all_songs">Titres Tous</string>
+    <string name="lbl_all_songs">Titres Tous</string>
 
-    <string name="label_search">Rechercher</string>
+    <string name="lbl_search">Rechercher</string>
-    <string name="label_filter">Filtre</string>
+    <string name="lbl_filter">Filtre</string>
-    <string name="label_filter_all">Tout</string>
+    <string name="lbl_filter_all">Tout</string>
 
-    <string name="label_sort">Tri</string>
+    <string name="lbl_sort">Tri</string>
-    <string name="label_sort_alpha_down">Ascendant</string>
+    <string name="lbl_sort_alpha_down">Ascendant</string>
-    <string name="label_sort_alpha_up">Descendant</string>
+    <string name="lbl_sort_alpha_up">Descendant</string>
 
-    <string name="label_play">Lecture</string>
+    <string name="lbl_play">Lecture</string>
-    <string name="label_shuffle">Aléatoire</string>
+    <string name="lbl_shuffle">Aléatoire</string>
-    <string name="label_playback">Lecture en cours</string>
+    <string name="lbl_playback">Lecture en cours</string>
 
-    <string name="label_queue">File d\'attente</string>
+    <string name="lbl_queue">File d\'attente</string>
-    <string name="label_queue_add">Ajouter à la file d\'attente</string>
+    <string name="lbl_queue_add">Ajouter à la file d\'attente</string>
-    <string name="label_queue_added">Ajouté à la file d\'attente</string>
+    <string name="lbl_queue_added">Ajouté à la file d\'attente</string>
-    <string name="label_next_user_queue">Suivant</string>
+    <string name="lbl_next_user_queue">Suivant</string>
 
-    <string name="label_go_album">Aller à l\'album</string>
+    <string name="lbl_go_album">Aller à l\'album</string>
-    <string name="label_go_artist">Aller à l\'artiste</string>
+    <string name="lbl_go_artist">Aller à l\'artiste</string>
 
-    <string name="label_about">À propos</string>
+    <string name="lbl_about">À propos</string>
-    <string name="label_version">Version</string>
+    <string name="lbl_version">Version</string>
-    <string name="label_code">Voir sur GitHub</string>
+    <string name="lbl_code">Voir sur GitHub</string>
-    <string name="label_faq">FAQ</string>
+    <string name="lbl_faq">FAQ</string>
-    <string name="label_licenses">Licences</string>
+    <string name="lbl_licenses">Licences</string>
-    <string name="label_author">Développé par OxygenCobalt</string>
+    <string name="lbl_author">Développé par OxygenCobalt</string>
 
     <!-- Settings namespace | Settings-related labels -->
-    <string name="setting_title">Paramètres</string>
+    <string name="set_title">Paramètres</string>
 
-    <string name="setting_ui">Apparence</string>
+    <string name="set_ui">Apparence</string>
-    <string name="setting_theme">Thème</string>
+    <string name="set_theme">Thème</string>
-    <string name="setting_theme_auto">Automatique</string>
+    <string name="set_theme_auto">Automatique</string>
-    <string name="setting_theme_day">Clair</string>
+    <string name="set_theme_day">Clair</string>
-    <string name="setting_theme_night">Sombre</string>
+    <string name="set_theme_night">Sombre</string>
-    <string name="setting_accent">Couleur d\'accentuation</string>
+    <string name="set_accent">Couleur d\'accentuation</string>
 
-    <string name="setting_lib_display">Objets Bibliothèque</string>
+    <string name="set_lib_display">Objets Bibliothèque</string>
-    <string name="setting_color_notif">Notification colorée</string>
+    <string name="set_color_notif">Notification colorée</string>
-    <string name="setting_quality_covers">Ignorer le stockage des pochettes</string>
+    <string name="set_quality_covers">Ignorer le stockage des pochettes</string>
 
-    <string name="setting_audio">Audio</string>
+    <string name="set_audio">Audio</string>
-    <string name="setting_audio_focus">Audio Focus</string>
+    <string name="set_focus">Audio Focus</string>
-    <string name="setting_audio_plug_mgt">Branchement du casque</string>
+    <string name="set_plug_mgt">Branchement du casque</string>
 
     <string name="setting_behavior">Comportement</string>
 
     <!-- Error Namespace | Error Labels -->
-    <string name="error_no_music">Pas de musique trouvée</string>
+    <string name="err_no_music">Pas de musique trouvée</string>
 
     <!-- Description Namespace | Accessibility Strings -->
-    <string name="description_track_number">Morceau %d</string>
+    <string name="desc_track_number">Morceau %d</string>
 
-    <string name="description_play_pause">Lecture/Pause</string>
+    <string name="desc_play_pause">Lecture/Pause</string>
 
-    <string name="description_clear_user_queue">Effacer la file d\'attente</string>
+    <string name="desc_clear_user_queue">Effacer la file d\'attente</string>
 
-    <string name="description_error">L’erreur</string>
+    <string name="desc_error">L’erreur</string>
     <!-- Hint Namespace | EditText Hints -->
     <string name="hint_search_library">Recherche dans votre bibliothèque…</string>
 
     <!-- Color Label namespace | Accent names -->
-    <string name="color_label_red">Rouge</string>
+    <string name="clr_red">Rouge</string>
-    <string name="color_label_pink">Rose</string>
+    <string name="clr_pink">Rose</string>
-    <string name="color_label_purple">Violet</string>
+    <string name="clr_purple">Violet</string>
-    <string name="color_label_indigo">Indigo</string>
+    <string name="clr_indigo">Indigo</string>
-    <string name="color_label_blue">Bleu</string>
+    <string name="clr_blue">Bleu</string>
-    <string name="color_label_light_blue">Bleu Clair</string>
+    <string name="clr_light_blue">Bleu Clair</string>
-    <string name="color_label_teal">Bleu Vert</string>
+    <string name="clr_teal">Bleu Vert</string>
-    <string name="color_label_green">Vert</string>
+    <string name="clr_green">Vert</string>
-    <string name="color_label_light_green">Vert Clair</string>
+    <string name="color_light_green">Vert Clair</string>
-    <string name="color_label_lime">Vert Citron</string>
+    <string name="color_lime">Vert Citron</string>
-    <string name="color_label_yellow">Jaune</string>
+    <string name="color_yellow">Jaune</string>
-    <string name="color_label_orange">Orange</string>
+    <string name="clr_orange">Orange</string>
-    <string name="color_label_brown">Brun</string>
+    <string name="clr_label_brown">Brun</string>
-    <string name="color_label_grey">Gris</string>
+    <string name="clr_label_grey">Gris</string>
-    <string name="color_label_blue_grey">Bleu Gris</string>
+    <string name="clr_blue_grey">Bleu Gris</string>
 
     <!-- Format Namespace | Value formatting/plurals -->
-    <string name="format_songs_loaded">Titres chargés: %d</string>
+    <string name="fmt_songs_loaded">Titres chargés: %d</string>
 
-    <plurals name="format_song_count">
+    <plurals name="fmt_song_count">
         <item quantity="one">%s Titre</item>
         <item quantity="other">%s Titres</item>
     </plurals>
 
-    <plurals name="format_album_count">
+    <plurals name="fmt_album_count">
         <item quantity="one">%s Album</item>
         <item quantity="other">%s Albums</item>
     </plurals>

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

@@ -1,60 +1,60 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <!-- Label Namespace | Static Labels -->
-    <string name="label_retry">फिर से कोशिश करे</string>
+    <string name="lbl_retry">फिर से कोशिश करे</string>
-    <string name="label_grant">अनुदान</string>
+    <string name="lbl_grant">अनुदान</string>
 
-    <string name="label_artists">कलाकार</string>
+    <string name="lbl_artists">कलाकार</string>
-    <string name="label_library">पुस्तकालय</string>
+    <string name="lbl_library">पुस्तकालय</string>
-    <string name="label_albums">एल्बम</string>
+    <string name="lbl_albums">एल्बम</string>
-    <string name="label_songs">गीत</string>
+    <string name="lbl_songs">गीत</string>
-    <string name="label_all_songs">गीत</string>
+    <string name="lbl_all_songs">गीत</string>
 
-    <string name="label_filter">छलनी</string>
+    <string name="lbl_filter">छलनी</string>
-    <string name="label_search">खोजें</string>
+    <string name="lbl_search">खोजें</string>
-    <string name="label_filter_all">सारे</string>
+    <string name="lbl_filter_all">सारे</string>
 
-    <string name="label_sort">क्रमबद्ध</string>
+    <string name="lbl_sort">क्रमबद्ध</string>
 
-    <string name="label_play">चलाएं</string>
+    <string name="lbl_play">चलाएं</string>
-    <string name="label_shuffle">शफ़ल</string>
+    <string name="lbl_shuffle">शफ़ल</string>
 
-    <string name="label_go_artist">कलाकार पर जाएं</string>
+    <string name="lbl_go_artist">कलाकार पर जाएं</string>
-    <string name="label_go_album">एल्बम पर जाएं</string>
+    <string name="lbl_go_album">एल्बम पर जाएं</string>
 
-    <string name="label_queue">पंक्ति</string>
+    <string name="lbl_queue">पंक्ति</string>
-    <string name="label_queue_add">क़तार में जोड़ें</string>
+    <string name="lbl_queue_add">क़तार में जोड़ें</string>
-    <string name="label_queue_added">कतार में जोड़ा गया</string>
+    <string name="lbl_queue_added">कतार में जोड़ा गया</string>
 
-    <string name="label_about">इसके बारे में</string>
+    <string name="lbl_about">इसके बारे में</string>
-    <string name="label_code">GitHub में देखें</string>
+    <string name="lbl_code">GitHub में देखें</string>
-    <string name="label_faq">FAQ</string>
+    <string name="lbl_faq">FAQ</string>
-    <string name="label_licenses">लाइसेंस</string>
+    <string name="lbl_licenses">लाइसेंस</string>
 
     <!-- Settings namespace | Settings-related labels -->
-    <string name="setting_title">सेटिंग्स</string>
+    <string name="set_title">सेटिंग्स</string>
 
-    <string name="setting_theme">थीम</string>
+    <string name="set_theme">थीम</string>
-    <string name="setting_theme_auto">सफ़ेद</string>
+    <string name="set_theme_auto">सफ़ेद</string>
-    <string name="setting_theme_day">गहरा</string>
+    <string name="set_theme_day">गहरा</string>
-    <string name="setting_theme_night">स्वचलित</string>
+    <string name="set_theme_night">स्वचलित</string>
-    <string name="setting_accent">एक्सेंट</string>
+    <string name="set_accent">एक्सेंट</string>
 
-    <string name="setting_color_notif">अधिसूचना को रंग दें</string>
+    <string name="set_color_notif">अधिसूचना को रंग दें</string>
 
-    <string name="setting_audio">ऑडियो</string>
+    <string name="set_audio">ऑडियो</string>
-    <string name="setting_audio_focus">ऑडियो फोकस</string>
+    <string name="set_focus">ऑडियो फोकस</string>
-    <string name="setting_audio_plug_mgt">हेडसेट प्लग</string>
+    <string name="set_plug_mgt">हेडसेट प्लग</string>
 
     <string name="setting_behavior">चाल चलन</string>
 
     <!-- Error Namespace | Error Labels -->
-    <string name="error_no_music">कोई संगीत नहीं मिला</string>
+    <string name="err_no_music">कोई संगीत नहीं मिला</string>
 
     <!-- Description Namespace | Accessibility Strings -->
-    <string name="description_play_pause">चलाएं/रोकें</string>
+    <string name="desc_play_pause">चलाएं/रोकें</string>
 
-    <string name="description_error">त्रुटी</string>
+    <string name="desc_error">त्रुटी</string>
 
     <!-- Hint Namespace | EditText Hints -->
     <string name="hint_search_library">संग्रह में खोजें</string>
@@ -62,12 +62,12 @@
     <!-- Color Label namespace | Accent names -->
 
     <!-- Format Namespace | Value formatting/plurals -->
-    <plurals name="format_song_count">
+    <plurals name="fmt_song_count">
         <item quantity="one">%d गीत</item>
         <item quantity="other">%d गीत</item>
     </plurals>
 
-    <plurals name="format_album_count">
+    <plurals name="fmt_album_count">
         <item quantity="one">%d एल्बम</item>
         <item quantity="other">%d एल्बम</item>
     </plurals>

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

@@ -1,101 +1,101 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <!-- Label Namespace | Static Labels -->
-    <string name="label_retry">Újra</string>
+    <string name="lbl_retry">Újra</string>
-    <string name="label_grant">Engedélyezés</string>
+    <string name="lbl_grant">Engedélyezés</string>
 
-    <string name="label_library">Könyvtár</string>
+    <string name="lbl_library">Könyvtár</string>
-    <string name="label_genres">Műfajo</string>
+    <string name="lbl_genres">Műfajo</string>
-    <string name="label_artists">Előadók</string>
+    <string name="lbl_artists">Előadók</string>
-    <string name="label_albums">Albumok</string>
+    <string name="lbl_albums">Albumok</string>
-    <string name="label_songs">Dalok</string>
+    <string name="lbl_songs">Dalok</string>
-    <string name="label_all_songs">Összes Dalok</string>
+    <string name="lbl_all_songs">Összes Dalok</string>
 
-    <string name="label_search">Keresés</string>
+    <string name="lbl_search">Keresés</string>
-    <string name="label_filter">Filter</string>
+    <string name="lbl_filter">Filter</string>
-    <string name="label_filter_all">Összes</string>
+    <string name="lbl_filter_all">Összes</string>
 
-    <string name="label_sort">Összes</string>
+    <string name="lbl_sort">Összes</string>
-    <string name="label_sort_alpha_down">Növekvő</string>
+    <string name="lbl_sort_alpha_down">Növekvő</string>
-    <string name="label_sort_alpha_up">Csökkenő</string>
+    <string name="lbl_sort_alpha_up">Csökkenő</string>
 
-    <string name="label_play">Lejátszás</string>
+    <string name="lbl_play">Lejátszás</string>
-    <string name="label_shuffle">Keverés</string>
+    <string name="lbl_shuffle">Keverés</string>
-    <string name="label_playback">Most Játszott</string>
+    <string name="lbl_playback">Most Játszott</string>
 
-    <string name="label_queue">Lejátszási sor</string>
+    <string name="lbl_queue">Lejátszási sor</string>
-    <string name="label_queue_add">Lejátszás sorhoz adás</string>
+    <string name="lbl_queue_add">Lejátszás sorhoz adás</string>
-    <string name="label_queue_added">Sorbaállítva</string>
+    <string name="lbl_queue_added">Sorbaállítva</string>
-    <string name="label_next_user_queue">Lejátszási sor</string>
+    <string name="lbl_next_user_queue">Lejátszási sor</string>
 
-    <string name="label_go_artist">Ugrás az előadóhoz</string>
+    <string name="lbl_go_artist">Ugrás az előadóhoz</string>
-    <string name="label_go_album">Ugrás az albumhoz</string>
+    <string name="lbl_go_album">Ugrás az albumhoz</string>
 
-    <string name="label_about">Névjegy</string>
+    <string name="lbl_about">Névjegy</string>
-    <string name="label_version">Verzió</string>
+    <string name="lbl_version">Verzió</string>
-    <string name="label_code">Megtekintés GitHubon</string>
+    <string name="lbl_code">Megtekintés GitHubon</string>
-    <string name="label_faq">GYIK</string>
+    <string name="lbl_faq">GYIK</string>
-    <string name="label_licenses">Engedélyek</string>
+    <string name="lbl_licenses">Engedélyek</string>
 
     <!-- Settings namespace | Settings-related labels -->
-    <string name="setting_title">Beállítások</string>
+    <string name="set_title">Beállítások</string>
 
-    <string name="setting_ui">Megjelenés</string>
+    <string name="set_ui">Megjelenés</string>
-    <string name="setting_theme">Téma</string>
+    <string name="set_theme">Téma</string>
-    <string name="setting_theme_auto">Automatikus</string>
+    <string name="set_theme_auto">Automatikus</string>
-    <string name="setting_theme_day">Világos</string>
+    <string name="set_theme_day">Világos</string>
-    <string name="setting_theme_night">Sötét</string>
+    <string name="set_theme_night">Sötét</string>
-    <string name="setting_accent">Kiemelés</string>
+    <string name="set_accent">Kiemelés</string>
 
-    <string name="setting_color_notif">Értesítés színezése</string>
+    <string name="set_color_notif">Értesítés színezése</string>
-    <string name="setting_quality_covers">A médiatár albumborítók figyelmen kívül hagyása</string>
+    <string name="set_quality_covers">A médiatár albumborítók figyelmen kívül hagyása</string>
 
-    <string name="setting_audio">Hang</string>
+    <string name="set_audio">Hang</string>
-    <string name="setting_audio_focus">Hangfókusz</string>
+    <string name="set_focus">Hangfókusz</string>
-    <string name="setting_audio_plug_mgt">Fejhallgató csatlakozó</string>
+    <string name="set_plug_mgt">Fejhallgató csatlakozó</string>
 
     <string name="setting_behavior">Működés</string>
 
     <!-- Error Namespace | Error Labels -->
-    <string name="error_no_music">Nem található zene</string>
+    <string name="err_no_music">Nem található zene</string>
 
     <!-- Hint Namespace | EditText Hints -->
     <string name="hint_search_library">Keresés a könyvtárban…</string>
 
     <!-- Description Namespace | Accessibility Strings -->
-    <string name="description_track_number">Sáv %d</string>
+    <string name="desc_track_number">Sáv %d</string>
 
-    <string name="description_play_pause">Lejátszás/Szünet</string>
+    <string name="desc_play_pause">Lejátszás/Szünet</string>
 
-    <string name="description_clear_user_queue">Lejátszási sor</string>
+    <string name="desc_clear_user_queue">Lejátszási sor</string>
 
-    <string name="description_error">Hiba</string>
+    <string name="desc_error">Hiba</string>
 
     <!-- Color Label namespace | Accent names -->
-    <string name="color_label_red">Piros</string>
+    <string name="clr_red">Piros</string>
-    <string name="color_label_pink">Rózsaszínű</string>
+    <string name="clr_pink">Rózsaszínű</string>
-    <string name="color_label_purple">Lila</string>
+    <string name="clr_purple">Lila</string>
-    <string name="color_label_deep_purple">Sötétlila</string>
+    <string name="clr_deep_purple">Sötétlila</string>
-    <string name="color_label_indigo">Indigókék</string>
+    <string name="clr_indigo">Indigókék</string>
-    <string name="color_label_blue">Kék</string>
+    <string name="clr_blue">Kék</string>
-    <string name="color_label_light_blue">Világoskék</string>
+    <string name="clr_light_blue">Világoskék</string>
-    <string name="color_label_teal">Kékeszöld</string>
+    <string name="clr_teal">Kékeszöld</string>
-    <string name="color_label_green">Zöld</string>
+    <string name="clr_green">Zöld</string>
-    <string name="color_label_light_green">Világoszöld</string>
+    <string name="color_light_green">Világoszöld</string>
-    <string name="color_label_lime">Sárgazöld</string>
+    <string name="color_lime">Sárgazöld</string>
-    <string name="color_label_yellow">Sárga</string>
+    <string name="color_yellow">Sárga</string>
-    <string name="color_label_orange">Narancs</string>
+    <string name="clr_orange">Narancs</string>
-    <string name="color_label_brown">Barna</string>
+    <string name="clr_label_brown">Barna</string>
-    <string name="color_label_grey">Szürke</string>
+    <string name="clr_label_grey">Szürke</string>
-    <string name="color_label_blue_grey">Kékszürke</string>
+    <string name="clr_blue_grey">Kékszürke</string>
 
     <!-- Format Namespace | Value formatting/plurals -->
-    <plurals name="format_song_count">
+    <plurals name="fmt_song_count">
         <item quantity="one">%d Dal</item>
         <item quantity="other">%d Dalok</item>
     </plurals>
 
-    <plurals name="format_album_count">
+    <plurals name="fmt_album_count">
         <item quantity="one">%d Album</item>
         <item quantity="other">%d Albumok</item>
     </plurals>

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

@@ -1,83 +1,83 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <!-- Label Namespace | Static Labels -->
-    <string name="label_retry">Ulangi</string>
+    <string name="lbl_retry">Ulangi</string>
-    <string name="label_grant">Izinkan</string>
+    <string name="lbl_grant">Izinkan</string>
 
-    <string name="label_library">Pustaka</string>
+    <string name="lbl_library">Pustaka</string>
-    <string name="label_genres">Aliran</string>
+    <string name="lbl_genres">Aliran</string>
-    <string name="label_artists">Artis</string>
+    <string name="lbl_artists">Artis</string>
-    <string name="label_albums">Album</string>
+    <string name="lbl_albums">Album</string>
-    <string name="label_songs">Lagu</string>
+    <string name="lbl_songs">Lagu</string>
-    <string name="label_all_songs">Lagu</string>
+    <string name="lbl_all_songs">Lagu</string>
 
-    <string name="label_search">Pencarian</string>
+    <string name="lbl_search">Pencarian</string>
-    <string name="label_filter">Filter</string>
+    <string name="lbl_filter">Filter</string>
-    <string name="label_filter_all">Semua</string>
+    <string name="lbl_filter_all">Semua</string>
 
-    <string name="label_sort">Urutan</string>
+    <string name="lbl_sort">Urutan</string>
-    <string name="label_sort_alpha_down">Naik</string>
+    <string name="lbl_sort_alpha_down">Naik</string>
-    <string name="label_sort_alpha_up">Turun</string>
+    <string name="lbl_sort_alpha_up">Turun</string>
 
-    <string name="label_play">Putar</string>
+    <string name="lbl_play">Putar</string>
-    <string name="label_shuffle">Acak</string>
+    <string name="lbl_shuffle">Acak</string>
-    <string name="label_playback">Sedang Diputar</string>
+    <string name="lbl_playback">Sedang Diputar</string>
 
-    <string name="label_queue">Antrean</string>
+    <string name="lbl_queue">Antrean</string>
-    <string name="label_queue_add">Tambahkan ke antrean</string>
+    <string name="lbl_queue_add">Tambahkan ke antrean</string>
-    <string name="label_queue_added">Ditambahkan ke antrean</string>
+    <string name="lbl_queue_added">Ditambahkan ke antrean</string>
-    <string name="label_next_user_queue">Berikutnya</string>
+    <string name="lbl_next_user_queue">Berikutnya</string>
 
-    <string name="label_go_artist">Pergi ke artis</string>
+    <string name="lbl_go_artist">Pergi ke artis</string>
-    <string name="label_go_album">Pergi ke album</string>
+    <string name="lbl_go_album">Pergi ke album</string>
 
-    <string name="label_about">Tentang</string>
+    <string name="lbl_about">Tentang</string>
-    <string name="label_version">Versi</string>
+    <string name="lbl_version">Versi</string>
-    <string name="label_code">Lihat di GitHub</string>
+    <string name="lbl_code">Lihat di GitHub</string>
-    <string name="label_faq">Tanya-Jawab</string>
+    <string name="lbl_faq">Tanya-Jawab</string>
-    <string name="label_licenses">Lisensi</string>
+    <string name="lbl_licenses">Lisensi</string>
 
     <!-- Settings namespace | Settings-related labels -->
-    <string name="setting_title">Setelan</string>
+    <string name="set_title">Setelan</string>
 
-    <string name="setting_ui">Tampilan</string>
+    <string name="set_ui">Tampilan</string>
-    <string name="setting_theme">Tema</string>
+    <string name="set_theme">Tema</string>
-    <string name="setting_theme_auto">Otomatis</string>
+    <string name="set_theme_auto">Otomatis</string>
-    <string name="setting_theme_day">Terang</string>
+    <string name="set_theme_day">Terang</string>
-    <string name="setting_theme_night">Gelap</string>
+    <string name="set_theme_night">Gelap</string>
-    <string name="setting_accent">Aksen</string>
+    <string name="set_accent">Aksen</string>
 
-    <string name="setting_color_notif">Warnai Notifikasi</string>
+    <string name="set_color_notif">Warnai Notifikasi</string>
-    <string name="setting_quality_covers">Abaikan sampul-sampul pada Media Penyimpanan</string>
+    <string name="set_quality_covers">Abaikan sampul-sampul pada Media Penyimpanan</string>
 
-    <string name="setting_audio">Audio</string>
+    <string name="set_audio">Audio</string>
-    <string name="setting_audio_focus">Fokus 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>
 
     <!-- Error Namespace | Error Labels -->
-    <string name="error_no_music">Musik tidak ditemukan</string>
+    <string name="err_no_music">Musik tidak ditemukan</string>
 
     <!-- Hint Namespace | EditText Hints -->
     <string name="hint_search_library">Mencari pustaka Anda…</string>
 
     <!-- Description Namespace | Accessibility Strings -->
-    <string name="description_track_number">Trek %d</string>
+    <string name="desc_track_number">Trek %d</string>
 
-    <string name="description_play_pause">Putar/Jeda</string>
+    <string name="desc_play_pause">Putar/Jeda</string>
 
-    <string name="description_clear_user_queue">Kosongkan antrean</string>
+    <string name="desc_clear_user_queue">Kosongkan antrean</string>
 
-    <string name="description_error">Galat</string>
+    <string name="desc_error">Galat</string>
 
     <!-- Format Namespace | Value formatting/plurals -->
 
-    <plurals name="format_song_count">
+    <plurals name="fmt_song_count">
         <item quantity="other">%d Lagu</item>
     </plurals>
 
-    <plurals name="format_album_count">
+    <plurals name="fmt_album_count">
         <item quantity="other">%d Album</item>
     </plurals>
 </resources>

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

@@ -1,104 +1,104 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <!-- Label Namespace | Static Labels -->
-    <string name="label_retry">Riprova</string>
+    <string name="lbl_retry">Riprova</string>
-    <string name="label_grant">Permetti</string>
+    <string name="lbl_grant">Permetti</string>
 
-    <string name="label_library">Libreria</string>
+    <string name="lbl_library">Libreria</string>
-    <string name="label_genres">Generi</string>
+    <string name="lbl_genres">Generi</string>
-    <string name="label_artists">Artisti</string>
+    <string name="lbl_artists">Artisti</string>
-    <string name="label_albums">Albums</string>
+    <string name="lbl_albums">Albums</string>
-    <string name="label_songs">Canzoni</string>
+    <string name="lbl_songs">Canzoni</string>
-    <string name="label_all_songs">Brani Tutti</string>
+    <string name="lbl_all_songs">Brani Tutti</string>
 
-    <string name="label_search">Cerca</string>
+    <string name="lbl_search">Cerca</string>
-    <string name="label_filter">Filtra</string>
+    <string name="lbl_filter">Filtra</string>
-    <string name="label_filter_all">Tutto</string>
+    <string name="lbl_filter_all">Tutto</string>
 
-    <string name="label_sort">Ordine</string>
+    <string name="lbl_sort">Ordine</string>
-    <string name="label_sort_alpha_down">Ascendente</string>
+    <string name="lbl_sort_alpha_down">Ascendente</string>
-    <string name="label_sort_alpha_up">Discendente</string>
+    <string name="lbl_sort_alpha_up">Discendente</string>
 
-    <string name="label_play">Riproduci</string>
+    <string name="lbl_play">Riproduci</string>
-    <string name="label_shuffle">Casuale</string>
+    <string name="lbl_shuffle">Casuale</string>
-    <string name="label_playback">Schermata di riproduzione</string>
+    <string name="lbl_playback">Schermata di riproduzione</string>
 
-    <string name="label_queue">Coda</string>
+    <string name="lbl_queue">Coda</string>
-    <string name="label_queue_add">Aggiungi alla coda</string>
+    <string name="lbl_queue_add">Aggiungi alla coda</string>
-    <string name="label_queue_added">Aggiunta alla coda</string>
+    <string name="lbl_queue_added">Aggiunta alla coda</string>
-    <string name="label_next_user_queue">A seguire</string>
+    <string name="lbl_next_user_queue">A seguire</string>
 
-    <string name="label_go_artist">Vai all\'artista</string>
+    <string name="lbl_go_artist">Vai all\'artista</string>
-    <string name="label_go_album">Vai all\'album</string>
+    <string name="lbl_go_album">Vai all\'album</string>
 
-    <string name="label_about">Informazioni</string>
+    <string name="lbl_about">Informazioni</string>
-    <string name="label_version">Versione</string>
+    <string name="lbl_version">Versione</string>
-    <string name="label_code">Mostra su GitHub</string>
+    <string name="lbl_code">Mostra su GitHub</string>
-    <string name="label_faq">FAQ</string>
+    <string name="lbl_faq">FAQ</string>
-    <string name="label_licenses">Licenze</string>
+    <string name="lbl_licenses">Licenze</string>
-    <string name="label_author">Sviluppato da OxygenCobalt</string>
+    <string name="lbl_author">Sviluppato da OxygenCobalt</string>
 
     <!-- Settings namespace | Settings-related labels -->
-    <string name="setting_title">Preferencias</string>
+    <string name="set_title">Preferencias</string>
 
-    <string name="setting_ui">Aspetto</string>
+    <string name="set_ui">Aspetto</string>
-    <string name="setting_theme">Tema</string>
+    <string name="set_theme">Tema</string>
-    <string name="setting_theme_auto">Automatico</string>
+    <string name="set_theme_auto">Automatico</string>
-    <string name="setting_theme_day">Chiaro</string>
+    <string name="set_theme_day">Chiaro</string>
-    <string name="setting_theme_night">Scuro</string>
+    <string name="set_theme_night">Scuro</string>
 
-    <string name="setting_accent">Accento</string>
+    <string name="set_accent">Accento</string>
-    <string name="setting_color_notif">Colora notifica</string>
+    <string name="set_color_notif">Colora notifica</string>
-    <string name="setting_quality_covers">Ignora le copertine del Media Store</string>
+    <string name="set_quality_covers">Ignora le copertine del Media Store</string>
 
-    <string name="setting_audio">Audio</string>
+    <string name="set_audio">Audio</string>
-    <string name="setting_audio_focus">Focus audio</string>
+    <string name="set_focus">Focus audio</string>
-    <string name="setting_audio_plug_mgt">Inserimento cuffie</string>
+    <string name="set_plug_mgt">Inserimento cuffie</string>
 
     <string name="setting_behavior">Comportamento</string>
     <string name="setting_behavior_keep_shuffle">Ricorda casuale</string>
 
     <!-- Error Namespace | Error Labels -->
-    <string name="error_no_music">Nessuna canzone trovata</string>
+    <string name="err_no_music">Nessuna canzone trovata</string>
 
     <!-- Description Namespace | Accessibility Strings -->
-    <string name="description_track_number">Traccia %d</string>
+    <string name="desc_track_number">Traccia %d</string>
 
-    <string name="description_play_pause">Play/Pausa</string>
+    <string name="desc_play_pause">Play/Pausa</string>
 
-    <string name="description_clear_user_queue">Svuota coda</string>
+    <string name="desc_clear_user_queue">Svuota coda</string>
 
-    <string name="description_error">Errore</string>
+    <string name="desc_error">Errore</string>
 
     <!-- Hint Namespace | EditText Hints -->
     <string name="hint_search_library">Cerca nella tua libreria…</string>
 
     <!-- Color Label namespace | Accent names -->
-    <string name="color_label_red">Rosso</string>
+    <string name="clr_red">Rosso</string>
-    <string name="color_label_pink">Rosa</string>
+    <string name="clr_pink">Rosa</string>
-    <string name="color_label_purple">Viola</string>
+    <string name="clr_purple">Viola</string>
-    <string name="color_label_indigo">Indaco</string>
+    <string name="clr_indigo">Indaco</string>
-    <string name="color_label_blue">Azzurro</string>
+    <string name="clr_blue">Azzurro</string>
-    <string name="color_label_light_blue">Azzurro Chiaro</string>
+    <string name="clr_light_blue">Azzurro Chiaro</string>
-    <string name="color_label_teal">Azzurro Verde</string>
+    <string name="clr_teal">Azzurro Verde</string>
-    <string name="color_label_green">Verde</string>
+    <string name="clr_green">Verde</string>
-    <string name="color_label_light_green">Verde Chiaro</string>
+    <string name="color_light_green">Verde Chiaro</string>
-    <string name="color_label_lime">Verde Giallo</string>
+    <string name="color_lime">Verde Giallo</string>
-    <string name="color_label_yellow">Giallo</string>
+    <string name="color_yellow">Giallo</string>
-    <string name="color_label_orange">Arancio</string>
+    <string name="clr_orange">Arancio</string>
-    <string name="color_label_brown">Bruno</string>
+    <string name="clr_label_brown">Bruno</string>
-    <string name="color_label_grey">Grigio</string>
+    <string name="clr_label_grey">Grigio</string>
-    <string name="color_label_blue_grey">Azzurro Grigio</string>
+    <string name="clr_blue_grey">Azzurro Grigio</string>
 
     <!-- Format Namespace | Value formatting/plurals -->
-    <string name="format_songs_loaded">Brani caricate: %d</string>
+    <string name="fmt_songs_loaded">Brani caricate: %d</string>
 
-    <plurals name="format_song_count">
+    <plurals name="fmt_song_count">
         <item quantity="one">%d Canto</item>
         <item quantity="other">%d Canzoni</item>
     </plurals>
 
-    <plurals name="format_album_count">
+    <plurals name="fmt_album_count">
         <item quantity="one">%d Album</item>
         <item quantity="other">%d Albums</item>
     </plurals>

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

@@ -1,83 +1,83 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <!-- Label Namespace | Static Labels -->
-    <string name="label_retry">재시도</string>
+    <string name="lbl_retry">재시도</string>
-    <string name="label_grant">허가</string>
+    <string name="lbl_grant">허가</string>
 
-    <string name="label_library">보관함</string>
+    <string name="lbl_library">보관함</string>
-    <string name="label_genres">장르</string>
+    <string name="lbl_genres">장르</string>
-    <string name="label_artists">아티스트</string>
+    <string name="lbl_artists">아티스트</string>
-    <string name="label_albums">앨범</string>
+    <string name="lbl_albums">앨범</string>
-    <string name="label_songs">노래</string>
+    <string name="lbl_songs">노래</string>
-    <string name="label_all_songs">노래</string>
+    <string name="lbl_all_songs">노래</string>
 
-    <string name="label_search">검색</string>
+    <string name="lbl_search">검색</string>
-    <string name="label_filter">필터</string>
+    <string name="lbl_filter">필터</string>
-    <string name="label_filter_all">전부</string>
+    <string name="lbl_filter_all">전부</string>
 
-    <string name="label_sort">분류</string>
+    <string name="lbl_sort">분류</string>
-    <string name="label_sort_alpha_down">오름차순</string>
+    <string name="lbl_sort_alpha_down">오름차순</string>
-    <string name="label_sort_alpha_up">내림차순</string>
+    <string name="lbl_sort_alpha_up">내림차순</string>
 
-    <string name="label_play">재생</string>
+    <string name="lbl_play">재생</string>
-    <string name="label_shuffle">모든 곡 랜덤 재생</string>
+    <string name="lbl_shuffle">모든 곡 랜덤 재생</string>
-    <string name="label_playback">지금 재생 중</string>
+    <string name="lbl_playback">지금 재생 중</string>
 
-    <string name="label_queue">대기열</string>
+    <string name="lbl_queue">대기열</string>
-    <string name="label_queue_add">대기열에 추가</string>
+    <string name="lbl_queue_add">대기열에 추가</string>
-    <string name="label_queue_added">가 대기열에 추가되었습니다</string>
+    <string name="lbl_queue_added">가 대기열에 추가되었습니다</string>
-    <string name="label_next_user_queue">다음 곡</string>
+    <string name="lbl_next_user_queue">다음 곡</string>
 
-    <string name="label_go_artist">아티스트로 가기</string>
+    <string name="lbl_go_artist">아티스트로 가기</string>
-    <string name="label_go_album">앨범으로 가기</string>
+    <string name="lbl_go_album">앨범으로 가기</string>
 
-    <string name="label_about">정보</string>
+    <string name="lbl_about">정보</string>
-    <string name="label_version">버전</string>
+    <string name="lbl_version">버전</string>
-    <string name="label_code">GitHub에서 보기</string>
+    <string name="lbl_code">GitHub에서 보기</string>
-    <string name="label_licenses">라이선스</string>
+    <string name="lbl_licenses">라이선스</string>
 
     <!-- Settings namespace | Settings-related labels -->
-    <string name="setting_title">설정</string>
+    <string name="set_title">설정</string>
 
-    <string name="setting_ui">스타일</string>
+    <string name="set_ui">스타일</string>
-    <string name="setting_theme">테마</string>
+    <string name="set_theme">테마</string>
-    <string name="setting_theme_auto">자동</string>
+    <string name="set_theme_auto">자동</string>
-    <string name="setting_theme_day">밝은 테마</string>
+    <string name="set_theme_day">밝은 테마</string>
-    <string name="setting_theme_night">어두운 테마</string>
+    <string name="set_theme_night">어두운 테마</string>
-    <string name="setting_accent">강조</string>
+    <string name="set_accent">강조</string>
 
-    <string name="setting_color_notif">색상화된 알림</string>
+    <string name="set_color_notif">색상화된 알림</string>
-    <string name="setting_quality_covers">미디어 스토어 앨범 커버 무시</string>
+    <string name="set_quality_covers">미디어 스토어 앨범 커버 무시</string>
 
-    <string name="setting_audio">오디오</string>
+    <string name="set_audio">오디오</string>
-    <string name="setting_audio_focus">오디오 포커스</string>
+    <string name="set_focus">오디오 포커스</string>
-    <string name="setting_audio_plug_mgt">헤드셋 연결</string>
+    <string name="set_plug_mgt">헤드셋 연결</string>
 
     <string name="setting_behavior">동작</string>
 
     <!-- Error Namespace | Error Labels -->
-    <string name="error_no_music">노래를 찾을 수 없습니다</string>
+    <string name="err_no_music">노래를 찾을 수 없습니다</string>
 
     <!-- Description Namespace | Accessibility Strings -->
-    <string name="description_track_number">트랙 %d</string>
+    <string name="desc_track_number">트랙 %d</string>
 
-    <string name="description_play_pause">재생/일시 정지</string>
+    <string name="desc_play_pause">재생/일시 정지</string>
 
-    <string name="description_clear_user_queue">재생 대기열 비우기</string>
+    <string name="desc_clear_user_queue">재생 대기열 비우기</string>
 
-    <string name="description_error">오류</string>
+    <string name="desc_error">오류</string>
 
     <!-- Hint Namespace | EditText Hints -->
     <string name="hint_search_library">저장소 검색…</string>
 
     <!-- Format Namespace | Value formatting/plurals -->
-    <string name="format_songs_loaded">찾은 노래 수: %d</string>
+    <string name="fmt_songs_loaded">찾은 노래 수: %d</string>
 
-    <plurals name="format_song_count">
+    <plurals name="fmt_song_count">
         <item quantity="other">노래</item>
     </plurals>
 
-    <plurals name="format_album_count">
+    <plurals name="fmt_album_count">
         <item quantity="other">앨범</item>
     </plurals>
 

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

@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <!-- Base style for the material buttons -->
+    <style name="Widget.Button.Vibrant.Base" parent="@style/Widget.MaterialComponents.Button.TextButton">
-    <style name="Widget.MaterialComponents.Button.Base" parent="@style/Widget.MaterialComponents.Button.TextButton">
         <item name="android:layout_width">0dp</item>
         <item name="android:layout_height">wrap_content</item>
         <item name="android:clickable">true</item>

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

@@ -5,80 +5,80 @@
     <string name="info_channel_name">Muziek Afspelen</string>
 
     <!-- Label Namespace | Static Labels -->
-    <string name="label_retry">Opnieuw proberen</string>
+    <string name="lbl_retry">Opnieuw proberen</string>
-    <string name="label_grant">Toestaan</string>
+    <string name="lbl_grant">Toestaan</string>
 
-    <string name="label_library">Bibliotheek</string>
+    <string name="lbl_library">Bibliotheek</string>
-    <string name="label_genres">Genres</string>
+    <string name="lbl_genres">Genres</string>
-    <string name="label_artists">Artiesten</string>
+    <string name="lbl_artists">Artiesten</string>
-    <string name="label_albums">Albums</string>
+    <string name="lbl_albums">Albums</string>
-    <string name="label_songs">Nummers</string>
+    <string name="lbl_songs">Nummers</string>
-    <string name="label_all_songs">Alle Nummers</string>
+    <string name="lbl_all_songs">Alle Nummers</string>
 
-    <string name="label_search">Zoeken</string>
+    <string name="lbl_search">Zoeken</string>
-    <string name="label_filter">Filter</string>
+    <string name="lbl_filter">Filter</string>
-    <string name="label_filter_all">Alles</string>
+    <string name="lbl_filter_all">Alles</string>
 
-    <string name="label_sort">Sorteren</string>
+    <string name="lbl_sort">Sorteren</string>
-    <string name="label_sort_alpha_down">Oplopend</string>
+    <string name="lbl_sort_alpha_down">Oplopend</string>
-    <string name="label_sort_alpha_up">Aflopend</string>
+    <string name="lbl_sort_alpha_up">Aflopend</string>
 
-    <string name="label_play">Afspelen</string>
+    <string name="lbl_play">Afspelen</string>
-    <string name="label_shuffle">Shuffle</string>
+    <string name="lbl_shuffle">Shuffle</string>
-    <string name="label_play_all_songs">Speel van alle nummers </string>
+    <string name="lbl_play_all">Speel van alle nummers </string>
-    <string name="label_play_album">Speel af van album </string>
+    <string name="lbl_play_album">Speel af van album </string>
-    <string name="label_play_artist">Speel van artiest </string>
+    <string name="lbl_play_artist">Speel van artiest </string>
-    <string name="label_play_genre">Speel vanuit genre </string>
+    <string name="lbl_play_genre">Speel vanuit genre </string>
-    <string name="label_playback">Afspeelscherm</string>
+    <string name="lbl_playback">Afspeelscherm</string>
 
-    <string name="label_queue">Wachtrij</string>
+    <string name="lbl_queue">Wachtrij</string>
-    <string name="label_queue_add">Toevoegen aan wachtrij</string>
+    <string name="lbl_queue_add">Toevoegen aan wachtrij</string>
-    <string name="label_queue_added">Toegevoegd aan de wachtrij</string>
+    <string name="lbl_queue_added">Toegevoegd aan de wachtrij</string>
-    <string name="label_next_user_queue">Als volgende</string>
+    <string name="lbl_next_user_queue">Als volgende</string>
 
-    <string name="label_go_artist">Ga naar artiest</string>
+    <string name="lbl_go_artist">Ga naar artiest</string>
-    <string name="label_go_album">Ga naar album</string>
+    <string name="lbl_go_album">Ga naar album</string>
 
-    <string name="label_state_saved">Staat gered</string>
+    <string name="lbl_state_saved">Staat gered</string>
 
-    <string name="label_add">Toevoegen</string>
+    <string name="lbl_add">Toevoegen</string>
-    <string name="label_save">Opslaan</string>
+    <string name="lbl_save">Opslaan</string>
-    <string name="label_no_dirs">Geen Mappen</string>
+    <string name="lbl_no_dirs">Geen Mappen</string>
 
-    <string name="label_about">Over</string>
+    <string name="lbl_about">Over</string>
-    <string name="label_version">Versie</string>
+    <string name="lbl_version">Versie</string>
-    <string name="label_code">Bekijken op GitHub</string>
+    <string name="lbl_code">Bekijken op GitHub</string>
-    <string name="label_faq">FAQ</string>
+    <string name="lbl_faq">FAQ</string>
-    <string name="label_licenses">Licenties</string>
+    <string name="lbl_licenses">Licenties</string>
-    <string name="label_author">Ontwikkeld door OxygenCobalt</string>
+    <string name="lbl_author">Ontwikkeld door OxygenCobalt</string>
 
     <!-- Settings namespace | Settings-related labels -->
-    <string name="setting_title">Instellingen</string>
+    <string name="set_title">Instellingen</string>
 
-    <string name="setting_ui">Uiterlijk</string>
+    <string name="set_ui">Uiterlijk</string>
-    <string name="setting_theme">Thema</string>
+    <string name="set_theme">Thema</string>
-    <string name="setting_theme_auto">Automatisch</string>
+    <string name="set_theme_auto">Automatisch</string>
-    <string name="setting_theme_day">Licht</string>
+    <string name="set_theme_day">Licht</string>
-    <string name="setting_theme_night">Donker</string>
+    <string name="set_theme_night">Donker</string>
-    <string name="setting_accent">Accent</string>
+    <string name="set_accent">Accent</string>
 
-    <string name="setting_display">Scherm</string>
+    <string name="set_display">Scherm</string>
-    <string name="setting_lib_display">Bibliotheek Items</string>
+    <string name="set_lib_display">Bibliotheek Items</string>
-    <string name="setting_color_notif">Notificatie kleur aanpassen</string>
+    <string name="set_color_notif">Notificatie kleur aanpassen</string>
-    <string name="setting_color_desc">Toon album art op notification</string>
+    <string name="set_color_notif_desc">Toon album art op notification</string>
     <string name="setting_show_covers">Toon albumhoezen</string>
-    <string name="setting_show_covers_desc">Schakel uit om geheugengebruik te besparen</string>
+    <string name="set_show_covers_desc">Schakel uit om geheugengebruik te besparen</string>
-    <string name="setting_quality_covers">Negeer Mediaopslag illustraties</string>
+    <string name="set_quality_covers">Negeer Mediaopslag illustraties</string>
-    <string name="setting_quality_covers_desc">Verhoogt de kwaliteit van de albumhoezen, maar resulteert in langere laadtijden en hoger geheugengebruik </string>
+    <string name="set_quality_covers_desc">Verhoogt de kwaliteit van de albumhoezen, maar resulteert in langere laadtijden en hoger geheugengebruik </string>
-    <string name="setting_use_alt_action">Gebruikt een afternatief notification action</string>
+    <string name="set_alt_action">Gebruikt een afternatief notification action</string>
-    <string name="setting_use_alt_loop">Voorkeur aan herhaalde actie</string>
+    <string name="set_alt_loop">Voorkeur aan herhaalde actie</string>
-    <string name="setting_use_alt_shuffle">Voorkeur aan shuffle actie</string>
+    <string name="set_alt_shuffle">Voorkeur aan shuffle actie</string>
 
-    <string name="setting_audio">Audio</string>
+    <string name="set_audio">Audio</string>
-    <string name="setting_audio_focus">Audiofocus</string>
+    <string name="set_focus">Audiofocus</string>
-    <string name="setting_audio_focus_desc">Pauze wanneer andere audio speelt [ex. Gesprekken]</string>
+    <string name="set_focus_desc">Pauze wanneer andere audio speelt [ex. Gesprekken]</string>
-    <string name="setting_audio_plug_mgt">Headset-pluggen</string>
+    <string name="set_plug_mgt">Headset-pluggen</string>
-    <string name="setting_audio_plug_mgt_desc">Afspelen/Pauzeren wanneer de headsetaansluiting verandert</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>
@@ -87,77 +87,77 @@
     <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="setting_content">Inhoud</string>
+    <string name="set_content">Inhoud</string>
-    <string name="setting_content_save">Afspeelstatus opslaan</string>
+    <string name="set_save">Afspeelstatus opslaan</string>
-    <string name="setting_content_save_desc">Sla de huidige afspeelstatus nu op </string>
+    <string name="set_save_desc">Sla de huidige afspeelstatus nu op </string>
-    <string name="setting_content_blacklist">Uitgesloten mappen </string>
+    <string name="set_blacklist">Uitgesloten mappen </string>
-    <string name="setting_content_blacklist_desc">De inhoud van uitgesloten mappen wordt verborgen voor uw bibliotheek</string>
+    <string name="set_blacklist_desc">De inhoud van uitgesloten mappen wordt verborgen voor uw bibliotheek</string>
 
     <!-- Error Namespace | Error Labels -->
-    <string name="error_no_music">Geen muziek aangetroffen</string>
+    <string name="err_no_music">Geen muziek aangetroffen</string>
-    <string name="error_load_failed">Laden van muziek mislukt</string>
+    <string name="err_load_failed">Laden van muziek mislukt</string>
-    <string name="error_no_perms">Auxio heeft toestemming nodig om uw muziekbibliotheek te lezen</string>
+    <string name="err_no_perms">Auxio heeft toestemming nodig om uw muziekbibliotheek te lezen</string>
-    <string name="error_no_browser">Geen app kan deze link openen</string>
+    <string name="err_no_app">Geen app kan deze link openen</string>
-    <string name="error_bad_dir">Deze map wordt niet ondersteund</string>
+    <string name="err_bad_dir">Deze map wordt niet ondersteund</string>
 
     <!-- Hint Namespace | EditText Hints -->
     <string name="hint_search_library">Zoek in uw bibliotheek…</string>
 
     <!-- Description Namespace | Accessibility Strings -->
-    <string name="description_sort_button">Sorteervolgorde wijzigen</string>
+    <string name="desc_sort_button">Sorteervolgorde wijzigen</string>
-    <string name="description_track_number">Nummer %d</string>
+    <string name="desc_track_number">Nummer %d</string>
 
-    <string name="description_play_pause">Afspelen/Pauzeren</string>
+    <string name="desc_play_pause">Afspelen/Pauzeren</string>
-    <string name="description_skip_next">Naar volgend nummer gaan</string>
+    <string name="desc_skip_next">Naar volgend nummer gaan</string>
-    <string name="description_skip_prev">Naar het laatste nummer gaan</string>
+    <string name="desc_skip_prev">Naar het laatste nummer gaan</string>
-    <string name="description_change_loop">Herhaalfunctie wijzigen</string>
+    <string name="desc_change_loop">Herhaalfunctie wijzigen</string>
 
-    <string name="description_clear_user_queue">Wachtrij wissen</string>
+    <string name="desc_clear_user_queue">Wachtrij wissen</string>
-    <string name="description_clear_search">Zoekopdracht wissen</string>
+    <string name="desc_clear_search">Zoekopdracht wissen</string>
-    <string name="description_blacklist_delete">Verwijder uitgesloten map</string>
+    <string name="desc_blacklist_delete">Verwijder uitgesloten map</string>
 
-    <string name="description_error">Fout</string>
+    <string name="desc_error">Fout</string>
-    <string name="description_auxio_icon">Auxio pictogram</string>
+    <string name="desc_auxio_icon">Auxio pictogram</string>
-    <string name="description_album_cover">Artist Image voor  %s</string>
+    <string name="desc_album_cover">Artist Image voor  %s</string>
-    <string name="description_artist_image">Artist Image voor %s</string>
+    <string name="desc_artist_image">Artist Image voor %s</string>
-    <string name="description_genre_image">Genre Image voor %s</string>
+    <string name="desc_genre_image">Genre Image voor %s</string>
 
     <!-- Placeholder Namespace | Placeholder values -->
-    <string name="placeholder_genre">Onbekend Genre</string>
+    <string name="def_genre">Onbekend Genre</string>
-    <string name="placeholder_artist">Onbekend Artist</string>
+    <string name="def_artist">Onbekend Artist</string>
-    <string name="placeholder_album">Onbekend Album</string>
+    <string name="def_album">Onbekend Album</string>
-    <string name="placeholder_no_date">Geen datum </string>
+    <string name="def_date">Geen datum </string>
 
     <!-- Color Label namespace | Accent names -->
-    <string name="color_label_red">Rood</string>
+    <string name="clr_red">Rood</string>
-    <string name="color_label_pink">Roze</string>
+    <string name="clr_pink">Roze</string>
-    <string name="color_label_purple">Paars</string>
+    <string name="clr_purple">Paars</string>
-    <string name="color_label_deep_purple">Donkerpaars</string>
+    <string name="clr_deep_purple">Donkerpaars</string>
-    <string name="color_label_indigo">Indigoblauw</string>
+    <string name="clr_indigo">Indigoblauw</string>
-    <string name="color_label_blue">Blauw</string>
+    <string name="clr_blue">Blauw</string>
-    <string name="color_label_light_blue">Lichtblauw</string>
+    <string name="clr_light_blue">Lichtblauw</string>
-    <string name="color_label_teal">Blauwgroen</string>
+    <string name="clr_teal">Blauwgroen</string>
-    <string name="color_label_green">Groen</string>
+    <string name="clr_green">Groen</string>
-    <string name="color_label_light_green">Lichtgroen</string>
+    <string name="color_light_green">Lichtgroen</string>
-    <string name="color_label_cyan">Cyaan</string>
+    <string name="clr_cyan">Cyaan</string>
-    <string name="color_label_lime">Geelgroen</string>
+    <string name="color_lime">Geelgroen</string>
-    <string name="color_label_yellow">Geel</string>
+    <string name="color_yellow">Geel</string>
-    <string name="color_label_orange">Oranje</string>
+    <string name="clr_orange">Oranje</string>
-    <string name="color_label_deep_orange">Dieporanje</string>
+    <string name="clr_deep_orange">Dieporanje</string>
-    <string name="color_label_brown">Bruin</string>
+    <string name="clr_label_brown">Bruin</string>
-    <string name="color_label_grey">Grijis</string>
+    <string name="clr_label_grey">Grijis</string>
-    <string name="color_label_blue_grey">Blauwgrijis</string>
+    <string name="clr_blue_grey">Blauwgrijis</string>
 
     <!-- Format Namespace | Value formatting/plurals -->
-    <string name="format_next_from">Volgende van: %s</string>
+    <string name="fmt_next_from">Volgende van: %s</string>
-    <string name="format_songs_loaded">Nummers geladen: %d</string>
+    <string name="fmt_songs_loaded">Nummers geladen: %d</string>
 
-    <plurals name="format_song_count">
+    <plurals name="fmt_song_count">
         <item quantity="one">%d Nummer</item>
         <item quantity="other">%d Nummers</item>
     </plurals>
 
-    <plurals name="format_album_count">
+    <plurals name="fmt_album_count">
         <item quantity="one">%d Album</item>
         <item quantity="other">%d Albums</item>
     </plurals>

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

@@ -1,102 +1,102 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <!-- Label Namespace | Static Labels -->
-    <string name="label_retry">Ponów</string>
+    <string name="lbl_retry">Ponów</string>
-    <string name="label_grant">Przyznaj</string>
+    <string name="lbl_grant">Przyznaj</string>
 
-    <string name="label_library">Biblioteka</string>
+    <string name="lbl_library">Biblioteka</string>
-    <string name="label_genres">Gatunki</string>
+    <string name="lbl_genres">Gatunki</string>
-    <string name="label_artists">Wykonawcy</string>
+    <string name="lbl_artists">Wykonawcy</string>
-    <string name="label_albums">Albumy</string>
+    <string name="lbl_albums">Albumy</string>
-    <string name="label_songs">Utwory</string>
+    <string name="lbl_songs">Utwory</string>
-    <string name="label_all_songs">Wszystkie Utwory</string>
+    <string name="lbl_all_songs">Wszystkie Utwory</string>
 
-    <string name="label_search">Szukaj</string>
+    <string name="lbl_search">Szukaj</string>
-    <string name="label_filter">Filtry</string>
+    <string name="lbl_filter">Filtry</string>
-    <string name="label_filter_all">Wszystkie</string>
+    <string name="lbl_filter_all">Wszystkie</string>
 
-    <string name="label_sort">Sortowanie</string>
+    <string name="lbl_sort">Sortowanie</string>
-    <string name="label_sort_alpha_down">Rosnąco</string>
+    <string name="lbl_sort_alpha_down">Rosnąco</string>
-    <string name="label_sort_alpha_up">Malejąco</string>
+    <string name="lbl_sort_alpha_up">Malejąco</string>
 
-    <string name="label_play">Graj</string>
+    <string name="lbl_play">Graj</string>
-    <string name="label_shuffle">Losowo</string>
+    <string name="lbl_shuffle">Losowo</string>
-    <string name="label_playback">Obecnie Grane</string>
+    <string name="lbl_playback">Obecnie Grane</string>
 
-    <string name="label_queue">Kolejka</string>
+    <string name="lbl_queue">Kolejka</string>
-    <string name="label_queue_add">Dodaj do kolejki</string>
+    <string name="lbl_queue_add">Dodaj do kolejki</string>
-    <string name="label_queue_added">Dodany do kolejki</string>
+    <string name="lbl_queue_added">Dodany do kolejki</string>
-    <string name="label_next_user_queue">Za chwilę zagra</string>
+    <string name="lbl_next_user_queue">Za chwilę zagra</string>
 
-    <string name="label_go_artist">Przejdź do wykonawcy</string>
+    <string name="lbl_go_artist">Przejdź do wykonawcy</string>
-    <string name="label_go_album">Przejdź do albumu</string>
+    <string name="lbl_go_album">Przejdź do albumu</string>
 
-    <string name="label_about">O aplikacji</string>
+    <string name="lbl_about">O aplikacji</string>
-    <string name="label_version">Wersja</string>
+    <string name="lbl_version">Wersja</string>
-    <string name="label_code">Zobacz na GitHubie</string>
+    <string name="lbl_code">Zobacz na GitHubie</string>
-    <string name="label_faq">FAQ</string>
+    <string name="lbl_faq">FAQ</string>
-    <string name="label_licenses">Licencje</string>
+    <string name="lbl_licenses">Licencje</string>
 
     <!-- Settings namespace | Settings-related labels -->
-    <string name="setting_title">Ustawienia</string>
+    <string name="set_title">Ustawienia</string>
 
-    <string name="setting_ui">Wygląd</string>
+    <string name="set_ui">Wygląd</string>
-    <string name="setting_theme">Motyw</string>
+    <string name="set_theme">Motyw</string>
-    <string name="setting_theme_auto">Automatyczny</string>
+    <string name="set_theme_auto">Automatyczny</string>
-    <string name="setting_theme_day">Jasny</string>
+    <string name="set_theme_day">Jasny</string>
-    <string name="setting_theme_night">Ciemny</string>
+    <string name="set_theme_night">Ciemny</string>
-    <string name="setting_accent">Odcień koloru</string>
+    <string name="set_accent">Odcień koloru</string>
 
-    <string name="setting_color_notif">Pokolorowanie powiadomienia</string>
+    <string name="set_color_notif">Pokolorowanie powiadomienia</string>
-    <string name="setting_quality_covers">Ignoruj okładki z Media Store</string>
+    <string name="set_quality_covers">Ignoruj okładki z Media Store</string>
 
-    <string name="setting_audio">Dźwięk</string>
+    <string name="set_audio">Dźwięk</string>
-    <string name="setting_audio_focus">Wyciszanie otoczenia</string>
+    <string name="set_focus">Wyciszanie otoczenia</string>
-    <string name="setting_audio_plug_mgt">Podłączanie słuchawek</string>
+    <string name="set_plug_mgt">Podłączanie słuchawek</string>
 
     <string name="setting_behavior">Zachowanie</string>
 
     <!-- Error Namespace | Error Labels -->
-    <string name="error_no_music">Nie znaleziono muzyki</string>
+    <string name="err_no_music">Nie znaleziono muzyki</string>
 
     <!-- Description Namespace | Accessibility Strings -->
-    <string name="description_track_number">Ścieżka %d</string>
+    <string name="desc_track_number">Ścieżka %d</string>
 
-    <string name="description_play_pause">Odtwarzanie/Pauza</string>
+    <string name="desc_play_pause">Odtwarzanie/Pauza</string>
 
-    <string name="description_clear_user_queue">Wyczyść kolejkę</string>
+    <string name="desc_clear_user_queue">Wyczyść kolejkę</string>
 
-    <string name="description_error">Błąd</string>
+    <string name="desc_error">Błąd</string>
 
     <!-- Hint Namespace | EditText Hints -->
     <string name="hint_search_library">Szukaj w bibliotece…</string>
 
     <!-- Color Label namespace | Accent names -->
-    <string name="color_label_red">Czerwony</string>
+    <string name="clr_red">Czerwony</string>
-    <string name="color_label_pink">Różowy</string>
+    <string name="clr_pink">Różowy</string>
-    <string name="color_label_purple">Purpura</string>
+    <string name="clr_purple">Purpura</string>
-    <string name="color_label_indigo">Błękit Indygowy</string>
+    <string name="clr_indigo">Błękit Indygowy</string>
-    <string name="color_label_blue">Błękit</string>
+    <string name="clr_blue">Błękit</string>
-    <string name="color_label_light_blue">Jasnobłękit</string>
+    <string name="clr_light_blue">Jasnobłękit</string>
-    <string name="color_label_green">Zielony</string>
+    <string name="clr_green">Zielony</string>
-    <string name="color_label_light_green">Jasnozielony</string>
+    <string name="color_light_green">Jasnozielony</string>
-    <string name="color_label_lime">Żółtyzielony</string>
+    <string name="color_lime">Żółtyzielony</string>
-    <string name="color_label_yellow">Żółty</string>
+    <string name="color_yellow">Żółty</string>
-    <string name="color_label_orange">Pomarańczowy</string>
+    <string name="clr_orange">Pomarańczowy</string>
-    <string name="color_label_brown">Brązowy</string>
+    <string name="clr_label_brown">Brązowy</string>
-    <string name="color_label_grey">Szary</string>
+    <string name="clr_label_grey">Szary</string>
-    <string name="color_label_blue_grey">Błękitszary</string>
+    <string name="clr_blue_grey">Błękitszary</string>
 
     <!-- Format Namespace | Value formatting/plurals -->
-    <string name="format_songs_loaded">Utwory uruchamia się: %d</string>
+    <string name="fmt_songs_loaded">Utwory uruchamia się: %d</string>
 
-    <plurals name="format_song_count">
+    <plurals name="fmt_song_count">
         <item quantity="one">%d Utwór</item>
         <item quantity="few">%d Utwory</item>
         <item quantity="many">%d Piosenek</item>
     </plurals>
 
-    <plurals name="format_album_count">
+    <plurals name="fmt_album_count">
         <item quantity="one">%d Album</item>
         <item quantity="few">%d Albumy</item>
         <item quantity="many">%d Albumów</item>

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

@@ -1,104 +1,104 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <!-- Label Namespace | Static Labels -->
-    <string name="label_retry">Tentar novamente</string>
+    <string name="lbl_retry">Tentar novamente</string>
-    <string name="label_grant">Confirmar</string>
+    <string name="lbl_grant">Confirmar</string>
 
-    <string name="label_library">Biblioteca</string>
+    <string name="lbl_library">Biblioteca</string>
-    <string name="label_genres">Gêneros</string>
+    <string name="lbl_genres">Gêneros</string>
-    <string name="label_artists">Artistas</string>
+    <string name="lbl_artists">Artistas</string>
-    <string name="label_albums">Álbuns</string>
+    <string name="lbl_albums">Álbuns</string>
-    <string name="label_songs">Músicas</string>
+    <string name="lbl_songs">Músicas</string>
-    <string name="label_all_songs">Músicas Todo</string>
+    <string name="lbl_all_songs">Músicas Todo</string>
 
-    <string name="label_search">Pesquisar</string>
+    <string name="lbl_search">Pesquisar</string>
-    <string name="label_filter">Filtro</string>
+    <string name="lbl_filter">Filtro</string>
-    <string name="label_filter_all">Tudo</string>
+    <string name="lbl_filter_all">Tudo</string>
 
-    <string name="label_sort">Classificação</string>
+    <string name="lbl_sort">Classificação</string>
-    <string name="label_sort_alpha_up">Descendente</string>
+    <string name="lbl_sort_alpha_up">Descendente</string>
 
-    <string name="label_play">Reproduzir</string>
+    <string name="lbl_play">Reproduzir</string>
-    <string name="label_shuffle">Embaralhar</string>
+    <string name="lbl_shuffle">Embaralhar</string>
-    <string name="label_playback">Tocando agora</string>
+    <string name="lbl_playback">Tocando agora</string>
 
-    <string name="label_queue">Fila</string>
+    <string name="lbl_queue">Fila</string>
-    <string name="label_queue_add">Adicionar à fila</string>
+    <string name="lbl_queue_add">Adicionar à fila</string>
-    <string name="label_queue_added">Adicionada à fila</string>
+    <string name="lbl_queue_added">Adicionada à fila</string>
-    <string name="label_next_user_queue">Próximo</string>
+    <string name="lbl_next_user_queue">Próximo</string>
 
-    <string name="label_go_artist">Ir para o artista</string>
+    <string name="lbl_go_artist">Ir para o artista</string>
-    <string name="label_go_album">Ir para o álbum</string>
+    <string name="lbl_go_album">Ir para o álbum</string>
 
-    <string name="label_about">Sobre</string>
+    <string name="lbl_about">Sobre</string>
-    <string name="label_version">Versão</string>
+    <string name="lbl_version">Versão</string>
-    <string name="label_code">Ver no GitHub</string>
+    <string name="lbl_code">Ver no GitHub</string>
-    <string name="label_faq">FAQ</string>
+    <string name="lbl_faq">FAQ</string>
-    <string name="label_licenses">Licenças</string>
+    <string name="lbl_licenses">Licenças</string>
-    <string name="label_author">Desenvolvido por OxygenCobalt</string>
+    <string name="lbl_author">Desenvolvido por OxygenCobalt</string>
 
     <!-- Settings namespace | Settings-related labels -->
-    <string name="setting_title">Configurações</string>
+    <string name="set_title">Configurações</string>
 
-    <string name="setting_ui">Aparência</string>
+    <string name="set_ui">Aparência</string>
-    <string name="setting_theme">Tema</string>
+    <string name="set_theme">Tema</string>
-    <string name="setting_theme_auto">Automático</string>
+    <string name="set_theme_auto">Automático</string>
-    <string name="setting_theme_day">Claro</string>
+    <string name="set_theme_day">Claro</string>
-    <string name="setting_theme_night">Escuro</string>
+    <string name="set_theme_night">Escuro</string>
-    <string name="setting_accent">Cor de destaque</string>
+    <string name="set_accent">Cor de destaque</string>
 
-    <string name="setting_color_notif">Colorir notificação</string>
+    <string name="set_color_notif">Colorir notificação</string>
-    <string name="setting_quality_covers">Ignorar capas Media Store</string>
+    <string name="set_quality_covers">Ignorar capas Media Store</string>
 
-    <string name="setting_audio">Áudio</string>
+    <string name="set_audio">Áudio</string>
-    <string name="setting_audio_focus">Foco do áudio</string>
+    <string name="set_focus">Foco do áudio</string>
-    <string name="setting_audio_plug_mgt">Entrada do fone de ouvido</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>
 
     <!-- Error Namespace | Error Labels -->
-    <string name="error_no_music">Nenhuma música encontrada</string>
+    <string name="err_no_music">Nenhuma música encontrada</string>
 
     <!-- Description Namespace | Accessibility Strings -->
-    <string name="description_track_number">Música %d</string>
+    <string name="desc_track_number">Música %d</string>
 
-    <string name="description_play_pause">Reproduzir/Pausar</string>
+    <string name="desc_play_pause">Reproduzir/Pausar</string>
 
-    <string name="description_clear_user_queue">Limpar fila</string>
+    <string name="desc_clear_user_queue">Limpar fila</string>
 
-    <string name="description_error">Erro</string>
+    <string name="desc_error">Erro</string>
 
     <!-- Hint Namespace | EditText Hints -->
     <string name="hint_search_library">Procurar na biblioteca…</string>
 
     <!-- Color Label namespace | Accent names -->
-    <string name="color_label_red">Vermelho</string>
+    <string name="clr_red">Vermelho</string>
-    <string name="color_label_pink">Rosa</string>
+    <string name="clr_pink">Rosa</string>
-    <string name="color_label_purple">Roxo</string>
+    <string name="clr_purple">Roxo</string>
-    <string name="color_label_blue">Azul</string>
+    <string name="clr_blue">Azul</string>
-    <string name="color_label_light_blue">Azul-claro</string>
+    <string name="clr_light_blue">Azul-claro</string>
-    <string name="color_label_teal">Azul-verde</string>
+    <string name="clr_teal">Azul-verde</string>
-    <string name="color_label_green">Verde</string>
+    <string name="clr_green">Verde</string>
-    <string name="color_label_light_green">Verde-claro</string>
+    <string name="color_light_green">Verde-claro</string>
-    <string name="color_label_lime">Verde-amarelo</string>
+    <string name="color_lime">Verde-amarelo</string>
-    <string name="color_label_yellow">Amarelo</string>
+    <string name="color_yellow">Amarelo</string>
-    <string name="color_label_orange">Laranja</string>
+    <string name="clr_orange">Laranja</string>
-    <string name="color_label_brown">Moreno</string>
+    <string name="clr_label_brown">Moreno</string>
-    <string name="color_label_grey">Grisalho</string>
+    <string name="clr_label_grey">Grisalho</string>
-    <string name="color_label_blue_grey">Azul-grisalho</string>
+    <string name="clr_blue_grey">Azul-grisalho</string>
 
     <!-- Format Namespace | Value formatting/plurals -->
-    <string name="format_songs_loaded">Músicas carregado: %d</string>
+    <string name="fmt_songs_loaded">Músicas carregado: %d</string>
 
-    <plurals name="format_song_count">
+    <plurals name="fmt_song_count">
         <item quantity="one">%d Música</item>
         <item quantity="other">%d Músicas</item>
     </plurals>
 
-    <plurals name="format_album_count">
+    <plurals name="fmt_album_count">
         <item quantity="one">%d Álbum</item>
         <item quantity="other">%d Álbuns</item>
     </plurals>
-    <string name="label_sort_alpha_down">Ascendente</string>
+    <string name="lbl_sort_alpha_down">Ascendente</string>
 </resources>

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

@@ -1,103 +1,103 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <!-- Label Namespace | Static Labels -->
-    <string name="label_retry">Tentar novamente</string>
+    <string name="lbl_retry">Tentar novamente</string>
-    <string name="label_grant">Permitir</string>
+    <string name="lbl_grant">Permitir</string>
 
-    <string name="label_library">Biblioteca</string>
+    <string name="lbl_library">Biblioteca</string>
-    <string name="label_genres">Gêneros</string>
+    <string name="lbl_genres">Gêneros</string>
-    <string name="label_artists">Artistas</string>
+    <string name="lbl_artists">Artistas</string>
-    <string name="label_albums">Álbuns</string>
+    <string name="lbl_albums">Álbuns</string>
-    <string name="label_songs">Músicas</string>
+    <string name="lbl_songs">Músicas</string>
-    <string name="label_all_songs">Músicas Todo</string>
+    <string name="lbl_all_songs">Músicas Todo</string>
 
-    <string name="label_search">Pesquisar</string>
+    <string name="lbl_search">Pesquisar</string>
-    <string name="label_filter">Filtrar</string>
+    <string name="lbl_filter">Filtrar</string>
-    <string name="label_filter_all">Tudo</string>
+    <string name="lbl_filter_all">Tudo</string>
 
-    <string name="label_sort">Classificação</string>
+    <string name="lbl_sort">Classificação</string>
-    <string name="label_sort_alpha_down">Ascendente</string>
+    <string name="lbl_sort_alpha_down">Ascendente</string>
-    <string name="label_sort_alpha_up">Descendente</string>
+    <string name="lbl_sort_alpha_up">Descendente</string>
 
-    <string name="label_play">Reproduzir</string>
+    <string name="lbl_play">Reproduzir</string>
-    <string name="label_shuffle">Embaralhar</string>
+    <string name="lbl_shuffle">Embaralhar</string>
-    <string name="label_playback">A reproduzir</string>
+    <string name="lbl_playback">A reproduzir</string>
 
-    <string name="label_queue">Fila</string>
+    <string name="lbl_queue">Fila</string>
-    <string name="label_queue_add">Adicionar à fila</string>
+    <string name="lbl_queue_add">Adicionar à fila</string>
-    <string name="label_queue_added">Adicionada à fila</string>
+    <string name="lbl_queue_added">Adicionada à fila</string>
-    <string name="label_next_user_queue">A seguir</string>
+    <string name="lbl_next_user_queue">A seguir</string>
 
-    <string name="label_go_artist">Ir para o artista</string>
+    <string name="lbl_go_artist">Ir para o artista</string>
-    <string name="label_go_album">Ir para o álbum</string>
+    <string name="lbl_go_album">Ir para o álbum</string>
 
-    <string name="label_about">Sobre</string>
+    <string name="lbl_about">Sobre</string>
-    <string name="label_version">Versão</string>
+    <string name="lbl_version">Versão</string>
-    <string name="label_code">Ver no GitHub</string>
+    <string name="lbl_code">Ver no GitHub</string>
-    <string name="label_faq">FAQ</string>
+    <string name="lbl_faq">FAQ</string>
-    <string name="label_licenses">Licenças</string>
+    <string name="lbl_licenses">Licenças</string>
-    <string name="label_author">Desenvolvido por OxygenCobalt</string>
+    <string name="lbl_author">Desenvolvido por OxygenCobalt</string>
 
     <!-- Settings namespace | Settings-related labels -->
-    <string name="setting_title">Definições</string>
+    <string name="set_title">Definições</string>
 
-    <string name="setting_ui">Aparência</string>
+    <string name="set_ui">Aparência</string>
-    <string name="setting_theme">Tema</string>
+    <string name="set_theme">Tema</string>
-    <string name="setting_theme_day">Claro</string>
+    <string name="set_theme_day">Claro</string>
-    <string name="setting_theme_night">Escuro</string>
+    <string name="set_theme_night">Escuro</string>
-    <string name="setting_theme_auto">Automático</string>
+    <string name="set_theme_auto">Automático</string>
-    <string name="setting_accent">Cor de realce</string>
+    <string name="set_accent">Cor de realce</string>
 
-    <string name="setting_color_notif">Colorir notificação</string>
+    <string name="set_color_notif">Colorir notificação</string>
-    <string name="setting_quality_covers">Ignorar capas Media Store</string>
+    <string name="set_quality_covers">Ignorar capas Media Store</string>
 
-    <string name="setting_audio">Áudio</string>
+    <string name="set_audio">Áudio</string>
-    <string name="setting_audio_focus">Foco de áudio</string>
+    <string name="set_focus">Foco de áudio</string>
-    <string name="setting_audio_plug_mgt">Entrada do fone de ouvido</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>
 
     <!-- Error Namespace | Error Labels -->
-    <string name="error_no_music">Nenhuma música encontrada</string>
+    <string name="err_no_music">Nenhuma música encontrada</string>
 
     <!-- Description Namespace | Accessibility Strings -->
-    <string name="description_track_number">Música %d</string>
+    <string name="desc_track_number">Música %d</string>
 
-    <string name="description_play_pause">Reproduzir/Pausar</string>
+    <string name="desc_play_pause">Reproduzir/Pausar</string>
 
-    <string name="description_clear_user_queue">Limpar fila</string>
+    <string name="desc_clear_user_queue">Limpar fila</string>
 
-    <string name="description_error">Error</string>
+    <string name="desc_error">Error</string>
 
     <!-- Hint Namespace | EditText Hints -->
     <string name="hint_search_library">Procurar na biblioteca…</string>
 
     <!-- Color Label namespace | Accent names -->
-    <string name="color_label_red">Vermelho</string>
+    <string name="clr_red">Vermelho</string>
-    <string name="color_label_pink">Rosa</string>
+    <string name="clr_pink">Rosa</string>
-    <string name="color_label_purple">Roxo</string>
+    <string name="clr_purple">Roxo</string>
-    <string name="color_label_blue">Azul</string>
+    <string name="clr_blue">Azul</string>
-    <string name="color_label_light_blue">Azul-claro</string>
+    <string name="clr_light_blue">Azul-claro</string>
-    <string name="color_label_teal">Azul-verde</string>
+    <string name="clr_teal">Azul-verde</string>
-    <string name="color_label_green">Verde</string>
+    <string name="clr_green">Verde</string>
-    <string name="color_label_light_green">Verde-claro</string>
+    <string name="color_light_green">Verde-claro</string>
-    <string name="color_label_lime">Verde-amarelo</string>
+    <string name="color_lime">Verde-amarelo</string>
-    <string name="color_label_yellow">Amarelo</string>
+    <string name="color_yellow">Amarelo</string>
-    <string name="color_label_orange">Laranja</string>
+    <string name="clr_orange">Laranja</string>
-    <string name="color_label_brown">Moreno</string>
+    <string name="clr_label_brown">Moreno</string>
-    <string name="color_label_grey">Grisalho</string>
+    <string name="clr_label_grey">Grisalho</string>
-    <string name="color_label_blue_grey">Azul-grisalho</string>
+    <string name="clr_blue_grey">Azul-grisalho</string>
 
     <!-- Format Namespace | Value formatting/plurals -->
-    <string name="format_songs_loaded">Músicas carregado: %d</string>
+    <string name="fmt_songs_loaded">Músicas carregado: %d</string>
 
-    <plurals name="format_song_count">
+    <plurals name="fmt_song_count">
         <item quantity="one">%d Música</item>
         <item quantity="other">%d Músicas</item>
     </plurals>
 
-    <plurals name="format_album_count">
+    <plurals name="fmt_album_count">
         <item quantity="one">%d Álbum</item>
         <item quantity="other">%d Álbuns</item>
     </plurals>

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

@@ -1,101 +1,101 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <!-- Label Namespace | Static Labels -->
-    <string name="label_retry">Reîncearcă</string>
+    <string name="lbl_retry">Reîncearcă</string>
-    <string name="label_grant">Permiteți</string>
+    <string name="lbl_grant">Permiteți</string>
 
-    <string name="label_library">Bibliotecă</string>
+    <string name="lbl_library">Bibliotecă</string>
-    <string name="label_genres">Genuri</string>
+    <string name="lbl_genres">Genuri</string>
-    <string name="label_artists">Artiști</string>
+    <string name="lbl_artists">Artiști</string>
-    <string name="label_albums">Albume</string>
+    <string name="lbl_albums">Albume</string>
-    <string name="label_songs">Cântece</string>
+    <string name="lbl_songs">Cântece</string>
-    <string name="label_all_songs">Toate Cântece</string>
+    <string name="lbl_all_songs">Toate Cântece</string>
 
-    <string name="label_search">Căutare</string>
+    <string name="lbl_search">Căutare</string>
-    <string name="label_filter">Filtru</string>
+    <string name="lbl_filter">Filtru</string>
-    <string name="label_filter_all">Tot</string>
+    <string name="lbl_filter_all">Tot</string>
 
-    <string name="label_sort">Sortare</string>
+    <string name="lbl_sort">Sortare</string>
-    <string name="label_sort_alpha_down">Crescător</string>
+    <string name="lbl_sort_alpha_down">Crescător</string>
-    <string name="label_sort_alpha_up">Descrescător</string>
+    <string name="lbl_sort_alpha_up">Descrescător</string>
 
-    <string name="label_play">Redă</string>
+    <string name="lbl_play">Redă</string>
-    <string name="label_shuffle">Amestecare</string>
+    <string name="lbl_shuffle">Amestecare</string>
-    <string name="label_playback">Redare Acum</string>
+    <string name="lbl_playback">Redare Acum</string>
 
-    <string name="label_queue">Fila de așteptare</string>
+    <string name="lbl_queue">Fila de așteptare</string>
-    <string name="label_queue_add">Adăugați la lista de așteptare</string>
+    <string name="lbl_queue_add">Adăugați la lista de așteptare</string>
-    <string name="label_queue_added">A fost adăugat la liste de așteptare</string>
+    <string name="lbl_queue_added">A fost adăugat la liste de așteptare</string>
-    <string name="label_next_user_queue">Urmează</string>
+    <string name="lbl_next_user_queue">Urmează</string>
 
-    <string name="label_go_artist">Accesaţi artistul</string>
+    <string name="lbl_go_artist">Accesaţi artistul</string>
-    <string name="label_go_album">Accesaţi albumul</string>
+    <string name="lbl_go_album">Accesaţi albumul</string>
 
-    <string name="label_about">Despre</string>
+    <string name="lbl_about">Despre</string>
-    <string name="label_version">Versiune</string>
+    <string name="lbl_version">Versiune</string>
-    <string name="label_code">Vedeți pe GitHub</string>
+    <string name="lbl_code">Vedeți pe GitHub</string>
-    <string name="label_faq">FAQ</string>
+    <string name="lbl_faq">FAQ</string>
-    <string name="label_licenses">Licențe</string>
+    <string name="lbl_licenses">Licențe</string>
-    <string name="label_author">Dezvoltat de OxygenCobalt</string>
+    <string name="lbl_author">Dezvoltat de OxygenCobalt</string>
 
     <!-- Settings namespace | Settings-related labels -->
-    <string name="setting_title">Setări</string>
+    <string name="set_title">Setări</string>
 
-    <string name="setting_ui">Aspect</string>
+    <string name="set_ui">Aspect</string>
-    <string name="setting_theme">Temă</string>
+    <string name="set_theme">Temă</string>
-    <string name="setting_theme_auto">Automatică</string>
+    <string name="set_theme_auto">Automatică</string>
-    <string name="setting_theme_day">Clar</string>
+    <string name="set_theme_day">Clar</string>
-    <string name="setting_theme_night">Întunecat</string>
+    <string name="set_theme_night">Întunecat</string>
-    <string name="setting_accent">Culoare accentuată</string>
+    <string name="set_accent">Culoare accentuată</string>
 
-    <string name="setting_color_notif">Colorează notificarea</string>
+    <string name="set_color_notif">Colorează notificarea</string>
-    <string name="setting_quality_covers">Ignoră coperțile Media Store</string>
+    <string name="set_quality_covers">Ignoră coperțile Media Store</string>
 
-    <string name="setting_audio">Audio</string>
+    <string name="set_audio">Audio</string>
-    <string name="setting_audio_focus">Concentrare audio</string>
+    <string name="set_focus">Concentrare audio</string>
-    <string name="setting_audio_plug_mgt">Conexiune cu cască</string>
+    <string name="set_plug_mgt">Conexiune cu cască</string>
 
     <string name="setting_behavior">Comportament</string>
 
     <!-- Error Namespace | Error Labels -->
-    <string name="error_no_music">Nu s-a găsit nici o muzică</string>
+    <string name="err_no_music">Nu s-a găsit nici o muzică</string>
 
     <!-- Hint Namespace | EditText Hints -->
     <string name="hint_search_library">Căutați în bibliotecă…</string>
 
     <!-- Description Namespace | Accessibility Strings -->
-    <string name="description_track_number">Melodie %d</string>
+    <string name="desc_track_number">Melodie %d</string>
 
-    <string name="description_play_pause">Redă/Pauză</string>
+    <string name="desc_play_pause">Redă/Pauză</string>
 
-    <string name="description_clear_user_queue">Golește lista de redare</string>
+    <string name="desc_clear_user_queue">Golește lista de redare</string>
 
-    <string name="description_error">Eroare</string>
+    <string name="desc_error">Eroare</string>
 
     <!-- Color Label namespace | Accent names -->
-    <string name="color_label_red">Roșu</string>
+    <string name="clr_red">Roșu</string>
-    <string name="color_label_pink">Roz</string>
+    <string name="clr_pink">Roz</string>
-    <string name="color_label_purple">Violet</string>
+    <string name="clr_purple">Violet</string>
-    <string name="color_label_blue">Albastru</string>
+    <string name="clr_blue">Albastru</string>
-    <string name="color_label_light_blue">Albastru Deschis</string>
+    <string name="clr_light_blue">Albastru Deschis</string>
-    <string name="color_label_teal">Albastru Verde</string>
+    <string name="clr_teal">Albastru Verde</string>
-    <string name="color_label_green">Verde</string>
+    <string name="clr_green">Verde</string>
-    <string name="color_label_light_green">Verde Deschis</string>
+    <string name="color_light_green">Verde Deschis</string>
-    <string name="color_label_lime">Verde Galben</string>
+    <string name="color_lime">Verde Galben</string>
-    <string name="color_label_yellow">Galben</string>
+    <string name="color_yellow">Galben</string>
-    <string name="color_label_orange">Portocaliu</string>
+    <string name="clr_orange">Portocaliu</string>
-    <string name="color_label_brown">Brun</string>
+    <string name="clr_label_brown">Brun</string>
-    <string name="color_label_grey">Gri</string>
+    <string name="clr_label_grey">Gri</string>
-    <string name="color_label_blue_grey">Albastru Gri</string>
+    <string name="clr_blue_grey">Albastru Gri</string>
 
     <!-- Format Namespace | Value formatting/plurals -->
-    <plurals name="format_song_count">
+    <plurals name="fmt_song_count">
         <item quantity="one">%d Cântec</item>
         <item quantity="few">%d Melodii</item>
         <item quantity="other">%d Cântece</item>
     </plurals>
 
-    <plurals name="format_album_count">
+    <plurals name="fmt_album_count">
         <item quantity="one">%d Album</item>
         <item quantity="few">%d Albume</item>
         <item quantity="other">%d Albume</item>

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

@@ -1,101 +1,101 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <!-- Label Namespace | Static Labels -->
-    <string name="label_retry">Повторить попытку</string>
+    <string name="lbl_retry">Повторить попытку</string>
-    <string name="label_grant">Разрешить</string>
+    <string name="lbl_grant">Разрешить</string>
 
-    <string name="label_library">Библиотека</string>
+    <string name="lbl_library">Библиотека</string>
-    <string name="label_genres">Жанры</string>
+    <string name="lbl_genres">Жанры</string>
-    <string name="label_artists">Исполнители</string>
+    <string name="lbl_artists">Исполнители</string>
-    <string name="label_albums">Альбомы</string>
+    <string name="lbl_albums">Альбомы</string>
-    <string name="label_songs">Треки</string>
+    <string name="lbl_songs">Треки</string>
-    <string name="label_all_songs">Треки</string>
+    <string name="lbl_all_songs">Треки</string>
 
-    <string name="label_search">Поиск</string>
+    <string name="lbl_search">Поиск</string>
-    <string name="label_filter">Фильтр</string>
+    <string name="lbl_filter">Фильтр</string>
-    <string name="label_filter_all">Всё</string>
+    <string name="lbl_filter_all">Всё</string>
 
-    <string name="label_sort">Сортировка</string>
+    <string name="lbl_sort">Сортировка</string>
-    <string name="label_sort_alpha_down">По возрастанию</string>
+    <string name="lbl_sort_alpha_down">По возрастанию</string>
-    <string name="label_sort_alpha_up">По убыванию</string>
+    <string name="lbl_sort_alpha_up">По убыванию</string>
 
-    <string name="label_play">Воспроизвести</string>
+    <string name="lbl_play">Воспроизвести</string>
-    <string name="label_shuffle">Перемешать</string>
+    <string name="lbl_shuffle">Перемешать</string>
-    <string name="label_playback">Сейчас воспроизводится</string>
+    <string name="lbl_playback">Сейчас воспроизводится</string>
 
-    <string name="label_queue">Очередь</string>
+    <string name="lbl_queue">Очередь</string>
-    <string name="label_queue_add">Добавить в очередь</string>
+    <string name="lbl_queue_add">Добавить в очередь</string>
-    <string name="label_queue_added">Добавлена в очередь</string>
+    <string name="lbl_queue_added">Добавлена в очередь</string>
-    <string name="label_next_user_queue">Далее</string>
+    <string name="lbl_next_user_queue">Далее</string>
 
-    <string name="label_go_artist">Перейти к исполнителю</string>
+    <string name="lbl_go_artist">Перейти к исполнителю</string>
-    <string name="label_go_album">Перейти к альбому</string>
+    <string name="lbl_go_album">Перейти к альбому</string>
 
-    <string name="label_about">О программе</string>
+    <string name="lbl_about">О программе</string>
-    <string name="label_version">Версия</string>
+    <string name="lbl_version">Версия</string>
-    <string name="label_code">Открыть на GitHub</string>
+    <string name="lbl_code">Открыть на GitHub</string>
-    <string name="label_faq">ЧаВО</string>
+    <string name="lbl_faq">ЧаВО</string>
-    <string name="label_licenses">Лицензии</string>
+    <string name="lbl_licenses">Лицензии</string>
 
     <!-- Settings namespace | Settings-related labels -->
-    <string name="setting_title">Настройки</string>
+    <string name="set_title">Настройки</string>
 
-    <string name="setting_ui">Внешний Вид</string>
+    <string name="set_ui">Внешний Вид</string>
-    <string name="setting_theme">Тема</string>
+    <string name="set_theme">Тема</string>
-    <string name="setting_theme_auto">Автоматически</string>
+    <string name="set_theme_auto">Автоматически</string>
-    <string name="setting_theme_day">Светлая</string>
+    <string name="set_theme_day">Светлая</string>
-    <string name="setting_theme_night">Темная</string>
+    <string name="set_theme_night">Темная</string>
-    <string name="setting_accent">Акцент</string>
+    <string name="set_accent">Акцент</string>
 
-    <string name="setting_color_notif">Цветное уведомление</string>
+    <string name="set_color_notif">Цветное уведомление</string>
-    <string name="setting_quality_covers">Игнорировать хранилище обложек альбомов</string>
+    <string name="set_quality_covers">Игнорировать хранилище обложек альбомов</string>
 
-    <string name="setting_audio">Аудио</string>
+    <string name="set_audio">Аудио</string>
-    <string name="setting_audio_focus">Фокусировка аудио</string>
+    <string name="set_focus">Фокусировка аудио</string>
-    <string name="setting_audio_plug_mgt">Гарнитура</string>
+    <string name="set_plug_mgt">Гарнитура</string>
 
     <string name="setting_behavior">Поведение</string>
     <string name="setting_behavior_keep_shuffle">Запомнить перемешивание</string>
 
     <!-- Error Namespace | Error Labels -->
-    <string name="error_no_music">Музыка не найдена</string>
+    <string name="err_no_music">Музыка не найдена</string>
 
     <!-- Description Namespace | Accessibility Strings -->
-    <string name="description_track_number">Трек %d</string>
+    <string name="desc_track_number">Трек %d</string>
 
-    <string name="description_play_pause">Воспроизвести/Пауза</string>
+    <string name="desc_play_pause">Воспроизвести/Пауза</string>
 
-    <string name="description_clear_user_queue">Очистить очередь</string>
+    <string name="desc_clear_user_queue">Очистить очередь</string>
 
-    <string name="description_error">Ошибка</string>
+    <string name="desc_error">Ошибка</string>
 
     <!-- Hint Namespace | EditText Hints -->
     <string name="hint_search_library">Поиск в библиотеке…</string>
 
     <!-- Color Label namespace | Accent names -->
-    <string name="color_label_red">Расный</string>
+    <string name="clr_red">Расный</string>
-    <string name="color_label_pink">Розовый</string>
+    <string name="clr_pink">Розовый</string>
-    <string name="color_label_purple">Пурпурный</string>
+    <string name="clr_purple">Пурпурный</string>
-    <string name="color_label_light_blue">Голубой</string>
+    <string name="clr_light_blue">Голубой</string>
-    <string name="color_label_teal">Зелёный</string>
+    <string name="clr_teal">Зелёный</string>
-    <string name="color_label_green">Светло-Зелёный</string>
+    <string name="clr_green">Светло-Зелёный</string>
-    <string name="color_label_yellow">Оранжевый</string>
+    <string name="color_yellow">Оранжевый</string>
-    <string name="color_label_light_green">Жёлтый</string>
+    <string name="color_light_green">Жёлтый</string>
-    <string name="color_label_orange">Коричневый</string>
+    <string name="clr_orange">Коричневый</string>
-    <string name="color_label_brown">Седой</string>
+    <string name="clr_label_brown">Седой</string>
-    <string name="color_label_blue_grey">Нейтральный</string>
+    <string name="clr_blue_grey">Нейтральный</string>
 
     <!-- Format Namespace | Value formatting/plurals -->
-    <string name="format_songs_loaded">Треки загружено: %d</string>
+    <string name="fmt_songs_loaded">Треки загружено: %d</string>
 
-    <plurals name="format_song_count">
+    <plurals name="fmt_song_count">
         <item quantity="one">%d Песня</item>
         <item quantity="few">%d Песни</item>
         <item quantity="many">%d Песен</item>
         <item quantity="other">%d Треки</item>
     </plurals>
 
-    <plurals name="format_album_count">
+    <plurals name="fmt_album_count">
         <item quantity="one">%d Альбом</item>
         <item quantity="few">%d Альбома</item>
         <item quantity="many">%d Альбомов</item>

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

@@ -1,83 +1,83 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <!-- Label Namespace | Static Labels -->
-    <string name="label_retry">Yeniden dene</string>
+    <string name="lbl_retry">Yeniden dene</string>
-    <string name="label_grant">İzin</string>
+    <string name="lbl_grant">İzin</string>
 
-    <string name="label_library">Kitaplık</string>
+    <string name="lbl_library">Kitaplık</string>
-    <string name="label_genres">Türler</string>
+    <string name="lbl_genres">Türler</string>
-    <string name="label_artists">Sanatçılar</string>
+    <string name="lbl_artists">Sanatçılar</string>
-    <string name="label_albums">Albümler</string>
+    <string name="lbl_albums">Albümler</string>
-    <string name="label_songs">Şarkılar</string>
+    <string name="lbl_songs">Şarkılar</string>
-    <string name="label_all_songs">Şarkılar</string>
+    <string name="lbl_all_songs">Şarkılar</string>
 
-    <string name="label_search">Ara</string>
+    <string name="lbl_search">Ara</string>
-    <string name="label_filter">Filtrele</string>
+    <string name="lbl_filter">Filtrele</string>
-    <string name="label_filter_all">Tümü</string>
+    <string name="lbl_filter_all">Tümü</string>
 
-    <string name="label_sort">Sıralama</string>
+    <string name="lbl_sort">Sıralama</string>
-    <string name="label_sort_alpha_down">Artan</string>
+    <string name="lbl_sort_alpha_down">Artan</string>
-    <string name="label_sort_alpha_up">Azalan</string>
+    <string name="lbl_sort_alpha_up">Azalan</string>
 
-    <string name="label_play">Başlat</string>
+    <string name="lbl_play">Başlat</string>
-    <string name="label_shuffle">Karıştır</string>
+    <string name="lbl_shuffle">Karıştır</string>
-    <string name="label_playback">Şuan çalınan</string>
+    <string name="lbl_playback">Şuan çalınan</string>
 
-    <string name="label_queue">Kuyruk</string>
+    <string name="lbl_queue">Kuyruk</string>
-    <string name="label_queue_add">Kuyruğa ekle</string>
+    <string name="lbl_queue_add">Kuyruğa ekle</string>
-    <string name="label_queue_added">Kuyruğa eklendi</string>
+    <string name="lbl_queue_added">Kuyruğa eklendi</string>
-    <string name="label_next_user_queue">Sırada olanlar</string>
+    <string name="lbl_next_user_queue">Sırada olanlar</string>
 
-    <string name="label_go_artist">Sanatçıya git</string>
+    <string name="lbl_go_artist">Sanatçıya git</string>
-    <string name="label_go_album">Albüme git</string>
+    <string name="lbl_go_album">Albüme git</string>
 
-    <string name="label_about">Hakkında</string>
+    <string name="lbl_about">Hakkında</string>
-    <string name="label_version">Sürüm</string>
+    <string name="lbl_version">Sürüm</string>
-    <string name="label_code">GitHub\'da görüntüle</string>
+    <string name="lbl_code">GitHub\'da görüntüle</string>
-    <string name="label_faq">SSS</string>
+    <string name="lbl_faq">SSS</string>
-    <string name="label_licenses">Lisanslar</string>
+    <string name="lbl_licenses">Lisanslar</string>
 
     <!-- Settings namespace | Settings-related labels -->
-    <string name="setting_title">Ayarlar</string>
+    <string name="set_title">Ayarlar</string>
 
-    <string name="setting_ui">Ayarlar</string>
+    <string name="set_ui">Ayarlar</string>
-    <string name="setting_theme">Tema</string>
+    <string name="set_theme">Tema</string>
-    <string name="setting_theme_auto">Otomatis</string>
+    <string name="set_theme_auto">Otomatis</string>
-    <string name="setting_theme_day">Açık</string>
+    <string name="set_theme_day">Açık</string>
-    <string name="setting_theme_night">Koyu</string>
+    <string name="set_theme_night">Koyu</string>
-    <string name="setting_accent">Ana Renk</string>
+    <string name="set_accent">Ana Renk</string>
 
-    <string name="setting_color_notif">Bildirimi renklendir</string>
+    <string name="set_color_notif">Bildirimi renklendir</string>
-    <string name="setting_quality_covers">Medya Deposu albüm kapağını yoksay</string>
+    <string name="set_quality_covers">Medya Deposu albüm kapağını yoksay</string>
 
-    <string name="setting_audio">Ses</string>
+    <string name="set_audio">Ses</string>
-    <string name="setting_audio_focus">Ses odaklama</string>
+    <string name="set_focus">Ses odaklama</string>
 
     <string name="setting_behavior">Tercihler</string>
 
     <!-- Error Namespace | Error Labels -->
-    <string name="error_no_music">Müzik bulunamadı</string>
+    <string name="err_no_music">Müzik bulunamadı</string>
 
     <!-- Hint Namespace | EditText Hints -->
     <string name="hint_search_library">Kitaplığınız taranıyor…</string>
 
     <!-- Description Namespace | Accessibility Strings -->
-    <string name="description_track_number">Parça %d</string>
+    <string name="desc_track_number">Parça %d</string>
 
-    <string name="description_play_pause">Başlat/Durdur</string>
+    <string name="desc_play_pause">Başlat/Durdur</string>
 
-    <string name="description_clear_user_queue">Temizle Kuyruk</string>
+    <string name="desc_clear_user_queue">Temizle Kuyruk</string>
 
-    <string name="description_error">Hata</string>
+    <string name="desc_error">Hata</string>
 
     <!-- Format Namespace | Value formatting/plurals -->
 
-    <plurals name="format_song_count">
+    <plurals name="fmt_song_count">
         <item quantity="one">%d Şarkı</item>
         <item quantity="other">%d Şarkılar</item>
     </plurals>
 
-    <plurals name="format_album_count">
+    <plurals name="fmt_album_count">
         <item quantity="one">%d Albüm</item>
         <item quantity="other">%d Albümler</item>
     </plurals>

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

@@ -1,80 +1,80 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <!-- Label Namespace | Static Labels -->
-    <string name="label_retry">Повторити спробу</string>
+    <string name="lbl_retry">Повторити спробу</string>
-    <string name="label_grant">Надати</string>
+    <string name="lbl_grant">Надати</string>
 
-    <string name="label_library">Бібліотека</string>
+    <string name="lbl_library">Бібліотека</string>
-    <string name="label_genres">Жанри</string>
+    <string name="lbl_genres">Жанри</string>
-    <string name="label_artists">Виконавці</string>
+    <string name="lbl_artists">Виконавці</string>
-    <string name="label_albums">Альбоми</string>
+    <string name="lbl_albums">Альбоми</string>
-    <string name="label_songs">Треки</string>
+    <string name="lbl_songs">Треки</string>
-    <string name="label_all_songs">Треки</string>
+    <string name="lbl_all_songs">Треки</string>
 
-    <string name="label_search">Шукати</string>
+    <string name="lbl_search">Шукати</string>
-    <string name="label_filter">Фільтр</string>
+    <string name="lbl_filter">Фільтр</string>
-    <string name="label_filter_all">Усе</string>
+    <string name="lbl_filter_all">Усе</string>
 
-    <string name="label_sort">Сортування</string>
+    <string name="lbl_sort">Сортування</string>
 
-    <string name="label_play">Відтворити</string>
+    <string name="lbl_play">Відтворити</string>
-    <string name="label_shuffle">Перемішати</string>
+    <string name="lbl_shuffle">Перемішати</string>
-    <string name="label_playback">Відтворюється</string>
+    <string name="lbl_playback">Відтворюється</string>
 
-    <string name="label_queue">Черга</string>
+    <string name="lbl_queue">Черга</string>
-    <string name="label_queue_add">Додати в чергу</string>
+    <string name="lbl_queue_add">Додати в чергу</string>
-    <string name="label_queue_added">Додана в чергу</string>
+    <string name="lbl_queue_added">Додана в чергу</string>
-    <string name="label_next_user_queue">До наступного</string>
+    <string name="lbl_next_user_queue">До наступного</string>
 
-    <string name="label_go_artist">Перейти до виконавця</string>
+    <string name="lbl_go_artist">Перейти до виконавця</string>
-    <string name="label_go_album">Перейти до альбому</string>
+    <string name="lbl_go_album">Перейти до альбому</string>
 
-    <string name="label_about">Про програму</string>
+    <string name="lbl_about">Про програму</string>
-    <string name="label_version">Версія</string>
+    <string name="lbl_version">Версія</string>
-    <string name="label_code">Переглянути на GitHub</string>
+    <string name="lbl_code">Переглянути на GitHub</string>
-    <string name="label_faq">ЧаП</string>
+    <string name="lbl_faq">ЧаП</string>
-    <string name="label_licenses">Ліцензії</string>
+    <string name="lbl_licenses">Ліцензії</string>
 
     <!-- Settings namespace | Settings-related labels -->
-    <string name="setting_title">Налаштування</string>
+    <string name="set_title">Налаштування</string>
 
-    <string name="setting_ui">Вигляд</string>
+    <string name="set_ui">Вигляд</string>
-    <string name="setting_theme">Тема</string>
+    <string name="set_theme">Тема</string>
-    <string name="setting_theme_day">Світла</string>
+    <string name="set_theme_day">Світла</string>
-    <string name="setting_theme_night">Темна</string>
+    <string name="set_theme_night">Темна</string>
 
-    <string name="setting_quality_covers">Ігнорувати обкладинки з Медіасховища</string>
+    <string name="set_quality_covers">Ігнорувати обкладинки з Медіасховища</string>
 
-    <string name="setting_audio">Аудіо</string>
+    <string name="set_audio">Аудіо</string>
 
     <string name="setting_behavior">Поведінка</string>
 
     <!-- Error Namespace | Error Labels -->
-    <string name="error_no_music">Музику не знайдено</string>
+    <string name="err_no_music">Музику не знайдено</string>
 
     <!-- Hint Namespace | EditText Hints -->
     <string name="hint_search_library">Пошук бібліотеки…</string>
 
     <!-- Description Namespace | Accessibility Strings -->
-    <string name="description_track_number">Доріжка %d</string>
+    <string name="desc_track_number">Доріжка %d</string>
 
-    <string name="description_play_pause">Відтворити/Зупинити</string>
+    <string name="desc_play_pause">Відтворити/Зупинити</string>
 
-    <string name="description_clear_user_queue">Очистити черга</string>
+    <string name="desc_clear_user_queue">Очистити черга</string>
 
-    <string name="description_error">Помилка</string>
+    <string name="desc_error">Помилка</string>
 
     <!-- Format Namespace | Value formatting/plurals -->
-    <string name="format_songs_loaded">Пісні завантажено: %d</string>
+    <string name="fmt_songs_loaded">Пісні завантажено: %d</string>
 
-    <plurals name="format_song_count">
+    <plurals name="fmt_song_count">
         <item quantity="one">%d Пісня</item>
         <item quantity="other">%d Пісні</item>
         <item quantity="few">%d Пісень</item>
         <item quantity="many">%d Пісень</item>
     </plurals>
 
-    <plurals name="format_album_count">
+    <plurals name="fmt_album_count">
         <item quantity="one">%d Альбом</item>
         <item quantity="other">%d Альбоми</item>
         <item quantity="few">%d Альбомів</item>

app/src/main/res/values-v31/styles_component.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <style name="Widget.Component.AppWidget.Button" parent="Widget.Component.AppWidget.Button.Base">
+        <item name="android:background">@drawable/ui_unbounded_ripple</item>
+    </style>
+
+    <style name="Widget.Component.AppWidget.Panel" parent="Widget.Component.AppWidget.Panel.Base" />
+</resources>

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

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <style name="Widget.Button.Unbounded.Widget" parent="Widget.Button.Unbounded.Widget.Base">
-        <item name="android:background">@drawable/ui_unbounded_ripple</item>
-    </style>
-
-    <style name="WidgetPanel" parent="WidgetPanel.Base" />
-</resources>

app/src/main/res/values-zh-rCN/strings.xml

@@ -1,52 +1,52 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <!-- Label Namespace | Static Labels -->
-    <string name="label_retry">重试</string>
+    <string name="lbl_retry">重试</string>
-    <string name="label_grant">授予</string>
+    <string name="lbl_grant">授予</string>
 
-    <string name="label_library">媒体库</string>
+    <string name="lbl_library">媒体库</string>
-    <string name="label_genres">流派</string>
+    <string name="lbl_genres">流派</string>
-    <string name="label_artists">艺术家</string>
+    <string name="lbl_artists">艺术家</string>
-    <string name="label_albums">专辑</string>
+    <string name="lbl_albums">专辑</string>
-    <string name="label_songs">歌曲</string>
+    <string name="lbl_songs">歌曲</string>
-    <string name="label_all_songs">歌曲</string>
+    <string name="lbl_all_songs">歌曲</string>
 
-    <string name="label_search">搜索</string>
+    <string name="lbl_search">搜索</string>
-    <string name="label_filter">过滤器</string>
+    <string name="lbl_filter">过滤器</string>
-    <string name="label_filter_all">全部</string>
+    <string name="lbl_filter_all">全部</string>
 
-    <string name="label_sort">排序方式</string>
+    <string name="lbl_sort">排序方式</string>
-    <string name="label_sort_alpha_down">按首字符（正序）</string>
+    <string name="lbl_sort_alpha_down">按首字符（正序）</string>
-    <string name="label_sort_alpha_up">按首字符（倒序）</string>
+    <string name="lbl_sort_alpha_up">按首字符（倒序）</string>
 
-    <string name="label_play">播放</string>
+    <string name="lbl_play">播放</string>
-    <string name="label_shuffle">随机播放</string>
+    <string name="lbl_shuffle">随机播放</string>
-    <string name="label_playback">正在播放界面</string>
+    <string name="lbl_playback">正在播放界面</string>
 
-    <string name="label_queue">播放队列</string>
+    <string name="lbl_queue">播放队列</string>
-    <string name="label_queue_add">加入播放队列</string>
+    <string name="lbl_queue_add">加入播放队列</string>
-    <string name="label_queue_added">此歌曲已加入播放队列</string>
+    <string name="lbl_queue_added">此歌曲已加入播放队列</string>
-    <string name="label_next_user_queue">即将播放</string>
+    <string name="lbl_next_user_queue">即将播放</string>
 
-    <string name="label_go_artist">查看艺术家</string>
+    <string name="lbl_go_artist">查看艺术家</string>
-    <string name="label_go_album">查看专辑</string>
+    <string name="lbl_go_album">查看专辑</string>
 
-    <string name="label_about">关于</string>
+    <string name="lbl_about">关于</string>
-    <string name="label_version">版本</string>
+    <string name="lbl_version">版本</string>
-    <string name="label_code">在GitHub上查看</string>
+    <string name="lbl_code">在GitHub上查看</string>
-    <string name="label_licenses">第三方许可</string>
+    <string name="lbl_licenses">第三方许可</string>
 
     <!-- Settings namespace | Settings-related labels -->
-    <string name="setting_title">设置</string>
+    <string name="set_title">设置</string>
 
-    <string name="setting_ui">外观</string>
+    <string name="set_ui">外观</string>
-    <string name="setting_theme">主题</string>
+    <string name="set_theme">主题</string>
-    <string name="setting_theme_day">浅色</string>
+    <string name="set_theme_day">浅色</string>
-    <string name="setting_theme_night">暗黑</string>
+    <string name="set_theme_night">暗黑</string>
 
-    <string name="setting_quality_covers">忽略媒体储存中的专辑封面</string>
+    <string name="set_quality_covers">忽略媒体储存中的专辑封面</string>
 
-    <string name="setting_audio">音频</string>
+    <string name="set_audio">音频</string>
 
     <string name="setting_behavior">行为</string>
 
@@ -54,20 +54,20 @@
     <string name="hint_search_library">正在扫描…</string>
 
     <!-- Description Namespace | Accessibility Strings -->
-    <string name="description_track_number">音轨 %d</string>
+    <string name="desc_track_number">音轨 %d</string>
 
-    <string name="description_play_pause">播放/暂停</string>
+    <string name="desc_play_pause">播放/暂停</string>
 
-    <string name="description_clear_user_queue">清空播放队列</string>
+    <string name="desc_clear_user_queue">清空播放队列</string>
 
-    <string name="description_error">错误</string>
+    <string name="desc_error">错误</string>
 
     <!-- Format Namespace | Value formatting/plurals -->
-    <plurals name="format_song_count">
+    <plurals name="fmt_song_count">
         <item quantity="other">%d 歌曲</item>
     </plurals>
 
-    <plurals name="format_album_count">
+    <plurals name="fmt_album_count">
         <item quantity="other">%d 专辑</item>
     </plurals>
 </resources>

app/src/main/res/values-zh-rTW/strings.xml

@@ -1,82 +1,82 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <!-- Label Namespace | Static Labels -->
-    <string name="label_retry">重試</string>
+    <string name="lbl_retry">重試</string>
-    <string name="label_grant">取得</string>
+    <string name="lbl_grant">取得</string>
 
-    <string name="label_library">音樂庫</string>
+    <string name="lbl_library">音樂庫</string>
-    <string name="label_genres">類型</string>
+    <string name="lbl_genres">類型</string>
-    <string name="label_artists">演出者</string>
+    <string name="lbl_artists">演出者</string>
-    <string name="label_albums">專輯</string>
+    <string name="lbl_albums">專輯</string>
-    <string name="label_songs">歌曲</string>
+    <string name="lbl_songs">歌曲</string>
-    <string name="label_all_songs">歌曲</string>
+    <string name="lbl_all_songs">歌曲</string>
 
-    <string name="label_search">搜尋</string>
+    <string name="lbl_search">搜尋</string>
-    <string name="label_filter">篩選器</string>
+    <string name="lbl_filter">篩選器</string>
-    <string name="label_filter_all">全部</string>
+    <string name="lbl_filter_all">全部</string>
 
-    <string name="label_sort">排序</string>
+    <string name="lbl_sort">排序</string>
-    <string name="label_sort_alpha_down">升序排列</string>
+    <string name="lbl_sort_alpha_down">升序排列</string>
-    <string name="label_sort_alpha_up">降序排列</string>
+    <string name="lbl_sort_alpha_up">降序排列</string>
 
-    <string name="label_play">播放</string>
+    <string name="lbl_play">播放</string>
-    <string name="label_shuffle">隨機播放</string>
+    <string name="lbl_shuffle">隨機播放</string>
-    <string name="label_playback">播放面板</string>
+    <string name="lbl_playback">播放面板</string>
 
-    <string name="label_queue">隊列</string>
+    <string name="lbl_queue">隊列</string>
-    <string name="label_queue_add">添加到隊列</string>
+    <string name="lbl_queue_add">添加到隊列</string>
-    <string name="label_queue_added">已加入隊列</string>
+    <string name="lbl_queue_added">已加入隊列</string>
-    <string name="label_next_user_queue">播放佇列：即將播放</string>
+    <string name="lbl_next_user_queue">播放佇列：即將播放</string>
 
-    <string name="label_go_artist">前往該歌手頁面</string>
+    <string name="lbl_go_artist">前往該歌手頁面</string>
-    <string name="label_go_album">專輯</string>
+    <string name="lbl_go_album">專輯</string>
 
-    <string name="label_about">關於</string>
+    <string name="lbl_about">關於</string>
-    <string name="label_version">版本</string>
+    <string name="lbl_version">版本</string>
-    <string name="label_code">在 GitHub 上檢視</string>
+    <string name="lbl_code">在 GitHub 上檢視</string>
-    <string name="label_licenses">授權條款</string>
+    <string name="lbl_licenses">授權條款</string>
 
     <!-- Settings namespace | Settings-related labels -->
-    <string name="setting_title">設定</string>
+    <string name="set_title">設定</string>
 
-    <string name="setting_ui">外觀</string>
+    <string name="set_ui">外觀</string>
-    <string name="setting_theme">主題色調</string>
+    <string name="set_theme">主題色調</string>
-    <string name="setting_theme_auto">強調色</string>
+    <string name="set_theme_auto">強調色</string>
-    <string name="setting_theme_day">淺色</string>
+    <string name="set_theme_day">淺色</string>
-    <string name="setting_theme_night">深色</string>
+    <string name="set_theme_night">深色</string>
-    <string name="setting_accent">自定義</string>
+    <string name="set_accent">自定義</string>
 
-    <string name="setting_color_notif">彩色通知</string>
+    <string name="set_color_notif">彩色通知</string>
-    <string name="setting_quality_covers">忽略音訊檔內嵌的專輯封面</string>
+    <string name="set_quality_covers">忽略音訊檔內嵌的專輯封面</string>
 
-    <string name="setting_audio">音訊</string>
+    <string name="set_audio">音訊</string>
-    <string name="setting_audio_focus">音頻焦點</string>
+    <string name="set_focus">音頻焦點</string>
-    <string name="setting_audio_plug_mgt">耳機插頭</string>
+    <string name="set_plug_mgt">耳機插頭</string>
 
     <string name="setting_behavior">行為</string>
     <string name="setting_behavior_keep_shuffle">記住隨機播放</string>
 
     <!-- Error Namespace | Error Labels -->
-    <string name="error_no_music">找不到音樂</string>
+    <string name="err_no_music">找不到音樂</string>
 
     <!-- Description Namespace | Accessibility Strings -->
-    <string name="description_track_number">音軌 %d</string>
+    <string name="desc_track_number">音軌 %d</string>
 
-    <string name="description_play_pause">播放/暫停</string>
+    <string name="desc_play_pause">播放/暫停</string>
 
-    <string name="description_clear_user_queue">清空播放佇列</string>
+    <string name="desc_clear_user_queue">清空播放佇列</string>
 
-    <string name="description_error">錯誤</string>
+    <string name="desc_error">錯誤</string>
 
     <!-- Hint Namespace | EditText Hints -->
     <string name="hint_search_library">搜尋音樂庫…</string>
 
     <!-- Format Namespace | Value formatting/plurals -->
-    <plurals name="format_song_count">
+    <plurals name="fmt_song_count">
         <item quantity="other">%d 歌曲</item>
     </plurals>
 
-    <plurals name="format_album_count">
+    <plurals name="fmt_album_count">
         <item quantity="other">%d 專輯</item>
     </plurals>
 </resources>

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

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string-array name="entires_theme">
-        <item>@string/setting_theme_auto</item>
+        <item>@string/set_theme_auto</item>
-        <item>@string/setting_theme_day</item>
+        <item>@string/set_theme_day</item>
-        <item>@string/setting_theme_night</item>
+        <item>@string/set_theme_night</item>
     </string-array>
 
     <integer-array name="values_theme">
@@ -13,9 +13,9 @@
     </integer-array>
 
     <string-array name="entries_lib_display">
-        <item>@string/label_genres</item>
+        <item>@string/lbl_genres</item>
-        <item>@string/label_artists</item>
+        <item>@string/lbl_artists</item>
-        <item>@string/label_albums</item>
+        <item>@string/lbl_albums</item>
     </string-array>
 
     <integer-array name="values_lib_display">
@@ -25,10 +25,10 @@
     </integer-array>
 
     <array name="entries_song_playback_mode">
-        <item>@string/label_play_all_songs</item>
+        <item>@string/lbl_play_all</item>
-        <item>@string/label_play_artist</item>
+        <item>@string/lbl_play_artist</item>
-        <item>@string/label_play_album</item>
+        <item>@string/lbl_play_album</item>
-        <item>@string/label_play_genre</item>
+        <item>@string/lbl_play_genre</item>
     </array>
 
     <string-array name="values_song_playback_mode">

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

@@ -9,82 +9,82 @@
     <string name="info_widget_desc">View and control music playback</string>
 
     <!-- Label Namespace | Static Labels -->
-    <string name="label_retry">Retry</string>
+    <string name="lbl_retry">Retry</string>
-    <string name="label_grant">Grant</string>
+    <string name="lbl_grant">Grant</string>
 
-    <string name="label_library">Library</string>
+    <string name="lbl_library">Library</string>
-    <string name="label_genres">Genres</string>
+    <string name="lbl_genres">Genres</string>
-    <string name="label_artists">Artists</string>
+    <string name="lbl_artists">Artists</string>
-    <string name="label_albums">Albums</string>
+    <string name="lbl_albums">Albums</string>
-    <string name="label_songs">Songs</string>
+    <string name="lbl_songs">Songs</string>
-    <string name="label_all_songs">All Songs</string>
+    <string name="lbl_all_songs">All Songs</string>
 
-    <string name="label_search">Search</string>
+    <string name="lbl_search">Search</string>
-    <string name="label_filter">Filter</string>
+    <string name="lbl_filter">Filter</string>
-    <string name="label_filter_all">All</string>
+    <string name="lbl_filter_all">All</string>
 
-    <string name="label_sort">Sort</string>
+    <string name="lbl_sort">Sort</string>
-    <string name="label_sort_alpha_down">Ascending</string>
+    <string name="lbl_sort_alpha_down">Ascending</string>
-    <string name="label_sort_alpha_up">Descending</string>
+    <string name="lbl_sort_alpha_up">Descending</string>
 
-    <string name="label_play">Play</string>
+    <string name="lbl_play">Play</string>
-    <string name="label_shuffle">Shuffle</string>
+    <string name="lbl_shuffle">Shuffle</string>
-    <string name="label_play_all_songs">Play from all songs</string>
+    <string name="lbl_play_all">Play from all songs</string>
-    <string name="label_play_album">Play from album</string>
+    <string name="lbl_play_album">Play from album</string>
-    <string name="label_play_artist">Play from artist</string>
+    <string name="lbl_play_artist">Play from artist</string>
-    <string name="label_play_genre">Play from genre</string>
+    <string name="lbl_play_genre">Play from genre</string>
-    <string name="label_playback">Now Playing</string>
+    <string name="lbl_playback">Now Playing</string>
 
-    <string name="label_queue">Queue</string>
+    <string name="lbl_queue">Queue</string>
-    <string name="label_queue_add">Add to queue</string>
+    <string name="lbl_queue_add">Add to queue</string>
-    <string name="label_queue_added">Added to queue</string>
+    <string name="lbl_queue_added">Added to queue</string>
-    <string name="label_next_user_queue">Next in Queue</string>
+    <string name="lbl_next_user_queue">Next in Queue</string>
 
-    <string name="label_go_artist">Go to artist</string>
+    <string name="lbl_go_artist">Go to artist</string>
-    <string name="label_go_album">Go to album</string>
+    <string name="lbl_go_album">Go to album</string>
 
-    <string name="label_state_saved">State saved</string>
+    <string name="lbl_state_saved">State saved</string>
 
-    <string name="label_add">Add</string>
+    <string name="lbl_add">Add</string>
-    <string name="label_save">Save</string>
+    <string name="lbl_save">Save</string>
-    <string name="label_no_dirs">No Folders</string>
+    <string name="lbl_no_dirs">No Folders</string>
 
-    <string name="label_about">About</string>
+    <string name="lbl_about">About</string>
-    <string name="label_version">Version</string>
+    <string name="lbl_version">Version</string>
-    <string name="label_code">View on Github</string>
+    <string name="lbl_code">View on Github</string>
-    <string name="label_faq">FAQ</string>
+    <string name="lbl_faq">FAQ</string>
-    <string name="label_licenses">Licenses</string>
+    <string name="lbl_licenses">Licenses</string>
-    <string name="label_author">Developed by OxygenCobalt</string>
+    <string name="lbl_author">Developed by OxygenCobalt</string>
 
     <!-- Settings namespace | Settings-related labels -->
-    <string name="setting_title">Settings</string>
+    <string name="set_title">Settings</string>
 
-    <string name="setting_ui">Appearance</string>
+    <string name="set_ui">Appearance</string>
-    <string name="setting_theme">Theme</string>
+    <string name="set_theme">Theme</string>
-    <string name="setting_theme_auto">Automatic</string>
+    <string name="set_theme_auto">Automatic</string>
-    <string name="setting_theme_day">Light</string>
+    <string name="set_theme_day">Light</string>
-    <string name="setting_theme_night">Dark</string>
+    <string name="set_theme_night">Dark</string>
-    <string name="setting_accent">Accent</string>
+    <string name="set_accent">Accent</string>
-    <string name="setting_black_mode">Black theme</string>
+    <string name="set_black_mode">Black theme</string>
     <string name="setting_black_mode_desc">Use a pure-black dark theme</string>
 
-    <string name="setting_display">Display</string>
+    <string name="set_display">Display</string>
-    <string name="setting_lib_display">Library Items</string>
+    <string name="set_lib_display">Library Items</string>
-    <string name="setting_color_notif">Colorize notification</string>
+    <string name="set_color_notif">Colorize notification</string>
-    <string name="setting_color_desc">Show album art on notification</string>
+    <string name="set_color_notif_desc">Show album art on notification</string>
     <string name="setting_show_covers">Show album covers</string>
-    <string name="setting_show_covers_desc">Turn off to save memory usage</string>
+    <string name="set_show_covers_desc">Turn off to save memory usage</string>
-    <string name="setting_quality_covers">Ignore MediaStore covers</string>
+    <string name="set_quality_covers">Ignore MediaStore covers</string>
-    <string name="setting_quality_covers_desc">Increases the quality of the album covers, but results in longer loading times and higher memory usage</string>
+    <string name="set_quality_covers_desc">Increases the quality of the album covers, but results in longer loading times and higher memory usage</string>
-    <string name="setting_use_alt_action">Use alternate notification action</string>
+    <string name="set_alt_action">Use alternate notification action</string>
-    <string name="setting_use_alt_loop">Prefer repeat mode action</string>
+    <string name="set_alt_loop">Prefer repeat mode action</string>
-    <string name="setting_use_alt_shuffle">Prefer shuffle action</string>
+    <string name="set_alt_shuffle">Prefer shuffle action</string>
 
-    <string name="setting_audio">Audio</string>
+    <string name="set_audio">Audio</string>
-    <string name="setting_audio_focus">Audio Focus</string>
+    <string name="set_focus">Audio Focus</string>
-    <string name="setting_audio_focus_desc">Pause when other audio plays [ex. Calls]</string>
+    <string name="set_focus_desc">Pause when other audio plays [ex. Calls]</string>
-    <string name="setting_audio_plug_mgt">Headset focus</string>
+    <string name="set_plug_mgt">Headset focus</string>
-    <string name="setting_audio_plug_mgt_desc">Play/Pause when the headset connection changes</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>
@@ -95,82 +95,82 @@
     <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="setting_content">Content</string>
+    <string name="set_content">Content</string>
-    <string name="setting_content_save">Save playback state</string>
+    <string name="set_save">Save playback state</string>
-    <string name="setting_content_save_desc">Save the current playback state now</string>
+    <string name="set_save_desc">Save the current playback state now</string>
-    <string name="setting_content_blacklist">Excluded Folders</string>
+    <string name="set_blacklist">Excluded Folders</string>
-    <string name="setting_content_blacklist_desc">The content of excluded folders is hidden from your library</string>
+    <string name="set_blacklist_desc">The content of excluded folders is hidden from your library</string>
 
     <!-- Error Namespace | Error Labels -->
-    <string name="error_no_music">No music found</string>
+    <string name="err_no_music">No music found</string>
-    <string name="error_load_failed">Music loading failed</string>
+    <string name="err_load_failed">Music loading failed</string>
-    <string name="error_no_perms">Auxio needs permission to read your music library</string>
+    <string name="err_no_perms">Auxio needs permission to read your music library</string>
-    <string name="error_no_browser">No app can open this link</string>
+    <string name="err_no_app">No app can open this link</string>
-    <string name="error_bad_dir">This directory is not supported</string>
+    <string name="err_bad_dir">This directory is not supported</string>
 
     <!-- Hint Namespace | EditText Hints -->
     <string name="hint_search_library">Search your library…</string>
 
     <!-- Description Namespace | Accessibility Strings -->
-    <string name="description_sort_button">Change Sort Order</string>
+    <string name="desc_sort_button">Change Sort Order</string>
-    <string name="description_track_number">Track %d</string>
+    <string name="desc_track_number">Track %d</string>
 
-    <string name="description_play_pause">Play or Pause</string>
+    <string name="desc_play_pause">Play or Pause</string>
-    <string name="description_skip_next">Skip to next song</string>
+    <string name="desc_skip_next">Skip to next song</string>
-    <string name="description_skip_prev">Skip to last song</string>
+    <string name="desc_skip_prev">Skip to last song</string>
-    <string name="description_change_loop">Change Repeat Mode</string>
+    <string name="desc_change_loop">Change repeat mode</string>
-    <string name="description_shuffle">Turn shuffle on or off</string>
+    <string name="desc_shuffle">Turn shuffle on or off</string>
 
-    <string name="description_clear_user_queue">Clear queue</string>
+    <string name="desc_clear_user_queue">Clear queue</string>
-    <string name="description_clear_search">Clear search query</string>
+    <string name="desc_clear_search">Clear search query</string>
-    <string name="description_blacklist_delete">Remove excluded directory</string>
+    <string name="desc_blacklist_delete">Remove excluded directory</string>
 
-    <string name="description_error">Error</string>
+    <string name="desc_error">Error</string>
-    <string name="description_auxio_icon">Auxio icon</string>
+    <string name="desc_auxio_icon">Auxio icon</string>
-    <string name="description_no_cover">Album cover</string>
+    <string name="desc_no_cover">Album cover</string>
-    <string name="description_album_cover">Album Cover for %s</string>
+    <string name="desc_album_cover">Album Cover for %s</string>
-    <string name="description_artist_image">Artist Image for %s</string>
+    <string name="desc_artist_image">Artist Image for %s</string>
-    <string name="description_genre_image">Genre Image for %s</string>
+    <string name="desc_genre_image">Genre Image for %s</string>
 
-    <!-- Placeholder Namespace | Placeholder values -->
+    <!-- Default Namespace | Placeholder values -->
-    <string name="placeholder_genre">Unknown Genre</string>
+    <string name="def_genre">Unknown Genre</string>
-    <string name="placeholder_artist">Unknown Artist</string>
+    <string name="def_artist">Unknown Artist</string>
-    <string name="placeholder_album">Unknown Album</string>
+    <string name="def_album">Unknown Album</string>
-    <string name="placeholder_no_date">No Date</string>
+    <string name="def_date">No Date</string>
-    <string name="placeholder_playback">No music playing</string>
+    <string name="def_playback">No music playing</string>
-    <string name="placeholder_widget_song">Song Name</string>
+    <string name="def_widget_song">Song Name</string>
-    <string name="placeholder_widget_artist">Artist Name</string>
+    <string name="def_widget_artist">Artist Name</string>
 
     <!-- Color Label namespace | Accent names -->
-    <string name="color_label_red">Red</string>
+    <string name="clr_red">Red</string>
-    <string name="color_label_pink">Pink</string>
+    <string name="clr_pink">Pink</string>
-    <string name="color_label_purple">Purple</string>
+    <string name="clr_purple">Purple</string>
-    <string name="color_label_deep_purple">Deep Purple</string>
+    <string name="clr_deep_purple">Deep Purple</string>
-    <string name="color_label_indigo">Indigo</string>
+    <string name="clr_indigo">Indigo</string>
-    <string name="color_label_blue">Blue</string>
+    <string name="clr_blue">Blue</string>
-    <string name="color_label_light_blue">Light Blue</string>
+    <string name="clr_light_blue">Light Blue</string>
-    <string name="color_label_cyan">Cyan</string>
+    <string name="clr_cyan">Cyan</string>
-    <string name="color_label_teal">Teal</string>
+    <string name="clr_teal">Teal</string>
-    <string name="color_label_green">Green</string>
+    <string name="clr_green">Green</string>
-    <string name="color_label_light_green">Light Green</string>
+    <string name="color_light_green">Light Green</string>
-    <string name="color_label_lime">Lime</string>
+    <string name="color_lime">Lime</string>
-    <string name="color_label_yellow">Yellow</string>
+    <string name="color_yellow">Yellow</string>
-    <string name="color_label_orange">Orange</string>
+    <string name="clr_orange">Orange</string>
-    <string name="color_label_deep_orange">Deep Orange</string>
+    <string name="clr_deep_orange">Deep Orange</string>
-    <string name="color_label_brown">Brown</string>
+    <string name="clr_label_brown">Brown</string>
-    <string name="color_label_grey">Grey</string>
+    <string name="clr_label_grey">Grey</string>
-    <string name="color_label_blue_grey">Blue Grey</string>
+    <string name="clr_blue_grey">Blue Grey</string>
 
     <!-- Format Namespace | Value formatting/plurals -->
-    <string name="format_next_from">Next From: %s</string>
+    <string name="fmt_next_from">Next From: %s</string>
-    <string name="format_songs_loaded">Songs loaded: %d</string>
+    <string name="fmt_songs_loaded">Songs loaded: %d</string>
 
-    <plurals name="format_song_count">
+    <plurals name="fmt_song_count">
         <item quantity="one">%d Song</item>
         <item quantity="other">%d Songs</item>
     </plurals>
 
-    <plurals name="format_album_count">
+    <plurals name="fmt_album_count">
         <item quantity="one">%d Album</item>
         <item quantity="other">%d Albums</item>
     </plurals>

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

@@ -1,153 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <!-- COMPONENT-SPECIFIC STYLES. NOT RE-USABLE. -->
-    <!-- TODO: Extract the component-specific and general styles into separate stylesheets -->
-
-    <!-- Title theme for Detail Fragments -->
-    <style name="DetailTitleText">
-        <item name="android:textAppearance">?android:attr/textAppearanceLarge</item>
-        <item name="android:textColor">?attr/colorPrimary</item>
-        <item name="android:fontFamily">@font/inter_bold</item>
-        <item name="android:textSize">@dimen/text_size_detail_header_max</item>
-        <item name="android:maxLines">1</item>
-        <item name="android:ellipsize">end</item>
-        <item name="android:textAlignment">viewStart</item>
-        <item name="android:gravity">center_vertical</item>
-
-        <item name="autoSizeMaxTextSize">@dimen/text_size_detail_header_max</item>
-        <item name="autoSizeMinTextSize">@dimen/text_size_min</item>
-        <item name="autoSizeStepGranularity">@dimen/text_size_increment</item>
-        <item name="autoSizeTextType">uniform</item>
-    </style>
-
-    <!-- Style for an action header -->
-    <style name="HeaderAction">
-        <item name="android:layout_height">wrap_content</item>
-        <item name="android:layout_width">0dp</item>
-        <item name="android:paddingStart">@dimen/spacing_medium</item>
-        <item name="android:paddingTop">@dimen/spacing_small</item>
-        <item name="android:paddingBottom">@dimen/spacing_small</item>
-        <item name="android:paddingEnd">@dimen/spacing_medium</item>
-        <item name="android:background">@drawable/ui_small_unbounded_ripple</item>
-    </style>
-
-    <!-- Style for the about TextViews -->
-    <style name="Widget.TextView.About" parent="Widget.AppCompat.TextView">
-        <item name="android:layout_width">match_parent</item>
-        <item name="android:layout_height">wrap_content</item>
-        <item name="android:drawablePadding">@dimen/spacing_medium</item>
-        <item name="android:padding">@dimen/spacing_medium</item>
-        <item name="android:textAlignment">viewStart</item>
-        <item name="android:textAppearance">@style/TextAppearance.AppCompat.Subhead</item>
-    </style>
-
-    <!-- Style for clickable about TextViews -->
-    <style name="Widget.TextView.About.Clickable" parent="Widget.TextView.About">
-        <item name="android:clickable">true</item>
-        <item name="android:focusable">true</item>
-        <item name="android:background">@drawable/ui_ripple</item>
-    </style>
-
-    <!-- Toolbar Title EntryNames -->
-    <style name="TextAppearance.Toolbar.Header" parent="TextAppearance.Widget.AppCompat.Toolbar.Title">
-        <item name="android:fontFamily">@font/inter_bold</item>
-        <item name="android:textSize">@dimen/text_size_toolbar_header</item>
-    </style>
-
-    <!-- Base style for TextViews used in CompactPlaybackFragment -->
-    <style name="Widget.TextView.Compact.Base" parent="Widget.AppCompat.TextView">
-        <item name="android:layout_width">0dp</item>
-        <item name="android:layout_height">wrap_content</item>
-        <item name="android:layout_marginStart">@dimen/spacing_small</item>
-        <item name="android:layout_marginEnd">@dimen/spacing_small</item>
-        <item name="android:ellipsize">end</item>
-        <item name="android:singleLine">true</item>
-        <item name="android:textAlignment">viewStart</item>
-    </style>
-
-    <!-- Style for the song title in CompactPlaybackFragment -->
-    <style name="Widget.TextView.Compact.Primary" parent="Widget.TextView.Compact.Base">
-        <item name="android:fontFamily">@font/inter_semibold</item>
-        <item name="android:textAppearance">@style/TextAppearance.MaterialComponents.Body2</item>
-    </style>
-
-    <!-- Style for the album/artist view in CompactPlaybackFragment -->
-    <style name="Widget.TextView.Compact.Secondary" parent="Widget.TextView.Compact.Base">
-        <item name="android:textAppearance">@style/TextAppearance.MaterialComponents.Caption</item>
-    </style>
-
-    <!-- Style for the ProgressBar on CompactPlaybackFragment -->
-    <style name="Widget.ProgressBar.Compact" parent="@style/Widget.AppCompat.ProgressBar.Horizontal">
-        <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>
-    </style>
-
-    <!-- Style for the play/pause button on CompactPlaybackFragment -->
-    <style name="Widget.Button.Unbounded.PlayPause" parent="Widget.Button.Unbounded">
-        <item name="android:padding">0dp</item>
-        <item name="android:layout_marginEnd">@dimen/spacing_small</item>
-    </style>
-
-    <!-- Base style for TextViews in PlaybackFragment -->
-    <style name="Widget.TextView.Playback.Base" parent="Widget.AppCompat.TextView">
-        <item name="android:layout_width">0dp</item>
-        <item name="android:layout_height">wrap_content</item>
-        <item name="android:singleLine">true</item>
-        <item name="android:textAlignment">viewStart</item>
-    </style>
-
-    <!-- Style for the title text in PlaybackFragment -->
-    <style name="Widget.TextView.Playback.Primary" parent="Widget.TextView.Playback.Base">
-        <item name="android:fontFamily">@font/inter_semibold</item>
-        <item name="android:ellipsize">marquee</item>
-        <item name="android:marqueeRepeatLimit">marquee_forever</item>
-        <item name="android:textAppearance">@style/TextAppearance.MaterialComponents.Headline6
-        </item>
-    </style>
-
-    <!-- Style for the album/artist text in PlaybackFragment -->
-    <style name="Widget.TextView.Playback.Secondary" parent="Widget.TextView.Playback.Base">
-        <item name="android:ellipsize">end</item>
-        <item name="android:textColor">?android:attr/textColorSecondary</item>
-        <item name="android:textAppearance">@style/TextAppearance.MaterialComponents.Subtitle1
-        </item>
-    </style>
-
-    <!-- Style for text used in widgets -->
-    <style name="Widget.TextView.Widget.Base" parent="Widget.AppCompat.TextView">
-        <item name="android:layout_width">match_parent</item>
-        <item name="android:layout_height">wrap_content</item>
-        <item name="android:singleLine">true</item>
-        <item name="android:textAlignment">viewStart</item>
-    </style>
-
-    <!-- Style for the title text in PlaybackFragment -->
-    <style name="Widget.TextView.Widget.Primary" parent="Widget.TextView.Widget.Base">
-        <item name="android:fontFamily">@font/inter</item>
-        <item name="android:textStyle">bold</item>
-        <item name="android:ellipsize">end</item>
-        <item name="android:textAppearance">@style/TextAppearance.MaterialComponents.Headline6
-        </item>
-    </style>
-
-    <!-- Style for the album/artist text in PlaybackFragment -->
-    <style name="Widget.TextView.Widget.Secondary" parent="Widget.TextView.Widget.Base">
-        <item name="android:ellipsize">end</item>
-        <item name="android:textColor">?android:attr/textColorSecondary</item>
-        <item name="android:textAppearance">@style/TextAppearance.MaterialComponents.Subtitle1
-        </item>
-    </style>
 
     <!-- Style for the play/pause circle button -->
-    <style name="PlayPause">
+    <style name="Widget.Component.Playback.PlayPause" parent="">
         <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:elevation">@dimen/elevation_normal</item>
-        <item name="android:contentDescription">@string/description_play_pause</item>
+        <item name="android:contentDescription">@string/desc_play_pause</item>
         <item name="android:tint">?android:attr/windowBackground</item>
         <item name="android:layout_marginStart">@dimen/spacing_large</item>
         <item name="android:layout_marginTop">@dimen/spacing_medium</item>
@@ -156,75 +18,59 @@
         <item name="android:padding">@dimen/spacing_medium</item>
     </style>
 
-    <!-- Style for a small ImageView-->
+    <!-- Style for text used in widgets -->
-    <style name="CompactImageView">
+    <style name="Widget.Component.AppWidget.TextView" parent="Widget.AppCompat.TextView">
-        <item name="android:layout_width">@dimen/size_cover_compact</item>
+        <item name="android:layout_width">match_parent</item>
-        <item name="android:layout_height">@dimen/size_cover_compact</item>
+        <item name="android:layout_height">wrap_content</item>
-        <item name="android:layout_margin">@dimen/spacing_small</item>
+        <item name="android:singleLine">true</item>
-        <item name="layout_constraintDimensionRatio">1:1</item>
+        <item name="android:textAlignment">viewStart</item>
     </style>
 
-    <!-- Style for a larger, elevated ImageView -->
+    <style name="Widget.Component.AppWidget.TextView.Primary" parent="Widget.Component.AppWidget.TextView">
-    <style name="ElevatedImageView">
+        <item name="android:fontFamily">@font/inter</item>
-        <item name="android:layout_width">0dp</item>
+        <item name="android:textStyle">bold</item>
-        <item name="android:layout_height">0dp</item>
+        <item name="android:ellipsize">end</item>
-        <item name="android:elevation">@dimen/elevation_normal</item>
+        <item name="android:textAppearance">@style/TextAppearance.MaterialComponents.Headline6
-        <item name="android:outlineProvider">bounds</item>
+        </item>
     </style>
 
-    <!--
+    <style name="Widget.Component.AppWidget.TextView.Secondary" parent="Widget.Component.AppWidget.TextView">
-    Style for an ImageView that expands regardless of whether it can fit,
+        <item name="android:ellipsize">end</item>
-    mostly used on widgets
+        <item name="android:textColor">?android:attr/textColorSecondary</item>
-    -->
+        <item name="android:textAppearance">@style/TextAppearance.MaterialComponents.Subtitle1
-    <style name="FluidImageView">
+        </item>
+    </style>
+
+    <style name="Widget.Component.AppWidget.ImageView" parent="">
         <item name="android:layout_width">match_parent</item>
         <item name="android:layout_height">0dp</item>
-        <item name="android:layout_weight">1</item>
         <item name="android:background">?attr/colorSurface</item>
         <item name="android:scaleType">centerCrop</item>
     </style>
 
-    <!-- Style for the seekbar on PlaybackFragment -->
+    <style name="Widget.Component.AppWidget.Button.Base" parent="Widget.AppCompat.Button.Borderless">
-    <style name="Widget.SeekBar.Full" parent="@style/Widget.AppCompat.SeekBar">
+        <item name="android:scaleType">fitCenter</item>
-        <item name="android:clickable">true</item>
+        <item name="android:padding">@dimen/spacing_micro</item>
-        <item name="android:focusable">true</item>
-        <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:splitTrack">false</item>
-        <item name="android:thumbOffset">@dimen/offset_thumb</item>
-        <item name="android:thumbTint">?attr/colorPrimary</item>
     </style>
 
-    <!-- Base style for the material buttons -->
+    <style name="Widget.Component.AppWidget.Button" parent="Widget.Component.AppWidget.Button.Base">
-    <style name="Widget.MaterialComponents.Button.Base" parent="@style/Widget.MaterialComponents.Button.TextButton">
+         <!--
-        <item name="android:layout_width">0dp</item>
+         Can't use a normal unbounded ripple here since it causes a weird bug
+         where the ripples will have a fixed starting size. Default to the
+         uglier system ripple instead.
+         -->
+        <item name="android:background">?android:attr/selectableItemBackgroundBorderless</item>
+    </style>
+
+    <style name="Widget.Component.AppWidget.Panel.Base">
         <item name="android:layout_height">wrap_content</item>
-        <item name="android:clickable">true</item>
+        <item name="android:layout_width">match_parent</item>
-        <item name="android:focusable">true</item>
+        <item name="android:padding">@dimen/spacing_medium</item>
-        <item name="rippleColor">?attr/colorControlHighlight</item>
+        <item name="android:orientation">vertical</item>
-        <item name="fontFamily">@font/inter_semibold</item>
+        <item name="android:background">?attr/colorSurface</item>
-        <item name="textAllCaps">false</item>
-        <item name="cornerRadius">0dp</item>
     </style>
 
-    <!-- An "Unimportant" material button, used for the "Play" button -->
+    <style name="Widget.Component.AppWidget.Panel" parent="Widget.Component.AppWidget.Panel.Base">
-    <style name="Widget.MaterialComponents.Button.Unimportant" parent="@style/Widget.MaterialComponents.Button.Base">
+        <item name="android:elevation">@dimen/elevation_normal</item>
-        <item name="android:layout_marginTop">@dimen/spacing_small</item>
-        <item name="android:layout_marginStart">@dimen/spacing_medium</item>
-        <item name="android:layout_marginEnd">@dimen/spacing_small</item>
-        <item name="strokeColor">@color/divider_color</item>
-        <item name="strokeWidth">@dimen/width_play_stroke</item>
-    </style>
-
-    <!-- An highlighted material button, used for the "Shuffle" button -->
-    <style name="Widget.MaterialComponents.Button.Highlighted" parent="@style/Widget.MaterialComponents.Button.Base">
-        <item name="android:layout_marginStart">@dimen/spacing_small</item>
-        <item name="android:layout_marginEnd">@dimen/spacing_medium</item>
-        <item name="rippleColor">?attr/colorControlHighlight</item>
-        <item name="fontFamily">@font/inter_semibold</item>
-        <item name="textAllCaps">false</item>
-        <item name="android:textColor">@color/surface_color</item>
     </style>
 </resources>

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

@@ -2,8 +2,8 @@
 <resources>
     <!-- SHARED RE-USABLE UI STYLES -->
 
-    <!-- Toolbar theme -->
+    <!-- VIEW STYLES -->
-    <style name="Toolbar.Style" parent="ThemeOverlay.MaterialComponents.ActionBar">
+    <style name="Widget.Toolbar" parent="ThemeOverlay.MaterialComponents.ActionBar">
         <item name="android:layout_width">match_parent</item>
         <item name="android:layout_height">?android:attr/actionBarSize</item>
         <item name="android:background">?attr/colorSurface</item>
@@ -16,17 +16,64 @@
     </style>
 
     <!-- Toolbar sub-style with a nav icon -->
-    <style name="Toolbar.Style.Icon" parent="Toolbar.Style">
+    <style name="Widget.Toolbar.Icon" parent="Widget.Toolbar">
         <item name="navigationIcon">@drawable/ic_back</item>
     </style>
 
     <!-- Toolbar sub-style with a downwards nav icon -->
-    <style name="Toolbar.Style.Icon.Down" parent="Toolbar.Style">
+    <style name="Widget.Toolbar.Icon.Down" parent="Widget.Toolbar">
         <item name="navigationIcon">@drawable/ic_down</item>
     </style>
 
-    <!-- Style for the general item background -->
+    <style name="Widget.ProgressBar.Compact" parent="@style/Widget.AppCompat.ProgressBar.Horizontal">
-    <style name="ItemSurroundings">
+        <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>
+    </style>
+
+    <style name="Widget.SeekBar.Full" parent="@style/Widget.AppCompat.SeekBar">
+        <item name="android:clickable">true</item>
+        <item name="android:focusable">true</item>
+        <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:splitTrack">false</item>
+        <item name="android:thumbOffset">@dimen/offset_thumb</item>
+        <item name="android:thumbTint">?attr/colorPrimary</item>
+    </style>
+
+    <style name="Widget.ImageView.Compact" parent="">
+        <item name="android:layout_width">@dimen/size_cover_compact</item>
+        <item name="android:layout_height">@dimen/size_cover_compact</item>
+    </style>
+
+    <style name="Widget.ImageView.Normal" parent="">
+        <item name="android:layout_width">@dimen/size_cover_normal</item>
+        <item name="android:layout_height">@dimen/size_cover_normal</item>
+    </style>
+
+    <style name="Widget.ImageView.Large" parent="">
+        <item name="android:layout_width">@dimen/size_cover_large</item>
+        <item name="android:layout_height">@dimen/size_cover_large</item>
+    </style>
+
+    <style name="Widget.ImageView.Full" parent="">
+        <item name="android:layout_width">0dp</item>
+        <item name="android:layout_height">0dp</item>
+        <item name="android:elevation">@dimen/elevation_normal</item>
+        <item name="android:outlineProvider">bounds</item>
+    </style>
+
+    <!-- VIEWGROUP STYLES -->
+
+    <style name="TextAppearance.Toolbar.Header" parent="TextAppearance.Widget.AppCompat.Toolbar.Title">
+        <item name="android:fontFamily">@font/inter_bold</item>
+        <item name="android:textSize">@dimen/text_size_toolbar_header</item>
+    </style>
+
+    <style name="ItemLayout">
         <item name="android:layout_width">match_parent</item>
         <item name="android:layout_height">wrap_content</item>
         <item name="android:background">@drawable/ui_ripple</item>
@@ -35,32 +82,66 @@
         <item name="android:focusable">true</item>
     </style>
 
-    <!-- Base style for any item text -->
+    <!-- TEXTVIEW STYLES -->
-    <style name="ItemText">
+    <style name="ItemText" parent="Widget.AppCompat.TextView">
-        <item name="android:textAlignment">viewStart</item>
         <item name="android:layout_width">0dp</item>
         <item name="android:layout_height">wrap_content</item>
+        <item name="android:textAlignment">viewStart</item>
         <item name="android:ellipsize">end</item>
         <item name="android:maxLines">1</item>
         <item name="android:layout_marginStart">@dimen/spacing_medium</item>
     </style>
 
-    <!-- Style for primary item text -->
     <style name="ItemText.Primary" parent="ItemText">
         <item name="android:textAppearance">?android:attr/textAppearanceListItem</item>
         <item name="android:textColor">?android:attr/textColorPrimary</item>
     </style>
 
-    <!-- Style for secondary item text -->
     <style name="ItemText.Secondary" parent="ItemText">
         <item name="android:textAppearance">?android:attr/textAppearanceListItemSecondary</item>
         <item name="android:textColor">?android:attr/textColorSecondary</item>
     </style>
 
-    <!-- Style for header text -->
+    <style name="Widget.TextView.Emp.Base" parent="Widget.AppCompat.TextView">
-    <style name="HeaderText">
+        <item name="android:layout_width">0dp</item>
         <item name="android:layout_height">wrap_content</item>
-        <item name="android:layout_width">match_parent</item>
+        <item name="android:singleLine">true</item>
+        <item name="android:textAlignment">viewStart</item>
+    </style>
+
+    <style name="Widget.TextView.Primary" parent="Widget.TextView.Emp.Base">
+        <item name="android:fontFamily">@font/inter_semibold</item>
+        <item name="android:ellipsize">marquee</item>
+        <item name="android:marqueeRepeatLimit">marquee_forever</item>
+        <item name="android:textAppearance">@style/TextAppearance.MaterialComponents.Headline6
+        </item>
+    </style>
+
+    <style name="Widget.TextView.Secondary" parent="Widget.TextView.Emp.Base">
+        <item name="android:ellipsize">end</item>
+        <item name="android:textColor">?android:attr/textColorSecondary</item>
+        <item name="android:textAppearance">@style/TextAppearance.MaterialComponents.Subtitle1
+        </item>
+    </style>
+
+    <style name="Widget.TextView.Compact.Base" parent="Widget.AppCompat.TextView">
+        <item name="android:layout_width">0dp</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:ellipsize">end</item>
+        <item name="android:singleLine">true</item>
+        <item name="android:textAlignment">viewStart</item>
+    </style>
+
+    <style name="Widget.TextView.Compact.Primary" parent="Widget.TextView.Compact.Base">
+        <item name="android:fontFamily">@font/inter_semibold</item>
+        <item name="android:textAppearance">@style/TextAppearance.MaterialComponents.Body2</item>
+    </style>
+
+    <style name="Widget.TextView.Compact.Secondary" parent="Widget.TextView.Compact.Base">
+        <item name="android:textAppearance">@style/TextAppearance.MaterialComponents.Caption</item>
+    </style>
+
+    <style name="Widget.TextView.Header" parent="@style/Widget.AppCompat.TextView">
         <item name="android:paddingStart">@dimen/spacing_medium</item>
         <item name="android:paddingTop">@dimen/spacing_small</item>
         <item name="android:paddingBottom">@dimen/spacing_small</item>
@@ -72,7 +153,39 @@
         <item name="android:textAlignment">viewStart</item>
     </style>
 
-    <!-- Style for an unbounded button -->
+    <style name="Widget.TextView.Detail" parent="@style/Widget.AppCompat.TextView">
+        <item name="android:textAppearance">?android:attr/textAppearanceLarge</item>
+        <item name="android:textSize">@dimen/text_size_detail_header_max</item>
+        <item name="android:maxLines">1</item>
+        <item name="android:ellipsize">end</item>
+        <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="autoSizeMaxTextSize">@dimen/text_size_detail_header_max</item>
+        <item name="autoSizeMinTextSize">@dimen/text_size_min</item>
+        <item name="autoSizeStepGranularity">@dimen/text_size_increment</item>
+        <item name="autoSizeTextType">uniform</item>
+    </style>
+
+    <style name="Widget.TextView.Icon" parent="Widget.AppCompat.TextView">
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:drawablePadding">@dimen/spacing_medium</item>
+        <item name="android:padding">@dimen/spacing_medium</item>
+        <item name="android:textAlignment">viewStart</item>
+        <item name="android:textAppearance">@style/TextAppearance.AppCompat.Subhead</item>
+    </style>
+
+    <style name="Widget.TextView.Icon.Clickable" parent="Widget.TextView.Icon">
+        <item name="android:clickable">true</item>
+        <item name="android:focusable">true</item>
+        <item name="android:background">@drawable/ui_ripple</item>
+    </style>
+
+    <!-- BUTTON STYLES -->
+
     <style name="Widget.Button.Unbounded" parent="Widget.AppCompat.Button.Borderless">
         <item name="android:layout_width">@dimen/size_play_pause_compact</item>
         <item name="android:layout_height">@dimen/size_play_pause_compact</item>
@@ -82,38 +195,40 @@
     </style>
 
     <style name="Widget.Button.Unbounded.Text" parent="Widget.AppCompat.Button.Borderless.Colored">
-        <item name="android:layout_width">wrap_content</item>
-        <item name="android:layout_height">wrap_content</item>
         <item name="android:fontFamily">@font/inter_semibold</item>
         <item name="android:textColor">?attr/colorPrimary</item>
     </style>
 
-    <style name="Widget.Button.Unbounded.Widget.Base" parent="Widget.AppCompat.Button.Borderless">
+    <style name="Widget.Button.Unbounded.Small" parent="Widget.AppCompat.Button.Borderless">
-        <item name="android:layout_height">@dimen/height_widget_button</item>
+        <item name="android:minWidth">0dp</item>
+        <item name="android:minHeight">0dp</item>
+        <item name="android:paddingStart">@dimen/spacing_medium</item>
+        <item name="android:paddingTop">@dimen/spacing_small</item>
+        <item name="android:paddingBottom">@dimen/spacing_small</item>
+        <item name="android:paddingEnd">@dimen/spacing_medium</item>
+        <item name="android:background">@drawable/ui_small_unbounded_ripple</item>
+    </style>
+
+    <style name="Widget.Button.Vibrant.Base" parent="@style/Widget.MaterialComponents.Button.TextButton">
         <item name="android:layout_width">0dp</item>
-        <item name="android:layout_weight">1</item>
-        <item name="android:scaleType">fitCenter</item>
-        <item name="android:padding">@dimen/spacing_micro</item>
-    </style>
-
-    <style name="Widget.Button.Unbounded.Widget" parent="Widget.Button.Unbounded.Widget.Base">
-         <!--
-         Can't use a normal unbounded ripple here since it causes a weird bug
-         where the ripples will have a fixed starting size. Default to the
-         uglier system ripple instead.
-         -->
-        <item name="android:background">?android:attr/selectableItemBackgroundBorderless</item>
-    </style>
-
-    <style name="WidgetPanel.Base">
         <item name="android:layout_height">wrap_content</item>
-        <item name="android:layout_width">match_parent</item>
+        <item name="android:clickable">true</item>
-        <item name="android:padding">@dimen/spacing_medium</item>
+        <item name="android:focusable">true</item>
-        <item name="android:orientation">vertical</item>
+        <item name="rippleColor">?attr/colorControlHighlight</item>
-        <item name="android:background">?attr/colorSurface</item>
+        <item name="fontFamily">@font/inter_semibold</item>
+        <item name="textAllCaps">false</item>
+        <item name="cornerRadius">0dp</item>
     </style>
 
-    <style name="WidgetPanel" parent="WidgetPanel.Base">
+    <style name="Widget.Button.Vibrant.Primary" parent="@style/Widget.Button.Vibrant.Base">
-        <item name="android:elevation">@dimen/elevation_normal</item>
+        <item name="rippleColor">?attr/colorControlHighlight</item>
+        <item name="fontFamily">@font/inter_semibold</item>
+        <item name="textAllCaps">false</item>
+        <item name="android:textColor">@color/surface_color</item>
+    </style>
+
+    <style name="Widget.Button.Vibrant.Secondary" parent="@style/Widget.Button.Vibrant.Base">
+        <item name="strokeColor">@color/divider_color</item>
+        <item name="strokeWidth">@dimen/width_play_stroke</item>
     </style>
 </resources>

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

@@ -2,7 +2,7 @@
 <PreferenceScreen xmlns:app="http://schemas.android.com/apk/res-auto">
     <PreferenceCategory
         app:layout="@layout/item_header"
-        app:title="@string/setting_ui">
+        app:title="@string/set_ui">
 
         <org.oxycblt.auxio.settings.ui.IntListPreference
             app:defaultValue="@integer/theme_auto"
@@ -11,20 +11,20 @@
             app:icon="@drawable/ic_day"
             app:iconSpaceReserved="false"
             app:key="KEY_THEME2"
-            app:title="@string/setting_theme" />
+            app:title="@string/set_theme" />
 
         <Preference
             app:allowDividerBelow="false"
             app:icon="@drawable/ic_accent"
             app:key="KEY_ACCENT2"
-            app:summary="@string/color_label_blue"
+            app:summary="@string/clr_blue"
-            app:title="@string/setting_accent" />
+            app:title="@string/set_accent" />
 
         <SwitchPreferenceCompat
             app:defaultValue="false"
             app:iconSpaceReserved="false"
             app:key="KEY_BLACK_THEME"
-            app:title="@string/setting_black_mode"
+            app:title="@string/set_black_mode"
             app:summary="@string/setting_black_mode_desc"
             app:allowDividerBelow="false" />
 
@@ -32,7 +32,7 @@
 
     <PreferenceCategory
         app:layout="@layout/item_header"
-        app:title="@string/setting_display">
+        app:title="@string/set_display">
 
         <org.oxycblt.auxio.settings.ui.IntListPreference
             app:defaultValue="@integer/display_artist"
@@ -40,14 +40,14 @@
             app:entryValues="@array/values_lib_display"
             app:icon="@drawable/ic_artist"
             app:key="KEY_LIB_MODE"
-            app:title="@string/setting_lib_display"
+            app:title="@string/set_lib_display"
             app:useSimpleSummaryProvider="true" />
 
         <SwitchPreferenceCompat
             app:defaultValue="true"
             app:iconSpaceReserved="false"
             app:key="KEY_SHOW_COVERS"
-            app:summary="@string/setting_show_covers_desc"
+            app:summary="@string/set_show_covers_desc"
             app:title="@string/setting_show_covers" />
 
         <SwitchPreferenceCompat
@@ -55,46 +55,46 @@
             app:dependency="KEY_SHOW_COVERS"
             app:iconSpaceReserved="false"
             app:key="KEY_QUALITY_COVERS"
-            app:summary="@string/setting_quality_covers_desc"
+            app:summary="@string/set_quality_covers_desc"
-            app:title="@string/setting_quality_covers" />
+            app:title="@string/set_quality_covers" />
 
         <SwitchPreferenceCompat
             app:defaultValue="true"
             app:dependency="KEY_SHOW_COVERS"
             app:iconSpaceReserved="false"
             app:key="KEY_COLOR_NOTIF"
-            app:summary="@string/setting_color_desc"
+            app:summary="@string/set_color_notif_desc"
-            app:title="@string/setting_color_notif" />
+            app:title="@string/set_color_notif" />
 
         <SwitchPreferenceCompat
             app:allowDividerBelow="false"
             app:defaultValue="false"
             app:iconSpaceReserved="false"
             app:key="KEY_ALT_NOTIF_ACTION"
-            app:summaryOff="@string/setting_use_alt_loop"
+            app:summaryOff="@string/set_alt_loop"
-            app:summaryOn="@string/setting_use_alt_shuffle"
+            app:summaryOn="@string/set_alt_shuffle"
-            app:title="@string/setting_use_alt_action" />
+            app:title="@string/set_alt_action" />
 
     </PreferenceCategory>
 
     <PreferenceCategory
         app:layout="@layout/item_header"
-        app:title="@string/setting_audio">
+        app:title="@string/set_audio">
 
         <SwitchPreferenceCompat
             app:defaultValue="true"
             app:iconSpaceReserved="false"
             app:key="KEY_AUDIO_FOCUS"
-            app:summary="@string/setting_audio_focus_desc"
+            app:summary="@string/set_focus_desc"
-            app:title="@string/setting_audio_focus" />
+            app:title="@string/set_focus" />
 
         <SwitchPreferenceCompat
             app:allowDividerBelow="false"
             app:defaultValue="true"
             app:iconSpaceReserved="false"
             app:key="KEY_PLUG_MGT"
-            app:summary="@string/setting_audio_plug_mgt_desc"
+            app:summary="@string/set_plug_mgt_desc"
-            app:title="@string/setting_audio_plug_mgt" />
+            app:title="@string/set_plug_mgt" />
 
     </PreferenceCategory>
 
@@ -138,19 +138,19 @@
 
     <PreferenceCategory
         app:layout="@layout/item_header"
-        app:title="@string/setting_content">
+        app:title="@string/set_content">
 
         <Preference
             app:iconSpaceReserved="false"
             app:key="KEY_SAVE_STATE"
-            app:summary="@string/setting_content_save_desc"
+            app:summary="@string/set_save_desc"
-            app:title="@string/setting_content_save" />
+            app:title="@string/set_save" />
 
         <Preference
             app:iconSpaceReserved="false"
             app:key="KEY_BLACKLIST"
-            app:summary="@string/setting_content_blacklist_desc"
+            app:summary="@string/set_blacklist_desc"
-            app:title="@string/setting_content_blacklist" />
+            app:title="@string/set_blacklist" />
 
     </PreferenceCategory>
 </PreferenceScreen>