lifecycle methods inconsistant

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

@@ -24,21 +24,21 @@ public class ReactRootViewController extends ViewController {
 	}
 
 	@Override
-	public void onDestroy() {
-		super.onDestroy();
+	public void destroy() {
+		super.destroy();
 		if (reactRootView != null) reactRootView.unmountReactApplication();
 		reactRootView = null;
 	}
 
 	@Override
-	public void onAppear() {
-		super.onAppear();
+	public void onViewAppeared() {
+		super.onViewAppeared();
 		new NavigationEvent(reactInstanceManager.getCurrentReactContext()).containerStart(getId());
 	}
 
 	@Override
-	public void onDisappear() {
-		super.onDisappear();
+	public void onViewDisappear() {
+		super.onViewDisappear();
 		new NavigationEvent(reactInstanceManager.getCurrentReactContext()).containerStop(getId());
 	}
 

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

@@ -32,10 +32,10 @@ public class NavigationModule extends ReactContextBaseJavaModule {
 
 	@ReactMethod
 	public void setRoot(final ReadableMap rawLayoutTree) {
+		final LayoutNode layoutTree = LayoutNodeParser.parse(JSONParser.parse(rawLayoutTree));
 		handle(new Runnable() {
 			@Override
 			public void run() {
-				final LayoutNode layoutTree = LayoutNodeParser.parse(JSONParser.parse(rawLayoutTree));
 				final ViewController viewController = newLayoutFactory().create(layoutTree);
 				navigator().setRoot(viewController);
 			}
@@ -44,10 +44,10 @@ public class NavigationModule extends ReactContextBaseJavaModule {
 
 	@ReactMethod
 	public void push(final String onContainerId, final ReadableMap rawLayoutTree) {
+		final LayoutNode layoutTree = LayoutNodeParser.parse(JSONParser.parse(rawLayoutTree));
 		handle(new Runnable() {
 			@Override
 			public void run() {
-				final LayoutNode layoutTree = LayoutNodeParser.parse(JSONParser.parse(rawLayoutTree));
 				final ViewController viewController = newLayoutFactory().create(layoutTree);
 				navigator().push(onContainerId, viewController);
 			}

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

@@ -39,7 +39,9 @@ public class Navigator extends ParentController {
 	 */
 
 	public void setRoot(final ViewController viewController) {
-		getView().removeAllViews();
+		if (root != null) {
+			root.destroy();
+		}
 
 		root = viewController;
 		getView().addView(viewController.getView());

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

@@ -40,31 +40,11 @@ public abstract class ParentController extends ViewController {
 		return null;
 	}
 
-	/*
-	 * lifecycle
-	 */
-
-	@Override
-	public void onAppear() {
-		super.onAppear();
-		for (ViewController child : getChildControllers()) {
-			child.onAppear();
-		}
-	}
-
-	@Override
-	public void onDisappear() {
-		super.onDisappear();
-		for (ViewController child : getChildControllers()) {
-			child.onDisappear();
-		}
-	}
-
 	@Override
-	public void onDestroy() {
-		super.onDestroy();
+	public void destroy() {
+		super.destroy();
 		for (ViewController child : getChildControllers()) {
-			child.onDestroy();
+			child.destroy();
 		}
 	}
 }

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

@@ -56,7 +56,7 @@ public class StackController extends ParentController {
 			@Override
 			public void run() {
 				getView().removeView(poppedTop.getView());
-				poppedTop.onDestroy();
+				poppedTop.destroy();
 			}
 		});
 	}
@@ -66,7 +66,7 @@ public class StackController extends ParentController {
 			pop();
 		} else {
 			stack.remove(childController.getId());
-			childController.onDestroy();
+			childController.destroy();
 		}
 	}
 

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

@@ -4,6 +4,7 @@ import android.app.Activity;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.view.View;
+import android.view.ViewGroup;
 import android.view.ViewTreeObserver;
 
 import com.reactnativenavigation.utils.StringUtils;
@@ -63,21 +64,24 @@ public abstract class ViewController implements ViewTreeObserver.OnGlobalLayoutL
 		return isSameId(id) ? this : null;
 	}
 
-	public void onAppear() {
+	public void onViewAppeared() {
 		//
 	}
 
-	public void onDisappear() {
+	public void onViewDisappear() {
 		//
 	}
 
-	public void onDestroy() {
+	public void destroy() {
 		if (isShown) {
 			isShown = false;
-			onDisappear();
+			onViewDisappear();
 		}
 		if (view != null) {
 			view.getViewTreeObserver().removeOnGlobalLayoutListener(this);
+			if (view.getParent() instanceof ViewGroup) {
+				((ViewGroup) view.getParent()).removeView(view);
+			}
 			view = null;
 		}
 	}
@@ -86,10 +90,10 @@ public abstract class ViewController implements ViewTreeObserver.OnGlobalLayoutL
 	public void onGlobalLayout() {
 		if (!isShown && isViewShown()) {
 			isShown = true;
-			onAppear();
+			onViewAppeared();
 		} else if (isShown && !isViewShown()) {
 			isShown = false;
-			onDisappear();
+			onViewDisappear();
 		}
 	}
 

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

@@ -85,9 +85,9 @@ public class ParentControllerTest extends BaseTest {
 		ViewController child1 = spy(new SimpleViewController(activity, "child1"));
 		children.add(child1);
 
-		verify(child1, times(0)).onAppear();
-		uut.onAppear();
-		verify(child1, times(1)).onAppear();
+		verify(child1, times(0)).onViewAppeared();
+		uut.onViewAppeared();
+		verify(child1, times(1)).onViewAppeared();
 	}
 
 	@Test
@@ -95,9 +95,9 @@ public class ParentControllerTest extends BaseTest {
 		ViewController child1 = spy(new SimpleViewController(activity, "child1"));
 		children.add(child1);
 
-		verify(child1, times(0)).onDisappear();
-		uut.onDisappear();
-		verify(child1, times(1)).onDisappear();
+		verify(child1, times(0)).onViewDisappear();
+		uut.onViewDisappear();
+		verify(child1, times(1)).onViewDisappear();
 	}
 
 	@Test
@@ -105,8 +105,8 @@ public class ParentControllerTest extends BaseTest {
 		ViewController child1 = spy(new SimpleViewController(activity, "child1"));
 		children.add(child1);
 
-		verify(child1, times(0)).onDestroy();
-		uut.onDestroy();
-		verify(child1, times(1)).onDestroy();
+		verify(child1, times(0)).destroy();
+		uut.destroy();
+		verify(child1, times(1)).destroy();
 	}
 }

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

@@ -250,9 +250,9 @@ public class StackControllerTest extends BaseTest {
 		uut.push(child2);
 		uut.push(child3);
 
-		verify(child3, times(0)).onDestroy();
+		verify(child3, times(0)).destroy();
 		uut.pop();
-		verify(child3, times(1)).onDestroy();
+		verify(child3, times(1)).destroy();
 	}
 
 	@Test
@@ -264,9 +264,9 @@ public class StackControllerTest extends BaseTest {
 		uut.push(child2);
 		uut.push(child3);
 
-		verify(child2, times(0)).onDestroy();
+		verify(child2, times(0)).destroy();
 		uut.popSpecific(child2);
-		verify(child2, times(1)).onDestroy();
+		verify(child2, times(1)).destroy();
 	}
 
 	@Test
@@ -278,11 +278,11 @@ public class StackControllerTest extends BaseTest {
 		uut.push(child2);
 		uut.push(child3);
 
-		verify(child2, times(0)).onDestroy();
-		verify(child3, times(0)).onDestroy();
+		verify(child2, times(0)).destroy();
+		verify(child3, times(0)).destroy();
 		uut.popTo(child1);
-		verify(child2, times(1)).onDestroy();
-		verify(child3, times(1)).onDestroy();
+		verify(child2, times(1)).destroy();
+		verify(child3, times(1)).destroy();
 	}
 
 	private void assertHasSingleChildViewOfController(ViewController childController) {

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

@@ -13,6 +13,7 @@ import org.robolectric.Shadows;
 
 import java.lang.reflect.Field;
 
+import static org.assertj.core.api.Assertions.fail;
 import static org.assertj.core.api.Java6Assertions.assertThat;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.spy;
@@ -89,13 +90,13 @@ public class ViewControllerTest extends BaseTest {
 		ViewController spy = spy(uut);
 		spy.getView().getViewTreeObserver().dispatchOnGlobalLayout();
 		Assertions.assertThat(spy.getView()).isNotShown();
-		verify(spy, times(0)).onAppear();
+		verify(spy, times(0)).onViewAppeared();
 
 		Shadows.shadowOf(spy.getView()).setMyParent(mock(ViewParent.class));
 		spy.getView().getViewTreeObserver().dispatchOnGlobalLayout();
 		Assertions.assertThat(spy.getView()).isShown();
 
-		verify(spy, times(1)).onAppear();
+		verify(spy, times(1)).onViewAppeared();
 	}
 
 	@Test
@@ -107,7 +108,7 @@ public class ViewControllerTest extends BaseTest {
 		spy.getView().getViewTreeObserver().dispatchOnGlobalLayout();
 		spy.getView().getViewTreeObserver().dispatchOnGlobalLayout();
 
-		verify(spy, times(1)).onAppear();
+		verify(spy, times(1)).onViewAppeared();
 	}
 
 	@Test
@@ -116,13 +117,13 @@ public class ViewControllerTest extends BaseTest {
 		Shadows.shadowOf(spy.getView()).setMyParent(mock(ViewParent.class));
 		Assertions.assertThat(spy.getView()).isShown();
 		spy.getView().getViewTreeObserver().dispatchOnGlobalLayout();
-		verify(spy, times(1)).onAppear();
-		verify(spy, times(0)).onDisappear();
+		verify(spy, times(1)).onViewAppeared();
+		verify(spy, times(0)).onViewDisappear();
 
 		spy.getView().setVisibility(View.GONE);
 		spy.getView().getViewTreeObserver().dispatchOnGlobalLayout();
 		Assertions.assertThat(spy.getView()).isNotShown();
-		verify(spy, times(1)).onDisappear();
+		verify(spy, times(1)).onViewDisappear();
 	}
 
 	@Test
@@ -135,23 +136,23 @@ public class ViewControllerTest extends BaseTest {
 		spy.getView().getViewTreeObserver().dispatchOnGlobalLayout();
 		spy.getView().getViewTreeObserver().dispatchOnGlobalLayout();
 		spy.getView().getViewTreeObserver().dispatchOnGlobalLayout();
-		verify(spy, times(1)).onDisappear();
+		verify(spy, times(1)).onViewDisappear();
 	}
 
 	@Test
 	public void onDestroy_RemovesGlobalLayoutListener() throws Exception {
-		new SimpleViewController(activity, "ensureNotNull").onDestroy();
+		new SimpleViewController(activity, "ensureNotNull").destroy();
 
 		ViewController spy = spy(uut);
 		View view = spy.getView();
 		Shadows.shadowOf(view).setMyParent(mock(ViewParent.class));
 
-		spy.onDestroy();
+		spy.destroy();
 
 		Assertions.assertThat(view).isShown();
 		view.getViewTreeObserver().dispatchOnGlobalLayout();
-		verify(spy, times(0)).onAppear();
-		verify(spy, times(0)).onDisappear();
+		verify(spy, times(0)).onViewAppeared();
+		verify(spy, times(0)).onViewDisappear();
 
 		Field field = ViewController.class.getDeclaredField("view");
 		field.setAccessible(true);
@@ -164,11 +165,16 @@ public class ViewControllerTest extends BaseTest {
 		Shadows.shadowOf(spy.getView()).setMyParent(mock(ViewParent.class));
 		Assertions.assertThat(spy.getView()).isShown();
 		spy.getView().getViewTreeObserver().dispatchOnGlobalLayout();
-		verify(spy, times(1)).onAppear();
+		verify(spy, times(1)).onViewAppeared();
 
-		spy.onDestroy();
+		spy.destroy();
 
-		verify(spy, times(1)).onDisappear();
+		verify(spy, times(1)).onViewDisappear();
+	}
+
+	@Test
+	public void onDestroy_RemovesSelfFromParentIfExists() throws Exception {
+		fail("implement");
 	}
 }