inlined bottom tabs

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

@@ -7,7 +7,7 @@ import android.view.View;
 
 import com.facebook.react.modules.core.DefaultHardwareBackBtnHandler;
 import com.reactnativenavigation.layout.Layout;
-import com.reactnativenavigation.layout.containers.LayoutStack;
+import com.reactnativenavigation.layout.containers.StackLayout;
 
 public class NavigationActivity extends AppCompatActivity implements DefaultHardwareBackBtnHandler {
 	private View contentView;
@@ -63,7 +63,7 @@ public class NavigationActivity extends AppCompatActivity implements DefaultHard
 
 	@Override
 	public void onBackPressed() {
-		if (layout instanceof LayoutStack && ((LayoutStack) layout).onBackPressed()) {
+		if (layout instanceof StackLayout && ((StackLayout) layout).onBackPressed()) {
 			// do nothing, layout pops
 		} else {
 			super.onBackPressed();

lib/android/app/src/main/java/com/reactnativenavigation/NavigationApplication.java

@@ -4,6 +4,7 @@ import android.app.Application;
 
 import com.facebook.react.ReactApplication;
 import com.facebook.react.ReactNativeHost;
+import com.reactnativenavigation.controllers.ActivityLifecycleDelegate;
 import com.reactnativenavigation.react.NavigationReactNativeHost;
 
 public abstract class NavigationApplication extends Application implements ReactApplication {

lib/android/app/src/main/java/com/reactnativenavigation/ActivityLifecycleDelegate.java → lib/android/app/src/main/java/com/reactnativenavigation/controllers/ActivityLifecycleDelegate.java

@@ -1,7 +1,8 @@
-package com.reactnativenavigation;
+package com.reactnativenavigation.controllers;
 
 import com.facebook.react.ReactInstanceManager;
 import com.facebook.react.bridge.ReactContext;
+import com.reactnativenavigation.NavigationActivity;
 import com.reactnativenavigation.react.DevPermissionRequest;
 import com.reactnativenavigation.react.NavigationEventEmitter;
 

lib/android/app/src/main/java/com/reactnativenavigation/layout/LayoutFactory.java

@@ -4,9 +4,9 @@ import android.app.Activity;
 
 import com.facebook.react.ReactInstanceManager;
 import com.reactnativenavigation.layout.containers.BottomTabsLayout;
-import com.reactnativenavigation.layout.containers.LayoutStack;
 import com.reactnativenavigation.layout.containers.RootLayout;
 import com.reactnativenavigation.layout.containers.SideMenuLayout;
+import com.reactnativenavigation.layout.containers.StackLayout;
 
 public class LayoutFactory {
 
@@ -77,7 +77,7 @@ public class LayoutFactory {
 	}
 
 	private Layout createContainerStack(LayoutNode node) {
-		final LayoutStack layoutStack = new LayoutStack(activity);
+		final StackLayout layoutStack = new StackLayout(activity);
 		for (LayoutNode child : node.children) {
 			layoutStack.push(create(child));
 		}
@@ -87,8 +87,8 @@ public class LayoutFactory {
 	private Layout createBottomTabs(LayoutNode node) {
 		final BottomTabsLayout tabsContainer = new BottomTabsLayout(activity);
 		for (int i = 0; i < node.children.size(); i++) {
-			final Layout tabContent = create(node.children.get(i));
-			tabsContainer.addTabContent("#" + i, tabContent);
+			final Layout tabLayout = create(node.children.get(i));
+			tabsContainer.addTab("#" + i, tabLayout);
 		}
 		return tabsContainer;
 	}

lib/android/app/src/main/java/com/reactnativenavigation/layout/containers/BottomTabs.java

@@ -1,65 +0,0 @@
-package com.reactnativenavigation.layout.containers;
-
-import android.graphics.Color;
-import android.support.annotation.NonNull;
-import android.support.design.widget.BottomNavigationView;
-import android.view.Menu;
-import android.view.MenuItem;
-import android.widget.RelativeLayout;
-import android.widget.RelativeLayout.LayoutParams;
-
-import com.reactnativenavigation.utils.CompatUtils;
-
-import static android.widget.RelativeLayout.ALIGN_PARENT_BOTTOM;
-
-public class BottomTabs implements BottomNavigationView.OnNavigationItemSelectedListener {
-
-	interface BottomTabsSelectionListener {
-		void onTabSelected(int index);
-	}
-
-	private BottomNavigationView bottomNavigationView;
-	private BottomTabsSelectionListener listener;
-
-	public void attach(RelativeLayout parentLayout) {
-		createBottomNavigation(parentLayout);
-		addBottomNavigationToParent(parentLayout);
-	}
-
-	public void setSelectionListener(BottomTabsSelectionListener listener) {
-		this.listener = listener;
-	}
-
-	public void add(String label) {
-		int tabId = size();
-		bottomNavigationView.getMenu().add(0, tabId, Menu.NONE, label);
-	}
-
-	public int size() {
-		return bottomNavigationView.getMenu().size();
-	}
-
-	int getViewId() {
-		return bottomNavigationView.getId();
-	}
-
-	@Override
-	public boolean onNavigationItemSelected(@NonNull MenuItem item) {
-		listener.onTabSelected(item.getItemId());
-		return true;
-	}
-
-	private void createBottomNavigation(RelativeLayout parentLayout) {
-		bottomNavigationView = new BottomNavigationView(parentLayout.getContext());
-		bottomNavigationView.setId(CompatUtils.generateViewId());
-		bottomNavigationView.setBackgroundColor(Color.DKGRAY);
-		bottomNavigationView.setOnNavigationItemSelectedListener(this);
-	}
-
-	private void addBottomNavigationToParent(RelativeLayout parentLayout) {
-		LayoutParams lp = new LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.WRAP_CONTENT);
-		lp.addRule(ALIGN_PARENT_BOTTOM);
-		bottomNavigationView.setLayoutParams(lp);
-		parentLayout.addView(bottomNavigationView, lp);
-	}
-}

lib/android/app/src/main/java/com/reactnativenavigation/layout/containers/BottomTabsLayout.java

@@ -1,8 +1,14 @@
 package com.reactnativenavigation.layout.containers;
 
 import android.app.Activity;
+import android.graphics.Color;
+import android.support.annotation.NonNull;
+import android.support.design.widget.BottomNavigationView;
+import android.view.Menu;
+import android.view.MenuItem;
 import android.view.View;
 import android.widget.RelativeLayout;
+import android.widget.RelativeLayout.LayoutParams;
 
 import com.reactnativenavigation.layout.Layout;
 import com.reactnativenavigation.utils.CompatUtils;
@@ -10,26 +16,34 @@ import com.reactnativenavigation.utils.CompatUtils;
 import java.util.ArrayList;
 import java.util.List;
 
+import static android.view.ViewGroup.LayoutParams.MATCH_PARENT;
+import static android.view.ViewGroup.LayoutParams.WRAP_CONTENT;
 import static android.widget.RelativeLayout.ABOVE;
+import static android.widget.RelativeLayout.ALIGN_PARENT_BOTTOM;
 
-public class BottomTabsLayout implements Layout, BottomTabs.BottomTabsSelectionListener {
+public class BottomTabsLayout implements Layout, BottomNavigationView.OnNavigationItemSelectedListener {
 
 	public static class TooManyTabs extends RuntimeException {
+		//
 	}
 
 	private final RelativeLayout view;
-	private final BottomTabs bottomTabs;
-	private final List<View> tabContentViews = new ArrayList<>();
+	private final BottomNavigationView bottomNavigationView;
+	private final List<Layout> tabs = new ArrayList<>();
 	private int currentTab;
 
 	public BottomTabsLayout(Activity activity) {
 		view = new RelativeLayout(activity);
 		view.setId(CompatUtils.generateViewId());
 
-		//TODO inline everything. unneeded complexity
-		bottomTabs = new BottomTabs();
-		bottomTabs.attach(view);
-		bottomTabs.setSelectionListener(this);
+		bottomNavigationView = new BottomNavigationView(view.getContext());
+		bottomNavigationView.setId(CompatUtils.generateViewId());
+		bottomNavigationView.setBackgroundColor(Color.DKGRAY);
+		bottomNavigationView.setOnNavigationItemSelectedListener(this);
+		LayoutParams lp = new LayoutParams(MATCH_PARENT, WRAP_CONTENT);
+		lp.addRule(ALIGN_PARENT_BOTTOM);
+		bottomNavigationView.setLayoutParams(lp);
+		view.addView(bottomNavigationView, lp);
 	}
 
 	@Override
@@ -42,38 +56,35 @@ public class BottomTabsLayout implements Layout, BottomTabs.BottomTabsSelectionL
 		//
 	}
 
-
-	public void addTabContent(String label, Layout tabContent) {
-		if (tabContentViews.size() >= 5) {
-			throw new TooManyTabs();
-		}
-		bottomTabs.add(label);
-		attachTabContent(tabContent.getView());
-		tabContentViews.add(tabContent.getView());
-
-		if (tabContentViews.size() > 1) {
-			tabContent.getView().setVisibility(View.GONE);
-		}
-	}
-
 	@Override
-	public void onTabSelected(int index) {
+	public boolean onNavigationItemSelected(@NonNull final MenuItem item) {
 		hideTab(currentTab);
-		currentTab = index;
+		currentTab = item.getItemId();
 		showTab(currentTab);
+		return true;
 	}
 
-	private void attachTabContent(View tabContent) {
-		RelativeLayout.LayoutParams tabParams = new RelativeLayout.LayoutParams(RelativeLayout.LayoutParams.MATCH_PARENT, RelativeLayout.LayoutParams.MATCH_PARENT);
-		tabParams.addRule(ABOVE, bottomTabs.getViewId());
-		view.addView(tabContent, tabParams);
+	public void addTab(String label, Layout tabLayout) {
+		if (tabs.size() >= 5) {
+			throw new TooManyTabs();
+		}
+		int tabId = bottomNavigationView.getMenu().size();
+		bottomNavigationView.getMenu().add(0, tabId, Menu.NONE, label);
+		LayoutParams tabParams = new LayoutParams(MATCH_PARENT, MATCH_PARENT);
+		tabParams.addRule(ABOVE, bottomNavigationView.getId());
+		view.addView(tabLayout.getView(), tabParams);
+		tabs.add(tabLayout);
+
+		if (tabs.size() > 1) {
+			tabLayout.getView().setVisibility(View.GONE);
+		}
 	}
 
 	private void showTab(int tabId) {
-		tabContentViews.get(tabId).setVisibility(View.VISIBLE);
+		tabs.get(tabId).getView().setVisibility(View.VISIBLE);
 	}
 
 	private void hideTab(int tabId) {
-		tabContentViews.get(tabId).setVisibility(View.GONE);
+		tabs.get(tabId).getView().setVisibility(View.GONE);
 	}
 }

lib/android/app/src/main/java/com/reactnativenavigation/layout/containers/LayoutStack.java → lib/android/app/src/main/java/com/reactnativenavigation/layout/containers/StackLayout.java

@@ -9,12 +9,12 @@ import com.reactnativenavigation.utils.CompatUtils;
 
 import java.util.Stack;
 
-public class LayoutStack implements Layout {
+public class StackLayout implements Layout {
 
 	private final Stack<Layout> stack = new Stack<>();
 	private final FrameLayout view;
 
-	public LayoutStack(Context context) {
+	public StackLayout(Context context) {
 		view = new FrameLayout(context);
 		view.setId(CompatUtils.generateViewId());
 	}

lib/android/app/src/main/java/com/reactnativenavigation/react/NavigationModule.java

@@ -9,7 +9,7 @@ import com.reactnativenavigation.NavigationActivity;
 import com.reactnativenavigation.layout.Layout;
 import com.reactnativenavigation.layout.LayoutFactory;
 import com.reactnativenavigation.layout.LayoutNode;
-import com.reactnativenavigation.layout.containers.LayoutStack;
+import com.reactnativenavigation.layout.containers.StackLayout;
 import com.reactnativenavigation.parse.JSONParser;
 import com.reactnativenavigation.parse.LayoutNodeParser;
 import com.reactnativenavigation.utils.UiThread;
@@ -50,7 +50,7 @@ public class NavigationModule extends ReactContextBaseJavaModule {
 				final LayoutNode layoutTree = LayoutNodeParser.parse(JSONParser.parse(rawLayoutTree));
 				LayoutFactory factory = new LayoutFactory(activity(), reactInstanceManager);
 				final Layout rootView = factory.create(layoutTree);
-				((LayoutStack) activity().getLayout()).push(rootView);
+				((StackLayout) activity().getLayout()).push(rootView);
 			}
 		});
 	}
@@ -60,7 +60,7 @@ public class NavigationModule extends ReactContextBaseJavaModule {
 		handle(new Runnable() {
 			@Override
 			public void run() {
-				((LayoutStack) activity().getLayout()).pop();
+				((StackLayout) activity().getLayout()).pop();
 			}
 		});
 	}