summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorByteHamster <ByteHamster@users.noreply.github.com>2022-05-15 18:18:09 +0200
committerGitHub <noreply@github.com>2022-05-15 18:18:09 +0200
commite63c8f81252a35a589cb730cf74641a3d9cfa345 (patch)
tree1659a44ecdf3fcf24e7c9a69f005977af4b3d3fd
parentee3b59de9027d4de195e928c6195bb675bb58749 (diff)
parent0510539e29345152df8b9fe4b9c45f6680032a44 (diff)
downloadAntennaPod-e63c8f81252a35a589cb730cf74641a3d9cfa345.zip
Merge pull request #5891 from ByteHamster/fix-load-next-page
Fix 'load more' not detecting next page
-rw-r--r--app/src/main/java/de/danoeh/antennapod/fragment/FeedItemlistFragment.java7
-rw-r--r--core/src/main/java/de/danoeh/antennapod/core/service/download/DownloadRequest.java3
2 files changed, 7 insertions, 3 deletions
diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/FeedItemlistFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/FeedItemlistFragment.java
index bb20cb4bc..fa2ed61ce 100644
--- a/app/src/main/java/de/danoeh/antennapod/fragment/FeedItemlistFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/fragment/FeedItemlistFragment.java
@@ -163,8 +163,11 @@ public class FeedItemlistFragment extends Fragment implements AdapterView.OnItem
public void onScrolled(@NonNull RecyclerView view, int deltaX, int deltaY) {
super.onScrolled(view, deltaX, deltaY);
boolean hasMorePages = feed != null && feed.isPaged() && feed.getNextPageLink() != null;
- nextPageLoader.getRoot().setVisibility(
- (viewBinding.recyclerView.isScrolledToBottom() && hasMorePages) ? View.VISIBLE : View.GONE);
+ boolean pageLoaderVisible = viewBinding.recyclerView.isScrolledToBottom() && hasMorePages;
+ nextPageLoader.getRoot().setVisibility(pageLoaderVisible ? View.VISIBLE : View.GONE);
+ viewBinding.recyclerView.setPadding(
+ viewBinding.recyclerView.getPaddingLeft(), 0, viewBinding.recyclerView.getPaddingRight(),
+ pageLoaderVisible ? nextPageLoader.getRoot().getMeasuredHeight() : 0);
}
});
diff --git a/core/src/main/java/de/danoeh/antennapod/core/service/download/DownloadRequest.java b/core/src/main/java/de/danoeh/antennapod/core/service/download/DownloadRequest.java
index fc708ef6a..c085bc007 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/service/download/DownloadRequest.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/service/download/DownloadRequest.java
@@ -271,7 +271,7 @@ public class DownloadRequest implements Parcelable {
private boolean deleteOnFailure = false;
private final long feedfileId;
private final int feedfileType;
- private Bundle arguments = new Bundle();
+ private final Bundle arguments = new Bundle();
private boolean initiatedByUser = true;
public Builder(@NonNull String destination, @NonNull FeedMedia media) {
@@ -288,6 +288,7 @@ public class DownloadRequest implements Parcelable {
this.title = feed.getHumanReadableIdentifier();
this.feedfileId = feed.getId();
this.feedfileType = feed.getTypeAsInt();
+ arguments.putInt(REQUEST_ARG_PAGE_NR, feed.getPageNr());
}
public Builder withInitiatedByUser(boolean initiatedByUser) {