Skip to content

fix: similar undo/redo fix to ios #129

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ktsorensenWX wants to merge 5 commits into
base: develop
Choose a base branch
from
+21 −3
Open

fix: similar undo/redo fix to ios #129

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f1e42bd
fix: similar undo/redo fix to ios, having the buttons remain when sel…
ktsorensenWX Jul 30, 2026
cc4a912
Merge branch 'develop' into fix/undo-redo-hotfix
ktsorensenWX Jul 30, 2026
8fd4923
fix: accidental removal of undo/redo when undo back to start
ktsorensenWX Jul 30, 2026
9768563
Merge branch 'fix/undo-redo-hotfix' of github.com:ngageoint/mage-andr…
ktsorensenWX Jul 30, 2026
5ccef13
fix: modifying undo-redo bar to stop dissapearing as soon as undo to …
ktsorensenWX Jul 31, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions mage/src/main/java/mil/nga/giat/mage/form/edit/FormEdit.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,8 @@ import androidx.compose.ui.text.input.PasswordVisualTransformation
import androidx.compose.ui.text.input.TextFieldValue
import androidx.compose.ui.text.input.VisualTransformation
import androidx.compose.ui.unit.sp
import androidx.compose.foundation.relocation.BringIntoViewRequester
import androidx.compose.foundation.relocation.bringIntoViewRequester
import mil.nga.giat.mage.database.model.event.Event
import mil.nga.giat.mage.form.field.*
import mil.nga.giat.mage.form.FormState
Expand Down Expand Up @@ -438,6 +440,7 @@ fun TextEdit(
val pendingJob = remember { object { var value: Job? = null } }
val lastHistoryText = remember { object { var value = fieldState.answer?.text ?: "" } }
val isFirstChange = remember { object { var value = true } }
val bringIntoViewRequester = remember { BringIntoViewRequester() }

var textFieldValue by remember { mutableStateOf(TextFieldValue(text = fieldState.answer?.text ?: "")) }
val currentAnswerText = fieldState.answer?.text ?: ""
Expand All @@ -459,6 +462,9 @@ fun TextEdit(
val newText = newValue.text
val capturedPrev = lastHistoryText.value
onAnswer(newText)
scope.launch {
bringIntoViewRequester.bringIntoView()
}
if (fieldState is TextFieldState) {
pendingJob.value?.cancel()
if (isFirstChange.value) {
Expand All @@ -484,6 +490,7 @@ fun TextEdit(
trailingIcon = icon,
modifier = Modifier
.fillMaxWidth()
.bringIntoViewRequester(bringIntoViewRequester)
.onFocusChanged { focusState ->
val focused = focusState.isFocused
if (focused && fieldState is TextFieldState) {
Expand Down
17 changes: 14 additions & 3 deletions mage/src/main/java/mil/nga/giat/mage/observation/edit/ObservationEditScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import androidx.compose.animation.slideInVertically
import androidx.compose.animation.slideOutVertically
import androidx.compose.foundation.*
import androidx.compose.foundation.gestures.animateScrollBy
import androidx.compose.foundation.gestures.detectTapGestures
import androidx.compose.foundation.layout.*
import androidx.compose.foundation.lazy.*
import androidx.compose.material.*
Expand All @@ -24,9 +25,11 @@ import androidx.compose.runtime.snapshotFlow
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.input.pointer.pointerInput
import androidx.compose.ui.layout.onSizeChanged
import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.platform.LocalDensity
import androidx.compose.ui.platform.LocalFocusManager
import androidx.compose.ui.text.font.FontWeight
import androidx.compose.ui.unit.dp
import kotlinx.android.parcel.Parcelize
Expand Down Expand Up @@ -79,15 +82,16 @@ fun ObservationEditScreen(
val scope = rememberCoroutineScope()
val scaffoldState = rememberScaffoldState()
val listState = rememberLazyListState()
val focusManager = LocalFocusManager.current

val focusedUndoField by remember {
derivedStateOf {
observationState?.forms?.value
?.flatMap { it.fields }
?.firstOrNull { field ->
field.isFocused && when (field) {
is TextFieldState -> field.isTypingActive && (field.canUndo || field.canRedo)
is NumberFieldState -> field.isTypingActive && (field.canUndo || field.canRedo)
is TextFieldState -> field.hasValue() || field.canUndo || field.canRedo
is NumberFieldState -> field.hasValue() || field.canUndo || field.canRedo
else -> false
}
}
Expand Down Expand Up @@ -134,7 +138,14 @@ fun ObservationEditScreen(
}
}

Column(modifier = Modifier.fillMaxSize().imePadding()) {
Column(
modifier = Modifier
.fillMaxSize()
.imePadding()
.pointerInput(Unit) {
detectTapGestures(onTap = { focusManager.clearFocus() })
}
) {
if (isServerVersion5(LocalContext.current)) {
ObservationMediaBar { onMediaAction?.invoke(MediaAction(it, null, null)) }
}
Expand Down