Added ability to disable the left menu on tablets.

roughike · adb47d8c64c38c3e41811e4ad2b3727c4fa76d88 · roughike committed Mar 21, 2016 · Mar 21, 2016 · adb47d8
1 parent 7a20c39
commit adb47d8c64c38c3e41811e4ad2b3727c4fa76d88
@@ -61,6 +61,7 @@
     private static final String TAG_BOTTOM_BAR_VIEW_ACTIVE = "BOTTOM_BAR_VIEW_ACTIVE";
 
     private Context mContext;
+    private boolean mIgnoreTabletLayout;
     private boolean mIsTabletMode;
     private boolean mIsShy;
     private boolean mUseExtraOffset;
@@ -73,6 +74,7 @@
     private View mBackgroundOverlay;
     private View mShadowView;
     private View mTabletRightBorder;
+    private View mPendingUserContentView;
 
     private int mPrimaryColor;
     private int mInActiveColor;
@@ -130,13 +132,16 @@ public static BottomBar attach(Activity activity, Bundle savedInstanceState) {
         View oldLayout = contentView.getChildAt(0);
         contentView.removeView(oldLayout);
 
-        bottomBar.getUserContainer()
-                .addView(oldLayout, 0, oldLayout.getLayoutParams());
+        bottomBar.setPendingUserContentView(oldLayout);
         contentView.addView(bottomBar, 0);
 
         return bottomBar;
     }
 
+    private void setPendingUserContentView(View oldLayout) {
+        mPendingUserContentView = oldLayout;
+    }
+
     /**
      * Bind the BottomBar to the specified View's parent, and inflate
      * your layout there. Useful when the BottomBar overlaps some content
@@ -159,17 +164,10 @@ public static BottomBar attach(View view, Bundle savedInstanceState) {
             View oldLayout = contentView.getChildAt(0);
             contentView.removeView(oldLayout);
 
-            bottomBar.getUserContainer()
-                    .addView(oldLayout, oldLayout.getLayoutParams());
+            bottomBar.setPendingUserContentView(oldLayout);
             contentView.addView(bottomBar, 0);
         } else {
-            if (view.getLayoutParams() == null) {
-                bottomBar.getUserContainer()
-                        .addView(view, new ViewGroup.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT));
-            } else {
-                bottomBar.getUserContainer()
-                        .addView(view, view.getLayoutParams());
-            }
+            bottomBar.setPendingUserContentView(view);
         }
 
         return bottomBar;
@@ -517,6 +515,20 @@ public void noNavBarGoodness() {
     }
 
     /**
+     * Force the BottomBar to behave exactly same on tablets and phones,
+     * instead of showing a left menu on tablets.
+     */
+    public void noTabletGoodness() {
+        if (mItems != null) {
+            throw new UnsupportedOperationException("This BottomBar already has items! " +
+                    "You must call noTabletGoodness() before setting the items, preferably " +
+                    "right after attaching it to your layout.");
+        }
+
+        mIgnoreTabletLayout = true;
+    }
+
+    /**
      * Super ugly hacks
      * ----------------------------/
      */
@@ -573,16 +585,16 @@ private void init(Context context, AttributeSet attrs, int defStyleAttr, int def
         mTwoDp = MiscUtils.dpToPixel(mContext, 2);
         mTenDp = MiscUtils.dpToPixel(mContext, 10);
         mMaxFixedItemWidth = MiscUtils.dpToPixel(mContext, 168);
-
-        initializeViews();
     }
 
-
     private void initializeViews() {
-        View rootView = View.inflate(mContext, R.layout.bb_bottom_bar_item_container, null);
+        mIsTabletMode = !mIgnoreTabletLayout &&
+                mContext.getResources().getBoolean(R.bool.bb_bottom_bar_is_tablet_mode);
 
+        View rootView = View.inflate(mContext, mIsTabletMode?
+                        R.layout.bb_bottom_bar_item_container_tablet : R.layout.bb_bottom_bar_item_container,
+                null);
         mTabletRightBorder = rootView.findViewById(R.id.bb_tablet_right_border);
-        mIsTabletMode = mTabletRightBorder != null;
 
         mUserContentContainer = (ViewGroup) rootView.findViewById(R.id.bb_user_content_container);
         mShadowView = rootView.findViewById(R.id.bb_bottom_bar_shadow);
@@ -593,6 +605,17 @@ private void initializeViews() {
         mBackgroundView = rootView.findViewById(R.id.bb_bottom_bar_background_view);
         mBackgroundOverlay = rootView.findViewById(R.id.bb_bottom_bar_background_overlay);
 
+        if (mPendingUserContentView != null) {
+            ViewGroup.LayoutParams params = mPendingUserContentView.getLayoutParams();
+
+            if (params == null) {
+                params = new ViewGroup.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT,
+                        ViewGroup.LayoutParams.MATCH_PARENT);
+            }
+
+            mUserContentContainer.addView(mPendingUserContentView, 0, params);
+        }
+
         addView(rootView);
     }
 
@@ -667,6 +690,10 @@ public boolean onLongClick(View v) {
     }
 
     private void updateItems(BottomBarItemBase[] bottomBarItems) {
+        if (mItemContainer == null) {
+            initializeViews();
+        }
+
         int index = 0;
         int biggestWidth = 0;
         mIsShiftingMode = MAX_FIXED_TAB_COUNT < bottomBarItems.length;
@@ -690,7 +717,8 @@ private void updateItems(BottomBarItemBase[] bottomBarItems) {
             if (mIsShiftingMode && !mIsTabletMode) {
                 layoutResource = R.layout.bb_bottom_bar_item_shifting;
             } else {
-                layoutResource = R.layout.bb_bottom_bar_item_fixed;
+                layoutResource = mIsTabletMode?
+                        R.layout.bb_bottom_bar_item_fixed_tablet : R.layout.bb_bottom_bar_item_fixed;
             }
 
             View bottomBarTab = View.inflate(mContext, layoutResource, null);
@@ -966,11 +994,13 @@ private void updateCurrentFragment() {
     }
 
     private void clearItems() {
-        int childCount = mItemContainer.getChildCount();
+        if (mItemContainer != null) {
+            int childCount = mItemContainer.getChildCount();
 
-        if (childCount > 0) {
-            for (int i = 0; i < childCount; i++) {
-                mItemContainer.removeView(mItemContainer.getChildAt(i));
+            if (childCount > 0) {
+                for (int i = 0; i < childCount; i++) {
+                    mItemContainer.removeView(mItemContainer.getChildAt(i));
+                }
             }
         }