diff --git a/CHANGELOG.md b/CHANGELOG.md index 6eba0d742..63626d664 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,7 +3,7 @@ ## 3.1.0 #### What's New -- **Playlists.** The long-awaited feature has arrived, with more functionality coming soon. +- Added playlist functionality #### What's Improved - Sorting now handles numbers of arbitrary length diff --git a/app/src/main/java/org/oxycblt/auxio/detail/DetailViewModel.kt b/app/src/main/java/org/oxycblt/auxio/detail/DetailViewModel.kt index a1682ffb7..92052a955 100644 --- a/app/src/main/java/org/oxycblt/auxio/detail/DetailViewModel.kt +++ b/app/src/main/java/org/oxycblt/auxio/detail/DetailViewModel.kt @@ -59,9 +59,9 @@ constructor( private val musicSettings: MusicSettings, private val playbackSettings: PlaybackSettings ) : ViewModel(), MusicRepository.UpdateListener { - private var currentSongJob: Job? = null - // --- SONG --- + + private var currentSongJob: Job? = null private val _currentSong = MutableStateFlow(null) /** The current [Song] to display. Null if there is nothing to show. */ @@ -279,7 +279,7 @@ constructor( * * @param uid The [Music.UID] of the [Playlist] to update [currentPlaylist] to. Must be valid. */ - fun setPlaylistUid(uid: Music.UID) { + fun setPlaylist(uid: Music.UID) { logD("Opening Playlist [uid: $uid]") _currentPlaylist.value = musicRepository.userLibrary?.findPlaylist(uid)?.also(::refreshPlaylistList) diff --git a/app/src/main/java/org/oxycblt/auxio/detail/PlaylistDetailFragment.kt b/app/src/main/java/org/oxycblt/auxio/detail/PlaylistDetailFragment.kt index 14ded5fa3..c7cf92cde 100644 --- a/app/src/main/java/org/oxycblt/auxio/detail/PlaylistDetailFragment.kt +++ b/app/src/main/java/org/oxycblt/auxio/detail/PlaylistDetailFragment.kt @@ -122,7 +122,7 @@ class PlaylistDetailFragment : // --- VIEWMODEL SETUP --- // DetailViewModel handles most initialization from the navigation argument. - detailModel.setPlaylistUid(args.playlistUid) + detailModel.setPlaylist(args.playlistUid) collectImmediately(detailModel.currentPlaylist, ::updatePlaylist) collectImmediately(detailModel.playlistList, ::updateList) collectImmediately(detailModel.editedPlaylist, ::updateEditedPlaylist)