Fabio/Auxio
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

detail: add playing indicator to genre artists

Browse source 
Add playing indicators to artists within the genre detail view.
This commit is contained in:
Alexander Capehart 2022-11-14 20:33:00 -07:00
parent aa50c82635
commit d764cc7c4e
No known key found for this signature in database
GPG key ID: 37DBE3621FE9AD47
2 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
app/src/main/java/org/oxycblt/auxio/detail/DetailViewModel.kt
View file

@ -98,7 +98,6 @@ class DetailViewModel(application: Application) :
var artistSort: Sort var artistSort: Sort
get() = settings.detailArtistSort get() = settings.detailArtistSort
set(value) { set(value) {
logD(value)
settings.detailArtistSort = value settings.detailArtistSort = value
currentArtist.value?.let(::refreshArtistData) currentArtist.value?.let(::refreshArtistData)
} }
@ -227,7 +226,7 @@ class DetailViewModel(application: Application) :
for (entry in byDisc.entries) { for (entry in byDisc.entries) {
val disc = entry.key val disc = entry.key
val discSongs = entry.value val discSongs = entry.value
data.add(DiscHeader(disc)) // Ensure ID uniqueness data.add(DiscHeader(disc))
data.addAll(discSongs) data.addAll(discSongs)
} }
} else { } else {

15
app/src/main/java/org/oxycblt/auxio/detail/GenreDetailFragment.kt
View file

@ -203,11 +203,16 @@ class GenreDetailFragment :
} }
private fun updatePlayback(song: Song?, parent: MusicParent?, isPlaying: Boolean) { private fun updatePlayback(song: Song?, parent: MusicParent?, isPlaying: Boolean) {
if (parent is Genre && parent == unlikelyToBeNull(detailModel.currentGenre.value)) { var item: Item? = null
detailAdapter.updateIndicator(song, isPlaying)
} else { if (parent is Artist) {
// Ignore song playback not from the genre item = parent
detailAdapter.updateIndicator(null, isPlaying)
} }
if (parent is Genre && parent.uid == unlikelyToBeNull(detailModel.currentGenre.value).uid) {
item = song
}
detailAdapter.updateIndicator(item, isPlaying)
} }
} }