jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/338141 )
Change subject: Hygiene: Rename PageTitleListCardItemView and related
RecyclerAdapter
......................................................................
Hygiene: Rename PageTitleListCardItemView and related RecyclerAdapter
PageTitleListCardItemView is a wordy, unwieldy class name, and the class
does not actually even involve PageTitles. Rename it to ListCardItemView
which is less of a mouthful and at least as descriptive.
Rename the related RecyclerAdapter as well.
Change-Id: I43c28750460bfc109daaec578afa559354ba5861
---
M
app/src/androidTest/java/org/wikipedia/feed/view/PageTitleListCardItemViewTest.java
M
app/src/main/java/org/wikipedia/feed/becauseyouread/BecauseYouReadCardView.java
M app/src/main/java/org/wikipedia/feed/mostread/MostReadCardView.java
M app/src/main/java/org/wikipedia/feed/news/NewsFragment.java
M app/src/main/java/org/wikipedia/feed/view/FeedAdapter.java
R app/src/main/java/org/wikipedia/feed/view/ListCardItemView.java
A app/src/main/java/org/wikipedia/feed/view/ListCardRecyclerAdapter.java
D app/src/main/java/org/wikipedia/feed/view/PageTitleRecyclerAdapter.java
8 files changed, 43 insertions(+), 43 deletions(-)
Approvals:
Dbrant: Looks good to me, approved
jenkins-bot: Verified
diff --git
a/app/src/androidTest/java/org/wikipedia/feed/view/PageTitleListCardItemViewTest.java
b/app/src/androidTest/java/org/wikipedia/feed/view/PageTitleListCardItemViewTest.java
index 01b8db9..21fc7bc 100644
---
a/app/src/androidTest/java/org/wikipedia/feed/view/PageTitleListCardItemViewTest.java
+++
b/app/src/androidTest/java/org/wikipedia/feed/view/PageTitleListCardItemViewTest.java
@@ -24,10 +24,10 @@
import static org.hamcrest.Matchers.notNullValue;
import static org.hamcrest.Matchers.nullValue;
import static org.mockito.Mockito.mock;
-import static org.wikipedia.feed.view.PageTitleListCardItemView.Callback;
+import static org.wikipedia.feed.view.ListCardItemView.Callback;
@SmallTest public class PageTitleListCardItemViewTest extends ViewTest {
- private PageTitleListCardItemView subject;
+ private ListCardItemView subject;
@Theory public void testWidth(@TestedOn(ints = {WIDTH_DP_L, WIDTH_DP_M})
int widthDp,
@NonNull FontScale fontScale, @NonNull
PrimaryTestImg image,
@@ -104,7 +104,7 @@
@NonNull TestStr title, @NonNull TestStr subtitle) {
setUp(widthDp, layoutDirection, fontScale, theme);
- subject = new PageTitleListCardItemView(ctx());
+ subject = new ListCardItemView(ctx());
if (!image.isNull()) {
subject.setImage(frescoUri(image.id()).toString());
}
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 22b8c54..724cd41 100644
---
a/app/src/main/java/org/wikipedia/feed/becauseyouread/BecauseYouReadCardView.java
+++
b/app/src/main/java/org/wikipedia/feed/becauseyouread/BecauseYouReadCardView.java
@@ -8,9 +8,9 @@
import org.wikipedia.R;
import org.wikipedia.feed.view.CardHeaderView;
import org.wikipedia.feed.view.CardLargeHeaderView;
+import org.wikipedia.feed.view.ListCardItemView;
+import org.wikipedia.feed.view.ListCardRecyclerAdapter;
import org.wikipedia.feed.view.ListCardView;
-import org.wikipedia.feed.view.PageTitleListCardItemView;
-import org.wikipedia.feed.view.PageTitleRecyclerAdapter;
import org.wikipedia.history.HistoryEntry;
import org.wikipedia.views.DefaultViewHolder;
import org.wikipedia.views.ItemTouchHelperSwipeAdapter;
@@ -70,13 +70,13 @@
}
}
- private class RecyclerAdapter extends
PageTitleRecyclerAdapter<BecauseYouReadItemCard> {
+ private class RecyclerAdapter extends
ListCardRecyclerAdapter<BecauseYouReadItemCard> {
RecyclerAdapter(@NonNull List<BecauseYouReadItemCard> items) {
super(items);
}
@Override
- public void
onBindViewHolder(DefaultViewHolder<PageTitleListCardItemView> holder, int i) {
+ public void onBindViewHolder(DefaultViewHolder<ListCardItemView>
holder, int i) {
BecauseYouReadItemCard card = item(i);
holder.getView().setHistoryEntry(new
HistoryEntry(card.pageTitle(), HistoryEntry.SOURCE_FEED_BECAUSE_YOU_READ));
holder.getView().setCallback(getCallback());
diff --git
a/app/src/main/java/org/wikipedia/feed/mostread/MostReadCardView.java
b/app/src/main/java/org/wikipedia/feed/mostread/MostReadCardView.java
index b30e350..40008bf 100644
--- a/app/src/main/java/org/wikipedia/feed/mostread/MostReadCardView.java
+++ b/app/src/main/java/org/wikipedia/feed/mostread/MostReadCardView.java
@@ -5,9 +5,9 @@
import org.wikipedia.R;
import org.wikipedia.feed.view.CardHeaderView;
+import org.wikipedia.feed.view.ListCardItemView;
+import org.wikipedia.feed.view.ListCardRecyclerAdapter;
import org.wikipedia.feed.view.ListCardView;
-import org.wikipedia.feed.view.PageTitleListCardItemView;
-import org.wikipedia.feed.view.PageTitleRecyclerAdapter;
import org.wikipedia.history.HistoryEntry;
import org.wikipedia.views.DefaultViewHolder;
import org.wikipedia.views.ItemTouchHelperSwipeAdapter;
@@ -37,13 +37,13 @@
header(header);
}
- private class RecyclerAdapter extends
PageTitleRecyclerAdapter<MostReadItemCard> {
+ private class RecyclerAdapter extends
ListCardRecyclerAdapter<MostReadItemCard> {
RecyclerAdapter(@NonNull List<MostReadItemCard> items) {
super(items);
}
@Override
- public void
onBindViewHolder(DefaultViewHolder<PageTitleListCardItemView> holder, int
position) {
+ public void onBindViewHolder(DefaultViewHolder<ListCardItemView>
holder, int position) {
MostReadItemCard card = item(position);
holder.getView().setHistoryEntry(new
HistoryEntry(card.pageTitle(), HistoryEntry.SOURCE_FEED_MOST_READ));
holder.getView().setCallback(getCallback());
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 2967fef..7b74ea2 100644
--- a/app/src/main/java/org/wikipedia/feed/news/NewsFragment.java
+++ b/app/src/main/java/org/wikipedia/feed/news/NewsFragment.java
@@ -18,7 +18,7 @@
import org.wikipedia.R;
import org.wikipedia.dataclient.WikiSite;
-import org.wikipedia.feed.view.PageTitleListCardItemView;
+import org.wikipedia.feed.view.ListCardItemView;
import org.wikipedia.history.HistoryEntry;
import org.wikipedia.json.GsonMarshaller;
import org.wikipedia.json.GsonUnmarshaller;
@@ -112,7 +112,7 @@
links.setNestedScrollingEnabled(false);
}
- protected static class RecyclerAdapter extends
DefaultRecyclerAdapter<NewsLinkCard, PageTitleListCardItemView> {
+ protected static class RecyclerAdapter extends
DefaultRecyclerAdapter<NewsLinkCard, ListCardItemView> {
@Nullable private Callback callback;
RecyclerAdapter(@NonNull List<NewsLinkCard> items, @NonNull Callback
callback) {
@@ -120,19 +120,19 @@
this.callback = callback;
}
- @Override public DefaultViewHolder<PageTitleListCardItemView>
onCreateViewHolder(ViewGroup parent, int viewType) {
- return new DefaultViewHolder<>(new
PageTitleListCardItemView(parent.getContext()));
+ @Override public DefaultViewHolder<ListCardItemView>
onCreateViewHolder(ViewGroup parent, int viewType) {
+ return new DefaultViewHolder<>(new
ListCardItemView(parent.getContext()));
}
@Override
- public void
onBindViewHolder(DefaultViewHolder<PageTitleListCardItemView> holder, int
position) {
+ 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);
}
}
- private class Callback implements PageTitleListCardItemView.Callback {
+ private class Callback implements ListCardItemView.Callback {
@Override
public void onSelectPage(@NonNull HistoryEntry entry) {
startActivity(PageActivity.newIntent(getContext(), entry,
entry.getTitle()));
diff --git a/app/src/main/java/org/wikipedia/feed/view/FeedAdapter.java
b/app/src/main/java/org/wikipedia/feed/view/FeedAdapter.java
index d968e3e..d55eabe 100644
--- a/app/src/main/java/org/wikipedia/feed/view/FeedAdapter.java
+++ b/app/src/main/java/org/wikipedia/feed/view/FeedAdapter.java
@@ -19,7 +19,7 @@
public class FeedAdapter<T extends View & FeedCardView<?>> extends
DefaultRecyclerAdapter<Card, T> {
public interface Callback extends ItemTouchHelperSwipeAdapter.Callback,
- PageTitleListCardItemView.Callback, CardHeaderView.Callback,
+ ListCardItemView.Callback, CardHeaderView.Callback,
FeaturedImageCardView.Callback, SearchCardView.Callback,
NewsListCardView.Callback,
AnnouncementCardView.Callback {
void onRequestMore();
diff --git
a/app/src/main/java/org/wikipedia/feed/view/PageTitleListCardItemView.java
b/app/src/main/java/org/wikipedia/feed/view/ListCardItemView.java
similarity index 92%
rename from
app/src/main/java/org/wikipedia/feed/view/PageTitleListCardItemView.java
rename to app/src/main/java/org/wikipedia/feed/view/ListCardItemView.java
index 8a168fc..c3059ef 100644
--- a/app/src/main/java/org/wikipedia/feed/view/PageTitleListCardItemView.java
+++ b/app/src/main/java/org/wikipedia/feed/view/ListCardItemView.java
@@ -23,7 +23,7 @@
import butterknife.ButterKnife;
import butterknife.OnClick;
-public class PageTitleListCardItemView extends FrameLayout {
+public class ListCardItemView extends FrameLayout {
public interface Callback {
void onSelectPage(@NonNull HistoryEntry entry);
void onAddPageToList(@NonNull HistoryEntry entry);
@@ -37,7 +37,7 @@
@Nullable private Callback callback;
@Nullable private HistoryEntry entry;
- public PageTitleListCardItemView(Context context) {
+ public ListCardItemView(Context context) {
super(context);
setLayoutParams(new
ViewGroup.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT,
@@ -56,12 +56,12 @@
});
}
- @NonNull public PageTitleListCardItemView setCallback(@Nullable Callback
callback) {
+ @NonNull public ListCardItemView setCallback(@Nullable Callback callback) {
this.callback = callback;
return this;
}
- @NonNull public PageTitleListCardItemView setHistoryEntry(@NonNull
HistoryEntry entry) {
+ @NonNull public ListCardItemView setHistoryEntry(@NonNull HistoryEntry
entry) {
this.entry = entry;
setTitle(entry.getTitle().getDisplayText());
setSubtitle(entry.getTitle().getDescription());
diff --git
a/app/src/main/java/org/wikipedia/feed/view/ListCardRecyclerAdapter.java
b/app/src/main/java/org/wikipedia/feed/view/ListCardRecyclerAdapter.java
new file mode 100644
index 0000000..83e5a44
--- /dev/null
+++ b/app/src/main/java/org/wikipedia/feed/view/ListCardRecyclerAdapter.java
@@ -0,0 +1,21 @@
+package org.wikipedia.feed.view;
+
+import android.support.annotation.NonNull;
+import android.view.ViewGroup;
+
+import org.wikipedia.views.DefaultRecyclerAdapter;
+import org.wikipedia.views.DefaultViewHolder;
+
+import java.util.List;
+
+public abstract class ListCardRecyclerAdapter<T>
+ extends DefaultRecyclerAdapter<T, ListCardItemView> {
+ public ListCardRecyclerAdapter(@NonNull List<T> items) {
+ super(items);
+ }
+
+ @Override public DefaultViewHolder<ListCardItemView>
onCreateViewHolder(ViewGroup parent,
+
int viewType) {
+ return new DefaultViewHolder<>(new
ListCardItemView(parent.getContext()));
+ }
+}
diff --git
a/app/src/main/java/org/wikipedia/feed/view/PageTitleRecyclerAdapter.java
b/app/src/main/java/org/wikipedia/feed/view/PageTitleRecyclerAdapter.java
deleted file mode 100644
index f4414f3..0000000
--- a/app/src/main/java/org/wikipedia/feed/view/PageTitleRecyclerAdapter.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package org.wikipedia.feed.view;
-
-import android.support.annotation.NonNull;
-import android.view.ViewGroup;
-
-import org.wikipedia.views.DefaultRecyclerAdapter;
-import org.wikipedia.views.DefaultViewHolder;
-
-import java.util.List;
-
-public abstract class PageTitleRecyclerAdapter<T>
- extends DefaultRecyclerAdapter<T, PageTitleListCardItemView> {
- public PageTitleRecyclerAdapter(@NonNull List<T> items) {
- super(items);
- }
-
- @Override public DefaultViewHolder<PageTitleListCardItemView>
onCreateViewHolder(ViewGroup parent,
-
int viewType) {
- return new DefaultViewHolder<>(new
PageTitleListCardItemView(parent.getContext()));
- }
-}
--
To view, visit https://gerrit.wikimedia.org/r/338141
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I43c28750460bfc109daaec578afa559354ba5861
Gerrit-PatchSet: 4
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Mholloway <[email protected]>
Gerrit-Reviewer: Dbrant <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
