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

[android] Refactor BookmarkCollectionAdapter constructor.

Browse source
This commit is contained in:
velichkomarija 2020-10-19 22:59:01 +03:00 • committed by Alexey
parent 343d0d6f7e
commit c597053db1
2 changed files with 13 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
android/src/com/mapswithme/maps/bookmarks/BookmarkCollectionAdapter.java
View file

@ -29,9 +29,8 @@ public class BookmarkCollectionAdapter extends RecyclerView.Adapter<RecyclerView
private final static int TYPE_CATEGORY_ITEM = BookmarkManager.CATEGORY;
private final static int TYPE_HEADER_ITEM = 3;
private final long mParentCategoryId;
@NonNull
private final String mParentServerId;
private final BookmarkCategory mBookmarkCategory;
@NonNull
private List<BookmarkCategory> mItemsCollection;
@ -65,7 +64,7 @@ public class BookmarkCollectionAdapter extends RecyclerView.Adapter<RecyclerView
category.invertVisibility();
notifyItemChanged(mHolder.getAdapterPosition());
notifyItemChanged(SectionPosition.INVALID_POSITION);
String compilationTypeString = BookmarkManager.INSTANCE.getCompilationType(category.getId()) ==
BookmarkManager.CATEGORY ?
Statistics.ParamValue.CATEGORY :
@ -76,13 +75,11 @@ public class BookmarkCollectionAdapter extends RecyclerView.Adapter<RecyclerView
}
}
BookmarkCollectionAdapter(@NonNull String parentServerId,
long parentCategoryId,
BookmarkCollectionAdapter(@NonNull BookmarkCategory bookmarkCategory,
@NonNull List<BookmarkCategory> itemsCategories,
@NonNull List<BookmarkCategory> itemsCollection)
{
mParentServerId = parentServerId;
mParentCategoryId = parentCategoryId;
mBookmarkCategory = bookmarkCategory;
//noinspection AssignmentOrReturnOfFieldWithMutableType
mItemsCategory = itemsCategories;
//noinspection AssignmentOrReturnOfFieldWithMutableType
@ -234,7 +231,7 @@ public class BookmarkCollectionAdapter extends RecyclerView.Adapter<RecyclerView
BookmarkManager.CATEGORY : BookmarkManager.COLLECTION;
headerViewHolder.setAction(mMassOperationAction,
!isCategoryAllItemsAreVisible(nextSectionPosition),
compilationType, mParentServerId);
compilationType, mBookmarkCategory.getServerId());
}
@Override
@ -273,9 +270,9 @@ public class BookmarkCollectionAdapter extends RecyclerView.Adapter<RecyclerView
private void updateItemsByType(@BookmarkManager.CompilationType int compilationType)
{
if (compilationType == BookmarkManager.COLLECTION)
mItemsCollection = BookmarkManager.INSTANCE.getChildrenCollections(mParentCategoryId);
mItemsCollection = BookmarkManager.INSTANCE.getChildrenCollections(mBookmarkCategory.getId());
else
mItemsCategory = BookmarkManager.INSTANCE.getChildrenCategories(mParentCategoryId);
mItemsCategory = BookmarkManager.INSTANCE.getChildrenCategories(mBookmarkCategory.getId());
}
class MassOperationAction implements Holders.HeaderViewHolder.HeaderActionChildCategories
@ -283,7 +280,8 @@ public class BookmarkCollectionAdapter extends RecyclerView.Adapter<RecyclerView
@Override
public void onHideAll(@BookmarkManager.CompilationType int compilationType)
{
BookmarkManager.INSTANCE.setChildCategoriesVisibility(mParentCategoryId, compilationType, false);
BookmarkManager.INSTANCE.setChildCategoriesVisibility(mBookmarkCategory.getId(),
compilationType, false);
updateItemsByType(compilationType);
notifyDataSetChanged();
}
@ -291,7 +289,8 @@ public class BookmarkCollectionAdapter extends RecyclerView.Adapter<RecyclerView
@Override
public void onShowAll(@BookmarkManager.CompilationType int compilationType)
{
BookmarkManager.INSTANCE.setChildCategoriesVisibility(mParentCategoryId, compilationType, true);
BookmarkManager.INSTANCE.setChildCategoriesVisibility(mBookmarkCategory.getId(),
compilationType, true);
updateItemsByType(compilationType);
notifyDataSetChanged();
}

4
android/src/com/mapswithme/maps/bookmarks/BookmarksListFragment.java
View file

@ -141,8 +141,8 @@ public class BookmarksListFragment extends BaseMwmRecyclerFragment<BookmarkListA
List<BookmarkCategory> mCategoryItems = BookmarkManager.INSTANCE.getChildrenCategories(categoryId);
List<BookmarkCategory> mCollectionItems = BookmarkManager.INSTANCE.getChildrenCollections(categoryId);
mBookmarkCollectionAdapter = new BookmarkCollectionAdapter(
getCategoryOrThrow().getServerId(), categoryId, mCategoryItems, mCollectionItems);
mBookmarkCollectionAdapter = new BookmarkCollectionAdapter(getCategoryOrThrow(),
mCategoryItems, mCollectionItems);
mBookmarkCollectionAdapter.setOnClickListener((v, item) -> {
Intent intent = new Intent(getActivity(), BookmarkListActivity.class)
.putExtra(BookmarksListFragment.EXTRA_CATEGORY, item);