Open SideMenu on burger button click

android/app/src/main/java/com/reactnativenavigation/controllers/Modal.java

@@ -39,13 +39,16 @@ public class Modal extends Dialog implements DialogInterface.OnDismissListener,
     }
 
     @Override
-    public boolean onTitleBarBackPress() {
+    public boolean onTitleBarBackButtonClick() {
         if (!layout.onBackPressed()) {
             onBackPressed();
         }
         return true;
     }
 
+    public void onSideMenuButtonClick() {
+    }
+
     public interface OnModalDismissedListener {
         void onModalDismissed(Modal modal);
     }

android/app/src/main/java/com/reactnativenavigation/controllers/ModalController.java

@@ -98,8 +98,13 @@ public class ModalController implements ScreenStackContainer, Modal.OnModalDismi
     }
 
     @Override
-    public boolean onTitleBarBackPress() {
-        // Do nothing and let the layout handle the back press
+    public boolean onTitleBarBackButtonClick() {
+        // Do nothing and let the layout handle the back button click
         return false;
     }
+
+    @Override
+    public void onSideMenuButtonClick() {
+        // Do nothing and let the layout handle the click
+    }
 }

android/app/src/main/java/com/reactnativenavigation/layouts/BottomTabsLayout.java

@@ -199,7 +199,7 @@ public class BottomTabsLayout extends RelativeLayout implements Layout, AHBottom
     }
 
     @Override
