Merge branch 'main' into david/aspect_ratio

google · Aug 10, 2023 · f9e0a3c · f9e0a3c
2 parents bd13148 + ea3ab14
commit f9e0a3c
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -25,7 +25,7 @@
         <activity
             android:name=".MainActivity"
             android:exported="true"
-            android:label="@string/app_name"
+            android:screenOrientation="portrait"
             android:theme="@style/Theme.JetpackCamera">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />

diff --git a/app/src/main/java/com/google/jetpackcamera/ui/JcaApp.kt b/app/src/main/java/com/google/jetpackcamera/ui/JcaApp.kt
@@ -56,6 +56,9 @@ private fun JetpackCameraNavHost(
                 onNavigateToSettings = { navController.navigate(SettingsRoute) }
             )
         }
-        composable(SettingsRoute) { SettingsScreen(navController = navController) }
+        composable(SettingsRoute) {
+            SettingsScreen(onNavigateToPreview = { navController.navigate(PreviewRoute) }
+            )
+        }
     }
 }
diff --git a/feature/settings/src/main/java/com/google/jetpackcamera/settings/SettingsScreen.kt b/feature/settings/src/main/java/com/google/jetpackcamera/settings/SettingsScreen.kt
@@ -25,7 +25,6 @@ import androidx.compose.runtime.getValue
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.stringResource
 import androidx.hilt.navigation.compose.hiltViewModel
-import androidx.navigation.NavController
 import com.google.jetpackcamera.settings.ui.DarkModeSetting
 import com.google.jetpackcamera.settings.ui.DefaultCameraFacing
 import com.google.jetpackcamera.settings.ui.FlashModeSetting
@@ -41,7 +40,7 @@ private const val TAG = "SettingsScreen"
 @Composable
 fun SettingsScreen(
     viewModel: SettingsViewModel = hiltViewModel(),
-    navController: NavController) {
+    onNavigateToPreview: () -> Unit ) {
     val settingsUiState by viewModel.settingsUiState.collectAsState()
 
     Column(
@@ -50,9 +49,7 @@ fun SettingsScreen(
     ) {
         SettingsPageHeader(
             title = stringResource(id = R.string.settings_title),
-            navBack = {
-                navController.popBackStack()
-            }
+            navBack = onNavigateToPreview
         )
         SettingsList(uiState = settingsUiState, viewModel = viewModel)
     }