Add flag to disable FixedLayout's expand animation. Closes sephiroth7…

…4#80
corouteam · Jun 23, 2018 · e036821 · e036821
1 parent eb74422
commit e036821
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 2 deletions.
diff --git a/...igation/src/main/java/it/sephiroth/android/library/bottomnavigation/BottomNavigation.java b/...igation/src/main/java/it/sephiroth/android/library/bottomnavigation/BottomNavigation.java
@@ -195,6 +195,12 @@ public class BottomNavigation extends FrameLayout implements OnItemClickListener
      */
     private boolean attached;
 
+
+    /**
+     * Set if current item should expand (default true)
+     */
+    private boolean itemExpands = true;
+
     private BadgeProvider badgeProvider;
 
     public BottomNavigation(final Context context) {
@@ -630,7 +636,7 @@ private void initializeContainer(final MenuParser.Menu menu) {
             } else if (menu.isShifting()) {
                 itemsContainer = new ShiftingLayout(getContext());
             } else {
-                itemsContainer = new FixedLayout(getContext());
+                itemsContainer = new FixedLayout(getContext(), itemExpands);
             }
 
             // force the layout manager ID
@@ -849,6 +855,10 @@ static BadgeProvider parseBadgeProvider(final BottomNavigation navigation, final
         }
     }
 
+    public void setItemExpands(boolean itemExpands) {
+        this.itemExpands = itemExpands;
+    }
+
     public interface OnMenuItemSelectionListener {
         void onMenuItemSelect(@IdRes final int itemId, final int position, final boolean fromUser);
 

diff --git a/...m-navigation/src/main/java/it/sephiroth/android/library/bottomnavigation/FixedLayout.java b/...m-navigation/src/main/java/it/sephiroth/android/library/bottomnavigation/FixedLayout.java
@@ -30,9 +30,25 @@ public class FixedLayout extends ViewGroup implements ItemsLayoutContainer {
     OnItemClickListener listener;
     private int itemFinalWidth;
     private MenuParser.Menu menu;
+    private boolean itemExpands;
+
 
     public FixedLayout(final Context context) {
         super(context);
+        this.itemExpands = true;
+
+        totalChildrenSize = 0;
+        selectedIndex = 0;
+
+        final Resources res = getResources();
+        maxActiveItemWidth = res.getDimensionPixelSize(R.dimen.bbn_fixed_maxActiveItemWidth);
+        minActiveItemWidth = res.getDimensionPixelSize(R.dimen.bbn_fixed_minActiveItemWidth);
+    }
+
+    public FixedLayout(final Context context, boolean itemExpands) {
+        super(context);
+        this.itemExpands = itemExpands;
+
         totalChildrenSize = 0;
         selectedIndex = 0;
 
@@ -108,7 +124,7 @@ public void setSelectedIndex(final int index, final boolean animate) {
             current.setExpanded(false, 0, animate);
         }
         if (null != child) {
-            child.setExpanded(true, 0, animate);
+            child.setExpanded(itemExpands, 0, animate);
         }
     }