Explorar el Código

compensate for bottomTabs (#731)

Guy Carmeli hace 8 años
padre
commit
7097472ce6

+ 9
- 4
android/app/src/main/java/com/reactnativenavigation/views/collapsingToolbar/CollapsingViewPagerContentViewMeasurer.java Ver fichero

@@ -20,15 +20,20 @@ public class CollapsingViewPagerContentViewMeasurer extends CollapsingViewMeasur
20 20
     @Override
21 21
     public int getMeasuredHeight(int heightMeasureSpec) {
22 22
         int height = screenHeight - topBar.getCollapsedHeight();
23
-        if (styleParams.bottomTabsHidden) {
23
+        if (hasBottomTabs() && drawScreenUnderBottomTabs()) {
24 24
             height -= bottomTabsHeight;
25 25
         }
26 26
         if (!styleParams.titleBarHideOnScroll) {
27 27
             height -= titleBarHeight;
28 28
         }
29
-        if (!styleParams.drawScreenAboveBottomTabs) {
30
-            height -= bottomTabsHeight;
31
-        }
32 29
         return height;
33 30
     }
31
+
32
+    private boolean drawScreenUnderBottomTabs() {
33
+        return !styleParams.drawScreenAboveBottomTabs;
34
+    }
35
+
36
+    private boolean hasBottomTabs() {
37
+        return !styleParams.bottomTabsHidden;
38
+    }
34 39
 }