merged from master

android/app/src/main/AndroidManifest.xml

@@ -6,6 +6,9 @@
         <activity
             android:name=".controllers.PortraitNavigationActivity"
             android:screenOrientation="portrait" />
+        <activity
+            android:name=".controllers.LandscapeNavigationActivity"
+            android:screenOrientation="landscape" />
         <activity
             android:name="com.facebook.react.devsupport.DevSettingsActivity"
             android:exported="false" />

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

@@ -15,6 +15,7 @@ import com.reactnativenavigation.params.parsers.ContextualMenuParamsParser;
 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;
 
@@ -45,10 +46,17 @@ public class NavigationReactModule extends ReactContextBaseJavaModule {
     @ReactMethod
     public void startApp(final ReadableMap params) {
         boolean portraitOnlyMode = false;
+        boolean landscapeOnlyMode = false;
+
         if (params.hasKey("portraitOnlyMode")) {
             portraitOnlyMode = params.getBoolean("portraitOnlyMode");
         }
-        NavigationCommandsHandler.startApp(BundleConverter.toBundle(params), portraitOnlyMode);
+
+        if (params.hasKey(("landscapeOnlyMode"))) {
+            landscapeOnlyMode = params.getBoolean("landscapeOnlyMode");
+        }
+
+        NavigationCommandsHandler.startApp(BundleConverter.toBundle(params), portraitOnlyMode, landscapeOnlyMode);
     }
 
     @ReactMethod
@@ -106,13 +114,13 @@ public class NavigationReactModule extends ReactContextBaseJavaModule {
     }
 
     @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/LandscapeNavigationActivity.java

@@ -0,0 +1,4 @@
+package com.reactnativenavigation.controllers;
+
+public class LandscapeNavigationActivity extends NavigationActivity {
+}

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

@@ -29,15 +29,15 @@ public class Modal extends Dialog implements DialogInterface.OnDismissListener,
         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);
     }
 
@@ -64,7 +64,7 @@ public class Modal extends Dialog implements DialogInterface.OnDismissListener,
     public void onSideMenuButtonClick() {
     }
 
-    public interface OnModalDismissedListener {
+    interface OnModalDismissedListener {
         void onModalDismissed(Modal modal);
     }
 
@@ -84,7 +84,7 @@ public class Modal extends Dialog implements DialogInterface.OnDismissListener,
         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());
     }
@@ -131,7 +131,7 @@ public class Modal extends Dialog implements DialogInterface.OnDismissListener,
         onModalDismissedListener.onModalDismissed(this);
     }
 
-    public void onModalDismissed() {
+    void onModalDismissed() {
         layout.onModalDismissed();
     }
 }

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

@@ -29,6 +29,7 @@ import com.reactnativenavigation.params.SnackbarParams;
 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;
 
@@ -253,12 +254,12 @@ public class NavigationActivity extends AppCompatActivity implements DefaultHard
         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

@@ -13,6 +13,7 @@ import com.reactnativenavigation.params.TitleBarButtonParams;
 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;
 
@@ -29,10 +30,13 @@ public class NavigationCommandsHandler {
      *
      * @param params ActivityParams as bundle
      */
-    public static void startApp(Bundle params, boolean portraitOnlyMode) {
+
+    public static void startApp(Bundle params, boolean portraitOnlyMode, boolean landscapeOnlyMode) {
         Intent intent;
         if (portraitOnlyMode) {
             intent = new Intent(NavigationApplication.instance, PortraitNavigationActivity.class);
+        } else if (landscapeOnlyMode) {
+            intent = new Intent(NavigationApplication.instance, LandscapeNavigationActivity.class);
         } else {
             intent = new Intent(NavigationApplication.instance, NavigationActivity.class);
         }
@@ -234,7 +238,7 @@ public class NavigationCommandsHandler {
         });
     }
 
-    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;
@@ -243,12 +247,12 @@ public class NavigationCommandsHandler {
         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;
@@ -257,7 +261,7 @@ public class NavigationCommandsHandler {
         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

@@ -21,6 +21,7 @@ import com.reactnativenavigation.params.TitleBarLeftButtonParams;
 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;
@@ -35,7 +36,8 @@ public class BottomTabsLayout extends RelativeLayout implements Layout, AHBottom
     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;
 
@@ -43,7 +45,8 @@ public class BottomTabsLayout extends RelativeLayout implements Layout, AHBottom
         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();
     }
@@ -58,10 +61,10 @@ public class BottomTabsLayout extends RelativeLayout implements Layout, AHBottom
     }
 
     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);
     }
