Browse Source

Rename topBar.hidden to topBar.visible

Guy Carmeli 6 years ago
parent
commit
11c1dec05b

+ 6
- 6
lib/android/app/src/main/java/com/reactnativenavigation/parse/TopBarOptions.java View File

24
         options.textColor = ColorParser.parse(json, "textColor");
24
         options.textColor = ColorParser.parse(json, "textColor");
25
         options.textFontSize = FractionParser.parse(json, "textFontSize");
25
         options.textFontSize = FractionParser.parse(json, "textFontSize");
26
         options.textFontFamily = typefaceManager.getTypeFace(json.optString("textFontFamily", ""));
26
         options.textFontFamily = typefaceManager.getTypeFace(json.optString("textFontFamily", ""));
27
-        options.hidden = BoolParser.parse(json, "hidden");
27
+        options.visible = BoolParser.parse(json, "visible");
28
         options.animateHide = BoolParser.parse(json,"animateHide");
28
         options.animateHide = BoolParser.parse(json,"animateHide");
29
         options.hideOnScroll = BoolParser.parse(json,"hideOnScroll");
29
         options.hideOnScroll = BoolParser.parse(json,"hideOnScroll");
30
         options.drawBehind = BoolParser.parse(json,"drawBehind");
30
         options.drawBehind = BoolParser.parse(json,"drawBehind");
41
     public Color textColor = new NullColor();
41
     public Color textColor = new NullColor();
42
     public Fraction textFontSize = new NullFraction();
42
     public Fraction textFontSize = new NullFraction();
43
     @Nullable public Typeface textFontFamily;
43
     @Nullable public Typeface textFontFamily;
44
-    public Bool hidden = new NullBool();
44
+    public Bool visible = new NullBool();
45
     public Bool animateHide = new NullBool();
45
     public Bool animateHide = new NullBool();
46
     public Bool hideOnScroll = new NullBool();
46
     public Bool hideOnScroll = new NullBool();
47
     public Bool drawBehind = new NullBool();
47
     public Bool drawBehind = new NullBool();
59
             textFontSize = other.textFontSize;
59
             textFontSize = other.textFontSize;
60
         if (other.textFontFamily != null)
60
         if (other.textFontFamily != null)
61
             textFontFamily = other.textFontFamily;
61
             textFontFamily = other.textFontFamily;
62
-        if (other.hidden.hasValue()) {
63
-            hidden = other.hidden;
62
+        if (other.visible.hasValue()) {
63
+            visible = other.visible;
64
         }
64
         }
