Skip to content

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

Add Live TV decorative row visibility toggle

David Nashashdef553916fc6
diff --git a/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsBrowsingSection.kt b/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsBrowsingSection.kt
index aac4db24..5ea2a061 100644
--- a/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsBrowsingSection.kt
+++ b/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsBrowsingSection.kt
@@ -171,6 +171,28 @@ internal fun LazyListScope.settingsBrowsingSection(
value = stringResource(uiState.liveTvQuickFilterVisibilityMode.labelResId()),
onClick = { onShowLiveTvQuickFilterVisibilityDialogChange(true) }
)
+ TvClickableSurface(
+ onClick = { viewModel.setHideDecorativeLiveRows(!uiState.hideDecorativeLiveRows) },
+ shape = ClickableSurfaceDefaults.shape(RoundedCornerShape(8.dp)),
+ colors = ClickableSurfaceDefaults.colors(
+ containerColor = Color.Transparent,
+ focusedContainerColor = Primary.copy(alpha = 0.15f)
+ ),
+ scale = ClickableSurfaceDefaults.scale(focusedScale = 1f),
+ modifier = Modifier.fillMaxWidth()
+ ) {
+ Row(
+ modifier = Modifier.fillMaxWidth().padding(horizontal = 8.dp, vertical = 12.dp),
+ horizontalArrangement = Arrangement.SpaceBetween,
+ verticalAlignment = Alignment.CenterVertically
+ ) {
+ Column(modifier = Modifier.weight(1f)) {
+ Text(text = stringResource(R.string.settings_hide_decorative_live_rows), style = MaterialTheme.typography.bodyMedium, color = OnSurface)
+ Text(text = stringResource(R.string.settings_hide_decorative_live_rows_subtitle), style = MaterialTheme.typography.bodySmall, color = OnBackground.copy(alpha = 0.6f))
+ }
+ Switch(checked = uiState.hideDecorativeLiveRows, onCheckedChange = { viewModel.setHideDecorativeLiveRows(it) })
+ }
+ }
ClickableSettingsRow(
label = stringResource(R.string.settings_live_channel_numbering_mode),
value = stringResource(uiState.liveChannelNumberingMode.labelResId()),
diff --git a/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsPreferenceModels.kt b/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsPreferenceModels.kt
index b55eb970..02d755d2 100644
--- a/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsPreferenceModels.kt
+++ b/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsPreferenceModels.kt
@@ -95,6 +95,7 @@ internal data class SettingsPreferenceSnapshot(
val remoteShortcutPreferences: RemoteShortcutPreferences,
val liveTvCategoryFilters: List<String>,
val liveTvQuickFilterVisibilityMode: LiveTvQuickFilterVisibilityMode,
+ val hideDecorativeLiveRows: Boolean,
val liveChannelNumberingMode: ChannelNumberingMode,
val liveChannelGroupingMode: LiveChannelGroupingMode,
val groupedChannelLabelMode: GroupedChannelLabelMode,
diff --git a/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsPreferenceSnapshotMapper.kt b/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsPreferenceSnapshotMapper.kt
index 56a3e14a..7a4b7488 100644
--- a/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsPreferenceSnapshotMapper.kt
+++ b/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsPreferenceSnapshotMapper.kt
@@ -61,6 +61,7 @@ internal fun SettingsUiState.applyPreferenceSnapshot(snapshot: SettingsPreferenc
remoteShortcutPreferences = snapshot.remoteShortcutPreferences,
liveTvCategoryFilters = snapshot.liveTvCategoryFilters,
liveTvQuickFilterVisibilityMode = snapshot.liveTvQuickFilterVisibilityMode,
+ hideDecorativeLiveRows = snapshot.hideDecorativeLiveRows,
liveChannelNumberingMode = snapshot.liveChannelNumberingMode,
liveChannelGroupingMode = snapshot.liveChannelGroupingMode,
groupedChannelLabelMode = snapshot.groupedChannelLabelMode,
diff --git a/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsStateBindings.kt b/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsStateBindings.kt
index 16a5dcd6..ba315195 100644
--- a/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsStateBindings.kt
+++ b/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsStateBindings.kt
@@ -93,6 +93,7 @@ internal fun observeSettingsPreferenceSnapshot(
remoteShortcutPreferences = com.streamvault.domain.model.RemoteShortcutPreferences(),
liveTvCategoryFilters = emptyList(),
liveTvQuickFilterVisibilityMode = LiveTvQuickFilterVisibilityMode.ALWAYS_VISIBLE,
+ hideDecorativeLiveRows = true,
liveChannelNumberingMode = ChannelNumberingMode.GROUP,
liveChannelGroupingMode = LiveChannelGroupingMode.RAW_VARIANTS,
groupedChannelLabelMode = GroupedChannelLabelMode.HYBRID,
@@ -218,6 +219,8 @@ internal fun observeSettingsPreferenceSnapshot(
snapshot.copy(
liveTvQuickFilterVisibilityMode = LiveTvQuickFilterVisibilityMode.fromStorage(visibilityMode)
)
+ }.combine(preferencesRepository.hideDecorativeLiveRows) { snapshot, hideDecorativeLiveRows ->
+ snapshot.copy(hideDecorativeLiveRows = hideDecorativeLiveRows)
}.combine(preferencesRepository.liveChannelNumberingMode) { snapshot, liveChannelNumberingMode ->
snapshot.copy(liveChannelNumberingMode = liveChannelNumberingMode)
}.combine(preferencesRepository.liveChannelGroupingMode) { snapshot, liveChannelGroupingMode ->
diff --git a/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsUiStateModel.kt b/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsUiStateModel.kt
index 55cee853..d3cca519 100644
--- a/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsUiStateModel.kt
+++ b/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsUiStateModel.kt
@@ -131,6 +131,7 @@ data class SettingsUiState(
val remoteShortcutPreferences: RemoteShortcutPreferences = RemoteShortcutPreferences(),
val liveTvCategoryFilters: List<String> = emptyList(),
val liveTvQuickFilterVisibilityMode: LiveTvQuickFilterVisibilityMode = LiveTvQuickFilterVisibilityMode.ALWAYS_VISIBLE,
+ val hideDecorativeLiveRows: Boolean = true,
val liveChannelNumberingMode: ChannelNumberingMode = ChannelNumberingMode.GROUP,
val liveChannelGroupingMode: LiveChannelGroupingMode = LiveChannelGroupingMode.RAW_VARIANTS,
val groupedChannelLabelMode: GroupedChannelLabelMode = GroupedChannelLabelMode.HYBRID,
diff --git a/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsViewModel.kt b/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsViewModel.kt
index 8e31d55e..2a096506 100644
--- a/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsViewModel.kt
+++ b/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsViewModel.kt
@@ -565,6 +565,12 @@ class SettingsViewModel @Inject constructor(
}
}
+ fun setHideDecorativeLiveRows(hide: Boolean) {
+ viewModelScope.launch {
+ preferencesRepository.setHideDecorativeLiveRows(hide)
+ }
+ }
+
fun setLiveChannelGroupingMode(mode: LiveChannelGroupingMode) {
viewModelScope.launch {
preferencesRepository.setLiveChannelGroupingMode(mode)
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 62280398..50d6bcb6 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -216,6 +216,8 @@
<string name="settings_live_channel_grouping_grouped_desc">Show one logical live channel with selectable variants.</string>
<string name="settings_live_channel_grouping_raw_variants">Raw Variants</string>
<string name="settings_live_channel_grouping_raw_variants_desc">Show every imported live stream as its own channel entry.</string>
+ <string name="settings_hide_decorative_live_rows">Hide decorative provider rows</string>
+ <string name="settings_hide_decorative_live_rows_subtitle">Hide non-playable section headers such as `#### GENERAL HD/4K ####` from Live TV lists and counts.</string>
<string name="settings_grouped_channel_label_mode">Grouped label style</string>
<string name="settings_grouped_channel_label_mode_subtitle">Control how grouped live channels are named in browse surfaces and overlays.</string>
<string name="settings_grouped_channel_label_canonical">Canonical</string>
diff --git a/data/src/main/java/com/streamvault/data/local/dao/Daos.kt b/data/src/main/java/com/streamvault/data/local/dao/Daos.kt
index 9d60fabc..41485170 100644
--- a/data/src/main/java/com/streamvault/data/local/dao/Daos.kt
+++ b/data/src/main/java/com/streamvault/data/local/dao/Daos.kt
@@ -408,6 +408,9 @@ abstract class ChannelDao {
)
abstract suspend fun getByLogicalGroupId(providerId: Long, logicalGroupId: String): List<ChannelBrowseEntity>
+ @Query("SELECT category_id, COUNT(*) as item_count FROM channels WHERE provider_id = :providerId AND category_id IS NOT NULL GROUP BY category_id")
+ abstract fun getRawCategoryCounts(providerId: Long): Flow<List<CategoryCount>>
+
@Query(
"""
SELECT category_id, COUNT(*) as item_count
@@ -420,6 +423,24 @@ abstract class ChannelDao {
)
abstract fun getCategoryCounts(providerId: Long): Flow<List<CategoryCount>>
+ @Query(
+ """
+ SELECT
+ category_id,
+ COUNT(
+ DISTINCT CASE
+ WHEN logical_group_id IS NOT NULL AND logical_group_id != '' THEN logical_group_id
+ ELSE CAST(id AS TEXT)
+ END
+ ) AS item_count
+ FROM channels
+ WHERE provider_id = :providerId
+ AND category_id IS NOT NULL
+ GROUP BY category_id
+ """
+ )
+ abstract fun getRawGroupedCategoryCounts(providerId: Long): Flow<List<CategoryCount>>
+
@Query(
"""
SELECT
@@ -439,6 +460,9 @@ abstract class ChannelDao {
)
abstract fun getGroupedCategoryCounts(providerId: Long): Flow<List<CategoryCount>>
+ @Query("SELECT COUNT(*) FROM channels WHERE provider_id = :providerId")
+ abstract fun getRawCount(providerId: Long): Flow<Int>
+
@Query(
"""
SELECT COUNT(*)
diff --git a/data/src/main/java/com/streamvault/data/preferences/PreferencesRepository.kt b/data/src/main/java/com/streamvault/data/preferences/PreferencesRepository.kt
index 2163e7f7..3c90b294 100644
--- a/data/src/main/java/com/streamvault/data/preferences/PreferencesRepository.kt
+++ b/data/src/main/java/com/streamvault/data/preferences/PreferencesRepository.kt
@@ -115,6 +115,7 @@ class PreferencesRepository @Inject constructor(
val SHOW_RECENT_CHANNELS_CATEGORY = booleanPreferencesKey("show_recent_channels_category")
val LIVE_TV_CATEGORY_FILTERS = stringPreferencesKey("live_tv_category_filters")
val LIVE_TV_QUICK_FILTER_VISIBILITY = stringPreferencesKey("live_tv_quick_filter_visibility")
+ val HIDE_DECORATIVE_LIVE_ROWS = booleanPreferencesKey("hide_decorative_live_rows")
val LIVE_CHANNEL_NUMBERING_MODE = stringPreferencesKey("live_channel_numbering_mode")
val LIVE_CHANNEL_GROUPING_MODE = stringPreferencesKey("live_channel_grouping_mode")
val GROUPED_CHANNEL_LABEL_MODE = stringPreferencesKey("grouped_channel_label_mode")
@@ -1431,6 +1432,16 @@ class PreferencesRepository @Inject constructor(
return true
}
+ val hideDecorativeLiveRows: Flow<Boolean> = context.dataStore.data.map { preferences ->
+ preferences[PreferencesKeys.HIDE_DECORATIVE_LIVE_ROWS] ?: true
+ }
+
+ suspend fun setHideDecorativeLiveRows(hide: Boolean) {
+ context.dataStore.edit { preferences ->
+ preferences[PreferencesKeys.HIDE_DECORATIVE_LIVE_ROWS] = hide
+ }
+ }
+
val liveChannelNumberingMode: Flow<ChannelNumberingMode> = context.dataStore.data.map { preferences ->
ChannelNumberingMode.fromStorage(preferences[PreferencesKeys.LIVE_CHANNEL_NUMBERING_MODE])
}
diff --git a/data/src/main/java/com/streamvault/data/repository/ChannelRepositoryImpl.kt b/data/src/main/java/com/streamvault/data/repository/ChannelRepositoryImpl.kt
index e350898d..264f98bc 100644
--- a/data/src/main/java/com/streamvault/data/repository/ChannelRepositoryImpl.kt
+++ b/data/src/main/java/com/streamvault/data/repository/ChannelRepositoryImpl.kt
@@ -81,7 +81,13 @@ class ChannelRepositoryImpl @Inject constructor(
observeChannels(channelDao.getByProvider(providerId), providerId)
override fun getChannelCount(providerId: Long): Flow<Int> =
- channelDao.getCount(providerId)
+ preferencesRepository.hideDecorativeLiveRows.flatMapLatest { hideDecorativeRows ->
+ if (hideDecorativeRows) {
+ channelDao.getCount(providerId)
+ } else {
+ channelDao.getRawCount(providerId)
+ }
+ }
override fun getChannelsByCategory(providerId: Long, categoryId: Long): Flow<List<Channel>> =
observeChannels(channelFlow(providerId, categoryId), providerId)
@@ -140,6 +146,7 @@ class ChannelRepositoryImpl @Inject constructor(
val level = preferencesRepository.parentalControlLevel.first()
val unlockedCats = parentalControlManager.unlockedCategoriesForProvider(providerId).first()
val hiddenIds = preferencesRepository.getHiddenChannelIds(providerId).first()
+ val hideDecorativeRows = preferencesRepository.hideDecorativeLiveRows.first()
val entities = if (categoryId == ChannelRepository.ALL_CHANNELS_ID) {
if (withoutErrors) channelDao.getByProviderWithoutErrorsBrowsePageOffset(providerId, limit, offset)
else channelDao.getByProviderBrowsePageOffset(providerId, limit, offset)
@@ -147,7 +154,7 @@ class ChannelRepositoryImpl @Inject constructor(
if (withoutErrors) channelDao.getByCategoryWithoutErrorsBrowsePageOffset(providerId, categoryId, limit, offset)
else channelDao.getByCategoryBrowsePageOffset(providerId, categoryId, limit, offset)
}
- val filtered = applyVisibilityFilter(entities, level, unlockedCats)
+ val filtered = applyVisibilityFilter(entities, level, unlockedCats, hideDecorativeRows)
.filterNot { it.id in hiddenIds }
val presented = buildPresentedChannels(filtered, settings, unlockedCats)
applyNumbering(presented, settings.numberingMode, offset)
@@ -160,14 +167,7 @@ class ChannelRepositoryImpl @Inject constructor(
override fun getCategories(providerId: Long): Flow<List<Category>> =
combine(
categoryDao.getByProviderAndType(providerId, ContentType.LIVE.name),
- preferencesRepository.liveChannelGroupingMode.flatMapLatest { groupingMode ->
- val countFlow: Flow<List<CategoryCount>> = if (groupingMode == LiveChannelGroupingMode.GROUPED) {
- channelDao.getGroupedCategoryCounts(providerId)
- } else {
- channelDao.getCategoryCounts(providerId)
- }
- countFlow
- },
+ decorativeAwareCategoryCountFlow(providerId),
preferencesRepository.parentalControlLevel,
parentalControlManager.unlockedCategoriesForProvider(providerId)
) { categories: List<CategoryEntity>, categoryCounts: List<CategoryCount>, level: Int, unlockedCats: Set<Long> ->
@@ -293,10 +293,11 @@ class ChannelRepositoryImpl @Inject constructor(
flowOf(requestedEntities),
entityPoolFlow,
preferencesRepository.parentalControlLevel,
- currentPresentationSettingsFlow()
- ) { requested, entityPool, level, settings ->
- val filteredRequested = applyVisibilityFilter(requested, level, emptySet())
- val filteredPool = applyVisibilityFilter(entityPool, level, emptySet())
+ currentPresentationSettingsFlow(),
+ preferencesRepository.hideDecorativeLiveRows
+ ) { requested, entityPool, level, settings, hideDecorativeRows ->
+ val filteredRequested = applyVisibilityFilter(requested, level, emptySet(), hideDecorativeRows)
+ val filteredPool = applyVisibilityFilter(entityPool, level, emptySet(), hideDecorativeRows)
buildChannelsForRequestedIds(
requestedIds = ids,
requestedEntities = filteredRequested,
@@ -325,17 +326,47 @@ class ChannelRepositoryImpl @Inject constructor(
source: Flow<List<ChannelBrowseEntity>>,
providerId: Long
): Flow<List<Channel>> = combine(
- source,
- preferencesRepository.parentalControlLevel,
- parentalControlManager.unlockedCategoriesForProvider(providerId),
- currentPresentationSettingsFlow(),
- preferencesRepository.getHiddenChannelIds(providerId)
- ) { entities, level, unlockedCats, settings, hiddenIds ->
- val filtered = applyVisibilityFilter(entities, level, unlockedCats)
+ combine(
+ source,
+ preferencesRepository.parentalControlLevel,
+ parentalControlManager.unlockedCategoriesForProvider(providerId),
+ currentPresentationSettingsFlow(),
+ preferencesRepository.getHiddenChannelIds(providerId)
+ ) { entities, level, unlockedCats, settings, hiddenIds ->
+ arrayOf(entities, level, unlockedCats, settings, hiddenIds)
+ },
+ preferencesRepository.hideDecorativeLiveRows
+ ) { values, hideDecorativeRows ->
+ @Suppress("UNCHECKED_CAST")
+ val entities = values[0] as List<ChannelBrowseEntity>
+ val level = values[1] as Int
+ val unlockedCats = values[2] as Set<Long>
+ val settings = values[3] as ChannelPresentationSettings
+ val hiddenIds = values[4] as Set<Long>
+ val filtered = applyVisibilityFilter(entities, level, unlockedCats, hideDecorativeRows)
.filterNot { it.id in hiddenIds }
applyNumbering(buildPresentedChannels(filtered, settings, unlockedCats), settings.numberingMode)
}.flowOn(Dispatchers.Default)
+ private fun decorativeAwareCategoryCountFlow(providerId: Long): Flow<List<CategoryCount>> =
+ combine(
+ preferencesRepository.liveChannelGroupingMode,
+ preferencesRepository.hideDecorativeLiveRows
+ ) { groupingMode, hideDecorativeRows ->
+ groupingMode to hideDecorativeRows
+ }.flatMapLatest { (groupingMode, hideDecorativeRows) ->
+ when {
+ groupingMode == LiveChannelGroupingMode.GROUPED && hideDecorativeRows ->
+ channelDao.getGroupedCategoryCounts(providerId)
+ groupingMode == LiveChannelGroupingMode.GROUPED ->
+ channelDao.getRawGroupedCategoryCounts(providerId)
+ hideDecorativeRows ->
+ channelDao.getCategoryCounts(providerId)
+ else ->
+ channelDao.getRawCategoryCounts(providerId)
+ }
+ }
+
private fun currentPresentationSettingsFlow(): Flow<ChannelPresentationSettings> =
combine(
combine(
@@ -642,10 +673,15 @@ class ChannelRepositoryImpl @Inject constructor(
private fun applyVisibilityFilter(
entities: List<ChannelBrowseEntity>,
level: Int,
- unlockedCats: Set<Long>
+ unlockedCats: Set<Long>,
+ hideDecorativeRows: Boolean
): List<ChannelBrowseEntity> {
- val usable = entities.filterNot { entity ->
- ChannelNormalizer.isHashWrappedHeader(entity.name)
+ val usable = if (hideDecorativeRows) {
+ entities.filterNot { entity ->
+ ChannelNormalizer.isHashWrappedHeader(entity.name)
+ }
+ } else {
+ entities
}
return if (level >= 3) {
usable.filter { entity ->
diff --git a/data/src/test/java/com/streamvault/data/repository/ChannelRepositoryImplTest.kt b/data/src/test/java/com/streamvault/data/repository/ChannelRepositoryImplTest.kt
index 5a6cbeb3..8f820342 100644
--- a/data/src/test/java/com/streamvault/data/repository/ChannelRepositoryImplTest.kt
+++ b/data/src/test/java/com/streamvault/data/repository/ChannelRepositoryImplTest.kt
@@ -47,6 +47,7 @@ class ChannelRepositoryImplTest {
whenever(preferencesRepository.liveVariantPreferenceMode).thenReturn(flowOf(LiveVariantPreferenceMode.BALANCED))
whenever(preferencesRepository.liveVariantSelections).thenReturn(flowOf(emptyMap()))
whenever(preferencesRepository.liveVariantObservations).thenReturn(flowOf(emptyMap()))
+ whenever(preferencesRepository.hideDecorativeLiveRows).thenReturn(flowOf(true))
whenever(preferencesRepository.getHiddenChannelIds(any())).thenReturn(flowOf(emptySet()))
}
@@ -83,6 +84,29 @@ class ChannelRepositoryImplTest {
verify(channelDao, never()).getByProvider(any())
}
+ @Test
+ fun `getCategories uses raw grouped counts when decorative rows are visible`() = runTest {
+ whenever(categoryDao.getByProviderAndType(7L, ContentType.LIVE.name)).thenReturn(
+ flowOf(listOf(categoryEntity(id = 10L, name = "News")))
+ )
+ whenever(preferencesRepository.hideDecorativeLiveRows).thenReturn(flowOf(false))
+ whenever(channelDao.getRawGroupedCategoryCounts(7L)).thenReturn(
+ flowOf(listOf(CategoryCount(categoryId = 10L, item_count = 5)))
+ )
+ whenever(parentalControlManager.unlockedCategoriesForProvider(7L)).thenReturn(flowOf(emptySet()))
+
+ val repository = createRepository()
+
+ val result = repository.getCategories(7L).first()
+
+ assertThat(result.map { it.name to it.count }).containsExactly(
+ "All Channels" to 5,
+ "News" to 5
+ ).inOrder()
+ verify(channelDao).getRawGroupedCategoryCounts(7L)
+ verify(channelDao, never()).getGroupedCategoryCounts(7L)
+ }
+
@Test
fun `getCategories keeps unlocked protected category visible at private level`() = runTest {
whenever(categoryDao.getByProviderAndType(7L, ContentType.LIVE.name)).thenReturn(
@@ -213,6 +237,58 @@ class ChannelRepositoryImplTest {
assertThat(result.map { it.name }).containsExactly("News One")
}
+ @Test
+ fun `getChannelsByCategory keeps hash wrapped provider headers when setting disabled`() = runTest {
+ whenever(preferencesRepository.hideDecorativeLiveRows).thenReturn(flowOf(false))
+ whenever(channelDao.getByCategory(7L, 10L)).thenReturn(
+ flowOf(
+ listOf(
+ ChannelBrowseEntity(
+ id = 1L,
+ streamId = 101L,
+ name = "#### GENERAL HD/4K ####",
+ categoryId = 10L,
+ categoryName = "News",
+ streamUrl = "https://stream/header",
+ number = 1,
+ providerId = 7L
+ ),
+ ChannelBrowseEntity(
+ id = 2L,
+ streamId = 102L,
+ name = "News One HD",
+ categoryId = 10L,
+ categoryName = "News",
+ streamUrl = "https://stream/news-one",
+ number = 2,
+ providerId = 7L
+ )
+ )
+ )
+ )
+ whenever(parentalControlManager.unlockedCategoriesForProvider(7L)).thenReturn(flowOf(emptySet()))
+
+ val repository = createRepository()
+
+ val result = repository.getChannelsByCategory(7L, 10L).first()
+
+ assertThat(result.map { it.name }).containsExactly("#### GENERAL ####", "News One")
+ }
+
+ @Test
+ fun `getChannelCount uses raw count when decorative rows are visible`() = runTest {
+ whenever(preferencesRepository.hideDecorativeLiveRows).thenReturn(flowOf(false))
+ whenever(channelDao.getRawCount(7L)).thenReturn(flowOf(12))
+
+ val repository = createRepository()
+
+ val result = repository.getChannelCount(7L).first()
+
+ assertThat(result).isEqualTo(12)
+ verify(channelDao).getRawCount(7L)
+ verify(channelDao, never()).getCount(7L)
+ }
+
@Test
fun `offset pages keep group numbering relative to full list`() = runTest {
whenever(channelDao.getByProviderWithoutErrorsBrowsePageOffset(7L, 60, 60)).thenReturn(