Skip to content
Snippets Groups Projects
Commit 7da67c5d authored by Nicolas Pomepuy's avatar Nicolas Pomepuy Committed by Duncan McNamara
Browse files

Fix the mini visualizer leaking the HeaderMediaListActivity

parent 95d137cf
No related branches found
No related tags found
1 merge request!1857Fix mini visualizer state in HeaderMediaListActivity
Pipeline #438129 passed with stage
in 8 minutes and 33 seconds
......@@ -167,15 +167,6 @@ open class HeaderMediaListActivity : AudioPlayerContainerActivity(), IEventsHand
binding.songs.addItemDecoration(RecyclerSectionItemDecoration(resources.getDimensionPixelSize(R.dimen.recycler_section_header_height), true, viewModel.tracksProvider))
}
val playlistModel = PlaylistModel.get(this)
PlaylistManager.currentPlayedMedia.observe(this) {
audioBrowserAdapter.currentMedia = it
}
playlistModel.dataset.asFlow().conflate().onEach {
audioBrowserAdapter.setCurrentlyPlaying(playlistModel.playing)
delay(50L)
}.launchWhenStarted(lifecycleScope)
audioBrowserAdapter.setModel(playlistModel)
binding.btnShuffle.setOnClickListener {
viewModel.playlist?.let { MediaUtils.playTracks(this, it, SecureRandom().nextInt(min(playlist.tracksCount, MEDIALIBRARY_PAGE_SIZE)), true) }
}
......@@ -239,6 +230,24 @@ open class HeaderMediaListActivity : AudioPlayerContainerActivity(), IEventsHand
binding.browserFastScroller.setRecyclerView(binding.songs, viewModel.tracksProvider)
}
override fun onResume() {
super.onResume()
val playlistModel = PlaylistModel.get(this)
PlaylistManager.currentPlayedMedia.observe(this) {
audioBrowserAdapter.currentMedia = it
}
playlistModel.dataset.asFlow().conflate().onEach {
audioBrowserAdapter.setCurrentlyPlaying(playlistModel.playing)
delay(50L)
}.launchWhenStarted(lifecycleScope)
audioBrowserAdapter.setModel(playlistModel)
}
override fun onPause() {
super.onPause()
audioBrowserAdapter.setCurrentlyPlaying(false)
}
override fun onStop() {
super.onStop()
stopActionMode()
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment