Adapt TopTabs to new API (#2540)

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

@@ -60,7 +60,7 @@ public class ComponentViewController extends ViewController implements Navigatio
     public void onViewAppeared() {
         super.onViewAppeared();
         ensureViewIsCreated();
-        applyOnParentStack(parentController -> {
+        applyOnParentController(parentController -> {
             parentController.clearOptions();
             parentController.applyOptions(options, component);
         });
@@ -89,7 +89,7 @@ public class ComponentViewController extends ViewController implements Navigatio
     public void mergeOptions(Options options) {
         this.options.mergeWith(options);
         component.applyOptions(this.options);
-        applyOnParentStack(parentController -> parentController.applyOptions(this.options, component));
+        applyOnParentController(parentController -> parentController.applyOptions(this.options, component));
     }
 
     Options getOptions() {

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

@@ -3,6 +3,7 @@ package com.reactnativenavigation.viewcontrollers;
 import android.app.Activity;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
+import android.support.v4.view.ViewPager;
 import android.view.ViewGroup;
 
 import com.reactnativenavigation.parse.Options;
@@ -58,4 +59,8 @@ public abstract class ParentController<T extends ViewGroup> extends ViewControll
     void clearOptions() {
 
     }
+
+    public void setupTopTabsWithViewPager(ViewPager viewPager) {
+
+    }
 }

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

@@ -3,6 +3,7 @@ package com.reactnativenavigation.viewcontrollers;
 import android.app.Activity;
 import android.support.annotation.NonNull;
 import android.support.annotation.RestrictTo;
+import android.support.v4.view.ViewPager;
 import android.view.View;
 
 import com.facebook.react.bridge.Promise;
@@ -61,7 +62,7 @@ public class StackController extends ParentController <StackLayout> {
 		}
 	}
 
-    public void pop(final Promise promise) {
+    void pop(final Promise promise) {
         if (!canPop()) {
             Navigator.rejectPromise(promise);
             return;
@@ -77,7 +78,7 @@ public class StackController extends ParentController <StackLayout> {
         finishPopping(exitingView, poppedTop, promise);
     }
 
-	public void animatePop(final Promise promise) {
+	private void animatePop(final Promise promise) {
 		if (!canPop()) {
 			Navigator.rejectPromise(promise);
 			return;
@@ -177,4 +178,9 @@ public class StackController extends ParentController <StackLayout> {
 	public Collection<ViewController> getChildControllers() {
 		return stack.values();
 	}
+
+    @Override
+    public void setupTopTabsWithViewPager(ViewPager viewPager) {
+        stackLayout.setupTopTabsWithViewPager(viewPager);
+    }
 }

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

@@ -50,7 +50,7 @@ public abstract class ViewController implements ViewTreeObserver.OnGlobalLayoutL
 		return activity;
 	}
 
-	protected void applyOnParentStack(Task<ParentController> task) {
+	protected void applyOnParentController(Task<ParentController> task) {
         if (parentController != null) {
             task.run(parentController);
         }

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

@@ -33,7 +33,7 @@ public class TopTabController extends ViewController implements NavigationOption
 
     @Override
     public void applyOptions(Options options) {
-        applyOnParentStack(parentController -> parentController.applyOptions(options));
+        applyOnParentController(parentController -> parentController.applyOptions(options));
     }
 
     @Override

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

@@ -2,6 +2,7 @@ package com.reactnativenavigation.viewcontrollers.toptabs;
 
 import android.app.Activity;
 import android.support.annotation.NonNull;
+import android.support.v4.view.ViewPager;
 import android.view.ViewGroup;
 
 import com.reactnativenavigation.parse.Options;
@@ -48,6 +49,7 @@ public class TopTabsController extends ParentController implements NavigationOpt
     @Override
     public void onViewAppeared() {
         applyOptions(options);
+        applyOnParentController(parentController -> parentController.setupTopTabsWithViewPager((ViewPager) getView()));
         performOnCurrentTab(ViewController::onViewAppeared);
     }
 

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

@@ -1,44 +0,0 @@
-package com.reactnativenavigation.viewcontrollers.toptabs;
-
-import android.annotation.SuppressLint;
-import android.content.Context;
-import android.support.v4.view.ViewPager;
-import android.view.ViewGroup;
-
-import com.reactnativenavigation.viewcontrollers.ComponentViewController;
-import com.reactnativenavigation.viewcontrollers.ViewController;
-
-import java.util.List;
-
-import static android.view.ViewGroup.LayoutParams.MATCH_PARENT;
-
-@SuppressLint("ViewConstructor")
-public class TopTabsViewPager extends ViewPager {
-    private static final int OFFSCREEN_PAGE_LIMIT = 99;
-    private List<ViewController> tabs;
-
-    public TopTabsViewPager(Context context, List<ViewController> tabs, TopTabsAdapter adapter) {
-        super(context);
-        this.tabs = tabs;
-        init(adapter);
-    }
-
-    private void init(TopTabsAdapter adapter) {
-        setOffscreenPageLimit(OFFSCREEN_PAGE_LIMIT);
-        for (ViewController tab : tabs) {
-            addView(tab.getView(), new ViewGroup.LayoutParams(MATCH_PARENT, MATCH_PARENT));
-        }
-        setAdapter(adapter);
-        addOnPageChangeListener(adapter);
-    }
-
-    public void destroy() {
-        for (ViewController tab : tabs) {
-            tab.destroy();
-        }
-    }
-
-    public void sendOnNavigationButtonPressed(String id) {
-        ((ComponentViewController.IReactView) tabs.get(getCurrentItem()).getView()).sendOnNavigationButtonPressed(id);
-    }
-}

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

@@ -2,6 +2,7 @@ package com.reactnativenavigation.views;
 
 import android.content.Context;
 import android.support.annotation.RestrictTo;
+import android.support.v4.view.ViewPager;
 import android.widget.RelativeLayout;
 
 import com.reactnativenavigation.parse.Options;
@@ -43,4 +44,8 @@ public class StackLayout extends RelativeLayout implements TitleBarButton.OnClic
     public void clearOptions() {
         topBar.clear();
     }
+
+    public void setupTopTabsWithViewPager(ViewPager viewPager) {
+        topBar.setupTopTabsWithViewPager(viewPager);
+    }
 }

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

@@ -5,6 +5,7 @@ import android.content.Context;
 import android.graphics.Typeface;
 import android.support.annotation.Nullable;
 import android.support.design.widget.AppBarLayout;
+import android.support.v4.view.ViewPager;
 import android.support.v7.widget.Toolbar;
 import android.util.Log;
 import android.view.Menu;
@@ -20,7 +21,6 @@ import com.reactnativenavigation.parse.Color;
 import com.reactnativenavigation.parse.Fraction;
 import com.reactnativenavigation.parse.Number;
 import com.reactnativenavigation.parse.Options;
-import com.reactnativenavigation.viewcontrollers.toptabs.TopTabsViewPager;
 
 import java.util.ArrayList;
 
@@ -146,7 +146,7 @@ public class TopBar extends AppBarLayout implements ScrollEventListener.ScrollAw
         return titleBar;
     }
 
-    public void setupTopTabsWithViewPager(TopTabsViewPager viewPager) {
+    public void setupTopTabsWithViewPager(ViewPager viewPager) {
         initTopTabs();
         topTabs.setupWithViewPager(viewPager);
     }

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

@@ -2,40 +2,39 @@ 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.view.View;
 import android.view.ViewGroup;
 import android.widget.RelativeLayout;
 
 import com.reactnativenavigation.parse.Options;
+import com.reactnativenavigation.viewcontrollers.ComponentViewController.IReactView;
 import com.reactnativenavigation.viewcontrollers.ViewController;
 import com.reactnativenavigation.viewcontrollers.toptabs.TopTabsAdapter;
-import com.reactnativenavigation.viewcontrollers.toptabs.TopTabsViewPager;
 
 import java.util.List;
 
+import static android.view.ViewGroup.LayoutParams.MATCH_PARENT;
+import static android.widget.RelativeLayout.BELOW;
+
 @SuppressLint("ViewConstructor")
-public class TopTabsLayout extends RelativeLayout implements Component, TitleBarButton.OnClickListener {
+public class TopTabsLayout extends ViewPager implements Component, TitleBarButton.OnClickListener {
 
-    private TopBar topBar;
-    private TopTabsViewPager viewPager;
+    private static final int OFFSCREEN_PAGE_LIMIT = 99;
+    private List<ViewController> tabs;
 
     public TopTabsLayout(Context context, List<ViewController> tabs, TopTabsAdapter adapter) {
         super(context);
-        viewPager = new TopTabsViewPager(context, tabs, adapter);
-        topBar = new TopBar(context, this);
-        topBar.setId(View.generateViewId());
-
-        initViews();
+        this.tabs = tabs;
+        initTabs(adapter);
     }
 
-    private void initViews() {
-        LayoutParams layoutParams = new LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT);
-        layoutParams.addRule(BELOW, topBar.getId());
-        addView(topBar, new LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT));
-        addView(viewPager, layoutParams);
-        topBar.setupTopTabsWithViewPager(viewPager);
+    private void initTabs(TopTabsAdapter adapter) {
+        setOffscreenPageLimit(OFFSCREEN_PAGE_LIMIT);
+        for (ViewController tab : tabs) {
+            addView(tab.getView(), new ViewGroup.LayoutParams(MATCH_PARENT, MATCH_PARENT));
+        }
+        setAdapter(adapter);
+        addOnPageChangeListener(adapter);
     }
 
     @Override
@@ -45,29 +44,30 @@ public class TopTabsLayout extends RelativeLayout implements Component, TitleBar
 
     @Override
     public void drawBehindTopBar() {
-
+        RelativeLayout.LayoutParams layoutParams = (RelativeLayout.LayoutParams) getLayoutParams();
+        layoutParams.removeRule(BELOW);
+        setLayoutParams(layoutParams);
     }
 
     @Override
     public void drawBelowTopBar(TopBar topBar) {
-
-    }
-
-    @RestrictTo(RestrictTo.Scope.TESTS)
-    public ViewPager getViewPager() {
-        return viewPager;
+        RelativeLayout.LayoutParams layoutParams = (RelativeLayout.LayoutParams) getLayoutParams();
+        layoutParams.addRule(BELOW, topBar.getId());
+        setLayoutParams(layoutParams);
     }
 
     public void switchToTab(int index) {
-        viewPager.setCurrentItem(index);
-    }
-
-    public int getCurrentItem() {
-        return viewPager.getCurrentItem();
+        setCurrentItem(index);
     }
 
     @Override
     public void onPress(String buttonId) {
-        viewPager.sendOnNavigationButtonPressed(buttonId);
+        ((IReactView) tabs.get(getCurrentItem()).getView()).sendOnNavigationButtonPressed(buttonId);
+    }
+
+    public void destroy() {
+        for (ViewController tab : tabs) {
+            tab.destroy();
+        }
     }
 }

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

@@ -133,6 +133,6 @@ public class TopTabsViewControllerTest extends BaseTest {
     }
 
     private IReactView tab(TopTabsLayout topTabs, final int index) {
-        return (IReactView) ((ViewGroup) topTabs.getViewPager().getChildAt(index)).getChildAt(0);
+        return (IReactView) ((ViewGroup) topTabs.getChildAt(index)).getChildAt(0);
     }
 }