Browse Source

Rename TopBarBackground to TopBarBackgroundOptions

Guy Carmeli 6 years ago
parent
commit
cc2e3effe4

lib/android/app/src/main/java/com/reactnativenavigation/parse/TopBarBackground.java → lib/android/app/src/main/java/com/reactnativenavigation/parse/TopBarBackgroundOptions.java View File

@@ -6,9 +6,9 @@ import com.reactnativenavigation.parse.parsers.ColorParser;
6 6
 
7 7
 import org.json.JSONObject;
8 8
 
9
-public class TopBarBackground {
10
-    public static TopBarBackground parse(JSONObject json) {
11
-        TopBarBackground options = new TopBarBackground();
9
+public class TopBarBackgroundOptions {
10
+    public static TopBarBackgroundOptions parse(JSONObject json) {
11
+        TopBarBackgroundOptions options = new TopBarBackgroundOptions();
12 12
         if (json == null) {
13 13
             return options;
14 14
         }
@@ -20,11 +20,11 @@ public class TopBarBackground {
20 20
 
21 21
     public Color color = new NullColor();
22 22
 
23
-    void mergeWith(final TopBarBackground other) {
23
+    void mergeWith(final TopBarBackgroundOptions other) {
24 24
         if (other.color.hasValue()) color = other.color;
25 25
     }
26 26
 
27
-    void mergeWithDefault(TopBarBackground defaultOptions) {
27
+    void mergeWithDefault(TopBarBackgroundOptions defaultOptions) {
28 28
         if (!color.hasValue()) color = defaultOptions.color;
29 29
     }
30 30
 }

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

@@ -23,7 +23,7 @@ public class TopBarOptions implements DEFAULT_VALUES {
23 23
         if (json == null) return options;
24 24
 
25 25
         options.title = TitleOptions.parse(typefaceManager, json.optJSONObject("title"));
26
-        options.background = TopBarBackground.parse(json.optJSONObject("background"));
26
+        options.background = TopBarBackgroundOptions.parse(json.optJSONObject("background"));
27 27
         options.visible = BoolParser.parse(json, "visible");
28 28
         options.animate = BoolParser.parse(json,"animate");
29 29
         options.hideOnScroll = BoolParser.parse(json,"hideOnScroll");
@@ -37,7 +37,7 @@ public class TopBarOptions implements DEFAULT_VALUES {
37 37
 
38 38
     public TitleOptions title = new TitleOptions();
39 39
     public Text testId = new NullText();
40
-    public TopBarBackground background = new TopBarBackground();
40
+    public TopBarBackgroundOptions background = new TopBarBackgroundOptions();
41 41
     public Bool visible = new NullBool();
42 42
     public Bool animate = new NullBool();
43 43
     public Bool hideOnScroll = new NullBool();