Allow for a smooth rotation while running the app. Replaced the quick…

…-settings lazy grid with a FlowRow as the grid was depending on screenWidth instead of constraints. Open issues: - Surface aspect ratio breaks when in non-initial orientation. - small flash sometimes when doing orientation change
google · Mar 29, 2024 · ecac330 · ecac330
1 parent 46a3b36
commit ecac330
Show file tree

Hide file tree

Showing 10 changed files with 234 additions and 273 deletions.
diff --git a/.idea/androidTestResultsUserPreferences.xml b/.idea/androidTestResultsUserPreferences.xml
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -44,8 +44,8 @@
         <profileable android:shell="true"/>
         <activity
             android:name=".MainActivity"
+            android:configChanges="orientation|screenSize|screenLayout|keyboard|keyboardHidden|navigation|uiMode|smallestScreenSize"
             android:exported="true"
-            android:screenOrientation="nosensor"
             android:theme="@style/Theme.JetpackCamera">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />

diff --git a/app/src/main/java/com/google/jetpackcamera/MainActivity.kt b/app/src/main/java/com/google/jetpackcamera/MainActivity.kt
@@ -38,6 +38,7 @@ import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.ExperimentalComposeUiApi
@@ -102,6 +103,7 @@ class MainActivity : ComponentActivity() {
                 }
 
                 is Success -> {
+                    val previewMode = remember { getPreviewMode() }
                     // TODO(kimblebee@): add app setting to enable/disable dynamic color
                     JetpackCameraTheme(
                         darkTheme = isInDarkMode(uiState = uiState),
@@ -117,7 +119,7 @@ class MainActivity : ComponentActivity() {
                         ) {
                             JcaApp(
                                 onPreviewViewModel = { previewViewModel = it },
-                                previewMode = getPreviewMode()
+                                previewMode = previewMode
                             )
                         }
                     }

diff --git a/feature/preview/src/main/java/com/google/jetpackcamera/feature/preview/PreviewScreen.kt b/feature/preview/src/main/java/com/google/jetpackcamera/feature/preview/PreviewScreen.kt
@@ -31,24 +31,27 @@ import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Text
 import androidx.compose.material3.darkColorScheme
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.platform.testTag
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import androidx.hilt.navigation.compose.hiltViewModel
 import androidx.lifecycle.compose.LifecycleStartEffect
+import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import com.google.jetpackcamera.feature.preview.ui.BlinkState
 import com.google.jetpackcamera.feature.preview.ui.CameraControlsOverlay
 import com.google.jetpackcamera.feature.preview.ui.PreviewDisplay
 import com.google.jetpackcamera.feature.preview.ui.ScreenFlashScreen
+import com.google.jetpackcamera.feature.preview.ui.SmoothImmersiveRotationEffect
 import com.google.jetpackcamera.feature.preview.ui.TestableToast
+import com.google.jetpackcamera.feature.preview.ui.rotatedLayout
 import com.google.jetpackcamera.feature.quicksettings.QuickSettingsScreenOverlay
 import com.google.jetpackcamera.settings.model.AspectRatio
 import com.google.jetpackcamera.settings.model.CaptureMode
@@ -71,13 +74,16 @@ fun PreviewScreen(
     Log.d(TAG, "PreviewScreen")
     onPreviewViewModel(viewModel)
 
-    val previewUiState: PreviewUiState by viewModel.previewUiState.collectAsState()
+    // For this screen, force an immersive view with smooth rotation.
+    SmoothImmersiveRotationEffect(LocalContext.current)
+
+    val previewUiState: PreviewUiState by viewModel.previewUiState.collectAsStateWithLifecycle()
 
     val screenFlashUiState: ScreenFlash.ScreenFlashUiState
-        by viewModel.screenFlash.screenFlashUiState.collectAsState()
+        by viewModel.screenFlash.screenFlashUiState.collectAsStateWithLifecycle()
 
     val surfaceRequest: SurfaceRequest?
-        by viewModel.surfaceRequest.collectAsState()
+        by viewModel.surfaceRequest.collectAsStateWithLifecycle()
 
     LifecycleStartEffect(Unit) {
         viewModel.startCamera()
@@ -163,7 +169,7 @@ private fun ContentScreen(
         )
 
         QuickSettingsScreenOverlay(
-            modifier = Modifier,
+            modifier = Modifier.rotatedLayout(),
             isOpen = previewUiState.quickSettingsIsOpen,
             toggleIsOpen = onToggleQuickSettings,
             currentCameraSettings = previewUiState.currentCameraSettings,
@@ -175,6 +181,7 @@ private fun ContentScreen(
         )
         // relative-grid style overlay on top of preview display
         CameraControlsOverlay(
+            modifier = Modifier.rotatedLayout(),
             previewUiState = previewUiState,
             onNavigateToSettings = onNavigateToSettings,
             previewMode = previewMode,

diff --git a/...view/src/main/java/com/google/jetpackcamera/feature/preview/ui/PreviewScreenComponents.kt b/...view/src/main/java/com/google/jetpackcamera/feature/preview/ui/PreviewScreenComponents.kt
@@ -29,12 +29,10 @@ import androidx.compose.foundation.gestures.detectTapGestures
 import androidx.compose.foundation.gestures.rememberTransformableState
 import androidx.compose.foundation.gestures.transformable
 import androidx.compose.foundation.layout.Box
-import androidx.compose.foundation.layout.BoxWithConstraints
 import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
-import androidx.compose.foundation.layout.width
+import androidx.compose.foundation.layout.wrapContentSize
 import androidx.compose.foundation.shape.CircleShape
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.Refresh
@@ -56,17 +54,20 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.alpha
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.input.pointer.pointerInput
+import androidx.compose.ui.layout.layout
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.platform.testTag
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.unit.Constraints
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import com.google.jetpackcamera.feature.preview.R
 import com.google.jetpackcamera.feature.preview.VideoRecordingState
 import com.google.jetpackcamera.settings.model.AspectRatio
 import com.google.jetpackcamera.settings.model.Stabilization
 import com.google.jetpackcamera.settings.model.SupportedStabilizationMode
+import kotlin.math.roundToInt
 import kotlinx.coroutines.CoroutineScope
 
 private const val TAG = "PreviewScreen"
@@ -132,11 +133,12 @@ fun PreviewDisplay(
     val currentOnFlipCamera by rememberUpdatedState(onFlipCamera)
 
     surfaceRequest?.let {
-        BoxWithConstraints(
-            Modifier
+        Box(
+            modifier
                 .testTag(PREVIEW_DISPLAY)
                 .fillMaxSize()
                 .background(Color.Black)
+                .wrapContentSize()
                 .pointerInput(Unit) {
                     detectTapGestures(
                         onDoubleTap = { offset ->
@@ -145,28 +147,46 @@ fun PreviewDisplay(
                             currentOnFlipCamera()
                         }
                     )
-                },
+                }
+                .layout { measurable, constraints ->
+                    val maxWidth = constraints.maxWidth.toFloat()
+                    val maxHeight = constraints.maxHeight.toFloat()
+                    val maxAspectRatio: Float = maxWidth / maxHeight
+                    val aspectRatioFloat: Float = aspectRatio.ratio.toFloat()
+
+                    val correctAspectRation = if (
+                        (maxAspectRatio > 1 && aspectRatioFloat < 1) ||
+                        (maxAspectRatio < 1 && aspectRatioFloat > 1)
+                    ) {
+                        1 / aspectRatioFloat
+                    } else {
+                        aspectRatioFloat
+                    }
+                    val shouldUseMaxWidth = maxAspectRatio <= correctAspectRation
+                    val width = if (shouldUseMaxWidth) maxWidth else maxHeight * correctAspectRation
+                    val height =
+                        if (!shouldUseMaxWidth) maxHeight else maxWidth / correctAspectRation
+
+                    val placeable = measurable.measure(
+                        Constraints.fixed(
+                            width.roundToInt(),
+                            height.roundToInt()
+                        )
+                    )
+
+                    layout(placeable.width, placeable.height) {
+                        placeable.place(0, 0)
+                    }
+                }
+                .transformable(state = transformableState)
+                .alpha(blinkState.alpha),
 
             contentAlignment = Alignment.Center
         ) {
-            val maxAspectRatio: Float = maxWidth / maxHeight
-            val aspectRatioFloat: Float = aspectRatio.ratio.toFloat()
-            val shouldUseMaxWidth = maxAspectRatio <= aspectRatioFloat
-            val width = if (shouldUseMaxWidth) maxWidth else maxHeight * aspectRatioFloat
-            val height = if (!shouldUseMaxWidth) maxHeight else maxWidth / aspectRatioFloat
-            Box(
-                modifier = Modifier
-                    .width(width)
-                    .height(height)
-                    .transformable(state = transformableState)
-                    .alpha(blinkState.alpha)
-
-            ) {
-                CameraXViewfinder(
-                    modifier = Modifier.fillMaxSize(),
-                    surfaceRequest = it
-                )
-            }
+            CameraXViewfinder(
+                modifier = Modifier.fillMaxSize(),
+                surfaceRequest = it
+            )
         }
     }
 }