Update the method of dealing with Console

Author: YektaDev

src/main/kotlin/ConsoleHandler.kt

@@ -1,16 +1,21 @@
 import androidx.compose.ui.text.AnnotatedString
+import androidx.compose.ui.text.input.TextFieldValue
 import androidx.compose.ui.text.withStyle
 
 object ConsoleHandler {
  private lateinit var builder: AnnotatedString.Builder
 
- fun processInput(text: String): AnnotatedString {
- if (::builder.isInitialized)
- if (State.console.prevText == text ||
- !identicalLinesExceptLastLineAreEqual(text, State.console.prevText) || isAtTheBeginningOfLinesExceptOne(State.console.prevText, text)
- ) {
- return builder.toAnnotatedString()
- }
+ fun shouldNotChange(newText: String) = ::builder.isInitialized && (
+ State.console.prevText == newText ||
+ !identicalLinesExceptLastLineAreEqual(newText, State.console.prevText) ||
+ isAtTheBeginningOfLinesExceptOne(State.console.prevText, newText)
+ )
+
+ fun processInput(textFieldValue: TextFieldValue): AnnotatedString {
+ val text = textFieldValue.text
+
+ if (shouldNotChange(text))
+ return builder.toAnnotatedString()
 
  if (text[text.lastIndex] == '\n') {
  val rawUserLine = State.console.prevText.substring(State.console.prevText.lastIndexOf('\n') + 1)

src/main/kotlin/ConsoleState.kt

@@ -1,6 +1,8 @@
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.setValue
+import androidx.compose.ui.text.TextRange
+import androidx.compose.ui.text.input.TextFieldValue
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.flow
 
@@ -21,7 +23,7 @@ class ConsoleState {
  |
  """.trimMargin(marginPrefix = "|")
 
- var text by mutableStateOf(initialText)
+ var textFieldValue by mutableStateOf(TextFieldValue(initialText, selection = TextRange(initialText.length)))
  private set
 
  var prevText by mutableStateOf(initialText)
@@ -35,10 +37,29 @@ class ConsoleState {
  colorChangeIndexList[478] = appConfig.theme.color.front
  }
 
- @JvmName("setConsoleText")
- fun setText(newText: String) {
- if (newText.count { it == '\n' } >= text.count { it == '\n' })
- text = newText
+ @JvmName("setConsoleTextFieldValue")
+ fun setTextFieldValue(textFieldValue: TextFieldValue) {
+ if (textFieldValue.text.count { it == '\n' } >= this.textFieldValue.text.count { it == '\n' }) {
+ this.textFieldValue = textFieldValue
+ }
+ }
+
+ fun setText(newText: String, jumpToEnd: Boolean) {
+ if (newText.count { it == '\n' } >= this.textFieldValue.text.count { it == '\n' }) {
+ this.textFieldValue = textFieldValue.copy(
+ text = newText,
+ selection = if (jumpToEnd) TextRange(newText.length) else this.textFieldValue.selection
+ )
+ }
+ }
+
+ fun setTextRange(selection: TextRange) {
+ this.textFieldValue.text.length.let { length ->
+ if (selection.max <= length)
+ textFieldValue = textFieldValue.copy(textFieldValue.text, selection)
+ else if (selection.min <= length)
+ textFieldValue = textFieldValue.copy(textFieldValue.text, TextRange(selection.min, length))
+ }
  }
 
  @JvmName("setConsolePrevText")
@@ -47,7 +68,7 @@ class ConsoleState {
  }
 
  fun clean() {
- text = initialText
+ textFieldValue = textFieldValue.copy(initialText)
  prevText = initialText
  }
 
@@ -56,7 +77,7 @@ class ConsoleState {
  printQueue += it
  }
  colorCode?.let {
- colorChangeIndexList[this.text.length] = it
+ colorChangeIndexList[this.textFieldValue.text.length] = it
  }
  }
 

src/main/kotlin/compose/Console.kt

@@ -1,8 +1,10 @@
 package compose
 
 import ConsoleHandler.processInput
+import ConsoleHandler.shouldNotChange
 import ConsoleState
 import State
+import androidx.compose.foundation.text.KeyboardOptions
 import androidx.compose.material.TextField
 import androidx.compose.material.TextFieldDefaults
 import androidx.compose.runtime.Composable
@@ -11,10 +13,15 @@ import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.RectangleShape
+import androidx.compose.ui.text.TextRange
 import androidx.compose.ui.text.TextStyle
 import androidx.compose.ui.text.font.FontFamily
 import androidx.compose.ui.text.font.FontStyle
+import androidx.compose.ui.text.input.ImeAction
+import androidx.compose.ui.text.input.KeyboardCapitalization
+import androidx.compose.ui.text.input.KeyboardType
 import androidx.compose.ui.text.input.OffsetMapping
+import androidx.compose.ui.text.input.TextFieldValue
 import androidx.compose.ui.text.input.TransformedText
 import androidx.compose.ui.unit.em
 import androidx.compose.ui.unit.sp
@@ -65,8 +72,8 @@ fun Console(modifier: Modifier, state: ConsoleState = remember { State.console }
  )
 
  TextField(
- modifier = modifier,
- value = state.text,
+ modifier = modifier.HandleKeyEvents(),
+ value = state.textFieldValue,
  singleLine = false,
  maxLines = Int.MAX_VALUE,
  colors = colors,
@@ -81,18 +88,29 @@ fun Console(modifier: Modifier, state: ConsoleState = remember { State.console }
  isError = false,
  visualTransformation = {
  TransformedText(
- processInput(state.text),
+ processInput(state.textFieldValue),
  OffsetMapping.Identity
  )
  },
- onValueChange = {
- state.setText(processInput(it).toString())
+ onValueChange = { value: TextFieldValue ->
+ if (!shouldNotChange(value.text)) {
+ val result = processInput(value).toString()
+ state.setTextFieldValue(
+ TextFieldValue(result, TextRange(result.length))
+ )
+ }
  },
+ keyboardOptions = KeyboardOptions(
+ capitalization = KeyboardCapitalization.None,
+ autoCorrect = true,
+ keyboardType = KeyboardType.Text,
+ imeAction = ImeAction.Send,
+ ),
  )
 
  coroutineScope.launch {
  state.printMessageFlow().collect {
- state.setText(processInput(state.text + it).toString())
+ state.setText(processInput(TextFieldValue(state.textFieldValue.text + it)).toString(), true)
  }
  }
 }