Replacement of tv-foudation from the dependencies of the TV app

Jetcaster/gradle/libs.versions.toml

@@ -23,7 +23,6 @@ androidx-test = "1.6.1"
 androidx-test-espresso = "3.6.1"
 androidx-test-ext-junit = "1.2.1"
 androidx-test-ext-truth = "1.5.0"
-androidx-tv-foundation = "1.0.0-alpha11"
 androidx-tv-material = "1.0.0"
 androidx-wear-compose = "1.3.1"
 androidx-window = "1.3.0"
@@ -122,7 +121,6 @@ androidx-test-ext-truth = { module = "androidx.test.ext:truth", version.ref = "a
 androidx-test-rules = { module = "androidx.test:rules", version.ref = "androidx-test" }
 androidx-test-runner = "androidx.test:runner:1.6.2"
 androidx-test-uiautomator = { module = "androidx.test.uiautomator:uiautomator", version.ref = "androix-test-uiautomator" }
-androidx-tv-foundation = { module = "androidx.tv:tv-foundation", version.ref = "androidx-tv-foundation" }
 androidx-tv-material = { module = "androidx.tv:tv-material", version.ref = "androidx-tv-material" }
 androidx-wear-compose-foundation = { module = "androidx.wear.compose:compose-foundation", version.ref = "androidx-wear-compose" }
 androidx-wear-compose-material = { module = "androidx.wear.compose:compose-material", version.ref = "androidx-wear-compose" }

Jetcaster/tv/build.gradle.kts

@@ -91,7 +91,6 @@ dependencies {
     implementation(platform(libs.androidx.compose.bom))
     implementation(libs.androidx.compose.material.iconsExtended)
     implementation(libs.androidx.compose.ui.tooling.preview)
-    implementation(libs.androidx.tv.foundation)
     implementation(libs.androidx.tv.material)
     implementation(libs.androidx.lifecycle.runtime)
     implementation(libs.androidx.lifecycle.runtime.compose)

Jetcaster/tv/src/main/java/com/example/jetcaster/tv/MainActivity.kt

@@ -20,20 +20,15 @@ import android.os.Bundle
 import androidx.activity.ComponentActivity
 import androidx.activity.compose.setContent
 import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.RectangleShape
-import androidx.compose.ui.tooling.preview.Preview
-import androidx.tv.material3.ExperimentalTvMaterial3Api
 import androidx.tv.material3.Surface
-import androidx.tv.material3.Text
 import com.example.jetcaster.tv.ui.JetcasterApp
 import com.example.jetcaster.tv.ui.theme.JetcasterTheme
 import dagger.hilt.android.AndroidEntryPoint
 
 @AndroidEntryPoint
 class MainActivity : ComponentActivity() {
-    @OptIn(ExperimentalTvMaterial3Api::class)
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContent {
@@ -49,20 +44,3 @@ class MainActivity : ComponentActivity() {
         }
     }
 }
-
-@OptIn(ExperimentalTvMaterial3Api::class)
-@Composable
-fun Greeting(name: String, modifier: Modifier = Modifier) {
-    Text(
-        text = "Hello $name!",
-        modifier = modifier
-    )
-}
-
-@Preview(showBackground = true)
-@Composable
-fun GreetingPreview() {
-    JetcasterTheme {
-        Greeting("Android")
-    }
-}

Jetcaster/tv/src/main/java/com/example/jetcaster/tv/model/PodcastList.kt

@@ -16,10 +16,6 @@
 
 package com.example.jetcaster.tv.model
 
-import androidx.compose.runtime.Immutable
 import com.example.jetcaster.core.model.PodcastInfo
 
-@Immutable
-data class PodcastList(
-    val member: List<PodcastInfo>
-) : List<PodcastInfo> by member
+typealias PodcastList = List<PodcastInfo>

Jetcaster/tv/src/main/java/com/example/jetcaster/tv/ui/JetcasterApp.kt

@@ -16,7 +16,7 @@
 
 package com.example.jetcaster.tv.ui
 
-import androidx.compose.foundation.focusable
+import androidx.compose.foundation.focusGroup
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxSize
@@ -33,8 +33,8 @@ import androidx.compose.runtime.remember
 import androidx.compose.ui.ExperimentalComposeUiApi
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.focus.FocusRequester
+import androidx.compose.ui.focus.focusProperties
 import androidx.compose.ui.focus.focusRequester
-import androidx.compose.ui.focus.onFocusChanged
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import androidx.navigation.compose.NavHost
 import androidx.navigation.compose.composable
@@ -76,16 +76,16 @@ private fun GlobalNavigationContainer(
             Column(
                 modifier = Modifier
                     .padding(JetcasterAppDefaults.overScanMargin.drawer.intoPaddingValues())
-                    .onFocusChanged { focusState ->
-                        if (focusState.isFocused) {
+                    .focusProperties {
+                        enter = {
                             when (currentRoute) {
                                 Screen.Discover.route -> discover
                                 Screen.Library.route -> library
                                 else -> FocusRequester.Default
-                            }.requestFocus()
+                            }
                         }
                     }
-                    .focusable()
+                    .focusGroup()
             ) {
                 NavigationDrawerItem(
                     selected = isClosed && currentRoute == Screen.Profile.route,
@@ -94,21 +94,34 @@ private fun GlobalNavigationContainer(
                 ) {
                     Column {
                         Text(text = "Name")
-                        Text(text = "Switch Account", style = MaterialTheme.typography.labelSmall)
+                        Text(
+                            text = "Switch Account",
+                            style = MaterialTheme.typography.labelSmall
+                        )
                     }
                 }
                 Spacer(modifier = Modifier.weight(1f))
                 NavigationDrawerItem(
                     selected = isClosed && currentRoute == Screen.Search.route,
                     onClick = jetcasterAppState::navigateToSearch,
-                    leadingContent = { Icon(Icons.Default.Search, contentDescription = null) }
+                    leadingContent = {
+                        Icon(
+                            Icons.Default.Search,
+                            contentDescription = null
+                        )
+                    }
                 ) {
                     Text(text = "Search")
                 }
                 NavigationDrawerItem(
                     selected = isClosed && currentRoute == Screen.Discover.route,
                     onClick = jetcasterAppState::navigateToDiscover,
-                    leadingContent = { Icon(Icons.Default.Home, contentDescription = null) },
+                    leadingContent = {
+                        Icon(
+                            Icons.Default.Home,
+                            contentDescription = null
+                        )
+                    },
                     modifier = Modifier.focusRequester(discover)
                 ) {
                     Text(text = "Discover")
@@ -137,7 +150,7 @@ private fun GlobalNavigationContainer(
             }
         },
         content = content,
-        modifier = modifier,
+        modifier = modifier
     )
 }
 

Jetcaster/tv/src/main/java/com/example/jetcaster/tv/ui/component/Button.kt

@@ -33,12 +33,10 @@ import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
 import androidx.tv.material3.ButtonDefaults
 import androidx.tv.material3.ButtonScale
-import androidx.tv.material3.ExperimentalTvMaterial3Api
 import androidx.tv.material3.Icon
 import androidx.tv.material3.IconButton
 import com.example.jetcaster.tv.R
 
-@OptIn(ExperimentalTvMaterial3Api::class)
 @Composable
 internal fun PlayButton(
     onClick: () -> Unit,
@@ -53,7 +51,6 @@ internal fun PlayButton(
         scale = scale
     )
 
-@OptIn(ExperimentalTvMaterial3Api::class)
 @Composable
 internal fun EnqueueButton(
     onClick: () -> Unit,
@@ -67,7 +64,6 @@ internal fun EnqueueButton(
     }
 }
 
-@OptIn(ExperimentalTvMaterial3Api::class)
 @Composable
 internal fun InfoButton(
     onClick: () -> Unit,
@@ -81,7 +77,6 @@ internal fun InfoButton(
     }
 }
 
-@OptIn(ExperimentalTvMaterial3Api::class)
 @Composable
 internal fun PreviousButton(
     onClick: () -> Unit,
@@ -95,7 +90,6 @@ internal fun PreviousButton(
     }
 }
 
-@OptIn(ExperimentalTvMaterial3Api::class)
 @Composable
 internal fun NextButton(
     onClick: () -> Unit,
@@ -109,7 +103,6 @@ internal fun NextButton(
     }
 }
 
-@OptIn(ExperimentalTvMaterial3Api::class)
 @Composable
 internal fun PlayPauseButton(
     isPlaying: Boolean,
@@ -126,7 +119,6 @@ internal fun PlayPauseButton(
     }
 }
 
-@OptIn(ExperimentalTvMaterial3Api::class)
 @Composable
 internal fun RewindButton(
     onClick: () -> Unit,
@@ -140,7 +132,6 @@ internal fun RewindButton(
     }
 }
 
-@OptIn(ExperimentalTvMaterial3Api::class)
 @Composable
 internal fun SkipButton(
     onClick: () -> Unit,

Jetcaster/tv/src/main/java/com/example/jetcaster/tv/ui/component/Catalog.kt

@@ -21,24 +21,20 @@ import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.width
+import androidx.compose.foundation.lazy.LazyColumn
+import androidx.compose.foundation.lazy.LazyListState
+import androidx.compose.foundation.lazy.LazyRow
+import androidx.compose.foundation.lazy.itemsIndexed
+import androidx.compose.foundation.lazy.rememberLazyListState
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.mutableIntStateOf
 import androidx.compose.runtime.remember
-import androidx.compose.runtime.setValue
 import androidx.compose.ui.ExperimentalComposeUiApi
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.focus.FocusRequester
 import androidx.compose.ui.focus.focusProperties
 import androidx.compose.ui.focus.focusRequester
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.TextStyle
-import androidx.tv.foundation.lazy.list.TvLazyColumn
-import androidx.tv.foundation.lazy.list.TvLazyListState
-import androidx.tv.foundation.lazy.list.TvLazyRow
-import androidx.tv.foundation.lazy.list.itemsIndexed
-import androidx.tv.foundation.lazy.list.rememberTvLazyListState
-import androidx.tv.material3.ExperimentalTvMaterial3Api
 import androidx.tv.material3.MaterialTheme
 import androidx.tv.material3.Text
 import com.example.jetcaster.core.model.PodcastInfo
@@ -55,10 +51,10 @@ internal fun Catalog(
     onPodcastSelected: (PodcastInfo) -> Unit,
     onEpisodeSelected: (PlayerEpisode) -> Unit,
     modifier: Modifier = Modifier,
-    state: TvLazyListState = rememberTvLazyListState(),
+    state: LazyListState = rememberLazyListState(),
     header: (@Composable () -> Unit)? = null,
 ) {
-    TvLazyColumn(
+    LazyColumn(
         modifier = modifier,
         contentPadding = JetcasterAppDefaults.overScanMargin.catalog.intoPaddingValues(),
         verticalArrangement =
@@ -121,7 +117,6 @@ private fun LatestEpisodeSection(
     }
 }
 
-@OptIn(ExperimentalTvMaterial3Api::class)
 @Composable
 private fun Section(
     modifier: Modifier = Modifier,
@@ -151,23 +146,20 @@ private fun PodcastRow(
     horizontalArrangement: Arrangement.Horizontal =
         Arrangement.spacedBy(JetcasterAppDefaults.gap.podcastRow),
 ) {
-    val (focusRequester, firstItem) = remember { FocusRequester.createRefs() }
-    var previousPodcastListHash by remember { mutableIntStateOf(podcastList.hashCode()) }
-    val isSamePodcastList = previousPodcastListHash == podcastList.hashCode()
+    val (focusRequester, firstItem) = remember(podcastList) { FocusRequester.createRefs() }
 
-    TvLazyRow(
+    LazyRow(
         contentPadding = contentPadding,
         horizontalArrangement = horizontalArrangement,
         modifier = modifier
             .focusRequester(focusRequester)
             .focusProperties {
                 exit = {
-                    previousPodcastListHash = podcastList.hashCode()
                     focusRequester.saveFocusedChild()
                     FocusRequester.Default
                 }
                 enter = {
-                    if (isSamePodcastList && focusRequester.restoreFocusedChild()) {
+                    if (focusRequester.restoreFocusedChild()) {
                         FocusRequester.Cancel
                     } else {
                         firstItem

Jetcaster/tv/src/main/java/com/example/jetcaster/tv/ui/component/EpisodeCard.kt

@@ -33,7 +33,6 @@ import androidx.compose.ui.unit.dp
 import androidx.tv.material3.Card
 import androidx.tv.material3.CardDefaults
 import androidx.tv.material3.CardScale
-import androidx.tv.material3.ExperimentalTvMaterial3Api
 import androidx.tv.material3.MaterialTheme
 import androidx.tv.material3.Text
 import androidx.tv.material3.WideCardContainer
@@ -63,7 +62,6 @@ internal fun EpisodeCard(
     )
 }
 
-@OptIn(ExperimentalTvMaterial3Api::class)
 @Composable
 private fun EpisodeThumbnail(
     playerEpisode: PlayerEpisode,
@@ -82,7 +80,6 @@ private fun EpisodeThumbnail(
     }
 }
 
-@OptIn(ExperimentalTvMaterial3Api::class)
 @Composable
 private fun EpisodeMetaData(
     playerEpisode: PlayerEpisode,

Jetcaster/tv/src/main/java/com/example/jetcaster/tv/ui/component/EpisodeRow.kt

@@ -18,6 +18,9 @@ package com.example.jetcaster.tv.ui.component
 
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.PaddingValues
+import androidx.compose.foundation.lazy.LazyListState
+import androidx.compose.foundation.lazy.LazyRow
+import androidx.compose.foundation.lazy.itemsIndexed
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableIntStateOf
@@ -28,9 +31,6 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.focus.FocusRequester
 import androidx.compose.ui.focus.focusProperties
 import androidx.compose.ui.focus.focusRequester
-import androidx.tv.foundation.lazy.list.TvLazyListState
-import androidx.tv.foundation.lazy.list.TvLazyRow
-import androidx.tv.foundation.lazy.list.itemsIndexed
 import com.example.jetcaster.core.player.model.PlayerEpisode
 import com.example.jetcaster.tv.model.EpisodeList
 import com.example.jetcaster.tv.ui.theme.JetcasterAppDefaults
@@ -45,13 +45,13 @@ internal fun EpisodeRow(
         Arrangement.spacedBy(JetcasterAppDefaults.gap.item),
     contentPadding: PaddingValues = JetcasterAppDefaults.padding.episodeRowContentPadding,
     focusRequester: FocusRequester = remember { FocusRequester() },
-    lazyListState: TvLazyListState = remember(playerEpisodeList) { TvLazyListState() }
+    lazyListState: LazyListState = remember(playerEpisodeList) { LazyListState() }
 ) {
     val firstItem = remember { FocusRequester() }
     var previousEpisodeListHash by remember { mutableIntStateOf(playerEpisodeList.hashCode()) }
     val isSameList = previousEpisodeListHash == playerEpisodeList.hashCode()
 
-    TvLazyRow(
+    LazyRow(
         state = lazyListState,
         modifier = Modifier
             .focusRequester(focusRequester)

Jetcaster/tv/src/main/java/com/example/jetcaster/tv/ui/discover/DiscoverScreen.kt

@@ -18,6 +18,8 @@ package com.example.jetcaster.tv.ui.discover
 
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.lazy.LazyListState
+import androidx.compose.foundation.lazy.rememberLazyListState
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.collectAsState
@@ -29,8 +31,6 @@ import androidx.compose.ui.focus.FocusRequester
 import androidx.compose.ui.focus.focusProperties
 import androidx.compose.ui.focus.focusRequester
 import androidx.hilt.navigation.compose.hiltViewModel
-import androidx.tv.foundation.lazy.list.TvLazyListState
-import androidx.tv.foundation.lazy.list.rememberTvLazyListState
 import androidx.tv.material3.Tab
 import androidx.tv.material3.TabRow
 import androidx.tv.material3.Text
@@ -94,7 +94,7 @@ private fun CatalogWithCategorySelection(
     onEpisodeSelected: (PlayerEpisode) -> Unit,
     onCategorySelected: (CategoryInfo) -> Unit,
     modifier: Modifier = Modifier,
-    state: TvLazyListState = rememberTvLazyListState(),
+    state: LazyListState = rememberLazyListState(),
 ) {
     val (focusRequester, selectedTab) = remember {
         FocusRequester.createRefs()