modals android

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

@@ -15,7 +15,6 @@ public class ModalsTest extends BaseTest {
 		assertExists(By.text("Modal Screen"));
 	}
 
-	@Ignore
 	@Test
 	public void dismissModal() throws Exception {
 		launchTheApp();
@@ -28,7 +27,6 @@ public class ModalsTest extends BaseTest {
 
 	}
 
-	@Ignore
 	@Test
 	public void showMultipleModals() throws Exception {
 		launchTheApp();
@@ -46,7 +44,6 @@ public class ModalsTest extends BaseTest {
 		assertMainShown();
 	}
 
-	@Ignore
 	@Test
 	public void dismissUnknownContainerId() throws Exception {
 		launchTheApp();
@@ -61,7 +58,6 @@ public class ModalsTest extends BaseTest {
 		assertMainShown();
 	}
 
-	@Ignore
 	@Test
 	public void dismissModalByContainerIdWhenNotOnTop() throws Exception {
 		launchTheApp();
@@ -79,7 +75,6 @@ public class ModalsTest extends BaseTest {
 		assertMainShown();
 	}
 
-	@Ignore
 	@Test
 	public void dismissAllPreviousModalsByIdWhenTheyAreBelowTopPresented() throws Exception {
 		launchTheApp();
@@ -98,7 +93,6 @@ public class ModalsTest extends BaseTest {
 		assertMainShown();
 	}
 
-	@Ignore
 	@Test
 	public void dismissSomeModalByIdDeepInTheStack() throws Exception {
 		launchTheApp();
@@ -110,7 +104,7 @@ public class ModalsTest extends BaseTest {
 		elementByText("SHOW MODAL").click();
 		assertExists(By.text("Modal Stack Position: 3"));
 
-		elementByText("DISMISS FIRST IN THE STACK").click();
+		elementByText("DISMISS FIRST IN STACK").click();
 		assertExists(By.text("Modal Stack Position: 3"));
 
 		elementByText("DISMISS MODAL").click();

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

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

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

@@ -3,6 +3,8 @@ 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;
 
@@ -11,6 +13,8 @@ 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;
@@ -18,6 +22,7 @@ import static android.view.View.MeasureSpec.makeMeasureSpec;
 public class Navigator extends ParentController {
 
 	private ViewController root;
+	private HashMap<ViewController, Dialog> modals = new HashMap<>();
 
 	public Navigator(final Activity activity) {
 		super(activity, "navigator" + CompatUtils.generateViewId());
@@ -107,5 +112,25 @@ public class Navigator extends ParentController {
 		Dialog dialog = new Dialog(getActivity(), R.style.Modal);
 		dialog.setContentView(viewController.getView());
 		dialog.show();
+		modals.put(viewController, dialog);
+	}
+
+	public void dismissModal(final String containerId) {
+		Pair<ViewController, Dialog> pair = findModalByContainerId(containerId);
+		if (pair != null) {
+			pair.second.dismiss();
+			modals.remove(pair.first);
+		}
+	}
+
+	@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;
 	}
 }