fenix/Simple-Calculator
1
0
Fork 0
mirror of https://github.com/SimpleMobileTools/Simple-Calculator.git synced 2025-06-05 21:49:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

fixing some decimal related glitches

Browse Source
This commit is contained in:
tibbi
2020-11-07 16:43:05 +01:00
parent 2291a5263b
commit 49712ff64c
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -70,14 +70,16 @@ class CalculatorImpl(calculator: Calculator, private val context: Context) {
} }
val lastChar = inputDisplayedFormula.last().toString() val lastChar = inputDisplayedFormula.last().toString()
if (operations.contains(lastChar) || lastChar == ".") { if (lastChar == ".") {
inputDisplayedFormula = inputDisplayedFormula.dropLast(1)
} else 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())) {
inputDisplayedFormula += getSign(operation) inputDisplayedFormula += getSign(operation)
} }
if (lastKey == DIGIT) { if (lastKey == DIGIT || lastKey == DECIMAL) {
if (lastOperation != "" && operation == PERCENT) { if (lastOperation != "" && operation == PERCENT) {
handlePercent() handlePercent()
} else { } else {
@@ -109,7 +111,7 @@ class CalculatorImpl(calculator: Calculator, private val context: Context) {
calculateResult() calculateResult()
} }
if (lastKey != DIGIT) { if (lastKey != DIGIT && lastKey != DECIMAL) {
return return
} }