Fix deprecations and upgrade OSS, Retrofit

app/src/main/AndroidManifest.xml

@@ -99,12 +99,8 @@
         </activity>
         <!-- need to use Theme.AppCompat -->
         <activity
-            android:name="com.google.android.gms.oss.licenses.OssLicensesMenuActivity"
-            android:theme="@style/AppCompatAndroidify" />
-
-        <!-- needs to use Theme.AppCompat -->
-        <activity
-            android:name="com.google.android.gms.oss.licenses.OssLicensesActivity"
+            android:name="com.google.android.gms.oss.licenses.v2.OssLicensesMenuActivity"
+            tools:replace="android:theme"
             android:theme="@style/AppCompatAndroidify" />
 
         <meta-data

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

@@ -48,7 +48,7 @@ import com.android.developers.androidify.home.HomeScreen
 import com.android.developers.androidify.results.ResultsScreen
 import com.android.developers.androidify.results.ResultsViewModel
 import com.android.developers.androidify.theme.transitions.ColorSplashTransitionScreen
-import com.google.android.gms.oss.licenses.OssLicensesMenuActivity
+import com.google.android.gms.oss.licenses.v2.OssLicensesMenuActivity
 
 @ExperimentalMaterial3ExpressiveApi
 @Composable

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

@@ -30,7 +30,6 @@ 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
@@ -41,7 +40,9 @@ 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.transformingMovable
 import androidx.xr.compose.unit.DpVolumeSize
 import com.android.developers.androidify.theme.AndroidifyTheme
 
