DEV/material-components_material-components-android
1
0
Fork 0
mirror of https://github.com/material-components/material-components-android.git synced 2026-02-20 08:39:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

Start using return value of OnNavigationItemSelectedListener. am: 578015fc3e am: a502cd075f am: ba4b4c48c7

Browse Source 
am: 9fdc2c22a0

Change-Id: Ia9b3c0bd39b7c38beade606f7f311a12bfe5bad8

GitOrigin-RevId=5f006fe9d3c4c9b8883f7755c42fdf3833d6b8a7

PiperOrigin-RevId: 141504385
This commit is contained in:
Aurimas Liutikas 2016-12-09 01:17:17 +00:00 committed by Travis Collins
parent 2f01207518
commit b6afbc1f91
3 changed files with 31 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/src/android/support/design/internal/BottomNavigationMenuView.java
View File

@ -86,8 +86,9 @@ public class BottomNavigationMenuView extends ViewGroup implements MenuView {
public void onClick(View v) {
final BottomNavigationItemView itemView = (BottomNavigationItemView) v;
final int itemPosition = itemView.getItemPosition();
activateNewButton(itemPosition);
mMenu.performItemAction(itemView.getItemData(), mPresenter, 0);
if (!mMenu.performItemAction(itemView.getItemData(), mPresenter, 0)) {
activateNewButton(itemPosition);
}
}
};
mTempChildWidths = new int[BottomNavigationMenu.MAX_ITEM_COUNT];

6
lib/src/android/support/design/widget/BottomNavigationView.java
View File

@ -152,7 +152,7 @@ public class BottomNavigationView extends FrameLayout {
mMenu.setCallback(new MenuBuilder.Callback() {
@Override
public boolean onMenuItemSelected(MenuBuilder menu, MenuItem item) {
return mListener != null && mListener.onNavigationItemSelected(item);
return mListener != null && !mListener.onNavigationItemSelected(item);
}
@Override
@ -279,7 +279,9 @@ public class BottomNavigationView extends FrameLayout {
*
* @param item The selected item
*
* @return true to display the item as the selected item
* @return true to display the item as the selected item and false if the item should not
* be selected. Consider setting non-selectable items as disabled preemptively to
* make them appear non-interactive.
*/
boolean onNavigationItemSelected(@NonNull MenuItem item);
}

28
lib/tests/src/android/support/design/widget/BottomNavigationViewTest.java
View File

@ -27,11 +27,15 @@ import static android.support.test.espresso.matcher.ViewMatchers.withText;
import static org.hamcrest.core.AllOf.allOf;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
import static org.mockito.Matchers.any;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.verifyNoMoreInteractions;
import static org.mockito.Mockito.when;
import android.content.res.Resources;
import android.support.annotation.ColorInt;
@ -95,22 +99,38 @@ public class BottomNavigationViewTest
mock(BottomNavigationView.OnNavigationItemSelectedListener.class);
mBottomNavigation.setOnNavigationItemSelectedListener(mockedListener);
// Click one of our items
// Make the listener return true to allow selecting the item.
when(mockedListener.onNavigationItemSelected(any(MenuItem.class))).thenReturn(true);
onView(allOf(withText(mMenuStringContent.get(R.id.destination_profile)),
isDescendantOfA(withId(R.id.bottom_navigation)), isDisplayed())).perform(click());
// And that our listener has been notified of the click
// Verify our listener has been notified of the click
verify(mockedListener, times(1)).onNavigationItemSelected(
mBottomNavigation.getMenu().findItem(R.id.destination_profile));
// Verify the item is now selected
assertTrue(mBottomNavigation.getMenu().findItem(R.id.destination_profile).isChecked());
// Make the listener return false to disallow selecting the item.
when(mockedListener.onNavigationItemSelected(any(MenuItem.class))).thenReturn(false);
onView(allOf(withText(mMenuStringContent.get(R.id.destination_people)),
isDescendantOfA(withId(R.id.bottom_navigation)), isDisplayed())).perform(click());
// Verify our listener has been notified of the click
verify(mockedListener, times(1)).onNavigationItemSelected(
mBottomNavigation.getMenu().findItem(R.id.destination_people));
// Verify the previous item is still selected
assertFalse(mBottomNavigation.getMenu().findItem(R.id.destination_people).isChecked());
assertTrue(mBottomNavigation.getMenu().findItem(R.id.destination_profile).isChecked());
// Set null listener to test that the next click is not going to notify the
// previously set listener
// previously set listener and will allow selecting items.
mBottomNavigation.setOnNavigationItemSelectedListener(null);
// Click one of our items
onView(allOf(withText(mMenuStringContent.get(R.id.destination_people)),
onView(allOf(withText(mMenuStringContent.get(R.id.destination_home)),
isDescendantOfA(withId(R.id.bottom_navigation)), isDisplayed())).perform(click());
// And that our previous listener has not been notified of the click
verifyNoMoreInteractions(mockedListener);
// Verify the correct item is now selected.
assertTrue(mBottomNavigation.getMenu().findItem(R.id.destination_home).isChecked());
}
@Test