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

fix the bug of % and pass the test case percentageTest

Browse source
This commit is contained in:
WddVictor 2019-12-20 23:47:47 +08:00
parent e6762dcec1
commit 6a21edba97
1 changed files with 0 additions and 8 deletions
Show stats 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

@ -13,7 +13,6 @@ class CalculatorImpl(calculator: Calculator, val context: Context) {
private var mIsFirstOperation = false
private var mResetValue = false
private var mWasPercentLast = false
private var mBaseValue = 0.0
private var mSecondValue = 0.0
@ -62,9 +61,6 @@ class CalculatorImpl(calculator: Calculator, val context: Context) {
setFormula(first + sign)
} else if (!sign.isEmpty()) {
var formula = first + sign + second
if (mWasPercentLast) {
formula += "%"
}
setFormula(formula)
}
}
@ -111,9 +107,6 @@ class CalculatorImpl(calculator: Calculator, val context: Context) {
private fun calculateResult() {
updateFormula()
if (mWasPercentLast) {
mSecondValue *= mBaseValue / 100
}
val operation = OperationFactory.forId(mLastOperation!!, mBaseValue, mSecondValue)
if (operation != null) {
@ -124,7 +117,6 @@ class CalculatorImpl(calculator: Calculator, val context: Context) {
}
fun handleOperation(operation: String) {
mWasPercentLast = operation == PERCENT
if (lastKey == DIGIT && operation != ROOT && operation != FACTORIAL) {
handleResult()
}