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

simplifying addDigit

Browse Source
This commit is contained in:
tibbi
2020-11-06 23:56:00 +01:00
parent 15e6f060e3
commit ad5d1d2ebf
1 changed files with 1 additions and 7 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

@@ -3,7 +3,6 @@ package com.simplemobiletools.calculator.helpers
import android.content.Context import android.content.Context
import com.simplemobiletools.calculator.R import com.simplemobiletools.calculator.R
import com.simplemobiletools.calculator.operation.PercentOperation import com.simplemobiletools.calculator.operation.PercentOperation
import com.simplemobiletools.commons.extensions.areDigitsOnly
import com.simplemobiletools.commons.extensions.toast import com.simplemobiletools.commons.extensions.toast
import net.objecthunter.exp4j.ExpressionBuilder import net.objecthunter.exp4j.ExpressionBuilder
@@ -23,15 +22,10 @@ class CalculatorImpl(calculator: Calculator, private val context: Context) {
} }
private fun addDigit(number: Int) { private fun addDigit(number: Int) {
if (inputDisplayedFormula == "0" && number.toString().areDigitsOnly()) { if (inputDisplayedFormula == "0") {
inputDisplayedFormula = "" inputDisplayedFormula = ""
} }
val value = getSecondValue().toString()
if (value == "0" && number.toString().areDigitsOnly()) {
inputDisplayedFormula = inputDisplayedFormula.dropLast(1)
}
inputDisplayedFormula += number inputDisplayedFormula += number
showNewResult(inputDisplayedFormula) showNewResult(inputDisplayedFormula)
} }