mirror of
https://github.com/cmclark00/RetroMusicPlayer.git
synced 2025-05-18 16:15:20 +01:00
refactor code
This commit is contained in:
parent
f4c56c8484
commit
d6a99f99e4
29 changed files with 299 additions and 178 deletions
|
@ -2,9 +2,9 @@ package code.name.monkey.retromusic.loaders
|
|||
|
||||
|
||||
import android.content.Context
|
||||
|
||||
import java.util.ArrayList
|
||||
import code.name.monkey.retromusic.misc.DisposingObserver
|
||||
import code.name.monkey.retromusic.model.Playlist
|
||||
import code.name.monkey.retromusic.model.Song
|
||||
import code.name.monkey.retromusic.model.smartplaylist.AbsSmartPlaylist
|
||||
import code.name.monkey.retromusic.model.smartplaylist.HistoryPlaylist
|
||||
import code.name.monkey.retromusic.model.smartplaylist.LastAddedPlaylist
|
||||
|
@ -13,9 +13,9 @@ import io.reactivex.Observable
|
|||
|
||||
object HomeLoader {
|
||||
|
||||
fun getRecentAndTopThings(
|
||||
context: Context): Observable<ArrayList<AbsSmartPlaylist>> {
|
||||
fun getRecentAndTopThings(context: Context): Observable<ArrayList<AbsSmartPlaylist>> {
|
||||
val objects = ArrayList<AbsSmartPlaylist>()
|
||||
|
||||
return Observable.create { e ->
|
||||
|
||||
HistoryPlaylist(context).getSongs(context).subscribe { songs ->
|
||||
|
@ -56,6 +56,4 @@ object HomeLoader {
|
|||
}
|
||||
return Observable.just(playlists)
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
|
|
@ -24,7 +24,7 @@ object LastAddedSongsLoader {
|
|||
return SongLoader.getSongs(makeLastAddedCursor(context))
|
||||
}
|
||||
|
||||
fun makeLastAddedCursor(@NonNull context: Context): Cursor? {
|
||||
private fun makeLastAddedCursor(@NonNull context: Context): Cursor? {
|
||||
val cutoff = PreferenceUtil.getInstance().lastAddedCutoff
|
||||
|
||||
return SongLoader.makeSongCursor(
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue