Emit modalDismissed event when dismissingAllModals as well

lib/android/app/src/main/java/com/reactnativenavigation/react/EventEmitter.java

@@ -61,9 +61,10 @@ public class EventEmitter {
 		emit(CommandCompleted, event);
 	}
 
-    public void emitModalDismissed(String id) {
+    public void emitModalDismissed(String id, int modalsDismissed) {
         WritableMap event = Arguments.createMap();
         event.putString("componentId", id);
+        event.putInt("modalsDismissed", modalsDismissed);
         emit(ModalDismissed, event);
     }
 

lib/android/app/src/main/java/com/reactnativenavigation/utils/CommandListenerAdapter.java

@@ -1,13 +1,30 @@
 package com.reactnativenavigation.utils;
 
+import android.support.annotation.Nullable;
+
 public class CommandListenerAdapter implements CommandListener {
+
+    @Nullable private CommandListener listener;
+
+    @Nullable
+    public CommandListener getListener() {
+        return listener;
+    }
+
+    public CommandListenerAdapter() {
+    }
+
+    public CommandListenerAdapter(@Nullable CommandListener listener) {
+        this.listener = listener;
+    }
+
     @Override
     public void onSuccess(String childId) {
-
+        if (listener != null) listener.onSuccess(childId);
     }
 
     @Override
     public void onError(String message) {
-
+        if (listener != null) listener.onError(message);
     }
 }

lib/android/app/src/main/java/com/reactnativenavigation/viewcontrollers/modal/ModalPresenter.java

@@ -86,11 +86,6 @@ public class ModalPresenter {
 
     private void onDismissEnd(ViewController toDismiss, CommandListener listener) {
         toDismiss.destroy();
-        eventEmitter.emitModalDismissed(toDismiss.getId());
         listener.onSuccess(toDismiss.getId());
     }
-
-    public void setEventEmitter(EventEmitter eventEmitter) {
-        this.eventEmitter = eventEmitter;
-    }
 }

lib/android/app/src/main/java/com/reactnativenavigation/viewcontrollers/modal/ModalStack.java

@@ -8,6 +8,7 @@ import com.reactnativenavigation.anim.ModalAnimator;
 import com.reactnativenavigation.parse.Options;
 import com.reactnativenavigation.react.EventEmitter;
 import com.reactnativenavigation.utils.CommandListener;
+import com.reactnativenavigation.utils.CommandListenerAdapter;
 import com.reactnativenavigation.viewcontrollers.ViewController;
 
 import java.util.ArrayList;
@@ -19,6 +20,11 @@ import javax.annotation.Nullable;
 public class ModalStack {
     private List<ViewController> modals = new ArrayList<>();
     private final ModalPresenter presenter;
+    private EventEmitter eventEmitter;
+
+    public void setEventEmitter(EventEmitter eventEmitter) {
+        this.eventEmitter = eventEmitter;
+    }
 
     public ModalStack(Activity activity) {
         this.presenter = new ModalPresenter(new ModalAnimator(activity));
@@ -49,10 +55,17 @@ public class ModalStack {
             boolean isTop = isTop(toDismiss);
             modals.remove(toDismiss);
             ViewController toAdd = isEmpty() ? root : isTop ? get(size() - 1) : null;
+            CommandListenerAdapter onDismiss = new CommandListenerAdapter(listener) {
+                @Override
+                public void onSuccess(String childId) {
+                    super.onSuccess(childId);
+                    eventEmitter.emitModalDismissed(toDismiss.getId(), 1);
+                }
+            };
             if (isTop) {
-                presenter.dismissTopModal(toDismiss, toAdd, listener);
+                presenter.dismissTopModal(toDismiss, toAdd, onDismiss);
             } else {
-                presenter.dismissModal(toDismiss, listener);
+                presenter.dismissModal(toDismiss, onDismiss);
             }
         } else {
             listener.onError("Nothing to dismiss");
@@ -65,9 +78,18 @@ public class ModalStack {
             return;
         }
 
+        String topModalId = peek().getId();
+        int modalsDismissed = size();
+
         while (!modals.isEmpty()) {
             if (modals.size() == 1) {
-                dismissModal(modals.get(0).getId(), root, listener);
+                dismissModal(modals.get(0).getId(), root, new CommandListenerAdapter(listener) {
+                    @Override
+                    public void onSuccess(String childId) {
+                        super.onSuccess(childId);
+                        eventEmitter.emitModalDismissed(topModalId, modalsDismissed);
+                    }
+                });
             } else {
                 modals.get(0).destroy();
                 modals.remove(0);
@@ -126,8 +148,4 @@ public class ModalStack {
         }
         return null;
     }
-
-    public void setEventEmitter(EventEmitter eventEmitter) {
-        presenter.setEventEmitter(eventEmitter);
-    }
 }

lib/android/app/src/test/java/com/reactnativenavigation/viewcontrollers/modal/ModalPresenterTest.java

@@ -10,7 +10,6 @@ import com.reactnativenavigation.parse.AnimationOptions;
 import com.reactnativenavigation.parse.ModalPresentationStyle;
 import com.reactnativenavigation.parse.Options;
 import com.reactnativenavigation.parse.params.Bool;
-import com.reactnativenavigation.react.EventEmitter;
 import com.reactnativenavigation.utils.CommandListener;
 import com.reactnativenavigation.utils.CommandListenerAdapter;
 import com.reactnativenavigation.viewcontrollers.ChildController;
@@ -20,7 +19,6 @@ import com.reactnativenavigation.viewcontrollers.ViewController;
 import org.json.JSONException;
 import org.json.JSONObject;
 import org.junit.Test;
-import org.mockito.Mockito;
 
 import static org.assertj.core.api.Java6Assertions.assertThat;
 import static org.mockito.ArgumentMatchers.any;
@@ -56,7 +54,6 @@ public class ModalPresenterTest extends BaseTest {
         uut.setContentLayout(contentLayout);
         modal1 = spy(new SimpleViewController(activity, childRegistry, MODAL_ID_1, new Options()));
         modal2 = spy(new SimpleViewController(activity, childRegistry, MODAL_ID_2, new Options()));
-        uut.setEventEmitter(Mockito.mock(EventEmitter.class));
     }
 
     @Test

lib/android/app/src/test/java/com/reactnativenavigation/viewcontrollers/modal/ModalStackTest.java

@@ -87,10 +87,11 @@ public class ModalStackTest extends BaseTest {
     @Test
     public void dismissModal() {
         uut.showModal(modal1, rootController, new CommandListenerAdapter());
-        CommandListener listener = new CommandListenerAdapter();
+        CommandListener listener = spy(new CommandListenerAdapter());
         uut.dismissModal(modal1.getId(), rootController, listener);
         assertThat(findModal(modal1.getId())).isNull();
-        verify(presenter, times(1)).dismissTopModal(modal1, rootController, listener);
+        verify(presenter, times(1)).dismissTopModal(eq(modal1), eq(rootController), any());
+        verify(listener).onSuccess(modal1.getId());
     }
 
     @SuppressWarnings("Convert2Lambda")
@@ -162,7 +163,8 @@ public class ModalStackTest extends BaseTest {
         ViewGroup view2 = modal2.getView();
         CommandListener listener = spy(new CommandListenerAdapter());
         uut.dismissAllModals(listener, rootController);
-        verify(presenter, times(1)).dismissTopModal(modal2, rootController, listener);
+        verify(presenter, times(1)).dismissTopModal(eq(modal2), eq(rootController), any());
+        verify(listener).onSuccess(modal2.getId());
         verify(animator, times(0)).dismiss(eq(view1), eq(modal1.options.animations.dismissModal), any());
         verify(animator, times(1)).dismiss(eq(view2), eq(modal2.options.animations.dismissModal), any());
         assertThat(uut.size()).isEqualTo(0);