diff --git a/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/components/themed/MediaItemMenu.kt b/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/components/themed/MediaItemMenu.kt index 385f4a4310..ce6e1f1ea1 100644 --- a/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/components/themed/MediaItemMenu.kt +++ b/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/components/themed/MediaItemMenu.kt @@ -284,6 +284,7 @@ fun QueuedMediaItemMenu( onRemoveFromQueue = if (indexInQueue != null) ({ binder?.player?.removeMediaItem(indexInQueue) }) else null, + onPlayNext = { binder?.player?.addNext(mediaItem) }, modifier = modifier ) } diff --git a/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/components/themed/PlaylistsItemMenu.kt b/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/components/themed/PlaylistsItemMenu.kt index b7aa69dc83..27140a4692 100644 --- a/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/components/themed/PlaylistsItemMenu.kt +++ b/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/components/themed/PlaylistsItemMenu.kt @@ -33,6 +33,7 @@ import androidx.compose.ui.res.stringResource import androidx.compose.ui.text.ExperimentalTextApi import androidx.compose.ui.unit.IntOffset import androidx.compose.ui.unit.dp +import androidx.media3.common.MediaItem import androidx.media3.common.util.UnstableApi import it.vfsfitvnm.vimusic.Database import it.vfsfitvnm.vimusic.LocalPlayerServiceBinder @@ -47,6 +48,7 @@ import it.vfsfitvnm.vimusic.ui.items.PlaylistItem import it.vfsfitvnm.vimusic.ui.styling.Dimensions import it.vfsfitvnm.vimusic.ui.styling.LocalAppearance import it.vfsfitvnm.vimusic.ui.styling.px +import it.vfsfitvnm.vimusic.utils.addNext import it.vfsfitvnm.vimusic.utils.playlistSortByKey import it.vfsfitvnm.vimusic.utils.playlistSortOrderKey import it.vfsfitvnm.vimusic.utils.rememberPreference @@ -87,6 +89,9 @@ fun PlaylistsItemMenu( mutableStateOf(0.dp) } + val binder = LocalPlayerServiceBinder.current + + AnimatedContent( targetState = isViewingPlaylists, transitionSpec = { @@ -254,7 +259,6 @@ fun PlaylistsItemMenu( ) } - onEnqueue?.let { onEnqueue -> MenuEntry( icon = R.drawable.enqueue, diff --git a/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/screens/player/Queue.kt b/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/screens/player/Queue.kt index 66d1fad175..e64c390984 100644 --- a/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/screens/player/Queue.kt +++ b/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/screens/player/Queue.kt @@ -113,6 +113,7 @@ import it.vfsfitvnm.vimusic.utils.DisposableListener import it.vfsfitvnm.vimusic.utils.LeftAction import it.vfsfitvnm.vimusic.utils.RightActions import it.vfsfitvnm.vimusic.utils.UiTypeKey +import it.vfsfitvnm.vimusic.utils.addNext import it.vfsfitvnm.vimusic.utils.asMediaItem import it.vfsfitvnm.vimusic.utils.downloadedStateMedia import it.vfsfitvnm.vimusic.utils.enqueue