|
@@ -29,7 +29,7 @@ public class StyleParamsParser {
|
29
|
29
|
result.topBarColor = getColor("topBarColor", getDefaultTopBarColor());
|
30
|
30
|
result.titleBarHidden = getBoolean("titleBarHidden", isDefaultTopBarHidden());
|
31
|
31
|
result.titleBarTitleColor = getColor("titleBarTitleColor", getDefaultTitleBarColor());
|
32
|
|
- result.titleBarButtonColor = getColor("titleBarButtonColor", getDefaultTitleBarColor());
|
|
32
|
+ result.titleBarButtonColor = getColor("titleBarButtonColor", getTitleBarButtonColor());
|
33
|
33
|
result.backButtonHidden = getBoolean("backButtonHidden", isDefaultBackButtonHidden());
|
34
|
34
|
result.topTabsHidden = getBoolean("topTabsHidden", isDefaultTopTabsHidden());
|
35
|
35
|
|
|
@@ -50,22 +50,22 @@ public class StyleParamsParser {
|
50
|
50
|
|
51
|
51
|
@Nullable
|
52
|
52
|
private StyleParams.Color getDefaultNavigationColor() {
|
53
|
|
- return appStyle == null ? new StyleParams.Color(-1) : appStyle.navigationBarColor;
|
|
53
|
+ return appStyle == null ? new StyleParams.Color() : appStyle.navigationBarColor;
|
54
|
54
|
}
|
55
|
55
|
|
56
|
56
|
@Nullable
|
57
|
57
|
private StyleParams.Color getDefaultSelectedBottomTabsButtonColor() {
|
58
|
|
- return appStyle == null ? new StyleParams.Color(-1) : appStyle.selectedBottomTabsButtonColor;
|
|
58
|
+ return appStyle == null ? new StyleParams.Color() : appStyle.selectedBottomTabsButtonColor;
|
59
|
59
|
}
|
60
|
60
|
|
61
|
61
|
@Nullable
|
62
|
62
|
private StyleParams.Color getDefaultBottomTabsButtonColor() {
|
63
|
|
- return appStyle == null ? new StyleParams.Color(-1) : appStyle.bottomTabsButtonColor;
|
|
63
|
+ return appStyle == null ? new StyleParams.Color() : appStyle.bottomTabsButtonColor;
|
64
|
64
|
}
|
65
|
65
|
|
66
|
66
|
@Nullable
|
67
|
67
|
private StyleParams.Color getDefaultBottomTabsColor() {
|
68
|
|
- return appStyle == null ? new StyleParams.Color(-1) : appStyle.bottomTabsColor;
|
|
68
|
+ return appStyle == null ? new StyleParams.Color() : appStyle.bottomTabsColor;
|
69
|
69
|
}
|
70
|
70
|
|
71
|
71
|
private boolean isDefaultBottomTabsHiddenOnScroll() {
|
|
@@ -90,12 +90,12 @@ public class StyleParamsParser {
|
90
|
90
|
|
91
|
91
|
@Nullable
|
92
|
92
|
private StyleParams.Color getDefaultTitleBarColor() {
|
93
|
|
- return appStyle == null ? new StyleParams.Color(-1) : appStyle.titleBarTitleColor;
|
|
93
|
+ return appStyle == null ? new StyleParams.Color() : appStyle.titleBarTitleColor;
|
94
|
94
|
}
|
95
|
95
|
|
96
|
96
|
@Nullable
|
97
|
97
|
private StyleParams.Color getTitleBarButtonColor() {
|
98
|
|
- return appStyle == null ? new StyleParams.Color(-1) : appStyle.titleBarButtonColor;
|
|
98
|
+ return appStyle == null ? new StyleParams.Color() : appStyle.titleBarButtonColor;
|
99
|
99
|
}
|
100
|
100
|
|
101
|
101
|
private boolean isDefaultTopBarHidden() {
|
|
@@ -104,12 +104,12 @@ public class StyleParamsParser {
|
104
|
104
|
|
105
|
105
|
@Nullable
|
106
|
106
|
private StyleParams.Color getDefaultTopBarColor() {
|
107
|
|
- return appStyle == null ? new StyleParams.Color(-1) : appStyle.topBarColor;
|
|
107
|
+ return appStyle == null ? new StyleParams.Color() : appStyle.topBarColor;
|
108
|
108
|
}
|
109
|
109
|
|
110
|
110
|
@Nullable
|
111
|
111
|
private StyleParams.Color getDefaultStatusBarColor() {
|
112
|
|
- return appStyle == null ? new StyleParams.Color(-1) : appStyle.statusBarColor;
|
|
112
|
+ return appStyle == null ? new StyleParams.Color() : appStyle.statusBarColor;
|
113
|
113
|
}
|
114
|
114
|
|
115
|
115
|
private boolean getBoolean(String titleBarHidden, boolean defaultValue) {
|
|
@@ -118,7 +118,7 @@ public class StyleParamsParser {
|
118
|
118
|
|
119
|
119
|
@NonNull
|
120
|
120
|
private StyleParams.Color getColor(String key, StyleParams.Color defaultColor) {
|
121
|
|
- StyleParams.Color color = new StyleParams.Color(ColorParser.parse(params.getString(key)));
|
|
121
|
+ StyleParams.Color color = StyleParams.Color.parse(params.getString(key));
|
122
|
122
|
if (color.hasColor()) {
|
123
|
123
|
return color;
|
124
|
124
|
} else {
|