all: clean up resources

Clean up resource implementations, removing useless attributes and
simplifying layouts.

app/src/main/java/org/oxycblt/auxio/home/HomeFragment.kt

@@ -104,11 +104,6 @@ class HomeFragment : ViewBindingFragment<FragmentHomeBinding>(), Toolbar.OnMenuI
 
         binding.homeToolbar.setOnMenuItemClickListener(this@HomeFragment)
 
-        binding.homeIndexingContainer.setOnApplyWindowInsetsListener { v, insets ->
-            logD("do basics you retard")
-            insets
-        }
-
         updateTabConfiguration()
 
         // Load the track color in manually as it's unclear whether the track actually supports

app/src/main/java/org/oxycblt/auxio/playback/state/PlaybackStateManager.kt

@@ -35,7 +35,7 @@ import org.oxycblt.auxio.util.logW
  * Master class (and possible god object) for the playback state.
  *
  * Whereas other apps centralize the playback state around the MediaSession, Auxio does not, as
- * MediaSession is a terrible API that prevents nice features like better album cover loading and a
+ * MediaSession is a terrible API that prevents nice features like better album cover loading or a
  * reasonable queue system.
  *
  * This should ***NOT*** be used outside of the playback module.

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

@@ -2,10 +2,10 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
+    android:tint="?attr/colorControlNormal"
     android:viewportWidth="24"
-    android:viewportHeight="24"
+    android:viewportHeight="24">
-    android:tint="?attr/colorControlNormal">
+    <path
-  <path
+        android:fillColor="@android:color/white"
-      android:fillColor="@android:color/white"
+        android:pathData="M12,12Q10.35,12 9.175,10.825Q8,9.65 8,8Q8,6.35 9.175,5.175Q10.35,4 12,4Q13.65,4 14.825,5.175Q16,6.35 16,8Q16,9.65 14.825,10.825Q13.65,12 12,12ZM4,20V17.2Q4,16.35 4.438,15.637Q4.875,14.925 5.6,14.55Q7.15,13.775 8.75,13.387Q10.35,13 12,13Q13.65,13 15.25,13.387Q16.85,13.775 18.4,14.55Q19.125,14.925 19.562,15.637Q20,16.35 20,17.2V20ZM6,18H18V17.2Q18,16.925 17.863,16.7Q17.725,16.475 17.5,16.35Q16.15,15.675 14.775,15.337Q13.4,15 12,15Q10.6,15 9.225,15.337Q7.85,15.675 6.5,16.35Q6.275,16.475 6.138,16.7Q6,16.925 6,17.2ZM12,10Q12.825,10 13.413,9.412Q14,8.825 14,8Q14,7.175 13.413,6.588Q12.825,6 12,6Q11.175,6 10.588,6.588Q10,7.175 10,8Q10,8.825 10.588,9.412Q11.175,10 12,10ZM12,8Q12,8 12,8Q12,8 12,8Q12,8 12,8Q12,8 12,8Q12,8 12,8Q12,8 12,8Q12,8 12,8Q12,8 12,8ZM12,18Q12,18 12,18Q12,18 12,18Q12,18 12,18Q12,18 12,18Q12,18 12,18Q12,18 12,18Q12,18 12,18Q12,18 12,18Z" />
-      android:pathData="M12,12Q10.35,12 9.175,10.825Q8,9.65 8,8Q8,6.35 9.175,5.175Q10.35,4 12,4Q13.65,4 14.825,5.175Q16,6.35 16,8Q16,9.65 14.825,10.825Q13.65,12 12,12ZM4,20V17.2Q4,16.35 4.438,15.637Q4.875,14.925 5.6,14.55Q7.15,13.775 8.75,13.387Q10.35,13 12,13Q13.65,13 15.25,13.387Q16.85,13.775 18.4,14.55Q19.125,14.925 19.562,15.637Q20,16.35 20,17.2V20ZM6,18H18V17.2Q18,16.925 17.863,16.7Q17.725,16.475 17.5,16.35Q16.15,15.675 14.775,15.337Q13.4,15 12,15Q10.6,15 9.225,15.337Q7.85,15.675 6.5,16.35Q6.275,16.475 6.138,16.7Q6,16.925 6,17.2ZM12,10Q12.825,10 13.413,9.412Q14,8.825 14,8Q14,7.175 13.413,6.588Q12.825,6 12,6Q11.175,6 10.588,6.588Q10,7.175 10,8Q10,8.825 10.588,9.412Q11.175,10 12,10ZM12,8Q12,8 12,8Q12,8 12,8Q12,8 12,8Q12,8 12,8Q12,8 12,8Q12,8 12,8Q12,8 12,8Q12,8 12,8ZM12,18Q12,18 12,18Q12,18 12,18Q12,18 12,18Q12,18 12,18Q12,18 12,18Q12,18 12,18Q12,18 12,18Q12,18 12,18Z"/>
 </vector>

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

