feat: replace SimpleDrawer with EmptyDrawer for improved drawer structure

Author: yoimerdr

virtualjoystick/src/main/java/com/yoimerdr/android/virtualjoystick/drawer/core/ColorfulProperties.kt

@@ -16,7 +16,7 @@ open class ColorfulProperties @JvmOverloads constructor(
      * The paint.
      * */
     val paint: Paint = Paint(Paint.ANTI_ALIAS_FLAG),
-) : SimpleDrawer.SimpleProperties() {
+) : EmptyDrawer.SimpleProperties() {
 
     init {
         paint.color = colors.primary

…tualjoystick/drawer/core/SimpleDrawer.kt …rtualjoystick/drawer/core/EmptyDrawer.ktvirtualjoystick/src/main/java/com/yoimerdr/android/virtualjoystick/drawer/core/SimpleDrawer.kt renamed to virtualjoystick/src/main/java/com/yoimerdr/android/virtualjoystick/drawer/core/EmptyDrawer.kt virtualjoystick/src/main/java/com/yoimerdr/android/virtualjoystick/drawer/core/SimpleDrawer.kt renamed to virtualjoystick/src/main/java/com/yoimerdr/android/virtualjoystick/drawer/core/EmptyDrawer.kt

@@ -12,7 +12,7 @@ import com.yoimerdr.android.virtualjoystick.control.Control
  *
  * @property properties The properties associated with this control drawer.
  */
-open class SimpleDrawer(
+open class EmptyDrawer(
     override val properties: DrawerProperties,
 ) : ConfigurableDrawer {
 
@@ -64,7 +64,17 @@ open class SimpleDrawer(
      *
      * Subclasses can override this method to perform initial setup.
      */
-    protected open fun configure() {}
+    protected open fun onConfigured() {}
+
+    /**
+     * Called once to configure the drawer.
+     * */
+    fun configure() {
+        if (!mConfigured) {
+            onConfigured()
+            mConfigured = true
+        }
+    }
 
     /**
      * Invalidates the drawer, resetting the recorded values.
@@ -108,11 +118,6 @@ open class SimpleDrawer(
 
     @CallSuper
     override fun draw(canvas: Canvas, control: Control) {
-        if (!mConfigured) {
-            configure()
-            mConfigured = true
-        }
-
         val direction = getDirection(control)
 
         if (!isValid(control)) {

virtualjoystick/src/main/java/com/yoimerdr/android/virtualjoystick/drawer/drawable/DrawableDrawer.kt

@@ -14,7 +14,7 @@ import com.yoimerdr.android.virtualjoystick.api.drawable.DrawableBitCache
 import com.yoimerdr.android.virtualjoystick.api.log.LoggerSupplier.withLogger
 import com.yoimerdr.android.virtualjoystick.control.Control
 import com.yoimerdr.android.virtualjoystick.drawer.core.ControlDrawer
-import com.yoimerdr.android.virtualjoystick.drawer.core.SimpleDrawer
+import com.yoimerdr.android.virtualjoystick.drawer.core.EmptyDrawer
 import com.yoimerdr.android.virtualjoystick.drawer.core.ColorfulProperties
 import com.yoimerdr.android.virtualjoystick.extensions.greaterThan
 import com.yoimerdr.android.virtualjoystick.geometry.Circle
@@ -30,7 +30,7 @@ open class DrawableDrawer(
      * The drawable drawer properties.
      */
     override val properties: DrawableProperties,
-) : SimpleDrawer(properties) {
+) : EmptyDrawer(properties) {
 
     private var mCache: DrawableBitCache? = null
 

virtualjoystick/src/main/java/com/yoimerdr/android/virtualjoystick/drawer/shapes/arc/ArcDrawer.kt

@@ -17,7 +17,7 @@ import com.yoimerdr.android.virtualjoystick.theme.ColorsScheme
 import androidx.core.graphics.withSave
 import com.yoimerdr.android.virtualjoystick.drawer.core.ControlDrawer
 import com.yoimerdr.android.virtualjoystick.drawer.core.ColorfulProperties
-import com.yoimerdr.android.virtualjoystick.drawer.core.SimpleDrawer
+import com.yoimerdr.android.virtualjoystick.drawer.core.EmptyDrawer
 
 /**
  * A [ControlDrawer] that draws an arc.
@@ -27,7 +27,7 @@ open class ArcDrawer(
      * The arc drawer properties.
      */
     override val properties: ArcProperties,
-) : SimpleDrawer() {
+) : EmptyDrawer() {
 
     /**
      * @param colors The colors for the drawer.

virtualjoystick/src/main/java/com/yoimerdr/android/virtualjoystick/drawer/shapes/circle/CircleDrawer.kt

@@ -7,7 +7,7 @@ import androidx.annotation.ColorInt
 import com.yoimerdr.android.virtualjoystick.control.Control
 import com.yoimerdr.android.virtualjoystick.drawer.core.ControlDrawer
 import com.yoimerdr.android.virtualjoystick.drawer.core.DrawerRadius
-import com.yoimerdr.android.virtualjoystick.drawer.core.SimpleDrawer
+import com.yoimerdr.android.virtualjoystick.drawer.core.EmptyDrawer
 import com.yoimerdr.android.virtualjoystick.drawer.core.ColorfulProperties
 import com.yoimerdr.android.virtualjoystick.geometry.Circle
 import com.yoimerdr.android.virtualjoystick.geometry.position.ImmutablePosition
@@ -18,7 +18,7 @@ import com.yoimerdr.android.virtualjoystick.theme.ColorsScheme
  * */
 open class CircleDrawer(
     override val properties: CircleProperties,
-) : SimpleDrawer() {
+) : EmptyDrawer() {
 
     /**
      * @param colors The colors for the drawer.

virtualjoystick/src/main/java/com/yoimerdr/android/virtualjoystick/drawer/shapes/path/PathDrawer.kt

@@ -7,7 +7,7 @@ import androidx.annotation.ColorInt
 import androidx.annotation.IntRange
 import com.yoimerdr.android.virtualjoystick.control.Control
 import com.yoimerdr.android.virtualjoystick.control.Control.Direction.Companion.quadrant
-import com.yoimerdr.android.virtualjoystick.drawer.core.SimpleDrawer
+import com.yoimerdr.android.virtualjoystick.drawer.core.EmptyDrawer
 import com.yoimerdr.android.virtualjoystick.drawer.core.ColorfulProperties
 import com.yoimerdr.android.virtualjoystick.theme.ColorsScheme
 
@@ -16,7 +16,7 @@ import com.yoimerdr.android.virtualjoystick.theme.ColorsScheme
  * */
 abstract class PathDrawer(
     override val properties: PathProperties,
-) : SimpleDrawer() {
+) : EmptyDrawer() {
 
     protected val path = Path()
 

virtualjoystick/src/main/java/com/yoimerdr/android/virtualjoystick/views/JoystickView.kt

@@ -29,6 +29,7 @@ import com.yoimerdr.android.virtualjoystick.api.log.LoggerSupplier.withLogger
 import com.yoimerdr.android.virtualjoystick.control.Control.Direction.Companion.direction
 import com.yoimerdr.android.virtualjoystick.drawer.core.ConfigurableDrawer
 import com.yoimerdr.android.virtualjoystick.drawer.core.ColorfulProperties
+import com.yoimerdr.android.virtualjoystick.drawer.core.EmptyDrawer
 import com.yoimerdr.android.virtualjoystick.geometry.Circle
 import com.yoimerdr.android.virtualjoystick.extensions.firstOrdinal
 import kotlin.math.min
@@ -241,6 +242,8 @@ class JoystickView @JvmOverloads constructor(
             .invalidRadius(invalidRadius)
             .build()
 
+        val drawer = mControl.drawer as? EmptyDrawer
+        drawer?.configure()
 
         background = try {
             getCompatDrawable(backgroundRes)
@@ -461,7 +464,7 @@ class JoystickView @JvmOverloads constructor(
             mControl.setPosition(touchPosition)
         } catch (e: LowerNumberException) {
             withLogger("JoystickView") {
-                error(e,)
+                error(e)
             }
             return false
         }
@@ -631,6 +634,8 @@ class JoystickView @JvmOverloads constructor(
      */
     fun setControlDrawer(drawer: ControlDrawer) {
         mControl.drawer = drawer
+        if (drawer is EmptyDrawer)
+            drawer.configure()
         invalidate()
     }
 
@@ -647,6 +652,8 @@ class JoystickView @JvmOverloads constructor(
                 setPosition(mControl.position)
                 invalidate()
             }
+            val drawer = this.drawer as? EmptyDrawer
+            drawer?.configure()
         }
     }