-    public boolean onTitleBarBackPress() {
+    public boolean onTitleBarBackButtonClick() {
         if (getCurrentScreenStack().canPop()) {
             getCurrentScreenStack().pop(true, new ScreenStack.OnScreenPop() {
                 @Override
@@ -212,4 +212,9 @@ public class BottomTabsLayout extends RelativeLayout implements Layout, AHBottom
 
         return false;
     }
+
+    @Override
+    public void onSideMenuButtonClick() {
+
+    }
 }

android/app/src/main/java/com/reactnativenavigation/layouts/ScreenStackContainer.java

@@ -1,9 +1,9 @@
 package com.reactnativenavigation.layouts;
 
 import com.reactnativenavigation.params.ScreenParams;
-import com.reactnativenavigation.views.TitleBarBackButtonListener;
+import com.reactnativenavigation.views.LeftButtonOnClickListener;
 
-public interface ScreenStackContainer extends TitleBarBackButtonListener {
+public interface ScreenStackContainer extends LeftButtonOnClickListener {
     void push(ScreenParams screenParams);
 
     void pop(ScreenParams screenParams);

android/app/src/main/java/com/reactnativenavigation/layouts/SingleScreenLayout.java

@@ -10,8 +10,8 @@ import com.reactnativenavigation.params.SideMenuParams;
 import com.reactnativenavigation.params.TitleBarButtonParams;
 import com.reactnativenavigation.params.TitleBarLeftButtonParams;
 import com.reactnativenavigation.screens.ScreenStack;
+import com.reactnativenavigation.views.LeftButtonOnClickListener;
 import com.reactnativenavigation.views.SideMenu;
-import com.reactnativenavigation.views.TitleBarBackButtonListener;
 
 import java.util.List;
 
@@ -23,13 +23,13 @@ public class SingleScreenLayout extends RelativeLayout implements Layout {
     private final ScreenParams screenParams;
     private final SideMenuParams sideMenuParams;
     private ScreenStack stack;
-    private TitleBarBackButtonListener titleBarBackButtonListener;
+    private LeftButtonOnClickListener leftButtonOnClickListener;
     private @Nullable SideMenu sideMenu;
 
     public SingleScreenLayout(AppCompatActivity activity, ScreenParams screenParams,
-                              TitleBarBackButtonListener titleBarBackButtonListener) {
+                              LeftButtonOnClickListener leftButtonOnClickListener) {
         this(activity, null, screenParams);
-        this.titleBarBackButtonListener = titleBarBackButtonListener;
+        this.leftButtonOnClickListener = leftButtonOnClickListener;
     }
 
     public SingleScreenLayout(AppCompatActivity activity, @Nullable SideMenuParams sideMenuParams, ScreenParams screenParams) {
@@ -133,11 +133,18 @@ public class SingleScreenLayout extends RelativeLayout implements Layout {
     }
 
     @Override
-    public boolean onTitleBarBackPress() {
-        if (titleBarBackButtonListener != null) {
-            return titleBarBackButtonListener.onTitleBarBackPress();
+    public boolean onTitleBarBackButtonClick() {
+        if (leftButtonOnClickListener != null) {
+            return leftButtonOnClickListener.onTitleBarBackButtonClick();
         }
 
         return onBackPressed();
     }
+
+    @Override
+    public void onSideMenuButtonClick() {
+        if (sideMenu != null) {
+            sideMenu.openDrawer();
+        }
+    }
 }

android/app/src/main/java/com/reactnativenavigation/screens/FragmentScreen.java

@@ -11,7 +11,7 @@ import android.widget.FrameLayout;
 import com.reactnativenavigation.R;
 import com.reactnativenavigation.params.ScreenParams;
 import com.reactnativenavigation.views.ContentView;
-import com.reactnativenavigation.views.TitleBarBackButtonListener;
+import com.reactnativenavigation.views.LeftButtonOnClickListener;
 
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
@@ -25,8 +25,8 @@ public class FragmentScreen extends Screen {
     private static final String CONTRACT_GET_SUPPORT_FRAGMENT = "getSupportFragment";
     private FrameLayout content;
 
-    public FragmentScreen(AppCompatActivity activity, ScreenParams screenParams, TitleBarBackButtonListener titleBarBackButtonListener) {
-        super(activity, screenParams, titleBarBackButtonListener);
+    public FragmentScreen(AppCompatActivity activity, ScreenParams screenParams, LeftButtonOnClickListener leftButtonOnClickListener) {
+        super(activity, screenParams, leftButtonOnClickListener);
     }
 
     @Override

android/app/src/main/java/com/reactnativenavigation/screens/Screen.java

@@ -14,7 +14,7 @@ import com.reactnativenavigation.params.StyleParams;
 import com.reactnativenavigation.params.TitleBarButtonParams;
 import com.reactnativenavigation.params.TitleBarLeftButtonParams;
 import com.reactnativenavigation.utils.ViewUtils;
-import com.reactnativenavigation.views.TitleBarBackButtonListener;
+import com.reactnativenavigation.views.LeftButtonOnClickListener;
 import com.reactnativenavigation.views.TopBar;
 
 import java.util.List;
@@ -27,15 +27,15 @@ public abstract class Screen extends RelativeLayout {
     protected final AppCompatActivity activity;
     protected final ScreenParams screenParams;
     protected TopBar topBar;
-    private final TitleBarBackButtonListener titleBarBackButtonListener;
+    private final LeftButtonOnClickListener leftButtonOnClickListener;
     private VisibilityAnimator topBarVisibilityAnimator;
     private ScreenAnimator screenAnimator;
 
-    public Screen(AppCompatActivity activity, ScreenParams screenParams, TitleBarBackButtonListener titleBarBackButtonListener) {
+    public Screen(AppCompatActivity activity, ScreenParams screenParams, LeftButtonOnClickListener leftButtonOnClickListener) {
         super(activity);
         this.activity = activity;
         this.screenParams = screenParams;
-        this.titleBarBackButtonListener = titleBarBackButtonListener;
+        this.leftButtonOnClickListener = leftButtonOnClickListener;
 
         screenAnimator = new ScreenAnimator(this);
         createViews();
@@ -61,7 +61,7 @@ public abstract class Screen extends RelativeLayout {
             screenParams.leftButton.setColorFromScreenStyle(screenParams.styleParams.titleBarButtonColor);
         }
         topBar.addTitleBarAndSetButtons(screenParams.rightButtons, screenParams.leftButton,
-                titleBarBackButtonListener, screenParams.navigatorEventId);
+                leftButtonOnClickListener, screenParams.navigatorEventId);
     }
 
     private void createTopBar() {
@@ -138,7 +138,7 @@ public abstract class Screen extends RelativeLayout {
         topBar.setTitleBarRightButtons(navigatorEventId, titleBarButtons);
     }
 
-    public void setTitleBarLeftButton(String navigatorEventId, TitleBarBackButtonListener backButtonListener,
+    public void setTitleBarLeftButton(String navigatorEventId, LeftButtonOnClickListener backButtonListener,
                                       TitleBarLeftButtonParams titleBarLeftButtonParams) {
         topBar.setTitleBarRightButton(navigatorEventId, backButtonListener, titleBarLeftButtonParams);
     }

android/app/src/main/java/com/reactnativenavigation/screens/ScreenFactory.java

@@ -3,18 +3,18 @@ package com.reactnativenavigation.screens;
 import android.support.v7.app.AppCompatActivity;
 
 import com.reactnativenavigation.params.ScreenParams;
-import com.reactnativenavigation.views.TitleBarBackButtonListener;
+import com.reactnativenavigation.views.LeftButtonOnClickListener;
 
 public class ScreenFactory {
     public static Screen create(AppCompatActivity activity,
                                 ScreenParams screenParams,
-                                TitleBarBackButtonListener titleBarBackButtonListener) {
+                                LeftButtonOnClickListener leftButtonOnClickListener) {
         if (screenParams.isFragmentScreen()) {
-            return new FragmentScreen(activity, screenParams, titleBarBackButtonListener);
+            return new FragmentScreen(activity, screenParams, leftButtonOnClickListener);
         } else if (screenParams.hasTopTabs()) {
-            return new ViewPagerScreen(activity, screenParams, titleBarBackButtonListener);
+            return new ViewPagerScreen(activity, screenParams, leftButtonOnClickListener);
         } else {
-            return new SingleScreen(activity, screenParams, titleBarBackButtonListener);
+            return new SingleScreen(activity, screenParams, leftButtonOnClickListener);
         }
     }
 }

android/app/src/main/java/com/reactnativenavigation/screens/ScreenStack.java

@@ -11,7 +11,7 @@ import com.reactnativenavigation.params.TitleBarButtonParams;
 import com.reactnativenavigation.params.TitleBarLeftButtonParams;
 import com.reactnativenavigation.utils.KeyboardVisibilityDetector;
 import com.reactnativenavigation.utils.Task;
-import com.reactnativenavigation.views.TitleBarBackButtonListener;
+import com.reactnativenavigation.views.LeftButtonOnClickListener;
 
 import java.util.List;
 import java.util.Stack;
@@ -24,27 +24,27 @@ public class ScreenStack {
 
     private final AppCompatActivity activity;
     private RelativeLayout parent;
-    private TitleBarBackButtonListener titleBarBackButtonListener;
+    private LeftButtonOnClickListener leftButtonOnClickListener;
     private Stack<Screen> stack = new Stack<>();
     private final KeyboardVisibilityDetector keyboardVisibilityDetector;
 
     public ScreenStack(AppCompatActivity activity,
                        RelativeLayout parent,
-                       TitleBarBackButtonListener titleBarBackButtonListener) {
+                       LeftButtonOnClickListener leftButtonOnClickListener) {
         this.activity = activity;
         this.parent = parent;
-        this.titleBarBackButtonListener = titleBarBackButtonListener;
+        this.leftButtonOnClickListener = leftButtonOnClickListener;
         keyboardVisibilityDetector = new KeyboardVisibilityDetector(parent);
     }
 
     public void pushInitialScreen(ScreenParams initialScreenParams, RelativeLayout.LayoutParams params) {
-        Screen initialScreen = ScreenFactory.create(activity, initialScreenParams, titleBarBackButtonListener);
+        Screen initialScreen = ScreenFactory.create(activity, initialScreenParams, leftButtonOnClickListener);
         initialScreen.setVisibility(View.INVISIBLE);
         addScreen(initialScreen, params);
     }
 
     public void push(final ScreenParams params, RelativeLayout.LayoutParams layoutParams) {
-        Screen nextScreen = ScreenFactory.create(activity, params, titleBarBackButtonListener);
+        Screen nextScreen = ScreenFactory.create(activity, params, leftButtonOnClickListener);
         final Screen previousScreen = stack.peek();
         addScreen(nextScreen, layoutParams);
         nextScreen.show(params.animateScreenTransitions, new Runnable() {
@@ -166,7 +166,7 @@ public class ScreenStack {
         performOnScreen(screenInstanceId, new Task<Screen>() {
             @Override
             public void run(Screen param) {
-                param.setTitleBarLeftButton(navigatorEventId, titleBarBackButtonListener, titleBarLeftButtonParams);
+                param.setTitleBarLeftButton(navigatorEventId, leftButtonOnClickListener, titleBarLeftButtonParams);
             }
         });
     }

android/app/src/main/java/com/reactnativenavigation/screens/SingleScreen.java

@@ -4,7 +4,7 @@ import android.support.v7.app.AppCompatActivity;
 
 import com.reactnativenavigation.params.ScreenParams;
 import com.reactnativenavigation.views.ContentView;
-import com.reactnativenavigation.views.TitleBarBackButtonListener;
+import com.reactnativenavigation.views.LeftButtonOnClickListener;
 
 import static android.view.ViewGroup.LayoutParams.MATCH_PARENT;
 
@@ -13,7 +13,7 @@ public class SingleScreen extends Screen {
     private ContentView contentView;
 
     public SingleScreen(AppCompatActivity activity, ScreenParams screenParams,
-                        TitleBarBackButtonListener titleBarBarBackButtonListener) {
+                        LeftButtonOnClickListener titleBarBarBackButtonListener) {
         super(activity, screenParams, titleBarBarBackButtonListener);
     }
 

android/app/src/main/java/com/reactnativenavigation/screens/ViewPagerScreen.java

@@ -7,7 +7,7 @@ import android.support.v7.app.AppCompatActivity;
 import com.reactnativenavigation.params.ScreenParams;
 import com.reactnativenavigation.params.TopTabParams;
 import com.reactnativenavigation.views.ContentView;
-import com.reactnativenavigation.views.TitleBarBackButtonListener;
+import com.reactnativenavigation.views.LeftButtonOnClickListener;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -20,7 +20,7 @@ public class ViewPagerScreen extends Screen {
     private List<ContentView> contentViews;
     private ViewPager viewPager;
 
-    public ViewPagerScreen(AppCompatActivity activity, ScreenParams screenParams, TitleBarBackButtonListener backButtonListener) {
+    public ViewPagerScreen(AppCompatActivity activity, ScreenParams screenParams, LeftButtonOnClickListener backButtonListener) {
         super(activity, screenParams, backButtonListener);
     }
 

android/app/src/main/java/com/reactnativenavigation/views/LeftButton.java

@@ -19,16 +19,16 @@ public class LeftButton extends MaterialMenuDrawable implements View.OnClickList
     }
 
     private TitleBarLeftButtonParams params;
-    private final TitleBarBackButtonListener titleBarBackButtonListener;
+    private final LeftButtonOnClickListener onClickListener;
     private final String navigatorEventId;
 
     public LeftButton(Context context,
                       TitleBarLeftButtonParams params,
-                      TitleBarBackButtonListener titleBarBackButtonListener,
+                      LeftButtonOnClickListener onClickListener,
                       String navigatorEventId) {
         super(context, getColor(params), Stroke.THIN);
         this.params = params;
-        this.titleBarBackButtonListener = titleBarBackButtonListener;
+        this.onClickListener = onClickListener;
         this.navigatorEventId = navigatorEventId;
         setInitialState();
     }
@@ -44,7 +44,9 @@ public class LeftButton extends MaterialMenuDrawable implements View.OnClickList
     @Override
     public void onClick(View v) {
         if (isBackButton()) {
-            titleBarBackButtonListener.onTitleBarBackPress();
+            onClickListener.onTitleBarBackButtonClick();
+        } else if (isSideMenuButton()) {
+            onClickListener.onSideMenuButtonClick();
         } else {
             sendClickEvent();
         }
@@ -62,6 +64,10 @@ public class LeftButton extends MaterialMenuDrawable implements View.OnClickList
         return getIconState() == IconState.ARROW;
     }
 
+    private boolean isSideMenuButton() {
+        return getIconState() == IconState.BURGER;
+    }
+
     private void sendClickEvent() {
         NavigationApplication.instance.sendNavigatorEvent(params.eventId, navigatorEventId);
     }

android/app/src/main/java/com/reactnativenavigation/views/LeftButtonOnClickListener.java

@@ -0,0 +1,7 @@
+package com.reactnativenavigation.views;
+
+public interface LeftButtonOnClickListener {
+    boolean onTitleBarBackButtonClick();
+
+    void onSideMenuButtonClick();
+}

android/app/src/main/java/com/reactnativenavigation/views/SideMenu.java

@@ -23,6 +23,10 @@ public class SideMenu extends DrawerLayout {
         removeView(sideMenuView);
     }
 
+    public void openDrawer() {
+        openDrawer(Gravity.LEFT);
+    }
+
     public SideMenu(Context context, SideMenuParams sideMenuParams) {
         super(context);
         createContentContainer();

android/app/src/main/java/com/reactnativenavigation/views/TitleBar.java

@@ -46,9 +46,9 @@ public class TitleBar extends Toolbar {
     }
 
     public void setLeftButton(TitleBarLeftButtonParams leftButtonParams,
-                               TitleBarBackButtonListener titleBarBackButtonListener, String navigatorEventId) {
+                              LeftButtonOnClickListener leftButtonOnClickListener, String navigatorEventId) {
         if (shouldSetLeftButton(leftButtonParams)) {
-            createAndSetLeftButton(leftButtonParams, titleBarBackButtonListener, navigatorEventId);
+            createAndSetLeftButton(leftButtonParams, leftButtonOnClickListener, navigatorEventId);
         } else if (hasLeftButton()) {
             updateLeftButton(leftButtonParams);
         }
@@ -101,8 +101,8 @@ public class TitleBar extends Toolbar {
         return leftButton == null && leftButtonParams != null;
     }
 
-    private void createAndSetLeftButton(TitleBarLeftButtonParams leftButtonParams, TitleBarBackButtonListener titleBarBackButtonListener, String navigatorEventId) {
-        leftButton = new LeftButton(getContext(), leftButtonParams, titleBarBackButtonListener, navigatorEventId);
+    private void createAndSetLeftButton(TitleBarLeftButtonParams leftButtonParams, LeftButtonOnClickListener leftButtonOnClickListener, String navigatorEventId) {
+        leftButton = new LeftButton(getContext(), leftButtonParams, leftButtonOnClickListener, navigatorEventId);
         setNavigationOnClickListener(leftButton);
         setNavigationIcon(leftButton);
     }

android/app/src/main/java/com/reactnativenavigation/views/TitleBarBackButtonListener.java

@@ -1,5 +0,0 @@
-package com.reactnativenavigation.views;
-
-public interface TitleBarBackButtonListener {
-    boolean onTitleBarBackPress();
-}

android/app/src/main/java/com/reactnativenavigation/views/TopBar.java

@@ -24,12 +24,12 @@ public class TopBar extends AppBarLayout {
 
     public void addTitleBarAndSetButtons(List<TitleBarButtonParams> rightButtons,
                                          TitleBarLeftButtonParams leftButton,
-                                         TitleBarBackButtonListener titleBarBackButtonListener,
+                                         LeftButtonOnClickListener leftButtonOnClickListener,
                                          String navigatorEventId) {
         titleBar = new TitleBar(getContext());
         addView(titleBar);
         titleBar.setRightButtons(rightButtons, navigatorEventId);
-        titleBar.setLeftButton(leftButton, titleBarBackButtonListener, navigatorEventId);
+        titleBar.setLeftButton(leftButton, leftButtonOnClickListener, navigatorEventId);
     }
 
     public void setTitle(String title) {
@@ -56,9 +56,9 @@ public class TopBar extends AppBarLayout {
     }
 
     public void setTitleBarRightButton(String navigatorEventId,
-                                       TitleBarBackButtonListener titleBarBackButtonListener,
+                                       LeftButtonOnClickListener leftButtonOnClickListener,
                                        TitleBarLeftButtonParams titleBarLeftButtonParams) {
-        titleBar.setLeftButton(titleBarLeftButtonParams, titleBarBackButtonListener, navigatorEventId);
+        titleBar.setLeftButton(titleBarLeftButtonParams, leftButtonOnClickListener, navigatorEventId);
     }
 
     private void setTopTabsStyle(StyleParams style) {