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

fix margin top topbar when statusbar drawbehind (#5209)

Igor преди 5 години
родител
ревизия
234c59ce7b
променени са 1 файла, в които са добавени 5 реда и са изтрити 1 реда
  1. 5
    1
      lib/android/app/src/main/java/com/reactnativenavigation/views/ComponentLayout.java

+ 5
- 1
lib/android/app/src/main/java/com/reactnativenavigation/views/ComponentLayout.java Целия файл

@@ -95,7 +95,11 @@ public class ComponentLayout extends FrameLayout implements ReactComponent, Titl
95 95
     public void drawBelowTopBar(TopBar topBar) {
96 96
         if (getLayoutParams() instanceof RelativeLayout.LayoutParams) {
97 97
             RelativeLayout.LayoutParams layoutParams = (RelativeLayout.LayoutParams) getLayoutParams();
98
-            layoutParams.topMargin = ViewUtils.getHeight(topBar);
98
+            if (topBar.getLayoutParams() instanceof MarginLayoutParams) {
99
+                layoutParams.topMargin = ViewUtils.getHeight(topBar) + ((MarginLayoutParams) topBar.getLayoutParams()).topMargin;
100
+            } else {
101
+                layoutParams.topMargin = ViewUtils.getHeight(topBar);
102
+            }
99 103
             try {
100 104
                 setLayoutParams(layoutParams);
101 105
             } catch (IllegalStateException ignored) { }