@@ -176,16 +179,16 @@ public class BottomTabsLayout extends RelativeLayout implements Layout, AHBottom
     }
 
     @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);
         }
     }
 
@@ -363,7 +366,7 @@ public class BottomTabsLayout extends RelativeLayout implements Layout, AHBottom
     @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

@@ -7,6 +7,7 @@ import com.reactnativenavigation.params.ContextualMenuParams;
 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;
 
@@ -25,9 +26,9 @@ public interface Layout extends ScreenStackContainer {
 
     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

@@ -17,7 +17,7 @@ public class LayoutFactory {
     }
 
     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

@@ -1,17 +1,16 @@
 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

@@ -18,6 +18,7 @@ import com.reactnativenavigation.params.TitleBarLeftButtonParams;
 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;
@@ -28,22 +29,25 @@ public class SingleScreenLayout extends RelativeLayout implements Layout {
 
     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();
@@ -58,7 +62,7 @@ public class SingleScreenLayout extends RelativeLayout implements Layout {
     }
 
     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;
@@ -182,16 +186,16 @@ public class SingleScreenLayout extends RelativeLayout implements Layout {
     }
 
     @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);
         }
     }
 
@@ -233,7 +237,7 @@ public class SingleScreenLayout extends RelativeLayout implements Layout {
     @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

@@ -10,6 +10,7 @@ public class ActivityParams {
     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

@@ -3,9 +3,9 @@ package com.reactnativenavigation.params;
 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

@@ -1,7 +1,10 @@
 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

@@ -4,6 +4,8 @@ import android.os.Bundle;
 
 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) {
@@ -22,7 +24,9 @@ public class ActivityParamsParser extends Parser {
         }
 
         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

@@ -1,17 +1,29 @@
 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

@@ -1,7 +1,7 @@
 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;
@@ -12,8 +12,22 @@ import com.reactnativenavigation.screens.Screen;
 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() {
@@ -21,45 +35,54 @@ public class SideMenu extends DrawerLayout {
     }
 
     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() {
@@ -69,15 +92,19 @@ public class SideMenu extends DrawerLayout {
         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

@@ -4,8 +4,8 @@ import static android.view.View.MeasureSpec;
 
 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) {

example/e2e/init.js

@@ -0,0 +1,17 @@
+/*eslint-disable*/
+const detox = require('detox');
+const config = require('../package.json').detox;
+
+before(function(done) {
+  this.timeout(120000);
+  detox.config(config);
+  detox.start(done);
+});
+
+afterEach(function(done) {
+  detox.waitForTestResult(done);
+});
+
+after(function(done) {
+  detox.cleanup(done);
+});

example/e2e/mocha.opts

@@ -0,0 +1,2 @@
+--recursive
+--timeout 120000

example/e2e/sanity.test.js

@@ -0,0 +1,9 @@
+describe('sanity', function() {
+  beforeEach(function(done) {
+    global.simulator.reloadReactNativeApp(done);
+  });
+
+  it('should have screen one showing', function() {
+    expect(element(by.label('Screen One'))).toBeVisible();
+  });
+});

example/ios/example.xcodeproj/project.pbxproj

@@ -7,23 +7,23 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
-		00C302E51ABCBA2D00DB3ED1 /* libRCTActionSheet.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 00C302AC1ABCB8CE00DB3ED1 /* libRCTActionSheet.a */; };
-		00C302E71ABCBA2D00DB3ED1 /* libRCTGeolocation.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 00C302BA1ABCB90400DB3ED1 /* libRCTGeolocation.a */; };
-		00C302E81ABCBA2D00DB3ED1 /* libRCTImage.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 00C302C01ABCB91800DB3ED1 /* libRCTImage.a */; };
-		00C302E91ABCBA2D00DB3ED1 /* libRCTNetwork.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 00C302DC1ABCB9D200DB3ED1 /* libRCTNetwork.a */; };
-		00C302EA1ABCBA2D00DB3ED1 /* libRCTVibration.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 00C302E41ABCB9EE00DB3ED1 /* libRCTVibration.a */; };
+		00C302E51ABCBA2D00DB3ED1 /* ReferenceProxy in Frameworks */ = {isa = PBXBuildFile; fileRef = 00C302AC1ABCB8CE00DB3ED1 /* libRCTActionSheet.a */; };
+		00C302E71ABCBA2D00DB3ED1 /* ReferenceProxy in Frameworks */ = {isa = PBXBuildFile; fileRef = 00C302BA1ABCB90400DB3ED1 /* libRCTGeolocation.a */; };
+		00C302E81ABCBA2D00DB3ED1 /* ReferenceProxy in Frameworks */ = {isa = PBXBuildFile; fileRef = 00C302C01ABCB91800DB3ED1 /* libRCTImage.a */; };
+		00C302E91ABCBA2D00DB3ED1 /* ReferenceProxy in Frameworks */ = {isa = PBXBuildFile; fileRef = 00C302DC1ABCB9D200DB3ED1 /* libRCTNetwork.a */; };
+		00C302EA1ABCBA2D00DB3ED1 /* ReferenceProxy in Frameworks */ = {isa = PBXBuildFile; fileRef = 00C302E41ABCB9EE00DB3ED1 /* libRCTVibration.a */; };
 		00E356F31AD99517003FC87E /* exampleTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 00E356F21AD99517003FC87E /* exampleTests.m */; };
