tabs selection

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

@@ -12,6 +12,7 @@ import android.widget.RelativeLayout;
 import com.reactnativenavigation.utils.CompatUtils;
 
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.List;
 
 import static android.view.ViewGroup.LayoutParams.MATCH_PARENT;
@@ -21,8 +22,8 @@ import static android.widget.RelativeLayout.ALIGN_PARENT_BOTTOM;
 
 public class BottomTabsController extends ParentController implements BottomNavigationView.OnNavigationItemSelectedListener {
 	private BottomNavigationView bottomNavigationView;
-	private int selectedIndex = 0;
 	private List<ViewController> tabs = new ArrayList<>();
+	private int selectedIndex = 0;
 
 	public BottomTabsController(final Activity activity, final String id) {
 		super(activity, id);
@@ -50,10 +51,14 @@ public class BottomTabsController extends ParentController implements BottomNavi
 
 	@Override
 	public boolean onNavigationItemSelected(@NonNull final MenuItem item) {
+		selectTabAtIndex(item.getItemId());
+		return true;
+	}
+
+	public void selectTabAtIndex(final int newIndex) {
 		tabs.get(selectedIndex).getView().setVisibility(View.GONE);
-		selectedIndex = item.getItemId();
+		selectedIndex = newIndex;
 		tabs.get(selectedIndex).getView().setVisibility(View.VISIBLE);
-		return true;
 	}
 
 	public void setTabs(final List<ViewController> tabs) {
@@ -63,15 +68,18 @@ public class BottomTabsController extends ParentController implements BottomNavi
 		this.tabs = tabs;
 		getView();
 		for (int i = 0; i < tabs.size(); i++) {
-			ViewController tab = tabs.get(i);
-			bottomNavigationView.getMenu().add(0, i, Menu.NONE, String.valueOf(i));
-			RelativeLayout.LayoutParams params = new RelativeLayout.LayoutParams(MATCH_PARENT, MATCH_PARENT);
-			params.addRule(ABOVE, bottomNavigationView.getId());
-			getView().addView(tab.getView(), params);
-			if (i > 0) {
-				tab.getView().setVisibility(View.GONE);
-			}
+			String title = String.valueOf(i);
+			createTab(tabs.get(i), i, title);
 		}
+		selectTabAtIndex(0);
+	}
+
+	private void createTab(ViewController tab, final int index, final String title) {
+		bottomNavigationView.getMenu().add(0, index, Menu.NONE, title);
+		RelativeLayout.LayoutParams params = new RelativeLayout.LayoutParams(MATCH_PARENT, MATCH_PARENT);
+		params.addRule(ABOVE, bottomNavigationView.getId());
+		tab.getView().setVisibility(View.GONE);
+		getView().addView(tab.getView(), params);
 	}
 
 	public int getSelectedIndex() {
@@ -79,7 +87,7 @@ public class BottomTabsController extends ParentController implements BottomNavi
 	}
 
 	@Override
-	public Iterable<ViewController> getChildControllers() {
+	public Collection<ViewController> getChildControllers() {
 		return tabs;
 	}
 }

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

@@ -2,12 +2,14 @@ package com.reactnativenavigation.viewcontrollers;
 
 import android.app.Activity;
 
+import java.util.Collection;
+
 public abstract class ParentController extends ViewController {
 	public ParentController(final Activity activity, final String id) {
 		super(activity, id);
 	}
 
-	public abstract Iterable<ViewController> getChildControllers();
+	public abstract Collection<ViewController> getChildControllers();
 
 	public ViewController findControllerById(final String id) {
 		ViewController fromSuper = super.findControllerById(id);

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

@@ -6,6 +6,8 @@ import android.support.annotation.Nullable;
 import android.view.ViewGroup;
 import android.widget.FrameLayout;
 
+import java.util.Collection;
+
 public class StackController extends ParentController {
 	private final IndexedStack<ViewController> stack = new IndexedStack<>();
 
@@ -108,7 +110,7 @@ public class StackController extends ParentController {
 	}
 
 	@Override
-	public Iterable<ViewController> getChildControllers() {
+	public Collection<ViewController> getChildControllers() {
 		return stack.values();
 	}
 }

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

@@ -3,22 +3,19 @@ package com.reactnativenavigation.viewcontrollers;
 import android.app.Activity;
 import android.support.annotation.NonNull;
 import android.support.design.widget.BottomNavigationView;
-import android.view.MenuItem;
 import android.view.View;
 import android.widget.RelativeLayout;
 
 import com.reactnativenavigation.BaseTest;
 import com.reactnativenavigation.mocks.SimpleViewController;
 
-import org.assertj.core.api.Condition;
+import org.assertj.core.api.iterable.Extractor;
 import org.junit.Test;
 
 import java.util.Arrays;
 import java.util.List;
 
 import static org.assertj.core.api.Java6Assertions.assertThat;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
 
 public class BottomTabsControllerTest extends BaseTest {
 
@@ -60,34 +57,28 @@ public class BottomTabsControllerTest extends BaseTest {
 		List<ViewController> tabs = createTabs();
 		uut.setTabs(tabs);
 		assertThat(uut.getView().getChildCount()).isEqualTo(6);
-		assertThat(uut.getView().getChildAt(1).getVisibility()).isEqualTo(View.VISIBLE);
-		assertThat(uut.getView().getChildAt(2).getVisibility()).isEqualTo(View.GONE);
-		assertThat(uut.getView().getChildAt(3).getVisibility()).isEqualTo(View.GONE);
-		assertThat(uut.getView().getChildAt(4).getVisibility()).isEqualTo(View.GONE);
-		assertThat(uut.getView().getChildAt(5).getVisibility()).isEqualTo(View.GONE);
+		assertThat(uut.getChildControllers()).extracting(new Extractor<ViewController, Integer>() {
+			@Override
+			public Integer extract(final ViewController input) {
+				return input.getView().getVisibility();
+			}
+		}).containsExactly(View.VISIBLE, View.GONE, View.GONE, View.GONE, View.GONE);
 	}
 
 	@Test
-	public void onTabSelected_SelectsTab() throws Exception {
+	public void selectTabAtIndex() throws Exception {
 		uut.setTabs(createTabs());
 		assertThat(uut.getSelectedIndex()).isZero();
 
-		MenuItem menuItem = mock(MenuItem.class);
-		when(menuItem.getItemId()).thenReturn(3);
-		assertThat(uut.onNavigationItemSelected(menuItem)).isTrue();
+		uut.selectTabAtIndex(3);
 
 		assertThat(uut.getSelectedIndex()).isEqualTo(3);
-		assertThat(uut.getChildControllers()).areExactly(1, new Condition<ViewController>() {
+		assertThat(uut.getChildControllers()).extracting(new Extractor<ViewController, Integer>() {
 			@Override
-			public boolean matches(final ViewController value) {
-				return value.getView().getVisibility() == View.VISIBLE;
+			public Integer extract(final ViewController input) {
+				return input.getView().getVisibility();
 			}
-		});
-//		assertThat(uut.getView().getChildAt(1).getVisibility()).isEqualTo(View.GONE);
-//		assertThat(uut.getView().getChildAt(2).getVisibility()).isEqualTo(View.GONE);
-//		assertThat(uut.getView().getChildAt(3).getVisibility()).isEqualTo(View.GONE);
-//		assertThat(uut.getView().getChildAt(4).getVisibility()).isEqualTo(View.VISIBLE);
-//		assertThat(uut.getView().getChildAt(5).getVisibility()).isEqualTo(View.GONE);
+		}).containsExactly(View.GONE, View.GONE, View.GONE, View.VISIBLE, View.GONE);
 	}
 
 	@Test

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

@@ -11,6 +11,7 @@ import com.reactnativenavigation.mocks.SimpleViewController;
 import org.junit.Test;
 
 import java.util.Arrays;
+import java.util.Collection;
 import java.util.Collections;
 
 import static org.assertj.core.api.Java6Assertions.assertThat;
@@ -30,7 +31,7 @@ public class ParentControllerTest extends BaseTest {
 	public void findControllerById_ReturnsSelfIfSameId() throws Exception {
 		ParentController uut = new ParentController(activity, "uut") {
 			@Override
-			public Iterable<ViewController> getChildControllers() {
+			public Collection<ViewController> getChildControllers() {
 				return Collections.emptyList();
 			}
 
@@ -56,7 +57,7 @@ public class ParentControllerTest extends BaseTest {
 
 		ParentController uut = new ParentController(activity, "uut") {
 			@Override
-			public Iterable<ViewController> getChildControllers() {
+			public Collection<ViewController> getChildControllers() {
 				return Arrays.<ViewController>asList(someInnerStack);
 			}