From afdb02f635525102f281c169c120ffc3076e502a Mon Sep 17 00:00:00 2001 From: NekoInverter <42698724+NekoInverter@users.noreply.github.com> Date: Sat, 21 Nov 2020 15:42:11 +0800 Subject: [PATCH] Use LinearDividerItemDecoration instead of DividerItemDecoration --- .../hippo/ehviewer/ui/scene/DownloadsScene.java | 8 +++++++- .../hippo/ehviewer/ui/scene/FavoritesScene.java | 8 +++++++- .../ehviewer/ui/scene/GalleryListScene.java | 8 +++++++- .../com/hippo/ehviewer/widget/SearchBar.java | 16 +--------------- app/src/main/res/layout/item_drawer_list.xml | 4 +++- app/src/main/res/layout/widget_search_bar.xml | 6 ------ 6 files changed, 25 insertions(+), 25 deletions(-) diff --git a/app/src/main/java/com/hippo/ehviewer/ui/scene/DownloadsScene.java b/app/src/main/java/com/hippo/ehviewer/ui/scene/DownloadsScene.java index 2a9c90734..4c77e7b78 100644 --- a/app/src/main/java/com/hippo/ehviewer/ui/scene/DownloadsScene.java +++ b/app/src/main/java/com/hippo/ehviewer/ui/scene/DownloadsScene.java @@ -75,6 +75,7 @@ import com.hippo.drawable.DrawerArrowDrawable; import com.hippo.easyrecyclerview.EasyRecyclerView; import com.hippo.easyrecyclerview.FastScroller; import com.hippo.easyrecyclerview.HandlerDrawable; +import com.hippo.easyrecyclerview.LinearDividerItemDecoration; import com.hippo.easyrecyclerview.MarginItemDecoration; import com.hippo.ehviewer.EhApplication; import com.hippo.ehviewer.EhDB; @@ -654,7 +655,12 @@ public class DownloadsScene extends ToolbarScene mLabelAdapter = new DownloadLabelAdapter(inflater); final EasyRecyclerView recyclerView = view.findViewById(R.id.recycler_view_drawer); recyclerView.setLayoutManager(new LinearLayoutManager(context)); - recyclerView.addItemDecoration(new DividerItemDecoration(context, DividerItemDecoration.VERTICAL)); + LinearDividerItemDecoration decoration = new LinearDividerItemDecoration( + LinearDividerItemDecoration.VERTICAL, + AttrResources.getAttrColor(context, R.attr.dividerColor), + LayoutUtils.dp2pix(context, 1)); + decoration.setShowLastDivider(true); + recyclerView.addItemDecoration(decoration); mLabelAdapter.setHasStableIds(true); final GeneralItemAnimator animator = new DraggableItemAnimator(); recyclerView.setItemAnimator(animator); 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 0eeb257d4..8fc35c426 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 @@ -54,6 +54,7 @@ import com.hippo.drawable.AddDeleteDrawable; import com.hippo.drawable.DrawerArrowDrawable; import com.hippo.easyrecyclerview.EasyRecyclerView; import com.hippo.easyrecyclerview.FastScroller; +import com.hippo.easyrecyclerview.LinearDividerItemDecoration; import com.hippo.ehviewer.EhApplication; import com.hippo.ehviewer.EhDB; import com.hippo.ehviewer.R; @@ -442,7 +443,12 @@ public class FavoritesScene extends BaseScene implements EasyRecyclerView recyclerView = view.findViewById(R.id.recycler_view_drawer); recyclerView.setLayoutManager(new LinearLayoutManager(context)); - recyclerView.addItemDecoration(new DividerItemDecoration(context, DividerItemDecoration.VERTICAL)); + LinearDividerItemDecoration decoration = new LinearDividerItemDecoration( + LinearDividerItemDecoration.VERTICAL, + AttrResources.getAttrColor(context, R.attr.dividerColor), + LayoutUtils.dp2pix(context, 1)); + decoration.setShowLastDivider(true); + recyclerView.addItemDecoration(decoration); mDrawerAdapter = new FavDrawerAdapter(inflater); recyclerView.setAdapter(mDrawerAdapter); 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 3c8dca2ed..d2f04f722 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 @@ -69,6 +69,7 @@ import com.hippo.drawable.AddDeleteDrawable; import com.hippo.drawable.DrawerArrowDrawable; import com.hippo.easyrecyclerview.EasyRecyclerView; import com.hippo.easyrecyclerview.FastScroller; +import com.hippo.easyrecyclerview.LinearDividerItemDecoration; import com.hippo.ehviewer.EhApplication; import com.hippo.ehviewer.EhDB; import com.hippo.ehviewer.FavouriteStatusRouter; @@ -778,7 +779,12 @@ public final class GalleryListScene extends BaseScene final EasyRecyclerView recyclerView = view.findViewById(R.id.recycler_view_drawer); recyclerView.setLayoutManager(new LinearLayoutManager(context)); - recyclerView.addItemDecoration(new DividerItemDecoration(context, DividerItemDecoration.VERTICAL)); + LinearDividerItemDecoration decoration = new LinearDividerItemDecoration( + LinearDividerItemDecoration.VERTICAL, + AttrResources.getAttrColor(context, R.attr.dividerColor), + LayoutUtils.dp2pix(context, 1)); + decoration.setShowLastDivider(true); + recyclerView.addItemDecoration(decoration); final QsDrawerAdapter qsDrawerAdapter = new QsDrawerAdapter(inflater); qsDrawerAdapter.setHasStableIds(true); final GeneralItemAnimator animator = new DraggableItemAnimator(); diff --git a/app/src/main/java/com/hippo/ehviewer/widget/SearchBar.java b/app/src/main/java/com/hippo/ehviewer/widget/SearchBar.java index e0483cdbd..83555ca21 100644 --- a/app/src/main/java/com/hippo/ehviewer/widget/SearchBar.java +++ b/app/src/main/java/com/hippo/ehviewer/widget/SearchBar.java @@ -83,7 +83,6 @@ public class SearchBar extends MaterialCardView implements View.OnClickListener, private SearchEditText mEditText; private EasyRecyclerView mListView; private View mListContainer; - private View mListHeader; private ViewTransition mViewTransition; @@ -125,7 +124,6 @@ public class SearchBar extends MaterialCardView implements View.OnClickListener, mEditText = (SearchEditText) ViewUtils.$$(this, R.id.search_edit_text); mListContainer = ViewUtils.$$(this, R.id.list_container); mListView = (EasyRecyclerView) ViewUtils.$$(mListContainer, R.id.search_bar_list); - mListHeader = ViewUtils.$$(mListContainer, R.id.list_header); mViewTransition = new ViewTransition(mTitleTextView, mEditText); @@ -148,19 +146,12 @@ public class SearchBar extends MaterialCardView implements View.OnClickListener, LinearDividerItemDecoration.VERTICAL, AttrResources.getAttrColor(context, R.attr.dividerColor), LayoutUtils.dp2pix(context, 1)); + decoration.setShowFirstDivider(true); decoration.setShowLastDivider(false); mListView.addItemDecoration(decoration); mListView.setLayoutManager(layoutManager); } - private void addListHeader() { - mListHeader.setVisibility(VISIBLE); - } - - private void removeListHeader() { - mListHeader.setVisibility(GONE); - } - private void updateSuggestions() { updateSuggestions(true); } @@ -196,11 +187,6 @@ public class SearchBar extends MaterialCardView implements View.OnClickListener, } } - if (mSuggestionList.size() == 0) { - removeListHeader(); - } else { - addListHeader(); - } mSuggestionAdapter.notifyDataSetChanged(); if (scrollToTop) { diff --git a/app/src/main/res/layout/item_drawer_list.xml b/app/src/main/res/layout/item_drawer_list.xml index 9d67e6873..63124e7ff 100644 --- a/app/src/main/res/layout/item_drawer_list.xml +++ b/app/src/main/res/layout/item_drawer_list.xml @@ -20,10 +20,12 @@ \ No newline at end of file diff --git a/app/src/main/res/layout/widget_search_bar.xml b/app/src/main/res/layout/widget_search_bar.xml index 9ed29ac33..2969e9d32 100644 --- a/app/src/main/res/layout/widget_search_bar.xml +++ b/app/src/main/res/layout/widget_search_bar.xml @@ -80,12 +80,6 @@ android:orientation="vertical" android:visibility="gone"> - -