From 9799898d9f8fc346f616b1b945292de41bf32485 Mon Sep 17 00:00:00 2001 From: Mutant-Slayer Date: Tue, 1 Jul 2025 23:16:49 +0530 Subject: [PATCH] fixed camera guide text ui --- .../androidify/camera/CameraGuideText.kt | 7 ++--- .../androidify/camera/CameraScreen.kt | 26 ++++++++++++------- 2 files changed, 21 insertions(+), 12 deletions(-) diff --git a/feature/camera/src/main/java/com/android/developers/androidify/camera/CameraGuideText.kt b/feature/camera/src/main/java/com/android/developers/androidify/camera/CameraGuideText.kt index 6a669449..51f9f1ac 100644 --- a/feature/camera/src/main/java/com/android/developers/androidify/camera/CameraGuideText.kt +++ b/feature/camera/src/main/java/com/android/developers/androidify/camera/CameraGuideText.kt @@ -25,6 +25,7 @@ import androidx.compose.material3.MaterialTheme import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier import androidx.compose.ui.res.stringResource +import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.unit.dp @OptIn(ExperimentalMaterial3ExpressiveApi::class) @@ -33,10 +34,10 @@ fun CameraGuideText( modifier: Modifier = Modifier, ) { BasicText( - stringResource(R.string.camera_guide_text_label), - style = MaterialTheme.typography.bodyMediumEmphasized, + text = stringResource(R.string.camera_guide_text_label), + style = MaterialTheme.typography.bodyMediumEmphasized.copy(textAlign = TextAlign.Center), autoSize = TextAutoSize.StepBased(maxFontSize = MaterialTheme.typography.bodyMediumEmphasized.fontSize), - maxLines = 1, + maxLines = 2, modifier = modifier .background( MaterialTheme.colorScheme.surfaceContainerHighest, diff --git a/feature/camera/src/main/java/com/android/developers/androidify/camera/CameraScreen.kt b/feature/camera/src/main/java/com/android/developers/androidify/camera/CameraScreen.kt index 80b649fd..fa35d29d 100644 --- a/feature/camera/src/main/java/com/android/developers/androidify/camera/CameraScreen.kt +++ b/feature/camera/src/main/java/com/android/developers/androidify/camera/CameraScreen.kt @@ -32,6 +32,7 @@ import androidx.compose.foundation.layout.Column 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.widthIn import androidx.compose.foundation.layout.wrapContentSize import androidx.compose.material3.Button @@ -247,12 +248,18 @@ fun StatelessCameraPreviewContent( }, guideText = { guideTextModifier -> AnimatedVisibility( - !detectedPose, + visible = !detectedPose, enter = fadeIn(MaterialTheme.motionScheme.slowEffectsSpec()), exit = fadeOut(MaterialTheme.motionScheme.slowEffectsSpec()), modifier = guideTextModifier, ) { - CameraGuideText() + CameraGuideText( + modifier = Modifier.padding( + start = 10.dp, + end = 10.dp, + bottom = 10.dp, + ), + ) } }, guide = { guideModifier -> @@ -263,12 +270,12 @@ fun StatelessCameraPreviewContent( ) }, rearCameraButton = ( - if (shouldShowRearCameraFeature()) { - rearCameraButton - } else { - emptyComposable - } - ), + if (shouldShowRearCameraFeature()) { + rearCameraButton + } else { + emptyComposable + } + ), isTabletop = isTableTopPosture(foldingFeature), modifier = modifier.onSizeChanged { size -> if (size.height > 0) { @@ -324,7 +331,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) } }, )