Animate fab in and out when screen changes

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

@@ -1,7 +1,18 @@
 package com.reactnativenavigation.events;
 
+import com.reactnativenavigation.params.ScreenParams;
+
 public class ScreenChangedEvent implements Event {
     public static final String TYPE = "ScreenChangedEvent";
+    private ScreenParams screenParams;
+
+    public ScreenChangedEvent(ScreenParams screenParams) {
+        this.screenParams = screenParams;
+    }
+
+    public ScreenParams getScreenParams() {
+        return screenParams;
+    }
 
     @Override
     public String getType() {

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

@@ -8,8 +8,9 @@ import android.widget.RelativeLayout;
 
 import com.aurelhubert.ahbottomnavigation.AHBottomNavigation;
 import com.reactnativenavigation.NavigationApplication;
+import com.reactnativenavigation.events.EventBus;
+import com.reactnativenavigation.events.ScreenChangedEvent;
 import com.reactnativenavigation.params.ActivityParams;
-import com.reactnativenavigation.params.FabParams;
 import com.reactnativenavigation.params.ScreenParams;
 import com.reactnativenavigation.params.SideMenuParams;
 import com.reactnativenavigation.params.SnackbarParams;
@@ -52,7 +53,6 @@ public class BottomTabsLayout extends RelativeLayout implements Layout, AHBottom
         addScreenStacks();
         createSnackbarContainer();
         showInitialScreenStack();
-        showFab();
     }
 
     private void createSideMenu() {
@@ -110,13 +110,7 @@ public class BottomTabsLayout extends RelativeLayout implements Layout, AHBottom
 
     private void showInitialScreenStack() {
         showStackAndUpdateStyle(screenStacks[0]);
-    }
-
-    private void showFab() {
-        FabParams fabParams = getCurrentScreenStack().peek().getFabParams();
-        if (fabParams != null) {
-            snackbarAndFabContainer.showFab(fabParams);
-        }
+        EventBus.instance.post(new ScreenChangedEvent(screenStacks[0].peek().getScreenParams()));
     }
 
     @Override
@@ -207,31 +201,31 @@ public class BottomTabsLayout extends RelativeLayout implements Layout, AHBottom
     }
 
     @Override
-    public void push(ScreenParams screenParams) {
-        ScreenStack screenStack = getScreenStack(screenParams.getNavigatorId());
-        screenStack.push(screenParams, createScreenLayoutParams(screenParams));
+    public void push(ScreenParams params) {
+        ScreenStack screenStack = getScreenStack(params.getNavigatorId());
+        screenStack.push(params, createScreenLayoutParams(params));
         if (isCurrentStack(screenStack)) {
-            bottomTabs.setStyleFromScreen(screenParams.styleParams);
+            bottomTabs.setStyleFromScreen(params.styleParams);
         }
-        snackbarAndFabContainer.onScreenChange();
+        EventBus.instance.post(new ScreenChangedEvent(params));
     }
 
     @Override
-    public void pop(ScreenParams screenParams) {
-        getCurrentScreenStack().pop(screenParams.animateScreenTransitions, new ScreenStack.OnScreenPop() {
+    public void pop(ScreenParams params) {
+        getCurrentScreenStack().pop(params.animateScreenTransitions, new ScreenStack.OnScreenPop() {
             @Override
             public void onScreenPopAnimationEnd() {
                 setBottomTabsStyleFromCurrentScreen();
             }
         });
-        snackbarAndFabContainer.onScreenChange();
+        EventBus.instance.post(new ScreenChangedEvent(getCurrentScreenStack().peek().getScreenParams()));
     }
 
     @Override
     public void popToRoot(ScreenParams params) {
         getCurrentScreenStack().popToRoot(params.animateScreenTransitions);
         setBottomTabsStyleFromCurrentScreen();
-        snackbarAndFabContainer.onScreenChange();
+        EventBus.instance.post(new ScreenChangedEvent(getCurrentScreenStack().peek().getScreenParams()));
     }
 
     @Override
@@ -246,7 +240,7 @@ public class BottomTabsLayout extends RelativeLayout implements Layout, AHBottom
         screenStacks[currentStackIndex] = newStack;
 
         bottomTabs.setStyleFromScreen(params.styleParams);
-        snackbarAndFabContainer.onScreenChange();
+        EventBus.instance.post(new ScreenChangedEvent(params));
     }
 
     @Override
@@ -264,7 +258,7 @@ public class BottomTabsLayout extends RelativeLayout implements Layout, AHBottom
     public boolean onTabSelected(int position, boolean wasSelected) {
         hideCurrentStack();
         showNewStack(position);
-        snackbarAndFabContainer.onScreenChange();
+        EventBus.instance.post(new ScreenChangedEvent(getCurrentScreenStack().peek().getScreenParams()));
         return true;
     }
 

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

@@ -6,6 +6,8 @@ import android.view.View;
 import android.widget.RelativeLayout;
 
 import com.reactnativenavigation.NavigationApplication;
+import com.reactnativenavigation.events.EventBus;
+import com.reactnativenavigation.events.ScreenChangedEvent;
 import com.reactnativenavigation.params.ScreenParams;
 import com.reactnativenavigation.params.SideMenuParams;
 import com.reactnativenavigation.params.SnackbarParams;
@@ -109,26 +111,26 @@ public class SingleScreenLayout extends RelativeLayout implements Layout {
     public void push(ScreenParams params) {
         LayoutParams lp = new LayoutParams(MATCH_PARENT, MATCH_PARENT);
         stack.push(params, lp);
-        snackbarAndFabContainer.onScreenChange();
+        EventBus.instance.post(new ScreenChangedEvent(params));
     }
 
     @Override
     public void pop(ScreenParams params) {
         stack.pop(params.animateScreenTransitions);
-        snackbarAndFabContainer.onScreenChange();
+        EventBus.instance.post(new ScreenChangedEvent(stack.peek().getScreenParams()));
     }
 
     @Override
     public void popToRoot(ScreenParams params) {
         stack.popToRoot(params.animateScreenTransitions);
-        snackbarAndFabContainer.onScreenChange();
+        EventBus.instance.post(new ScreenChangedEvent(stack.peek().getScreenParams()));
     }
 
     @Override
     public void newStack(ScreenParams params) {
         RelativeLayout parent = sideMenu == null ? this : sideMenu.getContentContainer();
         createStack(parent);
-        snackbarAndFabContainer.onScreenChange();
+        EventBus.instance.post(new ScreenChangedEvent(params));
     }
 
     @Override

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

@@ -41,7 +41,8 @@ public class ContentViewPagerAdapter extends PagerAdapter {
     }
 
     private void sendScreenChangeBroadcast() {
-        EventBus.instance.post(new ScreenChangedEvent());
+        // TODO Send navigatorParams to native. -guyca
+        EventBus.instance.post(new ScreenChangedEvent(null));
     }
 
     private void sendTabSelectedEventToJs() {

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

@@ -9,7 +9,6 @@ import android.view.Window;
 import android.widget.RelativeLayout;
 
 import com.reactnativenavigation.animation.VisibilityAnimator;
-import com.reactnativenavigation.params.FabParams;
 import com.reactnativenavigation.params.ScreenParams;
 import com.reactnativenavigation.params.StyleParams;
 import com.reactnativenavigation.params.TitleBarButtonParams;
@@ -137,8 +136,8 @@ public abstract class Screen extends RelativeLayout {
         return screenParams.getNavigatorEventId();
     }
 
-    public FabParams getFabParams() {
-        return screenParams.fabParams;
+    public ScreenParams getScreenParams() {
+        return screenParams;
     }
 
     public void setTopBarVisible(boolean visible, boolean animate) {

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

@@ -31,15 +31,68 @@ public class FloatingActionButtonCoordinator {
     final int margin = (int) ViewUtils.convertDpToPixel(16);
     private final ArrayList<FloatingActionButton> actions;
 
-    public FloatingActionButtonCoordinator(CoordinatorLayout parent, FabParams params) {
+    public FloatingActionButtonCoordinator(CoordinatorLayout parent) {
         this.parent = parent;
-        this.params = params;
         actions = new ArrayList<>();
         crossFadeAnimationDuration = parent.getResources().getInteger(android.R.integer.config_shortAnimTime);
         actionSize = (int) ViewUtils.convertDpToPixel(40);
+    }
+
+    public void add(FabParams params) {
+        this.params = params;
         createCollapsedFab();
         createExpendedFab();
         setStyle();
+        show();
+    }
+
+    public void remove(final Runnable onComplete) {
+        if (parent.getChildCount() == 0) {
+            onComplete.run();
+            return;
+        }
+
+        removeFabFromScreen(expendedFab, new AnimatorListenerAdapter() {
+            @Override
+            public void onAnimationEnd(Animator animation) {
+                removeAllViews();
+                onComplete.run();
+            }
+        });
+        removeFabFromScreen(collapsedFab, null);
+        removeActionsFromScreen();
+    }
+
+    private void removeActionsFromScreen() {
+        for (FloatingActionButton action : actions) {
+            action.animate()
+                    .alpha(0)
+                    .scaleX(0)
+                    .scaleY(0)
+                    .setDuration(crossFadeAnimationDuration)
+                    .start();
+        }
+    }
+
+    private void removeFabFromScreen(FloatingActionButton fab, AnimatorListenerAdapter animationListener) {
+        fab.animate()
+                .alpha(0)
+                .scaleX(0)
+                .scaleY(0)
+                .setDuration(crossFadeAnimationDuration)
+                .setListener(animationListener)
+                .start();
+    }
+
+    private void removeAllViews() {
+        parent.removeView(collapsedFab);
+        parent.removeView(expendedFab);
+        collapsedFab = null;
+        expendedFab = null;
+        for (FloatingActionButton action : actions) {
+            parent.removeView(action);
+        }
+        actions.clear();
     }
 
     private void createCollapsedFab() {
@@ -127,8 +180,15 @@ public class FloatingActionButtonCoordinator {
         expendedFab.setBackgroundTintList(ColorStateList.valueOf(params.backgroundColor.getColor()));
     }
 
-    public void show() {
-
+    private void show() {
+        collapsedFab.setScaleX(0);
+        collapsedFab.setScaleY(0);
+        collapsedFab.animate()
+                .alpha(1)
+                .scaleX(1)
+                .scaleY(1)
+                .setDuration(crossFadeAnimationDuration)
+                .start();
     }
 
     private void showActions() {

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

@@ -1,22 +1,22 @@
 package com.reactnativenavigation.views;
 
 import android.content.Context;
-import android.support.annotation.NonNull;
 import android.support.design.widget.CoordinatorLayout;
 
 import com.reactnativenavigation.events.Event;
 import com.reactnativenavigation.events.EventBus;
 import com.reactnativenavigation.events.ScreenChangedEvent;
 import com.reactnativenavigation.events.Subscriber;
-import com.reactnativenavigation.params.FabParams;
+import com.reactnativenavigation.params.ScreenParams;
 import com.reactnativenavigation.params.SnackbarParams;
 
 public class SnackbarAndFabContainer extends CoordinatorLayout implements Snakbar.OnDismissListener, Subscriber{
     private Snakbar snakbar;
-    private FloatingActionButtonCoordinator actionButtonCoordinator;
+    private FloatingActionButtonCoordinator fabCoordinator;
 
     public SnackbarAndFabContainer(Context context) {
         super(context);
+        fabCoordinator = new FloatingActionButtonCoordinator(this);
         EventBus.instance.register(this);
     }
 
@@ -25,13 +25,6 @@ public class SnackbarAndFabContainer extends CoordinatorLayout implements Snakba
         snakbar.show();
     }
 
-    public void onScreenChange() {
-        if (snakbar != null) {
-            snakbar.dismiss();
-            snakbar = null;
-        }
-    }
-
     @Override
     public void onDismiss(Snakbar snakbar) {
         if (this.snakbar == snakbar) {
@@ -43,14 +36,33 @@ public class SnackbarAndFabContainer extends CoordinatorLayout implements Snakba
         EventBus.instance.unregister(this);
     }
 
-    public void showFab(@NonNull FabParams fabParams) {
-        actionButtonCoordinator = new FloatingActionButtonCoordinator(this, fabParams);
-    }
-
     @Override
     public void onEvent(Event event) {
         if (event.getType() == ScreenChangedEvent.TYPE) {
-            onScreenChange();
+            onScreenChange(((ScreenChangedEvent) event).getScreenParams());
+        }
+    }
+
+    private void onScreenChange(ScreenParams screenParams) {
+        dismissSnackbar();
+        updateFab(screenParams);
+    }
+
+    private void dismissSnackbar() {
+        if (snakbar != null) {
+            snakbar.dismiss();
+            snakbar = null;
         }
     }
+
+    private void updateFab(final ScreenParams screenParams) {
+        fabCoordinator.remove(new Runnable() {
+            @Override
+            public void run() {
+                if (screenParams.fabParams != null) {
+                    fabCoordinator.add(screenParams.fabParams);
+                }
+            }
+        });
+    }
 }