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

Do not show "Remove" (from queue) button for the song that is actually playing

Browse source
This commit is contained in:
vfsfitvnm 2022-07-01 15:02:09 +02:00
parent 03333cd157
commit 91edb9672e
3 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/components/themed/MediaItemMenu.kt
View file

@ -165,7 +165,7 @@ fun NonQueuedMediaItemMenu(
@Composable @Composable
fun QueuedMediaItemMenu( fun QueuedMediaItemMenu(
mediaItem: MediaItem, mediaItem: MediaItem,
indexInQueue: Int, indexInQueue: Int?,
modifier: Modifier = Modifier, modifier: Modifier = Modifier,
onDismiss: (() -> Unit)? = null, onDismiss: (() -> Unit)? = null,
onGlobalRouteEmitted: (() -> Unit)? = null onGlobalRouteEmitted: (() -> Unit)? = null
@ -176,9 +176,9 @@ fun QueuedMediaItemMenu(
BaseMediaItemMenu( BaseMediaItemMenu(
mediaItem = mediaItem, mediaItem = mediaItem,
onDismiss = onDismiss ?: menuState::hide, onDismiss = onDismiss ?: menuState::hide,
onRemoveFromQueue = { onRemoveFromQueue = if (indexInQueue != null) ({
player?.removeMediaItem(indexInQueue) player?.removeMediaItem(indexInQueue)
}, }) else null,
onGlobalRouteEmitted = onGlobalRouteEmitted, onGlobalRouteEmitted = onGlobalRouteEmitted,
modifier = modifier modifier = modifier
) )

2
app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/views/CurrentPlaylistView.kt
View file

@ -100,7 +100,7 @@ fun CurrentPlaylistView(
menuContent = { menuContent = {
QueuedMediaItemMenu( QueuedMediaItemMenu(
mediaItem = mediaItem, mediaItem = mediaItem,
indexInQueue = index, indexInQueue = if (isPlayingThisMediaItem) null else index,
onGlobalRouteEmitted = onGlobalRouteEmitted onGlobalRouteEmitted = onGlobalRouteEmitted
) )
}, },

2
app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/views/PlayerView.kt
View file

@ -219,7 +219,7 @@ fun PlayerView(
menuState.display { menuState.display {
QueuedMediaItemMenu( QueuedMediaItemMenu(
mediaItem = playerState.mediaItem ?: MediaItem.EMPTY, mediaItem = playerState.mediaItem ?: MediaItem.EMPTY,
indexInQueue = playerState.mediaItemIndex, indexInQueue = null,
onDismiss = menuState::hide, onDismiss = menuState::hide,
onGlobalRouteEmitted = layoutState.collapse onGlobalRouteEmitted = layoutState.collapse
) )