@@ -1,10 +1,10 @@
 <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
-  <path
+        android:fillColor="@android:color/white"
-      android:fillColor="@android:color/white"
+        android:pathData="M6.8,22.725 L2.3,18.225 6.8,13.725 8.675,15.625 7.4,16.9H16.925V12.825H19.575V19.55H7.4L8.675,20.825ZM4.45,11.15V4.425H16.625L15.35,3.15L17.225,1.25L21.725,5.75L17.225,10.25L15.35,8.35L16.625,7.075H7.1V11.15Z" />
-      android:pathData="M6.8,22.725 L2.3,18.225 6.8,13.725 8.675,15.625 7.4,16.9H16.925V12.825H19.575V19.55H7.4L8.675,20.825ZM4.45,11.15V4.425H16.625L15.35,3.15L17.225,1.25L21.725,5.75L17.225,10.25L15.35,8.35L16.625,7.075H7.1V11.15Z"/>
 </vector>

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

@@ -1,10 +1,10 @@
 <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
-  <path
+        android:fillColor="@android:color/white"
-      android:fillColor="@android:color/white"
+        android:pathData="M11.325,15.225V10.65H9.6V8.75H13.225V15.225ZM6.8,22.725 L2.3,18.225 6.8,13.725 8.675,15.625 7.4,16.9H16.925V12.825H19.575V19.55H7.4L8.675,20.825ZM4.45,11.15V4.425H16.625L15.35,3.15L17.225,1.25L21.725,5.75L17.225,10.25L15.35,8.35L16.625,7.075H7.1V11.15Z" />
-      android:pathData="M11.325,15.225V10.65H9.6V8.75H13.225V15.225ZM6.8,22.725 L2.3,18.225 6.8,13.725 8.675,15.625 7.4,16.9H16.925V12.825H19.575V19.55H7.4L8.675,20.825ZM4.45,11.15V4.425H16.625L15.35,3.15L17.225,1.25L21.725,5.75L17.225,10.25L15.35,8.35L16.625,7.075H7.1V11.15Z"/>
 </vector>

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

@@ -1,10 +1,10 @@
 <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
-  <path
+        android:fillColor="@android:color/white"
-      android:fillColor="@android:color/white"
+        android:pathData="M9.05,10.775 L3.675,5.4 5.45,3.625 10.825,9ZM13.75,20.275V17.725H16L13.275,14.975L15.025,13.2L17.75,15.925V13.725H20.325V20.275ZM5.45,20.375 L3.675,18.6 16,6.275H13.75V3.725H20.325V10.275H17.75V8.05Z" />
-      android:pathData="M9.05,10.775 L3.675,5.4 5.45,3.625 10.825,9ZM13.75,20.275V17.725H16L13.275,14.975L15.025,13.2L17.75,15.925V13.725H20.325V20.275ZM5.45,20.375 L3.675,18.6 16,6.275H13.75V3.725H20.325V10.275H17.75V8.05Z"/>
 </vector>

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

@@ -7,12 +7,12 @@
 
     <com.google.android.material.appbar.MaterialToolbar
         android:id="@+id/playback_toolbar"
-        android:layout_height="wrap_content"
         android:layout_width="match_parent"
-        app:navigationIcon="@drawable/ic_down_24"
+        android:layout_height="wrap_content"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
         app:menu="@menu/menu_playback"
+        app:navigationIcon="@drawable/ic_down_24"
         app:title="@string/lbl_playback"
         tools:subtitle="@string/lbl_all_songs" />
 

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

