Преглед на файлове

Draw screens under BottomTabs when drawScreenAboveBottomTabs is true

Guy Carmeli преди 8 години
родител
ревизия
5cdfae1190
променени са 1 файла, в които са добавени 2 реда и са изтрити 3 реда
  1. 2
    3
      android/app/src/main/java/com/reactnativenavigation/params/parsers/StyleParamsParser.java

+ 2
- 3
android/app/src/main/java/com/reactnativenavigation/params/parsers/StyleParamsParser.java Целия файл

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