migrated to tv-material beta01

android · May 8, 2024 · 34dd960 · 34dd960
1 parent 3650f67
commit 34dd960
Show file tree

Hide file tree

Showing 22 changed files with 46 additions and 89 deletions.
diff --git a/TvMaterialCatalog/app/src/main/java/com/google/tv/material/catalog/App.kt b/TvMaterialCatalog/app/src/main/java/com/google/tv/material/catalog/App.kt
@@ -12,14 +12,12 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.RectangleShape
 import androidx.compose.ui.graphics.toArgb
 import androidx.compose.ui.unit.LayoutDirection
-import androidx.tv.material3.ExperimentalTvMaterial3Api
 import androidx.tv.material3.MaterialTheme
 import androidx.tv.material3.Surface
 import com.google.tv.material.catalog.colorutils.Scheme.Companion.dark
 import com.google.tv.material.catalog.colorutils.Scheme.Companion.light
 import com.google.tv.material.catalog.colorutils.toColorScheme
 
-@OptIn(ExperimentalTvMaterial3Api::class)
 @Composable
 fun App() {
     var themeMode by remember { mutableStateOf(Mode.Dark) }

diff --git a/TvMaterialCatalog/app/src/main/java/com/google/tv/material/catalog/AppBar.kt b/TvMaterialCatalog/app/src/main/java/com/google/tv/material/catalog/AppBar.kt
@@ -6,11 +6,9 @@ import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
-import androidx.compose.foundation.layout.WindowInsets
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
-import androidx.compose.foundation.layout.windowInsetsPadding
 import androidx.compose.foundation.shape.CircleShape
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
@@ -24,7 +22,6 @@ import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.dp
 import androidx.navigation.compose.currentBackStackEntryAsState
 import androidx.tv.material3.Button
-import androidx.tv.material3.ExperimentalTvMaterial3Api
 import androidx.tv.material3.Icon
 import androidx.tv.material3.MaterialTheme
 import androidx.tv.material3.Text
@@ -66,7 +63,6 @@ fun AppBar(
     }
 }
 
-@OptIn(ExperimentalTvMaterial3Api::class)
 @Composable
 private fun HeadlineContent(
     title: String,
@@ -112,7 +108,6 @@ private fun HeadlineContent(
     }
 }
 
-@OptIn(ExperimentalTvMaterial3Api::class)
 @Composable
 private fun Actions(
     onThemeColorModeClick: () -> Unit,

diff --git a/...og/app/src/main/java/com/google/tv/material/catalog/ExamplesScreenWithDottedBackground.kt b/...og/app/src/main/java/com/google/tv/material/catalog/ExamplesScreenWithDottedBackground.kt
@@ -30,15 +30,14 @@ import androidx.compose.ui.focus.onFocusChanged
 import androidx.compose.ui.geometry.Offset
 import androidx.compose.ui.graphics.PathEffect
 import androidx.compose.ui.unit.dp
-import androidx.tv.material3.ExperimentalTvMaterial3Api
 import androidx.tv.material3.ListItem
 import androidx.tv.material3.MaterialTheme
 import androidx.tv.material3.Text
 import androidx.tv.material3.surfaceColorAtElevation
 import kotlinx.coroutines.delay
 import kotlin.time.Duration.Companion.milliseconds
 
-@OptIn(ExperimentalTvMaterial3Api::class, ExperimentalComposeUiApi::class)
+@OptIn(ExperimentalComposeUiApi::class)
 @Composable
 fun ExamplesScreenWithDottedBackground(
     actions: List<ExampleAction>
@@ -76,10 +75,11 @@ fun ExamplesScreenWithDottedBackground(
                                 if (it.isFocused) {
                                     activeAction = action
                                 }
-                            }
-                    ) {
-                        Text(text = action.title)
-                    }
+                            },
+                        headlineContent = {
+                            Text(text = action.title)
+                        }
+                    )
                 }
             }
         }

diff --git a/...g/app/src/main/java/com/google/tv/material/catalog/FontScaleAndLayoutDirectionSelector.kt b/...g/app/src/main/java/com/google/tv/material/catalog/FontScaleAndLayoutDirectionSelector.kt
@@ -28,13 +28,12 @@ import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import androidx.tv.foundation.PivotOffsets
 import androidx.tv.foundation.lazy.list.TvLazyColumn
