|
@@ -40,9 +40,10 @@ public class StyleParamsParser {
|
40
|
40
|
result.selectedTopTabIndicatorHeight = getInt("selectedTopTabIndicatorHeight", getDefaultSelectedTopTabIndicatorHeight());
|
41
|
41
|
result.selectedTopTabIndicatorColor = getColor("selectedTopTabIndicatorColor", getDefaultSelectedTopTabIndicatorColor());
|
42
|
42
|
|
43
|
|
- // TODO: Uncomment once we support drawBelowTopBar again
|
44
|
|
- //result.drawScreenBelowTopBar = params.getBoolean("drawBelowTopBar", isDefaultScreenBelowTopBar());
|
45
|
|
- result.drawScreenBelowTopBar = !result.topBarTransparent;
|
|
43
|
+ result.drawScreenBelowTopBar = params.getBoolean("drawBelowTopBar", getDefaultScreenBelowTopBar());
|
|
44
|
+ if (result.topBarTransparent) {
|
|
45
|
+ result.drawScreenBelowTopBar = false;
|
|
46
|
+ }
|
46
|
47
|
|
47
|
48
|
result.bottomTabsHidden = getBoolean("bottomTabsHidden", getDefaultBottomTabsHidden());
|
48
|
49
|
result.drawScreenAboveBottomTabs = !result.bottomTabsHidden &&
|
|
@@ -126,8 +127,8 @@ public class StyleParamsParser {
|
126
|
127
|
return AppStyle.appStyle != null && AppStyle.appStyle.bottomTabsHidden;
|
127
|
128
|
}
|
128
|
129
|
|
129
|
|
- private boolean isDefaultScreenBelowTopBar() {
|
130
|
|
- return AppStyle.appStyle == null || AppStyle.appStyle.drawScreenBelowTopBar;
|
|
130
|
+ private boolean getDefaultScreenBelowTopBar() {
|
|
131
|
+ return AppStyle.appStyle != null && AppStyle.appStyle.drawScreenBelowTopBar;
|
131
|
132
|
}
|
132
|
133
|
|
133
|
134
|
private boolean getDefaultTopTabsHidden() {
|