Merge branch 'main' into feature/png

Author: riggaroo

app/src/main/AndroidManifest.xml

@@ -23,6 +23,9 @@
         android:name="android.hardware.camera"
         android:required="true" />
 
+    <!-- Androidify can use XR features if they're available; they're not required. -->
+    <uses-feature android:name="android.software.xr.api.spatial" android:required="false" />
+
     <uses-permission android:name="android.permission.CAMERA" />
     <uses-sdk tools:overrideLibrary="com.google.ai.edge.aicore" />
 

app/src/main/java/com/android/developers/androidify/navigation/MainNavigation.kt

@@ -31,6 +31,7 @@ import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.platform.LocalUriHandler
 import androidx.compose.ui.unit.IntOffset
 import androidx.hilt.navigation.compose.hiltViewModel
 import androidx.lifecycle.viewmodel.navigation3.rememberViewModelStoreNavEntryDecorator
@@ -184,13 +185,20 @@ fun MainNavigation() {
             }
             entry<About> {
                 val context = LocalContext.current
+                val uriHandler = LocalUriHandler.current
                 AboutScreen(
                     onBackPressed = {
                         backStack.removeLastOrNull()
                     },
                     onLicensesClicked = {
                         context.startActivity(Intent(context, OssLicensesMenuActivity::class.java))
                     },
+                    onPrivacyClicked = {
+                        uriHandler.openUri("https://policies.google.com/privacy")
+                    },
+                    onTermsClicked = {
+                        uriHandler.openUri("https://policies.google.com/terms")
+                    }
                 )
             }
         },

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

@@ -16,25 +16,24 @@
 package com.android.developers.androidify.xr
 
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.DisposableEffect
 import androidx.xr.compose.platform.LocalSession
 import androidx.xr.scenecore.scene
-import kotlinx.coroutines.delay
 
 /*
- * A composable that attempts to continually hide the mainPanel.
+ * A composable that hides the mainPanel when it is disposed. When placed outside of an (Application)Subspace,
+ * this composable will be disposed after the Subspace, hiding the mainPanelEntity again.
  *
- * This is a temporary workaround for b/440325404, that causes the mainPanelEntity when an
+ * This is a temporary workaround for b/440325404, that causes the mainPanelEntity to appear when an
  * ApplicationSubspace transitions out of the composition due to a race condition when transitioning
  * the two hierarchies.
  */
 @Composable
 fun MainPanelWorkaround() {
-    val session = LocalSession.current
-    LaunchedEffect(null) {
-        while (true) {
-            delay(100L)
-            session?.scene?.mainPanelEntity?.setEnabled(false)
+    val session = LocalSession.current ?: return
+    DisposableEffect(session) {
+        onDispose {
+            session.scene.mainPanelEntity.setEnabled(false)
         }
     }
 }

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/creation/src/main/java/com/android/developers/androidify/creation/EditScreen.kt

@@ -151,7 +151,7 @@ fun EditScreenScaffoldWithAppBar(
                 },
                 actions = {
                     AboutButton { onAboutPressed() }
-                    if (couldRequestFullSpace()) {
+                    if (uiState.xrEnabled && couldRequestFullSpace()) {
                         RequestFullSpaceIconButton()
                     }
                 },

feature/creation/src/main/java/com/android/developers/androidify/creation/xr/EditScreenSpatial.kt

@@ -75,8 +75,8 @@ fun EditScreenSpatial(
     onDropCallback: (Uri) -> Unit = {},
 ) {
     DisableSharedTransition {
+        MainPanelWorkaround()
         SquiggleBackgroundSubspace(minimumHeight = 600.dp) {
-            MainPanelWorkaround()
             SpatialColumn(SubspaceModifier.fillMaxWidth()) {
                 SpatialPanel(
                     SubspaceModifier.offset(z = 10.dp)

feature/creation/src/main/java/com/android/developers/androidify/creation/xr/LoadingScreenSpatial.kt

@@ -52,12 +52,12 @@ private const val squiggleSafeContentHeight = 0.6f
 fun LoadingScreenSpatial(
     onCancelPress: () -> Unit,
 ) {
+    MainPanelWorkaround()
     BackgroundSubspace(
         aspectRatio = 1.4f,
         minimumHeight = 500.dp,
         drawable = CreationR.drawable.squiggle_light,
     ) {
-        MainPanelWorkaround()
         Orbiter(
             position = ContentEdge.Top,
             offsetType = OrbiterOffsetType.OuterEdge,