Myzel394/Alibi
1
0
Fork 0
mirror of https://github.com/Myzel394/Alibi.git synced 2025-06-18 23:05:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix: Save saveFolder on change

Browse Source 
Signed-off-by: Myzel394 <50424412+Myzel394@users.noreply.github.com>
This commit is contained in:
Myzel394 2024-03-22 19:46:18 +01:00
parent 04c6cd92a3
commit e4e23abcea
No known key found for this signature in database
GPG Key ID: DEC4AAB876F73185
2 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/src/main/java/app/myzel394/alibi/ui/components/WelcomeScreen/pages/SaveFolderPage.kt
View File

@ -54,7 +54,7 @@ import app.myzel394.alibi.ui.utils.rememberFolderSelectorDialog
@Composable @Composable
fun SaveFolderPage( fun SaveFolderPage(
onBack: () -> Unit, onBack: () -> Unit,
onContinue: () -> Unit, onContinue: (saveFolder: String?) -> Unit,
appSettings: AppSettings, appSettings: AppSettings,
) { ) {
var saveFolder by rememberSaveable { mutableStateOf<String?>(null) } var saveFolder by rememberSaveable { mutableStateOf<String?>(null) }
@ -146,14 +146,14 @@ fun SaveFolderPage(
PermissionRequester( PermissionRequester(
permission = Manifest.permission.WRITE_EXTERNAL_STORAGE, permission = Manifest.permission.WRITE_EXTERNAL_STORAGE,
icon = Icons.AutoMirrored.Filled.InsertDriveFile, icon = Icons.AutoMirrored.Filled.InsertDriveFile,
onPermissionAvailable = onContinue, onPermissionAvailable = { onContinue(saveFolder) },
) { requestWritePermission -> ) { requestWritePermission ->
val selectFolder = rememberFolderSelectorDialog { folder -> val selectFolder = rememberFolderSelectorDialog { folder ->
if (folder == null) { if (folder == null) {
return@rememberFolderSelectorDialog return@rememberFolderSelectorDialog
} }
onContinue() onContinue(saveFolder)
} }
var showCustomFolderHint by rememberSaveable { mutableStateOf(false) } var showCustomFolderHint by rememberSaveable { mutableStateOf(false) }
@ -170,10 +170,10 @@ fun SaveFolderPage(
Button( Button(
onClick = { onClick = {
when (saveFolder) { when (saveFolder) {
null -> onContinue() null -> onContinue(saveFolder)
RECORDER_MEDIA_SELECTED_VALUE -> { RECORDER_MEDIA_SELECTED_VALUE -> {
if (SUPPORTS_SCOPED_STORAGE) { if (SUPPORTS_SCOPED_STORAGE) {
onContinue() onContinue(saveFolder)
} else { } else {
requestWritePermission() requestWritePermission()
} }

9
app/src/main/java/app/myzel394/alibi/ui/screens/WelcomeScreen.kt
View File

@ -45,8 +45,7 @@ fun WelcomeScreen(
} }
} }
Scaffold( Scaffold() { padding ->
) { padding ->
Column( Column(
modifier = Modifier modifier = Modifier
.fillMaxSize() .fillMaxSize()
@ -84,8 +83,12 @@ fun WelcomeScreen(
pagerState.animateScrollToPage(2) pagerState.animateScrollToPage(2)
} }
}, },
onContinue = { onContinue = { saveFolder ->
scope.launch { scope.launch {
dataStore.updateData {
settings.setSaveFolder(saveFolder)
}
pagerState.animateScrollToPage(4) pagerState.animateScrollToPage(4)
} }
}, },