From d4b50787d472f9db8fdecd5b5b3583987b0fcf90 Mon Sep 17 00:00:00 2001 From: Jhony Cesar Date: Tue, 28 Jul 2026 09:20:00 -0400 Subject: [PATCH] refactor: lift sheet state management to parent and implement custom back press handling for EditActivityBottomSheet --- .../ui/screens/MaintenanceDashboardScreen.kt | 32 ++++++++++--------- 1 file changed, 17 insertions(+), 15 deletions(-) diff --git a/app/src/main/java/com/example/ui/screens/MaintenanceDashboardScreen.kt b/app/src/main/java/com/example/ui/screens/MaintenanceDashboardScreen.kt index c6de577..9c4dcee 100644 --- a/app/src/main/java/com/example/ui/screens/MaintenanceDashboardScreen.kt +++ b/app/src/main/java/com/example/ui/screens/MaintenanceDashboardScreen.kt @@ -12,6 +12,7 @@ import androidx.compose.foundation.background import androidx.compose.foundation.clickable import androidx.compose.foundation.focusable import kotlinx.coroutines.delay +import kotlinx.coroutines.launch 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 @@ -575,11 +576,14 @@ fun MaintenanceDashboardScreen( // Details & Edit bottom sheet if (showEditSheet && selectedActivity != null) { + val editSheetState = rememberModalBottomSheetState(skipPartiallyExpanded = true) + EditActivityBottomSheet( activity = selectedActivity!!, history = selectedActivityHistory, currentUser = currentUser, userAccessLevel = userAccessLevel, + sheetState = editSheetState, onDismiss = { showEditSheet = false viewModel.selectActivity(null) @@ -1070,6 +1074,7 @@ fun EditActivityBottomSheet( history: List, currentUser: com.example.data.model.GoogleUser?, userAccessLevel: String?, + sheetState: SheetState, onDismiss: () -> Unit, onUpdateProgress: (Int, String, String?) -> Unit, onGoogleLoginClick: () -> Unit @@ -1077,28 +1082,25 @@ fun EditActivityBottomSheet( val density = LocalDensity.current val keyboardController = LocalSoftwareKeyboardController.current val focusManager = LocalFocusManager.current - - // Track keyboard visibility reactively val isKeyboardOpen = WindowInsets.ime.getBottom(density) > 0 - val sheetState = rememberModalBottomSheetState( - skipPartiallyExpanded = true, - confirmValueChange = { targetValue -> - if (targetValue == SheetValue.Hidden && isKeyboardOpen) { - // Keyboard is open: reject sheet dismissal and hide keyboard instead - keyboardController?.hide() - focusManager.clearFocus() - false - } else { - true - } + // Handle system Back button: if keyboard is open, close keyboard; otherwise close sheet + BackHandler(enabled = true) { + if (isKeyboardOpen) { + focusManager.clearFocus() + keyboardController?.hide() + } else { + onDismiss() } - ) + } ModalBottomSheet( onDismissRequest = onDismiss, sheetState = sheetState, - containerColor = Color.White + containerColor = Color.White, + properties = ModalBottomSheetDefaults.properties( + shouldDismissOnBackPress = false + ) ) { var progressValue by remember(activity) { mutableStateOf(activity.percentualExecucao.toFloat()) }