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 c535207..925f745 100644 --- a/app/src/main/java/com/example/ui/screens/MaintenanceDashboardScreen.kt +++ b/app/src/main/java/com/example/ui/screens/MaintenanceDashboardScreen.kt @@ -1,6 +1,7 @@ package com.example.ui.screens import android.widget.Toast +import androidx.activity.compose.BackHandler import androidx.activity.compose.rememberLauncherForActivityResult import androidx.activity.result.contract.ActivityResultContracts import androidx.compose.animation.AnimatedVisibility @@ -14,6 +15,7 @@ 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.* import androidx.compose.foundation.lazy.LazyColumn import androidx.compose.foundation.lazy.LazyRow @@ -30,6 +32,8 @@ import androidx.compose.ui.draw.clip import androidx.compose.ui.draw.rotate import androidx.compose.ui.graphics.Color import androidx.compose.ui.platform.LocalContext +import androidx.compose.ui.platform.LocalFocusManager +import androidx.compose.ui.platform.LocalSoftwareKeyboardController import androidx.compose.ui.platform.testTag import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.text.style.TextOverflow @@ -1006,7 +1010,7 @@ fun OSListItemCard( /** * Modal Bottom Sheet for OS Details, Editing and Timeline History */ -@OptIn(ExperimentalMaterial3Api::class) +@OptIn(ExperimentalMaterial3Api::class, ExperimentalLayoutApi::class) @Composable fun EditActivityBottomSheet( activity: MaintenanceActivity, @@ -1021,6 +1025,15 @@ fun EditActivityBottomSheet( 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() + } + var progressValue by remember(activity) { mutableStateOf(activity.percentualExecucao.toFloat()) } var observationText by remember { mutableStateOf("") } var selectedMockPhotoPath by remember { mutableStateOf(null) }