refactor CircleManager

UrAvgCode · Feb 24, 2025 · 44a2d9c · 44a2d9c
1 parent 82a1916
commit 44a2d9c
Showing 1 changed file with 7 additions and 18 deletions.
diff --git a/app/src/main/java/com/uravgcode/chooser/utilities/CircleManager.kt b/app/src/main/java/com/uravgcode/chooser/utilities/CircleManager.kt
@@ -32,30 +32,19 @@ class CircleManager : MutableMap<Int, Circle> {
     override val values: MutableCollection<Circle> get() = activeCircles.values
     override fun get(key: Int): Circle? = activeCircles[key]
     override fun isEmpty(): Boolean = activeCircles.isEmpty()
-    override fun containsValue(value: Circle): Boolean = activeCircles.containsValue(value)
     override fun containsKey(key: Int): Boolean = activeCircles.containsKey(key)
-
-    override fun putAll(from: Map<out Int, Circle>) {
-        activeCircles.putAll(from)
-    }
-
-    override fun put(key: Int, value: Circle): Circle? {
-        val previousValue = activeCircles[key]
-        activeCircles[key] = value
-        return previousValue
-    }
+    override fun containsValue(value: Circle): Boolean = activeCircles.containsValue(value)
+    override fun put(key: Int, value: Circle): Circle? = activeCircles.put(key, value)
+    override fun putAll(from: Map<out Int, Circle>) = activeCircles.putAll(from)
+    override fun clear() = activeCircles.clear()
 
     override fun remove(key: Int): Circle? {
-        return activeCircles.remove(key)?.apply {
-            removeFinger()
-            deadCircles += this
+        return activeCircles.remove(key)?.also {
+            it.removeFinger()
+            deadCircles += it
         }
     }
 
-    override fun clear() {
-        activeCircles.clear()
-    }
-
     fun update(deltaTime: Int) {
         activeCircles.forEach { (_, circle) -> circle.update(deltaTime) }
         deadCircles.forEach { it.update(deltaTime) }