StreamVault is a TV-first free IPTV player for Android TV built with Kotlin, Jetpack Compose, Room, Hilt, and Media3.
Kotlin iptv-player
refactor: move settings navigation rail
David Nashash3f2c490d6931
diff --git a/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsRowComponents.kt b/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsRowComponents.ktindex 1372d545..09f4eb37 100644--- a/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsRowComponents.kt+++ b/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsRowComponents.kt@@ -287,65 +287,3 @@ internal fun formatLiveTvQuickFiltersValue(filters: List<String>, context: androfilters.size)}--@Composable-internal fun SettingsNavItem(- label: String,- badgeChar: String,- accentColor: Color,- isSelected: Boolean,- modifier: Modifier = Modifier,- onClick: () -> Unit-) {- val focusRequester = remember { FocusRequester() }- TvClickableSurface(- onClick = onClick,- shape = ClickableSurfaceDefaults.shape(RoundedCornerShape(0.dp)),- colors = ClickableSurfaceDefaults.colors(- containerColor = if (isSelected) Primary.copy(alpha = 0.11f) else Color.Transparent,- focusedContainerColor = Primary.copy(alpha = 0.22f)- ),- scale = ClickableSurfaceDefaults.scale(focusedScale = 1f),- modifier = modifier- .fillMaxWidth()- .focusRequester(focusRequester)- .mouseClickable(focusRequester = focusRequester, onClick = onClick)- ) {- Row(- modifier = Modifier- .fillMaxWidth()- .padding(horizontal = 10.dp, vertical = 12.dp),- verticalAlignment = Alignment.CenterVertically,- horizontalArrangement = Arrangement.spacedBy(10.dp)- ) {- Box(- Modifier- .width(3.dp)- .height(22.dp)- .background(- color = if (isSelected) Primary else Color.Transparent,- shape = RoundedCornerShape(2.dp)- )- )- Box(- Modifier- .size(28.dp)- .background(accentColor.copy(alpha = 0.18f), RoundedCornerShape(7.dp)),- contentAlignment = Alignment.Center- ) {- Text(- text = badgeChar,- style = MaterialTheme.typography.labelSmall,- color = accentColor,- fontWeight = FontWeight.Bold- )- }- Text(- text = label,- style = MaterialTheme.typography.labelLarge,- color = if (isSelected) Primary else OnBackground,- fontWeight = if (isSelected) FontWeight.SemiBold else FontWeight.Normal- )- }- }-}diff --git a/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsNavigationRail.kt b/feature/settings/src/main/java/com/streamvault/feature/settings/presentation/SettingsNavigationRail.ktsimilarity index 51%rename from app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsNavigationRail.ktrename to feature/settings/src/main/java/com/streamvault/feature/settings/presentation/SettingsNavigationRail.ktindex 2d2114b0..d9ec5716 100644--- a/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsNavigationRail.kt+++ b/feature/settings/src/main/java/com/streamvault/feature/settings/presentation/SettingsNavigationRail.kt@@ -1,21 +1,37 @@-package com.streamvault.app.ui.screens.settings+package com.streamvault.feature.settings.presentationimport androidx.compose.foundation.background+import androidx.compose.foundation.layout.Boximport androidx.compose.foundation.layout.Arrangementimport androidx.compose.foundation.layout.PaddingValuesimport androidx.compose.foundation.layout.fillMaxHeight+import androidx.compose.foundation.layout.fillMaxWidth+import androidx.compose.foundation.layout.height+import androidx.compose.foundation.layout.padding+import androidx.compose.foundation.layout.Row+import androidx.compose.foundation.layout.sizeimport androidx.compose.foundation.layout.width+import androidx.compose.foundation.shape.RoundedCornerShapeimport androidx.compose.foundation.lazy.LazyColumnimport androidx.compose.foundation.lazy.itemsIndexedimport androidx.compose.runtime.Composable+import androidx.compose.runtime.rememberimport androidx.compose.ui.Modifier+import androidx.compose.ui.Alignmentimport androidx.compose.ui.focus.FocusRequesterimport androidx.compose.ui.focus.focusRequesterimport androidx.compose.ui.graphics.Colorimport androidx.compose.ui.res.stringResource+import androidx.compose.ui.text.font.FontWeightimport androidx.compose.ui.unit.dp-import com.streamvault.app.R+import androidx.tv.material3.ClickableSurfaceDefaults+import androidx.tv.material3.MaterialTheme+import androidx.tv.material3.Text+import com.streamvault.core.ui.interaction.TvClickableSurface+import com.streamvault.core.ui.interaction.mouseClickableimport com.streamvault.core.ui.theme.Primary+import com.streamvault.core.ui.theme.OnBackground+import com.streamvault.feature.settings.Rprivate data class SettingsNavEntry(val id: String,@@ -25,7 +41,7 @@ private data class SettingsNavEntry()@Composable-internal fun SettingsNavigationRail(+public fun SettingsNavigationRail(selectedCategory: Int,focusRequester: FocusRequester,onCategorySelected: (Int) -> Unit@@ -105,3 +121,65 @@ internal fun SettingsNavigationRail(}}}++@Composable+public fun SettingsNavItem(+ label: String,+ badgeChar: String,+ accentColor: Color,+ isSelected: Boolean,+ modifier: Modifier = Modifier,+ onClick: () -> Unit+) {+ val focusRequester = remember { FocusRequester() }+ TvClickableSurface(+ onClick = onClick,+ shape = ClickableSurfaceDefaults.shape(RoundedCornerShape(0.dp)),+ colors = ClickableSurfaceDefaults.colors(+ containerColor = if (isSelected) Primary.copy(alpha = 0.11f) else Color.Transparent,+ focusedContainerColor = Primary.copy(alpha = 0.22f)+ ),+ scale = ClickableSurfaceDefaults.scale(focusedScale = 1f),+ modifier = modifier+ .fillMaxWidth()+ .focusRequester(focusRequester)+ .mouseClickable(focusRequester = focusRequester, onClick = onClick)+ ) {+ Row(+ modifier = Modifier+ .fillMaxWidth()+ .padding(horizontal = 10.dp, vertical = 12.dp),+ verticalAlignment = Alignment.CenterVertically,+ horizontalArrangement = Arrangement.spacedBy(10.dp)+ ) {+ Box(+ Modifier+ .width(3.dp)+ .height(22.dp)+ .background(+ color = if (isSelected) Primary else Color.Transparent,+ shape = RoundedCornerShape(2.dp)+ )+ )+ Box(+ Modifier+ .size(28.dp)+ .background(accentColor.copy(alpha = 0.18f), RoundedCornerShape(7.dp)),+ contentAlignment = Alignment.Center+ ) {+ Text(+ text = badgeChar,+ style = MaterialTheme.typography.labelSmall,+ color = accentColor,+ fontWeight = FontWeight.Bold+ )+ }+ Text(+ text = label,+ style = MaterialTheme.typography.labelLarge,+ color = if (isSelected) Primary else OnBackground,+ fontWeight = if (isSelected) FontWeight.SemiBold else FontWeight.Normal+ )+ }+ }+}diff --git a/feature/settings/src/main/res/values/strings.xml b/feature/settings/src/main/res/values/strings.xmlindex 4a6f8dfd..eced72d9 100644--- a/feature/settings/src/main/res/values/strings.xml+++ b/feature/settings/src/main/res/values/strings.xml@@ -26,6 +26,13 @@<string name="settings_home_dashboard_remove">Remove</string><string name="settings_cancel">Cancel</string><string name="settings_syncing_title">Syncing data...</string>+ <string name="settings_providers">Providers</string>+ <string name="settings_playback">Playback</string>+ <string name="settings_browsing">Browsing</string>+ <string name="settings_privacy">Privacy</string>+ <string name="settings_recording_title">Recording</string>+ <string name="settings_backup_restore">Backup & Restore</string>+ <string name="settings_about">About</string><string name="settings_sync_elapsed">Elapsed: %1$s</string><string name="settings_speed_test_title">Internet Speed Test</string><string name="settings_speed_test_recommendation">Recommended quality cap: %1$s</string>