It should remove the other menu view while showing a menu. SpecialCyC…

…i#30
lhyhfut · Oct 22, 2014 · ada0245 · ada0245
1 parent e647b28
commit ada0245
Showing 1 changed file with 6 additions and 5 deletions.
diff --git a/ResideMenu/src/com/special/ResideMenu/ResideMenu.java b/ResideMenu/src/com/special/ResideMenu/ResideMenu.java
@@ -341,7 +341,7 @@ public void onClick(View view) {
         @Override
         public void onAnimationStart(Animator animation) {
             if (isOpened()){
-                showScrollViewMenu();
+                showScrollViewMenu(scrollViewMenu);
                 if (menuListener != null)
                     menuListener.openMenu();
             }
@@ -356,7 +356,8 @@ public void onAnimationEnd(Animator animation) {
             }else{
                 viewActivity.setTouchDisable(false);
                 viewActivity.setOnClickListener(null);
-                hideScrollViewMenu();
+                hideScrollViewMenu(scrollViewLeftMenu);
+                hideScrollViewMenu(scrollViewRightMenu);
                 if (menuListener != null)
                     menuListener.closeMenu();
             }
@@ -524,7 +525,7 @@ public boolean dispatchTouchEvent(MotionEvent ev) {
                     }
                 } else if(pressedState == PRESSED_MOVE_HORIZANTAL) {
                     if (currentActivityScaleX < 0.95)
-                        showScrollViewMenu();
+                        showScrollViewMenu(scrollViewMenu);
 
                     float targetScale = getTargetScale(ev.getRawX());
                     ViewHelper.setScaleX(viewActivity, targetScale);
@@ -592,13 +593,13 @@ public interface OnMenuListener{
         public void closeMenu();
     }
 
-    private void showScrollViewMenu(){
+    private void showScrollViewMenu(ScrollView scrollViewMenu){
         if (scrollViewMenu != null && scrollViewMenu.getParent() == null){
             addView(scrollViewMenu);
         }
     }
 
-    private void hideScrollViewMenu(){
+    private void hideScrollViewMenu(ScrollView scrollViewMenu){
         if (scrollViewMenu != null && scrollViewMenu.getParent() != null){
             removeView(scrollViewMenu);
         }