Changes Playlist to PlaylistEntity

app/src/main/java/code/name/monkey/retromusic/fragments/LibraryViewModel.kt

@@ -89,6 +89,8 @@ class LibraryViewModel(
             Albums -> albums.value = loadAlbums.await()
             Artists -> artists.value = loadArtists.await()
             HomeSections -> home.value = loadHome.await()
+            Playlists -> roomPlaylists.value = loadPlaylistsWithSongs.await()
+            Genres -> genres.value = loadGenres.await()
         }
     }
 
@@ -136,5 +138,7 @@ enum class ReloadType {
     Songs,
     Albums,
     Artists,
-    HomeSections
+    HomeSections,
+    Playlists,
+    Genres,
 }

app/src/main/java/code/name/monkey/retromusic/fragments/playlists/PlaylistDetailsFragment.kt

@@ -12,11 +12,9 @@ import androidx.recyclerview.widget.RecyclerView
 import code.name.monkey.retromusic.R
 import code.name.monkey.retromusic.adapter.song.OrderablePlaylistSongAdapter
 import code.name.monkey.retromusic.adapter.song.SongAdapter
+import code.name.monkey.retromusic.db.PlaylistWithSongs
 import code.name.monkey.retromusic.extensions.dipToPix
 import code.name.monkey.retromusic.fragments.base.AbsMainActivityFragment
-import code.name.monkey.retromusic.helper.menu.PlaylistMenuHelper
-import code.name.monkey.retromusic.model.AbsCustomPlaylist
-import code.name.monkey.retromusic.model.Playlist
 import code.name.monkey.retromusic.model.Song
 import code.name.monkey.retromusic.util.PlaylistsUtil
 import com.h6ah4i.android.widget.advrecyclerview.animator.RefactoredDefaultItemAnimator
@@ -32,7 +30,7 @@ class PlaylistDetailsFragment : AbsMainActivityFragment(R.layout.fragment_playli
         parametersOf(arguments.extraPlaylist)
     }
 
-    private lateinit var playlist: Playlist
+    private lateinit var playlist: PlaylistWithSongs
     private lateinit var adapter: SongAdapter
 
     private var wrappedAdapter: RecyclerView.Adapter<*>? = null
@@ -46,53 +44,49 @@ class PlaylistDetailsFragment : AbsMainActivityFragment(R.layout.fragment_playli
         mainActivity.hideBottomBarVisibility(false)
 
         playlist = arguments.extraPlaylist
+        toolbar.title = playlist.playlistEntity.playlistName
 
         setUpRecyclerView()
 
         viewModel.getSongs().observe(viewLifecycleOwner, Observer {
             songs(it)
         })
-
-        viewModel.getPlaylist().observe(viewLifecycleOwner, Observer {
-            playlist = it
-            toolbar.title = it.name
-        })
     }
 
     private fun setUpRecyclerView() {
         recyclerView.layoutManager = LinearLayoutManager(requireContext())
-        if (playlist is AbsCustomPlaylist) {
+        /*if (playlist is AbsCustomPlaylist) {
             adapter = SongAdapter(requireActivity(), ArrayList(), R.layout.item_list, null)
             recyclerView.adapter = adapter
-        } else {
-            recyclerViewDragDropManager = RecyclerViewDragDropManager()
-            val animator = RefactoredDefaultItemAnimator()
-            adapter = OrderablePlaylistSongAdapter(requireActivity(),
-                ArrayList(),
-                R.layout.item_list,
-                null,
-                object : OrderablePlaylistSongAdapter.OnMoveItemListener {
-                    override fun onMoveItem(fromPosition: Int, toPosition: Int) {
-                        if (PlaylistsUtil.moveItem(
-                                requireContext(),
-                                playlist.id,
-                                fromPosition,
-                                toPosition
-                            )
-                        ) {
-                            val song = adapter.dataSet.removeAt(fromPosition)
-                            adapter.dataSet.add(toPosition, song)
-                            adapter.notifyItemMoved(fromPosition, toPosition)
-                        }
+        } else {*/
+        recyclerViewDragDropManager = RecyclerViewDragDropManager()
+        val animator = RefactoredDefaultItemAnimator()
+        adapter = OrderablePlaylistSongAdapter(requireActivity(),
+            ArrayList(),
+            R.layout.item_list,
+            null,
+            object : OrderablePlaylistSongAdapter.OnMoveItemListener {
+                override fun onMoveItem(fromPosition: Int, toPosition: Int) {
+                    if (PlaylistsUtil.moveItem(
+                            requireContext(),
+                            playlist.playlistEntity.playListId,
+                            fromPosition,
+                            toPosition
+                        )
+                    ) {
+                        val song = adapter.dataSet.removeAt(fromPosition)
+                        adapter.dataSet.add(toPosition, song)
+                        adapter.notifyItemMoved(fromPosition, toPosition)
                     }
-                })
-            wrappedAdapter = recyclerViewDragDropManager!!.createWrappedAdapter(adapter)
+                }
+            })
+        wrappedAdapter = recyclerViewDragDropManager!!.createWrappedAdapter(adapter)
 
