From 63ca97ff1b55703b3af3644b5c001c4188778af0 Mon Sep 17 00:00:00 2001 From: Jhony Cesar Date: Tue, 28 Jul 2026 09:45:10 -0400 Subject: [PATCH] fix: resolve keyboard dismissal issues on Samsung devices by tracking back-press state in MaintenanceDashboardScreen --- .../ui/screens/MaintenanceDashboardScreen.kt | 30 +++++++++++-------- 1 file changed, 18 insertions(+), 12 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 2670c32..5932a5a 100644 --- a/app/src/main/java/com/example/ui/screens/MaintenanceDashboardScreen.kt +++ b/app/src/main/java/com/example/ui/screens/MaintenanceDashboardScreen.kt @@ -1084,24 +1084,32 @@ fun EditActivityBottomSheet( val focusManager = LocalFocusManager.current val coroutineScope = rememberCoroutineScope() - // Read WindowInsets.ime in Composable scope and wrap in rememberUpdatedState val isKeyboardOpen = WindowInsets.ime.getBottom(density) > 0 - val isKeyboardOpenState = rememberUpdatedState(isKeyboardOpen) + + // State flag to track if keyboard was already dismissed by a back press. + // This solves Samsung OneUI inset update delay issues after keyboardController.hide(). + var keyboardDismissedByBack by remember { mutableStateOf(false) } + + LaunchedEffect(isKeyboardOpen) { + if (isKeyboardOpen) { + keyboardDismissedByBack = false + } + } // Handle system Back button: - // 1. If keyboard is open -> clear focus and hide keyboard (sheet stays open) - // 2. If keyboard is closed -> animate sheet hiding and call onDismiss() + // 1st back press (keyboard open): clear focus and hide keyboard. + // 2nd back press (or keyboard closed): animate sheet hiding and call onDismiss(). BackHandler(enabled = true) { - if (isKeyboardOpenState.value) { - focusManager.clearFocus() + if (isKeyboardOpen && !keyboardDismissedByBack) { + keyboardDismissedByBack = true + focusManager.clearFocus(force = true) keyboardController?.hide() } else { + keyboardDismissedByBack = false coroutineScope.launch { sheetState.hide() }.invokeOnCompletion { - if (!sheetState.isVisible) { - onDismiss() - } + onDismiss() } } } @@ -1111,9 +1119,7 @@ fun EditActivityBottomSheet( coroutineScope.launch { sheetState.hide() }.invokeOnCompletion { - if (!sheetState.isVisible) { - onDismiss() - } + onDismiss() } }, sheetState = sheetState,