-		133E29F31AD74F7200F7D852 /* libRCTLinking.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 78C398B91ACF4ADC00677621 /* libRCTLinking.a */; };
-		139105C61AF99C1200B5F7CC /* libRCTSettings.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 139105C11AF99BAD00B5F7CC /* libRCTSettings.a */; };
-		139FDEF61B0652A700C62182 /* libRCTWebSocket.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 139FDEF41B06529B00C62182 /* libRCTWebSocket.a */; };
+		133E29F31AD74F7200F7D852 /* ReferenceProxy in Frameworks */ = {isa = PBXBuildFile; fileRef = 78C398B91ACF4ADC00677621 /* libRCTLinking.a */; };
+		139105C61AF99C1200B5F7CC /* ReferenceProxy in Frameworks */ = {isa = PBXBuildFile; fileRef = 139105C11AF99BAD00B5F7CC /* libRCTSettings.a */; };
+		139FDEF61B0652A700C62182 /* ReferenceProxy in Frameworks */ = {isa = PBXBuildFile; fileRef = 139FDEF41B06529B00C62182 /* libRCTWebSocket.a */; };
 		13B07FBC1A68108700A75B9A /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB01A68108700A75B9A /* AppDelegate.m */; };
 		13B07FBD1A68108700A75B9A /* LaunchScreen.xib in Resources */ = {isa = PBXBuildFile; fileRef = 13B07FB11A68108700A75B9A /* LaunchScreen.xib */; };
 		13B07FBF1A68108700A75B9A /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 13B07FB51A68108700A75B9A /* Images.xcassets */; };
 		13B07FC11A68108700A75B9A /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB71A68108700A75B9A /* main.m */; };
