hamystudio/muza
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

Simplify queries to move song in playlist

Browse Source
This commit is contained in:
vfsfitvnm
2022-09-15 18:56:34 +02:00
parent 19b19fe958
commit e13d083a8c
3 changed files with 14 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/components/themed/MediaItemMenu.kt
View File

@@ -132,17 +132,8 @@ fun InPlaylistMediaItemMenu(
onDismiss = onDismiss,
onRemoveFromPlaylist = {
transaction {
Database.delete(
SongPlaylistMap(
songId = song.id,
playlistId = playlistId,
position = positionInPlaylist
)
)
Database.decrementSongPositions(
playlistId = playlistId,
fromPosition = positionInPlaylist + 1
)
Database.move(playlistId, positionInPlaylist, Int.MAX_VALUE)
Database.delete(SongPlaylistMap(song.id, playlistId, Int.MAX_VALUE))
}
},
modifier = modifier

24
app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/screens/LocalPlaylistScreen.kt
View File

@@ -92,28 +92,8 @@ fun LocalPlaylistScreen(playlistId: Long) {
lazyListState = lazyListState,
key = playlistWithSongs.songs,
onDragEnd = { fromIndex, toIndex ->
transaction {
if (fromIndex > toIndex) {
Database.incrementSongPositions(
playlistId = playlistWithSongs.playlist.id,
fromPosition = toIndex,
toPosition = fromIndex - 1
)
} else if (fromIndex < toIndex) {
Database.decrementSongPositions(
playlistId = playlistWithSongs.playlist.id,
fromPosition = fromIndex + 1,
toPosition = toIndex
)
}
Database.update(
SongPlaylistMap(
songId = playlistWithSongs.songs[fromIndex].id,
playlistId = playlistWithSongs.playlist.id,
position = toIndex
)
)
query {
Database.move(playlistWithSongs.playlist.id, fromIndex, toIndex)
}
},
extraItemCount = 1