Android: improve BottomNavigation (experimental feature)

android/modules/ui/src/java/ti/modules/titanium/ui/TabGroupProxy.java

@@ -39,6 +39,7 @@
 
 import ti.modules.titanium.ui.android.AndroidModule;
 import ti.modules.titanium.ui.widget.tabgroup.TiUIAbstractTabGroup;
+import ti.modules.titanium.ui.widget.tabgroup.TiUIBottomNavigation;
 import ti.modules.titanium.ui.widget.tabgroup.TiUIBottomNavigationTabGroup;
 import ti.modules.titanium.ui.widget.tabgroup.TiUITabLayoutTabGroup;
 
@@ -367,7 +368,11 @@ public void windowCreated(TiBaseActivity activity, Bundle savedInstanceState)
 				((TiUITabLayoutTabGroup) view).setTabMode((Integer) getProperty(TiC.PROPERTY_TAB_MODE));
 			}
 		} else {
-			view = new TiUIBottomNavigationTabGroup(this, activity);
+			if (TiConvert.toBoolean(getProperty("newLayout"), false)) {
+				view = new TiUIBottomNavigation(this, activity);
+			} else {
+				view = new TiUIBottomNavigationTabGroup(this, activity);
+			}
 		}
 		// If we have set a title before the creation of the native view, set it now.
 		if (this.tabGroupTitle != null) {

android/modules/ui/src/java/ti/modules/titanium/ui/TabProxy.java

@@ -15,7 +15,6 @@
 import org.appcelerator.titanium.util.TiUIHelper;
 import org.appcelerator.titanium.view.TiUIView;
 
-import ti.modules.titanium.ui.widget.TiUIBottomNavigation;
 import ti.modules.titanium.ui.widget.tabgroup.TiUIAbstractTabGroup;
 
 import android.app.Activity;
@@ -40,11 +39,9 @@ public class TabProxy extends TiViewProxy
 	private static final String TAG = "TabProxy";
 
 	private TabGroupProxy tabGroupProxy;
-	private TiUIBottomNavigation navBar;
 	private TiWindowProxy window;
 	private boolean windowOpened = false;
 	private int windowId;
-	private int navBarId;
 
 	public TabProxy()
 	{
@@ -144,12 +141,6 @@ public void setTabGroup(TabGroupProxy tabGroupProxy)
 		}
 	}
 
-	public void setNavBar(TiUIBottomNavigation bottomNav, int idx)
-	{
-		this.navBar = bottomNav;
-		this.navBarId = idx;
-	}
-
 	public void setWindowId(int id)
 	{
 		windowId = id;
@@ -238,13 +229,6 @@ public void onPropertyChanged(String name, Object value)
 	{
 		super.onPropertyChanged(name, value);
 
-		if (navBar != null) {
-			if (name.equals(TiC.PROPERTY_BADGE)) {
-				navBar.updateBadge(this.navBarId);
-			}
-			return;
-		}
-
 		// Fetch the TabGroup's view. If currently null, then we have to wait for TabGroup activity to be created.
 		TiUIView view = (this.tabGroupProxy != null) ? this.tabGroupProxy.peekView() : null;
 		if (!(view instanceof TiUIAbstractTabGroup)) {

android/modules/ui/src/java/ti/modules/titanium/ui/widget/tabgroup/TiUIAbstractTabGroup.java

@@ -454,7 +454,7 @@ public void onPageScrollStateChanged(int i)
 		// Set action bar color.
 		if (proxy != null) {
 			final ActionBar actionBar = ((AppCompatActivity) proxy.getActivity()).getSupportActionBar();
-			if (actionBar != null) {
+			if (actionBar != null && !this.tabs.isEmpty()) {
 				final TiWindowProxy windowProxy = ((TabProxy) this.tabs.get(tabIndex).getProxy()).getWindow();
 				final KrollDict windowProperties = windowProxy.getProperties();
 				final KrollDict properties = getProxy().getProperties();