Skip to content

Update to September release of the XR libraries #156

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 8, 2025
Merged

Update to September release of the XR libraries #156

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d740be3
Update to September release of the XR libraries
devbridie Oct 2, 2025
531643f
Merge branch 'main' into jetpack-september
devbridie Oct 8, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 10 additions & 10 deletions core/xr/src/main/java/com/android/developers/androidify/xr/SpatialComponents.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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,
Expand All @@ -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,
),
Comment on lines +85 to +89
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

medium

To improve performance, it's recommended to memoize the creation of MovePolicy and ResizePolicy using remember. This avoids creating new objects on every recomposition. Since onMove and minimumHeight can change, they should be used as keys for remember.

For example:

val dragPolicy = remember(onMove) { MovePolicy(onMove = onMove) }
val resizePolicy = remember(minimumHeight) {
    ResizePolicy(
        minimumSize = DpVolumeSize(0.dp, minimumHeight, 0.dp),
        shouldMaintainAspectRatio = true,
    )
}
SpatialPanel(
    // ...
    dragPolicy = dragPolicy,
    resizePolicy = resizePolicy,
)

) {
FillBackground(drawable)
Subspace {
Expand Down
1 change: 0 additions & 1 deletion feature/home/src/main/java/com/android/developers/androidify/home/AboutScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
13 changes: 7 additions & 6 deletions feature/home/src/main/java/com/android/developers/androidify/home/xr/HomeScreenSpatial.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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(),
Comment on lines +101 to +102
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

medium

To optimize performance, you should wrap the creation of ResizePolicy and MovePolicy with remember. This prevents creating new policy objects on every recomposition.

For example:

val resizePolicy = remember { ResizePolicy(shouldMaintainAspectRatio = true) }
val dragPolicy = remember { MovePolicy() }
SpatialPanel(
    // ...
    resizePolicy = resizePolicy,
    dragPolicy = dragPolicy,
)

) {
VideoPlayer(videoLink)
}
Expand All @@ -115,7 +116,7 @@ private fun HomeScreenSpatialMainContent(
var positionButtonClick by remember {
mutableStateOf(IntOffset.Zero)
}
Box {
Box(Modifier.fillMaxSize()) {
Column(
modifier = Modifier
.fillMaxWidth(0.55f)
Expand Down
2 changes: 1 addition & 1 deletion gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" }
Expand Down