@@ -7,12 +7,12 @@
 
     <com.google.android.material.appbar.MaterialToolbar
         android:id="@+id/playback_toolbar"
-        android:layout_height="wrap_content"
         android:layout_width="match_parent"
-        app:navigationIcon="@drawable/ic_down_24"
+        android:layout_height="wrap_content"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
         app:menu="@menu/menu_playback"
+        app:navigationIcon="@drawable/ic_down_24"
         app:title="@string/lbl_playback"
         tools:subtitle="@string/lbl_all_songs" />
 

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

@@ -8,12 +8,12 @@
 
     <com.google.android.material.appbar.MaterialToolbar
         android:id="@+id/playback_toolbar"
-        android:layout_height="wrap_content"
         android:layout_width="match_parent"
-        app:navigationIcon="@drawable/ic_down_24"
+        android:layout_height="wrap_content"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
         app:menu="@menu/menu_playback"
+        app:navigationIcon="@drawable/ic_down_24"
         app:title="@string/lbl_playback"
         tools:subtitle="@string/lbl_all_songs" />
 

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

@@ -7,12 +7,12 @@
 
     <com.google.android.material.appbar.MaterialToolbar
         android:id="@+id/playback_toolbar"
-        android:layout_height="wrap_content"
         android:layout_width="match_parent"
-        app:navigationIcon="@drawable/ic_down_24"
+        android:layout_height="wrap_content"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
         app:menu="@menu/menu_playback"
+        app:navigationIcon="@drawable/ic_down_24"
         app:title="@string/lbl_playback"
         tools:subtitle="@string/lbl_all_songs" />
 

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

@@ -8,7 +8,5 @@
     android:paddingStart="@dimen/spacing_medium"
     android:paddingEnd="@dimen/spacing_medium"
     app:layoutManager="org.oxycblt.auxio.ui.accent.AccentGridLayoutManager"
-    app:layout_constraintBottom_toTopOf="@+id/accent_cancel"
-    app:layout_constraintTop_toBottomOf="@+id/accent_header"
     tools:itemCount="16"
     tools:listitem="@layout/item_accent" />

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

@@ -6,7 +6,5 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
-    app:layout_constraintBottom_toTopOf="@+id/accent_cancel"
-    app:layout_constraintTop_toBottomOf="@+id/accent_header"
     tools:itemCount="5"
     tools:listitem="@layout/item_tab" />

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

@@ -84,9 +84,9 @@
                         android:id="@+id/about_version_icon"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
+                        android:layout_marginStart="@dimen/spacing_medium"
                         android:contentDescription="@string/lbl_version"
                         android:src="@drawable/ic_about_24"
-                        android:layout_marginStart="@dimen/spacing_medium"
                         app:layout_constraintBottom_toBottomOf="@+id/about_version"
                         app:layout_constraintStart_toStartOf="parent"
                         app:layout_constraintTop_toTopOf="@+id/about_version_title" />
@@ -95,8 +95,8 @@
                         android:id="@+id/about_version_title"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:layout_marginTop="@dimen/spacing_medium"
                         android:layout_marginStart="@dimen/spacing_medium"
+                        android:layout_marginTop="@dimen/spacing_medium"
                         android:text="@string/lbl_version"
                         android:textAppearance="@style/TextAppearance.Auxio.BodyLarge"
                         app:layout_constraintBottom_toTopOf="@+id/about_version"
@@ -107,21 +107,20 @@
                         android:id="@+id/about_version"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
+                        android:layout_marginBottom="@dimen/spacing_medium"
                         android:textAppearance="@style/TextAppearance.Auxio.BodySmall"
                         app:layout_constraintStart_toStartOf="@+id/about_version_title"
                         app:layout_constraintTop_toBottomOf="@+id/about_version_title"
-                        android:layout_marginBottom="@dimen/spacing_medium"
                         tools:text="16.16.16" />
 
 
-
                     <TextView
                         android:id="@+id/about_code"
                         style="@style/Widget.Auxio.TextView.Icon.Clickable"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:text="@string/lbl_code"
                         android:layout_marginTop="@dimen/spacing_medium"
+                        android:text="@string/lbl_code"
                         app:drawableStartCompat="@drawable/ic_code_24"
                         app:layout_constraintBottom_toTopOf="@+id/about_faq"
                         app:layout_constraintEnd_toEndOf="parent"

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

