Browse Source

Add TopBarBackgroundColor and titleBarButtonColor

Guy Carmeli 8 years ago
parent
commit
c23d98ea05

+ 1
- 0
android/app/src/main/java/com/reactnativenavigation/params/StyleParams.java View File

31
 
31
 
32
     public boolean titleBarHidden;
32
     public boolean titleBarHidden;
33
     public Color titleBarTitleColor;
33
     public Color titleBarTitleColor;
34
+    public Color titleBarButtonColor;
34
     public boolean backButtonHidden;
35
     public boolean backButtonHidden;
35
 
36
 
36
     public boolean bottomTabsHidden;
37
     public boolean bottomTabsHidden;

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

29
         result.topBarColor = getColor("topBarColor", getDefaultTopBarColor());
29
         result.topBarColor = getColor("topBarColor", getDefaultTopBarColor());
30
         result.titleBarHidden = getBoolean("titleBarHidden", isDefaultTopBarHidden());
30
         result.titleBarHidden = getBoolean("titleBarHidden", isDefaultTopBarHidden());
31
         result.titleBarTitleColor = getColor("titleBarTitleColor", getDefaultTitleBarColor());
31
         result.titleBarTitleColor = getColor("titleBarTitleColor", getDefaultTitleBarColor());
32
+        result.titleBarButtonColor = getColor("titleBarButtonColor", getDefaultTitleBarColor());
32
         result.backButtonHidden = getBoolean("backButtonHidden", isDefaultBackButtonHidden());
33
         result.backButtonHidden = getBoolean("backButtonHidden", isDefaultBackButtonHidden());
33
         result.topTabsHidden = getBoolean("topTabsHidden", isDefaultTopTabsHidden());
34
         result.topTabsHidden = getBoolean("topTabsHidden", isDefaultTopTabsHidden());
34
 
35
 
92
         return appStyle == null ? new StyleParams.Color(-1) : appStyle.titleBarTitleColor;
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
     private boolean isDefaultTopBarHidden() {
101
     private boolean isDefaultTopBarHidden() {
96
         return appStyle != null && appStyle.titleBarHidden;
102
         return appStyle != null && appStyle.titleBarHidden;
97
     }
103
     }

+ 2
- 1
src/deprecated/platformSpecificDeprecated.android.js View File

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