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

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