clear screen on touch immediately

Author: UrAvgCode

app/src/main/java/com/uravgcode/chooser/chooser/presentation/Chooser.kt

@@ -120,7 +120,10 @@ class Chooser(
 
     private fun handleActionDown(event: MotionEvent, actionIndex: Int, pointerId: Int) {
         if (winnerChosen) {
-            if (clearOnTouch) resetGame()
+            if (clearOnTouch) {
+                circleManager.clear()
+                restoreDefaultState()
+            }
             return
         }
 
@@ -167,7 +170,6 @@ class Chooser(
     }
 
     private fun resetGame() {
-        circleManager.clear()
         colorManager.generateRandomColorPalette(5)
 
         if (!winnerChosen) {
@@ -176,14 +178,7 @@ class Chooser(
         }
 
         handler.postDelayed(
-            {
-                blackSpeed = 1f
-                handler.postDelayed({
-                    setButtonVisibility(true)
-                    winnerChosen = false
-                    setBackgroundColor(Color.BLACK)
-                }, 150)
-            },
+            { restoreDefaultState() },
             when (mode) {
                 Mode.SINGLE -> Circle.circleLifetime
                 Mode.GROUP -> GroupCircle.circleLifetime
@@ -192,6 +187,15 @@ class Chooser(
         )
     }
 
+    private fun restoreDefaultState() {
+        blackSpeed = 1f
+        handler.postDelayed({
+            setButtonVisibility(true)
+            winnerChosen = false
+            setBackgroundColor(Color.BLACK)
+        }, 150)
+    }
+
     private fun selectWinner() {
         if (circleManager.count <= count) return
 

app/src/main/java/com/uravgcode/chooser/chooser/presentation/circle/Circle.kt

@@ -102,6 +102,10 @@ open class Circle(var x: Float, var y: Float, radius: Float, var color: Int) {
         }
     }
 
+    fun removeFingerImmediately() {
+        hasFinger = false
+    }
+
     open fun setWinner() {
         winnerCircle = true
     }

app/src/main/java/com/uravgcode/chooser/chooser/presentation/manager/CircleManager.kt

@@ -38,13 +38,16 @@ class CircleManager {
     fun remove(key: Int): Circle? {
         return activeCircles.remove(key)?.also {
             it.removeFinger()
-            deadCircles += it
+            deadCircles.add(it)
         }
     }
 
     fun clear() {
+        deadCircles.forEach {
+            it.removeFingerImmediately()
+        }
         activeCircles.values.forEach { circle ->
-            circle.removeFinger()
+            circle.removeFingerImmediately()
             deadCircles.add(circle)
         }
         activeCircles.clear()