From ac1e62fc02397eaaf7bb559288b9a4e31d76f8df Mon Sep 17 00:00:00 2001
From: austinried <4966622+austinried@users.noreply.github.com>
Date: Fri, 9 Oct 2026 08:42:45 +0000
Subject: [PATCH] library: drop shuffle fab from album and playlist detail

---
 .../subtracks/ui/components/HeroDetailScaffold.kt  | 14 +-------------
 .../com/subtracks/ui/library/AlbumDetailScreen.kt  |  1 -
 .../subtracks/ui/library/PlaylistDetailScreen.kt   |  1 -
 3 files changed, 1 insertion(+), 15 deletions(-)

diff --git a/app/src/main/kotlin/com/subtracks/ui/components/HeroDetailScaffold.kt b/app/src/main/kotlin/com/subtracks/ui/components/HeroDetailScaffold.kt
index 59634634..cd327d71 100644
--- a/app/src/main/kotlin/com/subtracks/ui/components/HeroDetailScaffold.kt
+++ b/app/src/main/kotlin/com/subtracks/ui/components/HeroDetailScaffold.kt
@@ -98,7 +98,6 @@ fun HeroDetailScaffold(
     header: @Composable (controlsModifier: Modifier, topInset: Dp) -> Unit,
     content: LazyListScope.(rowModifier: Modifier) -> Unit,
     modifier: Modifier = Modifier,
-    onShuffle: (() -> Unit)? = null,
 ) {
     val effectiveArtwork = artwork ?: baseArtworkColors()
     CompositionLocalProvider(LocalContentColor provides MaterialTheme.colorScheme.onBackground) {
@@ -151,7 +150,7 @@ fun HeroDetailScaffold(
                     state = listState,
                     contentPadding =
                         PaddingValues(
-                            bottom = (if (onShuffle != null) 88.dp else 16.dp) + with(density) { navBarBottom.toDp() },
+                            bottom = 16.dp + with(density) { navBarBottom.toDp() },
                         ),
                     modifier = Modifier.fillMaxSize(),
                 ) {
@@ -202,17 +201,6 @@ fun HeroDetailScaffold(
                                 onClickLabel = stringResource(R.string.scroll_to_top),
                             ) { scope.launch { listState.animateScrollToItem(0) } },
                 )
-
-                if (onShuffle != null) {
-                    ShuffleFab(
-                        onClick = onShuffle,
-                        visible = barFraction > 0f,
-                        modifier =
-                            Modifier
-                                .align(Alignment.BottomEnd)
-                                .padding(end = 16.dp, bottom = 16.dp + with(density) { navBarBottom.toDp() }),
-                    )
-                }
             }
         }
     }
diff --git a/app/src/main/kotlin/com/subtracks/ui/library/AlbumDetailScreen.kt b/app/src/main/kotlin/com/subtracks/ui/library/AlbumDetailScreen.kt
index 8a2ca232..e2c49d52 100644
--- a/app/src/main/kotlin/com/subtracks/ui/library/AlbumDetailScreen.kt
+++ b/app/src/main/kotlin/com/subtracks/ui/library/AlbumDetailScreen.kt
@@ -248,7 +248,6 @@ fun AlbumDetailScreen(
             }
         },
         modifier = modifier,
-        onShuffle = onShuffle.takeIf { songs.isNotEmpty() },
     )
 }
 
diff --git a/app/src/main/kotlin/com/subtracks/ui/library/PlaylistDetailScreen.kt b/app/src/main/kotlin/com/subtracks/ui/library/PlaylistDetailScreen.kt
index 5df1ed0e..33b90f6e 100644
--- a/app/src/main/kotlin/com/subtracks/ui/library/PlaylistDetailScreen.kt
+++ b/app/src/main/kotlin/com/subtracks/ui/library/PlaylistDetailScreen.kt
@@ -178,7 +178,6 @@ fun PlaylistDetailScreen(
             }
         },
         modifier = modifier,
-        onShuffle = onShuffle.takeIf { songs.itemCount > 0 },
     )
 }