jenkins-bot has submitted this change and it was merged.
Change subject: Put News card at the top.
......................................................................
Put News card at the top.
It looks like explicitly setting setNestedScrollingEnabled to false seems to
solve
the weird scrolling issue I mentioned earlier.
Change-Id: Ibfd2c383af44311e5a318bd2bde140a5b98fbd26
---
M
app/src/main/java/org/wikipedia/feed/aggregated/AggregatedFeedContentClient.java
M app/src/main/java/org/wikipedia/feed/view/HorizontalScrollingListCardView.java
2 files changed, 4 insertions(+), 3 deletions(-)
Approvals:
Niedzielski: Looks good to me, approved
jenkins-bot: Verified
diff --git
a/app/src/main/java/org/wikipedia/feed/aggregated/AggregatedFeedContentClient.java
b/app/src/main/java/org/wikipedia/feed/aggregated/AggregatedFeedContentClient.java
index f80d1ab..e2ac3cd 100644
---
a/app/src/main/java/org/wikipedia/feed/aggregated/AggregatedFeedContentClient.java
+++
b/app/src/main/java/org/wikipedia/feed/aggregated/AggregatedFeedContentClient.java
@@ -86,13 +86,13 @@
UtcDate date = DateUtil.getUtcRequestDateFor(age);
List<Card> cards = new ArrayList<>();
AggregatedFeedContent content = response.body();
- if (content.tfa() != null) {
- cards.add(new FeaturedArticleCard(content.tfa(), date,
site));
- }
// todo: remove age check when news endpoint provides dated
content, T139481.
if (age == 0 && content.news() != null) {
cards.add(new NewsListCard(content.news(), date, site));
}
+ if (content.tfa() != null) {
+ cards.add(new FeaturedArticleCard(content.tfa(), date,
site));
+ }
if (content.mostRead() != null) {
cards.add(new MostReadListCard(content.mostRead(), site));
}
diff --git
a/app/src/main/java/org/wikipedia/feed/view/HorizontalScrollingListCardView.java
b/app/src/main/java/org/wikipedia/feed/view/HorizontalScrollingListCardView.java
index 65b14cc..965d23a 100644
---
a/app/src/main/java/org/wikipedia/feed/view/HorizontalScrollingListCardView.java
+++
b/app/src/main/java/org/wikipedia/feed/view/HorizontalScrollingListCardView.java
@@ -80,6 +80,7 @@
R.dimen.view_horizontal_scrolling_list_card_item_margin_horizontal,
R.dimen.view_horizontal_scrolling_list_card_item_margin_vertical));
recyclerView.addOnItemTouchListener(new DontInterceptTouchListener());
+ recyclerView.setNestedScrollingEnabled(false);
}
protected abstract static class RecyclerAdapter<T>
--
To view, visit https://gerrit.wikimedia.org/r/299192
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ibfd2c383af44311e5a318bd2bde140a5b98fbd26
Gerrit-PatchSet: 2
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Dbrant <[email protected]>
Gerrit-Reviewer: BearND <[email protected]>
Gerrit-Reviewer: Brion VIBBER <[email protected]>
Gerrit-Reviewer: Mholloway <[email protected]>
Gerrit-Reviewer: Niedzielski <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
