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

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
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 = "" 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 inputDisplayedFormula += number
setValue(inputDisplayedFormula) setValue(inputDisplayedFormula)
} }
@ -287,7 +298,13 @@ class CalculatorImpl(calculator: Calculator, val context: Context) {
} }
private fun zeroClicked() { 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") { if (value != "0") {
addDigit(0) addDigit(0)
} }