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

more simplification

Browse Source
This commit is contained in:
tibbi
2020-11-06 23:03:53 +01:00
parent 0dbbf6ef2d
commit 06486aad1c
1 changed files with 9 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -61,12 +61,7 @@ class CalculatorImpl(calculator: Calculator, private val context: Context) {
} }
if (lastKey != EQUALS) { if (lastKey != EQUALS) {
val valueToCheck = if (inputDisplayedFormula.startsWith("-")) { val valueToCheck = inputDisplayedFormula.trimStart('-').replace(",", "")
inputDisplayedFormula.substring(1)
} else {
inputDisplayedFormula
}
val parts = valueToCheck.split(operationsRegex).filter { it.trim().isNotEmpty() } val parts = valueToCheck.split(operationsRegex).filter { it.trim().isNotEmpty() }
baseValue = parts.first().replace(",", "").toDouble() baseValue = parts.first().replace(",", "").toDouble()
if (inputDisplayedFormula.startsWith("-")) { if (inputDisplayedFormula.startsWith("-")) {
@ -108,8 +103,8 @@ class CalculatorImpl(calculator: Calculator, private val context: Context) {
inputDisplayedFormula = "√" inputDisplayedFormula = "√"
} }
if (inputDisplayedFormula.last() == '+' || if (inputDisplayedFormula.last() == '-' ||
inputDisplayedFormula.last() == '-' || inputDisplayedFormula.last() == '+' ||
inputDisplayedFormula.last() == '*' || inputDisplayedFormula.last() == '*' ||
inputDisplayedFormula.last() == '/' || inputDisplayedFormula.last() == '/' ||
inputDisplayedFormula.last() == '^' || inputDisplayedFormula.last() == '^' ||
@ -118,8 +113,8 @@ class CalculatorImpl(calculator: Calculator, private val context: Context) {
inputDisplayedFormula = inputDisplayedFormula.dropLast(1) inputDisplayedFormula = inputDisplayedFormula.dropLast(1)
inputDisplayedFormula += getSign(operation) inputDisplayedFormula += getSign(operation)
} else { } else {
if (!inputDisplayedFormula.contains('+') && if (!inputDisplayedFormula.trimStart('-').contains('-') &&
!inputDisplayedFormula.substring(1).contains('-') && !inputDisplayedFormula.contains('+') &&
!inputDisplayedFormula.contains('*') && !inputDisplayedFormula.contains('*') &&
!inputDisplayedFormula.contains('/') && !inputDisplayedFormula.contains('/') &&
!inputDisplayedFormula.contains('^') && !inputDisplayedFormula.contains('^') &&
@ -136,8 +131,8 @@ class CalculatorImpl(calculator: Calculator, private val context: Context) {
lastOperation = tempOperation lastOperation = tempOperation
} else if (lastKey == DIGIT) { } else if (lastKey == DIGIT) {
handleResult() handleResult()
if (inputDisplayedFormula.last() != '+' && if (inputDisplayedFormula.last() != '-' &&
inputDisplayedFormula.last() != '-' && inputDisplayedFormula.last() != '+' &&
inputDisplayedFormula.last() != '*' && inputDisplayedFormula.last() != '*' &&
inputDisplayedFormula.last() != '/' && inputDisplayedFormula.last() != '/' &&
inputDisplayedFormula.last() != '^' && inputDisplayedFormula.last() != '^' &&
@ -192,12 +187,7 @@ class CalculatorImpl(calculator: Calculator, private val context: Context) {
} }
private fun getSecondValue(): Double { private fun getSecondValue(): Double {
val valueToCheck = if (inputDisplayedFormula.startsWith("-")) { val valueToCheck = inputDisplayedFormula.trimStart('-').replace(",", "")
inputDisplayedFormula.substring(1)
} else {
inputDisplayedFormula
}.replace(",", "")
var value = valueToCheck.substring(valueToCheck.indexOfAny(operations) + 1) var value = valueToCheck.substring(valueToCheck.indexOfAny(operations) + 1)
if (value.isEmpty()) { if (value.isEmpty()) {
value = "0" value = "0"
@ -207,12 +197,7 @@ class CalculatorImpl(calculator: Calculator, private val context: Context) {
} }
private fun decimalClicked() { private fun decimalClicked() {
val valueToCheck = if (inputDisplayedFormula.startsWith("-")) { val valueToCheck = inputDisplayedFormula.trimStart('-').replace(",", "")
inputDisplayedFormula.substring(1)
} else {
inputDisplayedFormula
}
val value = valueToCheck.substring(valueToCheck.indexOfAny(operations) + 1) val value = valueToCheck.substring(valueToCheck.indexOfAny(operations) + 1)
if (!value.contains(".")) { if (!value.contains(".")) {
when { when {