Apply BottomTabs options (#2763)

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

@@ -12,10 +12,11 @@ public class BottomTabsOptions implements DEFAULT_VALUES {
 		BottomTabsOptions options = new BottomTabsOptions();
 		if (json == null) return options;
 
-        options.color = ColorParser.parse(json, "tabColor");
-        options.selectedColor = ColorParser.parse(json, "selectedTabColor");
+        options.backgroundColor = ColorParser.parse(json, "backgroundColor");
+        options.tabColor = ColorParser.parse(json, "tabColor");
+        options.selectedTabColor = ColorParser.parse(json, "selectedTabColor");
         options.currentTabId = TextParser.parse(json, "currentTabId");
-		options.currentTabIndex = json.optInt("currentTabIndex", NO_INT_VALUE);
+		options.currentTabIndex = NumberParser.parse(json,"currentTabIndex");
 		options.visible = BoolParser.parse(json,"visible");
 		options.animateHide = BoolParser.parse(json,"animateHide");
         options.testId = TextParser.parse(json, "testID");
@@ -23,11 +24,12 @@ public class BottomTabsOptions implements DEFAULT_VALUES {
 		return options;
 	}
 
-    public Color color = new NullColor();
-    private Color selectedColor = new NullColor();
+    public Color backgroundColor = new NullColor();
+    public Color tabColor = new NullColor();
+    public Color selectedTabColor = new NullColor();
 	Bool visible = new NullBool();
 	Bool animateHide = new NullBool();
-	public int currentTabIndex = NO_INT_VALUE;
+	public Number currentTabIndex = new NullNumber();
 	public Text currentTabId = new NullText();
     public Text testId = new NullText();
 
@@ -35,7 +37,7 @@ public class BottomTabsOptions implements DEFAULT_VALUES {
 		if (other.currentTabId.hasValue()) {
 			currentTabId = other.currentTabId;
 		}
-		if (NO_INT_VALUE != other.currentTabIndex) {
+		if (other.currentTabIndex.hasValue()) {
             currentTabIndex = other.currentTabIndex;
 		}
 		if (other.visible.hasValue()) {
@@ -44,11 +46,14 @@ public class BottomTabsOptions implements DEFAULT_VALUES {
 		if (other.animateHide.hasValue()) {
 			animateHide = other.animateHide;
 		}
-        if (other.color.hasValue()) {
-            color = other.color;
+        if (other.tabColor.hasValue()) {
+            tabColor = other.tabColor;
         }
-        if (other.selectedColor.hasValue()) {
-            selectedColor = other.selectedColor;
+        if (other.selectedTabColor.hasValue()) {
+            selectedTabColor = other.selectedTabColor;
+        }
+        if (other.backgroundColor.hasValue()) {
+		    backgroundColor = other.backgroundColor;
         }
     }
 
@@ -56,7 +61,7 @@ public class BottomTabsOptions implements DEFAULT_VALUES {
         if (!currentTabId.hasValue()) {
             currentTabId = defaultOptions.currentTabId;
         }
-        if (NO_INT_VALUE == currentTabIndex) {
+        if (!currentTabIndex.hasValue()) {
             currentTabIndex = defaultOptions.currentTabIndex;
         }
         if (!visible.hasValue()) {
@@ -65,11 +70,14 @@ public class BottomTabsOptions implements DEFAULT_VALUES {
         if (!animateHide.hasValue()) {
             animateHide = defaultOptions.animateHide;
         }
-        if (!color.hasValue()) {
-            color = defaultOptions.color;
+        if (!tabColor.hasValue()) {
+            tabColor = defaultOptions.tabColor;
+        }
+        if (!selectedTabColor.hasValue()) {
+            selectedTabColor = defaultOptions.selectedTabColor;
         }
-        if (!selectedColor.hasValue()) {
-            selectedColor = defaultOptions.selectedColor;
+        if (!backgroundColor.hasValue()) {
+            backgroundColor = defaultOptions.backgroundColor;
         }
     }
 }

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

@@ -3,6 +3,7 @@ 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.views.BottomTabs;
 
@@ -13,6 +14,10 @@ public class BottomTabOptionsPresenter {
         this.bottomTabs = bottomTabs;
     }
 
+    public void present(Options options) {
+        applyBottomTabsOptions(options.bottomTabsOptions);
+    }
+
     public void present(Options options, @IntRange(from = 0) int bottomTabIndex) {
         applyBottomTabOptions(options.bottomTabOptions, bottomTabIndex);
     }
@@ -22,4 +27,22 @@ public class BottomTabOptionsPresenter {
             bottomTabs.setBadge(bottomTabIndex, options.badge);
         }
     }
+
+    private void applyBottomTabsOptions(BottomTabsOptions options) {
+        if (options.backgroundColor.hasValue()) {
+            bottomTabs.setBackgroundColor(options.backgroundColor.get());
+        }
+        if (options.currentTabIndex.hasValue()) {
+            bottomTabs.setCurrentItem(options.currentTabIndex.get());
+        }
+        if (options.testId.hasValue()) {
+            bottomTabs.setTag(options.testId.get());
+        }
+        if (options.selectedTabColor.hasValue()) {
+            bottomTabs.setAccentColor(options.selectedTabColor.get());
+        }
+        if (options.tabColor.hasValue()) {
+            bottomTabs.setInactiveColor(options.tabColor.get());
+        }
+    }
 }

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

@@ -1,7 +1,6 @@
 package com.reactnativenavigation.viewcontrollers;
 
 import android.app.Activity;
-import android.graphics.Color;
 import android.graphics.drawable.Drawable;
 import android.support.annotation.IntRange;
 import android.support.annotation.NonNull;
@@ -11,13 +10,11 @@ import android.widget.RelativeLayout;
 import com.aurelhubert.ahbottomnavigation.AHBottomNavigation;
 import com.aurelhubert.ahbottomnavigation.AHBottomNavigationItem;
 import com.reactnativenavigation.parse.BottomTabOptions;
-import com.reactnativenavigation.parse.BottomTabsOptions;
 import com.reactnativenavigation.parse.Options;
 import com.reactnativenavigation.parse.Text;
 import com.reactnativenavigation.presentation.BottomTabOptionsPresenter;
 import com.reactnativenavigation.presentation.NavigationOptionsListener;
 import com.reactnativenavigation.utils.ImageLoader;
-import com.reactnativenavigation.utils.UiUtils;
 import com.reactnativenavigation.views.BottomTabs;
 import com.reactnativenavigation.views.ReactComponent;
 
@@ -29,7 +26,6 @@ import static android.view.ViewGroup.LayoutParams.MATCH_PARENT;
 import static android.view.ViewGroup.LayoutParams.WRAP_CONTENT;
 import static android.widget.RelativeLayout.ABOVE;
 import static android.widget.RelativeLayout.ALIGN_PARENT_BOTTOM;
-import static com.reactnativenavigation.parse.DEFAULT_VALUES.NO_INT_VALUE;
 
 public class BottomTabsController extends ParentController implements AHBottomNavigation.OnTabSelectedListener, NavigationOptionsListener {
 	private BottomTabs bottomTabs;
@@ -45,7 +41,7 @@ public class BottomTabsController extends ParentController implements AHBottomNa
 	@Override
 	protected ViewGroup createView() {
 		RelativeLayout root = new RelativeLayout(getActivity());
-		bottomTabs = new BottomTabs(getActivity(), options.bottomTabsOptions);
+		bottomTabs = new BottomTabs(getActivity());
         bottomTabs.setOnTabSelectedListener(this);
 		RelativeLayout.LayoutParams lp = new RelativeLayout.LayoutParams(MATCH_PARENT, WRAP_CONTENT);
 		lp.addRule(ALIGN_PARENT_BOTTOM);
@@ -53,6 +49,12 @@ public class BottomTabsController extends ParentController implements AHBottomNa
 		return root;
 	}
 
+    @Override
+    public void applyOptions(Options options) {
+        super.applyOptions(options);
+        new BottomTabOptionsPresenter(bottomTabs).present(options);
+    }
+
     @Override
     public void applyOptions(Options options, ReactComponent childComponent) {
         super.applyOptions(options, childComponent);
@@ -92,19 +94,18 @@ public class BottomTabsController extends ParentController implements AHBottomNa
 		getView();
 		for (int i = 0; i < tabs.size(); i++) {
 		    tabs.get(i).setParentController(this);
-			createTab(i, tabs.get(i).options.bottomTabOptions, tabs.get(i).options.bottomTabsOptions);
+			createTab(i, tabs.get(i).options.bottomTabOptions);
 		}
 		selectTabAtIndex(0);
 	}
 
-	private void createTab(int index, final BottomTabOptions tabOptions, final BottomTabsOptions bottomTabsOptions) {
+	private void createTab(int index, final BottomTabOptions tabOptions) {
 	    if (!tabOptions.icon.hasValue()) {
             throw new RuntimeException("BottomTab must have an icon");
         }
         imageLoader.loadIcon(getActivity(), tabOptions.icon.get(), new ImageLoader.ImageLoadingListener() {
             @Override
             public void onComplete(@NonNull Drawable drawable) {
-                setIconColor(drawable, bottomTabsOptions);
                 AHBottomNavigationItem item = new AHBottomNavigationItem(tabOptions.title.get(""), drawable);
                 bottomTabs.addItem(item);
                 bottomTabs.post(() -> bottomTabs.setTabTag(index, tabOptions.testId));
@@ -120,10 +121,6 @@ public class BottomTabsController extends ParentController implements AHBottomNa
         params.addRule(ABOVE, bottomTabs.getId());
 	}
 
-    private void setIconColor(Drawable drawable, BottomTabsOptions options) {
-        UiUtils.tintDrawable(drawable, Color.RED);
-    }
-
     int getSelectedIndex() {
 		return bottomTabs.getCurrentItem();
 	}
@@ -137,8 +134,8 @@ public class BottomTabsController extends ParentController implements AHBottomNa
 	@Override
 	public void mergeOptions(Options options) {
         this.options = this.options.mergeWith(options);
-        if (options.bottomTabsOptions.currentTabIndex != NO_INT_VALUE) {
-            selectTabAtIndex(options.bottomTabsOptions.currentTabIndex);
+        if (options.bottomTabsOptions.currentTabIndex.hasValue()) {
+            selectTabAtIndex(options.bottomTabsOptions.currentTabIndex.get());
         }
         if (options.bottomTabsOptions.currentTabId.hasValue()) {
             Text id = options.bottomTabsOptions.currentTabId;

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

@@ -4,20 +4,15 @@ import android.annotation.SuppressLint;
 import android.content.Context;
 
 import com.aurelhubert.ahbottomnavigation.AHBottomNavigation;
-import com.reactnativenavigation.parse.BottomTabsOptions;
 import com.reactnativenavigation.parse.Text;
 import com.reactnativenavigation.utils.CompatUtils;
 
 @SuppressLint("ViewConstructor")
 public class BottomTabs extends AHBottomNavigation {
-    public BottomTabs(Context context, BottomTabsOptions bottomTabsOptions) {
+    public BottomTabs(Context context) {
         super(context);
         setId(CompatUtils.generateViewId());
-        setTestId(bottomTabsOptions.testId);
-    }
-
-    private void setTestId(Text testId) {
-        if (testId.hasValue()) setTag(testId.get());
+        setContentDescription("BottomTabs");
     }
 
     public void setTabTag(int index, Text testId) {

lib/android/app/src/test/java/com/reactnativenavigation/parse/OptionsTest.java

@@ -37,7 +37,7 @@ public class OptionsTest extends BaseTest {
     private static final Bool BOTTOM_TABS_VISIBLE = new Bool(true);
     private static final String BOTTOM_TABS_BADGE = "3";
     private static final String BOTTOM_TABS_CURRENT_TAB_ID = "ComponentId";
-    private static final int BOTTOM_TABS_CURRENT_TAB_INDEX = 1;
+    private static final Number BOTTOM_TABS_CURRENT_TAB_INDEX = new Number(1);
     private TypefaceLoader mockLoader;
 
     @Override
@@ -73,7 +73,7 @@ public class OptionsTest extends BaseTest {
         assertThat(result.bottomTabsOptions.animateHide.get()).isEqualTo(BOTTOM_TABS_ANIMATE_HIDE.get());
         assertThat(result.bottomTabsOptions.visible.get()).isEqualTo(BOTTOM_TABS_VISIBLE.get());
         assertThat(result.bottomTabsOptions.currentTabId.get()).isEqualTo(BOTTOM_TABS_CURRENT_TAB_ID);
-        assertThat(result.bottomTabsOptions.currentTabIndex).isEqualTo(BOTTOM_TABS_CURRENT_TAB_INDEX);
+        assertThat(result.bottomTabsOptions.currentTabIndex.get()).isEqualTo(BOTTOM_TABS_CURRENT_TAB_INDEX.get());
         assertThat(result.fabOptions.id.get()).isEqualTo(FAB_ID);
         assertThat(result.fabOptions.backgroundColor.get()).isEqualTo(FAB_BACKGROUND_COLOR);
         assertThat(result.fabOptions.clickColor.get()).isEqualTo(FAB_CLICK_COLOR);
@@ -88,7 +88,7 @@ public class OptionsTest extends BaseTest {
     private JSONObject createBottomTabs() throws JSONException {
         return new JSONObject()
                 .put("currentTabId", BOTTOM_TABS_CURRENT_TAB_ID)
-                .put("currentTabIndex", BOTTOM_TABS_CURRENT_TAB_INDEX)
+                .put("currentTabIndex", BOTTOM_TABS_CURRENT_TAB_INDEX.get())
                 .put("visible", BOTTOM_TABS_VISIBLE.get())
                 .put("animateHide", BOTTOM_TABS_ANIMATE_HIDE.get());
     }
@@ -223,9 +223,9 @@ public class OptionsTest extends BaseTest {
     @Test
     public void clear_bottomTabsOptions() throws Exception {
         Options uut = new Options();
-        uut.bottomTabsOptions.color = new Color(android.graphics.Color.RED);
+        uut.bottomTabsOptions.tabColor = new Color(android.graphics.Color.RED);
         uut.clearBottomTabsOptions();
-        assertThat(uut.bottomTabsOptions.color.hasValue()).isFalse();
+        assertThat(uut.bottomTabsOptions.tabColor.hasValue()).isFalse();
     }
 
     @Test

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

@@ -124,7 +124,7 @@ public class BottomTabsControllerTest extends BaseTest {
     @Test
     public void applyOptions_bottomTabsOptionsAreClearedAfterApply() throws Exception {
         List<ViewController> tabs = createTabs();
-        child1.options.bottomTabsOptions.color = new Color(android.graphics.Color.RED);
+        child1.options.bottomTabsOptions.tabColor = new Color(android.graphics.Color.RED);
         uut.setTabs(tabs);
         uut.ensureViewIsCreated();
 
@@ -137,7 +137,7 @@ public class BottomTabsControllerTest extends BaseTest {
         ArgumentCaptor<ReactComponent> viewCaptor = ArgumentCaptor.forClass(ReactComponent.class);
         verify(stack, times(1)).applyOptions(optionsCaptor.capture(), viewCaptor.capture());
         assertThat(viewCaptor.getValue()).isEqualTo(child1.getView());
-        assertThat(optionsCaptor.getValue().bottomTabsOptions.color.hasValue()).isFalse();
+        assertThat(optionsCaptor.getValue().bottomTabsOptions.tabColor.hasValue()).isFalse();
     }
 
     @Test

playground/src/app.js

@@ -31,7 +31,13 @@ function start() {
               name: 'navigation.playground.WelcomeScreen'
             }
           }
-        ]
+        ],
+        options: {
+          topBar: {
+            visible: false,
+            animateHide: false
+          }
+        }
       }
     });
   });