#1065

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

@@ -46,7 +46,7 @@ public class ReactRootViewController extends ViewController implements View.OnAt
 	}
 
 	@Override
-	protected View onCreateView() {
+	protected View createView() {
 		ReactRootView reactRootView = new ReactRootView(getActivity());
 		reactRootView.addOnAttachStateChangeListener(this);
 		Bundle opts = new Bundle();

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

@@ -77,7 +77,7 @@ public class StackController extends ViewController {
 	}
 
 	@Override
-	protected ViewGroup onCreateView() {
+	protected ViewGroup createView() {
 		return new FrameLayout(getActivity());
 	}
 

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

@@ -5,15 +5,17 @@ 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(ViewController viewController);
+		void onCreate();
 
-		void onStart(ViewController viewController);
+		void onStart();
 
-		void onStop(ViewController viewController);
+		void onStop();
 
-		void onDestroy(ViewController viewController);
+		void onDestroy();
 	}
 
 	private enum LifecycleState {
@@ -23,14 +25,14 @@ public abstract class ViewController {
 	private final Activity activity;
 	private View view;
 	private StackController stackController;
-	private LifecycleState lifecycleState;
+	private AtomicReference<LifecycleState> lifecycleState = new AtomicReference<>(LifecycleState.Destroyed);
 	private LifecycleListener lifecycleListener;
 
 	public ViewController(Activity activity) {
 		this.activity = activity;
 	}
 
-	protected abstract View onCreateView();
+	protected abstract View createView();
 
 	public boolean handleBack() {
 		return false;
@@ -52,6 +54,7 @@ public abstract class ViewController {
 	public View getView() {
 		if (view == null) {
 			view = createView();
+			attachLifecycle();
 		}
 		return view;
 	}
@@ -60,24 +63,27 @@ public abstract class ViewController {
 		this.lifecycleListener = lifecycleListener;
 	}
 
-	private View createView() {
-		View view = onCreateView();
-		lifecycleState = LifecycleState.Created;
-		view.getViewTreeObserver().addOnPreDrawListener(new ViewTreeObserver.OnPreDrawListener() {
+	private void attachLifecycle() {
+		view.getViewTreeObserver().addOnGlobalLayoutListener(new ViewTreeObserver.OnGlobalLayoutListener() {
 			@Override
-			public boolean onPreDraw() {
-				if (lifecycleListener != null) {
-					if (lifecycleState != LifecycleState.Started) {
-						lifecycleState = LifecycleState.Started;
-						lifecycleListener.onStart(ViewController.this);
+			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();
 					}
 				}
-				return true;
 			}
 		});
+		lifecycleState.set(LifecycleState.Created);
 		if (lifecycleListener != null) {
-			lifecycleListener.onCreate(this);
+			lifecycleListener.onCreate();
 		}
-		return view;
 	}
 }

lib/android/app/src/test/java/com/reactnativenavigation/mocks/SimpleViewController.java

@@ -14,7 +14,7 @@ public class SimpleViewController extends ViewController {
 	}
 
 	@Override
-	protected View onCreateView() {
+	protected View createView() {
 		return new View(getActivity());
 	}
 

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

@@ -41,7 +41,7 @@ public class ViewControllerTest extends BaseTest {
 		final View otherView = new View(activity);
 		ViewController myController = new ViewController(activity) {
 			@Override
-			protected View onCreateView() {
+			protected View createView() {
 				return otherView;
 			}
 		};
@@ -78,15 +78,40 @@ public class ViewControllerTest extends BaseTest {
 		public void onCreateView_CalledAsSoonAsPossible() throws Exception {
 			verifyZeroInteractions(uut);
 			controller.getView();
-			verify(uut, times(1)).onCreate(controller);
+			verify(uut, times(1)).onCreate();
 		}
 
 		@Test
-		public void onStart_CalledBeforeFirstDraw() throws Exception {
+		public void onStart_CalledWhenVisible() throws Exception {
 			verifyZeroInteractions(uut);
-			controller.getView().getViewTreeObserver().dispatchOnPreDraw();
-			controller.getView().getViewTreeObserver().dispatchOnPreDraw();
-			verify(uut, times(1)).onStart(controller);
+			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();
 		}
 	}