fenix
/
Simple-Calculator
mirror of https://github.com/SimpleMobileTools/Simple-Calculator.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

code reformat

This commit is contained in:
dagkalis 2021-08-29 18:28:47 +03:00
parent a7cb74eb70
commit 97b9e4ab2c
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/kotlin/com/simplemobiletools/calculator/activities/MainActivity.kt
View File

@ -43,7 +43,7 @@ class MainActivity : SimpleActivity(), Calculator {
btn_root.setOnClickListener { calc.handleOperation(ROOT); checkHaptic(it) } btn_root.setOnClickListener { calc.handleOperation(ROOT); checkHaptic(it) }
btn_minus.setOnLongClickListener { btn_minus.setOnLongClickListener {
calc.turnToNegative(); calc.turnToNegative()
} }
btn_clear.setOnClickListener { calc.handleClear(); checkHaptic(it) } btn_clear.setOnClickListener { calc.handleClear(); checkHaptic(it) }

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

@ -123,18 +123,19 @@ class CalculatorImpl(calculator: Calculator, private val context: Context) {
showNewResult(inputDisplayedFormula) showNewResult(inputDisplayedFormula)
} }
fun turnToNegative() : Boolean{ fun turnToNegative(): Boolean {
// turn to negative only if there is a baseValue alone ( not 0 ) // turn to negative only if there is a baseValue alone ( not 0 )
if (!inputDisplayedFormula.trimStart('-').any { it.toString() in operations } && inputDisplayedFormula.replace(",", "").toDouble() != 0.0){ if (!inputDisplayedFormula.trimStart('-').any { it.toString() in operations } && inputDisplayedFormula.replace(",", "").toDouble() != 0.0) {
if (inputDisplayedFormula.first() == '-') {
if(inputDisplayedFormula.first() == '-') {
inputDisplayedFormula = inputDisplayedFormula.substring(1) inputDisplayedFormula = inputDisplayedFormula.substring(1)
}else{ } else {
inputDisplayedFormula = "-$inputDisplayedFormula" inputDisplayedFormula = "-$inputDisplayedFormula"
} }
showNewResult(inputDisplayedFormula) showNewResult(inputDisplayedFormula)
return true return true
} }
return false return false
} }