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

Don't diplay NaN

Browse Source 
closes #47
This commit is contained in:
Sad Ellie 2023-04-21 11:54:34 +03:00
parent 60e60268cb
commit 570a89f769
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -90,7 +90,7 @@ internal class CalculatorViewModel @Inject constructor(
// Input and output can change while saving in history. This way we cache it here (i think) // Input and output can change while saving in history. This way we cache it here (i think)
val output = _output.value val output = _output.value
// Output can be empty when input and output are identical (for exampel when user entered // Output can be empty when input and output are identical (for example when user entered
// just a number, not expression // just a number, not expression
if (output.isEmpty()) return if (output.isEmpty()) return
if (!Expression(textFieldController.inputTextWithoutFormatting().clean).checkSyntax()) return if (!Expression(textFieldController.inputTextWithoutFormatting().clean).checkSyntax()) return
@ -124,9 +124,9 @@ internal class CalculatorViewModel @Inject constructor(
val calculated = Expression(currentInput.clean).calculate() val calculated = Expression(currentInput.clean).calculate()
// Calculation error, return NaN // Calculation error, return empty string
if (calculated.isNaN() or calculated.isInfinite()) { if (calculated.isNaN() or calculated.isInfinite()) {
_output.update { calculated.toString() } _output.update { "" }
return return
} }