@@ -17,8 +17,8 @@
 
             <com.google.android.material.appbar.MaterialToolbar
                 android:id="@+id/detail_toolbar"
-                android:layout_height="wrap_content"
                 android:layout_width="match_parent"
+                android:layout_height="wrap_content"
                 app:navigationIcon="@drawable/ic_back_24" />
 
         </org.oxycblt.auxio.detail.DetailAppBarLayout>

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

@@ -35,9 +35,9 @@
         android:id="@+id/home_content"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        app:layout_behavior="com.google.android.material.appbar.AppBarLayout$ScrollingViewBehavior"
         android:animateLayoutChanges="true"
-        android:clipToPadding="false">
+        android:clipToPadding="false"
+        app:layout_behavior="com.google.android.material.appbar.AppBarLayout$ScrollingViewBehavior">
 
         <androidx.viewpager2.widget.ViewPager2
             android:id="@+id/home_pager"
@@ -51,8 +51,9 @@
             android:id="@+id/home_indexing_container"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:layout_gravity="center"
             android:layout_margin="@dimen/spacing_medium"
-            android:layout_gravity="center">
+            android:visibility="invisible">
 
             <com.google.android.material.card.MaterialCardView
                 android:layout_width="match_parent"
@@ -92,10 +93,10 @@
                         android:id="@+id/home_indexing_action"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:text="@string/lbl_retry"
                         android:layout_marginStart="@dimen/spacing_medium"
                         android:layout_marginEnd="@dimen/spacing_medium"
                         android:layout_marginBottom="@dimen/spacing_medium"
+                        android:text="@string/lbl_retry"
                         android:visibility="invisible"
                         app:layout_constraintBottom_toBottomOf="parent"
                         app:layout_constraintTop_toBottomOf="@+id/home_indexing_status" />

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

@@ -7,12 +7,12 @@
 
     <com.google.android.material.appbar.MaterialToolbar
         android:id="@+id/playback_toolbar"
-        android:layout_height="wrap_content"
         android:layout_width="match_parent"
-        app:navigationIcon="@drawable/ic_down_24"
+        android:layout_height="wrap_content"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
         app:menu="@menu/menu_playback"
+        app:navigationIcon="@drawable/ic_down_24"
         app:title="@string/lbl_playback"
         tools:subtitle="@string/lbl_all_songs" />
 

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

@@ -14,10 +14,10 @@
 
         <com.google.android.material.appbar.MaterialToolbar
             android:id="@+id/queue_toolbar"
-        android:layout_height="wrap_content"
+            android:layout_width="match_parent"
-        android:layout_width="match_parent"
+            android:layout_height="wrap_content"
-        app:navigationIcon="@drawable/ic_down_24"
             android:elevation="0dp"
+            app:navigationIcon="@drawable/ic_down_24"
             app:title="@string/lbl_queue" />
 
     </org.oxycblt.auxio.ui.coordinator.EdgeAppBarLayout>

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

@@ -10,12 +10,12 @@
         app:liftOnScroll="true"
         app:liftOnScrollTargetViewId="@id/search_recycler">
 
-         <com.google.android.material.appbar.MaterialToolbar
+        <com.google.android.material.appbar.MaterialToolbar
             android:id="@+id/search_toolbar"
-        android:layout_height="wrap_content"
+            android:layout_width="match_parent"
-        android:layout_width="match_parent"
+            android:layout_height="wrap_content"
-        app:navigationIcon="@drawable/ic_back_24"
+            app:menu="@menu/menu_search"
-            app:menu="@menu/menu_search">
+            app:navigationIcon="@drawable/ic_back_24">
 
             <com.google.android.material.textfield.TextInputLayout
                 android:layout_width="match_parent"

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

@@ -15,9 +15,9 @@
 
         <com.google.android.material.appbar.MaterialToolbar
             android:id="@+id/settings_toolbar"
-        android:layout_height="wrap_content"
+            android:layout_width="match_parent"
-        android:layout_width="match_parent"
+            android:layout_height="wrap_content"
-        app:navigationIcon="@drawable/ic_back_24"
+            app:navigationIcon="@drawable/ic_back_24"
             app:title="@string/set_title" />
 
     </org.oxycblt.auxio.ui.coordinator.EdgeAppBarLayout>

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

