Преглед на файлове

Merge pull request #1 from wix/master

merge upstream
DanielZlotin преди 8 години
родител
ревизия
ef595e93a0

+ 1
- 0
android/app/src/main/java/com/reactnativenavigation/screens/ScreenStack.java Целия файл

55
             @Override
55
             @Override
56
             public void onDisplay() {
56
             public void onDisplay() {
57
                 screen.show(initialScreenParams.animateScreenTransitions);
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 Целия файл

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

+ 1
- 1
package.json Целия файл

7
     "type": "git",
7
     "type": "git",
8
     "url": "https://github.com/wix/react-native-navigation.git"
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
   "description": "React Native Navigation - truly native navigation for iOS and Android",
11
   "description": "React Native Navigation - truly native navigation for iOS and Android",
12
   "nativePackage": true,
12
   "nativePackage": true,
13
   "bugs": {
13
   "bugs": {