From 8f1d60b5a34c196f98b8b073273795907be12ca4 Mon Sep 17 00:00:00 2001
From: Special Leung <specialcyci@gmail.com>
Date: Thu, 4 Dec 2014 23:14:03 +0800
Subject: [PATCH 1/2] Tired to support custom menus.

---
 ResideMenu/res/layout/residemenu.xml          |  4 +-
 .../com/special/ResideMenu/ResideMenu.java    | 54 +++++++++++--------
 .../special/ResideMenuDemo/MenuActivity.java  |  7 +++
 3 files changed, 42 insertions(+), 23 deletions(-)

diff --git a/ResideMenu/res/layout/residemenu.xml b/ResideMenu/res/layout/residemenu.xml
index 75caff7..7c6c8db 100644
--- a/ResideMenu/res/layout/residemenu.xml
+++ b/ResideMenu/res/layout/residemenu.xml
@@ -21,7 +21,7 @@
             android:id="@+id/sv_left_menu"
             android:scrollbars="none"
             android:paddingLeft="30dp"
-            android:layout_width="150dp"
+            android:layout_width="wrap_content"
             android:layout_height="fill_parent">
         <LinearLayout
                 android:id="@+id/layout_left_menu"
@@ -37,7 +37,7 @@
             android:id="@+id/sv_right_menu"
             android:scrollbars="none"
             android:paddingRight="30dp"
-            android:layout_width="150dp"
+            android:layout_width="wrap_content"
             android:layout_height="fill_parent"
             android:layout_gravity="right">
         <LinearLayout