@@ -7,8 +7,8 @@
 
     <!--
     We don't want to show an album cover, but we still want the spacing of this song
-    to be alike to other songs. So, add a pastel-ish background to each track number
+    to be alike to other songs. So, the imageview retains it's default tonal color,
-    view. The way we do this is odd, but it's designed this way.
+    with us only overlaying the track number (and other elements) onto it.
     -->
 
     <org.oxycblt.auxio.image.ImageGroup

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

@@ -1,9 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout 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"
     android:layout_height="wrap_content"
+    android:orientation="horizontal"
     android:padding="@dimen/spacing_medium">
 
     <org.oxycblt.auxio.image.StyledImageView
@@ -21,10 +22,11 @@
         style="@style/Widget.Auxio.TextView.Header"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
+        android:layout_weight="1"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toEndOf="@+id/disc_item"
         app:layout_constraintTop_toTopOf="parent"
         tools:text="Disc 16" />
 
-</androidx.constraintlayout.widget.ConstraintLayout>
+</LinearLayout>

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

@@ -1,18 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout 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"
-    android:layout_height="wrap_content">
+    android:layout_height="wrap_content"
+    android:orientation="vertical">
 
     <TextView
         android:id="@android:id/title"
         style="@style/Widget.Auxio.TextView.Header"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        app:layout_constraintBottom_toTopOf="@id/header_divider"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
         tools:text="Songs" />
 
     <com.google.android.material.divider.MaterialDivider
@@ -21,4 +19,4 @@
         android:layout_height="wrap_content"
         app:layout_constraintBottom_toBottomOf="parent" />
 
-</androidx.constraintlayout.widget.ConstraintLayout>
+</LinearLayout>

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

@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-
+<LinearLayout 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"
-    android:layout_height="wrap_content">
+    android:layout_height="wrap_content"
+    android:gravity="center"
+    android:orientation="horizontal">
 
     <TextView
         android:id="@+id/dir_path"
@@ -13,15 +14,12 @@
         android:layout_height="wrap_content"
         android:layout_marginStart="@dimen/spacing_large"
         android:layout_marginEnd="@dimen/spacing_medium"
+        android:layout_weight="1"
         android:gravity="center"
         android:maxLines="@null"
         android:paddingTop="@dimen/spacing_small"
         android:paddingBottom="@dimen/spacing_small"
         android:textAppearance="@style/TextAppearance.Auxio.BodyLarge"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toStartOf="@+id/dir_delete"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
         tools:text="/storage/emulated/0/directory" />
 
     <Button
@@ -32,9 +30,6 @@
         android:layout_marginEnd="@dimen/spacing_mid_medium"
         android:contentDescription="@string/desc_music_dir_delete"
         app:icon="@drawable/ic_delete_24"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
         app:tint="?attr/colorControlNormal" />
 
-</androidx.constraintlayout.widget.ConstraintLayout>
+</LinearLayout>

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

@@ -1,34 +1,30 @@
 <?xml version="1.0" encoding="utf-8"?>
-
+<LinearLayout 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:padding="0dp">
+    android:background="?attr/selectableItemBackground"
+    android:clickable="true"
+    android:focusable="true"
+    android:orientation="horizontal"
+    android:paddingTop="@dimen/spacing_small"
+    android:paddingBottom="@dimen/spacing_small">
 
     <com.google.android.material.checkbox.MaterialCheckBox
         android:id="@+id/tab_icon"
-        style="@style/Widget.Material3.CompoundButton.CheckBox"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="@dimen/spacing_medium"
-        android:layout_marginTop="@dimen/spacing_small"
+        android:layout_marginEnd="@dimen/spacing_tiny"
-        android:layout_marginEnd="@dimen/spacing_medium"
+        android:layout_weight="1"
-        android:layout_marginBottom="@dimen/spacing_small"
         android:clickable="false"
         android:focusable="false"
         android:paddingStart="@dimen/spacing_medium"
         android:textAlignment="viewStart"
         android:textAppearance="@style/TextAppearance.Auxio.BodyLarge"
