Add readyToClear flag

jairrab · Sep 30, 2020 · 3b2c1ae · 3b2c1ae
1 parent 9f99b79
commit 3b2c1ae
Show file tree

Hide file tree

Showing 5 changed files with 43 additions and 43 deletions.
diff --git a/src/main/kotlin/com/github/jairrab/calc/lib/controls/buttons/BackspaceProcessor.kt b/src/main/kotlin/com/github/jairrab/calc/lib/controls/buttons/BackspaceProcessor.kt
@@ -13,7 +13,12 @@ internal class BackspaceProcessor(
             when {
                 entriesManager.isReadyToClear() -> {
                     entriesManager.setReadyToClear(false)
-                    entriesManager.removeLastEntry()
+                    val entry = entriesManager.getLastEntry().trimEndChar()
+                    if (entry.isNotEmpty()) {
+                        entriesManager.setLastEntry(entry)
+                    } else {
+                        entriesManager.removeLastEntry()
+                    }
                 }
                 entriesManager.isLastEntryAPercentNumber() -> {
                     val entry = entriesManager.getLastEntry().trimEndChar()

diff --git a/src/main/kotlin/com/github/jairrab/calc/lib/controls/buttons/DecimalProcessor.kt b/src/main/kotlin/com/github/jairrab/calc/lib/controls/buttons/DecimalProcessor.kt
@@ -20,8 +20,8 @@ internal class DecimalProcessor(
         } else {
             when {
                 entriesManager.isReadyToClear() -> {
-                    entriesManager.clearEntries()
                     entriesManager.setReadyToClear(false)
+                    entriesManager.clearEntries()
                     entriesManager.addEntry(DECIMAL.tag)
                 }
                 entriesManager.isLastEntryAnOperator() -> entriesManager.addEntry(DECIMAL.tag)

diff --git a/src/main/kotlin/com/github/jairrab/calc/lib/controls/buttons/NumberProcessor.kt b/src/main/kotlin/com/github/jairrab/calc/lib/controls/buttons/NumberProcessor.kt
@@ -13,11 +13,12 @@ internal class NumberProcessor(
         val number = calculatorButton.tag
         when {
             entriesManager.isNoEntries() -> {
+                entriesManager.setReadyToClear(false)
                 entriesManager.addEntry(number)
             }
             entriesManager.isReadyToClear() -> {
-                entriesManager.clearEntries()
                 entriesManager.setReadyToClear(false)
+                entriesManager.clearEntries()
                 entriesManager.addEntry(number)
             }
             entriesManager.isLastEntryAnOperator() -> {

diff --git a/src/main/kotlin/com/github/jairrab/calc/lib/controls/buttons/OperatorProcessor.kt b/src/main/kotlin/com/github/jairrab/calc/lib/controls/buttons/OperatorProcessor.kt
@@ -17,47 +17,46 @@ internal class OperatorProcessor(
     internal fun processOperator(calculatorButton: CalculatorButton) {
         val operator = calculatorButton.tag
 
-        if (entriesManager.isNoEntries()) {
-            entriesManager.addEntry(ZERO.tag)
-            entriesManager.addEntry(operator)
-        } else {
-            when {
-                entriesManager.isReadyToClear()  -> {
-                    entriesManager.setEntriesToResult()
-                    entriesManager.setReadyToClear(false)
+        when {
+            entriesManager.isNoEntries() -> {
+                entriesManager.setReadyToClear(false)
+                entriesManager.addEntry(ZERO.tag)
+                entriesManager.addEntry(operator)
+            }
+            entriesManager.isReadyToClear() -> {
+                entriesManager.setReadyToClear(false)
+                entriesManager.addEntry(operator)
+            }
+            entriesManager.isLastEntryAnOperator() -> {
+                entriesManager.removeLastEntry()
+                entriesManager.addEntry(operator)
+            }
+            entriesManager.isLastEntryAPercentNumber() -> {
+                entriesManager.addEntry(operator)
+            }
+            entriesManager.isLastEntryANumber() -> {
+                if (entriesManager.isLastEntryEndsWithDecimal()) {
+                    entriesManager.setLastEntry(entriesManager.getLastEntry().trimEndChar())
+                    entriesManager.addEntry(operator)
+                } else {
                     entriesManager.addEntry(operator)
                 }
-                entriesManager.isLastEntryAnOperator() -> {
+            }
+            entriesManager.isLastEntryADecimal() -> {
+                if (entriesManager.isSingleEntry()) {
                     entriesManager.removeLastEntry()
+                    entriesManager.addEntry(ZERO.tag)
                     entriesManager.addEntry(operator)
-                }
-                entriesManager.isLastEntryAPercentNumber() -> {
+                } else {
+                    entriesManager.removeLastEntry()
+                    entriesManager.removeLastEntry()
                     entriesManager.addEntry(operator)
                 }
-                entriesManager.isLastEntryANumber() -> {
-                    if (entriesManager.isLastEntryEndsWithDecimal()) {
-                        entriesManager.setLastEntry(entriesManager.getLastEntry().trimEndChar())
-                        entriesManager.addEntry(operator)
-                    } else {
-                        entriesManager.addEntry(operator)
-                    }
-                }
-                entriesManager.isLastEntryADecimal() -> {
-                    if (entriesManager.isSingleEntry()) {
-                        entriesManager.removeLastEntry()
-                        entriesManager.addEntry(ZERO.tag)
-                        entriesManager.addEntry(operator)
-                    } else {
-                        entriesManager.removeLastEntry()
-                        entriesManager.removeLastEntry()
-                        entriesManager.addEntry(operator)
-                    }
-                }
-                else -> {
-                    val entries = entriesManager.getEntries()
-                    outputManager.updateListener(InvalidKey(INVALID_OPERATOR_ENTRY, entries))
-                    throw IllegalStateException("Invalid operator entry")
-                }
+            }
+            else -> {
+                val entries = entriesManager.getEntries()
+                outputManager.updateListener(InvalidKey(INVALID_OPERATOR_ENTRY, entries))
+                throw IllegalStateException("Invalid operator entry")
             }
         }
     }

diff --git a/src/main/kotlin/com/github/jairrab/calc/lib/controls/entries/EntriesManager.kt b/src/main/kotlin/com/github/jairrab/calc/lib/controls/entries/EntriesManager.kt
@@ -40,11 +40,6 @@ internal class EntriesManager private constructor() {
         entries += entry
     }
 
-    fun setEntriesToResult() {
-        entries.clear()
-        entries += result.toString()
-    }
-
     fun isNoEntries(): Boolean {
         return entries.isEmpty()
     }