[MediaWiki-commits] [Gerrit] Apply variant C most read UI tweaks - change (apps...wikipedia)

2016-06-21 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged.

Change subject: Apply variant C most read UI tweaks
..


Apply variant C most read UI tweaks

https://app.zeplin.io/project.html#pid=575030de30a17087229662e6=5756ffc19bf6204842c64ebf

Bug: T129082
Change-Id: I5a25213007c600be2882b38b3de425ca2c3c555f
---
M app/src/main/java/org/wikipedia/feed/mostread/MostReadCardView.java
M app/src/main/java/org/wikipedia/feed/mostread/MostReadListCard.java
M app/src/main/java/org/wikipedia/feed/view/CardHeaderView.java
M app/src/main/java/org/wikipedia/util/ResourceUtil.java
A app/src/main/res/drawable/ic_most_read.xml
M app/src/main/res/layout/view_card_header.xml
M app/src/main/res/values/strings_no_translate.xml
M app/src/test/java/org/wikipedia/feed/mostread/MostReadClientTest.java
8 files changed, 56 insertions(+), 22 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/mostread/MostReadCardView.java 
b/app/src/main/java/org/wikipedia/feed/mostread/MostReadCardView.java
index 081bc9b..fcb67d0 100644
--- a/app/src/main/java/org/wikipedia/feed/mostread/MostReadCardView.java
+++ b/app/src/main/java/org/wikipedia/feed/mostread/MostReadCardView.java
@@ -3,11 +3,13 @@
 import android.content.Context;
 import android.support.annotation.NonNull;
 
+import org.wikipedia.R;
 import org.wikipedia.feed.demo.IntegerListCard;
 import org.wikipedia.feed.view.CardFooterView;
 import org.wikipedia.feed.view.CardHeaderView;
 import org.wikipedia.feed.view.ListCardItemView;
 import org.wikipedia.feed.view.ListCardView;
+import org.wikipedia.util.ResourceUtil;
 import org.wikipedia.views.DefaultViewHolder;
 
 import java.util.List;
@@ -26,7 +28,8 @@
 private void header(@NonNull MostReadListCard card) {
 CardHeaderView header = new CardHeaderView(getContext())
 .setTitle(card.title())
-.setSubtitle(card.subtitle());
+.setSubtitle(card.subtitle())
+.setImage(ResourceUtil.uri(getContext(), 
R.drawable.ic_most_read));
 header(header);
 }
 
diff --git 
a/app/src/main/java/org/wikipedia/feed/mostread/MostReadListCard.java 
b/app/src/main/java/org/wikipedia/feed/mostread/MostReadListCard.java
index 212d769..723cea5 100644
--- a/app/src/main/java/org/wikipedia/feed/mostread/MostReadListCard.java
+++ b/app/src/main/java/org/wikipedia/feed/mostread/MostReadListCard.java
@@ -26,21 +26,23 @@
 }
 
 @NonNull @Override public String title() {
-return getString(R.string.most_read_list_card_title, date());
+return getString(R.string.most_read_list_card_title);
 }
 
 @Nullable @Override public String subtitle() {
-return date();
+// todo: consider allowing TWN date formats. It would be useful to 
have but might be
+//   difficult for translators to write correct format specifiers 
without being able to
+//   test them. We should investigate localization support in date 
libraries such as
+//   Joda-Time and how TWN solves this classic problem.
+DateFormat dateFormat = 
android.text.format.DateFormat.getDateFormat(context());
+return dateFormat.format(articles.date());
 }
 
 @Nullable @Override public String footer() {
-// todo: the mocks show a more terse date used here but this will 
probably require TWN
-//   support. We should investigate localization support in date 
libraries such as
-//   Joda-Time and how TWN solves this classic problem.
-return getString(R.string.most_read_list_card_footer, date());
+return getString(R.string.most_read_list_card_footer);
 }
 
-@VisibleForTesting @NonNull Date getDate() {
+@VisibleForTesting @NonNull Date date() {
 return articles.date();
 }
 
@@ -50,14 +52,6 @@
 cards.add(new MostReadItemCard(article));
 }
 return cards.subList(0, Math.min(cards.size(), MAX_SIZE));
