Merge branch 'room-playlist' of https://github.com/h4h13/RetroMusicPlayer into room-playlist

2020-08-24 22:00:49 +05:30 · 2020-08-24 22:00:49 +05:30 · 3265580275
commit 3265580275
parent bbfec6f489 cee4565c34
126 changed files with 1023 additions and 718 deletions
--- a/app/src/main/java/code/name/monkey/retromusic/fragments/DetailListFragment.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/fragments/DetailListFragment.kt
@ -3,6 +3,8 @@ package code.name.monkey.retromusic.fragments
 import android.os.Bundle
 import android.view.View
 import android.widget.ImageView
+import androidx.lifecycle.Observer
+import androidx.lifecycle.lifecycleScope
 import androidx.navigation.fragment.navArgs
 import androidx.recyclerview.widget.GridLayoutManager
 import androidx.recyclerview.widget.LinearLayoutManager
@ -10,15 +12,14 @@ import code.name.monkey.retromusic.*
 import code.name.monkey.retromusic.adapter.album.AlbumAdapter
 import code.name.monkey.retromusic.adapter.artist.ArtistAdapter
 import code.name.monkey.retromusic.adapter.song.SongAdapter
+import code.name.monkey.retromusic.db.toSong
 import code.name.monkey.retromusic.fragments.albums.AlbumClickListener
 import code.name.monkey.retromusic.fragments.artists.ArtistClickListener
 import code.name.monkey.retromusic.fragments.base.AbsMainActivityFragment
 import code.name.monkey.retromusic.model.Album
 import code.name.monkey.retromusic.model.Artist
-import code.name.monkey.retromusic.model.Song
 import code.name.monkey.retromusic.repository.RealRepository
 import kotlinx.android.synthetic.main.fragment_playlist_detail.*
-import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers.IO
 import kotlinx.coroutines.Dispatchers.Main
 import kotlinx.coroutines.launch
@ -48,32 +49,86 @@ class DetailListFragment : AbsMainActivityFragment(R.layout.fragment_playlist_de
            RECENT_ALBUMS -> {
                loadAlbums(R.string.recent_albums, RECENT_ALBUMS)
            }
-            FAVOURITES -> {
-                loadFavorite()
-            }
+            FAVOURITES -> loadFavorite()
+            HISTORY_PLAYLIST -> loadHistory()
+            LAST_ADDED_PLAYLIST -> lastAddedSongs()
+            TOP_PLAYED_PLAYLIST -> topPlayed()
        }
    }

