wbrawner/Simple-Calculator
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

do not allow prepending some numbers with zero

Browse source
This commit is contained in:
tibbi 2020-11-05 23:04:53 +01:00
parent b775a98247
commit dc97c40b70
1 changed files with 18 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
app/src/main/kotlin/com/simplemobiletools/calculator/helpers/CalculatorImpl.kt
View file

@ -79,6 +79,17 @@ class CalculatorImpl(calculator: Calculator, val context: Context) {
inputDisplayedFormula = ""
}
val valueToCheck = if (inputDisplayedFormula.startsWith("-")) {
inputDisplayedFormula.substring(1)
} else {
inputDisplayedFormula
}
val value = valueToCheck.substring(valueToCheck.indexOfAny(operations, 0, false) + 1)
if (value == "0" && number.toString().areDigitsOnly()) {
inputDisplayedFormula = inputDisplayedFormula.dropLast(1)
}
inputDisplayedFormula += number
setValue(inputDisplayedFormula)
}
@ -287,7 +298,13 @@ class CalculatorImpl(calculator: Calculator, val context: Context) {
}
private fun zeroClicked() {
val value = inputDisplayedFormula
val valueToCheck = if (inputDisplayedFormula.startsWith("-")) {
inputDisplayedFormula.substring(1)
} else {
inputDisplayedFormula
}
val value = valueToCheck.substring(valueToCheck.indexOfAny(operations, 0, false) + 1)
if (value != "0") {
addDigit(0)
}