Skip to content

HelloAndroidXR update for May 2026 #32

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
amyZepp merged 2 commits into from
May 13, 2026
Merged

HelloAndroidXR update for May 2026 #32

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
d24aaa2
- Updated dependencies for latest JXR release
amyZepp May 12, 2026
3c61204
Update app/src/main/java/com/example/helloandroidxr/ui/components/Bug…
amyZepp May 12, 2026
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
0 ...c/main/res/raw/bugdroid_animated_wave.glb → .../assets/models/bugdroid_animated_wave.glb
View file
Open in desktop
File renamed without changes.
0 app/src/main/assets/white.png → app/src/main/assets/textures/white.png
View file
Open in desktop
File renamed without changes
82 changes: 0 additions & 82 deletions app/src/main/java/com/example/helloandroidxr/bugdroid/BugdroidController.kt
View file
Open in desktop

This file was deleted.

30 changes: 15 additions & 15 deletions app/src/main/java/com/example/helloandroidxr/ui/HelloAndroidXRApp.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,24 +55,23 @@ import androidx.compose.ui.res.stringResource
import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.unit.dp
import androidx.window.core.layout.WindowSizeClass
import androidx.window.core.layout.WindowWidthSizeClass
import androidx.xr.compose.platform.LocalSpatialCapabilities
import androidx.xr.compose.platform.LocalSpatialConfiguration
import androidx.xr.compose.spatial.ContentEdge
import androidx.xr.compose.spatial.Orbiter
import androidx.xr.compose.spatial.Subspace
import androidx.xr.compose.subspace.MovePolicy
import androidx.xr.compose.subspace.ResizePolicy
import androidx.xr.compose.subspace.SpatialColumn
import androidx.xr.compose.subspace.SpatialPanel
import androidx.xr.compose.subspace.SpatialRow
import androidx.xr.compose.subspace.draw.alpha
import androidx.xr.compose.subspace.layout.SubspaceModifier
import androidx.xr.compose.subspace.layout.alpha
import androidx.xr.compose.subspace.layout.fillMaxSize
import androidx.xr.compose.subspace.layout.fillMaxWidth
import androidx.xr.compose.subspace.layout.height
import androidx.xr.compose.subspace.layout.movable
import androidx.xr.compose.subspace.layout.offset
import androidx.xr.compose.subspace.layout.padding
import androidx.xr.compose.subspace.layout.resizable
import androidx.xr.compose.subspace.layout.rotate
import androidx.xr.compose.subspace.layout.size
import androidx.xr.compose.subspace.layout.width
Expand Down Expand Up @@ -181,18 +180,18 @@ private fun SpatialLayout(
SubspaceModifier
.alpha(animatedAlpha.value)
.size(400.dp)
.padding(bottom = 16.dp),
dragPolicy = MovePolicy(isEnabled = true),
resizePolicy = ResizePolicy(isEnabled = true)
.padding(bottom = 16.dp)
.movable()
.resizable(),
) {
firstSupportingContent()
}
SpatialPanel(
SubspaceModifier
.alpha(animatedAlpha.value)
.weight(1f),
dragPolicy = MovePolicy(isEnabled = true),
resizePolicy = ResizePolicy(isEnabled = true)
.weight(1f)
.movable()
.resizable(),
) {
secondSupportingContent()
}
Expand All @@ -201,9 +200,9 @@ private fun SpatialLayout(
modifier = SubspaceModifier
.alpha(animatedAlpha.value)
.fillMaxSize()
.padding(left = 16.dp),
dragPolicy = MovePolicy(isEnabled = true),
resizePolicy = ResizePolicy(isEnabled = true)
.padding(end = 16.dp)
.movable()
.resizable(),
) {
Column {
TopAppBar()
Expand All @@ -222,7 +221,7 @@ private fun NonSpatialTwoPaneLayout(
primaryPane: @Composable () -> Unit,
secondaryPane: @Composable () -> Unit,
modifier: Modifier = Modifier,
windowSizeClass: WindowSizeClass = currentWindowAdaptiveInfo().windowSizeClass
windowSizeClass: WindowSizeClass = currentWindowAdaptiveInfo(supportLargeAndXLargeWidth = true).windowSizeClass
) {
val animatedAlpha = remember { Animatable(0.5f) }
LaunchedEffect(Unit) {
Expand All @@ -241,7 +240,7 @@ private fun NonSpatialTwoPaneLayout(
) {
TopAppBar()
Spacer(Modifier.height(16.dp))
if (windowSizeClass.windowWidthSizeClass == WindowWidthSizeClass.COMPACT) {
if (windowSizeClass.isWidthAtLeastBreakpoint(WindowSizeClass.HEIGHT_DP_EXPANDED_LOWER_BOUND)) {
TopAndBottomPaneLayout(primaryPane, secondaryPane)
} else {
SideBySidePaneLayout(primaryPane, secondaryPane)
Expand Down Expand Up @@ -305,6 +304,7 @@ private fun TopAndBottomPaneLayout(
/**
* Contains controls that decompose into Orbiters when spatial UI is enabled
*/
@Suppress("DEPRECATION")
@Composable
private fun TopAppBar() {
Row(
Expand Down
Loading
Loading