Fixes overlapping fab. (#620)

This commit also introduces a tempprary fix to an issue where fab is
displayed on wrong screen when switching between bottom tabs rapidly.

android/app/src/main/java/com/reactnativenavigation/bridge/NavigationReactModule.java

@@ -98,7 +98,7 @@ public class NavigationReactModule extends ReactContextBaseJavaModule {
     }
 
     private void setScreenFab(String screenInstanceId, String navigatorEventId, ReadableMap fab) {
-        FabParams fabParams = new FabParamsParser().parse(BundleConverter.toBundle(fab), navigatorEventId);
+        FabParams fabParams = new FabParamsParser().parse(BundleConverter.toBundle(fab), navigatorEventId, screenInstanceId);
         NavigationCommandsHandler.setScreenFab(screenInstanceId, navigatorEventId, fabParams);
     }
 

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

@@ -21,6 +21,7 @@ import com.reactnativenavigation.params.SideMenuParams;
 import com.reactnativenavigation.params.SnackbarParams;
 import com.reactnativenavigation.params.TitleBarButtonParams;
 import com.reactnativenavigation.params.TitleBarLeftButtonParams;
+import com.reactnativenavigation.screens.Screen;
 import com.reactnativenavigation.screens.ScreenStack;
 import com.reactnativenavigation.views.BottomTabs;
 import com.reactnativenavigation.views.SideMenu;
@@ -110,7 +111,7 @@ public class BottomTabsLayout extends RelativeLayout implements Layout, AHBottom
     }
 
     private void createSnackbarContainer() {
-        snackbarAndFabContainer = new SnackbarAndFabContainer(getContext());
+        snackbarAndFabContainer = new SnackbarAndFabContainer(getContext(), this);
         RelativeLayout.LayoutParams lp = new RelativeLayout.LayoutParams(MATCH_PARENT, MATCH_PARENT);
         lp.addRule(ABOVE, bottomTabs.getId());
         getScreenStackParent().addView(snackbarAndFabContainer, lp);
@@ -229,6 +230,11 @@ public class BottomTabsLayout extends RelativeLayout implements Layout, AHBottom
         getCurrentScreenStack().peek().dismissContextualMenu();
     }
 
+    @Override
+    public Screen getCurrentScreen() {
+        return getCurrentScreenStack().peek();
+    }
+
     public void selectBottomTabByTabIndex(Integer index) {
         bottomTabs.setCurrentItem(index);
     }

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

@@ -8,6 +8,7 @@ import com.reactnativenavigation.params.FabParams;
 import com.reactnativenavigation.params.SnackbarParams;
 import com.reactnativenavigation.params.TitleBarButtonParams;
 import com.reactnativenavigation.params.TitleBarLeftButtonParams;
+import com.reactnativenavigation.screens.Screen;
 import com.reactnativenavigation.views.SideMenu.Side;
 
 import java.util.List;
@@ -42,4 +43,6 @@ public interface Layout extends ScreenStackContainer {
     void showContextualMenu(String screenInstanceId, ContextualMenuParams params, Callback onButtonClicked);
 
     void dismissContextualMenu(String screenInstanceId);
+
+    Screen getCurrentScreen();
 }

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

@@ -16,6 +16,7 @@ import com.reactnativenavigation.params.SideMenuParams;
 import com.reactnativenavigation.params.SnackbarParams;
 import com.reactnativenavigation.params.TitleBarButtonParams;
 import com.reactnativenavigation.params.TitleBarLeftButtonParams;
+import com.reactnativenavigation.screens.Screen;
 import com.reactnativenavigation.screens.ScreenStack;
 import com.reactnativenavigation.views.LeftButtonOnClickListener;
 import com.reactnativenavigation.views.SideMenu;
