organicmaps/organicmaps-tmp
Archived
13
Fork 1
Code Issues 2.7k Pull requests 182 Projects Releases 65 Wiki Activity Actions

[android] Remove overengineering from BookmarkCategoryAdapter

Browse source 
Signed-off-by: Roman Tsisyk <roman@tsisyk.com>
This commit is contained in:
Roman Tsisyk 2021-05-16 10:56:41 +03:00
parent c456bb6953
commit 86277837e5
5 changed files with 24 additions and 135 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -21,12 +21,10 @@ import java.util.List;
public class BookmarkCategoriesAdapter extends BaseBookmarkCategoryAdapter<RecyclerView.ViewHolder>
{
private final static int TYPE_CATEGORY_ITEM = 0;
private final static int TYPE_ACTION_FOOTER = 1;
private final static int TYPE_ACTION_HEADER = 2;
private final static int HEADER_POSITION = 0;
@NonNull
private final BookmarkCategoriesPageResProvider mResProvider;
private final static int TYPE_ACTION_HEADER = 0;
private final static int TYPE_CATEGORY_ITEM = 1;
private final static int TYPE_ACTION_ADD = 2;
@Nullable
private OnItemLongClickListener<BookmarkCategory> mLongClickListener;
@Nullable
@ -39,7 +37,6 @@ public class BookmarkCategoriesAdapter extends BaseBookmarkCategoryAdapter<Recyc
BookmarkCategoriesAdapter(@NonNull Context context, @NonNull List<BookmarkCategory> categories)
{
super(context.getApplicationContext(), categories);
mResProvider = new BookmarkCategoriesPageResProvider.Default();
}
public void setOnClickListener(@Nullable OnItemClickListener<BookmarkCategory> listener)
@ -67,10 +64,10 @@ public class BookmarkCategoriesAdapter extends BaseBookmarkCategoryAdapter<Recyc
return new Holders.HeaderViewHolder(header);
}
if (viewType == TYPE_ACTION_FOOTER)
if (viewType == TYPE_ACTION_ADD)
{
View item = inflater.inflate(R.layout.item_bookmark_create_group, parent, false);
item.setOnClickListener(new FooterClickListener());
item.setOnClickListener(new AddButtonClickListener());
return new Holders.GeneralViewHolder(item);
}
@ -86,9 +83,9 @@ public class BookmarkCategoriesAdapter extends BaseBookmarkCategoryAdapter<Recyc
public void onBindViewHolder(final RecyclerView.ViewHolder holder, final int position)
{
int type = getItemViewType(position);
if (type == TYPE_ACTION_FOOTER)
if (type == TYPE_ACTION_ADD)
{
bindFooterHolder(holder);
bindAddButtonHolder(holder);
return;
}
@ -101,20 +98,19 @@ public class BookmarkCategoriesAdapter extends BaseBookmarkCategoryAdapter<Recyc
bindCategoryHolder(holder, position);
}
private void bindFooterHolder(@NonNull RecyclerView.ViewHolder holder)
private void bindAddButtonHolder(@NonNull RecyclerView.ViewHolder holder)
{
Holders.GeneralViewHolder generalViewHolder = (Holders.GeneralViewHolder) holder;
generalViewHolder.getImage().setImageResource(mResProvider.getFooterImage());
generalViewHolder.getText().setText(mResProvider.getFooterText());
generalViewHolder.getImage().setImageResource(R.drawable.ic_checkbox_add);
generalViewHolder.getText().setText(R.string.bookmarks_create_new_group);
}
private void bindHeaderHolder(@NonNull RecyclerView.ViewHolder holder)
{
HeaderViewHolder headerViewHolder = (HeaderViewHolder) holder;
headerViewHolder.setAction(mMassOperationAction,
mResProvider,
BookmarkManager.INSTANCE.areAllCategoriesInvisible());
headerViewHolder.getText().setText(mResProvider.getHeaderText());
headerViewHolder.getText().setText(R.string.bookmarks_groups);
}
private void bindCategoryHolder(@NonNull RecyclerView.ViewHolder holder, int position)
@ -142,7 +138,10 @@ public class BookmarkCategoriesAdapter extends BaseBookmarkCategoryAdapter<Recyc
if (position == 0)
return TYPE_ACTION_HEADER;
return (position == getItemCount() - 1) ? TYPE_ACTION_FOOTER : TYPE_CATEGORY_ITEM;
if (position == getItemCount() - 1)
return TYPE_ACTION_ADD;
return TYPE_CATEGORY_ITEM;
}
private int toCategoryPosition(int adapterPosition)
@ -160,7 +159,9 @@ public class BookmarkCategoriesAdapter extends BaseBookmarkCategoryAdapter<Recyc
public int getItemCount()
{
int count = super.getItemCount();
return count > 0 ? (count + 1 /* header */ + 1 /* footer */) : 0;
if (count == 0)
return 0;
return 1 /* header */ + count + 1 /* add button */;
}
private class LongClickListener implements View.OnLongClickListener
@ -219,13 +220,13 @@ public class BookmarkCategoriesAdapter extends BaseBookmarkCategoryAdapter<Recyc
}
}
private class FooterClickListener implements View.OnClickListener
private class AddButtonClickListener implements View.OnClickListener
{
@Override
public void onClick(View v)
{
if (mCategoryListCallback != null)
mCategoryListCallback.onFooterClick();
mCategoryListCallback.onAddButtonClick();
}
}

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

