Set different ids for collapsed and expended fabs

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

@@ -8,7 +8,8 @@ public class FabParams {
     public Drawable collapsedIcon;
     public Drawable expendedIcon;
     public StyleParams.Color backgroundColor;
-    public String id;
+    public String collapsedId;
+    public String expendedId;
     public String navigatorEventId;
     public List<FabActionParams> actions;
 

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

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

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

@@ -92,9 +92,8 @@ public class FloatingActionButtonCoordinator {
                     fabAnimator.hideCollapsed();
                     fabAnimator.showExpended();
                     showActions();
-                } else {
-                    NavigationApplication.instance.sendNavigatorEvent(params.id, params.navigatorEventId);
                 }
+                NavigationApplication.instance.sendNavigatorEvent(params.collapsedId, params.navigatorEventId);
             }
         });
     }
@@ -108,6 +107,7 @@ public class FloatingActionButtonCoordinator {
             @Override
             public void onClick(View v) {
                 fabAnimator.collapse();
+                NavigationApplication.instance.sendNavigatorEvent(params.expendedId, params.navigatorEventId);
             }
         });
     }