Просмотр исходного кода

V2 nhotfix (#2272)

* readme

* dewfault values
Roman Kozlov 7 лет назад
Родитель
Сommit
2d083591da

+ 1
- 2
README.md Просмотреть файл

@@ -69,7 +69,7 @@ v2 is written in Test Driven Development. We have a test for every feature inclu
69 69
 | dismissOverlay             |  [Contribute](/docs/docs/CONTRIBUTING.md)         |	✅ |
70 70
 | customTransition            |   ✅        |	[Contribute](/docs/docs/CONTRIBUTING.md) |
71 71
 | Screen Visibility        | ✅     |✅|
72
-| async commands (await push)     |  [Contribute](/docs/docs/CONTRIBUTING.md)        |[Contribute](/docs/docs/CONTRIBUTING.md)   |
72
+| async commands (await push)     |  [Contribute](/docs/docs/CONTRIBUTING.md)        | WIP @cool04ek   |
73 73
 
74 74
 ### Navigation Options
75 75
 
@@ -205,4 +205,3 @@ Note:  v1 properties with names beginning with 'navBar' are replaced in v2 with
205 205
 | splitViewScreen       |     :x:  |    [Contribute](/docs/docs/CONTRIBUTING.md)      | [Contribute](/docs/docs/CONTRIBUTING.md)|
206 206
 
207 207
 Element transitions, adding buttons and styles are not yet implemented. [Contribute](/docs/docs/CONTRIBUTING.md)  
208
-

+ 4
- 4
lib/android/app/src/main/java/com/reactnativenavigation/parse/BottomTabsOptions.java Просмотреть файл

@@ -21,17 +21,17 @@ public class BottomTabsOptions implements DEFAULT_VALUES {
21 21
 	public int tabBadge = NO_INT_VALUE;
22 22
 	public NavigationOptions.BooleanOptions hidden = NavigationOptions.BooleanOptions.False;
23 23
 	public NavigationOptions.BooleanOptions animateHide = NavigationOptions.BooleanOptions.False;
24
-	public int currentTabIndex;
25
-	public String currentTabId;
24
+	public int currentTabIndex = NO_INT_VALUE;
25
+	public String currentTabId = NO_VALUE;
26 26
 
27 27
 	void mergeWith(final BottomTabsOptions other) {
28 28
 		if (!NO_VALUE.equals(other.currentTabId)) {
29 29
 			currentTabId = other.currentTabId;
30 30
 		}
31
-		if(NO_INT_VALUE != other.currentTabIndex) {
31
+		if (NO_INT_VALUE != other.currentTabIndex) {
32 32
 			currentTabId = other.currentTabId;
33 33
 		}
34
-		if(NO_INT_VALUE != other.tabBadge) {
34
+		if (NO_INT_VALUE != other.tabBadge) {
35 35
 			tabBadge = other.tabBadge;
36 36
 		}
37 37
 		if (other.hidden != NavigationOptions.BooleanOptions.NoValue) {

+ 5
- 5
lib/android/app/src/main/java/com/reactnativenavigation/parse/TopBarOptions.java Просмотреть файл

@@ -22,13 +22,13 @@ public class TopBarOptions implements DEFAULT_VALUES {
22 22
 		return options;
23 23
 	}
24 24
 
25
-	public String title = "";
25
+	public String title = NO_VALUE;
26 26
 	@ColorInt
27
-	public int backgroundColor;
27
+	public int backgroundColor = NO_COLOR_VALUE;
28 28
 	@ColorInt
29
-	public int textColor;
30
-	public float textFontSize;
31
-	public String textFontFamily;
29
+	public int textColor = NO_COLOR_VALUE;
30
+	public float textFontSize = NO_FLOAT_VALUE;
31
+	public String textFontFamily = NO_VALUE;
32 32
 	public NavigationOptions.BooleanOptions hidden = NavigationOptions.BooleanOptions.False;
33 33
 	public NavigationOptions.BooleanOptions animateHide = NavigationOptions.BooleanOptions.False;
34 34