Skip to content

Commit

Permalink
<Merge> playlist-detail-cleanup -> dev
Browse files Browse the repository at this point in the history
  • Loading branch information
@chr56
chr56 committed Aug 21, 2024
2 parents 3d17a02 + bf62137 commit f9e1779
Show file tree
Hide file tree
Showing 8 changed files with 205 additions and 177 deletions.
2 changes: 1 addition & 1 deletion app/src/main/java/player/phonograph/ui/KoinViewmodelDeclaration.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,5 @@ val moduleViewModels = module {
viewModel { param -> PanelViewModel(param.get(), param.get(), param.get()) }
viewModel { param -> ArtistDetailActivityViewModel(param.get()) }
viewModel { param -> AlbumDetailActivityViewModel(param.get()) }
viewModel { param -> PlaylistDetailViewModel(param.get()) }
viewModel { param -> PlaylistDetailViewModel(param.get(), param.get()) }
}
22 changes: 22 additions & 0 deletions app/src/main/java/player/phonograph/ui/modules/playlist/PlaylistActions.kt
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
/*
* Copyright (c) 2022~2024 chr_56
*/

@file:Suppress("ConvertObjectToDataObject")

package player.phonograph.ui.modules.playlist

import player.phonograph.model.Song
import player.phonograph.model.UIMode

sealed interface PlaylistAction

object Fetch : PlaylistAction
class Refresh(@JvmField val fetch: Boolean) : PlaylistAction
class Search(@JvmField val keyword: String) : PlaylistAction
class UpdateMode(val mode: UIMode) : PlaylistAction

sealed interface EditAction : PlaylistAction {
class Move(@JvmField val from: Int, @JvmField val to: Int) : EditAction
class Delete(val song: Song, @JvmField val position: Int) : EditAction
}
131 changes: 61 additions & 70 deletions app/src/main/java/player/phonograph/ui/modules/playlist/PlaylistDetailActivity.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,14 +26,15 @@ import player.phonograph.model.UIMode
import player.phonograph.model.getReadableDurationString
import player.phonograph.model.playlist.FilePlaylistLocation
import player.phonograph.model.playlist.Playlist
import player.phonograph.model.totalDuration
import player.phonograph.repo.mediastore.loaders.PlaylistLoader
import player.phonograph.ui.activities.base.AbsSlidingMusicPanelActivity
import player.phonograph.util.parcelable
import player.phonograph.util.theme.accentColor
import player.phonograph.util.theme.getTintedDrawable
import player.phonograph.util.theme.primaryColor
import player.phonograph.util.ui.hideKeyboard
import player.phonograph.util.ui.setUpFastScrollRecyclerViewColor
import player.phonograph.util.ui.showKeyboard
import util.theme.color.primaryTextColor
import util.theme.color.secondaryDisabledTextColor
import util.theme.color.secondaryTextColor
Expand Down Expand Up @@ -64,7 +65,7 @@ class PlaylistDetailActivity :

private lateinit var binding: ActivityPlaylistDetailBinding

private val model: PlaylistDetailViewModel by viewModel { parametersOf(parseIntent(intent)) }
private val model: PlaylistDetailViewModel by viewModel { parametersOf(parseIntent(intent), emptyList<Song>()) }

private lateinit var adapter: PlaylistSongDisplayAdapter // init in OnCreate() -> setUpRecyclerView()

Expand Down Expand Up @@ -102,61 +103,51 @@ class PlaylistDetailActivity :
prepareRecyclerView()
setUpDashBroad()

initialize()

observeData()

setupOnBackPressCallback()
}


private fun initialize() {
val playlist = model.playlist
if (!checkExistence(playlist)) finish() // File Playlist was deleted
supportActionBar!!.title = playlist.name
execute(Fetch)
}

