StreamVault is a TV-first free IPTV player for Android TV built with Kotlin, Jetpack Compose, Room, Hilt, and Media3.
Kotlin iptv-player
refactor(home): polish HiddenChannelsDialog with tap-to-restore rows
Celtiorebd60239f95a3
diff --git a/app/src/main/java/com/streamvault/app/ui/components/dialogs/HiddenChannelsDialog.kt b/app/src/main/java/com/streamvault/app/ui/components/dialogs/HiddenChannelsDialog.ktindex 206daa3c..10c87831 100644--- a/app/src/main/java/com/streamvault/app/ui/components/dialogs/HiddenChannelsDialog.kt+++ b/app/src/main/java/com/streamvault/app/ui/components/dialogs/HiddenChannelsDialog.kt@@ -1,20 +1,13 @@package com.streamvault.app.ui.components.dialogsimport androidx.compose.foundation.BorderStroke-import androidx.compose.foundation.layout.Arrangementimport androidx.compose.foundation.layout.Box-import androidx.compose.foundation.layout.Columnimport androidx.compose.foundation.layout.Row-import androidx.compose.foundation.layout.Spacerimport androidx.compose.foundation.layout.fillMaxWidth-import androidx.compose.foundation.layout.heightInimport androidx.compose.foundation.layout.padding-import androidx.compose.foundation.lazy.LazyColumn-import androidx.compose.foundation.lazy.itemsimport androidx.compose.foundation.shape.RoundedCornerShape-import androidx.compose.material3.Switch-import androidx.compose.material3.SwitchDefaultsimport androidx.compose.runtime.Composable+import androidx.compose.runtime.keyimport androidx.compose.ui.Alignmentimport androidx.compose.ui.Modifierimport androidx.compose.ui.res.stringResource@@ -25,7 +18,6 @@ import androidx.tv.material3.MaterialThemeimport androidx.tv.material3.Textimport com.streamvault.app.Rimport com.streamvault.app.ui.interaction.TvClickableSurface-import com.streamvault.app.ui.theme.OnBackgroundimport com.streamvault.app.ui.theme.OnSurfaceimport com.streamvault.app.ui.theme.Primaryimport com.streamvault.app.ui.theme.PrimaryLight@@ -35,7 +27,11 @@ import com.streamvault.domain.model.Channel/*** Quick-action dialog that lists the currently-hidden Live channels and lets- * the user restore them one by one (apply-immediate) or in bulk via "Unhide all".+ * the user restore them one by one (tap-immediate) or in bulk via "Unhide all".+ *+ * Each row is a full-width [TvClickableSurface] — tapping it restores the+ * channel immediately. Pattern mirrors `HiddenCategoriesDialog` (M5) so the+ * affordance is consistent across the app.** Hosted by `HomeScreen` from the Live TV *Filtres rapides* block (M4). Backend* mutations are routed through `HomeViewModel.unhideChannel` /@@ -43,8 +39,7 @@ import com.streamvault.domain.model.Channel* / `setHiddenChannelIds` — no schema change, just a new entry point into the* existing visibility plumbing.*- * Mirrors `HiddenCategoriesDialog` (M5) line-by-line with Channel in place of- * Category. Channels are items (not containers) so the row has no count badge.+ * Channels are items (not containers) so the row has no count badge.*/@Composablefun HiddenChannelsDialog(@@ -57,62 +52,50 @@ fun HiddenChannelsDialog(title = stringResource(R.string.hidden_channels_dialog_title),subtitle = stringResource(R.string.hidden_channels_dialog_subtitle),onDismissRequest = onDismiss,- widthFraction = 0.42f,- heightFraction = null,+ widthFraction = 0.55f,+ heightFraction = 0.95f,+ bodyHeightFraction = 0.85f,content = {- Column(- modifier = Modifier- .fillMaxWidth()- .padding(top = 4.dp),- verticalArrangement = Arrangement.spacedBy(10.dp)+ TvClickableSurface(+ onClick = onUnhideAll,+ enabled = hiddenChannels.isNotEmpty(),+ modifier = Modifier.fillMaxWidth(),+ shape = ClickableSurfaceDefaults.shape(RoundedCornerShape(10.dp)),+ colors = ClickableSurfaceDefaults.colors(+ containerColor = SurfaceElevated,+ focusedContainerColor = SurfaceHighlight+ ),+ border = ClickableSurfaceDefaults.border(+ focusedBorder = Border(+ border = BorderStroke(2.dp, PrimaryLight),+ shape = RoundedCornerShape(10.dp)+ )+ ),+ scale = ClickableSurfaceDefaults.scale(focusedScale = 1f)) {- TvClickableSurface(- onClick = onUnhideAll,- enabled = hiddenChannels.isNotEmpty(),- modifier = Modifier.fillMaxWidth(),- shape = ClickableSurfaceDefaults.shape(RoundedCornerShape(10.dp)),- colors = ClickableSurfaceDefaults.colors(- containerColor = SurfaceElevated,- focusedContainerColor = SurfaceHighlight- ),- border = ClickableSurfaceDefaults.border(- focusedBorder = Border(- border = BorderStroke(2.dp, PrimaryLight),- shape = RoundedCornerShape(10.dp)- )- ),- scale = ClickableSurfaceDefaults.scale(focusedScale = 1f)- ) {- Box(- modifier = Modifier- .fillMaxWidth()- .padding(horizontal = 16.dp, vertical = 12.dp),- contentAlignment = Alignment.Center- ) {- Text(- text = stringResource(R.string.hidden_channels_dialog_unhide_all),- style = MaterialTheme.typography.labelLarge,- color = Primary- )- }- }- LazyColumn(+ Box(modifier = Modifier.fillMaxWidth()- .heightIn(max = 360.dp),- verticalArrangement = Arrangement.spacedBy(6.dp)+ .padding(horizontal = 12.dp, vertical = 8.dp),+ contentAlignment = Alignment.Center) {- items(hiddenChannels, key = { it.id }) { channel ->- HiddenChannelRow(- channel = channel,- onUnhide = { onUnhide(channel) }- )- }+ Text(+ text = stringResource(R.string.hidden_channels_dialog_unhide_all),+ style = MaterialTheme.typography.labelMedium,+ color = Primary+ )+ }+ }+ hiddenChannels.forEach { channel ->+ key(channel.id) {+ HiddenChannelRow(+ channel = channel,+ onUnhide = { onUnhide(channel) }+ )}}},footer = {- Spacer(modifier = Modifier.fillMaxWidth().padding(horizontal = 4.dp))PremiumDialogFooterButton(label = stringResource(R.string.hidden_channels_dialog_close),onClick = onDismiss@@ -126,29 +109,34 @@ private fun HiddenChannelRow(channel: Channel,onUnhide: () -> Unit) {- Row(- modifier = Modifier- .fillMaxWidth()- .padding(horizontal = 14.dp, vertical = 6.dp),- verticalAlignment = Alignment.CenterVertically,- horizontalArrangement = Arrangement.SpaceBetween+ TvClickableSurface(+ onClick = onUnhide,+ modifier = Modifier.fillMaxWidth(),+ shape = ClickableSurfaceDefaults.shape(RoundedCornerShape(8.dp)),+ colors = ClickableSurfaceDefaults.colors(+ containerColor = SurfaceElevated.copy(alpha = 0.4f),+ focusedContainerColor = SurfaceHighlight+ ),+ border = ClickableSurfaceDefaults.border(+ focusedBorder = Border(+ border = BorderStroke(2.dp, PrimaryLight),+ shape = RoundedCornerShape(8.dp)+ )+ ),+ scale = ClickableSurfaceDefaults.scale(focusedScale = 1f)) {- Text(- text = channel.name,- style = MaterialTheme.typography.bodyLarge,- color = OnSurface,- modifier = Modifier.padding(end = 12.dp)- )- Switch(- checked = true,- onCheckedChange = { onUnhide() },- colors = SwitchDefaults.colors(- uncheckedThumbColor = OnBackground,- uncheckedTrackColor = SurfaceHighlight,- uncheckedBorderColor = SurfaceHighlight,- checkedThumbColor = Primary,- checkedTrackColor = Primary.copy(alpha = 0.4f)+ Row(+ modifier = Modifier+ .fillMaxWidth()+ .padding(horizontal = 14.dp, vertical = 8.dp),+ verticalAlignment = Alignment.CenterVertically+ ) {+ Text(+ text = channel.name,+ style = MaterialTheme.typography.bodySmall,+ color = OnSurface,+ modifier = Modifier.weight(1f).padding(end = 12.dp))- )+ }}}diff --git a/app/src/main/java/com/streamvault/app/ui/components/dialogs/PremiumDialog.kt b/app/src/main/java/com/streamvault/app/ui/components/dialogs/PremiumDialog.ktindex 706eef25..587c9a43 100644--- a/app/src/main/java/com/streamvault/app/ui/components/dialogs/PremiumDialog.kt+++ b/app/src/main/java/com/streamvault/app/ui/components/dialogs/PremiumDialog.kt@@ -70,6 +70,7 @@ fun PremiumDialog(modifier: Modifier = Modifier,widthFraction: Float = 0.42f,heightFraction: Float? = 0.88f,+ bodyHeightFraction: Float = 0.5f,content: @Composable ColumnScope.() -> Unit,footer: @Composable RowScope.() -> Unit = {}) {@@ -91,7 +92,7 @@ fun PremiumDialog(modifier = Modifier.fillMaxWidth(),contentAlignment = Alignment.Center) {- val maxDialogBodyHeight = maxHeight * 0.5f+ val maxDialogBodyHeight = maxHeight * bodyHeightFractionval dialogModifier = modifier.fillMaxWidth(widthFraction).then(@@ -159,7 +160,7 @@ fun PremiumDialog(maxWidth < 1000.dp -> maxOf(widthFraction, 0.62f)else -> widthFraction}- val maxDialogBodyHeight = maxHeight * 0.5f+ val maxDialogBodyHeight = maxHeight * bodyHeightFractionval dialogModifier = modifier.fillMaxWidth(resolvedWidthFraction).then(