all: cleanup

Clean up the project after the previous changes and update some
dependencies.

app/build.gradle

@@ -97,10 +97,13 @@ dependencies {
     implementation fileTree(dir: "libs", include: ["extension-*.aar"])
 
     // Image loading
-    implementation "io.coil-kt:coil:2.0.0-rc01"
+    implementation "io.coil-kt:coil:2.0.0-rc02"
 
     // Material
-    implementation "com.google.android.material:material:1.6.0-alpha03"
+    implementation "com.google.android.material:material:1.6.0-beta01"
+
+    // LeakCanary
+    debugImplementation "com.squareup.leakcanary:leakcanary-android:2.8.1"
 }
 
 spotless {

app/src/main/java/org/oxycblt/auxio/coil/CoilUtils.kt

@@ -38,19 +38,19 @@ import org.oxycblt.auxio.music.Song
 // --- BINDING ADAPTERS ---
 
 /** Bind the album cover for a [song]. */
-fun ImageView.applyAlbumCover(song: Song?) =
+fun ImageView.bindAlbumCover(song: Song?) =
     load(song, R.drawable.ic_album, R.string.desc_album_cover)
 
 /** Bind the album cover for an [album]. */
-fun ImageView.applyAlbumCover(album: Album?) =
+fun ImageView.bindAlbumCover(album: Album?) =
     load(album, R.drawable.ic_album, R.string.desc_album_cover)
 
 /** Bind the image for an [artist] */
-fun ImageView.applyArtistImage(artist: Artist?) =
+fun ImageView.bindArtistImage(artist: Artist?) =
     load(artist, R.drawable.ic_artist, R.string.desc_artist_image)
 
 /** Bind the image for a [genre] */
-fun ImageView.applyGenreImage(genre: Genre?) =
+fun ImageView.bindGenreImage(genre: Genre?) =
     load(genre, R.drawable.ic_genre, R.string.desc_genre_image)
 
 fun <T : Music> ImageView.load(music: T?, @DrawableRes error: Int, @StringRes desc: Int) {

app/src/main/java/org/oxycblt/auxio/detail/recycler/AlbumDetailAdapter.kt

@@ -24,7 +24,7 @@ import androidx.recyclerview.widget.ListAdapter
 import androidx.recyclerview.widget.RecyclerView
 import org.oxycblt.auxio.IntegerTable
 import org.oxycblt.auxio.R
-import org.oxycblt.auxio.coil.applyAlbumCover
+import org.oxycblt.auxio.coil.bindAlbumCover
 import org.oxycblt.auxio.databinding.ItemAlbumSongBinding
 import org.oxycblt.auxio.databinding.ItemDetailBinding
 import org.oxycblt.auxio.detail.DetailViewModel
@@ -129,7 +129,7 @@ class AlbumDetailAdapter(
 
         override fun onBind(data: Album) {
             binding.detailCover.apply {
-                applyAlbumCover(data)
+                bindAlbumCover(data)
                 contentDescription = context.getString(R.string.desc_album_cover, data.resolvedName)
             }
 

app/src/main/java/org/oxycblt/auxio/detail/recycler/ArtistDetailAdapter.kt

@@ -23,8 +23,8 @@ import androidx.recyclerview.widget.ListAdapter
 import androidx.recyclerview.widget.RecyclerView
 import org.oxycblt.auxio.IntegerTable
 import org.oxycblt.auxio.R
-import org.oxycblt.auxio.coil.applyAlbumCover
+import org.oxycblt.auxio.coil.bindAlbumCover
-import org.oxycblt.auxio.coil.applyArtistImage
+import org.oxycblt.auxio.coil.bindArtistImage
 import org.oxycblt.auxio.databinding.ItemDetailBinding
 import org.oxycblt.auxio.databinding.ItemParentBinding
 import org.oxycblt.auxio.databinding.ItemSongBinding
@@ -176,7 +176,7 @@ class ArtistDetailAdapter(
             val context = binding.root.context
 
             binding.detailCover.apply {
-                applyArtistImage(data)
+                bindArtistImage(data)
                 contentDescription =
                     context.getString(R.string.desc_artist_image, data.resolvedName)
             }
@@ -209,7 +209,7 @@ class ArtistDetailAdapter(
         private val binding: ItemParentBinding,
     ) : BaseViewHolder<Album>(binding, doOnClick, doOnLongClick), Highlightable {
         override fun onBind(data: Album) {
-            binding.parentImage.applyAlbumCover(data)
+            binding.parentImage.bindAlbumCover(data)
             binding.parentName.textSafe = data.resolvedName
             binding.parentInfo.textSafe = binding.context.getString(R.string.fmt_number, data.year)
         }
@@ -223,7 +223,7 @@ class ArtistDetailAdapter(
         private val binding: ItemSongBinding,
     ) : BaseViewHolder<Song>(binding, doOnSongClick, doOnLongClick), Highlightable {
         override fun onBind(data: Song) {
-            binding.songAlbumCover.applyAlbumCover(data)
+            binding.songAlbumCover.bindAlbumCover(data)
             binding.songName.textSafe = data.resolvedName
             binding.songInfo.textSafe = data.resolvedAlbumName
         }

app/src/main/java/org/oxycblt/auxio/detail/recycler/GenreDetailAdapter.kt

@@ -23,8 +23,8 @@ import androidx.recyclerview.widget.ListAdapter
 import androidx.recyclerview.widget.RecyclerView
 import org.oxycblt.auxio.IntegerTable
 import org.oxycblt.auxio.R
-import org.oxycblt.auxio.coil.applyAlbumCover
+import org.oxycblt.auxio.coil.bindAlbumCover
-import org.oxycblt.auxio.coil.applyGenreImage
+import org.oxycblt.auxio.coil.bindGenreImage
 import org.oxycblt.auxio.databinding.ItemDetailBinding
 import org.oxycblt.auxio.databinding.ItemSongBinding
 import org.oxycblt.auxio.music.ActionHeader
@@ -128,7 +128,7 @@ class GenreDetailAdapter(
             val context = binding.root.context
 
             binding.detailCover.apply {
-                applyGenreImage(data)
+                bindGenreImage(data)
                 contentDescription = context.getString(R.string.desc_genre_image, data.resolvedName)
             }
 
@@ -150,7 +150,7 @@ class GenreDetailAdapter(
     ) : BaseViewHolder<Song>(binding, doOnClick, doOnLongClick), Highlightable {
 
         override fun onBind(data: Song) {
-            binding.songAlbumCover.applyAlbumCover(data)
+            binding.songAlbumCover.bindAlbumCover(data)
             binding.songName.textSafe = data.resolvedName
             binding.songInfo.textSafe = data.resolvedArtistName
         }

app/src/main/java/org/oxycblt/auxio/home/list/GenreListFragment.kt

@@ -28,6 +28,7 @@ import org.oxycblt.auxio.music.Genre
 import org.oxycblt.auxio.ui.GenreViewHolder
 import org.oxycblt.auxio.ui.newMenu
 import org.oxycblt.auxio.ui.sliceArticle
+import org.oxycblt.auxio.util.context
 
 /**
  * A [HomeListFragment] for showing a list of [Genre]s.

app/src/main/java/org/oxycblt/auxio/playback/PlaybackBarFragment.kt

@@ -25,7 +25,7 @@ import androidx.core.view.updatePadding
 import androidx.fragment.app.activityViewModels
 import com.google.android.material.color.MaterialColors
 import org.oxycblt.auxio.R
-import org.oxycblt.auxio.coil.applyAlbumCover
+import org.oxycblt.auxio.coil.bindAlbumCover
 import org.oxycblt.auxio.databinding.FragmentPlaybackBarBinding
 import org.oxycblt.auxio.detail.DetailViewModel
 import org.oxycblt.auxio.ui.BottomSheetLayout
@@ -99,7 +99,7 @@ class PlaybackBarFragment : ViewBindingFragment<FragmentPlaybackBarBinding>() {
 
         playbackModel.song.observe(viewLifecycleOwner) { song ->
             if (song != null) {
-                binding.playbackCover.applyAlbumCover(song)
+                binding.playbackCover.bindAlbumCover(song)
                 binding.playbackSong.textSafe = song.resolvedName
                 binding.playbackInfo.textSafe =
                     getString(R.string.fmt_two, song.resolvedArtistName, song.resolvedAlbumName)

app/src/main/java/org/oxycblt/auxio/playback/PlaybackPanelFragment.kt

@@ -29,7 +29,7 @@ import com.google.android.material.slider.Slider
 import kotlin.math.max
 import org.oxycblt.auxio.MainFragmentDirections
 import org.oxycblt.auxio.R
-import org.oxycblt.auxio.coil.applyAlbumCover
+import org.oxycblt.auxio.coil.bindAlbumCover
 import org.oxycblt.auxio.databinding.FragmentPlaybackPanelBinding
 import org.oxycblt.auxio.detail.DetailViewModel
 import org.oxycblt.auxio.music.MusicParent
@@ -175,7 +175,7 @@ class PlaybackPanelFragment :
         if (song == null) return
 
         val binding = requireBinding()
-        binding.playbackCover.applyAlbumCover(song)
+        binding.playbackCover.bindAlbumCover(song)
         binding.playbackSong.textSafe = song.resolvedName
         binding.playbackArtist.textSafe = song.resolvedArtistName
         binding.playbackAlbum.textSafe = song.resolvedAlbumName

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

@@ -28,7 +28,7 @@ import androidx.recyclerview.widget.ItemTouchHelper
 import androidx.recyclerview.widget.RecyclerView
 import com.google.android.material.shape.MaterialShapeDrawable
 import org.oxycblt.auxio.IntegerTable
-import org.oxycblt.auxio.coil.applyAlbumCover
+import org.oxycblt.auxio.coil.bindAlbumCover
 import org.oxycblt.auxio.databinding.ItemQueueSongBinding
 import org.oxycblt.auxio.music.ActionHeader
 import org.oxycblt.auxio.music.Header
@@ -127,7 +127,7 @@ class QueueAdapter(private val touchHelper: ItemTouchHelper) :
 
         @SuppressLint("ClickableViewAccessibility")
         override fun onBind(data: Song) {
-            binding.songAlbumCover.applyAlbumCover(data)
+            binding.songAlbumCover.bindAlbumCover(data)
             binding.songName.textSafe = data.resolvedName
             binding.songInfo.textSafe = data.resolvedArtistName
 

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

@@ -23,9 +23,9 @@ import androidx.appcompat.widget.TooltipCompat
 import androidx.recyclerview.widget.RecyclerView
 import androidx.viewbinding.ViewBinding
 import org.oxycblt.auxio.R
-import org.oxycblt.auxio.coil.applyAlbumCover
+import org.oxycblt.auxio.coil.bindAlbumCover
-import org.oxycblt.auxio.coil.applyArtistImage
+import org.oxycblt.auxio.coil.bindArtistImage
-import org.oxycblt.auxio.coil.applyGenreImage
+import org.oxycblt.auxio.coil.bindGenreImage
 import org.oxycblt.auxio.databinding.ItemActionHeaderBinding
 import org.oxycblt.auxio.databinding.ItemHeaderBinding
 import org.oxycblt.auxio.databinding.ItemParentBinding
@@ -96,7 +96,7 @@ private constructor(
 ) : BaseViewHolder<Song>(binding, doOnClick, doOnLongClick) {
 
     override fun onBind(data: Song) {
-        binding.songAlbumCover.applyAlbumCover(data)
+        binding.songAlbumCover.bindAlbumCover(data)
         binding.songName.textSafe = data.resolvedName
         binding.songInfo.textSafe = data.resolvedArtistName
     }
@@ -123,13 +123,9 @@ private constructor(
 ) : BaseViewHolder<Album>(binding, doOnClick, doOnLongClick) {
 
     override fun onBind(data: Album) {
-        binding.parentImage.applyAlbumCover(data)
+        binding.parentImage.bindAlbumCover(data)
         binding.parentName.textSafe = data.resolvedName
-        binding.parentInfo.textSafe =
+        binding.parentInfo.textSafe = data.resolvedArtistName
-            binding.context.getString(
-                R.string.fmt_two,
-                data.resolvedArtistName,
-                binding.context.getPluralSafe(R.plurals.fmt_song_count, data.songs.size))
     }
 
     companion object {
@@ -154,7 +150,7 @@ private constructor(
 ) : BaseViewHolder<Artist>(binding, doOnClick, doOnLongClick) {
 
     override fun onBind(data: Artist) {
-        binding.parentImage.applyArtistImage(data)
+        binding.parentImage.bindArtistImage(data)
         binding.parentName.textSafe = data.resolvedName
         binding.parentInfo.textSafe =
             binding.context.getString(
@@ -185,7 +181,7 @@ private constructor(
 ) : BaseViewHolder<Genre>(binding, doOnClick, doOnLongClick) {
 
     override fun onBind(data: Genre) {
-        binding.parentImage.applyGenreImage(data)
+        binding.parentImage.bindGenreImage(data)
         binding.parentName.textSafe = data.resolvedName
         binding.parentInfo.textSafe =
             binding.context.getPluralSafe(R.plurals.fmt_song_count, data.songs.size)

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

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:color="?attr/colorOnSurface" android:alpha="0.12" android:state_enabled="false" />
+    <item android:alpha="0.12" android:color="?attr/colorOnSurface" android:state_enabled="false" />
     <item android:color="?attr/colorOnPrimary" android:state_checked="true" />
     <item android:color="?attr/colorSurfaceVariant" />
 </selector>

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

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:color="?attr/colorOnSurface" android:alpha="0.38" android:state_enabled="false" />
+    <item android:alpha="0.38" android:color="?attr/colorOnSurface" android:state_enabled="false" />
     <item android:color="?attr/colorPrimary" android:state_checked="true" />
     <item android:color="?attr/colorOnSurfaceVariant" />
 </selector>

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

@@ -2,9 +2,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
+    android:tint="?attr/colorPrimary"
     android:viewportWidth="24"
-    android:viewportHeight="24"
+    android:viewportHeight="24">
-    android:tint="?attr/colorPrimary">
     <path
         android:fillColor="@android:color/white"
         android:pathData="M12,3v10.55c-0.59,-0.34 -1.27,-0.55 -2,-0.55 -2.21,0 -4,1.79 -4,4s1.79,4 4,4 4,-1.79 4,-4V7h4V3h-6z" />

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

@@ -2,7 +2,7 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="oval">
     <size
-        android:height="4dp"
+        android:width="4dp"
-        android:width="4dp" />
+        android:height="4dp" />
     <solid android:color="?attr/colorPrimary" />
 </shape>

app/src/main/res/layout-h600dp/item_detail.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-    <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
@@ -70,4 +70,4 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toEndOf="@+id/detail_play_button"
         app:layout_constraintTop_toTopOf="@+id/detail_play_button" />
-    </androidx.constraintlayout.widget.ConstraintLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>

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

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-    <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
@@ -83,4 +83,4 @@
         app:layout_constraintStart_toEndOf="@+id/detail_play_button"
         app:layout_constraintTop_toTopOf="@+id/detail_play_button" />
 
-    </androidx.constraintlayout.widget.ConstraintLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>

app/src/main/res/layout-sw600dp-land/fragment_playback_panel.xml

@@ -10,10 +10,10 @@
         android:id="@+id/playback_toolbar"
         style="@style/Widget.Auxio.Toolbar.Icon.Down"
         app:layout_constraintStart_toStartOf="parent"
-            app:title="@string/lbl_playback"
-            tools:subtitle="@string/lbl_all_songs"
         app:layout_constraintTop_toTopOf="parent"
-            app:menu="@menu/menu_playback" />
+        app:menu="@menu/menu_playback"
+        app:title="@string/lbl_playback"
+        tools:subtitle="@string/lbl_all_songs" />
 
     <org.oxycblt.auxio.coil.RoundableImageView
         android:id="@+id/playback_cover"
@@ -55,9 +55,9 @@
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         app:layout_constraintBottom_toTopOf="@+id/playback_album"
-            app:layout_constraintStart_toStartOf="@+id/playback_song_container"
         app:layout_constraintEnd_toEndOf="@+id/playback_song_container"
         app:layout_constraintHorizontal_bias="0.0"
+        app:layout_constraintStart_toStartOf="@+id/playback_song_container"
         app:layout_constraintTop_toBottomOf="@+id/playback_song_container"
         tools:text="Artist Name" />
 
@@ -67,9 +67,9 @@
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         app:layout_constraintBottom_toTopOf="@+id/playback_seek_bar"
+        app:layout_constraintEnd_toEndOf="@+id/playback_song_container"
         app:layout_constraintHorizontal_bias="0.5"
         app:layout_constraintStart_toStartOf="@+id/playback_song_container"
-            app:layout_constraintEnd_toEndOf="@+id/playback_song_container"
         app:layout_constraintTop_toBottomOf="@+id/playback_artist"
         tools:text="Album Name" />
 
@@ -77,13 +77,13 @@
         android:id="@+id/playback_seek_bar"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
+        android:layout_marginStart="@dimen/spacing_small"
+        android:layout_marginEnd="@dimen/spacing_small"
         android:layout_marginBottom="@dimen/spacing_medium"
         android:valueFrom="0"
         android:valueTo="1"
         app:haloRadius="@dimen/slider_halo_radius"
         app:labelBehavior="gone"
-            android:layout_marginStart="@dimen/spacing_small"
-            android:layout_marginEnd="@dimen/spacing_small"
         app:labelStyle="@style/TextAppearance.Auxio.BodySmall"
         app:layout_constraintBottom_toTopOf="@+id/playback_play_pause"
         app:layout_constraintEnd_toEndOf="parent"
@@ -108,8 +108,8 @@
         android:id="@+id/playback_duration"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-            android:layout_marginEnd="@dimen/spacing_medium"
         android:layout_marginTop="@dimen/spacing_small_inv"
+        android:layout_marginEnd="@dimen/spacing_medium"
         android:textAppearance="@style/TextAppearance.Auxio.BodyMedium"
         android:textColor="?android:attr/textColorSecondary"
         app:layout_constraintEnd_toEndOf="@+id/playback_seek_bar"
@@ -169,12 +169,12 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginStart="@dimen/spacing_large"
-            app:hasIndicator="true"
         android:contentDescription="@string/desc_shuffle"
         android:src="@drawable/ic_shuffle"
+        app:hasIndicator="true"
         app:layout_constraintBottom_toBottomOf="@+id/playback_skip_next"
         app:layout_constraintStart_toEndOf="@+id/playback_skip_next"
         app:layout_constraintTop_toTopOf="@+id/playback_skip_next"
         app:tint="@color/sel_accented" />
 
-    </androidx.constraintlayout.widget.ConstraintLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>

app/src/main/res/layout-sw600dp/fragment_playback_panel.xml

@@ -12,9 +12,9 @@
         style="@style/Widget.Auxio.Toolbar.Icon.Down"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
+        app:menu="@menu/menu_playback"
         app:title="@string/lbl_playback"
-            tools:subtitle="@string/lbl_all_songs"
+        tools:subtitle="@string/lbl_all_songs" />
-            app:menu="@menu/menu_playback" />
 
     <org.oxycblt.auxio.coil.RoundableImageView
         android:id="@+id/playback_cover"
@@ -67,14 +67,14 @@
         android:id="@+id/playback_seek_bar"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:layout_marginStart="@dimen/spacing_medium"
+        android:layout_marginEnd="@dimen/spacing_medium"
+        android:layout_marginBottom="@dimen/spacing_medium"
         android:valueFrom="0"
         android:valueTo="1"
         app:haloRadius="@dimen/slider_halo_radius"
         app:labelBehavior="gone"
         app:labelStyle="@style/TextAppearance.Auxio.BodySmall"
-            android:layout_marginBottom="@dimen/spacing_medium"
-            android:layout_marginStart="@dimen/spacing_medium"
-            android:layout_marginEnd="@dimen/spacing_medium"
         app:layout_constraintBottom_toTopOf="@+id/playback_play_pause"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="0.0"
@@ -97,8 +97,8 @@
         android:id="@+id/playback_duration"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-            android:layout_marginEnd="@dimen/spacing_medium"
         android:layout_marginTop="@dimen/spacing_small_inv"
+        android:layout_marginEnd="@dimen/spacing_medium"
         android:textAppearance="@style/TextAppearance.Auxio.BodyMedium"
         android:textColor="?android:attr/textColorSecondary"
         app:layout_constraintEnd_toEndOf="@+id/playback_seek_bar"
@@ -166,4 +166,4 @@
         app:layout_constraintTop_toTopOf="@+id/playback_skip_next"
         app:tint="@color/sel_accented" />
 
-    </androidx.constraintlayout.widget.ConstraintLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>

app/src/main/res/layout-sw600dp/item_detail.xml

@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-    <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-        android:layout_height="match_parent"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
+    android:layout_height="match_parent"
     android:padding="@dimen/spacing_medium">
 
     <org.oxycblt.auxio.coil.RoundableImageView
@@ -88,4 +88,4 @@
         app:layout_constraintTop_toTopOf="@+id/detail_play_button" />
 
 
-    </androidx.constraintlayout.widget.ConstraintLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>

app/src/main/res/layout-sw640dp/fragment_playback_bar.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-    <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
@@ -17,12 +17,12 @@
 
     <TextView
         android:id="@+id/playback_song"
-            android:textAppearance="@style/TextAppearance.Auxio.LabelLarger"
         style="@style/Widget.Auxio.TextView.Primary.Compact"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="@dimen/spacing_small"
         android:layout_marginEnd="@dimen/spacing_small"
+        android:textAppearance="@style/TextAppearance.Auxio.LabelLarger"
         app:layout_constraintBottom_toTopOf="@+id/playback_info"
         app:layout_constraintEnd_toStartOf="@+id/playback_skip_prev"
         app:layout_constraintStart_toEndOf="@+id/playback_cover"
@@ -33,11 +33,11 @@
     <TextView
         android:id="@+id/playback_info"
         style="@style/Widget.Auxio.TextView.Secondary.Compact"
-            android:textAppearance="@style/TextAppearance.Auxio.LabelLarge"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="@dimen/spacing_small"
         android:ellipsize="end"
+        android:textAppearance="@style/TextAppearance.Auxio.LabelLarge"
         app:layout_constraintBottom_toBottomOf="@+id/playback_cover"
         app:layout_constraintEnd_toEndOf="@+id/playback_song"
         app:layout_constraintStart_toEndOf="@+id/playback_cover"
@@ -92,4 +92,4 @@
         app:trackColor="?attr/colorPrimary"
         tools:progress="70" />
 
-    </androidx.constraintlayout.widget.ConstraintLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>

app/src/main/res/layout-sw840dp/item_detail.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-    <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-        android:layout_height="match_parent"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
+    android:layout_height="match_parent"
     android:padding="@dimen/spacing_medium">
 
     <org.oxycblt.auxio.coil.RoundableImageView
@@ -50,10 +50,10 @@
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="@dimen/spacing_medium"
+        app:layout_constraintBottom_toTopOf="@+id/detail_play_button"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toEndOf="@+id/detail_cover"
         app:layout_constraintTop_toBottomOf="@+id/detail_subhead"
-            app:layout_constraintBottom_toTopOf="@+id/detail_play_button"
         tools:text="Info B" />
 
     <Button
@@ -83,4 +83,4 @@
         app:layout_constraintStart_toEndOf="@+id/detail_play_button"
         app:layout_constraintTop_toTopOf="@+id/detail_play_button" />
 
-    </androidx.constraintlayout.widget.ConstraintLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>

app/src/main/res/layout-w600dp-land/fragment_playback_panel.xml

@@ -12,9 +12,9 @@
         style="@style/Widget.Auxio.Toolbar.Icon.Down"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
+        app:menu="@menu/menu_playback"
         app:title="@string/lbl_playback"
-            tools:subtitle="@string/lbl_all_songs"
+        tools:subtitle="@string/lbl_all_songs" />
-            app:menu="@menu/menu_playback" />
 
     <org.oxycblt.auxio.coil.RoundableImageView
         android:id="@+id/playback_cover"
@@ -110,8 +110,8 @@
         android:id="@+id/playback_duration"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-            android:layout_marginEnd="@dimen/spacing_medium"
         android:layout_marginTop="@dimen/spacing_small_inv"
+        android:layout_marginEnd="@dimen/spacing_medium"
         android:textAppearance="@style/TextAppearance.Auxio.BodyMedium"
         android:textColor="?android:attr/textColorSecondary"
         app:layout_constraintEnd_toEndOf="@+id/playback_seek_bar"
@@ -124,8 +124,8 @@
         android:layout_height="wrap_content"
         android:layout_marginStart="@dimen/spacing_medium"
         android:contentDescription="@string/desc_change_loop"
-            app:hasIndicator="true"
         android:src="@drawable/ic_loop"
+        app:hasIndicator="true"
         app:layout_constraintBottom_toBottomOf="@+id/playback_skip_prev"
         app:layout_constraintHorizontal_chainStyle="packed"
         app:layout_constraintStart_toStartOf="@+id/playback_seek_bar"
@@ -173,11 +173,11 @@
         android:layout_height="wrap_content"
         android:layout_marginEnd="@dimen/spacing_medium"
         android:contentDescription="@string/desc_shuffle"
-            app:hasIndicator="true"
         android:src="@drawable/ic_shuffle"
+        app:hasIndicator="true"
         app:layout_constraintBottom_toBottomOf="@+id/playback_skip_next"
         app:layout_constraintEnd_toEndOf="@+id/playback_seek_bar"
         app:layout_constraintTop_toTopOf="@+id/playback_skip_next"
         app:tint="@color/sel_accented" />
 
-    </androidx.constraintlayout.widget.ConstraintLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>

app/src/main/res/layout-w600dp/fragment_playback_bar.xml

@@ -91,4 +91,4 @@
         app:trackColor="?attr/colorPrimary"
         tools:progress="70" />
 
-    </androidx.constraintlayout.widget.ConstraintLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>

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

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-    <org.oxycblt.auxio.ui.EdgeCoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<org.oxycblt.auxio.ui.EdgeCoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/main_layout"
@@ -55,4 +55,4 @@
 
     </org.oxycblt.auxio.home.EdgeFabContainer>
 
-    </org.oxycblt.auxio.ui.EdgeCoordinatorLayout>
+</org.oxycblt.auxio.ui.EdgeCoordinatorLayout>

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

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-    <org.oxycblt.auxio.home.fastscroll.FastScrollRecyclerView xmlns:android="http://schemas.android.com/apk/res/android"
+<org.oxycblt.auxio.home.fastscroll.FastScrollRecyclerView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/home_recycler"

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

@@ -20,15 +20,15 @@
 
         <androidx.fragment.app.FragmentContainerView
             android:id="@+id/playback_bar_fragment"
+            android:name="org.oxycblt.auxio.playback.PlaybackBarFragment"
             android:layout_width="match_parent"
-                android:layout_height="wrap_content"
+            android:layout_height="wrap_content" />
-                android:name="org.oxycblt.auxio.playback.PlaybackBarFragment" />
 
         <androidx.fragment.app.FragmentContainerView
             android:id="@+id/playback_panel_fragment"
+            android:name="org.oxycblt.auxio.playback.PlaybackPanelFragment"
             android:layout_width="match_parent"
-                android:layout_height="match_parent"
+            android:layout_height="match_parent" />
-                android:name="org.oxycblt.auxio.playback.PlaybackPanelFragment" />
 
     </org.oxycblt.auxio.ui.BottomSheetLayout>
 
@@ -59,4 +59,4 @@
             android:textStyle="bold" />
 
     </FrameLayout>
-    </FrameLayout>
+</FrameLayout>

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

@@ -58,10 +58,10 @@
         android:id="@+id/playback_progress_bar"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-            app:trackColor="?attr/colorPrimary"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
+        app:trackColor="?attr/colorPrimary"
         tools:progress="70" />
 
-    </androidx.constraintlayout.widget.ConstraintLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>

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

@@ -11,16 +11,16 @@
         style="@style/Widget.Auxio.Toolbar.Icon.Down"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
+        app:menu="@menu/menu_playback"
         app:title="@string/lbl_playback"
-            tools:subtitle="@string/lbl_all_songs"
+        tools:subtitle="@string/lbl_all_songs" />
-            app:menu="@menu/menu_playback" />
 
     <org.oxycblt.auxio.coil.RoundableImageView
         android:id="@+id/playback_cover"
         style="@style/Widget.Auxio.Image.Full"
+        android:layout_margin="@dimen/spacing_medium"
         app:layout_constraintBottom_toTopOf="@+id/playback_song"
         app:layout_constraintEnd_toEndOf="parent"
-            android:layout_margin="@dimen/spacing_medium"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/playback_toolbar"
         tools:src="@drawable/ic_album" />
@@ -66,12 +66,12 @@
         android:id="@+id/playback_seek_bar"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:layout_marginBottom="@dimen/spacing_medium"
         android:valueFrom="0"
         android:valueTo="1"
         app:haloRadius="@dimen/slider_halo_radius"
         app:labelBehavior="gone"
         app:labelStyle="@style/TextAppearance.Auxio.BodySmall"
-            android:layout_marginBottom="@dimen/spacing_medium"
         app:layout_constraintBottom_toTopOf="@+id/playback_play_pause"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="0.0"
@@ -106,10 +106,10 @@
         android:id="@+id/playback_loop"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:layout_marginStart="@dimen/spacing_medium"
         android:contentDescription="@string/desc_change_loop"
         android:src="@drawable/ic_loop"
         app:hasIndicator="true"
-            android:layout_marginStart="@dimen/spacing_medium"
         app:layout_constraintBottom_toBottomOf="@+id/playback_skip_prev"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="@+id/playback_skip_prev" />
@@ -155,15 +155,15 @@
         android:id="@+id/playback_shuffle"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:layout_marginEnd="@dimen/spacing_medium"
         android:contentDescription="@string/desc_shuffle"
         android:minWidth="@dimen/size_btn_small"
         android:minHeight="@dimen/size_btn_small"
         android:src="@drawable/ic_shuffle"
-            android:layout_marginEnd="@dimen/spacing_medium"
         app:hasIndicator="true"
         app:layout_constraintBottom_toBottomOf="@+id/playback_skip_next"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toTopOf="@+id/playback_skip_next"
         app:tint="@color/sel_accented" />
 
-    </androidx.constraintlayout.widget.ConstraintLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>

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

@@ -32,4 +32,4 @@
         app:layout_behavior="com.google.android.material.appbar.AppBarLayout$ScrollingViewBehavior"
         tools:listitem="@layout/item_queue_song" />
 
-    </org.oxycblt.auxio.ui.EdgeCoordinatorLayout>
+</org.oxycblt.auxio.ui.EdgeCoordinatorLayout>

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

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-    <org.oxycblt.auxio.ui.EdgeCoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<org.oxycblt.auxio.ui.EdgeCoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
@@ -52,4 +52,4 @@
         app:layout_behavior="com.google.android.material.appbar.AppBarLayout$ScrollingViewBehavior"
         tools:listitem="@layout/item_song" />
 
-    </org.oxycblt.auxio.ui.EdgeCoordinatorLayout>
+</org.oxycblt.auxio.ui.EdgeCoordinatorLayout>

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

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-    <org.oxycblt.auxio.ui.EdgeCoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<org.oxycblt.auxio.ui.EdgeCoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/settings_coordinator"
     android:layout_width="match_parent"
@@ -29,4 +29,4 @@
         android:layout_height="match_parent"
         app:layout_behavior="com.google.android.material.appbar.AppBarLayout$ScrollingViewBehavior" />
 
-    </org.oxycblt.auxio.ui.EdgeCoordinatorLayout>
+</org.oxycblt.auxio.ui.EdgeCoordinatorLayout>

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

@@ -21,9 +21,9 @@
         style="@style/Widget.AppCompat.Button.Borderless"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
+        android:background="@drawable/ui_unbounded_ripple"
         android:minWidth="@dimen/size_btn_small"
         android:minHeight="@dimen/size_btn_small"
-            android:background="@drawable/ui_unbounded_ripple"
         android:paddingStart="@dimen/spacing_medium"
         android:paddingEnd="@dimen/spacing_medium"
         app:layout_constraintBottom_toTopOf="@id/header_divider"
@@ -38,4 +38,4 @@
         android:layout_height="wrap_content"
         app:layout_constraintBottom_toBottomOf="parent" />
 
-    </androidx.constraintlayout.widget.ConstraintLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>

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

@@ -13,11 +13,11 @@
         android:contentDescription="@string/def_track"
         android:src="@drawable/ic_song"
         android:visibility="invisible"
-        app:tint="@color/sel_accented"
         app:layout_constraintBottom_toBottomOf="@+id/song_track"
         app:layout_constraintEnd_toEndOf="@+id/song_track"
         app:layout_constraintStart_toStartOf="@+id/song_track"
         app:layout_constraintTop_toTopOf="@+id/song_track"
+        app:tint="@color/sel_accented"
         tools:text="1" />
 
     <TextView
@@ -63,4 +63,4 @@
         app:layout_constraintTop_toBottomOf="@+id/song_name"
         tools:text="16:16" />
 
-    </androidx.constraintlayout.widget.ConstraintLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>

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

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
     style="@style/Widget.Auxio.ItemLayout">
 
     <org.oxycblt.auxio.coil.RoundableImageView
@@ -36,4 +36,4 @@
         app:layout_constraintTop_toBottomOf="@+id/artist_name"
         tools:text="2 Albums, 20 Songs" />
 
-    </androidx.constraintlayout.widget.ConstraintLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>

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

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-    <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
@@ -71,4 +71,4 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toEndOf="@+id/detail_play_button"
         app:layout_constraintTop_toTopOf="@+id/detail_play_button" />
-    </androidx.constraintlayout.widget.ConstraintLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>

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

@@ -1,24 +1,24 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-    <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    style="@style/Widget.Auxio.ItemLayout"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:clickable="false"
     android:focusable="false"
-        xmlns:app="http://schemas.android.com/apk/res-auto"
-        xmlns:tools="http://schemas.android.com/tools"
-        style="@style/Widget.Auxio.ItemLayout"
     android:padding="0dp">
 
     <TextView
         android:id="@+id/excluded_path"
         style="@style/Widget.Auxio.TextView.Item.Primary"
         android:layout_width="0dp"
-            android:textAppearance="@style/TextAppearance.Auxio.BodyLarge"
         android:layout_height="wrap_content"
         android:layout_margin="@dimen/spacing_medium"
         android:gravity="center"
         android:maxLines="@null"
+        android:textAppearance="@style/TextAppearance.Auxio.BodyLarge"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toStartOf="@+id/excluded_clear"
         app:layout_constraintStart_toStartOf="parent"
@@ -30,14 +30,14 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_margin="@dimen/spacing_small"
-            android:minHeight="@dimen/size_btn_small"
-            android:minWidth="@dimen/size_btn_small"
         android:background="@drawable/ui_unbounded_ripple"
         android:contentDescription="@string/desc_blacklist_delete"
+        android:minWidth="@dimen/size_btn_small"
+        android:minHeight="@dimen/size_btn_small"
         android:src="@drawable/ic_clear"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toTopOf="parent"
         app:tint="?attr/colorControlNormal" />
 
-    </androidx.constraintlayout.widget.ConstraintLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>

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

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-    <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
@@ -21,4 +21,4 @@
         android:layout_height="wrap_content"
         app:layout_constraintBottom_toBottomOf="parent" />
 
-    </androidx.constraintlayout.widget.ConstraintLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>

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

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-    <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
 
@@ -81,4 +81,4 @@
             app:layout_constraintTop_toTopOf="@+id/song_album_cover" />
 
     </androidx.constraintlayout.widget.ConstraintLayout>
-    </FrameLayout>
+</FrameLayout>

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

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
     style="@style/Widget.Auxio.ItemLayout">
 
     <org.oxycblt.auxio.coil.RoundableImageView
@@ -36,4 +36,4 @@
         app:layout_constraintTop_toBottomOf="@+id/song_name"
         tools:text="Info" />
 
-    </androidx.constraintlayout.widget.ConstraintLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>

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

@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-    <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     style="@style/Widget.Auxio.ItemLayout"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
     android:padding="0dp">
 
     <com.google.android.material.checkbox.MaterialCheckBox
@@ -45,4 +45,4 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toTopOf="@+id/tab_icon" />
 
-    </androidx.constraintlayout.widget.ConstraintLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>

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

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-    <merge xmlns:android="http://schemas.android.com/apk/res/android"
+<merge xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     tools:layout_height="wrap_content"
@@ -13,15 +13,15 @@
         android:layout_marginBottom="@dimen/spacing_medium"
         android:paddingStart="@dimen/spacing_small"
         android:paddingEnd="@dimen/spacing_small"
-            app:labelBehavior="gone"
-            app:labelStyle="@style/TextAppearance.Auxio.BodySmall"
         android:valueFrom="0"
         android:valueTo="1"
-            app:thumbRadius="@dimen/slider_thumb_radius"
         app:haloRadius="@dimen/slider_halo_radius"
+        app:labelBehavior="gone"
+        app:labelStyle="@style/TextAppearance.Auxio.BodySmall"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent" />
+        app:layout_constraintStart_toStartOf="parent"
+        app:thumbRadius="@dimen/slider_thumb_radius" />
 
     <TextView
         android:id="@+id/playback_position"
@@ -41,10 +41,10 @@
         android:layout_height="wrap_content"
         android:layout_marginEnd="@dimen/spacing_medium"
         android:layout_marginBottom="@dimen/spacing_small"
-            android:textColor="?android:attr/textColorSecondary"
         android:textAppearance="@style/TextAppearance.Auxio.BodyMedium"
+        android:textColor="?android:attr/textColorSecondary"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         tools:text="16:16" />
 
-    </merge>
+</merge>

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

@@ -18,15 +18,15 @@
         android:tint="?attr/colorPrimary" />
 
     <android.widget.TextView
-        android:layout_width="match_parent"
         style="@style/Widget.Auxio.TextView.Primary.AppWidget"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
         android:ellipsize="none"
-        android:singleLine="false"
-        android:textAlignment="center"
         android:gravity="center"
         android:padding="@dimen/spacing_medium"
-        android:text="@string/def_playback" />
+        android:singleLine="false"
+        android:text="@string/def_playback"
+        android:textAlignment="center" />
 
 </FrameLayout>

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

@@ -51,9 +51,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_alignParentBottom="true"
-        android:padding="@dimen/spacing_medium"
+        android:layout_gravity="center"
         android:orientation="vertical"
-        android:layout_gravity="center">
+        android:padding="@dimen/spacing_medium">
 
         <android.widget.TextView
             android:id="@+id/widget_song"

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

@@ -51,9 +51,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_alignParentBottom="true"
-        android:padding="@dimen/spacing_medium"
+        android:layout_gravity="center"
         android:orientation="vertical"
-        android:layout_gravity="center">
+        android:padding="@dimen/spacing_medium">
 
         <android.widget.TextView
             android:id="@+id/widget_song"

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

@@ -53,13 +53,13 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_alignParentBottom="true"
-        android:paddingTop="@dimen/spacing_small"
+        android:layout_gravity="center"
-        android:paddingBottom="@dimen/spacing_small"
-        android:paddingStart="@dimen/spacing_small"
-        android:paddingEnd="@dimen/spacing_small"
-        android:orientation="horizontal"
         android:background="@drawable/ui_widget_panel"
-        android:layout_gravity="center">
+        android:orientation="horizontal"
+        android:paddingStart="@dimen/spacing_small"
+        android:paddingTop="@dimen/spacing_small"
+        android:paddingEnd="@dimen/spacing_small"
+        android:paddingBottom="@dimen/spacing_small">
 
         <android.widget.ImageButton
             android:id="@+id/widget_skip_prev"

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

@@ -56,10 +56,10 @@
         android:layout_gravity="center"
         android:background="@drawable/ui_widget_panel"
         android:orientation="horizontal"
-        android:paddingTop="@dimen/spacing_small"
-        android:paddingBottom="@dimen/spacing_small"
         android:paddingStart="@dimen/spacing_small"
-        android:paddingEnd="@dimen/spacing_small">
+        android:paddingTop="@dimen/spacing_small"
+        android:paddingEnd="@dimen/spacing_small"
+        android:paddingBottom="@dimen/spacing_small">
 
         <android.widget.ImageButton
             android:id="@+id/widget_loop"

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

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-<style name="Widget.Auxio.Button.AppWidget.V31" parent="Widget.AppCompat.Button.Borderless">
+    <style name="Widget.Auxio.Button.AppWidget.V31" parent="Widget.AppCompat.Button.Borderless">
         <item name="android:background">@drawable/ui_large_unbounded_ripple</item>
     </style>
 </resources>

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

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-<style name="Theme.Widget" parent="@android:style/Theme.DeviceDefault.DayNight">
+    <style name="Theme.Widget" parent="@android:style/Theme.DeviceDefault.DayNight">
         <item name="colorSurface">@color/widget_surface</item>
         <item name="colorPrimary">?android:attr/colorAccent</item>
         <item name="colorSecondary">?android:attr/colorAccent</item>

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

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-<style name="Theme.Auxio.Black" parent="Theme.Auxio.App">
+    <style name="Theme.Auxio.Black" parent="Theme.Auxio.App">
         <item name="colorSurface">@android:color/black</item>
     </style>
 

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

@@ -6,17 +6,17 @@
 
         <org.oxycblt.auxio.settings.pref.IntListPreference
             app:defaultValue="@integer/theme_auto"
-            app:isPreferenceVisible="@bool/enable_theme_settings"
             app:entries="@array/entries_theme"
             app:entryValues="@array/values_theme"
             app:icon="@drawable/ic_day"
             app:iconSpaceReserved="false"
+            app:isPreferenceVisible="@bool/enable_theme_settings"
             app:key="KEY_THEME2"
             app:title="@string/set_theme" />
 
         <Preference
-            app:isPreferenceVisible="@bool/enable_theme_settings"
             app:icon="@drawable/ic_accent"
+            app:isPreferenceVisible="@bool/enable_theme_settings"
             app:key="auxio_accent"
             app:title="@string/set_accent" />
 
@@ -81,8 +81,8 @@
         <org.oxycblt.auxio.settings.pref.M3SwitchPreference
             app:defaultValue="true"
             app:iconSpaceReserved="false"
-            app:key="KEY_AUDIO_FOCUS"
             app:isPreferenceVisible="@bool/enable_audio_focus_setting"
+            app:key="KEY_AUDIO_FOCUS"
             app:summary="@string/set_focus_desc"
             app:title="@string/set_focus" />
 
@@ -94,12 +94,12 @@
             app:title="@string/set_headset_autoplay" />
 
         <org.oxycblt.auxio.settings.pref.IntListPreference
-            app:defaultValue="@integer/replay_gain_off"
-            app:key="auxio_replay_gain"
             app:allowDividerBelow="false"
-            app:iconSpaceReserved="false"
+            app:defaultValue="@integer/replay_gain_off"
             app:entries="@array/entries_replay_gain"
             app:entryValues="@array/values_replay_gain"
+            app:iconSpaceReserved="false"
+            app:key="auxio_replay_gain"
             app:title="@string/set_replay_gain" />
 
     </PreferenceCategory>