Compare commits
4 Commits
af1c782ba5
...
899f921792
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
899f921792 | ||
|
|
63ca97ff1b | ||
|
|
977c87c125 | ||
|
|
d4b50787d4 |
@@ -11,7 +11,10 @@ import androidx.compose.foundation.Canvas
|
||||
import androidx.compose.foundation.background
|
||||
import androidx.compose.foundation.clickable
|
||||
import androidx.compose.foundation.focusable
|
||||
import androidx.compose.ui.window.Dialog
|
||||
import androidx.compose.ui.window.DialogProperties
|
||||
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
|
||||
@@ -1063,7 +1066,7 @@ fun OSListItemCard(
|
||||
/**
|
||||
* Modal Bottom Sheet for OS Details, Editing and Timeline History
|
||||
*/
|
||||
@OptIn(ExperimentalMaterial3Api::class, ExperimentalLayoutApi::class)
|
||||
@OptIn(ExperimentalLayoutApi::class)
|
||||
@Composable
|
||||
fun EditActivityBottomSheet(
|
||||
activity: MaintenanceActivity,
|
||||
@@ -1074,32 +1077,58 @@ fun EditActivityBottomSheet(
|
||||
onUpdateProgress: (Int, String, String?) -> Unit,
|
||||
onGoogleLoginClick: () -> Unit
|
||||
) {
|
||||
val density = LocalDensity.current
|
||||
val keyboardController = LocalSoftwareKeyboardController.current
|
||||
val focusManager = LocalFocusManager.current
|
||||
val keyboardController = LocalSoftwareKeyboardController.current
|
||||
val isImeVisible = WindowInsets.isImeVisible
|
||||
|
||||
// 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
|
||||
}
|
||||
}
|
||||
)
|
||||
|
||||
ModalBottomSheet(
|
||||
Dialog(
|
||||
onDismissRequest = onDismiss,
|
||||
sheetState = sheetState,
|
||||
containerColor = Color.White
|
||||
properties = DialogProperties(usePlatformDefaultWidth = false)
|
||||
) {
|
||||
BackHandler(enabled = true) {
|
||||
if (isImeVisible) {
|
||||
focusManager.clearFocus(force = true)
|
||||
keyboardController?.hide()
|
||||
} else {
|
||||
onDismiss()
|
||||
}
|
||||
}
|
||||
|
||||
Box(
|
||||
modifier = Modifier
|
||||
.fillMaxSize()
|
||||
.background(Color.Black.copy(alpha = 0.5f))
|
||||
.clickable(onClick = onDismiss),
|
||||
contentAlignment = Alignment.BottomCenter
|
||||
) {
|
||||
Card(
|
||||
modifier = Modifier
|
||||
.fillMaxWidth()
|
||||
.clickable(enabled = false) {}, // Prevent card content click from dismissing
|
||||
shape = RoundedCornerShape(topStart = 16.dp, topEnd = 16.dp),
|
||||
colors = CardDefaults.cardColors(containerColor = Color.White)
|
||||
) {
|
||||
Column(
|
||||
modifier = Modifier
|
||||
.fillMaxWidth()
|
||||
.padding(horizontal = 20.dp, vertical = 12.dp)
|
||||
.verticalScroll(rememberScrollState())
|
||||
.navigationBarsPadding(),
|
||||
verticalArrangement = Arrangement.spacedBy(16.dp)
|
||||
) {
|
||||
// Top Drag Handle Indicator
|
||||
Box(
|
||||
modifier = Modifier.fillMaxWidth(),
|
||||
contentAlignment = Alignment.Center
|
||||
) {
|
||||
Box(
|
||||
modifier = Modifier
|
||||
.width(32.dp)
|
||||
.height(4.dp)
|
||||
.clip(RoundedCornerShape(2.dp))
|
||||
.background(Color(0xFFE0E0E0))
|
||||
)
|
||||
}
|
||||
|
||||
var progressValue by remember(activity) { mutableStateOf(activity.percentualExecucao.toFloat()) }
|
||||
var observationText by remember { mutableStateOf("") }
|
||||
@@ -1113,15 +1142,6 @@ fun EditActivityBottomSheet(
|
||||
"Mancal Engraxado" to "ic_gear_mock",
|
||||
"Caldeira Lavada" to "ic_boiler_mock"
|
||||
)
|
||||
|
||||
Column(
|
||||
modifier = Modifier
|
||||
.fillMaxWidth()
|
||||
.padding(horizontal = 20.dp, vertical = 8.dp)
|
||||
.verticalScroll(rememberScrollState()) // Allow full content scrolling on small screens
|
||||
.navigationBarsPadding(), // Prevent covering by standard bottom navigation buttons
|
||||
verticalArrangement = Arrangement.spacedBy(16.dp)
|
||||
) {
|
||||
// Header: OS + Close
|
||||
Row(
|
||||
modifier = Modifier.fillMaxWidth(),
|
||||
@@ -1496,6 +1516,8 @@ fun EditActivityBottomSheet(
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@Composable
|
||||
fun TimelineLogItem(log: OSUpdateHistory) {
|
||||
|
||||
@@ -1,8 +1,18 @@
|
||||
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.ui.focus.FocusRequester
|
||||
import androidx.compose.ui.focus.focusRequester
|
||||
import androidx.compose.ui.focus.onFocusChanged
|
||||
import androidx.compose.ui.platform.LocalFocusManager
|
||||
import androidx.compose.ui.platform.LocalSoftwareKeyboardController
|
||||
import androidx.compose.ui.platform.LocalDensity
|
||||
import androidx.compose.ui.window.Dialog
|
||||
import androidx.compose.ui.window.DialogProperties
|
||||
import kotlinx.coroutines.delay
|
||||
import androidx.compose.foundation.BorderStroke
|
||||
import androidx.compose.foundation.background
|
||||
import androidx.compose.foundation.clickable
|
||||
@@ -58,6 +68,7 @@ fun SettingsScreen(
|
||||
var tempSpreadsheetId by remember(activeSpreadsheetId) { mutableStateOf(activeSpreadsheetId) }
|
||||
var showClearCacheDialog by remember { mutableStateOf(false) }
|
||||
var showConflictsDialog by remember { mutableStateOf(false) }
|
||||
var activeTestModal by remember { mutableStateOf<Int?>(null) }
|
||||
|
||||
// Start monitoring GCP API status when screen is open, stop when closed
|
||||
DisposableEffect(Unit) {
|
||||
@@ -828,3 +839,5 @@ fun AdminButton(
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user