Procházet zdrojové kódy

Add TopBarBackgroundColor and titleBarButtonColor

Guy Carmeli před 8 roky
rodič
revize
c23d98ea05

+ 1
- 0
android/app/src/main/java/com/reactnativenavigation/params/StyleParams.java Zobrazit soubor

@@ -31,6 +31,7 @@ public class StyleParams {
31 31
 
32 32
     public boolean titleBarHidden;
33 33
     public Color titleBarTitleColor;
34
+    public Color titleBarButtonColor;
34 35
     public boolean backButtonHidden;
35 36
 
36 37
     public boolean bottomTabsHidden;

+ 6
- 0
android/app/src/main/java/com/reactnativenavigation/params/parsers/StyleParamsParser.java Zobrazit soubor

@@ -29,6 +29,7 @@ public class StyleParamsParser {
29 29
         result.topBarColor = getColor("topBarColor", getDefaultTopBarColor());
30 30
         result.titleBarHidden = getBoolean("titleBarHidden", isDefaultTopBarHidden());
31 31
         result.titleBarTitleColor = getColor("titleBarTitleColor", getDefaultTitleBarColor());
32
+        result.titleBarButtonColor = getColor("titleBarButtonColor", getDefaultTitleBarColor());
32 33
         result.backButtonHidden = getBoolean("backButtonHidden", isDefaultBackButtonHidden());
33 34
         result.topTabsHidden = getBoolean("topTabsHidden", isDefaultTopTabsHidden());
34 35
 
@@ -92,6 +93,11 @@ public class StyleParamsParser {
92 93
         return appStyle == null ? new StyleParams.Color(-1) : appStyle.titleBarTitleColor;
93 94
     }
94 95
 
96
+    @Nullable
97
+    private StyleParams.Color getTitleBarButtonColor() {
98
+        return appStyle == null ? new StyleParams.Color(-1) : appStyle.titleBarButtonColor;
99
+    }
100
+
95 101
     private boolean isDefaultTopBarHidden() {
96 102
         return appStyle != null && appStyle.titleBarHidden;
97 103
     }

+ 2
- 1
src/deprecated/platformSpecificDeprecated.android.js Zobrazit soubor

@@ -95,10 +95,11 @@ function convertStyleParams(originalStyleObject) {
95 95
 
96 96
   return {
97 97
     statusBarColor: originalStyleObject.statusBarColor,
98
-    topBarColor: originalStyleObject.toolBarColor,
98
+    topBarColor: originalStyleObject.navBarBackgroundColor,
99 99
     navigationBarColor: originalStyleObject.navigationBarColor,
100 100
     titleBarHidden: originalStyleObject.navBarHidden,
101 101
     titleBarTitleColor: originalStyleObject.navBarTextColor,
102
+    titleBarButtonColor: originalStyleObject.navBarButtonColor,
102 103
     backButtonHidden: originalStyleObject.backButtonHidden,
103 104
     topTabsHidden: originalStyleObject.topTabsHidden,
104 105
     bottomTabsHidden: originalStyleObject.tabBarHidden,