diff --git a/app/build.gradle b/app/build.gradle index 85fba90ec..3cc3eefad 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -131,7 +131,6 @@ dependencies { implementation 'dev.rikka.rikkax.insets:insets:1.2.0' implementation 'dev.rikka.rikkax.layoutinflater:layoutinflater:1.2.0' implementation 'dev.rikka.rikkax.material:material:2.4.0' - implementation 'dev.rikka.rikkax.recyclerview:recyclerview-ktx:1.3.1' implementation 'dev.rikka.rikkax.preference:simplemenu-preference:1.0.3' implementation 'org.ccil.cowan.tagsoup:tagsoup:1.2.1' implementation 'org.greenrobot:greendao:3.3.0' diff --git a/app/src/main/java/com/hippo/ehviewer/ui/fragment/BasePreferenceFragment.java b/app/src/main/java/com/hippo/ehviewer/ui/fragment/BasePreferenceFragment.java index fc77fc22c..29862158e 100644 --- a/app/src/main/java/com/hippo/ehviewer/ui/fragment/BasePreferenceFragment.java +++ b/app/src/main/java/com/hippo/ehviewer/ui/fragment/BasePreferenceFragment.java @@ -12,7 +12,6 @@ import androidx.recyclerview.widget.RecyclerView; import com.hippo.ehviewer.ui.SettingsActivity; import com.takisoft.preferencex.PreferenceFragmentCompat; -import rikka.recyclerview.RecyclerViewKt; public class BasePreferenceFragment extends PreferenceFragmentCompat implements Preference.OnPreferenceClickListener, Preference.OnPreferenceChangeListener { @@ -53,11 +52,4 @@ public class BasePreferenceFragment extends PreferenceFragmentCompat public void showTip(CharSequence message, int length) { ((SettingsActivity) requireActivity()).showTip(message, length); } - - @Override - public RecyclerView onCreateRecyclerView(LayoutInflater inflater, ViewGroup parent, Bundle savedInstanceState) { - RecyclerView recyclerView = super.onCreateRecyclerView(inflater, parent, savedInstanceState); - RecyclerViewKt.fixEdgeEffect(recyclerView, false, true); - return recyclerView; - } } 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 614eea23a..c483fabc3 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 @@ -114,7 +114,6 @@ import java.util.LinkedList; import java.util.List; import rikka.core.res.ResourcesKt; -import rikka.recyclerview.RecyclerViewKt; @SuppressLint("RtlHardcoded") public class DownloadsScene extends ToolbarScene @@ -378,8 +377,6 @@ public class DownloadsScene extends ToolbarScene mRecyclerView.scrollToPosition(mInitPosition); mInitPosition = -1; } - RecyclerViewKt.addEdgeSpacing(mRecyclerView, 4, 4, 4, 4, TypedValue.COMPLEX_UNIT_DIP); - RecyclerViewKt.fixEdgeEffect(mRecyclerView, false, true); mFastScroller.attachToRecyclerView(mRecyclerView); HandlerDrawable handlerDrawable = new HandlerDrawable(); diff --git a/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryCommentsScene.java b/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryCommentsScene.java index c5af49510..9cf756af7 100644 --- a/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryCommentsScene.java +++ b/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryCommentsScene.java @@ -94,7 +94,6 @@ import java.util.ArrayList; import java.util.List; import rikka.core.res.ResourcesKt; -import rikka.recyclerview.RecyclerViewKt; public final class GalleryCommentsScene extends ToolbarScene implements View.OnClickListener, SwipeRefreshLayout.OnRefreshListener { @@ -176,7 +175,6 @@ public final class GalleryCommentsScene extends ToolbarScene @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) { View view = inflater.inflate(R.layout.scene_gallery_comments, container, false); mRecyclerView = (EasyRecyclerView) ViewUtils.$$(view, R.id.recycler_view); - RecyclerViewKt.fixEdgeEffect(mRecyclerView, false, true); TextView tip = (TextView) ViewUtils.$$(view, R.id.tip); mEditPanel = ViewUtils.$$(view, R.id.edit_panel); mSendImage = (ImageView) ViewUtils.$$(mEditPanel, R.id.send); @@ -223,7 +221,6 @@ public final class GalleryCommentsScene extends ToolbarScene if (itemAnimator instanceof DefaultItemAnimator) { ((DefaultItemAnimator) itemAnimator).setSupportsChangeAnimations(false); } - RecyclerViewKt.addEdgeSpacing(mRecyclerView, 0, 0, 0, 80, TypedValue.COMPLEX_UNIT_DIP); mSendImage.setOnClickListener(this); mFab.setOnClickListener(this); diff --git a/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryInfoScene.java b/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryInfoScene.java index 0b7d552ad..57e8ecc31 100644 --- a/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryInfoScene.java +++ b/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryInfoScene.java @@ -44,7 +44,6 @@ import com.hippo.yorozuya.ViewUtils; import java.util.ArrayList; import rikka.core.res.ResourcesKt; -import rikka.recyclerview.RecyclerViewKt; public final class GalleryInfoScene extends ToolbarScene { @@ -174,7 +173,6 @@ public final class GalleryInfoScene extends ToolbarScene { mRecyclerView.addItemDecoration(decoration); mRecyclerView.setClipToPadding(false); mRecyclerView.setHasFixedSize(true); - RecyclerViewKt.fixEdgeEffect(mRecyclerView, false, true); return view; } diff --git a/app/src/main/java/com/hippo/ehviewer/ui/scene/HistoryScene.java b/app/src/main/java/com/hippo/ehviewer/ui/scene/HistoryScene.java index ee8045bf5..6aa259d53 100644 --- a/app/src/main/java/com/hippo/ehviewer/ui/scene/HistoryScene.java +++ b/app/src/main/java/com/hippo/ehviewer/ui/scene/HistoryScene.java @@ -86,8 +86,6 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; -import rikka.recyclerview.RecyclerViewKt; - public class HistoryScene extends ToolbarScene { /*--------------- @@ -232,8 +230,6 @@ public class HistoryScene extends ToolbarScene { mRecyclerView.addItemDecoration(decoration); guardManager.attachRecyclerView(mRecyclerView); swipeManager.attachRecyclerView(mRecyclerView); - RecyclerViewKt.fixEdgeEffect(mRecyclerView, false, true); - RecyclerViewKt.addEdgeSpacing(mRecyclerView, 4, 4, 4, 4, TypedValue.COMPLEX_UNIT_DIP); mFastScroller.attachToRecyclerView(mRecyclerView); HandlerDrawable handlerDrawable = new HandlerDrawable(); diff --git a/app/src/main/java/com/hippo/widget/ContentLayout.java b/app/src/main/java/com/hippo/widget/ContentLayout.java index cb14f928b..d047a482f 100644 --- a/app/src/main/java/com/hippo/widget/ContentLayout.java +++ b/app/src/main/java/com/hippo/widget/ContentLayout.java @@ -56,8 +56,6 @@ import java.util.Collections; import java.util.Iterator; import java.util.List; -import rikka.recyclerview.RecyclerViewKt; - public class ContentLayout extends FrameLayout { private CircularProgressIndicator mProgressView; @@ -124,9 +122,6 @@ public class ContentLayout extends FrameLayout { resources.getColor(R.color.loading_indicator_orange)); mBottomProgress.setIndeterminateAnimationType(LinearProgressIndicator.INDETERMINATE_ANIMATION_TYPE_CONTIGUOUS); - RecyclerViewKt.addEdgeSpacing(mRecyclerView, 4, 4, 4, 4, TypedValue.COMPLEX_UNIT_DIP); - RecyclerViewKt.fixEdgeEffect(mRecyclerView, false, true); - mRecyclerViewOriginBottom = mRecyclerView.getPaddingBottom(); mFastScrollerOriginBottom = mFastScroller.getPaddingBottom(); }