Skip to content

FolderPickerDialog: Make back button go up one level #166

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
chenxiaolong merged 1 commit into from
Jun 15, 2026
Merged

FolderPickerDialog: Make back button go up one level #166

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion app/src/main/java/com/chiller3/basicsync/settings/FolderPickerDialog.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
package com.chiller3.basicsync.settings

import android.os.Parcelable
import androidx.activity.compose.BackHandler
import androidx.compose.foundation.lazy.itemsIndexed
import androidx.compose.material3.AlertDialog
import androidx.compose.material3.ExperimentalMaterial3ExpressiveApi
Expand Down Expand Up @@ -61,6 +62,7 @@ fun FolderPickerDialog(
}

val state by viewModel.state.collectAsStateWithLifecycle()
val hasParent = ".." in state.childDirs

var showNewFolderDialog by rememberSaveable { mutableStateOf(false) }

Expand All @@ -79,6 +81,11 @@ fun FolderPickerDialog(
)
}
}

BackHandler(
enabled = hasParent,
onBack = { viewModel.navigate(File("..")) },
)
},
onDismissRequest = onDismiss,
confirmButton = {
Expand All @@ -96,7 +103,7 @@ fun FolderPickerDialog(
}
},
properties = DialogProperties(
dismissOnBackPress = false,
dismissOnBackPress = !hasParent,
dismissOnClickOutside = false,
),
)
Expand Down