fenix/Simple-Calculator
1
0
Fork 0
mirror of https://github.com/SimpleMobileTools/Simple-Calculator.git synced 2025-04-03 13:01:42 +02:00
Code Issues Packages Projects Releases Wiki Activity

properly handle pressing Plus after a decimal

Browse Source
This commit is contained in:
tibbi 2020-11-07 09:20:42 +01:00
parent a6c1847701
commit 04a191c66b
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/kotlin/com/simplemobiletools/calculator/helpers/CalculatorImpl.kt
View File

@ -49,6 +49,7 @@ class CalculatorImpl(calculator: Calculator, private val context: Context) {
} }
} }
lastKey = DECIMAL
showNewResult(inputDisplayedFormula) showNewResult(inputDisplayedFormula)
} }
@ -61,7 +62,8 @@ class CalculatorImpl(calculator: Calculator, private val context: Context) {
inputDisplayedFormula = "√" inputDisplayedFormula = "√"
} }
if (operations.contains(inputDisplayedFormula.last().toString())) { val lastChar = inputDisplayedFormula.last().toString()
if (operations.contains(lastChar) || lastChar == ".") {
inputDisplayedFormula = inputDisplayedFormula.dropLast(1) inputDisplayedFormula = inputDisplayedFormula.dropLast(1)
inputDisplayedFormula += getSign(operation) inputDisplayedFormula += getSign(operation)
} else if (!inputDisplayedFormula.trimStart('-').contains(operationsRegex.toRegex())) { } else if (!inputDisplayedFormula.trimStart('-').contains(operationsRegex.toRegex())) {