fix: calculator cursor placement after evaluation

you-apps · Dec 10, 2023 · cc448be · cc448be
1 parent b3b04f2
commit cc448be
Showing 1 changed file with 8 additions and 5 deletions.
diff --git a/app/src/main/java/net/youapps/calcyou/data/EventHandler.kt b/app/src/main/java/net/youapps/calcyou/data/EventHandler.kt
@@ -1,6 +1,7 @@
 package net.youapps.calcyou.data
 
 import android.content.Context
+import androidx.compose.ui.text.TextRange
 import androidx.compose.ui.text.input.TextFieldValue
 
 class EventHandler(
@@ -34,12 +35,14 @@ class EventHandler(
 
             CalculatorEvent.Evaluate -> {
                 onUpdateHistory(currentText.text)
+                val newText = evaluator.evaluate(
+                    tokenizer.getNormalizedExpression(
+                        currentText.text
+                    )
+                ) ?: "Error"
                 TextFieldValue(
-                    evaluator.evaluate(
-                        tokenizer.getNormalizedExpression(
-                            currentText.text
-                        )
-                    ) ?: "Error"
+                    newText,
+                    selection = TextRange(newText.length)
                 )
             }