playback improvements, dependancy updates, and updated SDK

This commit is contained in:
2026-11-15 16:19:18 -05:00
parent 97c45f14c2
commit 2c094e254d
5 changed files with 704 additions and 475 deletions

View File

@@ -152,6 +152,7 @@ fun PlayerScreen(
}
}
}
fun showControlsAndFocusPlay() {
areControlsVisible = true
resetHideTimer()
@@ -162,6 +163,7 @@ fun PlayerScreen(
} catch (_: Exception) {}
}
}
val exoPlayer = remember {
ExoPlayer.Builder(context).build().apply {
playWhenReady = true
@@ -172,6 +174,7 @@ fun PlayerScreen(
durationMs = duration.coerceAtLeast(0L)
}
}
override fun onIsPlayingChanged(playing: Boolean) {
isPlaying = playing
if (playing) {
@@ -226,32 +229,36 @@ fun PlayerScreen(
resetHideTimer()
}
DisposableEffect(exoPlayer) {
val errorListener = object : Player.Listener { // source auto-fallback
override fun onPlayerError(error: androidx.media3.common.PlaybackException) {
val currentIdx = resolvedStreams.indexOf(activeStream)
if (currentIdx != -1 && currentIdx + 1 < resolvedStreams.size) {
// android.widget.Toast.makeText(context, "Source failed. Trying next...", android.widget.Toast.LENGTH_SHORT).show()
Log.e("vyla", "Source failed. Trying next...")
val errorListener = object : Player.Listener { // source auto-fallback
override fun onPlayerError(error: androidx.media3.common.PlaybackException) {
val currentIdx = resolvedStreams.indexOf(activeStream)
if (currentIdx != -1 && currentIdx + 1 < resolvedStreams.size) {
// android.widget.Toast.makeText(context, "Source failed. Trying next...", android.widget.Toast.LENGTH_SHORT).show()
Log.e("vyla", "Source failed. Trying next...")
coroutineScope.launch {
delay(1500) // follow rate limits
val nextStream = resolvedStreams[currentIdx + 1]
activeStream = nextStream
playStream(nextStream.primaryUrl, nextStream.headers)
coroutineScope.launch {
delay(1500) // follow rate limits
val nextStream = resolvedStreams[currentIdx + 1]
activeStream = nextStream
playStream(nextStream.primaryUrl, nextStream.headers)
}
} else {
isBuffering = false
Log.e("vyla", "All Sources Failed")
android.widget.Toast.makeText(
context,
"All available sources failed. Please disable any VPN or try again later",
android.widget.Toast.LENGTH_LONG
).show()
}
} else {
isBuffering = false
Log.e("vyla", "All Sources Failed")
android.widget.Toast.makeText(context, "All available sources failed. Please disable any VPN or try again later", android.widget.Toast.LENGTH_LONG).show()
}
}
exoPlayer.addListener(errorListener)
onDispose {
exoPlayer.removeListener(errorListener)
}
}
exoPlayer.addListener(errorListener)
onDispose {
exoPlayer.removeListener(errorListener)
}
}
suspend fun focusEpisodeCard() {
var tries = 0
while (tries < 15) {
@@ -260,9 +267,11 @@ fun PlayerScreen(
try {
episodeFocusRequester.requestFocus()
return
} catch (_: Exception) {}
} catch (_: Exception) {
}
}
}
fun loadSeasonEpisodes(seasonNum: Int, focusFirst: Boolean = false) {
selectedSeasonNum = seasonNum
coroutineScope.launch {
@@ -367,26 +376,31 @@ fun PlayerScreen(
}
BackHandler {
when {
activeMenu != ActivePlayerMenu.NONE -> {
val closedMenu = activeMenu
activeMenu = ActivePlayerMenu.NONE
areControlsVisible = true
resetHideTimer()
coroutineScope.launch {
delay(50)
try {
when (closedMenu) {
ActivePlayerMenu.QUALITY -> qualityButtonFocusRequester.requestFocus()
ActivePlayerMenu.SUBTITLES -> ccButtonFocusRequester.requestFocus()
ActivePlayerMenu.VOLUME -> volButtonFocusRequester.requestFocus()
ActivePlayerMenu.SETTINGS -> setButtonFocusRequester.requestFocus()
ActivePlayerMenu.MORE -> moreButtonFocusRequester.requestFocus()
else -> playPauseFocusRequester.requestFocus()
}
} catch (_: Exception) {}
fun closeActiveMenu() {
val closedMenu = activeMenu
activeMenu = ActivePlayerMenu.NONE
areControlsVisible = true
resetHideTimer()
coroutineScope.launch {
delay(50)
try {
when (closedMenu) {
ActivePlayerMenu.QUALITY -> qualityButtonFocusRequester.requestFocus()
ActivePlayerMenu.SUBTITLES -> ccButtonFocusRequester.requestFocus()
ActivePlayerMenu.VOLUME -> volButtonFocusRequester.requestFocus()
ActivePlayerMenu.SETTINGS -> setButtonFocusRequester.requestFocus()
ActivePlayerMenu.MORE -> moreButtonFocusRequester.requestFocus()
else -> playPauseFocusRequester.requestFocus()
}
} catch (_: Exception) {
}
}
}
when {
activeMenu != ActivePlayerMenu.NONE -> {
closeActiveMenu()
}
isEpisodesDrawerOpen -> {
isEpisodesDrawerOpen = false
areControlsVisible = true
@@ -395,12 +409,20 @@ fun PlayerScreen(
delay(50)
try {
episodesButtonFocusRequester.requestFocus()
} catch (_: Exception) {}
} catch (_: Exception) {
}
}
}
areControlsVisible -> {
hideControlsJob?.cancel()
areControlsVisible = false
try {
playerContainerFocusRequester.requestFocus()
} catch (_: Exception) {
}
}
else -> onBack()
}
}
@@ -412,6 +434,7 @@ fun PlayerScreen(
idx >= 0 && (idx + 1 < allEpisodes.size || seasons.any { it.seasonNumber > ep.seasonNumber })
}
}
fun playNextEpisode() {
val ep = currentEpisode ?: return
val idx = allEpisodes.indexOfFirst { it.episodeNumber == ep.episodeNumber }
@@ -450,6 +473,25 @@ fun PlayerScreen(
playerViewRef?.videoSurfaceView
}
fun closeActiveMenu() {
val closedMenu = activeMenu
activeMenu = ActivePlayerMenu.NONE
resetHideTimer()
coroutineScope.launch {
delay(50)
try {
when (closedMenu) {
ActivePlayerMenu.QUALITY -> qualityButtonFocusRequester.requestFocus()
ActivePlayerMenu.SUBTITLES -> ccButtonFocusRequester.requestFocus()
ActivePlayerMenu.VOLUME -> volButtonFocusRequester.requestFocus()
ActivePlayerMenu.SETTINGS -> setButtonFocusRequester.requestFocus()
ActivePlayerMenu.MORE -> moreButtonFocusRequester.requestFocus()
else -> playPauseFocusRequester.requestFocus()
}
} catch (_: Exception) {
}
}
}
Box(
modifier = modifier
.fillMaxSize()
@@ -461,10 +503,14 @@ fun PlayerScreen(
val code = event.nativeKeyEvent.keyCode
if (!areControlsVisible) {
if (code == KeyEvent.KEYCODE_BACK || code == KeyEvent.KEYCODE_ESCAPE) { // defer to backhandler
return@onKeyEvent false
}
val pendingSegment = activeSegment
val isConfirm = code == KeyEvent.KEYCODE_DPAD_CENTER ||
code == KeyEvent.KEYCODE_ENTER ||
code == KeyEvent.KEYCODE_NUMPAD_ENTER
if (pendingSegment != null && isConfirm && activeMenu == ActivePlayerMenu.NONE && !isEpisodesDrawerOpen) {
skipSegment(pendingSegment)
return@onKeyEvent true
@@ -476,41 +522,70 @@ fun PlayerScreen(
return@onKeyEvent true
}
if (code == KeyEvent.KEYCODE_BACK || code == KeyEvent.KEYCODE_ESCAPE) {
when {
activeMenu != ActivePlayerMenu.NONE -> {
return@onKeyEvent false // defer to backhandler
}
isEpisodesDrawerOpen -> {
return@onKeyEvent false // defer to backhandler
}
else -> { // hide controls
hideControlsJob?.cancel()
areControlsVisible = false
try {
playerContainerFocusRequester.requestFocus()
} catch (_: Exception) {
}
return@onKeyEvent true
}
}
}
when (code) {
KeyEvent.KEYCODE_MEDIA_PLAY -> {
exoPlayer.play()
showControlsAndFocusPlay()
return@onKeyEvent true
}
KeyEvent.KEYCODE_MEDIA_PAUSE -> {
exoPlayer.pause()
showControlsAndFocusPlay()
return@onKeyEvent true
}
KeyEvent.KEYCODE_MEDIA_PLAY_PAUSE -> {
if (exoPlayer.isPlaying) exoPlayer.pause() else exoPlayer.play()
showControlsAndFocusPlay()
return@onKeyEvent true
}
KeyEvent.KEYCODE_MEDIA_FAST_FORWARD -> {
exoPlayer.seekTo((exoPlayer.currentPosition + 10000).coerceAtMost(exoPlayer.duration))
resetHideTimer()
return@onKeyEvent true
}
KeyEvent.KEYCODE_MEDIA_REWIND -> {
exoPlayer.seekTo((exoPlayer.currentPosition - 10000).coerceAtLeast(0))
resetHideTimer()
return@onKeyEvent true
}
KeyEvent.KEYCODE_SPACE -> {
if (exoPlayer.isPlaying) exoPlayer.pause() else exoPlayer.play()
showControlsAndFocusPlay()
return@onKeyEvent true
}
KeyEvent.KEYCODE_BACK -> {
resetHideTimer()
return@onKeyEvent false
}
KeyEvent.KEYCODE_DPAD_CENTER -> {
resetHideTimer()
return@onKeyEvent false
@@ -529,7 +604,8 @@ fun PlayerScreen(
isFocusable = false
isFocusableInTouchMode = false
descendantFocusability = ViewGroup.FOCUS_BLOCK_DESCENDANTS
resizeMode = if (isFillScreen) AspectRatioFrameLayout.RESIZE_MODE_ZOOM else AspectRatioFrameLayout.RESIZE_MODE_FIT
resizeMode =
if (isFillScreen) AspectRatioFrameLayout.RESIZE_MODE_ZOOM else AspectRatioFrameLayout.RESIZE_MODE_FIT
layoutParams = FrameLayout.LayoutParams(
ViewGroup.LayoutParams.MATCH_PARENT,
ViewGroup.LayoutParams.MATCH_PARENT
@@ -781,7 +857,8 @@ fun PlayerScreen(
onLeftPress = {
try {
seekbarFocusRequester.requestFocus()
} catch (_: Exception) {}
} catch (_: Exception) {
}
},
onUpPress = {
try {
@@ -800,6 +877,7 @@ fun PlayerScreen(
}
}
if (activeMenu != ActivePlayerMenu.NONE) {
var menuHasFocus by remember { mutableStateOf(false) }
Box(
modifier = Modifier
.align(Alignment.TopEnd)
@@ -811,6 +889,30 @@ fun PlayerScreen(
.border(1.dp, Color(0x33FFFFFF), RoundedCornerShape(18.dp))
.padding(14.dp)
.zIndex(25f)
.onFocusChanged { state ->
if (menuHasFocus && !state.hasFocus) {
// Focus navigated outside the menu popup: dismiss it
activeMenu = ActivePlayerMenu.NONE
resetHideTimer()
}
menuHasFocus = state.hasFocus
}
.onKeyEvent { event ->
if (event.type == KeyEventType.KeyDown) {
when (event.nativeKeyEvent.keyCode) {
KeyEvent.KEYCODE_BACK, KeyEvent.KEYCODE_ESCAPE -> {
closeActiveMenu()
return@onKeyEvent true
}
KeyEvent.KEYCODE_DPAD_LEFT -> {
closeActiveMenu()
return@onKeyEvent true
}
}
}
false
}
) {
LazyColumn(modifier = Modifier.fillMaxWidth()) {
when (activeMenu) {
@@ -846,6 +948,7 @@ fun PlayerScreen(
}
}
}
ActivePlayerMenu.SUBTITLES -> {
item {
MenuSectionHeader("Subtitles")
@@ -900,7 +1003,11 @@ fun PlayerScreen(
horizontalArrangement = Arrangement.spacedBy(8.dp),
modifier = Modifier.padding(horizontal = 6.dp, vertical = 4.dp)
) {
listOf("White" to "#FFFFFF", "Yellow" to "#FFD700", "Cyan" to "#00FFFF").forEach { (name, hex) ->
listOf(
"White" to "#FFFFFF",
"Yellow" to "#FFD700",
"Cyan" to "#00FFFF"
).forEach { (name, hex) ->
MiniSelectButton(
text = name,
isSelected = subtitleColorHex == hex,
@@ -910,6 +1017,7 @@ fun PlayerScreen(
}
}
}
ActivePlayerMenu.VOLUME -> {
item {
MenuSectionHeader("Volume Control")
@@ -961,14 +1069,16 @@ fun PlayerScreen(
)
}
}
ActivePlayerMenu.SETTINGS -> {
item {
MenuSectionHeader("Available Sources (${resolvedStreams.size})")
}
items(resolvedStreams) { stream ->
itemsIndexed(resolvedStreams) { index, stream ->
MenuItemRow(
label = stream.label,
isSelected = ((activeStream?.provider == stream.provider) && (activeStream?.primaryUrl == stream.primaryUrl)),
focusRequester = if (index == 0) menuFirstItemFocusRequester else null,
onClick = {
activeStream = stream
playStream(stream.primaryUrl, stream.headers)
@@ -1014,6 +1124,7 @@ fun PlayerScreen(
)
}
}
ActivePlayerMenu.MORE -> {
item {
MenuSectionHeader("Library")
@@ -1038,6 +1149,7 @@ fun PlayerScreen(
)
}
}
else -> {}
}
}
@@ -1104,7 +1216,8 @@ fun PlayerScreen(
delay(50)
try {
episodesButtonFocusRequester.requestFocus()
} catch (_: Exception) {}
} catch (_: Exception) {
}
}
}
)
@@ -1135,6 +1248,7 @@ fun PlayerScreen(
}
}
}
@Composable
private fun PlayerCircleButton(
icon: androidx.compose.ui.graphics.vector.ImageVector,
@@ -1155,6 +1269,8 @@ private fun PlayerCircleButton(
.videoTint(isFocused, isSelected)
.then(if (focusRequester != null) Modifier.focusRequester(focusRequester) else Modifier)
.onFocusChanged { isFocused = it.isFocused }
.focusable()
.videoTint(isFocused, isSelected)
.onKeyEvent { event ->
if (event.type == KeyEventType.KeyDown && event.nativeKeyEvent.keyCode == KeyEvent.KEYCODE_DPAD_DOWN && onDownPress != null) {
onDownPress()
@@ -1162,7 +1278,6 @@ private fun PlayerCircleButton(
}
false
}
.focusable()
.clickable(
interactionSource = remember { MutableInteractionSource() },
indication = null
@@ -1176,6 +1291,7 @@ private fun PlayerCircleButton(
)
}
}
@Composable
private fun PlayerEpisodesButton(
focusRequester: FocusRequester,
@@ -1201,6 +1317,7 @@ private fun PlayerEpisodesButton(
onLeftPress()
return@onKeyEvent true
}
KeyEvent.KEYCODE_DPAD_UP -> {
onUpPress()
return@onKeyEvent true
@@ -1223,6 +1340,7 @@ private fun PlayerEpisodesButton(
)
}
}
@Composable
private fun PlayerCenterPlayButton(
isPlaying: Boolean,
@@ -1262,6 +1380,7 @@ private fun PlayerCenterPlayButton(
)
}
}
@Composable
private fun PlayerPillButton(
text: String,
@@ -1309,6 +1428,7 @@ private fun PlayerPillButton(
)
}
}
@Composable
private fun PlayerSeekBar(
currentPositionMs: Long,
@@ -1327,7 +1447,10 @@ private fun PlayerSeekBar(
if (!isFocused) isScrubbingMode = false
}
val barHeight by animateDpAsState(if (isFocused || isScrubbingMode) 6.dp else 4.dp, label = "bar_height")
val thumbScale by animateFloatAsState(if (isScrubbingMode) 1.5f else if (isFocused) 1.3f else 1.0f, label = "thumb_scale")
val thumbScale by animateFloatAsState(
if (isScrubbingMode) 1.5f else if (isFocused) 1.3f else 1.0f,
label = "thumb_scale"
)
val progressFraction = if (durationMs > 0) (currentPositionMs.toFloat() / durationMs).coerceIn(0f, 1f) else 0f
val bufferFraction = if (durationMs > 0) (bufferedPositionMs.toFloat() / durationMs).coerceIn(0f, 1f) else 0f
Box(
@@ -1343,12 +1466,14 @@ private fun PlayerSeekBar(
onUpPress()
return@onKeyEvent true
}
KeyEvent.KEYCODE_DPAD_DOWN -> {
if (onRequestEpisodesFocus != null) {
onRequestEpisodesFocus()
return@onKeyEvent true
}
}
KeyEvent.KEYCODE_DPAD_RIGHT -> {
if (isScrubbingMode) {
onSeekRight()
@@ -1363,10 +1488,12 @@ private fun PlayerSeekBar(
}
}
}
KeyEvent.KEYCODE_DPAD_LEFT -> {
onSeekLeft()
return@onKeyEvent true
}
KeyEvent.KEYCODE_DPAD_CENTER, KeyEvent.KEYCODE_ENTER -> {
isScrubbingMode = !isScrubbingMode
return@onKeyEvent true
@@ -1434,6 +1561,7 @@ private fun PlayerSeekBar(
}
}
}
@Composable
private fun MenuSectionHeader(title: String) {
Text(
@@ -1445,6 +1573,7 @@ private fun MenuSectionHeader(title: String) {
modifier = Modifier.padding(start = 12.dp, end = 12.dp, top = 12.dp, bottom = 6.dp)
)
}
@Composable
private fun MenuItemRow(
label: String,
@@ -1489,6 +1618,7 @@ private fun MenuItemRow(
}
}
}
@Composable
private fun MiniSelectButton(
text: String,
@@ -1523,6 +1653,7 @@ private fun MiniSelectButton(
)
}
}
@Composable
private fun DrawerEpisodeCard(
episode: Episode,
@@ -1629,6 +1760,7 @@ private fun DrawerEpisodeCard(
}
}
}
@Composable
private fun SeasonSelectChip(
season: Season,
@@ -1658,6 +1790,7 @@ private fun SeasonSelectChip(
)
}
}
private fun formatTime(ms: Long): String {
val totalSeconds = (ms / 1000).coerceAtLeast(0)
val hours = totalSeconds / 3600