From 7226f9e76ca0185f8ed97d1a9c2a1d5a69f02999 Mon Sep 17 00:00:00 2001
From: Prathamesh More <prathameshmm02@gmail.com>
Date: Fri, 21 Jan 2022 21:51:15 +0530
Subject: [PATCH] [Now Playing] Fixed lyrics over cover

---
 .../monkey/retromusic/fragments/base/AbsPlayerFragment.kt   | 2 +-
 .../retromusic/fragments/player/PlayerAlbumCoverFragment.kt | 5 +++--
 .../java/code/name/monkey/retromusic/util/PreferenceUtil.kt | 6 +++---
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/base/AbsPlayerFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/base/AbsPlayerFragment.kt
index 379a2e789..872f843d2 100644
--- a/app/src/main/java/code/name/monkey/retromusic/fragments/base/AbsPlayerFragment.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/fragments/base/AbsPlayerFragment.kt
@@ -310,8 +310,8 @@ abstract class AbsPlayerFragment(@LayoutRes layout: Int) : AbsMainActivityFragme
             playerToolbar()?.menu?.removeItem(R.id.action_toggle_lyrics)
         } else {
             playerToolbar()?.menu?.findItem(R.id.action_toggle_lyrics)?.apply {
-                isCheckable = true
                 isChecked = PreferenceUtil.showLyrics
+                showLyricsIcon(this)
             }
         }
         requireView().setOnTouchListener(
diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/player/PlayerAlbumCoverFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/player/PlayerAlbumCoverFragment.kt
index 2099bf573..9da856bf3 100644
--- a/app/src/main/java/code/name/monkey/retromusic/fragments/player/PlayerAlbumCoverFragment.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/fragments/player/PlayerAlbumCoverFragment.kt
@@ -215,10 +215,11 @@ class PlayerAlbumCoverFragment : AbsMusicServiceFragment(R.layout.fragment_playe
         binding.coverLyrics.isVisible = false
         binding.lyricsView.isVisible = false
         binding.viewPager.isVisible = true
-        val lyrics: View = if (PreferenceUtil.lyricsType == LyricsType.REPLACE_LYRICS) {
+        val lyrics: View = if (PreferenceUtil.lyricsType == LyricsType.REPLACE_COVER) {
             ObjectAnimator.ofFloat(viewPager, View.ALPHA, if (visible) 0F else 1F).start()
             lrcView
         } else {
+            ObjectAnimator.ofFloat(viewPager, View.ALPHA, 1F).start()
             binding.coverLyrics
         }
         ObjectAnimator.ofFloat(lyrics, View.ALPHA, if (visible) 1F else 0F).apply {
@@ -234,7 +235,7 @@ class PlayerAlbumCoverFragment : AbsMusicServiceFragment(R.layout.fragment_playe
         // Don't show lyrics container for below conditions
         if (lyricViewNpsList.contains(nps) && PreferenceUtil.showLyrics) {
             showLyrics(true)
-            if (PreferenceUtil.lyricsType == LyricsType.REPLACE_LYRICS) {
+            if (PreferenceUtil.lyricsType == LyricsType.REPLACE_COVER) {
                 progressViewUpdateHelper?.start()
             }
         } else {
diff --git a/app/src/main/java/code/name/monkey/retromusic/util/PreferenceUtil.kt b/app/src/main/java/code/name/monkey/retromusic/util/PreferenceUtil.kt
index d47aa1717..20b9d799f 100644
--- a/app/src/main/java/code/name/monkey/retromusic/util/PreferenceUtil.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/util/PreferenceUtil.kt
@@ -675,9 +675,9 @@ object PreferenceUtil {
 
     val lyricsType: LyricsType
         get() = if (sharedPreferences.getString(LYRICS_TYPE, "0") == "0") {
-            LyricsType.REPLACE_LYRICS
+            LyricsType.REPLACE_COVER
         } else {
-            LyricsType.OVER_LYRICS
+            LyricsType.OVER_COVER
         }
 
     var playbackSpeed
@@ -710,5 +710,5 @@ object PreferenceUtil {
         get() = sharedPreferences.getBoolean(CIRCLE_PLAY_BUTTON, false)
 }
 enum class LyricsType {
-    REPLACE_LYRICS, OVER_LYRICS
+    REPLACE_COVER, OVER_COVER
 }
\ No newline at end of file