lun_admin/NeoLaunch_From_Kvaesitso
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Prevent customize sheet to be dismissed by swipe when icon picker is open

Browse Source
This commit is contained in:
MM20 2022-07-31 15:11:01 +02:00
parent d5aa0667ad
commit b9e65f3c9f
No known key found for this signature in database
GPG Key ID: 0B61A8F2DEAFA389
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ui/src/main/java/de/mm20/launcher2/ui/component/BottomSheetDialog.kt
View File

@ -36,13 +36,17 @@ fun BottomSheetDialog(
actions: @Composable RowScope.() -> Unit = {}, actions: @Composable RowScope.() -> Unit = {},
confirmButton: @Composable (() -> Unit)? = null, confirmButton: @Composable (() -> Unit)? = null,
dismissButton: @Composable (() -> Unit)? = null, dismissButton: @Composable (() -> Unit)? = null,
swipeToDismiss: () -> Boolean = { true },
content: @Composable () -> Unit, content: @Composable () -> Unit,
) { ) {
val swipeState = remember { val swipeState = remember {
SwipeableState( SwipeableState(
initialValue = SwipeState.Dismiss, initialValue = SwipeState.Dismiss,
confirmStateChange = { confirmStateChange = {
if (it == SwipeState.Dismiss) onDismissRequest() if (it == SwipeState.Dismiss) {
if (swipeToDismiss()) onDismissRequest()
else return@SwipeableState false
}
return@SwipeableState true return@SwipeableState true
} }
) )

1
ui/src/main/java/de/mm20/launcher2/ui/launcher/search/common/customattrs/CustomizeSearchableSheet.kt
View File

@ -47,6 +47,7 @@ fun CustomizeSearchableSheet(
title = { title = {
Text(stringResource(if (pickIcon) R.string.icon_picker_title else R.string.menu_customize)) Text(stringResource(if (pickIcon) R.string.icon_picker_title else R.string.menu_customize))
}, },
swipeToDismiss = { !pickIcon },
confirmButton = { confirmButton = {
if (pickIcon) { if (pickIcon) {
OutlinedButton(onClick = { viewModel.closeIconPicker() }) { OutlinedButton(onClick = { viewModel.closeIconPicker() }) {