hide FeedContextMenu when click outside of FeedContextMenu

frogermcs · Mar 15, 2015 · 1184b07 · 1184b07 · proman112111 · May 5, 2015
1 parent c38caf8
commit 1184b07
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/app/src/main/java/io/github/froger/instamaterial/ui/activity/BaseActivity.java b/app/src/main/java/io/github/froger/instamaterial/ui/activity/BaseActivity.java
@@ -7,6 +7,7 @@
 import android.view.Gravity;
 import android.view.Menu;
 import android.view.MenuItem;
+import android.view.MotionEvent;
 import android.view.View;
 import android.widget.ImageView;
 
@@ -16,6 +17,7 @@
 import io.github.froger.instamaterial.ui.utils.DrawerLayoutInstaller;
 import io.github.froger.instamaterial.R;
 import io.github.froger.instamaterial.Utils;
+import io.github.froger.instamaterial.ui.view.FeedContextMenuManager;
 import io.github.froger.instamaterial.ui.view.GlobalMenuView;
 
 /**
@@ -101,4 +103,10 @@ public void run() {
             }
         }, 200);
     }
+
+    @Override
+    public boolean dispatchTouchEvent(MotionEvent ev) {
+        FeedContextMenuManager.getInstance().hideContextMenu();
+        return super.dispatchTouchEvent(ev);
+    }
 }
diff --git a/app/src/main/java/io/github/froger/instamaterial/ui/view/FeedContextMenuManager.java b/app/src/main/java/io/github/froger/instamaterial/ui/view/FeedContextMenuManager.java
@@ -90,7 +90,7 @@ public void onAnimationEnd(Animator animation) {
     }
 
     public void hideContextMenu() {
-        if (!isContextMenuDismissing) {
+        if (!isContextMenuDismissing && contextMenuView != null) {
             isContextMenuDismissing = true;
             performDismissAnimation();
         }