65
         if (other.animateHide.hasValue()) {
65
         if (other.animateHide.hasValue()) {
66
             animateHide = other.animateHide;
66
             animateHide = other.animateHide;
88
             textFontSize = defaultOptions.textFontSize;
88
             textFontSize = defaultOptions.textFontSize;
89
         if (textFontFamily == null)
89
         if (textFontFamily == null)
90
             textFontFamily = defaultOptions.textFontFamily;
90
             textFontFamily = defaultOptions.textFontFamily;
91
-        if (!hidden.hasValue())
92
-            hidden = defaultOptions.hidden;
91
+        if (!visible.hasValue())
92
+            visible = defaultOptions.visible;
93
         if (!animateHide.hasValue())
93
         if (!animateHide.hasValue())
94
             animateHide = defaultOptions.animateHide;
94
             animateHide = defaultOptions.animateHide;
95
         if (!hideOnScroll.hasValue())
95
         if (!hideOnScroll.hasValue())

+ 2
- 2
lib/android/app/src/main/java/com/reactnativenavigation/presentation/OptionsPresenter.java View File

34
         if (options.testId.hasValue()) topBar.setTestId(options.testId.get());
34
         if (options.testId.hasValue()) topBar.setTestId(options.testId.get());
35
 
35
 
36
         topBar.setTitleTypeface(options.textFontFamily);
36
         topBar.setTitleTypeface(options.textFontFamily);
37
-        if (options.hidden.isTrue()) {
37
+        if (options.visible.isFalse()) {
38
             topBar.hide(options.animateHide);
38
             topBar.hide(options.animateHide);
39
         }
39
         }
40
-        if (options.hidden.isFalseOrUndefined()) {
40
+        if (options.visible.isTrueOrUndefined()) {
41
             topBar.show(options.animateHide);
41
             topBar.show(options.animateHide);
42
         }
42
         }
43
         if (options.drawBehind.isTrue()) {
43
         if (options.drawBehind.isTrue()) {

+ 11
- 12
lib/android/app/src/test/java/com/reactnativenavigation/parse/OptionsTest.java View File

22
     private static final int TOP_BAR_FONT_SIZE = 18;
22
     private static final int TOP_BAR_FONT_SIZE = 18;
23
     private static final String TOP_BAR_FONT_FAMILY = "HelveticaNeue-CondensedBold";
23
     private static final String TOP_BAR_FONT_FAMILY = "HelveticaNeue-CondensedBold";
24
     private static final Typeface TOP_BAR_TYPEFACE = Typeface.create("HelveticaNeue-CondensedBold", Typeface.BOLD);
24
     private static final Typeface TOP_BAR_TYPEFACE = Typeface.create("HelveticaNeue-CondensedBold", Typeface.BOLD);
25
-    private static final Bool TOP_BAR_HIDDEN = new Bool(true);
25
+    private static final Bool TOP_BAR_VISIBLE = new Bool(true);
26
     private static final Bool TOP_BAR_DRAW_BEHIND = new Bool(true);
26
     private static final Bool TOP_BAR_DRAW_BEHIND = new Bool(true);
27
     private static final Bool TOP_BAR_HIDE_ON_SCROLL = new Bool(true);
27
     private static final Bool TOP_BAR_HIDE_ON_SCROLL = new Bool(true);
28
     private static final Bool BOTTOM_TABS_ANIMATE_HIDE = new Bool(true);
28
     private static final Bool BOTTOM_TABS_ANIMATE_HIDE = new Bool(true);
46
     @Test
46
     @Test
47
     public void parsesJson() throws Exception {
47
     public void parsesJson() throws Exception {
48
         JSONObject json = new JSONObject()
48
         JSONObject json = new JSONObject()
49
-                .put("topBar", createTopBar(TOP_BAR_HIDDEN.get()))
49
+                .put("topBar", createTopBar(TOP_BAR_VISIBLE.get()))
50
                 .put("bottomTabs", createBottomTabs());
50
                 .put("bottomTabs", createBottomTabs());
51
         Options result = Options.parse(mockLoader, json);
51
         Options result = Options.parse(mockLoader, json);
52
         assertResult(result);
52
         assertResult(result);
58
         assertThat(result.topBarOptions.textColor.get()).isEqualTo(TOP_BAR_TEXT_COLOR);
58
         assertThat(result.topBarOptions.textColor.get()).isEqualTo(TOP_BAR_TEXT_COLOR);
59
         assertThat(result.topBarOptions.textFontSize.get()).isEqualTo(TOP_BAR_FONT_SIZE);
59
         assertThat(result.topBarOptions.textFontSize.get()).isEqualTo(TOP_BAR_FONT_SIZE);
60
         assertThat(result.topBarOptions.textFontFamily).isEqualTo(TOP_BAR_TYPEFACE);
60
         assertThat(result.topBarOptions.textFontFamily).isEqualTo(TOP_BAR_TYPEFACE);
61
-        assertThat(result.topBarOptions.hidden.get()).isEqualTo(TOP_BAR_HIDDEN.get());
61
+        assertThat(result.topBarOptions.visible.get()).isEqualTo(TOP_BAR_VISIBLE.get());
62
         assertThat(result.topBarOptions.drawBehind.get()).isEqualTo(TOP_BAR_DRAW_BEHIND.get());
62
         assertThat(result.topBarOptions.drawBehind.get()).isEqualTo(TOP_BAR_DRAW_BEHIND.get());
63
         assertThat(result.topBarOptions.hideOnScroll.get()).isEqualTo(TOP_BAR_HIDE_ON_SCROLL.get());
63
         assertThat(result.topBarOptions.hideOnScroll.get()).isEqualTo(TOP_BAR_HIDE_ON_SCROLL.get());
64
         assertThat(result.bottomTabsOptions.animateHide.get()).isEqualTo(BOTTOM_TABS_ANIMATE_HIDE.get());
64
         assertThat(result.bottomTabsOptions.animateHide.get()).isEqualTo(BOTTOM_TABS_ANIMATE_HIDE.get());
77
     }
77
     }
78
 
78
 
79
     @NonNull
79
     @NonNull
80
-    private JSONObject createTopBar(boolean hidden) throws JSONException {
80
+    private JSONObject createTopBar(boolean visible) throws JSONException {
81
         return new JSONObject()
81
         return new JSONObject()
82
                 .put("title", "the title")
82
                 .put("title", "the title")
83
                 .put("backgroundColor", TOP_BAR_BACKGROUND_COLOR)
83
                 .put("backgroundColor", TOP_BAR_BACKGROUND_COLOR)
84
                 .put("textColor", TOP_BAR_TEXT_COLOR)
84
                 .put("textColor", TOP_BAR_TEXT_COLOR)
85
                 .put("textFontSize", TOP_BAR_FONT_SIZE)
85
                 .put("textFontSize", TOP_BAR_FONT_SIZE)
86
                 .put("textFontFamily", TOP_BAR_FONT_FAMILY)
86
                 .put("textFontFamily", TOP_BAR_FONT_FAMILY)
87
-                .put("hidden", hidden)
87
+                .put("visible", visible)
88
                 .put("drawBehind", TOP_BAR_DRAW_BEHIND.get())
88
                 .put("drawBehind", TOP_BAR_DRAW_BEHIND.get())
89
                 .put("hideOnScroll", TOP_BAR_HIDE_ON_SCROLL.get());
89
                 .put("hideOnScroll", TOP_BAR_HIDE_ON_SCROLL.get());
90
     }
90
     }
97
                 .put("textColor", TOP_BAR_TEXT_COLOR)
97
                 .put("textColor", TOP_BAR_TEXT_COLOR)
98
                 .put("textFontSize", TOP_BAR_FONT_SIZE)
98
                 .put("textFontSize", TOP_BAR_FONT_SIZE)
99
                 .put("textFontFamily", TOP_BAR_FONT_FAMILY)
99
                 .put("textFontFamily", TOP_BAR_FONT_FAMILY)
100
-                .put("visible", TOP_BAR_HIDDEN);
100
+                .put("visible", TOP_BAR_VISIBLE);
101
     }
101
     }
102
 
102
 
103
     @NonNull
103
     @NonNull
117
         Options options1 = Options.parse(mockLoader, json1);
117
         Options options1 = Options.parse(mockLoader, json1);
118
         options1.topBarOptions.title = new Text("some title");
118
         options1.topBarOptions.title = new Text("some title");
119
 
119
 
120
-
121
         JSONObject json2 = new JSONObject();
120
         JSONObject json2 = new JSONObject();
122
         json2.put("topBar", createTopBar(false));
121
         json2.put("topBar", createTopBar(false));
123
         Options options2 = Options.parse(mockLoader, json2);
122
         Options options2 = Options.parse(mockLoader, json2);
124
         options2.topBarOptions.title = new NullText();
123
         options2.topBarOptions.title = new NullText();
125
 
124
 
126
         Options merged = options1.mergeWith(options2);
125
         Options merged = options1.mergeWith(options2);
127
-        assertThat(options1.topBarOptions.hidden.get()).isTrue();
128
-        assertThat(merged.topBarOptions.hidden.get()).isFalse();
126
+        assertThat(options1.topBarOptions.visible.get()).isTrue();
127
+        assertThat(merged.topBarOptions.visible.get()).isFalse();
129
         assertThat(merged.topBarOptions.title.get()).isEqualTo("some title");
128
         assertThat(merged.topBarOptions.title.get()).isEqualTo("some title");
130
     }
129
     }
