From 04a191c66b5eb9c2d4568c6c774922d1c5a6b980 Mon Sep 17 00:00:00 2001 From: tibbi Date: Sat, 7 Nov 2020 09:20:42 +0100 Subject: [PATCH] properly handle pressing Plus after a decimal --- .../simplemobiletools/calculator/helpers/CalculatorImpl.kt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/src/main/kotlin/com/simplemobiletools/calculator/helpers/CalculatorImpl.kt b/app/src/main/kotlin/com/simplemobiletools/calculator/helpers/CalculatorImpl.kt index caf5c63d..af7a8403 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calculator/helpers/CalculatorImpl.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calculator/helpers/CalculatorImpl.kt @@ -49,6 +49,7 @@ class CalculatorImpl(calculator: Calculator, private val context: Context) { } } + lastKey = DECIMAL showNewResult(inputDisplayedFormula) } @@ -61,7 +62,8 @@ class CalculatorImpl(calculator: Calculator, private val context: Context) { inputDisplayedFormula = "√" } - if (operations.contains(inputDisplayedFormula.last().toString())) { + val lastChar = inputDisplayedFormula.last().toString() + if (operations.contains(lastChar) || lastChar == ".") { inputDisplayedFormula = inputDisplayedFormula.dropLast(1) inputDisplayedFormula += getSign(operation) } else if (!inputDisplayedFormula.trimStart('-').contains(operationsRegex.toRegex())) {