@ -178,12 +178,6 @@ public class BookmarkCategoriesFragment extends BaseMwmRecyclerFragment<Bookmark
return R.menu.menu_bookmark_categories;
}
@Override
public void onMoreOperationClick(@NonNull BookmarkCategory item)
{
showBottomMenu(item);
}
@Override
protected void setupPlaceholder(@Nullable PlaceholderView placeholder)
{
@ -208,7 +202,7 @@ public class BookmarkCategoriesFragment extends BaseMwmRecyclerFragment<Bookmark
}
@Override
public void onFooterClick()
public void onAddButtonClick()
{
mCategoryEditor = BookmarkManager.INSTANCE::createCategory;

99
android/src/com/mapswithme/maps/bookmarks/BookmarkCategoriesPageResProvider.java
View file

@ -1,99 +0,0 @@
package com.mapswithme.maps.bookmarks;
import androidx.annotation.DrawableRes;
import androidx.annotation.NonNull;
import androidx.annotation.StringRes;
import com.mapswithme.maps.R;
public interface BookmarkCategoriesPageResProvider
{
@StringRes
int getHeaderText();
@StringRes
int getFooterText();
@DrawableRes
int getFooterImage();
@NonNull
Button getHeaderBtn();
class Default implements BookmarkCategoriesPageResProvider
{
@NonNull
private final Button mBtn;
public Default(@NonNull Button btn)
{
mBtn = btn;
}
public Default()
{
this(new Button());
}
@Override
public int getHeaderText()
{
return R.string.bookmarks_groups;
}
@Override
public int getFooterText()
{
return R.string.bookmarks_create_new_group;
}
@Override
public int getFooterImage()
{
return R.drawable.ic_checkbox_add;
}
@NonNull
@Override
public Button getHeaderBtn()
{
return mBtn;
}
}
class Catalog extends Default
{
@Override
public int getHeaderText()
{
return R.string.bookmarks;
}
@Override
public int getFooterImage()
{
return R.drawable.ic_download;
}
@Override
public int getFooterText()
{
return R.string.bookmarks;
}
}
class Button
{
@StringRes
public int getSelectModeText()
{
return R.string.bookmarks_groups_show_all;
}
@StringRes
public int getUnSelectModeText()
{
return R.string.bookmarks_groups_hide_all;
}
}
}

8
android/src/com/mapswithme/maps/bookmarks/CategoryListCallback.java
View file

@ -1,12 +1,6 @@
package com.mapswithme.maps.bookmarks;
import androidx.annotation.NonNull;
import com.mapswithme.maps.bookmarks.data.BookmarkCategory;
interface CategoryListCallback
{
void onFooterClick();
void onMoreOperationClick(@NonNull BookmarkCategory item);
void onAddButtonClick();
}

5
android/src/com/mapswithme/maps/bookmarks/Holders.java
View file

@ -84,12 +84,11 @@ public class Holders
}
void setAction(@NonNull HeaderAction action,
@NonNull BookmarkCategoriesPageResProvider resProvider,
final boolean showAll)
{
mButton.setText(showAll
? resProvider.getHeaderBtn().getSelectModeText()
: resProvider.getHeaderBtn().getUnSelectModeText());
? R.string.bookmarks_groups_show_all
: R.string.bookmarks_groups_hide_all);
mButton.setOnClickListener(new ToggleShowAllClickListener(action, showAll));
}