LayoutFactory

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

@@ -10,7 +10,7 @@ import android.view.View;
 import com.facebook.react.modules.core.DefaultHardwareBackBtnHandler;
 import com.reactnativenavigation.NavigationApplication;
 import com.reactnativenavigation.layouts.Layout;
-import com.reactnativenavigation.layouts.SingleScreenLayout;
+import com.reactnativenavigation.layouts.LayoutFactory;
 import com.reactnativenavigation.params.ActivityParams;
 import com.reactnativenavigation.params.parsers.ActivityParamsParser;
 import com.reactnativenavigation.react.JsDevReloadHandler;
@@ -45,8 +45,7 @@ public class NavigationActivity extends AppCompatActivity implements DefaultHard
     }
 
     private void createLayout() {
-        //TODO layout factory (tabsLayout etc)
-        layout = new SingleScreenLayout(this, activityParams.screenParams);
+        layout = LayoutFactory.create(this, activityParams);
         setContentView((View) layout);
     }
 

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

@@ -1,76 +1,61 @@
 package com.reactnativenavigation.layouts;
 
 import android.app.Activity;
-import android.support.v4.widget.DrawerLayout;
-import android.view.Gravity;
-import android.widget.FrameLayout;
-import android.widget.LinearLayout;
 
-import com.aurelhubert.ahbottomnavigation.AHBottomNavigation;
-
-import static android.view.ViewGroup.LayoutParams.MATCH_PARENT;
-import static android.view.ViewGroup.LayoutParams.WRAP_CONTENT;
+import com.reactnativenavigation.params.ActivityParams;
 
 public class LayoutFactory {
-    public static class SideMenuParams {
-        private boolean enabled = false;
-    }
-
-    public static class BottomTabsParams {
-        private boolean enabled = false;
-    }
-
-    public static class Params {
-        private SideMenuParams sideMenu = new SideMenuParams();
-        private BottomTabsParams bottomTabs = new BottomTabsParams();
-    }
-
-    public static Layout create(Activity activity, Params params) {
-        LinearLayout root = createRoot(activity);
-        FrameLayout content = createContent(activity);
-        addContentWithMenuIfNeeded(activity, params, root, content);
-        addBottomTabsIfNeeded(activity, params, root);
-
-        return null;
-    }
-
-    private static void addBottomTabsIfNeeded(Activity activity, Params params, LinearLayout root) {
-        if (params.bottomTabs.enabled) {
-            AHBottomNavigation bottomTabs = createBottomTabs(activity);
-            root.addView(bottomTabs, new LinearLayout.LayoutParams(MATCH_PARENT, WRAP_CONTENT));
+    public static Layout create(Activity activity, ActivityParams params) {
+        switch (params.type) {
+            case TabBased:
+                throw new UnsupportedOperationException("WHAT!? u crazy...");
+            case SingleScreen:
+            default:
+                return createSingleScreenLayout(activity, params);
         }
     }
 
-    private static void addContentWithMenuIfNeeded(Activity activity, Params params, LinearLayout root, FrameLayout content) {
-        if (params.sideMenu.enabled) {
-            DrawerLayout sideMenu = createSideMenu(activity, content);
-            root.addView(sideMenu, new LinearLayout.LayoutParams(MATCH_PARENT, 0, 1));
-        } else {
-            root.addView(content, new LinearLayout.LayoutParams(MATCH_PARENT, 0, 1));
-        }
-    }
-
-    private static AHBottomNavigation createBottomTabs(Activity activity) {
-        return new AHBottomNavigation(activity);
-    }
-
-    private static LinearLayout createRoot(Activity activity) {
-        LinearLayout root = new LinearLayout(activity);
-        root.setOrientation(LinearLayout.VERTICAL);
-        return root;
-    }
-
-    private static DrawerLayout createSideMenu(Activity activity, FrameLayout content) {
-        DrawerLayout drawerLayout = new DrawerLayout(activity);
-        FrameLayout drawerContent = new FrameLayout(activity);
-        drawerLayout.addView(content, new DrawerLayout.LayoutParams(MATCH_PARENT, 0, 1));
-        DrawerLayout.LayoutParams drawerContentParams = new DrawerLayout.LayoutParams(WRAP_CONTENT, MATCH_PARENT);
-        drawerContentParams.gravity = Gravity.START;
-        drawerLayout.addView(drawerContent, drawerContentParams);
-        return drawerLayout;
-    }
-
-    private static FrameLayout createContent(Activity activity) {
-        return new FrameLayout(activity);
-    }
+    private static Layout createSingleScreenLayout(Activity activity, ActivityParams params) {
+        return new SingleScreenLayout(activity, params.screenParams);
+    }
+
+//    private static void addBottomTabsIfNeeded(Activity activity, Params params, LinearLayout root) {
+//        if (params.bottomTabs.enabled) {
+//            AHBottomNavigation bottomTabs = createBottomTabs(activity);
+//            root.addView(bottomTabs, new LinearLayout.LayoutParams(MATCH_PARENT, WRAP_CONTENT));
+//        }
+//    }
+//
+//    private static void addContentWithMenuIfNeeded(Activity activity, Params params, LinearLayout root, FrameLayout content) {
+//        if (params.sideMenu.enabled) {
+//            DrawerLayout sideMenu = createSideMenu(activity, content);
+//            root.addView(sideMenu, new LinearLayout.LayoutParams(MATCH_PARENT, 0, 1));
+//        } else {
+//            root.addView(content, new LinearLayout.LayoutParams(MATCH_PARENT, 0, 1));
+//        }
+//    }
+//
+//    private static AHBottomNavigation createBottomTabs(Activity activity) {
+//        return new AHBottomNavigation(activity);
+//    }
+//
+//    private static LinearLayout createRoot(Activity activity) {
+//        LinearLayout root = new LinearLayout(activity);
+//        root.setOrientation(LinearLayout.VERTICAL);
+//        return root;
+//    }
+//
+//    private static DrawerLayout createSideMenu(Activity activity, FrameLayout content) {
+//        DrawerLayout drawerLayout = new DrawerLayout(activity);
+//        FrameLayout drawerContent = new FrameLayout(activity);
+//        drawerLayout.addView(content, new DrawerLayout.LayoutParams(MATCH_PARENT, 0, 1));
+//        DrawerLayout.LayoutParams drawerContentParams = new DrawerLayout.LayoutParams(WRAP_CONTENT, MATCH_PARENT);
+//        drawerContentParams.gravity = Gravity.START;
+//        drawerLayout.addView(drawerContent, drawerContentParams);
+//        return drawerLayout;
+//    }
+//
+//    private static FrameLayout createContent(Activity activity) {
+//        return new FrameLayout(activity);
+//    }
 }

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

@@ -1,5 +1,10 @@
 package com.reactnativenavigation.params;
 
 public class ActivityParams {
+    public enum Type {
+        SingleScreen, TabBased
+    }
+
+    public Type type;
     public ScreenParams screenParams;
 }

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

@@ -7,6 +7,7 @@ import com.reactnativenavigation.params.ActivityParams;
 public class ActivityParamsParser {
     public static ActivityParams parse(Bundle params) {
         ActivityParams result = new ActivityParams();
+        result.type = ActivityParams.Type.SingleScreen; //TODO tabs
         result.screenParams = ScreenParamsParser.parse(params.getBundle("screen"));
         return result;
     }