fixup! Refactor getPageData

This commit is contained in:
FooIbar authored and tarsin committed 2022-12-29 20:28:16 +08:00
1 parent d8ccec45f9
commit a168c95d79
5 files changed
+10 -8

No files matched your search

@@ -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)
@@ -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
@@ -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));
}
}
@@ -91,11 +91,15 @@ abstract class GalleryInfoContentHelper : ContentHelper<GalleryInfo?>() {
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
}
@@ -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;