Introduce Bool instead of BooleanOptions

* Fix Options.copy
* Screens are now by default drawBehind: false

lib/android/app/src/main/java/com/reactnativenavigation/parse/BottomTabsOptions.java

@@ -1,7 +1,8 @@
 package com.reactnativenavigation.parse;
 
-
-import com.reactnativenavigation.parse.Options.BooleanOptions;
+import com.reactnativenavigation.parse.params.Bool;
+import com.reactnativenavigation.parse.params.NullBool;
+import com.reactnativenavigation.parse.parsers.BoolParser;
 
 import org.json.JSONObject;
 
@@ -15,17 +16,17 @@ public class BottomTabsOptions implements DEFAULT_VALUES {
         options.selectedColor = ColorParser.parse(json, "selectedTabColor");
         options.currentTabId = TextParser.parse(json, "currentTabId");
 		options.currentTabIndex = json.optInt("currentTabIndex", NO_INT_VALUE);
-		options.visible = BooleanOptions.parse(json.optString("visible"));
-		options.animateHide = BooleanOptions.parse(json.optString("animateHide"));
+		options.visible = BoolParser.parse(json,"visible");
+		options.animateHide = BoolParser.parse(json,"animateHide");
         options.testId = TextParser.parse(json, "testID");
 
 		return options;
 	}
 
     public Color color = new NullColor();
-    public Color selectedColor = new NullColor();
-	BooleanOptions visible = BooleanOptions.False;
-	BooleanOptions animateHide = BooleanOptions.False;
+    private Color selectedColor = new NullColor();
+	Bool visible = new NullBool();
+	Bool animateHide = new NullBool();
 	public int currentTabIndex = NO_INT_VALUE;
 	public Text currentTabId = new NullText();
     public Text testId = new NullText();