diff --git a/ResideMenu/src/com/special/ResideMenu/ResideMenu.java b/ResideMenu/src/com/special/ResideMenu/ResideMenu.java
index 39ed023..8bd900b 100644
--- a/ResideMenu/src/com/special/ResideMenu/ResideMenu.java
+++ b/ResideMenu/src/com/special/ResideMenu/ResideMenu.java
@@ -29,18 +29,20 @@ public class ResideMenu extends FrameLayout{
 
     public  static final int DIRECTION_LEFT  = 0;
     public  static final int DIRECTION_RIGHT = 1;
-    private static final int PRESSED_MOVE_HORIZANTAL = 2;
+    private static final int PRESSED_MOVE_HORIZONTAL = 2;
     private static final int PRESSED_DOWN = 3;
     private static final int PRESSED_DONE = 4;
     private static final int PRESSED_MOVE_VERTICAL = 5;
 
     private ImageView imageViewShadow;
     private ImageView imageViewBackground;
+    private View leftMenuView;
+    private View rightMenuView;
+    private View showingMenuView;
     private LinearLayout layoutLeftMenu;
     private LinearLayout layoutRightMenu;
     private ScrollView scrollViewLeftMenu;
     private ScrollView scrollViewRightMenu;
-    private ScrollView scrollViewMenu;
     /** the activity that view attach to */
     private Activity activity;
     /** the decorview of the activity    */
@@ -81,6 +83,8 @@ private void initViews(Context context){
         layoutLeftMenu = (LinearLayout) findViewById(R.id.layout_left_menu);
         layoutRightMenu = (LinearLayout) findViewById(R.id.layout_right_menu);
         imageViewBackground = (ImageView) findViewById(R.id.iv_background);
+        leftMenuView = scrollViewLeftMenu;
+        rightMenuView = scrollViewRightMenu;
     }
     
     @Override
@@ -264,7 +268,7 @@ public void openMenu(int direction){
         AnimatorSet scaleDown_activity = buildScaleDownAnimation(viewActivity, mScaleValue, mScaleValue);
         AnimatorSet scaleDown_shadow = buildScaleDownAnimation(imageViewShadow,
         		mScaleValue + shadowAdjustScaleX, mScaleValue + shadowAdjustScaleY);
-        AnimatorSet alpha_menu = buildMenuAnimation(scrollViewMenu, 1.0f);
+        AnimatorSet alpha_menu = buildMenuAnimation(showingMenuView, 1.0f);
         scaleDown_shadow.addListener(animationListener);
         scaleDown_activity.playTogether(scaleDown_shadow);
         scaleDown_activity.playTogether(alpha_menu);
@@ -279,7 +283,7 @@ public void closeMenu(){
         isOpened = false;
         AnimatorSet scaleUp_activity = buildScaleUpAnimation(viewActivity, 1.0f, 1.0f);
         AnimatorSet scaleUp_shadow = buildScaleUpAnimation(imageViewShadow, 1.0f, 1.0f);
-        AnimatorSet alpha_menu = buildMenuAnimation(scrollViewMenu, 0.0f);
+        AnimatorSet alpha_menu = buildMenuAnimation(showingMenuView, 0.0f);
         scaleUp_activity.addListener(animationListener);
         scaleUp_activity.playTogether(scaleUp_shadow);
         scaleUp_activity.playTogether(alpha_menu);
@@ -306,10 +310,10 @@ private void setScaleDirection(int direction){
         float pivotY = getScreenHeight() * 0.5f;
 
         if (direction == DIRECTION_LEFT){
-            scrollViewMenu = scrollViewLeftMenu;
+            showingMenuView = leftMenuView;
             pivotX  = screenWidth * 1.5f;
         }else{
-            scrollViewMenu = scrollViewRightMenu;
+            showingMenuView = rightMenuView;
             pivotX  = screenWidth * -0.5f;
         }
 
@@ -340,7 +344,7 @@ public void onClick(View view) {
         @Override
         public void onAnimationStart(Animator animation) {
             if (isOpened()){
-                showScrollViewMenu(scrollViewMenu);
+                showMenu(showingMenuView);
                 if (menuListener != null)
                     menuListener.openMenu();
             }
@@ -355,8 +359,8 @@ public void onAnimationEnd(Animator animation) {
             }else{
                 viewActivity.setTouchDisable(false);
                 viewActivity.setOnClickListener(null);
-                hideScrollViewMenu(scrollViewLeftMenu);
-                hideScrollViewMenu(scrollViewRightMenu);
+                hideMenu(leftMenuView);
+                hideMenu(rightMenuView);
                 if (menuListener != null)
                     menuListener.closeMenu();
             }
@@ -507,7 +511,7 @@ public boolean dispatchTouchEvent(MotionEvent ev) {
                     break;
 
                 if(pressedState != PRESSED_DOWN &&
-                        pressedState != PRESSED_MOVE_HORIZANTAL)
+                        pressedState != PRESSED_MOVE_HORIZONTAL)
                     break;
 
                 int xOffset = (int) (ev.getX() - lastActionDownX);
@@ -519,19 +523,19 @@ public boolean dispatchTouchEvent(MotionEvent ev) {
                         break;
                     }
                     if(xOffset < -50 || xOffset > 50) {
-                        pressedState = PRESSED_MOVE_HORIZANTAL;
+                        pressedState = PRESSED_MOVE_HORIZONTAL;
                         ev.setAction(MotionEvent.ACTION_CANCEL);
                     }
-                } else if(pressedState == PRESSED_MOVE_HORIZANTAL) {
+                } else if(pressedState == PRESSED_MOVE_HORIZONTAL) {
                     if (currentActivityScaleX < 0.95)
-                        showScrollViewMenu(scrollViewMenu);
+                        showMenu(showingMenuView);
 
                     float targetScale = getTargetScale(ev.getRawX());
                     ViewHelper.setScaleX(viewActivity, targetScale);
                     ViewHelper.setScaleY(viewActivity, targetScale);
                     ViewHelper.setScaleX(imageViewShadow, targetScale + shadowAdjustScaleX);
                     ViewHelper.setScaleY(imageViewShadow, targetScale + shadowAdjustScaleY);
-                    ViewHelper.setAlpha(scrollViewMenu, (1 - targetScale) * 2.0f);
+                    ViewHelper.setAlpha(showingMenuView, (1 - targetScale) * 2.0f);
 
                     lastRawX = ev.getRawX();
                     return true;
@@ -542,7 +546,7 @@ public boolean dispatchTouchEvent(MotionEvent ev) {
             case MotionEvent.ACTION_UP:
 
                 if (isInIgnoredView) break;
-                if (pressedState != PRESSED_MOVE_HORIZANTAL) break;
+                if (pressedState != PRESSED_MOVE_HORIZONTAL) break;
 
                 pressedState = PRESSED_DONE;
                 if (isOpened()){
@@ -592,15 +596,23 @@ public interface OnMenuListener{
         public void closeMenu();
     }
 
-    private void showScrollViewMenu(ScrollView scrollViewMenu){
-        if (scrollViewMenu != null && scrollViewMenu.getParent() == null){
-            addView(scrollViewMenu);
+    private void showMenu(View menuView){
+        if (menuView != null && menuView.getParent() == null){
+            addView(menuView);
         }
     }
 
-    private void hideScrollViewMenu(ScrollView scrollViewMenu){
-        if (scrollViewMenu != null && scrollViewMenu.getParent() != null){
-            removeView(scrollViewMenu);
+    private void hideMenu(View menuView){
+        if (menuView != null && menuView.getParent() != null){
+            removeView(menuView);
         }
     }
+
+    public void setLeftMenuView(View menuView){
+        this.leftMenuView = menuView;
+    }
+
+    public void setRightMenuView(View menuView){
+        this.rightMenuView = menuView;
+    }
 }
diff --git a/ResideMenuDemo/src/com/special/ResideMenuDemo/MenuActivity.java b/ResideMenuDemo/src/com/special/ResideMenuDemo/MenuActivity.java
index f80c925..0f01ca3 100644
--- a/ResideMenuDemo/src/com/special/ResideMenuDemo/MenuActivity.java
+++ b/ResideMenuDemo/src/com/special/ResideMenuDemo/MenuActivity.java
@@ -1,14 +1,18 @@
 package com.special.ResideMenuDemo;
 
+import android.content.Context;
 import android.os.Bundle;
 import android.support.v4.app.Fragment;
 import android.support.v4.app.FragmentActivity;
 import android.support.v4.app.FragmentTransaction;
+import android.view.LayoutInflater;
 import android.view.MotionEvent;
 import android.view.View;
+import android.widget.Button;
 import android.widget.Toast;
 import com.special.ResideMenu.ResideMenu;
 import com.special.ResideMenu.ResideMenuItem;
+import com.special.ResideMenuDemo.R;
 
 public class MenuActivity extends FragmentActivity implements View.OnClickListener{
 
@@ -61,6 +65,9 @@ private void setUpMenu() {
         // You can disable a direction by setting ->
         // resideMenu.setSwipeDirectionDisable(ResideMenu.DIRECTION_RIGHT);
 
+        Button btn = new Button(this);
+        resideMenu.setLeftMenuView(btn);
+
         findViewById(R.id.title_bar_left_menu).setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {

From 31120be831fd4dfeb82c0c7db841c4d4bb2507a6 Mon Sep 17 00:00:00 2001
From: Special Leung <specialcyci@gmail.com>
Date: Thu, 4 Dec 2014 23:15:21 +0800
Subject: [PATCH 2/2] Add files.

---
 ResideMenuDemo/res/layout/left_menu.xml | 13 +++++++++++++
 1 file changed, 13 insertions(+)
 create mode 100644 ResideMenuDemo/res/layout/left_menu.xml

diff --git a/ResideMenuDemo/res/layout/left_menu.xml b/ResideMenuDemo/res/layout/left_menu.xml
new file mode 100644
index 0000000..53b99ca
--- /dev/null
+++ b/ResideMenuDemo/res/layout/left_menu.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              android:orientation="vertical"
+              android:layout_width="match_parent"
+              android:layout_height="match_parent">
+
+    <Button
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="New Button"
+            android:id="@+id/button"/>
+</LinearLayout>
\ No newline at end of file