Rename topBar.hidden to topBar.visible

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

@@ -24,7 +24,7 @@ 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 = BoolParser.parse(json, "hidden");
+        options.visible = BoolParser.parse(json, "visible");
         options.animateHide = BoolParser.parse(json,"animateHide");
         options.hideOnScroll = BoolParser.parse(json,"hideOnScroll");
         options.drawBehind = BoolParser.parse(json,"drawBehind");
@@ -41,7 +41,7 @@ public class TopBarOptions implements DEFAULT_VALUES {
     public Color textColor = new NullColor();
     public Fraction textFontSize = new NullFraction();
     @Nullable public Typeface textFontFamily;
-    public Bool hidden = new NullBool();
+    public Bool visible = new NullBool();
     public Bool animateHide = new NullBool();
     public Bool hideOnScroll = new NullBool();
     public Bool drawBehind = new NullBool();
@@ -59,8 +59,8 @@ public class TopBarOptions implements DEFAULT_VALUES {
             textFontSize = other.textFontSize;
         if (other.textFontFamily != null)
             textFontFamily = other.textFontFamily;
-        if (other.hidden.hasValue()) {
-            hidden = other.hidden;
+        if (other.visible.hasValue()) {
+            visible = other.visible;
         }
         if (other.animateHide.hasValue()) {
             animateHide = other.animateHide;
@@ -88,8 +88,8 @@ public class TopBarOptions implements DEFAULT_VALUES {
             textFontSize = defaultOptions.textFontSize;
         if (textFontFamily == null)
             textFontFamily = defaultOptions.textFontFamily;
-        if (!hidden.hasValue())
-            hidden = defaultOptions.hidden;
+        if (!visible.hasValue())
+            visible = defaultOptions.visible;
         if (!animateHide.hasValue())
             animateHide = defaultOptions.animateHide;
         if (!hideOnScroll.hasValue())

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

@@ -34,10 +34,10 @@ public class OptionsPresenter {
         if (options.testId.hasValue()) topBar.setTestId(options.testId.get());
 
         topBar.setTitleTypeface(options.textFontFamily);
-        if (options.hidden.isTrue()) {
+        if (options.visible.isFalse()) {
             topBar.hide(options.animateHide);
         }
-        if (options.hidden.isFalseOrUndefined()) {
+        if (options.visible.isTrueOrUndefined()) {
             topBar.show(options.animateHide);
         }
         if (options.drawBehind.isTrue()) {

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

@@ -22,7 +22,7 @@ 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 Bool TOP_BAR_HIDDEN = new Bool(true);
+    private static final Bool TOP_BAR_VISIBLE = 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);
@@ -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.get()))
+                .put("topBar", createTopBar(TOP_BAR_VISIBLE.get()))
                 .put("bottomTabs", createBottomTabs());
         Options result = Options.parse(mockLoader, json);
         assertResult(result);
@@ -58,7 +58,7 @@ 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.get()).isEqualTo(TOP_BAR_HIDDEN.get());
+        assertThat(result.topBarOptions.visible.get()).isEqualTo(TOP_BAR_VISIBLE.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());
@@ -77,14 +77,14 @@ public class OptionsTest extends BaseTest {
     }
 
     @NonNull
-    private JSONObject createTopBar(boolean hidden) throws JSONException {
+    private JSONObject createTopBar(boolean visible) throws JSONException {
         return new JSONObject()
                 .put("title", "the title")
                 .put("backgroundColor", TOP_BAR_BACKGROUND_COLOR)
                 .put("textColor", TOP_BAR_TEXT_COLOR)
                 .put("textFontSize", TOP_BAR_FONT_SIZE)
                 .put("textFontFamily", TOP_BAR_FONT_FAMILY)
-                .put("hidden", hidden)
+                .put("visible", visible)
                 .put("drawBehind", TOP_BAR_DRAW_BEHIND.get())
                 .put("hideOnScroll", TOP_BAR_HIDE_ON_SCROLL.get());
     }
@@ -97,7 +97,7 @@ public class OptionsTest extends BaseTest {
                 .put("textColor", TOP_BAR_TEXT_COLOR)
                 .put("textFontSize", TOP_BAR_FONT_SIZE)
                 .put("textFontFamily", TOP_BAR_FONT_FAMILY)
-                .put("visible", TOP_BAR_HIDDEN);
+                .put("visible", TOP_BAR_VISIBLE);
     }
 
     @NonNull
@@ -117,22 +117,21 @@ public class OptionsTest extends BaseTest {
         Options options1 = Options.parse(mockLoader, json1);
         options1.topBarOptions.title = new Text("some title");
 
-
         JSONObject json2 = new JSONObject();
         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.get()).isTrue();
-        assertThat(merged.topBarOptions.hidden.get()).isFalse();
+        assertThat(options1.topBarOptions.visible.get()).isTrue();
+        assertThat(merged.topBarOptions.visible.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.get()));
+        json.put("topBar", createTopBar(TOP_BAR_VISIBLE.get()));
         json.put("bottomTabs", createBottomTabs());
         Options defaultOptions = Options.parse(mockLoader, json);
         Options options = new Options();
@@ -148,7 +147,7 @@ public class OptionsTest extends BaseTest {
         Options defaultOptions = Options.parse(mockLoader, defaultJson);
 
         JSONObject json = new JSONObject()
-                .put("topBar", createTopBar(TOP_BAR_HIDDEN.get()))
+                .put("topBar", createTopBar(TOP_BAR_VISIBLE.get()))
                 .put("bottomTabs", createBottomTabs());
         Options options = Options.parse(mockLoader, json);
         options.withDefaultOptions(defaultOptions);
@@ -164,7 +163,7 @@ public class OptionsTest extends BaseTest {
     @Test
     public void topBar_defaultOptions() throws Exception {
         Options uut = new Options();
-        assertThat(uut.topBarOptions.hidden.isFalseOrUndefined()).isTrue();
+        assertThat(uut.topBarOptions.visible.isFalseOrUndefined()).isTrue();
         assertThat(uut.topBarOptions.animateHide.isTrueOrUndefined()).isTrue();
     }
 }

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

@@ -146,7 +146,7 @@ public class OptionsApplyingTest extends BaseTest {
         assertThat(stackController.getTopBar().getVisibility()).isNotEqualTo(View.GONE);
 
         Options opts = new Options();
-        opts.topBarOptions.hidden = new Bool(true);
+        opts.topBarOptions.visible = new Bool(false);
         uut.mergeOptions(opts);
 
         assertThat(stackController.getTopBar().getVisibility()).isEqualTo(View.GONE);