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

simplifying Clear, not sure why was it so complicated

Browse Source
This commit is contained in:
tibbi 2020-11-06 22:35:13 +01:00
parent f527d8d954
commit ab5c0a3522
1 changed files with 5 additions and 20 deletions
Show Stats 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

@ -167,29 +167,14 @@ class CalculatorImpl(calculator: Calculator, private val context: Context) {
}
fun handleClear() {
val oldValue = displayedNumber
var newValue = "0"
val len = oldValue.length
var minLen = 1
if (oldValue.contains("-"))
minLen++
if (len > minLen) {
newValue = oldValue.substring(0, len - 1)
var newValue = inputDisplayedFormula.dropLast(1)
if (newValue.isEmpty()) {
newValue = "0"
}
newValue = newValue.replace("\\.$".toRegex(), "")
if (!newValue.contains('+') &&
!newValue.contains('-') &&
!newValue.contains('*') &&
!newValue.contains('/') &&
!newValue.contains('%') &&
!newValue.contains('^') &&
!newValue.contains('√')) {
newValue = formatString(newValue)
}
newValue = newValue.trimEnd(',')
inputDisplayedFormula = newValue
showNewResult(newValue)
inputDisplayedFormula = if (newValue != "0") newValue else ""
}
fun handleReset() {