-		146834051AC3E58100842450 /* libReact.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 146834041AC3E56700842450 /* libReact.a */; };
-		2647D65F1DB175C200B23722 /* libReactNativeNavigation.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 2647D65E1DB175B300B23722 /* libReactNativeNavigation.a */; };
-		7B9B39861DEB4091004A6281 /* libRCTAnimation.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 7B9B39631DEB4076004A6281 /* libRCTAnimation.a */; };
-		832341BD1AAA6AB300B99B32 /* libRCTText.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 832341B51AAA6A8300B99B32 /* libRCTText.a */; };
+		146834051AC3E58100842450 /* ReferenceProxy in Frameworks */ = {isa = PBXBuildFile; fileRef = 146834041AC3E56700842450 /* libReact.a */; };
+		2647D65F1DB175C200B23722 /* ReferenceProxy in Frameworks */ = {isa = PBXBuildFile; fileRef = 2647D65E1DB175B300B23722 /* libReactNativeNavigation.a */; };
+		7B9B39861DEB4091004A6281 /* ReferenceProxy in Frameworks */ = {isa = PBXBuildFile; fileRef = 7B9B39631DEB4076004A6281 /* libRCTAnimation.a */; };
+		832341BD1AAA6AB300B99B32 /* ReferenceProxy in Frameworks */ = {isa = PBXBuildFile; fileRef = 832341B51AAA6A8300B99B32 /* libRCTText.a */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
@@ -214,18 +214,18 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				7B9B39861DEB4091004A6281 /* libRCTAnimation.a in Frameworks */,
-				2647D65F1DB175C200B23722 /* libReactNativeNavigation.a in Frameworks */,
-				146834051AC3E58100842450 /* libReact.a in Frameworks */,
-				00C302E51ABCBA2D00DB3ED1 /* libRCTActionSheet.a in Frameworks */,
-				00C302E71ABCBA2D00DB3ED1 /* libRCTGeolocation.a in Frameworks */,
-				00C302E81ABCBA2D00DB3ED1 /* libRCTImage.a in Frameworks */,
-				133E29F31AD74F7200F7D852 /* libRCTLinking.a in Frameworks */,
-				00C302E91ABCBA2D00DB3ED1 /* libRCTNetwork.a in Frameworks */,
-				139105C61AF99C1200B5F7CC /* libRCTSettings.a in Frameworks */,
-				832341BD1AAA6AB300B99B32 /* libRCTText.a in Frameworks */,
-				00C302EA1ABCBA2D00DB3ED1 /* libRCTVibration.a in Frameworks */,
-				139FDEF61B0652A700C62182 /* libRCTWebSocket.a in Frameworks */,
+				7B9B39861DEB4091004A6281 /* ReferenceProxy in Frameworks */,
+				2647D65F1DB175C200B23722 /* ReferenceProxy in Frameworks */,
+				146834051AC3E58100842450 /* ReferenceProxy in Frameworks */,
+				00C302E51ABCBA2D00DB3ED1 /* ReferenceProxy in Frameworks */,
+				00C302E71ABCBA2D00DB3ED1 /* ReferenceProxy in Frameworks */,
+				00C302E81ABCBA2D00DB3ED1 /* ReferenceProxy in Frameworks */,
+				133E29F31AD74F7200F7D852 /* ReferenceProxy in Frameworks */,
+				00C302E91ABCBA2D00DB3ED1 /* ReferenceProxy in Frameworks */,
+				139105C61AF99C1200B5F7CC /* ReferenceProxy in Frameworks */,
+				832341BD1AAA6AB300B99B32 /* ReferenceProxy in Frameworks */,
+				00C302EA1ABCBA2D00DB3ED1 /* ReferenceProxy in Frameworks */,
+				139FDEF61B0652A700C62182 /* ReferenceProxy in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -436,6 +436,7 @@
 				13B07F8C1A680F5B00A75B9A /* Frameworks */,
 				13B07F8E1A680F5B00A75B9A /* Resources */,
 				00DD1BFF1BD5951E006B06BC /* Bundle React Native code and images */,
+				6956ED03EAA1831C238A5BB4 /* Copy Detox Framework */,
 			);
 			buildRules = (
 			);
@@ -707,6 +708,21 @@
 			shellPath = /bin/sh;
 			shellScript = "export NODE_BINARY=node\n../node_modules/react-native/packager/react-native-xcode.sh";
 		};
+		6956ED03EAA1831C238A5BB4 /* Copy Detox Framework */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputPaths = (
+			);
+			name = "Copy Detox Framework";
+			outputPaths = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/bash;
+			shellScript = "if [ -n \"$DEPLOY_DETOX_FRAMEWORK\" ]; then\nmkdir -p \"${BUILT_PRODUCTS_DIR}\"/\"${FRAMEWORKS_FOLDER_PATH}\"\ncp -r \"${PROJECT_DIR}\"/../node_modules/detox/Detox.framework \"${BUILT_PRODUCTS_DIR}\"/\"${FRAMEWORKS_FOLDER_PATH}\"\nfi";
+			showEnvVarsInLog = 1;
+		};
 /* End PBXShellScriptBuildPhase section */
 
 /* Begin PBXSourcesBuildPhase section */