-import androidx.tv.material3.ExperimentalTvMaterial3Api
 import androidx.tv.material3.Icon
 import androidx.tv.material3.ListItem
 import androidx.tv.material3.MaterialTheme
-import androidx.tv.material3.NonInteractiveSurfaceDefaults
 import androidx.tv.material3.RadioButton
 import androidx.tv.material3.Surface
+import androidx.tv.material3.SurfaceDefaults
 import androidx.tv.material3.Text
 
 @OptIn(ExperimentalTvMaterial3Api::class, ExperimentalComposeUiApi::class)
@@ -69,7 +68,7 @@ fun FontScaleAndLayoutDirectionSelector(
                         .width(300.dp)
                         .padding(12.dp)
                         .align(Alignment.End),
-                    colors = NonInteractiveSurfaceDefaults
+                    colors = SurfaceDefaults
                         .colors(containerColor = MaterialTheme.colorScheme.surface)
                 ) {
                     TvLazyColumn(
@@ -122,10 +121,10 @@ fun FontScaleAndLayoutDirectionSelector(
                                             },
                                             trailingContent = {
                                                 RadioButton(selected = isSelected, onClick = { })
-                                            }
-                                        ) {
-                                            Text(text = it.title)
-                                        }
+                                            },
+                                            headlineContent = {
+                                                Text(text = it.title)
+                                            })
                                     }
                                 }
                             }
@@ -163,10 +162,10 @@ fun FontScaleAndLayoutDirectionSelector(
                                             },
                                             trailingContent = {
                                                 RadioButton(selected = isSelected, onClick = { })
-                                            }
-                                        ) {
-                                            Text(text = it.title)
-                                        }
+                                            },
+                                            headlineContent = {
+                                                Text(text = it.title)
+                                            })
                                     }
                                 }
                             }

diff --git a/TvMaterialCatalog/app/src/main/java/com/google/tv/material/catalog/HomeGrid.kt b/TvMaterialCatalog/app/src/main/java/com/google/tv/material/catalog/HomeGrid.kt
@@ -18,10 +18,9 @@ import androidx.tv.foundation.lazy.grid.TvGridCells
 import androidx.tv.foundation.lazy.grid.TvGridItemSpan
 import androidx.tv.foundation.lazy.grid.TvLazyVerticalGrid
 import androidx.tv.foundation.lazy.grid.itemsIndexed
-import androidx.tv.material3.ExperimentalTvMaterial3Api
 import androidx.tv.material3.Text
 
-@OptIn(ExperimentalTvMaterial3Api::class, ExperimentalComposeUiApi::class)
+@OptIn(ExperimentalComposeUiApi::class)
 @Composable
 fun HomeGrid() {
     val focusRequester = remember { FocusRequester() }

diff --git a/TvMaterialCatalog/app/src/main/java/com/google/tv/material/catalog/HomeGridCard.kt b/TvMaterialCatalog/app/src/main/java/com/google/tv/material/catalog/HomeGridCard.kt
@@ -7,13 +7,11 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.unit.dp
+import androidx.tv.material3.Card
 import androidx.tv.material3.CardDefaults
-import androidx.tv.material3.CardLayoutDefaults
-import androidx.tv.material3.ExperimentalTvMaterial3Api
-import androidx.tv.material3.StandardCardLayout
+import androidx.tv.material3.StandardCardContainer
 import androidx.tv.material3.Text
 
-@OptIn(ExperimentalTvMaterial3Api::class)
 @Composable
 fun ComponentsGridCard(
     component: Component,
@@ -23,10 +21,10 @@ fun ComponentsGridCard(
     val image = getHomeGridCardImage(imageArg = component.imageArg)
     val navHostController = LocalNavController.current
 
-    StandardCardLayout(
+    StandardCardContainer(
         modifier = modifier,
         imageCard = {
-            CardLayoutDefaults.ImageCard(
+            Card(
                 onClick = {
                     onClick?.invoke()
                     navHostController.navigate(component.routeValue)

diff --git a/...rialCatalog/app/src/main/java/com/google/tv/material/catalog/ThemeAndColorModeSelector.kt b/...rialCatalog/app/src/main/java/com/google/tv/material/catalog/ThemeAndColorModeSelector.kt
@@ -27,16 +27,15 @@ import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import androidx.tv.foundation.PivotOffsets
 import androidx.tv.foundation.lazy.list.TvLazyColumn
-import androidx.tv.material3.ExperimentalTvMaterial3Api
 import androidx.tv.material3.Icon
 import androidx.tv.material3.ListItem
 import androidx.tv.material3.MaterialTheme
-import androidx.tv.material3.NonInteractiveSurfaceDefaults
 import androidx.tv.material3.RadioButton
 import androidx.tv.material3.Surface
+import androidx.tv.material3.SurfaceDefaults
 import androidx.tv.material3.Text
 
-@OptIn(ExperimentalTvMaterial3Api::class, ExperimentalComposeUiApi::class)
+@OptIn(ExperimentalComposeUiApi::class)
 @Composable
 fun ThemeAndColorModeSelector(
     isExpanded: Boolean,
@@ -68,7 +67,7 @@ fun ThemeAndColorModeSelector(
                         .width(300.dp)
                         .padding(12.dp)
                         .align(Alignment.End),
-                    colors = NonInteractiveSurfaceDefaults
+                    colors = SurfaceDefaults
                         .colors(containerColor = MaterialTheme.colorScheme.surface)
                 ) {
                     TvLazyColumn(
@@ -120,10 +119,10 @@ fun ThemeAndColorModeSelector(
                                             },
                                             trailingContent = {
                                                 RadioButton(selected = isSelected, onClick = { })
-                                            }
-                                        ) {
-                                            Text(text = it.title)
-                                        }
+                                            },
+                                            headlineContent = {
+                                                Text(text = it.title)
+                                            })
                                     }
                                 }
                             }
@@ -162,10 +161,10 @@ fun ThemeAndColorModeSelector(
                                             },
                                             trailingContent = {
                                                 RadioButton(selected = isSelected, onClick = { })
-                                            }
-                                        ) {
-                                            Text(text = it.name)
-                                        }
+                                            },
+                                            headlineContent = {
+                                                Text(text = it.name)
+                                            })
                                     }
                                 }
                             }

