Siklos/Metro
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[Now Playing] Fixed lyrics over cover

Browse source
This commit is contained in:
Prathamesh More 2022-01-21 21:51:15 +05:30
parent db97705f67
commit 7226f9e76c
3 changed files with 7 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -310,8 +310,8 @@ abstract class AbsPlayerFragment(@LayoutRes layout: Int) : AbsMainActivityFragme
playerToolbar()?.menu?.removeItem(R.id.action_toggle_lyrics) playerToolbar()?.menu?.removeItem(R.id.action_toggle_lyrics)
} else { } else {
playerToolbar()?.menu?.findItem(R.id.action_toggle_lyrics)?.apply { playerToolbar()?.menu?.findItem(R.id.action_toggle_lyrics)?.apply {
isCheckable = true
isChecked = PreferenceUtil.showLyrics isChecked = PreferenceUtil.showLyrics
showLyricsIcon(this)
} }
} }
requireView().setOnTouchListener( requireView().setOnTouchListener(

5
app/src/main/java/code/name/monkey/retromusic/fragments/player/PlayerAlbumCoverFragment.kt
View file

@ -215,10 +215,11 @@ class PlayerAlbumCoverFragment : AbsMusicServiceFragment(R.layout.fragment_playe
binding.coverLyrics.isVisible = false binding.coverLyrics.isVisible = false
binding.lyricsView.isVisible = false binding.lyricsView.isVisible = false
binding.viewPager.isVisible = true 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() ObjectAnimator.ofFloat(viewPager, View.ALPHA, if (visible) 0F else 1F).start()
lrcView lrcView
} else { } else {
ObjectAnimator.ofFloat(viewPager, View.ALPHA, 1F).start()
binding.coverLyrics binding.coverLyrics
} }
ObjectAnimator.ofFloat(lyrics, View.ALPHA, if (visible) 1F else 0F).apply { 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 // Don't show lyrics container for below conditions
if (lyricViewNpsList.contains(nps) && PreferenceUtil.showLyrics) { if (lyricViewNpsList.contains(nps) && PreferenceUtil.showLyrics) {
showLyrics(true) showLyrics(true)
if (PreferenceUtil.lyricsType == LyricsType.REPLACE_LYRICS) { if (PreferenceUtil.lyricsType == LyricsType.REPLACE_COVER) {
progressViewUpdateHelper?.start() progressViewUpdateHelper?.start()
} }
} else { } else {

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

@ -675,9 +675,9 @@ object PreferenceUtil {
val lyricsType: LyricsType val lyricsType: LyricsType
get() = if (sharedPreferences.getString(LYRICS_TYPE, "0") == "0") { get() = if (sharedPreferences.getString(LYRICS_TYPE, "0") == "0") {
LyricsType.REPLACE_LYRICS LyricsType.REPLACE_COVER
} else { } else {
LyricsType.OVER_LYRICS LyricsType.OVER_COVER
} }
var playbackSpeed var playbackSpeed
@ -710,5 +710,5 @@ object PreferenceUtil {
get() = sharedPreferences.getBoolean(CIRCLE_PLAY_BUTTON, false) get() = sharedPreferences.getBoolean(CIRCLE_PLAY_BUTTON, false)
} }
enum class LyricsType { enum class LyricsType {
REPLACE_LYRICS, OVER_LYRICS REPLACE_COVER, OVER_COVER
} }