Implement SideMenu in SingleScreenLayout

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

@@ -16,7 +16,7 @@ public class LayoutFactory {
     }
 
     private static Layout createSingleScreenLayout(AppCompatActivity activity, ActivityParams params) {
-        return new SingleScreenLayout(activity, params.screenParams);
+        return new SingleScreenLayout(activity, params.sideMenuParams, params.screenParams);
     }
 
     private static Layout createBottomTabsScreenLayout(AppCompatActivity activity, ActivityParams params) {

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

@@ -1,44 +1,66 @@
 package com.reactnativenavigation.layouts;
 
+import android.support.annotation.Nullable;
 import android.support.v7.app.AppCompatActivity;
 import android.view.View;
 import android.widget.RelativeLayout;
 
 import com.reactnativenavigation.params.ScreenParams;
+import com.reactnativenavigation.params.SideMenuParams;
 import com.reactnativenavigation.params.TitleBarButtonParams;
 import com.reactnativenavigation.params.TitleBarLeftButtonParams;
-import com.reactnativenavigation.screens.ScreenAnimator;
 import com.reactnativenavigation.screens.ScreenStack;
+import com.reactnativenavigation.views.SideMenu;
 import com.reactnativenavigation.views.TitleBarBackButtonListener;
 
 import java.util.List;
 
+import static android.view.ViewGroup.LayoutParams.MATCH_PARENT;
+
 public class SingleScreenLayout extends RelativeLayout implements Layout {
 
     private final AppCompatActivity activity;
     private final ScreenParams screenParams;
+    private final SideMenuParams sideMenuParams;
     private ScreenStack stack;
-    private ScreenAnimator screenAnimator;
     private TitleBarBackButtonListener titleBarBackButtonListener;
+    private SideMenu sideMenu;
 
-    public SingleScreenLayout(AppCompatActivity activity, ScreenParams screenParams, TitleBarBackButtonListener titleBarBackButtonListener) {
-        this(activity, screenParams);
+    public SingleScreenLayout(AppCompatActivity activity, ScreenParams screenParams,
+                              TitleBarBackButtonListener titleBarBackButtonListener) {
+        this(activity, null, screenParams);
         this.titleBarBackButtonListener = titleBarBackButtonListener;
     }
 
-    public SingleScreenLayout(AppCompatActivity activity, ScreenParams screenParams) {
+    public SingleScreenLayout(AppCompatActivity activity, @Nullable SideMenuParams sideMenuParams, ScreenParams screenParams) {
         super(activity);
         this.activity = activity;
         this.screenParams = screenParams;
-        createStack();
+        this.sideMenuParams = sideMenuParams;
+        createLayout();
+    }
+
+    private void createLayout() {
+        if (sideMenuParams == null) {
+            createStack(this);
+        } else {
+            createSideMenu();
+            createStack(sideMenu.getContentContainer());
+        }
+    }
+
+    private void createSideMenu() {
+        sideMenu = new SideMenu(getContext(), sideMenuParams);
+        RelativeLayout.LayoutParams lp = new LayoutParams(MATCH_PARENT, MATCH_PARENT);
+        addView(sideMenu, lp);
     }
 
-    private void createStack() {
+    private void createStack(RelativeLayout parent) {
         if (stack != null) {
             stack.destroy();
         }
-        stack = new ScreenStack(activity, this, this);
-        LayoutParams lp = new LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.MATCH_PARENT);
+        stack = new ScreenStack(activity, parent, this);
+        LayoutParams lp = new LayoutParams(MATCH_PARENT, MATCH_PARENT);
         stack.pushInitialScreen(screenParams, lp);
         stack.showFirstScreen();
     }
@@ -60,7 +82,7 @@ public class SingleScreenLayout extends RelativeLayout implements Layout {
 
     @Override
     public void push(ScreenParams params) {
-        LayoutParams lp = new LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.MATCH_PARENT);
+        LayoutParams lp = new LayoutParams(MATCH_PARENT, MATCH_PARENT);
         stack.push(params, lp);
     }
 
@@ -76,7 +98,8 @@ public class SingleScreenLayout extends RelativeLayout implements Layout {
 
     @Override
     public void newStack(ScreenParams params) {
-        createStack();
+        RelativeLayout parent = sideMenuParams == null ? this : sideMenu.getContentContainer();
+        createStack(parent);
     }
 
     @Override

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

@@ -10,4 +10,5 @@ public class ActivityParams {
     public Type type;
     public ScreenParams screenParams;
     public List<ScreenParams> tabParams;
+    public SideMenuParams sideMenuParams;
 }

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

@@ -0,0 +1,9 @@
+package com.reactnativenavigation.params;
+
+import android.os.Bundle;
+
+public class SideMenuParams {
+    public String screenId;
+    public Bundle navigationParams;
+    public boolean disableOpenGesture;
+}

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

@@ -21,6 +21,10 @@ public class ActivityParamsParser extends Parser {
             result.tabParams = ScreenParamsParser.parseTabs(params.getBundle("tabs"));
         }
 
+        if (hasKey(params, "sideMenu")) {
+            result.sideMenuParams = SideMenuParamsParser.parse(params.getBundle("sideMenu"));
+        }
+
         return result;
     }
 }

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

@@ -0,0 +1,15 @@
+package com.reactnativenavigation.params.parsers;
+
+import android.os.Bundle;
+
+import com.reactnativenavigation.params.SideMenuParams;
+
+public class SideMenuParamsParser extends Parser {
+
+    public static SideMenuParams parse(Bundle sideMenu) {
+        SideMenuParams result = new SideMenuParams();
+        result.screenId = sideMenu.getString("screenId");
+        result.disableOpenGesture = sideMenu.getBoolean("disableOpenGesture", false);
+        return result;
+    }
+}

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

@@ -40,7 +40,6 @@ public class FragmentScreen extends Screen {
     private void addContent() {
         ContentView contentView = new ContentView(getContext(),
                 screenParams.screenId,
-                screenParams.navigatorEventId,
                 screenParams.navigationParams);
         addView(contentView, 0, 0);
         LayoutParams params = new LayoutParams(MATCH_PARENT, MATCH_PARENT);

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

@@ -19,7 +19,7 @@ public class SingleScreen extends Screen {
 
     @Override
     protected void createContent() {
-        contentView = new ContentView(getContext(), screenParams.screenId, screenParams.navigatorEventId, screenParams.navigationParams);
+        contentView = new ContentView(getContext(), screenParams.screenId, screenParams.navigationParams);
         LayoutParams params = new LayoutParams(MATCH_PARENT, MATCH_PARENT);
         if (screenParams.styleParams.drawScreenBelowTopBar) {
             params.addRule(BELOW, topBar.getId());

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

@@ -45,7 +45,7 @@ public class ViewPagerScreen extends Screen {
     private void addPages() {
         contentViews = new ArrayList<>();
         for (TopTabParams tab : screenParams.topTabParams) {
-            ContentView contentView = new ContentView(getContext(), tab.screenId, screenParams.navigatorEventId, tab.navigationParams);
+            ContentView contentView = new ContentView(getContext(), tab.screenId, tab.navigationParams, screenParams.navigatorEventId);
             addContent(contentView);
             contentViews.add(contentView);
         }

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

@@ -10,10 +10,14 @@ import com.reactnativenavigation.react.ReactViewHacks;
 public class ContentView extends ReactRootView {
 
     private final String screenId;
-    private final String navigatorEventId;
+    private String navigatorEventId;
     private final Bundle navigationParams;
 
-    public ContentView(Context context, String screenId, String navigatorEventId, Bundle navigationParams) {
+    public ContentView(Context context, String screenId, Bundle navigationParams) {
+        this(context, screenId, navigationParams, null);
+    }
+
+    public ContentView(Context context, String screenId, Bundle navigationParams, String navigatorEventId) {
         super(context);
         this.screenId = screenId;
         this.navigatorEventId = navigatorEventId;

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

@@ -0,0 +1,44 @@
+package com.reactnativenavigation.views;
+
+import android.content.Context;
+import android.support.v4.widget.DrawerLayout;
+import android.view.Gravity;
+import android.view.ViewGroup;
+import android.widget.RelativeLayout;
+
+import com.reactnativenavigation.params.SideMenuParams;
+import com.reactnativenavigation.utils.ViewUtils;
+
+public class SideMenu extends DrawerLayout {
+
+    private ContentView sideMenuView;
+    private RelativeLayout contentContainer;
+
+    public RelativeLayout getContentContainer() {
+        return contentContainer;
+    }
+
+    public SideMenu(Context context, SideMenuParams sideMenuParams) {
+        super(context);
+        createContentContainer();
+        createSideMenu(sideMenuParams);
+    }
+
+    private void createContentContainer() {
+        LayoutParams lp = new LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.MATCH_PARENT);
+        contentContainer = new RelativeLayout(getContext());
+        contentContainer.setId(ViewUtils.generateViewId());
+        addView(contentContainer, lp);
+    }
+
+    private void createSideMenu(SideMenuParams sideMenuParams) {
+        sideMenuView = new ContentView(getContext(),
+                sideMenuParams.screenId,
+                sideMenuParams.navigationParams);
+
+        DrawerLayout.LayoutParams lp =
+                new LayoutParams((int) ViewUtils.convertDpToPixel(240), ViewGroup.LayoutParams.MATCH_PARENT);
+        lp.gravity = Gravity.START;
+        addView(sideMenuView, lp);
+    }
+}

src/deprecated/platformSpecificDeprecated.android.js

@@ -19,8 +19,6 @@ function startSingleScreenApp(params) {
   addNavigationStyleParams(screen);
   screen.passProps = params.passProps;
 
-  //const drawer = setupDrawer(params.drawer);
-
   /*
    * adapt to new API
    */
@@ -29,6 +27,7 @@ function startSingleScreenApp(params) {
   params.screen = adaptNavigationStyleToScreenStyle(screen);
   params.screen = adaptNavigationParams(screen);
   params.appStyle = convertStyleParams(params.appStyle);
+  params.sideMenu = convertDrawerParamsToSideMenuParams(params.drawer);
 
   newPlatformSpecific.startApp(params);
 }
@@ -134,6 +133,20 @@ function convertStyleParams(originalStyleObject) {
   }
 }
 
+function convertDrawerParamsToSideMenuParams(drawerParams) {
+  const drawer = Object.assign({}, drawerParams);
+  if (!drawer.left || !drawer.left.screen) {
+    return null;
+  }
+
+  let result = {};
+  result.disableOpenGesture = drawer.disableOpenGesture !== undefined;
+  result.screenId = drawer.left.screen;
+  addNavigatorParams(result);
+
+  return result;
+}
+
 function adaptNavigationParams(screen) {
   screen.navigationParams = {
     screenInstanceID: screen.screenInstanceID,
@@ -350,24 +363,6 @@ function addNavigationStyleParams(screen) {
   screen.navigatorStyle = Object.assign({}, screen.navigatorStyle, Screen.navigatorStyle);
 }
 
-function setupDrawer(drawerParams) {
-  const drawer = Object.assign({}, drawerParams);
-  [drawer.left, drawer.right].forEach(side => {
-    if (!side) {
-      return;
-    }
-    const icon = resolveAssetSource(side.icon);
-    if (icon) {
-      side.icon = icon.uri;
-    }
-  });
-  if (drawer.disableOpenGesture === undefined) {
-    drawer.disableOpenGesture = false;
-  }
-
-  return drawer;
-}
-
 export default {
   startTabBasedApp,
   startSingleScreenApp,