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

fixing some Equals related glitch

Browse Source
This commit is contained in:
tibbi 2020-11-05 22:40:38 +01:00
parent 2ec342d4db
commit 998766e2e1
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -241,11 +241,13 @@ class CalculatorImpl(calculator: Calculator, val context: Context) {
} }
fun handleEquals() { fun handleEquals() {
if (lastKey == EQUALS) if (lastKey == EQUALS) {
calculateResult() calculateResult()
}
if (lastKey != DIGIT) if (lastKey != DIGIT) {
return return
}
val numberToCheck = if (inputDisplayedFormula.startsWith("-")) { val numberToCheck = if (inputDisplayedFormula.startsWith("-")) {
inputDisplayedFormula.substring(1) inputDisplayedFormula.substring(1)
@ -257,7 +259,8 @@ class CalculatorImpl(calculator: Calculator, val context: Context) {
secondValue = getDisplayedNumberAsDouble() secondValue = getDisplayedNumberAsDouble()
calculateResult() calculateResult()
lastKey = EQUALS lastKey = EQUALS
inputDisplayedFormula = displayedNumber ?: "" inputDisplayedFormula = displayedNumber ?: "0"
baseValue = getDisplayedNumberAsDouble()
} }
private fun decimalClicked() { private fun decimalClicked() {