beenull/ViMusic
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Tweak shuffle queue button UI

Browse source
This commit is contained in:
vfsfitvnm 2022-10-08 13:00:28 +02:00
parent d363f35801
commit 7b6676e7c4
2 changed files with 132 additions and 124 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/components/themed/FloatingActionsContainer.kt
View file

@ -11,6 +11,7 @@ import androidx.compose.foundation.ScrollState
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.BoxScope
import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.WindowInsets
import androidx.compose.foundation.layout.WindowInsetsSides
import androidx.compose.foundation.layout.asPaddingValues
import androidx.compose.foundation.layout.only
@ -38,6 +39,7 @@ fun BoxScope.FloatingActionsContainerWithScrollToTop(
visible: Boolean = true,
iconId: Int? = null,
onClick: (() -> Unit)? = null,
windowInsets: WindowInsets = LocalPlayerAwareWindowInsets.current
) {
val transitionState = remember {
MutableTransitionState<ScrollingInfo?>(ScrollingInfo())
@ -48,6 +50,7 @@ fun BoxScope.FloatingActionsContainerWithScrollToTop(
onScrollToTop = lazyGridState::smoothScrollToTop,
iconId = iconId,
onClick = onClick,
windowInsets = windowInsets,
modifier = modifier
)
}
@ -60,6 +63,7 @@ fun BoxScope.FloatingActionsContainerWithScrollToTop(
visible: Boolean = true,
iconId: Int? = null,
onClick: (() -> Unit)? = null,
windowInsets: WindowInsets = LocalPlayerAwareWindowInsets.current
) {
val transitionState = remember {
MutableTransitionState<ScrollingInfo?>(ScrollingInfo())
@ -70,6 +74,7 @@ fun BoxScope.FloatingActionsContainerWithScrollToTop(
onScrollToTop = lazyListState::smoothScrollToTop,
iconId = iconId,
onClick = onClick,
windowInsets = windowInsets,
modifier = modifier
)
}
@ -82,6 +87,7 @@ fun BoxScope.FloatingActionsContainerWithScrollToTop(
visible: Boolean = true,
iconId: Int? = null,
onClick: (() -> Unit)? = null,
windowInsets: WindowInsets = LocalPlayerAwareWindowInsets.current
) {
val transitionState = remember {
MutableTransitionState<ScrollingInfo?>(ScrollingInfo())
@ -91,6 +97,7 @@ fun BoxScope.FloatingActionsContainerWithScrollToTop(
transitionState = transitionState,
iconId = iconId,
onClick = onClick,
windowInsets = windowInsets,
modifier = modifier
)
}
@ -99,13 +106,13 @@ fun BoxScope.FloatingActionsContainerWithScrollToTop(
@Composable
fun BoxScope.FloatingActions(
transitionState: MutableTransitionState<ScrollingInfo?>,
windowInsets: WindowInsets,
modifier: Modifier = Modifier,
onScrollToTop: (suspend () -> Unit)? = null,
iconId: Int? = null,
onClick: (() -> Unit)? = null,
onClick: (() -> Unit)? = null
) {
val transition = updateTransition(transitionState, "")
val windowInsets = LocalPlayerAwareWindowInsets.current
val bottomPaddingValues = windowInsets.only(WindowInsetsSides.Bottom).asPaddingValues()

45
app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/screens/player/Queue.kt
View file

@ -50,6 +50,7 @@ import it.vfsfitvnm.vimusic.ui.components.BottomSheet
import it.vfsfitvnm.vimusic.ui.components.BottomSheetState
import it.vfsfitvnm.vimusic.ui.components.LocalMenuState
import it.vfsfitvnm.vimusic.ui.components.MusicBars
import it.vfsfitvnm.vimusic.ui.components.themed.FloatingActionsContainerWithScrollToTop
import it.vfsfitvnm.vimusic.ui.components.themed.IconButton
import it.vfsfitvnm.vimusic.ui.components.themed.QueuedMediaItemMenu
import it.vfsfitvnm.vimusic.ui.items.SongItem
@ -125,24 +126,24 @@ fun Queue(
extraItemCount = 0
)
val rippleIndication = rememberRipple(bounded = false)
Column {
Box(
modifier = Modifier
.background(colorPalette.background1)
.weight(1f)
) {
ReorderingLazyColumn(
reorderingState = reorderingState,
contentPadding = windowInsets
.only(WindowInsetsSides.Horizontal + WindowInsetsSides.Top).asPaddingValues(),
horizontalAlignment = Alignment.CenterHorizontally,
modifier = Modifier
.background(colorPalette.background0)
.fillMaxSize()
.nestedScroll(remember {
layoutState.nestedScrollConnection(reorderingState.lazyListState.firstVisibleItemIndex == 0 && reorderingState.lazyListState.firstVisibleItemScrollOffset == 0)
})
.background(colorPalette.background1)
.weight(1f)
) {
items(
items = windows,
@ -253,6 +254,22 @@ fun Queue(
}
}
FloatingActionsContainerWithScrollToTop(
lazyListState = reorderingState.lazyListState,
iconId = R.drawable.shuffle,
visible = !reorderingState.isDragging,
windowInsets = windowInsets.only(WindowInsetsSides.Horizontal),
onClick = {
reorderingState.coroutineScope.launch {
reorderingState.lazyListState.smoothScrollToTop()
}.invokeOnCompletion {
binder.player.shuffleQueue()
}
}
)
}
Box(
modifier = Modifier
.clickable(onClick = layoutState::collapseSoft)
@ -282,22 +299,6 @@ fun Queue(
.align(Alignment.Center)
.size(18.dp)
)
IconButton(
icon = R.drawable.shuffle,
color = colorPalette.text,
onClick = {
reorderingState.coroutineScope.launch {
reorderingState.lazyListState.smoothScrollToTop()
}.invokeOnCompletion {
binder.player.shuffleQueue()
}
},
modifier = Modifier
.padding(horizontal = 4.dp, vertical = 8.dp)
.size(20.dp)
.align(Alignment.CenterEnd)
)
}
}
}