dismissAllModals android

AndroidE2E/app/src/androidTest/java/com/reactnativenavigation/e2e/androide2e/ModalsTest.java

@@ -2,7 +2,6 @@ package com.reactnativenavigation.e2e.androide2e;
 
 import android.support.test.uiautomator.By;
 
-import org.junit.Ignore;
 import org.junit.Test;
 
 public class ModalsTest extends BaseTest {
@@ -100,7 +99,6 @@ public class ModalsTest extends BaseTest {
 		assertMainShown();
 	}
 
-	@Ignore
 	@Test
 	public void dismissAllModals() throws Exception {
 		elementByText("SHOW MODAL").click();

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

@@ -106,6 +106,16 @@ public class NavigationModule extends ReactContextBaseJavaModule {
 		});
 	}
 
+	@ReactMethod
+	public void dismissAllModals() {
+		handle(new Runnable() {
+			@Override
+			public void run() {
+				navigator().dismissAllModals();
+			}
+		});
+	}
+
 	private NavigationActivity activity() {
 		return (NavigationActivity) getCurrentActivity();
 	}

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

@@ -0,0 +1,78 @@
+package com.reactnativenavigation.viewcontrollers;
+
+import android.app.Dialog;
+import android.support.annotation.Nullable;
+import android.view.View;
+
+import com.reactnativenavigation.R;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import static android.view.View.MeasureSpec.EXACTLY;
+import static android.view.View.MeasureSpec.makeMeasureSpec;
+
+public class ModalStack {
+
+	private List<Modal> modals = new ArrayList<>();
+
+	public void showModal(final ViewController viewController) {
+		Modal modal = new Modal(viewController);
+		modals.add(modal);
+		modal.show();
+	}
+
+	public void dismissModal(final String containerId) {
+		Modal modal = findModalByContainerId(containerId);
+		if (modal != null) {
+			modal.dismiss();
+			modals.remove(modal);
+		}
+	}
+
+	public void dismissAll() {
+		for (Modal modal : modals) {
+			modal.dismiss();
+		}
+		modals.clear();
+	}
+
+	@Nullable
+	private Modal findModalByContainerId(String containerId) {
+		for (Modal modal : modals) {
+			if (modal.containsDeepContainerId(containerId)) {
+				return modal;
+			}
+		}
+		return null;
+	}
+
+	private static class Modal {
+		private final ViewController viewController;
+		private final Dialog dialog;
+
+		Modal(final ViewController viewController) {
+			this.viewController = viewController;
+			dialog = new Dialog(viewController.getActivity(), R.style.Modal);
+		}
+
+		void show() {
+			preMeasureView();
+			dialog.setContentView(viewController.getView());
+			dialog.show();
+		}
+
+		void dismiss() {
+			dialog.dismiss();
+		}
+
+		boolean containsDeepContainerId(String containerId) {
+			return viewController.findControllerById(containerId) != null;
+		}
+
+		private void preMeasureView() {
+			View decorView = viewController.getActivity().getWindow().getDecorView();
+			viewController.getView().measure(makeMeasureSpec(decorView.getMeasuredWidth(), EXACTLY), makeMeasureSpec(decorView.getMeasuredHeight(), EXACTLY));
+		}
+	}
+}

lib/android/app/src/main/java/com/reactnativenavigation/viewcontrollers/Navigator.java

@@ -1,28 +1,19 @@
 package com.reactnativenavigation.viewcontrollers;
 
 import android.app.Activity;
-import android.app.Dialog;
 import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v4.util.Pair;
 import android.view.ViewGroup;
 import android.widget.FrameLayout;
 
-import com.reactnativenavigation.R;
 import com.reactnativenavigation.utils.CompatUtils;
 
 import java.util.Collection;
 import java.util.Collections;
-import java.util.HashMap;
-import java.util.Map;
-
-import static android.view.View.MeasureSpec.EXACTLY;
-import static android.view.View.MeasureSpec.makeMeasureSpec;
 
 public class Navigator extends ParentController {
 
+	private final ModalStack modalStack = new ModalStack();
 	private ViewController root;
-	private HashMap<ViewController, Dialog> modals = new HashMap<>();
 
 	public Navigator(final Activity activity) {
 		super(activity, "navigator" + CompatUtils.generateViewId());
@@ -108,29 +99,14 @@ public class Navigator extends ParentController {
 	}
 
 	public void showModal(final ViewController viewController) {
-		viewController.getView().measure(makeMeasureSpec(getView().getWidth(), EXACTLY), makeMeasureSpec(getView().getHeight(), EXACTLY));
-		Dialog dialog = new Dialog(getActivity(), R.style.Modal);
-		dialog.setContentView(viewController.getView());
-		dialog.show();
-		modals.put(viewController, dialog);
+		modalStack.showModal(viewController);
 	}
 
 	public void dismissModal(final String containerId) {
-		Pair<ViewController, Dialog> pair = findModalByContainerId(containerId);
-		if (pair != null) {
-			pair.second.dismiss();
-			modals.remove(pair.first);
-		}
+		modalStack.dismissModal(containerId);
 	}
 
-	@Nullable
-	private Pair<ViewController, Dialog> findModalByContainerId(String containerId) {
-		for (Map.Entry<ViewController, Dialog> entry : modals.entrySet()) {
-			ViewController vc = entry.getKey().findControllerById(containerId);
-			if (vc != null) {
-				return Pair.create(entry.getKey(), entry.getValue());
-			}
-		}
-		return null;
+	public void dismissAllModals() {
+		modalStack.dismissAll();
 	}
 }