Switch fab on ViewPager screen change

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

@@ -1,17 +1,19 @@
 package com.reactnativenavigation.events;
 
+import com.reactnativenavigation.params.FabParams;
 import com.reactnativenavigation.params.ScreenParams;
+import com.reactnativenavigation.params.TopTabParams;
 
 public class ScreenChangedEvent implements Event {
     public static final String TYPE = "ScreenChangedEvent";
-    private ScreenParams screenParams;
+    public FabParams fabParams;
 
     public ScreenChangedEvent(ScreenParams screenParams) {
-        this.screenParams = screenParams;
+        this.fabParams = screenParams.fabParams;
     }
 
-    public ScreenParams getScreenParams() {
-        return screenParams;
+    public ScreenChangedEvent(TopTabParams topTabParams) {
+        this.fabParams = topTabParams.fabParams;
     }
 
     @Override

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

@@ -21,7 +21,6 @@ import com.reactnativenavigation.views.SnackbarAndFabContainer;
 import java.util.List;
 
 import static android.view.ViewGroup.LayoutParams.MATCH_PARENT;
-import static android.view.ViewGroup.LayoutParams.WRAP_CONTENT;
 
 public class SingleScreenLayout extends RelativeLayout implements Layout {
 
@@ -48,7 +47,7 @@ public class SingleScreenLayout extends RelativeLayout implements Layout {
             sideMenu = createSideMenu();
             createStack(getScreenStackParent());
         }
-        createSnackbarContainer();
+        createFabAndSnackbarContainer();
     }
 
     private RelativeLayout getScreenStackParent() {
@@ -76,9 +75,9 @@ public class SingleScreenLayout extends RelativeLayout implements Layout {
         stack.show();
     }
 
-    private void createSnackbarContainer() {
+    private void createFabAndSnackbarContainer() {
         snackbarAndFabContainer = new SnackbarAndFabContainer(getContext());
-        RelativeLayout.LayoutParams lp = new LayoutParams(MATCH_PARENT, WRAP_CONTENT);
+        RelativeLayout.LayoutParams lp = new LayoutParams(MATCH_PARENT, MATCH_PARENT);
         lp.addRule(ALIGN_PARENT_BOTTOM);
         snackbarAndFabContainer.setLayoutParams(lp);
         getScreenStackParent().addView(snackbarAndFabContainer);

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

@@ -1,7 +1,12 @@
 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/ButtonParser.java

@@ -0,0 +1,45 @@
+package com.reactnativenavigation.params.parsers;
+
+import android.os.Bundle;
+
+import com.reactnativenavigation.params.FabParams;
+import com.reactnativenavigation.params.TitleBarButtonParams;
+import com.reactnativenavigation.params.TitleBarLeftButtonParams;
+
+import java.util.List;
+
+public class ButtonParser extends Parser {
+    private static final String KEY_RIGHT_BUTTONS = "rightButtons";
+    private static final String KEY_LEFT_BUTTON = "leftButton";
+    private static final String KEY_FAB = "fab";
+    private static final String KEY_BACK_BUTTON_HIDDEN = "backButtonHidden";
+
+    public static List<TitleBarButtonParams> parseRightButton(Bundle params) {
+        List<TitleBarButtonParams> rightButtons = null;
+        if (hasKey(params, KEY_RIGHT_BUTTONS)) {
+            rightButtons = new TitleBarButtonParamsParser().parseButtons(params.getBundle(KEY_RIGHT_BUTTONS));
+        }
+        return rightButtons;
+    }
+
+    public static TitleBarLeftButtonParams parseLeftButton(Bundle params) {
+        TitleBarLeftButtonParams leftButton = null;
+        if (hasKey(params, KEY_LEFT_BUTTON)) {
+            leftButton =  new TitleBarLeftButtonParamsParser().parseSingleButton(params.getBundle(KEY_LEFT_BUTTON));
+
+            boolean backButtonHidden = params.getBoolean(KEY_BACK_BUTTON_HIDDEN, false);
+            if (backButtonHidden && leftButton.isBackButton()) {
+                leftButton = null;
+            }
+        }
+        return leftButton;
+    }
+
+    public static FabParams parseFab(Bundle params) {
+        FabParams fabParams = null;
+        if (hasKey(params, KEY_FAB)) {
+            fabParams = new FabParamsParser().parse(params.getBundle(KEY_FAB));
+        }
+        return fabParams;
+    }
+}

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

@@ -3,11 +3,8 @@ package com.reactnativenavigation.params.parsers;
 import android.graphics.drawable.Drawable;
 import android.os.Bundle;
 
-import com.reactnativenavigation.params.FabParams;
 import com.reactnativenavigation.params.NavigationParams;
 import com.reactnativenavigation.params.ScreenParams;
-import com.reactnativenavigation.params.TitleBarButtonParams;
-import com.reactnativenavigation.params.TitleBarLeftButtonParams;
 import com.reactnativenavigation.params.TopTabParams;
 import com.reactnativenavigation.react.ImageLoader;
 
@@ -17,10 +14,6 @@ public class ScreenParamsParser extends Parser {
     private static final String KEY_TITLE = "title";
     private static final String KEY_SCREEN_ID = "screenId";
     private static final String KEY_NAVIGATION_PARAMS = "navigationParams";
-    private static final String KEY_RIGHT_BUTTONS = "rightButtons";
-    private static final String KEY_LEFT_BUTTON = "leftButton";
-    private static final String KEY_FAB = "fab";
-    private static final String KEY_BACK_BUTTON_HIDDEN = "backButtonHidden";
     private static final String STYLE_PARAMS = "styleParams";
     private static final String TOP_TABS = "topTabs";
     private static final String FRAGMENT_CREATOR_CLASS_NAME = "fragmentCreatorClassName";
@@ -37,9 +30,9 @@ public class ScreenParamsParser extends Parser {
         result.styleParams = new StyleParamsParser(params.getBundle(STYLE_PARAMS)).parse();
 
         result.title = params.getString(KEY_TITLE);
-        result.rightButtons = parseRightButton(params);
+        result.rightButtons = ButtonParser.parseRightButton(params);
         result.overrideBackPressInJs = params.getBoolean(OVERRIDE_BACK_PRESS, false);
-        result.leftButton = parseLeftButton(params);
+        result.leftButton = ButtonParser.parseLeftButton(params);
 
         result.topTabParams = parseTopTabs(params);
 
@@ -48,7 +41,7 @@ public class ScreenParamsParser extends Parser {
             result.fragmentCreatorPassProps = params.getBundle(FRAGMENT_CREATOR_PASS_PROPS);
         }
 
-        result.fabParams = parseFab(params);
+        result.fabParams = ButtonParser.parseFab(params);
 
         result.tabLabel = getTabLabel(params);
         result.tabIcon = getTabIcon(params);
@@ -82,35 +75,6 @@ public class ScreenParamsParser extends Parser {
         return topTabParams;
     }
 
-    private static List<TitleBarButtonParams> parseRightButton(Bundle params) {
-        List<TitleBarButtonParams> rightButtons = null;
-        if (hasKey(params, KEY_RIGHT_BUTTONS)) {
-            rightButtons = new TitleBarButtonParamsParser().parseButtons(params.getBundle(KEY_RIGHT_BUTTONS));
-        }
-        return rightButtons;
-    }
-
-    private static TitleBarLeftButtonParams parseLeftButton(Bundle params) {
-        TitleBarLeftButtonParams leftButton = null;
-        if (hasKey(params, KEY_LEFT_BUTTON)) {
-            leftButton =  new TitleBarLeftButtonParamsParser().parseSingleButton(params.getBundle(KEY_LEFT_BUTTON));
-
-            boolean backButtonHidden = params.getBoolean(KEY_BACK_BUTTON_HIDDEN, false);
-            if (backButtonHidden && leftButton.isBackButton()) {
-                leftButton = null;
-            }
-        }
-        return leftButton;
-    }
-
-    private static FabParams parseFab(Bundle params) {
-        FabParams fabParams = null;
-        if (hasKey(params, KEY_FAB)) {
-            fabParams = new FabParamsParser().parse(params.getBundle(KEY_FAB));
-        }
-        return fabParams;
-    }
-
     public List<ScreenParams> parseTabs(Bundle params) {
         return parseBundle(params, new ParseStrategy<ScreenParams>() {
             @Override

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

@@ -29,6 +29,9 @@ public class TopTabParamsParser extends Parser {
         result.screenId = params.getString(KEY_SCREEN_ID);
         result.title = params.getString(KEY_TITLE);
         result.navigationParams = new NavigationParams(params.getBundle(NAVIGATION_PARAMS));
+        result.leftButton = ButtonParser.parseLeftButton(params);
+        result.rightButtons = ButtonParser.parseRightButton(params);
+        result.fabParams = ButtonParser.parseFab(params);
         return result;
     }
 }

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

@@ -1,6 +1,7 @@
 package com.reactnativenavigation.screens;
 
 import android.support.v4.view.PagerAdapter;
+import android.support.v4.view.ViewPager;
 import android.view.View;
 import android.view.ViewGroup;
 
@@ -14,8 +15,7 @@ import com.reactnativenavigation.views.ContentView;
 
 import java.util.List;
 
-public class ContentViewPagerAdapter extends PagerAdapter {
-
+public class ContentViewPagerAdapter extends PagerAdapter implements ViewPager.OnPageChangeListener {
     private List<ContentView> contentViews;
     private List<TopTabParams> topTabParams;
     private int currentPosition = 0;
@@ -31,38 +31,40 @@ public class ContentViewPagerAdapter extends PagerAdapter {
     }
 
     @Override
-    public void setPrimaryItem(ViewGroup container, int position, Object object) {
-        super.setPrimaryItem(container, position, object);
-        if (position != currentPosition) {
-            currentPosition = position;
-            sendScreenChangeBroadcast();
-            sendTabSelectedEventToJs();
-        }
+    public int getCount() {
+        return contentViews.size();
     }
 
-    private void sendScreenChangeBroadcast() {
-        // TODO Send navigatorParams to native. -guyca
-        EventBus.instance.post(new ScreenChangedEvent(null));
+    @Override
+    public boolean isViewFromObject(View view, Object object) {
+        return view == object;
     }
 
-    private void sendTabSelectedEventToJs() {
-        WritableMap data = Arguments.createMap();
-        String navigatorEventId = contentViews.get(currentPosition).getNavigatorEventId();
-        NavigationApplication.instance.sendNavigatorEvent("tabSelected", navigatorEventId, data);
+    @Override
+    public CharSequence getPageTitle(int position) {
+        return topTabParams.get(position).title;
     }
 
     @Override
-    public int getCount() {
-        return contentViews.size();
+    public void onPageScrolled(int position, float positionOffset, int positionOffsetPixels) {
+
     }
 
     @Override
-    public boolean isViewFromObject(View view, Object object) {
-        return view == object;
+    public void onPageSelected(int position) {
+        currentPosition = position;
+        EventBus.instance.post(new ScreenChangedEvent(topTabParams.get(currentPosition)));
+        sendTabSelectedEventToJs();
     }
 
     @Override
-    public CharSequence getPageTitle(int position) {
-        return topTabParams.get(position).title;
+    public void onPageScrollStateChanged(int state) {
+
+    }
+
+    private void sendTabSelectedEventToJs() {
+        WritableMap data = Arguments.createMap();
+        String navigatorEventId = contentViews.get(currentPosition).getNavigatorEventId();
+        NavigationApplication.instance.sendNavigatorEvent("tabSelected", navigatorEventId, data);
     }
 }

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

@@ -54,6 +54,7 @@ public class ViewPagerScreen extends Screen {
     private void setupViewPager(TabLayout tabLayout) {
         ContentViewPagerAdapter adapter = new ContentViewPagerAdapter(contentViews, screenParams.topTabParams);
         viewPager.setAdapter(adapter);
+        viewPager.addOnPageChangeListener(adapter);
         tabLayout.setupWithViewPager(viewPager);
     }
 

android/app/src/main/java/com/reactnativenavigation/views/FloatingActionButtonCoordinator.java

@@ -6,6 +6,7 @@ import android.content.res.ColorStateList;
 import android.graphics.drawable.Drawable;
 import android.support.annotation.FloatRange;
 import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
 import android.support.design.widget.CoordinatorLayout;
 import android.support.design.widget.FloatingActionButton;
 import android.view.Gravity;
@@ -46,9 +47,15 @@ public class FloatingActionButtonCoordinator {
         show();
     }
 
-    public void remove(final Runnable onComplete) {
+    public void remove() {
+        remove(null);
+    }
+
+    public void remove(@Nullable final Runnable onComplete) {
         if (parent.getChildCount() == 0) {
-            onComplete.run();
+            if (onComplete != null) {
+                onComplete.run();
+            }
             return;
         }
 
@@ -56,7 +63,9 @@ public class FloatingActionButtonCoordinator {
             @Override
             public void onAnimationEnd(Animator animation) {
                 removeAllViews();
-                onComplete.run();
+                if (onComplete != null) {
+                    onComplete.run();
+                }
             }
         });
         removeFabFromScreen(collapsedFab, null);

android/app/src/main/java/com/reactnativenavigation/views/SnackbarAndFabContainer.java

@@ -7,7 +7,7 @@ import com.reactnativenavigation.events.Event;
 import com.reactnativenavigation.events.EventBus;
 import com.reactnativenavigation.events.ScreenChangedEvent;
 import com.reactnativenavigation.events.Subscriber;
-import com.reactnativenavigation.params.ScreenParams;
+import com.reactnativenavigation.params.FabParams;
 import com.reactnativenavigation.params.SnackbarParams;
 
 public class SnackbarAndFabContainer extends CoordinatorLayout implements Snakbar.OnDismissListener, Subscriber{
@@ -39,13 +39,13 @@ public class SnackbarAndFabContainer extends CoordinatorLayout implements Snakba
     @Override
     public void onEvent(Event event) {
         if (event.getType() == ScreenChangedEvent.TYPE) {
-            onScreenChange(((ScreenChangedEvent) event).getScreenParams());
+            onScreenChange(((ScreenChangedEvent) event).fabParams);
         }
     }
 
-    private void onScreenChange(ScreenParams screenParams) {
+    private void onScreenChange(FabParams fabParams) {
         dismissSnackbar();
-        updateFab(screenParams);
+        updateFab(fabParams);
     }
 
     private void dismissSnackbar() {
@@ -55,12 +55,12 @@ public class SnackbarAndFabContainer extends CoordinatorLayout implements Snakba
         }
     }
 
-    private void updateFab(final ScreenParams screenParams) {
+    private void updateFab(final FabParams fabParams) {
         fabCoordinator.remove(new Runnable() {
             @Override
             public void run() {
-                if (screenParams.fabParams != null) {
-                    fabCoordinator.add(screenParams.fabParams);
+                if (fabParams != null) {
+                    fabCoordinator.add(fabParams);
                 }
             }
         });

src/deprecated/platformSpecificDeprecated.android.js

@@ -40,6 +40,8 @@ function adaptTopTabs(screen, navigatorID) {
     if (navigatorID) {
       tab.navigatorID = navigatorID;
     }
+    tab.screen = tab.screenId;
+    addNavigatorButtons(tab);
     adaptNavigationParams(tab);
   });
 }