Ensure ReactView isn't created after it's destroyed (#2503)

* Ensure ReactView isn't created after it's destroyed

Fixes #2490

* Rebase fixes and renames

lib/android/app/src/main/java/com/reactnativenavigation/presentation/NavigationOptionsListener.java

@@ -4,5 +4,5 @@ package com.reactnativenavigation.presentation;
 import com.reactnativenavigation.parse.Options;
 
 public interface NavigationOptionsListener {
-	void mergeNavigationOptions(Options options);
+	void mergeOptions(Options options);
 }

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

@@ -98,7 +98,7 @@ public class BottomTabsController extends ParentController
 	}
 
 	@Override
-	public void mergeNavigationOptions(Options options) {
+	public void mergeOptions(Options options) {
 		if (options.bottomTabsOptions != null) {
 			if (options.bottomTabsOptions.currentTabIndex != NO_INT_VALUE) {
 				selectTabAtIndex(options.bottomTabsOptions.currentTabIndex);

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

@@ -86,7 +86,7 @@ public class ComponentViewController extends ViewController implements Navigatio
     }
 
     @Override
-    public void mergeNavigationOptions(Options options) {
+    public void mergeOptions(Options options) {
         this.options.mergeWith(options);
         component.applyOptions(this.options);
     }

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

@@ -0,0 +1,104 @@
+package com.reactnativenavigation.viewcontrollers;
+
+import android.app.Activity;
+import android.support.annotation.NonNull;
+import android.support.annotation.RestrictTo;
+import android.view.View;
+
+import com.reactnativenavigation.parse.Options;
+import com.reactnativenavigation.presentation.NavigationOptionsListener;
+import com.reactnativenavigation.views.ReactComponent;
+import com.reactnativenavigation.views.TopBar;
+
+public class ContainerViewController extends ViewController implements NavigationOptionsListener {
+
+    public interface ReactViewCreator {
+
+        IReactView create(Activity activity, String containerId, String containerName);
+    }
+
+    public interface IReactView {
+
+        boolean isReady();
+
+        View asView();
+
+        void destroy();
+
+        void sendComponentStart();
+
+        void sendComponentStop();
+
+        void sendOnNavigationButtonPressed(String buttonId);
+    }
+
+    private final String componentName;
+
+    private final ReactViewCreator viewCreator;
+    private Options options;
+    private ReactComponent component;
+
+    public ContainerViewController(final Activity activity,
+                                   final String id,
+                                   final String componentName,
+                                   final ReactViewCreator viewCreator,
+                                   final Options initialOptions) {
+        super(activity, id);
+        this.componentName = componentName;
+        this.viewCreator = viewCreator;
+        this.options = initialOptions;
+    }
+
+    @RestrictTo(RestrictTo.Scope.TESTS)
+    TopBar getTopBar() {
+        return component.getTopBar();
+    }
+
+    @RestrictTo(RestrictTo.Scope.TESTS)
+    ReactComponent getComponent() {
+        return component;
+    }
+
+    @Override
+    public void destroy() {
+        super.destroy();
+        if (component != null) component.destroy();
+        component = null;
+    }
+
+    @Override
+    public void onViewAppeared() {
+        super.onViewAppeared();
+        ensureViewIsCreated();
+        component.applyOptions(options);
+        component.sendComponentStart();
+    }
+
+    @Override
+    public void onViewDisappear() {
+        super.onViewDisappear();
+        component.sendComponentStop();
+    }
+
+    @Override
+    protected boolean isViewShown() {
+        return super.isViewShown() && component.isReady();
+    }
+
+    @NonNull
+    @Override
+    protected View createView() {
+        component = (ReactComponent) viewCreator.create(getActivity(), getId(), componentName);
+        return component.asView();
+    }
+
+    @Override
+    public void mergeOptions(Options options) {
+        this.options.mergeWith(options);
+        component.applyOptions(this.options);
+    }
+
+    Options getOptions() {
+        return options;
+    }
+}

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

@@ -81,10 +81,10 @@ public class Navigator extends ParentController {
 	public void setOptions(final String componentId, Options options) {
 		ViewController target = findControllerById(componentId);
 		if (target instanceof NavigationOptionsListener) {
-			((NavigationOptionsListener) target).mergeNavigationOptions(options);
+			((NavigationOptionsListener) target).mergeOptions(options);
 		}
 		if (root instanceof NavigationOptionsListener) {
-			((NavigationOptionsListener) root).mergeNavigationOptions(options);
+			((NavigationOptionsListener) root).mergeOptions(options);
 		}
 	}
 

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

@@ -23,6 +23,8 @@ public abstract class ViewController implements ViewTreeObserver.OnGlobalLayoutL
 	private ParentController parentController;
 	private boolean isShown = false;
 
+    private boolean isDestroyed;
+
 	public ViewController(Activity activity, String id) {
 		this.activity = activity;
 		this.id = id;
@@ -77,7 +79,8 @@ public abstract class ViewController implements ViewTreeObserver.OnGlobalLayoutL
 	@NonNull
 	public View getView() {
 		if (view == null) {
-			view = createView();
+		    if (isDestroyed) throw new RuntimeException("Tried to create view after it has already been destroyed");
+            view = createView();
 			view.setId(CompatUtils.generateViewId());
 			view.getViewTreeObserver().addOnGlobalLayoutListener(this);
 		}
@@ -120,6 +123,7 @@ public abstract class ViewController implements ViewTreeObserver.OnGlobalLayoutL
 				((ViewManager) view.getParent()).removeView(view);
 			}
 			view = null;
+            isDestroyed = true;
 		}
 	}
 
@@ -135,6 +139,6 @@ public abstract class ViewController implements ViewTreeObserver.OnGlobalLayoutL
 	}
 
 	protected boolean isViewShown() {
-		return getView().isShown();
+        return !isDestroyed && getView().isShown();
 	}
 }

lib/android/app/src/main/java/com/reactnativenavigation/viewcontrollers/toptabs/TopTabController.java

@@ -66,7 +66,7 @@ public class TopTabController extends ViewController implements NavigationOption
     }
 
     @Override
-    public void mergeNavigationOptions(Options options) {
+    public void mergeOptions(Options options) {
         this.options.mergeWith(options);
         applyOptions(this.options);
     }

lib/android/app/src/main/java/com/reactnativenavigation/viewcontrollers/toptabs/TopTabsController.java

@@ -62,7 +62,7 @@ public class TopTabsController extends ParentController implements NavigationOpt
     }
 
     @Override
-    public void mergeNavigationOptions(Options options) {
+    public void mergeOptions(Options options) {
 
     }
 

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

@@ -61,7 +61,7 @@ public class OptionsApplyingTest extends BaseTest {
         assertThat(uut.getOptions().topBarOptions.title).isEmpty();
         Options options = new Options();
         options.topBarOptions.title = "new title";
-        uut.mergeNavigationOptions(options);
+        uut.mergeOptions(options);
         assertThat(uut.getOptions().topBarOptions.title).isEqualTo("new title");
         assertThat(uut.getOptions()).isSameAs(initialNavigationOptions);
     }
@@ -73,7 +73,7 @@ public class OptionsApplyingTest extends BaseTest {
 
         Options opts = new Options();
         opts.topBarOptions.title = "the new title";
-        uut.mergeNavigationOptions(opts);
+        uut.mergeOptions(opts);
 
         assertThat(uut.getTopBar().getTitle()).isEqualTo("the new title");
     }
@@ -86,7 +86,7 @@ public class OptionsApplyingTest extends BaseTest {
 
         Options opts = new Options();
         opts.topBarOptions.backgroundColor = Color.RED;
-        uut.mergeNavigationOptions(opts);
+        uut.mergeOptions(opts);
 
         assertThat(((ColorDrawable) uut.getTopBar().getTitleBar().getBackground()).getColor()).isEqualTo(Color.RED);
     }
@@ -101,7 +101,7 @@ public class OptionsApplyingTest extends BaseTest {
         Options opts = new Options();
         opts.topBarOptions.title = "the title";
         opts.topBarOptions.textColor = Color.RED;
-        uut.mergeNavigationOptions(opts);
+        uut.mergeOptions(opts);
 
         assertThat(uut.getTopBar().getTitleTextView()).isNotEqualTo(null);
         assertThat(uut.getTopBar().getTitleTextView().getCurrentTextColor()).isEqualTo(Color.RED);
@@ -117,7 +117,7 @@ public class OptionsApplyingTest extends BaseTest {
         Options opts = new Options();
         opts.topBarOptions.title = "the title";
         opts.topBarOptions.textFontSize = 18;
-        uut.mergeNavigationOptions(opts);
+        uut.mergeOptions(opts);
 
         assertThat(uut.getTopBar().getTitleTextView()).isNotEqualTo(null);
         assertThat(uut.getTopBar().getTitleTextView().getTextSize()).isEqualTo(18);
@@ -132,7 +132,7 @@ public class OptionsApplyingTest extends BaseTest {
 
         Options opts = new Options();
         opts.topBarOptions.hidden = Options.BooleanOptions.True;
-        uut.mergeNavigationOptions(opts);
+        uut.mergeOptions(opts);
 
         assertThat(uut.getTopBar().getVisibility()).isEqualTo(View.GONE);
     }
@@ -148,7 +148,7 @@ public class OptionsApplyingTest extends BaseTest {
 
         Options opts = new Options();
         opts.topBarOptions.drawBehind = Options.BooleanOptions.True;
-        uut.mergeNavigationOptions(opts);
+        uut.mergeOptions(opts);
 
         uutLayoutParams = (RelativeLayout.LayoutParams) ((ViewGroup) uut.getComponent().asView()).getChildAt(1).getLayoutParams();
         assertThat(uutLayoutParams.getRule(BELOW)).isEqualTo(0);

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

@@ -1,6 +1,7 @@
 package com.reactnativenavigation.viewcontrollers;
 
 import android.app.*;
+import android.view.View;
 
 import com.reactnativenavigation.*;
 import com.reactnativenavigation.mocks.*;
@@ -142,11 +143,13 @@ public class StackControllerTest extends BaseTest {
     public void popReplacesViewWithPrevious() throws Exception {
         uut.push(child1);
         uut.push(child2);
-        assertIsChildById(uut.getView(), child2.getView());
-        assertNotChildOf(uut.getView(), child1.getView());
+        final View child2View = child2.getView();
+        final View child1View = child1.getView();
+        assertIsChildById(uut.getView(), child2View);
+        assertNotChildOf(uut.getView(), child1View);
         uut.pop();
-        assertNotChildOf(uut.getView(), child2.getView());
-        assertIsChildById(uut.getView(), child1.getView());
+        assertNotChildOf(uut.getView(), child2View);
+        assertIsChildById(uut.getView(), child1View);
     }
 
     @Test

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

@@ -44,7 +44,7 @@ public class TopTabControllerTest extends BaseTest {
     public void styleIsAppliedOnParentControllerWhenOptionsAreSetDynamically() throws Exception {
         uut.ensureViewIsCreated();
         uut.onViewAppeared();
-        uut.mergeNavigationOptions(new Options());
+        uut.mergeOptions(new Options());
         verify(parentController, times(2)).applyOptions(initialOptions);
     }
 

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

@@ -1,20 +1,24 @@
 package com.reactnativenavigation.viewcontrollers;
 
-import android.app.*;
-import android.view.*;
-import android.widget.*;
+import android.app.Activity;
+import android.view.View;
+import android.view.ViewParent;
+import android.widget.LinearLayout;
 
-import com.reactnativenavigation.*;
-import com.reactnativenavigation.mocks.*;
+import com.reactnativenavigation.BaseTest;
+import com.reactnativenavigation.mocks.SimpleViewController;
 
-import org.assertj.android.api.*;
-import org.junit.*;
-import org.robolectric.*;
+import org.assertj.android.api.Assertions;
+import org.junit.Test;
+import org.robolectric.Shadows;
 
-import java.lang.reflect.*;
+import java.lang.reflect.Field;
 
-import static org.assertj.core.api.Java6Assertions.*;
-import static org.mockito.Mockito.*;
+import static org.assertj.core.api.Java6Assertions.assertThat;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
 
 public class ViewControllerTest extends BaseTest {