Merge branch 'master' of https://github.com/wix/react-native-navigation

android/app/src/main/java/com/reactnativenavigation/controllers/ModalController.java

@@ -2,6 +2,8 @@ package com.reactnativenavigation.controllers;
 
 import android.support.v7.app.AppCompatActivity;
 
+import com.reactnativenavigation.events.EventBus;
+import com.reactnativenavigation.events.ModalDismissedEvent;
 import com.reactnativenavigation.layouts.ScreenStackContainer;
 import com.reactnativenavigation.params.ScreenParams;
 import com.reactnativenavigation.params.TitleBarButtonParams;
@@ -72,6 +74,7 @@ public class ModalController implements ScreenStackContainer, Modal.OnModalDismi
     @Override
     public void onModalDismissed(Modal modal) {
         stack.remove(modal);
+        EventBus.instance.post(new ModalDismissedEvent());
     }
 
     public void setTopBarVisible(String screenInstanceId, boolean hidden, boolean animated) {

android/app/src/main/java/com/reactnativenavigation/controllers/NavigationActivity.java

@@ -7,6 +7,10 @@ import android.view.KeyEvent;
 
 import com.facebook.react.modules.core.DefaultHardwareBackBtnHandler;
 import com.reactnativenavigation.NavigationApplication;
+import com.reactnativenavigation.events.Event;
+import com.reactnativenavigation.events.EventBus;
+import com.reactnativenavigation.events.ModalDismissedEvent;
+import com.reactnativenavigation.events.Subscriber;
 import com.reactnativenavigation.layouts.BottomTabsLayout;
 import com.reactnativenavigation.layouts.Layout;
 import com.reactnativenavigation.layouts.LayoutFactory;
@@ -21,7 +25,7 @@ import com.reactnativenavigation.react.RedboxPermission;
 
 import java.util.List;
 
-public class NavigationActivity extends AppCompatActivity implements DefaultHardwareBackBtnHandler, ReactGateway.OnJsDevReloadListener {
+public class NavigationActivity extends AppCompatActivity implements DefaultHardwareBackBtnHandler, ReactGateway.OnJsDevReloadListener, Subscriber {
 
     /**
      * Although we start multiple activities, we make sure to pass Intent.CLEAR_TASK | Intent.NEW_TASK
@@ -79,6 +83,7 @@ public class NavigationActivity extends AppCompatActivity implements DefaultHard
 
         currentActivity = this;
         NavigationApplication.instance.getReactGateway().onResumeActivity(this, this, this);
+        EventBus.instance.register(this);
     }
 
     @Override
@@ -86,6 +91,7 @@ public class NavigationActivity extends AppCompatActivity implements DefaultHard
         super.onPause();
         currentActivity = null;
         NavigationApplication.instance.getReactGateway().onPauseActivity();
+        EventBus.instance.unregister(this);
     }
 
     @Override
@@ -249,4 +255,11 @@ public class NavigationActivity extends AppCompatActivity implements DefaultHard
     public void showSnackbar(SnackbarParams params) {
         layout.showSnackbar(params);
     }
+
+    @Override
+    public void onEvent(Event event) {
+        if (event.getType() == ModalDismissedEvent.TYPE) {
+            layout.onModalDismissed();
+        }
+    }
 }

android/app/src/main/java/com/reactnativenavigation/events/ModalDismissedEvent.java

@@ -0,0 +1,10 @@
+package com.reactnativenavigation.events;
+
+public class ModalDismissedEvent implements Event {
+    public static final String TYPE = "ModalDismissedEvent";
+
+    @Override
+    public String getType() {
+        return TYPE;
+    }
+}

android/app/src/main/java/com/reactnativenavigation/events/ScreenChangedEvent.java

@@ -1,18 +1,18 @@
 package com.reactnativenavigation.events;
 
+import com.reactnativenavigation.params.BaseScreenParams;
 import com.reactnativenavigation.params.FabParams;
-import com.reactnativenavigation.params.ScreenParams;
-import com.reactnativenavigation.params.TopTabParams;
+import com.reactnativenavigation.params.PageParams;
 
 public class ScreenChangedEvent implements Event {
     public static final String TYPE = "ScreenChangedEvent";
     public FabParams fabParams;
 
-    public ScreenChangedEvent(ScreenParams screenParams) {
+    public ScreenChangedEvent(BaseScreenParams screenParams) {
         this.fabParams = screenParams.fabParams;
     }
 
-    public ScreenChangedEvent(TopTabParams topTabParams) {
+    public ScreenChangedEvent(PageParams topTabParams) {
         this.fabParams = topTabParams.fabParams;
     }
 

android/app/src/main/java/com/reactnativenavigation/layouts/BottomTabsLayout.java

@@ -193,6 +193,11 @@ public class BottomTabsLayout extends RelativeLayout implements Layout, AHBottom
         snackbarAndFabContainer.showSnackbar(eventId, params);
     }
 
+    @Override
+    public void onModalDismissed() {
+        EventBus.instance.post(new ScreenChangedEvent(getCurrentScreenStack().peek().getScreenParams()));
+    }
+
     public void selectBottomTabByTabIndex(Integer index) {
         bottomTabs.setCurrentItem(index);
     }

android/app/src/main/java/com/reactnativenavigation/layouts/Layout.java

@@ -28,4 +28,6 @@ public interface Layout extends ScreenStackContainer {
     void setSideMenuVisible(boolean animated, boolean visible);
 
     void showSnackbar(SnackbarParams params);
+
+    void onModalDismissed();
 }

android/app/src/main/java/com/reactnativenavigation/layouts/SingleScreenLayout.java

@@ -100,6 +100,7 @@ public class SingleScreenLayout extends RelativeLayout implements Layout {
 
         if (stack.canPop()) {
             stack.pop(true);
+            EventBus.instance.post(new ScreenChangedEvent(stack.peek().getScreenParams()));
             return true;
         } else {
             return false;
@@ -192,6 +193,11 @@ public class SingleScreenLayout extends RelativeLayout implements Layout {
         snackbarAndFabContainer.showSnackbar(navigatorEventId, params);
     }
 
+    @Override
+    public void onModalDismissed() {
+        EventBus.instance.post(new ScreenChangedEvent(stack.peek().getScreenParams()));
+    }
+
     @Override
     public boolean onTitleBarBackButtonClick() {
         if (leftButtonOnClickListener != null) {

android/app/src/main/java/com/reactnativenavigation/params/BaseScreenParams.java

@@ -0,0 +1,36 @@
+package com.reactnativenavigation.params;
+
+import android.os.Bundle;
+
+import java.util.List;
+
+public class BaseScreenParams {
+    public String screenId;
+    public String title;
+    public NavigationParams navigationParams;
+    public List<TitleBarButtonParams> rightButtons;
+    public TitleBarLeftButtonParams leftButton;
+    public FabParams fabParams;
+
+    public boolean overrideBackPressInJs;
+    public StyleParams styleParams;
+    public String fragmentCreatorClassName;
+    public Bundle fragmentCreatorPassProps;
+    public boolean animateScreenTransitions;
+
+    public boolean isFragmentScreen() {
+        return fragmentCreatorClassName != null;
+    }
+
+    public String getScreenInstanceId() {
+        return navigationParams.screenInstanceId;
+    }
+
+    public String getNavigatorId() {
+        return navigationParams.navigatorId;
+    }
+
+    public String getNavigatorEventId() {
+        return navigationParams.navigatorEventId;
+    }
+}

android/app/src/main/java/com/reactnativenavigation/params/PageParams.java

@@ -0,0 +1,6 @@
+package com.reactnativenavigation.params;
+
+public class PageParams extends BaseScreenParams {
+
+
+}

android/app/src/main/java/com/reactnativenavigation/params/ScreenParams.java

@@ -1,44 +1,17 @@
 package com.reactnativenavigation.params;
 
 import android.graphics.drawable.Drawable;
-import android.os.Bundle;
 
 import java.util.List;
 
-public class ScreenParams {
-    public String screenId;
-    public List<TitleBarButtonParams> rightButtons;
-    public TitleBarLeftButtonParams leftButton;
-    public boolean overrideBackPressInJs;
-    public String title;
-    public StyleParams styleParams;
-    public List<TopTabParams> topTabParams;
-    public String fragmentCreatorClassName;
-    public Bundle fragmentCreatorPassProps;
-    public boolean animateScreenTransitions;
-    public FabParams fabParams;
+public class ScreenParams extends BaseScreenParams {
+
     public String tabLabel;
     public Drawable tabIcon;
-
-    public NavigationParams navigationParams;
+    public List<PageParams> topTabParams;
 
     public boolean hasTopTabs() {
         return topTabParams != null && !topTabParams.isEmpty();
     }
 
-    public boolean isFragmentScreen() {
-        return fragmentCreatorClassName != null;
-    }
-
-    public String getScreenInstanceId() {
-        return navigationParams.screenInstanceId;
-    }
-
-    public String getNavigatorId() {
-        return navigationParams.navigatorId;
-    }
-
-    public String getNavigatorEventId() {
-        return navigationParams.navigatorEventId;
-    }
 }

android/app/src/main/java/com/reactnativenavigation/params/TopTabParams.java

@@ -1,12 +0,0 @@
-package com.reactnativenavigation.params;
-
-import java.util.List;
-
-public class TopTabParams {
-    public String screenId;
-    public String title;
-    public NavigationParams navigationParams;
-    public List<TitleBarButtonParams> rightButtons;
-    public TitleBarLeftButtonParams leftButton;
-    public FabParams fabParams;
-}

android/app/src/main/java/com/reactnativenavigation/params/parsers/ScreenParamsParser.java

@@ -5,7 +5,7 @@ import android.os.Bundle;
 
 import com.reactnativenavigation.params.NavigationParams;
 import com.reactnativenavigation.params.ScreenParams;
-import com.reactnativenavigation.params.TopTabParams;
+import com.reactnativenavigation.params.PageParams;
 import com.reactnativenavigation.react.ImageLoader;
 
 import java.util.List;
@@ -67,8 +67,8 @@ public class ScreenParamsParser extends Parser {
         return tabLabel;
     }
 
-    private static List<TopTabParams> parseTopTabs(Bundle params) {
-        List<TopTabParams> topTabParams = null;
+    private static List<PageParams> parseTopTabs(Bundle params) {
+        List<PageParams> topTabParams = null;
         if (hasKey(params, TOP_TABS)) {
             topTabParams = new TopTabParamsParser().parse(params.getBundle(TOP_TABS));
         }

android/app/src/main/java/com/reactnativenavigation/params/parsers/TopTabParamsParser.java

@@ -4,7 +4,7 @@ import android.os.Bundle;
 import android.support.annotation.NonNull;
 
 import com.reactnativenavigation.params.NavigationParams;
-import com.reactnativenavigation.params.TopTabParams;
+import com.reactnativenavigation.params.PageParams;
 
 import java.util.List;
 
@@ -14,18 +14,18 @@ public class TopTabParamsParser extends Parser {
     private static final String NAVIGATION_PARAMS = "navigationParams";
 
     @SuppressWarnings("ConstantConditions")
-    public List<TopTabParams> parse(Bundle params) {
-        return parseBundle(params, new ParseStrategy<TopTabParams>() {
+    public List<PageParams> parse(Bundle params) {
+        return parseBundle(params, new ParseStrategy<PageParams>() {
             @Override
-            public TopTabParams parse(Bundle topTabs) {
+            public PageParams parse(Bundle topTabs) {
                 return parseItem(topTabs);
             }
         });
     }
 
     @NonNull
-    private static TopTabParams parseItem(Bundle params) {
-        TopTabParams result = new TopTabParams();
+    private static PageParams parseItem(Bundle params) {
+        PageParams result = new PageParams();
         result.screenId = params.getString(KEY_SCREEN_ID);
         result.title = params.getString(KEY_TITLE);
         result.navigationParams = new NavigationParams(params.getBundle(NAVIGATION_PARAMS));

android/app/src/main/java/com/reactnativenavigation/screens/ContentViewPagerAdapter.java

@@ -10,19 +10,19 @@ import com.facebook.react.bridge.WritableMap;
 import com.reactnativenavigation.NavigationApplication;
 import com.reactnativenavigation.events.EventBus;
 import com.reactnativenavigation.events.ScreenChangedEvent;
-import com.reactnativenavigation.params.TopTabParams;
+import com.reactnativenavigation.params.PageParams;
 import com.reactnativenavigation.views.ContentView;
 
 import java.util.List;
 
 public class ContentViewPagerAdapter extends PagerAdapter implements ViewPager.OnPageChangeListener {
     private List<ContentView> contentViews;
-    private List<TopTabParams> topTabParams;
+    private List<PageParams> pageParams;
     private int currentPosition = 0;
 
-    public ContentViewPagerAdapter(List<ContentView> contentViews, List<TopTabParams> topTabParams) {
+    public ContentViewPagerAdapter(List<ContentView> contentViews, List<PageParams> pageParams) {
         this.contentViews = contentViews;
-        this.topTabParams = topTabParams;
+        this.pageParams = pageParams;
     }
 
     @Override
@@ -42,7 +42,7 @@ public class ContentViewPagerAdapter extends PagerAdapter implements ViewPager.O
 
     @Override
     public CharSequence getPageTitle(int position) {
-        return topTabParams.get(position).title;
+        return pageParams.get(position).title;
     }
 
     @Override
@@ -53,7 +53,7 @@ public class ContentViewPagerAdapter extends PagerAdapter implements ViewPager.O
     @Override
     public void onPageSelected(int position) {
         currentPosition = position;
-        EventBus.instance.post(new ScreenChangedEvent(topTabParams.get(currentPosition)));
+        EventBus.instance.post(new ScreenChangedEvent(pageParams.get(currentPosition)));
         sendTabSelectedEventToJs();
     }
 

android/app/src/main/java/com/reactnativenavigation/screens/Screen.java

@@ -9,6 +9,7 @@ import android.view.Window;
 import android.widget.RelativeLayout;
 
 import com.reactnativenavigation.animation.VisibilityAnimator;
+import com.reactnativenavigation.params.BaseScreenParams;
 import com.reactnativenavigation.params.ScreenParams;
 import com.reactnativenavigation.params.StyleParams;
 import com.reactnativenavigation.params.TitleBarButtonParams;
@@ -132,7 +133,7 @@ public abstract class Screen extends RelativeLayout {
         return screenParams.getNavigatorEventId();
     }
 
-    public ScreenParams getScreenParams() {
+    public BaseScreenParams getScreenParams() {
         return screenParams;
     }
 

android/app/src/main/java/com/reactnativenavigation/screens/ViewPagerScreen.java

@@ -4,8 +4,9 @@ import android.support.design.widget.TabLayout;
 import android.support.v4.view.ViewPager;
 import android.support.v7.app.AppCompatActivity;
 
+import com.reactnativenavigation.params.BaseScreenParams;
 import com.reactnativenavigation.params.ScreenParams;
-import com.reactnativenavigation.params.TopTabParams;
+import com.reactnativenavigation.params.PageParams;
 import com.reactnativenavigation.views.ContentView;
 import com.reactnativenavigation.views.LeftButtonOnClickListener;
 
@@ -24,6 +25,11 @@ public class ViewPagerScreen extends Screen {
         super(activity, screenParams, backButtonListener);
     }
 
+    @Override
+    public BaseScreenParams getScreenParams() {
+        return screenParams.topTabParams.get(viewPager.getCurrentItem());
+    }
+
     @Override
     protected void createContent() {
         TabLayout tabLayout = topBar.initTabs();
@@ -44,7 +50,7 @@ public class ViewPagerScreen extends Screen {
 
     private void addPages() {
         contentViews = new ArrayList<>();
-        for (TopTabParams tab : screenParams.topTabParams) {
+        for (PageParams tab : screenParams.topTabParams) {
             ContentView contentView = new ContentView(getContext(), tab.screenId, tab.navigationParams);
             addContent(contentView);
             contentViews.add(contentView);

example-redux/README.md

@@ -4,7 +4,7 @@ A simple usage example for an app based on redux. If you're not using redux, tak
 
 ## Installation - iOS
 
-* In the `example/` folder, run `npm install`
+* In the `example-redux/` folder, run `npm install`
 
 > Make sure you're using npm ver 3. If you normally use npm ver 2 on your system and reluctant to upgrade, you can install [npm 3 alongside 2](https://www.npmjs.com/package/npm3). For more details see https://github.com/wix/react-native-navigation/issues/1. In addition, redux also causes some issues with npm 2. If you have to use npm 2 on this project, fix those by running `npm run fix_npm2` in your project directory after running `npm install`.
 

package.json

@@ -7,7 +7,7 @@
     "type": "git",
     "url": "https://github.com/wix/react-native-navigation.git"
   },
-  "version": "2.0.0-experimental.96",
+  "version": "2.0.0-experimental.97",
   "description": "React Native Navigation - truly native navigation for iOS and Android",
   "nativePackage": true,
   "bugs": {