[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: Hygiene: unify feed card interface
jenkins-bot has submitted this change and it was merged.
Change subject: Hygiene: unify feed card interface
..
Hygiene: unify feed card interface
Handle all feed cards in the same way. Also, use set/get prefixes to
avoid less obvious mistakes like calling super.card() instead of
super.card(Card) when overriding card(Card).
Change-Id: Icda23061f7d07b73cccebaa74fb7907f695d2786
---
M app/src/main/java/org/wikipedia/feed/FeedFragment.java
M
app/src/main/java/org/wikipedia/feed/becauseyouread/BecauseYouReadCardView.java
M
app/src/main/java/org/wikipedia/feed/continuereading/ContinueReadingCardView.java
M app/src/main/java/org/wikipedia/feed/featured/FeaturedArticleCardView.java
M app/src/main/java/org/wikipedia/feed/image/FeaturedImageCardView.java
M app/src/main/java/org/wikipedia/feed/mainpage/MainPageCardView.java
M app/src/main/java/org/wikipedia/feed/model/CardType.java
M app/src/main/java/org/wikipedia/feed/mostread/MostReadCardView.java
M app/src/main/java/org/wikipedia/feed/news/NewsListCardView.java
M app/src/main/java/org/wikipedia/feed/progress/ProgressCardView.java
M app/src/main/java/org/wikipedia/feed/random/RandomCardView.java
M app/src/main/java/org/wikipedia/feed/searchbar/SearchCardView.java
A app/src/main/java/org/wikipedia/feed/view/DefaultFeedCardView.java
M app/src/main/java/org/wikipedia/feed/view/FeedAdapter.java
M app/src/main/java/org/wikipedia/feed/view/FeedCardView.java
M app/src/main/java/org/wikipedia/feed/view/HorizontalScrollingListCardView.java
M app/src/main/java/org/wikipedia/feed/view/ListCardView.java
M app/src/main/java/org/wikipedia/feed/view/StaticCardView.java
18 files changed, 135 insertions(+), 153 deletions(-)
Approvals:
Mholloway: Looks good to me, but someone else must approve
Dbrant: Looks good to me, approved
jenkins-bot: Verified
diff --git a/app/src/main/java/org/wikipedia/feed/FeedFragment.java
b/app/src/main/java/org/wikipedia/feed/FeedFragment.java
index 83cedd1..57da467 100644
--- a/app/src/main/java/org/wikipedia/feed/FeedFragment.java
+++ b/app/src/main/java/org/wikipedia/feed/FeedFragment.java
@@ -94,7 +94,7 @@
View view = inflater.inflate(R.layout.fragment_feed, container, false);
unbinder = ButterKnife.bind(this, view);
-feedView.setAdapter(new FeedAdapter(coordinator, feedCallback));
+feedView.setAdapter(new FeedAdapter<>(coordinator, feedCallback));
feedView.callback(feedCallback);
feedView.addOnScrollListener(feedScrollListener);
diff --git
a/app/src/main/java/org/wikipedia/feed/becauseyouread/BecauseYouReadCardView.java
b/app/src/main/java/org/wikipedia/feed/becauseyouread/BecauseYouReadCardView.java
index 5d1ed1a..7bb7fce 100644
---
a/app/src/main/java/org/wikipedia/feed/becauseyouread/BecauseYouReadCardView.java
+++
b/app/src/main/java/org/wikipedia/feed/becauseyouread/BecauseYouReadCardView.java
@@ -19,14 +19,15 @@
import java.util.List;
-public class BecauseYouReadCardView extends ListCardView
+public class BecauseYouReadCardView extends ListCardView
implements ItemTouchHelperSwipeAdapter.SwipeableView {
public BecauseYouReadCardView(Context context) {
super(context);
}
-public void set(@NonNull final BecauseYouReadCard card) {
+@Override public void setCard(@NonNull BecauseYouReadCard card) {
+super.setCard(card);
header(card);
set(new RecyclerAdapter(card.items(), getCallback()));
}
diff --git
a/app/src/main/java/org/wikipedia/feed/continuereading/ContinueReadingCardView.java
b/app/src/main/java/org/wikipedia/feed/continuereading/ContinueReadingCardView.java
index a5c8a63..d9e26ad 100644
---
a/app/src/main/java/org/wikipedia/feed/continuereading/ContinueReadingCardView.java
+++
b/app/src/main/java/org/wikipedia/feed/continuereading/ContinueReadingCardView.java
@@ -12,16 +12,14 @@
import org.wikipedia.history.HistoryEntry;
import org.wikipedia.views.ItemTouchHelperSwipeAdapter;
-public class ContinueReadingCardView extends ListCardView
+public class ContinueReadingCardView extends ListCardView
implements ItemTouchHelperSwipeAdapter.SwipeableView {
-private ContinueReadingCard card;
-
public ContinueReadingCardView(Context context) {
super(context);
}
-public void set(@NonNull ContinueReadingCard card) {
-this.card = card;
+@Override public void setCard(@NonNull ContinueReadingCard card) {
+super.setCard(card);
header(card);
}
@@ -46,9 +44,10 @@
private class CardClickListener implements OnClickListener {
@Override
public void onClick(View v) {
-if (getCallback() != null) {
-getCallback().onSelectPage(new HistoryEntry(card.pageTitle(),
HistoryEntry.SOURCE_FEED_CONTINUE_READING));
+if (getCallback() != null && getCard() != null) {
+getCallback().onSelectPage(new
Hist
[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: Hygiene: unify feed card interface
Niedzielski has uploaded a new change for review.
https://gerrit.wikimedia.org/r/311909
Change subject: Hygiene: unify feed card interface
..
Hygiene: unify feed card interface
Handle all feed cards in the same way. Also, use set/get prefixes to
avoid less obvious mistakes like calling super.card() instead of
super.card(Card) when overriding card(Card).
Change-Id: Icda23061f7d07b73cccebaa74fb7907f695d2786
---
M
app/src/main/java/org/wikipedia/feed/becauseyouread/BecauseYouReadCardView.java
M
app/src/main/java/org/wikipedia/feed/continuereading/ContinueReadingCardView.java
M app/src/main/java/org/wikipedia/feed/featured/FeaturedArticleCardView.java
M app/src/main/java/org/wikipedia/feed/image/FeaturedImageCardView.java
M app/src/main/java/org/wikipedia/feed/mainpage/MainPageCardView.java
M app/src/main/java/org/wikipedia/feed/model/CardType.java
M app/src/main/java/org/wikipedia/feed/mostread/MostReadCardView.java
M app/src/main/java/org/wikipedia/feed/news/NewsListCardView.java
M app/src/main/java/org/wikipedia/feed/progress/ProgressCardView.java
M app/src/main/java/org/wikipedia/feed/random/RandomCardView.java
M app/src/main/java/org/wikipedia/feed/searchbar/SearchCardView.java
A app/src/main/java/org/wikipedia/feed/view/DefaultFeedCardView.java
M app/src/main/java/org/wikipedia/feed/view/FeedAdapter.java
M app/src/main/java/org/wikipedia/feed/view/FeedCardView.java
M app/src/main/java/org/wikipedia/feed/view/HorizontalScrollingListCardView.java
M app/src/main/java/org/wikipedia/feed/view/ListCardView.java
M app/src/main/java/org/wikipedia/feed/view/StaticCardView.java
17 files changed, 134 insertions(+), 151 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia
refs/changes/09/311909/1
diff --git
a/app/src/main/java/org/wikipedia/feed/becauseyouread/BecauseYouReadCardView.java
b/app/src/main/java/org/wikipedia/feed/becauseyouread/BecauseYouReadCardView.java
index 5d1ed1a..7bb7fce 100644
---
a/app/src/main/java/org/wikipedia/feed/becauseyouread/BecauseYouReadCardView.java
+++
b/app/src/main/java/org/wikipedia/feed/becauseyouread/BecauseYouReadCardView.java
@@ -19,14 +19,15 @@
import java.util.List;
-public class BecauseYouReadCardView extends ListCardView
+public class BecauseYouReadCardView extends ListCardView
implements ItemTouchHelperSwipeAdapter.SwipeableView {
public BecauseYouReadCardView(Context context) {
super(context);
}
-public void set(@NonNull final BecauseYouReadCard card) {
+@Override public void setCard(@NonNull BecauseYouReadCard card) {
+super.setCard(card);
header(card);
set(new RecyclerAdapter(card.items(), getCallback()));
}
diff --git
a/app/src/main/java/org/wikipedia/feed/continuereading/ContinueReadingCardView.java
b/app/src/main/java/org/wikipedia/feed/continuereading/ContinueReadingCardView.java
index a5c8a63..d9e26ad 100644
---
a/app/src/main/java/org/wikipedia/feed/continuereading/ContinueReadingCardView.java
+++
b/app/src/main/java/org/wikipedia/feed/continuereading/ContinueReadingCardView.java
@@ -12,16 +12,14 @@
import org.wikipedia.history.HistoryEntry;
import org.wikipedia.views.ItemTouchHelperSwipeAdapter;
-public class ContinueReadingCardView extends ListCardView
+public class ContinueReadingCardView extends ListCardView
implements ItemTouchHelperSwipeAdapter.SwipeableView {
-private ContinueReadingCard card;
-
public ContinueReadingCardView(Context context) {
super(context);
}
-public void set(@NonNull ContinueReadingCard card) {
-this.card = card;
+@Override public void setCard(@NonNull ContinueReadingCard card) {
+super.setCard(card);
header(card);
}
@@ -46,9 +44,10 @@
private class CardClickListener implements OnClickListener {
@Override
public void onClick(View v) {
-if (getCallback() != null) {
-getCallback().onSelectPage(new HistoryEntry(card.pageTitle(),
HistoryEntry.SOURCE_FEED_CONTINUE_READING));
+if (getCallback() != null && getCard() != null) {
+getCallback().onSelectPage(new
HistoryEntry(getCard().pageTitle(),
+HistoryEntry.SOURCE_FEED_CONTINUE_READING));
}
}
}
-}
+}
\ No newline at end of file
diff --git
a/app/src/main/java/org/wikipedia/feed/featured/FeaturedArticleCardView.java
b/app/src/main/java/org/wikipedia/feed/featured/FeaturedArticleCardView.java
index 0748f0c..40e5531 100644
--- a/app/src/main/java/org/wikipedia/feed/featured/FeaturedArticleCardView.java
+++ b/app/src/main/java/org/wikipedia/feed/featured/FeaturedArticleCardView.java
@@ -10,7 +10,7 @@
import org.wikipedia.R;
import org.wikipedia.feed.view.ActionFooterView;
import org.wikipedia.feed.view.CardHeaderView;
-import org.wikipedia.feed.view.FeedCardView;
+import org.wikipedia.feed.view.
