Fix: a build error happening on TV app module (#1307)

This PR fixes a build issue happening on tv-app module. The issue was
cased by the resolution failure of BasicTextField2.

More specifically the following change happen by this PR:

- Switching from BasicTextFiled2 to BasicTextField
- Modification on DiscoverScreenViewModel to remove line breaks causing
a layout glitch
- Passing supportingContent parameter to ListItem instead of putting
everything in the content parameter

Author: arriolac

Jetcaster/tv-app/src/main/java/com/example/jetcaster/tv/ui/discover/DiscoverScreenViewModel.kt

@@ -16,14 +16,11 @@
 
 package com.example.jetcaster.tv.ui.discover
 
-import android.util.Log
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import com.example.jetcaster.core.data.database.model.Category
-import com.example.jetcaster.core.data.database.model.PodcastWithExtraInfo
 import com.example.jetcaster.core.data.di.Graph
 import com.example.jetcaster.core.data.repository.CategoryStore
-import com.example.jetcaster.core.data.repository.PodcastStore
 import com.example.jetcaster.core.data.repository.PodcastsRepository
 import com.example.jetcaster.tv.model.CategoryList
 import com.example.jetcaster.tv.model.EpisodeList
@@ -41,15 +38,25 @@ import kotlinx.coroutines.launch
 class DiscoverScreenViewModel(
     private val podcastsRepository: PodcastsRepository = Graph.podcastRepository,
     private val categoryStore: CategoryStore = Graph.categoryStore,
-    private val podcastStore: PodcastStore = Graph.podcastStore,
 ) : ViewModel() {
 
     private val _selectedCategory = MutableStateFlow<Category?>(null)
+
+    private val categoryListFlow = categoryStore
+        .categoriesSortedByPodcastCount()
+        .map { categoryList ->
+            categoryList.map { category ->
+                Category(
+                    id = category.id,
+                    name = category.name.filter { !it.isWhitespace() }
+                )
+            }
+        }
+
     private val selectedCategoryFlow = combine(
-        categoryStore.categoriesSortedByPodcastCount(),
+        categoryListFlow,
         _selectedCategory
     ) { categoryList, category ->
-        Log.d("category list", "$categoryList")
         category ?: categoryList.firstOrNull()
     }
 
@@ -76,7 +83,7 @@ class DiscoverScreenViewModel(
     }
 
     val uiState = combine(
-        categoryStore.categoriesSortedByPodcastCount(),
+        categoryListFlow,
         selectedCategoryFlow,
         podcastInSelectedCategory,
         latestEpisodeFlow,
@@ -105,14 +112,6 @@ class DiscoverScreenViewModel(
         _selectedCategory.value = category
     }
 
-    fun subscribe(podcastWithExtraInfo: PodcastWithExtraInfo) {
-        if (!podcastWithExtraInfo.isFollowed) {
-            viewModelScope.launch {
-                podcastStore.togglePodcastFollowed(podcastWithExtraInfo.podcast.uri)
-            }
-        }
-    }
-
     private fun refresh() {
         viewModelScope.launch {
             podcastsRepository.updatePodcasts(false)

Jetcaster/tv-app/src/main/java/com/example/jetcaster/tv/ui/podcast/PodcastScreen.kt

@@ -32,7 +32,6 @@ import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.remember
-import androidx.compose.ui.Alignment
 import androidx.compose.ui.ExperimentalComposeUiApi
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.focus.FocusRequester
@@ -263,33 +262,29 @@ private fun EpisodeListItem(
     modifier: Modifier = Modifier,
     selected: Boolean = false
 ) {
+    val duration = episodeToPodcast.episode.duration
+
     ListItem(
         selected = selected,
         onClick = { onInfoClicked(episodeToPodcast) },
         onLongClick = { onEpisodeSelected(episodeToPodcast) },
+        supportingContent = {
+            if (duration != null) {
+                EpisodeDataAndDuration(episodeToPodcast.episode.published, duration)
+            }
+        },
         modifier = modifier
     ) {
-        Row(
-            modifier = Modifier.padding(top = 12.dp, bottom = 12.dp, start = 12.dp, end = 16.dp),
-            verticalAlignment = Alignment.CenterVertically
-        ) {
-            EpisodeMetaData(episode = episodeToPodcast.episode)
-        }
+        EpisodeTitle(episode = episodeToPodcast.episode)
     }
 }
 
 @OptIn(ExperimentalTvMaterial3Api::class)
 @Composable
-private fun EpisodeMetaData(episode: Episode, modifier: Modifier = Modifier) {
-    val published = episode.published
-    val duration = episode.duration
-    Column(modifier = modifier) {
-        Text(
-            text = episode.title,
-            style = MaterialTheme.typography.bodyMedium
-        )
-        if (duration != null) {
-            EpisodeDataAndDuration(published, duration)
-        }
-    }
+private fun EpisodeTitle(episode: Episode, modifier: Modifier = Modifier) {
+    Text(
+        text = episode.title,
+        style = MaterialTheme.typography.bodyMedium,
+        modifier = modifier
+    )
 }

Jetcaster/tv-app/src/main/java/com/example/jetcaster/tv/ui/search/SearchScreen.kt

@@ -27,8 +27,8 @@ import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.foundation.text.BasicTextField
 import androidx.compose.foundation.text.KeyboardOptions
-import androidx.compose.foundation.text2.BasicTextField2
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.Search
 import androidx.compose.runtime.Composable
@@ -191,14 +191,14 @@ private fun KeywordInput(
         color = MaterialTheme.colorScheme.onSurfaceVariant
     )
     val cursorBrush = SolidColor(MaterialTheme.colorScheme.onSurfaceVariant)
-    BasicTextField2(
+    BasicTextField(
         value = keyword,
         onValueChange = onKeywordInput,
         textStyle = textStyle,
         cursorBrush = cursorBrush,
         modifier = modifier,
         keyboardOptions = KeyboardOptions.Default.copy(imeAction = ImeAction.Next),
-        decorator = { innerTextField ->
+        decorationBox = { innerTextField ->
             Box(
                 modifier = Modifier
                     .fillMaxWidth()