fenix/Simple-Calculator
1
0
Fork 0
mirror of https://github.com/SimpleMobileTools/Simple-Calculator.git synced 2025-02-08 07:38:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

turn number to negative on minus-btn long-press

Browse Source
This commit is contained in:
dagkalis 2021-08-26 21:48:46 +03:00
parent c5fd2f4da6
commit a7cb74eb70
2 changed files with 19 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -42,6 +42,10 @@ class MainActivity : SimpleActivity(), Calculator {
btn_power.setOnClickListener { calc.handleOperation(POWER); checkHaptic(it) }
btn_root.setOnClickListener { calc.handleOperation(ROOT); checkHaptic(it) }
btn_minus.setOnLongClickListener {
calc.turnToNegative();
}
btn_clear.setOnClickListener { calc.handleClear(); checkHaptic(it) }
btn_clear.setOnLongClickListener { calc.handleReset(); true }

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

@ -123,6 +123,21 @@ class CalculatorImpl(calculator: Calculator, private val context: Context) {
showNewResult(inputDisplayedFormula)
}
fun turnToNegative() : Boolean{
// 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.first() == '-') {
inputDisplayedFormula = inputDisplayedFormula.substring(1)
}else{
inputDisplayedFormula = "-$inputDisplayedFormula"
}
showNewResult(inputDisplayedFormula)
return true
}
return false
}
// handle percents manually, it doesn't seem to be possible via net.objecthunter:exp4j. "%" is used only for modulo there
private fun handlePercent() {
var result = calculatePercentage(baseValue, getSecondValue(), lastOperation)