Browse Source

Draw screens under BottomTabs when drawScreenAboveBottomTabs is true

Guy Carmeli 8 years ago
parent
commit
5cdfae1190

+ 2
- 3
android/app/src/main/java/com/reactnativenavigation/params/parsers/StyleParamsParser.java View File

@@ -38,10 +38,9 @@ public class StyleParamsParser {
38 38
         //result.drawScreenBelowTopBar = params.getBoolean("drawBelowTopBar", isDefaultScreenBelowTopBar());
39 39
         result.drawScreenBelowTopBar = true;
40 40
 
41
-        result.drawScreenAboveBottomTabs =
42
-                params.getBoolean("drawScreenAboveBottomTabs", getDefaultDrawScreenAboveBottomTabs());
43
-
44 41
         result.bottomTabsHidden = getBoolean("bottomTabsHidden", getDefaultBottomTabsHidden());
42
+        result.drawScreenAboveBottomTabs = !result.bottomTabsHidden &&
43
+                params.getBoolean("drawScreenAboveBottomTabs", getDefaultDrawScreenAboveBottomTabs());
45 44
         result.bottomTabsHiddenOnScroll =
46 45
                 getBoolean("bottomTabsHiddenOnScroll", getDefaultBottomTabsHiddenOnScroll());
47 46
         result.bottomTabsColor = getColor("bottomTabsColor", getDefaultBottomTabsColor());