From f660c6147a0e1a7dc66c130a4119f791214718cb Mon Sep 17 00:00:00 2001
From: Prathamesh More
Slidr by Drew Heavner
+FadingEdgeLayout by bosphere
Icons by Austin Andrews
Material Design City Wallpaper
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 d4a278cb9..449943e94 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 @@ -21,6 +21,7 @@ import android.os.Bundle import android.view.View import androidx.core.view.isInvisible import androidx.core.view.isVisible +import androidx.lifecycle.lifecycleScope import androidx.preference.PreferenceManager import androidx.viewpager.widget.ViewPager import code.name.monkey.appthemehelper.util.MaterialValueHelper @@ -43,6 +44,9 @@ import code.name.monkey.retromusic.transform.ParallaxPagerTransformer import code.name.monkey.retromusic.util.LyricUtil import code.name.monkey.retromusic.util.PreferenceUtil import code.name.monkey.retromusic.util.color.MediaNotificationProcessor +import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.launch +import kotlinx.coroutines.withContext class PlayerAlbumCoverFragment : AbsMusicServiceFragment(R.layout.fragment_player_album_cover), ViewPager.OnPageChangeListener, MusicProgressViewUpdateHelper.Callback, @@ -75,17 +79,24 @@ class PlayerAlbumCoverFragment : AbsMusicServiceFragment(R.layout.fragment_playe private fun updateLyrics() { binding.lyricsView.setLabel(context?.getString(R.string.no_lyrics_found)) val song = MusicPlayerRemote.currentSong - val lrcFile = LyricUtil.getSyncedLyricsFile(song) - if (lrcFile != null) { - binding.lyricsView.loadLrc(lrcFile) - } else { - val embeddedLyrics = LyricUtil.getEmbeddedSyncedLyrics(song.data) - if (embeddedLyrics != null) { - binding.lyricsView.loadLrc(embeddedLyrics) + lifecycleScope.launch(Dispatchers.IO) { + val lrcFile = LyricUtil.getSyncedLyricsFile(song) + if (lrcFile != null) { + withContext(Dispatchers.Main) { + binding.lyricsView.loadLrc(lrcFile) + } } else { - binding.lyricsView.reset() + val embeddedLyrics = LyricUtil.getEmbeddedSyncedLyrics(song.data) + withContext(Dispatchers.Main) { + if (embeddedLyrics != null) { + binding.lyricsView.loadLrc(embeddedLyrics) + } else { + binding.lyricsView.reset() + } + } } } + } override fun onUpdateProgressViews(progress: Int, total: Int) { @@ -272,7 +283,6 @@ class PlayerAlbumCoverFragment : AbsMusicServiceFragment(R.layout.fragment_playe companion object { val TAG: String = PlayerAlbumCoverFragment::class.java.simpleName - } private val lyricViewNpsList = diff --git a/app/src/main/res/layout/fragment_player_album_cover.xml b/app/src/main/res/layout/fragment_player_album_cover.xml index 90aa7633c..4086b5d20 100644 --- a/app/src/main/res/layout/fragment_player_album_cover.xml +++ b/app/src/main/res/layout/fragment_player_album_cover.xml @@ -13,19 +13,27 @@ -