diff --git a/app/src/main/java/com/hippo/ehviewer/client/data/ListUrlBuilder.kt b/app/src/main/java/com/hippo/ehviewer/client/data/ListUrlBuilder.kt index 8c5a29475..16109c167 100644 --- a/app/src/main/java/com/hippo/ehviewer/client/data/ListUrlBuilder.kt +++ b/app/src/main/java/com/hippo/ehviewer/client/data/ListUrlBuilder.kt @@ -355,8 +355,6 @@ open class ListUrlBuilder : Cloneable, Parcelable { } mJumpTo?.let { ub.addQuery("seek", it) - mPrev = null - mNext = null } mPrev?.let { ub.addQuery("prev", it) 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 c1c9b4492..7af273654 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 @@ -568,7 +568,7 @@ public class FavoritesScene extends SearchBarScene implements .setSelection(toDate) .build(); datePicker.show(requireActivity().getSupportFragmentManager(), "date-picker"); - datePicker.addOnPositiveButtonClickListener(v -> mHelper.goTo(v)); + datePicker.addOnPositiveButtonClickListener(v -> mHelper.goTo(v, true)); } @Override 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 65db751e1..5fcd1767e 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 @@ -896,7 +896,7 @@ public final class GalleryListScene extends SearchBarScene .setSelection(toDate) .build(); datePicker.show(requireActivity().getSupportFragmentManager(), "date-picker"); - datePicker.addOnPositiveButtonClickListener(v -> mHelper.goTo(v)); + datePicker.addOnPositiveButtonClickListener(v -> mHelper.goTo(v, true)); } } diff --git a/app/src/main/java/com/hippo/ehviewer/widget/GalleryInfoContentHelper.kt b/app/src/main/java/com/hippo/ehviewer/widget/GalleryInfoContentHelper.kt index 77cf15669..f5881e83b 100644 --- a/app/src/main/java/com/hippo/ehviewer/widget/GalleryInfoContentHelper.kt +++ b/app/src/main/java/com/hippo/ehviewer/widget/GalleryInfoContentHelper.kt @@ -91,11 +91,15 @@ abstract class GalleryInfoContentHelper : ContentHelper() { return super.restoreInstanceState(state) } - fun goTo(time: Long) { + fun goTo(time: Long, isNext: Boolean) { val formatter = DateTimeFormatter .ofPattern("yyyy-MM-dd", Locale.US).withZone(ZoneOffset.UTC) jumpTo = formatter.format(Instant.ofEpochMilli(time)) - goTo(null, true) + if (isNext) { + goTo(mNext ?: "2", true) + } else { + goTo(mPrev, false) + } jumpTo = null } diff --git a/app/src/main/java/com/hippo/widget/ContentLayout.java b/app/src/main/java/com/hippo/widget/ContentLayout.java index 573490b2b..475ff12b8 100644 --- a/app/src/main/java/com/hippo/widget/ContentLayout.java +++ b/app/src/main/java/com/hippo/widget/ContentLayout.java @@ -227,8 +227,8 @@ public class ContentLayout extends FrameLayout { */ private int mPages; private int mNextPage; - private String mPrev; - private String mNext; + protected String mPrev; + protected String mNext; private int mCurrentTaskId; private int mCurrentTaskType; private int mCurrentTaskPage;