jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/405319 )
Change subject: Improve failure behavior of FaceAndColorDetectImageView.
......................................................................
Improve failure behavior of FaceAndColorDetectImageView.
When the loading of an image into this component fails, it was doing
nothing, which was resulting in an empty white background.
This patch makes it load our default lead-image placeholder in case the
image loading fails.
Change-Id: Id791782f7aa89ab56592b1d831365b3266235545
---
M
app/src/main/java/org/wikipedia/feed/view/HorizontalScrollingListCardItemView.java
M app/src/main/java/org/wikipedia/views/FaceAndColorDetectImageView.java
2 files changed, 11 insertions(+), 7 deletions(-)
Approvals:
jenkins-bot: Verified
Cooltey: Looks good to me, approved
diff --git
a/app/src/main/java/org/wikipedia/feed/view/HorizontalScrollingListCardItemView.java
b/app/src/main/java/org/wikipedia/feed/view/HorizontalScrollingListCardItemView.java
index 3b54686..9331585 100644
---
a/app/src/main/java/org/wikipedia/feed/view/HorizontalScrollingListCardItemView.java
+++
b/app/src/main/java/org/wikipedia/feed/view/HorizontalScrollingListCardItemView.java
@@ -44,7 +44,11 @@
}
public void setImage(@Nullable Uri image) {
- imageView.loadImage(image);
+ if (image == null) {
+ imageView.loadImage(R.drawable.lead_default);
+ } else {
+ imageView.loadImage(image);
+ }
}
public View getImageView() {
diff --git
a/app/src/main/java/org/wikipedia/views/FaceAndColorDetectImageView.java
b/app/src/main/java/org/wikipedia/views/FaceAndColorDetectImageView.java
index 2f0ec38..0c9ba8a 100644
--- a/app/src/main/java/org/wikipedia/views/FaceAndColorDetectImageView.java
+++ b/app/src/main/java/org/wikipedia/views/FaceAndColorDetectImageView.java
@@ -14,6 +14,8 @@
import com.facebook.drawee.view.SimpleDraweeView;
import com.facebook.imagepipeline.request.ImageRequestBuilder;
+import org.wikipedia.R;
+
import static org.wikipedia.settings.Prefs.isImageDownloadEnabled;
public class FaceAndColorDetectImageView extends SimpleDraweeView {
@@ -64,18 +66,16 @@
private class DefaultListener implements OnImageLoadListener {
@Override
public void onImageLoaded(int bmpHeight, @Nullable final PointF
faceLocation, @ColorInt int mainColor) {
- post(new Runnable() {
- @Override
- public void run() {
- if (faceLocation != null) {
- getHierarchy().setActualImageFocusPoint(faceLocation);
- }
+ post(() -> {
+ if (faceLocation != null) {
+ getHierarchy().setActualImageFocusPoint(faceLocation);
}
});
}
@Override
public void onImageFailed() {
+ post(() -> setActualImageResource(R.drawable.lead_default));
}
}
}
--
To view, visit https://gerrit.wikimedia.org/r/405319
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Id791782f7aa89ab56592b1d831365b3266235545
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Dbrant <[email protected]>
Gerrit-Reviewer: Brion VIBBER <[email protected]>
Gerrit-Reviewer: Cooltey <[email protected]>
Gerrit-Reviewer: Dbrant <[email protected]>
Gerrit-Reviewer: Sharvaniharan <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
