navigationOptions

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

@@ -3,8 +3,8 @@ package com.reactnativenavigation.layout;
 import android.app.Activity;
 
 import com.facebook.react.ReactInstanceManager;
-import com.reactnativenavigation.viewcontrollers.SideMenuController;
 import com.reactnativenavigation.viewcontrollers.BottomTabsController;
+import com.reactnativenavigation.viewcontrollers.SideMenuController;
 import com.reactnativenavigation.viewcontrollers.StackController;
 import com.reactnativenavigation.viewcontrollers.ViewController;
 
@@ -76,7 +76,7 @@ public class LayoutFactory {
 	}
 
 	private ViewController createContainer(LayoutNode node) {
-		return new ReactRootViewController(activity, node.id, node.data.optString("name"), reactInstanceManager);
+		return new ReactRootViewController(activity, node.id, node.data.optString("name"), node.data.optJSONObject("navigationOptions").optString("title"), reactInstanceManager);
 	}
 
 	private ViewController createContainerStack(LayoutNode node) {

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

@@ -13,13 +13,15 @@ import com.reactnativenavigation.viewcontrollers.ViewController;
 public class ReactRootViewController extends ViewController {
 
 	private final String name;
+	private final String title;
 	private final ReactInstanceManager reactInstanceManager;
 	private boolean attachedToReactInstance = false;
 	private ReactRootView reactRootView;
 
-	public ReactRootViewController(final Activity activity, final String id, final String name, final ReactInstanceManager reactInstanceManager) {
+	public ReactRootViewController(final Activity activity, final String id, final String name, String title, final ReactInstanceManager reactInstanceManager) {
 		super(activity, id);
 		this.name = name;
+		this.title = title;
 		this.reactInstanceManager = reactInstanceManager;
 	}
 
@@ -33,6 +35,7 @@ public class ReactRootViewController extends ViewController {
 	@Override
 	public void onViewAppeared() {
 		super.onViewAppeared();
+		if (getParentStackController() != null) getParentStackController().setTitle(title);
 		new NavigationEvent(reactInstanceManager.getCurrentReactContext()).containerStart(getId());
 	}
 

lib/android/app/src/main/java/com/reactnativenavigation/viewcontrollers/StackController.java

@@ -2,16 +2,20 @@ package com.reactnativenavigation.viewcontrollers;
 
 import android.app.Activity;
 import android.support.annotation.NonNull;
+import android.view.View;
 import android.view.ViewGroup;
-import android.widget.FrameLayout;
+import android.widget.LinearLayout;
 
 import com.reactnativenavigation.anim.StackAnimator;
+import com.reactnativenavigation.utils.CompatUtils;
+import com.reactnativenavigation.views.TopBar;
 
 import java.util.Collection;
 
 public class StackController extends ParentController {
 	private final IdStack<ViewController> stack = new IdStack<>();
-	private StackAnimator animator;
+	private final StackAnimator animator;
+	private TopBar topBar;
 
 	public StackController(final Activity activity, String id) {
 		this(activity, id, new StackAnimator(activity));
@@ -29,7 +33,7 @@ public class StackController extends ParentController {
 		stack.push(child.getId(), child);
 
 		getView().addView(child.getView());
-
+//TODO animate only when needed
 		if (previousTop != null) {
 			animator.animatePush(child.getView(), previousTop.getView(), new Runnable() {
 				@Override
@@ -50,15 +54,19 @@ public class StackController extends ParentController {
 		final ViewController poppedTop = stack.pop();
 		ViewController newTop = peek();
 
-		getView().addView(newTop.getView());
+		final View enteringView = newTop.getView();
+		final View exitingView = poppedTop.getView();
+
+		getView().addView(enteringView);
 
-		animator.animatePop(newTop.getView(), poppedTop.getView(), new Runnable() {
-			@Override
-			public void run() {
-				getView().removeView(poppedTop.getView());
-				poppedTop.destroy();
-			}
-		});
+		//TODO animate only when needed
+//		animator.animatePop(enteringView, exitingView, new Runnable() {
+//			@Override
+//			public void run() {
+		getView().removeView(exitingView);
+		poppedTop.destroy();
+//			}
+//		});
 	}
 
 	public void popSpecific(final ViewController childController) {
@@ -110,7 +118,12 @@ public class StackController extends ParentController {
 	@NonNull
 	@Override
 	protected ViewGroup createView() {
-		return new FrameLayout(getActivity());
+		LinearLayout root = new LinearLayout(getActivity());
+		root.setOrientation(LinearLayout.VERTICAL);
+		topBar = new TopBar(getActivity());
+		topBar.setId(CompatUtils.generateViewId());
+		root.addView(topBar);
+		return root;
 	}
 
 	@NonNull
@@ -118,4 +131,8 @@ public class StackController extends ParentController {
 	public Collection<ViewController> getChildControllers() {
 		return stack.values();
 	}
+
+	public void setTitle(final String title) {
+		topBar.setTitle(title);
+	}
 }

lib/android/app/src/main/java/com/reactnativenavigation/viewcontrollers/ViewController.java

@@ -7,6 +7,7 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.view.ViewTreeObserver;
 
+import com.reactnativenavigation.utils.CompatUtils;
 import com.reactnativenavigation.utils.StringUtils;
 
 public abstract class ViewController implements ViewTreeObserver.OnGlobalLayoutListener {
@@ -46,6 +47,7 @@ public abstract class ViewController implements ViewTreeObserver.OnGlobalLayoutL
 	public View getView() {
 		if (view == null) {
 			view = createView();
+			view.setId(CompatUtils.generateViewId());
 			view.getViewTreeObserver().addOnGlobalLayoutListener(this);
 		}
 		return view;

lib/android/app/src/main/java/com/reactnativenavigation/views/TopBar.java

@@ -0,0 +1,18 @@
+package com.reactnativenavigation.views;
+
+import android.app.Activity;
+import android.support.design.widget.AppBarLayout;
+import android.support.v7.widget.Toolbar;
+
+public class TopBar extends AppBarLayout {
+	private final Toolbar titleBar;
+
+	public TopBar(final Activity context) {
+		super(context);
+		titleBar = new Toolbar(context);
+	}
+
+	public void setTitle(String title) {
+		titleBar.setTitle(title);
+	}
+}

lib/android/app/src/test/java/com/reactnativenavigation/BaseTest.java

@@ -1,6 +1,8 @@
 package com.reactnativenavigation;
 
 import android.app.Activity;
+import android.view.View;
+import android.view.ViewGroup;
 
 import org.junit.After;
 import org.junit.Before;
@@ -9,6 +11,8 @@ import org.robolectric.Robolectric;
 import org.robolectric.RobolectricTestRunner;
 import org.robolectric.annotation.Config;
 
+import static org.assertj.core.api.Java6Assertions.assertThat;
+
 @RunWith(RobolectricTestRunner.class)
 @Config(sdk = 25, constants = BuildConfig.class, manifest = "/../../../../../src/test/AndroidManifest.xml")
 public abstract class BaseTest {
@@ -25,4 +29,18 @@ public abstract class BaseTest {
 	public Activity newActivity() {
 		return Robolectric.setupActivity(Activity.class);
 	}
+
+	public void assertIsChildById(ViewGroup parent, View child) {
+		assertThat(parent).isNotNull();
+		assertThat(child).isNotNull();
+		assertThat(child.getId()).isNotZero().isPositive();
+		assertThat(parent.findViewById(child.getId())).isNotNull().isEqualTo(child);
+	}
+
+	public void assertNotChildOf(ViewGroup parent, View child) {
+		assertThat(parent).isNotNull();
+		assertThat(child).isNotNull();
+		assertThat(child.getId()).isNotZero().isPositive();
+		assertThat(parent.findViewById(child.getId())).isNull();
+	}
 }

lib/android/app/src/test/java/com/reactnativenavigation/viewcontrollers/NavigatorTest.java

@@ -2,7 +2,6 @@ package com.reactnativenavigation.viewcontrollers;
 
 import android.app.Activity;
 import android.support.annotation.NonNull;
-import android.view.ViewGroup;
 
 import com.reactnativenavigation.BaseTest;
 import com.reactnativenavigation.mocks.SimpleViewController;
@@ -44,14 +43,14 @@ public class NavigatorTest extends BaseTest {
 	public void setRoot_AddsChildControllerView() throws Exception {
 		assertThat(uut.getView().getChildCount()).isZero();
 		uut.setRoot(child1);
-		assertHasSingleChildViewOf(uut, child1);
+		assertIsChildById(uut.getView(), child1.getView());
 	}
 
 	@Test
 	public void setRoot_ReplacesExistingChildControllerViews() throws Exception {
 		uut.setRoot(child1);
 		uut.setRoot(child2);
-		assertHasSingleChildViewOf(uut, child2);
+		assertIsChildById(uut.getView(), child2.getView());
 	}
 
 	@Test
@@ -66,20 +65,20 @@ public class NavigatorTest extends BaseTest {
 		stackController.push(child1);
 		uut.setRoot(stackController);
 
-		assertHasSingleChildViewOf(uut, stackController);
-		assertHasSingleChildViewOf(stackController, child1);
+		assertIsChildById(uut.getView(), stackController.getView());
+		assertIsChildById(stackController.getView(), child1.getView());
 
 		uut.push(child1.getId(), child2);
 
-		assertHasSingleChildViewOf(uut, stackController);
-		assertHasSingleChildViewOf(stackController, child2);
+		assertIsChildById(uut.getView(), stackController.getView());
+		assertIsChildById(stackController.getView(), child2.getView());
 	}
 
 	@Test
 	public void push_InvalidPushWithoutAStack_DoesNothing() throws Exception {
 		uut.setRoot(child1);
 		uut.push(child1.getId(), child2);
-		assertHasSingleChildViewOf(uut, child1);
+		assertIsChildById(uut.getView(), child1.getView());
 	}
 
 	@Test
@@ -193,11 +192,6 @@ public class NavigatorTest extends BaseTest {
 		return new BottomTabsController(activity, "tabsController");
 	}
 
-	private void assertHasSingleChildViewOf(ViewController parent, ViewController child) {
-		assertThat(((ViewGroup) parent.getView()).getChildCount()).isEqualTo(1);
-		assertThat(((ViewGroup) parent.getView()).getChildAt(0)).isEqualTo(child.getView()).isNotNull();
-	}
-
 	@NonNull
 	private StackController newStack() {
 		return new StackController(activity, "stack" + CompatUtils.generateViewId(), new TestStackAnimator());

lib/android/app/src/test/java/com/reactnativenavigation/viewcontrollers/StackControllerTest.java

@@ -1,8 +1,6 @@
 package com.reactnativenavigation.viewcontrollers;
 
 import android.app.Activity;
-import android.view.ViewGroup;
-import android.widget.FrameLayout;
 
 import com.reactnativenavigation.BaseTest;
 import com.reactnativenavigation.mocks.SimpleViewController;
@@ -126,37 +124,32 @@ public class StackControllerTest extends BaseTest {
 		assertThat(uut.canPop()).isTrue();
 	}
 
-	@Test
-	public void constructsSelfWithFrameLayout() throws Exception {
-		assertThat(uut.getView())
-				.isNotNull()
-				.isInstanceOf(ViewGroup.class)
-				.isInstanceOf(FrameLayout.class);
-	}
-
 	@Test
 	public void pushAddsToViewTree() throws Exception {
-		assertThat(uut.getView().getChildCount()).isZero();
+		assertThat(uut.getView().findViewById(child1.getView().getId())).isNull();
 		uut.push(child1);
-		assertHasSingleChildViewOfController(child1);
+		assertThat(uut.getView().findViewById(child1.getView().getId())).isNotNull();
 	}
 
 	@Test
 	public void pushRemovesPreviousFromTree() throws Exception {
-		assertThat(uut.getView().getChildCount()).isZero();
+		assertThat(uut.getView().findViewById(child1.getView().getId())).isNull();
 		uut.push(child1);
-		assertHasSingleChildViewOfController(child1);
+		assertThat(uut.getView().findViewById(child1.getView().getId())).isNotNull();
 		uut.push(child2);
-		assertHasSingleChildViewOfController(child2);
+		assertThat(uut.getView().findViewById(child1.getView().getId())).isNull();
+		assertThat(uut.getView().findViewById(child2.getView().getId())).isNotNull();
 	}
 
 	@Test
 	public void popReplacesViewWithPrevious() throws Exception {
 		uut.push(child1);
 		uut.push(child2);
-		assertHasSingleChildViewOfController(child2);
+		assertIsChildById(uut.getView(), child2.getView());
+		assertNotChildOf(uut.getView(), child1.getView());
 		uut.pop();
-		assertHasSingleChildViewOfController(child1);
+		assertNotChildOf(uut.getView(), child2.getView());
+		assertIsChildById(uut.getView(), child1.getView());
 	}
 
 	@Test
@@ -165,18 +158,17 @@ public class StackControllerTest extends BaseTest {
 		uut.push(child2);
 		uut.popSpecific(child2);
 		assertContainsOnlyId(child1.getId());
-		assertHasSingleChildViewOfController(child1);
+		assertIsChildById(uut.getView(), child1.getView());
 	}
 
 	@Test
 	public void popSpecificDeepInStack() throws Exception {
 		uut.push(child1);
 		uut.push(child2);
-		assertHasSingleChildViewOfController(child2);
-
+		assertIsChildById(uut.getView(), child2.getView());
 		uut.popSpecific(child1);
 		assertContainsOnlyId(child2.getId());
-		assertHasSingleChildViewOfController(child2);
+		assertIsChildById(uut.getView(), child2.getView());
 	}
 
 	@Test
@@ -285,11 +277,6 @@ public class StackControllerTest extends BaseTest {
 		verify(child3, times(1)).destroy();
 	}
 
-	private void assertHasSingleChildViewOfController(ViewController childController) {
-		assertThat(uut.getView().getChildCount()).isEqualTo(1);
-		assertThat(uut.getView().getChildAt(0)).isEqualTo(childController.getView());
-	}
-
 	private void assertContainsOnlyId(String... ids) {
 		assertThat(uut.size()).isEqualTo(ids.length);
 		assertThat(uut.getChildControllers()).extracting(new Extractor<ViewController, String>() {

lib/android/app/src/test/java/com/reactnativenavigation/viewcontrollers/ViewControllerTest.java

@@ -172,6 +172,11 @@ public class ViewControllerTest extends BaseTest {
 		verify(spy, times(1)).onViewDisappear();
 	}
 
+	@Test
+	public void assignsIdToCreatedView() throws Exception {
+		assertThat(uut.getView().getId()).isPositive();
+	}
+
 	@Test
 	public void onDestroy_RemovesSelfFromParentIfExists() throws Exception {
 		LinearLayout parent = new LinearLayout(activity);

playground/src/containers/OptionsScreen.js

@@ -22,7 +22,7 @@ class OptionsScreen extends Component {
   render() {
     return (
       <View style={styles.root}>
-        <Text style={styles.h1}>{`Style Screen`}</Text>
+        <Text style={styles.h1}>{`Options Screen`}</Text>
         <Button title="Dynamic Options" onPress={this.onClickDynamicOptions} />
         <Text style={styles.footer}>{`this.props.id = ${this.props.id}`}</Text>
       </View>