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

Properly format calculation formula

Browse Source
This commit is contained in:
Naveen 2022-06-04 11:36:55 +05:30
parent 8668a5b680
commit 2af2a6175f
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -272,11 +272,14 @@ class CalculatorImpl(
} }
showNewResult(result.format()) showNewResult(result.format())
baseValue = result val newFormula = "${baseValue.format()}$sign${secondValue.format()}"
val newFormula = expression.replace("sqrt", "√").replace("*", "×").replace("/", "÷") HistoryHelper(context).insertOrUpdateHistoryEntry(
HistoryHelper(context).insertOrUpdateHistoryEntry(History(null, newFormula, result.format(), System.currentTimeMillis())) History(id = null, formula = newFormula, result = result.format(), timestamp = System.currentTimeMillis())
inputDisplayedFormula = result.format() )
showNewFormula(newFormula) showNewFormula(newFormula)
inputDisplayedFormula = result.format()
baseValue = result
} catch (e: Exception) { } catch (e: Exception) {
context.toast(R.string.unknown_error_occurred) context.toast(R.string.unknown_error_occurred)
} }