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

Expose navBarTransparent to Js

closes #21
Guy Carmeli преди 8 години
родител
ревизия
1a8f01a607

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

40
         result.selectedTopTabIndicatorHeight = getInt("selectedTopTabIndicatorHeight", getDefaultSelectedTopTabIndicatorHeight());
40
         result.selectedTopTabIndicatorHeight = getInt("selectedTopTabIndicatorHeight", getDefaultSelectedTopTabIndicatorHeight());
41
         result.selectedTopTabIndicatorColor = getColor("selectedTopTabIndicatorColor", getDefaultSelectedTopTabIndicatorColor());
41
         result.selectedTopTabIndicatorColor = getColor("selectedTopTabIndicatorColor", getDefaultSelectedTopTabIndicatorColor());
42
 
42
 
43
-        // TODO: Uncomment once we support drawBelowTopBar again
44
-        //result.drawScreenBelowTopBar = params.getBoolean("drawBelowTopBar", isDefaultScreenBelowTopBar());
45
-        result.drawScreenBelowTopBar = !result.topBarTransparent;
43
+        result.drawScreenBelowTopBar = params.getBoolean("drawBelowTopBar", getDefaultScreenBelowTopBar());
44
+        if (result.topBarTransparent) {
45
+            result.drawScreenBelowTopBar = false;
46
+        }
46
 
47
 
47
         result.bottomTabsHidden = getBoolean("bottomTabsHidden", getDefaultBottomTabsHidden());
48
         result.bottomTabsHidden = getBoolean("bottomTabsHidden", getDefaultBottomTabsHidden());
48
         result.drawScreenAboveBottomTabs = !result.bottomTabsHidden &&
49
         result.drawScreenAboveBottomTabs = !result.bottomTabsHidden &&
126
         return AppStyle.appStyle != null && AppStyle.appStyle.bottomTabsHidden;
127
         return AppStyle.appStyle != null && AppStyle.appStyle.bottomTabsHidden;
127
     }
128
     }
128
 
129
 
129
-    private boolean isDefaultScreenBelowTopBar() {
130
-        return AppStyle.appStyle == null || AppStyle.appStyle.drawScreenBelowTopBar;
130
+    private boolean getDefaultScreenBelowTopBar() {
131
+        return AppStyle.appStyle != null && AppStyle.appStyle.drawScreenBelowTopBar;
131
     }
132
     }
132
 
133
 
133
     private boolean getDefaultTopTabsHidden() {
134
     private boolean getDefaultTopTabsHidden() {

+ 1
- 1
android/app/src/main/java/com/reactnativenavigation/screens/SingleScreen.java Целия файл

19
     @Override
19
     @Override
20
     protected void createContent() {
20
     protected void createContent() {
21
         contentView = new ContentView(getContext(), screenParams.screenId, screenParams.navigationParams);
21
         contentView = new ContentView(getContext(), screenParams.screenId, screenParams.navigationParams);
22
-        addView(contentView, createLayoutParams());
22
+        addView(contentView, 0, createLayoutParams());
23
     }
23
     }
24
 
24
 
25
     protected LayoutParams createLayoutParams() {
25
     protected LayoutParams createLayoutParams() {

+ 1
- 0
src/deprecated/platformSpecificDeprecated.android.js Целия файл

116
   let ret = {
116
   let ret = {
117
     statusBarColor: originalStyleObject.statusBarColor,
117
     statusBarColor: originalStyleObject.statusBarColor,
118
     topBarColor: originalStyleObject.navBarBackgroundColor,
118
     topBarColor: originalStyleObject.navBarBackgroundColor,
119
+    topBarTransparent: originalStyleObject.navBarTransparent,
119
     collapsingToolBarImage: originalStyleObject.collapsingToolBarImage,
120
     collapsingToolBarImage: originalStyleObject.collapsingToolBarImage,
120
     collapsingToolBarCollapsedColor: originalStyleObject.collapsingToolBarCollapsedColor,
121
     collapsingToolBarCollapsedColor: originalStyleObject.collapsingToolBarCollapsedColor,
121
     titleBarHidden: originalStyleObject.navBarHidden,
122
     titleBarHidden: originalStyleObject.navBarHidden,