Skip to content

Commit 5ae337c

Browse files
committed
Move UIL Image Display Options building to common method
1 parent da3e40b commit 5ae337c

File tree

4 files changed

+20
-18
lines changed

4 files changed

+20
-18
lines changed

commons/src/main/java/org/wikimedia/commons/MultipleUploadListFragment.java

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -146,13 +146,8 @@ public void afterTextChanged(Editable editable) {
146146
@Override
147147
public void onCreate(Bundle savedInstanceState) {
148148
super.onCreate(savedInstanceState);
149-
uploadDisplayOptions = new DisplayImageOptions.Builder().cacheInMemory()
150-
.imageScaleType(ImageScaleType.IN_SAMPLE_POWER_OF_2)
151-
.displayer(new FadeInBitmapDisplayer(300))
152-
.cacheInMemory()
153-
.resetViewBeforeLoading().build();
154-
155149

150+
uploadDisplayOptions = Utils.getGenericDisplayOptions().build();
156151
}
157152

158153
@Override

commons/src/main/java/org/wikimedia/commons/Utils.java

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@
22

33
import android.os.AsyncTask;
44
import android.os.Build;
5+
import com.nostra13.universalimageloader.core.DisplayImageOptions;
6+
import com.nostra13.universalimageloader.core.assist.ImageScaleType;
7+
import com.nostra13.universalimageloader.core.display.FadeInBitmapDisplayer;
58
import org.apache.commons.codec.EncoderException;
69
import org.apache.commons.codec.binary.Hex;
710
import org.apache.commons.codec.digest.DigestUtils;
@@ -78,6 +81,18 @@ static public <T> void executeAsyncTask(AsyncTask<T, ?, ?> task,
7881
}
7982
}
8083

84+
private static DisplayImageOptions.Builder defaultImageOptionsBuilder;
85+
public static DisplayImageOptions.Builder getGenericDisplayOptions() {
86+
if(defaultImageOptionsBuilder == null) {
87+
defaultImageOptionsBuilder = new DisplayImageOptions.Builder().cacheInMemory()
88+
.imageScaleType(ImageScaleType.IN_SAMPLE_POWER_OF_2)
89+
.displayer(new FadeInBitmapDisplayer(300))
90+
.cacheInMemory()
91+
.resetViewBeforeLoading();
92+
}
93+
return defaultImageOptionsBuilder;
94+
}
95+
8196
private static final URLCodec urlCodec = new URLCodec();
8297

8398
public static String urlEncode(String url) {

commons/src/main/java/org/wikimedia/commons/contributions/ContributionsListFragment.java

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131
import org.wikimedia.commons.R;
3232
import org.wikimedia.commons.ShareActivity;
3333
import org.wikimedia.commons.UploadService;
34+
import org.wikimedia.commons.Utils;
3435

3536
import java.io.File;
3637
import java.io.IOException;
@@ -245,12 +246,7 @@ public void onActivityCreated(Bundle savedInstanceState) {
245246
super.onActivityCreated(savedInstanceState);
246247

247248
contributionsList = (GridView)getView().findViewById(R.id.contributionsList);
248-
contributionDisplayOptions = new DisplayImageOptions.Builder().cacheInMemory()
249-
.imageScaleType(ImageScaleType.IN_SAMPLE_POWER_OF_2)
250-
.displayer(new FadeInBitmapDisplayer(300))
251-
.cacheInMemory()
252-
.cacheOnDisc()
253-
.resetViewBeforeLoading().build();
249+
contributionDisplayOptions = Utils.getGenericDisplayOptions().build();
254250

255251
contributionsList.setOnItemClickListener((AdapterView.OnItemClickListener)getActivity());
256252
if(savedInstanceState != null) {

commons/src/main/java/org/wikimedia/commons/media/MediaDetailFragment.java

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
import com.nostra13.universalimageloader.core.display.FadeInBitmapDisplayer;
1919
import org.wikimedia.commons.Media;
2020
import org.wikimedia.commons.R;
21+
import org.wikimedia.commons.Utils;
2122

2223
public class MediaDetailFragment extends SherlockFragment {
2324

@@ -86,11 +87,6 @@ public void onLoadingCancelled(String s, View view) {
8687
public void onActivityCreated(Bundle savedInstanceState) {
8788
super.onActivityCreated(savedInstanceState);
8889

89-
displayOptions = new DisplayImageOptions.Builder().cacheInMemory()
90-
.imageScaleType(ImageScaleType.IN_SAMPLE_POWER_OF_2)
91-
.displayer(new FadeInBitmapDisplayer(300))
92-
.cacheInMemory()
93-
.cacheOnDisc()
94-
.resetViewBeforeLoading().build();
90+
displayOptions = Utils.getGenericDisplayOptions().build();
9591
}
9692
}

0 commit comments

Comments
 (0)