-            recyclerView.adapter = wrappedAdapter
-            recyclerView.itemAnimator = animator
+        recyclerView.adapter = wrappedAdapter
+        recyclerView.itemAnimator = animator
+
+        recyclerViewDragDropManager?.attachRecyclerView(recyclerView)
 
-            recyclerViewDragDropManager?.attachRecyclerView(recyclerView)
-        }
         adapter.registerAdapterDataObserver(object : RecyclerView.AdapterDataObserver() {
             override fun onChanged() {
                 super.onChanged()
@@ -103,14 +97,14 @@ class PlaylistDetailsFragment : AbsMainActivityFragment(R.layout.fragment_playli
 
     override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) {
         super.onCreateOptionsMenu(menu, inflater)
-        val menuRes = if (playlist is AbsCustomPlaylist)
+        val menuRes =/* if (playlist is AbsCustomPlaylist)
             R.menu.menu_smart_playlist_detail
-        else R.menu.menu_playlist_detail
+        else*/ R.menu.menu_playlist_detail
         inflater.inflate(menuRes, menu)
     }
 
     override fun onOptionsItemSelected(item: MenuItem): Boolean {
-        return PlaylistMenuHelper.handleMenuClick(requireActivity(), playlist, item)
+          return true//PlaylistMenuHelper.handleMenuClick(requireActivity(), playlist, item)
     }
 
     private fun checkForPadding() {
@@ -160,11 +154,11 @@ class PlaylistDetailsFragment : AbsMainActivityFragment(R.layout.fragment_playli
     }
 
     fun songs(songs: List<Song>) {
+        progressIndicator.hide()
         if (songs.isNotEmpty()) {
             adapter.swapDataSet(songs)
         } else {
             showEmptyView()
         }
     }
-
 }

app/src/main/java/code/name/monkey/retromusic/fragments/playlists/PlaylistDetailsViewModel.kt

@@ -4,27 +4,26 @@ import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
-import code.name.monkey.retromusic.App
+import code.name.monkey.retromusic.db.PlaylistWithSongs
 import code.name.monkey.retromusic.interfaces.MusicServiceEventListener
-import code.name.monkey.retromusic.model.AbsCustomPlaylist
-import code.name.monkey.retromusic.model.Playlist
 import code.name.monkey.retromusic.model.Song
 import code.name.monkey.retromusic.repository.RealRepository
-import code.name.monkey.retromusic.util.PlaylistsUtil
+import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Dispatchers.Main
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 
 class PlaylistDetailsViewModel(
     private val realRepository: RealRepository,
-    private var playlist: Playlist
+    private var playlist: PlaylistWithSongs
 ) : ViewModel(), MusicServiceEventListener {
+
     private val _playListSongs = MutableLiveData<List<Song>>()
-    private val _playlist = MutableLiveData<Playlist>().apply {
+    private val _playlist = MutableLiveData<PlaylistWithSongs>().apply {
         postValue(playlist)
     }
 
-    fun getPlaylist(): LiveData<Playlist> = _playlist
+    fun getPlaylist(): LiveData<PlaylistWithSongs> = _playlist
 
     fun getSongs(): LiveData<List<Song>> = _playListSongs
 
@@ -32,13 +31,13 @@ class PlaylistDetailsViewModel(
         loadPlaylistSongs(playlist)
     }
 
-    private fun loadPlaylistSongs(playlist: Playlist) = viewModelScope.launch {
-        val songs = realRepository.getPlaylistSongs(playlist)
+    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) {
+        /*if (playlist !is AbsCustomPlaylist) {
             // Playlist deleted
             if (!PlaylistsUtil.doesPlaylistExist(App.getContext(), playlist.id)) {
                 //TODO Finish the page
@@ -54,7 +53,7 @@ class PlaylistDetailsViewModel(
                 }
             }
         }
-        loadPlaylistSongs(playlist)
+        loadPlaylistSongs(playlist)*/
     }
 
     override fun onServiceConnected() {}