Brion VIBBER has uploaded a new change for review.
https://gerrit.wikimedia.org/r/98579
Change subject: Use empty placeholder while loading, CTA placeholder only for
known missing images
......................................................................
Use empty placeholder while loading, CTA placeholder only for known missing
images
Change-Id: Iffa2330e3807fc82d24df011617a5e4a24073374
---
A wikipedia/res/drawable-mdpi/transparent.png
M wikipedia/src/main/java/org/wikimedia/wikipedia/SearchArticlesFragment.java
2 files changed, 11 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia
refs/changes/79/98579/1
diff --git a/wikipedia/res/drawable-mdpi/transparent.png
b/wikipedia/res/drawable-mdpi/transparent.png
new file mode 100644
index 0000000..73f7e3f
--- /dev/null
+++ b/wikipedia/res/drawable-mdpi/transparent.png
Binary files differ
diff --git
a/wikipedia/src/main/java/org/wikimedia/wikipedia/SearchArticlesFragment.java
b/wikipedia/src/main/java/org/wikimedia/wikipedia/SearchArticlesFragment.java
index e821ae4..cdcd043 100644
---
a/wikipedia/src/main/java/org/wikimedia/wikipedia/SearchArticlesFragment.java
+++
b/wikipedia/src/main/java/org/wikimedia/wikipedia/SearchArticlesFragment.java
@@ -22,6 +22,7 @@
private static final int DELAY_MILLIS = 300;
private static final int MESSAGE_SEARCH = 1;
+ public static final String NO_IMAGE_AVAILABLE = "x-wikipedia-no-image:";
private WikipediaApp app;
private EditText searchTermText;
@@ -66,6 +67,7 @@
public void onFinish(Map<PageTitle, String> result) {
for(Map.Entry<PageTitle, String> entry :
result.entrySet()) {
if (entry.getValue() == null) {
+
pageImagesCache.put(entry.getKey().getPrefixedText(), NO_IMAGE_AVAILABLE);
continue;
}
pageImagesCache.put(entry.getKey().getPrefixedText(),
entry.getValue());
@@ -220,14 +222,20 @@
String thumbnail = pageImagesCache.get(title.getPrefixedText());
if (thumbnail == null) {
+ // Null -- no data yet!
Picasso.with(getActivity())
- .load(R.drawable.ic_pageimage_placeholder)
+ .load(R.drawable.transparent)
.into(imageView);
+ } else if (thumbnail.equals(NO_IMAGE_AVAILABLE)) {
+ // Known to have no image available! Show the icon with an
upload call to action!
+ Picasso.with(getActivity())
+ .load(R.drawable.ic_pageimage_placeholder)
+ .into(imageView);
} else {
+ // Load the pretty image!
Picasso.with(getActivity())
.load(thumbnail)
- .placeholder(R.drawable.ic_pageimage_placeholder)
-
.error(R.drawable.ic_pageimage_placeholder)
+ .placeholder(R.drawable.transparent)
.into(imageView);
}
--
To view, visit https://gerrit.wikimedia.org/r/98579
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iffa2330e3807fc82d24df011617a5e4a24073374
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Brion VIBBER <br...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