@@ -37,10 +38,10 @@ public class BottomTabsOptions implements DEFAULT_VALUES {
 		if (NO_INT_VALUE != other.currentTabIndex) {
             currentTabIndex = other.currentTabIndex;
 		}
-		if (other.visible != BooleanOptions.NoValue) {
+		if (other.visible.hasValue()) {
 			visible = other.visible;
 		}
-		if (other.animateHide != BooleanOptions.NoValue) {
+		if (other.animateHide.hasValue()) {
 			animateHide = other.animateHide;
 		}
         if (other.color.hasValue()) {
@@ -58,10 +59,10 @@ public class BottomTabsOptions implements DEFAULT_VALUES {
         if (NO_INT_VALUE == currentTabIndex) {
             currentTabIndex = defaultOptions.currentTabIndex;
         }
-        if (visible == BooleanOptions.NoValue) {
+        if (!visible.hasValue()) {
             visible = defaultOptions.visible;
         }
-        if (animateHide == BooleanOptions.NoValue) {
+        if (!animateHide.hasValue()) {
             animateHide = defaultOptions.animateHide;
         }
         if (!color.hasValue()) {

lib/android/app/src/main/java/com/reactnativenavigation/parse/Button.java

@@ -3,6 +3,9 @@ package com.reactnativenavigation.parse;
 import android.support.annotation.ColorInt;
 import android.view.MenuItem;
 
+import com.reactnativenavigation.parse.params.Bool;
+import com.reactnativenavigation.parse.parsers.BoolParser;
+
 import org.json.JSONArray;
 import org.json.JSONObject;
 
@@ -13,12 +16,12 @@ import static com.reactnativenavigation.parse.Options.NO_INT_VALUE;
 public class Button {
 	public String id;
 	public Text title;
-	public Options.BooleanOptions disabled;
-	public Options.BooleanOptions disableIconTint;
+	public Bool disabled;
+	public Bool disableIconTint;
 	public int showAsAction;
 	@ColorInt public int buttonColor;
 	public int buttonFontSize;
-	public Text buttonFontWeight;
+	private Text buttonFontWeight;
 	public Text icon = new NullText();
 	public Text testId;
 
@@ -26,8 +29,8 @@ public class Button {
 		Button button = new Button();
 		button.id = json.optString("id");
 		button.title = TextParser.parse(json, "title");
-		button.disabled = Options.BooleanOptions.parse(json.optString("disabled", ""));
-		button.disableIconTint = Options.BooleanOptions.parse(json.optString("disableIconTint", ""));
+		button.disabled = BoolParser.parse(json,"disabled");
+		button.disableIconTint = BoolParser.parse(json,"disableIconTint");
 		button.showAsAction = parseShowAsAction(json);
 		button.buttonColor = json.optInt("buttonColor", NO_INT_VALUE);
 		button.buttonFontSize = json.optInt("buttonFontSize", NO_INT_VALUE);

lib/android/app/src/main/java/com/reactnativenavigation/parse/Options.java

@@ -2,7 +2,6 @@ package com.reactnativenavigation.parse;
 
 import android.support.annotation.CheckResult;
 import android.support.annotation.NonNull;
-import android.text.TextUtils;
 
 import com.reactnativenavigation.utils.TypefaceLoader;
 
@@ -10,19 +9,6 @@ import org.json.JSONObject;
 
 public class Options implements DEFAULT_VALUES {
 
-    public enum BooleanOptions {
-		True,
-		False,
-		NoValue;
-
-		static BooleanOptions parse(String value) {
-			if (!TextUtils.isEmpty(value)) {
-				return Boolean.valueOf(value) ? True : False;
-			}
-			return NoValue;
-		}
-	}
-
     @NonNull
     public static Options parse(TypefaceLoader typefaceManager, JSONObject json) {
         return parse(typefaceManager, json, new Options());
@@ -56,12 +42,18 @@ public class Options implements DEFAULT_VALUES {
 
     @CheckResult
     public Options copy() {
-        return new Options().mergeWith(this);
+        Options result = new Options();
+        result.topBarOptions.mergeWith(topBarOptions);
+        result.topTabsOptions.mergeWith(topTabsOptions);
+        result.topTabOptions.mergeWith(topTabOptions);
+        result.bottomTabOptions.mergeWith(bottomTabOptions);
+        result.bottomTabsOptions.mergeWith(bottomTabsOptions);
+        return result;
     }
 
     @CheckResult
 	public Options mergeWith(final Options other) {
-        Options result = new Options();
+        Options result = copy();
         result.topBarOptions.mergeWith(other.topBarOptions);
         result.topTabsOptions.mergeWith(other.topTabsOptions);
         result.topTabOptions.mergeWith(other.topTabOptions);

lib/android/app/src/main/java/com/reactnativenavigation/parse/OverlayOptions.java

@@ -1,15 +1,19 @@
 package com.reactnativenavigation.parse;
 
+import com.reactnativenavigation.parse.params.Bool;
+import com.reactnativenavigation.parse.params.NullBool;
+import com.reactnativenavigation.parse.parsers.BoolParser;
+
 import org.json.JSONObject;
 
 public class OverlayOptions {
-    public Options.BooleanOptions interceptTouchOutside = Options.BooleanOptions.False;
+    public Bool interceptTouchOutside = new NullBool();
 
     public static OverlayOptions parse(JSONObject json) {
         OverlayOptions options = new OverlayOptions();
         if (json == null) return options;
 
-        options.interceptTouchOutside = Options.BooleanOptions.parse(json.optString("interceptTouchOutside", ""));
+        options.interceptTouchOutside = BoolParser.parse(json,"interceptTouchOutside");
         return options;
     }
 }

lib/android/app/src/main/java/com/reactnativenavigation/parse/TopBarOptions.java

@@ -4,6 +4,9 @@ package com.reactnativenavigation.parse;
 import android.graphics.Typeface;
 import android.support.annotation.Nullable;
 
+import com.reactnativenavigation.parse.params.Bool;
+import com.reactnativenavigation.parse.params.NullBool;
+import com.reactnativenavigation.parse.parsers.BoolParser;
 import com.reactnativenavigation.utils.TypefaceLoader;
 
 import org.json.JSONObject;
@@ -21,10 +24,10 @@ public class TopBarOptions implements DEFAULT_VALUES {
         options.textColor = ColorParser.parse(json, "textColor");
         options.textFontSize = FractionParser.parse(json, "textFontSize");
         options.textFontFamily = typefaceManager.getTypeFace(json.optString("textFontFamily", ""));
-        options.hidden = Options.BooleanOptions.parse(json.optString("hidden", "false"));
-        options.animateHide = Options.BooleanOptions.parse(json.optString("animateHide", "true"));
-        options.hideOnScroll = Options.BooleanOptions.parse(json.optString("hideOnScroll"));
-        options.drawBehind = Options.BooleanOptions.parse(json.optString("drawBehind"));
+        options.hidden = BoolParser.parse(json, "hidden");
+        options.animateHide = BoolParser.parse(json,"animateHide");
+        options.hideOnScroll = BoolParser.parse(json,"hideOnScroll");
+        options.drawBehind = BoolParser.parse(json,"drawBehind");
         options.rightButtons = Button.parseJsonArray(json.optJSONArray("rightButtons"));
         options.leftButtons = Button.parseJsonArray(json.optJSONArray("leftButtons"));
         options.testId = TextParser.parse(json, "testID");
@@ -38,15 +41,16 @@ public class TopBarOptions implements DEFAULT_VALUES {
     public Color textColor = new NullColor();
     public Fraction textFontSize = new NullFraction();
     @Nullable public Typeface textFontFamily;
-    public Options.BooleanOptions hidden = Options.BooleanOptions.False;
-    public Options.BooleanOptions animateHide = Options.BooleanOptions.True;
-    public Options.BooleanOptions hideOnScroll = Options.BooleanOptions.NoValue;
-    public Options.BooleanOptions drawBehind = Options.BooleanOptions.NoValue;
+    public Bool hidden = new NullBool();
+    public Bool animateHide = new NullBool();
+    public Bool hideOnScroll = new NullBool();
+    public Bool drawBehind = new NullBool();
     public ArrayList<Button> leftButtons;
     public ArrayList<Button> rightButtons;
 
     void mergeWith(final TopBarOptions other) {
-        if (other.title != null) title = other.title;
+        if (other.title.hasValue())
+            title = other.title;
         if (other.backgroundColor.hasValue())
             backgroundColor = other.backgroundColor;
         if (other.textColor.hasValue())
@@ -55,16 +59,16 @@ public class TopBarOptions implements DEFAULT_VALUES {
             textFontSize = other.textFontSize;
         if (other.textFontFamily != null)
             textFontFamily = other.textFontFamily;
-        if (other.hidden != Options.BooleanOptions.NoValue) {
+        if (other.hidden.hasValue()) {
             hidden = other.hidden;
         }
-        if (other.animateHide != Options.BooleanOptions.NoValue) {
+        if (other.animateHide.hasValue()) {
             animateHide = other.animateHide;
         }
-        if (other.hideOnScroll != Options.BooleanOptions.NoValue) {
+        if (other.hideOnScroll.hasValue()) {
             hideOnScroll = other.hideOnScroll;
         }
-        if (other.drawBehind != Options.BooleanOptions.NoValue) {
+        if (other.drawBehind.hasValue()) {
             drawBehind = other.drawBehind;
         }
         if (other.leftButtons != null)
@@ -84,13 +88,13 @@ public class TopBarOptions implements DEFAULT_VALUES {
             textFontSize = defaultOptions.textFontSize;
         if (textFontFamily == null)
             textFontFamily = defaultOptions.textFontFamily;
-        if (hidden == Options.BooleanOptions.NoValue)
+        if (!hidden.hasValue())
             hidden = defaultOptions.hidden;
-        if (animateHide == Options.BooleanOptions.NoValue)
+        if (!animateHide.hasValue())
             animateHide = defaultOptions.animateHide;
-        if (hideOnScroll == Options.BooleanOptions.NoValue)
+        if (!hideOnScroll.hasValue())
             hideOnScroll = defaultOptions.hideOnScroll;
-        if (drawBehind == Options.BooleanOptions.NoValue)
+        if (!drawBehind.hasValue())
             drawBehind = defaultOptions.drawBehind;
         if (leftButtons == null)
             leftButtons = defaultOptions.leftButtons;

lib/android/app/src/main/java/com/reactnativenavigation/parse/params/Bool.java

@@ -0,0 +1,25 @@
+package com.reactnativenavigation.parse.params;
+
+import com.reactnativenavigation.parse.Param;
+
+public class Bool extends Param<Boolean> {
+    public Bool(Boolean value) {
+        super(value);
+    }
+
+    public boolean isFalseOrUndefined() {
+        return !hasValue() || !get();
+    }
+
+    public boolean isTrueOrUndefined() {
+        return !hasValue() || get();
+    }
+
+    public boolean isTrue() {
+        return hasValue() && get();
+    }
+
+    public boolean isFalse() {
+        return hasValue() && get();
+    }
+}

lib/android/app/src/main/java/com/reactnativenavigation/parse/params/NullBool.java

@@ -0,0 +1,7 @@
+package com.reactnativenavigation.parse.params;
+
+public class NullBool extends Bool {
+    public NullBool() {
+        super(null);
+    }
+}

lib/android/app/src/main/java/com/reactnativenavigation/parse/parsers/BoolParser.java

@@ -0,0 +1,12 @@
+package com.reactnativenavigation.parse.parsers;
+
+import com.reactnativenavigation.parse.params.Bool;
+import com.reactnativenavigation.parse.params.NullBool;
+
+import org.json.JSONObject;
+
+public class BoolParser {
+    public static Bool parse(JSONObject json, String bool) {
+        return json.has(bool) ? new Bool(json.optBoolean(bool)) : new NullBool();
+    }
+}

lib/android/app/src/main/java/com/reactnativenavigation/presentation/OptionsPresenter.java

@@ -10,9 +10,6 @@ import com.reactnativenavigation.views.TopBar;
 
 import java.util.ArrayList;
 
-import static com.reactnativenavigation.parse.Options.BooleanOptions.False;
-import static com.reactnativenavigation.parse.Options.BooleanOptions.True;
-
 public class OptionsPresenter {
     private TopBar topBar;
     private ReactComponent component;
@@ -37,21 +34,21 @@ public class OptionsPresenter {
         if (options.testId.hasValue()) topBar.setTestId(options.testId.get());
 
         topBar.setTitleTypeface(options.textFontFamily);
-        if (options.hidden == True) {
+        if (options.hidden.isTrue()) {
             topBar.hide(options.animateHide);
         }
-        if (options.hidden == False) {
+        if (options.hidden.isFalseOrUndefined()) {
             topBar.show(options.animateHide);
         }
-        if (options.drawBehind == True) {
+        if (options.drawBehind.isTrue()) {
             component.drawBehindTopBar();
-        } else if (options.drawBehind == False) {
+        } else if (options.drawBehind.isFalseOrUndefined()) {
             component.drawBelowTopBar(topBar);
         }
 
-        if (options.hideOnScroll == True) {
+        if (options.hideOnScroll.isTrue()) {
             topBar.enableCollapse(component.getScrollEventListener());
-        } else if (options.hideOnScroll == False) {
+        } else if (options.hideOnScroll.isTrue()) {
             topBar.disableCollapse();
         }
     }

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

@@ -25,6 +25,7 @@ public class ComponentLayout extends FrameLayout implements ReactComponent, Titl
 		super(context);
 		this.reactView = reactView;
         addView(reactView.asView(), MATCH_PARENT, MATCH_PARENT);
+        setContentDescription("ComponentLayout");
         touchDelegate = new OverlayTouchDelegate(reactView);
     }
 
@@ -55,7 +56,7 @@ public class ComponentLayout extends FrameLayout implements ReactComponent, Titl
 
     @Override
     public void applyOptions(Options options) {
-        touchDelegate.setInterceptTouchOutside(options.overlayOptions.interceptTouchOutside == Options.BooleanOptions.True);
+        touchDelegate.setInterceptTouchOutside(options.overlayOptions.interceptTouchOutside.isTrue());
     }
 
     @Override
@@ -75,16 +76,20 @@ public class ComponentLayout extends FrameLayout implements ReactComponent, Titl
 
     @Override
     public void drawBehindTopBar() {
-        RelativeLayout.LayoutParams layoutParams = (RelativeLayout.LayoutParams) getLayoutParams();
-        layoutParams.removeRule(BELOW);
-        setLayoutParams(layoutParams);
+        if (getParent() instanceof RelativeLayout) {
+            RelativeLayout.LayoutParams layoutParams = (RelativeLayout.LayoutParams) getLayoutParams();
+            layoutParams.removeRule(BELOW);
+            setLayoutParams(layoutParams);
+        }
     }
 
     @Override
     public void drawBelowTopBar(TopBar topBar) {
-        RelativeLayout.LayoutParams layoutParams = (RelativeLayout.LayoutParams) getLayoutParams();
-        layoutParams.addRule(BELOW, topBar.getId());
-        setLayoutParams(layoutParams);
+        if (getParent() instanceof RelativeLayout) {
+            RelativeLayout.LayoutParams layoutParams = (RelativeLayout.LayoutParams) getLayoutParams();
+            layoutParams.addRule(BELOW, topBar.getId());
+            setLayoutParams(layoutParams);
+        }
     }
 
     @Override

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

@@ -21,6 +21,7 @@ public class StackLayout extends RelativeLayout implements TitleBarButton.OnClic
         topBar = new TopBar(context, this);
         topBar.setId(CompatUtils.generateViewId());
         createLayout();
+        setContentDescription("StackLayout");
     }
 
     void createLayout() {

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

@@ -17,7 +17,6 @@ import android.widget.ImageButton;
 import android.widget.TextView;
 
 import com.reactnativenavigation.parse.Button;
-import com.reactnativenavigation.parse.Options;
 import com.reactnativenavigation.parse.Text;
 import com.reactnativenavigation.utils.ArrayUtils;
 import com.reactnativenavigation.utils.ImageLoader;
@@ -46,7 +45,7 @@ public class TitleBarButton implements MenuItem.OnMenuItemClickListener {
 	void addToMenu(Context context, final Menu menu) {
 		MenuItem menuItem = menu.add(button.title.get(""));
 		menuItem.setShowAsAction(button.showAsAction);
-		menuItem.setEnabled(button.disabled != Options.BooleanOptions.True);
+		menuItem.setEnabled(button.disabled.isFalseOrUndefined());
 		menuItem.setOnMenuItemClickListener(this);
 
 		if (hasIcon()) {
@@ -109,12 +108,12 @@ public class TitleBarButton implements MenuItem.OnMenuItemClickListener {
 	}
 
 	private void setIconColor() {
-		if (button.disabled == Options.BooleanOptions.False || button.disabled == Options.BooleanOptions.NoValue) {
+		if (button.disabled.isFalseOrUndefined()) {
 			UiUtils.tintDrawable(icon, button.buttonColor);
 			return;
 		}
 
-		if (button.disableIconTint == Options.BooleanOptions.True) {
+		if (button.disableIconTint.isTrue()) {
 			UiUtils.tintDrawable(icon, button.buttonColor);
 		} else {
 			UiUtils.tintDrawable(icon, Color.LTGRAY);

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

@@ -20,7 +20,7 @@ import com.reactnativenavigation.parse.Button;
 import com.reactnativenavigation.parse.Color;
 import com.reactnativenavigation.parse.Fraction;
 import com.reactnativenavigation.parse.Number;
-import com.reactnativenavigation.parse.Options;
+import com.reactnativenavigation.parse.params.Bool;
 
 import java.util.ArrayList;
 
@@ -169,22 +169,22 @@ public class TopBar extends AppBarLayout implements ScrollEventListener.ScrollAw
         collapsingBehavior.disableCollapse();
     }
 
-    public void show(Options.BooleanOptions animated) {
+    public void show(Bool animated) {
         if (getVisibility() == View.VISIBLE) {
             return;
         }
-        if (animated == Options.BooleanOptions.True) {
+        if (animated.isTrue()) {
             animator.show();
         } else {
             setVisibility(View.VISIBLE);
         }
     }
 
-    public void hide(Options.BooleanOptions animated) {
+    public void hide(Bool animated) {
         if (getVisibility() == View.GONE) {
             return;
         }
-        if (animated == Options.BooleanOptions.True) {
+        if (animated.isTrue()) {
             animator.hide();
         } else {
             setVisibility(View.GONE);

lib/android/app/src/test/java/com/reactnativenavigation/parse/OptionsTest.java

@@ -5,13 +5,13 @@ import android.support.annotation.*;
 
 import com.reactnativenavigation.*;
 import com.reactnativenavigation.mocks.*;
+import com.reactnativenavigation.parse.params.Bool;
 import com.reactnativenavigation.utils.*;
 
 import org.json.*;
 import org.junit.*;
 import org.mockito.*;
 
-import static com.reactnativenavigation.parse.Options.BooleanOptions.*;
 import static org.assertj.core.api.Java6Assertions.*;
 
 public class OptionsTest extends BaseTest {
@@ -22,11 +22,11 @@ public class OptionsTest extends BaseTest {
     private static final int TOP_BAR_FONT_SIZE = 18;
     private static final String TOP_BAR_FONT_FAMILY = "HelveticaNeue-CondensedBold";
     private static final Typeface TOP_BAR_TYPEFACE = Typeface.create("HelveticaNeue-CondensedBold", Typeface.BOLD);
-    private static final Options.BooleanOptions TOP_BAR_HIDDEN = True;
-    private static final Options.BooleanOptions TOP_BAR_DRAW_BEHIND = True;
-    private static final Options.BooleanOptions TOP_BAR_HIDE_ON_SCROLL = True;
-    private static final Options.BooleanOptions BOTTOM_TABS_ANIMATE_HIDE = True;
-    private static final Options.BooleanOptions BOTTOM_TABS_HIDDEN = True;
+    private static final Bool TOP_BAR_HIDDEN = new Bool(true);
+    private static final Bool TOP_BAR_DRAW_BEHIND = new Bool(true);
+    private static final Bool TOP_BAR_HIDE_ON_SCROLL = new Bool(true);
+    private static final Bool BOTTOM_TABS_ANIMATE_HIDE = new Bool(true);
+    private static final Bool BOTTOM_TABS_HIDDEN = new Bool(true);
     private static final String BOTTOM_TABS_BADGE = "3";
     private static final String BOTTOM_TABS_CURRENT_TAB_ID = "ComponentId";
     private static final int BOTTOM_TABS_CURRENT_TAB_INDEX = 1;
@@ -46,7 +46,7 @@ public class OptionsTest extends BaseTest {
     @Test
     public void parsesJson() throws Exception {
         JSONObject json = new JSONObject()
-                .put("topBar", createTopBar(TOP_BAR_HIDDEN))
+                .put("topBar", createTopBar(TOP_BAR_HIDDEN.get()))
                 .put("bottomTabs", createBottomTabs());
         Options result = Options.parse(mockLoader, json);
         assertResult(result);
@@ -58,11 +58,11 @@ public class OptionsTest extends BaseTest {
         assertThat(result.topBarOptions.textColor.get()).isEqualTo(TOP_BAR_TEXT_COLOR);
         assertThat(result.topBarOptions.textFontSize.get()).isEqualTo(TOP_BAR_FONT_SIZE);
         assertThat(result.topBarOptions.textFontFamily).isEqualTo(TOP_BAR_TYPEFACE);
-        assertThat(result.topBarOptions.hidden).isEqualTo(TOP_BAR_HIDDEN);
-        assertThat(result.topBarOptions.drawBehind).isEqualTo(TOP_BAR_DRAW_BEHIND);
-        assertThat(result.topBarOptions.hideOnScroll).isEqualTo(TOP_BAR_HIDE_ON_SCROLL);
-        assertThat(result.bottomTabsOptions.animateHide).isEqualTo(BOTTOM_TABS_ANIMATE_HIDE);
-        assertThat(result.bottomTabsOptions.visible).isEqualTo(BOTTOM_TABS_HIDDEN);
+        assertThat(result.topBarOptions.hidden.get()).isEqualTo(TOP_BAR_HIDDEN.get());
+        assertThat(result.topBarOptions.drawBehind.get()).isEqualTo(TOP_BAR_DRAW_BEHIND.get());
+        assertThat(result.topBarOptions.hideOnScroll.get()).isEqualTo(TOP_BAR_HIDE_ON_SCROLL.get());
+        assertThat(result.bottomTabsOptions.animateHide.get()).isEqualTo(BOTTOM_TABS_ANIMATE_HIDE.get());
+        assertThat(result.bottomTabsOptions.visible.get()).isEqualTo(BOTTOM_TABS_HIDDEN.get());
         assertThat(result.bottomTabsOptions.currentTabId.get()).isEqualTo(BOTTOM_TABS_CURRENT_TAB_ID);
         assertThat(result.bottomTabsOptions.currentTabIndex).isEqualTo(BOTTOM_TABS_CURRENT_TAB_INDEX);
     }
@@ -72,12 +72,12 @@ public class OptionsTest extends BaseTest {
         return new JSONObject()
                 .put("currentTabId", BOTTOM_TABS_CURRENT_TAB_ID)
                 .put("currentTabIndex", BOTTOM_TABS_CURRENT_TAB_INDEX)
-                .put("visible", BOTTOM_TABS_HIDDEN)
-                .put("animateHide", BOTTOM_TABS_ANIMATE_HIDE);
+                .put("visible", BOTTOM_TABS_HIDDEN.get())
+                .put("animateHide", BOTTOM_TABS_ANIMATE_HIDE.get());
     }
 
     @NonNull
-    private JSONObject createTopBar(Options.BooleanOptions hidden) throws JSONException {
+    private JSONObject createTopBar(boolean hidden) throws JSONException {
         return new JSONObject()
                 .put("title", "the title")
                 .put("backgroundColor", TOP_BAR_BACKGROUND_COLOR)
@@ -85,8 +85,8 @@ public class OptionsTest extends BaseTest {
                 .put("textFontSize", TOP_BAR_FONT_SIZE)
                 .put("textFontFamily", TOP_BAR_FONT_FAMILY)
                 .put("hidden", hidden)
-                .put("drawBehind", TOP_BAR_DRAW_BEHIND)
-                .put("hideOnScroll", TOP_BAR_HIDE_ON_SCROLL);
+                .put("drawBehind", TOP_BAR_DRAW_BEHIND.get())
+                .put("hideOnScroll", TOP_BAR_HIDE_ON_SCROLL.get());
     }
 
     @NonNull
@@ -113,23 +113,26 @@ public class OptionsTest extends BaseTest {
     @Test
     public void mergeDoesNotMutate() throws Exception {
         JSONObject json1 = new JSONObject();
-        json1.put("topBar", createTopBar(Options.BooleanOptions.True));
+        json1.put("topBar", createTopBar(true));
         Options options1 = Options.parse(mockLoader, json1);
+        options1.topBarOptions.title = new Text("some title");
 
 
         JSONObject json2 = new JSONObject();
-        json2.put("topBar", createTopBar(Options.BooleanOptions.False));
+        json2.put("topBar", createTopBar(false));
         Options options2 = Options.parse(mockLoader, json2);
+        options2.topBarOptions.title = new NullText();
 
         Options merged = options1.mergeWith(options2);
-        assertThat(options1.topBarOptions.hidden).isEqualTo(Options.BooleanOptions.True);
-        assertThat(merged.topBarOptions.hidden).isEqualTo(False);
+        assertThat(options1.topBarOptions.hidden.get()).isTrue();
+        assertThat(merged.topBarOptions.hidden.get()).isFalse();
+        assertThat(merged.topBarOptions.title.get()).isEqualTo("some title");
     }
 
     @Test
     public void mergeDefaultOptions() throws Exception {
         JSONObject json = new JSONObject();
-        json.put("topBar", createTopBar(TOP_BAR_HIDDEN));
+        json.put("topBar", createTopBar(TOP_BAR_HIDDEN.get()));
         json.put("bottomTabs", createBottomTabs());
         Options defaultOptions = Options.parse(mockLoader, json);
         Options options = new Options();
@@ -145,7 +148,7 @@ public class OptionsTest extends BaseTest {
         Options defaultOptions = Options.parse(mockLoader, defaultJson);
 
         JSONObject json = new JSONObject()
-                .put("topBar", createTopBar(TOP_BAR_HIDDEN))
+                .put("topBar", createTopBar(TOP_BAR_HIDDEN.get()))
                 .put("bottomTabs", createBottomTabs());
         Options options = Options.parse(mockLoader, json);
         options.withDefaultOptions(defaultOptions);
@@ -161,7 +164,7 @@ public class OptionsTest extends BaseTest {
     @Test
     public void topBar_defaultOptions() throws Exception {
         Options uut = new Options();
-        assertThat(uut.topBarOptions.hidden).isEqualTo(Options.BooleanOptions.False);
-        assertThat(uut.topBarOptions.animateHide).isEqualTo(Options.BooleanOptions.True);
+        assertThat(uut.topBarOptions.hidden.isFalseOrUndefined()).isTrue();
+        assertThat(uut.topBarOptions.animateHide.isTrueOrUndefined()).isTrue();
     }
 }

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

@@ -13,6 +13,7 @@ import com.reactnativenavigation.mocks.TestReactView;
 import com.reactnativenavigation.parse.Fraction;
 import com.reactnativenavigation.parse.Options;
 import com.reactnativenavigation.parse.Text;
+import com.reactnativenavigation.parse.params.Bool;
 
 import org.junit.Test;
 
@@ -145,7 +146,7 @@ public class OptionsApplyingTest extends BaseTest {
         assertThat(stackController.getTopBar().getVisibility()).isNotEqualTo(View.GONE);
 
         Options opts = new Options();
-        opts.topBarOptions.hidden = Options.BooleanOptions.True;
+        opts.topBarOptions.hidden = new Bool(true);
         uut.mergeOptions(opts);
 
         assertThat(stackController.getTopBar().getVisibility()).isEqualTo(View.GONE);
@@ -154,17 +155,17 @@ public class OptionsApplyingTest extends BaseTest {
     @Test
     public void appliesDrawUnder() throws Exception {
         uut.options.topBarOptions.title = new Text("the title");
-        uut.options.topBarOptions.drawBehind = Options.BooleanOptions.False;
+        uut.options.topBarOptions.drawBehind = new Bool(false);
         uut.ensureViewIsCreated();
-        uut.onViewAppeared();
         stackController.animatePush(uut, new MockPromise() {
             @Override
             public void resolve(@Nullable Object value) {
+                uut.onViewAppeared();
                 RelativeLayout.LayoutParams uutLayoutParams = (RelativeLayout.LayoutParams) uut.getComponent().asView().getLayoutParams();
                 assertThat(uutLayoutParams.getRule(BELOW)).isNotEqualTo(0);
 
                 Options opts = new Options();
-                opts.topBarOptions.drawBehind = Options.BooleanOptions.True;
+                opts.topBarOptions.drawBehind = new Bool(true);
                 uut.mergeOptions(opts);
 
                 uutLayoutParams = (RelativeLayout.LayoutParams) (uut.getComponent().asView()).getLayoutParams();

playground/src/screens/ScrollViewScreen.js

@@ -11,6 +11,7 @@ class ScrollViewScreen extends Component {
     return {
       topBar: {
         title: 'Collapse',
+        drawBehind: true,
         textColor: 'black',
         textFontSize: 16
       }
@@ -46,7 +47,6 @@ class ScrollViewScreen extends Component {
   componentDidUpdate() {
     Navigation.setOptions(this.props.componentId, {
       topBar: {
-        drawUnder: true,
         hideOnScroll: this.state.topBarHideOnScroll
       }
     });