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

Fix circlar UI and lyrics

Browse source
This commit is contained in:
h4h13 2019-11-12 19:49:33 +05:30
commit c5aa167c1c
10 changed files with 148 additions and 98 deletions
Download patch file Download diff file Expand all files Collapse all files

23
app/src/main/java/code/name/monkey/retromusic/fragments/MiniPlayerFragment.kt
View file

@ -11,10 +11,6 @@ import android.view.*
import android.view.animation.DecelerateInterpolator
import code.name.monkey.appthemehelper.ThemeStore
import code.name.monkey.retromusic.R
import code.name.monkey.retromusic.extensions.fistElement
import code.name.monkey.retromusic.extensions.hide
import code.name.monkey.retromusic.extensions.lastElement
import code.name.monkey.retromusic.extensions.show
import code.name.monkey.retromusic.fragments.base.AbsMusicServiceFragment
import code.name.monkey.retromusic.helper.MusicPlayerRemote
import code.name.monkey.retromusic.helper.MusicProgressViewUpdateHelper
@ -96,7 +92,6 @@ open class MiniPlayerFragment : AbsMusicServiceFragment(), MusicProgressViewUpda
override fun onServiceConnected() {
updateSongTitle()
updatePlayPauseDrawableState()
updateButtons()
}
override fun onPlayingMetaChanged() {
@ -105,24 +100,8 @@ open class MiniPlayerFragment : AbsMusicServiceFragment(), MusicProgressViewUpda
override fun onPlayStateChanged() {
updatePlayPauseDrawableState()
updateButtons()
}
private fun updateButtons() {
if (PreferenceUtil.getInstance(requireContext()).isExtraControls) {
if (MusicPlayerRemote.playingQueue.fistElement()) {
actionPrevious.hide()
} else {
actionPrevious.show()
}
if (MusicPlayerRemote.playingQueue.lastElement()) {
actionNext.hide()
} else {
actionNext.show()
}
}
}
override fun onUpdateProgressViews(progress: Int, total: Int) {
progressBar.max = total
@ -146,7 +125,7 @@ open class MiniPlayerFragment : AbsMusicServiceFragment(), MusicProgressViewUpda
if (MusicPlayerRemote.isPlaying) {
miniPlayerPlayPauseButton!!.setImageResource(R.drawable.ic_pause_white_24dp)
} else {
miniPlayerPlayPauseButton!!.setImageResource(R.drawable.ic_play_arrow_white_32dp)
miniPlayerPlayPauseButton!!.setImageResource(R.drawable.ic_play_arrow_white_24dp)
}
}

28
app/src/main/java/code/name/monkey/retromusic/fragments/base/AbsPlayerControlsFragment.kt
View file

@ -5,15 +5,9 @@ import android.view.View
import android.view.animation.AccelerateInterpolator
import android.view.animation.DecelerateInterpolator
import code.name.monkey.retromusic.R
import code.name.monkey.retromusic.extensions.fistElement
import code.name.monkey.retromusic.extensions.hidden
import code.name.monkey.retromusic.extensions.lastElement
import code.name.monkey.retromusic.extensions.show
import code.name.monkey.retromusic.fragments.VolumeFragment
import code.name.monkey.retromusic.helper.MusicPlayerRemote
import code.name.monkey.retromusic.helper.MusicProgressViewUpdateHelper
import code.name.monkey.retromusic.util.PreferenceUtil
import kotlinx.android.synthetic.main.fragment_adaptive_player_playback_controls.*
/**
@ -78,27 +72,5 @@ abstract class AbsPlayerControlsFragment : AbsMusicServiceFragment(), MusicProgr
const val SLIDER_ANIMATION_TIME: Long = 400
}
override fun onServiceConnected() {
super.onServiceConnected()
updateButtons()
}
override fun onPlayingMetaChanged() {
super.onPlayingMetaChanged()
updateButtons()
}
private fun updateButtons() {
if (MusicPlayerRemote.playingQueue.fistElement()) {
previousButton?.hidden()
} else {
previousButton?.show()
}
if (MusicPlayerRemote.playingQueue.lastElement()) {
nextButton?.hidden()
} else {
nextButton?.show()
}
}
}

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

@ -213,7 +213,7 @@ abstract class AbsPlayerFragment : AbsMusicServiceFragment(),
override fun doInBackground(vararg params: Song): Lyrics? {
try {
var data: String? = LyricUtil.getStringFromFile(params[0].title, params[0].artistName)
var data: String? = LyricUtil.getStringFromFile(params[0].data, params[0].artistName)
return if (TextUtils.isEmpty(data)) {
data = MusicUtil.getLyrics(params[0])
return if (TextUtils.isEmpty(data)) {