From 0004164b4062ce8765d9dafe74b3516ad0c68a02 Mon Sep 17 00:00:00 2001 From: Abdelilah El Aissaoui Date: Mon, 1 May 2023 16:20:57 +0200 Subject: [PATCH] Fixed signoff dialog cursor position --- .../com/jetpackduba/gitnuro/ui/dialogs/SignOffDialog.kt | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/main/kotlin/com/jetpackduba/gitnuro/ui/dialogs/SignOffDialog.kt b/src/main/kotlin/com/jetpackduba/gitnuro/ui/dialogs/SignOffDialog.kt index 066dfc2..c151926 100644 --- a/src/main/kotlin/com/jetpackduba/gitnuro/ui/dialogs/SignOffDialog.kt +++ b/src/main/kotlin/com/jetpackduba/gitnuro/ui/dialogs/SignOffDialog.kt @@ -14,7 +14,9 @@ import androidx.compose.ui.focus.focusProperties import androidx.compose.ui.focus.focusRequester import androidx.compose.ui.graphics.Color import androidx.compose.ui.res.painterResource +import androidx.compose.ui.text.TextRange import androidx.compose.ui.text.font.FontWeight +import androidx.compose.ui.text.input.TextFieldValue import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.unit.dp import com.jetpackduba.gitnuro.AppIcons @@ -43,7 +45,7 @@ fun SignOffDialog( "" } - mutableStateOf(signOff) + mutableStateOf(TextFieldValue(signOff, TextRange(signOff.count()))) } var enabledSignOff by remember(viewModel, state) { @@ -157,9 +159,9 @@ fun SignOffDialog( this.previous = signOffFieldFocusRequester this.next = signOffFieldFocusRequester }, - enabled = signOffField.isNotBlank() && state is SignOffState.Loaded, + enabled = signOffField.text.isNotBlank() && state is SignOffState.Loaded, onClick = { - viewModel.saveSignOffFormat(enabledSignOff, signOffField) + viewModel.saveSignOffFormat(enabledSignOff, signOffField.text) onClose() }, text = "Save"