Browse Source

Remove screenBackgroundColor from Options.java

Guy Carmeli 6 years ago
parent
commit
722698072b

+ 0
- 8
lib/android/app/src/main/java/com/reactnativenavigation/parse/Options.java View File

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