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

Dont close customize sheet on back press if icon picker is open

Browse Source
This commit is contained in:
MM20 2022-07-31 16:04:03 +02:00
parent a0cec95aa7
commit b979c81501
No known key found for this signature in database
GPG Key ID: 0B61A8F2DEAFA389
2 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -37,6 +37,7 @@ fun BottomSheetDialog(
confirmButton: @Composable (() -> Unit)? = null, confirmButton: @Composable (() -> Unit)? = null,
dismissButton: @Composable (() -> Unit)? = null, dismissButton: @Composable (() -> Unit)? = null,
swipeToDismiss: () -> Boolean = { true }, swipeToDismiss: () -> Boolean = { true },
dismissOnBackPress: () -> Boolean = { true },
content: @Composable () -> Unit, content: @Composable () -> Unit,
) { ) {
val swipeState = remember { val swipeState = remember {
@ -102,7 +103,8 @@ fun BottomSheetDialog(
Dialog( Dialog(
properties = DialogProperties( properties = DialogProperties(
usePlatformDefaultWidth = false, usePlatformDefaultWidth = false,
dismissOnClickOutside = true dismissOnClickOutside = true,
dismissOnBackPress = dismissOnBackPress()
), ),
onDismissRequest = onDismissRequest, onDismissRequest = onDismissRequest,
) { ) {

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

@ -1,7 +1,10 @@
package de.mm20.launcher2.ui.launcher.search.common.customattrs package de.mm20.launcher2.ui.launcher.search.common.customattrs
import android.graphics.drawable.InsetDrawable import android.graphics.drawable.InsetDrawable
import android.widget.Toast
import androidx.activity.compose.BackHandler
import androidx.appcompat.content.res.AppCompatResources import androidx.appcompat.content.res.AppCompatResources
import androidx.compose.foundation.clickable
import androidx.compose.foundation.layout.* import androidx.compose.foundation.layout.*
import androidx.compose.foundation.lazy.grid.GridCells import androidx.compose.foundation.lazy.grid.GridCells
import androidx.compose.foundation.lazy.grid.GridItemSpan import androidx.compose.foundation.lazy.grid.GridItemSpan
@ -16,6 +19,7 @@ import androidx.compose.runtime.livedata.observeAsState
import androidx.compose.ui.Alignment import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier import androidx.compose.ui.Modifier
import androidx.compose.ui.graphics.toArgb import androidx.compose.ui.graphics.toArgb
import androidx.compose.ui.input.pointer.pointerInput
import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.res.stringResource import androidx.compose.ui.res.stringResource
import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.text.style.TextAlign
@ -48,6 +52,7 @@ fun CustomizeSearchableSheet(
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 }, swipeToDismiss = { !pickIcon },
dismissOnBackPress = { !pickIcon },
confirmButton = { confirmButton = {
if (pickIcon) { if (pickIcon) {
OutlinedButton(onClick = { viewModel.closeIconPicker() }) { OutlinedButton(onClick = { viewModel.closeIconPicker() }) {
@ -94,8 +99,14 @@ fun CustomizeSearchableSheet(
modifier = modifier =
Modifier Modifier
.fillMaxWidth() .fillMaxWidth()
.padding(top = 24.dp), .padding(top = 24.dp)
value = "", .clickable {
Toast
.makeText(context, "Soon™", Toast.LENGTH_SHORT)
.show()
},
enabled = false,
value = searchable.label,
onValueChange = {}, onValueChange = {},
placeholder = { placeholder = {
Text(searchable.label) Text(searchable.label)