From 1ebe0a79b3cb0c65cbdede83d995dca7ca215aaa Mon Sep 17 00:00:00 2001 From: NekoInverter <42698724+NekoInverter@users.noreply.github.com> Date: Thu, 19 Nov 2020 12:43:55 +0800 Subject: [PATCH] Update refresh layout --- app/build.gradle | 2 +- .../com/hippo/ehviewer/ui/scene/FavoritesScene.java | 3 +-- .../hippo/ehviewer/ui/scene/GalleryListScene.java | 6 ++---- .../main/java/com/hippo/widget/ContentLayout.java | 13 ++++--------- 4 files changed, 8 insertions(+), 16 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 10c604bd3..e28121832 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -94,7 +94,6 @@ dependencies { implementation 'com.github.seven332:glview:0.1.0' implementation 'com.github.seven332:glview-image:0.1.0' implementation 'com.github.seven332:hotspot:0.1.0' - implementation 'com.github.seven332:refreshlayout:0.1.0' implementation 'com.github.seven332:streampipe:0.1.0' implementation 'com.github.seven332:tuxiang:0.1.6' implementation 'com.github.seven332:unifile:9ec57bcd8f' @@ -112,6 +111,7 @@ dependencies { implementation 'com.github.NekoInverter:DrawerLayout:6ba992f8d4' implementation 'com.github.NekoInverter:Image:8fd6c1e1df' implementation 'com.github.NekoInverter.preferencex-android:preferencex-simplemenu:88f93154b2' + implementation 'com.github.NekoInverter:RefreshLayout:7241e04739' implementation 'fadeapp.widgets:scrollless-recyclerView:1.0.2' implementation 'org.ccil.cowan.tagsoup:tagsoup:1.2.1' implementation 'org.greenrobot:greendao:2.2.1' 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 82a614a87..e458ad7d8 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 @@ -266,6 +266,7 @@ public class FavoritesScene extends BaseScene implements mHelper.setEmptyString(resources.getString(R.string.gallery_list_empty_hit)); contentLayout.setHelper(mHelper); contentLayout.getFastScroller().setOnDragHandlerListener(this); + contentLayout.setFitPaddingTop(paddingTopSB); mAdapter = new FavoritesAdapter(inflater, resources, mRecyclerView, Settings.getListMode()); //mRecyclerView.setSelector(Ripple.generateRippleDrawable(context, !AttrResources.getAttrBoolean(context, R.attr.isLightTheme), new ColorDrawable(Color.TRANSPARENT))); @@ -280,8 +281,6 @@ public class FavoritesScene extends BaseScene implements fastScroller.setPadding(fastScroller.getPaddingLeft(), fastScroller.getPaddingTop() + paddingTopSB, fastScroller.getPaddingRight(), fastScroller.getPaddingBottom()); - refreshLayout.setHeaderTranslationY(paddingTopSB); - mLeftDrawable = new DrawerArrowDrawable(context, AttrResources.getAttrColor(context, R.attr.drawableColorPrimary)); mSearchBar.setLeftDrawable(mLeftDrawable); mSearchBar.setRightDrawable(DrawableManager.getVectorDrawable(context, R.drawable.v_magnify_x24)); 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 1ae56a48c..630730747 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 @@ -550,7 +550,6 @@ public final class GalleryListScene extends BaseScene ContentLayout contentLayout = (ContentLayout) ViewUtils.$$(mainLayout, R.id.content_layout); mRecyclerView = contentLayout.getRecyclerView(); FastScroller fastScroller = contentLayout.getFastScroller(); - RefreshLayout refreshLayout = contentLayout.getRefreshLayout(); mSearchLayout = (SearchLayout) ViewUtils.$$(mainLayout, R.id.search_layout); mSearchBar = (SearchBar) ViewUtils.$$(mainLayout, R.id.search_bar); mFabLayout = (FabLayout) ViewUtils.$$(mainLayout, R.id.fab_layout); @@ -564,6 +563,7 @@ public final class GalleryListScene extends BaseScene mHelper = new GalleryListHelper(); contentLayout.setHelper(mHelper); contentLayout.getFastScroller().setOnDragHandlerListener(this); + contentLayout.setFitPaddingTop(paddingTopSB); mAdapter = new GalleryListAdapter(inflater, resources, mRecyclerView, Settings.getListMode()); @@ -574,8 +574,6 @@ public final class GalleryListScene extends BaseScene fastScroller.setPadding(fastScroller.getPaddingLeft(), fastScroller.getPaddingTop() + paddingTopSB, fastScroller.getPaddingRight(), fastScroller.getPaddingBottom()); - refreshLayout.setHeaderTranslationY(paddingTopSB); - mLeftDrawable = new DrawerArrowDrawable(context, AttrResources.getAttrColor(context, R.attr.drawableColorPrimary)); mRightDrawable = new AddDeleteDrawable(context, AttrResources.getAttrColor(context, R.attr.drawableColorPrimary)); mSearchBar.setLeftDrawable(mLeftDrawable); @@ -785,7 +783,7 @@ public final class GalleryListScene extends BaseScene final QsDrawerAdapter qsDrawerAdapter = new QsDrawerAdapter(inflater); qsDrawerAdapter.setHasStableIds(true); final GeneralItemAnimator animator = new DraggableItemAnimator(); - mRecyclerView.setItemAnimator(animator); + recyclerView.setItemAnimator(animator); recyclerView.setAdapter(dragDropManager.createWrappedAdapter(qsDrawerAdapter)); dragDropManager.attachRecyclerView(recyclerView); mQuickSearchList = EhDB.getAllQuickSearch(); diff --git a/app/src/main/java/com/hippo/widget/ContentLayout.java b/app/src/main/java/com/hippo/widget/ContentLayout.java index b9134fcdd..f11f3bfbe 100644 --- a/app/src/main/java/com/hippo/widget/ContentLayout.java +++ b/app/src/main/java/com/hippo/widget/ContentLayout.java @@ -63,7 +63,7 @@ public class ContentLayout extends FrameLayout { private EasyRecyclerView mRecyclerView; private FastScroller mFastScroller; - private ContentHelper mContentHelper; + private ContentHelper mContentHelper; private int mRecyclerViewOriginTop; private int mRecyclerViewOriginBottom; @@ -129,7 +129,7 @@ public class ContentLayout extends FrameLayout { return mRefreshLayout; } - public void setHelper(ContentHelper helper) { + public void setHelper(ContentHelper helper) { mContentHelper = helper; helper.init(this); } @@ -148,7 +148,7 @@ public class ContentLayout extends FrameLayout { // RecyclerView mRecyclerView.setPadding(mRecyclerView.getPaddingLeft(), mRecyclerViewOriginTop + fitPaddingTop, mRecyclerView.getPaddingRight(), mRecyclerView.getPaddingBottom()); // RefreshLayout - mRefreshLayout.setProgressViewOffset(false, fitPaddingTop, fitPaddingTop + LayoutUtils.dp2pix(getContext(), 32)); // TODO + mRefreshLayout.setHeaderProgressViewOffset(true, 0, fitPaddingTop + LayoutUtils.dp2pix(getContext(), 32)); // TODO } public void setFitPaddingBottom(int fitPaddingBottom) { @@ -310,12 +310,7 @@ public class ContentLayout extends FrameLayout { mRecyclerView.addOnScrollListener(mOnScrollListener); mRefreshLayout.setOnRefreshListener(mOnRefreshListener); - mTipView.setOnClickListener(new OnClickListener() { - @Override - public void onClick(View v) { - refresh(); - } - }); + mTipView.setOnClickListener(v -> refresh()); } /**