From f5ac87a36b6670ff0dd0ee2ee86a1dfed9f7fef7 Mon Sep 17 00:00:00 2001
From: Alexander Capehart <alex@oxycblt.org>
Date: Fri, 3 Jan 2025 14:32:39 -0700
Subject: [PATCH] detail: use only linear recyclerviews

Going to switch to a two-pane layout.
---
 .../org/oxycblt/auxio/detail/DetailFragment.kt    | 15 +--------------
 .../main/res/layout-h360dp/fragment_detail.xml    |  2 +-
 .../main/res/layout-h480dp/fragment_detail.xml    |  2 +-
 .../main/res/layout-sw600dp/fragment_detail.xml   |  2 +-
 .../main/res/layout-w600dp/fragment_detail.xml    |  2 +-
 app/src/main/res/layout/fragment_detail.xml       |  2 +-
 6 files changed, 6 insertions(+), 19 deletions(-)

diff --git a/app/src/main/java/org/oxycblt/auxio/detail/DetailFragment.kt b/app/src/main/java/org/oxycblt/auxio/detail/DetailFragment.kt
index 16aff144f..b417f1960 100644
--- a/app/src/main/java/org/oxycblt/auxio/detail/DetailFragment.kt
+++ b/app/src/main/java/org/oxycblt/auxio/detail/DetailFragment.kt
@@ -83,20 +83,7 @@ abstract class DetailFragment<P : MusicParent, C : Music> :
             overrideOnOverflowMenuClick { onOpenParentMenu() }
         }
 
-        binding.detailRecycler.apply {
-            adapter = getDetailListAdapter()
-            (layoutManager as GridLayoutManager).setFullWidthLookup {
-                if (it != 0) {
-                    val item =
-                        detailModel.artistSongList.value.getOrElse(it - 1) {
-                            return@setFullWidthLookup false
-                        }
-                    item is PlainDivider || item is PlainHeader
-                } else {
-                    true
-                }
-            }
-        }
+        binding.detailRecycler.adapter = getDetailListAdapter()
 
         spacingSmall = requireContext().getDimenPixels(R.dimen.spacing_small)
     }
diff --git a/app/src/main/res/layout-h360dp/fragment_detail.xml b/app/src/main/res/layout-h360dp/fragment_detail.xml
index 3511712ed..33db2269b 100644
--- a/app/src/main/res/layout-h360dp/fragment_detail.xml
+++ b/app/src/main/res/layout-h360dp/fragment_detail.xml
@@ -204,7 +204,7 @@
 
     <org.oxycblt.auxio.list.recycler.AuxioRecyclerView
         android:id="@+id/detail_recycler"
-        style="@style/Widget.Auxio.RecyclerView.Grid"
+        style="@style/Widget.Auxio.RecyclerView.Linear"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         app:layout_behavior="com.google.android.material.appbar.AppBarLayout$ScrollingViewBehavior"
diff --git a/app/src/main/res/layout-h480dp/fragment_detail.xml b/app/src/main/res/layout-h480dp/fragment_detail.xml
index 9a9e62f20..a82c18baf 100644
--- a/app/src/main/res/layout-h480dp/fragment_detail.xml
+++ b/app/src/main/res/layout-h480dp/fragment_detail.xml
@@ -186,7 +186,7 @@
 
     <org.oxycblt.auxio.list.recycler.AuxioRecyclerView
         android:id="@+id/detail_recycler"
-        style="@style/Widget.Auxio.RecyclerView.Grid"
+        style="@style/Widget.Auxio.RecyclerView.Linear"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         app:layout_behavior="com.google.android.material.appbar.AppBarLayout$ScrollingViewBehavior"
diff --git a/app/src/main/res/layout-sw600dp/fragment_detail.xml b/app/src/main/res/layout-sw600dp/fragment_detail.xml
index 81acc19c5..940e16b8e 100644
--- a/app/src/main/res/layout-sw600dp/fragment_detail.xml
+++ b/app/src/main/res/layout-sw600dp/fragment_detail.xml
@@ -201,7 +201,7 @@
 
     <org.oxycblt.auxio.list.recycler.AuxioRecyclerView
         android:id="@+id/detail_recycler"
-        style="@style/Widget.Auxio.RecyclerView.Grid"
+        style="@style/Widget.Auxio.RecyclerView.Linear"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         app:layout_behavior="com.google.android.material.appbar.AppBarLayout$ScrollingViewBehavior"
diff --git a/app/src/main/res/layout-w600dp/fragment_detail.xml b/app/src/main/res/layout-w600dp/fragment_detail.xml
index 3511712ed..33db2269b 100644
--- a/app/src/main/res/layout-w600dp/fragment_detail.xml
+++ b/app/src/main/res/layout-w600dp/fragment_detail.xml
@@ -204,7 +204,7 @@
 
     <org.oxycblt.auxio.list.recycler.AuxioRecyclerView
         android:id="@+id/detail_recycler"
-        style="@style/Widget.Auxio.RecyclerView.Grid"
+        style="@style/Widget.Auxio.RecyclerView.Linear"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         app:layout_behavior="com.google.android.material.appbar.AppBarLayout$ScrollingViewBehavior"
diff --git a/app/src/main/res/layout/fragment_detail.xml b/app/src/main/res/layout/fragment_detail.xml
index 82c95571a..9b5372433 100644
--- a/app/src/main/res/layout/fragment_detail.xml
+++ b/app/src/main/res/layout/fragment_detail.xml
@@ -176,7 +176,7 @@
 
     <org.oxycblt.auxio.list.recycler.AuxioRecyclerView
         android:id="@+id/detail_recycler"
-        style="@style/Widget.Auxio.RecyclerView.Grid"
+        style="@style/Widget.Auxio.RecyclerView.Linear"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         app:layout_behavior="com.google.android.material.appbar.AppBarLayout$ScrollingViewBehavior"