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

playback: re-add headers to search

Browse source
This commit is contained in:
Alexander Capehart 2024-08-27 16:50:54 -06:00
parent f0dda6c43e
commit 35646d6a2d
No known key found for this signature in database
GPG key ID: 37DBE3621FE9AD47
1 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
app/src/main/java/org/oxycblt/auxio/music/service/MusicServiceFragment.kt
View file

@ -30,6 +30,7 @@ import kotlinx.coroutines.Job
import kotlinx.coroutines.launch import kotlinx.coroutines.launch
import org.oxycblt.auxio.ForegroundListener import org.oxycblt.auxio.ForegroundListener
import org.oxycblt.auxio.ForegroundServiceNotification import org.oxycblt.auxio.ForegroundServiceNotification
import org.oxycblt.auxio.R
import org.oxycblt.auxio.music.IndexingState import org.oxycblt.auxio.music.IndexingState
import org.oxycblt.auxio.music.MusicRepository import org.oxycblt.auxio.music.MusicRepository
import org.oxycblt.auxio.music.MusicSettings import org.oxycblt.auxio.music.MusicSettings
@ -147,25 +148,25 @@ constructor(
deviceLibrary.artists, deviceLibrary.artists,
deviceLibrary.genres, deviceLibrary.genres,
userLibrary.playlists) userLibrary.playlists)
searchEngine.search(items, query).concat() searchEngine.search(items, query).toMediaItems()
} }
private fun SearchEngine.Items.concat(): MutableList<MediaItem> { private fun SearchEngine.Items.toMediaItems(): MutableList<MediaItem> {
val music = mutableListOf<MediaItem>() val music = mutableListOf<MediaItem>()
if (songs != null) { if (songs != null) {
music.addAll(songs.map { it.toMediaItem(context, null) }) music.addAll(songs.map { it.toMediaItem(context, null, header(R.string.lbl_songs)) })
} }
if (albums != null) { if (albums != null) {
music.addAll(albums.map { it.toMediaItem(context) }) music.addAll(albums.map { it.toMediaItem(context, null, header(R.string.lbl_albums)) })
} }
if (artists != null) { if (artists != null) {
music.addAll(artists.map { it.toMediaItem(context) }) music.addAll(artists.map { it.toMediaItem(context, header(R.string.lbl_artists)) })
} }
if (genres != null) { if (genres != null) {
music.addAll(genres.map { it.toMediaItem(context) }) music.addAll(genres.map { it.toMediaItem(context, header(R.string.lbl_genres)) })
} }
if (playlists != null) { if (playlists != null) {
music.addAll(playlists.map { it.toMediaItem(context) }) music.addAll(playlists.map { it.toMediaItem(context, header(R.string.lbl_playlists)) })
} }
return music return music
} }