Merge pull request #156 from devbridie/jetpack-september

Update to September release of the XR libraries

Author: devbridie

core/xr/src/main/java/com/android/developers/androidify/xr/SpatialComponents.kt

@@ -30,18 +30,18 @@ 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.MovePolicy
+import androidx.xr.compose.subspace.ResizePolicy
 import androidx.xr.compose.subspace.SpatialBox
 import androidx.xr.compose.subspace.SpatialBoxScope
 import androidx.xr.compose.subspace.SpatialPanel
 import androidx.xr.compose.subspace.SubspaceComposable
-import androidx.xr.compose.subspace.layout.MoveEvent
+import androidx.xr.compose.subspace.layout.SpatialMoveEvent
 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 androidx.xr.compose.unit.DpVolumeSize
 import com.android.developers.androidify.theme.AndroidifyTheme
 
@@ -53,7 +53,7 @@ import com.android.developers.androidify.theme.AndroidifyTheme
 @Composable
 fun SquiggleBackgroundSubspace(
     minimumHeight: Dp,
-    onMove: ((MoveEvent) -> Boolean)? = null,
+    onMove: ((SpatialMoveEvent) -> Boolean)? = null,
     content:
     @SubspaceComposable @Composable
     SpatialBoxScope.() -> Unit,
@@ -72,21 +72,21 @@ fun BackgroundSubspace(
     aspectRatio: Float,
     @DrawableRes drawable: Int,
     minimumHeight: Dp,
-    onMove: ((MoveEvent) -> Boolean)? = null,
+    onMove: ((SpatialMoveEvent) -> Boolean)? = null,
     content:
     @SubspaceComposable @Composable
     SpatialBoxScope.() -> Unit,
 ) {
     Subspace {
         SpatialPanel(
             SubspaceModifier
-                .movable(onMove = onMove)
-                .resizable(
-                    minimumSize = DpVolumeSize(0.dp, minimumHeight, 0.dp),
-                    maintainAspectRatio = true,
-                )
                 .fillMaxWidth()
                 .aspectRatio(aspectRatio),
+            dragPolicy = MovePolicy(onMove = onMove),
+            resizePolicy = ResizePolicy(
+                minimumSize = DpVolumeSize(0.dp, minimumHeight, 0.dp),
+                shouldMaintainAspectRatio = true,
+            ),
         ) {
             FillBackground(drawable)
             Subspace {

feature/home/src/main/java/com/android/developers/androidify/home/AboutScreen.kt

@@ -27,7 +27,6 @@ import androidx.compose.foundation.layout.IntrinsicSize
 import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
-import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.safeDrawingPadding

feature/home/src/main/java/com/android/developers/androidify/home/xr/HomeScreenSpatial.kt

@@ -18,6 +18,7 @@ package com.android.developers.androidify.home.xr
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.fillMaxHeight
+import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
@@ -38,16 +39,16 @@ 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.MovePolicy
+import androidx.xr.compose.subspace.ResizePolicy
 import androidx.xr.compose.subspace.SpatialPanel
 import androidx.xr.compose.subspace.layout.SpatialAlignment
 import androidx.xr.compose.subspace.layout.SubspaceModifier
 import androidx.xr.compose.subspace.layout.aspectRatio
 import androidx.xr.compose.subspace.layout.fillMaxHeight
 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 androidx.xr.compose.subspace.layout.rotate
 import com.android.developers.androidify.home.HomePageButton
 import com.android.developers.androidify.home.MainHomeContent
@@ -94,11 +95,11 @@ fun HomeScreenContentsSpatial(
                     .fillMaxWidth(0.2f)
                     .fillMaxHeight(0.8f)
                     .aspectRatio(0.77f)
-                    .resizable(maintainAspectRatio = true)
-                    .movable()
-                    .align(SpatialAlignment.CenterRight)
+                    .align(SpatialAlignment.CenterEnd)
                     .offset(z = 10.dp)
                     .rotate(0f, 0f, 5f),
+                resizePolicy = ResizePolicy(shouldMaintainAspectRatio = true),
+                dragPolicy = MovePolicy(),
             ) {
                 VideoPlayer(videoLink)
             }
@@ -115,7 +116,7 @@ private fun HomeScreenSpatialMainContent(
     var positionButtonClick by remember {
         mutableStateOf(IntOffset.Zero)
     }
-    Box {
+    Box(Modifier.fillMaxSize()) {
         Column(
             modifier = Modifier
                 .fillMaxWidth(0.55f)

gradle/libs.versions.toml

@@ -85,7 +85,7 @@ mlkitSegmentation = "16.0.0-beta1"
 playServicesBase = "18.7.2"
 timber = "5.0.1"
 workRuntimeKtx = "2.10.4"
-xr-compose = "1.0.0-alpha06"
+xr-compose = "1.0.0-alpha07"
 
 [libraries]
 accompanist-permissions = { module = "com.google.accompanist:accompanist-permissions", version.ref = "accompanist" }