@@ -830,6 +846,73 @@
 			};
 			name = Release;
 		};
+		2C24A1398D388E120DDC2CA1 /* Debug_Detox */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
+				CLANG_CXX_LIBRARY = "libc++";
+				CLANG_ENABLE_MODULES = YES;
+				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
+				CLANG_WARN_EMPTY_BODY = YES;
+				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_UNREACHABLE_CODE = YES;
+				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
+				COPY_PHASE_STRIP = NO;
+				ENABLE_STRICT_OBJC_MSGSEND = YES;
+				GCC_C_LANGUAGE_STANDARD = gnu99;
+				GCC_DYNAMIC_NO_PIC = NO;
+				GCC_OPTIMIZATION_LEVEL = 0;
+				GCC_PREPROCESSOR_DEFINITIONS = (
+					"DEBUG=1",
+					"$(inherited)",
+				);
+				GCC_SYMBOLS_PRIVATE_EXTERN = NO;
+				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
+				GCC_WARN_UNDECLARED_SELECTOR = YES;
+				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
+				GCC_WARN_UNUSED_FUNCTION = YES;
+				GCC_WARN_UNUSED_VARIABLE = YES;
+				HEADER_SEARCH_PATHS = (
+					"$(inherited)",
+					/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include,
+					"$(SRCROOT)/../node_modules/react-native/React/**",
+				);
+				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
+				MTL_ENABLE_DEBUG_INFO = YES;
+				ONLY_ACTIVE_ARCH = YES;
+				OTHER_LDFLAGS = "";
+				SDKROOT = iphoneos;
+			};
+			name = Debug_Detox;
+		};
+		5627D4C51CEC610E1744267F /* Debug_Detox */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				BUNDLE_LOADER = "$(TEST_HOST)";
+				FRAMEWORK_SEARCH_PATHS = (
+					"$(SDKROOT)/Developer/Library/Frameworks",
+					"$(inherited)",
+				);
+				GCC_PREPROCESSOR_DEFINITIONS = (
+					"DEBUG=1",
+					"$(inherited)",
+				);
+				INFOPLIST_FILE = exampleTests/Info.plist;
+				IPHONEOS_DEPLOYMENT_TARGET = 8.2;
+				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
+				PRODUCT_NAME = "$(TARGET_NAME)";
+				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/example.app/example";
+			};
+			name = Debug_Detox;
+		};
 		83CBBA201A601CBA00E9B192 /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
@@ -918,6 +1001,121 @@
 			};
 			name = Release;
 		};
