Myzel394/NumberHub
1
0
Fork 0
mirror of https://github.com/Myzel394/NumberHub.git synced 2025-06-20 09:15:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fixed expression evaluation ("=" click)

Browse Source
This commit is contained in:
Sad Ellie 2023-02-26 15:12:34 +04:00
parent 2ee69c5b9c
commit ce614aa172
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
feature/calculator/src/main/java/com/sadellie/unitto/feature/calculator/CalculatorViewModel.kt
View File

@ -99,7 +99,11 @@ internal class CalculatorViewModel @Inject constructor(
fun evaluate() {
// Input and output can change while saving in history. This way we cache it here (i think)
val output = _output.value
if (!Expression(textFieldController.inputTextWithoutFormatting()).checkSyntax()) return
// Output can be empty when input and output are identical (for exampel when user entered
// just a number, not expression
if (output.isEmpty()) return
if (!Expression(textFieldController.inputTextWithoutFormatting().clean).checkSyntax()) return
// Save to history
viewModelScope.launch(Dispatchers.IO) {
@ -139,6 +143,7 @@ internal class CalculatorViewModel @Inject constructor(
.setMinimumRequiredScale(_userPrefs.value.digitsPrecision)
.trimZeros()
// Output will be empty if it's same as input
try {
val inputBigDecimal = BigDecimal(currentInput)