diff --git a/JetStreamCompose/jetstream/src/main/res/drawable/app_banner_foreground.xml b/JetStreamCompose/jetstream/src/main/res/drawable/app_banner_foreground.xml new file mode 100644 index 00000000..c4656f8b --- /dev/null +++ b/JetStreamCompose/jetstream/src/main/res/drawable/app_banner_foreground.xml @@ -0,0 +1,34 @@ + + + + + + + + diff --git a/JetStreamCompose/jetstream/src/main/res/drawable/ic_launcher_foreground.xml b/JetStreamCompose/jetstream/src/main/res/drawable/ic_launcher_foreground.xml index a544fcf1..38339e14 100644 --- a/JetStreamCompose/jetstream/src/main/res/drawable/ic_launcher_foreground.xml +++ b/JetStreamCompose/jetstream/src/main/res/drawable/ic_launcher_foreground.xml @@ -23,9 +23,6 @@ android:scaleY="0.2371875" android:translateX="16.05" android:translateY="32.653126"> - + + + + + + \ No newline at end of file diff --git a/TvMaterialCatalog/app/build.gradle.kts b/TvMaterialCatalog/app/build.gradle.kts index a931aafd..5901c4ea 100644 --- a/TvMaterialCatalog/app/build.gradle.kts +++ b/TvMaterialCatalog/app/build.gradle.kts @@ -10,12 +10,12 @@ kotlin { android { namespace = "com.google.tv.material.catalog" - compileSdk = 34 + compileSdk = 35 defaultConfig { applicationId = "com.google.tv.material.catalog" minSdk = 21 - targetSdk = 34 + targetSdk = 35 versionCode = 1 versionName = "1.0" vectorDrawables { @@ -27,6 +27,7 @@ android { buildTypes { release { isMinifyEnabled = false + signingConfig = signingConfigs.getByName("debug") proguardFiles( getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro" @@ -56,4 +57,6 @@ dependencies { implementation(libs.tv.material) implementation(libs.coil.compose) implementation(libs.navigation.compose) + implementation(libs.compose.ui) + implementation(libs.compose.foundation) } \ No newline at end of file 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 index 6b8aa0e4..32f3d295 100644 --- 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 @@ -9,17 +9,16 @@ import androidx.compose.runtime.mutableStateOf import androidx.compose.runtime.remember import androidx.compose.runtime.setValue import androidx.compose.ui.Modifier +import androidx.compose.ui.focus.FocusRequester 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) } @@ -40,15 +39,23 @@ fun App() { fontScale = fontScale, ) { MaterialTheme(colorScheme = colorScheme.toColorScheme()) { + val themeFocus = remember { FocusRequester() } + val fontFocus = remember { FocusRequester() } ThemeAndColorModeSelector( isExpanded = isThemeSelectorExpanded, - onClose = { isThemeSelectorExpanded = false }, + onClose = { + isThemeSelectorExpanded = false + themeFocus.requestFocus() + }, onSeedColorChange = { seedColor = it }, onThemeModeChange = { themeMode = it }, ) { FontScaleAndLayoutDirectionSelector( isExpanded = isFontScaleSelectorExpanded, - onClose = { isFontScaleSelectorExpanded = false }, + onClose = { + isFontScaleSelectorExpanded = false + fontFocus.requestFocus() + }, onLayoutDirectionChange = { layoutDirection = it }, onFontScaleChange = { fontScale = it } ) { @@ -58,6 +65,7 @@ fun App() { ) { Column(Modifier.fillMaxSize()) { NavigationGraph( + themeFocus, fontFocus, onThemeColorModeClick = { isThemeSelectorExpanded = true }, 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 index eaa08387..6a4539da 100644 --- 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 @@ -1,12 +1,14 @@ package com.google.tv.material.catalog import androidx.compose.foundation.background +import androidx.compose.foundation.focusGroup import androidx.compose.foundation.layout.Arrangement 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.fillMaxWidth +import androidx.compose.foundation.layout.height import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.size import androidx.compose.foundation.shape.CircleShape @@ -14,6 +16,8 @@ import androidx.compose.runtime.Composable import androidx.compose.runtime.getValue import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier +import androidx.compose.ui.focus.FocusRequester +import androidx.compose.ui.focus.focusRequester import androidx.compose.ui.graphics.painter.Painter import androidx.compose.ui.res.painterResource import androidx.compose.ui.res.stringResource @@ -22,13 +26,14 @@ 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 @Composable fun AppBar( + themeFocus: FocusRequester, + fontFocus: FocusRequester, onThemeColorModeClick: () -> Unit, onFontScaleClick: () -> Unit ) { @@ -58,13 +63,13 @@ fun AppBar( isMainIconMagnified = isMainIconMagnified ) Actions( + themeFocus, fontFocus, onThemeColorModeClick = onThemeColorModeClick, - onFontScaleClick = onFontScaleClick, + onFontScaleClick = onFontScaleClick ) } } -@OptIn(ExperimentalTvMaterial3Api::class) @Composable private fun HeadlineContent( title: String, @@ -72,6 +77,7 @@ private fun HeadlineContent( isMainIconMagnified: Boolean, ) { Row( + modifier = Modifier.height(64.dp), horizontalArrangement = Arrangement.spacedBy(16.dp), verticalAlignment = Alignment.CenterVertically, ) { @@ -110,9 +116,10 @@ private fun HeadlineContent( } } -@OptIn(ExperimentalTvMaterial3Api::class) @Composable private fun Actions( + themeFocus: FocusRequester, + fontFocus: FocusRequester, onThemeColorModeClick: () -> Unit, onFontScaleClick: () -> Unit, ) { @@ -120,18 +127,28 @@ private fun Actions( Action( iconPainter = painterResource(id = R.drawable.ic_palette), text = "Theme & color mode", - onClick = onThemeColorModeClick + onClick = onThemeColorModeClick, + focusRequester = themeFocus ), Action( iconPainter = painterResource(id = R.drawable.ic_font), text = "Font scale", - onClick = onFontScaleClick + onClick = onFontScaleClick, + focusRequester = fontFocus ) ) - Row(horizontalArrangement = Arrangement.spacedBy(16.dp)) { + Row( + horizontalArrangement = Arrangement.spacedBy(16.dp), + modifier = Modifier + .padding(end = 8.dp) + .focusGroup() + ) { actions.forEach { - Button(onClick = it.onClick) { + Button( + modifier = Modifier.focusRequester(it.focusRequester), + onClick = it.onClick + ) { Icon( modifier = Modifier.size(16.dp), painter = it.iconPainter, @@ -151,4 +168,5 @@ private data class Action( val iconPainter: Painter, val text: String, val onClick: () -> Unit, + val focusRequester: FocusRequester ) diff --git a/TvMaterialCatalog/app/src/main/java/com/google/tv/material/catalog/Component.kt b/TvMaterialCatalog/app/src/main/java/com/google/tv/material/catalog/Component.kt index 23a106a5..45dac91c 100644 --- a/TvMaterialCatalog/app/src/main/java/com/google/tv/material/catalog/Component.kt +++ b/TvMaterialCatalog/app/src/main/java/com/google/tv/material/catalog/Component.kt @@ -1,5 +1,12 @@ package com.google.tv.material.catalog +val foundations = listOf( + Component.Color, + Component.Typography, + Component.Motion, + Component.Interaction, +) + val components = listOf( Component.Button, Component.Card, @@ -7,28 +14,21 @@ val components = listOf( Component.ListItem, Component.ImmersiveList, Component.FeaturedCarousel, - Component.NavigationDrawer, Component.TabRow, +) + +val componentsPlanned = listOf( + Component.NavigationDrawer, Component.ModalDialog, Component.TextField, Component.MediaPlayerOverlay, ) -val foundations = listOf( - Foundation.Color, - Foundation.Typography, - Foundation.Motion, - Foundation.Interaction, -) - -enum class Foundation(val title: String, val imageArg: String, val routeValue: String) { +enum class Component(val title: String, val imageArg: String, val routeValue: String) { Color(title = "Color", imageArg = "colors", routeValue = NavGraph.Color.routeName), Typography(title = "Typography", imageArg = "typography", routeValue = NavGraph.Typography.routeName), Motion(title = "Motion", imageArg = "motion", routeValue = NavGraph.Motion.routeName), Interaction(title = "Interaction", imageArg = "interaction", routeValue = NavGraph.Interaction.routeName), -} - -enum class Component(val title: String, val imageArg: String, val routeValue: String) { Button(title = "Buttons", imageArg = "buttons", routeValue = NavGraph.Buttons.routeName), Card(title = "Cards", imageArg = "cards", routeValue = NavGraph.Cards.routeName), Chip(title = "Chips", imageArg = "chips", routeValue = NavGraph.Chips.routeName), diff --git a/TvMaterialCatalog/app/src/main/java/com/google/tv/material/catalog/ExamplesScreenWithDottedBackground.kt b/TvMaterialCatalog/app/src/main/java/com/google/tv/material/catalog/ExamplesScreenWithDottedBackground.kt index 00e75278..9c55a3fd 100644 --- a/TvMaterialCatalog/app/src/main/java/com/google/tv/material/catalog/ExamplesScreenWithDottedBackground.kt +++ b/TvMaterialCatalog/app/src/main/java/com/google/tv/material/catalog/ExamplesScreenWithDottedBackground.kt @@ -30,7 +30,6 @@ 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 @@ -38,7 +37,7 @@ 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 @@ -76,10 +75,11 @@ fun ExamplesScreenWithDottedBackground( if (it.isFocused) { activeAction = action } - } - ) { - Text(text = action.title) - } + }, + headlineContent = { + Text(text = action.title) + } + ) } } } diff --git a/TvMaterialCatalog/app/src/main/java/com/google/tv/material/catalog/FontScaleAndLayoutDirectionSelector.kt b/TvMaterialCatalog/app/src/main/java/com/google/tv/material/catalog/FontScaleAndLayoutDirectionSelector.kt index cc37a010..130ee9e3 100644 --- a/TvMaterialCatalog/app/src/main/java/com/google/tv/material/catalog/FontScaleAndLayoutDirectionSelector.kt +++ b/TvMaterialCatalog/app/src/main/java/com/google/tv/material/catalog/FontScaleAndLayoutDirectionSelector.kt @@ -1,5 +1,6 @@ package com.google.tv.material.catalog +import androidx.activity.compose.BackHandler import androidx.compose.foundation.background import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.Column @@ -9,6 +10,7 @@ import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.height import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.width +import androidx.compose.foundation.lazy.LazyColumn import androidx.compose.foundation.selection.selectableGroup import androidx.compose.runtime.Composable import androidx.compose.runtime.LaunchedEffect @@ -26,18 +28,15 @@ import androidx.compose.ui.semantics.semantics import androidx.compose.ui.unit.LayoutDirection 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 FontScaleAndLayoutDirectionSelector( isExpanded: Boolean, @@ -54,6 +53,10 @@ fun FontScaleAndLayoutDirectionSelector( } } + BackHandler(enabled = isExpanded) { + onClose() + } + Box(modifier = Modifier.fillMaxSize()) { content() @@ -69,10 +72,10 @@ fun FontScaleAndLayoutDirectionSelector( .width(300.dp) .padding(12.dp) .align(Alignment.End), - colors = NonInteractiveSurfaceDefaults + colors = SurfaceDefaults .colors(containerColor = MaterialTheme.colorScheme.surface) ) { - TvLazyColumn( + LazyColumn( modifier = Modifier .padding(12.dp) .focusRequester(focusRequester) @@ -81,8 +84,7 @@ fun FontScaleAndLayoutDirectionSelector( onClose() FocusRequester.Default } - }, - pivotOffsets = PivotOffsets(parentFraction = 0.2f) + } ) { item { Text( @@ -121,11 +123,13 @@ fun FontScaleAndLayoutDirectionSelector( ) }, trailingContent = { - RadioButton(selected = isSelected, onClick = { }) - } - ) { - Text(text = it.title) - } + RadioButton( + selected = isSelected, + onClick = { }) + }, + headlineContent = { + Text(text = it.title) + }) } } } @@ -150,7 +154,8 @@ fun FontScaleAndLayoutDirectionSelector( Modifier.selectableGroup() ) { fontScales.forEach { - val isSelected = LocalDensity.current.fontScale == it.scale + val isSelected = + LocalDensity.current.fontScale == it.scale ListItem( selected = isSelected, onClick = { onFontScaleChange(it.scale) }, @@ -162,11 +167,13 @@ fun FontScaleAndLayoutDirectionSelector( ) }, trailingContent = { - RadioButton(selected = isSelected, onClick = { }) - } - ) { - Text(text = it.title) - } + RadioButton( + selected = isSelected, + onClick = { }) + }, + 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 index acda4c28..eb932023 100644 --- 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 @@ -5,47 +5,76 @@ import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.PaddingValues import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.lazy.grid.GridCells +import androidx.compose.foundation.lazy.grid.GridItemSpan +import androidx.compose.foundation.lazy.grid.LazyVerticalGrid +import androidx.compose.foundation.lazy.grid.items import androidx.compose.runtime.Composable +import androidx.compose.runtime.LaunchedEffect +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.focusRequester +import androidx.compose.ui.focus.focusRestorer import androidx.compose.ui.unit.dp -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 navHostController = LocalNavController.current + val focusRequester = remember { FocusRequester() } + LaunchedEffect(Unit) { + focusRequester.requestFocus() + } Column(Modifier.fillMaxSize()) { Column( Modifier .weight(1f) - .padding(start = 54.dp, top = 0.dp, end = 38.dp, bottom = 12.dp) + .padding(start = 54.dp, top = 0.dp, end = 38.dp, bottom = 0.dp) ) { - TvLazyVerticalGrid( - columns = TvGridCells.Fixed(4), - modifier = Modifier.padding(top = 12.dp), + LazyVerticalGrid( + columns = GridCells.Fixed(4), + modifier = Modifier + .padding(top = 12.dp) + .focusRequester(focusRequester) + .focusRestorer(), contentPadding = PaddingValues(vertical = 12.dp), horizontalArrangement = Arrangement.spacedBy(20.dp), verticalArrangement = Arrangement.spacedBy(20.dp) ) { - item(span = { TvGridItemSpan(4) }) { + item(span = { GridItemSpan(4) }) { Text(text = "Foundations") } - itemsIndexed(foundations) { index, item -> - FoundationsGridCard(foundation = item) + items(foundations) { item -> + ComponentsGridCard(component = item, onClick = { + focusRequester.saveFocusedChild() + navHostController.navigate(item.routeValue) + }) } - item(span = { TvGridItemSpan(4) }) { + item(span = { GridItemSpan(4) }) { Text(text = "Components") } - itemsIndexed(components) { index, item -> - ComponentsGridCard(component = item) + items(components) { item -> + ComponentsGridCard(component = item, onClick = { + focusRequester.saveFocusedChild() + navHostController.navigate(item.routeValue) + }) + } + + item(span = { GridItemSpan(4) }) { + Text(text = "Components (planned)") + } + + items(componentsPlanned) { item -> + ComponentsGridCard(component = item, onClick = { + focusRequester.saveFocusedChild() + navHostController.navigate(item.routeValue) + }) } } } 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 index a075808f..2d8be3b9 100644 --- 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,26 +7,26 @@ 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, - modifier: Modifier = Modifier + modifier: Modifier = Modifier, + onClick: () -> Unit = {} ) { val image = getHomeGridCardImage(imageArg = component.imageArg) - val navHostController = LocalNavController.current - StandardCardLayout( + StandardCardContainer( modifier = modifier, imageCard = { - CardLayoutDefaults.ImageCard( - onClick = { navHostController.navigate(component.routeValue) }, + Card( + onClick = { + onClick() + }, interactionSource = it, colors = CardDefaults.colors(containerColor = Color.Transparent) ) { @@ -41,32 +41,3 @@ fun ComponentsGridCard( } ) } - -@OptIn(ExperimentalTvMaterial3Api::class) -@Composable -fun FoundationsGridCard( - foundation: Foundation, - modifier: Modifier = Modifier -) { - val image = getHomeGridCardImage(imageArg = foundation.imageArg) - val navHostController = LocalNavController.current - - StandardCardLayout( - modifier = modifier, - imageCard = { - CardLayoutDefaults.ImageCard( - onClick = { navHostController.navigate(foundation.routeValue) }, - interactionSource = it, - colors = CardDefaults.colors(containerColor = Color.Transparent) - ) { - Image(painter = painterResource(id = image), contentDescription = null) - } - }, - title = { - Text( - text = foundation.title, - modifier = Modifier.padding(top = 8.dp) - ) - } - ) -} diff --git a/TvMaterialCatalog/app/src/main/java/com/google/tv/material/catalog/NavGraph.kt b/TvMaterialCatalog/app/src/main/java/com/google/tv/material/catalog/NavGraph.kt index c05ef4c3..cdcda893 100644 --- a/TvMaterialCatalog/app/src/main/java/com/google/tv/material/catalog/NavGraph.kt +++ b/TvMaterialCatalog/app/src/main/java/com/google/tv/material/catalog/NavGraph.kt @@ -4,6 +4,7 @@ import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.Column import androidx.compose.runtime.Composable import androidx.compose.runtime.compositionLocalOf +import androidx.compose.ui.focus.FocusRequester import androidx.navigation.NavHostController import androidx.navigation.compose.NavHost import androidx.navigation.compose.composable @@ -22,6 +23,8 @@ import com.google.tv.material.catalog.screens.WorkInProgressScreen @Composable fun NavigationGraph( + themeFocus: FocusRequester, + fontFocus: FocusRequester, onThemeColorModeClick: () -> Unit, onFontScaleClick: () -> Unit ) { @@ -31,6 +34,7 @@ fun NavigationGraph( composable(destination.routeName) { destination.composable { AppBar( + themeFocus, fontFocus, onThemeColorModeClick = onThemeColorModeClick, onFontScaleClick = onFontScaleClick ) @@ -147,12 +151,6 @@ enum class NavGraph( } } ), - NavigationDrawer( - routeName = "nav-drawer", - composable = { - WorkInProgressScreen() - } - ), TabRow( routeName = "tab-row", composable = { appBar -> @@ -162,6 +160,12 @@ enum class NavGraph( } } ), + NavigationDrawer( + routeName = "nav-drawer", + composable = { + WorkInProgressScreen() + } + ), ModalDialog( routeName = "modal-dialog", composable = { diff --git a/TvMaterialCatalog/app/src/main/java/com/google/tv/material/catalog/PositionFocusedItemInLazyLayout.kt b/TvMaterialCatalog/app/src/main/java/com/google/tv/material/catalog/PositionFocusedItemInLazyLayout.kt new file mode 100644 index 00000000..5c528e0a --- /dev/null +++ b/TvMaterialCatalog/app/src/main/java/com/google/tv/material/catalog/PositionFocusedItemInLazyLayout.kt @@ -0,0 +1,47 @@ +package com.google.tv.material.catalog + +import androidx.compose.foundation.ExperimentalFoundationApi +import androidx.compose.foundation.gestures.BringIntoViewSpec +import androidx.compose.foundation.gestures.LocalBringIntoViewSpec +import androidx.compose.runtime.Composable +import androidx.compose.runtime.CompositionLocalProvider + +@OptIn(ExperimentalFoundationApi::class) +@Composable +fun PositionFocusedItemInLazyLayout( + parentFraction: Float = 0.3f, + childFraction: Float = 0f, + content: @Composable () -> Unit, +) { + // This bring-into-view spec pivots around the center of the scrollable container + val bringIntoViewSpec = object : BringIntoViewSpec { + override fun calculateScrollDistance( + // Initial position of item requesting focus + offset: Float, + // Size of item requesting focus + size: Float, + // Size of the lazy container + containerSize: Float + ): Float { + val childSmallerThanParent = size <= containerSize + val initialTargetForLeadingEdge = + parentFraction * containerSize - (childFraction * size) + val spaceAvailableToShowItem = containerSize - initialTargetForLeadingEdge + + val targetForLeadingEdge = + if (childSmallerThanParent && spaceAvailableToShowItem < size) { + containerSize - size + } else { + initialTargetForLeadingEdge + } + + return offset - targetForLeadingEdge + } + } + + // LocalBringIntoViewSpec will apply to all scrollables in the hierarchy + CompositionLocalProvider( + LocalBringIntoViewSpec provides bringIntoViewSpec, + content = content, + ) +} diff --git a/TvMaterialCatalog/app/src/main/java/com/google/tv/material/catalog/ThemeAndColorModeSelector.kt b/TvMaterialCatalog/app/src/main/java/com/google/tv/material/catalog/ThemeAndColorModeSelector.kt index fdd3cdf8..3af68331 100644 --- a/TvMaterialCatalog/app/src/main/java/com/google/tv/material/catalog/ThemeAndColorModeSelector.kt +++ b/TvMaterialCatalog/app/src/main/java/com/google/tv/material/catalog/ThemeAndColorModeSelector.kt @@ -1,5 +1,6 @@ package com.google.tv.material.catalog +import androidx.activity.compose.BackHandler import androidx.compose.foundation.background import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.Column @@ -10,6 +11,7 @@ import androidx.compose.foundation.layout.height import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.size import androidx.compose.foundation.layout.width +import androidx.compose.foundation.lazy.LazyColumn import androidx.compose.foundation.selection.selectableGroup import androidx.compose.foundation.shape.CircleShape import androidx.compose.runtime.Composable @@ -25,18 +27,15 @@ import androidx.compose.ui.res.painterResource import androidx.compose.ui.semantics.semantics 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, @@ -53,6 +52,10 @@ fun ThemeAndColorModeSelector( } } + BackHandler(enabled = isExpanded) { + onClose() + } + Box(modifier = Modifier.fillMaxSize()) { content() @@ -68,10 +71,10 @@ fun ThemeAndColorModeSelector( .width(300.dp) .padding(12.dp) .align(Alignment.End), - colors = NonInteractiveSurfaceDefaults + colors = SurfaceDefaults .colors(containerColor = MaterialTheme.colorScheme.surface) ) { - TvLazyColumn( + LazyColumn( modifier = Modifier .padding(12.dp) .focusRequester(focusRequester) @@ -80,8 +83,7 @@ fun ThemeAndColorModeSelector( onClose() FocusRequester.Default } - }, - pivotOffsets = PivotOffsets(parentFraction = 0.2f) + } ) { item { Text( @@ -119,11 +121,13 @@ fun ThemeAndColorModeSelector( ) }, trailingContent = { - RadioButton(selected = isSelected, onClick = { }) - } - ) { - Text(text = it.title) - } + RadioButton( + selected = isSelected, + onClick = { }) + }, + headlineContent = { + Text(text = it.title) + }) } } } @@ -148,7 +152,8 @@ fun ThemeAndColorModeSelector( Modifier.selectableGroup() ) { seedColors.forEach { - val isSelected = LocalThemeSeedColor.current.name == it.name + val isSelected = + LocalThemeSeedColor.current.name == it.name ListItem( selected = isSelected, onClick = { onSeedColorChange(it) }, @@ -161,11 +166,13 @@ fun ThemeAndColorModeSelector( ) }, trailingContent = { - RadioButton(selected = isSelected, onClick = { }) - } - ) { - Text(text = it.name) - } + RadioButton( + selected = isSelected, + onClick = { }) + }, + 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 index 61750482..b7a7744c 100644 --- 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 index 866cc510..5b89a035 100644 --- 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 index fd80cfe3..866d3089 100644 --- 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 index 0eb4f954..5a616e76 100644 --- 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,7 +113,6 @@ fun ChipsScreen() { ExamplesScreenWithDottedBackground(actions) } -@OptIn(ExperimentalTvMaterial3Api::class) private val editIcon = @Composable { Icon( imageVector = Icons.Default.Edit, @@ -121,7 +120,6 @@ private val editIcon = @Composable { ) } -@OptIn(ExperimentalTvMaterial3Api::class) private val checkIcon = @Composable { Icon( imageVector = Icons.Default.Check, @@ -129,7 +127,6 @@ private val checkIcon = @Composable { ) } -@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 index 04e99c19..d1bf6845 100644 --- 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 @@ -7,131 +7,128 @@ import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.height import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.lazy.grid.GridCells +import androidx.compose.foundation.lazy.grid.GridItemSpan +import androidx.compose.foundation.lazy.grid.LazyVerticalGrid import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier import androidx.compose.ui.graphics.Color import androidx.compose.ui.graphics.luminance import androidx.compose.ui.unit.dp -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( Modifier.fillMaxSize().padding(start = 58.dp, end = 48.dp, top = 8.dp), horizontalArrangement = Arrangement.spacedBy(20.dp) ) { - TvLazyVerticalGrid( - columns = TvGridCells.Fixed(2), + LazyVerticalGrid( + columns = GridCells.Fixed(2), modifier = Modifier.weight(1f), verticalArrangement = Arrangement.spacedBy(10.dp), horizontalArrangement = Arrangement.spacedBy(10.dp), ) { - item(span = { TvGridItemSpan(2) }) { + item(span = { GridItemSpan(2) }) { ColorBg(text = "On Background", color = MaterialTheme.colorScheme.onBackground) } - item(span = { TvGridItemSpan(2) }) { + item(span = { GridItemSpan(2) }) { ColorBg(text = "Background", color = MaterialTheme.colorScheme.background) } - item(span = { TvGridItemSpan(1) }) { + item(span = { GridItemSpan(1) }) { ColorBg(text = "On Surface", color = MaterialTheme.colorScheme.onSurface) } - item(span = { TvGridItemSpan(1) }) { + item(span = { GridItemSpan(1) }) { ColorBg( text = "On Surface Variant", color = MaterialTheme.colorScheme.onSurfaceVariant ) } - item(span = { TvGridItemSpan(2) }) { + item(span = { GridItemSpan(2) }) { ColorBg(text = "Surface", color = MaterialTheme.colorScheme.surface) } - item(span = { TvGridItemSpan(1) }) { + item(span = { GridItemSpan(1) }) { ColorBg(text = "Inverse Primary", color = MaterialTheme.colorScheme.inversePrimary) } - item(span = { TvGridItemSpan(1) }) { + item(span = { GridItemSpan(1) }) { ColorBg( text = "Inverse On Surface", color = MaterialTheme.colorScheme.inverseOnSurface ) } - item(span = { TvGridItemSpan(1) }) { + item(span = { GridItemSpan(1) }) { ColorBg(text = "Surface Variant", color = MaterialTheme.colorScheme.surfaceVariant) } - item(span = { TvGridItemSpan(1) }) { + item(span = { GridItemSpan(1) }) { ColorBg(text = "Inverse Surface", color = MaterialTheme.colorScheme.inverseSurface) } } - TvLazyVerticalGrid( - columns = TvGridCells.Fixed(2), + LazyVerticalGrid( + columns = GridCells.Fixed(2), modifier = Modifier.weight(1f), verticalArrangement = Arrangement.spacedBy(10.dp), horizontalArrangement = Arrangement.spacedBy(10.dp), ) { - item(span = { TvGridItemSpan(1) }) { + item(span = { GridItemSpan(1) }) { ColorBg( text = "On Primary Container", color = MaterialTheme.colorScheme.onPrimaryContainer ) } - item(span = { TvGridItemSpan(1) }) { + item(span = { GridItemSpan(1) }) { ColorBg(text = "On Primary", color = MaterialTheme.colorScheme.onPrimary) } - item(span = { TvGridItemSpan(1) }) { + item(span = { GridItemSpan(1) }) { ColorBg( text = "Primary Container", color = MaterialTheme.colorScheme.primaryContainer ) } - item(span = { TvGridItemSpan(1) }) { + item(span = { GridItemSpan(1) }) { ColorBg(text = "Primary", color = MaterialTheme.colorScheme.primary) } - item(span = { TvGridItemSpan(1) }) { + item(span = { GridItemSpan(1) }) { ColorBg( text = "On Secondary Container", color = MaterialTheme.colorScheme.onSecondaryContainer ) } - item(span = { TvGridItemSpan(1) }) { + item(span = { GridItemSpan(1) }) { ColorBg(text = "On Secondary", color = MaterialTheme.colorScheme.onSecondary) } - item(span = { TvGridItemSpan(1) }) { + item(span = { GridItemSpan(1) }) { ColorBg(text = "Secondary", color = MaterialTheme.colorScheme.secondaryContainer) } - item(span = { TvGridItemSpan(1) }) { + item(span = { GridItemSpan(1) }) { ColorBg(text = "Secondary", color = MaterialTheme.colorScheme.secondary) } - item(span = { TvGridItemSpan(1) }) { + item(span = { GridItemSpan(1) }) { ColorBg( text = "On Tertiary Container", color = MaterialTheme.colorScheme.onTertiaryContainer ) } - item(span = { TvGridItemSpan(1) }) { + item(span = { GridItemSpan(1) }) { ColorBg(text = "On Tertiary", color = MaterialTheme.colorScheme.onTertiary) } - item(span = { TvGridItemSpan(1) }) { + item(span = { GridItemSpan(1) }) { ColorBg( text = "Tertiary Container", color = MaterialTheme.colorScheme.tertiaryContainer ) } - item(span = { TvGridItemSpan(1) }) { + item(span = { GridItemSpan(1) }) { ColorBg(text = "Tertiary", color = MaterialTheme.colorScheme.tertiary) } } } } -@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/TvMaterialCatalog/app/src/main/java/com/google/tv/material/catalog/screens/FeaturedCarouselScreen.kt b/TvMaterialCatalog/app/src/main/java/com/google/tv/material/catalog/screens/FeaturedCarouselScreen.kt index 77499377..2173ed89 100644 --- a/TvMaterialCatalog/app/src/main/java/com/google/tv/material/catalog/screens/FeaturedCarouselScreen.kt +++ b/TvMaterialCatalog/app/src/main/java/com/google/tv/material/catalog/screens/FeaturedCarouselScreen.kt @@ -15,6 +15,7 @@ import androidx.compose.foundation.layout.height import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.size import androidx.compose.foundation.layout.width +import androidx.compose.foundation.lazy.LazyRow import androidx.compose.foundation.shape.RoundedCornerShape import androidx.compose.material.icons.Icons import androidx.compose.material.icons.outlined.PlayArrow @@ -37,7 +38,6 @@ import androidx.compose.ui.res.painterResource import androidx.compose.ui.text.style.TextMotion import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.unit.dp -import androidx.tv.foundation.lazy.list.TvLazyRow import androidx.tv.material3.Border import androidx.tv.material3.Button import androidx.tv.material3.ButtonDefaults @@ -219,10 +219,9 @@ fun Modifier.carouselGradient(): Modifier = composed { ) } -@OptIn(ExperimentalTvMaterial3Api::class) @Composable fun BottomCards(modifier: Modifier) { - TvLazyRow( + LazyRow( modifier = modifier, contentPadding = PaddingValues(start = 36.dp), horizontalArrangement = Arrangement.spacedBy(20.dp), diff --git a/TvMaterialCatalog/app/src/main/java/com/google/tv/material/catalog/screens/ImmersiveListScreen.kt b/TvMaterialCatalog/app/src/main/java/com/google/tv/material/catalog/screens/ImmersiveListScreen.kt index 10f1b7e9..a882191d 100644 --- a/TvMaterialCatalog/app/src/main/java/com/google/tv/material/catalog/screens/ImmersiveListScreen.kt +++ b/TvMaterialCatalog/app/src/main/java/com/google/tv/material/catalog/screens/ImmersiveListScreen.kt @@ -9,12 +9,16 @@ import androidx.compose.foundation.layout.PaddingValues import androidx.compose.foundation.layout.Spacer import androidx.compose.foundation.layout.aspectRatio import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.height import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.width import androidx.compose.foundation.layout.wrapContentHeight +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.mutableFloatStateOf import androidx.compose.runtime.mutableStateOf import androidx.compose.runtime.remember import androidx.compose.runtime.setValue @@ -30,20 +34,20 @@ import androidx.compose.ui.geometry.Offset import androidx.compose.ui.graphics.Brush import androidx.compose.ui.graphics.Color import androidx.compose.ui.layout.ContentScale +import androidx.compose.ui.layout.onPlaced +import androidx.compose.ui.platform.LocalDensity import androidx.compose.ui.res.painterResource import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.unit.dp -import androidx.tv.foundation.lazy.list.TvLazyRow -import androidx.tv.foundation.lazy.list.itemsIndexed import androidx.tv.material3.CardDefaults import androidx.tv.material3.CompactCard -import androidx.tv.material3.ExperimentalTvMaterial3Api import androidx.tv.material3.MaterialTheme import androidx.tv.material3.Text +import com.google.tv.material.catalog.PositionFocusedItemInLazyLayout import com.google.tv.material.catalog.R import com.google.tv.material.catalog.ifElse -@OptIn(ExperimentalTvMaterial3Api::class, ExperimentalComposeUiApi::class) +@OptIn(ExperimentalComposeUiApi::class) @Composable fun ImmersiveListScreen() { var selectedCard by remember { mutableStateOf(immersiveListItems.first()) } @@ -94,39 +98,52 @@ fun ImmersiveListScreen() { } } + val density = LocalDensity.current + var fullWidth by remember { mutableFloatStateOf(1f) } val firstChildFr = remember { FocusRequester() } - TvLazyRow( - modifier = Modifier - .align(Alignment.BottomStart) - .padding(bottom = 20.dp) - .focusRestorer { firstChildFr }, - contentPadding = PaddingValues(start = 58.dp), - horizontalArrangement = Arrangement.spacedBy(20.dp) + PositionFocusedItemInLazyLayout( + parentFraction = 58f / fullWidth, + childFraction = 0f ) { - itemsIndexed(immersiveListItems) { index, card -> - CompactCard( - modifier = Modifier - .width(196.dp) - .aspectRatio(16f / 9) - .ifElse(index == 0, Modifier.focusRequester(firstChildFr)) - .onFocusChanged { - if (it.isFocused) { - selectedCard = card - } - }, - onClick = {}, - image = { - Image( - painter = painterResource(id = card.image), - contentDescription = "Image", - modifier = Modifier.fillMaxSize(), - contentScale = ContentScale.FillBounds - ) + LazyRow( + modifier = Modifier + .align(Alignment.BottomStart) + .fillMaxWidth() + .padding(bottom = 20.dp) + .focusRestorer { firstChildFr } + .onPlaced { + with(density) { + fullWidth = it.size.width.toDp().value + } }, - title = {}, - colors = CardDefaults.colors(containerColor = Color.Transparent) - ) + contentPadding = PaddingValues(start = 58.dp, end = 46.dp), + horizontalArrangement = Arrangement.spacedBy(20.dp) + ) { + itemsIndexed(immersiveListItems) { index, card -> + CompactCard( + modifier = Modifier + .width(280.dp) + .aspectRatio(16f / 9) + .ifElse(index == 0, Modifier.focusRequester(firstChildFr)) + .onFocusChanged { + if (it.isFocused) { + selectedCard = card + } + }, + onClick = {}, + image = { + Image( + painter = painterResource(id = card.image), + contentDescription = "Image", + modifier = Modifier.fillMaxSize(), + contentScale = ContentScale.FillBounds + ) + }, + title = {}, + colors = CardDefaults.colors(containerColor = Color.Transparent) + ) + } } } } @@ -171,7 +188,6 @@ private data class ImmersiveListSlide( val image: Int = 10, ) -@OptIn(ExperimentalTvMaterial3Api::class) fun Modifier.immersiveListGradient(): Modifier = composed { val color = MaterialTheme.colorScheme.surface diff --git a/TvMaterialCatalog/app/src/main/java/com/google/tv/material/catalog/screens/InteractionsScreen.kt b/TvMaterialCatalog/app/src/main/java/com/google/tv/material/catalog/screens/InteractionsScreen.kt index 60e61ccd..a016fd47 100644 --- a/TvMaterialCatalog/app/src/main/java/com/google/tv/material/catalog/screens/InteractionsScreen.kt +++ b/TvMaterialCatalog/app/src/main/java/com/google/tv/material/catalog/screens/InteractionsScreen.kt @@ -15,7 +15,6 @@ import androidx.compose.ui.unit.dp import androidx.tv.material3.Border import androidx.tv.material3.ClickableSurfaceDefaults import androidx.tv.material3.ClickableSurfaceScale -import androidx.tv.material3.ExperimentalTvMaterial3Api import androidx.tv.material3.Glow import androidx.tv.material3.MaterialTheme import androidx.tv.material3.Surface @@ -23,7 +22,6 @@ import androidx.tv.material3.Text import com.google.tv.material.catalog.ExampleAction import com.google.tv.material.catalog.ExamplesScreenWithDottedBackground -@OptIn(ExperimentalTvMaterial3Api::class) @Composable fun InteractionsScreen() { val actions = listOf( diff --git a/TvMaterialCatalog/app/src/main/java/com/google/tv/material/catalog/screens/ListsScreen.kt b/TvMaterialCatalog/app/src/main/java/com/google/tv/material/catalog/screens/ListsScreen.kt index b8af2ce3..7b7eb7ff 100644 --- a/TvMaterialCatalog/app/src/main/java/com/google/tv/material/catalog/screens/ListsScreen.kt +++ b/TvMaterialCatalog/app/src/main/java/com/google/tv/material/catalog/screens/ListsScreen.kt @@ -15,7 +15,6 @@ import androidx.compose.runtime.setValue import androidx.compose.ui.Modifier import androidx.compose.ui.unit.dp import androidx.tv.material3.DenseListItem -import androidx.tv.material3.ExperimentalTvMaterial3Api import androidx.tv.material3.Icon import androidx.tv.material3.ListItem import androidx.tv.material3.ListItemDefaults @@ -23,7 +22,6 @@ import androidx.tv.material3.Text import com.google.tv.material.catalog.ExampleAction import com.google.tv.material.catalog.ExamplesScreenWithDottedBackground -@OptIn(ExperimentalTvMaterial3Api::class) @Composable fun ListsScreen() { val actions = listOf( diff --git a/TvMaterialCatalog/app/src/main/java/com/google/tv/material/catalog/screens/MotionScreen.kt b/TvMaterialCatalog/app/src/main/java/com/google/tv/material/catalog/screens/MotionScreen.kt index c460002b..ae994d25 100644 --- a/TvMaterialCatalog/app/src/main/java/com/google/tv/material/catalog/screens/MotionScreen.kt +++ b/TvMaterialCatalog/app/src/main/java/com/google/tv/material/catalog/screens/MotionScreen.kt @@ -24,7 +24,6 @@ import androidx.compose.ui.text.font.FontFamily import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp -import androidx.tv.material3.ExperimentalTvMaterial3Api import androidx.tv.material3.MaterialTheme import androidx.tv.material3.Text import com.google.tv.material.catalog.ExampleAction @@ -63,7 +62,6 @@ fun MotionScreen() { ExamplesScreenWithDottedBackground(actions) } -@OptIn(ExperimentalTvMaterial3Api::class) @Composable private fun StandardMotion() { Column( @@ -143,7 +141,6 @@ private fun StandardMotion() { } } -@OptIn(ExperimentalTvMaterial3Api::class) @Composable private fun BrowseMotion() { Column( @@ -223,7 +220,6 @@ private fun BrowseMotion() { } } -@OptIn(ExperimentalTvMaterial3Api::class) @Composable private fun EnterMotion() { Column( @@ -303,7 +299,6 @@ private fun EnterMotion() { } } -@OptIn(ExperimentalTvMaterial3Api::class) @Composable private fun ExitMotion() { Column( diff --git a/TvMaterialCatalog/app/src/main/java/com/google/tv/material/catalog/screens/TabRowScreen.kt b/TvMaterialCatalog/app/src/main/java/com/google/tv/material/catalog/screens/TabRowScreen.kt index c6829981..ae1a6c48 100644 --- a/TvMaterialCatalog/app/src/main/java/com/google/tv/material/catalog/screens/TabRowScreen.kt +++ b/TvMaterialCatalog/app/src/main/java/com/google/tv/material/catalog/screens/TabRowScreen.kt @@ -23,7 +23,6 @@ import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.res.painterResource import androidx.compose.ui.unit.dp -import androidx.tv.material3.ExperimentalTvMaterial3Api import androidx.tv.material3.MaterialTheme import androidx.tv.material3.Tab import androidx.tv.material3.TabDefaults @@ -60,7 +59,6 @@ fun TabRowScreen() { ExamplesScreenWithDottedBackground(actions) } -@OptIn(ExperimentalTvMaterial3Api::class) @Composable private fun PillIndicatorTabRow() { var selectedTabIndex by remember { mutableIntStateOf(0) } @@ -89,7 +87,6 @@ private fun PillIndicatorTabRow() { } } -@OptIn(ExperimentalTvMaterial3Api::class) @Composable private fun UnderlinedIndicatorTabRow() { var selectedTabIndex by remember { mutableIntStateOf(0) } @@ -130,12 +127,8 @@ private fun UnderlinedIndicatorTabRow() { @Composable private fun TabPanels(selectedTabIndex: Int) { - var value = 0 - AnimatedContent(targetState = selectedTabIndex, label = "") { - value = it - - when (selectedTabIndex) { + when (it) { getTabIndex("Search") -> { Column( modifier = Modifier diff --git a/TvMaterialCatalog/app/src/main/java/com/google/tv/material/catalog/screens/TypographyScreen.kt b/TvMaterialCatalog/app/src/main/java/com/google/tv/material/catalog/screens/TypographyScreen.kt index 1a167353..d51883bc 100644 --- a/TvMaterialCatalog/app/src/main/java/com/google/tv/material/catalog/screens/TypographyScreen.kt +++ b/TvMaterialCatalog/app/src/main/java/com/google/tv/material/catalog/screens/TypographyScreen.kt @@ -8,13 +8,11 @@ import androidx.compose.runtime.Composable import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.unit.dp -import androidx.tv.material3.ExperimentalTvMaterial3Api import androidx.tv.material3.MaterialTheme import androidx.tv.material3.Text import com.google.tv.material.catalog.ExampleAction import com.google.tv.material.catalog.ExamplesScreenWithDottedBackground -@OptIn(ExperimentalTvMaterial3Api::class) @Composable fun TypographyScreen() { val actions = listOf( diff --git a/TvMaterialCatalog/app/src/main/java/com/google/tv/material/catalog/screens/WorkInProgressScreen.kt b/TvMaterialCatalog/app/src/main/java/com/google/tv/material/catalog/screens/WorkInProgressScreen.kt index 546d1012..5be61987 100644 --- a/TvMaterialCatalog/app/src/main/java/com/google/tv/material/catalog/screens/WorkInProgressScreen.kt +++ b/TvMaterialCatalog/app/src/main/java/com/google/tv/material/catalog/screens/WorkInProgressScreen.kt @@ -7,10 +7,8 @@ import androidx.compose.runtime.Composable import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.unit.dp -import androidx.tv.material3.ExperimentalTvMaterial3Api import androidx.tv.material3.Text -@OptIn(ExperimentalTvMaterial3Api::class) @Composable fun WorkInProgressScreen() { Box(modifier = Modifier.fillMaxSize()) { diff --git a/TvMaterialCatalog/gradle/libs.versions.toml b/TvMaterialCatalog/gradle/libs.versions.toml index 9c94179f..a96ddcaf 100644 --- a/TvMaterialCatalog/gradle/libs.versions.toml +++ b/TvMaterialCatalog/gradle/libs.versions.toml @@ -1,15 +1,15 @@ [versions] -agp = "8.3.1" -coil-compose = "2.5.0" +agp = "8.7.2" +coil-compose = "2.7.0" kotlin = "1.9.0" -core-ktx = "1.12.0" -appcompat = "1.6.1" -compose-bom = "2024.03.00" -navigation-compose = "2.7.7" -tv-foundation = "1.0.0-alpha10" -tv-material = "1.0.0-alpha10" -lifecycle-runtime-ktx = "2.7.0" -activity-compose = "1.8.2" +core-ktx = "1.15.0" +appcompat = "1.7.0" +compose-bom = "2024.11.00" +navigation-compose = "2.8.4" +tv-foundation = "1.0.0-alpha11" +tv-material = "1.0.0" +lifecycle-runtime-ktx = "2.8.7" +activity-compose = "1.9.3" [libraries] coil-compose = { module = "io.coil-kt:coil-compose", version.ref = "coil-compose" } @@ -21,8 +21,9 @@ tv-foundation = { group = "androidx.tv", name = "tv-foundation", version.ref = " tv-material = { group = "androidx.tv", name = "tv-material", version.ref = "tv-material" } lifecycle-runtime-ktx = { group = "androidx.lifecycle", name = "lifecycle-runtime-ktx", version.ref = "lifecycle-runtime-ktx" } activity-compose = { group = "androidx.activity", name = "activity-compose", version.ref = "activity-compose" } +compose-ui = { group = 'androidx.compose.ui', name = 'ui', version = "1.7.5" } +compose-foundation = { group = 'androidx.compose.foundation', name = 'foundation', version = "1.7.5" } [plugins] androidApplication = { id = "com.android.application", version.ref = "agp" } kotlinAndroid = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" } - diff --git a/TvMaterialCatalog/gradle/wrapper/gradle-wrapper.jar b/TvMaterialCatalog/gradle/wrapper/gradle-wrapper.jar index e708b1c0..e6441136 100644 Binary files a/TvMaterialCatalog/gradle/wrapper/gradle-wrapper.jar and b/TvMaterialCatalog/gradle/wrapper/gradle-wrapper.jar differ diff --git a/TvMaterialCatalog/gradle/wrapper/gradle-wrapper.properties b/TvMaterialCatalog/gradle/wrapper/gradle-wrapper.properties index 5b26786d..df97d72b 100644 --- a/TvMaterialCatalog/gradle/wrapper/gradle-wrapper.properties +++ b/TvMaterialCatalog/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,7 @@ -#Tue Dec 12 14:24:49 IST 2023 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip +networkTimeout=10000 +validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/TvMaterialCatalog/gradlew b/TvMaterialCatalog/gradlew index 4f906e0c..b740cf13 100755 --- a/TvMaterialCatalog/gradlew +++ b/TvMaterialCatalog/gradlew @@ -1,7 +1,7 @@ -#!/usr/bin/env sh +#!/bin/sh # -# Copyright 2015 the original author or authors. +# Copyright © 2015-2021 the original authors. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -17,67 +17,99 @@ # ############################################################################## -## -## Gradle start up script for UN*X -## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# ############################################################################## # Attempt to set APP_HOME + # Resolve links: $0 may be a link -PRG="$0" -# Need this for relative symlinks. -while [ -h "$PRG" ] ; do - ls=`ls -ld "$PRG"` - link=`expr "$ls" : '.*-> \(.*\)$'` - if expr "$link" : '/.*' > /dev/null; then - PRG="$link" - else - PRG=`dirname "$PRG"`"/$link" - fi +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac done -SAVED="`pwd`" -cd "`dirname \"$PRG\"`/" >/dev/null -APP_HOME="`pwd -P`" -cd "$SAVED" >/dev/null -APP_NAME="Gradle" -APP_BASE_NAME=`basename "$0"` - -# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' +# This is normally unused +# shellcheck disable=SC2034 +APP_BASE_NAME=${0##*/} +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) +APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit # Use the maximum available, or set MAX_FD != -1 to use that value. -MAX_FD="maximum" +MAX_FD=maximum warn () { echo "$*" -} +} >&2 die () { echo echo "$*" echo exit 1 -} +} >&2 # OS specific support (must be 'true' or 'false'). cygwin=false msys=false darwin=false nonstop=false -case "`uname`" in - CYGWIN* ) - cygwin=true - ;; - Darwin* ) - darwin=true - ;; - MINGW* ) - msys=true - ;; - NONSTOP* ) - nonstop=true - ;; +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; esac CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar @@ -87,9 +119,9 @@ CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar if [ -n "$JAVA_HOME" ] ; then if [ -x "$JAVA_HOME/jre/sh/java" ] ; then # IBM's JDK on AIX uses strange locations for the executables - JAVACMD="$JAVA_HOME/jre/sh/java" + JAVACMD=$JAVA_HOME/jre/sh/java else - JAVACMD="$JAVA_HOME/bin/java" + JAVACMD=$JAVA_HOME/bin/java fi if [ ! -x "$JAVACMD" ] ; then die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME @@ -98,88 +130,120 @@ Please set the JAVA_HOME variable in your environment to match the location of your Java installation." fi else - JAVACMD="java" - which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + JAVACMD=java + if ! command -v java >/dev/null 2>&1 + then + die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. Please set the JAVA_HOME variable in your environment to match the location of your Java installation." + fi fi # Increase the maximum file descriptors if we can. -if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then - MAX_FD_LIMIT=`ulimit -H -n` - if [ $? -eq 0 ] ; then - if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then - MAX_FD="$MAX_FD_LIMIT" - fi - ulimit -n $MAX_FD - if [ $? -ne 0 ] ; then - warn "Could not set maximum file descriptor limit: $MAX_FD" - fi - else - warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" - fi +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac fi -# For Darwin, add options to specify how the application appears in the dock -if $darwin; then - GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" -fi +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. # For Cygwin or MSYS, switch paths to Windows format before running java -if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then - APP_HOME=`cygpath --path --mixed "$APP_HOME"` - CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` - - JAVACMD=`cygpath --unix "$JAVACMD"` - - # We build the pattern for arguments to be converted via cygpath - ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` - SEP="" - for dir in $ROOTDIRSRAW ; do - ROOTDIRS="$ROOTDIRS$SEP$dir" - SEP="|" - done - OURCYGPATTERN="(^($ROOTDIRS))" - # Add a user-defined pattern to the cygpath arguments - if [ "$GRADLE_CYGPATTERN" != "" ] ; then - OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" - fi +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + # Now convert the arguments - kludge to limit ourselves to /bin/sh - i=0 - for arg in "$@" ; do - CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` - CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option - - if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition - eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` - else - eval `echo args$i`="\"$arg\"" + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) fi - i=`expr $i + 1` + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg done - case $i in - 0) set -- ;; - 1) set -- "$args0" ;; - 2) set -- "$args0" "$args1" ;; - 3) set -- "$args0" "$args1" "$args2" ;; - 4) set -- "$args0" "$args1" "$args2" "$args3" ;; - 5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; - 6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; - 7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; - 8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; - 9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; - esac fi -# Escape application args -save () { - for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done - echo " " -} -APP_ARGS=`save "$@"` -# Collect all arguments for the java command, following the shell quoting and substitution rules -eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Collect all arguments for the java command: +# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# and any embedded shellness will be escaped. +# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be +# treated as '${Hostname}' itself on the command line. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' exec "$JAVACMD" "$@" diff --git a/TvMaterialCatalog/gradlew.bat b/TvMaterialCatalog/gradlew.bat index ac1b06f9..7101f8e4 100644 --- a/TvMaterialCatalog/gradlew.bat +++ b/TvMaterialCatalog/gradlew.bat @@ -14,7 +14,7 @@ @rem limitations under the License. @rem -@if "%DEBUG%" == "" @echo off +@if "%DEBUG%"=="" @echo off @rem ########################################################################## @rem @rem Gradle startup script for Windows @@ -25,7 +25,8 @@ if "%OS%"=="Windows_NT" setlocal set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused set APP_BASE_NAME=%~n0 set APP_HOME=%DIRNAME% @@ -40,13 +41,13 @@ if defined JAVA_HOME goto findJavaFromJavaHome set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto execute +if %ERRORLEVEL% equ 0 goto execute -echo. -echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. +echo. 1>&2 +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 goto fail @@ -56,11 +57,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe if exist "%JAVA_EXE%" goto execute -echo. -echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. +echo. 1>&2 +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 goto fail @@ -75,13 +76,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar :end @rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd +if %ERRORLEVEL% equ 0 goto mainEnd :fail rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of rem the _cmd.exe /c_ return code! -if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 -exit /b 1 +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% :mainEnd if "%OS%"=="Windows_NT" endlocal