Merge branch 'fix_set_items' of git://github.com/amenon/BottomBar int…

…o amenon-fix_set_items # Conflicts: # bottom-bar/src/main/java/com/roughike/bottombar/BottomBar.java
roughike · Jan 10, 2017 · 4b485ef · 4b485ef
2 parents c8ad293 + 8de5579
commit 4b485ef
Show file tree

Hide file tree

Showing 2 changed files with 4,701 additions and 1 deletion.
diff --git a/bottom-bar/src/main/java/com/roughike/bottombar/BottomBar.java b/bottom-bar/src/main/java/com/roughike/bottombar/BottomBar.java
@@ -118,6 +118,9 @@ private void init(Context context, AttributeSet attrs) {
         populateAttributes(context, attrs);
         initializeViews();
         determineInitialBackgroundColor();
+        if (tabXmlResource != 0) {
+            setItems(tabXmlResource);
+        }
     }
 
     private void populateAttributes(Context context, AttributeSet attrs) {
@@ -260,6 +263,7 @@ private void updateItems(final List<BottomBarTab> bottomBarItems) {
         int index = 0;
         int biggestWidth = 0;
 
+        tabContainer.removeAllViews();
         BottomBarTab[] viewsToAdd = new BottomBarTab[bottomBarItems.size()];
 
         for (BottomBarTab bottomBarTab : bottomBarItems) {
@@ -873,4 +877,4 @@ private void toggleShyVisibility(boolean visible) {
             from.setHidden(this, visible);
         }
     }
-}
+}