ContentView

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

@@ -8,19 +8,24 @@ import com.facebook.react.ReactInstanceManager;
 import com.facebook.react.ReactRootView;
 import com.reactnativenavigation.react.ReactViewHacks;
 
-public class ContentView extends ReactRootView implements ScrollDirectionListener.OnChanged {
+public class ContentView extends ReactRootView {
 
-    private final ScrollViewAttacher scrollViewAttacher;
+    private final ReactInstanceManager reactInstanceManager;
+    private final String moduleName;
+    private final Bundle passProps;
+    private final ScrollDirectionListener.OnScrollChanged scrollListener;
 
-    public ContentView(Context context, ReactInstanceManager reactInstanceManager, String moduleName, Bundle passProps) {
+    public ContentView(Context context, ReactInstanceManager reactInstanceManager, String moduleName, Bundle passProps, ScrollDirectionListener.OnScrollChanged scrollListener) {
         super(context);
-        startReactApplication(reactInstanceManager, moduleName, passProps);
-        scrollViewAttacher = new ScrollViewAttacher(this, this);
+        this.reactInstanceManager = reactInstanceManager;
+        this.moduleName = moduleName;
+        this.passProps = passProps;
+        this.scrollListener = scrollListener;
     }
 
-    @Override
-    public void onScrollChanged(ScrollDirectionListener.Direction direction) {
-
+    public void init() {
+        startReactApplication(reactInstanceManager, moduleName, passProps);
+        new ScrollViewAttacher(this, scrollListener).attach();
     }
 
     public void removeFromParentWithoutUnmount() {
@@ -33,5 +38,4 @@ public class ContentView extends ReactRootView implements ScrollDirectionListene
         ReactViewHacks.ensureUnmountOnDetachedFromWindow(this);
         ((ViewGroup) getParent()).removeView(this);
     }
-
 }

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

@@ -8,15 +8,15 @@ public class ScrollDirectionListener implements ViewTreeObserver.OnScrollChanged
         Up, Down
     }
 
-    public interface OnChanged {
+    public interface OnScrollChanged {
         void onScrollChanged(Direction direction);
     }
 
     private final ViewGroup view;
-    private OnChanged onChanged;
+    private OnScrollChanged onChanged;
     private int lastScrollY = -1;
 
-    public ScrollDirectionListener(ViewGroup view, OnChanged onChanged) {
+    public ScrollDirectionListener(ViewGroup view, OnScrollChanged onChanged) {
         this.view = view;
         this.onChanged = onChanged;
     }

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

@@ -9,11 +9,11 @@ import com.reactnativenavigation.utils.ViewUtils;
 public class ScrollViewAttacher implements View.OnAttachStateChangeListener {
 
     private final ContentView view;
-    private final ScrollDirectionListener.OnChanged onChanged;
+    private final ScrollDirectionListener.OnScrollChanged onChanged;
     private ScrollView scrollView;
     private ScrollDirectionListener scrollDirectionListener;
 
-    public ScrollViewAttacher(ContentView view, ScrollDirectionListener.OnChanged onChanged) {
+    public ScrollViewAttacher(ContentView view, ScrollDirectionListener.OnScrollChanged onChanged) {
         this.view = view;
         this.onChanged = onChanged;
     }