Merge branch 'release/1.0.5'

lovestart · Nov 25, 2015 · bff827d · bff827d
2 parents 36698a1 + 2e44ffa
commit bff827d
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 27 deletions.
diff --git a/app/src/main/java/com/yalantis/contextmenu/sample/MainActivity.java b/app/src/main/java/com/yalantis/contextmenu/sample/MainActivity.java
@@ -4,11 +4,10 @@
 import android.graphics.BitmapFactory;
 import android.graphics.drawable.BitmapDrawable;
 import android.os.Bundle;
-import android.support.v4.app.DialogFragment;
 import android.support.v4.app.Fragment;
 import android.support.v4.app.FragmentManager;
 import android.support.v4.app.FragmentTransaction;
-import android.support.v7.app.ActionBarActivity;
+import android.support.v7.app.AppCompatActivity;
 import android.support.v7.widget.Toolbar;
 import android.view.Menu;
 import android.view.MenuInflater;
@@ -27,11 +26,10 @@
 import java.util.ArrayList;
 import java.util.List;
 
-public class MainActivity extends ActionBarActivity implements OnMenuItemClickListener,
-        OnMenuItemLongClickListener{
+public class MainActivity extends AppCompatActivity implements OnMenuItemClickListener, OnMenuItemLongClickListener{
 
     private FragmentManager fragmentManager;
-    private DialogFragment mMenuDialogFragment;
+    private ContextMenuDialogFragment mMenuDialogFragment;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -49,6 +47,8 @@ private void initMenuFragment() {
         menuParams.setMenuObjects(getMenuObjects());
         menuParams.setClosableOutside(false);
         mMenuDialogFragment = ContextMenuDialogFragment.newInstance(menuParams);
+        mMenuDialogFragment.setItemClickListener(this);
+        mMenuDialogFragment.setItemLongClickListener(this);
     }
 
     private List<MenuObject> getMenuObjects() {

diff --git a/gradle.properties b/gradle.properties
@@ -17,8 +17,8 @@
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
 # org.gradle.parallel=true
 
-VERSION_NAME=1.0.4
-VERSION_CODE=5
+VERSION_NAME=1.0.5
+VERSION_CODE=6
 GROUP=com.yalantis
 
 POM_DESCRIPTION=Android Library to display awesome context menu

diff --git a/lib/src/main/java/com/yalantis/contextmenu/lib/ContextMenuDialogFragment.java b/lib/src/main/java/com/yalantis/contextmenu/lib/ContextMenuDialogFragment.java
@@ -2,12 +2,10 @@
 
 import android.annotation.SuppressLint;
 import android.annotation.TargetApi;
-import android.app.Activity;
 import android.os.Build;
 import android.os.Bundle;
 import android.os.Handler;
 import android.support.v4.app.DialogFragment;
-import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -83,23 +81,6 @@ public static ContextMenuDialogFragment newInstance(MenuParams menuParams) {
         return fragment;
     }
 
-    @Override
-    public void onAttach(Activity activity) {
-        super.onAttach(activity);
-        try {
-            mItemClickListener = (OnMenuItemClickListener) activity;
-        } catch (ClassCastException e) {
-            Log.e(TAG, activity.getClass().getSimpleName() +
-                    " should implement " + OnMenuItemClickListener.class.getSimpleName());
-        }
-        try {
-            mItemLongClickListener = (OnMenuItemLongClickListener) activity;
-        } catch (ClassCastException e) {
-            Log.e(TAG, activity.getClass().getSimpleName() +
-                    " should implement " + OnMenuItemLongClickListener.class.getSimpleName());
-        }
-    }
-
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -130,7 +111,9 @@ public void run() {
             rootView.findViewById(R.id.root).setOnClickListener(new View.OnClickListener() {
                 @Override
                 public void onClick(View v) {
-                    getActivity().onBackPressed();
+                    if (isAdded()) {
+                        dismiss();
+                    }
                 }
             });
         }
@@ -159,6 +142,14 @@ public void run() {
         }, mMenuParams.getAnimationDelay());
     }
 
+    public void setItemLongClickListener(OnMenuItemLongClickListener itemLongClickListener) {
+        this.mItemLongClickListener = itemLongClickListener;
+    }
+
+    public void setItemClickListener(OnMenuItemClickListener itemClickListener) {
+        this.mItemClickListener = itemClickListener;
+    }
+
     /**
      * Menu item click method
      */

diff --git a/lib/src/main/java/com/yalantis/contextmenu/lib/MenuAdapter.java b/lib/src/main/java/com/yalantis/contextmenu/lib/MenuAdapter.java
@@ -285,6 +285,8 @@ private void toggleIsMenuOpen() {
 
     public void setAnimationDuration(int durationMillis) {
         mAnimationDurationMilis = durationMillis;
+        mAnimatorSetShowMenu.setDuration(mAnimationDurationMilis);
+        mAnimatorSetHideMenu.setDuration(mAnimationDurationMilis);
     }
 
     private Animator.AnimatorListener mCloseOpenAnimatorListener = new Animator.AnimatorListener() {