f

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

@@ -249,12 +249,12 @@ public class StackController extends ParentController<StackLayout> {
 
     @Override
     public void setupTopTabsWithViewPager(ViewPager viewPager) {
-        getView().initTopTabs(viewPager);
+        topBarController.initTopTabs(viewPager);
     }
 
     @Override
     public void clearTopTabs() {
-        getView().clearTopTabs();
+        topBarController.clearTopTabs();
     }
 
      NavigationAnimator createAnimator() {
@@ -263,7 +263,7 @@ public class StackController extends ParentController<StackLayout> {
 
     @RestrictTo(RestrictTo.Scope.TESTS)
     TopBar getTopBar() {
-        return getView().getTopBar();
+        return topBarController.getTopBar();
     }
 
     @RestrictTo(RestrictTo.Scope.TESTS)

lib/android/app/src/main/java/com/reactnativenavigation/views/StackLayout.java

@@ -2,8 +2,6 @@ package com.reactnativenavigation.views;
 
 import android.annotation.SuppressLint;
 import android.content.Context;
-import android.support.annotation.RestrictTo;
-import android.support.v4.view.ViewPager;
 import android.widget.RelativeLayout;
 
 import com.reactnativenavigation.interfaces.ChildDisappearListener;
@@ -13,7 +11,6 @@ import com.reactnativenavigation.viewcontrollers.ReactViewCreator;
 import com.reactnativenavigation.viewcontrollers.TopBarButtonController;
 import com.reactnativenavigation.viewcontrollers.topbar.TopBarController;
 import com.reactnativenavigation.views.titlebar.TitleBarReactViewCreator;
-import com.reactnativenavigation.views.topbar.TopBar;
 import com.reactnativenavigation.views.topbar.TopBarBackgroundViewCreator;
 
 import static android.view.ViewGroup.LayoutParams.MATCH_PARENT;
@@ -21,20 +18,18 @@ import static android.view.ViewGroup.LayoutParams.WRAP_CONTENT;
 
 @SuppressLint("ViewConstructor")
 public class StackLayout extends RelativeLayout {
-    private TopBarController topBarController;
     private String stackId;
     private final OptionsPresenter optionsPresenter;
 
     public StackLayout(Context context, ReactViewCreator topBarButtonCreator, TitleBarReactViewCreator titleBarReactViewCreator, TopBarBackgroundViewCreator topBarBackgroundViewCreator, TopBarController topBarController, TopBarButtonController.OnClickListener topBarButtonClickListener, String stackId) {
         super(context);
-        this.topBarController = topBarController;
         this.stackId = stackId;
-        createLayout(topBarButtonCreator, titleBarReactViewCreator, topBarBackgroundViewCreator, topBarButtonClickListener);
+        createLayout(topBarButtonCreator, titleBarReactViewCreator, topBarBackgroundViewCreator, topBarController, topBarButtonClickListener);
         optionsPresenter = new OptionsPresenter(topBarController.getTopBar());
         setContentDescription("StackLayout");
     }
 
-    private void createLayout(ReactViewCreator buttonCreator, TitleBarReactViewCreator titleBarReactViewCreator, TopBarBackgroundViewCreator BackgroundViewCreator, TopBarButtonController.OnClickListener topBarButtonClickListener) {
+    private void createLayout(ReactViewCreator buttonCreator, TitleBarReactViewCreator titleBarReactViewCreator, TopBarBackgroundViewCreator BackgroundViewCreator, TopBarController topBarController, TopBarButtonController.OnClickListener topBarButtonClickListener) {
         addView(topBarController.createTopBar(getContext(), buttonCreator, titleBarReactViewCreator, BackgroundViewCreator, topBarButtonClickListener, this), MATCH_PARENT, WRAP_CONTENT);
     }
 
@@ -50,19 +45,6 @@ public class StackLayout extends RelativeLayout {
         optionsPresenter.onChildWillDisappear(disappearing, appearing, childDisappearListener);
     }
 
-    public void initTopTabs(ViewPager viewPager) {
-        topBarController.initTopTabs(viewPager);
-    }
-
-    public void clearTopTabs() {
-        topBarController.clearTopTabs();
-    }
-
-    @RestrictTo(RestrictTo.Scope.TESTS)
-    public TopBar getTopBar() {
-        return topBarController.getTopBar();
-    }
-
     public void mergeChildOptions(Options options, Component child) {
         optionsPresenter.mergeChildOptions(options, child);
     }