+		96FA810D67E56FD9D43906E6 /* Release_Detox */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+				DEPLOY_DETOX_FRAMEWORK = YES;
+				FRAMEWORK_SEARCH_PATHS = (
+					"$(inherited)",
+					"$(PROJECT_DIR)/../node_modules/detox",
+				);
+				HEADER_SEARCH_PATHS = (
+					"$(inherited)",
+					/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include,
+					"$(SRCROOT)/../node_modules/react-native/React/**",
+					"$(SRCROOT)/../node_modules/react-native-navigation/ios/**",
+				);
+				INFOPLIST_FILE = example/Info.plist;
+				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
+				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
+				OTHER_LDFLAGS = (
+					"-ObjC",
+					"-l\"c++\"",
+					"-framework",
+					Detox,
+				);
+				PRODUCT_NAME = example;
+			};
+			name = Release_Detox;
+		};
+		BEB8EFA9FD7A9DCE32773C1C /* Debug_Detox */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+				DEAD_CODE_STRIPPING = NO;
+				DEPLOY_DETOX_FRAMEWORK = YES;
+				FRAMEWORK_SEARCH_PATHS = (
+					"$(inherited)",
+					"$(PROJECT_DIR)/../node_modules/detox",
+				);
+				HEADER_SEARCH_PATHS = (
+					"$(inherited)",
+					/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include,
+					"$(SRCROOT)/../node_modules/react-native/React/**",
+					"$(SRCROOT)/../node_modules/react-native-navigation/ios/**",
+				);
+				INFOPLIST_FILE = example/Info.plist;
+				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
+				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
+				OTHER_LDFLAGS = (
+					"-ObjC",
+					"-l\"c++\"",
+					"-framework",
+					Detox,
+				);
+				PRODUCT_NAME = example;
+			};
+			name = Debug_Detox;
+		};
+		E53E50BD43A56CF67FAAD3A5 /* Release_Detox */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				BUNDLE_LOADER = "$(TEST_HOST)";
+				COPY_PHASE_STRIP = NO;
+				FRAMEWORK_SEARCH_PATHS = (
+					"$(SDKROOT)/Developer/Library/Frameworks",
+					"$(inherited)",
+				);
+				INFOPLIST_FILE = exampleTests/Info.plist;
+				IPHONEOS_DEPLOYMENT_TARGET = 8.2;
+				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
+				PRODUCT_NAME = "$(TARGET_NAME)";
+				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/example.app/example";
+			};
+			name = Release_Detox;
+		};
+		EAA4DC359BE7739594666868 /* Release_Detox */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
+				CLANG_CXX_LIBRARY = "libc++";
+				CLANG_ENABLE_MODULES = YES;
+				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
+				CLANG_WARN_EMPTY_BODY = YES;
+				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_UNREACHABLE_CODE = YES;
+				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
+				COPY_PHASE_STRIP = YES;
+				ENABLE_NS_ASSERTIONS = NO;
+				ENABLE_STRICT_OBJC_MSGSEND = YES;
+				GCC_C_LANGUAGE_STANDARD = gnu99;
+				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
+				GCC_WARN_UNDECLARED_SELECTOR = YES;
+				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
+				GCC_WARN_UNUSED_FUNCTION = YES;
+				GCC_WARN_UNUSED_VARIABLE = YES;
+				HEADER_SEARCH_PATHS = (
+					"$(inherited)",
+					/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include,
+					"$(SRCROOT)/../node_modules/react-native/React/**",
+				);
+				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
+				MTL_ENABLE_DEBUG_INFO = NO;
+				OTHER_LDFLAGS = "";
+				SDKROOT = iphoneos;
+				VALIDATE_PRODUCT = YES;
+			};
+			name = Release_Detox;
+		};
 /* End XCBuildConfiguration section */
 
 /* Begin XCConfigurationList section */
@@ -926,6 +1124,8 @@
 			buildConfigurations = (
 				00E356F61AD99517003FC87E /* Debug */,
 				00E356F71AD99517003FC87E /* Release */,
+				5627D4C51CEC610E1744267F /* Debug_Detox */,
+				E53E50BD43A56CF67FAAD3A5 /* Release_Detox */,
 			);
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Release;
@@ -935,6 +1135,8 @@
 			buildConfigurations = (
 				13B07F941A680F5B00A75B9A /* Debug */,
 				13B07F951A680F5B00A75B9A /* Release */,
+				BEB8EFA9FD7A9DCE32773C1C /* Debug_Detox */,
+				96FA810D67E56FD9D43906E6 /* Release_Detox */,
 			);
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Release;
@@ -944,6 +1146,8 @@
 			buildConfigurations = (
 				83CBBA201A601CBA00E9B192 /* Debug */,
 				83CBBA211A601CBA00E9B192 /* Release */,
+				2C24A1398D388E120DDC2CA1 /* Debug_Detox */,
+				EAA4DC359BE7739594666868 /* Release_Detox */,
 			);
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Release;

example/ios/example.xcodeproj/xcshareddata/xcschemes/example.xcscheme

@@ -37,10 +37,10 @@
       </BuildActionEntries>
    </BuildAction>
    <TestAction
+      buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      shouldUseLaunchSchemeArgsEnv = "YES"
-      buildConfiguration = "Debug">
+      shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
          <TestableReference
             skipped = "NO">
@@ -62,15 +62,18 @@
             ReferencedContainer = "container:example.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
+      <AdditionalOptions>
+      </AdditionalOptions>
    </TestAction>
    <LaunchAction
+      buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       launchStyle = "0"
       useCustomWorkingDirectory = "NO"
-      buildConfiguration = "Debug"
       ignoresPersistentStateOnLaunch = "NO"
       debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
       allowLocationSimulation = "YES">
       <BuildableProductRunnable
          runnableDebuggingMode = "0">
@@ -86,10 +89,10 @@
       </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
