Android right side menu (#547)

* Implement right SideMenu on Android

* Adapt toggleSideMenu and toggleSideMenuVisible to right SideMenu

android/app/src/main/java/com/reactnativenavigation/bridge/NavigationReactModule.java

 import com.reactnativenavigation.params.parsers.SnackbarParamsParser;
 import com.reactnativenavigation.params.parsers.TitleBarButtonParamsParser;
 import com.reactnativenavigation.params.parsers.TitleBarLeftButtonParamsParser;
+import com.reactnativenavigation.views.SideMenu.Side;
 
 import java.util.List;
 
     }
 
     @ReactMethod
-    public void toggleSideMenuVisible(boolean animated) {
-        NavigationCommandsHandler.toggleSideMenuVisible(animated);
+    public void toggleSideMenuVisible(boolean animated, String side) {
+        NavigationCommandsHandler.toggleSideMenuVisible(animated, Side.fromString(side));
     }
 
     @ReactMethod
-    public void setSideMenuVisible(boolean animated, boolean visible) {
-        NavigationCommandsHandler.setSideMenuVisible(animated, visible);
+    public void setSideMenuVisible(boolean animated, boolean visible, String side) {
+        NavigationCommandsHandler.setSideMenuVisible(animated, visible, Side.fromString(side));
     }
 
     @ReactMethod

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

         layout.setTopBarVisible(screenInstanceId, hidden, animated);
     }
 
-    public void setTitleBarTitle(String screenInstanceId, String title) {
+    void setTitleBarTitle(String screenInstanceId, String title) {
         layout.setTitleBarTitle(screenInstanceId, title);
     }
 
-    public void setTitleBarSubtitle(String screenInstanceId, String subtitle) {
+    void setTitleBarSubtitle(String screenInstanceId, String subtitle) {
         layout.setTitleBarSubtitle(screenInstanceId, subtitle);
     }
 
-    public void setTitleBarRightButtons(String screenInstanceId, String navigatorEventId, List<TitleBarButtonParams> titleBarButtons) {
+    void setTitleBarRightButtons(String screenInstanceId, String navigatorEventId, List<TitleBarButtonParams> titleBarButtons) {
         layout.setTitleBarRightButtons(screenInstanceId, navigatorEventId, titleBarButtons);
     }
 
     public void onSideMenuButtonClick() {
     }
 
-    public interface OnModalDismissedListener {
+    interface OnModalDismissedListener {
         void onModalDismissed(Modal modal);
     }
 
         setCancelable(true);
         setOnDismissListener(this);
         requestWindowFeature(Window.FEATURE_NO_TITLE);
-        layout = new ModalScreenLayout(getActivity(), null, screenParams, this);
+        layout = new ModalScreenLayout(getActivity(), screenParams, this);
         getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE);
         setContentView(layout.asView());
     }
         onModalDismissedListener.onModalDismissed(this);
     }
 
-    public void onModalDismissed() {
+    void onModalDismissed() {
         layout.onModalDismissed();
     }
 }

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

 import com.reactnativenavigation.params.TitleBarButtonParams;
 import com.reactnativenavigation.params.TitleBarLeftButtonParams;
 import com.reactnativenavigation.react.JsDevReloadHandler;
+import com.reactnativenavigation.views.SideMenu.Side;
 
 import java.util.List;
 
         modalController.setTitleBarLeftButton(screenInstanceId, navigatorEventId, titleBarLeftButton);
     }
 
-    public void toggleSideMenuVisible(boolean animated) {
-        layout.toggleSideMenuVisible(animated);
+    public void toggleSideMenuVisible(boolean animated, Side side) {
+        layout.toggleSideMenuVisible(animated, side);
     }
 
-    public void setSideMenuVisible(boolean animated, boolean visible) {
-        layout.setSideMenuVisible(animated, visible);
+    public void setSideMenuVisible(boolean animated, boolean visible, Side side) {
+        layout.setSideMenuVisible(animated, visible, side);
     }
 
     public void selectBottomTabByTabIndex(Integer index) {

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

 import com.reactnativenavigation.params.TitleBarLeftButtonParams;
 import com.reactnativenavigation.params.parsers.ActivityParamsParser;
 import com.reactnativenavigation.params.parsers.ScreenParamsParser;
+import com.reactnativenavigation.views.SideMenu.Side;
 
 import java.util.List;
 
         });
     }
 
-    public static void toggleSideMenuVisible(final boolean animated) {
+    public static void toggleSideMenuVisible(final boolean animated, final Side side) {
         final NavigationActivity currentActivity = NavigationActivity.currentActivity;
         if (currentActivity == null) {
             return;
         NavigationApplication.instance.runOnMainThread(new Runnable() {
             @Override
             public void run() {
-                currentActivity.toggleSideMenuVisible(animated);
+                currentActivity.toggleSideMenuVisible(animated, side);
             }
         });
     }
 
-    public static void setSideMenuVisible(final boolean animated, final boolean visible) {
+    public static void setSideMenuVisible(final boolean animated, final boolean visible, final Side side) {
         final NavigationActivity currentActivity = NavigationActivity.currentActivity;
         if (currentActivity == null) {
             return;
         NavigationApplication.instance.runOnMainThread(new Runnable() {
             @Override
             public void run() {
-                currentActivity.setSideMenuVisible(animated, visible);
+                currentActivity.setSideMenuVisible(animated, visible, side);
             }
         });
     }

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

 import com.reactnativenavigation.screens.ScreenStack;
 import com.reactnativenavigation.views.BottomTabs;
 import com.reactnativenavigation.views.SideMenu;
+import com.reactnativenavigation.views.SideMenu.Side;
 import com.reactnativenavigation.views.SnackbarAndFabContainer;
 
 import java.util.List;
     private SnackbarAndFabContainer snackbarAndFabContainer;
     private BottomTabs bottomTabs;
     private ScreenStack[] screenStacks;
-    private final SideMenuParams sideMenuParams;
+    private final SideMenuParams leftSideMenuParams;
+    private final SideMenuParams rightSideMenuParams;
     private @Nullable SideMenu sideMenu;
     private int currentStackIndex = 0;
 
         super(activity);
         this.activity = activity;
         this.params = params;
-        this.sideMenuParams = params.sideMenuParams;
+        leftSideMenuParams = params.leftSideMenuParams;
+        rightSideMenuParams = params.rightSideMenuParams;
         screenStacks = new ScreenStack[params.tabParams.size()];
         createLayout();
     }
     }
 
     private void createSideMenu() {
-        if (sideMenuParams == null) {
+        if (leftSideMenuParams == null && rightSideMenuParams == null) {
             return;
         }
-        sideMenu = new SideMenu(getContext(), sideMenuParams);
+        sideMenu = new SideMenu(getContext(), leftSideMenuParams, rightSideMenuParams);
         RelativeLayout.LayoutParams lp = new LayoutParams(MATCH_PARENT, MATCH_PARENT);
         addView(sideMenu, lp);
     }
     }
 
     @Override
-    public void toggleSideMenuVisible(boolean animated) {
+    public void toggleSideMenuVisible(boolean animated, Side side) {
         if (sideMenu != null) {
-            sideMenu.toggleVisible(animated);
+            sideMenu.toggleVisible(animated, side);
         }
     }
 
     @Override
-    public void setSideMenuVisible(boolean animated, boolean visible) {
+    public void setSideMenuVisible(boolean animated, boolean visible, Side side) {
         if (sideMenu != null) {
-            sideMenu.setVisible(visible, animated);
+            sideMenu.setVisible(visible, animated, side);
         }
     }
 
     @Override
     public void onSideMenuButtonClick() {
         if (sideMenu != null) {
-            sideMenu.openDrawer();
+            sideMenu.openDrawer(Side.Left);
         } else {
             final String navigatorEventId = getCurrentScreenStack().peek().getNavigatorEventId();
             NavigationApplication.instance.getEventEmitter().sendNavigatorEvent("sideMenu", navigatorEventId);

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

 import com.reactnativenavigation.params.SnackbarParams;
 import com.reactnativenavigation.params.TitleBarButtonParams;
 import com.reactnativenavigation.params.TitleBarLeftButtonParams;
+import com.reactnativenavigation.views.SideMenu.Side;
 
 import java.util.List;
 
 
     void setTitleBarLeftButton(String screenInstanceId, String navigatorEventId, TitleBarLeftButtonParams titleBarLeftButtonParams);
 
-    void toggleSideMenuVisible(boolean animated);
+    void toggleSideMenuVisible(boolean animated, Side side);
 
-    void setSideMenuVisible(boolean animated, boolean visible);
+    void setSideMenuVisible(boolean animated, boolean visible, Side side);
 
     void showSnackbar(SnackbarParams params);
 

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

     }
 
     private static Layout createSingleScreenLayout(AppCompatActivity activity, ActivityParams params) {
-        return new SingleScreenLayout(activity, params.sideMenuParams, params.screenParams);
+        return new SingleScreenLayout(activity, params.leftSideMenuParams, params.rightSideMenuParams, params.screenParams);
     }
 
     private static Layout createBottomTabsScreenLayout(AppCompatActivity activity, ActivityParams params) {

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

 package com.reactnativenavigation.layouts;
 
-import android.support.annotation.Nullable;
 import android.support.v7.app.AppCompatActivity;
 
 import com.reactnativenavigation.params.ScreenParams;
-import com.reactnativenavigation.params.SideMenuParams;
 import com.reactnativenavigation.views.LeftButtonOnClickListener;
 
 public class ModalScreenLayout extends SingleScreenLayout {
 
-    public ModalScreenLayout(AppCompatActivity activity, @Nullable SideMenuParams sideMenuParams,
-                             ScreenParams screenParams, LeftButtonOnClickListener leftButtonOnClickListener) {
-        super(activity, sideMenuParams, screenParams);
+    public ModalScreenLayout(AppCompatActivity activity,
+                             ScreenParams screenParams,
+                             LeftButtonOnClickListener leftButtonOnClickListener) {
+        super(activity, null, null, screenParams);
         this.leftButtonOnClickListener = leftButtonOnClickListener;
     }
 

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

 import com.reactnativenavigation.screens.ScreenStack;
 import com.reactnativenavigation.views.LeftButtonOnClickListener;
 import com.reactnativenavigation.views.SideMenu;
+import com.reactnativenavigation.views.SideMenu.Side;
 import com.reactnativenavigation.views.SnackbarAndFabContainer;
 
 import java.util.List;
 
     private final AppCompatActivity activity;
     protected final ScreenParams screenParams;
-    private final SideMenuParams sideMenuParams;
+    private final SideMenuParams leftSideMenuParams;
+    private final SideMenuParams rightSideMenuParams;
     protected ScreenStack stack;
     private SnackbarAndFabContainer snackbarAndFabContainer;
     protected LeftButtonOnClickListener leftButtonOnClickListener;
     private @Nullable SideMenu sideMenu;
 
-    public SingleScreenLayout(AppCompatActivity activity, @Nullable SideMenuParams sideMenuParams, ScreenParams screenParams) {
+    public SingleScreenLayout(AppCompatActivity activity, SideMenuParams leftSideMenuParams,
+                              SideMenuParams rightSideMenuParams, ScreenParams screenParams) {
         super(activity);
         this.activity = activity;
         this.screenParams = screenParams;
-        this.sideMenuParams = sideMenuParams;
+        this.leftSideMenuParams = leftSideMenuParams;
+        this.rightSideMenuParams = rightSideMenuParams;
         createLayout();
     }
 
     private void createLayout() {
-        if (sideMenuParams == null) {
+        if (leftSideMenuParams == null) {
             createStack(getScreenStackParent());
         } else {
             sideMenu = createSideMenu();
     }
 
     private SideMenu createSideMenu() {
-        SideMenu sideMenu = new SideMenu(getContext(), sideMenuParams);
+        SideMenu sideMenu = new SideMenu(getContext(), leftSideMenuParams, rightSideMenuParams);
         RelativeLayout.LayoutParams lp = new LayoutParams(MATCH_PARENT, MATCH_PARENT);
         addView(sideMenu, lp);
         return sideMenu;
     }
 
     @Override
-    public void toggleSideMenuVisible(boolean animated) {
+    public void toggleSideMenuVisible(boolean animated, Side side) {
         if (sideMenu != null) {
-            sideMenu.toggleVisible(animated);
+            sideMenu.toggleVisible(animated, side);
         }
     }
 
     @Override
-    public void setSideMenuVisible(boolean animated, boolean visible) {
+    public void setSideMenuVisible(boolean animated, boolean visible, Side side) {
         if (sideMenu != null) {
-            sideMenu.setVisible(visible, animated);
+            sideMenu.setVisible(visible, animated, side);
         }
     }
 
     @Override
     public void onSideMenuButtonClick() {
         if (sideMenu != null) {
-            sideMenu.openDrawer();
+            sideMenu.openDrawer(Side.Left);
         } else {
             final String navigatorEventId = stack.peek().getNavigatorEventId();
             NavigationApplication.instance.getEventEmitter().sendNavigatorEvent("sideMenu", navigatorEventId);

android/app/src/main/java/com/reactnativenavigation/params/ActivityParams.java

     public Type type;
     public ScreenParams screenParams;
     public List<ScreenParams> tabParams;
-    public SideMenuParams sideMenuParams;
+    public SideMenuParams leftSideMenuParams;
+    public SideMenuParams rightSideMenuParams;
     public boolean animateShow;
 }

android/app/src/main/java/com/reactnativenavigation/params/NavigationParams.java

 import android.os.Bundle;
 
 public class NavigationParams {
-    public static final String SCREEN_INSTANCE_ID = "screenInstanceID";
-    public static final String NAVIGATOR_ID = "navigatorID";
-    public static final String NAVIGATOR_EVENT_ID = "navigatorEventID";
+    private static final String SCREEN_INSTANCE_ID = "screenInstanceID";
+    private static final String NAVIGATOR_ID = "navigatorID";
+    private static final String NAVIGATOR_EVENT_ID = "navigatorEventID";
 
     public String screenInstanceId;
     public String navigatorId;

android/app/src/main/java/com/reactnativenavigation/params/SideMenuParams.java

 package com.reactnativenavigation.params;
 
+import com.reactnativenavigation.views.SideMenu;
+
 public class SideMenuParams {
     public String screenId;
     public NavigationParams navigationParams;
     public boolean disableOpenGesture;
+    public SideMenu.Side side;
 }

android/app/src/main/java/com/reactnativenavigation/params/parsers/ActivityParamsParser.java

 
 import com.reactnativenavigation.params.ActivityParams;
 import com.reactnativenavigation.params.AppStyle;
+import com.reactnativenavigation.params.SideMenuParams;
+import com.reactnativenavigation.views.SideMenu;
 
 public class ActivityParamsParser extends Parser {
     public static ActivityParams parse(Bundle params) {
         }
 
         if (hasKey(params, "sideMenu")) {
-            result.sideMenuParams = SideMenuParamsParser.parse(params.getBundle("sideMenu"));
+            SideMenuParams[] sideMenus = SideMenuParamsParser.parse(params.getBundle("sideMenu"));
+            result.leftSideMenuParams = sideMenus[SideMenu.Side.Left.ordinal()];
+            result.rightSideMenuParams = sideMenus[SideMenu.Side.Right.ordinal()];
         }
 
         result.animateShow = params.getBoolean("animateShow", true);

android/app/src/main/java/com/reactnativenavigation/params/parsers/SideMenuParamsParser.java

 package com.reactnativenavigation.params.parsers;
 
 import android.os.Bundle;
+import android.support.annotation.Nullable;
 
 import com.reactnativenavigation.params.NavigationParams;
 import com.reactnativenavigation.params.SideMenuParams;
+import com.reactnativenavigation.views.SideMenu.Side;
 
-public class SideMenuParamsParser extends Parser {
+class SideMenuParamsParser extends Parser {
+    public static SideMenuParams[] parse(Bundle sideMenues) {
+        SideMenuParams[] result = new SideMenuParams[2];
+        result[Side.Left.ordinal()] = parseSideMenu(sideMenues.getBundle("left"), Side.Left);
+        result[Side.Right.ordinal()] = parseSideMenu(sideMenues.getBundle("right"), Side.Right);
+        return result;
+    }
 
-    public static SideMenuParams parse(Bundle sideMenu) {
+    private static SideMenuParams parseSideMenu(@Nullable Bundle sideMenu, Side side) {
+        if (sideMenu == null || sideMenu.isEmpty()) {
+            return null;
+        }
         SideMenuParams result = new SideMenuParams();
         result.screenId = sideMenu.getString("screenId");
         result.navigationParams = new NavigationParams(sideMenu.getBundle("navigationParams"));
         result.disableOpenGesture = sideMenu.getBoolean("disableOpenGesture", false);
+        result.side = side;
         return result;
     }
 }

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

 package com.reactnativenavigation.views;
 
 import android.content.Context;
-import android.support.v4.view.GravityCompat;
+import android.support.annotation.Nullable;
 import android.support.v4.widget.DrawerLayout;
 import android.view.Gravity;
 import android.view.ViewGroup;
 import com.reactnativenavigation.utils.ViewUtils;
 
 public class SideMenu extends DrawerLayout {
+    public enum Side {
+        Left(Gravity.LEFT), Right(Gravity.RIGHT);
 
-    private ContentView sideMenuView;
+        int gravity;
+
+        Side(int gravity) {
+            this.gravity = gravity;
+        }
+
+        public static Side fromString(String side) {
+            return "left".equals(side.toLowerCase()) ? Left : Right;
+        }
+    }
+
+    private ContentView leftSideMenuView;
+    private ContentView rightSideMenuView;
     private RelativeLayout contentContainer;
 
     public RelativeLayout getContentContainer() {
     }
 
     public void destroy() {
+        destroySideMenu(leftSideMenuView);
+        destroySideMenu(rightSideMenuView);
+    }
+
+    private void destroySideMenu(ContentView sideMenuView) {
+        if (sideMenuView == null) {
+            return;
+        }
         sideMenuView.unmountReactView();
         removeView(sideMenuView);
     }
 
-    public void setVisible(boolean visible, boolean animated) {
+    public void setVisible(boolean visible, boolean animated, Side side) {
         if (!isShown() && visible) {
-            openDrawer(animated);
+            openDrawer(animated, side);
         }
 
         if (isShown() && !visible) {
-            closeDrawer(animated);
+            closeDrawer(animated, side);
         }
     }
 
-    public void openDrawer() {
-        openDrawer(Gravity.LEFT);
-    }
-
-    public void openDrawer(boolean animated) {
-        openDrawer(Gravity.LEFT, animated);
+    public void openDrawer(Side side) {
+        openDrawer(side.gravity);
     }
 
-    public void closeDrawer(boolean animated) {
-        closeDrawer(Gravity.LEFT, animated);
+    public void openDrawer(boolean animated, Side side) {
+        openDrawer(side.gravity, animated);
     }
 
-    public void toggleVisible(boolean animated) {
-        if (isDrawerOpen(GravityCompat.START)) {
-            closeDrawer(animated);
+    public void toggleVisible(boolean animated, Side side) {
+        if (isDrawerOpen(side.gravity)) {
+            closeDrawer(animated, side);
         } else {
-            openDrawer(animated);
+            openDrawer(animated, side);
         }
     }
 
-    public SideMenu(Context context, SideMenuParams sideMenuParams) {
+    public void closeDrawer(boolean animated, Side side) {
+        closeDrawer(side.gravity, animated);
+    }
+
+    public SideMenu(Context context, SideMenuParams leftMenuParams, SideMenuParams rightMenuParams) {
         super(context);
         createContentContainer();
-        createSideMenu(sideMenuParams);
-        setStyle(sideMenuParams);
+        leftSideMenuView = createSideMenu(leftMenuParams);
+        rightSideMenuView = createSideMenu(rightMenuParams);
+        setStyle(leftMenuParams);
     }
 
     private void createContentContainer() {
         addView(contentContainer, lp);
     }
 
-    private void createSideMenu(SideMenuParams sideMenuParams) {
-        sideMenuView = new ContentView(getContext(), sideMenuParams.screenId, sideMenuParams.navigationParams);
+    private ContentView createSideMenu(@Nullable SideMenuParams params) {
+        if (params == null) {
+            return null;
+        }
+        ContentView sideMenuView = new ContentView(getContext(), params.screenId, params.navigationParams);
         LayoutParams lp = new LayoutParams(LayoutParams.WRAP_CONTENT, LayoutParams.MATCH_PARENT);
-        lp.gravity = Gravity.START;
-        setSideMenuWidth();
+        lp.gravity = params.side.gravity;
+        setSideMenuWidth(sideMenuView);
         addView(sideMenuView, lp);
+        return sideMenuView;
     }
 
-    private void setSideMenuWidth() {
+    private void setSideMenuWidth(final ContentView sideMenuView) {
         sideMenuView.setOnDisplayListener(new Screen.OnDisplayListener() {
             @Override
             public void onDisplay() {

android/app/src/main/java/com/reactnativenavigation/views/utils/ViewMeasurer.java

 
 public class ViewMeasurer {
 
-    public int getMeasuredHeight(int heightMeasuerSpec) {
-        return MeasureSpec.getSize(heightMeasuerSpec);
+    public int getMeasuredHeight(int heightMeasureSpec) {
+        return MeasureSpec.getSize(heightMeasureSpec);
     }
 
     public int getMeasuredWidth(int widthMeasureSpec) {

src/deprecated/platformSpecificDeprecated.android.js

     return null;
   }
 
-  let result = {};
+  let result = {
+    left: {},
+    right: {}
+  };
   result.disableOpenGesture = drawer.disableOpenGesture !== undefined;
-  result.screenId = drawer.left.screen;
-  addNavigatorParams(result);
-  result = adaptNavigationParams(result);
-  result.passProps = drawer.passProps;
+  result.left.screenId = drawer.left.screen;
+  addNavigatorParams(result.left);
+  result.left = adaptNavigationParams(result.left);
+  result.left.passProps = drawer.left.passProps;
+
+  result.right.screenId = drawer.right.screen;
+  addNavigatorParams(result.right);
+  result.right = adaptNavigationParams(result.right);
+  result.right.passProps = drawer.right.passProps;
+
   return result;
 }
 
   const animated = !(params.animated === false);
   if (params.to) {
     const visible = params.to === 'open';
-    newPlatformSpecific.setSideMenuVisible(animated, visible);
+    newPlatformSpecific.setSideMenuVisible(animated, visible, params.side);
   } else {
-    newPlatformSpecific.toggleSideMenuVisible(animated);
+    newPlatformSpecific.toggleSideMenuVisible(animated, params.side);
   }
 }
 

src/platformSpecific.android.js

     });
   }
 
-  if (params.sideMenu) {
-    PropRegistry.save(params.sideMenu.navigationParams.screenInstanceID, params.sideMenu.passProps);
+  if (params.sideMenu && params.sideMenu.left) {
+    PropRegistry.save(params.sideMenu.left.navigationParams.screenInstanceID, params.sideMenu.left.passProps);
+  }
+  if (params.sideMenu && params.sideMenu.right) {
+    PropRegistry.save(params.sideMenu.right.navigationParams.screenInstanceID, params.sideMenu.right.passProps);
   }
 }
 
-function toggleSideMenuVisible(animated) {
-  NativeReactModule.toggleSideMenuVisible(animated);
+function toggleSideMenuVisible(animated, side) {
+  NativeReactModule.toggleSideMenuVisible(animated, side);
 }
 
-function setSideMenuVisible(animated, visible) {
-  NativeReactModule.setSideMenuVisible(animated, visible);
+function setSideMenuVisible(animated, visible, side) {
+  NativeReactModule.setSideMenuVisible(animated, visible, side);
 }
 
 function selectBottomTabByNavigatorId(navigatorId) {