From a3fc46d8019742ac1fc55fce53bb74bfb9b397de Mon Sep 17 00:00:00 2001 From: Special Leung Date: Mon, 14 Apr 2014 19:22:30 +0800 Subject: [PATCH] change a wrong void's name and update README doc --- README.md | 11 ++++++++--- README_CN.md | 12 +++++++++--- .../src/com/special/ResideMenu/ResideMenu.java | 8 ++++---- .../src/com/special/ResideMenuDemo/MenuActivity.java | 2 +- 4 files changed, 22 insertions(+), 11 deletions(-) diff --git a/README.md b/README.md index 13cbf5f..95e1a49 100644 --- a/README.md +++ b/README.md @@ -45,7 +45,7 @@ init ResideMenu: write these code in Activity onCreate() for (int i = 0; i < titles.length; i++){ ResideMenuItem item = new ResideMenuItem(this, icon[i], titles[i]); item.setOnClickListener(this); - resideMenu.addMenuItem(item); + resideMenu.addMenuItem(item, ResideMenu.DIRECTION_LEFT); // or ResideMenu.DIRECTION_RIGHT } ``` If you want to use slipping gesture to operate(lock/unlock) the menu, override this code in Acitivity dispatchTouchEvent() (please duplicate the followed code in dispatchTouchEvent() of Activity. @@ -59,7 +59,7 @@ If you want to use slipping gesture to operate(lock/unlock) the menu, override t open/close menu ```java -resideMenu.openMenu(); +resideMenu.openMenu(ResideMenu.DIRECTION_LEFT); // or ResideMenu.DIRECTION_RIGHT resideMenu.closeMenu(); ``` @@ -79,6 +79,11 @@ listen in the menu state }; ``` +disable a direction +```java + resideMenu.setDirectionDisable(ResideMenu.DIRECTION_RIGHT); +``` + ##Ignored Views On some occasions, the slipping gesture function for locking/unlocking menu, may have conflicts with your widgets such as viewpager.By then you can add the viewpager to ignored view. ```java @@ -97,4 +102,4 @@ Email: specialcyci#gmail.com [2]: http://dribbble.com/shots/1116265-Instasave-iPhone-App [3]: http://dribbble.com/shots/1114754-Social-Feed-iOS7 [4]: https://github.com/romaonthego/RESideMenu - [5]: https://github.com/SpecialCyCi/AndroidResideMenu/blob/master/ResideMenuDemo/project.properties \ No newline at end of file + [5]: https://github.com/SpecialCyCi/AndroidResideMenu/blob/master/ResideMenuDemo/project.properties diff --git a/README_CN.md b/README_CN.md index a2005f0..4edbd99 100644 --- a/README_CN.md +++ b/README_CN.md @@ -42,7 +42,7 @@ ReisdeMenu 创意灵感来自于Dribbble[1][1]还有[2][2]，而这个是Android for (int i = 0; i < titles.length; i++){ ResideMenuItem item = new ResideMenuItem(this, icon[i], titles[i]); item.setOnClickListener(this); - resideMenu.addMenuItem(item); + resideMenu.addMenuItem(item, ResideMenu.DIRECTION_LEFT); // or ResideMenu.DIRECTION_RIGHT } ``` 如果您需要使用手势滑动开启/关闭菜单，请复写activity的dispatchTouchEvent()，代码如下 @@ -57,7 +57,7 @@ ReisdeMenu 创意灵感来自于Dribbble[1][1]还有[2][2]，而这个是Android 开启/关闭菜单 open or close menu ```java -resideMenu.openMenu(); +resideMenu.openMenu(ResideMenu.DIRECTION_LEFT); // or ResideMenu.DIRECTION_RIGHT resideMenu.closeMenu(); ``` 监听菜单状态 @@ -76,6 +76,12 @@ resideMenu.closeMenu(); }; ``` +禁止使用某个菜单方向 +```java + resideMenu.setDirectionDisable(ResideMenu.DIRECTION_RIGHT); +``` + + ##Ignored Views 在某些场景下，手势滑动开启/关闭菜单可能与您的某些控件产生冲突，例如viewpager，这时您可以把viewpager添加到ignored view. ```java @@ -94,4 +100,4 @@ Email: specialcyci#gmail.com [3]: https://github.com/romaonthego/RESideMenu [4]: http://dribbble.com/shots/1116265-Instasave-iPhone-App [5]: http://dribbble.com/shots/1114754-Social-Feed-iOS7 -[6]: https://github.com/SpecialCyCi/AndroidResideMenu/blob/master/ResideMenuDemo/project.properties \ No newline at end of file +[6]: https://github.com/SpecialCyCi/AndroidResideMenu/blob/master/ResideMenuDemo/project.properties diff --git a/ResideMenu/src/com/special/ResideMenu/ResideMenu.java b/ResideMenu/src/com/special/ResideMenu/ResideMenu.java index 9b462b5..48b00e0 100644 --- a/ResideMenu/src/com/special/ResideMenu/ResideMenu.java +++ b/ResideMenu/src/com/special/ResideMenu/ResideMenu.java @@ -57,7 +57,7 @@ public class ResideMenu extends FrameLayout implements GestureDetector.OnGesture private float lastRawX; private boolean canScale = false; private int scaleDirection = DIRECTION_LEFT; - private List disableDirection = new ArrayList(); + private List disabledDirection = new ArrayList(); public ResideMenu(Context context) { super(context); @@ -272,12 +272,12 @@ public void closeMenu(){ scaleUp_activity.start(); } - public void setDisableDirection(int direction){ - disableDirection.add(direction); + public void setDirectionDisable(int direction){ + disabledDirection.add(direction); } private boolean isInDisableDirection(int direction){ - return disableDirection.contains(direction); + return disabledDirection.contains(direction); } private void setScaleDirection(int direction){ diff --git a/ResideMenuDemo/src/com/special/ResideMenuDemo/MenuActivity.java b/ResideMenuDemo/src/com/special/ResideMenuDemo/MenuActivity.java index 146fd67..0cd6d86 100644 --- a/ResideMenuDemo/src/com/special/ResideMenuDemo/MenuActivity.java +++ b/ResideMenuDemo/src/com/special/ResideMenuDemo/MenuActivity.java @@ -56,7 +56,7 @@ private void setUpMenu() { resideMenu.addMenuItem(itemSettings, ResideMenu.DIRECTION_RIGHT); // You can disable a direction by setting -> - // resideMenu.setDisableDirection(ResideMenu.DIRECTION_RIGHT); + // resideMenu.setDirectionDisable(ResideMenu.DIRECTION_RIGHT); findViewById(R.id.title_bar_left_menu).setOnClickListener(new View.OnClickListener() { @Override