-        app:buttonCompat="@null"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toStartOf="@+id/tab_drag_handle"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
         tools:ignore="RtlSymmetry,contentDescription"
-        tools:text="Artist" />
+        tools:text="Artists" />
 
     <Button
         android:id="@+id/tab_drag_handle"
@@ -37,9 +33,6 @@
         android:layout_height="wrap_content"
         android:layout_marginEnd="@dimen/spacing_mid_medium"
         android:contentDescription="@string/desc_tab_handle"
-        app:icon="@drawable/ic_handle_24"
+        app:icon="@drawable/ic_handle_24" />
-        app:layout_constraintBottom_toBottomOf="@+id/tab_icon"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toTopOf="@+id/tab_icon" />
 
-</androidx.constraintlayout.widget.ConstraintLayout>
+</LinearLayout>

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

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <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"
     android:layout_width="match_parent"
     android:layout_height="wrap_content">
@@ -11,11 +10,7 @@
         android:layout_height="wrap_content"
         android:layout_marginBottom="@dimen/spacing_medium"
         android:valueFrom="0"
-        android:valueTo="1"
+        android:valueTo="1" />
-        app:layout_constraintBottom_toTopOf="@+id/playback_play_pause"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.0"
-        app:layout_constraintStart_toStartOf="parent" />
 
     <TextView
         android:id="@+id/seek_bar_position"
@@ -37,8 +32,6 @@
         android:layout_marginBottom="@dimen/spacing_tiny"
         android:textAppearance="@style/TextAppearance.Auxio.LabelMedium"
         android:textColor="?android:attr/textColorSecondary"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/playback_seek_bar"
         tools:text="16:16" />
 
 </FrameLayout>

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

@@ -4,8 +4,8 @@
     android:id="@android:id/background"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:backgroundTint="?attr/colorSurface"
     android:background="@drawable/ui_widget_bg"
+    android:backgroundTint="?attr/colorSurface"
     android:theme="@style/Theme.Widget">
 
     <!--
@@ -108,7 +108,7 @@
 
             <android.widget.ImageButton
                 android:id="@+id/widget_play_pause"
-                style="@style/Widget.Auxio.FloatingActionButton.AppWidget"
+                style="@style/Widget.Auxio.MaterialButton.AppWidget.PlayPause"
                 android:layout_width="@dimen/size_btn"
                 android:layout_height="@dimen/size_btn"
                 android:contentDescription="@string/desc_play_pause"

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

@@ -4,8 +4,8 @@
     android:id="@android:id/background"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:backgroundTint="?attr/colorSurface"
     android:background="@drawable/ui_widget_bg"
+    android:backgroundTint="?attr/colorSurface"
     android:theme="@style/Theme.Widget">
 
     <!--
@@ -93,7 +93,7 @@
 
             <android.widget.ImageButton
                 android:id="@+id/widget_play_pause"
-                style="@style/Widget.Auxio.FloatingActionButton.AppWidget"
+                style="@style/Widget.Auxio.MaterialButton.AppWidget.PlayPause"
                 android:layout_width="@dimen/size_btn"
                 android:layout_height="@dimen/size_btn"
                 android:contentDescription="@string/desc_play_pause"

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

@@ -8,7 +8,7 @@
     android:theme="@style/Theme.Widget">
 
     <!--
-    For most widget forms to work, we need to scale the ImageView across a 1:1 aspect ratio.
+    For our widgets to work, we need to scale the ImageView across a 1:1 aspect ratio.
     However, since we are working with a RemoteViews instance, we can't just use ConstraintLayout
     to achieve this. We can use RelativeLayout, but there's no way to force an aspect ratio with
     that layout. However, if we create an invisible ImageView that contains a massive fixed-size
@@ -81,7 +81,7 @@
 
         <android.widget.ImageButton
             android:id="@+id/widget_play_pause"
-            style="@style/Widget.Auxio.FloatingActionButton.AppWidget"
+            style="@style/Widget.Auxio.MaterialButton.AppWidget.PlayPause"
             android:layout_width="@dimen/size_btn"
             android:layout_height="@dimen/size_btn"
             android:contentDescription="@string/desc_play_pause"

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

