jenkins-bot has submitted this change and it was merged.
Change subject: Hygiene: collapse PageTitleListCardItemView
......................................................................
Hygiene: collapse PageTitleListCardItemView
Merge ListCardItemView into PageTitleListCardItemView and remove dead
code.
Change-Id: I2abab7182bee35026fe3e95acbf596a5e2c6f57b
---
D app/src/androidTest/java/org/wikipedia/feed/view/ListCardItemViewTest.java
D app/src/main/java/org/wikipedia/feed/view/ListCardItemView.java
M app/src/main/java/org/wikipedia/feed/view/PageTitleListCardItemView.java
3 files changed, 26 insertions(+), 106 deletions(-)
Approvals:
Dbrant: Looks good to me, approved
jenkins-bot: Verified
diff --git
a/app/src/androidTest/java/org/wikipedia/feed/view/ListCardItemViewTest.java
b/app/src/androidTest/java/org/wikipedia/feed/view/ListCardItemViewTest.java
deleted file mode 100644
index 1c42f86..0000000
--- a/app/src/androidTest/java/org/wikipedia/feed/view/ListCardItemViewTest.java
+++ /dev/null
@@ -1,45 +0,0 @@
-package org.wikipedia.feed.view;
-
-import android.net.Uri;
-
-import org.junit.Before;
-import org.junit.experimental.theories.Theory;
-import org.junit.experimental.theories.suppliers.TestedOn;
-import org.wikipedia.test.ViewTest;
-import org.wikipedia.theme.Theme;
-
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.is;
-import static org.hamcrest.Matchers.notNullValue;
-import static org.hamcrest.Matchers.nullValue;
-import static org.mockito.Mockito.mock;
-import static org.wikipedia.test.ViewTest.LayoutDirection.LOCALE;
-import static org.wikipedia.util.StringUtil.emptyIfNull;
-
-public class ListCardItemViewTest extends ViewTest {
- private ListCardItemView subject;
-
- @Before public void setUp() {
- setUp(WIDTH_DP_S, LOCALE, FONT_SCALES[0], Theme.LIGHT);
- subject = new ListCardItemView(ctx());
- }
-
- @Theory public void testSetImage(@TestedOn(ints = {0, 1}) int nonnull) {
- Uri uri = nonnull == 0 ? null : mock(Uri.class);
- assertThat(subject.imageView.getController(), nullValue());
- subject.setImage(uri);
- assertThat(subject.imageView.getController(), notNullValue());
- }
-
- @Theory public void testSetTitle(@TestedOn(ints = {0, 1}) int nonnull) {
- CharSequence title = nonnull == 0 ? null : "subtitle";
- subject.setTitle(title);
- assertThat(subject.titleView.getText(), is(emptyIfNull(title)));
- }
-
- @Theory public void testSetSubtitle(@TestedOn(ints = {0, 1}) int nonnull) {
- CharSequence subtitle = nonnull == 0 ? null : "subtitle";
- subject.setSubtitle(subtitle);
- assertThat(subject.subtitleView.getText(), is(emptyIfNull(subtitle)));
- }
-}
\ No newline at end of file
diff --git a/app/src/main/java/org/wikipedia/feed/view/ListCardItemView.java
b/app/src/main/java/org/wikipedia/feed/view/ListCardItemView.java
deleted file mode 100644
index 739d6ac..0000000
--- a/app/src/main/java/org/wikipedia/feed/view/ListCardItemView.java
+++ /dev/null
@@ -1,51 +0,0 @@
-package org.wikipedia.feed.view;
-
-import android.content.Context;
-import android.net.Uri;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.FrameLayout;
-import android.widget.TextView;
-
-import com.facebook.drawee.view.SimpleDraweeView;
-
-import org.wikipedia.R;
-import org.wikipedia.views.GoneIfEmptyTextView;
-
-import butterknife.BindView;
-import butterknife.ButterKnife;
-
-public class ListCardItemView extends FrameLayout {
- @BindView(R.id.view_list_card_item_image) SimpleDraweeView imageView;
- @BindView(R.id.view_list_card_item_title) TextView titleView;
- @BindView(R.id.view_list_card_item_subtitle) GoneIfEmptyTextView
subtitleView;
- @BindView(R.id.view_list_card_item_menu) View menuView;
-
- public ListCardItemView(Context context) {
- super(context);
-
- setLayoutParams(new
ViewGroup.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT,
- ViewGroup.LayoutParams.WRAP_CONTENT));
- setClickable(true);
-
- inflate(getContext(), R.layout.view_list_card_item, this);
- ButterKnife.bind(this);
- }
-
- @NonNull public ListCardItemView setImage(@Nullable Uri uri) {
- imageView.setImageURI(uri);
- return this;
- }
-
- @NonNull public ListCardItemView setTitle(@Nullable CharSequence title) {
- titleView.setText(title);
- return this;
- }
-
- @NonNull public ListCardItemView setSubtitle(@Nullable CharSequence
subtitle) {
- subtitleView.setText((String) subtitle);
- return this;
- }
-}
\ No newline at end of file
diff --git
a/app/src/main/java/org/wikipedia/feed/view/PageTitleListCardItemView.java
b/app/src/main/java/org/wikipedia/feed/view/PageTitleListCardItemView.java
index ca7fc79..63f2821 100644
--- a/app/src/main/java/org/wikipedia/feed/view/PageTitleListCardItemView.java
+++ b/app/src/main/java/org/wikipedia/feed/view/PageTitleListCardItemView.java
@@ -6,35 +6,50 @@
import android.support.v7.widget.PopupMenu;
import android.view.MenuItem;
import android.view.View;
+import android.view.ViewGroup;
+import android.widget.FrameLayout;
+import android.widget.TextView;
+
+import com.facebook.drawee.view.SimpleDraweeView;
import org.wikipedia.R;
import org.wikipedia.history.HistoryEntry;
+import org.wikipedia.views.GoneIfEmptyTextView;
import org.wikipedia.views.ViewUtil;
-public class PageTitleListCardItemView extends ListCardItemView {
+import butterknife.BindView;
+import butterknife.ButterKnife;
+import butterknife.OnClick;
+
+public class PageTitleListCardItemView extends FrameLayout {
public interface Callback {
void onSelectPage(@NonNull HistoryEntry entry);
void onAddPageToList(@NonNull HistoryEntry entry);
void onSharePage(@NonNull HistoryEntry entry);
}
+ @BindView(R.id.view_list_card_item_image) SimpleDraweeView imageView;
+ @BindView(R.id.view_list_card_item_title) TextView titleView;
+ @BindView(R.id.view_list_card_item_subtitle) GoneIfEmptyTextView
subtitleView;
+
@Nullable private Callback callback;
@Nullable private HistoryEntry entry;
public PageTitleListCardItemView(Context context) {
super(context);
+
+ setLayoutParams(new
ViewGroup.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT,
+ ViewGroup.LayoutParams.WRAP_CONTENT));
+
+ 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) {
callback.onSelectPage(entry);
}
- }
- });
- menuView.setOnClickListener(new OnClickListener() {
- @Override
- public void onClick(View v) {
- showOverflowMenu(v);
}
});
}
@@ -52,7 +67,7 @@
return this;
}
- private void showOverflowMenu(View anchorView) {
+ @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());
menu.setOnMenuItemClickListener(new CardItemMenuClickListener());
@@ -60,17 +75,18 @@
}
private class CardItemMenuClickListener implements
PopupMenu.OnMenuItemClickListener {
- @Override
- public boolean onMenuItemClick(MenuItem item) {
+ @Override public boolean onMenuItemClick(MenuItem item) {
switch (item.getItemId()) {
case R.id.menu_feed_card_item_save:
if (callback != null && entry != null) {
callback.onAddPageToList(entry);
+ return true;
}
break;
case R.id.menu_feed_card_item_share:
if (callback != null && entry != null) {
callback.onSharePage(entry);
+ return true;
}
break;
default:
--
To view, visit https://gerrit.wikimedia.org/r/318230
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I2abab7182bee35026fe3e95acbf596a5e2c6f57b
Gerrit-PatchSet: 2
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Niedzielski <sniedziel...@wikimedia.org>
Gerrit-Reviewer: BearND <bsitzm...@wikimedia.org>
Gerrit-Reviewer: Brion VIBBER <br...@wikimedia.org>
Gerrit-Reviewer: Dbrant <dbr...@wikimedia.org>
Gerrit-Reviewer: Mholloway <mhollo...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
