BottomTab badge is applied

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

@@ -9,10 +9,10 @@ public class BottomTabOptions implements DEFAULT_VALUES {
         if (json == null) return options;
 
         options.title = TextParser.parse(json, "title");
-        if (!json.has("icon")) {
-            throw new RuntimeException("BottomTab must have an icon");
+        if (json.has("icon")) {
+            options.icon = TextParser.parse(json.optJSONObject("icon"), "uri");
         }
-        options.icon = TextParser.parse(json.optJSONObject("icon"), "uri");
+        options.badge = TextParser.parse(json, "badge");
         options.testId = TextParser.parse(json, "testID");
         return options;
     }
@@ -20,6 +20,7 @@ public class BottomTabOptions implements DEFAULT_VALUES {
     public Text title = new NullText();
     public Text icon = new NullText();
     public Text testId = new NullText();
+    public Text badge = new NullText();
 
     void mergeWith(final BottomTabOptions other) {
         if (other.title.hasValue()) {
@@ -28,6 +29,9 @@ public class BottomTabOptions implements DEFAULT_VALUES {
         if (other.icon.hasValue()) {
             icon = other.icon;
         }
+        if (other.badge.hasValue()) {
+            badge = other.badge;
+        }
     }
 
     void mergeWithDefault(final BottomTabOptions defaultOptions) {
@@ -37,5 +41,8 @@ public class BottomTabOptions implements DEFAULT_VALUES {
         if (!icon.hasValue()) {
             icon = defaultOptions.icon;
         }
+        if (!badge.hasValue()) {
+            badge = defaultOptions.badge;
+        }
     }
 }

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

@@ -0,0 +1,25 @@
+package com.reactnativenavigation.presentation;
+
+import android.support.annotation.IntRange;
+
+import com.reactnativenavigation.parse.BottomTabOptions;
+import com.reactnativenavigation.parse.Options;
+import com.reactnativenavigation.views.BottomTabs;
+
+public class BottomTabOptionsPresenter {
+    private BottomTabs bottomTabs;
+
+    public BottomTabOptionsPresenter(BottomTabs bottomTabs) {
+        this.bottomTabs = bottomTabs;
+    }
+
+    public void present(Options options, @IntRange(from = 0) int bottomTabIndex) {
+        applyBottomTabOptions(options.bottomTabOptions, bottomTabIndex);
+    }
+
+    private void applyBottomTabOptions(BottomTabOptions options, int bottomTabIndex) {
+        if (options.badge.hasValue()) {
+            bottomTabs.setBadge(bottomTabIndex, options.badge);
+        }
+    }
+}

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

@@ -3,6 +3,7 @@ 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;
 import android.view.ViewGroup;
 import android.widget.RelativeLayout;
@@ -13,10 +14,12 @@ 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;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -50,7 +53,13 @@ public class BottomTabsController extends ParentController implements AHBottomNa
 		return root;
 	}
 
-	@Override
+    @Override
+    public void applyOptions(Options options, ReactComponent childComponent) {
+        int tabIndex = findTabContainingComponent(childComponent);
+        if (tabIndex >= 0) new BottomTabOptionsPresenter(bottomTabs).present(options, tabIndex);
+    }
+
+    @Override
 	public boolean handleBack() {
 		return !tabs.isEmpty() && tabs.get(bottomTabs.getCurrentItem()).handleBack();
 	}
@@ -69,6 +78,7 @@ public class BottomTabsController extends ParentController implements AHBottomNa
 		this.tabs = tabs;
 		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);
 		}
 		selectTabAtIndex(0);
@@ -113,6 +123,7 @@ public class BottomTabsController extends ParentController implements AHBottomNa
 
 	@Override
 	public void mergeOptions(Options options) {
+        this.options.mergeWith(options);
         if (options.bottomTabsOptions.currentTabIndex != NO_INT_VALUE) {
             selectTabAtIndex(options.bottomTabsOptions.currentTabIndex);
         }
@@ -153,4 +164,14 @@ public class BottomTabsController extends ParentController implements AHBottomNa
 		}
 		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/viewcontrollers/ParentController.java

@@ -44,6 +44,17 @@ public abstract class ParentController<T extends ViewGroup> extends ViewControll
 		return null;
 	}
 
+	@Override
+    public boolean containsComponent(ReactComponent component) {
+        if (super.containsComponent(component)) {
+            return true;
+        }
+        for (ViewController child : getChildControllers()) {
+            if (child.containsComponent(component)) return true;
+        }
+        return false;
+    }
+
     public void applyOptions(Options options, ReactComponent childComponent) {
 
     }

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

@@ -37,6 +37,7 @@ public class StackController extends ParentController <StackLayout> {
     @Override
     public void applyOptions(Options options, ReactComponent component) {
         stackLayout.applyOptions(options, component);
+        applyOnParentController(parentController -> ((ParentController) parentController).applyOptions(options, component));
     }
 
     @Override

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

@@ -126,6 +126,10 @@ public abstract class ViewController<T extends ViewGroup> implements ViewTreeObs
         return isSameId(id) ? this : null;
     }
 
+    public boolean containsComponent(ReactComponent component) {
+        return getView().equals(component);
+    }
+
     public void onViewAppeared() {
         isShown = true;
         applyOnParentController(parentController -> {

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

@@ -25,4 +25,8 @@ public class BottomTabs extends AHBottomNavigation {
         if (testId.hasValue()) getViewAtPosition(index).setTag(testId.get());
         if (testId.hasValue()) getViewAtPosition(index).setContentDescription(testId.get());
     }
+
+    public void setBadge(int bottomTabIndex, Text badge) {
+        setNotification(badge.get(), bottomTabIndex);
+    }
 }

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

@@ -62,6 +62,15 @@ public class BottomTabsControllerTest extends BaseTest {
         uut.setTabs(tabs);
     }
 
+    @Test
+    public void setTab_controllerIsSetAsParent() throws Exception {
+        List<ViewController> tabs = createTabs();
+        uut.setTabs(tabs);
+        for (ViewController tab : tabs) {
+            assertThat(tab.getParentController()).isEqualTo(uut);
+        }
+    }
+
     @Test
     public void setTabs_AddAllViews() throws Exception {
         List<ViewController> tabs = createTabs();