From fcdf9ad590d0bd4f2c9f4684251fe6549be727b9 Mon Sep 17 00:00:00 2001 From: Prathamesh More Date: Sat, 19 Feb 2022 09:55:11 +0530 Subject: [PATCH] [Glide] Code Cleanup --- .../activities/DriveModeActivity.kt | 11 ++----- .../adapter/song/PlayingQueueAdapter.kt | 11 ++----- .../fragments/albums/AlbumDetailsFragment.kt | 10 ++----- .../retromusic/fragments/home/HomeFragment.kt | 10 +++---- .../fragments/other/MiniPlayerFragment.kt | 5 ++-- .../player/full/FullPlayerFragment.kt | 29 ++++++++----------- .../monkey/retromusic/service/MusicService.kt | 7 +++-- 7 files changed, 30 insertions(+), 53 deletions(-) diff --git a/app/src/main/java/code/name/monkey/retromusic/activities/DriveModeActivity.kt b/app/src/main/java/code/name/monkey/retromusic/activities/DriveModeActivity.kt index 9bdfbd05d..39c46e712 100644 --- a/app/src/main/java/code/name/monkey/retromusic/activities/DriveModeActivity.kt +++ b/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()) - .into(object : RetroMusicColoredTarget(binding.image) { - override fun onColorReady(colors: MediaNotificationProcessor) { - } - }) + .songCoverOptions(song).transform(BlurTransformation.Builder(this).build()) + .into(binding.image) } override fun onUpdateProgressViews(progress: Int, total: Int) { diff --git a/app/src/main/java/code/name/monkey/retromusic/adapter/song/PlayingQueueAdapter.kt b/app/src/main/java/code/name/monkey/retromusic/adapter/song/PlayingQueueAdapter.kt index 398f479bf..ae2de00c6 100644 --- a/app/src/main/java/code/name/monkey/retromusic/adapter/song/PlayingQueueAdapter.kt +++ b/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!!) { - override fun onColorReady(colors: MediaNotificationProcessor) { - //setColors(colors, holder) - } - }) + .songCoverOptions(song) + .into(holder.image!!) } fun swapDataSet(dataSet: List, position: Int) { diff --git 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 index 97a232020..8698abc84 100644 --- 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 @@ -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) { - override fun onColorReady(colors: MediaNotificationProcessor) { - } - }) + .into(binding.artistImage) } private fun loadAlbumCover(album: Album) { diff --git 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 index 577bf39db..9c5b04117 100644 --- 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 @@ -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() - .userProfileOptions(RetroGlideExtension.getUserModel()) + GlideApp.with(requireActivity()) .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) } } diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/other/MiniPlayerFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/other/MiniPlayerFragment.kt index 0bdfc952f..05998ea64 100644 --- a/app/src/main/java/code/name/monkey/retromusic/fragments/other/MiniPlayerFragment.kt +++ b/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) } diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/player/full/FullPlayerFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/player/full/FullPlayerFragment.kt index f20efdd24..6e0cfa836 100644 --- a/app/src/main/java/code/name/monkey/retromusic/fragments/player/full/FullPlayerFragment.kt +++ b/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) { - override fun onColorReady(colors: MediaNotificationProcessor) { - } - }) + .artistImageOptions(artist) + .into(binding.artistImage) } } @@ -151,17 +148,15 @@ class FullPlayerFragment : AbsPlayerFragment(R.layout.fragment_full) { } private fun updateLabel() { - (MusicPlayerRemote.playingQueue.size - 1).apply { - if (this == (MusicPlayerRemote.position)) { - binding.nextSongLabel.setText(R.string.last_song) - binding.nextSong.hide() - } else { - val title = MusicPlayerRemote.playingQueue[MusicPlayerRemote.position + 1].title - binding.nextSongLabel.setText(R.string.next_song) - binding.nextSong.apply { - text = title - show() - } + if ((MusicPlayerRemote.playingQueue.size - 1) == (MusicPlayerRemote.position)) { + binding.nextSongLabel.setText(R.string.last_song) + binding.nextSong.hide() + } else { + val title = MusicPlayerRemote.playingQueue[MusicPlayerRemote.position + 1].title + binding.nextSongLabel.setText(R.string.next_song) + binding.nextSong.apply { + text = title + show() } } } diff --git a/app/src/main/java/code/name/monkey/retromusic/service/MusicService.kt b/app/src/main/java/code/name/monkey/retromusic/service/MusicService.kt index 1a4a02744..7cce726d3 100644 --- a/app/src/main/java/code/name/monkey/retromusic/service/MusicService.kt +++ b/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 = - GlideApp.with(this@MusicService).asBitmap().songCoverOptions(song).load( - getSongModel(song) - ) + GlideApp.with(this@MusicService) + .asBitmap() + .songCoverOptions(song) + .load(getSongModel(song)) if (isBlurredAlbumArt) { request.transform(BlurTransformation.Builder(this@MusicService).build()) }