Merge branch 'v2' into newAPI

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

 		elementByText("DISMISS ALL MODALS").click();
 		assertMainShown();
 	}
+
+	@Test
+    public void pushIntoModal() throws Exception {
+        elementByText("SHOW MODAL").click();
+        elementByText("PUSH SCREEN").click();
+        assertExists(By.text("Pushed Screen"));
+    }
+
+    @Test
+    public void backPopsModalStack() throws Exception {
+        elementByText("SHOW MODAL").click();
+        elementByText("PUSH SCREEN").click();
+        elementByText("PUSH").click();
+        device().pressBack();
+        assertExists(By.text("Pushed Screen"));
+    }
 }

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

 package com.reactnativenavigation.viewcontrollers;
 
 import android.app.Dialog;
+import android.content.DialogInterface;
 import android.support.annotation.Nullable;
+import android.view.KeyEvent;
 import android.view.View;
 
 import com.facebook.react.bridge.Promise;
 		return null;
 	}
 
-	private static class Modal {
-		private final ViewController viewController;
+	@Nullable
+    ViewController findControllerById(String id) {
+        Modal modal = findModalByContainerId(id);
+        return modal != null ? modal.viewController : null;
+    }
+
+    private static class Modal implements DialogInterface.OnKeyListener {
+		public final ViewController viewController;
 		private final Dialog dialog;
 
 		Modal(final ViewController viewController) {
 			this.viewController = viewController;
 			dialog = new Dialog(viewController.getActivity(), R.style.Modal);
+			dialog.setOnKeyListener(this);
 		}
 
 		void show() {
 			View decorView = viewController.getActivity().getWindow().getDecorView();
 			viewController.getView().measure(makeMeasureSpec(decorView.getMeasuredWidth(), EXACTLY), makeMeasureSpec(decorView.getMeasuredHeight(), EXACTLY));
 		}
-	}
+
+        @Override
+        public boolean onKey(DialogInterface dialog, int keyCode, KeyEvent event) {
+            if (keyCode == KeyEvent.KEYCODE_BACK) {
+                if (event.getAction() == KeyEvent.ACTION_UP) {
+                    if (viewController.handleBack()) {
+                        return true;
+                    }
+                    dialog.dismiss();
+                }
+            }
+            return false;
+        }
+    }
 }

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

 
 import android.app.Activity;
 import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
 import android.view.ViewGroup;
 import android.widget.FrameLayout;
 
 	@NonNull
 	@Override
 	public Collection<ViewController> getChildControllers() {
-		return root == null ? Collections.<ViewController>emptyList() : Collections.singletonList(root);
+		return root == null ? Collections.emptyList() : Collections.singletonList(root);
 	}
 
 	@Override
 			promise.reject(new Throwable("Nothing to pop"));
 		}
 	}
+
+    @Nullable
+    @Override
+    public ViewController findControllerById(String id) {
+        ViewController controllerById = super.findControllerById(id);
+        return controllerById != null ? controllerById : modalStack.findControllerById(id);
+    }
 }

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

 		this.parentController = parentController;
 	}
 
