Dbrant has uploaded a new change for review.
https://gerrit.wikimedia.org/r/299192
Change subject: [WIP] Put News card at the top.
......................................................................
[WIP] Put News card at the top.
working out some kinks...
Change-Id: Ibfd2c383af44311e5a318bd2bde140a5b98fbd26
---
M
app/src/main/java/org/wikipedia/feed/aggregated/AggregatedFeedContentClient.java
M app/src/main/java/org/wikipedia/feed/news/NewsListCardView.java
M app/src/main/java/org/wikipedia/feed/view/HorizontalScrollingListCardView.java
3 files changed, 5 insertions(+), 6 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia
refs/changes/92/299192/1
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/news/NewsListCardView.java
b/app/src/main/java/org/wikipedia/feed/news/NewsListCardView.java
index d3e82e1..979cc6b 100644
--- a/app/src/main/java/org/wikipedia/feed/news/NewsListCardView.java
+++ b/app/src/main/java/org/wikipedia/feed/news/NewsListCardView.java
@@ -16,8 +16,7 @@
import java.util.List;
-public class NewsListCardView extends HorizontalScrollingListCardView
- implements ItemTouchHelperSwipeAdapter.SwipeableView {
+public class NewsListCardView extends HorizontalScrollingListCardView {
public NewsListCardView(@NonNull Context context) {
super(context);
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..fde47cb 100644
---
a/app/src/main/java/org/wikipedia/feed/view/HorizontalScrollingListCardView.java
+++
b/app/src/main/java/org/wikipedia/feed/view/HorizontalScrollingListCardView.java
@@ -79,7 +79,7 @@
R.dimen.view_horizontal_scrolling_list_card_item_margin_vertical,
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: newchange
Gerrit-Change-Id: Ibfd2c383af44311e5a318bd2bde140a5b98fbd26
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Dbrant <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
