From 8d5636a5b07c5b28b8f6abff3132ca1ce0fb9528 Mon Sep 17 00:00:00 2001 From: Dereck Bridie Date: Wed, 3 Sep 2025 13:46:01 +0200 Subject: [PATCH 1/4] Refactor XR backgrounds to shared XR components. This change allows for more types of backgrounds and minimum height requirements on the panels. --- .../theme/components/Backgrounds.kt | 27 ------- .../androidify/xr/SpatialComponents.kt | 72 +++++++++++++++++-- .../src/main/res/drawable/squiggle_full.xml | 0 .../creation/xr/EditScreenSpatial.kt | 2 +- .../androidify/home/xr/HomeScreenSpatial.kt | 5 +- 5 files changed, 68 insertions(+), 38 deletions(-) rename core/{theme => xr}/src/main/res/drawable/squiggle_full.xml (100%) diff --git a/core/theme/src/main/java/com/android/developers/androidify/theme/components/Backgrounds.kt b/core/theme/src/main/java/com/android/developers/androidify/theme/components/Backgrounds.kt index 9a1a2266..976546d2 100644 --- a/core/theme/src/main/java/com/android/developers/androidify/theme/components/Backgrounds.kt +++ b/core/theme/src/main/java/com/android/developers/androidify/theme/components/Backgrounds.kt @@ -36,8 +36,6 @@ import androidx.compose.ui.graphics.vector.ImageVector import androidx.compose.ui.graphics.vector.rememberVectorPainter import androidx.compose.ui.layout.ContentScale import androidx.compose.ui.res.vectorResource -import androidx.compose.ui.tooling.preview.Devices.PIXEL_TABLET -import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.IntOffset import androidx.compose.ui.unit.dp import com.android.developers.androidify.theme.AndroidifyTheme @@ -80,31 +78,6 @@ fun SquiggleBackground( } } -/** - * Background squiggle that tries to fit in its parent. - */ -@Composable -fun SquiggleBackgroundFull() { - val vectorBackground = - rememberVectorPainter(ImageVector.vectorResource(R.drawable.squiggle_full)) - Box(modifier = Modifier.fillMaxSize()) { - Image( - painter = vectorBackground, - contentDescription = null, - modifier = Modifier.fillMaxSize(), - contentScale = ContentScale.Fit, - ) - } -} - -@Preview(device = PIXEL_TABLET) -@Composable -fun SquiggleFullImagePreview() { - AndroidifyTheme { - SquiggleBackgroundFull() - } -} - @LargeScreensPreview @Composable private fun SquiggleBackgroundLargePreview() { diff --git a/core/xr/src/main/java/com/android/developers/androidify/xr/SpatialComponents.kt b/core/xr/src/main/java/com/android/developers/androidify/xr/SpatialComponents.kt index 79b03da2..fd2e8493 100644 --- a/core/xr/src/main/java/com/android/developers/androidify/xr/SpatialComponents.kt +++ b/core/xr/src/main/java/com/android/developers/androidify/xr/SpatialComponents.kt @@ -15,7 +15,19 @@ */ package com.android.developers.androidify.xr +import androidx.annotation.DrawableRes +import androidx.compose.foundation.Image +import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.runtime.Composable +import androidx.compose.ui.Modifier +import androidx.compose.ui.graphics.vector.ImageVector +import androidx.compose.ui.graphics.vector.rememberVectorPainter +import androidx.compose.ui.layout.ContentScale +import androidx.compose.ui.res.vectorResource +import androidx.compose.ui.tooling.preview.Devices.PIXEL_TABLET +import androidx.compose.ui.tooling.preview.Preview +import androidx.compose.ui.unit.Dp import androidx.compose.ui.unit.dp import androidx.xr.compose.spatial.Subspace import androidx.xr.compose.subspace.SpatialBox @@ -24,11 +36,13 @@ import androidx.xr.compose.subspace.SpatialPanel import androidx.xr.compose.subspace.SubspaceComposable import androidx.xr.compose.subspace.layout.SubspaceModifier import androidx.xr.compose.subspace.layout.aspectRatio +import androidx.xr.compose.subspace.layout.fillMaxSize import androidx.xr.compose.subspace.layout.fillMaxWidth import androidx.xr.compose.subspace.layout.movable import androidx.xr.compose.subspace.layout.offset import androidx.xr.compose.subspace.layout.resizable -import com.android.developers.androidify.theme.components.SquiggleBackgroundFull +import androidx.xr.compose.unit.DpVolumeSize +import com.android.developers.androidify.theme.AndroidifyTheme /** * A composable for a Subspace with a Squiggle background. @@ -37,6 +51,24 @@ import com.android.developers.androidify.theme.components.SquiggleBackgroundFull */ @Composable fun SquiggleBackgroundSubspace( + minimumHeight: Dp, + content: + @SubspaceComposable @Composable + SpatialBoxScope.() -> Unit, +) { + BackgroundSubspace( + aspectRatio = 1.7f, + drawable = R.drawable.squiggle_full, + minimumHeight = minimumHeight, + content = content, + ) +} + +@Composable +fun BackgroundSubspace( + aspectRatio: Float, + @DrawableRes drawable: Int, + minimumHeight: Dp, content: @SubspaceComposable @Composable SpatialBoxScope.() -> Unit, @@ -45,14 +77,42 @@ fun SquiggleBackgroundSubspace( SpatialPanel( SubspaceModifier .movable() - .resizable() - .fillMaxWidth(1f) - .aspectRatio(1.7f), + .resizable( + minimumSize = DpVolumeSize(0.dp, minimumHeight, 0.dp), + maintainAspectRatio = true, + ) + .fillMaxWidth() + .aspectRatio(aspectRatio), ) { - SquiggleBackgroundFull() + FillBackground(drawable) Subspace { - SpatialBox(SubspaceModifier.offset(z = 10.dp), content = content) + SpatialBox(SubspaceModifier.offset(z = 10.dp).fillMaxSize(), content = content) } } } } + +/** + * Background squiggle that tries to fit in its parent. + */ +@Composable +fun FillBackground(@DrawableRes drawable: Int) { + val vectorBackground = + rememberVectorPainter(ImageVector.vectorResource(drawable)) + Box(modifier = Modifier.fillMaxSize()) { + Image( + painter = vectorBackground, + contentDescription = null, + modifier = Modifier.fillMaxSize(), + contentScale = ContentScale.Fit, + ) + } +} + +@Preview(device = PIXEL_TABLET) +@Composable +fun SquiggleFullImagePreview() { + AndroidifyTheme { + FillBackground(R.drawable.squiggle_full) + } +} diff --git a/core/theme/src/main/res/drawable/squiggle_full.xml b/core/xr/src/main/res/drawable/squiggle_full.xml similarity index 100% rename from core/theme/src/main/res/drawable/squiggle_full.xml rename to core/xr/src/main/res/drawable/squiggle_full.xml diff --git a/feature/creation/src/main/java/com/android/developers/androidify/creation/xr/EditScreenSpatial.kt b/feature/creation/src/main/java/com/android/developers/androidify/creation/xr/EditScreenSpatial.kt index 8f7632d1..ad347484 100644 --- a/feature/creation/src/main/java/com/android/developers/androidify/creation/xr/EditScreenSpatial.kt +++ b/feature/creation/src/main/java/com/android/developers/androidify/creation/xr/EditScreenSpatial.kt @@ -75,7 +75,7 @@ fun EditScreenSpatial( onDropCallback: (Uri) -> Unit = {}, ) { DisableSharedTransition { - SquiggleBackgroundSubspace { + SquiggleBackgroundSubspace(minimumHeight = 600.dp) { MainPanelWorkaround() SpatialColumn(SubspaceModifier.fillMaxWidth()) { SpatialPanel( diff --git a/feature/home/src/main/java/com/android/developers/androidify/home/xr/HomeScreenSpatial.kt b/feature/home/src/main/java/com/android/developers/androidify/home/xr/HomeScreenSpatial.kt index 815c2001..03024019 100644 --- a/feature/home/src/main/java/com/android/developers/androidify/home/xr/HomeScreenSpatial.kt +++ b/feature/home/src/main/java/com/android/developers/androidify/home/xr/HomeScreenSpatial.kt @@ -38,7 +38,6 @@ import androidx.compose.ui.unit.dp import androidx.xr.compose.spatial.ContentEdge import androidx.xr.compose.spatial.Orbiter import androidx.xr.compose.spatial.OrbiterOffsetType -import androidx.xr.compose.spatial.Subspace import androidx.xr.compose.subspace.SpatialPanel import androidx.xr.compose.subspace.layout.SpatialAlignment import androidx.xr.compose.subspace.layout.SubspaceModifier @@ -56,7 +55,6 @@ import com.android.developers.androidify.home.VideoPlayer import com.android.developers.androidify.theme.SharedElementContextPreview import com.android.developers.androidify.theme.components.AboutButton import com.android.developers.androidify.theme.components.AndroidifyTopAppBar -import com.android.developers.androidify.theme.components.SquiggleBackgroundFull import com.android.developers.androidify.util.TabletPreview import com.android.developers.androidify.xr.DisableSharedTransition import com.android.developers.androidify.xr.MainPanelWorkaround @@ -71,7 +69,7 @@ fun HomeScreenContentsSpatial( onAboutClicked: () -> Unit, ) { DisableSharedTransition { - SquiggleBackgroundSubspace { + SquiggleBackgroundSubspace(minimumHeight = 600.dp) { MainPanelWorkaround() Orbiter( position = ContentEdge.Top, @@ -118,7 +116,6 @@ private fun HomeScreenSpatialMainContent( mutableStateOf(IntOffset.Zero) } Box { - SquiggleBackgroundFull() Column( modifier = Modifier .fillMaxWidth(0.55f) From 22a00f07f66a8e50899739d077922edf51e3b93e Mon Sep 17 00:00:00 2001 From: Dereck Bridie Date: Wed, 3 Sep 2025 13:53:16 +0200 Subject: [PATCH 2/4] Add Spatial layout for LoadingScreen --- .../androidify/creation/CreationScreen.kt | 1 + .../androidify/creation/LoadingScreen.kt | 57 ++++++--- .../creation/xr/LoadingScreenSpatial.kt | 115 ++++++++++++++++++ .../src/main/res/drawable/squiggle_light.xml | 31 +++++ 4 files changed, 188 insertions(+), 16 deletions(-) create mode 100644 feature/creation/src/main/java/com/android/developers/androidify/creation/xr/LoadingScreenSpatial.kt create mode 100644 feature/creation/src/main/res/drawable/squiggle_light.xml diff --git a/feature/creation/src/main/java/com/android/developers/androidify/creation/CreationScreen.kt b/feature/creation/src/main/java/com/android/developers/androidify/creation/CreationScreen.kt index a1e85ab2..20bcb055 100644 --- a/feature/creation/src/main/java/com/android/developers/androidify/creation/CreationScreen.kt +++ b/feature/creation/src/main/java/com/android/developers/androidify/creation/CreationScreen.kt @@ -99,6 +99,7 @@ fun CreationScreen( onCancelPress = { creationViewModel.cancelInProgressTask() }, + layoutType = layoutType, ) } } diff --git a/feature/creation/src/main/java/com/android/developers/androidify/creation/LoadingScreen.kt b/feature/creation/src/main/java/com/android/developers/androidify/creation/LoadingScreen.kt index ccf39eef..61866a2f 100644 --- a/feature/creation/src/main/java/com/android/developers/androidify/creation/LoadingScreen.kt +++ b/feature/creation/src/main/java/com/android/developers/androidify/creation/LoadingScreen.kt @@ -27,7 +27,6 @@ import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.BoxScope import androidx.compose.foundation.layout.Column -import androidx.compose.foundation.layout.PaddingValues import androidx.compose.foundation.layout.Spacer import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.fillMaxWidth @@ -48,6 +47,7 @@ import androidx.compose.runtime.setValue import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.draw.paint +import androidx.compose.ui.graphics.Color import androidx.compose.ui.graphics.SolidColor import androidx.compose.ui.graphics.StrokeCap import androidx.compose.ui.graphics.graphicsLayer @@ -70,12 +70,12 @@ import androidx.compose.ui.tooling.preview.Devices.PIXEL_3A_XL import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.tooling.preview.PreviewScreenSizes import androidx.compose.ui.unit.dp +import com.android.developers.androidify.creation.xr.LoadingScreenSpatial import com.android.developers.androidify.theme.AndroidifyTheme import com.android.developers.androidify.theme.components.AndroidifyTopAppBar import com.android.developers.androidify.theme.components.PrimaryButton import com.android.developers.androidify.util.LargeScreensPreview import com.android.developers.androidify.util.SmallPhonePreview -import com.android.developers.androidify.util.isAtLeastMedium import kotlinx.coroutines.delay import kotlin.math.roundToInt import com.android.developers.androidify.creation.R as CreationR @@ -83,12 +83,35 @@ import com.android.developers.androidify.creation.R as CreationR @Composable fun LoadingScreen( onCancelPress: () -> Unit, - isMediumScreen: Boolean = isAtLeastMedium(), + layoutType: EditScreenLayoutType, +) { + when (layoutType) { + EditScreenLayoutType.Spatial -> + LoadingScreenSpatial( + onCancelPress = onCancelPress, + ) + + EditScreenLayoutType.Compact, EditScreenLayoutType.Medium -> + LoadingScreenScaffold( + topBar = { + AndroidifyTopAppBar(isMediumWindowSize = layoutType == EditScreenLayoutType.Medium) + }, + onCancelPress = onCancelPress, + ) { + LoadingScreenContents() + } + } +} + +@Composable +fun LoadingScreenScaffold( + topBar: @Composable () -> Unit, + onCancelPress: () -> Unit, + containerColor: Color = MaterialTheme.colorScheme.secondary, + content: @Composable () -> Unit, ) { Scaffold( - topBar = { - AndroidifyTopAppBar(isMediumWindowSize = isMediumScreen) - }, + topBar = topBar, bottomBar = { Box( modifier = Modifier @@ -105,23 +128,25 @@ fun LoadingScreen( ) } }, - containerColor = MaterialTheme.colorScheme.secondary, + containerColor = containerColor, modifier = Modifier .fillMaxSize() .keepScreenOn(), ) { contentPadding -> - LoadingScreenContents(contentPadding) + Box( + modifier = Modifier + .fillMaxSize() + .padding(contentPadding), + ) { + content() + } } } @Composable -private fun LoadingScreenContents( - contentPadding: PaddingValues, -) { +fun LoadingScreenContents() { Column( - modifier = Modifier - .fillMaxSize() - .padding(contentPadding), + modifier = Modifier.fillMaxSize(), horizontalAlignment = Alignment.CenterHorizontally, verticalArrangement = Arrangement.Center, ) { @@ -202,7 +227,7 @@ private fun BoxScope.DecorativeSparkleDarkGreen(modifier: Modifier = Modifier) { @Composable fun LoadingScreenLargePreview() { AndroidifyTheme { - LoadingScreen(onCancelPress = {}) + LoadingScreen(onCancelPress = {}, layoutType = EditScreenLayoutType.Medium) } } @@ -212,7 +237,7 @@ fun LoadingScreenLargePreview() { @Composable fun LoadingScreenPreview() { AndroidifyTheme { - LoadingScreen(onCancelPress = {}, isMediumScreen = false) + LoadingScreen(onCancelPress = {}, layoutType = EditScreenLayoutType.Compact) } } diff --git a/feature/creation/src/main/java/com/android/developers/androidify/creation/xr/LoadingScreenSpatial.kt b/feature/creation/src/main/java/com/android/developers/androidify/creation/xr/LoadingScreenSpatial.kt new file mode 100644 index 00000000..a0a86f84 --- /dev/null +++ b/feature/creation/src/main/java/com/android/developers/androidify/creation/xr/LoadingScreenSpatial.kt @@ -0,0 +1,115 @@ +/* + * Copyright 2025 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.android.developers.androidify.creation.xr + +import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.fillMaxHeight +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.size +import androidx.compose.material3.IconButtonDefaults +import androidx.compose.material3.MaterialTheme +import androidx.compose.runtime.Composable +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.unit.dp +import androidx.xr.compose.spatial.ContentEdge +import androidx.xr.compose.spatial.Orbiter +import androidx.xr.compose.spatial.OrbiterOffsetType +import androidx.xr.compose.subspace.SpatialPanel +import androidx.xr.compose.subspace.layout.SubspaceModifier +import androidx.xr.compose.subspace.layout.fillMaxHeight +import androidx.xr.compose.subspace.layout.fillMaxWidth +import androidx.xr.compose.subspace.layout.offset +import com.android.developers.androidify.creation.LoadingScreenContents +import com.android.developers.androidify.creation.LoadingScreenScaffold +import com.android.developers.androidify.theme.AndroidifyTheme +import com.android.developers.androidify.util.TabletPreview +import com.android.developers.androidify.xr.BackgroundSubspace +import com.android.developers.androidify.xr.FillBackground +import com.android.developers.androidify.xr.MainPanelWorkaround +import com.android.developers.androidify.xr.RequestHomeSpaceIconButton +import com.android.developers.androidify.creation.R as CreationR + +private const val squiggleSafeContentWidth = 0.4f +private const val squiggleSafeContentHeight = 0.6f + +@Composable +fun LoadingScreenSpatial( + onCancelPress: () -> Unit, +) { + BackgroundSubspace( + aspectRatio = 1.4f, + minimumHeight = 500.dp, + drawable = CreationR.drawable.squiggle_light, + ) { + MainPanelWorkaround() + Orbiter( + position = ContentEdge.Top, + offsetType = OrbiterOffsetType.OuterEdge, + offset = 32.dp, + alignment = Alignment.End, + ) { + RequestHomeSpaceIconButton( + modifier = Modifier + .size(64.dp, 64.dp) + .padding(8.dp), + colors = IconButtonDefaults.iconButtonColors( + containerColor = MaterialTheme.colorScheme.secondaryContainer, + ), + ) + } + SpatialPanel( + SubspaceModifier + .fillMaxWidth(squiggleSafeContentWidth) + .fillMaxHeight(squiggleSafeContentHeight) + .offset(z = 10.dp), + ) { + LoadingScreenScaffold( + topBar = {}, + onCancelPress = onCancelPress, + containerColor = Color.Transparent, + ) { + LoadingScreenContents() + } + } + } +} + +@TabletPreview +@Composable +private fun LoadingScreenSpatialPreview() { + AndroidifyTheme { + Box { + FillBackground(CreationR.drawable.squiggle_light) + Box( + Modifier + .fillMaxHeight(squiggleSafeContentHeight) + .fillMaxWidth(squiggleSafeContentWidth) + .align(Alignment.Center), + ) { + LoadingScreenScaffold( + topBar = {}, + onCancelPress = { }, + containerColor = Color.Transparent, + ) { + LoadingScreenContents() + } + } + } + } +} diff --git a/feature/creation/src/main/res/drawable/squiggle_light.xml b/feature/creation/src/main/res/drawable/squiggle_light.xml new file mode 100644 index 00000000..3e89dffa --- /dev/null +++ b/feature/creation/src/main/res/drawable/squiggle_light.xml @@ -0,0 +1,31 @@ + + + + + + + From 6ce74866b7c832fd1cb9d515686cea4c0a035c5a Mon Sep 17 00:00:00 2001 From: Dereck Bridie Date: Mon, 15 Sep 2025 18:03:10 +0200 Subject: [PATCH 3/4] Fix CreationScreenTest --- .../developers/androidify/creation/CreationScreenTest.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/feature/creation/src/androidTest/java/com/android/developers/androidify/creation/CreationScreenTest.kt b/feature/creation/src/androidTest/java/com/android/developers/androidify/creation/CreationScreenTest.kt index 2f0fa383..837eb79f 100644 --- a/feature/creation/src/androidTest/java/com/android/developers/androidify/creation/CreationScreenTest.kt +++ b/feature/creation/src/androidTest/java/com/android/developers/androidify/creation/CreationScreenTest.kt @@ -303,7 +303,7 @@ class CreationScreenTest { composeTestRule.setContent { SharedElementContextPreview { - LoadingScreen(onCancelPress = {}) + LoadingScreen(onCancelPress = {}, layoutType = EditScreenLayoutType.Medium) } } From 7aa6120f564a995580e62cd7be51f9506d3ed0b2 Mon Sep 17 00:00:00 2001 From: Dereck Bridie Date: Tue, 16 Sep 2025 15:51:33 +0200 Subject: [PATCH 4/4] Refactor Scaffold contentPadding back into parameter --- .../androidify/creation/LoadingScreen.kt | 24 ++++++++----------- .../creation/xr/LoadingScreenSpatial.kt | 8 +++---- 2 files changed, 14 insertions(+), 18 deletions(-) diff --git a/feature/creation/src/main/java/com/android/developers/androidify/creation/LoadingScreen.kt b/feature/creation/src/main/java/com/android/developers/androidify/creation/LoadingScreen.kt index 61866a2f..e593c2c5 100644 --- a/feature/creation/src/main/java/com/android/developers/androidify/creation/LoadingScreen.kt +++ b/feature/creation/src/main/java/com/android/developers/androidify/creation/LoadingScreen.kt @@ -27,6 +27,7 @@ import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.BoxScope import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.PaddingValues import androidx.compose.foundation.layout.Spacer import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.fillMaxWidth @@ -97,8 +98,8 @@ fun LoadingScreen( AndroidifyTopAppBar(isMediumWindowSize = layoutType == EditScreenLayoutType.Medium) }, onCancelPress = onCancelPress, - ) { - LoadingScreenContents() + ) { contentPadding -> + LoadingScreenContents(contentPadding) } } } @@ -108,7 +109,7 @@ fun LoadingScreenScaffold( topBar: @Composable () -> Unit, onCancelPress: () -> Unit, containerColor: Color = MaterialTheme.colorScheme.secondary, - content: @Composable () -> Unit, + content: @Composable (PaddingValues) -> Unit, ) { Scaffold( topBar = topBar, @@ -132,21 +133,16 @@ fun LoadingScreenScaffold( modifier = Modifier .fillMaxSize() .keepScreenOn(), - ) { contentPadding -> - Box( - modifier = Modifier - .fillMaxSize() - .padding(contentPadding), - ) { - content() - } - } + content = content, + ) } @Composable -fun LoadingScreenContents() { +fun LoadingScreenContents(contentPadding: PaddingValues) { Column( - modifier = Modifier.fillMaxSize(), + modifier = Modifier + .fillMaxSize() + .padding(contentPadding), horizontalAlignment = Alignment.CenterHorizontally, verticalArrangement = Arrangement.Center, ) { diff --git a/feature/creation/src/main/java/com/android/developers/androidify/creation/xr/LoadingScreenSpatial.kt b/feature/creation/src/main/java/com/android/developers/androidify/creation/xr/LoadingScreenSpatial.kt index a0a86f84..c0c9c239 100644 --- a/feature/creation/src/main/java/com/android/developers/androidify/creation/xr/LoadingScreenSpatial.kt +++ b/feature/creation/src/main/java/com/android/developers/androidify/creation/xr/LoadingScreenSpatial.kt @@ -83,8 +83,8 @@ fun LoadingScreenSpatial( topBar = {}, onCancelPress = onCancelPress, containerColor = Color.Transparent, - ) { - LoadingScreenContents() + ) { contentPadding -> + LoadingScreenContents(contentPadding) } } } @@ -106,8 +106,8 @@ private fun LoadingScreenSpatialPreview() { topBar = {}, onCancelPress = { }, containerColor = Color.Transparent, - ) { - LoadingScreenContents() + ) { contentPadding -> + LoadingScreenContents(contentPadding) } } }