fenix/Simple-Calculator
1
0
Fork 0
mirror of https://github.com/SimpleMobileTools/Simple-Calculator.git synced 2025-02-21 14:00:56 +01:00
Code Issues Packages Projects Releases Wiki Activity

[Bug] NaN error #54

Browse Source
This commit is contained in:
zosimadis 2018-01-06 14:35:23 +02:00
parent 67894925ad
commit eed466ed05
2 changed files with 18 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -119,6 +119,9 @@ class CalculatorImpl(calculator: Calculator, val context: Context) {
} }
fun handleClear() { fun handleClear() {
if (displayedNumber.equals(NAN)) {
handleReset()
} else {
val oldValue = displayedNumber val oldValue = displayedNumber
var newValue = "0" var newValue = "0"
val len = oldValue!!.length val len = oldValue!!.length
@ -135,6 +138,7 @@ class CalculatorImpl(calculator: Calculator, val context: Context) {
setValue(newValue) setValue(newValue)
mBaseValue = Formatter.stringToDouble(newValue) mBaseValue = Formatter.stringToDouble(newValue)
} }
}
fun handleReset() { fun handleReset() {
resetValues() resetValues()

1
app/src/main/kotlin/com/simplemobiletools/calculator/helpers/Constants.kt
View File

@ -13,6 +13,7 @@ val DECIMAL = "decimal"
val CLEAR = "clear" val CLEAR = "clear"
val RESET = "reset" val RESET = "reset"
val NAN = "NaN"
val ZERO = "zero" val ZERO = "zero"
val ONE = "one" val ONE = "one"
val TWO = "two" val TWO = "two"