Skip to content

Fix song unselected when played/paused #224

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
rivaldi8 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix song unselected when played/paused #224

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
17 changes: 11 additions & 6 deletions ...pp/src/main/java/com/simplecityapps/shuttle/ui/screens/library/songs/SongListViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,10 @@ class SongListViewModel @Inject constructor(
mediaImportObserver: SongImportStateProvider,
) : ViewModel() {

private val selectionState = SelectionState<Song>()
// We need to store Song.id instead of Song. Otherwise, when a song is
// played/paused, it mutates so, when checking if it's contained in the
// set of selected songs with Song.equals, it returns false.
private val selectionState = SelectionState<Long>()

private val _sortOrder = MutableStateFlow(sortPreferenceManager.sortOrderSongList)

Expand All @@ -91,7 +94,9 @@ class SongListViewModel @Inject constructor(
selectionState.selectedItems,
_sortOrder,
playlistRepository.getPlaylists(PlaylistQuery.All(mediaProviderType = null)),
) { songs, songImportState, selectedSongs, sortOrder, playlists ->
) { songs, songImportState, selectedSongIds, sortOrder, playlists ->
val selectedSongs = songs.filter { it.id in selectedSongIds }.toSet()

if (songImportState is SongImportState.ImportProgress) {
SongListUiState(
loadingState = SongListUiState.LoadingState.Scanning,
Expand Down Expand Up @@ -125,14 +130,14 @@ class SongListViewModel @Inject constructor(

fun onSongClick(song: Song) {
if (selectionState.isActive()) {
selectionState.toggle(song)
selectionState.toggle(song.id)
} else {
play(song)
}
}

fun onSongLongClick(song: Song) {
selectionState.toggle(song)
selectionState.toggle(song.id)
}

private fun play(song: Song) {
Expand All @@ -154,7 +159,7 @@ class SongListViewModel @Inject constructor(

fun onAddSelectedToQueue() {
viewModelScope.launch {
val selected = selectionState.selectedItems.value.toList()
val selected = selectedSongs()
playbackManager.addToQueue(selected)
_events.emit(SongListUiEvent.AddedToQueue(selected.size))
selectionState.clear()
Expand Down Expand Up @@ -213,7 +218,7 @@ class SongListViewModel @Inject constructor(
selectionState.clear()
}

fun selectedSongs(): List<Song> = selectionState.selectedItems.value.toList()
fun selectedSongs(): List<Song> = uiState.value.selectedSongs.toList()

fun addToPlaylist(playlist: Playlist, playlistData: PlaylistData, ignoreDuplicates: Boolean = false) {
viewModelScope.launch {
Expand Down
Loading