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

handle thousands delimiter at Clear too

Browse Source
This commit is contained in:
tibbi
2020-11-07 17:38:31 +01:00
parent a313e5de38
commit 7d165ae0e7
1 changed files with 16 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -28,19 +28,7 @@ class CalculatorImpl(calculator: Calculator, private val context: Context) {
}
inputDisplayedFormula += number
val valuesToCheck = numbersRegex.split(inputDisplayedFormula).filter { it.trim().isNotEmpty() }
valuesToCheck.forEach {
var newString = Formatter.addGroupingSeparators(it)
// allow writing numbers like 0.003
if (it.contains(".")) {
newString = newString.substringBefore(".") + ".${it.substringAfter(".")}"
}
inputDisplayedFormula = inputDisplayedFormula.replace(it, newString)
}
addThousandsDelimiter()
showNewResult(inputDisplayedFormula)
}
@@ -67,6 +55,19 @@ class CalculatorImpl(calculator: Calculator, private val context: Context) {
showNewResult(inputDisplayedFormula)
}
private fun addThousandsDelimiter() {
val valuesToCheck = numbersRegex.split(inputDisplayedFormula).filter { it.trim().isNotEmpty() }
valuesToCheck.forEach {
var newString = Formatter.addGroupingSeparators(it)
// allow writing numbers like 0.003
if (it.contains(".")) {
newString = newString.substringBefore(".") + ".${it.substringAfter(".")}"
}
inputDisplayedFormula = inputDisplayedFormula.replace(it, newString)
}
}
fun handleOperation(operation: String) {
if (inputDisplayedFormula == "") {
inputDisplayedFormula = "0"
@@ -183,7 +184,8 @@ class CalculatorImpl(calculator: Calculator, private val context: Context) {
newValue = newValue.trimEnd(',')
inputDisplayedFormula = newValue
showNewResult(newValue)
addThousandsDelimiter()
showNewResult(inputDisplayedFormula)
}
fun handleReset() {