diff --git a/ui/src/main/java/de/mm20/launcher2/ui/component/BottomSheetDialog.kt b/ui/src/main/java/de/mm20/launcher2/ui/component/BottomSheetDialog.kt index cacfc559..50035aeb 100644 --- a/ui/src/main/java/de/mm20/launcher2/ui/component/BottomSheetDialog.kt +++ b/ui/src/main/java/de/mm20/launcher2/ui/component/BottomSheetDialog.kt @@ -37,6 +37,7 @@ fun BottomSheetDialog( confirmButton: @Composable (() -> Unit)? = null, dismissButton: @Composable (() -> Unit)? = null, swipeToDismiss: () -> Boolean = { true }, + dismissOnBackPress: () -> Boolean = { true }, content: @Composable () -> Unit, ) { val swipeState = remember { @@ -102,7 +103,8 @@ fun BottomSheetDialog( Dialog( properties = DialogProperties( usePlatformDefaultWidth = false, - dismissOnClickOutside = true + dismissOnClickOutside = true, + dismissOnBackPress = dismissOnBackPress() ), onDismissRequest = onDismissRequest, ) { diff --git a/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/common/customattrs/CustomizeSearchableSheet.kt b/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/common/customattrs/CustomizeSearchableSheet.kt index 612a2a9d..778d49ad 100644 --- a/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/common/customattrs/CustomizeSearchableSheet.kt +++ b/ui/src/main/java/de/mm20/launcher2/ui/launcher/search/common/customattrs/CustomizeSearchableSheet.kt @@ -1,7 +1,10 @@ package de.mm20.launcher2.ui.launcher.search.common.customattrs import android.graphics.drawable.InsetDrawable +import android.widget.Toast +import androidx.activity.compose.BackHandler import androidx.appcompat.content.res.AppCompatResources +import androidx.compose.foundation.clickable import androidx.compose.foundation.layout.* import androidx.compose.foundation.lazy.grid.GridCells 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.Modifier import androidx.compose.ui.graphics.toArgb +import androidx.compose.ui.input.pointer.pointerInput import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.res.stringResource 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)) }, swipeToDismiss = { !pickIcon }, + dismissOnBackPress = { !pickIcon }, confirmButton = { if (pickIcon) { OutlinedButton(onClick = { viewModel.closeIconPicker() }) { @@ -94,8 +99,14 @@ fun CustomizeSearchableSheet( modifier = Modifier .fillMaxWidth() - .padding(top = 24.dp), - value = "", + .padding(top = 24.dp) + .clickable { + Toast + .makeText(context, "Soon™", Toast.LENGTH_SHORT) + .show() + }, + enabled = false, + value = searchable.label, onValueChange = {}, placeholder = { Text(searchable.label)