diff --git a/commons/src/main/java/org/wikimedia/commons/MultipleUploadListFragment.java b/commons/src/main/java/org/wikimedia/commons/MultipleUploadListFragment.java index d3c4464ec..b1a227b41 100644 --- a/commons/src/main/java/org/wikimedia/commons/MultipleUploadListFragment.java +++ b/commons/src/main/java/org/wikimedia/commons/MultipleUploadListFragment.java @@ -146,13 +146,8 @@ public class MultipleUploadListFragment extends SherlockFragment { @Override public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - uploadDisplayOptions = new DisplayImageOptions.Builder().cacheInMemory() - .imageScaleType(ImageScaleType.IN_SAMPLE_POWER_OF_2) - .displayer(new FadeInBitmapDisplayer(300)) - .cacheInMemory() - .resetViewBeforeLoading().build(); - + uploadDisplayOptions = Utils.getGenericDisplayOptions().build(); } @Override diff --git a/commons/src/main/java/org/wikimedia/commons/Utils.java b/commons/src/main/java/org/wikimedia/commons/Utils.java index 7be21f8a5..3a6a4b99f 100644 --- a/commons/src/main/java/org/wikimedia/commons/Utils.java +++ b/commons/src/main/java/org/wikimedia/commons/Utils.java @@ -2,6 +2,9 @@ package org.wikimedia.commons; import android.os.AsyncTask; import android.os.Build; +import com.nostra13.universalimageloader.core.DisplayImageOptions; +import com.nostra13.universalimageloader.core.assist.ImageScaleType; +import com.nostra13.universalimageloader.core.display.FadeInBitmapDisplayer; import org.apache.commons.codec.EncoderException; import org.apache.commons.codec.binary.Hex; import org.apache.commons.codec.digest.DigestUtils; @@ -78,6 +81,18 @@ public class Utils { } } + private static DisplayImageOptions.Builder defaultImageOptionsBuilder; + public static DisplayImageOptions.Builder getGenericDisplayOptions() { + if(defaultImageOptionsBuilder == null) { + defaultImageOptionsBuilder = new DisplayImageOptions.Builder().cacheInMemory() + .imageScaleType(ImageScaleType.IN_SAMPLE_POWER_OF_2) + .displayer(new FadeInBitmapDisplayer(300)) + .cacheInMemory() + .resetViewBeforeLoading(); + } + return defaultImageOptionsBuilder; + } + private static final URLCodec urlCodec = new URLCodec(); public static String urlEncode(String url) { diff --git a/commons/src/main/java/org/wikimedia/commons/contributions/ContributionsListFragment.java b/commons/src/main/java/org/wikimedia/commons/contributions/ContributionsListFragment.java index 49f83551a..c4b2c0264 100644 --- a/commons/src/main/java/org/wikimedia/commons/contributions/ContributionsListFragment.java +++ b/commons/src/main/java/org/wikimedia/commons/contributions/ContributionsListFragment.java @@ -31,6 +31,7 @@ import com.nostra13.universalimageloader.core.display.FadeInBitmapDisplayer; import org.wikimedia.commons.R; import org.wikimedia.commons.ShareActivity; import org.wikimedia.commons.UploadService; +import org.wikimedia.commons.Utils; import java.io.File; import java.io.IOException; @@ -245,12 +246,7 @@ public class ContributionsListFragment extends SherlockFragment { super.onActivityCreated(savedInstanceState); contributionsList = (GridView)getView().findViewById(R.id.contributionsList); - contributionDisplayOptions = new DisplayImageOptions.Builder().cacheInMemory() - .imageScaleType(ImageScaleType.IN_SAMPLE_POWER_OF_2) - .displayer(new FadeInBitmapDisplayer(300)) - .cacheInMemory() - .cacheOnDisc() - .resetViewBeforeLoading().build(); + contributionDisplayOptions = Utils.getGenericDisplayOptions().build(); contributionsList.setOnItemClickListener((AdapterView.OnItemClickListener)getActivity()); if(savedInstanceState != null) { diff --git a/commons/src/main/java/org/wikimedia/commons/media/MediaDetailFragment.java b/commons/src/main/java/org/wikimedia/commons/media/MediaDetailFragment.java index 4151e1657..3d6fa116c 100644 --- a/commons/src/main/java/org/wikimedia/commons/media/MediaDetailFragment.java +++ b/commons/src/main/java/org/wikimedia/commons/media/MediaDetailFragment.java @@ -18,6 +18,7 @@ import com.nostra13.universalimageloader.core.assist.ImageScaleType; import com.nostra13.universalimageloader.core.display.FadeInBitmapDisplayer; import org.wikimedia.commons.Media; import org.wikimedia.commons.R; +import org.wikimedia.commons.Utils; public class MediaDetailFragment extends SherlockFragment { @@ -86,11 +87,6 @@ public class MediaDetailFragment extends SherlockFragment { public void onActivityCreated(Bundle savedInstanceState) { super.onActivityCreated(savedInstanceState); - displayOptions = new DisplayImageOptions.Builder().cacheInMemory() - .imageScaleType(ImageScaleType.IN_SAMPLE_POWER_OF_2) - .displayer(new FadeInBitmapDisplayer(300)) - .cacheInMemory() - .cacheOnDisc() - .resetViewBeforeLoading().build(); + displayOptions = Utils.getGenericDisplayOptions().build(); } }