ReactViewHacks + RctView terminated

android/app/src/main/java/com/reactnativenavigation/react/ReactViewHacks.java

@@ -0,0 +1,18 @@
+package com.reactnativenavigation.react;
+
+import com.facebook.react.ReactRootView;
+import com.reactnativenavigation.utils.ReflectionUtils;
+
+public class ReactViewHacks {
+
+    public static void preventUnmountOnDetachedFromWindow(ReactRootView view) {
+        ReflectionUtils.setField(view, "mAttachScheduled", true);
+    }
+
+    public static void ensureUnmountOnDetachedFromWindow(ReactRootView view) {
+        // Must be called before view is removed from screen inorder to ensure onDetachedFromScreen is properly
+        // executed and componentWillUnmount is called
+        ReflectionUtils.setField(view, "mAttachScheduled", false);
+    }
+
+}

android/app/src/main/java/com/reactnativenavigation/views/ContentView.java

@@ -2,9 +2,11 @@ package com.reactnativenavigation.views;
 
 import android.content.Context;
 import android.os.Bundle;
+import android.view.ViewGroup;
 
 import com.facebook.react.ReactInstanceManager;
 import com.facebook.react.ReactRootView;
+import com.reactnativenavigation.react.ReactViewHacks;
 
 public class ContentView extends ReactRootView implements ScrollDirectionListener.OnChanged {
 
@@ -20,4 +22,16 @@ public class ContentView extends ReactRootView implements ScrollDirectionListene
     public void onScrollChanged(ScrollDirectionListener.Direction direction) {
 
     }
+
+    public void removeFromParentWithoutUnmount() {
+        // Hack in order to prevent the react view from getting unmounted
+        ReactViewHacks.preventUnmountOnDetachedFromWindow(this);
+        ((ViewGroup) getParent()).removeView(this);
+    }
+
+    public void removeFromParentAndUnmount() {
+        ReactViewHacks.ensureUnmountOnDetachedFromWindow(this);
+        ((ViewGroup) getParent()).removeView(this);
+    }
+
 }

android/app/src/main/java/com/reactnativenavigation/views/RctView.java

@@ -121,56 +121,26 @@ public class RctView extends FrameLayout {
         return passProps;
     }
 
-    private void setupScrollViewWithBottomTabs() {
-        scrollView = getScrollView((ViewGroup) getParent());
-        if (scrollView != null) {
-            context = (BottomTabActivity) getContext();
-            attachStateChangeListener(scrollView);
-            addScrollListener();
-        }
-    }
-
-
-    private void attachStateChangeListener(ScrollView scrollView) {
-        scrollView.addOnAttachStateChangeListener(stateChangeListener);
-    }
-
-    private void addScrollListener() {
-        scrollView.getViewTreeObserver().addOnScrollChangedListener(scrollChangedListener);
-    }
-
-    private void removeScrollListener() {
-        scrollView.getViewTreeObserver().removeOnScrollChangedListener(scrollChangedListener);
-    }
-
-    /**
-     * Must be called before view is removed from screen, but will be added again later. Setting mAttachScheduled
-     * to true will prevent the component from getting unmounted once view is detached from screen.
-     */
-    public void onTemporallyRemovedFromScreen() {
-        // Hack in order to prevent the react view from getting unmounted
-
-        ReflectionUtils.setField(reactRootView, "mAttachScheduled", true);
-    }
-
-    /**
-     * Must be called before view is removed from screen inorder to ensure onDetachedFromScreen is properly
-     * executed and componentWillUnmount is called
-     */
-    public void onRemoveFromScreen() {
-        ReflectionUtils.setField(reactRootView, "mAttachScheduled", false);
-    }
-
-    /**
-     * Must be called when view is added again to screen inorder to ensure onDetachedFromScreen is properly
-     * executed and componentWillUnmount is called
-     */
-    public void onReAddToScreen() {
-        ReflectionUtils.setField(reactRootView, "mAttachScheduled", false);
-    }
-
-    public void detachFromScreen() {
-        ReflectionUtils.invoke(reactRootView, "onDetachedFromWindow");
-    }
+//    private void setupScrollViewWithBottomTabs() {
+//        scrollView = getScrollView((ViewGroup) getParent());
+//        if (scrollView != null) {
+//            context = (BottomTabActivity) getContext();
+//            attachStateChangeListener(scrollView);
+//            addScrollListener();
+//        }
+//    }
+
+
+//    private void attachStateChangeListener(ScrollView scrollView) {
+//        scrollView.addOnAttachStateChangeListener(stateChangeListener);
+//    }
+//
+//    private void addScrollListener() {
+//        scrollView.getViewTreeObserver().addOnScrollChangedListener(scrollChangedListener);
+//    }
+//
+//    private void removeScrollListener() {
+//        scrollView.getViewTreeObserver().removeOnScrollChangedListener(scrollChangedListener);
+//    }
 }