+    private fun lastAddedSongs() {
+        toolbar.setTitle(R.string.last_added)
+        val songAdapter = SongAdapter(
+            requireActivity(),
+            mutableListOf(),
+            R.layout.item_list, null
+        )
+        recyclerView.apply {
+            adapter = songAdapter
+            layoutManager = linearLayoutManager()
+        }
+        lifecycleScope.launch(IO) {
+            val songs = repository.recentSongs()
+            withContext(Main) { songAdapter.swapDataSet(songs) }
+        }
+    }
+
+    private fun topPlayed() {
+        toolbar.setTitle(R.string.my_top_tracks)
+        val songAdapter = SongAdapter(
+            requireActivity(),
+            mutableListOf(),
+            R.layout.item_list, null
+        )
+        recyclerView.apply {
+            adapter = songAdapter
+            layoutManager = linearLayoutManager()
+        }
+        lifecycleScope.launch(IO) {
+            val songs = repository.recentSongs()
+            withContext(Main) { songAdapter.swapDataSet(songs) }
+        }
+    }
+
+    private fun loadHistory() {
+        toolbar.setTitle(R.string.history)
+
+        val songAdapter = SongAdapter(
+            requireActivity(),
+            mutableListOf(),
+            R.layout.item_list, null
+        )
+        recyclerView.apply {
+            adapter = songAdapter
+            layoutManager = linearLayoutManager()
+        }
+        repository.historySong().observe(viewLifecycleOwner, Observer {
+            val songs = it.map { historyEntity -> historyEntity.toSong() }
+            songAdapter.swapDataSet(songs)
+        })
+    }
+
    private fun loadFavorite() {
        toolbar.setTitle(R.string.favorites)
-        CoroutineScope(IO).launch {
-            val songs = repository.favoritePlaylistHome()
-            withContext(Main) {
-                recyclerView.apply {
-                    adapter = SongAdapter(
-                        requireActivity(),
-                        songs.arrayList as MutableList<Song>,
-                        R.layout.item_list, null
-                    )
-                    layoutManager = linearLayoutManager()
-                }
-            }
+        val songAdapter = SongAdapter(
+            requireActivity(),
+            mutableListOf(),
+            R.layout.item_list, null
+        )
+        recyclerView.apply {
+            adapter = songAdapter
+            layoutManager = linearLayoutManager()
        }
+        repository.favorites().observe(viewLifecycleOwner, Observer {
+            println(it.size)
+            val songs = it.map { songEntity -> songEntity.toSong() }
+            songAdapter.swapDataSet(songs)
+        })
    }

    private fun loadArtists(title: Int, type: Int) {
        toolbar.setTitle(title)
-        CoroutineScope(IO).launch {
+        lifecycleScope.launch(IO) {
            val artists =
                if (type == TOP_ARTISTS) repository.topArtists() else repository.recentArtists()
            withContext(Main) {
@ -87,7 +142,7 @@ class DetailListFragment : AbsMainActivityFragment(R.layout.fragment_playlist_de

    private fun loadAlbums(title: Int, type: Int) {
        toolbar.setTitle(title)
-        CoroutineScope(IO).launch {
+        lifecycleScope.launch(IO) {
            val albums =
                if (type == TOP_ALBUMS) repository.topAlbums() else repository.recentAlbums()
            withContext(Main) {
--- a/app/src/main/java/code/name/monkey/retromusic/fragments/LibraryViewModel.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/fragments/LibraryViewModel.kt
@ -5,7 +5,9 @@ import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import code.name.monkey.retromusic.db.PlaylistWithSongs
+import code.name.monkey.retromusic.db.toPlayCount
 import code.name.monkey.retromusic.fragments.ReloadType.*
+import code.name.monkey.retromusic.helper.MusicPlayerRemote
 import code.name.monkey.retromusic.interfaces.MusicServiceEventListener
 import code.name.monkey.retromusic.model.*
 import code.name.monkey.retromusic.repository.RealRepository
@ -15,7 +17,7 @@ import kotlinx.coroutines.async
 import kotlinx.coroutines.launch

 class LibraryViewModel(
-    private val realRepository: RealRepository
+    private val repository: RealRepository
 ) : ViewModel(), MusicServiceEventListener {

    private val paletteColor = MutableLiveData<Int>()
@ -49,37 +51,37 @@ class LibraryViewModel(
        artists.value = loadArtists.await()
        playlists.value = loadPlaylists.await()
        roomPlaylists.value = loadPlaylistsWithSongs.await()
-        //genres.value = loadGenres.await()
+        genres.value = loadGenres.await()
    }

    private val loadHome: Deferred<List<Home>>
-        get() = viewModelScope.async { realRepository.homeSections() }
+        get() = viewModelScope.async { repository.homeSections() }

    private val loadSongs: Deferred<List<Song>>
-        get() = viewModelScope.async(IO) { realRepository.allSongs() }
+        get() = viewModelScope.async(IO) { repository.allSongs() }

    private val loadAlbums: Deferred<List<Album>>
        get() = viewModelScope.async(IO) {
-            realRepository.allAlbums()
+            repository.allAlbums()
        }

    private val loadArtists: Deferred<List<Artist>>
        get() = viewModelScope.async(IO) {
-            realRepository.albumArtists()
+            repository.albumArtists()
        }

    private val loadPlaylists: Deferred<List<Playlist>>
        get() = viewModelScope.async(IO) {
-            realRepository.allPlaylists()
+            repository.allPlaylists()
        }
    private val loadPlaylistsWithSongs: Deferred<List<PlaylistWithSongs>>
        get() = viewModelScope.async(IO) {
-            realRepository.playlistWithSongs()
+            repository.playlistWithSongs()
        }

    private val loadGenres: Deferred<List<Genre>>
        get() = viewModelScope.async(IO) {
-            realRepository.allGenres()
+            repository.allGenres()
        }


@ -119,6 +121,22 @@ class LibraryViewModel(

    override fun onPlayingMetaChanged() {
        println("onPlayingMetaChanged")
+        viewModelScope.launch(IO) {
+            val entity = repository.songPresentInHistory(MusicPlayerRemote.currentSong)
+            if (entity != null) {
+                repository.updateHistorySong(MusicPlayerRemote.currentSong)
+            } else {
+                repository.addSongToHistory(MusicPlayerRemote.currentSong)
+            }
+            val songs = repository.checkSongExistInPlayCount(MusicPlayerRemote.currentSong.id)
+            if (songs.isNotEmpty()) {
+                repository.updateSongInPlayCount(songs.first().apply {
+                    playCount += playCount + 1
+                })
+            } else {
+                repository.insertSongInPlayCount(MusicPlayerRemote.currentSong.toPlayCount())
+            }
+        }
    }

    override fun onPlayStateChanged() {
--- a/app/src/main/java/code/name/monkey/retromusic/fragments/albums/AlbumDetailsFragment.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/fragments/albums/AlbumDetailsFragment.kt
@ -26,6 +26,7 @@ import code.name.monkey.retromusic.adapter.song.SimpleSongAdapter
 import code.name.monkey.retromusic.dialogs.AddToRetroPlaylist
 import code.name.monkey.retromusic.dialogs.DeleteSongsDialog
 import code.name.monkey.retromusic.extensions.applyColor
+import code.name.monkey.retromusic.extensions.applyOutlineColor
 import code.name.monkey.retromusic.extensions.show
 import code.name.monkey.retromusic.fragments.base.AbsMainActivityFragment
 import code.name.monkey.retromusic.glide.AlbumGlideRequest
@ -240,7 +241,7 @@ class AlbumDetailsFragment : AbsMainActivityFragment(R.layout.fragment_album_det

    private fun setColors(color: MediaNotificationProcessor) {
        shuffleAction.applyColor(color.backgroundColor)
-        playAction.applyColor(color.backgroundColor)
+        playAction.applyOutlineColor(color.backgroundColor)
    }

    override fun onAlbumClick(albumId: Int, view: View) {
--- a/app/src/main/java/code/name/monkey/retromusic/fragments/albums/AlbumDetailsViewModel.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/fragments/albums/AlbumDetailsViewModel.kt
@ -27,7 +27,7 @@ class AlbumDetailsViewModel(
    fun getAlbum(): LiveData<Album> = _album
    fun getArtist(): LiveData<Artist> = _artist
    fun getAlbumInfo(): LiveData<LastFmAlbum> = _lastFmAlbum
-    fun getMoreAlbums(): LiveData<List<Album>> = _moreAlbums;
+    fun getMoreAlbums(): LiveData<List<Album>> = _moreAlbums

    init {
        loadAlbumDetails()
--- a/app/src/main/java/code/name/monkey/retromusic/fragments/artists/ArtistDetailsFragment.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/fragments/artists/ArtistDetailsFragment.kt
@ -22,6 +22,7 @@ import code.name.monkey.retromusic.adapter.album.HorizontalAlbumAdapter
 import code.name.monkey.retromusic.adapter.song.SimpleSongAdapter
 import code.name.monkey.retromusic.dialogs.AddToRetroPlaylist
 import code.name.monkey.retromusic.extensions.applyColor
+import code.name.monkey.retromusic.extensions.applyOutlineColor
 import code.name.monkey.retromusic.extensions.show
 import code.name.monkey.retromusic.extensions.showToast
 import code.name.monkey.retromusic.fragments.albums.AlbumClickListener
@ -72,7 +73,6 @@ class ArtistDetailsFragment : AbsMainActivityFragment(R.layout.fragment_artist_d
        setupRecyclerView()
        postponeEnterTransition()
        detailsViewModel.getArtist().observe(viewLifecycleOwner, Observer {
-
            showArtist(it)
            startPostponedEnterTransition()
        })
@ -191,7 +191,7 @@ class ArtistDetailsFragment : AbsMainActivityFragment(R.layout.fragment_artist_d

    private fun setColors(color: MediaNotificationProcessor) {
        shuffleAction.applyColor(color.backgroundColor)
-        playAction.applyColor(color.backgroundColor)
+        playAction.applyOutlineColor(color.backgroundColor)
    }

    override fun onAlbumClick(albumId: Int, view: View) {
--- a/app/src/main/java/code/name/monkey/retromusic/fragments/artists/ArtistDetailsViewModel.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/fragments/artists/ArtistDetailsViewModel.kt
@ -6,8 +6,8 @@ import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import code.name.monkey.retromusic.interfaces.MusicServiceEventListener
 import code.name.monkey.retromusic.model.Artist
-import code.name.monkey.retromusic.repository.RealRepository
 import code.name.monkey.retromusic.network.model.LastFmArtist
+import code.name.monkey.retromusic.repository.RealRepository
 import kotlinx.coroutines.Deferred
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.async
--- a/app/src/main/java/code/name/monkey/retromusic/fragments/base/AbsPlayerFragment.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/fragments/base/AbsPlayerFragment.kt
@ -1,10 +1,8 @@
 package code.name.monkey.retromusic.fragments.base

-import android.annotation.SuppressLint
 import android.content.ContentUris
 import android.content.Intent
 import android.media.MediaMetadataRetriever
-import android.os.AsyncTask
 import android.os.Build
 import android.os.Bundle
 import android.provider.MediaStore
@ -22,29 +20,34 @@ import code.name.monkey.retromusic.EXTRA_ARTIST_ID
 import code.name.monkey.retromusic.R
 import code.name.monkey.retromusic.activities.tageditor.AbsTagEditorActivity
 import code.name.monkey.retromusic.activities.tageditor.SongTagEditorActivity
+import code.name.monkey.retromusic.db.PlaylistEntity
 import code.name.monkey.retromusic.dialogs.*
 import code.name.monkey.retromusic.extensions.hide
+import code.name.monkey.retromusic.extensions.whichFragment
 import code.name.monkey.retromusic.fragments.LibraryViewModel
+import code.name.monkey.retromusic.fragments.ReloadType.Playlists
 import code.name.monkey.retromusic.fragments.player.PlayerAlbumCoverFragment
 import code.name.monkey.retromusic.helper.MusicPlayerRemote
 import code.name.monkey.retromusic.interfaces.PaletteColorHolder
 import code.name.monkey.retromusic.model.Song
 import code.name.monkey.retromusic.model.lyrics.Lyrics
 import code.name.monkey.retromusic.repository.RealRepository
+import code.name.monkey.retromusic.service.MusicService
 import code.name.monkey.retromusic.util.*
 import kotlinx.android.synthetic.main.shadow_statusbar_toolbar.*
 import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.Dispatchers.IO
+import kotlinx.coroutines.Dispatchers.Main
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import org.koin.android.ext.android.get
+import org.koin.android.ext.android.inject
 import org.koin.androidx.viewmodel.ext.android.sharedViewModel
 import java.io.FileNotFoundException

 abstract class AbsPlayerFragment(@LayoutRes layout: Int) : AbsMainActivityFragment(layout),
    Toolbar.OnMenuItemClickListener, PaletteColorHolder, PlayerAlbumCoverFragment.Callbacks {

-    private var updateIsFavoriteTask: AsyncTask<*, *, *>? = null
-    private var updateLyricsAsyncTask: AsyncTask<*, *, *>? = null
    private var playerAlbumCoverFragment: PlayerAlbumCoverFragment? = null
    protected val libraryViewModel by sharedViewModel<LibraryViewModel>()

@ -70,7 +73,7 @@ abstract class AbsPlayerFragment(@LayoutRes layout: Int) : AbsMainActivityFragme
                return true
            }
            R.id.action_add_to_playlist -> {
-                lifecycleScope.launch(Dispatchers.IO) {
+                lifecycleScope.launch(IO) {
                    val playlists = get<RealRepository>().roomPlaylists()
                    withContext(Dispatchers.Main) {
                        AddToRetroPlaylist.create(playlists, song)
@ -159,7 +162,18 @@ abstract class AbsPlayerFragment(@LayoutRes layout: Int) : AbsMainActivityFragme
    }

    protected open fun toggleFavorite(song: Song) {
-        MusicUtil.toggleFavorite(requireActivity(), song)
+        lifecycleScope.launch(IO) {
+            val playlist: PlaylistEntity = repository.favoritePlaylist().first()
+            val songEntity = song.toSongEntity(playlist.playListId)
+            val isFavorite = repository.isFavoriteSong(songEntity).isNotEmpty()
+            if (isFavorite) {
+                repository.removeSongFromPlaylist(songEntity)
+            } else {
+                repository.insertSongs(listOf(song.toSongEntity(playlist.playListId)))
+                libraryViewModel.forceReload(Playlists)
+            }
+            requireContext().sendBroadcast(Intent(MusicService.FAVORITE_STATE_CHANGED))
+        }
    }

    abstract fun playerToolbar(): Toolbar?
@ -182,84 +196,62 @@ abstract class AbsPlayerFragment(@LayoutRes layout: Int) : AbsMainActivityFragme
        updateLyrics()
    }

-    override fun onDestroyView() {
-        if (updateIsFavoriteTask != null && !updateIsFavoriteTask!!.isCancelled) {
-            updateIsFavoriteTask!!.cancel(true)
-        }
-        if (updateLyricsAsyncTask != null && !updateLyricsAsyncTask!!.isCancelled) {
-            updateLyricsAsyncTask!!.cancel(true)
-        }
-        super.onDestroyView()
-    }
-
-    @SuppressLint("StaticFieldLeak")
    fun updateIsFavorite() {
-        if (updateIsFavoriteTask != null) {
-            updateIsFavoriteTask!!.cancel(false)
-        }
-        updateIsFavoriteTask = object : AsyncTask<Song, Void, Boolean>() {
-            override fun doInBackground(vararg params: Song): Boolean {
-                return MusicUtil.isFavorite(requireActivity(), params[0])
-            }
-
-            override fun onPostExecute(isFavorite: Boolean) {
-                val res = if (isFavorite)
-                    R.drawable.ic_favorite
-                else
-                    R.drawable.ic_favorite_border
-
+        lifecycleScope.launch(IO) {
+            val playlist: PlaylistEntity = repository.favoritePlaylist().first()
+            val song = MusicPlayerRemote.currentSong.toSongEntity(playlist.playListId)
+            val isFavorite = repository.isFavoriteSong(song).isNotEmpty()
+            withContext(Dispatchers.Main) {
+                val icon = if (isFavorite) R.drawable.ic_favorite else R.drawable.ic_favorite_border
                val drawable =
-                    RetroUtil.getTintedVectorDrawable(requireContext(), res, toolbarIconColor())
-                if (playerToolbar() != null && playerToolbar()!!.menu.findItem(R.id.action_toggle_favorite) != null)
-                    playerToolbar()!!.menu.findItem(R.id.action_toggle_favorite).setIcon(drawable)
-                        .title =
-                        if (isFavorite) getString(R.string.action_remove_from_favorites) else getString(
-                            R.string.action_add_to_favorites
-                        )
-            }
-        }.execute(MusicPlayerRemote.currentSong)
-    }
-
-    @SuppressLint("StaticFieldLeak")
-    private fun updateLyrics() {
-        if (updateLyricsAsyncTask != null) updateLyricsAsyncTask!!.cancel(false)
-
-        updateLyricsAsyncTask = object : AsyncTask<Song, Void, Lyrics>() {
-            override fun onPreExecute() {
-                super.onPreExecute()
-                setLyrics(null)
-            }
-
-            override fun doInBackground(vararg params: Song): Lyrics? {
-                try {
-                    var data: String? =
-                        LyricUtil.getStringFromFile(params[0].title, params[0].artistName)
-                    return if (TextUtils.isEmpty(data)) {
-                        data = MusicUtil.getLyrics(params[0])
-                        return if (TextUtils.isEmpty(data)) {
-                            null
-                        } else {
-                            Lyrics.parse(params[0], data)
-                        }
-                    } else Lyrics.parse(params[0], data!!)
-                } catch (err: FileNotFoundException) {
-                    return null
+                    RetroUtil.getTintedVectorDrawable(requireContext(), icon, toolbarIconColor())
+                if (playerToolbar() != null) {
+                    playerToolbar()?.menu?.findItem(R.id.action_toggle_favorite)
+                        ?.setIcon(drawable)?.title =
+                        if (isFavorite) getString(R.string.action_remove_from_favorites)
+                        else getString(R.string.action_add_to_favorites)
                }
            }
+        }
+    }

-            override fun onPostExecute(l: Lyrics?) {
-                setLyrics(l)
+    private fun updateLyrics() {
+        setLyrics(null)
+        lifecycleScope.launch(IO) {
+            val song = MusicPlayerRemote.currentSong
+            val lyrics = try {
+                var data: String? = LyricUtil.getStringFromFile(song.title, song.artistName)
+                if (TextUtils.isEmpty(data)) {
+                    data = MusicUtil.getLyrics(song)
+                    if (TextUtils.isEmpty(data)) {
+                        null
+                    } else {
+                        Lyrics.parse(song, data)
+                    }
+                } else Lyrics.parse(song, data!!)
+            } catch (err: FileNotFoundException) {
+                null
            }
-
-            override fun onCancelled(s: Lyrics?) {
-                onPostExecute(null)
+            withContext(Main) {
+                setLyrics(lyrics)
            }
-        }.execute(MusicPlayerRemote.currentSong)
+        }
    }

    open fun setLyrics(l: Lyrics?) {
    }

+    private val repository by inject<RealRepository>()
+
+    override fun onActivityCreated(savedInstanceState: Bundle?) {
+        super.onActivityCreated(savedInstanceState)
+        lifecycleScope.launch(IO) {
+            if (repository.checkPlaylistExists(getString(R.string.favorites)).isEmpty()) {
+                repository.createPlaylist(PlaylistEntity(getString(R.string.favorites)))
+            }
+        }
+    }
+
    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
        super.onViewCreated(view, savedInstanceState)
        if (PreferenceUtil.isFullScreenMode &&
@ -267,8 +259,7 @@ abstract class AbsPlayerFragment(@LayoutRes layout: Int) : AbsMainActivityFragme
        ) {
            view.findViewById<View>(R.id.status_bar).visibility = View.GONE
        }
-        playerAlbumCoverFragment =
-            childFragmentManager.findFragmentById(R.id.playerAlbumCoverFragment) as PlayerAlbumCoverFragment?
+        playerAlbumCoverFragment = whichFragment(R.id.playerAlbumCoverFragment)
        playerAlbumCoverFragment?.setCallbacks(this)

        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M)
--- a/app/src/main/java/code/name/monkey/retromusic/fragments/folder/FoldersFragment.java
+++ b/app/src/main/java/code/name/monkey/retromusic/fragments/folder/FoldersFragment.java
@ -290,7 +290,7 @@ public class FoldersFragment extends AbsMainActivityFragment implements
                    }
                }
                if (startIndex > -1) {
-                    MusicPlayerRemote.INSTANCE.openQueue(songs, startIndex, true);
+                    MusicPlayerRemote.openQueue(songs, startIndex, true);
                } else {
                    final File finalFile = file1;
                    Snackbar.make(coordinatorLayout, Html.fromHtml(
--- a/app/src/main/java/code/name/monkey/retromusic/fragments/genres/GenreDetailsFragment.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/fragments/genres/GenreDetailsFragment.kt
@ -36,7 +36,7 @@ class GenreDetailsFragment : AbsMainActivityFragment(R.layout.fragment_playlist_
        mainActivity.addMusicServiceEventListener(detailsViewModel)
        mainActivity.setSupportActionBar(toolbar)
        mainActivity.hideBottomBarVisibility(false)
-
+        progressIndicator.hide()
        setupRecyclerView()
        detailsViewModel.getSongs().observe(viewLifecycleOwner, androidx.lifecycle.Observer {
            songs(it)
--- a/app/src/main/java/code/name/monkey/retromusic/fragments/home/HomeFragment.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/fragments/home/HomeFragment.kt
@ -21,10 +21,11 @@ import android.view.View
 import androidx.core.os.bundleOf
 import androidx.lifecycle.Observer
 import androidx.lifecycle.lifecycleScope
-import androidx.navigation.findNavController
 import androidx.recyclerview.widget.LinearLayoutManager
-import code.name.monkey.retromusic.EXTRA_PLAYLIST
+import code.name.monkey.retromusic.HISTORY_PLAYLIST
+import code.name.monkey.retromusic.LAST_ADDED_PLAYLIST
 import code.name.monkey.retromusic.R
+import code.name.monkey.retromusic.TOP_PLAYED_PLAYLIST
 import code.name.monkey.retromusic.adapter.HomeAdapter
 import code.name.monkey.retromusic.extensions.findActivityNavController
 import code.name.monkey.retromusic.fragments.LibraryViewModel
@ -32,9 +33,6 @@ import code.name.monkey.retromusic.fragments.base.AbsMainActivityFragment
 import code.name.monkey.retromusic.glide.ProfileBannerGlideRequest
 import code.name.monkey.retromusic.glide.UserProfileGlideRequest
 import code.name.monkey.retromusic.helper.MusicPlayerRemote
-import code.name.monkey.retromusic.model.smartplaylist.HistoryPlaylist
-import code.name.monkey.retromusic.model.smartplaylist.LastAddedPlaylist
-import code.name.monkey.retromusic.model.smartplaylist.TopTracksPlaylist
 import code.name.monkey.retromusic.repository.Repository
 import code.name.monkey.retromusic.util.NavigationUtil
 import code.name.monkey.retromusic.util.PreferenceUtil
@ -74,15 +72,15 @@ class HomeFragment :

        lastAdded.setOnClickListener {
            findActivityNavController(R.id.fragment_container).navigate(
-                R.id.playlistDetailsFragment,
-                bundleOf(EXTRA_PLAYLIST to LastAddedPlaylist())
+                R.id.detailListFragment,
+                bundleOf("type" to LAST_ADDED_PLAYLIST)
            )
        }

        topPlayed.setOnClickListener {
            findActivityNavController(R.id.fragment_container).navigate(
-                R.id.playlistDetailsFragment,
-                bundleOf(EXTRA_PLAYLIST to TopTracksPlaylist())
+                R.id.detailListFragment,
+                bundleOf("type" to TOP_PLAYED_PLAYLIST)
            )
        }

@ -96,9 +94,9 @@ class HomeFragment :
        }

        history.setOnClickListener {
-            requireActivity().findNavController(R.id.fragment_container).navigate(
-                R.id.playlistDetailsFragment,
-                bundleOf(EXTRA_PLAYLIST to HistoryPlaylist())
+            findActivityNavController(R.id.fragment_container).navigate(
+                R.id.detailListFragment,
+                bundleOf("type" to HISTORY_PLAYLIST)
            )
        }

--- a/app/src/main/java/code/name/monkey/retromusic/fragments/player/fit/FitPlaybackControlsFragment.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/fragments/player/fit/FitPlaybackControlsFragment.kt
@ -3,9 +3,7 @@ package code.name.monkey.retromusic.fragments.player.fit
 import android.animation.ObjectAnimator
 import android.graphics.PorterDuff
 import android.os.Bundle
-import android.view.LayoutInflater
 import android.view.View
-import android.view.ViewGroup
 import android.view.animation.AccelerateInterpolator
 import android.view.animation.DecelerateInterpolator
 import android.view.animation.LinearInterpolator
@ -26,7 +24,6 @@ import code.name.monkey.retromusic.helper.PlayPauseButtonOnClickHandler
 import code.name.monkey.retromusic.misc.SimpleOnSeekbarChangeListener
 import code.name.monkey.retromusic.service.MusicService
 import code.name.monkey.retromusic.util.MusicUtil
-
 import code.name.monkey.retromusic.util.PreferenceUtil
 import code.name.monkey.retromusic.util.color.MediaNotificationProcessor
 import kotlinx.android.synthetic.main.fragment_fit_playback_controls.*
--- a/app/src/main/java/code/name/monkey/retromusic/fragments/playlists/PlaylistDetailsFragment.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/fragments/playlists/PlaylistDetailsFragment.kt
@ -127,7 +127,7 @@ class PlaylistDetailsFragment : AbsMainActivityFragment(R.layout.fragment_playli
        return String(Character.toChars(unicode))
    }

-    public override fun onPause() {
+    override fun onPause() {
        if (recyclerViewDragDropManager != null) {
            recyclerViewDragDropManager!!.cancelDrag()
        }
--- a/app/src/main/java/code/name/monkey/retromusic/fragments/playlists/PlaylistDetailsViewModel.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/fragments/playlists/PlaylistDetailsViewModel.kt
@ -31,10 +31,11 @@ class PlaylistDetailsViewModel(
        loadPlaylistSongs(playlist)
    }

-    private fun loadPlaylistSongs(playlist: PlaylistWithSongs) = viewModelScope.launch(Dispatchers.IO) {
-        val songs: List<Song> = realRepository.playlistSongs(playlist)
-        withContext(Main) { _playListSongs.postValue(songs) }
-    }
+    private fun loadPlaylistSongs(playlist: PlaylistWithSongs) =
+        viewModelScope.launch(Dispatchers.IO) {
+            val songs: List<Song> = realRepository.playlistSongs(playlist)
+            withContext(Main) { _playListSongs.postValue(songs) }
+        }

    override fun onMediaStoreChanged() {
        /*if (playlist !is AbsCustomPlaylist) {