-}
-
-@NonNull private String date() {
-// todo: consider allowing TWN date formats. It would be useful to 
have but might be
-//   difficult for translators to write correct format specifiers 
without being able to
-//   test them.
-DateFormat dateFormat = 
android.text.format.DateFormat.getDateFormat(context());
-return dateFormat.format(articles.date());
 }
 
 @NonNull private String getString(@StringRes int id, @Nullable Object... 
formatArgs) {
diff --git a/app/src/main/java/org/wikipedia/feed/view/CardHeaderView.java 
b/app/src/main/java/org/wikipedia/feed/view/CardHeaderView.java
index a590420..acc2884 100644
--- a/app/src/main/java/org/wikipedia/feed/view/CardHeaderView.java
+++ b/app/src/main/java/org/wikipedia/feed/view/CardHeaderView.java
@@ -26,7 +26,7 @@

[MediaWiki-commits] [Gerrit] Apply variant C most read UI tweaks - change (apps...wikipedia)

2016-06-14 Thread Niedzielski (Code Review) 
Niedzielski has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/294395

Change subject: Apply variant C most read UI tweaks
..

Apply variant C most read UI tweaks

https://app.zeplin.io/project.html#pid=575030de30a17087229662e6=5756ffc19bf6204842c64ebf

Bug: T129082
Change-Id: I5a25213007c600be2882b38b3de425ca2c3c555f
---
M app/src/main/java/org/wikipedia/feed/mostread/MostReadCardView.java
M app/src/main/java/org/wikipedia/feed/mostread/MostReadListCard.java
M app/src/main/java/org/wikipedia/feed/view/CardHeaderView.java
M app/src/main/java/org/wikipedia/util/ResourceUtil.java
A app/src/main/res/drawable/ic_most_read.xml
M app/src/main/res/layout/view_card_header.xml
M app/src/main/res/values/strings_no_translate.xml
M app/src/test/java/org/wikipedia/feed/mostread/MostReadClientTest.java
8 files changed, 56 insertions(+), 22 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia 
refs/changes/95/294395/1

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 081bc9b..fcb67d0 100644
--- a/app/src/main/java/org/wikipedia/feed/mostread/MostReadCardView.java
+++ b/app/src/main/java/org/wikipedia/feed/mostread/MostReadCardView.java
@@ -3,11 +3,13 @@
 import android.content.Context;
 import android.support.annotation.NonNull;
 
+import org.wikipedia.R;
 import org.wikipedia.feed.demo.IntegerListCard;
 import org.wikipedia.feed.view.CardFooterView;
 import org.wikipedia.feed.view.CardHeaderView;
 import org.wikipedia.feed.view.ListCardItemView;
 import org.wikipedia.feed.view.ListCardView;
+import org.wikipedia.util.ResourceUtil;
 import org.wikipedia.views.DefaultViewHolder;
 
 import java.util.List;
@@ -26,7 +28,8 @@
 private void header(@NonNull MostReadListCard card) {
 CardHeaderView header = new CardHeaderView(getContext())
 .setTitle(card.title())
-.setSubtitle(card.subtitle());
+.setSubtitle(card.subtitle())
+.setImage(ResourceUtil.uri(getContext(), 
R.drawable.ic_most_read));
 header(header);
 }
 
diff --git 
a/app/src/main/java/org/wikipedia/feed/mostread/MostReadListCard.java 
b/app/src/main/java/org/wikipedia/feed/mostread/MostReadListCard.java
index 212d769..723cea5 100644
--- a/app/src/main/java/org/wikipedia/feed/mostread/MostReadListCard.java
+++ b/app/src/main/java/org/wikipedia/feed/mostread/MostReadListCard.java
@@ -26,21 +26,23 @@
 }
 
 @NonNull @Override public String title() {
-return getString(R.string.most_read_list_card_title, date());
+return getString(R.string.most_read_list_card_title);
 }
 
 @Nullable @Override public String subtitle() {
-return date();
+// todo: consider allowing TWN date formats. It would be useful to 
have but might be
+//   difficult for translators to write correct format specifiers 
without being able to
+//   test them. We should investigate localization support in date 
libraries such as
+//   Joda-Time and how TWN solves this classic problem.
+DateFormat dateFormat = 
android.text.format.DateFormat.getDateFormat(context());
+return dateFormat.format(articles.date());
 }
 
 @Nullable @Override public String footer() {
-// todo: the mocks show a more terse date used here but this will 
probably require TWN
-//   support. We should investigate localization support in date 
libraries such as
-//   Joda-Time and how TWN solves this classic problem.
-return getString(R.string.most_read_list_card_footer, date());
+return getString(R.string.most_read_list_card_footer);
 }
 
-@VisibleForTesting @NonNull Date getDate() {
+@VisibleForTesting @NonNull Date date() {
 return articles.date();
 }
 
@@ -50,14 +52,6 @@
 cards.add(new MostReadItemCard(article));
 }
 return cards.subList(0, Math.min(cards.size(), MAX_SIZE));
-}
-
-@NonNull private String date() {
-// todo: consider allowing TWN date formats. It would be useful to 
have but might be
-//   difficult for translators to write correct format specifiers 
without being able to
-//   test them.
-DateFormat dateFormat = 
android.text.format.DateFormat.getDateFormat(context());
-return dateFormat.format(articles.date());
 }
 
 @NonNull private String getString(@StringRes int id, @Nullable Object... 
formatArgs) {
diff --git a/app/src/main/java/org/wikipedia/feed/view/CardHeaderView.java 
b/app/src/main/java/org/wikipedia/feed/view/CardHeaderView.java
index ca75f8c..3bc2ad2 100644
--- a/app/src/main/java/org/wikipedia/feed/view/CardHeaderView.java
+++ b/app/src/main/java/org/wikipedia/feed/view/CardHeaderView.java
@@ -26,7 +26,7 @@