fix: update ModalBottomSheet back press behavior to explicitly trigger onDismiss

This commit is contained in:
Jhony Cesar
2026-07-28 01:06:48 -04:00
parent 61596965e1
commit e4d897b769

View File

@@ -10,12 +10,14 @@ import androidx.compose.foundation.BorderStroke
import androidx.compose.foundation.Canvas
import androidx.compose.foundation.background
import androidx.compose.foundation.clickable
import androidx.compose.foundation.focusable
import kotlinx.coroutines.delay
import com.google.android.gms.auth.api.signin.GoogleSignIn
import com.google.android.gms.auth.api.signin.GoogleSignInOptions
import com.google.android.gms.common.api.ApiException
import androidx.compose.foundation.verticalScroll
import androidx.compose.foundation.layout.ExperimentalLayoutApi
import androidx.compose.foundation.layout.isImeVisible
import androidx.compose.foundation.layout.*
import androidx.compose.foundation.lazy.LazyColumn
import androidx.compose.foundation.lazy.LazyRow
@@ -31,7 +33,9 @@ import androidx.compose.ui.Modifier
import androidx.compose.ui.draw.clip
import androidx.compose.ui.draw.rotate
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.input.key.*
import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.platform.LocalDensity
import androidx.compose.ui.platform.LocalFocusManager
import androidx.compose.ui.platform.LocalSoftwareKeyboardController
import androidx.compose.ui.platform.testTag
@@ -1070,19 +1074,31 @@ fun EditActivityBottomSheet(
onUpdateProgress: (Int, String, String?) -> Unit,
onGoogleLoginClick: () -> Unit
) {
val density = LocalDensity.current
val isKeyboardOpen = WindowInsets.ime.getBottom(density) > 0
ModalBottomSheet(
onDismissRequest = onDismiss,
sheetState = rememberModalBottomSheetState(skipPartiallyExpanded = true),
containerColor = Color.White
) {
val isKeyboardOpen = WindowInsets.isImeVisible
val keyboardController = LocalSoftwareKeyboardController.current
val focusManager = LocalFocusManager.current
BackHandler(enabled = isKeyboardOpen) {
keyboardController?.hide()
focusManager.clearFocus()
containerColor = Color.White,
properties = ModalBottomSheetDefaults.properties(
shouldDismissOnBackPress = false
),
modifier = Modifier
.focusable()
.onPreviewKeyEvent { event ->
if (event.key == Key.Back && event.type == KeyEventType.KeyUp) {
if (isKeyboardOpen) {
false
} else {
onDismiss()
true
}
} else {
false
}
}
) {
var progressValue by remember(activity) { mutableStateOf(activity.percentualExecucao.toFloat()) }
var observationText by remember { mutableStateOf("") }