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

Fix visibility of lyrics views in LyricsFragment

Browse source
This commit is contained in:
Prathamesh More 2022-06-23 00:07:46 +05:30 • committed by Daksh P. Jain
parent 70e28e3e0f
commit 96ef1416f8
2 changed files with 9 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

15
app/src/main/java/code/name/monkey/retromusic/fragments/lyrics/LyricsFragment.kt
View file

@ -305,13 +305,14 @@ class LyricsFragment : AbsMainActivityFragment(R.layout.fragment_lyrics),
} }
private fun loadNormalLyrics() { private fun loadNormalLyrics() {
var lyrics: String? = null
val file = File(song.data) val file = File(song.data)
try { val lyrics = try {
lyrics = AudioFileIO.read(file).tagOrCreateDefault.getFirst(FieldKey.LYRICS) AudioFileIO.read(file).tagOrCreateDefault.getFirst(FieldKey.LYRICS)
} catch (e: Exception) { } catch (e: Exception) {
e.printStackTrace() e.printStackTrace()
""
} }
binding.normalLyrics.isVisible = !lyrics.isNullOrEmpty()
binding.noLyricsFound.isVisible = lyrics.isNullOrEmpty() binding.noLyricsFound.isVisible = lyrics.isNullOrEmpty()
binding.normalLyrics.text = lyrics binding.normalLyrics.text = lyrics
} }
@ -320,17 +321,15 @@ class LyricsFragment : AbsMainActivityFragment(R.layout.fragment_lyrics),
* @return success * @return success
*/ */
private fun loadLRCLyrics(): Boolean { private fun loadLRCLyrics(): Boolean {
binding.lyricsView.setLabel(getString(R.string.empty))
val lrcFile = LyricUtil.getSyncedLyricsFile(song) val lrcFile = LyricUtil.getSyncedLyricsFile(song)
if (lrcFile != null) { if (lrcFile != null) {
binding.lyricsView.loadLrc(lrcFile) binding.lyricsView.loadLrc(lrcFile)
println("File: ${lrcFile.absolutePath}")
} else { } else {
val embeddedLyrics = LyricUtil.getEmbeddedSyncedLyrics(song.data) val embeddedLyrics = LyricUtil.getEmbeddedSyncedLyrics(song.data)
if (embeddedLyrics != null) { if (embeddedLyrics != null) {
binding.lyricsView.loadLrc(embeddedLyrics) binding.lyricsView.loadLrc(embeddedLyrics)
println("Lyrics: ${embeddedLyrics.substring(0..50)}")
} else { } else {
binding.lyricsView.setLabel(getString(R.string.empty))
return false return false
} }
} }
@ -339,11 +338,13 @@ class LyricsFragment : AbsMainActivityFragment(R.layout.fragment_lyrics),
private fun loadLyrics() { private fun loadLyrics() {
lyricsType = if (!loadLRCLyrics()) { lyricsType = if (!loadLRCLyrics()) {
binding.lyricsView.isVisible = false
loadNormalLyrics() loadNormalLyrics()
LyricsType.SYNCED_LYRICS LyricsType.SYNCED_LYRICS
} else { } else {
binding.normalLyrics.isVisible = false
binding.noLyricsFound.isVisible = false binding.noLyricsFound.isVisible = false
binding.normalLyrics.text = "" binding.lyricsView.isVisible = true
LyricsType.NORMAL_LYRICS LyricsType.NORMAL_LYRICS
} }
} }

2
app/src/main/java/code/name/monkey/retromusic/lyrics/LrcView.java
View file

@ -544,7 +544,7 @@ public class LrcView extends View {
mLrcEntryList.clear(); mLrcEntryList.clear();
mOffset = 0; mOffset = 0;
mCurrentLine = 0; mCurrentLine = 0;
invalidate(); //invalidate();
} }
private void adjustCenter() { private void adjustCenter() {