Smooth rotation on orientation change

app/build.gradle.kts

@@ -22,23 +22,22 @@ plugins {
 }
 
 android {
+    compileSdk = libs.versions.compileSdk.get().toInt()
     namespace = "com.google.jetpackcamera"
-    compileSdk = 34
 
     defaultConfig {
         applicationId = "com.google.jetpackcamera"
-        minSdk = 21
-        targetSdk = 34
+        minSdk = libs.versions.minSdk.get().toInt()
+        targetSdk = libs.versions.targetSdk.get().toInt()
         versionCode = 1
         versionName = "0.1.0"
-
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
-        vectorDrawables {
-            useSupportLibrary = true
-        }
     }
 
     buildTypes {
+        getByName("debug") {
+            signingConfig = signingConfigs.getByName("debug")
+        }
         release {
             isMinifyEnabled = true
             proguardFiles(
@@ -60,16 +59,18 @@ android {
         jvmToolchain(17)
     }
     buildFeatures {
+        buildConfig = true
         compose = true
     }
     composeOptions {
-        kotlinCompilerExtensionVersion = "1.4.0"
+        kotlinCompilerExtensionVersion = libs.versions.composeCompiler.get()
     }
-    packagingOptions {
+    packaging {
         resources {
             excludes += "/META-INF/{AL2.0,LGPL2.1}"
         }
     }
+    @Suppress("UnstableApiUsage")
     testOptions {
         managedDevices {
             localDevices {

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" />

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
                             )
                         }
                     }

app/src/main/java/com/google/jetpackcamera/MainActivityViewModel.kt

@@ -30,7 +30,7 @@ import kotlinx.coroutines.flow.stateIn
 
 @HiltViewModel
 class MainActivityViewModel @Inject constructor(
-    val settingsRepository: SettingsRepository
+    settingsRepository: SettingsRepository
 ) : ViewModel() {
     val uiState: StateFlow<MainActivityUiState> = settingsRepository.cameraAppSettings.map {
         Success(it)
@@ -42,6 +42,6 @@ class MainActivityViewModel @Inject constructor(
 }
 
 sealed interface MainActivityUiState {
-    object Loading : MainActivityUiState
+    data object Loading : MainActivityUiState
     data class Success(val cameraAppSettings: CameraAppSettings) : MainActivityUiState
 }

app/src/main/java/com/google/jetpackcamera/ui/JcaApp.kt

@@ -40,19 +40,21 @@ import com.google.jetpackcamera.ui.Routes.SETTINGS_ROUTE
 fun JcaApp(
     onPreviewViewModel: (PreviewViewModel) -> Unit,
     /*TODO(b/306236646): remove after still capture*/
-    previewMode: PreviewMode
+    previewMode: PreviewMode,
+    modifier: Modifier = Modifier
 ) {
     val permissionState =
         rememberPermissionState(permission = Manifest.permission.CAMERA)
 
     if (permissionState.status.isGranted) {
         JetpackCameraNavHost(
             onPreviewViewModel = onPreviewViewModel,
-            previewMode = previewMode
+            previewMode = previewMode,
+            modifier = modifier
         )
     } else {
         CameraPermission(
-            modifier = Modifier.fillMaxSize(),
+            modifier = modifier.fillMaxSize(),
             cameraPermissionState = permissionState
         )
     }
@@ -61,10 +63,11 @@ fun JcaApp(
 @Composable
 private fun JetpackCameraNavHost(
     onPreviewViewModel: (PreviewViewModel) -> Unit,
-    navController: NavHostController = rememberNavController(),
-    previewMode: PreviewMode
+    previewMode: PreviewMode,
+    modifier: Modifier = Modifier,
+    navController: NavHostController = rememberNavController()
 ) {
-    NavHost(navController = navController, startDestination = PREVIEW_ROUTE) {
+    NavHost(navController = navController, startDestination = PREVIEW_ROUTE, modifier = modifier) {
         composable(PREVIEW_ROUTE) {
             PreviewScreen(
                 onPreviewViewModel = onPreviewViewModel,

app/src/main/java/com/google/jetpackcamera/ui/PermissionsUi.kt

@@ -49,7 +49,7 @@ import com.google.jetpackcamera.R
 
 @OptIn(ExperimentalPermissionsApi::class)
 @Composable
-fun CameraPermission(modifier: Modifier = Modifier, cameraPermissionState: PermissionState) {
+fun CameraPermission(cameraPermissionState: PermissionState, modifier: Modifier = Modifier) {
     PermissionTemplate(
         modifier = modifier,
         permissionState = cameraPermissionState,
@@ -64,14 +64,14 @@ fun CameraPermission(modifier: Modifier = Modifier, cameraPermissionState: Permi
 @OptIn(ExperimentalPermissionsApi::class)
 @Composable
 fun PermissionTemplate(
-    modifier: Modifier = Modifier,
     permissionState: PermissionState,
-    onSkipPermission: (() -> Unit)? = null,
     painter: Painter,
     iconAccessibilityText: String,
     title: String,
     bodyText: String,
-    requestButtonText: String
+    requestButtonText: String,
+    modifier: Modifier = Modifier,
+    onSkipPermission: (() -> Unit)? = null
 ) {
     Column(
         modifier = modifier.background(MaterialTheme.colorScheme.primary),
@@ -110,7 +110,7 @@ fun PermissionTemplate(
 }
 
 @Composable
-fun PermissionImage(modifier: Modifier = Modifier, painter: Painter, accessibilityText: String) {
+fun PermissionImage(painter: Painter, accessibilityText: String, modifier: Modifier = Modifier) {
     Box(modifier = modifier) {
         Icon(
             modifier = Modifier
@@ -126,9 +126,9 @@ fun PermissionImage(modifier: Modifier = Modifier, painter: Painter, accessibili
 @OptIn(ExperimentalPermissionsApi::class)
 @Composable
 fun PermissionButtonSection(
-    modifier: Modifier = Modifier,
     permissionState: PermissionState,
     requestButtonText: String,
+    modifier: Modifier = Modifier,
     onSkipPermission: (() -> Unit)?
 ) {
     Box(modifier = modifier) {
@@ -159,9 +159,9 @@ fun PermissionButtonSection(
 @OptIn(ExperimentalPermissionsApi::class)
 @Composable
 fun PermissionButton(
-    modifier: Modifier = Modifier,
     permissionState: PermissionState,
-    requestButtonText: String
+    requestButtonText: String,
+    modifier: Modifier = Modifier
 ) {
     Button(
         modifier = modifier,
@@ -181,13 +181,13 @@ fun PermissionButton(
 }
 
 @Composable
-fun PermissionText(modifier: Modifier = Modifier, title: String, bodyText: String) {
+fun PermissionText(title: String, bodyText: String, modifier: Modifier = Modifier) {
     Box(
         modifier = modifier
             .height(IntrinsicSize.Min)
     ) {
         Column(
-            modifier = modifier
+            modifier = Modifier
                 .fillMaxSize()
                 .align(Alignment.Center)
         ) {
@@ -213,7 +213,7 @@ fun PermissionText(modifier: Modifier = Modifier, title: String, bodyText: Strin
 }
 
 @Composable
-fun PermissionTitleText(modifier: Modifier = Modifier, text: String, color: Color) {
+fun PermissionTitleText(text: String, color: Color, modifier: Modifier = Modifier) {
     Text(
         modifier = modifier,
         color = color,
@@ -224,7 +224,7 @@ fun PermissionTitleText(modifier: Modifier = Modifier, text: String, color: Colo
 }
 
 @Composable
-fun PermissionBodyText(modifier: Modifier = Modifier, text: String, color: Color) {
+fun PermissionBodyText(text: String, color: Color, modifier: Modifier = Modifier) {
     Text(
         modifier = modifier,
         color = color,

benchmark/build.gradle.kts

@@ -21,7 +21,7 @@ plugins {
 
 android {
     namespace = "com.google.jetpackcamera.benchmark"
-    compileSdk = 34
+    compileSdk = libs.versions.compileSdk.get().toInt()
 
     compileOptions {
         sourceCompatibility = JavaVersion.VERSION_1_8
@@ -35,7 +35,7 @@ android {
     defaultConfig {
         //Our app has a minSDK of 21, but in order for the benchmark tool to function, it must be 23
         minSdk = 23
-        targetSdk = 34
+        targetSdk = libs.versions.targetSdk.get().toInt()
 
         // allows the benchmark to be run on an emulator
         testInstrumentationRunnerArguments["androidx.benchmark.suppressErrors"] =
@@ -56,6 +56,7 @@ android {
     }
 
     targetProjectPath = ":app"
+    @Suppress("UnstableApiUsage")
     experimentalProperties["android.experimental.self-instrumenting"] = true
     // required for benchmark:
     // self instrumentation required for the tests to be able to compile, start, or kill the app

build.gradle.kts

@@ -38,4 +38,14 @@ gradle.taskGraph.whenReady {
             task.dependsOn(tasks["installGitHooks"])
         }
     }
+}
+
+// Task to print all the module paths in the project e.g. :core:data
+// Used by module graph generator script
+tasks.register("printModulePaths") {
+    subprojects {
+        if (subprojects.size == 0) {
+            println(this.path)
+        }
+    }
 }

core/common/build.gradle.kts

@@ -23,11 +23,12 @@ plugins {
 
 android {
     namespace = "com.google.jetpackcamera.core.common"
-    compileSdk = 34
+    compileSdk = libs.versions.compileSdk.get().toInt()
 
     defaultConfig {
-        minSdk = 21
-        targetSdk = 34
+        minSdk = libs.versions.minSdk.get().toInt()
+        testOptions.targetSdk = libs.versions.targetSdk.get().toInt()
+        lint.targetSdk = libs.versions.targetSdk.get().toInt()
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles("consumer-rules.pro")

data/settings/build.gradle.kts

@@ -24,11 +24,12 @@ plugins {
 
 android {
     namespace = "com.google.jetpackcamera.data.settings"
-    compileSdk = 34
+    compileSdk = libs.versions.compileSdk.get().toInt()
 
     defaultConfig {
-        minSdk = 21
-        targetSdk = 34
+        minSdk = libs.versions.minSdk.get().toInt()
+        testOptions.targetSdk = libs.versions.targetSdk.get().toInt()
+        lint.targetSdk = libs.versions.targetSdk.get().toInt()
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles("consumer-rules.pro")
@@ -51,6 +52,7 @@ android {
         jvmToolchain(17)
     }
 
+    @Suppress("UnstableApiUsage")
     testOptions {
         managedDevices {
             localDevices {

data/settings/src/main/java/com/google/jetpackcamera/settings/model/AspectRatio.kt

@@ -28,14 +28,14 @@ enum class AspectRatio(val ratio: Rational) {
         /** returns the AspectRatio enum equivalent of a provided AspectRatioProto */
         fun fromProto(aspectRatioProto: AspectRatioProto): AspectRatio {
             return when (aspectRatioProto) {
-                AspectRatioProto.ASPECT_RATIO_NINE_SIXTEEN -> AspectRatio.NINE_SIXTEEN
-                AspectRatioProto.ASPECT_RATIO_ONE_ONE -> AspectRatio.ONE_ONE
+                AspectRatioProto.ASPECT_RATIO_NINE_SIXTEEN -> NINE_SIXTEEN
+                AspectRatioProto.ASPECT_RATIO_ONE_ONE -> ONE_ONE
 
                 // defaults to 3:4 aspect ratio
                 AspectRatioProto.ASPECT_RATIO_THREE_FOUR,
                 AspectRatioProto.ASPECT_RATIO_UNDEFINED,
                 AspectRatioProto.UNRECOGNIZED
-                -> AspectRatio.THREE_FOUR
+                -> THREE_FOUR
             }
         }
     }

domain/camera/build.gradle.kts

@@ -23,11 +23,12 @@ plugins {
 
 android {
     namespace = "com.google.jetpackcamera.data.camera"
-    compileSdk = 34
+    compileSdk = libs.versions.compileSdk.get().toInt()
 
     defaultConfig {
-        minSdk = 21
-        targetSdk = 34
+        minSdk = libs.versions.minSdk.get().toInt()
+        testOptions.targetSdk = libs.versions.targetSdk.get().toInt()
+        lint.targetSdk = libs.versions.targetSdk.get().toInt()
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles("consumer-rules.pro")
@@ -55,8 +56,8 @@ dependencies {
     // Testing
     testImplementation(libs.junit)
     testImplementation(libs.truth)
-    testImplementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:1.7.3")
-    testImplementation("org.mockito:mockito-core:5.2.0")
+    testImplementation(libs.kotlinx.coroutines.test)
+    testImplementation(libs.mockito.core)
     androidTestImplementation(libs.androidx.junit)
     androidTestImplementation(libs.androidx.espresso.core)
 
@@ -74,7 +75,7 @@ dependencies {
     kapt(libs.dagger.hilt.compiler)
 
     // Tracing
-    implementation("androidx.tracing:tracing-ktx:1.2.0")
+    implementation(libs.androidx.tracing)
 
     // Project dependencies
     implementation(project(":data:settings"))

domain/camera/src/main/AndroidManifest.xml

@@ -14,6 +14,6 @@
   ~ See the License for the specific language governing permissions and
   ~ limitations under the License.
   -->
-<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+<manifest>
 
 </manifest>

domain/camera/src/main/java/com/google/jetpackcamera/domain/camera/test/FakeCameraUseCase.kt

@@ -145,9 +145,6 @@ class FakeCameraUseCase(
     override fun getZoomScale(): StateFlow<Float> = _zoomScale.asStateFlow()
 
     private val _surfaceRequest = MutableStateFlow<SurfaceRequest?>(null)
-    fun setSurfaceRequest(surfaceRequest: SurfaceRequest) {
-        _surfaceRequest.value = surfaceRequest
-    }
     override fun getSurfaceRequest(): StateFlow<SurfaceRequest?> = _surfaceRequest.asStateFlow()
 
     override fun getScreenFlashEvents() = screenFlashEvents