Add camera preview aspect ratio hint.

This allows the Spatial layout to maintain an arbitrary aspect ratio without any cropping.

Author: devbridie

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

@@ -71,6 +71,7 @@ internal fun CameraLayout(
     guideText: @Composable (modifier: Modifier) -> Unit,
     guide: @Composable (modifier: Modifier) -> Unit,
     rearCameraButton: @Composable (modifier: Modifier) -> Unit,
+    surfaceAspectRatio: Float,
     xrEnabled: Boolean = false,
     supportsTabletop: Boolean = supportsTabletop(),
     isTabletop: Boolean = false,
@@ -107,6 +108,7 @@ internal fun CameraLayout(
                 zoomButton,
                 guideText,
                 guide,
+                surfaceAspectRatio,
             )
 
             isAtLeastMedium() && shouldShowTabletopLayout(
@@ -580,6 +582,7 @@ private fun CameraOverlayPreview(
             },
             supportsTabletop = parameters.supportsTabletop,
             isTabletop = parameters.isTabletop,
+            surfaceAspectRatio = 16f / 9f,
         )
     }
 }

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

@@ -148,6 +148,7 @@ fun CameraPreviewScreen(
                         isRearCameraEnabled = uiState.isRearCameraActive,
                         cameraSessionId = uiState.cameraSessionId,
                         xrEnabled = uiState.xrEnabled,
+                        surfaceAspectRatio = uiState.surfaceAspectRatio,
                     )
                 }
             } else {
@@ -204,13 +205,14 @@ fun StatelessCameraPreviewContent(
     onAnimateZoom: (Float) -> Unit,
     requestCaptureImage: () -> Unit,
     modifier: Modifier = Modifier,
+    surfaceAspectRatio: Float = 9f / 16f,
     xrEnabled: Boolean = false,
     foldingFeature: FoldingFeature? = null,
     shouldShowRearCameraFeature: () -> Boolean = { false },
     toggleRearCameraFeature: () -> Unit = {},
     isRearCameraEnabled: Boolean = false,
 ) {
-    var aspectRatio by remember { mutableFloatStateOf(9f / 16f) }
+    var layoutAspectRatio by remember { mutableFloatStateOf(9f / 16f) }
     val emptyComposable: @Composable (Modifier) -> Unit = {}
     val rearCameraButton: @Composable (Modifier) -> Unit = { rearModifier ->
         RearCameraButton(
@@ -261,7 +263,7 @@ fun StatelessCameraPreviewContent(
             CameraGuide(
                 detectedPose = detectedPose,
                 modifier = guideModifier,
-                defaultAspectRatio = aspectRatio,
+                defaultAspectRatio = layoutAspectRatio,
             )
         },
         rearCameraButton = (
@@ -275,9 +277,11 @@ fun StatelessCameraPreviewContent(
         modifier = modifier.onSizeChanged { size ->
             if (size.height > 0) {
                 // Recalculate aspect ratio based on the overall layout size
-                aspectRatio = calculateCorrectAspectRatio(size.height, size.width, aspectRatio)
+                layoutAspectRatio =
+                    calculateCorrectAspectRatio(size.height, size.width, layoutAspectRatio)
             }
         },
+        surfaceAspectRatio = surfaceAspectRatio,
         xrEnabled = xrEnabled,
     )
 }
@@ -301,6 +305,7 @@ private fun CameraPreviewContent(
     zoomLevel: () -> Float,
     onChangeZoomLevel: (zoomLevel: Float) -> Unit,
     requestCaptureImage: () -> Unit,
+    surfaceAspectRatio: Float,
     modifier: Modifier = Modifier,
     foldingFeature: FoldingFeature? = null,
     shouldShowRearCameraFeature: () -> Boolean = { false },
@@ -328,7 +333,8 @@ private fun CameraPreviewContent(
                 onScaleZoom = { scope.launch { zoomState.scaleZoom(it) } },
                 modifier = viewfinderModifier.onSizeChanged { size -> // Apply modifier from slot
                     if (size.height > 0) {
-                        aspectRatio = calculateCorrectAspectRatio(size.height, size.width, aspectRatio)
+                        aspectRatio =
+                            calculateCorrectAspectRatio(size.height, size.width, aspectRatio)
                     }
                 },
             )
@@ -345,6 +351,7 @@ private fun CameraPreviewContent(
         shouldShowRearCameraFeature = shouldShowRearCameraFeature,
         toggleRearCameraFeature = toggleRearCameraFeature,
         isRearCameraEnabled = isRearCameraEnabled,
+        surfaceAspectRatio = surfaceAspectRatio,
         xrEnabled = xrEnabled,
         modifier = modifier,
     )

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

@@ -92,10 +92,12 @@ class CameraViewModel
 
     private val cameraPreviewUseCase = Preview.Builder().build().apply {
         setSurfaceProvider { newSurfaceRequest ->
-            _uiState.update { it.copy(surfaceRequest = newSurfaceRequest) }
+            val width = newSurfaceRequest.resolution.width.toFloat()
+            val height = newSurfaceRequest.resolution.height.toFloat()
+            _uiState.update { it.copy(surfaceRequest = newSurfaceRequest, surfaceAspectRatio = height / width) }
             surfaceMeteringPointFactory = SurfaceOrientedMeteringPointFactory(
-                newSurfaceRequest.resolution.width.toFloat(),
-                newSurfaceRequest.resolution.height.toFloat(),
+                width,
+                height,
             )
         }
     }
@@ -354,6 +356,7 @@ data class CameraUiState(
     val isRearCameraActive: Boolean = false,
     val autofocusUiState: AutofocusUiState = AutofocusUiState.Unspecified,
     val xrEnabled: Boolean = false,
+    val surfaceAspectRatio: Float = 9f / 16f,
 ) {
     val zoomOptions = when {
         zoomMinRatio <= 0.6f && zoomMaxRatio >= 1f -> listOf(0.6f, 1f)

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

@@ -51,7 +51,8 @@ fun CameraLayoutSpatial(
         MainPanelWorkaround()
         SpatialPanel(
             SubspaceModifier
-                .fillMaxSize(0.5f),
+                .fillMaxSize(0.5f)
+                .aspectRatio(surfaceAspectRatio),
         ) {
             Orbiter(
                 position = ContentEdge.Top,