@@ -4,8 +4,8 @@
     android:id="@android:id/background"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:backgroundTint="?attr/colorSurface"
     android:background="@drawable/ui_widget_bg"
+    android:backgroundTint="?attr/colorSurface"
     android:baselineAligned="false"
     android:orientation="horizontal"
     android:theme="@style/Theme.Widget">
@@ -93,7 +93,7 @@
 
         <android.widget.ImageButton
             android:id="@+id/widget_play_pause"
-            style="@style/Widget.Auxio.FloatingActionButton.AppWidget"
+            style="@style/Widget.Auxio.MaterialButton.AppWidget.PlayPause"
             android:layout_width="@dimen/size_btn"
             android:layout_height="@dimen/size_btn"
             android:contentDescription="@string/desc_play_pause"

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

@@ -81,7 +81,7 @@
 
         <android.widget.ImageButton
             android:id="@+id/widget_play_pause"
-            style="@style/Widget.Auxio.FloatingActionButton.AppWidget"
+            style="@style/Widget.Auxio.MaterialButton.AppWidget.PlayPause"
             android:layout_width="@dimen/size_btn"
             android:layout_height="@dimen/size_btn"
             android:contentDescription="@string/desc_play_pause"

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

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+
     <style name="Widget.Auxio.FloatingActionButton.Adaptive" parent="Widget.Material3.FloatingActionButton.Large.Primary">
         <item name="fabSize">normal</item>
     </style>

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

@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <!-- Dialog style that properly implements dividers in a NestedScrollView -->
-    <style name="Widget.Auxio.Dialog.NestedScrollView" parent="">
-        <item name="android:overScrollMode">never</item>
-        <item name="android:scrollIndicators">top|bottom</item>
-        <item name="android:paddingTop">@dimen/spacing_medium</item>
-    </style>
-</resources>

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

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

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

@@ -1,12 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <!-- Note: Not actually transparent, making it transparent would actually make it translucent -->
+    <!-- Note: Not actually transparent, making it transparent would actually make it translucent
+     TODO: Can actually disable the contrast check on some newer versions -->
     <color name="chrome_transparent">#01fafafa</color>
     <color name="chrome_translucent">#80000000</color>
     <color name="remote_translucent">#80ffffff</color>
 
     <color name="widget_surface">@color/material_dynamic_primary95</color>
-    <color name="widget_surface_inverse">@color/material_dynamic_neutral80</color>
+    <color name="widget_surface_inverse">@color/material_dynamic_neutral20</color>
     <color name="widget_on_surface_inverse">@color/material_dynamic_neutral95</color>
 
     <color name="red_primary">#BC1714</color>

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

@@ -28,7 +28,7 @@
     <string name="set_key_reindex" translatable="false">auxio_reindex</string>
     <string name="set_key_music_dirs" translatable="false">auxio_music_dirs</string>
     <string name="set_key_music_dirs_include" translatable="false">auxio_include_dirs</string>
-    <string name="set_key_observing">auxio_observing</string>
+    <string name="set_key_observing" translatable="false">auxio_observing</string>
     <string name="set_key_quality_tags" translatable="false">auxio_quality_tags</string>
 
     <string name="set_key_search_filter" translatable="false">KEY_SEARCH_FILTER</string>

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

@@ -1,14 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools">
     <!-- ANDROID COMPONENT-SPECIFIC STYLES.-->
 
     <style name="Theme.Auxio.Dialog" parent="ThemeOverlay.Material3.MaterialAlertDialog">
         <item name="android:checkedTextViewStyle">@style/Widget.Auxio.Dialog.CheckedTextView</item>
-        <item name="buttonBarPositiveButtonStyle">@style/Widget.Material3.Button.TextButton.Dialog
-        </item>
-        <item name="buttonBarNegativeButtonStyle">@style/Widget.Material3.Button.TextButton.Dialog
-        </item>
-        <item name="buttonBarNeutralButtonStyle">@style/Widget.Auxio.Dialog.Button.Flush</item>
     </style>
 
     <!-- The style for the checked text view in the custom dialog -->
@@ -16,15 +11,13 @@
         <item name="android:textColor">?android:attr/textColorPrimary</item>
     </style>
 
