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

improve percentage handling

Browse Source
This commit is contained in:
tibbi 2020-11-06 11:48:24 +01:00
parent 6db8017611
commit 13829b852a
3 changed files with 44 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3,6 +3,7 @@ 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.OperationFactory import com.simplemobiletools.calculator.operation.OperationFactory
import com.simplemobiletools.calculator.operation.PercentOperation
import com.simplemobiletools.commons.extensions.areDigitsOnly import com.simplemobiletools.commons.extensions.areDigitsOnly
import com.simplemobiletools.commons.extensions.toast import com.simplemobiletools.commons.extensions.toast
import java.math.BigDecimal import java.math.BigDecimal
@ -203,12 +204,12 @@ class CalculatorImpl(calculator: Calculator, val context: Context) {
} }
private fun handlePercent() { private fun handlePercent() {
OperationFactory.forId(PERCENT, baseValue, getDisplayedNumberAsDouble())?.let { val operation = PercentOperation(baseValue, getSecondValue(), lastOperation ?: "")
val result = it.getResult() val result = operation.getResult()
setFormula("${baseValue.format()}${getSign(lastOperation)}${getDisplayedNumberAsDouble().format()}%") setFormula("${baseValue.format()}${getSign(lastOperation)}${getSecondValue()}%")
secondValue = result secondValue = result
calculateResult(false) updateResult(result)
} inputDisplayedFormula = displayedNumber ?: ""
} }
fun handleClear() { fun handleClear() {
@ -294,6 +295,16 @@ class CalculatorImpl(calculator: Calculator, val context: Context) {
setValue(inputDisplayedFormula) setValue(inputDisplayedFormula)
} }
private fun getSecondValue(): BigDecimal {
val valueToCheck = if (inputDisplayedFormula.startsWith("-")) {
inputDisplayedFormula.substring(1)
} else {
inputDisplayedFormula
}
return valueToCheck.substring(valueToCheck.indexOfAny(operations, 0, false) + 1).toBigDecimal()
}
private fun zeroClicked() { private fun zeroClicked() {
val valueToCheck = if (inputDisplayedFormula.startsWith("-")) { val valueToCheck = if (inputDisplayedFormula.startsWith("-")) {
inputDisplayedFormula.substring(1) inputDisplayedFormula.substring(1)

1
app/src/main/kotlin/com/simplemobiletools/calculator/operation/OperationFactory.kt
View File

@ -12,7 +12,6 @@ object OperationFactory {
MINUS -> MinusOperation(baseValue, secondValue) MINUS -> MinusOperation(baseValue, secondValue)
DIVIDE -> DivideOperation(baseValue, secondValue) DIVIDE -> DivideOperation(baseValue, secondValue)
MULTIPLY -> MultiplyOperation(baseValue, secondValue) MULTIPLY -> MultiplyOperation(baseValue, secondValue)
PERCENT -> PercentOperation(baseValue, secondValue)
POWER -> PowerOperation(baseValue, secondValue) POWER -> PowerOperation(baseValue, secondValue)
ROOT -> RootOperation(baseValue, secondValue) ROOT -> RootOperation(baseValue, secondValue)
else -> null else -> null

30
app/src/main/kotlin/com/simplemobiletools/calculator/operation/PercentOperation.kt
View File

@ -1,16 +1,38 @@
package com.simplemobiletools.calculator.operation package com.simplemobiletools.calculator.operation
import com.simplemobiletools.calculator.helpers.DIVIDE
import com.simplemobiletools.calculator.helpers.MINUS
import com.simplemobiletools.calculator.helpers.MULTIPLY
import com.simplemobiletools.calculator.helpers.PLUS
import com.simplemobiletools.calculator.operation.base.BinaryOperation import com.simplemobiletools.calculator.operation.base.BinaryOperation
import com.simplemobiletools.calculator.operation.base.Operation import com.simplemobiletools.calculator.operation.base.Operation
import java.math.BigDecimal import java.math.BigDecimal
import java.math.MathContext
class PercentOperation(baseValue: BigDecimal, secondValue: BigDecimal) : BinaryOperation(baseValue, secondValue), Operation { class PercentOperation(baseValue: BigDecimal, secondValue: BigDecimal, val sign: String) : BinaryOperation(baseValue, secondValue), Operation {
override fun getResult(): BigDecimal { override fun getResult(): BigDecimal {
return if (secondValue.compareTo(BigDecimal.ZERO) == 0) { return when {
BigDecimal.ZERO secondValue.compareTo(BigDecimal.ZERO) == 0 -> BigDecimal.ZERO
} else { sign == MULTIPLY -> {
val partial = BigDecimal(100).divide(secondValue, MathContext.DECIMAL32)
baseValue.divide(partial, MathContext.DECIMAL32)
}
sign == DIVIDE -> {
val partial = BigDecimal(100).divide(secondValue, MathContext.DECIMAL32)
baseValue.multiply(partial, MathContext.DECIMAL32)
}
sign == PLUS -> {
val partial = baseValue.divide(100.toBigDecimal().divide(secondValue, MathContext.DECIMAL32), MathContext.DECIMAL32)
baseValue.plus(partial)
}
sign == MINUS -> {
val partial = baseValue.divide(100.toBigDecimal().divide(secondValue, MathContext.DECIMAL32), MathContext.DECIMAL32)
baseValue.minus(partial)
}
else -> {
baseValue.divide(BigDecimal(100)).multiply(secondValue) baseValue.divide(BigDecimal(100)).multiply(secondValue)
} }
} }
}
} }