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

Merge pull request #2 from ochagovdanil/feature_divide_by_zero_message

Browse source 
Show Toast message instead of printing division by zero error
This commit is contained in:
Danil Ochagov 2020-05-19 15:06:01 +03:00 committed by GitHub
commit b430e6e7bf
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
app/src/main/kotlin/com/simplemobiletools/calculator/helpers/CalculatorImpl.kt
View file

@ -2,6 +2,7 @@ package com.simplemobiletools.calculator.helpers
import android.content.Context import android.content.Context
import android.util.Log import android.util.Log
import android.widget.Toast
import com.simplemobiletools.calculator.R import com.simplemobiletools.calculator.R
import com.simplemobiletools.calculator.operation.OperationFactory import com.simplemobiletools.calculator.operation.OperationFactory
@ -57,19 +58,21 @@ class CalculatorImpl(calculator: Calculator, val context: Context) {
val sign = getSign(lastOperation) val sign = getSign(lastOperation)
when { when {
baseValue == 0.0 && secondValue == 0.0 && sign == "/" -> { sign == "√" -> {
setFormula(context.getString(R.string.formula_divide_by_zero_error)) setFormula(sign + first)
} }
sign == "!" -> {
sign == "√" -> setFormula(sign + first) setFormula(first + sign)
}
sign == "!" -> setFormula(first + sign) sign.isNotEmpty() -> {
if (secondValue == 0.0 && sign == "/") {
else -> { Toast.makeText(
if (sign.isNotEmpty()) { context,
val formula = first + sign + second context.getString(R.string.formula_divide_by_zero_error),
setFormula(formula) Toast.LENGTH_SHORT).show()
} }
setFormula(first + sign + second)
} }
} }
} }