Skip to content

StreamVault is a TV-first free IPTV player for Android TV built with Kotlin, Jetpack Compose, Room, Hilt, and Media3.

refactor(home): polish HiddenCategoriesDialog with tap-to-restore rows

Celtiore85cba79b269d
diff --git a/app/src/main/java/com/streamvault/app/ui/components/dialogs/HiddenCategoriesDialog.kt b/app/src/main/java/com/streamvault/app/ui/components/dialogs/HiddenCategoriesDialog.kt
index 54ceedea..df3513e7 100644
--- a/app/src/main/java/com/streamvault/app/ui/components/dialogs/HiddenCategoriesDialog.kt
+++ b/app/src/main/java/com/streamvault/app/ui/components/dialogs/HiddenCategoriesDialog.kt
@@ -1,20 +1,13 @@
package com.streamvault.app.ui.components.dialogs
import androidx.compose.foundation.BorderStroke
-import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Box
-import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.Row
-import androidx.compose.foundation.layout.Spacer
import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.heightIn
import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.lazy.LazyColumn
-import androidx.compose.foundation.lazy.items
import androidx.compose.foundation.shape.RoundedCornerShape
-import androidx.compose.material3.Switch
-import androidx.compose.material3.SwitchDefaults
import androidx.compose.runtime.Composable
+import androidx.compose.runtime.key
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.res.stringResource
@@ -25,7 +18,6 @@ import androidx.tv.material3.MaterialTheme
import androidx.tv.material3.Text
import com.streamvault.app.R
import com.streamvault.app.ui.interaction.TvClickableSurface
-import com.streamvault.app.ui.theme.OnBackground
import com.streamvault.app.ui.theme.OnSurface
import com.streamvault.app.ui.theme.OnSurfaceDim
import com.streamvault.app.ui.theme.Primary
@@ -36,7 +28,11 @@ import com.streamvault.domain.model.Category
/**
* Quick-action dialog that lists the currently-hidden Live categories 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
+ * category immediately. Pattern mirrors David's `CategoryVisibilityCard` in
+ * `ParentalControlGroupScreen` so the affordance is consistent across the app.
*
* Hosted by `HomeScreen` from the Live TV *Filtres rapides* block (M5). Backend
* mutations are routed through `HomeViewModel.unhideCategory` /
@@ -55,62 +51,50 @@ fun HiddenCategoriesDialog(
title = stringResource(R.string.hidden_categories_dialog_title),
subtitle = stringResource(R.string.hidden_categories_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 = hiddenCategories.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 = hiddenCategories.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_categories_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(hiddenCategories, key = { it.id }) { category ->
- HiddenCategoryRow(
- category = category,
- onUnhide = { onUnhide(category) }
- )
- }
+ Text(
+ text = stringResource(R.string.hidden_categories_dialog_unhide_all),
+ style = MaterialTheme.typography.labelMedium,
+ color = Primary
+ )
+ }
+ }
+ hiddenCategories.forEach { category ->
+ key(category.id) {
+ HiddenCategoryRow(
+ category = category,
+ onUnhide = { onUnhide(category) }
+ )
}
}
},
footer = {
- Spacer(modifier = Modifier.fillMaxWidth().padding(horizontal = 4.dp))
PremiumDialogFooterButton(
label = stringResource(R.string.hidden_categories_dialog_close),
onClick = onDismiss
@@ -124,37 +108,41 @@ private fun HiddenCategoryRow(
category: Category,
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)
) {
- Column(modifier = Modifier.padding(end = 12.dp)) {
+ Row(
+ modifier = Modifier
+ .fillMaxWidth()
+ .padding(horizontal = 14.dp, vertical = 8.dp),
+ verticalAlignment = Alignment.CenterVertically
+ ) {
Text(
text = category.name,
- style = MaterialTheme.typography.bodyLarge,
- color = OnSurface
+ style = MaterialTheme.typography.bodySmall,
+ color = OnSurface,
+ modifier = Modifier.weight(1f).padding(end = 12.dp)
)
if (category.count > 0) {
Text(
text = category.count.toString(),
- style = MaterialTheme.typography.bodySmall,
+ style = MaterialTheme.typography.labelSmall,
color = OnSurfaceDim
)
}
}
- Switch(
- checked = false,
- onCheckedChange = { onUnhide() },
- colors = SwitchDefaults.colors(
- uncheckedThumbColor = OnBackground,
- uncheckedTrackColor = SurfaceHighlight,
- uncheckedBorderColor = SurfaceHighlight,
- checkedThumbColor = Primary,
- checkedTrackColor = Primary.copy(alpha = 0.4f)
- )
- )
}
}
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.kt
index 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 * bodyHeightFraction
val 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 * bodyHeightFraction
val dialogModifier = modifier
.fillMaxWidth(resolvedWidthFraction)
.then(
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.kt
index 67e799be..0bccd998 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
@@ -720,59 +720,31 @@ fun HomeScreen(
)
}
}
- if (uiState.hiddenLiveCategories.isNotEmpty()) {
- TvClickableSurface(
- onClick = { if (!isReorderMode) showHiddenCategoriesDialog = true },
- enabled = !isReorderMode,
- modifier = Modifier
- .fillMaxWidth()
- .padding(bottom = 10.dp),
- shape = ClickableSurfaceDefaults.shape(RoundedCornerShape(12.dp)),
- colors = ClickableSurfaceDefaults.colors(
- containerColor = SurfaceElevated,
- focusedContainerColor = SurfaceHighlight.copy(alpha = 0.9f)
- ),
- border = ClickableSurfaceDefaults.border(
- focusedBorder = Border(
- border = BorderStroke(2.dp, Primary.copy(alpha = 0.85f)),
- shape = RoundedCornerShape(12.dp)
- )
- ),
- scale = ClickableSurfaceDefaults.scale(focusedScale = 1f)
- ) {
- Row(
- modifier = Modifier
- .fillMaxWidth()
- .padding(horizontal = 12.dp, vertical = 10.dp),
- verticalAlignment = Alignment.CenterVertically,
- horizontalArrangement = Arrangement.SpaceBetween
- ) {
- Text(
- text = stringResource(
- R.string.live_quick_filter_hidden_categories,
- uiState.hiddenLiveCategories.size
- ),
- style = MaterialTheme.typography.labelLarge,
- color = OnSurface
- )
- Text(
- text = stringResource(R.string.hidden_categories_dialog_unhide_all),
- style = MaterialTheme.typography.labelMedium,
- color = Primary
- )
- }
- }
- }
if (showQuickFiltersDrawer) {
- Row(
+ Column(
modifier = Modifier
.fillMaxWidth()
.padding(bottom = 8.dp),
- horizontalArrangement = Arrangement.End
+ verticalArrangement = Arrangement.spacedBy(8.dp)
) {
+ if (uiState.hiddenLiveCategories.isNotEmpty()) {
+ TvButton(
+ onClick = { showHiddenCategoriesDialog = true },
+ enabled = !isReorderMode,
+ modifier = Modifier.fillMaxWidth()
+ ) {
+ Text(
+ text = stringResource(
+ R.string.live_quick_filter_hidden_categories,
+ uiState.hiddenLiveCategories.size
+ )
+ )
+ }
+ }
TvButton(
onClick = { showAddQuickFilterDialog = true },
- enabled = !isReorderMode
+ enabled = !isReorderMode,
+ modifier = Modifier.fillMaxWidth()
) {
Text(stringResource(R.string.home_quick_filters_add_chip))
}