Browse Source

Merge pull request #1 from wix/master

merge upstream
DanielZlotin 8 years ago
parent
commit
ef595e93a0

+ 1
- 0
android/app/src/main/java/com/reactnativenavigation/screens/ScreenStack.java View File

@@ -55,6 +55,7 @@ public class ScreenStack {
55 55
             @Override
56 56
             public void onDisplay() {
57 57
                 screen.show(initialScreenParams.animateScreenTransitions);
58
+                screen.setStyle();
58 59
             }
59 60
         });
60 61
     }

+ 1
- 1
android/app/src/main/java/com/reactnativenavigation/views/BottomTabs.java View File

@@ -27,7 +27,7 @@ public class BottomTabs extends AHBottomNavigation {
27 27
 
28 28
     public void addTabs(List<ScreenParams> params, OnTabSelectedListener onTabSelectedListener) {
29 29
         for (ScreenParams screenParams : params) {
30
-            AHBottomNavigationItem item = new AHBottomNavigationItem(screenParams.title, screenParams.tabIcon,
30
+            AHBottomNavigationItem item = new AHBottomNavigationItem(screenParams.tabLabel, screenParams.tabIcon,
31 31
                     Color.GRAY);
32 32
             addItem(item);
33 33
             setOnTabSelectedListener(onTabSelectedListener);

+ 1
- 1
package.json View File

@@ -7,7 +7,7 @@
7 7
     "type": "git",
8 8
     "url": "https://github.com/wix/react-native-navigation.git"
9 9
   },
10
-  "version": "2.0.0-experimental.78",
10
+  "version": "2.0.0-experimental.82",
11 11
   "description": "React Native Navigation - truly native navigation for iOS and Android",
12 12
   "nativePackage": true,
13 13
   "bugs": {