remove menu views after disapper

Author: dacer

androidarcmenu/src/main/java/com/hackplan/androidarcmenu/AnimatorUtils.java

@@ -67,7 +67,7 @@ static void clearFocusChild(ViewGroup viewGroup, int index) {
         animSet.start();
     }
 
-    static void showMenu(ViewGroup viewGroup, Point touchPoint, Animator.AnimatorListener listener) {
+    static void showMenu(ViewGroup viewGroup, Point touchPoint, AnimatorListenerAdapter listener) {
         List<Animator> animList = new ArrayList<>();
 
         for (int i = 0, len = viewGroup.getChildCount(); i < len; i++) {
@@ -101,7 +101,7 @@ public void onAnimationEnd(Animator animation) {
         });
         animSet.start();
     }
-    static void openMenu(ViewGroup viewGroup, int openIndex) {
+    static void openMenu(ViewGroup viewGroup, int openIndex, AnimatorListenerAdapter endListener) {
         List<Animator> animList = new ArrayList<>();
 
         for (int i = viewGroup.getChildCount() - 1; i >= 0; i--) {
@@ -115,12 +115,7 @@ static void openMenu(ViewGroup viewGroup, int openIndex) {
         animSet.setDuration(ANIM_DURATION);
         animSet.setInterpolator(new AnticipateInterpolator());
         animSet.playTogether(animList);
-        animSet.addListener(new AnimatorListenerAdapter() {
-            @Override
-            public void onAnimationEnd(Animator animation) {
-                super.onAnimationEnd(animation);
-            }
-        });
+        animSet.addListener(endListener);
         animSet.start();
     }
 

androidarcmenu/src/main/java/com/hackplan/androidarcmenu/ArcMenuLayout.java

@@ -1,6 +1,7 @@
 package com.hackplan.androidarcmenu;
 
 import android.animation.Animator;
+import android.animation.AnimatorListenerAdapter;
 import android.content.Context;
 import android.graphics.Canvas;
 import android.graphics.Point;
@@ -21,7 +22,7 @@
  * Created by Dacer on 12/11/2016.
  */
 
-public class ArcMenuLayout extends ViewGroup implements Animator.AnimatorListener{
+public class ArcMenuLayout extends ViewGroup {
     private Point touchPoint = new Point();
     private final Rect mScreenRect = new Rect();
     private Rect tempRect = new Rect();
@@ -99,7 +100,7 @@ protected void onLayout(boolean changed, int l, int t, int r, int b) {
                         (int)(yEnd + child.getMeasuredHeight()/2));
             }
         }
-        AnimatorUtils.showMenu(this, touchPoint, this);
+        AnimatorUtils.showMenu(this, touchPoint, animListener);
     }
 
     private int lastFocusIndex = -1;
@@ -113,8 +114,8 @@ public boolean onTouchEvent(MotionEvent event) {
             case MotionEvent.ACTION_CANCEL:
                 if (!show) break;
                 if (lastFocusIndex != -1) {
-                    AnimatorUtils.openMenu(this, lastFocusIndex);
                     show = false;
+                    AnimatorUtils.openMenu(this, lastFocusIndex, animListener);
                     if (onClickBtnListener != null) {
                         View clickedView = getChildAt(lastFocusIndex);
                         onClickBtnListener.onClickArcMenu(clickedView, (int)clickedView.getTag());
@@ -170,23 +171,24 @@ public float dpToPx(float dipValue) {
     }
 
     private boolean animFinished = true;
-    @Override
-    public void onAnimationStart(Animator animation) {
-        animFinished = false;
-    }
 
-    @Override
-    public void onAnimationEnd(Animator animation) {
-        animFinished = true;
-    }
+    private AnimatorListenerAdapter animListener = new AnimatorListenerAdapter() {
 
-    @Override
-    public void onAnimationCancel(Animator animation) {
-        animFinished = true;
-    }
+        @Override
+        public void onAnimationStart(Animator animation) {
+            animFinished = false;
+        }
 
-    @Override
-    public void onAnimationRepeat(Animator animation) {
+        @Override
+        public void onAnimationEnd(Animator animation) {
+            animFinished = true;
+            if (!show) removeAllViews();
+        }
+
+        @Override
+        public void onAnimationCancel(Animator animation) {
+            animFinished = true;
+        }
+    };
 
-    }
 }