@SuppressLint("NotifyDataSetChanged")
private fun observeData() {
lifecycleScope.launch {
model.songs.collect { songs ->
if (model.currentMode.value != UIMode.Search) {
adapter.dataset = songs
binding.empty.visibility = if (songs.isEmpty()) VISIBLE else GONE
updateDashboard(model.playlist.value, songs)
}
model.items.collect { songs ->
adapter.dataset = songs
binding.empty.visibility = if (songs.isEmpty()) VISIBLE else GONE
}
}
lifecycleScope.launch {
model.currentMode.collect { mode ->
supportActionBar!!.title =
if (mode == UIMode.Editor)
"${model.playlist.value.name} [${getString(R.string.edit)}]"
"${model.playlist.name} [${getString(R.string.edit)}]"
else
model.playlist.value.name
updateSearchBarVisibility(mode == UIMode.Search)
model.playlist.name
updateBannerVisibility(mode)
adapter.notifyDataSetChanged()
if (mode == UIMode.Search) {
model.searchSongs(model.keyword.value)
}
}
}
lifecycleScope.launch {
model.playlist.collect { playlist ->
model.fetchAllSongs(this@PlaylistDetailActivity)
supportActionBar!!.title = playlist.name
if (playlist.location is FilePlaylistLocation
&& !PlaylistLoader.checkExistence(this@PlaylistDetailActivity, playlist.location.mediastoreId)
) {
// File Playlist was deleted
finish()
}
updateDashboard(playlist, model.songs.value)
}
}
lifecycleScope.launch {
model.keyword.collect { word ->
if (model.currentMode.value == UIMode.Search) {
model.searchSongs(word)
model.totalCount.collect {
with(binding) {
songCountText.text = it.toString()
}
}
}
lifecycleScope.launch {
model.searchResults.collect { songs ->
if (model.currentMode.value == UIMode.Search) {
adapter.dataset = songs
binding.empty.visibility = if (songs.isEmpty()) VISIBLE else GONE
model.totalDuration.collect {
with(binding) {
durationText.text = getReadableDurationString(it)
}
}
}
Expand All @@ -165,7 +156,7 @@ class PlaylistDetailActivity :
private fun setupOnBackPressCallback() {
onBackPressedDispatcher.addCallback {
if (model.currentMode.value != UIMode.Common) {
model.updateCurrentMode(UIMode.Common)
execute(UpdateMode(UIMode.Common))
} else {
remove()
onBackPressedDispatcher.onBackPressed()
Expand Down Expand Up @@ -264,6 +255,11 @@ class PlaylistDetailActivity :
pathText.setTextColor(textColor)


val playlist = model.playlist
nameText.text = playlist.name
pathText.text = playlist.location.text(this@PlaylistDetailActivity)


with(searchBox) {
searchBadge.setImageDrawable(
getTintedDrawable(R.drawable.ic_search_white_24dp, textColor)
Expand All @@ -274,18 +270,18 @@ class PlaylistDetailActivity :
close.setOnClickListener {
val editable = editQuery.editableText
if (editable.isEmpty()) {
model.updateCurrentMode(UIMode.Common)
execute(UpdateMode(UIMode.Common))
} else {
editable.clear()
editQuery.editableText.clear()
}
}
editQuery.setTextColor(textColor)
editQuery.setHintTextColor(iconColor)
editQuery.setBackgroundTint(textColor)
}
searchBox.editQuery.addTextChangedListener { editable ->
if (editable != null) {
model.updateKeyword(editable.toString())
editQuery.addTextChangedListener { editable ->
if (editable != null) {
execute(Search(editable.toString()))
}
}
}
}
Expand All @@ -305,44 +301,35 @@ class PlaylistDetailActivity :
}
}

private fun updateSearchBarVisibility(visibility: Boolean) {
private fun updateBannerVisibility(mode: UIMode) {
with(binding) {
searchBar.visibility = if (visibility) VISIBLE else GONE
searchBox.editQuery.setText(if (visibility) model.keyword.value else "")
updateRecyclerviewPadding(if (visibility) 0 else searchBar.height)
}
}
// Search Bar
val searchBarVisibility = mode == UIMode.Search
searchBar.visibility = if (searchBarVisibility) VISIBLE else GONE
// Dashboard
val statsBarVisibility = mode != UIMode.Search
statsBar.visibility = if (statsBarVisibility) VISIBLE else GONE
// IME
if (searchBarVisibility) {
showKeyboard(this@PlaylistDetailActivity, searchBox.editQuery)
} else {
hideKeyboard(this@PlaylistDetailActivity, searchBox.editQuery)
}

private fun updateDashboard(playlist: Playlist, songs: List<Song>) {
// text
with(binding) {
nameText.text = playlist.name
songCountText.text = songs.size.toString()
durationText.text = getReadableDurationString(songs.totalDuration())
pathText.text = playlist.location.text(this@PlaylistDetailActivity)
}
}

private fun setupMenu(menu: Menu) {
val playlist = model.playlist.value
val iconColor = primaryTextColor(viewModel.activityColor.value)
PlaylistToolbarMenuProvider(::onSearch, ::onRefresh, ::onEdit)
.inflateMenu(menu, this, playlist, iconColor)
PlaylistToolbarMenuProvider(::execute)
.inflateMenu(menu, this, model.playlist, iconColor)
tintMenuActionIcons(binding.toolbar, menu, iconColor)
}

private fun onSearch(): Boolean {
model.updateCurrentMode(UIMode.Search)
return true
}

private fun onRefresh(): Boolean {
model.refreshPlaylist(this)
return true
}

private fun onEdit(): Boolean {
model.updateCurrentMode(UIMode.Editor)
private fun execute(action: PlaylistAction): Boolean {
lifecycleScope.launch {
model.execute(this@PlaylistDetailActivity, action)
}
return true
}

Expand Down Expand Up @@ -370,11 +357,15 @@ class PlaylistDetailActivity :
override fun onMediaStoreChanged() {
if (model.currentMode.value != UIMode.Editor) {
adapter.dataset = emptyList()
model.refreshPlaylist(this@PlaylistDetailActivity)
execute(Refresh(fetch = true))
}
}
}

private fun checkExistence(playlist: Playlist): Boolean =
!(playlist.location is FilePlaylistLocation &&
!PlaylistLoader.checkExistence(this, playlist.location.mediastoreId))

/* *******************
* companion object
* *******************/
Expand Down
Loading

0 comments on commit f9e1779

Please sign in to comment.