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 parental controls to settings feature
David Nashash0441d1e6e458
diff --git a/app/src/main/java/com/streamvault/app/navigation/graph/SystemGraph.kt b/app/src/main/java/com/streamvault/app/navigation/graph/SystemGraph.ktindex 3b81d116..2e735bd4 100644--- a/app/src/main/java/com/streamvault/app/navigation/graph/SystemGraph.kt+++ b/app/src/main/java/com/streamvault/app/navigation/graph/SystemGraph.kt@@ -10,7 +10,7 @@ import com.streamvault.app.navigation.AppRoutePatternsimport com.streamvault.app.ui.screens.downloads.DownloadsScreenimport com.streamvault.app.ui.screens.plugins.PluginsScreenimport com.streamvault.app.ui.screens.settings.SettingsScreen-import com.streamvault.app.ui.screens.settings.parental.ParentalControlGroupScreen+import com.streamvault.feature.settings.parental.ParentalControlGroupScreenimport com.streamvault.core.navigation.AppDestinationimport com.streamvault.core.navigation.NavigationActionsimport com.streamvault.core.navigation.NavigationOptionsdiff --git a/app/src/main/java/com/streamvault/app/ui/screens/settings/parental/ParentalControlGroupScreen.kt b/feature/settings/src/main/java/com/streamvault/feature/settings/parental/ParentalControlGroupScreen.ktsimilarity index 97%rename from app/src/main/java/com/streamvault/app/ui/screens/settings/parental/ParentalControlGroupScreen.ktrename to feature/settings/src/main/java/com/streamvault/feature/settings/parental/ParentalControlGroupScreen.ktindex 794e5c58..7e61df4b 100644--- a/app/src/main/java/com/streamvault/app/ui/screens/settings/parental/ParentalControlGroupScreen.kt+++ b/feature/settings/src/main/java/com/streamvault/feature/settings/parental/ParentalControlGroupScreen.kt@@ -1,4 +1,4 @@-package com.streamvault.app.ui.screens.settings.parental+package com.streamvault.feature.settings.parentalimport androidx.compose.foundation.backgroundimport androidx.compose.foundation.border@@ -48,11 +48,12 @@ import androidx.tv.material3.IconButtonimport androidx.tv.material3.MaterialThemeimport androidx.tv.material3.Surfaceimport androidx.tv.material3.Text-import com.streamvault.app.R+import com.streamvault.feature.settings.Rimport com.streamvault.core.ui.components.SearchInputimport com.streamvault.core.ui.components.dialogs.PinDialog-import com.streamvault.app.ui.components.shell.AppNavigationChrome-import com.streamvault.app.ui.components.shell.AppScreenScaffold+import com.streamvault.core.ui.components.shell.CoreAppScreenScaffold+import com.streamvault.core.ui.components.shell.NavigationChrome+import com.streamvault.core.ui.components.shell.UiDestinationimport com.streamvault.domain.model.ContentTypeimport com.streamvault.core.ui.interaction.TvClickableSurfaceimport com.streamvault.core.ui.interaction.TvIconButton@@ -73,6 +74,7 @@ fun ParentalControlGroupScreen(currentRoute: String,onNavigate: (String) -> Unit,onBack: () -> Unit,+ navigationDestinations: List<UiDestination> = emptyList(),viewModel: ParentalControlGroupViewModel = hiltViewModel()) {val uiState by viewModel.uiState.collectAsStateWithLifecycle()@@ -115,12 +117,13 @@ fun ParentalControlGroupScreen(}}- AppScreenScaffold(- currentRoute = currentRoute,- onNavigate = onNavigate,+ CoreAppScreenScaffold(+ currentDestinationId = currentRoute,+ destinations = navigationDestinations,+ onDestinationSelected = onNavigate,title = stringResource(R.string.settings_provider_category_controls_title),subtitle = stringResource(R.string.settings_provider_category_controls_subtitle),- navigationChrome = AppNavigationChrome.TopBar,+ navigationChrome = NavigationChrome.TopBar,compactHeader = true,showScreenHeader = false,header = {diff --git a/app/src/main/java/com/streamvault/app/ui/screens/settings/parental/ParentalControlGroupViewModel.kt b/feature/settings/src/main/java/com/streamvault/feature/settings/parental/ParentalControlGroupViewModel.ktsimilarity index 99%rename from app/src/main/java/com/streamvault/app/ui/screens/settings/parental/ParentalControlGroupViewModel.ktrename to feature/settings/src/main/java/com/streamvault/feature/settings/parental/ParentalControlGroupViewModel.ktindex e78471f7..626807e3 100644--- a/app/src/main/java/com/streamvault/app/ui/screens/settings/parental/ParentalControlGroupViewModel.kt+++ b/feature/settings/src/main/java/com/streamvault/feature/settings/parental/ParentalControlGroupViewModel.kt@@ -1,4 +1,4 @@-package com.streamvault.app.ui.screens.settings.parental+package com.streamvault.feature.settings.parentalimport androidx.lifecycle.SavedStateHandleimport androidx.lifecycle.ViewModeldiff --git a/feature/settings/src/main/res/values/strings.xml b/feature/settings/src/main/res/values/strings.xmlindex 0b826d63..9400b9b5 100644--- a/feature/settings/src/main/res/values/strings.xml+++ b/feature/settings/src/main/res/values/strings.xml@@ -44,4 +44,36 @@<string name="settings_backup_conflict_count">%1$d conflicts</string><string name="settings_backup_no_conflicts">No conflicts</string><string name="settings_backup_item_count">%1$d items</string>+ <string name="settings_provider_category_controls_title">Category Controls</string>+ <string name="settings_provider_category_controls_subtitle">Lock, unlock, hide, and restore categories for the current playlist from one place.</string>+ <string name="settings_provider_category_controls_search">Search categories...</string>+ <string name="pin_dialog_cancel">Cancel</string>+ <string name="home_incorrect_pin">Incorrect PIN</string>+ <string name="settings_enter_new_pin">Enter New PIN</string>+ <string name="settings_enter_pin">Enter PIN</string>+ <string name="nav_live_tv">Live TV</string>+ <string name="nav_movies">Movies</string>+ <string name="nav_vod">VOD</string>+ <string name="nav_series">Series</string>+ <string name="settings_category_mode_protection">Lock / Unlock</string>+ <string name="settings_category_mode_visibility">Hide / Unhide</string>+ <string name="settings_category_protection_summary_title">Lock changes are reviewed before they go live</string>+ <string name="settings_category_protection_summary_body">Toggle the categories you want to lock or unlock, then save. Saving requires your parental PIN.</string>+ <string name="settings_category_protection_summary_body_no_pin">Toggle the categories you want to lock or unlock, then save. You will be asked to create a parental PIN before the changes are applied.</string>+ <string name="settings_category_protection_save">Save Locks (%1$d)</string>+ <string name="settings_category_protection_save_idle">Save Locks</string>+ <string name="settings_category_protection_reset">Reset</string>+ <string name="settings_category_visibility_summary_title">Visibility changes apply immediately</string>+ <string name="settings_category_visibility_summary_body">%1$d categories are currently hidden for this playlist. Hiding and restoring does not require a PIN.</string>+ <string name="settings_category_status_locked">Locked</string>+ <string name="settings_category_status_unlocked">Unlocked</string>+ <string name="settings_category_status_auto_locked">Auto-Locked</string>+ <string name="settings_category_status_hidden">Hidden</string>+ <string name="settings_unhide_category">Unhide</string>+ <string name="settings_hide_category">Hide</string>+ <string name="settings_hide_all_categories">Hide All</string>+ <string name="settings_unhide_all_categories">Unhide All</string>+ <string name="parental_group_auto_protected">Adult Category (Auto-Protected)</string>+ <string name="parental_group_back">Back</string>+ <string name="settings_category_controls_empty">No categories match this search.</string></resources>diff --git a/feature/settings/src/test/java/com/streamvault/feature/settings/parental/ParentalControlGroupViewModelTest.kt b/feature/settings/src/test/java/com/streamvault/feature/settings/parental/ParentalControlGroupViewModelTest.ktnew file mode 100644index 00000000..93e0f387--- /dev/null+++ b/feature/settings/src/test/java/com/streamvault/feature/settings/parental/ParentalControlGroupViewModelTest.kt@@ -0,0 +1,57 @@+package com.streamvault.feature.settings.parental++import androidx.lifecycle.SavedStateHandle+import com.google.common.truth.Truth.assertThat+import com.streamvault.data.preferences.PreferencesRepository+import com.streamvault.domain.model.Category+import com.streamvault.domain.model.ContentType+import com.streamvault.domain.repository.CategoryRepository+import kotlinx.coroutines.ExperimentalCoroutinesApi+import kotlinx.coroutines.flow.flowOf+import kotlinx.coroutines.flow.first+import kotlinx.coroutines.test.runTest+import org.junit.Test+import org.mockito.kotlin.mock+import org.mockito.kotlin.whenever++@OptIn(ExperimentalCoroutinesApi::class)+class ParentalControlGroupViewModelTest {++ private val categoryRepository: CategoryRepository = mock()+ private val preferencesRepository: PreferencesRepository = mock()++ @Test+ fun adultCategoryRemainsProtectedWhenProtectionIsToggled() = runTest {+ val adult = Category(+ id = 9L,+ name = "Adult",+ type = ContentType.VOD,+ isAdult = true,+ isUserProtected = true+ )+ whenever(categoryRepository.getCategories(7L)).thenReturn(flowOf(listOf(adult)))+ whenever(preferencesRepository.getHiddenCategoryIds(7L, ContentType.LIVE))+ .thenReturn(flowOf(emptySet()))+ whenever(preferencesRepository.getHiddenCategoryIds(7L, ContentType.MOVIE))+ .thenReturn(flowOf(emptySet()))+ whenever(preferencesRepository.getHiddenCategoryIds(7L, ContentType.SERIES))+ .thenReturn(flowOf(emptySet()))+ whenever(preferencesRepository.getHiddenCategoryIds(7L, ContentType.VOD))+ .thenReturn(flowOf(emptySet()))+ whenever(preferencesRepository.hasParentalPin).thenReturn(flowOf(true))++ val viewModel = ParentalControlGroupViewModel(+ categoryRepository = categoryRepository,+ preferencesRepository = preferencesRepository,+ savedStateHandle = SavedStateHandle(mapOf("providerId" to 7L))+ )++ val initial = viewModel.uiState.first { !it.isLoading }+ viewModel.toggleCategoryProtection(adult)+ val afterToggle = viewModel.uiState.first { !it.isLoading }++ assertThat(initial.categories.single().isProtected).isTrue()+ assertThat(afterToggle.categories.single().isProtected).isTrue()+ assertThat(afterToggle.hasPendingProtectionChanges).isFalse()+ }+}