first implemenetation of #965

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

@@ -3,12 +3,10 @@ package com.reactnativenavigation.e2e.androide2e;
 import android.support.test.uiautomator.By;
 
 import org.junit.FixMethodOrder;
-import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runners.MethodSorters;
 
 @FixMethodOrder(MethodSorters.NAME_ASCENDING)
-@Ignore
 public class ApplicationLifecycleTest extends BaseTest {
 
 	@Test

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

@@ -32,7 +32,7 @@ public class TopLevelApiTest extends BaseTest {
 		assertMainShown();
 		elementByText("PUSH LIFECYCLE SCREEN").click();
 		elementByText("onStart!");
-		elementByText("Push to test onStop").click();
+		elementByText("PUSH TO TEST ONSTOP").click();
 		elementByText("Alert");
 		elementByText("onStop").click();
 	}

lib/android/app/src/main/java/com/reactnativenavigation/layout/containers/Container.java

@@ -22,29 +22,39 @@ public class Container extends FrameLayout {
 		this.id = id;
 		this.name = name;
 		addView(createReactRootView());
-
 	}
 
 	private View createReactRootView() {
-		ReactRootView rootView = new ReactRootView(getContext());
+		final ReactRootView rootView = new ReactRootView(getContext());
 		Bundle opts = new Bundle();
 		opts.putString("id", id);
 		rootView.startReactApplication(reactNativeHost.getReactInstanceManager(), name, opts);
+		rootView.setEventListener(new ReactRootView.ReactRootViewEventListener() {
+			@Override
+			public void onAttachedToReactInstance(final ReactRootView reactRootView) {
+				rootView.setEventListener(null);
+				onStart();
+			}
+		});
 		return rootView;
 	}
 
-	//    @Override
-//    protected void onAttachedToWindow() {
-//        super.onAttachedToWindow();
-//        NavigationEventEmitter.emit(NavigationApplication.instance.getReactNativeHost().getReactInstanceManager().getCurrentReactContext())
-//                .containerStart(id);
-//    }
-
 	@Override
 	protected void onDetachedFromWindow() {
 		super.onDetachedFromWindow();
-		//TODO this is wrong
-		ReactContext reactContext = ((NavigationApplication) getContext().getApplicationContext()).getReactNativeHost().getReactInstanceManager().getCurrentReactContext();
-		new NavigationEventEmitter(reactContext).containerStart(id);
+		onStop();
+	}
+
+	private void onStart() {
+		new NavigationEventEmitter(reactContext()).containerStart(id);
+	}
+
+	private void onStop() {
+		new NavigationEventEmitter(reactContext()).containerStop(id);
+	}
+
+	private ReactContext reactContext() {
+		//TODO this is wrong, we should inject reactContext somehow
+		return ((NavigationApplication) getContext().getApplicationContext()).getReactNativeHost().getReactInstanceManager().getCurrentReactContext();
 	}
 }

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

@@ -4,7 +4,7 @@ import android.view.View;
 import android.view.ViewTreeObserver;
 
 public class UiUtils {
-	public static void runOnPreDraw(final View view, final Runnable task) {
+	public static void runOnPreDrawOnce(final View view, final Runnable task) {
 		view.getViewTreeObserver().addOnPreDrawListener(new ViewTreeObserver.OnPreDrawListener() {
 			@Override
 			public boolean onPreDraw() {

lib/android/app/src/test/java/com/reactnativenavigation/utils/UiUtilsTest.java

@@ -14,12 +14,12 @@ import static org.mockito.Mockito.verifyZeroInteractions;
 
 public class UiUtilsTest extends BaseTest {
 	@Test
-	public void runOnPreDraw() throws Exception {
+	public void runOnPreDrawOnce() throws Exception {
 		View view = Shadow.newInstanceOf(View.class);
 		Runnable task = mock(Runnable.class);
 		verifyZeroInteractions(task);
 
-		UiUtils.runOnPreDraw(view, task);
+		UiUtils.runOnPreDrawOnce(view, task);
 		view.getViewTreeObserver().dispatchOnPreDraw();
 		verify(task, times(1)).run();
 	}