@@ -53,7 +54,7 @@ import com.android.developers.androidify.theme.AndroidifyTheme
 @Composable
 fun SquiggleBackgroundSubspace(
     minimumHeight: Dp,
-    onMove: ((SpatialMoveEvent) -> Boolean)? = null,
+    onMove: ((SpatialMoveEvent) -> Unit)? = null,
     content:
     @SubspaceComposable @Composable
     SpatialBoxScope.() -> Unit,
@@ -72,7 +73,7 @@ fun BackgroundSubspace(
     aspectRatio: Float,
     @DrawableRes drawable: Int,
     minimumHeight: Dp,
-    onMove: ((SpatialMoveEvent) -> Boolean)? = null,
+    onMove: ((SpatialMoveEvent) -> Unit)? = null,
     content:
     @SubspaceComposable @Composable
     SpatialBoxScope.() -> Unit,
@@ -81,8 +82,14 @@ fun BackgroundSubspace(
         SpatialPanel(
             SubspaceModifier
                 .fillMaxWidth()
-                .aspectRatio(aspectRatio),
-            dragPolicy = MovePolicy(onMove = onMove),
+                .aspectRatio(aspectRatio)
+                .let { modifier ->
+                    if (onMove != null) {
+                        modifier.movable(onMove = onMove)
+                    } else {
+                        modifier.transformingMovable()
+                    }
+                },
             resizePolicy = ResizePolicy(
                 minimumSize = DpVolumeSize(0.dp, minimumHeight, 0.dp),
                 shouldMaintainAspectRatio = true,

feature/camera/src/main/java/com/android/developers/androidify/camera/CameraScreen.kt

@@ -56,7 +56,7 @@ import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.unit.dp
 import androidx.graphics.shapes.RoundedPolygon
 import androidx.graphics.shapes.rectangle
-import androidx.hilt.navigation.compose.hiltViewModel
+import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel
 import androidx.lifecycle.compose.LifecycleStartEffect
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import androidx.window.layout.FoldingFeature

feature/camera/src/main/java/com/android/developers/androidify/camera/CameraViewfinder.kt

@@ -69,7 +69,7 @@ internal fun CameraViewfinder(
             }
             .transformable(
                 rememberTransformableState(
-                    onTransformation = { zoomChange, _, _ ->
+                    onTransformation = { _, zoomChange, _, _ ->
                         onScaleCurrentZoom(zoomChange)
                     },
                 ),

feature/camera/src/main/java/com/android/developers/androidify/camera/CameraZoomToolbar.kt

@@ -78,35 +78,41 @@ internal fun ZoomToolbar(
             }
         }
     }
-    val textMeasurer = rememberTextMeasurer()
 
     ButtonGroup(
+        overflowIndicator = {},
         modifier = modifier,
         horizontalArrangement = Arrangement.spacedBy(ButtonGroupDefaults.ConnectedSpaceBetween),
         expandedRatio = 0f,
     ) {
-        ToggleButton(
-            checked = selectedOptionIndex == 0,
-            onCheckedChange = { onZoomLevelSelected(defaultZoomOptions[0]) },
-            shapes = ButtonGroupDefaults.connectedLeadingButtonShapes(),
-            colors = ToggleButtonDefaults.toggleButtonColors(),
-            modifier = Modifier,
-        ) {
-            val textLayoutResult = textMeasurer.measure("M.MX", LocalTextStyle.current)
-            val width = with(LocalDensity.current) { textLayoutResult.size.width.toDp() }
-            Text(options[0], Modifier.widthIn(min = width), textAlign = TextAlign.Center)
-        }
-        ToggleButton(
-            checked = selectedOptionIndex == 1,
-            onCheckedChange = { onZoomLevelSelected(defaultZoomOptions[1]) },
-            shapes = ButtonGroupDefaults.connectedTrailingButtonShapes(),
-            colors = ToggleButtonDefaults.toggleButtonColors(),
-            modifier = Modifier,
-        ) {
-            val textLayoutResult = textMeasurer.measure("M.MX", LocalTextStyle.current)
-            val width = with(LocalDensity.current) { textLayoutResult.size.width.toDp() }
-            Text(options[1], Modifier.widthIn(min = width), textAlign = TextAlign.Center)
-        }
+        customItem(
+            buttonGroupContent = {
+                ToggleButton(
+                    checked = selectedOptionIndex == 0,
+                    onCheckedChange = { onZoomLevelSelected(defaultZoomOptions[0]) },
+                    shapes = ButtonGroupDefaults.connectedLeadingButtonShapes(),
+                    colors = ToggleButtonDefaults.toggleButtonColors(),
+                    modifier = Modifier,
+                ) {
+                    Text(options[0], Modifier, textAlign = TextAlign.Center)
+                }
+            },
+            menuContent = {},
+        )
+        customItem(
+            buttonGroupContent = {
+                ToggleButton(
+                    checked = selectedOptionIndex == 1,
+                    onCheckedChange = { onZoomLevelSelected(defaultZoomOptions[1]) },
+                    shapes = ButtonGroupDefaults.connectedTrailingButtonShapes(),
+                    colors = ToggleButtonDefaults.toggleButtonColors(),
+                    modifier = Modifier,
+                ) {
+                    Text(options[1], Modifier, textAlign = TextAlign.Center)
+                }
+            },
+            menuContent = {},
+        )
     }
 }
 

feature/camera/src/main/java/com/android/developers/androidify/camera/xr/CameraLayoutSpatial.kt

@@ -26,14 +26,14 @@ import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 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.spatial.OrbiterAnchorPoint
 import androidx.xr.compose.spatial.Subspace
 import androidx.xr.compose.subspace.SpatialPanel
 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.unit.DpVolumeOffset
 import com.android.developers.androidify.xr.MainPanelWorkaround
 import com.android.developers.androidify.xr.RequestHomeSpaceIconButton
 
@@ -55,10 +55,8 @@ fun CameraLayoutSpatial(
                 .aspectRatio(surfaceAspectRatio),
         ) {
             Orbiter(
-                position = ContentEdge.Top,
-                offsetType = OrbiterOffsetType.InnerEdge,
-                offset = 32.dp,
-                alignment = Alignment.End,
+                anchorPoint = OrbiterAnchorPoint.TopEnd,
+                offset = DpVolumeOffset(x = (-32).dp, y = (-32).dp),
             ) {
                 RequestHomeSpaceIconButton(
                     modifier = Modifier
@@ -69,13 +67,19 @@ fun CameraLayoutSpatial(
                     ),
                 )
             }
-            Orbiter(ContentEdge.Start, offsetType = OrbiterOffsetType.InnerEdge, offset = 16.dp) {
+            Orbiter(
+                anchorPoint = OrbiterAnchorPoint.Start,
+                offset = DpVolumeOffset(x = 16.dp),
+            ) {
                 Column(horizontalAlignment = Alignment.CenterHorizontally) {
                     captureButton(Modifier)
                     flipCameraButton(Modifier)
                 }
             }
-            Orbiter(ContentEdge.Bottom, offsetType = OrbiterOffsetType.InnerEdge) {
+            Orbiter(
+                anchorPoint = OrbiterAnchorPoint.Bottom,
+                offset = DpVolumeOffset(y = 16.dp),
+            ) {
                 zoomButton(Modifier)
             }
             Box(Modifier.fillMaxSize()) {

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

@@ -44,8 +44,9 @@ import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.ExperimentalMaterial3ExpressiveApi
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.ModalBottomSheet
+import androidx.compose.material3.SheetValue
 import androidx.compose.material3.SnackbarHostState
-import androidx.compose.material3.rememberModalBottomSheetState
+import androidx.compose.material3.rememberBottomSheetState
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
@@ -134,7 +135,10 @@ private fun BotColorPickerBottomSheet(
     listBotColors: List<BotColor>,
     selectedBotColor: BotColor,
 ) {
-    val sheetState = rememberModalBottomSheetState(skipPartiallyExpanded = true)
+    val sheetState = rememberBottomSheetState(
+        initialValue = SheetValue.Hidden,
+        enabledValues = setOf(SheetValue.Hidden, SheetValue.Expanded),
+    )
     if (showColorPickerBottomSheet) {
         ModalBottomSheet(
             modifier = Modifier,

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

@@ -26,12 +26,11 @@ import androidx.compose.foundation.layout.padding
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.SnackbarHostState
 import androidx.compose.runtime.Composable
-import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
-import androidx.xr.compose.spatial.ContentEdge
 import androidx.xr.compose.spatial.Orbiter
+import androidx.xr.compose.spatial.OrbiterAnchorPoint
 import androidx.xr.compose.subspace.SpatialColumn
 import androidx.xr.compose.subspace.SpatialPanel
 import androidx.xr.compose.subspace.SpatialRow
@@ -41,6 +40,7 @@ import androidx.xr.compose.subspace.layout.fillMaxHeight
 import androidx.xr.compose.subspace.layout.fillMaxWidth
 import androidx.xr.compose.subspace.layout.offset
 import androidx.xr.compose.subspace.layout.width
+import androidx.xr.compose.unit.DpVolumeOffset
 import com.android.developers.androidify.creation.AndroidBotColorPicker
 import com.android.developers.androidify.creation.BotColor
 import com.android.developers.androidify.creation.CreationState
@@ -165,9 +165,8 @@ fun EditScreenSpatial(
                     }
 
                     Orbiter(
-                        position = ContentEdge.Bottom,
-                        alignment = Alignment.End,
-                        offset = 16.dp,
+                        anchorPoint = OrbiterAnchorPoint.BottomEnd,
+                        offset = DpVolumeOffset(x = (-16).dp, y = (-16).dp),
                     ) {
                         TransformButton(
                             buttonText = stringResource(CreationR.string.start_transformation_button),

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

@@ -27,14 +27,14 @@ import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 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.spatial.OrbiterAnchorPoint
 import androidx.xr.compose.subspace.SpatialPanel
 import androidx.xr.compose.subspace.layout.SubspaceModifier
 import androidx.xr.compose.subspace.layout.fillMaxHeight
 import androidx.xr.compose.subspace.layout.fillMaxWidth
 import androidx.xr.compose.subspace.layout.offset
+import androidx.xr.compose.unit.DpVolumeOffset
 import com.android.developers.androidify.creation.LoadingScreenContents
 import com.android.developers.androidify.creation.LoadingScreenScaffold
 import com.android.developers.androidify.theme.AndroidifyTheme
@@ -59,10 +59,8 @@ fun LoadingScreenSpatial(
         drawable = CreationR.drawable.squiggle_light,
     ) {
         Orbiter(
-            position = ContentEdge.Top,
-            offsetType = OrbiterOffsetType.OuterEdge,
-            offset = 32.dp,
-            alignment = Alignment.End,
+            anchorPoint = OrbiterAnchorPoint.TopEnd,
+            offset = DpVolumeOffset(x = (-32).dp, y = 32.dp),
         ) {
             RequestHomeSpaceIconButton(
                 modifier = Modifier

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

@@ -55,7 +55,7 @@ import androidx.compose.ui.text.TextStyle
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
-import androidx.hilt.navigation.compose.hiltViewModel
+import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import androidx.navigation3.ui.LocalNavAnimatedContentScope
 import androidx.xr.compose.platform.LocalSpatialCapabilities

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

@@ -24,7 +24,7 @@ import androidx.compose.material3.ExperimentalMaterial3ExpressiveApi
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.unit.IntOffset
-import androidx.hilt.navigation.compose.hiltViewModel
+import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import com.android.developers.androidify.home.xr.HomeScreenContentsSpatial
 import com.android.developers.androidify.theme.SharedElementContextPreview

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

@@ -19,13 +19,12 @@ import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.runtime.Composable
-import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 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.spatial.OrbiterAnchorPoint
 import androidx.xr.compose.subspace.SpatialPanel
+import androidx.xr.compose.unit.DpVolumeOffset
 import com.android.developers.androidify.home.AboutScreenMedium
 import com.android.developers.androidify.home.BackButton
 import com.android.developers.androidify.xr.MainPanelWorkaround
@@ -37,10 +36,8 @@ fun AboutScreenSpatial(onBackPressed: () -> Unit, bottomButtons: @Composable ()
     SquiggleBackgroundSubspace(500.dp) {
         SpatialPanel {
             Orbiter(
-                ContentEdge.Top,
-                offset = 16.dp,
-                offsetType = OrbiterOffsetType.InnerEdge,
-                alignment = Alignment.Start,
+                anchorPoint = OrbiterAnchorPoint.TopStart,
+                offset = DpVolumeOffset(x = 16.dp, y = (-16).dp),
             ) {
                 BackButton(onBackPressed)
             }
@@ -50,10 +47,8 @@ fun AboutScreenSpatial(onBackPressed: () -> Unit, bottomButtons: @Composable ()
                 bottomButtons = null,
             )
             Orbiter(
-                position = ContentEdge.Bottom,
-                offset = 48.dp,
-                offsetType = OrbiterOffsetType.InnerEdge,
-                elevation = 0.dp,
+                anchorPoint = OrbiterAnchorPoint.Bottom,
+                offset = DpVolumeOffset(y = 48.dp, z = 0.dp),
             ) {
                 bottomButtons()
             }