diff --git a/app/src/main/java/app/myzel394/alibi/ui/components/WelcomeScreen/pages/SaveFolderPage.kt b/app/src/main/java/app/myzel394/alibi/ui/components/WelcomeScreen/pages/SaveFolderPage.kt index 8fc9990..65ec0c2 100644 --- a/app/src/main/java/app/myzel394/alibi/ui/components/WelcomeScreen/pages/SaveFolderPage.kt +++ b/app/src/main/java/app/myzel394/alibi/ui/components/WelcomeScreen/pages/SaveFolderPage.kt @@ -54,7 +54,7 @@ import app.myzel394.alibi.ui.utils.rememberFolderSelectorDialog @Composable fun SaveFolderPage( onBack: () -> Unit, - onContinue: () -> Unit, + onContinue: (saveFolder: String?) -> Unit, appSettings: AppSettings, ) { var saveFolder by rememberSaveable { mutableStateOf(null) } @@ -146,14 +146,14 @@ fun SaveFolderPage( PermissionRequester( permission = Manifest.permission.WRITE_EXTERNAL_STORAGE, icon = Icons.AutoMirrored.Filled.InsertDriveFile, - onPermissionAvailable = onContinue, + onPermissionAvailable = { onContinue(saveFolder) }, ) { requestWritePermission -> val selectFolder = rememberFolderSelectorDialog { folder -> if (folder == null) { return@rememberFolderSelectorDialog } - onContinue() + onContinue(saveFolder) } var showCustomFolderHint by rememberSaveable { mutableStateOf(false) } @@ -170,10 +170,10 @@ fun SaveFolderPage( Button( onClick = { when (saveFolder) { - null -> onContinue() + null -> onContinue(saveFolder) RECORDER_MEDIA_SELECTED_VALUE -> { if (SUPPORTS_SCOPED_STORAGE) { - onContinue() + onContinue(saveFolder) } else { requestWritePermission() } diff --git a/app/src/main/java/app/myzel394/alibi/ui/screens/WelcomeScreen.kt b/app/src/main/java/app/myzel394/alibi/ui/screens/WelcomeScreen.kt index adcd27f..ec2c014 100644 --- a/app/src/main/java/app/myzel394/alibi/ui/screens/WelcomeScreen.kt +++ b/app/src/main/java/app/myzel394/alibi/ui/screens/WelcomeScreen.kt @@ -45,8 +45,7 @@ fun WelcomeScreen( } } - Scaffold( - ) { padding -> + Scaffold() { padding -> Column( modifier = Modifier .fillMaxSize() @@ -84,8 +83,12 @@ fun WelcomeScreen( pagerState.animateScrollToPage(2) } }, - onContinue = { + onContinue = { saveFolder -> scope.launch { + dataStore.updateData { + settings.setSaveFolder(saveFolder) + } + pagerState.animateScrollToPage(4) } },