Browse Source

no message

Guy Carmeli 8 years ago
parent
commit
1bd739e4dd

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

@@ -2,8 +2,6 @@ package com.reactnativenavigation.params.parsers;
2 2
 
3 3
 import android.graphics.Color;
4 4
 import android.os.Bundle;
5
-import android.support.annotation.NonNull;
6
-import android.support.annotation.Nullable;
7 5
 
8 6
 import com.reactnativenavigation.params.AppStyle;
9 7
 import com.reactnativenavigation.params.StyleParams;
@@ -72,7 +70,6 @@ public class StyleParamsParser {
72 70
         return AppStyle.appStyle == null ? new StyleParams.Color() : AppStyle.appStyle.selectedTopTabTextColor;
73 71
     }
74 72
 
75
-    @Nullable
76 73
     private StyleParams.Color getDefaultNavigationColor() {
77 74
         return AppStyle.appStyle == null ? new StyleParams.Color() : AppStyle.appStyle.navigationBarColor;
78 75
     }
@@ -81,17 +78,14 @@ public class StyleParamsParser {
81 78
         return AppStyle.appStyle != null && AppStyle.appStyle.forceTitlesDisplay;
82 79
     }
83 80
 
84
-    @Nullable
85 81
     private StyleParams.Color getDefaultSelectedBottomTabsButtonColor() {
86 82
         return AppStyle.appStyle == null ? new StyleParams.Color() : AppStyle.appStyle.selectedBottomTabsButtonColor;
87 83
     }
88 84
 
89
-    @Nullable
90 85
     private StyleParams.Color getDefaultBottomTabsButtonColor() {
91 86
         return AppStyle.appStyle == null ? new StyleParams.Color() : AppStyle.appStyle.bottomTabsButtonColor;
92 87
     }
93 88
 
94
-    @Nullable
95 89
     private StyleParams.Color getDefaultBottomTabsColor() {
96 90
         return AppStyle.appStyle == null ? new StyleParams.Color() : AppStyle.appStyle.bottomTabsColor;
97 91
     }
@@ -120,17 +114,14 @@ public class StyleParamsParser {
120 114
         return AppStyle.appStyle != null && AppStyle.appStyle.backButtonHidden;
121 115
     }
122 116
 
123
-    @Nullable
124 117
     private StyleParams.Color getDefaultTitleBarColor() {
125 118
         return AppStyle.appStyle == null ? new StyleParams.Color() : AppStyle.appStyle.titleBarTitleColor;
126 119
     }
127 120
 
128
-    @Nullable
129 121
     private StyleParams.Color getTitleBarButtonColor() {
130 122
         return AppStyle.appStyle == null ? new StyleParams.Color() : AppStyle.appStyle.titleBarButtonColor;
131 123
     }
132 124
 
133
-    @Nullable
134 125
     private StyleParams.Color getTitleBarDisabledButtonColor() {
135 126
         return AppStyle.appStyle == null ? new StyleParams.Color(Color.LTGRAY) : AppStyle.appStyle.titleBarDisabledButtonColor;
136 127
     }
@@ -139,12 +130,10 @@ public class StyleParamsParser {
139 130
         return AppStyle.appStyle != null && AppStyle.appStyle.titleBarHidden;
140 131
     }
141 132
 
142
-    @Nullable
143 133
     private StyleParams.Color getDefaultTopBarColor() {
144 134
         return AppStyle.appStyle == null ? new StyleParams.Color() : AppStyle.appStyle.topBarColor;
145 135
     }
146 136
 
147
-    @Nullable
148 137
     private StyleParams.Color getDefaultStatusBarColor() {
149 138
         return AppStyle.appStyle == null ? new StyleParams.Color() : AppStyle.appStyle.statusBarColor;
150 139
     }
@@ -153,7 +142,6 @@ public class StyleParamsParser {
153 142
         return params.containsKey(key) ? params.getBoolean(key) : defaultValue;
154 143
     }
155 144
 
156
-    @NonNull
157 145
     private StyleParams.Color getColor(String key, StyleParams.Color defaultColor) {
158 146
         StyleParams.Color color = StyleParams.Color.parse(params.getString(key));
159 147
         if (color.hasColor()) {

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

@@ -115,6 +115,7 @@ function convertStyleParams(originalStyleObject) {
115 115
     titleBarHidden: originalStyleObject.navBarHidden,
116 116
     titleBarTitleColor: originalStyleObject.navBarTextColor,
117 117
     titleBarButtonColor: originalStyleObject.navBarButtonColor,
118
+    titleBarDisabledButtonColor: originalStyleObject.titleBarDisabledButtonColor,
118 119
     backButtonHidden: originalStyleObject.backButtonHidden,
119 120
     topTabsHidden: originalStyleObject.topTabsHidden,
120 121