Niedzielski has uploaded a new change for review.
https://gerrit.wikimedia.org/r/297812
Change subject: Allow for picture of the day without description
......................................................................
Allow for picture of the day without description
See also If17f02ef09704293355db508b205d8c34512a409.
Change-Id: I1bd8efa0085f814054ba17dba19e36a1bfd39431
---
M app/src/main/java/org/wikipedia/feed/image/FeaturedImage.java
M app/src/main/java/org/wikipedia/feed/image/FeaturedImageCard.java
M app/src/main/java/org/wikipedia/feed/image/FeaturedImageCardView.java
3 files changed, 18 insertions(+), 10 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia
refs/changes/12/297812/1
diff --git a/app/src/main/java/org/wikipedia/feed/image/FeaturedImage.java
b/app/src/main/java/org/wikipedia/feed/image/FeaturedImage.java
index c2081ad..fcf26ce 100644
--- a/app/src/main/java/org/wikipedia/feed/image/FeaturedImage.java
+++ b/app/src/main/java/org/wikipedia/feed/image/FeaturedImage.java
@@ -1,6 +1,7 @@
package org.wikipedia.feed.image;
import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
import org.wikipedia.feed.model.Thumbnail;
@@ -8,7 +9,7 @@
@SuppressWarnings("unused,NullableProblems") @NonNull private String title;
@SuppressWarnings("unused,NullableProblems") @NonNull private Thumbnail
thumbnail;
@SuppressWarnings("unused,NullableProblems") @NonNull private Thumbnail
image;
- @SuppressWarnings("unused,NullableProblems") @NonNull private Description
description;
+ @SuppressWarnings("unused") @Nullable private Description description;
@NonNull
public String title() {
@@ -25,9 +26,14 @@
return image;
}
- @NonNull
- public Description description() {
- return description;
+ @Nullable
+ public String description() {
+ return description == null ? null : description.text;
+ }
+
+ @Nullable
+ public String descriptionLang() {
+ return description == null ? null : description.lang;
}
/**
@@ -37,7 +43,7 @@
* returns the translation for the request Site language, if available.
Otherwise it defaults
* to providing the English translation.
*/
- public static class Description {
+ private static class Description {
@SuppressWarnings("unused,NullableProblems") @NonNull private String
text;
@SuppressWarnings("unused,NullableProblems") @NonNull private String
lang;
diff --git a/app/src/main/java/org/wikipedia/feed/image/FeaturedImageCard.java
b/app/src/main/java/org/wikipedia/feed/image/FeaturedImageCard.java
index 702093b..d05ecd1 100644
--- a/app/src/main/java/org/wikipedia/feed/image/FeaturedImageCard.java
+++ b/app/src/main/java/org/wikipedia/feed/image/FeaturedImageCard.java
@@ -2,6 +2,7 @@
import android.net.Uri;
import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
import org.wikipedia.R;
import org.wikipedia.Site;
@@ -44,15 +45,15 @@
return featuredImage.thumbnail().source();
}
- @NonNull
+ @Nullable
public String description() {
- return featuredImage.description().text();
+ return featuredImage.description();
}
//Expose the language of the returned description in case we want to hide
it if it doesn't match
//the request Site language
- @NonNull
+ @Nullable
public String descriptionLang() {
- return featuredImage.description().lang();
+ return featuredImage.descriptionLang();
}
}
diff --git
a/app/src/main/java/org/wikipedia/feed/image/FeaturedImageCardView.java
b/app/src/main/java/org/wikipedia/feed/image/FeaturedImageCardView.java
index eb4f788..de5aa4f 100644
--- a/app/src/main/java/org/wikipedia/feed/image/FeaturedImageCardView.java
+++ b/app/src/main/java/org/wikipedia/feed/image/FeaturedImageCardView.java
@@ -13,6 +13,7 @@
import org.wikipedia.feed.view.CardHeaderView;
import org.wikipedia.feed.view.FeedCardView;
import org.wikipedia.richtext.RichTextUtil;
+import org.wikipedia.util.StringUtil;
import org.wikipedia.views.ItemTouchHelperSwipeAdapter;
import org.wikipedia.views.ViewUtil;
@@ -37,7 +38,7 @@
this.card = card;
// TODO: superimpose text onto image thumb
image(card.image());
- description(card.description()); //Can check language before doing
this if we want
+ description(StringUtil.defaultIfNull(card.description(), "")); //Can
check language before doing this if we want
header(card);
footer();
onClickListener(new CardClickListener());
--
To view, visit https://gerrit.wikimedia.org/r/297812
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I1bd8efa0085f814054ba17dba19e36a1bfd39431
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Niedzielski <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
