RedAuburn/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

[android] Implemented more button for category item in the list

Browse source
This commit is contained in:
Александр Зацепин 2018-03-20 18:33:41 +03:00 • committed by Arsentiy Milchakov
parent 07ef48a7ce
commit 0ba811ad7c
2 changed files with 25 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
android/src/com/mapswithme/maps/bookmarks/BookmarkCategoriesAdapter.java
View file

@ -26,7 +26,7 @@ public class BookmarkCategoriesAdapter extends BaseBookmarkCategoryAdapter<Recyc
@Nullable
private RecyclerClickListener mClickListener;
@Nullable
private OnAddCategoryListener mOnAddCategoryListener;
private CategoryListInterface mCategoryListInterface;
BookmarkCategoriesAdapter(@NonNull Context context)
{
@ -43,9 +43,9 @@ public class BookmarkCategoriesAdapter extends BaseBookmarkCategoryAdapter<Recyc
mLongClickListener = listener;
}
void setOnAddCategoryListener(@Nullable OnAddCategoryListener listener)
void setCategoryListInterface(@Nullable CategoryListInterface listener)
{
mOnAddCategoryListener = listener;
mCategoryListInterface = listener;
}
@Override
@ -69,8 +69,8 @@ public class BookmarkCategoriesAdapter extends BaseBookmarkCategoryAdapter<Recyc
createListView.setOnClickListener
(v ->
{
if (mOnAddCategoryListener != null)
mOnAddCategoryListener.onAddCategory();
if (mCategoryListInterface != null)
mCategoryListInterface.onAddCategory();
});
return new Holders.GeneralViewHolder(createListView);
}
@ -105,7 +105,9 @@ public class BookmarkCategoriesAdapter extends BaseBookmarkCategoryAdapter<Recyc
CategoryViewHolder categoryHolder = (CategoryViewHolder) holder;
final BookmarkManager bmManager = BookmarkManager.INSTANCE;
final long catId = getCategoryIdByPosition(position - 1);
// The header "Hide All" is located at first index, so subsctraction is needed.
final int categoryPosition = position - 1;
final long catId = getCategoryIdByPosition(categoryPosition);
categoryHolder.setName(bmManager.getCategoryName(catId));
categoryHolder.setSize(bmManager.getCategorySize(catId));
categoryHolder.setVisibilityState(bmManager.isVisible(catId));
@ -116,7 +118,8 @@ public class BookmarkCategoriesAdapter extends BaseBookmarkCategoryAdapter<Recyc
categoryHolder.setVisibilityState(bmManager.isVisible(catId));
});
categoryHolder.setMoreListener(v -> {
Toast.makeText(getContext(), "Coming soon", Toast.LENGTH_SHORT).show();
if (mCategoryListInterface != null)
mCategoryListInterface.onMoreOperationClick(categoryPosition);
});
}
@ -141,8 +144,9 @@ public class BookmarkCategoriesAdapter extends BaseBookmarkCategoryAdapter<Recyc
return count > 0 ? count + 2 /* header + add category btn */ : 0;
}
interface OnAddCategoryListener
interface CategoryListInterface
{
void onAddCategory();
void onMoreOperationClick(int position);
}
}

15
android/src/com/mapswithme/maps/bookmarks/BookmarkCategoriesFragment.java
View file

@ -31,7 +31,7 @@ public class BookmarkCategoriesFragment extends BaseMwmRecyclerFragment
RecyclerClickListener,
RecyclerLongClickListener,
BookmarkManager.BookmarksLoadingListener,
BookmarkCategoriesAdapter.OnAddCategoryListener
BookmarkCategoriesAdapter.CategoryListInterface
{
private long mSelectedCatId;
@Nullable
@ -73,7 +73,7 @@ public class BookmarkCategoriesFragment extends BaseMwmRecyclerFragment
{
getAdapter().setOnClickListener(this);
getAdapter().setOnLongClickListener(this);
getAdapter().setOnAddCategoryListener(this);
getAdapter().setCategoryListInterface(this);
getAdapter().registerAdapterDataObserver(new RecyclerView.AdapterDataObserver()
{
@Override
@ -188,6 +188,11 @@ public class BookmarkCategoriesFragment extends BaseMwmRecyclerFragment
@Override
public void onLongItemClick(View v, int position)
{
showBottomMenu(position);
}
private void showBottomMenu(int position)
{
final BookmarkManager bmManager = BookmarkManager.INSTANCE;
mSelectedCatId = bmManager.getCategoryIdByPosition(position);
@ -205,6 +210,12 @@ public class BookmarkCategoriesFragment extends BaseMwmRecyclerFragment
bs.tint().show();
}
@Override
public void onMoreOperationClick(int position)
{
showBottomMenu(position);
}
@Override
public void onItemClick(View v, int position)
{