-    void performOnParentStack(Task<StackController> task) {
+    boolean performOnParentStack(Task<StackController> task) {
 	    if (parentController instanceof StackController) {
             task.run((StackController) parentController);
+            return true;
         }
+        if (this instanceof StackController) {
+	        task.run((StackController) this);
+            return true;
+        }
+        return false;
     }
 
     void performOnParentStack(Task<StackController> accept, Runnable  reject) {
-        if (parentController instanceof StackController) {
-            accept.run((StackController) parentController);
-        } else {
+        if (!performOnParentStack(accept)) {
             reject.run();
         }
     }

lib/android/app/src/test/java/com/reactnativenavigation/viewcontrollers/NavigatorTest.java

 		StackController stack2 = newStack();
 		stack1.push(child1);
 		stack2.push(child2);
-		bottomTabsController.setTabs(Arrays.<ViewController>asList(stack1, stack2));
+		bottomTabsController.setTabs(Arrays.asList(stack1, stack2));
 		uut.setRoot(bottomTabsController);
 
 		SimpleViewController newChild = new SimpleViewController(activity, "new child");
 		stack2.push(child2);
 		stack2.push(child3);
 		stack2.push(child4);
-		bottomTabsController.setTabs(Arrays.<ViewController>asList(stack1, stack2));
+		bottomTabsController.setTabs(Arrays.asList(stack1, stack2));
 		uut.setRoot(bottomTabsController);
 
 		uut.pop("child4");
 		stack2.push(child2);
 		stack2.push(child3);
 		stack2.push(child4);
-		bottomTabsController.setTabs(Arrays.<ViewController>asList(stack1, stack2));
+		bottomTabsController.setTabs(Arrays.asList(stack1, stack2));
 		uut.setRoot(bottomTabsController);
 
 		uut.popSpecific(child2.getId());
 		stack2.push(child3);
 		stack2.push(child4);
 		stack2.push(child5);
-		bottomTabsController.setTabs(Arrays.<ViewController>asList(stack1, stack2));
+		bottomTabsController.setTabs(Arrays.asList(stack1, stack2));
 		uut.setRoot(bottomTabsController);
 
 		uut.popTo(child2.getId());
 		stack2.push(child4);
 		stack2.push(child5);
 
-		bottomTabsController.setTabs(Arrays.<ViewController>asList(stack1, stack2));
+		bottomTabsController.setTabs(Arrays.asList(stack1, stack2));
 		uut.setRoot(bottomTabsController);
 
 		uut.popToRoot(child3.getId());
 		stack2.push(child2);
 		stack2.push(child3);
 		stack2.push(child4);
-		bottomTabsController.setTabs(Arrays.<ViewController>asList(stack1, stack2));
+		bottomTabsController.setTabs(Arrays.asList(stack1, stack2));
 		uut.setRoot(bottomTabsController);
 
 		uut.pop("child4", new MockPromise() {
 			}
 		});
 	}
+
+	@Test
+    public void pushIntoModal() throws Exception {
+        StackController stackController = newStack();
+        stackController.push(child1);
+        uut.showModal(stackController, new MockPromise());
+        uut.push(stackController.getId(), child2);
+        assertIsChildById(stackController.getView(), child2.getView());
+    }
 }

playground/src/screens/ModalScreen.js

     this.onClickDismissAllPreviousModals = this.onClickDismissAllPreviousModals.bind(this);
     this.onClickDismissFirstInStack = this.onClickDismissFirstInStack.bind(this);
     this.onClickDismissAllModals = this.onClickDismissAllModals.bind(this);
+    this.onClickPushScreen = this.onClickPushScreen.bind(this);
   }
 
   render() {
         <Button title="Dismiss Modal" testID={testIDs.DISMISS_MODAL_BUTTON} onPress={this.onClickDismissModal} />
         <Button title="Dismiss Unknown Modal" testID={testIDs.DISMISS_UNKNOWN_MODAL_BUTTON} onPress={this.onClickDismissUnknownModal} />
         <Button title="Dismiss All Modals" testID={testIDs.DISMISS_ALL_MODALS_BUTTON} onPress={this.onClickDismissAllModals} />
+        <Button title="Push screen" testID={testIDs.PUSH_BUTTON} onPress={this.onClickPushScreen} />
         {this.getPreviousModalId() ? (<Button title="Dismiss Previous Modal" testID={testIDs.DISMISS_PREVIOUS_MODAL_BUTTON} onPress={this.onClickDismissPreviousModal} />) : undefined}
         {this.props.previousModalIds ? (<Button title="Dismiss ALL Previous Modals" testID={testIDs.DISMISS_ALL_PREVIOUS_MODAL_BUTTON} onPress={this.onClickDismissAllPreviousModals} />) : undefined}
         {this.props.previousModalIds ? (<Button title="Dismiss First In Stack" testID={testIDs.DISMISS_FIRST_MODAL_BUTTON} onPress={this.onClickDismissFirstInStack} />) : undefined}
     Navigation.dismissAllModals();
   }
 
+  onClickPushScreen() {
+    Navigation.push(this.props.containerId, {
+      name: `navigation.playground.PushedScreen`,
+      passProps: {
+        text: 'Pushed from modal'
+      }
+    });
+  }
+
   getModalPosition() {
     return (this.props.modalPosition || 1);
   }