mirror of
https://github.com/commons-app/apps-android-commons.git
synced 2025-10-26 20:33:53 +01:00
Upgrade version of UIL
This commit is contained in:
YuviPanda
parent
e50f50cabc
commit
6a99255a1e
5 changed files with 15 additions and 37 deletions
|
|
@ -36,14 +36,11 @@
|
|||
<content url="file://$MODULE_DIR$">
|
||||
<sourceFolder url="file://$MODULE_DIR$/target/generated-sources/r" isTestSource="false" />
|
||||
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/target/classes" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/target/generated-sources/combined-assets" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/target/generated-sources/combined-resources" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/target/generated-sources/extracted-dependencies" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/target/idea-classes" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/target/idea-test-classes" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/target/maven-archiver" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/target/unpack" />
|
||||
</content>
|
||||
<orderEntry type="sourceFolder" forTests="false" />
|
||||
<orderEntry type="library" name="Maven: org.mediawiki:api:1.3" level="project" />
|
||||
|
|
@ -53,10 +50,11 @@
|
|||
<orderEntry type="library" name="Maven: commons-logging:commons-logging:1.1.1" level="project" />
|
||||
<orderEntry type="library" name="Maven: commons-codec:commons-codec:1.6" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.apache.httpcomponents:httpmime:4.2.2" level="project" />
|
||||
<orderEntry type="library" name="Maven: com.actionbarsherlock:actionbarsherlock:apklib:4.2.0" level="project" />
|
||||
<orderEntry type="library" scope="PROVIDED" name="Maven: android:android:4.1_r2" level="project" />
|
||||
<orderEntry type="library" name="Maven: android.support:compatibility-v4:11" level="project" />
|
||||
<orderEntry type="library" name="Maven: de.akquinet.android.androlog:androlog:1.0.5" level="project" />
|
||||
<orderEntry type="library" name="Maven: com.nostra13.universalimageloader:universal-image-loader:1.7.1" level="project" />
|
||||
<orderEntry type="library" name="Maven: com.nostra13.universalimageloader:universal-image-loader:1.8.2" level="project" />
|
||||
<orderEntry type="library" name="Maven: ch.acra:acra:4.4.0" level="project" />
|
||||
<orderEntry type="library" name="Maven: de.keyboardsurfer.android.widget:crouton:1.7" level="project" />
|
||||
<orderEntry type="jdk" jdkName="Android 4.0.3 Platform" jdkType="Android SDK" />
|
||||
|
|
|
|||
|
|
@ -49,7 +49,7 @@
|
|||
<dependency>
|
||||
<groupId>com.nostra13.universalimageloader</groupId>
|
||||
<artifactId>universal-image-loader</artifactId>
|
||||
<version>1.7.1</version>
|
||||
<version>1.8.2</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>ch.acra</groupId>
|
||||
|
|
|
|||
|
|
@ -9,13 +9,14 @@ import android.accounts.*;
|
|||
import android.app.Application;
|
||||
import android.content.pm.PackageInfo;
|
||||
import android.content.pm.PackageManager;
|
||||
import android.graphics.Bitmap;
|
||||
import android.net.Uri;
|
||||
import android.os.Build;
|
||||
|
||||
import com.nostra13.universalimageloader.cache.disc.impl.TotalSizeLimitedDiscCache;
|
||||
import com.nostra13.universalimageloader.cache.memory.impl.LimitedAgeMemoryCache;
|
||||
import com.nostra13.universalimageloader.core.ImageLoader;
|
||||
import com.nostra13.universalimageloader.core.ImageLoaderConfiguration;
|
||||
import com.nostra13.universalimageloader.core.download.URLConnectionImageDownloader;
|
||||
import com.nostra13.universalimageloader.utils.StorageUtils;
|
||||
import org.acra.ACRA;
|
||||
import org.acra.ReportingInteractionMode;
|
||||
|
|
@ -73,15 +74,6 @@ public class CommonsApplication extends Application {
|
|||
return dbOpenHelper;
|
||||
}
|
||||
|
||||
public class ContentUriImageDownloader extends URLConnectionImageDownloader {
|
||||
@Override
|
||||
protected InputStream getStreamFromOtherSource(URI imageUri) throws IOException {
|
||||
if(imageUri.getScheme().equals("content")) {
|
||||
return getContentResolver().openInputStream(Uri.parse(imageUri.toString()));
|
||||
}
|
||||
throw new RuntimeException("Not a content URI: " + imageUri);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onCreate() {
|
||||
|
|
@ -94,7 +86,7 @@ public class CommonsApplication extends Application {
|
|||
|
||||
ImageLoaderConfiguration imageLoaderConfiguration = new ImageLoaderConfiguration.Builder(getApplicationContext())
|
||||
.discCache(new TotalSizeLimitedDiscCache(StorageUtils.getCacheDirectory(this), 128 * 1024 * 1024))
|
||||
.imageDownloader(new ContentUriImageDownloader()).build();
|
||||
.build();
|
||||
ImageLoader.getInstance().init(imageLoaderConfiguration);
|
||||
|
||||
try {
|
||||
|
|
|
|||
|
|
@ -26,6 +26,7 @@ import com.nostra13.universalimageloader.core.ImageLoader;
|
|||
import com.nostra13.universalimageloader.core.assist.FailReason;
|
||||
import com.nostra13.universalimageloader.core.assist.ImageLoadingListener;
|
||||
import com.nostra13.universalimageloader.core.assist.ImageScaleType;
|
||||
import com.nostra13.universalimageloader.core.assist.SimpleImageLoadingListener;
|
||||
import com.nostra13.universalimageloader.core.display.FadeInBitmapDisplayer;
|
||||
import org.wikimedia.commons.R;
|
||||
import org.wikimedia.commons.ShareActivity;
|
||||
|
|
@ -85,25 +86,16 @@ public class ContributionsListFragment extends SherlockFragment {
|
|||
String actualUrl = TextUtils.isEmpty(contribution.getImageUrl()) ? contribution.getLocalUri().toString() : contribution.getThumbnailUrl(320);
|
||||
|
||||
if(views.url == null || !views.url.equals(actualUrl)) {
|
||||
ImageLoader.getInstance().displayImage(actualUrl, views.imageView, contributionDisplayOptions, new ImageLoadingListener() {
|
||||
public void onLoadingStarted() {
|
||||
ImageLoader.getInstance().displayImage(actualUrl, views.imageView, contributionDisplayOptions, new SimpleImageLoadingListener() {
|
||||
|
||||
}
|
||||
|
||||
public void onLoadingFailed(FailReason failReason) {
|
||||
|
||||
}
|
||||
|
||||
public void onLoadingComplete(Bitmap bitmap) {
|
||||
if(bitmap.hasAlpha()) {
|
||||
@Override
|
||||
public void onLoadingComplete(String imageUri, View view, Bitmap loadedImage) {
|
||||
if(loadedImage.hasAlpha()) {
|
||||
views.imageView.setBackgroundResource(android.R.color.white);
|
||||
}
|
||||
views.seqNumView.setVisibility(View.GONE);
|
||||
}
|
||||
|
||||
public void onLoadingCancelled() {
|
||||
|
||||
}
|
||||
});
|
||||
views.url = actualUrl;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -55,30 +55,26 @@ public class MediaDetailFragment extends SherlockFragment {
|
|||
|
||||
String actualUrl = TextUtils.isEmpty(media.getImageUrl()) ? media.getLocalUri().toString() : media.getThumbnailUrl(640);
|
||||
ImageLoader.getInstance().displayImage(actualUrl, image, displayOptions, new ImageLoadingListener() {
|
||||
public void onLoadingStarted() {
|
||||
public void onLoadingStarted(String s, View view) {
|
||||
loadingProgress.setVisibility(View.VISIBLE);
|
||||
}
|
||||
|
||||
public void onLoadingFailed(FailReason failReason) {
|
||||
public void onLoadingFailed(String s, View view, FailReason failReason) {
|
||||
loadingProgress.setVisibility(View.GONE);
|
||||
loadingFailed.setVisibility(View.VISIBLE);
|
||||
|
||||
}
|
||||
|
||||
public void onLoadingComplete(Bitmap bitmap) {
|
||||
public void onLoadingComplete(String s, View view, Bitmap bitmap) {
|
||||
loadingProgress.setVisibility(View.GONE);
|
||||
loadingFailed.setVisibility(View.GONE);
|
||||
image.setVisibility(View.VISIBLE);
|
||||
if(bitmap.hasAlpha()) {
|
||||
image.setBackgroundResource(android.R.color.white);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
public void onLoadingCancelled() {
|
||||
// wat?
|
||||
public void onLoadingCancelled(String s, View view) {
|
||||
throw new RuntimeException("Image loading cancelled. But why?");
|
||||
|
||||
}
|
||||
});
|
||||
title.setText(media.getDisplayTitle());
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue