sync xr snippets to march release of JXR libraries (#848)

* sync xr snippets to march release of JXR libraries

* fix jxr march release issues

* update jxr glimmer to alpha 9

* change back region tag

Author: trambui09

gradle/libs.versions.toml

@@ -32,12 +32,12 @@ androidx-window = "1.5.1"
 androidx-window-core = "1.5.1"
 androidx-window-java = "1.5.1"
 androidx-work-runtime = "2.11.1"
-androidx-xr-arcore = "1.0.0-alpha11"
-androidx-xr-arcore-play-services = "1.0.0-alpha11"
-androidx-xr-compose = "1.0.0-alpha11"
-androidx-xr-glimmer = "1.0.0-alpha08"
-androidx-xr-projected = "1.0.0-alpha05"
-androidx-xr-scenecore = "1.0.0-alpha12"
+androidx-xr-arcore = "1.0.0-alpha12"
+androidx-xr-arcore-play-services = "1.0.0-alpha12"
+androidx-xr-compose = "1.0.0-alpha12"
+androidx-xr-glimmer = "1.0.0-alpha09"
+androidx-xr-projected = "1.0.0-alpha06"
+androidx-xr-scenecore = "1.0.0-alpha13"
 androidxHiltNavigationCompose = "1.3.0"
 appcompat = "1.7.1"
 coil = "2.7.0"

xr/src/main/java/com/example/xr/arcore/Anchors.kt

@@ -18,7 +18,7 @@ package com.example.xr.arcore
 
 import androidx.xr.arcore.Anchor
 import androidx.xr.arcore.AnchorCreateSuccess
-import androidx.xr.arcore.Trackable
+import androidx.xr.arcore.runtime.Anchorable
 import androidx.xr.runtime.AnchorPersistenceMode
 import androidx.xr.runtime.Session
 import androidx.xr.runtime.SessionConfigureSuccess
@@ -50,10 +50,10 @@ private fun createAnchorAtPose(session: Session, pose: Pose) {
     // [END androidxr_arcore_anchor_create]
 }
 
-private fun createAnchorAtTrackable(trackable: Trackable<*>) {
+private fun createAnchorAtAnchorable(anchorable: Anchorable) {
     val pose = Pose()
     // [START androidxr_arcore_anchor_create_trackable]
-    when (val result = trackable.createAnchor(pose)) {
+    when (val result = anchorable.createAnchor(pose)) {
         is AnchorCreateSuccess -> { /* anchor stored in `result.anchor`. */ }
         else -> { /* handle failure */ }
     }

xr/src/main/java/com/example/xr/runtime/DeviceLifecycle.kt

@@ -21,17 +21,16 @@ import androidx.lifecycle.Lifecycle
 import androidx.xr.projected.ProjectedContext
 import androidx.xr.projected.experimental.ExperimentalProjectedApi
 import androidx.xr.runtime.ExperimentalXrDeviceLifecycleApi
-import androidx.xr.runtime.Session
 import androidx.xr.runtime.XrDevice
 import kotlinx.coroutines.flow.takeWhile
 
 @OptIn(ExperimentalXrDeviceLifecycleApi::class, ExperimentalProjectedApi::class)
-suspend fun collectDeviceLifecycle(context: Context, session: Session) {
+suspend fun collectDeviceLifecycle(context: Context) {
 
     val projectedContext = ProjectedContext.createProjectedDeviceContext(context)
 
     // [START androidxr_device_lifecycle_collect]
-    val xrDevice = XrDevice.getCurrentDevice(projectedContext, session)
+    val xrDevice = XrDevice.getCurrentDevice(projectedContext)
 
     xrDevice.getLifecycle().currentStateFlow
         .takeWhile { it != Lifecycle.State.DESTROYED }

xr/src/main/java/com/example/xr/scenecore/MaterialOverride.kt

@@ -19,7 +19,7 @@ package com.example.xr.scenecore
 import androidx.xr.runtime.Session
 import androidx.xr.runtime.math.Vector4
 import androidx.xr.scenecore.AlphaMode
-import androidx.xr.scenecore.GltfModelEntity
+import androidx.xr.scenecore.GltfModelNode
 import androidx.xr.scenecore.KhronosPbrMaterial
 import androidx.xr.scenecore.Texture
 import kotlin.io.path.Path
@@ -65,20 +65,17 @@ private class MaterialOverride(val xrSession: Session) {
         // [END androidxr_scenecore_material_override_setOcclusionTexture]
     }
 
-    private fun setMaterialOverride(gltfModelEntity: GltfModelEntity, pbrMaterial: KhronosPbrMaterial) {
+    private fun setMaterialOverride(gltfModelNode: GltfModelNode, pbrMaterial: KhronosPbrMaterial) {
         // [START androidxr_scenecore_material_override_setMaterialOverride]
-        gltfModelEntity.setMaterialOverride(
-            material = pbrMaterial,
-            nodeName = "Node Name"
+        gltfModelNode.setMaterialOverride(
+            material = pbrMaterial
         )
         // [END androidxr_scenecore_material_override_setMaterialOverride]
     }
 
-    private fun clearMaterialOverride(gltfModelEntity: GltfModelEntity) {
+    private fun clearMaterialOverride(gltfModelNode: GltfModelNode) {
         // [START androidxr_scenecore_material_override_clearMaterialOverride]
-        gltfModelEntity.clearMaterialOverride(
-            nodeName = "Node Name"
-        )
+        gltfModelNode.clearMaterialOverride()
         // [END androidxr_scenecore_material_override_clearMaterialOverride]
     }
 }