From 2f2ba0ce3d1b1e8732ff078cb64bfde00a1473aa Mon Sep 17 00:00:00 2001 From: afohrman Date: Mon, 23 Apr 2018 15:16:02 -0400 Subject: [PATCH] Add "enabled" suffix to itemHorizontalTranslation attribute name. The suffix makes it clearer that the attribute is boolean. This attribute was introduced in an alpha release, so it is fine to rename. PiperOrigin-RevId: 193964290 --- .../BottomNavigationMenuView.java | 19 +++++++++--------- .../BottomNavigationView.java | 20 +++++++++---------- .../bottomnavigation/res/values/attrs.xml | 5 ++--- .../bottomnavigation/res/values/styles.xml | 4 ++-- 4 files changed, 24 insertions(+), 24 deletions(-) diff --git a/lib/java/com/google/android/material/bottomnavigation/BottomNavigationMenuView.java b/lib/java/com/google/android/material/bottomnavigation/BottomNavigationMenuView.java index df782985c..d6036f730 100644 --- a/lib/java/com/google/android/material/bottomnavigation/BottomNavigationMenuView.java +++ b/lib/java/com/google/android/material/bottomnavigation/BottomNavigationMenuView.java @@ -61,7 +61,7 @@ public class BottomNavigationMenuView extends ViewGroup implements MenuView { private final OnClickListener onClickListener; private final Pools.Pool itemPool = new Pools.SynchronizedPool<>(5); - private boolean itemHorizontalTranslation; + private boolean itemHorizontalTranslationEnabled; @LabelVisibilityMode private int labelVisibilityMode; private BottomNavigationItemView[] buttons; @@ -133,7 +133,7 @@ public class BottomNavigationMenuView extends ViewGroup implements MenuView { final int heightSpec = MeasureSpec.makeMeasureSpec(itemHeight, MeasureSpec.EXACTLY); - if (isShifting(labelVisibilityMode, visibleCount) && itemHorizontalTranslation) { + if (isShifting(labelVisibilityMode, visibleCount) && itemHorizontalTranslationEnabled) { final View activeChild = getChildAt(selectedItemPosition); int activeItemWidth = activeItemMinWidth; if (activeChild.getVisibility() != View.GONE) { @@ -406,11 +406,12 @@ public class BottomNavigationMenuView extends ViewGroup implements MenuView { * Sets whether the menu items horizontally translate on selection when the combined item widths * fill the screen. * - * @param itemHorizontalTranslation whether the menu items horizontally translate on selection - * @see #getItemHorizontalTranslation() + * @param itemHorizontalTranslationEnabled whether the menu items horizontally translate on + * selection + * @see #isItemHorizontalTranslationEnabled() */ - public void setItemHorizontalTranslation(boolean itemHorizontalTranslation) { - this.itemHorizontalTranslation = itemHorizontalTranslation; + public void setItemHorizontalTranslationEnabled(boolean itemHorizontalTranslationEnabled) { + this.itemHorizontalTranslationEnabled = itemHorizontalTranslationEnabled; } /** @@ -418,10 +419,10 @@ public class BottomNavigationMenuView extends ViewGroup implements MenuView { * widths fill the screen. * * @return whether the menu items horizontally translate on selection - * @see #setItemHorizontalTranslation(boolean) + * @see #setItemHorizontalTranslationEnabled(boolean) */ - public boolean getItemHorizontalTranslation() { - return itemHorizontalTranslation; + public boolean isItemHorizontalTranslationEnabled() { + return itemHorizontalTranslationEnabled; } public ColorStateList createDefaultColorStateList(int baseColorThemeAttr) { diff --git a/lib/java/com/google/android/material/bottomnavigation/BottomNavigationView.java b/lib/java/com/google/android/material/bottomnavigation/BottomNavigationView.java index ea0ad9508..8f6e6aba6 100644 --- a/lib/java/com/google/android/material/bottomnavigation/BottomNavigationView.java +++ b/lib/java/com/google/android/material/bottomnavigation/BottomNavigationView.java @@ -175,8 +175,8 @@ public class BottomNavigationView extends FrameLayout { a.getInteger( R.styleable.BottomNavigationView_labelVisibilityMode, LabelVisibilityMode.LABEL_VISIBILITY_AUTO)); - setItemHorizontalTranslation( - a.getBoolean(R.styleable.BottomNavigationView_itemHorizontalTranslation, true)); + setItemHorizontalTranslationEnabled( + a.getBoolean(R.styleable.BottomNavigationView_itemHorizontalTranslationEnabled, true)); int itemBackground = a.getResourceId(R.styleable.BottomNavigationView_itemBackground, 0); menuView.setItemBackgroundRes(itemBackground); @@ -475,12 +475,12 @@ public class BottomNavigationView extends FrameLayout { * Sets whether the menu items horizontally translate on selection when the combined item widths * fill up the screen. * - * @param itemHorizontalTranslation whether the items horizontally translate on selection - * @see #getItemHorizontalTranslation() + * @param itemHorizontalTranslationEnabled whether the items horizontally translate on selection + * @see #isItemHorizontalTranslationEnabled() */ - public void setItemHorizontalTranslation(boolean itemHorizontalTranslation) { - if (menuView.getItemHorizontalTranslation() != itemHorizontalTranslation) { - menuView.setItemHorizontalTranslation(itemHorizontalTranslation); + public void setItemHorizontalTranslationEnabled(boolean itemHorizontalTranslationEnabled) { + if (menuView.isItemHorizontalTranslationEnabled() != itemHorizontalTranslationEnabled) { + menuView.setItemHorizontalTranslationEnabled(itemHorizontalTranslationEnabled); presenter.updateMenuView(false); } } @@ -490,10 +490,10 @@ public class BottomNavigationView extends FrameLayout { * screen. * * @return whether the menu items horizontally translate on selection - * @see #setItemHorizontalTranslation(boolean) + * @see #setItemHorizontalTranslationEnabled(boolean) */ - public boolean getItemHorizontalTranslation() { - return menuView.getItemHorizontalTranslation(); + public boolean isItemHorizontalTranslationEnabled() { + return menuView.isItemHorizontalTranslationEnabled(); } /** Listener for handling selection events on bottom navigation items. */ diff --git a/lib/java/com/google/android/material/bottomnavigation/res/values/attrs.xml b/lib/java/com/google/android/material/bottomnavigation/res/values/attrs.xml index 89e5f4a1b..48f77a8fc 100644 --- a/lib/java/com/google/android/material/bottomnavigation/res/values/attrs.xml +++ b/lib/java/com/google/android/material/bottomnavigation/res/values/attrs.xml @@ -58,9 +58,8 @@ precedence over android:textColor in itemTextAppearanceInactive or itemTextAppearanceActive. Attribute type definition is in navigation package. --> - - + + diff --git a/lib/java/com/google/android/material/bottomnavigation/res/values/styles.xml b/lib/java/com/google/android/material/bottomnavigation/res/values/styles.xml index 0345633f9..2eb5bfbc5 100644 --- a/lib/java/com/google/android/material/bottomnavigation/res/values/styles.xml +++ b/lib/java/com/google/android/material/bottomnavigation/res/values/styles.xml @@ -20,7 +20,7 @@ @dimen/design_bottom_navigation_elevation auto ?attr/selectableItemBackgroundBorderless - true + true @dimen/design_bottom_navigation_icon_size @@ -29,7 +29,7 @@ colorPrimary for the icon and text colors. -->