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

make lastOperation non nullable

Browse source
This commit is contained in:
tibbi 2020-11-06 17:18:19 +01:00
parent 6504233dd2
commit 7b82f163a8
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -12,13 +12,13 @@ class CalculatorImpl(calculator: Calculator, val context: Context) {
var displayedFormula: String? = null var displayedFormula: String? = null
var lastKey: String? = null var lastKey: String? = null
private var inputDisplayedFormula = "0" private var inputDisplayedFormula = "0"
private var lastOperation: String? = null
private var callback: Calculator? = calculator private var callback: Calculator? = calculator
private var isFirstOperation = false private var isFirstOperation = false
private var resetValue = false private var resetValue = false
private var baseValue = 0.0 private var baseValue = 0.0
private var secondValue = 0.0 private var secondValue = 0.0
private var lastOperation = ""
private val operations = listOf("+", "-", "*", "/", "^", "%", "√") private val operations = listOf("+", "-", "*", "/", "^", "%", "√")
private val operationsRegex = "[+,-,*,/,^,%,√]".toRegex() private val operationsRegex = "[+,-,*,/,^,%,√]".toRegex()
private var moreOperationsInRaw = false private var moreOperationsInRaw = false
@ -129,7 +129,7 @@ class CalculatorImpl(calculator: Calculator, val context: Context) {
baseValue = 1.0 baseValue = 1.0
} }
val operation = OperationFactory.forId(lastOperation!!, baseValue, secondValue) val operation = OperationFactory.forId(lastOperation, baseValue, secondValue)
if (operation != null) { if (operation != null) {
try { try {
updateResult(operation.getResult()) updateResult(operation.getResult())
@ -174,7 +174,7 @@ class CalculatorImpl(calculator: Calculator, val context: Context) {
} }
} }
if (lastKey == DIGIT && !lastOperation.isNullOrEmpty() && operation == PERCENT) { if (lastKey == DIGIT && lastOperation != "" && operation == PERCENT) {
val tempOperation = lastOperation val tempOperation = lastOperation
handlePercent() handlePercent()
lastKey = tempOperation lastKey = tempOperation
@ -199,7 +199,7 @@ class CalculatorImpl(calculator: Calculator, val context: Context) {
} }
private fun handlePercent() { private fun handlePercent() {
val operation = PercentOperation(baseValue, getSecondValue(), lastOperation ?: "") val operation = PercentOperation(baseValue, getSecondValue(), lastOperation)
val result = operation.getResult() val result = operation.getResult()
setFormula("${baseValue.format()}${getSign(lastOperation)}${getSecondValue().format()}%") setFormula("${baseValue.format()}${getSign(lastOperation)}${getSecondValue().format()}%")
secondValue = result secondValue = result
@ -302,7 +302,7 @@ class CalculatorImpl(calculator: Calculator, val context: Context) {
} }
} }
private fun getSign(lastOperation: String?) = when (lastOperation) { private fun getSign(lastOperation: String) = when (lastOperation) {
PLUS -> "+" PLUS -> "+"
MINUS -> "-" MINUS -> "-"
MULTIPLY -> "*" MULTIPLY -> "*"