-    <!-- Custom button style that eliminates the weird margin that the neutral button has -->
-    <style name="Widget.Auxio.Dialog.Button.Flush" parent="Widget.Material3.Button.TextButton.Dialog">
-        <item name="android:layout_marginStart">0dp</item>
-    </style>
-
     <!-- Dialog style that properly implements dividers in a NestedScrollView -->
     <style name="Widget.Auxio.Dialog.NestedScrollView" parent="">
         <item name="android:overScrollMode">never</item>
         <item name="android:paddingTop">@dimen/spacing_medium</item>
+
+        <!-- API 23+ specific -->
+        <item name="android:scrollIndicators" tools:ignore="NewApi">top|bottom</item>
     </style>
 
     <!-- Widget TextView that mimics the main Auxio Primary/Secondary TextViews. -->
@@ -51,7 +44,7 @@
     </style>
 
     <!-- A variant of button that emulates a FAB-ish button that plays along with widget restrictions -->
-    <style name="Widget.Auxio.FloatingActionButton.AppWidget" parent="Widget.AppCompat.Button.Borderless">
+    <style name="Widget.Auxio.MaterialButton.AppWidget.PlayPause" parent="Widget.AppCompat.Button.Borderless">
         <item name="android:minWidth">@dimen/size_btn</item>
         <item name="android:background">@drawable/ui_remote_fab_bg</item>
         <item name="android:tint">?attr/colorOnPrimary</item>

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

@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <!-- Master parent theme -->
+    <!-- TODO: Make the app theme blue before dynamic colors -->
     <style name="Theme.Auxio" parent="Theme.Material3.DynamicColors.DayNight" />
     <!-- Template theme that handles edge-to-edge on other styles variants -->
     <style name="Theme.Auxio.V27" parent="Theme.Auxio">
@@ -32,7 +33,6 @@
         <item name="materialAlertDialogTheme">@style/Theme.Auxio.Dialog</item>
         <item name="sliderStyle">@style/Widget.Auxio.Slider</item>
         <item name="linearProgressIndicatorStyle">@style/Widget.Auxio.LinearProgressIndicator</item>
-        <item name="textInputStyle">@style/Widget.Material3.TextInputLayout.OutlinedBox</item>
         <item name="toolbarNavigationButtonStyle">@style/Widget.Auxio.Toolbar.Navigation</item>
         <item name="actionOverflowButtonStyle">@style/Widget.Auxio.Button.Overflow</item>
 

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

@@ -218,7 +218,9 @@
         <item name="android:paddingEnd">@dimen/spacing_mid_large</item>
         <item name="android:paddingTop">@dimen/spacing_mid_large</item>
         <item name="android:paddingBottom">@dimen/spacing_mid_large</item>
-        <item name="shapeAppearanceOverlay">@style/ShapeAppearanceOverlay.Material3.FloatingActionButton</item>
+        <item name="shapeAppearanceOverlay">
+            @style/ShapeAppearanceOverlay.Material3.FloatingActionButton
+        </item>
     </style>
 
     <style name="Widget.Auxio.FloatingActionButton.Adaptive" parent="Widget.Material3.FloatingActionButton.Primary">

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

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <!--
-    Auxio leverages the Material3 Text Appearances in a strange way, mostly driven by
+    Typography is derived from Inter and it's size-dependent spacing calculation. Auxio does not
-    the author's perception of what looks "right." Guides for usage are placed next to
+    completely adhere to the typography system, sometimes having two variants of a given style in
-    each set of styles.
+    order to bypass the restrictive nature of the default typography.
     -->
 
     <!--
@@ -31,7 +31,7 @@
     </style>
 
     <!--
-    Headline styles are similar to title styles, but are used on tablets.
+    Headline styles are similar to title styles, but are not used as often.
     -->
     <style name="TextAppearance.Auxio.HeadlineLarge" parent="TextAppearance.Material3.HeadlineLarge">
         <item name="fontFamily">@font/inter_semibold</item>
@@ -55,7 +55,7 @@
     </style>
 
     <!--
-    Title styles are often used for headers and dividing elements.
+    Title styles are often used for headers, dividing elements, and items.
     -->
     <style name="TextAppearance.Auxio.TitleLarge" parent="TextAppearance.Material3.TitleLarge">
         <item name="fontFamily">@font/inter_semibold</item>