@@ -92,7 +93,7 @@ public class SingleScreenLayout extends RelativeLayout implements Layout {
     }
 
     private void createFabAndSnackbarContainer() {
-        snackbarAndFabContainer = new SnackbarAndFabContainer(getContext());
+        snackbarAndFabContainer = new SnackbarAndFabContainer(getContext(), this);
         RelativeLayout.LayoutParams lp = new LayoutParams(MATCH_PARENT, MATCH_PARENT);
         lp.addRule(ALIGN_PARENT_BOTTOM);
         snackbarAndFabContainer.setLayoutParams(lp);
@@ -231,6 +232,11 @@ public class SingleScreenLayout extends RelativeLayout implements Layout {
         stack.dismissContextualMenu(screenInstanceId);
     }
 
+    @Override
+    public Screen getCurrentScreen() {
+        return stack.peek();
+    }
+
     @Override
     public boolean onTitleBarBackButtonClick() {
         if (leftButtonOnClickListener != null) {

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

@@ -12,6 +12,7 @@ public class FabParams {
     public String expendedId;
     public String navigatorEventId;
     public List<FabActionParams> actions;
+    public String screenInstanceId;
 
     public boolean hasExpendedState() {
         return actions != null && actions.size() > 0;

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

@@ -35,10 +35,10 @@ public class ButtonParser extends Parser {
         return leftButton;
     }
 
-    public static FabParams parseFab(Bundle params, String navigatorEventId) {
+    public static FabParams parseFab(Bundle params, String navigatorEventId, String screenInstanceId) {
         FabParams fabParams = null;
         if (hasKey(params, KEY_FAB)) {
-            fabParams = new FabParamsParser().parse(params.getBundle(KEY_FAB), navigatorEventId);
+            fabParams = new FabParamsParser().parse(params.getBundle(KEY_FAB), navigatorEventId, screenInstanceId);
         }
         return fabParams;
     }

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

@@ -8,11 +8,12 @@ import com.reactnativenavigation.params.StyleParams;
 import com.reactnativenavigation.react.ImageLoader;
 
 public class FabParamsParser extends Parser {
-    public FabParams parse(Bundle params, final String navigatorEventId) {
+    public FabParams parse(Bundle params, final String navigatorEventId, String screenInstanceId) {
         FabParams fabParams = new FabParams();
         fabParams.collapsedId = params.getString("collapsedId");
         fabParams.expendedId = params.getString("expendedId");
         fabParams.navigatorEventId = navigatorEventId;
+        fabParams.screenInstanceId = screenInstanceId;
         fabParams.backgroundColor = getColor(params, "backgroundColor", new StyleParams.Color());
 
         if (hasKey(params, "collapsedIcon")) {

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

@@ -43,7 +43,7 @@ public class ScreenParamsParser extends Parser {
             result.fragmentCreatorPassProps = params.getBundle(FRAGMENT_CREATOR_PASS_PROPS);
         }
 
-        result.fabParams = ButtonParser.parseFab(params, result.navigationParams.navigatorEventId);
+        result.fabParams = ButtonParser.parseFab(params, result.navigationParams.navigatorEventId, result.navigationParams.screenInstanceId);
 
         result.tabLabel = getTabLabel(params);
         result.tabIcon = getTabIcon(params);

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

@@ -31,7 +31,7 @@ public class TopTabParamsParser extends Parser {
         result.navigationParams = new NavigationParams(params.getBundle(NAVIGATION_PARAMS));
         result.leftButton = ButtonParser.parseLeftButton(params);
         result.rightButtons = ButtonParser.parseRightButton(params);
-        result.fabParams = ButtonParser.parseFab(params, result.navigationParams.navigatorEventId);
+        result.fabParams = ButtonParser.parseFab(params, result.navigationParams.navigatorEventId, result.navigationParams.screenInstanceId);
         result.styleParams = new StyleParamsParser(params.getBundle("styleParams")).parse();
         return result;
     }

android/app/src/main/java/com/reactnativenavigation/utils/ViewUtils.java

@@ -9,11 +9,13 @@ import android.support.annotation.Nullable;
 import android.util.DisplayMetrics;
 import android.view.View;
 import android.view.ViewGroup;
+import android.view.ViewParent;
 import android.view.ViewTreeObserver;
 import android.view.WindowManager;
 
 import com.reactnativenavigation.NavigationApplication;
 import com.reactnativenavigation.params.AppStyle;
+import com.reactnativenavigation.screens.Screen;
 
 import java.util.concurrent.atomic.AtomicInteger;
 
@@ -115,5 +117,22 @@ public class ViewUtils {
     public interface PerformOnViewTask {
         void runOnView(View view);
     }
+
+    public static void performOnParentScreen(View child, Task<Screen> task) {
+        Screen parentScreen = findParentScreen(child.getParent());
+        if (parentScreen != null) {
+            task.run(parentScreen);
+        }
+    }
+
+    private static Screen findParentScreen(ViewParent parent) {
+        if (parent == null) {
+            return null;
+        }
+        if (parent instanceof Screen) {
+            return (Screen) parent;
+        }
+        return findParentScreen(parent.getParent());
+    }
 }
 

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

@@ -87,6 +87,9 @@ public class FloatingActionButtonAnimator {
     }
 
     void removeFabFromScreen(FloatingActionButton fab, final AnimatorListenerAdapter animationListener) {
+        if (fab == null) {
+            return;
+        }
         state = State.Removing;
         fab.animate()
                 .alpha(0)

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

@@ -10,6 +10,7 @@ import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.support.design.widget.CoordinatorLayout;
 import android.support.design.widget.FloatingActionButton;
+import android.util.Log;
 import android.view.Gravity;
 import android.view.View;
 
@@ -23,7 +24,7 @@ import java.util.ArrayList;
 import static android.view.ViewGroup.LayoutParams.WRAP_CONTENT;
 
 public class FloatingActionButtonCoordinator {
-
+    private static final String TAG = "FloatingActionButtonCoo";
     private static final int INITIAL_EXPENDED_FAB_ROTATION = -90;
     private CoordinatorLayout parent;
     private FabParams params;
@@ -42,7 +43,18 @@ public class FloatingActionButtonCoordinator {
         actionSize = (int) ViewUtils.convertDpToPixel(40);
     }
 
-    public void add(FabParams params) {
+    public void add(final FabParams params) {
+        Log.i(TAG, "add() called with: params = [" + params + "]");
+        if (parent.getChildCount() > 0) {
+            remove(new Runnable() {
+                @Override
+                public void run() {
+                    add(params);
+                }
+            });
+            return;
+        }
+
         this.params = params;
         if (!params.isValid()) {
             return;
@@ -55,7 +67,8 @@ public class FloatingActionButtonCoordinator {
     }
 
     public void remove(@Nullable final Runnable onComplete) {
-        if (parent.getChildCount() == 0 || fabAnimator.isAnimating()) {
+        Log.w(TAG, "remove: ");
+        if (parent.getChildCount() == 0) {
             if (onComplete != null) {
                 onComplete.run();
             }

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

@@ -8,15 +8,18 @@ import com.reactnativenavigation.events.EventBus;
 import com.reactnativenavigation.events.FabSetEvent;
 import com.reactnativenavigation.events.ScreenChangedEvent;
 import com.reactnativenavigation.events.Subscriber;
+import com.reactnativenavigation.layouts.Layout;
 import com.reactnativenavigation.params.FabParams;
 import com.reactnativenavigation.params.SnackbarParams;
 
 public class SnackbarAndFabContainer extends CoordinatorLayout implements Snakbar.OnDismissListener, Subscriber{
     private Snakbar snakbar;
     private FloatingActionButtonCoordinator fabCoordinator;
+    private Layout layout;
 
-    public SnackbarAndFabContainer(Context context) {
+    public SnackbarAndFabContainer(Context context, Layout layout) {
         super(context);
+        this.layout = layout;
         fabCoordinator = new FloatingActionButtonCoordinator(this);
         EventBus.instance.register(this);
     }
@@ -64,7 +67,9 @@ public class SnackbarAndFabContainer extends CoordinatorLayout implements Snakba
             @Override
             public void run() {
                 if (fabParams != null) {
-                    fabCoordinator.add(fabParams);
+                    if (layout.getCurrentScreen().getScreenInstanceId().equals(fabParams.screenInstanceId)) {
+                        fabCoordinator.add(fabParams);
+                    }
                 }
             }
         });