Update fab when modal is dismissed

android/app/src/main/java/com/reactnativenavigation/controllers/ModalController.java

@@ -2,6 +2,8 @@ package com.reactnativenavigation.controllers;
 
 import android.support.v7.app.AppCompatActivity;
 
+import com.reactnativenavigation.events.EventBus;
+import com.reactnativenavigation.events.ModalDismissedEvent;
 import com.reactnativenavigation.layouts.ScreenStackContainer;
 import com.reactnativenavigation.params.ScreenParams;
 import com.reactnativenavigation.params.TitleBarButtonParams;
@@ -72,6 +74,7 @@ public class ModalController implements ScreenStackContainer, Modal.OnModalDismi
     @Override
     public void onModalDismissed(Modal modal) {
         stack.remove(modal);
+        EventBus.instance.post(new ModalDismissedEvent());
     }
 
     public void setTopBarVisible(String screenInstanceId, boolean hidden, boolean animated) {

android/app/src/main/java/com/reactnativenavigation/controllers/NavigationActivity.java

@@ -7,6 +7,10 @@ import android.view.KeyEvent;
 
 import com.facebook.react.modules.core.DefaultHardwareBackBtnHandler;
 import com.reactnativenavigation.NavigationApplication;
+import com.reactnativenavigation.events.Event;
+import com.reactnativenavigation.events.EventBus;
+import com.reactnativenavigation.events.ModalDismissedEvent;
+import com.reactnativenavigation.events.Subscriber;
 import com.reactnativenavigation.layouts.BottomTabsLayout;
 import com.reactnativenavigation.layouts.Layout;
 import com.reactnativenavigation.layouts.LayoutFactory;
@@ -21,7 +25,7 @@ import com.reactnativenavigation.react.RedboxPermission;
 
 import java.util.List;
 
-public class NavigationActivity extends AppCompatActivity implements DefaultHardwareBackBtnHandler, ReactGateway.OnJsDevReloadListener {
+public class NavigationActivity extends AppCompatActivity implements DefaultHardwareBackBtnHandler, ReactGateway.OnJsDevReloadListener, Subscriber {
 
     /**
      * Although we start multiple activities, we make sure to pass Intent.CLEAR_TASK | Intent.NEW_TASK
@@ -79,6 +83,7 @@ public class NavigationActivity extends AppCompatActivity implements DefaultHard
 
         currentActivity = this;
         NavigationApplication.instance.getReactGateway().onResumeActivity(this, this, this);
+        EventBus.instance.register(this);
     }
 
     @Override
@@ -86,6 +91,7 @@ public class NavigationActivity extends AppCompatActivity implements DefaultHard
         super.onPause();
         currentActivity = null;
         NavigationApplication.instance.getReactGateway().onPauseActivity();
+        EventBus.instance.unregister(this);
     }
 
     @Override
@@ -249,4 +255,11 @@ public class NavigationActivity extends AppCompatActivity implements DefaultHard
     public void showSnackbar(SnackbarParams params) {
         layout.showSnackbar(params);
     }
+
+    @Override
+    public void onEvent(Event event) {
+        if (event.getType() == ModalDismissedEvent.TYPE) {
+            layout.onModalDismissed();
+        }
+    }
 }

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

@@ -0,0 +1,10 @@
+package com.reactnativenavigation.events;
+
+public class ModalDismissedEvent implements Event {
+    public static final String TYPE = "ModalDismissedEvent";
+
+    @Override
+    public String getType() {
+        return TYPE;
+    }
+}

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

@@ -193,6 +193,11 @@ public class BottomTabsLayout extends RelativeLayout implements Layout, AHBottom
         snackbarAndFabContainer.showSnackbar(eventId, params);
     }
 
+    @Override
+    public void onModalDismissed() {
+        EventBus.instance.post(new ScreenChangedEvent(getCurrentScreenStack().peek().getScreenParams()));
+    }
+
     public void selectBottomTabByTabIndex(Integer index) {
         bottomTabs.setCurrentItem(index);
     }

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

@@ -28,4 +28,6 @@ public interface Layout extends ScreenStackContainer {
     void setSideMenuVisible(boolean animated, boolean visible);
 
     void showSnackbar(SnackbarParams params);
+
+    void onModalDismissed();
 }

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

@@ -193,6 +193,11 @@ public class SingleScreenLayout extends RelativeLayout implements Layout {
         snackbarAndFabContainer.showSnackbar(navigatorEventId, params);
     }
 
+    @Override
+    public void onModalDismissed() {
+        EventBus.instance.post(new ScreenChangedEvent(stack.peek().getScreenParams()));
+    }
+
     @Override
     public boolean onTitleBarBackButtonClick() {
         if (leftButtonOnClickListener != null) {