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

shortening more code

Browse Source
This commit is contained in:
tibbi
2020-11-06 23:38:13 +01:00
parent e9167c9183
commit d74457b1e7
1 changed files with 11 additions and 14 deletions
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

@ -96,22 +96,19 @@ class CalculatorImpl(calculator: Calculator, private val context: Context) {
if (operations.contains(inputDisplayedFormula.last().toString())) { if (operations.contains(inputDisplayedFormula.last().toString())) {
inputDisplayedFormula = inputDisplayedFormula.dropLast(1) inputDisplayedFormula = inputDisplayedFormula.dropLast(1)
inputDisplayedFormula += getSign(operation) inputDisplayedFormula += getSign(operation)
} else { } else if (!inputDisplayedFormula.trimStart('-').contains(operationsRegex.toRegex())) {
if (!inputDisplayedFormula.trimStart('-').contains(operationsRegex.toRegex())) { inputDisplayedFormula += getSign(operation)
inputDisplayedFormula += getSign(operation)
}
} }
if (lastKey == DIGIT && lastOperation != "" && operation == PERCENT) { if (lastKey == DIGIT) {
val tempOperation = lastOperation if (lastOperation != "" && operation == PERCENT) {
handlePercent() handlePercent()
lastKey = tempOperation } else {
lastOperation = tempOperation secondValue = getSecondValue()
} else if (lastKey == DIGIT) { calculateResult()
secondValue = getSecondValue() if (!operations.contains(inputDisplayedFormula.last().toString())) {
calculateResult() inputDisplayedFormula += getSign(operation)
if (!operations.contains(inputDisplayedFormula.last().toString())) { }
inputDisplayedFormula += getSign(operation)
} }
} }