Skip to content
Merged
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
4 changes: 2 additions & 2 deletions app/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ import java.util.Properties
import org.gradle.api.provider.Property
import org.jetbrains.kotlin.gradle.dsl.JvmTarget

val appVersionCode = 149
val appVersionName = "3.5.3"
val appVersionCode = 150
val appVersionName = "3.5.4"

plugins {
alias(libs.plugins.android.application)
Expand Down
1 change: 1 addition & 0 deletions app/src/main/java/com/example/xtreamplayer/BrowseScreen.kt
Original file line number Diff line number Diff line change
Expand Up @@ -498,6 +498,7 @@ Row(modifier = Modifier.fillMaxSize()) {
onOpenSyncSchedule = { showSyncScheduleDialog = true },
onToggleCheckUpdatesOnStartup = onToggleCheckUpdatesOnStartup,
onCheckForUpdates = { onCheckForUpdates() },
onToggleDualLiveEnabled = settingsViewModel::toggleDualLiveEnabled,
onClearCache = {
coroutineScope.launch {
val contentBytes = contentRepository.diskCacheSizeBytes()
Expand Down
560 changes: 560 additions & 0 deletions app/src/main/java/com/example/xtreamplayer/DualLiveScreen.kt

Large diffs are not rendered by default.

13 changes: 13 additions & 0 deletions app/src/main/java/com/example/xtreamplayer/DualLiveSession.kt
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
package com.example.xtreamplayer

enum class DualTile { LEFT, RIGHT }

fun DualTile.opposite(): DualTile = if (this == DualTile.LEFT) DualTile.RIGHT else DualTile.LEFT

sealed interface DualTilePlayerState {
data object Idle : DualTilePlayerState
data object Loading : DualTilePlayerState
data object Reconnecting : DualTilePlayerState // silent auto-retry, shows spinner not error
data object Ready : DualTilePlayerState
data class Error(val message: String?) : DualTilePlayerState
}
12 changes: 12 additions & 0 deletions app/src/main/java/com/example/xtreamplayer/MainActivityUi.kt
Original file line number Diff line number Diff line change
Expand Up @@ -2396,6 +2396,18 @@ fun RootScreen(
onSubtitleStateChanged = { state ->
activePlaybackSubtitleState = state
},
dualLiveEnabled = settings.dualLiveEnabled,
loadLiveStreamUri = loadLiveStreamUri@{ item ->
val config = authState.activeConfig ?: return@loadLiveStreamUri null
Uri.parse(
StreamUrlBuilder.buildUrl(
config = config,
type = item.contentType,
streamId = item.streamId,
extension = item.containerExtension
)
)
},
loadLiveNowNext = loadLiveNowNext@{ item ->
val config = authState.activeConfig ?: return@loadLiveNowNext Result.success(null)
if (item.contentType != ContentType.LIVE) {
Expand Down
Loading
Loading