mnalis/apps-android-commons
1
0
Fork 0
mirror of https://github.com/commons-app/apps-android-commons.git synced 2025-10-26 12:23:58 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Load images from local disk if possible

Browse source 
Change-Id: I21c477131d714dde6029db7193ab1063809581b5
This commit is contained in:
YuviPanda 2013-10-24 01:27:18 +05:30
parent fed215a37a
commit 1824176c81
2 changed files with 11 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

12
commons/src/main/java/org/wikimedia/commons/contributions/ContributionsListAdapter.java
View file

@ -7,10 +7,12 @@ import android.graphics.Bitmap;
import android.graphics.drawable.BitmapDrawable; import android.graphics.drawable.BitmapDrawable;
import android.support.v4.widget.CursorAdapter; import android.support.v4.widget.CursorAdapter;
import android.text.TextUtils; import android.text.TextUtils;
import android.util.Log;
import android.view.View; import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
import com.actionbarsherlock.app.SherlockFragment; import com.actionbarsherlock.app.SherlockFragment;
import com.nostra13.universalimageloader.core.DisplayImageOptions; import com.nostra13.universalimageloader.core.DisplayImageOptions;
import com.nostra13.universalimageloader.core.assist.FailReason;
import com.nostra13.universalimageloader.core.assist.SimpleImageLoadingListener; import com.nostra13.universalimageloader.core.assist.SimpleImageLoadingListener;
import org.wikimedia.commons.CommonsApplication; import org.wikimedia.commons.CommonsApplication;
import org.wikimedia.commons.MediaWikiImageView; import org.wikimedia.commons.MediaWikiImageView;
@ -37,9 +39,9 @@ class ContributionsListAdapter extends CursorAdapter {
@Override @Override
public void bindView(View view, Context context, Cursor cursor) { public void bindView(View view, Context context, Cursor cursor) {
final ContributionViewHolder views = (ContributionViewHolder)view.getTag(); final ContributionViewHolder views = (ContributionViewHolder)view.getTag();
Contribution contribution = Contribution.fromCursor(cursor); final Contribution contribution = Contribution.fromCursor(cursor);
String actualUrl = (contribution.getLocalUri() != null && TextUtils.isEmpty(contribution.getLocalUri().toString())) ? contribution.getLocalUri().toString() : contribution.getThumbnailUrl(640); String actualUrl = (contribution.getLocalUri() != null && !TextUtils.isEmpty(contribution.getLocalUri().toString())) ? contribution.getLocalUri().toString() : contribution.getThumbnailUrl(640);
if(views.url == null || !views.url.equals(actualUrl)) { if(views.url == null || !views.url.equals(actualUrl)) {
if(actualUrl.startsWith("http")) { if(actualUrl.startsWith("http")) {
@ -57,6 +59,12 @@ class ContributionsListAdapter extends CursorAdapter {
views.seqNumView.setVisibility(View.GONE); views.seqNumView.setVisibility(View.GONE);
} }
@Override
public void onLoadingFailed(String imageUri, View view, FailReason failReason) {
super.onLoadingFailed(imageUri, view, failReason);
MediaWikiImageView mwImageView = (MediaWikiImageView)views.imageView;
mwImageView.setMedia(contribution, ((CommonsApplication) activity.getApplicationContext()).getImageLoader());
}
}); });
} }
views.url = actualUrl; views.url = actualUrl;

2
commons/src/main/java/org/wikimedia/commons/media/MediaDetailFragment.java
View file

@ -168,7 +168,7 @@ public class MediaDetailFragment extends SherlockFragment {
} }
private void displayMediaDetails(final Media media) { private void displayMediaDetails(final Media media) {
String actualUrl = (media.getLocalUri() != null && TextUtils.isEmpty(media.getLocalUri().toString())) ? media.getLocalUri().toString() : media.getThumbnailUrl(640); String actualUrl = (media.getLocalUri() != null && !TextUtils.isEmpty(media.getLocalUri().toString())) ? media.getLocalUri().toString() : media.getThumbnailUrl(640);
if(actualUrl.startsWith("http")) { if(actualUrl.startsWith("http")) {
ImageLoader loader = ((CommonsApplication)getActivity().getApplicationContext()).getImageLoader(); ImageLoader loader = ((CommonsApplication)getActivity().getApplicationContext()).getImageLoader();
MediaWikiImageView mwImage = (MediaWikiImageView)image; MediaWikiImageView mwImage = (MediaWikiImageView)image;