Browse Source

Merge branch 'master' into v2

Daniel Zlotin 8 years ago
parent
commit
f624aa3974

+ 3
- 1
android/app/src/main/java/com/reactnativenavigation/screens/CollapsingViewPagerScreen.java View File

101
     public void destroy() {
101
     public void destroy() {
102
         super.destroy();
102
         super.destroy();
103
         for (ContentView contentView : contentViews) {
103
         for (ContentView contentView : contentViews) {
104
-            ((CollapsingContentView) contentView).destroy();
104
+            if (contentView instanceof CollapsingContentView) {
105
+                ((CollapsingContentView) contentView).destroy();
106
+            }
105
         }
107
         }
106
     }
108
     }
107
 }
109
 }

+ 2
- 2
src/deprecated/platformSpecificDeprecated.android.js View File

398
 }
398
 }
399
 
399
 
400
 function getFab(screen) {
400
 function getFab(screen) {
401
-  if (screen.fab) {
402
-    const fab = screen.fab;
401
+  if (screen.navigatorButtons && screen.navigatorButtons.fab) {
402
+    const fab = screen.navigatorButtons.fab;
403
     const collapsedIconUri = resolveAssetSource(fab.collapsedIcon);
403
     const collapsedIconUri = resolveAssetSource(fab.collapsedIcon);
404
     if (!collapsedIconUri) {
404
     if (!collapsedIconUri) {
405
       return;
405
       return;