+      buildConfiguration = "Release"
       shouldUseLaunchSchemeArgsEnv = "YES"
       savedToolIdentifier = ""
       useCustomWorkingDirectory = "NO"
-      buildConfiguration = "Release"
       debugDocumentVersioning = "YES">
       <BuildableProductRunnable
          runnableDebuggingMode = "0">

example/ios/example.xcodeproj/xcshareddata/xcschemes/example_Detox.xcscheme

@@ -0,0 +1,115 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "0620"
+   version = "1.3">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "13B07F861A680F5B00A75B9A"
+               BuildableName = "example.app"
+               BlueprintName = "example"
+               ReferencedContainer = "container:example.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "NO"
+            buildForArchiving = "NO"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "00E356ED1AD99517003FC87E"
+               BuildableName = "exampleTests.xctest"
+               BlueprintName = "exampleTests"
+               ReferencedContainer = "container:example.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES">
+      <Testables>
+         <TestableReference
+            skipped = "NO">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "00E356ED1AD99517003FC87E"
+               BuildableName = "exampleTests.xctest"
+               BlueprintName = "exampleTests"
+               ReferencedContainer = "container:example.xcodeproj">
+            </BuildableReference>
+         </TestableReference>
+      </Testables>
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "13B07F861A680F5B00A75B9A"
+            BuildableName = "example.app"
+            BlueprintName = "example"
+            ReferencedContainer = "container:example.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
+      <AdditionalOptions>
+      </AdditionalOptions>
+   </TestAction>
+   <LaunchAction
+      buildConfiguration = "Debug_Detox"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
+      allowLocationSimulation = "YES">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "13B07F861A680F5B00A75B9A"
+            BuildableName = "example.app"
+            BlueprintName = "example"
+            ReferencedContainer = "container:example.xcodeproj">
+         </BuildableReference>
+      </BuildableProductRunnable>
+      <AdditionalOptions>
+      </AdditionalOptions>
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "13B07F861A680F5B00A75B9A"
+            BuildableName = "example.app"
+            BlueprintName = "example"
+            ReferencedContainer = "container:example.xcodeproj">
+         </BuildableReference>
+      </BuildableProductRunnable>
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>

example/ios/example.xcodeproj/xcshareddata/xcschemes/example_release.xcscheme

@@ -0,0 +1,105 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "0620"
+   version = "1.3">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "13B07F861A680F5B00A75B9A"
+               BuildableName = "example.app"
+               BlueprintName = "example"
+               ReferencedContainer = "container:example.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "NO"
+            buildForArchiving = "NO"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "00E356ED1AD99517003FC87E"
+               BuildableName = "exampleTests.xctest"
+               BlueprintName = "exampleTests"
+               ReferencedContainer = "container:example.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Release"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES">
+      <Testables>
+      </Testables>
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "13B07F861A680F5B00A75B9A"
+            BuildableName = "example.app"
+            BlueprintName = "example"
+            ReferencedContainer = "container:example.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
+      <AdditionalOptions>
+      </AdditionalOptions>
+   </TestAction>
+   <LaunchAction
+      buildConfiguration = "Release"
+      selectedDebuggerIdentifier = ""
+      selectedLauncherIdentifier = "Xcode.IDEFoundation.Launcher.PosixSpawn"
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
+      allowLocationSimulation = "YES">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "13B07F861A680F5B00A75B9A"
+            BuildableName = "example.app"
+            BlueprintName = "example"
+            ReferencedContainer = "container:example.xcodeproj">
+         </BuildableReference>
+      </BuildableProductRunnable>
+      <AdditionalOptions>
+      </AdditionalOptions>
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "13B07F861A680F5B00A75B9A"
+            BuildableName = "example.app"
+            BlueprintName = "example"
+            ReferencedContainer = "container:example.xcodeproj">
+         </BuildableReference>
+      </BuildableProductRunnable>
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Release">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>

example/ios/example/AppDelegate.m

