mirror of
https://github.com/commons-app/apps-android-commons.git
synced 2025-10-27 21:03:54 +01:00
* Fixed #4908 : Thumbnail image is grey during upload * Test Added and minor changes
This commit is contained in:
parent
4ba463c6b2
commit
e58322ed63
2 changed files with 54 additions and 4 deletions
|
|
@ -3,6 +3,7 @@ package fr.free.nrw.commons.contributions;
|
|||
import android.net.Uri;
|
||||
import android.text.TextUtils;
|
||||
import android.view.View;
|
||||
import android.webkit.URLUtil;
|
||||
import android.widget.ImageButton;
|
||||
import android.widget.ProgressBar;
|
||||
import android.widget.RelativeLayout;
|
||||
|
|
@ -23,6 +24,7 @@ import fr.free.nrw.commons.media.MediaClient;
|
|||
import io.reactivex.android.schedulers.AndroidSchedulers;
|
||||
import io.reactivex.disposables.CompositeDisposable;
|
||||
import io.reactivex.schedulers.Schedulers;
|
||||
import java.io.File;
|
||||
|
||||
public class ContributionViewHolder extends RecyclerView.ViewHolder {
|
||||
|
||||
|
|
@ -58,6 +60,7 @@ public class ContributionViewHolder extends RecyclerView.ViewHolder {
|
|||
private boolean isWikipediaButtonDisplayed;
|
||||
private AlertDialog pausingPopUp;
|
||||
private View parent;
|
||||
private ImageRequest imageRequest;
|
||||
|
||||
ContributionViewHolder(final View parent, final Callback callback,
|
||||
final MediaClient mediaClient) {
|
||||
|
|
@ -96,11 +99,18 @@ public class ContributionViewHolder extends RecyclerView.ViewHolder {
|
|||
final String imageSource = chooseImageSource(contribution.getMedia().getThumbUrl(),
|
||||
contribution.getLocalUri());
|
||||
if (!TextUtils.isEmpty(imageSource)) {
|
||||
final ImageRequest imageRequest =
|
||||
ImageRequestBuilder.newBuilderWithSource(Uri.parse(imageSource))
|
||||
if (URLUtil.isHttpsUrl(imageSource)) {
|
||||
imageRequest = ImageRequestBuilder.newBuilderWithSource(Uri.parse(imageSource))
|
||||
.setProgressiveRenderingEnabled(true)
|
||||
.build();
|
||||
imageView.setImageRequest(imageRequest);
|
||||
} else if(imageSource != null) {
|
||||
final File file = new File(imageSource);
|
||||
imageRequest = ImageRequest.fromFile(file);
|
||||
}
|
||||
|
||||
if(imageRequest != null){
|
||||
imageView.setImageRequest(imageRequest);
|
||||
}
|
||||
}
|
||||
|
||||
seqNumView.setText(String.valueOf(position + 1));
|
||||
|
|
@ -280,4 +290,8 @@ public class ContributionViewHolder extends RecyclerView.ViewHolder {
|
|||
pauseResumeButton.setImageResource(R.drawable.play_icon);
|
||||
pauseResumeButton.setTag(parent.getContext().getString(R.string.resume));
|
||||
}
|
||||
|
||||
public ImageRequest getImageRequest() {
|
||||
return imageRequest;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue