Skip to content

Fix/Make only one instance of a song have the playing icon #2290

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
laoluogun wants to merge 1 commit into
base: dev
Choose a base branch
from
+6 −1
Open

Fix/Make only one instance of a song have the playing icon #2290

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion composeApp/src/commonMain/kotlin/com/maxrave/simpmusic/ui/component/ModalBottomSheet.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -927,6 +927,11 @@ fun QueueBottomSheet(
queueData?.data?.listTracks ?: emptyList()
}
}
val currentSongIndex by remember(queue, songEntity) {
derivedStateOf {
musicServiceHandler.currentOrderIndex().takeIf { it > -1 } ?: 0
}
}
val loadMoreState by remember {
derivedStateOf {
queueData?.queueState ?: QueueData.StateSource.STATE_CREATED
Expand Down Expand Up @@ -1167,7 +1172,7 @@ fun QueueBottomSheet(
) { _ ->
SongFullWidthItems(
track = track,
isPlaying = track.videoId == songEntity?.videoId,
isPlaying = index == currentSongIndex,
modifier =
Modifier
.fillMaxWidth(),
Expand Down
Loading