Skip to content

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

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.kt
index 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: andro
filters.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.kt
similarity index 51%
rename from app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsNavigationRail.kt
rename to feature/settings/src/main/java/com/streamvault/feature/settings/presentation/SettingsNavigationRail.kt
index 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.presentation
import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.PaddingValues
import 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.size
import androidx.compose.foundation.layout.width
+import androidx.compose.foundation.shape.RoundedCornerShape
import androidx.compose.foundation.lazy.LazyColumn
import androidx.compose.foundation.lazy.itemsIndexed
import androidx.compose.runtime.Composable
+import androidx.compose.runtime.remember
import androidx.compose.ui.Modifier
+import androidx.compose.ui.Alignment
import androidx.compose.ui.focus.FocusRequester
import androidx.compose.ui.focus.focusRequester
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.font.FontWeight
import 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.mouseClickable
import com.streamvault.core.ui.theme.Primary
+import com.streamvault.core.ui.theme.OnBackground
+import com.streamvault.feature.settings.R
private 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.xml
index 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 &amp; 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>