[Glide] Code Cleanup

app/src/main/java/code/name/monkey/retromusic/activities/DriveModeActivity.kt

@@ -32,7 +32,6 @@ import code.name.monkey.retromusic.fragments.base.AbsPlayerControlsFragment
 import code.name.monkey.retromusic.glide.BlurTransformation
 import code.name.monkey.retromusic.glide.GlideApp
 import code.name.monkey.retromusic.glide.RetroGlideExtension
-import code.name.monkey.retromusic.glide.RetroMusicColoredTarget
 import code.name.monkey.retromusic.helper.MusicPlayerRemote
 import code.name.monkey.retromusic.helper.MusicProgressViewUpdateHelper
 import code.name.monkey.retromusic.helper.MusicProgressViewUpdateHelper.Callback
@@ -42,7 +41,6 @@ import code.name.monkey.retromusic.model.Song
 import code.name.monkey.retromusic.repository.RealRepository
 import code.name.monkey.retromusic.service.MusicService
 import code.name.monkey.retromusic.util.MusicUtil
-import code.name.monkey.retromusic.util.color.MediaNotificationProcessor
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
@@ -247,14 +245,9 @@ class DriveModeActivity : AbsMusicServiceActivity(), Callback {
         binding.songText.text = song.artistName
 
         GlideApp.with(this)
-            .asBitmapPalette()
-            .songCoverOptions(song)
             .load(RetroGlideExtension.getSongModel(song))
-            .transform(BlurTransformation.Builder(this).build())
+            .songCoverOptions(song).transform(BlurTransformation.Builder(this).build())
-            .into(object : RetroMusicColoredTarget(binding.image) {
+            .into(binding.image)
-                override fun onColorReady(colors: MediaNotificationProcessor) {
-                }
-            })
     }
 
     override fun onUpdateProgressViews(progress: Int, total: Int) {

app/src/main/java/code/name/monkey/retromusic/adapter/song/PlayingQueueAdapter.kt

@@ -21,7 +21,6 @@ import androidx.fragment.app.FragmentActivity
 import code.name.monkey.retromusic.R
 import code.name.monkey.retromusic.glide.GlideApp
 import code.name.monkey.retromusic.glide.RetroGlideExtension
-import code.name.monkey.retromusic.glide.RetroMusicColoredTarget
 import code.name.monkey.retromusic.helper.MusicPlayerRemote
 import code.name.monkey.retromusic.helper.MusicPlayerRemote.isPlaying
 import code.name.monkey.retromusic.helper.MusicPlayerRemote.playNextSong
@@ -29,7 +28,6 @@ import code.name.monkey.retromusic.helper.MusicPlayerRemote.removeFromQueue
 import code.name.monkey.retromusic.model.Song
 import code.name.monkey.retromusic.util.MusicUtil
 import code.name.monkey.retromusic.util.ViewUtil
-import code.name.monkey.retromusic.util.color.MediaNotificationProcessor
 import com.h6ah4i.android.widget.advrecyclerview.draggable.DraggableItemAdapter
 import com.h6ah4i.android.widget.advrecyclerview.draggable.ItemDraggableRange
 import com.h6ah4i.android.widget.advrecyclerview.draggable.annotation.DraggableItemStateFlags
@@ -79,13 +77,10 @@ class PlayingQueueAdapter(
         if (holder.image == null) {
             return
         }
-        GlideApp.with(activity).asBitmapPalette().songCoverOptions(song)
+        GlideApp.with(activity)
             .load(RetroGlideExtension.getSongModel(song))
-            .into(object : RetroMusicColoredTarget(holder.image!!) {
+            .songCoverOptions(song)
-                override fun onColorReady(colors: MediaNotificationProcessor) {
+            .into(holder.image!!)
-                    //setColors(colors, holder)
-                }
-            })
     }
 
     fun swapDataSet(dataSet: List<Song>, position: Int) {

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

@@ -49,7 +49,6 @@ import code.name.monkey.retromusic.extensions.*
 import code.name.monkey.retromusic.fragments.base.AbsMainActivityFragment
 import code.name.monkey.retromusic.glide.GlideApp
 import code.name.monkey.retromusic.glide.RetroGlideExtension
-import code.name.monkey.retromusic.glide.RetroMusicColoredTarget
 import code.name.monkey.retromusic.glide.SingleColorTarget
 import code.name.monkey.retromusic.helper.MusicPlayerRemote
 import code.name.monkey.retromusic.helper.SortOrder.AlbumSongSortOrder.Companion.SONG_A_Z
@@ -68,7 +67,6 @@ import code.name.monkey.retromusic.util.MusicUtil
 import code.name.monkey.retromusic.util.PreferenceUtil
 import code.name.monkey.retromusic.util.RetroColorUtil
 import code.name.monkey.retromusic.util.RetroUtil
-import code.name.monkey.retromusic.util.color.MediaNotificationProcessor
 import com.afollestad.materialcab.attached.AttachedCab
 import com.afollestad.materialcab.attached.destroy
 import com.afollestad.materialcab.attached.isActive
@@ -307,7 +305,7 @@ class AlbumDetailsFragment : AbsMainActivityFragment(R.layout.fragment_album_det
         detailsViewModel.getMoreAlbums(artist).observe(viewLifecycleOwner) {
             moreAlbums(it)
         }
-        GlideApp.with(requireContext()).asBitmapPalette().artistImageOptions(artist)
+        GlideApp.with(requireContext())
             //.forceDownload(PreferenceUtil.isAllowedToDownloadMetadata())
             .load(
                 RetroGlideExtension.getArtistModel(
@@ -315,12 +313,10 @@ class AlbumDetailsFragment : AbsMainActivityFragment(R.layout.fragment_album_det
                     PreferenceUtil.isAllowedToDownloadMetadata()
                 )
             )
+            .artistImageOptions(artist)
             .dontAnimate()
             .dontTransform()
-            .into(object : RetroMusicColoredTarget(binding.artistImage) {
+            .into(binding.artistImage)
-                override fun onColorReady(colors: MediaNotificationProcessor) {
-                }
-            })
     }
 
     private fun loadAlbumCover(album: Album) {

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

@@ -181,14 +181,13 @@ class HomeFragment :
     private fun loadProfile() {
         binding.bannerImage?.let {
             GlideApp.with(requireContext())
-                .asBitmap()
-                .profileBannerOptions(RetroGlideExtension.getBannerModel())
                 .load(RetroGlideExtension.getBannerModel())
+                .profileBannerOptions(RetroGlideExtension.getBannerModel())
                 .into(it)
         }
-        GlideApp.with(requireActivity()).asBitmap()
+        GlideApp.with(requireActivity())
-            .userProfileOptions(RetroGlideExtension.getUserModel())
             .load(RetroGlideExtension.getUserModel())
+            .userProfileOptions(RetroGlideExtension.getUserModel())
             .into(binding.userImage)
     }
 
@@ -273,9 +272,8 @@ class HomeFragment :
                 }
             }
             GlideApp.with(this)
-                .asBitmap()
-                .songCoverOptions(songs[index])
                 .load(RetroGlideExtension.getSongModel(songs[index]))
+                .songCoverOptions(songs[index])
                 .into(imageView)
         }
     }

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