131
 
130
 
132
     @Test
131
     @Test
133
     public void mergeDefaultOptions() throws Exception {
132
     public void mergeDefaultOptions() throws Exception {
134
         JSONObject json = new JSONObject();
133
         JSONObject json = new JSONObject();
135
-        json.put("topBar", createTopBar(TOP_BAR_HIDDEN.get()));
134
+        json.put("topBar", createTopBar(TOP_BAR_VISIBLE.get()));
136
         json.put("bottomTabs", createBottomTabs());
135
         json.put("bottomTabs", createBottomTabs());
137
         Options defaultOptions = Options.parse(mockLoader, json);
136
         Options defaultOptions = Options.parse(mockLoader, json);
138
         Options options = new Options();
137
         Options options = new Options();
148
         Options defaultOptions = Options.parse(mockLoader, defaultJson);
147
         Options defaultOptions = Options.parse(mockLoader, defaultJson);
149
 
148
 
150
         JSONObject json = new JSONObject()
149
         JSONObject json = new JSONObject()
151
-                .put("topBar", createTopBar(TOP_BAR_HIDDEN.get()))
150
+                .put("topBar", createTopBar(TOP_BAR_VISIBLE.get()))
152
                 .put("bottomTabs", createBottomTabs());
151
                 .put("bottomTabs", createBottomTabs());
153
         Options options = Options.parse(mockLoader, json);
152
         Options options = Options.parse(mockLoader, json);
154
         options.withDefaultOptions(defaultOptions);
153
         options.withDefaultOptions(defaultOptions);
164
     @Test
163
     @Test
165
     public void topBar_defaultOptions() throws Exception {
164
     public void topBar_defaultOptions() throws Exception {
166
         Options uut = new Options();
165
         Options uut = new Options();
167
-        assertThat(uut.topBarOptions.hidden.isFalseOrUndefined()).isTrue();
166
+        assertThat(uut.topBarOptions.visible.isFalseOrUndefined()).isTrue();
168
         assertThat(uut.topBarOptions.animateHide.isTrueOrUndefined()).isTrue();
167
         assertThat(uut.topBarOptions.animateHide.isTrueOrUndefined()).isTrue();
169
     }
168
     }
170
 }
169
 }

+ 1
- 1
lib/android/app/src/test/java/com/reactnativenavigation/viewcontrollers/OptionsApplyingTest.java View File

146
         assertThat(stackController.getTopBar().getVisibility()).isNotEqualTo(View.GONE);
146
         assertThat(stackController.getTopBar().getVisibility()).isNotEqualTo(View.GONE);
147
 
147
 
148
         Options opts = new Options();
148
         Options opts = new Options();
149
-        opts.topBarOptions.hidden = new Bool(true);
149
+        opts.topBarOptions.visible = new Bool(false);
150
         uut.mergeOptions(opts);
150
         uut.mergeOptions(opts);
151
 
151
 
152
         assertThat(stackController.getTopBar().getVisibility()).isEqualTo(View.GONE);
152
         assertThat(stackController.getTopBar().getVisibility()).isEqualTo(View.GONE);