buttons

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

@@ -35,9 +35,13 @@ public class ScreenLayout extends LinearLayout implements ScrollDirectionListene
 
     private void createViews() {
         addTopBar();
+        addTitleBar();
+        addContentView();
+    }
+
+    private void addTitleBar() {
         topBar.addTitleBarAndSetButtons(screenParams.buttons);
         topBar.setTitle(screenParams.title);
-        addContentView();
     }
 
     private void addTopBar() {

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

@@ -0,0 +1,11 @@
+package com.reactnativenavigation.params.parsers;
+
+import android.os.Bundle;
+
+public class Parser {
+
+    protected static boolean hasKey(Bundle bundle, String key) {
+        return bundle.keySet().contains(key);
+    }
+
+}

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

@@ -8,7 +8,7 @@ import com.reactnativenavigation.react.ImageLoader;
 import java.util.ArrayList;
 import java.util.List;
 
-public class TitleBarButtonParamsParser {
+public class TitleBarButtonParamsParser extends Parser {
     public static List<TitleBarButtonParams> parse(Bundle params) {
         List<TitleBarButtonParams> result = new ArrayList<>();
         if (params == null) {
@@ -23,15 +23,21 @@ public class TitleBarButtonParamsParser {
 
     private static TitleBarButtonParams parseItem(Bundle bundle) {
         TitleBarButtonParams result = new TitleBarButtonParams();
-        result.label = bundle.getString("label");
-        result.icon = ImageLoader.loadImage(bundle.getString("icon"));
+        result.label = bundle.getString("title");
+        if (hasKey(bundle,"icon")) {
+            result.icon = ImageLoader.loadImage(bundle.getString("icon"));
+        }
         result.color = ColorParser.parse(bundle.getString("color"));
         result.showAsAction = parseShowAsAction(bundle.getString("showAsAction"));
-        result.enabled = bundle.getBoolean("enabled");
+        result.enabled = bundle.getBoolean("enabled", true);
         return result;
     }
 
     private static TitleBarButtonParams.ShowAsAction parseShowAsAction(String showAsAction) {
+        if (showAsAction == null) {
+            return TitleBarButtonParams.ShowAsAction.IfRoom;
+        }
+
         switch (showAsAction) {
             case "always":
                 return TitleBarButtonParams.ShowAsAction.Always;

src/Screen.js

@@ -6,6 +6,7 @@ import {
 } from 'react-native';
 import platformSpecific from './deprecated/platformSpecificDeprecated';
 import Navigation from './Navigation';
+import _ from 'lodash';
 
 const _allNavigatorEventHandlers = {};
 
@@ -137,9 +138,11 @@ export default class Screen extends Component {
 
   constructor(props) {
     super(props);
-    if (props.navigatorID) {
-      this.navigator = new Navigator(props.navigatorID, props.navigatorEventID);
+    // TODO: remove this shit
+    if (!props.navigatorID) {
+      props.navigatorID = _.uniqueId('navigatorId');
     }
+    this.navigator = new Navigator(props.navigatorID, props.navigatorEventID);
   }
 
   componentWillUnmount() {