Made it possible to have individual titleless tabs.

roughike · Apr 2, 2017 · 4c32407 · 4c32407
1 parent 9fe6776
commit 4c32407
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 3 deletions.
diff --git a/bottom-bar/src/androidTest/java/com/roughike/bottombar/TabParserTest.java b/bottom-bar/src/androidTest/java/com/roughike/bottombar/TabParserTest.java
@@ -129,6 +129,15 @@ public void correctBadgeHidingPolicies() {
         assertTrue(tabs.get(4).getBadgeHidesWhenActive());
     }
 
+    @Test
+    public void titlelessTabsAsExpected() {
+        assertFalse(tabs.get(0).isTitleless());
+        assertFalse(tabs.get(1).isTitleless());
+        assertTrue(tabs.get(2).isTitleless());
+        assertFalse(tabs.get(3).isTitleless());
+        assertTrue(tabs.get(4).isTitleless());
+    }
+
     private Drawable getDrawableByResource(int iconResId) {
         return ContextCompat.getDrawable(context, iconResId);
     }

diff --git a/bottom-bar/src/androidTest/res/xml/dummy_tabs_five.xml b/bottom-bar/src/androidTest/res/xml/dummy_tabs_five.xml
@@ -2,7 +2,7 @@
 <tabs>
     <tab inActiveColor="#00FF00" activeColor="#FF0000" id="@+id/tab_recents" title="Recents" icon="@drawable/empty_icon" barColorWhenSelected="#FF0000" badgeBackgroundColor="#FF0000" badgeHidesWhenActive="false" />
     <tab inActiveColor="#0000FF" activeColor="@color/test_random_color" id="@+id/tab_favorites" title="@string/favorites" icon="@drawable/empty_icon" barColorWhenSelected="#00FF00" badgeBackgroundColor="#00FF00" />
-    <tab inActiveColor="#FF0000" activeColor="#0000FF" id="@+id/tab_nearby" title="Nearby" icon="@drawable/empty_icon" barColorWhenSelected="#F00000" badgeBackgroundColor="#F00000" badgeHidesWhenActive="false" />
+    <tab inActiveColor="#FF0000" activeColor="#0000FF" id="@+id/tab_nearby" title="Nearby" icon="@drawable/empty_icon" barColorWhenSelected="#F00000" badgeBackgroundColor="#F00000" badgeHidesWhenActive="false" iconOnly="true" />
     <tab inActiveColor="#F0F000" activeColor="@color/test_random_color_two" id="@+id/tab_friends" title="@string/friends" icon="@drawable/empty_icon" barColorWhenSelected="#00F000" badgeBackgroundColor="#00F000" badgeHidesWhenActive="true" />
-    <tab inActiveColor="#F00F00" activeColor="#F00F00" id="@+id/tab_food" title="Food" icon="@drawable/empty_icon" barColorWhenSelected="#00F0F0" badgeBackgroundColor="#00F0F0" />
+    <tab inActiveColor="#F00F00" activeColor="#F00F00" id="@+id/tab_food" title="Food" icon="@drawable/empty_icon" barColorWhenSelected="#00F0F0" badgeBackgroundColor="#00F0F0" iconOnly="true" />
 </tabs>
diff --git a/bottom-bar/src/main/java/com/roughike/bottombar/BottomBarTab.java b/bottom-bar/src/main/java/com/roughike/bottombar/BottomBarTab.java
@@ -171,6 +171,10 @@ void setType(Type type) {
         this.type = type;
     }
 
+    boolean isTitleless() {
+        return isTitleless;
+    }
+
     void setIsTitleless(boolean isTitleless) {
         if (isTitleless && getIconResId() == 0) {
             throw new IllegalStateException("This tab is supposed to be " +

diff --git a/bottom-bar/src/main/java/com/roughike/bottombar/TabParser.java b/bottom-bar/src/main/java/com/roughike/bottombar/TabParser.java
@@ -27,6 +27,7 @@
 import static com.roughike.bottombar.TabParser.TabAttribute.ICON;
 import static com.roughike.bottombar.TabParser.TabAttribute.ID;
 import static com.roughike.bottombar.TabParser.TabAttribute.INACTIVE_COLOR;
+import static com.roughike.bottombar.TabParser.TabAttribute.IS_TITLELESS;
 import static com.roughike.bottombar.TabParser.TabAttribute.TITLE;
 
 /**
@@ -137,6 +138,10 @@ private BottomBarTab parseNewTab(@NonNull XmlResourceParser parser, @IntRange(fr
                     boolean badgeHidesWhenActive = parser.getAttributeBooleanValue(i, true);
                     workingTab.setBadgeHidesWhenActive(badgeHidesWhenActive);
                     break;
+                case IS_TITLELESS:
+                    boolean isTitleless = parser.getAttributeBooleanValue(i, false);
+                    workingTab.setIsTitleless(isTitleless);
+                    break;
             }
         }
 
@@ -175,7 +180,17 @@ private int getColorValue(@NonNull XmlResourceParser parser, @IntRange(from = 0)
     }
 
     @Retention(RetentionPolicy.SOURCE)
-    @StringDef({ID, ICON, TITLE, INACTIVE_COLOR, ACTIVE_COLOR, BAR_COLOR_WHEN_SELECTED, BADGE_BACKGROUND_COLOR, BADGE_HIDES_WHEN_ACTIVE})
+    @StringDef({
+            ID,
+            ICON,
+            TITLE,
+            INACTIVE_COLOR,
+            ACTIVE_COLOR,
+            BAR_COLOR_WHEN_SELECTED,
+            BADGE_BACKGROUND_COLOR,
+            BADGE_HIDES_WHEN_ACTIVE,
+            IS_TITLELESS
+    })
     @interface TabAttribute {
         String ID = "id";
         String ICON = "icon";
@@ -185,6 +200,7 @@ private int getColorValue(@NonNull XmlResourceParser parser, @IntRange(from = 0)
         String BAR_COLOR_WHEN_SELECTED = "barColorWhenSelected";
         String BADGE_BACKGROUND_COLOR = "badgeBackgroundColor";
         String BADGE_HIDES_WHEN_ACTIVE = "badgeHidesWhenActive";
+        String IS_TITLELESS = "iconOnly";
     }
 
     @SuppressWarnings("WeakerAccess")