@@ -114,10 +114,9 @@ open class MiniPlayerFragment : AbsMusicServiceFragment(R.layout.fragment_mini_p
     private fun updateSongCover() {
         val song = MusicPlayerRemote.currentSong
         GlideApp.with(requireContext())
-            .asBitmap()
-            .songCoverOptions(song)
-            .transition(RetroGlideExtension.getDefaultTransition())
             .load(RetroGlideExtension.getSongModel(song))
+            .transition(RetroGlideExtension.getDefaultTransition())
+            .songCoverOptions(song)
             .into(binding.image)
     }
 

app/src/main/java/code/name/monkey/retromusic/fragments/player/full/FullPlayerFragment.kt

@@ -31,7 +31,6 @@ import code.name.monkey.retromusic.fragments.base.goToArtist
 import code.name.monkey.retromusic.fragments.player.PlayerAlbumCoverFragment
 import code.name.monkey.retromusic.glide.GlideApp
 import code.name.monkey.retromusic.glide.RetroGlideExtension
-import code.name.monkey.retromusic.glide.RetroMusicColoredTarget
 import code.name.monkey.retromusic.helper.MusicPlayerRemote
 import code.name.monkey.retromusic.model.Song
 import code.name.monkey.retromusic.util.color.MediaNotificationProcessor
@@ -134,12 +133,10 @@ class FullPlayerFragment : AbsPlayerFragment(R.layout.fragment_full) {
         libraryViewModel.artist(MusicPlayerRemote.currentSong.artistId)
             .observe(viewLifecycleOwner) { artist ->
                 if (artist.id != -1L) {
-                    GlideApp.with(requireActivity()).asBitmapPalette().artistImageOptions(artist)
+                    GlideApp.with(requireActivity())
                         .load(RetroGlideExtension.getArtistModel(artist))
-                        .into(object : RetroMusicColoredTarget(binding.artistImage) {
+                        .artistImageOptions(artist)
-                            override fun onColorReady(colors: MediaNotificationProcessor) {
+                        .into(binding.artistImage)
-                            }
-                        })
                 }
 
             }
@@ -151,8 +148,7 @@ class FullPlayerFragment : AbsPlayerFragment(R.layout.fragment_full) {
     }
 
     private fun updateLabel() {
-        (MusicPlayerRemote.playingQueue.size - 1).apply {
+        if ((MusicPlayerRemote.playingQueue.size - 1) == (MusicPlayerRemote.position)) {
-            if (this == (MusicPlayerRemote.position)) {
             binding.nextSongLabel.setText(R.string.last_song)
             binding.nextSong.hide()
         } else {
@@ -165,4 +161,3 @@ class FullPlayerFragment : AbsPlayerFragment(R.layout.fragment_full) {
         }
     }
 }
-}

app/src/main/java/code/name/monkey/retromusic/service/MusicService.kt

@@ -1146,9 +1146,10 @@ class MusicService : MediaBrowserServiceCompat(),
         if (isAlbumArtOnLockScreen) {
             val screenSize = RetroUtil.getScreenSize(this@MusicService)
             val request: RequestBuilder<Bitmap> =
-                GlideApp.with(this@MusicService).asBitmap().songCoverOptions(song).load(
+                GlideApp.with(this@MusicService)
-                    getSongModel(song)
+                    .asBitmap()
-                )
+                    .songCoverOptions(song)
+                    .load(getSongModel(song))
             if (isBlurredAlbumArt) {
                 request.transform(BlurTransformation.Builder(this@MusicService).build())
             }