Bottom tabs visible (#2779)

* Rename BottomTabOptionsPresenter

* Set currentTabIndex in BottomTabsPresenter

* implement BottomTabs visible

lib/android/app/src/main/java/com/reactnativenavigation/parse/LayoutFactory.java

@@ -6,7 +6,7 @@ import com.facebook.react.ReactInstanceManager;
 import com.reactnativenavigation.utils.ImageLoader;
 import com.reactnativenavigation.utils.NoOpPromise;
 import com.reactnativenavigation.utils.TypefaceLoader;
-import com.reactnativenavigation.viewcontrollers.BottomTabsController;
+import com.reactnativenavigation.viewcontrollers.bottomtabs.BottomTabsController;
 import com.reactnativenavigation.viewcontrollers.ComponentViewController;
 import com.reactnativenavigation.viewcontrollers.SideMenuController;
 import com.reactnativenavigation.viewcontrollers.StackController;

lib/android/app/src/main/java/com/reactnativenavigation/presentation/BottomTabOptionsPresenter.java → lib/android/app/src/main/java/com/reactnativenavigation/presentation/BottomTabsOptionsPresenter.java

@@ -1,30 +1,31 @@
 package com.reactnativenavigation.presentation;
 
-import android.support.annotation.IntRange;
-
 import com.reactnativenavigation.parse.BottomTabOptions;
 import com.reactnativenavigation.parse.BottomTabsOptions;
 import com.reactnativenavigation.parse.Options;
+import com.reactnativenavigation.viewcontrollers.bottomtabs.BottomTabFinder;
 import com.reactnativenavigation.views.BottomTabs;
 
-public class BottomTabOptionsPresenter {
+public class BottomTabsOptionsPresenter {
     private BottomTabs bottomTabs;
+    private BottomTabFinder bottomTabFinder;
 
-    public BottomTabOptionsPresenter(BottomTabs bottomTabs) {
+    public BottomTabsOptionsPresenter(BottomTabs bottomTabs, BottomTabFinder bottomTabFinder) {
         this.bottomTabs = bottomTabs;
+        this.bottomTabFinder = bottomTabFinder;
     }
 
     public void present(Options options) {
         applyBottomTabsOptions(options.bottomTabsOptions);
     }
 
-    public void present(Options options, @IntRange(from = 0) int bottomTabIndex) {
-        applyBottomTabOptions(options.bottomTabOptions, bottomTabIndex);
+    public void present(Options options, int tabIndex) {
+        applyBottomTabOptions(options.bottomTabOptions, tabIndex);
     }
 
-    private void applyBottomTabOptions(BottomTabOptions options, int bottomTabIndex) {
+    private void applyBottomTabOptions(BottomTabOptions options, int tabIndex) {
         if (options.badge.hasValue()) {
-            bottomTabs.setBadge(bottomTabIndex, options.badge);
+            bottomTabs.setBadge(tabIndex, options.badge);
         }
     }
 
@@ -44,5 +45,15 @@ public class BottomTabOptionsPresenter {
         if (options.tabColor.hasValue()) {
             bottomTabs.setInactiveColor(options.tabColor.get());
         }
+        if (options.currentTabId.hasValue()) {
+            int tabIndex = bottomTabFinder.findByControllerId(options.currentTabId.get());
+            if (tabIndex >= 0) bottomTabs.setCurrentItem(tabIndex);
+        }
+        if (options.visible.isTrueOrUndefined()) {
+            bottomTabs.restoreBottomNavigation(options.animate.isTrueOrUndefined());
+        }
+        if (options.visible.isFalse()) {
+            bottomTabs.hideBottomNavigation(options.animate.isTrueOrUndefined());
+        }
     }
 }

lib/android/app/src/main/java/com/reactnativenavigation/viewcontrollers/bottomtabs/BottomTabFinder.java

@@ -0,0 +1,36 @@
+package com.reactnativenavigation.viewcontrollers.bottomtabs;
+
+import android.support.annotation.IntRange;
+
+import com.reactnativenavigation.viewcontrollers.ViewController;
+import com.reactnativenavigation.views.ReactComponent;
+
+import java.util.List;
+
+public class BottomTabFinder {
+    private List<ViewController> tabs;
+
+    @IntRange(from = -1)
+    public int findByComponent(ReactComponent component) {
+        for (int i = 0; i < tabs.size(); i++) {
+            if (tabs.get(i).containsComponent(component)) {
+                return i;
+            }
+        }
+        return -1;
+    }
+
+    @IntRange(from = -1)
+    public int findByControllerId(String id) {
+        for (int i = 0; i < tabs.size(); i++) {
+            if (tabs.get(i).findControllerById(id) != null) {
+                return i;
+            }
+        }
+        return -1;
+    }
+
+    void setTabs(List<ViewController> tabs) {
+        this.tabs = tabs;
+    }
+}

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

@@ -1,8 +1,7 @@
-package com.reactnativenavigation.viewcontrollers;
+package com.reactnativenavigation.viewcontrollers.bottomtabs;
 
 import android.app.Activity;
 import android.graphics.drawable.Drawable;
-import android.support.annotation.IntRange;
 import android.support.annotation.NonNull;
 import android.view.ViewGroup;
 import android.widget.RelativeLayout;
@@ -11,10 +10,11 @@ import com.aurelhubert.ahbottomnavigation.AHBottomNavigation;
 import com.aurelhubert.ahbottomnavigation.AHBottomNavigationItem;
 import com.reactnativenavigation.parse.BottomTabOptions;
 import com.reactnativenavigation.parse.Options;
-import com.reactnativenavigation.parse.params.Text;
-import com.reactnativenavigation.presentation.BottomTabOptionsPresenter;
+import com.reactnativenavigation.presentation.BottomTabsOptionsPresenter;
 import com.reactnativenavigation.presentation.NavigationOptionsListener;
 import com.reactnativenavigation.utils.ImageLoader;
+import com.reactnativenavigation.viewcontrollers.ParentController;
+import com.reactnativenavigation.viewcontrollers.ViewController;
 import com.reactnativenavigation.views.BottomTabs;
 import com.reactnativenavigation.views.ReactComponent;
 
@@ -31,6 +31,7 @@ public class BottomTabsController extends ParentController implements AHBottomNa
 	private BottomTabs bottomTabs;
 	private List<ViewController> tabs = new ArrayList<>();
     private ImageLoader imageLoader;
+    private BottomTabFinder bottomTabFinder = new BottomTabFinder();
 
     public BottomTabsController(final Activity activity, ImageLoader imageLoader, final String id, Options initialOptions) {
 		super(activity, id, initialOptions);
@@ -52,14 +53,14 @@ public class BottomTabsController extends ParentController implements AHBottomNa
     @Override
     public void applyOptions(Options options) {
         super.applyOptions(options);
-        new BottomTabOptionsPresenter(bottomTabs).present(options);
+        new BottomTabsOptionsPresenter(bottomTabs, bottomTabFinder).present(options);
     }
 
     @Override
     public void applyOptions(Options options, ReactComponent childComponent) {
         super.applyOptions(options, childComponent);
-        int tabIndex = findTabContainingComponent(childComponent);
-        if (tabIndex >= 0) new BottomTabOptionsPresenter(bottomTabs).present(options, tabIndex);
+        int tabIndex = bottomTabFinder.findByComponent(childComponent);
+        if (tabIndex >= 0) new BottomTabsOptionsPresenter(bottomTabs, bottomTabFinder).present(this.options, tabIndex);
         applyOnParentController(parentController ->
                 ((ParentController) parentController).applyOptions(this.options.copy().clearBottomTabsOptions().clearBottomTabOptions(), childComponent)
         );
@@ -91,7 +92,8 @@ public class BottomTabsController extends ParentController implements AHBottomNa
 			throw new RuntimeException("Too many tabs!");
 		}
 		this.tabs = tabs;
-		getView();
+        bottomTabFinder.setTabs(tabs);
+        getView();
 		for (int i = 0; i < tabs.size(); i++) {
 		    tabs.get(i).setParentController(this);
 			createTab(i, tabs.get(i).options.bottomTabOptions);
@@ -121,7 +123,7 @@ public class BottomTabsController extends ParentController implements AHBottomNa
         params.addRule(ABOVE, bottomTabs.getId());
 	}
 
-    int getSelectedIndex() {
+    public int getSelectedIndex() {
 		return bottomTabs.getCurrentItem();
 	}
 
@@ -134,25 +136,10 @@ public class BottomTabsController extends ParentController implements AHBottomNa
 	@Override
 	public void mergeOptions(Options options) {
         this.options = this.options.mergeWith(options);
-        if (options.bottomTabsOptions.currentTabIndex.hasValue()) {
-            selectTabAtIndex(options.bottomTabsOptions.currentTabIndex.get());
-        }
-        if (options.bottomTabsOptions.currentTabId.hasValue()) {
-            Text id = options.bottomTabsOptions.currentTabId;
-            for (ViewController controller : tabs) {
-                if (controller.getId().equals(id.get())) {
-                    selectTabAtIndex(tabs.indexOf(controller));
-                }
-                if (controller instanceof StackController) {
-                    if (hasControlWithId((StackController) controller, id.get())) {
-                        selectTabAtIndex(tabs.indexOf(controller));
-                    }
-                }
-            }
-        }
+        new BottomTabsOptionsPresenter(bottomTabs, bottomTabFinder).present(this.options);
     }
 
-    void selectTabAtIndex(final int newIndex) {
+    public void selectTabAtIndex(final int newIndex) {
         getView().removeView(getCurrentView());
         bottomTabs.setCurrentItem(newIndex, false);
         getView().addView(getCurrentView());
@@ -162,26 +149,4 @@ public class BottomTabsController extends ParentController implements AHBottomNa
     private ViewGroup getCurrentView() {
         return tabs.get(bottomTabs.getCurrentItem()).getView();
     }
-
-    private boolean hasControlWithId(StackController controller, String id) {
-		for (ViewController child : controller.getChildControllers()) {
-			if (id.equals(child.getId())) {
-				return true;
-			}
-			if (child instanceof StackController) {
-				return hasControlWithId((StackController) child, id);
-			}
-		}
-		return false;
-	}
-
-	@IntRange(from = -1)
-    private int findTabContainingComponent(ReactComponent component) {
-        for (int i = 0; i < tabs.size(); i++) {
-            if (tabs.get(i).containsComponent(component)) {
-                return i;
-            }
-        }
-        return -1;
-    }
 }

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

@@ -2,6 +2,7 @@ package com.reactnativenavigation.views;
 
 import android.annotation.SuppressLint;
 import android.content.Context;
+import android.support.annotation.IntRange;
 
 import com.aurelhubert.ahbottomnavigation.AHBottomNavigation;
 import com.reactnativenavigation.parse.params.Text;
@@ -24,4 +25,9 @@ public class BottomTabs extends AHBottomNavigation {
     public void setBadge(int bottomTabIndex, Text badge) {
         setNotification(badge.get(), bottomTabIndex);
     }
+
+    @Override
+    public void setCurrentItem(@IntRange(from = 0) int position) {
+        super.setCurrentItem(position);
+    }
 }

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

@@ -10,8 +10,10 @@ import com.reactnativenavigation.mocks.MockPromise;
 import com.reactnativenavigation.mocks.SimpleViewController;
 import com.reactnativenavigation.parse.params.Color;
 import com.reactnativenavigation.parse.Options;
+import com.reactnativenavigation.parse.params.Number;
 import com.reactnativenavigation.utils.ImageLoader;
 import com.reactnativenavigation.utils.OptionHelper;
+import com.reactnativenavigation.viewcontrollers.bottomtabs.BottomTabsController;
 import com.reactnativenavigation.views.BottomTabs;
 import com.reactnativenavigation.views.ReactComponent;
 
@@ -44,7 +46,7 @@ public class BottomTabsControllerTest extends BaseTest {
     public void beforeEach() {
         super.beforeEach();
         activity = newActivity();
-        uut = new BottomTabsController(activity, imageLoaderMock, "uut", new Options());
+        uut = spy(new BottomTabsController(activity, imageLoaderMock, "uut", new Options()));
         child1 = spy(new SimpleViewController(activity, "child1", tabOptions));
         child2 = spy(new SimpleViewController(activity, "child2", tabOptions));
         child3 = spy(new SimpleViewController(activity, "child3", tabOptions));
@@ -140,6 +142,18 @@ public class BottomTabsControllerTest extends BaseTest {
         assertThat(optionsCaptor.getValue().bottomTabsOptions.tabColor.hasValue()).isFalse();
     }
 
+    @Test
+    public void mergeOptions_currentTabIndex() throws Exception {
+        List<ViewController> tabs = createTabs();
+        uut.setTabs(tabs);
+        uut.ensureViewIsCreated();
+
+        Options options = new Options();
+        options.bottomTabsOptions.currentTabIndex = new Number(1);
+        uut.mergeOptions(options);
+        verify(uut, times(1)).selectTabAtIndex(1);
+    }
+
     @Test
     public void buttonPressInvokedOnCurrentTab() throws Exception {
         uut.setTabs(createTabs());

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

@@ -13,6 +13,7 @@ import com.reactnativenavigation.parse.params.Text;
 import com.reactnativenavigation.utils.CompatUtils;
 import com.reactnativenavigation.utils.ImageLoader;
 import com.reactnativenavigation.utils.OptionHelper;
+import com.reactnativenavigation.viewcontrollers.bottomtabs.BottomTabsController;
 
 import org.junit.Test;