revert #1065 impl, going a different route

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

@@ -6,7 +6,7 @@ import org.junit.Ignore;
 import org.junit.Test;
 
 public class ScreenLifecycleTest extends BaseTest {
-
+	@Ignore
 	@Test
 	public void onStartOnStop() throws Exception {
 		launchTheApp();

lib/android/app/src/main/java/com/reactnativenavigation/layout/impl/ReactRootViewController.java

@@ -6,10 +6,9 @@ import android.view.View;
 
 import com.facebook.react.ReactInstanceManager;
 import com.facebook.react.ReactRootView;
-import com.reactnativenavigation.react.NavigationEvent;
 import com.reactnativenavigation.viewcontrollers.ViewController;
 
-public class ReactRootViewController extends ViewController implements View.OnAttachStateChangeListener {
+public class ReactRootViewController extends ViewController {
 
 	private final String id;
 	private final String name;
@@ -27,28 +26,27 @@ public class ReactRootViewController extends ViewController implements View.OnAt
 //		reactRootView.unmountReactApplication();
 //	}
 
-	@Override
-	public void onViewAttachedToWindow(final View v) {
-		//
-	}
-
-	@Override
-	public void onViewDetachedFromWindow(final View v) {
-		onStop();
-	}
-
-	private void onStart() {
-		new NavigationEvent(reactInstanceManager.getCurrentReactContext()).containerStart(id);
-	}
-
-	private void onStop() {
-		new NavigationEvent(reactInstanceManager.getCurrentReactContext()).containerStop(id);
-	}
+//	@Override
+//	public void onViewAttachedToWindow(final View v) {
+//		//
+//	}
+//
+//	@Override
+//	public void onViewDetachedFromWindow(final View v) {
+//		onStop();
+//	}
+//
+//	private void onStart() {
+//		new NavigationEvent(reactInstanceManager.getCurrentReactContext()).containerStart(id);
+//	}
+//
+//	private void onStop() {
+//		new NavigationEvent(reactInstanceManager.getCurrentReactContext()).containerStop(id);
+//	}
 
 	@Override
 	protected View createView() {
 		ReactRootView reactRootView = new ReactRootView(getActivity());
-		reactRootView.addOnAttachStateChangeListener(this);
 		Bundle opts = new Bundle();
 		opts.putString("id", this.id);
 		reactRootView.startReactApplication(this.reactInstanceManager, this.name, opts);

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

@@ -3,30 +3,11 @@ package com.reactnativenavigation.viewcontrollers;
 import android.app.Activity;
 import android.support.annotation.Nullable;
 import android.view.View;
-import android.view.ViewTreeObserver;
-
-import java.util.concurrent.atomic.AtomicReference;
 
 public abstract class ViewController {
-	public interface LifecycleListener {
-		void onCreate();
-
-		void onStart();
-
-		void onStop();
-
-		void onDestroy();
-	}
-
-	private enum LifecycleState {
-		Created, Started, Stopped, Destroyed
-	}
-
-	private final Activity activity;
 	private View view;
+	private final Activity activity;
 	private StackController stackController;
-	private AtomicReference<LifecycleState> lifecycleState = new AtomicReference<>(LifecycleState.Destroyed);
-	private LifecycleListener lifecycleListener;
 
 	public ViewController(Activity activity) {
 		this.activity = activity;
@@ -54,36 +35,25 @@ public abstract class ViewController {
 	public View getView() {
 		if (view == null) {
 			view = createView();
-			attachLifecycle();
+			onCreate();
 		}
 		return view;
 	}
 
-	public void setLifecycleListener(LifecycleListener lifecycleListener) {
-		this.lifecycleListener = lifecycleListener;
+	public void onCreate() {
+
 	}
 
-	private void attachLifecycle() {
-		view.getViewTreeObserver().addOnGlobalLayoutListener(new ViewTreeObserver.OnGlobalLayoutListener() {
-			@Override
-			public void onGlobalLayout() {
-				if (lifecycleListener == null) {
-					return;
-				}
-				if (view.getVisibility() == View.VISIBLE) {
-					if (lifecycleState.compareAndSet(LifecycleState.Created, LifecycleState.Started)) {
-						lifecycleListener.onStart();
-					}
-				} else {
-					if (lifecycleState.compareAndSet(LifecycleState.Started, LifecycleState.Stopped)) {
-						lifecycleListener.onStop();
-					}
-				}
-			}
-		});
-		lifecycleState.set(LifecycleState.Created);
-		if (lifecycleListener != null) {
-			lifecycleListener.onCreate();
-		}
+	public void onStart() {
+
+	}
+
+	public void onStop() {
+
 	}
+
+	public void onDestroy() {
+
+	}
+
 }

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

@@ -9,10 +9,6 @@ import com.reactnativenavigation.mocks.SimpleViewController;
 import org.junit.Test;
 
 import static org.assertj.core.api.Java6Assertions.assertThat;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.verifyZeroInteractions;
 
 public class ViewControllerTest extends BaseTest {
 
@@ -60,59 +56,4 @@ public class ViewControllerTest extends BaseTest {
 	public void handleBackDefaultFalse() throws Exception {
 		assertThat(uut.handleBack()).isFalse();
 	}
-
-	public static class LifecycleTest extends BaseTest {
-		private ViewController controller;
-		private ViewController.LifecycleListener uut;
-
-		@Override
-		public void beforeEach() {
-			super.beforeEach();
-			Activity activity = newActivity();
-			controller = new SimpleViewController(activity, "controller");
-			uut = mock(ViewController.LifecycleListener.class);
-			controller.setLifecycleListener(uut);
-		}
-
-		@Test
-		public void onCreateView_CalledAsSoonAsPossible() throws Exception {
-			verifyZeroInteractions(uut);
-			controller.getView();
-			verify(uut, times(1)).onCreate();
-		}
-
-		@Test
-		public void onStart_CalledWhenVisible() throws Exception {
-			verifyZeroInteractions(uut);
-			controller.getView().getViewTreeObserver().dispatchOnGlobalLayout();
-			verify(uut, times(1)).onStart();
-		}
-
-		@Test
-		public void onStop_CalledWhenInvisible() throws Exception {
-			verifyZeroInteractions(uut);
-			controller.getView().getViewTreeObserver().dispatchOnGlobalLayout();
-			controller.getView().setVisibility(View.GONE);
-			controller.getView().getViewTreeObserver().dispatchOnGlobalLayout();
-			verify(uut, times(1)).onStop();
-		}
-
-		@Test
-		public void onStart_OnStop_Cycle() throws Exception {
-			verifyZeroInteractions(uut);
-			controller.getView().getViewTreeObserver().dispatchOnGlobalLayout();
-			controller.getView().getViewTreeObserver().dispatchOnGlobalLayout();
-			verify(uut, times(1)).onStart();
-			controller.getView().getViewTreeObserver().dispatchOnGlobalLayout();
-			controller.getView().setVisibility(View.INVISIBLE);
-			controller.getView().getViewTreeObserver().dispatchOnGlobalLayout();
-			controller.getView().getViewTreeObserver().dispatchOnGlobalLayout();
-			verify(uut, times(1)).onStop();
-			controller.getView().setVisibility(View.VISIBLE);
-			controller.getView().getViewTreeObserver().dispatchOnGlobalLayout();
-			controller.getView().getViewTreeObserver().dispatchOnGlobalLayout();
-			verify(uut, times(1)).onStart();
-		}
-	}
-
 }