From 14d1f2f8b4f9fa3f9bcae8d482d830b097363994 Mon Sep 17 00:00:00 2001 From: tehcneko <7741672-NekoInverter@users.noreply.gitlab.com> Date: Sat, 15 Jan 2022 13:17:32 +0800 Subject: [PATCH] Replace addVerticalPadding with addEdgeSpacing --- .../main/java/com/hippo/ehviewer/ui/scene/DownloadsScene.java | 3 ++- .../main/java/com/hippo/ehviewer/ui/scene/FavoritesScene.java | 2 ++ .../java/com/hippo/ehviewer/ui/scene/GalleryCommentsScene.java | 3 ++- .../main/java/com/hippo/ehviewer/ui/scene/HistoryScene.java | 3 ++- app/src/main/java/com/hippo/widget/ContentLayout.java | 3 ++- app/src/main/res/layout/item_download.xml | 3 +-- app/src/main/res/layout/item_gallery_grid.xml | 3 +-- app/src/main/res/layout/item_gallery_list.xml | 3 +-- 8 files changed, 13 insertions(+), 10 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 38c1828f5..940c27354 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 @@ -30,6 +30,7 @@ import android.os.Bundle; import android.text.TextUtils; import android.util.Log; import android.util.SparseBooleanArray; +import android.util.TypedValue; import android.view.Display; import android.view.Gravity; import android.view.LayoutInflater; @@ -376,7 +377,7 @@ public class DownloadsScene extends ToolbarScene mRecyclerView.scrollToPosition(mInitPosition); mInitPosition = -1; } - RecyclerViewKt.addVerticalPadding(mRecyclerView, 4, 4); + RecyclerViewKt.addEdgeSpacing(mRecyclerView, 4,4,4,4, TypedValue.COMPLEX_UNIT_DIP); RecyclerViewKt.fixEdgeEffect(mRecyclerView, false, true); mFastScroller.attachToRecyclerView(mRecyclerView); 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 f7cee84da..82626b544 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 @@ -27,6 +27,7 @@ import android.os.Bundle; import android.text.InputType; import android.text.TextUtils; import android.util.SparseBooleanArray; +import android.util.TypedValue; import android.view.Display; import android.view.Gravity; import android.view.LayoutInflater; @@ -89,6 +90,7 @@ import java.util.Collections; import java.util.List; import rikka.core.res.ResourcesKt; +import rikka.recyclerview.RecyclerViewKt; // TODO Get favorite, modify favorite, add favorite, what a mess! @SuppressLint("RtlHardcoded") 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 bec6f289d..3e2d3cf7e 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 @@ -34,6 +34,7 @@ import android.text.style.RelativeSizeSpan; import android.text.style.StyleSpan; import android.text.style.URLSpan; import android.util.Log; +import android.util.TypedValue; import android.view.LayoutInflater; import android.view.View; import android.view.ViewAnimationUtils; @@ -222,7 +223,7 @@ public final class GalleryCommentsScene extends ToolbarScene if (itemAnimator instanceof DefaultItemAnimator) { ((DefaultItemAnimator) itemAnimator).setSupportsChangeAnimations(false); } - RecyclerViewKt.addVerticalPadding(mRecyclerView, 0, 80); + 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/HistoryScene.java b/app/src/main/java/com/hippo/ehviewer/ui/scene/HistoryScene.java index 186428ad9..614773c38 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 @@ -24,6 +24,7 @@ import android.content.res.Resources; import android.graphics.drawable.Drawable; import android.os.Bundle; import android.text.TextUtils; +import android.util.TypedValue; import android.view.Gravity; import android.view.LayoutInflater; import android.view.MenuItem; @@ -233,7 +234,7 @@ public class HistoryScene extends ToolbarScene { guardManager.attachRecyclerView(mRecyclerView); swipeManager.attachRecyclerView(mRecyclerView); RecyclerViewKt.fixEdgeEffect(mRecyclerView, false, true); - RecyclerViewKt.addVerticalPadding(mRecyclerView, 4, 4); + 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 a477a215c..6ed503622 100644 --- a/app/src/main/java/com/hippo/widget/ContentLayout.java +++ b/app/src/main/java/com/hippo/widget/ContentLayout.java @@ -24,6 +24,7 @@ import android.os.Bundle; import android.os.Parcelable; import android.util.AttributeSet; import android.util.Log; +import android.util.TypedValue; import android.view.View; import android.view.ViewGroup; import android.widget.FrameLayout; @@ -124,7 +125,7 @@ public class ContentLayout extends FrameLayout { resources.getColor(R.color.loading_indicator_orange)); mBottomProgress.setIndeterminateAnimationType(LinearProgressIndicator.INDETERMINATE_ANIMATION_TYPE_CONTIGUOUS); - RecyclerViewKt.addVerticalPadding(mRecyclerView, 4, 4); + RecyclerViewKt.addEdgeSpacing(mRecyclerView, 4,4,4,4, TypedValue.COMPLEX_UNIT_DIP); RecyclerViewKt.fixEdgeEffect(mRecyclerView, false, true); mRecyclerViewOriginBottom = mRecyclerView.getPaddingBottom(); diff --git a/app/src/main/res/layout/item_download.xml b/app/src/main/res/layout/item_download.xml index 734693423..d65ac361a 100644 --- a/app/src/main/res/layout/item_download.xml +++ b/app/src/main/res/layout/item_download.xml @@ -19,8 +19,7 @@ style="@style/CardView.Reactive" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginVertical="2dp" - android:layout_marginHorizontal="6dp" + android:layout_margin="2dp" android:background="?selectableItemBackground" android:checkable="true" android:clickable="true" diff --git a/app/src/main/res/layout/item_gallery_grid.xml b/app/src/main/res/layout/item_gallery_grid.xml index c42cd15fe..d7da9e2e6 100644 --- a/app/src/main/res/layout/item_gallery_grid.xml +++ b/app/src/main/res/layout/item_gallery_grid.xml @@ -20,8 +20,7 @@ style="@style/CardView.Normal" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginVertical="2dp" - android:layout_marginHorizontal="6dp" + android:layout_margin="2dp" android:background="?selectableItemBackground" android:checkable="true" android:clickable="true" diff --git a/app/src/main/res/layout/item_gallery_list.xml b/app/src/main/res/layout/item_gallery_list.xml index e9c6348f7..6252217a3 100644 --- a/app/src/main/res/layout/item_gallery_list.xml +++ b/app/src/main/res/layout/item_gallery_list.xml @@ -19,8 +19,7 @@ style="@style/CardView.Reactive" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginVertical="2dp" - android:layout_marginHorizontal="6dp" + android:layout_margin="2dp" android:background="?selectableItemBackground" android:checkable="true" android:clickable="true"