Siklos/Metro
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fixed crash when clicking on Playlist in the Search Tab

Browse source
This commit is contained in:
Prathamesh More 2022-03-24 19:23:59 +05:30
parent ea56e1d99a
commit f6d640b84a
2 changed files with 7 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

7
app/src/main/java/code/name/monkey/retromusic/adapter/SearchAdapter.kt
View file

@ -28,7 +28,6 @@ import androidx.recyclerview.widget.RecyclerView
import code.name.monkey.appthemehelper.ThemeStore import code.name.monkey.appthemehelper.ThemeStore
import code.name.monkey.retromusic.* import code.name.monkey.retromusic.*
import code.name.monkey.retromusic.adapter.base.MediaEntryViewHolder import code.name.monkey.retromusic.adapter.base.MediaEntryViewHolder
import code.name.monkey.retromusic.db.PlaylistEntity
import code.name.monkey.retromusic.db.PlaylistWithSongs import code.name.monkey.retromusic.db.PlaylistWithSongs
import code.name.monkey.retromusic.glide.GlideApp import code.name.monkey.retromusic.glide.GlideApp
import code.name.monkey.retromusic.glide.RetroGlideExtension import code.name.monkey.retromusic.glide.RetroGlideExtension
@ -56,7 +55,7 @@ class SearchAdapter(
if (dataSet[position] is Album) return ALBUM if (dataSet[position] is Album) return ALBUM
if (dataSet[position] is Artist) return if ((dataSet[position] as Artist).isAlbumArtist) ALBUM_ARTIST else ARTIST if (dataSet[position] is Artist) return if ((dataSet[position] as Artist).isAlbumArtist) ALBUM_ARTIST else ARTIST
if (dataSet[position] is Genre) return GENRE if (dataSet[position] is Genre) return GENRE
if (dataSet[position] is PlaylistEntity) return PLAYLIST if (dataSet[position] is PlaylistWithSongs) return PLAYLIST
return if (dataSet[position] is Song) SONG else HEADER return if (dataSet[position] is Song) SONG else HEADER
} }
@ -121,8 +120,8 @@ class SearchAdapter(
) )
} }
PLAYLIST -> { PLAYLIST -> {
val playlist = dataSet[position] as PlaylistEntity val playlist = dataSet[position] as PlaylistWithSongs
holder.title?.text = playlist.playlistName holder.title?.text = playlist.playlistEntity.playlistName
//holder.text?.text = MusicUtil.playlistInfoString(activity, playlist.songs) //holder.text?.text = MusicUtil.playlistInfoString(activity, playlist.songs)
} }
ALBUM_ARTIST -> { ALBUM_ARTIST -> {

8
app/src/main/java/code/name/monkey/retromusic/repository/SearchRepository.kt
View file

@ -16,7 +16,7 @@ package code.name.monkey.retromusic.repository
import android.content.Context import android.content.Context
import code.name.monkey.retromusic.R import code.name.monkey.retromusic.R
import code.name.monkey.retromusic.db.PlaylistEntity import code.name.monkey.retromusic.db.PlaylistWithSongs
import code.name.monkey.retromusic.fragments.search.Filter import code.name.monkey.retromusic.fragments.search.Filter
import code.name.monkey.retromusic.model.Album import code.name.monkey.retromusic.model.Album
import code.name.monkey.retromusic.model.Artist import code.name.monkey.retromusic.model.Artist
@ -93,10 +93,10 @@ class RealSearchRepository(
} }
/** Playlists **/ /** Playlists **/
val playlist: List<PlaylistEntity> = val playlist: List<PlaylistWithSongs> =
if (filter == Filter.PLAYLISTS || filter == Filter.NO_FILTER) { if (filter == Filter.PLAYLISTS || filter == Filter.NO_FILTER) {
roomRepository.playlists().filter { playlist -> roomRepository.playlistWithSongs().filter { playlist ->
playlist.playlistName.lowercase().contains(searchString.lowercase()) playlist.playlistEntity.playlistName.lowercase().contains(searchString.lowercase())
} }
} else { } else {
emptyList() emptyList()