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

Merge pull request #518 from tva2000hn/master

Browse source 
Synced .lrc lyrics without putting in the /RetroMusic folder
This commit is contained in:
Hemanth S 2019-11-10 00:07:49 +05:30 • committed by GitHub
commit 99ed3d3bbb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 79 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

20
app/src/main/java/code/name/monkey/retromusic/activities/LyricsActivity.kt
View file

@ -7,6 +7,7 @@ import android.os.Build
import android.os.Bundle
import android.text.InputType
import android.text.TextUtils
import android.util.Log
import android.view.*
import androidx.annotation.StringRes
import androidx.core.content.ContextCompat
@ -150,8 +151,13 @@ class LyricsActivity : AbsMusicServiceActivity(), View.OnClickListener, ViewPage
private fun showSyncedLyrics() {
var content = ""
try {
content = LyricUtil.getStringFromFile(song.title, song.artistName)
content = LyricUtil.getStringFromFile(song.data, song.artistName)
} catch (e: Exception) {
try{
content = LyricUtil.getStringFromFile(song.title, song.artistName)
} catch ( e2 : Exception){
}
e.printStackTrace()
}
@ -161,7 +167,7 @@ class LyricsActivity : AbsMusicServiceActivity(), View.OnClickListener, ViewPage
input(hint = getString(R.string.paste_lyrics_here),
prefill = content,
inputType = InputType.TYPE_CLASS_TEXT or InputType.TYPE_TEXT_FLAG_MULTI_LINE) { _, input ->
LyricUtil.writeLrcToLoc(song.title, song.artistName, input.toString())
LyricUtil.writeLrcToLoc(song.data, song.artistName, input.toString())
}
positiveButton(android.R.string.ok) {
updateSong()
@ -364,8 +370,12 @@ class LyricsActivity : AbsMusicServiceActivity(), View.OnClickListener, ViewPage
private fun loadLRCLyrics() {
val song = MusicPlayerRemote.currentSong
if (LyricUtil.isLrcFileExist(song.title, song.artistName)) {
showLyricsLocal(LyricUtil.getLocalLyricFile(song.title, song.artistName))
if (LyricUtil.isLrcFile2Exist(song.data, song.artistName)) {
showLyricsLocal(LyricUtil.getLocalLyricFile(song.data, song.artistName))
} else {
if (LyricUtil.isLrcFileExist(song.title, song.artistName)) {
showLyricsLocal(LyricUtil.getLocalLyricFile(song.title, song.artistName))
}
}
}
@ -375,4 +385,4 @@ class LyricsActivity : AbsMusicServiceActivity(), View.OnClickListener, ViewPage
}
}
}
}
}