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

am 9fe27e97: am e6df0157: am ac09900d: am 9b6192b8: Merge "NavigationView handles checked status" into lmp-mr1-ub-dev

Browse Source 
* commit '9fe27e97b81b99be510acdb644f23d56c8c7d429':
  NavigationView handles checked status

GitOrigin-RevId=36728a2ee9e2a1e6aabb0ae61a3b74a07ceac039

PiperOrigin-RevId: 140548834
This commit is contained in:
Yuichi Araki 2016-11-30 01:19:57 +00:00 committed by Travis Collins
parent 6b4a20fe30
commit dd5bf43dc6
3 changed files with 60 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
api/current.txt
View File

@ -197,6 +197,7 @@ package android.support.design.widget {
method public void setItemIconTintList(android.content.res.ColorStateList);
method public void setItemTextColor(android.content.res.ColorStateList);
method public void setNavigationItemSelectedListener(android.support.design.widget.NavigationView.OnNavigationItemSelectedListener);
method public void setCheckedItem(int);
}
public static abstract interface NavigationView.OnNavigationItemSelectedListener {

61
src/android/support/design/internal/NavigationMenuPresenter.java
View File

@ -184,10 +184,21 @@ public class NavigationMenuPresenter implements MenuPresenter, AdapterView.OnIte
public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
int positionInAdapter = position - mMenuView.getHeaderViewsCount();
if (positionInAdapter >= 0) {
mMenu.performItemAction(mAdapter.getItem(positionInAdapter).getMenuItem(), this, 0);
setUpdateSuspended(true);
MenuItemImpl item = mAdapter.getItem(positionInAdapter).getMenuItem();
if (item != null && item.isCheckable()) {
setCheckedItem(item);
}
mMenu.performItemAction(item, this, 0);
setUpdateSuspended(false);
updateMenuView(false);
}
}
public void setCheckedItem(MenuItemImpl item) {
mAdapter.setCheckedItem(item);
}
public View inflateHeaderView(@LayoutRes int res) {
View view = mLayoutInflater.inflate(res, mHeader, false);
addHeaderView(view);
@ -241,13 +252,14 @@ public class NavigationMenuPresenter implements MenuPresenter, AdapterView.OnIte
private class NavigationMenuAdapter extends BaseAdapter {
private static final String STATE_CHECKED_ITEMS = "android:menu:checked";
private static final String STATE_CHECKED_ITEM = "android:menu:checked";
private static final int VIEW_TYPE_NORMAL = 0;
private static final int VIEW_TYPE_SUBHEADER = 1;
private static final int VIEW_TYPE_SEPARATOR = 2;
private final ArrayList<NavigationMenuItem> mItems = new ArrayList<>();
private MenuItemImpl mCheckedItem;
private ColorDrawable mTransparentIcon;
private boolean mUpdateSuspended;
@ -353,6 +365,12 @@ public class NavigationMenuPresenter implements MenuPresenter, AdapterView.OnIte
boolean currentGroupHasIcon = false;
for (int i = 0, totalSize = mMenu.getVisibleItems().size(); i < totalSize; i++) {
MenuItemImpl item = mMenu.getVisibleItems().get(i);
if (item.isChecked()) {
setCheckedItem(item);
}
if (item.isCheckable()) {
item.setExclusiveCheckable(false);
}
if (item.hasSubMenu()) {
SubMenu subMenu = item.getSubMenu();
if (subMenu.hasVisibleItems()) {
@ -363,12 +381,18 @@ public class NavigationMenuPresenter implements MenuPresenter, AdapterView.OnIte
boolean subMenuHasIcon = false;
int subMenuStart = mItems.size();
for (int j = 0, size = subMenu.size(); j < size; j++) {
MenuItem subMenuItem = subMenu.getItem(j);
MenuItemImpl subMenuItem = (MenuItemImpl) subMenu.getItem(j);
if (subMenuItem.isVisible()) {
if (!subMenuHasIcon && subMenuItem.getIcon() != null) {
subMenuHasIcon = true;
}
mItems.add(NavigationMenuItem.of((MenuItemImpl) subMenuItem));
if (subMenuItem.isCheckable()) {
subMenuItem.setExclusiveCheckable(false);
}
if (item.isChecked()) {
setCheckedItem(item);
}
mItems.add(NavigationMenuItem.of(subMenuItem));
}
}
if (subMenuHasIcon) {
@ -410,27 +434,32 @@ public class NavigationMenuPresenter implements MenuPresenter, AdapterView.OnIte
}
}
public void setCheckedItem(MenuItemImpl checkedItem) {
if (mCheckedItem == checkedItem || !checkedItem.isCheckable()) {
return;
}
if (mCheckedItem != null) {
mCheckedItem.setChecked(false);
}
mCheckedItem = checkedItem;
checkedItem.setChecked(true);
}
public Bundle createInstanceState() {
Bundle state = new Bundle();
ArrayList<Integer> checkedItems = new ArrayList<>();
for (NavigationMenuItem item : mItems) {
MenuItemImpl menuItem = item.getMenuItem();
if (menuItem != null && menuItem.isChecked()) {
checkedItems.add(menuItem.getItemId());
}
}
state.putIntegerArrayList(STATE_CHECKED_ITEMS, checkedItems);
state.putInt(STATE_CHECKED_ITEM, mCheckedItem.getItemId());
return state;
}
public void restoreInstanceState(Bundle state) {
ArrayList<Integer> checkedItems = state.getIntegerArrayList(STATE_CHECKED_ITEMS);
if (checkedItems != null) {
int checkedItem = state.getInt(STATE_CHECKED_ITEM, 0);
if (checkedItem != 0) {
mUpdateSuspended = true;
for (NavigationMenuItem item : mItems) {
MenuItemImpl menuItem = item.getMenuItem();
if (menuItem != null && checkedItems.contains(menuItem.getItemId())) {
menuItem.setChecked(true);
if (menuItem != null && menuItem.getItemId() == checkedItem) {
setCheckedItem(menuItem);
break;
}
}
mUpdateSuspended = false;

14
src/android/support/design/widget/NavigationView.java
View File

@ -24,6 +24,7 @@ import android.os.Bundle;
import android.os.Parcel;
import android.os.Parcelable;
import android.support.annotation.DrawableRes;
import android.support.annotation.IdRes;
import android.support.annotation.LayoutRes;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
@ -34,6 +35,7 @@ import android.support.v4.content.ContextCompat;
import android.support.v4.view.ViewCompat;
import android.support.v7.internal.view.SupportMenuInflater;
import android.support.v7.internal.view.menu.MenuBuilder;
import android.support.v7.internal.view.menu.MenuItemImpl;
import android.util.AttributeSet;
import android.util.TypedValue;
import android.view.Menu;
@ -330,6 +332,18 @@ public class NavigationView extends ScrimInsetsFrameLayout {
mPresenter.setItemBackground(itemBackground);
}
/**
* Sets the currently checked item in this navigation menu.
*
* @param id The item ID of the currently checked item.
*/
public void setCheckedItem(@IdRes int id) {
MenuItem item = mMenu.findItem(id);
if (item != null) {
mPresenter.setCheckedItem((MenuItemImpl) item);
}
}
private MenuInflater getMenuInflater() {
if (mMenuInflater == null) {
mMenuInflater = new SupportMenuInflater(getContext());