Do not show "Remove" (from queue) button for the song that is actually playing
This commit is contained in:
@@ -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
|
||||||
)
|
)
|
||||||
|
|||||||
@@ -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
|
||||||
)
|
)
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -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
|
||||||
)
|
)
|
||||||
|
|||||||
Reference in New Issue
Block a user