From 570a89f769cfd64198351846d09b88df6a069d28 Mon Sep 17 00:00:00 2001 From: Sad Ellie Date: Fri, 21 Apr 2023 11:54:34 +0300 Subject: [PATCH] Don't diplay NaN closes #47 --- .../unitto/feature/calculator/CalculatorViewModel.kt | 6 +++--- 1 file changed, 3 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 5bcc7214..9c1b6081 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 @@ -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) 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 if (output.isEmpty()) return if (!Expression(textFieldController.inputTextWithoutFormatting().clean).checkSyntax()) return @@ -124,9 +124,9 @@ internal class CalculatorViewModel @Inject constructor( val calculated = Expression(currentInput.clean).calculate() - // Calculation error, return NaN + // Calculation error, return empty string if (calculated.isNaN() or calculated.isInfinite()) { - _output.update { calculated.toString() } + _output.update { "" } return }