From f3b247dc81ba79a86cc9a7793955c98962379320 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Mart=C3=AD?= Date: Wed, 25 Dec 2013 20:11:26 +0100 Subject: [PATCH] Don't override old DisplayImageOptions entirely --- src/org/fdroid/fdroid/AppDetails.java | 18 +++++++++++++++++- src/org/fdroid/fdroid/FDroidApp.java | 13 ------------- .../fdroid/fdroid/views/AppListAdapter.java | 18 +++++++++++++----- 3 files changed, 30 insertions(+), 19 deletions(-) diff --git a/src/org/fdroid/fdroid/AppDetails.java b/src/org/fdroid/fdroid/AppDetails.java index 345a7a1e0..c8ed91e24 100644 --- a/src/org/fdroid/fdroid/AppDetails.java +++ b/src/org/fdroid/fdroid/AppDetails.java @@ -62,6 +62,7 @@ import android.view.SubMenu; import android.view.View; import android.view.ViewGroup; import android.widget.BaseAdapter; +import android.graphics.Bitmap; import android.support.v4.app.NavUtils; import android.support.v4.view.MenuItemCompat; @@ -71,7 +72,10 @@ import org.fdroid.fdroid.compat.ActionBarCompat; import org.fdroid.fdroid.compat.MenuManager; import org.fdroid.fdroid.DB.CommaSeparatedList; +import com.nostra13.universalimageloader.core.display.FadeInBitmapDisplayer; +import com.nostra13.universalimageloader.core.DisplayImageOptions; import com.nostra13.universalimageloader.core.ImageLoader; +import com.nostra13.universalimageloader.core.assist.ImageScaleType; public class AppDetails extends ListActivity { @@ -198,6 +202,7 @@ public class AppDetails extends ListActivity { View infoView; private final Context mctx = this; + private DisplayImageOptions displayImageOptions; @Override protected void onCreate(Bundle savedInstanceState) { @@ -205,6 +210,16 @@ public class AppDetails extends ListActivity { ((FDroidApp) getApplication()).applyTheme(this); super.onCreate(savedInstanceState); + + displayImageOptions = new DisplayImageOptions.Builder() + .cacheInMemory(true) + .cacheOnDisc(true) + .imageScaleType(ImageScaleType.NONE) + .showImageOnLoading(R.drawable.ic_repo_app_default) + .showImageForEmptyUri(R.drawable.ic_repo_app_default) + .bitmapConfig(Bitmap.Config.RGB_565) + .build(); + ActionBarCompat abCompat = ActionBarCompat.create(this); abCompat.setDisplayHomeAsUpEnabled(true); @@ -413,7 +428,8 @@ public class AppDetails extends ListActivity { // Set the icon... ImageView iv = (ImageView) findViewById(R.id.icon); - ImageLoader.getInstance().displayImage(app.iconUrl, iv); + ImageLoader.getInstance().displayImage(app.iconUrl, iv, + displayImageOptions); // Set the title and other header details... TextView tv = (TextView) findViewById(R.id.title); diff --git a/src/org/fdroid/fdroid/FDroidApp.java b/src/org/fdroid/fdroid/FDroidApp.java index 3a8eb607f..f8ed94acf 100644 --- a/src/org/fdroid/fdroid/FDroidApp.java +++ b/src/org/fdroid/fdroid/FDroidApp.java @@ -30,13 +30,10 @@ import android.preference.PreferenceManager; import android.util.Log; import android.content.Context; import android.content.SharedPreferences; -import android.graphics.Bitmap; import com.nostra13.universalimageloader.utils.StorageUtils; import com.nostra13.universalimageloader.cache.disc.impl.UnlimitedDiscCache; import com.nostra13.universalimageloader.cache.disc.naming.FileNameGenerator; -import com.nostra13.universalimageloader.core.display.FadeInBitmapDisplayer; -import com.nostra13.universalimageloader.core.DisplayImageOptions; import com.nostra13.universalimageloader.core.ImageLoader; import com.nostra13.universalimageloader.core.ImageLoaderConfiguration; @@ -102,15 +99,6 @@ public class FDroidApp extends Application { DB.initDB(ctx); UpdateService.schedule(ctx); - DisplayImageOptions options = new DisplayImageOptions.Builder() - .cacheInMemory(true) - .cacheOnDisc(true) - .showImageOnLoading(R.drawable.ic_repo_app_default) - .showImageForEmptyUri(R.drawable.ic_repo_app_default) - .displayer(new FadeInBitmapDisplayer(200, true, true, false)) - .bitmapConfig(Bitmap.Config.RGB_565) - .build(); - ImageLoaderConfiguration config = new ImageLoaderConfiguration.Builder(ctx) .discCache(new UnlimitedDiscCache( new File(StorageUtils.getCacheDirectory(ctx), "icons"), @@ -120,7 +108,6 @@ public class FDroidApp extends Application { return imageUri.substring( imageUri.lastIndexOf('/') + 1); } } )) - .defaultDisplayImageOptions(options) .threadPoolSize(Runtime.getRuntime().availableProcessors() * 2) .build(); ImageLoader.getInstance().init(config); diff --git a/src/org/fdroid/fdroid/views/AppListAdapter.java b/src/org/fdroid/fdroid/views/AppListAdapter.java index 0289b752c..535475953 100644 --- a/src/org/fdroid/fdroid/views/AppListAdapter.java +++ b/src/org/fdroid/fdroid/views/AppListAdapter.java @@ -8,12 +8,14 @@ import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; import android.widget.*; +import android.graphics.Bitmap; import org.fdroid.fdroid.DB; import org.fdroid.fdroid.Preferences; import org.fdroid.fdroid.R; import org.fdroid.fdroid.compat.LayoutCompat; +import com.nostra13.universalimageloader.core.display.FadeInBitmapDisplayer; import com.nostra13.universalimageloader.core.DisplayImageOptions; import com.nostra13.universalimageloader.core.ImageLoader; import com.nostra13.universalimageloader.core.assist.ImageScaleType; @@ -27,11 +29,17 @@ abstract public class AppListAdapter extends BaseAdapter { public AppListAdapter(Context context) { mContext = context; - DisplayImageOptions.Builder builder = new DisplayImageOptions.Builder(); - builder.imageScaleType(ImageScaleType.NONE); // let android scale - builder.resetViewBeforeLoading(true); // required for multiple loading - builder.cacheInMemory(true); // default even if doc says otherwise - displayImageOptions = builder.build(); + displayImageOptions = new DisplayImageOptions.Builder() + .cacheInMemory(true) + .cacheOnDisc(true) + .imageScaleType(ImageScaleType.NONE) + .resetViewBeforeLoading(true) + .showImageOnLoading(R.drawable.ic_repo_app_default) + .showImageForEmptyUri(R.drawable.ic_repo_app_default) + .displayer(new FadeInBitmapDisplayer(200, true, true, false)) + .bitmapConfig(Bitmap.Config.RGB_565) + .build(); + } abstract protected boolean showStatusUpdate();