Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,8 @@ import android.view.MenuInflater
import android.view.MenuItem
import android.view.View
import android.view.ViewGroup
import android.view.GestureDetector
import android.view.MotionEvent
import com.naman14.timberx.R
import com.naman14.timberx.databinding.FragmentNowPlayingBinding
import com.naman14.timberx.extensions.addFragment
Expand Down Expand Up @@ -53,14 +55,19 @@ import kotlinx.android.synthetic.main.fragment_now_playing.songTitle
import kotlinx.android.synthetic.main.fragment_now_playing.upNextAlbumArt
import kotlinx.android.synthetic.main.fragment_now_playing.upNextArtist
import kotlinx.android.synthetic.main.fragment_now_playing.upNextTitle
import kotlinx.android.synthetic.main.fragment_now_playing.frag_now_playing_rl
import org.koin.android.ext.android.inject
import kotlin.math.absoluteValue

class NowPlayingFragment : BaseNowPlayingFragment() {
class NowPlayingFragment : BaseNowPlayingFragment(), GestureDetector.OnGestureListener {
var binding by AutoClearedValue<FragmentNowPlayingBinding>(this)
private var queueData: QueueData? = null

private val songsRepository by inject<SongsRepository>()

private lateinit var gestureDetector: GestureDetector
val MIN_FLING_VELOCITY = 800

override fun onCreateView(
inflater: LayoutInflater,
container: ViewGroup?,
Expand Down Expand Up @@ -139,6 +146,8 @@ class NowPlayingFragment : BaseNowPlayingFragment() {
btnBack.setOnClickListener { safeActivity.onBackPressed() }

buildUIControls()

setupSwipeGestures()
}

private fun buildUIControls() {
Expand All @@ -152,6 +161,11 @@ class NowPlayingFragment : BaseNowPlayingFragment() {
}
}

private fun setupSwipeGestures() {
gestureDetector = GestureDetector(activity, this)
frag_now_playing_rl.setOnTouchListener(touchListener)
}

override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) {
inflater.inflate(R.menu.menu_main, menu)
super.onCreateOptionsMenu(menu, inflater)
Expand All @@ -177,4 +191,42 @@ class NowPlayingFragment : BaseNowPlayingFragment() {
seekBar.disconnectController()
super.onStop()
}

var touchListener: View.OnTouchListener = View.OnTouchListener {
_: View, motionEvent: MotionEvent -> gestureDetector.onTouchEvent(motionEvent)
}

override fun onDown(event: MotionEvent): Boolean {
return true
}

override fun onFling(
e1: MotionEvent,
e2: MotionEvent,
velocityX: Float,
velocityY: Float
): Boolean {
if (velocityX.absoluteValue > MIN_FLING_VELOCITY) {
if (velocityX < 0) {
mainViewModel.transportControls().skipToNext()
} else {
mainViewModel.transportControls().skipToPrevious()
}
}
return true
}

override fun onShowPress(e: MotionEvent?) {
}

override fun onSingleTapUp(e: MotionEvent?): Boolean {
return true
}

override fun onLongPress(e: MotionEvent?) {
}

override fun onScroll(e1: MotionEvent?, e2: MotionEvent?, distanceX: Float, distanceY: Float): Boolean {
return true
}
}
4 changes: 3 additions & 1 deletion app/src/main/res/layout/fragment_now_playing.xml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,9 @@
type="com.naman14.timberx.ui.viewmodels.NowPlayingViewModel" />
</data>

<RelativeLayout xmlns:app="http://schemas.android.com/apk/res-auto"
<RelativeLayout
android:id="@+id/frag_now_playing_rl"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_gravity="top"
Expand Down