Revert some changes in LockScreenActivity and MusicService

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

@@ -26,13 +26,10 @@ import code.name.monkey.retromusic.extensions.hideStatusBar
 import code.name.monkey.retromusic.extensions.setTaskDescriptionColorAuto
 import code.name.monkey.retromusic.extensions.whichFragment
 import code.name.monkey.retromusic.fragments.player.lockscreen.LockScreenControlsFragment
-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.util.PreferenceUtil
-import code.name.monkey.retromusic.util.PreferenceUtil.isAlbumArtOnLockScreen
 import code.name.monkey.retromusic.util.color.MediaNotificationProcessor
 import com.r0adkll.slidr.Slidr
 import com.r0adkll.slidr.model.SlidrConfig
@@ -91,7 +88,7 @@ class LockScreenActivity : AbsMusicServiceActivity() {
         } else {
             window.addFlags(
                 WindowManager.LayoutParams.FLAG_SHOW_WHEN_LOCKED
-                //          or WindowManager.LayoutParams.FLAG_TURN_SCREEN_ON
+              //          or WindowManager.LayoutParams.FLAG_TURN_SCREEN_ON
             )
         }
     }
@@ -107,31 +104,16 @@ class LockScreenActivity : AbsMusicServiceActivity() {
     }
 
     private fun updateSongs() {
-        if (!isAlbumArtOnLockScreen) {
-            binding.image.setImageResource(R.drawable.default_audio_art)
-            return
-        }
-
         val song = MusicPlayerRemote.currentSong
-
         GlideApp.with(this)
             .asBitmapPalette()
             .songCoverOptions(song)
             .load(RetroGlideExtension.getSongModel(song))
-            .transition(RetroGlideExtension.getDefaultTransition())
+            .dontAnimate()
             .into(object : RetroMusicColoredTarget(binding.image) {
                 override fun onColorReady(colors: MediaNotificationProcessor) {
                     fragment?.setColor(colors)
                 }
             })
-
-        if (PreferenceUtil.isBlurredAlbumArt) {
-            GlideApp.with(this)
-                .load(RetroGlideExtension.getSongModel(song))
-                .transition(RetroGlideExtension.getDefaultTransition())
-                .transform(BlurTransformation.Builder(this).blurRadius(25f).build())
-                .into(binding.ivBlurredAlbumArt)
-        }
-
     }
 }

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

@@ -52,7 +52,6 @@ import code.name.monkey.retromusic.extensions.toMediaSessionQueue
 import code.name.monkey.retromusic.extensions.uri
 import code.name.monkey.retromusic.glide.BlurTransformation
 import code.name.monkey.retromusic.glide.GlideApp
-import code.name.monkey.retromusic.glide.RetroGlideExtension.getDefaultTransition
 import code.name.monkey.retromusic.glide.RetroGlideExtension.getSongModel
 import code.name.monkey.retromusic.helper.ShuffleHelper.makeShuffleList
 import code.name.monkey.retromusic.model.Song
@@ -70,6 +69,7 @@ import code.name.monkey.retromusic.util.MusicUtil
 import code.name.monkey.retromusic.util.MusicUtil.toggleFavorite
 import code.name.monkey.retromusic.util.PackageValidator
 import code.name.monkey.retromusic.util.PreferenceUtil.crossFadeDuration
+import code.name.monkey.retromusic.util.PreferenceUtil.isAlbumArtOnLockScreen
 import code.name.monkey.retromusic.util.PreferenceUtil.isBluetoothSpeaker
 import code.name.monkey.retromusic.util.PreferenceUtil.isBlurredAlbumArt
 import code.name.monkey.retromusic.util.PreferenceUtil.isClassicNotification
@@ -1021,13 +1021,18 @@ class MusicService : MediaBrowserServiceCompat(),
             .putBitmap(MediaMetadataCompat.METADATA_KEY_ALBUM_ART, null)
             .putLong(MediaMetadataCompat.METADATA_KEY_NUM_TRACKS, playingQueue.size.toLong())
 
-            // there only about notification's album art, so remove "isAlbumArtOnLockScreen" and "isBlurredAlbumArt"
+        if (isAlbumArtOnLockScreen) {
-            GlideApp.with(this)
+            // val screenSize: Point = RetroUtil.getScreenSize(this)
+            val request = GlideApp.with(this)
                 .asBitmap()
                 .songCoverOptions(song)
                 .load(getSongModel(song))
-                .transition(getDefaultTransition())
+
-                .into(object : CustomTarget<Bitmap?>(Target.SIZE_ORIGINAL, Target.SIZE_ORIGINAL) {
+            if (isBlurredAlbumArt) {
+                request.transform(BlurTransformation.Builder(this@MusicService).build())
+            }
+            request.into(object :
+                CustomTarget<Bitmap?>(Target.SIZE_ORIGINAL, Target.SIZE_ORIGINAL) {
                 override fun onLoadFailed(errorDrawable: Drawable?) {
                     super.onLoadFailed(errorDrawable)
                     metaData.putBitmap(
@@ -1055,6 +1060,10 @@ class MusicService : MediaBrowserServiceCompat(),
 
                 override fun onLoadCleared(placeholder: Drawable?) {}
             })
+        } else {
+            mediaSession?.setMetadata(metaData.build())
+            onCompletion()
+        }
     }
 
     private fun handleChangeInternal(what: String) {

app/src/main/java/code/name/monkey/retromusic/util/PreferenceUtil.kt

@@ -263,7 +263,7 @@ object PreferenceUtil {
 
     val isAlbumArtOnLockScreen
         get() = sharedPreferences.getBoolean(
-            ALBUM_ART_ON_LOCK_SCREEN, false
+            ALBUM_ART_ON_LOCK_SCREEN, true
         )
 
     val isAudioDucking