Browse Source

V2 topbar (#2285)

* readme

* fix
Roman Kozlov 7 years ago
parent
commit
ab8e1d3841

+ 1
- 0
README.md View File

205
 | splitViewScreen       |     :x:  |    [Contribute](/docs/docs/CONTRIBUTING.md)      | [Contribute](/docs/docs/CONTRIBUTING.md)|
205
 | splitViewScreen       |     :x:  |    [Contribute](/docs/docs/CONTRIBUTING.md)      | [Contribute](/docs/docs/CONTRIBUTING.md)|
206
 
206
 
207
 Element transitions, adding buttons and styles are not yet implemented. [Contribute](/docs/docs/CONTRIBUTING.md)  
207
 Element transitions, adding buttons and styles are not yet implemented. [Contribute](/docs/docs/CONTRIBUTING.md)  
208
+

+ 2
- 2
lib/android/app/src/main/java/com/reactnativenavigation/parse/TopBarOptions.java View File

13
 
13
 
14
 		options.title = json.optString("title", NO_VALUE);
14
 		options.title = json.optString("title", NO_VALUE);
15
 		options.backgroundColor = json.optInt("backgroundColor", NO_COLOR_VALUE);
15
 		options.backgroundColor = json.optInt("backgroundColor", NO_COLOR_VALUE);
16
-		options.textColor = json.optInt("textColor", NO_INT_VALUE);
16
+		options.textColor = json.optInt("textColor", NO_COLOR_VALUE);
17
 		options.textFontSize = (float) json.optDouble("textFontSize", NO_FLOAT_VALUE);
17
 		options.textFontSize = (float) json.optDouble("textFontSize", NO_FLOAT_VALUE);
18
 		options.textFontFamily = json.optString("textFontFamily", NO_VALUE);
18
 		options.textFontFamily = json.optString("textFontFamily", NO_VALUE);
19
 		options.hidden = NavigationOptions.BooleanOptions.parse(json.optString("hidden"));
19
 		options.hidden = NavigationOptions.BooleanOptions.parse(json.optString("hidden"));
36
 		if (!NO_VALUE.equals(other.title)) title = other.title;
36
 		if (!NO_VALUE.equals(other.title)) title = other.title;
37
 		if (other.backgroundColor != NO_COLOR_VALUE)
37
 		if (other.backgroundColor != NO_COLOR_VALUE)
38
 			backgroundColor = other.backgroundColor;
38
 			backgroundColor = other.backgroundColor;
39
-		if (other.textColor != NO_INT_VALUE)
39
+		if (other.textColor != NO_COLOR_VALUE)
40
 			textColor = other.textColor;
40
 			textColor = other.textColor;
41
 		if (other.textFontSize != NO_FLOAT_VALUE)
41
 		if (other.textFontSize != NO_FLOAT_VALUE)
42
 			textFontSize = other.textFontSize;
42
 			textFontSize = other.textFontSize;