extract

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

@@ -13,33 +13,41 @@ import static android.view.ViewGroup.LayoutParams.WRAP_CONTENT;
 
 public class LayoutFactory {
     public static class SideMenuParams {
-        private boolean enabled;
+        private boolean enabled = false;
     }
 
     public static class BottomTabsParams {
-        private boolean enabled;
+        private boolean enabled = false;
     }
 
     public static class Params {
-        private SideMenuParams sideMenu;
-        private BottomTabsParams bottomTabs;
+        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));
+        }
+    }
+
+    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));
         }
-        if (params.bottomTabs.enabled) {
-            AHBottomNavigation bottomTabs = createBottomTabs(activity);
-            root.addView(bottomTabs, new LinearLayout.LayoutParams(MATCH_PARENT, WRAP_CONTENT));
-        }
-
-        return null;
     }
 
     private static AHBottomNavigation createBottomTabs(Activity activity) {