[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: Hygiene: simplify CardLargeHeaderView
jenkins-bot has submitted this change and it was merged.
Change subject: Hygiene: simplify CardLargeHeaderView
..
Hygiene: simplify CardLargeHeaderView
• Fix title for RTL.
• Remove unused subtitle.
• Reduce View hierarchy depth.
• Rename pageTitle to title. This View is generic and shouldn't assume
an article title will be shown.
Change-Id: Ie0bae4dd3b918e8e78aebf5c88bc24bf621e5c3b
---
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/view/CardLargeHeaderView.java
M app/src/main/res/layout/view_card_header_large.xml
4 files changed, 43 insertions(+), 60 deletions(-)
Approvals:
Dbrant: Looks good to me, approved
jenkins-bot: Verified
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 bbce74c..5d1ed1a 100644
---
a/app/src/main/java/org/wikipedia/feed/becauseyouread/BecauseYouReadCardView.java
+++
b/app/src/main/java/org/wikipedia/feed/becauseyouread/BecauseYouReadCardView.java
@@ -43,8 +43,7 @@
.setCallback(getCallback());
header(header);
CardLargeHeaderView largeHeader = new CardLargeHeaderView(getContext())
-.setPageTitle(card.pageTitle())
-.setSubtitle(card.subtitle())
+.setTitle(card.pageTitle())
.setImage(card.image())
.onClickListener(new SelectPageCallbackAdapter(card));
largeHeader(largeHeader);
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 2908ac1..a5c8a63 100644
---
a/app/src/main/java/org/wikipedia/feed/continuereading/ContinueReadingCardView.java
+++
b/app/src/main/java/org/wikipedia/feed/continuereading/ContinueReadingCardView.java
@@ -37,7 +37,7 @@
.setCallback(getCallback());
header(header);
CardLargeHeaderView largeHeader = new CardLargeHeaderView(getContext())
-.setPageTitle(card.title())
+.setTitle(card.title())
.setImage(card.image())
.onClickListener(new CardClickListener());
largeHeader(largeHeader);
diff --git a/app/src/main/java/org/wikipedia/feed/view/CardLargeHeaderView.java
b/app/src/main/java/org/wikipedia/feed/view/CardLargeHeaderView.java
index 6fb67e3..18966f4 100644
--- a/app/src/main/java/org/wikipedia/feed/view/CardLargeHeaderView.java
+++ b/app/src/main/java/org/wikipedia/feed/view/CardLargeHeaderView.java
@@ -10,30 +10,27 @@
import android.support.annotation.Nullable;
import android.support.v4.content.ContextCompat;
import android.view.View;
-import android.widget.FrameLayout;
+import android.widget.RelativeLayout;
import android.widget.TextView;
import org.wikipedia.R;
import org.wikipedia.views.FaceAndColorDetectImageView;
-import org.wikipedia.views.GoneIfEmptyTextView;
import butterknife.BindView;
import butterknife.ButterKnife;
-public class CardLargeHeaderView extends FrameLayout {
+public class CardLargeHeaderView extends RelativeLayout {
@BindView(R.id.view_card_header_large_background) View backgroundView;
-@BindView(R.id.view_card_header_large_text_container) View
textContainerView;
@BindView(R.id.view_card_header_large_image) FaceAndColorDetectImageView
imageView;
-@BindView(R.id.view_card_header_large_page_title) TextView pageTitleView;
-@BindView(R.id.view_card_header_large_subtitle) GoneIfEmptyTextView
subtitleView;
+@BindView(R.id.view_card_header_large_title) TextView titleView;
public CardLargeHeaderView(Context context) {
super(context);
+resetBackgroundColor();
inflate(getContext(), R.layout.view_card_header_large, this);
ButterKnife.bind(this);
imageView.setOnImageLoadListener(new ImageLoadListener());
-resetBackgroundColor();
}
@NonNull public CardLargeHeaderView setImage(@Nullable Uri uri) {
@@ -42,32 +39,27 @@
return this;
}
-@NonNull public CardLargeHeaderView setSubtitle(@Nullable CharSequence
subtitle) {
-subtitleView.setText(subtitle == null ? null : subtitle.toString());
-return this;
-}
-
-@NonNull public CardLargeHeaderView setPageTitle(@Nullable CharSequence
title) {
-pageTitleView.setText(title);
+@NonNull public CardLargeHeaderView setTitle(@Nullable CharSequence title)
{
+titleView.setText(title);
return this;
}
@NonNull public CardLargeHeaderView onClickListener(@Nullable
OnClickListener listener) {
-setOnClickListener(listener);
+backgroundView.setOnClickListener(listener);
[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: Hygiene: simplify CardLargeHeaderView
Niedzielski has uploaded a new change for review.
https://gerrit.wikimedia.org/r/308103
Change subject: Hygiene: simplify CardLargeHeaderView
..
Hygiene: simplify CardLargeHeaderView
• Fix title for RTL.
• Remove unused subtitle.
• Reduce View hierarchy depth.
• Rename pageTitle to title. This View is generic and shouldn't assume
an article title will be shown.
Change-Id: Ie0bae4dd3b918e8e78aebf5c88bc24bf621e5c3b
---
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/view/CardLargeHeaderView.java
M app/src/main/res/layout/view_card_header_large.xml
4 files changed, 43 insertions(+), 60 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia
refs/changes/03/308103/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 bbce74c..5d1ed1a 100644
---
a/app/src/main/java/org/wikipedia/feed/becauseyouread/BecauseYouReadCardView.java
+++
b/app/src/main/java/org/wikipedia/feed/becauseyouread/BecauseYouReadCardView.java
@@ -43,8 +43,7 @@
.setCallback(getCallback());
header(header);
CardLargeHeaderView largeHeader = new CardLargeHeaderView(getContext())
-.setPageTitle(card.pageTitle())
-.setSubtitle(card.subtitle())
+.setTitle(card.pageTitle())
.setImage(card.image())
.onClickListener(new SelectPageCallbackAdapter(card));
largeHeader(largeHeader);
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 2908ac1..a5c8a63 100644
---
a/app/src/main/java/org/wikipedia/feed/continuereading/ContinueReadingCardView.java
+++
b/app/src/main/java/org/wikipedia/feed/continuereading/ContinueReadingCardView.java
@@ -37,7 +37,7 @@
.setCallback(getCallback());
header(header);
CardLargeHeaderView largeHeader = new CardLargeHeaderView(getContext())
-.setPageTitle(card.title())
+.setTitle(card.title())
.setImage(card.image())
.onClickListener(new CardClickListener());
largeHeader(largeHeader);
diff --git a/app/src/main/java/org/wikipedia/feed/view/CardLargeHeaderView.java
b/app/src/main/java/org/wikipedia/feed/view/CardLargeHeaderView.java
index 6fb67e3..18966f4 100644
--- a/app/src/main/java/org/wikipedia/feed/view/CardLargeHeaderView.java
+++ b/app/src/main/java/org/wikipedia/feed/view/CardLargeHeaderView.java
@@ -10,30 +10,27 @@
import android.support.annotation.Nullable;
import android.support.v4.content.ContextCompat;
import android.view.View;
-import android.widget.FrameLayout;
+import android.widget.RelativeLayout;
import android.widget.TextView;
import org.wikipedia.R;
import org.wikipedia.views.FaceAndColorDetectImageView;
-import org.wikipedia.views.GoneIfEmptyTextView;
import butterknife.BindView;
import butterknife.ButterKnife;
-public class CardLargeHeaderView extends FrameLayout {
+public class CardLargeHeaderView extends RelativeLayout {
@BindView(R.id.view_card_header_large_background) View backgroundView;
-@BindView(R.id.view_card_header_large_text_container) View
textContainerView;
@BindView(R.id.view_card_header_large_image) FaceAndColorDetectImageView
imageView;
-@BindView(R.id.view_card_header_large_page_title) TextView pageTitleView;
-@BindView(R.id.view_card_header_large_subtitle) GoneIfEmptyTextView
subtitleView;
+@BindView(R.id.view_card_header_large_title) TextView titleView;
public CardLargeHeaderView(Context context) {
super(context);
+resetBackgroundColor();
inflate(getContext(), R.layout.view_card_header_large, this);
ButterKnife.bind(this);
imageView.setOnImageLoadListener(new ImageLoadListener());
-resetBackgroundColor();
}
@NonNull public CardLargeHeaderView setImage(@Nullable Uri uri) {
@@ -42,32 +39,27 @@
return this;
}
-@NonNull public CardLargeHeaderView setSubtitle(@Nullable CharSequence
subtitle) {
-subtitleView.setText(subtitle == null ? null : subtitle.toString());
-return this;
-}
-
-@NonNull public CardLargeHeaderView setPageTitle(@Nullable CharSequence
title) {
-pageTitleView.setText(title);
+@NonNull public CardLargeHeaderView setTitle(@Nullable CharSequence title)
{
+titleView.setText(title);
return this;
}
@NonNull public CardLargeHeaderView onClickListener(@Nullable
OnClickListener listener) {
-setOnClickListener(listener);
+
