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

Merge pull request #53 from ensozos/Issue#28 

Confusing behaviour after calculating a square root #28
This commit is contained in:
Tibor Kaputa 2018-01-06 13:03:14 +01:00 committed by GitHub
parent 67894925ad 8833e0ed58
commit 832a2b50d5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -92,6 +92,11 @@ class CalculatorImpl(calculator: Calculator, val context: Context) {
mBaseValue = getDisplayedNumberAsDouble() mBaseValue = getDisplayedNumberAsDouble()
} }
private fun handleRoot() {
mBaseValue = getDisplayedNumberAsDouble()
calculateResult()
}
private fun calculateResult() { private fun calculateResult() {
if (!mIsFirstOperation) { if (!mIsFirstOperation) {
updateFormula() updateFormula()
@ -107,15 +112,18 @@ class CalculatorImpl(calculator: Calculator, val context: Context) {
} }
fun handleOperation(operation: String) { fun handleOperation(operation: String) {
if (lastKey == DIGIT) if (lastKey == DIGIT && operation != ROOT)
handleResult() handleResult()
mResetValue = true mResetValue = true
lastKey = operation lastKey = operation
mLastOperation = operation mLastOperation = operation
if (operation == ROOT) if (operation == ROOT) {
calculateResult() handleRoot()
mResetValue = false
}
} }
fun handleClear() { fun handleClear() {