소스 검색

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) { }