kavin/LibreTube
1
0
Fork 0
mirror of https://github.com/libre-tube/LibreTube.git synced 2024-12-13 22:00:30 +05:30
Code Issues Projects Releases Wiki Activity

add repeat queue btn

Browse Source
This commit is contained in:
Bnyro 2022-11-17 16:45:07 +01:00
parent 12adebd4bf
commit bbdeeea03b
4 changed files with 31 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/com/github/libretube/ui/fragments/PlayerFragment.kt
View File

@ -501,7 +501,7 @@ class PlayerFragment : BaseFragment(), OnlinePlayerOptions {
try {
// clear the playing queue
PlayingQueue.clear()
PlayingQueue.removeOnQueueTapListener()
PlayingQueue.resetToDefaults()
saveWatchPosition()
nowPlayingNotification.destroySelfAndPlayer()

7
app/src/main/java/com/github/libretube/ui/sheets/PlayingQueueSheet.kt
View File

@ -61,6 +61,13 @@ class PlayingQueueSheet : ExpandedBottomSheet() {
adapter.notifyDataSetChanged()
}
binding.repeat.setOnClickListener {
PlayingQueue.repeatQueue = !PlayingQueue.repeatQueue
it.alpha = if (PlayingQueue.repeatQueue) 1f else 0.5f
}
binding.repeat.alpha = if (PlayingQueue.repeatQueue) 1f else 0.5f
binding.bottomControls.setOnClickListener {
dialog?.dismiss()
}

23
app/src/main/java/com/github/libretube/ui/views/CustomExoPlayerView.kt
View File

@ -22,7 +22,9 @@ import com.github.libretube.ui.interfaces.PlayerOptions
import com.github.libretube.ui.sheets.BaseBottomSheet
import com.github.libretube.ui.sheets.PlaybackSpeedSheet
import com.github.libretube.util.PlayerHelper
import com.github.libretube.util.PlayingQueue
import com.google.android.exoplayer2.PlaybackParameters
import com.google.android.exoplayer2.Player
import com.google.android.exoplayer2.trackselection.TrackSelector
import com.google.android.exoplayer2.ui.AspectRatioFrameLayout
import com.google.android.exoplayer2.ui.StyledPlayerView
@ -373,18 +375,23 @@ internal class CustomExoPlayerView(
override fun onRepeatModeClicked() {
val repeatModeNames = listOf(
context.getString(R.string.repeat_mode_none),
context.getString(R.string.repeat_mode_current)
)
val repeatModes = listOf(
RepeatModeUtil.REPEAT_TOGGLE_MODE_NONE,
RepeatModeUtil.REPEAT_TOGGLE_MODE_ALL
context.getString(R.string.repeat_mode_current),
context.getString(R.string.all)
)
// repeat mode options dialog
BaseBottomSheet()
.setSimpleItems(repeatModeNames) { index ->
player?.repeatMode = repeatModes[index]
PlayingQueue.repeatQueue = when (index) {
0 -> {
player?.repeatMode = Player.REPEAT_MODE_OFF
false
}
1 -> {
player?.repeatMode = Player.REPEAT_MODE_ONE
false
}
else -> true
}
}
.show(supportFragmentManager)
}

12
app/src/main/java/com/github/libretube/util/PlayingQueue.kt
View File

@ -13,6 +13,7 @@ object PlayingQueue {
private val queue = mutableListOf<StreamItem>()
private var currentStream: StreamItem? = null
private var onQueueTapListener: (StreamItem) -> Unit = {}
var repeatQueue: Boolean = false
fun add(vararg streamItem: StreamItem) {
streamItem.forEach {
@ -33,11 +34,13 @@ object PlayingQueue {
}
fun getNext(): String? {
return try {
queue[currentIndex() + 1].url?.toID()
try {
return queue[currentIndex() + 1].url?.toID()
} catch (e: Exception) {
null
Log.e("queue ended", e.toString())
}
if (repeatQueue) return queue.firstOrNull()?.url?.toID()
return null
}
fun getPrev(): String? {
@ -133,7 +136,8 @@ object PlayingQueue {
onQueueTapListener = listener
}
fun removeOnQueueTapListener() {
fun resetToDefaults() {
repeatQueue = false
onQueueTapListener = {}
}
}