diff --git a/TvMaterialCatalog/app/src/main/java/com/google/tv/material/catalog/colorutils/ColorUtils.kt b/TvMaterialCatalog/app/src/main/java/com/google/tv/material/catalog/colorutils/ColorUtils.kt
@@ -2,7 +2,6 @@ package com.google.tv.material.catalog.colorutils
 
 import androidx.compose.ui.graphics.Color
 import androidx.tv.material3.ColorScheme
-import androidx.tv.material3.ExperimentalTvMaterial3Api
 import kotlin.math.pow
 
 
@@ -233,7 +232,6 @@ object ColorUtils {
     }
 }
 
-@OptIn(ExperimentalTvMaterial3Api::class)
 fun Scheme.toColorScheme(): ColorScheme {
     return ColorScheme(
         primary = Color(primary),

diff --git a/TvMaterialCatalog/app/src/main/java/com/google/tv/material/catalog/screens/ButtonsScreen.kt b/TvMaterialCatalog/app/src/main/java/com/google/tv/material/catalog/screens/ButtonsScreen.kt
@@ -14,7 +14,6 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.unit.dp
 import androidx.tv.material3.Button
 import androidx.tv.material3.ButtonDefaults
-import androidx.tv.material3.ExperimentalTvMaterial3Api
 import androidx.tv.material3.Icon
 import androidx.tv.material3.IconButton
 import androidx.tv.material3.IconButtonDefaults
@@ -27,7 +26,6 @@ import androidx.tv.material3.WideButton
 import com.google.tv.material.catalog.ExampleAction
 import com.google.tv.material.catalog.ExamplesScreenWithDottedBackground
 
-@OptIn(ExperimentalTvMaterial3Api::class)
 @Composable
 fun ButtonsScreen() {
     val actions = listOf(

diff --git a/TvMaterialCatalog/app/src/main/java/com/google/tv/material/catalog/screens/CardsScreen.kt b/TvMaterialCatalog/app/src/main/java/com/google/tv/material/catalog/screens/CardsScreen.kt
@@ -10,31 +10,29 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.unit.dp
+import androidx.tv.material3.Card
 import androidx.tv.material3.CardDefaults
-import androidx.tv.material3.CardLayoutDefaults
 import androidx.tv.material3.ClassicCard
 import androidx.tv.material3.CompactCard
-import androidx.tv.material3.ExperimentalTvMaterial3Api
-import androidx.tv.material3.StandardCardLayout
+import androidx.tv.material3.StandardCardContainer
 import androidx.tv.material3.Text
-import androidx.tv.material3.WideCardLayout
+import androidx.tv.material3.WideCardContainer
 import androidx.tv.material3.WideClassicCard
 import com.google.tv.material.catalog.ExampleAction
 import com.google.tv.material.catalog.ExamplesScreenWithDottedBackground
 import com.google.tv.material.catalog.R
 
-@OptIn(ExperimentalTvMaterial3Api::class)
 @Composable
 fun CardsScreen() {
     val actions = listOf(
         ExampleAction(
             title = "Standard card",
             content = {
-                StandardCardLayout(
+                StandardCardContainer(
                     modifier = Modifier.width(180.dp),
                     imageCard = {
-                        CardLayoutDefaults.ImageCard(
-                            onClick = { },
+                        Card(
+                            onClick = {},
                             interactionSource = it,
                             colors = CardDefaults.colors(containerColor = Color.Transparent)
                         ) {
@@ -133,10 +131,10 @@ fun CardsScreen() {
         ExampleAction(
             title = "Wide standard card",
             content = {
-                WideCardLayout(
+                WideCardContainer(
                     modifier = Modifier,
                     imageCard = {
-                        CardLayoutDefaults.ImageCard(
+                        Card(
                             onClick = { },
                             interactionSource = it,
                             colors = CardDefaults.colors(containerColor = Color.Transparent)

diff --git a/TvMaterialCatalog/app/src/main/java/com/google/tv/material/catalog/screens/ChipsScreen.kt b/TvMaterialCatalog/app/src/main/java/com/google/tv/material/catalog/screens/ChipsScreen.kt
@@ -113,23 +113,20 @@ fun ChipsScreen() {
     ExamplesScreenWithDottedBackground(actions)
 }
 
-@OptIn(ExperimentalTvMaterial3Api::class)
 private val editIcon = @Composable {
     Icon(
         imageVector = Icons.Default.Edit,
         contentDescription = "Edit icon",
     )
 }
 
-@OptIn(ExperimentalTvMaterial3Api::class)
 private val checkIcon = @Composable {
     Icon(
         imageVector = Icons.Default.Check,
         contentDescription = "Check icon",
     )
 }
 
-@OptIn(ExperimentalTvMaterial3Api::class)
 private val clearIcon = @Composable {
     Icon(
         imageVector = Icons.Default.Clear,

diff --git a/TvMaterialCatalog/app/src/main/java/com/google/tv/material/catalog/screens/ColorsScreen.kt b/TvMaterialCatalog/app/src/main/java/com/google/tv/material/catalog/screens/ColorsScreen.kt
@@ -16,13 +16,11 @@ import androidx.tv.foundation.lazy.grid.TvGridCells
 import androidx.tv.foundation.lazy.grid.TvGridItemSpan
 import androidx.tv.foundation.lazy.grid.TvLazyVerticalGrid
 import androidx.tv.material3.Border
-import androidx.tv.material3.ExperimentalTvMaterial3Api
 import androidx.tv.material3.MaterialTheme
-import androidx.tv.material3.NonInteractiveSurfaceDefaults
 import androidx.tv.material3.Surface
+import androidx.tv.material3.SurfaceDefaults
 import androidx.tv.material3.Text
 
-@OptIn(ExperimentalTvMaterial3Api::class)
 @Composable
 fun ColorsScreen() {
     Row(
@@ -131,7 +129,6 @@ fun ColorsScreen() {
     }
 }
 
-@OptIn(ExperimentalTvMaterial3Api::class)
 @Composable
 private fun ColorBg(
     text: String,
@@ -141,7 +138,7 @@ private fun ColorBg(
         modifier = Modifier
             .fillMaxWidth()
             .height(60.dp),
-        colors = NonInteractiveSurfaceDefaults.colors(
+        colors = SurfaceDefaults.colors(
             containerColor = color
         ),
         border = Border(

diff --git a/...atalog/app/src/main/java/com/google/tv/material/catalog/screens/FeaturedCarouselScreen.kt b/...atalog/app/src/main/java/com/google/tv/material/catalog/screens/FeaturedCarouselScreen.kt
@@ -219,7 +219,6 @@ fun Modifier.carouselGradient(): Modifier = composed {
         )
 }
 
-@OptIn(ExperimentalTvMaterial3Api::class)
 @Composable
 fun BottomCards(modifier: Modifier) {
     TvLazyRow(