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

Merge pull request #183 from studentPavel/patch-1

Browse source 
Make symbol appear in input
This commit is contained in:
Tibor Kaputa 2020-11-05 21:35:13 +01:00 committed by GitHub
commit 34ee9e5b04
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 50 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -10,6 +10,7 @@ class CalculatorImpl(calculator: Calculator, val context: Context) {
var displayedNumber: String? = null
var displayedFormula: String? = null
var lastKey: String? = null
private var inputDisplayedFormula: String? = null
private var lastOperation: String? = null
private var callback: Calculator? = calculator
@ -17,11 +18,14 @@ class CalculatorImpl(calculator: Calculator, val context: Context) {
private var resetValue = false
private var baseValue: BigDecimal = BigDecimal.ZERO
private var secondValue: BigDecimal = BigDecimal.ZERO
private val operations = listOf("+", "-", "*", "/", "^", "%")
private var moreOperationsInRaw = false
init {
resetValues()
setValue("0")
setFormula("")
inputDisplayedFormula = "0"
}
private fun resetValueIfNeeded() {
@ -71,9 +75,8 @@ class CalculatorImpl(calculator: Calculator, val context: Context) {
}
fun addDigit(number: Int) {
val currentValue = displayedNumber
val newValue = formatString(currentValue!! + number)
setValue(newValue)
inputDisplayedFormula += number
setValue(inputDisplayedFormula.toString())
}
private fun formatString(str: String): String {
@ -95,9 +98,15 @@ class CalculatorImpl(calculator: Calculator, val context: Context) {
private fun getDisplayedNumberAsDouble() = Formatter.stringToBigDecimal(displayedNumber!!)
fun handleResult() {
if(moreOperationsInRaw){
val index = displayedNumber!!.indexOfAny(operations,0,false)
displayedNumber = displayedNumber!!.substring(index + 1)
}
moreOperationsInRaw = false
secondValue = getDisplayedNumberAsDouble()
calculateResult()
baseValue = getDisplayedNumberAsDouble()
setValue(inputDisplayedFormula!!)
}
private fun handleRoot() {
@ -117,6 +126,7 @@ class CalculatorImpl(calculator: Calculator, val context: Context) {
if (operation != null) {
try {
updateResult(operation.getResult())
inputDisplayedFormula = displayedNumber
} catch (e: Exception) {
context.toast(R.string.unknown_error_occurred)
}
@ -126,6 +136,18 @@ class CalculatorImpl(calculator: Calculator, val context: Context) {
}
fun handleOperation(operation: String) {
if(operation != ROOT) {
if (inputDisplayedFormula!!.last() == '+' || inputDisplayedFormula!!.last() == '-' || inputDisplayedFormula!!.last() == '*' || inputDisplayedFormula!!.last() == '/' || inputDisplayedFormula!!.last() == '^' || inputDisplayedFormula!!.last() == '%') {
inputDisplayedFormula = inputDisplayedFormula!!.dropLast(1)
inputDisplayedFormula += getSign(operation)
} else {
if(!inputDisplayedFormula!!.contains('+') && !inputDisplayedFormula!!.contains('-') && !inputDisplayedFormula!!.contains('*') && !inputDisplayedFormula!!.contains('/') && !inputDisplayedFormula!!.contains('^') && !inputDisplayedFormula!!.contains('%')) {
inputDisplayedFormula += getSign(operation)
}else{
moreOperationsInRaw = true
}
}
}
if (lastKey == DIGIT && !lastOperation.isNullOrEmpty() && operation == PERCENT) {
val tempOp = lastOperation
handlePercent()
@ -138,6 +160,7 @@ class CalculatorImpl(calculator: Calculator, val context: Context) {
resetValue = true
lastKey = operation
lastOperation = operation
setValue(inputDisplayedFormula!!)
if (operation == ROOT) {
handleRoot()
@ -174,8 +197,16 @@ class CalculatorImpl(calculator: Calculator, val context: Context) {
}
newValue = newValue.replace("\\.$".toRegex(), "")
newValue = formatString(newValue)
if(!newValue.contains('+' ) && !newValue.contains('-' ) && !newValue.contains('*' ) && !newValue.contains('/' ) && !newValue.contains('%' ) && !newValue.contains('^' ) ){
newValue = formatString(newValue)
}
setValue(newValue)
if(newValue!="0") {
inputDisplayedFormula = newValue
}else{
inputDisplayedFormula = ""
}
}
}
@ -183,6 +214,7 @@ class CalculatorImpl(calculator: Calculator, val context: Context) {
resetValues()
setValue("0")
setFormula("")
inputDisplayedFormula=""
}
fun handleEquals() {
@ -192,21 +224,32 @@ class CalculatorImpl(calculator: Calculator, val context: Context) {
if (lastKey != DIGIT)
return
displayedNumber = displayedNumber!!.substring(displayedNumber!!.indexOfAny(operations,0,false) + 1)
secondValue = getDisplayedNumberAsDouble()
calculateResult()
lastKey = EQUALS
inputDisplayedFormula = displayedNumber
}
private fun decimalClicked() {
var value = displayedNumber
if (!value!!.contains(".")) {
value += "."
if(value.toString().equals("0")){
inputDisplayedFormula = "0."
}else{
inputDisplayedFormula += "."
}
}else{
value = displayedNumber!!.substring(displayedNumber!!.indexOfAny(operations,0,false) + 1)
if (!value!!.contains(".")) {
inputDisplayedFormula += "."
}
}
setValue(value)
setValue(inputDisplayedFormula!!)
}
private fun zeroClicked() {
val value = displayedNumber
val value = inputDisplayedFormula
if (value != "0") {
addDigit(0)
}