jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/342865 )
Change subject: Whoops: fix clicking of items in News activity.
......................................................................
Whoops: fix clicking of items in News activity.
Due to a recent update to ListCardItemView, the items in NewsActivity
stopped being clickable (forgot to setCard() on the item views).
This fixes the click behavior, and also butterifies the eigen-
click-handler of the view.
Change-Id: I1ccd00147c7900953e36291255a4e86c18983cc3
---
M app/src/main/java/org/wikipedia/feed/news/NewsFragment.java
M app/src/main/java/org/wikipedia/feed/view/ListCardItemView.java
2 files changed, 9 insertions(+), 11 deletions(-)
Approvals:
Niedzielski: Looks good to me, approved
jenkins-bot: Verified
diff --git a/app/src/main/java/org/wikipedia/feed/news/NewsFragment.java
b/app/src/main/java/org/wikipedia/feed/news/NewsFragment.java
index 51cfed4..36ef274 100644
--- a/app/src/main/java/org/wikipedia/feed/news/NewsFragment.java
+++ b/app/src/main/java/org/wikipedia/feed/news/NewsFragment.java
@@ -128,8 +128,9 @@
@Override
public void onBindViewHolder(DefaultViewHolder<ListCardItemView>
holder, int position) {
NewsLinkCard card = item(position);
- holder.getView().setHistoryEntry(new
HistoryEntry(card.pageTitle(), HistoryEntry.SOURCE_NEWS));
- holder.getView().setCallback(callback);
+ holder.getView().setCard(card)
+ .setHistoryEntry(new HistoryEntry(card.pageTitle(),
HistoryEntry.SOURCE_NEWS))
+ .setCallback(callback);
}
}
diff --git a/app/src/main/java/org/wikipedia/feed/view/ListCardItemView.java
b/app/src/main/java/org/wikipedia/feed/view/ListCardItemView.java
index 54983b8..3641c68 100644
--- a/app/src/main/java/org/wikipedia/feed/view/ListCardItemView.java
+++ b/app/src/main/java/org/wikipedia/feed/view/ListCardItemView.java
@@ -47,15 +47,6 @@
inflate(getContext(), R.layout.view_list_card_item, this);
ButterKnife.bind(this);
-
- setOnClickListener(new OnClickListener() {
- @Override
- public void onClick(View view) {
- if (callback != null && entry != null && card != null) {
- callback.onSelectPage(card, entry);
- }
- }
- });
}
@NonNull public ListCardItemView setCard(@Nullable Card card) {
@@ -76,6 +67,12 @@
return this;
}
+ @OnClick void onClick(View view) {
+ if (callback != null && entry != null && card != null) {
+ callback.onSelectPage(card, entry);
+ }
+ }
+
@OnClick(R.id.view_list_card_item_menu) void showOverflowMenu(View
anchorView) {
PopupMenu menu = new PopupMenu(getContext(), anchorView);
menu.getMenuInflater().inflate(R.menu.menu_feed_card_item,
menu.getMenu());
--
To view, visit https://gerrit.wikimedia.org/r/342865
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I1ccd00147c7900953e36291255a4e86c18983cc3
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Dbrant <[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
