Code Cleanup
This commit is contained in:
parent
170e51a595
commit
8607b0d4ee
6 changed files with 12 additions and 34 deletions
|
@ -18,6 +18,7 @@ class MusicSeekSkipTouchListener(val activity: FragmentActivity, val next: Boole
|
|||
|
||||
var job: Job? = null
|
||||
var counter = 0
|
||||
var wasSeeking = false
|
||||
|
||||
private val gestureDetector = GestureDetector(activity, object :
|
||||
GestureDetector.SimpleOnGestureListener() {
|
||||
|
@ -26,6 +27,7 @@ class MusicSeekSkipTouchListener(val activity: FragmentActivity, val next: Boole
|
|||
counter = 0
|
||||
while (isActive) {
|
||||
delay(500)
|
||||
wasSeeking = true
|
||||
var seekingDuration = MusicPlayerRemote.songProgressMillis
|
||||
if (next) {
|
||||
seekingDuration += 5000 * (counter.floorDiv(2) + 1)
|
||||
|
@ -38,15 +40,6 @@ class MusicSeekSkipTouchListener(val activity: FragmentActivity, val next: Boole
|
|||
}
|
||||
return super.onDown(e)
|
||||
}
|
||||
|
||||
override fun onSingleTapConfirmed(e: MotionEvent?): Boolean {
|
||||
if (next) {
|
||||
MusicPlayerRemote.playNextSong()
|
||||
} else {
|
||||
MusicPlayerRemote.back()
|
||||
}
|
||||
return super.onSingleTapConfirmed(e)
|
||||
}
|
||||
})
|
||||
|
||||
@SuppressLint("ClickableViewAccessibility")
|
||||
|
@ -54,6 +47,14 @@ class MusicSeekSkipTouchListener(val activity: FragmentActivity, val next: Boole
|
|||
val action = event?.actionMasked
|
||||
if (action == MotionEvent.ACTION_UP || action == MotionEvent.ACTION_CANCEL) {
|
||||
job?.cancel()
|
||||
if (!wasSeeking) {
|
||||
if (next) {
|
||||
MusicPlayerRemote.playNextSong()
|
||||
} else {
|
||||
MusicPlayerRemote.back()
|
||||
}
|
||||
}
|
||||
wasSeeking = false
|
||||
}
|
||||
return gestureDetector.onTouchEvent(event)
|
||||
}
|
||||
|
|
|
@ -245,6 +245,7 @@ class HomeFragment :
|
|||
}
|
||||
|
||||
private fun loadSuggestions(songs: List<Song>) {
|
||||
if (songs.isEmpty()) return
|
||||
val images = listOf(
|
||||
binding.suggestions.image1,
|
||||
binding.suggestions.image2,
|
||||
|
|
|
@ -147,21 +147,6 @@ class PlayerAlbumCoverFragment : AbsMusicServiceFragment(R.layout.fragment_playe
|
|||
setOnClickListener {
|
||||
goToLyrics(requireActivity())
|
||||
}
|
||||
setOnFlingXListener { velocityX ->
|
||||
when {
|
||||
velocityX < 0 -> {
|
||||
MusicPlayerRemote.playNextSong()
|
||||
true
|
||||
}
|
||||
velocityX > 0 -> {
|
||||
MusicPlayerRemote.playPreviousSong()
|
||||
true
|
||||
}
|
||||
else -> {
|
||||
false
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue