fenix
/
Simple-Calculator
mirror of https://github.com/SimpleMobileTools/Simple-Calculator.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fixed some glitches related to infinite numbers and errors

This commit is contained in:
tibbi 2020-12-28 20:16:53 +01:00
parent 210020895f
commit 28160884fd
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -68,6 +68,10 @@ class CalculatorImpl(calculator: Calculator, private val context: Context) {
} }
fun handleOperation(operation: String) { fun handleOperation(operation: String) {
if (inputDisplayedFormula == Double.NaN.toString()) {
inputDisplayedFormula = "0"
}
if (inputDisplayedFormula == "") { if (inputDisplayedFormula == "") {
inputDisplayedFormula = "0" inputDisplayedFormula = "0"
} }
@ -81,7 +85,7 @@ class CalculatorImpl(calculator: Calculator, private val context: Context) {
val lastChar = inputDisplayedFormula.last().toString() val lastChar = inputDisplayedFormula.last().toString()
if (lastChar == ".") { if (lastChar == ".") {
inputDisplayedFormula = inputDisplayedFormula.dropLast(1) inputDisplayedFormula = inputDisplayedFormula.dropLast(1)
} else if (operations.contains(lastChar)/* || lastChar == "."*/) { } else if (operations.contains(lastChar)) {
inputDisplayedFormula = inputDisplayedFormula.dropLast(1) inputDisplayedFormula = inputDisplayedFormula.dropLast(1)
inputDisplayedFormula += getSign(operation) inputDisplayedFormula += getSign(operation)
} else if (!inputDisplayedFormula.trimStart('-').contains(operationsRegex.toRegex())) { } else if (!inputDisplayedFormula.trimStart('-').contains(operationsRegex.toRegex())) {
@ -107,7 +111,11 @@ class CalculatorImpl(calculator: Calculator, private val context: Context) {
// handle percents manually, it doesn't seem to be possible via net.objecthunter:exp4j. "%" is used only for modulo there // handle percents manually, it doesn't seem to be possible via net.objecthunter:exp4j. "%" is used only for modulo there
private fun handlePercent() { private fun handlePercent() {
val result = calculatePercentage(baseValue, getSecondValue(), lastOperation) var result = calculatePercentage(baseValue, getSecondValue(), lastOperation)
if (result == Double.POSITIVE_INFINITY || result == Double.NEGATIVE_INFINITY) {
result = 0.0
}
showNewFormula("${baseValue.format()}${getSign(lastOperation)}${getSecondValue().format()}%") showNewFormula("${baseValue.format()}${getSign(lastOperation)}${getSecondValue().format()}%")
inputDisplayedFormula = result.format() inputDisplayedFormula = result.format()
showNewResult(result.format()) showNewResult(result.format())
@ -235,6 +243,10 @@ class CalculatorImpl(calculator: Calculator, private val context: Context) {
} }
fun numpadClicked(id: Int) { fun numpadClicked(id: Int) {
if (inputDisplayedFormula == Double.NaN.toString()) {
inputDisplayedFormula = ""
}
if (lastKey == EQUALS) { if (lastKey == EQUALS) {
lastOperation = EQUALS lastOperation = EQUALS
} }