Bug fixed

Menu in and out animation bug fixed

Author: BrotherV

ArcMenuLibrary/src/main/java/com/bvapp/arcmenulibrary/ArcMenu.java

@@ -441,14 +441,7 @@ public void run() {
 							bindItemAnimation(item, false, 200);
 						}
 					}
-					if(isMenuClicked){
-						isMenuClicked = false;
-						if(!isDoubleIconSet && !isOneIconSet){
-							ViewAnim.rotateAnimation(mIcon, false);
-						}else if(isDoubleIconSet && !isOneIconSet){
-							fabMenu.setIcon(iconClose, true);
-						}
-					}
+					retFirstStatus();
 					mArcLayout.invalidate();
 					mArcLayout.setExpandDone(false);
 					if (listener != null) {
@@ -459,6 +452,16 @@ public void run() {
 		};
 	}
 
+	private void retFirstStatus(){
+		if(isMenuClicked){
+			isMenuClicked = false;
+			if(!isDoubleIconSet && !isOneIconSet){
+				ViewAnim.rotateAnimation(mIcon, false);
+			}else if(isDoubleIconSet && !isOneIconSet){
+				fabMenu.setIcon(iconClose, true);
+			}
+		}
+	}
 	/**
 	 *
 	 * @param child
@@ -825,6 +828,7 @@ private void setDefaultAnim(){
 	public void menuOut(){
 		if(mArcLayout.isExpanded()){
 			mArcLayout.switchState(true);
+			retFirstStatus();
 		}
 		this.startAnimation(menuTranslateOut);
 	}

app/src/androidTest/java/com/bvapp/arcmenu/ExampleInstrumentedTest.java

@@ -0,0 +1,26 @@
+package com.bvapp.arcmenu;
+
+import android.content.Context;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.runner.AndroidJUnit4;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import static org.junit.Assert.*;
+
+/**
+ * Instrumentation test, which will execute on an Android device.
+ *
+ * @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
+ */
+@RunWith(AndroidJUnit4.class)
+public class ExampleInstrumentedTest {
+	@Test
+	public void useAppContext() throws Exception {
+		// Context of the app under test.
+		Context appContext = InstrumentationRegistry.getTargetContext();
+
+		assertEquals("com.bvapp.arcmenu", appContext.getPackageName());
+	}
+}

app/src/main/java/com/bvapp/arcmenu/ActivityFragment.java

@@ -122,6 +122,7 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle sa
 			menu.setToolTipPadding(4f);
 			menu.setToolTipTextSize(14);
 			menu.setToolTipTextColor(Color.BLUE);
+			//menu.setIcon(R.mipmap.facebook_w, R.mipmap.github_w);
 			menu.setAnim(300,300, ArcMenu.ANIM_MIDDLE_TO_RIGHT, ArcMenu.ANIM_MIDDLE_TO_RIGHT,
 					ArcMenu.ANIM_INTERPOLATOR_ACCELERATE_DECLERATE, ArcMenu.ANIM_INTERPOLATOR_ACCELERATE_DECLERATE);
 

app/src/main/res/layout/fragment_recyclerview.xml

@@ -23,7 +23,6 @@
         arc:menuChildAnim="false"
         arc:menuShadowElevation="true"
         arc:menuNormalColor="@color/colorAccent"
-        arc:menuImage="@mipmap/tools"
         android:layout_gravity="center_horizontal|right"
         android:layout_marginRight="6dp"
         android:layout_marginBottom="6dp"

app/src/test/java/com/bvapp/arcmenu/ExampleUnitTest.java

@@ -0,0 +1,17 @@
+package com.bvapp.arcmenu;
+
+import org.junit.Test;
+
+import static org.junit.Assert.*;
+
+/**
+ * Example local unit test, which will execute on the development machine (host).
+ *
+ * @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
+ */
+public class ExampleUnitTest {
+	@Test
+	public void addition_isCorrect() throws Exception {
+		assertEquals(4, 2 + 2);
+	}
+}