Refactor CircleMenuView.onClick method

dvg4000 · dvg4000 · commit ee5b50727b07 · 2017-11-16T11:41:25.000+03:00
diff --git a/circle-menu/src/main/java/com/ramotion/circlemenu/CircleMenuView.java b/circle-menu/src/main/java/com/ramotion/circlemenu/CircleMenuView.java
@@ -211,23 +211,28 @@ public void onClick(View view) {
                 animation.addListener(new AnimatorListenerAdapter() {
                     @Override
                     public void onAnimationStart(Animator animation) {
-                        if (mListener != null) {
-                            if (mClosedState) {
-                                mListener.onMenuOpenAnimationStart(CircleMenuView.this);
-                            } else {
-                                mListener.onMenuCloseAnimationStart(CircleMenuView.this);
-                            }
+                        if (mListener == null) {
+                            return;
+                        }
+
+                        if (mClosedState) {
+                            mListener.onMenuOpenAnimationStart(CircleMenuView.this);
+                        } else {
+                            mListener.onMenuCloseAnimationStart(CircleMenuView.this);
                         }
                     }
                     @Override
                     public void onAnimationEnd(Animator animation) {
                         animation.removeListener(this);
-                        if (mListener != null) {
-                            if (mClosedState) {
-                                mListener.onMenuOpenAnimationEnd(CircleMenuView.this);
-                            } else {
-                                mListener.onMenuCloseAnimationEnd(CircleMenuView.this);
-                            }
+
+                        if (mListener == null) {
+                            return;
+                        }
+
+                        if (mClosedState) {
+                            mListener.onMenuOpenAnimationEnd(CircleMenuView.this);
+                        } else {
+                            mListener.onMenuCloseAnimationEnd(CircleMenuView.this);
                         }
                     }
                 });
