|
|
@@ -3,11 +3,8 @@ package com.reactnativenavigation.parse;
|
|
3
|
3
|
import android.support.annotation.CheckResult;
|
|
4
|
4
|
import android.support.annotation.NonNull;
|
|
5
|
5
|
|
|
6
|
|
-import com.reactnativenavigation.parse.params.Color;
|
|
7
|
|
-import com.reactnativenavigation.parse.params.NullColor;
|
|
8
|
6
|
import com.reactnativenavigation.parse.params.NullNumber;
|
|
9
|
7
|
import com.reactnativenavigation.parse.params.NullText;
|
|
10
|
|
-import com.reactnativenavigation.parse.parsers.ColorParser;
|
|
11
|
8
|
import com.reactnativenavigation.utils.TypefaceLoader;
|
|
12
|
9
|
|
|
13
|
10
|
import org.json.JSONObject;
|
|
|
@@ -33,7 +30,6 @@ public class Options {
|
|
33
|
30
|
result.fabOptions = FabOptions.parse(json.optJSONObject("fab"));
|
|
34
|
31
|
result.sideMenuRootOptions = SideMenuRootOptions.parse(json.optJSONObject("sideMenu"));
|
|
35
|
32
|
result.animations = AnimationsOptions.parse(json.optJSONObject("animations"));
|
|
36
|
|
- result.screenBackgroundColor = ColorParser.parse(json, "screenBackgroundColor");
|
|
37
|
33
|
result.modal = ModalOptions.parse(json);
|
|
38
|
34
|
result.statusBar = StatusBarOptions.parse(json.optJSONObject("statusBar"));
|
|
39
|
35
|
result.layout = LayoutOptions.parse(json.optJSONObject("layout"));
|
|
|
@@ -50,7 +46,6 @@ public class Options {
|
|
50
|
46
|
@NonNull public FabOptions fabOptions = new FabOptions();
|
|
51
|
47
|
@NonNull public AnimationsOptions animations = new AnimationsOptions();
|
|
52
|
48
|
@NonNull public SideMenuRootOptions sideMenuRootOptions = new SideMenuRootOptions();
|
|
53
|
|
- @NonNull public Color screenBackgroundColor = new NullColor();
|
|
54
|
49
|
@NonNull public ModalOptions modal = new ModalOptions();
|
|
55
|
50
|
@NonNull public StatusBarOptions statusBar = new StatusBarOptions();
|
|
56
|
51
|
@NonNull public LayoutOptions layout = new LayoutOptions();
|
|
|
@@ -71,7 +66,6 @@ public class Options {
|
|
71
|
66
|
result.fabOptions.mergeWith(fabOptions);
|
|
72
|
67
|
result.sideMenuRootOptions.mergeWith(sideMenuRootOptions);
|
|
73
|
68
|
result.animations.mergeWith(animations);
|
|
74
|
|
- result.screenBackgroundColor = screenBackgroundColor;
|
|
75
|
69
|
result.modal.mergeWith(modal);
|
|
76
|
70
|
result.statusBar.mergeWith(statusBar);
|
|
77
|
71
|
result.layout.mergeWith(layout);
|
|
|
@@ -89,7 +83,6 @@ public class Options {
|
|
89
|
83
|
result.fabOptions.mergeWith(other.fabOptions);
|
|
90
|
84
|
result.animations.mergeWith(other.animations);
|
|
91
|
85
|
result.sideMenuRootOptions.mergeWith(other.sideMenuRootOptions);
|
|
92
|
|
- if (other.screenBackgroundColor.hasValue()) result.screenBackgroundColor = other.screenBackgroundColor;
|
|
93
|
86
|
result.modal.mergeWith(other.modal);
|
|
94
|
87
|
result.statusBar.mergeWith(other.statusBar);
|
|
95
|
88
|
result.layout.mergeWith(other.layout);
|
|
|
@@ -105,7 +98,6 @@ public class Options {
|
|
105
|
98
|
fabOptions.mergeWithDefault(defaultOptions.fabOptions);
|
|
106
|
99
|
animations.mergeWithDefault(defaultOptions.animations);
|
|
107
|
100
|
sideMenuRootOptions.mergeWithDefault(defaultOptions.sideMenuRootOptions);
|
|
108
|
|
- if (!screenBackgroundColor.hasValue()) screenBackgroundColor = defaultOptions.screenBackgroundColor;
|
|
109
|
101
|
modal.mergeWithDefault(defaultOptions.modal);
|
|
110
|
102
|
statusBar.mergeWithDefault(defaultOptions.statusBar);
|
|
111
|
103
|
layout.mergeWithDefault(defaultOptions.layout);
|
Guy Carmeli
6 years ago