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 multiview to playback feature
David Nashash420b1ab650b8
diff --git a/app/src/main/java/com/streamvault/app/navigation/graph/PlayerGraph.kt b/app/src/main/java/com/streamvault/app/navigation/graph/PlayerGraph.ktindex 2e5b8a26..3d27417a 100644--- a/app/src/main/java/com/streamvault/app/navigation/graph/PlayerGraph.kt+++ b/app/src/main/java/com/streamvault/app/navigation/graph/PlayerGraph.kt@@ -8,8 +8,8 @@ import com.streamvault.app.navigation.APP_NAVIGATION_TAGimport com.streamvault.app.navigation.AppNavigationPayloadsimport com.streamvault.app.navigation.AppRoutePatternsimport com.streamvault.app.navigation.safePlayerNavigationRequest-import com.streamvault.app.ui.screens.multiview.MultiViewScreen-import com.streamvault.app.ui.screens.multiview.MultiViewPlannerDialog+import com.streamvault.feature.playback.multiview.MultiViewScreen+import com.streamvault.feature.playback.multiview.MultiViewPlannerDialogimport 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/home/HomeScreen.kt b/app/src/main/java/com/streamvault/app/ui/screens/home/HomeScreen.ktindex 3a32a02e..28042ccd 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@@ -81,8 +81,8 @@ import kotlinx.coroutines.flow.filterimport androidx.compose.ui.res.stringResourceimport com.streamvault.app.Rimport com.streamvault.app.ui.model.LiveTvChannelMode-import com.streamvault.app.ui.screens.multiview.MultiViewViewModel-import com.streamvault.app.ui.screens.multiview.MultiViewPlannerDialog+import com.streamvault.feature.playback.multiview.MultiViewViewModel+import com.streamvault.feature.playback.multiview.MultiViewPlannerDialogimport com.streamvault.app.navigation.Routesimport com.streamvault.domain.model.VirtualCategoryIdsimport com.streamvault.domain.repository.ChannelRepositorydiff --git a/app/src/main/java/com/streamvault/app/ui/screens/home/HomeScreenDialogs.kt b/app/src/main/java/com/streamvault/app/ui/screens/home/HomeScreenDialogs.ktindex 219b6ffc..b1584adb 100644--- a/app/src/main/java/com/streamvault/app/ui/screens/home/HomeScreenDialogs.kt+++ b/app/src/main/java/com/streamvault/app/ui/screens/home/HomeScreenDialogs.kt@@ -24,8 +24,8 @@ import com.streamvault.app.ui.components.dialogs.RenameGroupDialogimport com.streamvault.app.ui.components.dialogs.M3uCategoryOrganizerDialogimport com.streamvault.app.ui.components.dialogs.M3uCategorySeriesAssignmentDialogimport com.streamvault.app.ui.components.dialogs.M3uSeriesAssignmentDialog-import com.streamvault.app.ui.screens.multiview.MultiViewPlannerDialog-import com.streamvault.app.ui.screens.multiview.MultiViewViewModel+import com.streamvault.feature.playback.multiview.MultiViewPlannerDialog+import com.streamvault.feature.playback.multiview.MultiViewViewModelimport com.streamvault.domain.model.ActiveLiveSourceimport com.streamvault.domain.model.Categoryimport com.streamvault.domain.model.Channeldiff --git a/app/src/main/java/com/streamvault/app/ui/screens/home/HomeViewModel.kt b/app/src/main/java/com/streamvault/app/ui/screens/home/HomeViewModel.ktindex 46ac52a5..f16da749 100644--- a/app/src/main/java/com/streamvault/app/ui/screens/home/HomeViewModel.kt+++ b/app/src/main/java/com/streamvault/app/ui/screens/home/HomeViewModel.kt@@ -7,7 +7,7 @@ import com.streamvault.feature.playback.preview.LivePreviewHandoffManagerimport com.streamvault.feature.playback.preview.PreviewHandoffSourceimport com.streamvault.app.plugins.StreamVaultPluginManagerimport com.streamvault.app.tvinput.TvInputChannelSyncManager-import com.streamvault.app.ui.screens.multiview.MultiViewManager+import com.streamvault.feature.playback.multiview.MultiViewManagerimport com.streamvault.app.ui.model.applyProviderCategoryDisplayPreferencesimport com.streamvault.domain.playback.orderedByRequestedRawIdsimport com.streamvault.app.ui.model.guideLookupKeydiff --git a/app/src/test/java/com/streamvault/app/ui/screens/home/HomeViewModelTest.kt b/app/src/test/java/com/streamvault/app/ui/screens/home/HomeViewModelTest.ktindex ec25fd40..8fcc0149 100644--- a/app/src/test/java/com/streamvault/app/ui/screens/home/HomeViewModelTest.kt+++ b/app/src/test/java/com/streamvault/app/ui/screens/home/HomeViewModelTest.kt@@ -5,7 +5,7 @@ import androidx.lifecycle.ViewModelimport com.streamvault.feature.playback.preview.LivePreviewHandoffManagerimport com.streamvault.app.plugins.StreamVaultPluginManagerimport com.streamvault.app.tvinput.TvInputChannelSyncManager-import com.streamvault.app.ui.screens.multiview.MultiViewManager+import com.streamvault.feature.playback.multiview.MultiViewManagerimport com.streamvault.data.preferences.PreferencesRepositoryimport com.streamvault.data.sync.SyncManagerimport com.streamvault.domain.manager.ParentalControlManagerdiff --git a/app/src/main/java/com/streamvault/app/ui/screens/multiview/EnhancedMultiViewControlHud.kt b/feature/playback/src/main/java/com/streamvault/feature/playback/multiview/EnhancedMultiViewControlHud.ktsimilarity index 99%rename from app/src/main/java/com/streamvault/app/ui/screens/multiview/EnhancedMultiViewControlHud.ktrename to feature/playback/src/main/java/com/streamvault/feature/playback/multiview/EnhancedMultiViewControlHud.ktindex dd82d946..9e397323 100644--- a/app/src/main/java/com/streamvault/app/ui/screens/multiview/EnhancedMultiViewControlHud.kt+++ b/feature/playback/src/main/java/com/streamvault/feature/playback/multiview/EnhancedMultiViewControlHud.kt@@ -1,4 +1,4 @@-package com.streamvault.app.ui.screens.multiview+package com.streamvault.feature.playback.multiviewimport androidx.compose.foundation.backgroundimport androidx.compose.foundation.border@@ -22,7 +22,7 @@ import androidx.tv.material3.ButtonDefaultsimport androidx.tv.material3.MaterialThemeimport androidx.tv.material3.Surfaceimport androidx.tv.material3.Text-import com.streamvault.app.R+import com.streamvault.feature.playback.Rimport com.streamvault.core.ui.theme.Primaryimport com.streamvault.core.ui.interaction.TvClickableSurfaceimport com.streamvault.core.ui.interaction.TvButtondiff --git a/app/src/main/java/com/streamvault/app/ui/screens/multiview/MultiViewManager.kt b/feature/playback/src/main/java/com/streamvault/feature/playback/multiview/MultiViewManager.ktsimilarity index 97%rename from app/src/main/java/com/streamvault/app/ui/screens/multiview/MultiViewManager.ktrename to feature/playback/src/main/java/com/streamvault/feature/playback/multiview/MultiViewManager.ktindex 695bce86..09a4ac11 100644--- a/app/src/main/java/com/streamvault/app/ui/screens/multiview/MultiViewManager.kt+++ b/feature/playback/src/main/java/com/streamvault/feature/playback/multiview/MultiViewManager.kt@@ -1,4 +1,4 @@-package com.streamvault.app.ui.screens.multiview+package com.streamvault.feature.playback.multiviewimport com.streamvault.domain.model.Channelimport kotlinx.coroutines.flow.MutableStateFlowdiff --git a/app/src/main/java/com/streamvault/app/ui/screens/multiview/MultiViewPlannerDialog.kt b/feature/playback/src/main/java/com/streamvault/feature/playback/multiview/MultiViewPlannerDialog.ktsimilarity index 99%rename from app/src/main/java/com/streamvault/app/ui/screens/multiview/MultiViewPlannerDialog.ktrename to feature/playback/src/main/java/com/streamvault/feature/playback/multiview/MultiViewPlannerDialog.ktindex 2bddc2c6..8afce855 100644--- a/app/src/main/java/com/streamvault/app/ui/screens/multiview/MultiViewPlannerDialog.kt+++ b/feature/playback/src/main/java/com/streamvault/feature/playback/multiview/MultiViewPlannerDialog.kt@@ -1,4 +1,4 @@-package com.streamvault.app.ui.screens.multiview+package com.streamvault.feature.playback.multiviewimport androidx.compose.foundation.BorderStrokeimport androidx.compose.foundation.background@@ -37,7 +37,7 @@ import androidx.tv.material3.ClickableSurfaceDefaultsimport androidx.tv.material3.MaterialThemeimport androidx.tv.material3.Surfaceimport androidx.tv.material3.Text-import com.streamvault.app.R+import com.streamvault.feature.playback.Rimport com.streamvault.core.ui.components.dialogs.PremiumDialogimport com.streamvault.core.ui.components.dialogs.PremiumDialogFooterButtonimport com.streamvault.core.ui.components.shell.AppMessageStatediff --git a/app/src/main/java/com/streamvault/app/ui/screens/multiview/MultiViewScreen.kt b/feature/playback/src/main/java/com/streamvault/feature/playback/multiview/MultiViewScreen.ktsimilarity index 99%rename from app/src/main/java/com/streamvault/app/ui/screens/multiview/MultiViewScreen.ktrename to feature/playback/src/main/java/com/streamvault/feature/playback/multiview/MultiViewScreen.ktindex 08265df3..ae404a16 100644--- a/app/src/main/java/com/streamvault/app/ui/screens/multiview/MultiViewScreen.kt+++ b/feature/playback/src/main/java/com/streamvault/feature/playback/multiview/MultiViewScreen.kt@@ -1,4 +1,4 @@-package com.streamvault.app.ui.screens.multiview+package com.streamvault.feature.playback.multiviewimport android.app.Activityimport android.view.View@@ -76,7 +76,7 @@ import androidx.tv.material3.MaterialThemeimport androidx.tv.material3.Surfaceimport androidx.compose.runtime.rememberCoroutineScopeimport androidx.compose.ui.platform.LocalContext-import com.streamvault.app.R+import com.streamvault.feature.playback.Rimport com.streamvault.player.ui.PlayerRenderViewimport com.streamvault.core.ui.components.dialogs.PinEntryDialogimport com.streamvault.core.ui.components.dialogs.PremiumDialogdiff --git a/app/src/main/java/com/streamvault/app/ui/screens/multiview/MultiViewState.kt b/feature/playback/src/main/java/com/streamvault/feature/playback/multiview/MultiViewState.ktsimilarity index 98%rename from app/src/main/java/com/streamvault/app/ui/screens/multiview/MultiViewState.ktrename to feature/playback/src/main/java/com/streamvault/feature/playback/multiview/MultiViewState.ktindex df84c164..a327486c 100644--- a/app/src/main/java/com/streamvault/app/ui/screens/multiview/MultiViewState.kt+++ b/feature/playback/src/main/java/com/streamvault/feature/playback/multiview/MultiViewState.kt@@ -1,4 +1,4 @@-package com.streamvault.app.ui.screens.multiview+package com.streamvault.feature.playback.multiviewimport com.streamvault.domain.model.Channelimport com.streamvault.player.PlayerEnginediff --git a/app/src/main/java/com/streamvault/app/ui/screens/multiview/MultiViewViewModel.kt b/feature/playback/src/main/java/com/streamvault/feature/playback/multiview/MultiViewViewModel.ktsimilarity index 99%rename from app/src/main/java/com/streamvault/app/ui/screens/multiview/MultiViewViewModel.ktrename to feature/playback/src/main/java/com/streamvault/feature/playback/multiview/MultiViewViewModel.ktindex 02e5f074..01cb508c 100644--- a/app/src/main/java/com/streamvault/app/ui/screens/multiview/MultiViewViewModel.kt+++ b/feature/playback/src/main/java/com/streamvault/feature/playback/multiview/MultiViewViewModel.kt@@ -1,4 +1,4 @@-package com.streamvault.app.ui.screens.multiview+package com.streamvault.feature.playback.multiviewimport android.app.ActivityManagerimport android.content.Contextdiff --git a/feature/playback/src/main/res/values/playback_multiview_strings.xml b/feature/playback/src/main/res/values/playback_multiview_strings.xmlnew file mode 100644index 00000000..b8c5ec7a--- /dev/null+++ b/feature/playback/src/main/res/values/playback_multiview_strings.xml@@ -0,0 +1,47 @@+<resources>+ <string name="home_incorrect_pin">Incorrect PIN</string>+ <string name="pin_dialog_title">Enter PIN</string>+ <string name="pin_dialog_cancel">Cancel</string>+ <string name="settings_cancel">Cancel</string>+ <string name="category_options_cancel">Cancel</string>++ <string name="multiview_add_to_split">Add to Split Screen</string>+ <string name="multiview_planner_title">Split Screen Manager</string>+ <string name="multiview_planner_empty">No channels in slots yet.\nLong-press a channel to add it.</string>+ <string name="multiview_planner_clear">Clear All</string>+ <string name="multiview_planner_launch">Launch Split Screen</string>+ <string name="multiview_planner_launch_disabled">Add channels first</string>+ <string name="multiview_planner_pick_slot">Choose a slot for %1$s.</string>+ <string name="multiview_planner_added">%1$s is ready for split screen.</string>+ <string name="multiview_planner_ready_subtitle">Review the active slots, replace any stream, and launch when ready.</string>+ <string name="multiview_planner_slot_hint">Select a slot to place this channel.</string>+ <string name="multiview_empty_slot">Empty Slot</string>+ <string name="multiview_stream_error">Stream Error</string>+ <string name="multiview_focused_prefix">Focused: %1$s</string>+ <string name="multiview_preset_label">Preset %1$d</string>+ <string name="multiview_preset_save">Save %1$d</string>+ <string name="multiview_audio_badge">Audio</string>+ <string name="multiview_audio_pinned_badge">Audio Pinned</string>+ <string name="multiview_replace_slot">Replace Slot</string>+ <string name="multiview_remove_slot">Remove Slot</string>+ <string name="multiview_pin_audio">Pin Audio</string>+ <string name="multiview_audio_follow_focus">Follow Focus</string>+ <string name="multiview_replace_title">Replace Focused Slot</string>+ <string name="multiview_replace_empty">Use Live TV favorites or recent channels first so replacement choices appear here.</string>+ <string name="multiview_slot_label">Slot %1$d</string>+ <string name="multiview_policy_summary">%1$s tier • %2$d active slot(s)</string>+ <string name="multiview_policy_auto">Auto</string>+ <string name="multiview_policy_conservative">Conservative</string>+ <string name="multiview_policy_balanced">Balanced</string>+ <string name="multiview_policy_maximum">Maximum</string>+ <string name="multiview_policy_blocked">Standby Slot</string>+ <string name="multiview_telemetry_snapshot">%1$d active • %2$d standby • %3$d buffering • %4$d errors</string>+ <string name="multiview_telemetry_detail">%1$d dropped total • +%2$d recent • load %3$d • %4$s thermal</string>+ <string name="multiview_thermal_unknown">Unknown</string>+ <string name="multiview_thermal_normal">Normal</string>+ <string name="multiview_thermal_light">Light</string>+ <string name="multiview_thermal_moderate">Moderate</string>+ <string name="multiview_thermal_severe">Severe</string>+ <string name="multiview_thermal_critical">Critical</string>+ <string name="multiview_low_memory_warning">Memory pressure is high. Extra slots stay in standby until playback stabilizes.</string>+</resources>diff --git a/feature/playback/src/test/java/com/streamvault/feature/playback/multiview/MultiViewManagerTest.kt b/feature/playback/src/test/java/com/streamvault/feature/playback/multiview/MultiViewManagerTest.ktnew file mode 100644index 00000000..1919d080--- /dev/null+++ b/feature/playback/src/test/java/com/streamvault/feature/playback/multiview/MultiViewManagerTest.kt@@ -0,0 +1,63 @@+package com.streamvault.feature.playback.multiview++import com.google.common.truth.Truth.assertThat+import com.streamvault.domain.model.Channel+import org.junit.Test++class MultiViewManagerTest {++ @Test+ fun setChannel_replacesSlotAndRemovesTheChannelFromItsPreviousSlot() {+ val manager = MultiViewManager()+ val news = channel(1, "News")+ val sport = channel(2, "Sport")++ manager.setChannel(0, news)+ manager.setChannel(1, sport)+ manager.setChannel(3, news)++ assertThat(manager.slots.value).containsExactly(null, sport, null, news).inOrder()+ }++ @Test+ fun slots_alwaysExposeTheFixedMaximumIncludingEmptySlots() {+ val manager = MultiViewManager()++ assertThat(manager.slots.value).hasSize(MultiViewManager.MAX_SLOTS)+ assertThat(manager.slots.value).containsExactly(null, null, null, null).inOrder()++ manager.setChannel(MultiViewManager.MAX_SLOTS, channel(9, "Ignored"))+ manager.clearSlot(-1)++ assertThat(manager.slots.value).containsExactly(null, null, null, null).inOrder()+ }++ @Test+ fun setSlots_requiresTheMaximumAndKeepsEmptySlotPositions() {+ val manager = MultiViewManager()+ val news = channel(1, "News")++ manager.setSlots(listOf(news, null, null, null))++ assertThat(manager.isQueued(news.id)).isTrue()+ assertThat(manager.slots.value).containsExactly(news, null, null, null).inOrder()+ }++ @Test+ fun setChannel_usesChannelIdentityRatherThanItsDisplayName() {+ val manager = MultiViewManager()+ val original = channel(3, "News")+ val renamed = channel(3, "News HD")++ manager.setChannel(0, original)+ manager.setChannel(2, renamed)++ assertThat(manager.slots.value).containsExactly(null, null, renamed, null).inOrder()+ }++ private fun channel(id: Long, name: String) = Channel(+ id = id,+ name = name,+ streamUrl = "https://example.test/$id.m3u8"+ )+}diff --git a/feature/playback/src/test/java/com/streamvault/feature/playback/multiview/MultiViewViewModelTest.kt b/feature/playback/src/test/java/com/streamvault/feature/playback/multiview/MultiViewViewModelTest.ktnew file mode 100644index 00000000..19a1732b--- /dev/null+++ b/feature/playback/src/test/java/com/streamvault/feature/playback/multiview/MultiViewViewModelTest.kt@@ -0,0 +1,133 @@+package com.streamvault.feature.playback.multiview++import com.google.common.truth.Truth.assertThat+import android.app.ActivityManager+import android.content.Context+import androidx.lifecycle.ViewModel+import com.streamvault.data.preferences.PreferencesRepository+import com.streamvault.domain.manager.ParentalControlManager+import com.streamvault.domain.model.Channel+import com.streamvault.domain.repository.ChannelRepository+import com.streamvault.domain.repository.FavoriteRepository+import com.streamvault.domain.repository.PlaybackHistoryRepository+import com.streamvault.domain.repository.ProviderRepository+import com.streamvault.domain.usecase.UnlockParentalCategory+import com.streamvault.player.PlayerEngine+import kotlinx.coroutines.Dispatchers+import kotlinx.coroutines.ExperimentalCoroutinesApi+import kotlinx.coroutines.flow.flowOf+import kotlinx.coroutines.test.StandardTestDispatcher+import kotlinx.coroutines.test.advanceTimeBy+import kotlinx.coroutines.test.runCurrent+import kotlinx.coroutines.test.setMain+import kotlinx.coroutines.test.resetMain+import org.junit.Test+import org.junit.After+import org.junit.Before+import org.mockito.kotlin.any+import org.mockito.kotlin.mock+import org.mockito.kotlin.times+import org.mockito.kotlin.verify+import org.mockito.kotlin.whenever+import javax.inject.Provider++@OptIn(ExperimentalCoroutinesApi::class)+class MultiViewViewModelTest {++ private val dispatcher = StandardTestDispatcher()+ private val context: Context = mock()+ private val activityManager: ActivityManager = mock()+ private val manager = MultiViewManager()+ private val playerEngine: PlayerEngine = mock()+ private val playerEngineProvider: Provider<PlayerEngine> = mock()+ private val preferences: PreferencesRepository = mock()+ private val channels: ChannelRepository = mock()+ private val favorites: FavoriteRepository = mock()+ private val history: PlaybackHistoryRepository = mock()+ private val providers: ProviderRepository = mock()+ private val parentalControl: ParentalControlManager = mock()+ private val unlockParentalCategory: UnlockParentalCategory = mock()++ @Before+ fun setUp() {+ Dispatchers.setMain(dispatcher)+ whenever(context.getSystemService(Context.ACTIVITY_SERVICE)).thenReturn(activityManager)+ whenever(activityManager.memoryClass).thenReturn(128)+ whenever(activityManager.isLowRamDevice).thenReturn(true)+ whenever(playerEngineProvider.get()).thenReturn(playerEngine)+ whenever(preferences.playerAudioVideoSyncEnabled).thenReturn(flowOf(false))+ whenever(preferences.playerAudioVideoOffsetMs).thenReturn(flowOf(0))+ whenever(preferences.getMultiViewPreset(any())).thenReturn(flowOf(emptyList()))+ whenever(preferences.multiViewCenterTwoSlotLayout).thenReturn(flowOf(false))+ whenever(preferences.multiViewRespectProviderConnectionLimit).thenReturn(flowOf(false))+ whenever(preferences.parentalControlLevel).thenReturn(flowOf(0))+ whenever(preferences.lastActiveProviderId).thenReturn(flowOf(null))+ whenever(providers.getActiveProvider()).thenReturn(flowOf(null))+ }++ @After+ fun tearDown() {+ Dispatchers.resetMain()+ }++ @Test+ fun initSlots_blocksExtraOccupiedSlotsForTheSelectedPerformancePolicy() {+ whenever(preferences.multiViewPerformanceMode).thenReturn(flowOf(MultiViewPerformanceMode.CONSERVATIVE.name))+ manager.setSlots(listOf(channel(1), channel(2), null, null))+ val viewModel = createViewModel()+ dispatcher.scheduler.runCurrent()++ viewModel.initSlots()++ assertThat(viewModel.uiState.value.slots[0].performanceBlockedReason).isNull()+ assertThat(viewModel.uiState.value.slots[1].performanceBlockedReason).contains("policy")+ assertThat(viewModel.uiState.value.slots.filter(MultiViewSlot::isEmpty).map(MultiViewSlot::index))+ .containsExactly(2, 3).inOrder()+ clear(viewModel)+ }++ @Test+ fun clearSlot_cancelsStaggeredGenerationBeforeAnAuxiliaryEngineIsCreated() {+ whenever(preferences.multiViewPerformanceMode).thenReturn(flowOf(MultiViewPerformanceMode.MAXIMUM.name))+ manager.setSlots(listOf(channel(1), channel(2), null, null))+ val viewModel = createViewModel()+ dispatcher.scheduler.runCurrent()++ viewModel.initSlots()+ dispatcher.scheduler.runCurrent()+ viewModel.clearSlot(1)+ dispatcher.scheduler.advanceTimeBy(1_000)+ dispatcher.scheduler.runCurrent()++ verify(playerEngineProvider, times(1)).get()+ assertThat(manager.slots.value).containsExactly(channel(1), null, null, null).inOrder()+ clear(viewModel)+ }++ private fun createViewModel() = MultiViewViewModel(+ context = context,+ multiViewManager = manager,+ playerEngineProvider = playerEngineProvider,+ preferencesRepository = preferences,+ channelRepository = channels,+ favoriteRepository = favorites,+ playbackHistoryRepository = history,+ providerRepository = providers,+ parentalControlManager = parentalControl,+ unlockParentalCategory = unlockParentalCategory+ )++ private fun channel(id: Long) = Channel(+ id = id,+ name = "Channel $id",+ streamUrl = "https://example.test/$id.m3u8"+ )++ private fun clear(viewModel: ViewModel) {+ val clearMethod = ViewModel::class.java.declaredMethods.first { method ->+ method.parameterCount == 0 && method.name.startsWith("clear")+ }+ clearMethod.isAccessible = true+ clearMethod.invoke(viewModel)+ }+}