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

show a clearshow a clearer error at zero division

Browse source
This commit is contained in:
tibbi 2020-12-28 20:51:25 +01:00
parent 3be6487fdd
commit e4e24bc226
1 changed files with 7 additions and 1 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

@ -163,8 +163,14 @@ class CalculatorImpl(calculator: Calculator, private val context: Context) {
}
if (lastOperation != "") {
val expression = "${baseValue.format()}${getSign(lastOperation)}${secondValue.format()}".replace("√", "sqrt")
val sign = getSign(lastOperation)
val expression = "${baseValue.format()}$sign${secondValue.format()}".replace("√", "sqrt")
try {
if (sign == "/" && secondValue == 0.0) {
context.toast(R.string.formula_divide_by_zero_error)
return
}
val result = ExpressionBuilder(expression.replace(",", "")).build().evaluate()
showNewResult(result.format())
baseValue = result