add boolean return value to SparkEventListener that controls animation (

#2)
connyduck · Mar 2, 2020 · ab06bbc · ab06bbc
1 parent 30fd0a2
commit ab06bbc
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 16 deletions.
diff --git a/sparkbutton/src/main/java/at/connyduck/sparkbutton/SparkButton.java b/sparkbutton/src/main/java/at/connyduck/sparkbutton/SparkButton.java
@@ -254,25 +254,26 @@ public void setEventListener(SparkEventListener listener) {
 
     @Override
     public void onClick(View v) {
-        if (imageResourceIdInactive != INVALID_RESOURCE_ID) {
-            isChecked = !isChecked;
+        boolean shouldPlayAnimation = listener == null || listener.onEvent(this, isChecked);
 
-            imageView.setImageResource(isChecked ? imageResourceIdActive : imageResourceIdInactive);
+        if(shouldPlayAnimation) {
+            if (imageResourceIdInactive != INVALID_RESOURCE_ID) {
+                isChecked = !isChecked;
 
-            if (animatorSet != null) {
-                animatorSet.cancel();
-            }
-            if (isChecked) {
-                sparkAnimationView.setVisibility(VISIBLE);
-                playAnimation();
+                imageView.setImageResource(isChecked ? imageResourceIdActive : imageResourceIdInactive);
+
+                if (animatorSet != null) {
+                    animatorSet.cancel();
+                }
+                if (isChecked) {
+                    sparkAnimationView.setVisibility(VISIBLE);
+                    playAnimation();
+                } else {
+                    sparkAnimationView.setVisibility(INVISIBLE);
+                }
             } else {
-                sparkAnimationView.setVisibility(INVISIBLE);
+                playAnimation();
             }
-        } else {
-            playAnimation();
-        }
-        if (listener != null) {
-            listener.onEvent(this, isChecked);
         }
     }
 

diff --git a/sparkbutton/src/main/java/at/connyduck/sparkbutton/SparkEventListener.java b/sparkbutton/src/main/java/at/connyduck/sparkbutton/SparkEventListener.java
@@ -17,5 +17,5 @@
 import androidx.annotation.NonNull;
 
 public interface SparkEventListener {
-    void onEvent(@NonNull SparkButton button, boolean buttonState);
+    boolean onEvent(@NonNull SparkButton button, boolean buttonState);
 }