Send fab press events and collapse fab on action click

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

@@ -4,6 +4,7 @@ import android.graphics.drawable.Drawable;
 
 public class FabActionParams {
     public String id;
+    public String navigatorEventId;
     public Drawable icon;
     public StyleParams.Color backgroundColor;
 }

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

@@ -9,5 +9,10 @@ public class FabParams {
     public Drawable expendedIcon;
     public StyleParams.Color backgroundColor;
     public String id;
+    public String navigatorEventId;
     public List<FabActionParams> actions;
+
+    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) {
+    public static FabParams parseFab(Bundle params, String navigatorEventId) {
         FabParams fabParams = null;
         if (hasKey(params, KEY_FAB)) {
-            fabParams = new FabParamsParser().parse(params.getBundle(KEY_FAB));
+            fabParams = new FabParamsParser().parse(params.getBundle(KEY_FAB), navigatorEventId);
         }
         return fabParams;
     }

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

@@ -7,9 +7,10 @@ import com.reactnativenavigation.params.StyleParams;
 import com.reactnativenavigation.react.ImageLoader;
 
 public class FabActionParamsParser extends Parser {
-    public FabActionParams parse(Bundle params) {
+    public FabActionParams parse(Bundle params, String navigatorEventId) {
         FabActionParams fabActionParams = new FabActionParams();
         fabActionParams.id = params.getString("id");
+        fabActionParams.navigatorEventId = navigatorEventId;
         fabActionParams.icon = ImageLoader.loadImage(params.getString("icon"));
         fabActionParams.backgroundColor = StyleParams.Color.parse(params.getString("backgroundColor"));
         return fabActionParams;

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

@@ -8,9 +8,10 @@ import com.reactnativenavigation.params.StyleParams;
 import com.reactnativenavigation.react.ImageLoader;
 
 public class FabParamsParser extends Parser {
-    public FabParams parse(Bundle params) {
+    public FabParams parse(Bundle params, final String navigatorEventId) {
         FabParams fabParams = new FabParams();
         fabParams.id = params.getString("id");
+        fabParams.navigatorEventId = navigatorEventId;
         fabParams.backgroundColor = getColor(params, "backgroundColor", new StyleParams.Color());
 
         if (hasKey(params, "collapsedIcon")) {
@@ -23,11 +24,10 @@ public class FabParamsParser extends Parser {
             fabParams.actions = parseBundle(params.getBundle("actions"), new ParseStrategy<FabActionParams>() {
                 @Override
                 public FabActionParams parse(Bundle params) {
-                    return new FabActionParamsParser().parse(params);
+                    return new FabActionParamsParser().parse(params, navigatorEventId);
                 }
             });
         }
-
         return fabParams;
     }
 }

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

@@ -41,7 +41,7 @@ public class ScreenParamsParser extends Parser {
             result.fragmentCreatorPassProps = params.getBundle(FRAGMENT_CREATOR_PASS_PROPS);
         }
 
-        result.fabParams = ButtonParser.parseFab(params);
+        result.fabParams = ButtonParser.parseFab(params, result.navigationParams.navigatorEventId);
 
         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.fabParams = ButtonParser.parseFab(params, result.navigationParams.navigatorEventId);
         return result;
     }
 }

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

@@ -44,6 +44,11 @@ public class FloatingActionButtonAnimator {
                 .start();
     }
 
+    public void collapse() {
+        hideExpended();
+        showCollapsed();
+    }
+
     void hideCollapsed() {
         animateFab(collapsedFab, 0, 90);
     }

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

@@ -12,6 +12,7 @@ import android.support.design.widget.FloatingActionButton;
 import android.view.Gravity;
 import android.view.View;
 
+import com.reactnativenavigation.NavigationApplication;
 import com.reactnativenavigation.params.FabActionParams;
 import com.reactnativenavigation.params.FabParams;
 import com.reactnativenavigation.utils.ViewUtils;
@@ -87,9 +88,13 @@ public class FloatingActionButtonCoordinator {
         collapsedFab.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                fabAnimator.hideCollapsed();
-                fabAnimator.showExpended();
-                showActions();
+                if (params.hasExpendedState()) {
+                    fabAnimator.hideCollapsed();
+                    fabAnimator.showExpended();
+                    showActions();
+                } else {
+                    NavigationApplication.instance.sendNavigatorEvent(params.id, params.navigatorEventId);
+                }
             }
         });
     }
@@ -102,8 +107,7 @@ public class FloatingActionButtonCoordinator {
         expendedFab.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                fabAnimator.hideExpended();
-                fabAnimator.showCollapsed();
+                fabAnimator.collapse();
             }
         });
     }
@@ -142,9 +146,16 @@ public class FloatingActionButtonCoordinator {
     }
 
     private FloatingActionButton createAction(int index) {
-        FabActionParams actionParams = params.actions.get(index);
+        final FabActionParams actionParams = params.actions.get(index);
         FloatingActionButton action = createFab(actionParams.icon);
         action.setLayoutParams(createActionLayoutParams(index));
+        action.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                NavigationApplication.instance.sendNavigatorEvent(actionParams.id, actionParams.navigatorEventId);
+                fabAnimator.collapse();
+            }
+        });
         if (actionParams.backgroundColor.hasColor()) {
             action.setBackgroundTintList(ColorStateList.valueOf(actionParams.backgroundColor.getColor()));
         }
@@ -182,9 +193,14 @@ public class FloatingActionButtonCoordinator {
             float fraction = calculateTransitionFraction(dependentValue);
             child.setY(calculateY(parent, fraction));
             child.setAlpha(calculateAlpha(fraction));
+            setVisibility(child);
             return true;
         }
 
+        private void setVisibility(FloatingActionButton child) {
+            child.setVisibility(child.getAlpha() == 0 ? View.GONE : View.VISIBLE);
+        }
+
         private float calculateAlpha(float fraction) {
             return 1 * fraction;
         }