StreamVault is a TV-first free IPTV player for Android TV built with Kotlin, Jetpack Compose, Room, Hilt, and Media3.
Kotlin iptv-player
fix: redesign Split Screen UX with slot-picker dialog
Davidonab6d4683bd70d
diff --git a/app/src/main/java/com/streamvault/app/navigation/AppNavigation.kt b/app/src/main/java/com/streamvault/app/navigation/AppNavigation.ktindex ee5bd6a9..5542971d 100644--- a/app/src/main/java/com/streamvault/app/navigation/AppNavigation.kt+++ b/app/src/main/java/com/streamvault/app/navigation/AppNavigation.kt@@ -297,7 +297,8 @@ fun AppNavigation() {providerId = providerId,isVirtual = isVirtual,contentType = contentType,- onBack = { navController.popBackStack() }+ onBack = { navController.popBackStack() },+ onNavigate = { route -> navController.navigate(route) })}diff --git a/app/src/main/java/com/streamvault/app/ui/components/dialogs/AddToGroupDialog.kt b/app/src/main/java/com/streamvault/app/ui/components/dialogs/AddToGroupDialog.ktindex dff5100b..a6dc4495 100644--- a/app/src/main/java/com/streamvault/app/ui/components/dialogs/AddToGroupDialog.kt+++ b/app/src/main/java/com/streamvault/app/ui/components/dialogs/AddToGroupDialog.kt@@ -7,7 +7,6 @@ import androidx.compose.foundation.lazy.itemsimport androidx.compose.foundation.shape.RoundedCornerShapeimport androidx.compose.material.icons.Iconsimport androidx.compose.material.icons.filled.Add-import androidx.compose.material.icons.filled.Checkimport androidx.compose.material.icons.filled.Closeimport androidx.compose.material.icons.filled.Starimport androidx.compose.material3.*@@ -21,10 +20,8 @@ import androidx.compose.ui.unit.dpimport androidx.compose.ui.window.Dialogimport com.streamvault.domain.model.Channelimport com.streamvault.domain.model.Category-import androidx.compose.ui.res.stringResourceimport com.streamvault.app.R-import androidx.compose.ui.input.key.*import androidx.compose.ui.focus.onFocusChangedimport androidx.compose.foundation.shape.CircleShape@@ -32,11 +29,15 @@ import androidx.compose.foundation.text.KeyboardActionsimport androidx.compose.foundation.text.KeyboardOptionsimport androidx.compose.ui.text.input.ImeActionimport kotlinx.coroutines.delay+import com.streamvault.app.ui.screens.multiview.MultiViewPlannerDialog+import com.streamvault.app.ui.screens.multiview.MultiViewViewModel+import androidx.hilt.navigation.compose.hiltViewModel@Composablefun AddToGroupDialog(contentTitle: String,- groups: List<Category>, // Only custom groups+ channel: Channel? = null, // the channel being managed (for split screen)+ groups: List<Category>,isFavorite: Boolean,memberOfGroups: List<Long>,onDismiss: () -> Unit,@@ -44,24 +45,40 @@ fun AddToGroupDialog(onAddToGroup: (Category) -> Unit,onRemoveFromGroup: (Category) -> Unit,onCreateGroup: (String) -> Unit,- onAddToSplitScreen: (() -> Unit)? = null,- isSplitScreenQueued: Boolean = false+ onNavigateToSplitScreen: (() -> Unit)? = null // navigate to MultiViewScreen when launched) {var showCreateGroup by remember { mutableStateOf(false) }var newGroupName by remember { mutableStateOf("") }val focusRequester = remember { FocusRequester() }-- // Fix for ghost clicks: Debounce interaction for 500ms to ignore long-press release- var canInteract by remember { mutableStateOf(false) }+ // Ghost-click debounce+ var canInteract by remember { mutableStateOf(false) }LaunchedEffect(Unit) {focusRequester.requestFocus()delay(500)canInteract = true}-- val safeDismiss = {- if (canInteract) onDismiss()++ val safeDismiss = { if (canInteract) onDismiss() }++ // Split screen state+ val multiViewViewModel: MultiViewViewModel = hiltViewModel()+ val slots by multiViewViewModel.slotsFlow.collectAsState()+ val isQueued = channel != null && multiViewViewModel.isQueued(channel.id)+ var showSlotPicker by remember { mutableStateOf(false) }++ // Show slot-picker dialog when user taps the split screen button+ if (showSlotPicker && channel != null) {+ MultiViewPlannerDialog(+ pendingChannel = channel,+ onDismiss = { showSlotPicker = false },+ onLaunch = {+ showSlotPicker = false+ onDismiss()+ onNavigateToSplitScreen?.invoke()+ },+ viewModel = multiViewViewModel+ )}Dialog(onDismissRequest = safeDismiss) {@@ -73,6 +90,7 @@ fun AddToGroupDialog(.padding(16.dp)) {Column(modifier = Modifier.padding(24.dp)) {+ // HeaderRow(modifier = Modifier.fillMaxWidth().padding(bottom = 16.dp),horizontalArrangement = Arrangement.SpaceBetween,@@ -127,13 +145,12 @@ fun AddToGroupDialog(}}} else {- // Content in a scrollable container to prevent cut-offLazyColumn(modifier = Modifier.weight(1f, fill = false),verticalArrangement = Arrangement.spacedBy(8.dp)) {+ // ── Favorites ────────────────────────────────item {- // Favorites Togglevar isFocused by remember { mutableStateOf(false) }Button(onClick = onToggleFavorite,@@ -156,21 +173,19 @@ fun AddToGroupDialog()Spacer(modifier = Modifier.width(8.dp))Text(- text = if (isFavorite) stringResource(R.string.add_group_remove_favorites) else stringResource(R.string.add_group_add_favorites),+ text = if (isFavorite) stringResource(R.string.add_group_remove_favorites)+ else stringResource(R.string.add_group_add_favorites),color = if (isFavorite) Color.Black else Color.White)}}- // Add to Split Screen button- if (onAddToSplitScreen != null) {+ // ── Split Screen ─────────────────────────────+ if (channel != null) {item {var isFocused by remember { mutableStateOf(false) }Button(- onClick = {- onAddToSplitScreen()- onDismiss()- },+ onClick = { showSlotPicker = true },modifier = Modifier.fillMaxWidth().onFocusChanged { isFocused = it.isFocused }@@ -180,22 +195,20 @@ fun AddToGroupDialog(CircleShape),colors = ButtonDefaults.buttonColors(- containerColor = if (isSplitScreenQueued) Color(0xFF1B5E20) else Color(0xFF2E7D32)+ containerColor = if (isQueued) Color(0xFF1B5E20) else Color(0xFF2E7D32))) {Text("🔳 ", color = Color.White)Text(- text = if (isSplitScreenQueued)- stringResource(R.string.multiview_queued)- else- stringResource(R.string.multiview_add_to_split),+ text = if (isQueued) stringResource(R.string.multiview_queued)+ else stringResource(R.string.multiview_add_to_split),color = Color.White)}}}- // Reordering Controls removed (handled in dedicated reorder mode)+ // ── Custom Groups Section ─────────────────────item {HorizontalDivider(modifier = Modifier.padding(vertical = 8.dp))Text(@@ -209,20 +222,20 @@ fun AddToGroupDialog(val groupId = -group.idval isMember = memberOfGroups.contains(groupId)var isFocused by remember { mutableStateOf(false) }-+Row(modifier = Modifier.fillMaxWidth().padding(vertical = 4.dp),horizontalArrangement = Arrangement.SpaceBetween,verticalAlignment = Alignment.CenterVertically) {Text(- text = group.name,+ text = group.name,style = MaterialTheme.typography.bodyMedium,modifier = Modifier.weight(1f))Button(- onClick = {- if (isMember) onRemoveFromGroup(group) else onAddToGroup(group)+ onClick = {+ if (isMember) onRemoveFromGroup(group) else onAddToGroup(group)},modifier = Modifier.onFocusChanged { isFocused = it.isFocused }@@ -232,15 +245,20 @@ fun AddToGroupDialog(CircleShape),colors = ButtonDefaults.buttonColors(- containerColor = if (isMember) MaterialTheme.colorScheme.errorContainer else MaterialTheme.colorScheme.primaryContainer,- contentColor = if (isMember) MaterialTheme.colorScheme.onErrorContainer else MaterialTheme.colorScheme.onPrimaryContainer+ containerColor = if (isMember) MaterialTheme.colorScheme.errorContainer+ else MaterialTheme.colorScheme.primaryContainer,+ contentColor = if (isMember) MaterialTheme.colorScheme.onErrorContainer+ else MaterialTheme.colorScheme.onPrimaryContainer)) {- Text(if (isMember) stringResource(R.string.add_group_remove_btn) else stringResource(R.string.add_group_add_btn))+ Text(+ if (isMember) stringResource(R.string.add_group_remove_btn)+ else stringResource(R.string.add_group_add_btn)+ )}}}-+item {Spacer(modifier = Modifier.height(8.dp))OutlinedButton(diff --git a/app/src/main/java/com/streamvault/app/ui/screens/home/HomeScreen.kt b/app/src/main/java/com/streamvault/app/ui/screens/home/HomeScreen.ktindex 31749d18..06388f5b 100644--- a/app/src/main/java/com/streamvault/app/ui/screens/home/HomeScreen.kt+++ b/app/src/main/java/com/streamvault/app/ui/screens/home/HomeScreen.kt@@ -44,6 +44,9 @@ import com.streamvault.domain.model.Providerimport kotlinx.coroutines.launchimport androidx.compose.ui.res.stringResourceimport com.streamvault.app.R+import com.streamvault.app.ui.screens.multiview.MultiViewViewModel+import com.streamvault.app.ui.screens.multiview.MultiViewPlannerDialog+import com.streamvault.app.navigation.Routes// ── Screen ─────────────────────────────────────────────────────────@@ -58,10 +61,16 @@ fun HomeScreen(onChannelClick: (Channel, Category?, Provider?) -> Unit,onNavigate: (String) -> Unit,currentRoute: String,- viewModel: HomeViewModel = hiltViewModel()+ viewModel: HomeViewModel = hiltViewModel(),+ multiViewViewModel: MultiViewViewModel = hiltViewModel()) {val uiState by viewModel.uiState.collectAsState()val snackbarHostState = remember { SnackbarHostState() }++ // Split screen state+ val splitSlots by multiViewViewModel.slotsFlow.collectAsState()+ val hasSplitChannels = splitSlots.any { it != null }+ var showSplitManagerDialog by remember { mutableStateOf(false) }// Parental Control Statevar showPinDialog by remember { mutableStateOf(false) }@@ -321,13 +330,38 @@ fun HomeScreen(style = MaterialTheme.typography.headlineSmall,color = OnBackground)-- SearchInput(- value = uiState.channelSearchQuery,- onValueChange = { viewModel.updateChannelSearchQuery(it) },- placeholder = stringResource(R.string.home_search_channels),- modifier = Modifier.width(300.dp)- )++ Row(+ verticalAlignment = Alignment.CenterVertically,+ horizontalArrangement = Arrangement.spacedBy(12.dp)+ ) {+ // Split Screen button — visible only if at least 1 slot is filled+ if (hasSplitChannels) {+ Surface(+ onClick = { showSplitManagerDialog = true },+ shape = ClickableSurfaceDefaults.shape(RoundedCornerShape(8.dp)),+ colors = ClickableSurfaceDefaults.colors(+ containerColor = Color(0xFF1B5E20),+ focusedContainerColor = Color(0xFF2E7D32)+ )+ ) {+ Text(+ text = "🔳 " + stringResource(R.string.multiview_nav) ++ " (${splitSlots.count { it != null }})",+ color = Color.White,+ modifier = Modifier.padding(horizontal = 14.dp, vertical = 8.dp),+ style = MaterialTheme.typography.labelLarge+ )+ }+ }++ SearchInput(+ value = uiState.channelSearchQuery,+ onValueChange = { viewModel.updateChannelSearchQuery(it) },+ placeholder = stringResource(R.string.home_search_channels),+ modifier = Modifier.width(300.dp)+ )+ }}if (uiState.isLoading) {@@ -489,23 +523,33 @@ fun HomeScreen(if (uiState.showDialog && uiState.selectedChannelForDialog != null) {val channel = uiState.selectedChannelForDialog!!- val context = androidx.compose.ui.platform.LocalContext.currentcom.streamvault.app.ui.components.dialogs.AddToGroupDialog(contentTitle = channel.name,+ channel = channel,groups = uiState.categories.filter { it.isVirtual && it.id != -999L },- isFavorite = channel.isFavorite, // This is now Global Favorite status+ isFavorite = channel.isFavorite,memberOfGroups = uiState.dialogGroupMemberships,onDismiss = { viewModel.onDismissDialog() },- onToggleFavorite = {+ onToggleFavorite = {if (channel.isFavorite) viewModel.removeFavorite(channel) else viewModel.addFavorite(channel)},- onAddToGroup = { group ->- viewModel.addToGroup(channel, group)- },- onRemoveFromGroup = { group ->- viewModel.removeFromGroup(channel, group)+ onAddToGroup = { group -> viewModel.addToGroup(channel, group) },+ onRemoveFromGroup = { group -> viewModel.removeFromGroup(channel, group) },+ onCreateGroup = { name -> viewModel.createCustomGroup(name) },+ onNavigateToSplitScreen = { onNavigate(Routes.MULTI_VIEW) }+ )+ }++ // Split Screen manager dialog (opened from the header button)+ if (showSplitManagerDialog) {+ MultiViewPlannerDialog(+ pendingChannel = null,+ onDismiss = { showSplitManagerDialog = false },+ onLaunch = {+ showSplitManagerDialog = false+ onNavigate(Routes.MULTI_VIEW)},- onCreateGroup = { name -> viewModel.createCustomGroup(name) }+ viewModel = multiViewViewModel)}diff --git a/app/src/main/java/com/streamvault/app/ui/screens/multiview/MultiViewManager.kt b/app/src/main/java/com/streamvault/app/ui/screens/multiview/MultiViewManager.ktindex a1d5f44e..6c932f93 100644--- a/app/src/main/java/com/streamvault/app/ui/screens/multiview/MultiViewManager.kt+++ b/app/src/main/java/com/streamvault/app/ui/screens/multiview/MultiViewManager.kt@@ -8,33 +8,37 @@ import javax.inject.Injectimport javax.inject.Singleton/**- * Singleton manager that holds the pre-launch queue for the Multi-View (Split Screen) feature.- * Users can add up to 4 channels before launching the MultiViewScreen.+ * Singleton that holds the 4 fixed slots for the Multi-View (Split Screen) feature.+ * Each slot can hold exactly one channel. Slots persist across navigation.*/@Singletonclass MultiViewManager @Inject constructor() {- private val _queue = MutableStateFlow<List<Channel>>(emptyList())- val queue: StateFlow<List<Channel>> = _queue.asStateFlow()+ // Null = empty slot, non-null = channel in that slot+ private val _slots = MutableStateFlow<List<Channel?>>(List(MAX_SLOTS) { null })+ val slots: StateFlow<List<Channel?>> = _slots.asStateFlow()- val isFull: Boolean get() = _queue.value.size >= MAX_SLOTS+ val hasAnyChannel: Boolean get() = _slots.value.any { it != null }- fun addChannel(channel: Channel) {- val current = _queue.value- if (current.size < MAX_SLOTS && current.none { it.id == channel.id }) {- _queue.value = current + channel- }+ /** Place a channel in a specific slot index (0–3). Replaces whatever was there. */+ fun setChannel(slotIndex: Int, channel: Channel) {+ if (slotIndex !in 0 until MAX_SLOTS) return+ _slots.value = _slots.value.toMutableList().also { it[slotIndex] = channel }}- fun removeChannel(channelId: Long) {- _queue.value = _queue.value.filter { it.id != channelId }+ /** Clear a specific slot. */+ fun clearSlot(slotIndex: Int) {+ if (slotIndex !in 0 until MAX_SLOTS) return+ _slots.value = _slots.value.toMutableList().also { it[slotIndex] = null }}- fun clearQueue() {- _queue.value = emptyList()+ /** Clear all slots. */+ fun clearAll() {+ _slots.value = List(MAX_SLOTS) { null }}- fun hasChannels(): Boolean = _queue.value.isNotEmpty()+ /** Returns true if the given channel is in any slot. */+ fun isQueued(channelId: Long): Boolean = _slots.value.any { it?.id == channelId }companion object {const val MAX_SLOTS = 4diff --git a/app/src/main/java/com/streamvault/app/ui/screens/multiview/MultiViewPlannerDialog.kt b/app/src/main/java/com/streamvault/app/ui/screens/multiview/MultiViewPlannerDialog.ktindex 613245ec..51453734 100644--- a/app/src/main/java/com/streamvault/app/ui/screens/multiview/MultiViewPlannerDialog.kt+++ b/app/src/main/java/com/streamvault/app/ui/screens/multiview/MultiViewPlannerDialog.kt@@ -1,121 +1,142 @@package com.streamvault.app.ui.screens.multiviewimport androidx.compose.foundation.background+import androidx.compose.foundation.border+import androidx.compose.foundation.clickableimport androidx.compose.foundation.layout.*-import androidx.compose.foundation.lazy.LazyColumn-import androidx.compose.foundation.lazy.itemsimport androidx.compose.foundation.shape.RoundedCornerShape+import androidx.compose.material.icons.Icons+import androidx.compose.material.icons.filled.Clearimport androidx.compose.material3.*import androidx.compose.runtime.*import androidx.compose.ui.Alignmentimport androidx.compose.ui.Modifier+import androidx.compose.ui.draw.clipimport androidx.compose.ui.graphics.Color-import androidx.compose.ui.res.stringResourceimport androidx.compose.ui.text.font.FontWeight+import androidx.compose.ui.text.style.TextAlign+import androidx.compose.ui.text.style.TextOverflowimport androidx.compose.ui.unit.dpimport androidx.compose.ui.unit.spimport androidx.compose.ui.window.Dialogimport androidx.hilt.navigation.compose.hiltViewModel-import com.streamvault.app.Rimport com.streamvault.domain.model.Channel+/**+ * The Split Screen Manager dialog.+ *+ * Two modes:+ * 1. [pendingChannel] != null → slot-picker: pick a slot to place the channel+ * 2. [pendingChannel] == null → manager: view/clear existing slots, then launch+ */@Composablefun MultiViewPlannerDialog(+ pendingChannel: Channel? = null, // channel being added; null = just managingonDismiss: () -> Unit,- onLaunch: () -> Unit,+ onLaunch: () -> Unit, // navigate to MultiViewScreenviewModel: MultiViewViewModel = hiltViewModel()) {- val queue by viewModel.queueFlow.collectAsState()+ val slots by viewModel.slotsFlow.collectAsState()+ val isPickerMode = pendingChannel != null+ val hasAny = slots.any { it != null }Dialog(onDismissRequest = onDismiss) {Card(modifier = Modifier.fillMaxWidth().wrapContentHeight(),- shape = RoundedCornerShape(16.dp),- colors = CardDefaults.cardColors(- containerColor = Color(0xFF1A1A2E)- )+ shape = RoundedCornerShape(20.dp),+ colors = CardDefaults.cardColors(containerColor = Color(0xFF12121F))) {Column(modifier = Modifier.padding(20.dp)) {- // Header++ // ── Header ────────────────────────────────────────────Row(modifier = Modifier.fillMaxWidth(),horizontalArrangement = Arrangement.SpaceBetween,verticalAlignment = Alignment.CenterVertically) {Text(- text = "🔳 " + stringResource(R.string.multiview_planner_title),+ text = if (isPickerMode) "🔳 Choose a slot" else "🔳 Split Screen",color = Color.White,fontSize = 18.sp,fontWeight = FontWeight.Bold)+ if (!isPickerMode) {+ TextButton(onClick = {+ viewModel.clearAll()+ onDismiss()+ }) {+ Text("Clear All", color = Color(0xFFFF5252), fontSize = 13.sp)+ }+ }+ }++ if (isPickerMode) {+ Spacer(modifier = Modifier.height(4.dp))Text(- text = "${queue.size}/${MultiViewManager.MAX_SLOTS}",- color = Color(0xFF4CAF50),- fontSize = 14.sp+ text = "Adding: ${pendingChannel!!.name}",+ color = Color(0xFF90CAF9),+ fontSize = 13.sp)}Spacer(modifier = Modifier.height(16.dp))- // Queue list- if (queue.isEmpty()) {- Box(- modifier = Modifier- .fillMaxWidth()- .height(80.dp),- contentAlignment = Alignment.Center- ) {- Text(- text = stringResource(R.string.multiview_planner_empty),- color = Color(0xFF888888),- fontSize = 13.sp- )- }- } else {- LazyColumn(- modifier = Modifier.heightIn(max = 200.dp),- verticalArrangement = Arrangement.spacedBy(8.dp)- ) {- items(queue, key = { it.id }) { channel ->- QueueItem(- channel = channel,- onRemove = { viewModel.removeFromQueue(channel.id) }- )+ // ── 2×2 Slot Grid ─────────────────────────────────────+ Column(verticalArrangement = Arrangement.spacedBy(10.dp)) {+ for (row in 0 until 2) {+ Row(+ modifier = Modifier.fillMaxWidth(),+ horizontalArrangement = Arrangement.spacedBy(10.dp)+ ) {+ for (col in 0 until 2) {+ val slotIndex = row * 2 + col+ val occupant = slots.getOrNull(slotIndex)+ SlotCell(+ slotIndex = slotIndex,+ occupant = occupant,+ isPickerMode = isPickerMode,+ modifier = Modifier.weight(1f),+ onSlotClick = {+ if (isPickerMode && pendingChannel != null) {+ viewModel.assignChannelToSlot(slotIndex, pendingChannel)+ onDismiss()+ }+ },+ onClearSlot = { viewModel.clearSlot(slotIndex) }+ )+ }}}}Spacer(modifier = Modifier.height(16.dp))- // Action buttons- Row(- modifier = Modifier.fillMaxWidth(),- horizontalArrangement = Arrangement.spacedBy(8.dp)- ) {- OutlinedButton(- onClick = {- viewModel.clearQueue()- onDismiss()- },- modifier = Modifier.weight(1f),- colors = ButtonDefaults.outlinedButtonColors(- contentColor = Color(0xFFFF5252)- )- ) {- Text(stringResource(R.string.multiview_planner_clear))- }-+ // ── Bottom actions ─────────────────────────────────────+ if (!isPickerMode) {Button(onClick = onLaunch,- enabled = queue.isNotEmpty(),- modifier = Modifier.weight(1f),+ enabled = hasAny,+ modifier = Modifier.fillMaxWidth(),colors = ButtonDefaults.buttonColors(- containerColor = Color(0xFF4CAF50)+ containerColor = Color(0xFF4CAF50),+ disabledContainerColor = Color(0xFF2A3A2A))) {- Text(stringResource(R.string.multiview_planner_launch))+ Text(+ text = if (hasAny) "▶ Start Split Screen" else "Add channels to slots first",+ color = Color.White+ )+ }+ } else {+ Row(+ modifier = Modifier.fillMaxWidth(),+ horizontalArrangement = Arrangement.End+ ) {+ TextButton(onClick = onDismiss) {+ Text("Cancel", color = Color(0xFF888888))+ }}}}@@ -124,29 +145,92 @@ fun MultiViewPlannerDialog(}@Composable-private fun QueueItem(- channel: Channel,- onRemove: () -> Unit+private fun SlotCell(+ slotIndex: Int,+ occupant: Channel?,+ isPickerMode: Boolean,+ modifier: Modifier = Modifier,+ onSlotClick: () -> Unit,+ onClearSlot: () -> Unit) {- Row(- modifier = Modifier- .fillMaxWidth()- .background(Color(0xFF16213E), RoundedCornerShape(8.dp))- .padding(horizontal = 12.dp, vertical = 8.dp),- verticalAlignment = Alignment.CenterVertically,- horizontalArrangement = Arrangement.SpaceBetween+ val isEmpty = occupant == null+ val borderColor = when {+ isPickerMode && !isEmpty -> Color(0xFFFF9800) // orange = "Replace"+ isPickerMode && isEmpty -> Color(0xFF4CAF50) // green = "Add here"+ else -> Color(0xFF333355)+ }+ val bgColor = if (isEmpty) Color(0xFF1A1A30) else Color(0xFF1E2A3A)++ Box(+ modifier = modifier+ .aspectRatio(16f / 9f)+ .clip(RoundedCornerShape(10.dp))+ .background(bgColor)+ .border(+ width = if (isPickerMode) 2.dp else 1.dp,+ color = borderColor,+ shape = RoundedCornerShape(10.dp)+ )+ .clickable(enabled = isPickerMode) { onSlotClick() },+ contentAlignment = Alignment.Center) {- Text(- text = channel.name,- color = Color.White,- fontSize = 13.sp,- modifier = Modifier.weight(1f)- )- IconButton(- onClick = onRemove,- modifier = Modifier.size(32.dp)- ) {- Text("✕", color = Color(0xFFFF5252), fontSize = 14.sp)+ if (isEmpty) {+ Column(horizontalAlignment = Alignment.CenterHorizontally) {+ Text("+", color = Color(0xFF555577), fontSize = 22.sp)+ Text(+ text = if (isPickerMode) "Add here" else "Empty",+ color = Color(0xFF555577),+ fontSize = 11.sp+ )+ }+ } else {+ Column(+ modifier = Modifier+ .fillMaxSize()+ .padding(6.dp),+ verticalArrangement = Arrangement.SpaceBetween+ ) {+ Text(+ text = occupant!!.name,+ color = Color.White,+ fontSize = 11.sp,+ fontWeight = FontWeight.Medium,+ maxLines = 2,+ overflow = TextOverflow.Ellipsis,+ modifier = Modifier.weight(1f)+ )+ Row(+ modifier = Modifier.fillMaxWidth(),+ horizontalArrangement = Arrangement.SpaceBetween,+ verticalAlignment = Alignment.CenterVertically+ ) {+ Text(+ text = "Slot ${slotIndex + 1}",+ color = Color(0xFF888888),+ fontSize = 10.sp+ )+ if (isPickerMode) {+ Text(+ text = "Replace",+ color = Color(0xFFFF9800),+ fontSize = 10.sp,+ fontWeight = FontWeight.Bold+ )+ } else {+ IconButton(+ onClick = onClearSlot,+ modifier = Modifier.size(20.dp)+ ) {+ Icon(+ Icons.Default.Clear,+ contentDescription = "Remove",+ tint = Color(0xFFFF5252),+ modifier = Modifier.size(14.dp)+ )+ }+ }+ }+ }}}}diff --git a/app/src/main/java/com/streamvault/app/ui/screens/multiview/MultiViewState.kt b/app/src/main/java/com/streamvault/app/ui/screens/multiview/MultiViewState.ktindex 32156f2c..b2531de4 100644--- a/app/src/main/java/com/streamvault/app/ui/screens/multiview/MultiViewState.kt+++ b/app/src/main/java/com/streamvault/app/ui/screens/multiview/MultiViewState.kt@@ -1,5 +1,6 @@package com.streamvault.app.ui.screens.multiview+import com.streamvault.domain.model.Channelimport com.streamvault.player.PlayerEngine/**@@ -7,12 +8,15 @@ import com.streamvault.player.PlayerEngine*/data class MultiViewSlot(val index: Int,+ val channel: Channel? = null,val streamUrl: String = "",val title: String = "",val playerEngine: PlayerEngine? = null,val isLoading: Boolean = false,val hasError: Boolean = false-)+) {+ val isEmpty: Boolean get() = channel == null+}data class MultiViewUiState(val slots: List<MultiViewSlot> = List(4) { MultiViewSlot(index = it) },diff --git a/app/src/main/java/com/streamvault/app/ui/screens/multiview/MultiViewViewModel.kt b/app/src/main/java/com/streamvault/app/ui/screens/multiview/MultiViewViewModel.ktindex d39bdbfd..a26bccdd 100644--- a/app/src/main/java/com/streamvault/app/ui/screens/multiview/MultiViewViewModel.kt+++ b/app/src/main/java/com/streamvault/app/ui/screens/multiview/MultiViewViewModel.kt@@ -8,58 +8,63 @@ import dagger.hilt.android.lifecycle.HiltViewModelimport kotlinx.coroutines.flow.MutableStateFlowimport kotlinx.coroutines.flow.StateFlowimport kotlinx.coroutines.flow.asStateFlow+import kotlinx.coroutines.flow.mapimport kotlinx.coroutines.launchimport javax.inject.Injectimport javax.inject.Provider@HiltViewModelclass MultiViewViewModel @Inject constructor(- private val multiViewManager: MultiViewManager,+ val multiViewManager: MultiViewManager,private val playerEngineProvider: Provider<PlayerEngine>) : ViewModel() {private val _uiState = MutableStateFlow(MultiViewUiState())val uiState: StateFlow<MultiViewUiState> = _uiState.asStateFlow()- val queueFlow = multiViewManager.queue+ /** Flow of the current 4 slot channels from the manager */+ val slotsFlow = multiViewManager.slotsprivate val playerEngines = mutableListOf<PlayerEngine>()+ /** Called when MultiViewScreen is opened — spins up player engines for occupied slots */fun initSlots() {- val channels = multiViewManager.queue.value+ val channels = multiViewManager.slots.valueval slots = channels.mapIndexed { index, channel ->- val engine = playerEngineProvider.get()- playerEngines.add(engine)- MultiViewSlot(- index = index,- streamUrl = channel.streamUrl,- title = channel.name,- playerEngine = engine,- isLoading = true- )+ if (channel != null) {+ val engine = playerEngineProvider.get()+ playerEngines.add(engine)+ MultiViewSlot(+ index = index,+ channel = channel,+ streamUrl = channel.streamUrl,+ title = channel.name,+ playerEngine = engine,+ isLoading = true+ )+ } else {+ MultiViewSlot(index = index)+ }}- // Fill remaining empty slots- val allSlots = slots + (slots.size until 4).map { MultiViewSlot(index = it) }- _uiState.value = MultiViewUiState(slots = allSlots.take(4))+ _uiState.value = MultiViewUiState(slots = slots)- // Start all engines+ // Start all occupied enginesslots.forEachIndexed { index, slot ->- viewModelScope.launch {- try {- slot.playerEngine?.prepare(- com.streamvault.domain.model.StreamInfo(- url = slot.streamUrl+ if (!slot.isEmpty) {+ viewModelScope.launch {+ try {+ slot.playerEngine?.prepare(+ com.streamvault.domain.model.StreamInfo(url = slot.streamUrl))- )- slot.playerEngine?.play()- updateSlot(index) { it.copy(isLoading = false) }- } catch (e: Exception) {- updateSlot(index) { it.copy(isLoading = false, hasError = true) }+ slot.playerEngine?.play()+ updateSlot(index) { it.copy(isLoading = false) }+ } catch (e: Exception) {+ updateSlot(index) { it.copy(isLoading = false, hasError = true) }+ }}}}- // Mute all except focusedapplyFocusAudio(0)}@@ -74,18 +79,23 @@ class MultiViewViewModel @Inject constructor(}}- fun addToQueue(channel: Channel) {- multiViewManager.addChannel(channel)+ /** Assign a channel to a specific slot (0–3). Called from dialog or AddToGroupDialog. */+ fun assignChannelToSlot(slotIndex: Int, channel: Channel) {+ multiViewManager.setChannel(slotIndex, channel)}- fun removeFromQueue(channelId: Long) {- multiViewManager.removeChannel(channelId)+ /** Clear a specific slot */+ fun clearSlot(slotIndex: Int) {+ multiViewManager.clearSlot(slotIndex)}- fun clearQueue() {- multiViewManager.clearQueue()+ /** Clear all slots */+ fun clearAll() {+ multiViewManager.clearAll()}+ fun isQueued(channelId: Long): Boolean = multiViewManager.isQueued(channelId)+private fun updateSlot(index: Int, transform: (MultiViewSlot) -> MultiViewSlot) {val updated = _uiState.value.slots.toMutableList()if (index < updated.size) {diff --git a/app/src/main/java/com/streamvault/app/ui/screens/player/PlayerScreen.kt b/app/src/main/java/com/streamvault/app/ui/screens/player/PlayerScreen.ktindex a47a4b31..a8e20455 100644--- a/app/src/main/java/com/streamvault/app/ui/screens/player/PlayerScreen.kt+++ b/app/src/main/java/com/streamvault/app/ui/screens/player/PlayerScreen.kt@@ -55,6 +55,9 @@ import androidx.compose.material3.SliderDefaultsimport com.streamvault.app.ui.components.dialogs.ProgramHistoryDialogimport androidx.compose.ui.res.stringResourceimport com.streamvault.app.R+import com.streamvault.app.ui.screens.multiview.MultiViewViewModel+import com.streamvault.app.ui.screens.multiview.MultiViewPlannerDialog+import com.streamvault.app.navigation.Routes@@ -70,7 +73,9 @@ fun PlayerScreen(isVirtual: Boolean = false,contentType: String = "LIVE",onBack: () -> Unit,- viewModel: PlayerViewModel = hiltViewModel()+ onNavigate: ((String) -> Unit)? = null,+ viewModel: PlayerViewModel = hiltViewModel(),+ multiViewViewModel: MultiViewViewModel = hiltViewModel()) {val playbackState by viewModel.playerEngine.playbackState.collectAsState()val isPlaying by viewModel.playerEngine.isPlaying.collectAsState()@@ -102,6 +107,7 @@ fun PlayerScreen(var showTrackSelection by remember { mutableStateOf<TrackType?>(null) }var showProgramHistory by remember { mutableStateOf(false) }+ var showSplitDialog by remember { mutableStateOf(false) }val focusRequester = remember { FocusRequester() }val channelListFocusRequester = remember { FocusRequester() }@@ -163,6 +169,19 @@ fun PlayerScreen()}+ // Split Screen Manager dialog+ if (showSplitDialog) {+ MultiViewPlannerDialog(+ pendingChannel = null,+ onDismiss = { showSplitDialog = false },+ onLaunch = {+ showSplitDialog = false+ onNavigate?.invoke(Routes.MULTI_VIEW)+ },+ viewModel = multiViewViewModel+ )+ }+LaunchedEffect(streamUrl, epgChannelId) {viewModel.prepare(streamUrl, epgChannelId, internalChannelId, categoryId ?: -1, providerId ?: -1, isVirtual, contentType)}@@ -501,6 +520,8 @@ fun PlayerScreen(if (availableVideoQualities.size > 1) {QuickSettingsButton("⚙ HD") { showTrackSelection = TrackType.VIDEO }}+ // Split Screen button — available in LIVE mode+ QuickSettingsButton("🔳 " + stringResource(R.string.multiview_nav)) { showSplitDialog = true }}}diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xmlindex f34464c7..46e0920a 100644--- a/app/src/main/res/values/strings.xml+++ b/app/src/main/res/values/strings.xml@@ -204,9 +204,9 @@<!-- Multi-View / Split Screen --><string name="multiview_add_to_split">Add to Split Screen</string>- <string name="multiview_queued">Added to Split Screen ✓</string>- <string name="multiview_planner_title">Split Screen Queue</string>- <string name="multiview_planner_empty">No channels queued yet.\nLong-press a channel to add it.</string>+ <string name="multiview_queued">In Split Screen ✓</string>+ <string name="multiview_planner_title">Split Screen Manager</string>+ <string name="multiview_planner_empty">No channels in slots yet.\nLong-press a channel to add it.</string><string name="multiview_planner_clear">Clear All</string><string name="multiview_planner_launch">Launch Split Screen</string><string name="multiview_empty_slot">Empty Slot</string>