@@ -15,8 +15,11 @@
 - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions
 {
   NSURL *jsCodeLocation;
+#ifdef DEBUG
   jsCodeLocation = [NSURL URLWithString:@"http://localhost:8081/index.ios.bundle?platform=ios&dev=true"];
-  // jsCodeLocation = [[NSBundle mainBundle] URLForResource:@"main" withExtension:@"jsbundle"];
+#else
+   jsCodeLocation = [[NSBundle mainBundle] URLForResource:@"main" withExtension:@"jsbundle"];
+#endif
 
 
   // **********************************************

example/package.json

@@ -3,14 +3,29 @@
   "version": "0.0.1",
   "private": true,
   "scripts": {
-    "postinstall": "rm -rf node_modules/react-native-navigation/node_modules && rm -rf node_modules/react-native-navigation/example && rm -rf yarn.lock",
-    "start": "watchman watch-del-all && (adb reverse tcp:8081 tcp:8081 || true) && node node_modules/react-native/local-cli/cli.js start",
+    "postinstall": "node ./scripts/postinstall.js",
+    "start": "watchman watch-del-all && (adb reverse tcp:8081 tcp:8081 || true) && node node_modules/react-native/local-cli/cli.js start --reset-cache",
     "xcode": "open ios/example.xcodeproj",
-    "android": "cd android && ./gradlew installDebug"
+    "android": "cd android && ./gradlew installDebug",
+    "e2e": "node ./scripts/e2e.ios.js"
   },
   "dependencies": {
     "react-native": "0.38.0",
     "react": "15.4.1",
     "react-native-navigation": "file:../"
+  },
+  "devDependencies": {
+    "detox": "4.x.x",
+    "detox-server": "1.x.x"
+  },
+  "detox": {
+    "session": {
+      "server": "ws://localhost:8099",
+      "sessionId": "example"
+    },
+    "ios-simulator": {
+      "app": "ios/DerivedData/example/Build/Products/Debug_Detox-iphonesimulator/example.app",
+      "device": "iPhone 7, iOS 10.1"
+    }
   }
 }

example/scripts/e2e.ios.js

@@ -0,0 +1,44 @@
+const cp = require('child_process');
+
+function exec(cmd) {
+  cp.execSync(cmd, {stdio: ['inherit', 'inherit', 'inherit']});
+}
+
+function execSilent(cmd) {
+  cp.execSync(cmd, {stdio: ['inherit', 'ignore', 'inherit']});
+}
+
+function kill(process) {
+  execSilent(`pkill -f "${process}" || true`);
+}
+
+function buildXcodeReleaseProj() {
+//exec(`RCT_NO_LAUNCH_PACKAGER=true cd ios && xcodebuild \
+//-scheme example_Detox clean build \
+//-project example.xcodeproj \
+//-destination "platform=iOS Simulator,name=iPhone 7,OS=10.1" \
+//-derivedDataPath ./DerivedData/example`);
+}
+
+function e2e() {
+  kill(`detox-server`);
+
+  try {
+    cp.exec(`./node_modules/.bin/detox-server > ./detox-server.log 2>&1`);
+    exec(`BABEL_ENV=test ./node_modules/mocha/bin/mocha e2e --opts ./e2e/mocha.opts`);
+  } finally {
+    kill(`detox-server`);
+    kill(`Simulator`);
+    kill(`CoreSimulator`);
+    exec(`cat ./detox-server.log`);
+    exec(`sleep 5`);
+  }
+}
+
+function run() {
+  buildXcodeReleaseProj();
+  e2e();
+}
+
+run();
+

example/scripts/postinstall.js

@@ -0,0 +1,4 @@
+const cp = require('child_process');
+cp.execSync(`rm -rf node_modules/react-native-navigation/node_modules`);
+cp.execSync(`rm -rf node_modules/react-native-navigation/example `);
+cp.execSync(`rm -rf yarn.lock`);

package.json

@@ -55,6 +55,9 @@
   },
   "jest": {
     "preset": "react-native",
+    "testPathDirs": [
+      "src"
+    ],
     "resetMocks": true,
     "resetModules": true
   }

src/deprecated/platformSpecificDeprecated.android.js

@@ -176,12 +176,21 @@ function convertDrawerParamsToSideMenuParams(drawerParams) {
     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;
 }
 
@@ -301,9 +310,9 @@ function navigatorToggleDrawer(navigator, params) {
   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

@@ -87,17 +87,20 @@ function savePassProps(params) {
     });
   }
 
-  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) {