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

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

@@ -4,8 +4,11 @@ import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
+import code.name.monkey.retromusic.db.PlaylistEntity
 import code.name.monkey.retromusic.db.PlaylistWithSongs
+import code.name.monkey.retromusic.db.SongEntity
 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
@@ -133,6 +136,38 @@ class LibraryViewModel(
         println("onShuffleModeChanged")
     }
 
+    fun shuffleSongs() = viewModelScope.launch(IO) {
+        val songs = repository.allSongs()
+        MusicPlayerRemote.openAndShuffleQueue(
+            songs,
+            true
+        )
+    }
+
+    fun renameRoomPlaylist(playListId: Int, name: String) = viewModelScope.launch(IO) {
+        repository.renameRoomPlaylist(playListId, name)
+    }
+
+    fun deleteSongsInPlaylist(songs: List<SongEntity>) = viewModelScope.launch(IO) {
+        repository.deleteSongsInPlaylist(songs)
+    }
+
+    fun deleteSongsFromPlaylist(playlists: List<PlaylistEntity>) = viewModelScope.launch(IO) {
+        repository.deleteSongsFromPlaylist(playlists)
+    }
+
+    fun deleteRoomPlaylist(playlists: List<PlaylistEntity>) = viewModelScope.launch(IO) {
+        repository.deleteRoomPlaylist(playlists)
+    }
+
+    suspend fun albumById(id: Int) = repository.albumById(id)
+    suspend fun artistById(id: Int) = repository.artistById(id)
+    suspend fun favoritePlaylist() = repository.favoritePlaylist()
+    suspend fun isFavoriteSong(song: SongEntity) = repository.isFavoriteSong(song)
+    suspend fun insertSongs(songs: List<SongEntity>) = repository.insertSongs(songs)
+    suspend fun removeSongFromPlaylist(songEntity: SongEntity) =
+        repository.removeSongFromPlaylist(songEntity)
+
 }
 
 enum class ReloadType {

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

@@ -11,18 +11,14 @@ import android.view.GestureDetector
 import android.view.MotionEvent
 import android.view.View
 import android.view.animation.DecelerateInterpolator
-import code.name.monkey.appthemehelper.ThemeStore
 import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.extensions.show
-import code.name.monkey.retromusic.extensions.textColorPrimary
-import code.name.monkey.retromusic.extensions.textColorSecondary
+import code.name.monkey.retromusic.extensions.*
 import code.name.monkey.retromusic.fragments.base.AbsMusicServiceFragment
 import code.name.monkey.retromusic.helper.MusicPlayerRemote
 import code.name.monkey.retromusic.helper.MusicProgressViewUpdateHelper
 import code.name.monkey.retromusic.helper.PlayPauseButtonOnClickHandler
 import code.name.monkey.retromusic.util.PreferenceUtil
 import code.name.monkey.retromusic.util.RetroUtil
-import code.name.monkey.retromusic.util.ViewUtil
 import kotlinx.android.synthetic.main.fragment_mini_player.*
 import kotlin.math.abs
 
@@ -67,7 +63,7 @@ open class MiniPlayerFragment : AbsMusicServiceFragment(R.layout.fragment_mini_p
 
     private fun setUpMiniPlayer() {
         setUpPlayPauseButton()
-        ViewUtil.setProgressDrawable(progressBar, ThemeStore.accentColor(requireContext()))
+        progressBar.accentColor()
     }
 
     private fun setUpPlayPauseButton() {
@@ -129,6 +125,10 @@ open class MiniPlayerFragment : AbsMusicServiceFragment(R.layout.fragment_mini_p
         }
     }
 
+    fun updateProgressBar(paletteColor: Int) {
+         progressBar.applyColor(paletteColor)
+    }
+
     class FlingPlayBackController(context: Context) : View.OnTouchListener {
 
         private var flingPlayBackController: GestureDetector

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

@@ -14,8 +14,7 @@ import code.name.monkey.retromusic.fragments.ReloadType
 import code.name.monkey.retromusic.fragments.base.AbsRecyclerViewCustomGridSizeFragment
 import code.name.monkey.retromusic.util.PreferenceUtil
 
-class AlbumsFragment :
-    AbsRecyclerViewCustomGridSizeFragment<AlbumAdapter, GridLayoutManager>(),
+class AlbumsFragment : AbsRecyclerViewCustomGridSizeFragment<AlbumAdapter, GridLayoutManager>(),
     AlbumClickListener {
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {

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

@@ -12,17 +12,10 @@ import code.name.monkey.retromusic.adapter.artist.ArtistAdapter
 import code.name.monkey.retromusic.extensions.findActivityNavController
 import code.name.monkey.retromusic.fragments.ReloadType
 import code.name.monkey.retromusic.fragments.base.AbsRecyclerViewCustomGridSizeFragment
-import code.name.monkey.retromusic.interfaces.MainActivityFragmentCallbacks
 import code.name.monkey.retromusic.util.PreferenceUtil
 
-class ArtistsFragment :
-    AbsRecyclerViewCustomGridSizeFragment<ArtistAdapter, GridLayoutManager>(),
-    MainActivityFragmentCallbacks, ArtistClickListener {
-
-    override fun handleBackPress(): Boolean {
-        return false
-    }
-
+class ArtistsFragment : AbsRecyclerViewCustomGridSizeFragment<ArtistAdapter, GridLayoutManager>(),
+    ArtistClickListener {
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)

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

@@ -25,7 +25,7 @@ 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.ReloadType
 import code.name.monkey.retromusic.fragments.player.PlayerAlbumCoverFragment
 import code.name.monkey.retromusic.helper.MusicPlayerRemote
 import code.name.monkey.retromusic.interfaces.PaletteColorHolder
@@ -40,7 +40,6 @@ 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
 
@@ -160,22 +159,6 @@ abstract class AbsPlayerFragment(@LayoutRes layout: Int) : AbsMainActivityFragme
         return false
     }
 
-    protected open fun toggleFavorite(song: Song) {
-        lifecycleScope.launch(IO) {
-            val playlist: PlaylistEntity? = repository.favoritePlaylist()
-            if (playlist != null) {
-                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?
 
@@ -197,25 +180,44 @@ abstract class AbsPlayerFragment(@LayoutRes layout: Int) : AbsMainActivityFragme
         updateLyrics()
     }
 
+    protected open fun toggleFavorite(song: Song) {
+        lifecycleScope.launch(IO) {
+            val playlist: PlaylistEntity? = libraryViewModel.favoritePlaylist()
+            if (playlist != null) {
+                val songEntity = song.toSongEntity(playlist.playListId)
+                val isFavorite = libraryViewModel.isFavoriteSong(songEntity).isNotEmpty()
+                if (isFavorite) {
+                    libraryViewModel.removeSongFromPlaylist(songEntity)
+                } else {
+                    libraryViewModel.insertSongs(listOf(song.toSongEntity(playlist.playListId)))
+                }
+            }
+            libraryViewModel.forceReload(ReloadType.Playlists)
+            requireContext().sendBroadcast(Intent(MusicService.FAVORITE_STATE_CHANGED))
+        }
+    }
+
     fun updateIsFavorite() {
         lifecycleScope.launch(IO) {
-            val playlist: PlaylistEntity = repository.favoritePlaylist()
-            val song = MusicPlayerRemote.currentSong.toSongEntity(playlist.playListId)
-            val isFavorite = repository.isFavoriteSong(song).isNotEmpty()
-            withContext(Main) {
-                val icon = if (isFavorite) R.drawable.ic_favorite
-                else R.drawable.ic_favorite_border
-                val drawable =
-                    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)
+            val playlist: PlaylistEntity? = libraryViewModel.favoritePlaylist()
+            if (playlist != null) {
+                val song = MusicPlayerRemote.currentSong.toSongEntity(playlist.playListId)
+                val isFavorite = libraryViewModel.isFavoriteSong(song).isNotEmpty()
+                withContext(Main) {
+                    val icon =
+                        if (isFavorite) R.drawable.ic_favorite else R.drawable.ic_favorite_border
+                    val drawable =
+                        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)
+                    }
                 }
             }
         }
@@ -247,17 +249,6 @@ abstract class AbsPlayerFragment(@LayoutRes layout: Int) : AbsMainActivityFragme
     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 &&

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

@@ -21,14 +21,8 @@ import androidx.recyclerview.widget.LinearLayoutManager
 import code.name.monkey.retromusic.R
 import code.name.monkey.retromusic.adapter.GenreAdapter
 import code.name.monkey.retromusic.fragments.base.AbsRecyclerViewFragment
-import code.name.monkey.retromusic.interfaces.MainActivityFragmentCallbacks
 
-class GenresFragment : AbsRecyclerViewFragment<GenreAdapter, LinearLayoutManager>(),
-    MainActivityFragmentCallbacks {
-
-    override fun handleBackPress(): Boolean {
-        return false
-    }
+class GenresFragment : AbsRecyclerViewFragment<GenreAdapter, LinearLayoutManager>() {
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)

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

@@ -19,7 +19,6 @@ import android.os.Bundle
 import android.view.View
 import androidx.core.os.bundleOf
 import androidx.lifecycle.Observer
-import androidx.lifecycle.lifecycleScope
 import androidx.recyclerview.widget.LinearLayoutManager
 import code.name.monkey.retromusic.HISTORY_PLAYLIST
 import code.name.monkey.retromusic.LAST_ADDED_PLAYLIST
@@ -31,25 +30,19 @@ import code.name.monkey.retromusic.fragments.LibraryViewModel
 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.repository.Repository
 import code.name.monkey.retromusic.util.NavigationUtil
 import code.name.monkey.retromusic.util.PreferenceUtil
 import com.bumptech.glide.Glide
 import kotlinx.android.synthetic.main.abs_playlists.*
 import kotlinx.android.synthetic.main.fragment_banner_home.*
 import kotlinx.android.synthetic.main.home_content.*
-import kotlinx.coroutines.launch
-import org.koin.android.ext.android.inject
 import org.koin.androidx.viewmodel.ext.android.sharedViewModel
 
 class HomeFragment :
     AbsMainActivityFragment(if (PreferenceUtil.isHomeBanner) R.layout.fragment_banner_home else R.layout.fragment_home) {
 
-    private val repository by inject<Repository>()
     private val libraryViewModel: LibraryViewModel by sharedViewModel()
 
-
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
         setStatusBarColorAuto(view)
@@ -77,12 +70,7 @@ class HomeFragment :
         }
 
         actionShuffle.setOnClickListener {
-            lifecycleScope.launch {
-                MusicPlayerRemote.openAndShuffleQueue(
-                    repository.allSongs(),
-                    true
-                )
-            }
+            libraryViewModel.shuffleSongs()
         }
 
         history.setOnClickListener {

app/src/main/java/code/name/monkey/retromusic/fragments/player/gradient/GradientPlayerFragment.kt

@@ -5,7 +5,6 @@ import android.annotation.SuppressLint
 import android.content.res.ColorStateList
 import android.graphics.Color
 import android.graphics.PorterDuff
-import android.os.AsyncTask
 import android.os.Bundle
 import android.view.View
 import android.view.animation.LinearInterpolator
@@ -18,7 +17,6 @@ import androidx.core.view.ViewCompat
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import code.name.monkey.appthemehelper.util.ColorUtil
-import code.name.monkey.appthemehelper.util.TintHelper
 import code.name.monkey.retromusic.R
 import code.name.monkey.retromusic.RetroBottomSheetBehavior
 import code.name.monkey.retromusic.adapter.song.PlayingQueueAdapter
@@ -61,7 +59,6 @@ class GradientPlayerFragment : AbsPlayerFragment(R.layout.fragment_gradient_play
     private var recyclerViewSwipeManager: RecyclerViewSwipeManager? = null
     private var recyclerViewTouchActionGuardManager: RecyclerViewTouchActionGuardManager? = null
     private var playingQueueAdapter: PlayingQueueAdapter? = null
-    private var updateIsFavoriteTask: AsyncTask<*, *, *>? = null
     private lateinit var linearLayoutManager: LinearLayoutManager
 
     private val bottomSheetCallbackList = object : BottomSheetBehavior.BottomSheetCallback() {
@@ -218,9 +215,8 @@ class GradientPlayerFragment : AbsPlayerFragment(R.layout.fragment_gradient_play
 
     override fun toggleFavorite(song: Song) {
         super.toggleFavorite(song)
-        MusicUtil.toggleFavorite(requireContext(), song)
         if (song.id == MusicPlayerRemote.currentSong.id) {
-            updateFavorite()
+            updateIsFavorite()
         }
     }
 
@@ -268,6 +264,7 @@ class GradientPlayerFragment : AbsPlayerFragment(R.layout.fragment_gradient_play
     override fun onQueueChanged() {
         super.onQueueChanged()
         updateLabel()
+        playingQueueAdapter?.swapDataSet(MusicPlayerRemote.playingQueue)
     }
 
     private fun updateSong() {
@@ -366,7 +363,7 @@ class GradientPlayerFragment : AbsPlayerFragment(R.layout.fragment_gradient_play
             } else {
                 val title = MusicPlayerRemote.playingQueue[MusicPlayerRemote.position + 1].title
                 nextSong.apply {
-                    text = "Next: $title"
+                    text = title
                     show()
                 }
             }
@@ -472,36 +469,4 @@ class GradientPlayerFragment : AbsPlayerFragment(R.layout.fragment_gradient_play
         songTotalTime.text = MusicUtil.getReadableDurationString(total.toLong())
         songCurrentProgress.text = MusicUtil.getReadableDurationString(progress.toLong())
     }
-
-    @SuppressLint("StaticFieldLeak")
-    private fun updateFavorite() {
-        if (updateIsFavoriteTask != null) {
-            updateIsFavoriteTask?.cancel(false)
-        }
-        updateIsFavoriteTask =
-            object : AsyncTask<Song, Void, Boolean>() {
-                override fun doInBackground(vararg params: Song): Boolean? {
-                    val activity = activity
-                    return if (activity != null) {
-                        MusicUtil.isFavorite(requireActivity(), params[0])
-                    } else {
-                        cancel(false)
-                        null
-                    }
-                }
-
-                override fun onPostExecute(isFavorite: Boolean?) {
-                    val activity = activity
-                    if (activity != null) {
-                        val res = if (isFavorite!!)
-                            R.drawable.ic_favorite
-                        else
-                            R.drawable.ic_favorite_border
-
-                        val drawable = TintHelper.createTintedDrawable(activity, res, Color.WHITE)
-                        songFavourite?.setImageDrawable(drawable)
-                    }
-                }
-            }.execute(MusicPlayerRemote.currentSong)
-    }
 }

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

@@ -7,15 +7,8 @@ import androidx.recyclerview.widget.GridLayoutManager
 import code.name.monkey.retromusic.R
 import code.name.monkey.retromusic.adapter.playlist.PlaylistAdapter
 import code.name.monkey.retromusic.fragments.base.AbsRecyclerViewFragment
-import code.name.monkey.retromusic.interfaces.MainActivityFragmentCallbacks
 
-class PlaylistsFragment :
-    AbsRecyclerViewFragment<PlaylistAdapter, GridLayoutManager>(),
-    MainActivityFragmentCallbacks {
-
-    override fun handleBackPress(): Boolean {
-        return false
-    }
+class PlaylistsFragment : AbsRecyclerViewFragment<PlaylistAdapter, GridLayoutManager>() {
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)

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

@@ -22,7 +22,6 @@ import code.name.monkey.retromusic.R
 import code.name.monkey.retromusic.adapter.song.PlayingQueueAdapter
 import code.name.monkey.retromusic.fragments.base.AbsRecyclerViewFragment
 import code.name.monkey.retromusic.helper.MusicPlayerRemote
-import code.name.monkey.retromusic.interfaces.MainActivityFragmentCallbacks
 import com.h6ah4i.android.widget.advrecyclerview.animator.DraggableItemAnimator
 import com.h6ah4i.android.widget.advrecyclerview.draggable.RecyclerViewDragDropManager
 import com.h6ah4i.android.widget.advrecyclerview.swipeable.RecyclerViewSwipeManager
@@ -33,13 +32,7 @@ import kotlinx.android.synthetic.main.activity_playing_queue.*
 /**
  * Created by hemanths on 2019-12-08.
  */
-class PlayingQueueFragment :
-    AbsRecyclerViewFragment<PlayingQueueAdapter, LinearLayoutManager>(),
-    MainActivityFragmentCallbacks {
-
-    override fun handleBackPress(): Boolean {
-        return false
-    }
+class PlayingQueueFragment : AbsRecyclerViewFragment<PlayingQueueAdapter, LinearLayoutManager>() {
 
     private lateinit var wrappedAdapter: RecyclerView.Adapter<*>
     private var recyclerViewDragDropManager: RecyclerViewDragDropManager? = null

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

@@ -9,15 +9,9 @@ import code.name.monkey.retromusic.R
 import code.name.monkey.retromusic.adapter.song.SongAdapter
 import code.name.monkey.retromusic.fragments.ReloadType
 import code.name.monkey.retromusic.fragments.base.AbsRecyclerViewCustomGridSizeFragment
-import code.name.monkey.retromusic.interfaces.MainActivityFragmentCallbacks
 import code.name.monkey.retromusic.util.PreferenceUtil
 
-class SongsFragment :
-    AbsRecyclerViewCustomGridSizeFragment<SongAdapter, GridLayoutManager>(),
-    MainActivityFragmentCallbacks {
-    override fun handleBackPress(): Boolean {
-        return false
-    }
+class SongsFragment : AbsRecyclerViewCustomGridSizeFragment<SongAdapter, GridLayoutManager>() {
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)