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 the zero division check a bit

Browse Source
This commit is contained in:
Tibor Kaputa
2020-05-19 14:38:54 +02:00
committed by GitHub
parent b430e6e7bf
commit 11933ce2e1
1 changed files with 3 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -58,18 +58,11 @@ class CalculatorImpl(calculator: Calculator, val context: Context) {
val sign = getSign(lastOperation) val sign = getSign(lastOperation)
when { when {
sign == "√" -> { sign == "√" -> setFormula(sign + first)
setFormula(sign + first) sign == "!" -> setFormula(first + sign)
}
sign == "!" -> {
setFormula(first + sign)
}
sign.isNotEmpty() -> { sign.isNotEmpty() -> {
if (secondValue == 0.0 && sign == "/") { if (secondValue == 0.0 && sign == "/") {
Toast.makeText( context.toast(context.getString(R.string.formula_divide_by_zero_error))
context,
context.getString(R.string.formula_divide_by_zero_error),
Toast.LENGTH_SHORT).show()
} }
setFormula(first + sign + second) setFormula(first + sign + second)