From e5df5714de1376f0917ce537a8c8ae9f6b01b08d Mon Sep 17 00:00:00 2001 From: seven332 Date: Tue, 19 Mar 2019 21:04:29 +0800 Subject: [PATCH] Don't show favourited icon on FavouritesScene --- .../java/com/hippo/ehviewer/ui/scene/FavoritesScene.java | 2 +- .../java/com/hippo/ehviewer/ui/scene/GalleryAdapter.java | 6 ++++-- .../java/com/hippo/ehviewer/ui/scene/GalleryListScene.java | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/com/hippo/ehviewer/ui/scene/FavoritesScene.java b/app/src/main/java/com/hippo/ehviewer/ui/scene/FavoritesScene.java index 78889a30a..af7f2a3b1 100644 --- a/app/src/main/java/com/hippo/ehviewer/ui/scene/FavoritesScene.java +++ b/app/src/main/java/com/hippo/ehviewer/ui/scene/FavoritesScene.java @@ -1013,7 +1013,7 @@ public class FavoritesScene extends BaseScene implements public FavoritesAdapter(@NonNull LayoutInflater inflater, @NonNull Resources resources, @NonNull RecyclerView recyclerView, int type) { - super(inflater, resources, recyclerView, type); + super(inflater, resources, recyclerView, type, false); } @Override diff --git a/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryAdapter.java b/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryAdapter.java index db5b9df8b..21bdc5703 100644 --- a/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryAdapter.java +++ b/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryAdapter.java @@ -62,14 +62,16 @@ abstract class GalleryAdapter extends RecyclerView.Adapter { private final int mListThumbWidth; private final int mListThumbHeight; private int mType = TYPE_INVALID; + private boolean mShowFavourited; public GalleryAdapter(@NonNull LayoutInflater inflater, @NonNull Resources resources, - @NonNull RecyclerView recyclerView, int type) { + @NonNull RecyclerView recyclerView, int type, boolean showFavourited) { mInflater = inflater; mResources = resources; mRecyclerView = recyclerView; mLayoutManager = new AutoStaggeredGridLayoutManager(0, StaggeredGridLayoutManager.VERTICAL); mPaddingTopSB = resources.getDimensionPixelOffset(R.dimen.gallery_padding_top_search_bar); + mShowFavourited = showFavourited; mRecyclerView.setAdapter(this); mRecyclerView.setLayoutManager(mLayoutManager); @@ -210,7 +212,7 @@ abstract class GalleryAdapter extends RecyclerView.Adapter { holder.simpleLanguage.setText(gi.simpleLanguage); holder.simpleLanguage.setVisibility(View.VISIBLE); } - holder.favourited.setVisibility((gi.favoriteSlot >= -1 && gi.favoriteSlot <= 10) ? View.VISIBLE : View.GONE); + holder.favourited.setVisibility((mShowFavourited && gi.favoriteSlot >= -1 && gi.favoriteSlot <= 10) ? View.VISIBLE : View.GONE); holder.downloaded.setVisibility(gi.downloaded ? View.VISIBLE : View.GONE); break; } diff --git a/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryListScene.java b/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryListScene.java index fc3b0b190..75d90d944 100644 --- a/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryListScene.java +++ b/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryListScene.java @@ -1339,7 +1339,7 @@ public final class GalleryListScene extends BaseScene public GalleryListAdapter(@NonNull LayoutInflater inflater, @NonNull Resources resources, @NonNull RecyclerView recyclerView, int type) { - super(inflater, resources, recyclerView, type); + super(inflater, resources, recyclerView, type, true); } @Override