adds watch next channel to top of home tab

Author: Morten Friesgaard

app/src/main/kotlin/nl/ndat/tvlauncher/data/repository/ChannelRepository.kt

@@ -123,4 +123,5 @@ class ChannelRepository(
 	fun getChannels() = database.channels.getAll().executeAsListFlow()
 	fun getFavoriteAppChannels() = database.channels.getFavoriteAppChannels(::Channel).executeAsListFlow()
 	fun getProgramsByChannel(channel: Channel) = database.channelPrograms.getByChannel(channel.id).executeAsListFlow()
+	fun getWatchNextPrograms() = database.channels.getById(ChannelResolver.CHANNEL_ID_WATCH_NEXT).executeAsListFlow()
 }

app/src/main/kotlin/nl/ndat/tvlauncher/ui/tab/home/HomeTab.kt

@@ -9,7 +9,9 @@ import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.remember
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
+import nl.ndat.tvlauncher.R
 import nl.ndat.tvlauncher.ui.tab.home.row.AppCardRow
 import nl.ndat.tvlauncher.ui.tab.home.row.ChannelProgramCardRow
 import org.koin.androidx.compose.koinViewModel
@@ -21,6 +23,7 @@ fun HomeTab(
 	val viewModel = koinViewModel<HomeTabViewModel>()
 	val apps by viewModel.apps.collectAsState()
 	val channels by viewModel.channels.collectAsState()
+	val watchNext by viewModel.watchNext.collectAsState()
 
 	LazyColumn(
 		verticalArrangement = Arrangement.spacedBy(8.dp),
@@ -33,6 +36,18 @@ fun HomeTab(
 			)
 		}
 
+		items(
+			items = watchNext,
+			key = { channel -> channel.id }
+		) { channel ->
+			val programs by viewModel.channelPrograms(channel).collectAsState(initial = emptyList())
+
+			ChannelProgramCardRow(
+				title = stringResource(R.string.channel_watch_next),
+				programs = programs,
+			)
+		}
+
 		items(
 			items = channels,
 			key = { channel -> channel.id }
@@ -43,9 +58,10 @@ fun HomeTab(
 			val programs by viewModel.channelPrograms(channel).collectAsState(initial = emptyList())
 
 			if (app != null) {
+				val title = stringResource(R.string.channel_preview, app.displayName, channel.displayName)
+
 				ChannelProgramCardRow(
-					channel = channel,
-					app = app,
+					title = title,
 					programs = programs,
 				)
 			}

app/src/main/kotlin/nl/ndat/tvlauncher/ui/tab/home/HomeTabViewModel.kt

@@ -20,6 +20,9 @@ class HomeTabViewModel(
 	val channels = channelRepository.getFavoriteAppChannels()
 		.stateIn(viewModelScope, SharingStarted.Eagerly, emptyList())
 
+	val watchNext = channelRepository.getWatchNextPrograms()
+		.stateIn(viewModelScope, SharingStarted.Eagerly, emptyList())
+
 	fun channelPrograms(channel: Channel) = channelRepository.getProgramsByChannel(channel)
 
 	fun favoriteApp(app: App, favorite: Boolean) = viewModelScope.launch {

app/src/main/kotlin/nl/ndat/tvlauncher/ui/tab/home/row/ChannelProgramCardRow.kt

@@ -15,34 +15,19 @@ import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.focus.focusRequester
 import androidx.compose.ui.focus.onFocusChanged
-import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
 import androidx.tv.material3.MaterialTheme
 import androidx.tv.material3.Text
-import nl.ndat.tvlauncher.R
-import nl.ndat.tvlauncher.data.model.ChannelType
-import nl.ndat.tvlauncher.data.sqldelight.App
-import nl.ndat.tvlauncher.data.sqldelight.Channel
 import nl.ndat.tvlauncher.data.sqldelight.ChannelProgram
 import nl.ndat.tvlauncher.ui.component.card.ChannelProgramCard
 import nl.ndat.tvlauncher.util.modifier.ifElse
 
 @Composable
 fun ChannelProgramCardRow(
 	modifier: Modifier = Modifier,
-	channel: Channel,
-	app: App,
+	title: String,
 	programs: List<ChannelProgram>,
 ) {
-	val title = when (channel.type) {
-		ChannelType.WATCH_NEXT -> stringResource(R.string.channel_watch_next)
-		ChannelType.PREVIEW -> stringResource(
-			R.string.channel_preview,
-			app.displayName,
-			channel.displayName
-		)
-	}
-
 	var focusedProgram by remember { mutableStateOf<ChannelProgram?>(null) }
 
 	if (programs.isNotEmpty()) {