From 942ea853f057d3ae159093be891e5e20d3c06f7c Mon Sep 17 00:00:00 2001
From: Sad Ellie <sadellie.dev@gmail.com>
Date: Sat, 25 Feb 2023 17:03:30 +0400
Subject: [PATCH] Remove formatting when evaluating

---
 .../unitto/feature/calculator/CalculatorViewModel.kt         | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/feature/calculator/src/main/java/com/sadellie/unitto/feature/calculator/CalculatorViewModel.kt b/feature/calculator/src/main/java/com/sadellie/unitto/feature/calculator/CalculatorViewModel.kt
index 32539c93..3c24bbc8 100644
--- a/feature/calculator/src/main/java/com/sadellie/unitto/feature/calculator/CalculatorViewModel.kt
+++ b/feature/calculator/src/main/java/com/sadellie/unitto/feature/calculator/CalculatorViewModel.kt
@@ -98,9 +98,8 @@ internal class CalculatorViewModel @Inject constructor(
     // Called when user clicks "=" on a keyboard
     fun evaluate() {
         // Input and output can change while saving in history. This way we cache it here (i think)
-        val currentInput = textFieldController.input.value.text
         val output = _output.value
-        if (!Expression(currentInput.clean).checkSyntax()) return
+        if (!Expression(textFieldController.inputTextWithoutFormatting()).checkSyntax()) return
 
         // Save to history
         viewModelScope.launch(Dispatchers.IO) {
@@ -120,7 +119,7 @@ internal class CalculatorViewModel @Inject constructor(
     fun onCursorChange(selection: IntRange) = textFieldController.moveCursor(selection)
 
     private fun calculateInput() {
-        val currentInput = textFieldController.input.value.text
+        val currentInput = textFieldController.inputTextWithoutFormatting()
         // Input is empty, don't calculate
         if (currentInput.isEmpty()) {
             _output.update { "" }