Playlist Add, Delete, Add Songs

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

@@ -34,6 +34,7 @@ class DetailListFragment : AbsMainActivityFragment(R.layout.fragment_playlist_de
         super.onActivityCreated(savedInstanceState)
         mainActivity.setSupportActionBar(toolbar)
         mainActivity.hideBottomBarVisibility(false)
+        progressIndicator.hide()
         when (args.type) {
             TOP_ARTISTS -> {
                 loadArtists(R.string.top_artists, TOP_ARTISTS)

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

@@ -33,7 +33,7 @@ class LibraryViewModel(
     val songsLiveData: LiveData<List<Song>> = songs
     val artistsLiveData: LiveData<List<Artist>> = artists
     val playlisitsLiveData: LiveData<List<Playlist>> = playlists
-    val roomPlaylisitsLiveData: LiveData<List<PlaylistWithSongs>> = roomPlaylists
+    val roomPlaylistsLiveData: LiveData<List<PlaylistWithSongs>> = roomPlaylists
     val genresLiveData: LiveData<List<Genre>> = genres
 
     init {
@@ -43,13 +43,13 @@ class LibraryViewModel(
     }
 
     private fun loadLibraryContent() = viewModelScope.launch {
+        home.value = loadHome.await()
         songs.value = loadSongs.await()
         albums.value = loadAlbums.await()
         artists.value = loadArtists.await()
         playlists.value = loadPlaylists.await()
         roomPlaylists.value = loadPlaylistsWithSongs.await()
         //genres.value = loadGenres.await()
-        home.value = loadHome.await()
     }
 
     private val loadHome: Deferred<List<Home>>
@@ -84,6 +84,7 @@ class LibraryViewModel(
 
 
     fun forceReload(reloadType: ReloadType) = viewModelScope.launch {
+        println(reloadType)
         when (reloadType) {
             Songs -> songs.value = loadSongs.await()
             Albums -> albums.value = loadAlbums.await()

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

@@ -7,6 +7,7 @@ import android.view.*
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.os.bundleOf
 import androidx.lifecycle.Observer
+import androidx.lifecycle.lifecycleScope
 import androidx.navigation.findNavController
 import androidx.navigation.fragment.findNavController
 import androidx.navigation.fragment.navArgs
@@ -22,7 +23,7 @@ import code.name.monkey.retromusic.activities.tageditor.AbsTagEditorActivity
 import code.name.monkey.retromusic.activities.tageditor.AlbumTagEditorActivity
 import code.name.monkey.retromusic.adapter.album.HorizontalAlbumAdapter
 import code.name.monkey.retromusic.adapter.song.SimpleSongAdapter
-import code.name.monkey.retromusic.dialogs.AddToPlaylistDialog
+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.show
@@ -35,6 +36,7 @@ import code.name.monkey.retromusic.helper.SortOrder
 import code.name.monkey.retromusic.model.Album
 import code.name.monkey.retromusic.model.Artist
 import code.name.monkey.retromusic.network.model.LastFmAlbum
+import code.name.monkey.retromusic.repository.RealRepository
 import code.name.monkey.retromusic.util.MusicUtil
 import code.name.monkey.retromusic.util.PreferenceUtil
 import code.name.monkey.retromusic.util.RetroUtil
@@ -42,6 +44,10 @@ import code.name.monkey.retromusic.util.color.MediaNotificationProcessor
 import com.bumptech.glide.Glide
 import kotlinx.android.synthetic.main.fragment_album_content.*
 import kotlinx.android.synthetic.main.fragment_album_details.*
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
+import org.koin.android.ext.android.get
 import org.koin.androidx.viewmodel.ext.android.viewModel
 import org.koin.core.parameter.parametersOf
 import java.util.*
@@ -275,7 +281,13 @@ class AlbumDetailsFragment : AbsMainActivityFragment(R.layout.fragment_album_det
                 return true
             }
             R.id.action_add_to_playlist -> {
-                AddToPlaylistDialog.create(songs).show(childFragmentManager, "ADD_PLAYLIST")
+                lifecycleScope.launch(Dispatchers.IO) {
+                    val playlists = get<RealRepository>().roomPlaylists()
+                    withContext(Dispatchers.Main) {
+                        AddToRetroPlaylist.create(playlists, songs)
+                            .show(childFragmentManager, "ADD_PLAYLIST")
+                    }
+                }
                 return true
             }
             R.id.action_delete_from_device -> {

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

@@ -10,6 +10,7 @@ import android.view.View
 import androidx.core.os.bundleOf
 import androidx.core.text.HtmlCompat
 import androidx.lifecycle.Observer
+import androidx.lifecycle.lifecycleScope
 import androidx.navigation.fragment.FragmentNavigatorExtras
 import androidx.navigation.fragment.findNavController
 import androidx.navigation.fragment.navArgs
@@ -19,7 +20,7 @@ import androidx.recyclerview.widget.LinearLayoutManager
 import code.name.monkey.retromusic.R
 import code.name.monkey.retromusic.adapter.album.HorizontalAlbumAdapter
 import code.name.monkey.retromusic.adapter.song.SimpleSongAdapter
-import code.name.monkey.retromusic.dialogs.AddToPlaylistDialog
+import code.name.monkey.retromusic.dialogs.AddToRetroPlaylist
 import code.name.monkey.retromusic.extensions.applyColor
 import code.name.monkey.retromusic.extensions.show
 import code.name.monkey.retromusic.extensions.showToast
@@ -30,6 +31,7 @@ import code.name.monkey.retromusic.glide.RetroMusicColoredTarget
 import code.name.monkey.retromusic.helper.MusicPlayerRemote
 import code.name.monkey.retromusic.model.Artist
 import code.name.monkey.retromusic.network.model.LastFmArtist
+import code.name.monkey.retromusic.repository.RealRepository
 import code.name.monkey.retromusic.util.CustomArtistImageUtil
 import code.name.monkey.retromusic.util.MusicUtil
 import code.name.monkey.retromusic.util.RetroUtil
@@ -37,6 +39,10 @@ import code.name.monkey.retromusic.util.color.MediaNotificationProcessor
 import com.bumptech.glide.Glide
 import kotlinx.android.synthetic.main.fragment_artist_content.*
 import kotlinx.android.synthetic.main.fragment_artist_details.*
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
+import org.koin.android.ext.android.get
 import org.koin.androidx.viewmodel.ext.android.viewModel
 import org.koin.core.parameter.parametersOf
 import java.util.*
@@ -216,7 +222,13 @@ class ArtistDetailsFragment : AbsMainActivityFragment(R.layout.fragment_artist_d
                 return true
             }
             R.id.action_add_to_playlist -> {
-                AddToPlaylistDialog.create(songs).show(childFragmentManager, "ADD_PLAYLIST")
+                lifecycleScope.launch(Dispatchers.IO) {
+                    val playlists = get<RealRepository>().roomPlaylists()
+                    withContext(Dispatchers.Main) {
+                        AddToRetroPlaylist.create(playlists, songs)
+                            .show(childFragmentManager, "ADD_PLAYLIST")
+                    }
+                }
                 return true
             }
             R.id.action_set_artist_image -> {

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

@@ -15,6 +15,7 @@ import android.widget.Toast
 import androidx.annotation.LayoutRes
 import androidx.appcompat.widget.Toolbar
 import androidx.core.os.bundleOf
+import androidx.lifecycle.lifecycleScope
 import androidx.navigation.findNavController
 import code.name.monkey.retromusic.EXTRA_ALBUM_ID
 import code.name.monkey.retromusic.EXTRA_ARTIST_ID
@@ -29,8 +30,13 @@ 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.util.*
 import kotlinx.android.synthetic.main.shadow_statusbar_toolbar.*
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
+import org.koin.android.ext.android.get
 import org.koin.androidx.viewmodel.ext.android.sharedViewModel
 import java.io.FileNotFoundException
 
@@ -64,7 +70,13 @@ abstract class AbsPlayerFragment(@LayoutRes layout: Int) : AbsMainActivityFragme
                 return true
             }
             R.id.action_add_to_playlist -> {
-                AddToPlaylistDialog.create(song).show(childFragmentManager, "ADD_PLAYLIST")
+                lifecycleScope.launch(Dispatchers.IO) {
+                    val playlists = get<RealRepository>().roomPlaylists()
+                    withContext(Dispatchers.Main) {
+                        AddToRetroPlaylist.create(playlists, song)
+                            .show(childFragmentManager, "ADD_PLAYLIST")
+                    }
+                }
                 return true
             }
             R.id.action_clear_playing_queue -> {

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

@@ -4,20 +4,15 @@ import android.os.Bundle
 import android.view.Menu
 import android.view.MenuInflater
 import android.view.MenuItem
-import androidx.lifecycle.lifecycleScope
 import androidx.navigation.fragment.findNavController
 import androidx.navigation.ui.NavigationUI
 import code.name.monkey.appthemehelper.common.ATHToolbarActivity.getToolbarBackgroundColor
 import code.name.monkey.appthemehelper.util.ToolbarContentTintHelper
 import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.repository.RoomPlaylistRepository
-import code.name.monkey.retromusic.dialogs.AddToRetroPlaylist
+import code.name.monkey.retromusic.dialogs.CreateRetroPlaylist
 import code.name.monkey.retromusic.extensions.findNavController
 import code.name.monkey.retromusic.fragments.base.AbsMainActivityFragment
-import com.google.android.material.appbar.AppBarLayout
 import kotlinx.android.synthetic.main.fragment_library.*
-import kotlinx.coroutines.launch
-import org.koin.android.ext.android.get
 
 class LibraryFragment : AbsMainActivityFragment(R.layout.fragment_library) {
 
@@ -34,12 +29,29 @@ class LibraryFragment : AbsMainActivityFragment(R.layout.fragment_library) {
                 navOptions
             )
         }
+        addPlaylist.setOnClickListener {
+            CreateRetroPlaylist().show(childFragmentManager, "ShowCreatePlaylistDialog")
+        }
         setupNavigationController()
     }
 
     private fun setupNavigationController() {
         val navController = findNavController(R.id.fragment_container)
         NavigationUI.setupWithNavController(mainActivity.getBottomNavigationView(), navController)
+        navController.addOnDestinationChangedListener { _, destination, _ ->
+            if (destination.id in arrayOf(
+                    R.id.action_album,
+                    R.id.action_artist,
+                    R.id.action_home,
+                    R.id.action_song,
+                    R.id.action_genre
+                )
+            ) {
+                addPlaylist.hide()
+            } else {
+                addPlaylist.show()
+            }
+        }
     }
 
     override fun onPrepareOptionsMenu(menu: Menu) {
@@ -60,32 +72,12 @@ class LibraryFragment : AbsMainActivityFragment(R.layout.fragment_library) {
 
     override fun onOptionsItemSelected(item: MenuItem): Boolean {
         when (item.itemId) {
-            R.id.action_settings ->
-                //CreateRetroPlaylist().show(childFragmentManager, "Dialog")
-            lifecycleScope.launch {
-                    val playlistRepository = get<RoomPlaylistRepository>()
-                    AddToRetroPlaylist.getInstance(playlistRepository.playlists())
-                        .show(childFragmentManager, "PlaylistDialog")
-                }
-
-            /*findNavController().navigate(
-           R.id.settingsActivity,
-           null,
-           navOptions
-       )*/
+            R.id.action_settings -> findNavController().navigate(
+                R.id.settingsActivity,
+                null,
+                navOptions
+            )
         }
         return super.onOptionsItemSelected(item)
     }
-
-    fun addOnAppBarOffsetChangedListener(changedListener: AppBarLayout.OnOffsetChangedListener) {
-        appBarLayout.addOnOffsetChangedListener(changedListener)
-    }
-
-    fun removeOnAppBarOffsetChangedListener(changedListener: AppBarLayout.OnOffsetChangedListener) {
-        appBarLayout.removeOnOffsetChangedListener(changedListener)
-    }
-
-    fun getTotalAppBarScrollingRange(): Int {
-        return 0
-    }
 }

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

@@ -15,6 +15,7 @@ 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.Song
 import code.name.monkey.retromusic.util.PlaylistsUtil
 import com.h6ah4i.android.widget.advrecyclerview.animator.RefactoredDefaultItemAnimator
@@ -61,25 +62,28 @@ class PlaylistDetailsFragment : AbsMainActivityFragment(R.layout.fragment_playli
         } 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)
+        adapter =
+            OrderablePlaylistSongAdapter(
+                playlist.playlistEntity.playListId,
+                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)
 
         recyclerView.adapter = wrappedAdapter
@@ -104,7 +108,7 @@ class PlaylistDetailsFragment : AbsMainActivityFragment(R.layout.fragment_playli
     }
 
     override fun onOptionsItemSelected(item: MenuItem): Boolean {
-          return true//PlaylistMenuHelper.handleMenuClick(requireActivity(), playlist, item)
+        return PlaylistMenuHelper.handleMenuClick(requireActivity(), playlist, item)
     }
 
     private fun checkForPadding() {

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

@@ -19,7 +19,7 @@ class PlaylistsFragment :
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
-        libraryViewModel.roomPlaylisitsLiveData.observe(viewLifecycleOwner, Observer {
+        libraryViewModel.roomPlaylistsLiveData.observe(viewLifecycleOwner, Observer {
             if (it.isNotEmpty())
                 adapter?.swapDataSet(it)
             else

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

@@ -19,12 +19,16 @@ import android.view.View
 import androidx.preference.Preference
 import code.name.monkey.appthemehelper.common.prefs.supportv7.ATEListPreference
 import code.name.monkey.retromusic.R
+import code.name.monkey.retromusic.fragments.LibraryViewModel
+import code.name.monkey.retromusic.fragments.ReloadType.HomeSections
+import org.koin.androidx.viewmodel.ext.android.sharedViewModel
 
 /**
  * @author Hemanth S (h4h13).
  */
 
 class OtherSettingsFragment : AbsSettingsFragment() {
+    private val libraryViewModel by sharedViewModel<LibraryViewModel>()
     override fun invalidateSettings() {
         val languagePreference: ATEListPreference? = findPreference("language_name")
         languagePreference?.setOnPreferenceChangeListener { _, _ ->
@@ -42,6 +46,7 @@ class OtherSettingsFragment : AbsSettingsFragment() {
         val preference: Preference? = findPreference("last_added_interval")
         preference?.setOnPreferenceChangeListener { lastAdded, newValue ->
             setSummary(lastAdded, newValue)
+            libraryViewModel.forceReload(HomeSections)
             true
         }
         val languagePreference: Preference? = findPreference("language_name")