Skip to content

Commit 06a6f83

Browse files
nostra13nostra13
committed
Sample: Change root package
1 parent c6e9bf1 commit 06a6f83

13 files changed

+78
-61
lines changed

‎sample/AndroidManifest.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
3-
package="com.nostra13.example.universalimageloader"
3+
package="com.nostra13.universalimageloader.sample"
44
android:versionCode="39"
55
android:versionName="1.9.4" >
66

‎sample/src/com/nostra13/example/universalimageloader/Constants.java ‎sample/src/com/nostra13/universalimageloader/sample/Constants.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*******************************************************************************/
16-
package com.nostra13.example.universalimageloader;
16+
package com.nostra13.universalimageloader.sample;
1717

1818
/**
1919
* @author Sergey Tarasevich (nostra13[at]gmail[dot]com)
@@ -151,7 +151,7 @@ public final class Constants {
151151
"http://4.bp.blogspot.com/-LEvwF87bbyU/Uicaskm-g6I/AAAAAAAAZ2c/V-WZZAvFg5I/s800/Pesto+Guacamole+500w+0268.jpg", // Image with "Mark has been invalidated" problem
152152
"file:///sdcard/Universal Image Loader @#&=+-_.,!()~'%20.png", // Image from SD card with encoded symbols
153153
"assets://Living Things @#&=+-_.,!()~'%20.jpg", // Image from assets
154-
"drawable://" + R.drawable.ic_launcher, // Image from drawables
154+
"drawable://" + com.nostra13.universalimageloader.R.drawable.ic_launcher, // Image from drawables
155155
"http://upload.wikimedia.org/wikipedia/ru/b/b6/Как_кот_с_мышами_воевал.png", // Link with UTF-8
156156
"https://www.eff.org/sites/default/files/chrome150_0.jpg", // Image from HTTPS
157157
"http://bit.ly/soBiXr", // Redirect link

‎sample/src/com/nostra13/example/universalimageloader/UILApplication.java ‎sample/src/com/nostra13/universalimageloader/sample/UILApplication.java

+2-3
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,13 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*******************************************************************************/
16-
package com.nostra13.example.universalimageloader;
16+
package com.nostra13.universalimageloader.sample;
1717

1818
import android.annotation.TargetApi;
1919
import android.app.Application;
2020
import android.content.Context;
2121
import android.os.Build;
2222
import android.os.StrictMode;
23-
import com.nostra13.example.universalimageloader.Constants.Config;
2423
import com.nostra13.universalimageloader.cache.disc.naming.Md5FileNameGenerator;
2524
import com.nostra13.universalimageloader.core.ImageLoader;
2625
import com.nostra13.universalimageloader.core.ImageLoaderConfiguration;
@@ -34,7 +33,7 @@ public class UILApplication extends Application {
3433
@SuppressWarnings("unused")
3534
@Override
3635
public void onCreate() {
37-
if (Config.DEVELOPER_MODE && Build.VERSION.SDK_INT >= Build.VERSION_CODES.GINGERBREAD) {
36+
if (Constants.Config.DEVELOPER_MODE && Build.VERSION.SDK_INT >= Build.VERSION_CODES.GINGERBREAD) {
3837
StrictMode.setThreadPolicy(new StrictMode.ThreadPolicy.Builder().detectAll().penaltyDialog().build());
3938
StrictMode.setVmPolicy(new StrictMode.VmPolicy.Builder().detectAll().penaltyDeath().build());
4039
}

‎sample/src/com/nostra13/example/universalimageloader/activity/ComplexImageActivity.java ‎sample/src/com/nostra13/universalimageloader/sample/activity/ComplexImageActivity.java

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*******************************************************************************
2-
* Copyright 2011-2013 Sergey Tarasevich
2+
* Copyright 2014 Sergey Tarasevich
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -13,17 +13,17 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*******************************************************************************/
16-
package com.nostra13.example.universalimageloader.activity;
16+
package com.nostra13.universalimageloader.sample.activity;
1717

1818
import android.os.Bundle;
1919
import android.support.v4.app.Fragment;
2020
import android.support.v4.app.FragmentActivity;
2121
import android.support.v4.app.FragmentManager;
2222
import android.support.v4.app.FragmentPagerAdapter;
2323
import android.support.v4.view.ViewPager;
24-
import com.nostra13.example.universalimageloader.fragment.ImageGridFragment;
25-
import com.nostra13.example.universalimageloader.fragment.ImageListFragment;
26-
import com.nostra13.example.universalimageloader.R;
24+
import com.nostra13.universalimageloader.sample.R;
25+
import com.nostra13.universalimageloader.sample.fragment.ImageGridFragment;
26+
import com.nostra13.universalimageloader.sample.fragment.ImageListFragment;
2727

2828
/**
2929
* @author Sergey Tarasevich (nostra13[at]gmail[dot]com)

‎sample/src/com/nostra13/example/universalimageloader/activity/HomeActivity.java ‎sample/src/com/nostra13/universalimageloader/sample/activity/HomeActivity.java

+29-7
Original file line numberDiff line numberDiff line change
@@ -13,19 +13,21 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*******************************************************************************/
16-
package com.nostra13.example.universalimageloader.activity;
16+
package com.nostra13.universalimageloader.sample.activity;
1717

1818
import android.app.Activity;
1919
import android.content.Intent;
2020
import android.os.Bundle;
21+
import android.view.Menu;
22+
import android.view.MenuItem;
2123
import android.view.View;
22-
import com.nostra13.example.universalimageloader.Constants;
23-
import com.nostra13.example.universalimageloader.R;
24-
import com.nostra13.example.universalimageloader.fragment.ImageGalleryFragment;
25-
import com.nostra13.example.universalimageloader.fragment.ImageGridFragment;
26-
import com.nostra13.example.universalimageloader.fragment.ImageListFragment;
27-
import com.nostra13.example.universalimageloader.fragment.ImagePagerFragment;
2824
import com.nostra13.universalimageloader.core.ImageLoader;
25+
import com.nostra13.universalimageloader.sample.Constants;
26+
import com.nostra13.universalimageloader.sample.R;
27+
import com.nostra13.universalimageloader.sample.fragment.ImageGalleryFragment;
28+
import com.nostra13.universalimageloader.sample.fragment.ImageGridFragment;
29+
import com.nostra13.universalimageloader.sample.fragment.ImageListFragment;
30+
import com.nostra13.universalimageloader.sample.fragment.ImagePagerFragment;
2931
import com.nostra13.universalimageloader.utils.L;
3032

3133
import java.io.File;
@@ -86,6 +88,26 @@ public void onBackPressed() {
8688
super.onBackPressed();
8789
}
8890

91+
@Override
92+
public boolean onCreateOptionsMenu(Menu menu) {
93+
getMenuInflater().inflate(R.menu.main_menu, menu);
94+
return true;
95+
}
96+
97+
@Override
98+
public boolean onOptionsItemSelected(MenuItem item) {
99+
switch (item.getItemId()) {
100+
case R.id.item_clear_memory_cache:
101+
ImageLoader.getInstance().clearMemoryCache();
102+
return true;
103+
case R.id.item_clear_disc_cache:
104+
ImageLoader.getInstance().clearDiskCache();
105+
return true;
106+
default:
107+
return false;
108+
}
109+
}
110+
89111
private void copyTestImageToSdCard(final File testImageOnSdCard) {
90112
new Thread(new Runnable() {
91113
@Override

‎sample/src/com/nostra13/example/universalimageloader/activity/SimpleImageActivity.java ‎sample/src/com/nostra13/universalimageloader/sample/activity/SimpleImageActivity.java

+8-8
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*******************************************************************************
2-
* Copyright 2011-2013 Sergey Tarasevich
2+
* Copyright 2014 Sergey Tarasevich
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -13,17 +13,17 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*******************************************************************************/
16-
package com.nostra13.example.universalimageloader.activity;
16+
package com.nostra13.universalimageloader.sample.activity;
1717

1818
import android.os.Bundle;
1919
import android.support.v4.app.Fragment;
2020
import android.support.v4.app.FragmentActivity;
21-
import com.nostra13.example.universalimageloader.Constants;
22-
import com.nostra13.example.universalimageloader.R;
23-
import com.nostra13.example.universalimageloader.fragment.ImageGalleryFragment;
24-
import com.nostra13.example.universalimageloader.fragment.ImageGridFragment;
25-
import com.nostra13.example.universalimageloader.fragment.ImageListFragment;
26-
import com.nostra13.example.universalimageloader.fragment.ImagePagerFragment;
21+
import com.nostra13.universalimageloader.sample.Constants;
22+
import com.nostra13.universalimageloader.sample.R;
23+
import com.nostra13.universalimageloader.sample.fragment.ImageGalleryFragment;
24+
import com.nostra13.universalimageloader.sample.fragment.ImageGridFragment;
25+
import com.nostra13.universalimageloader.sample.fragment.ImageListFragment;
26+
import com.nostra13.universalimageloader.sample.fragment.ImagePagerFragment;
2727

2828
/**
2929
* @author Sergey Tarasevich (nostra13[at]gmail[dot]com)

‎sample/src/com/nostra13/example/universalimageloader/fragment/AbsListViewBaseFragment.java ‎sample/src/com/nostra13/universalimageloader/sample/fragment/AbsListViewBaseFragment.java

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*******************************************************************************
2-
* Copyright 2011-2013 Sergey Tarasevich
2+
* Copyright 2011-2014 Sergey Tarasevich
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -13,17 +13,17 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*******************************************************************************/
16-
package com.nostra13.example.universalimageloader.fragment;
16+
package com.nostra13.universalimageloader.sample.fragment;
1717

1818
import android.content.Intent;
1919
import android.view.Menu;
2020
import android.view.MenuItem;
2121
import android.widget.AbsListView;
22-
import com.nostra13.example.universalimageloader.Constants;
23-
import com.nostra13.example.universalimageloader.R;
24-
import com.nostra13.example.universalimageloader.activity.SimpleImageActivity;
2522
import com.nostra13.universalimageloader.core.ImageLoader;
2623
import com.nostra13.universalimageloader.core.listener.PauseOnScrollListener;
24+
import com.nostra13.universalimageloader.sample.Constants;
25+
import com.nostra13.universalimageloader.sample.R;
26+
import com.nostra13.universalimageloader.sample.activity.SimpleImageActivity;
2727

2828
/**
2929
* @author Sergey Tarasevich (nostra13[at]gmail[dot]com)

‎sample/src/com/nostra13/example/universalimageloader/fragment/BaseFragment.java ‎sample/src/com/nostra13/universalimageloader/sample/fragment/BaseFragment.java

+5-9
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*******************************************************************************
2-
* Copyright 2011-2013 Sergey Tarasevich
2+
* Copyright 2011-2014 Sergey Tarasevich
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -13,29 +13,25 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*******************************************************************************/
16-
package com.nostra13.example.universalimageloader.fragment;
16+
package com.nostra13.universalimageloader.sample.fragment;
1717

1818
import android.os.Bundle;
1919
import android.support.v4.app.Fragment;
2020
import android.view.Menu;
2121
import android.view.MenuInflater;
2222
import android.view.MenuItem;
23-
import com.nostra13.example.universalimageloader.R;
2423
import com.nostra13.universalimageloader.core.ImageLoader;
24+
import com.nostra13.universalimageloader.sample.R;
2525

2626
/**
2727
* @author Sergey Tarasevich (nostra13[at]gmail[dot]com)
2828
*/
2929
public abstract class BaseFragment extends Fragment {
30-
31-
protected ImageLoader imageLoader = ImageLoader.getInstance();
32-
3330
@Override
3431
public void onCreate(Bundle savedInstanceState) {
3532
super.onCreate(savedInstanceState);
3633

3734
setHasOptionsMenu(true);
38-
setRetainInstance(true);
3935
}
4036

4137
public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
@@ -46,10 +42,10 @@ public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
4642
public boolean onOptionsItemSelected(MenuItem item) {
4743
switch (item.getItemId()) {
4844
case R.id.item_clear_memory_cache:
49-
imageLoader.clearMemoryCache();
45+
ImageLoader.getInstance().clearMemoryCache();
5046
return true;
5147
case R.id.item_clear_disc_cache:
52-
imageLoader.clearDiskCache();
48+
ImageLoader.getInstance().clearDiskCache();
5349
return true;
5450
default:
5551
return false;

‎sample/src/com/nostra13/example/universalimageloader/fragment/ImageGalleryFragment.java ‎sample/src/com/nostra13/universalimageloader/sample/fragment/ImageGalleryFragment.java

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*******************************************************************************
2-
* Copyright 2011-2013 Sergey Tarasevich
2+
* Copyright 2011-2014 Sergey Tarasevich
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -13,7 +13,7 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*******************************************************************************/
16-
package com.nostra13.example.universalimageloader.fragment;
16+
package com.nostra13.universalimageloader.sample.fragment;
1717

1818
import android.content.Intent;
1919
import android.graphics.Bitmap;
@@ -26,11 +26,11 @@
2626
import android.widget.BaseAdapter;
2727
import android.widget.Gallery;
2828
import android.widget.ImageView;
29-
import com.nostra13.example.universalimageloader.Constants;
30-
import com.nostra13.example.universalimageloader.R;
31-
import com.nostra13.example.universalimageloader.activity.SimpleImageActivity;
3229
import com.nostra13.universalimageloader.core.DisplayImageOptions;
3330
import com.nostra13.universalimageloader.core.ImageLoader;
31+
import com.nostra13.universalimageloader.sample.Constants;
32+
import com.nostra13.universalimageloader.sample.R;
33+
import com.nostra13.universalimageloader.sample.activity.SimpleImageActivity;
3434

3535
/**
3636
* @author Sergey Tarasevich (nostra13[at]gmail[dot]com)

‎sample/src/com/nostra13/example/universalimageloader/fragment/ImageGridFragment.java ‎sample/src/com/nostra13/universalimageloader/sample/fragment/ImageGridFragment.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*******************************************************************************
2-
* Copyright 2011-2013 Sergey Tarasevich
2+
* Copyright 2011-2014 Sergey Tarasevich
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -13,7 +13,7 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*******************************************************************************/
16-
package com.nostra13.example.universalimageloader.fragment;
16+
package com.nostra13.universalimageloader.sample.fragment;
1717

1818
import android.graphics.Bitmap;
1919
import android.os.Bundle;
@@ -26,13 +26,13 @@
2626
import android.widget.GridView;
2727
import android.widget.ImageView;
2828
import android.widget.ProgressBar;
29-
import com.nostra13.example.universalimageloader.Constants;
30-
import com.nostra13.example.universalimageloader.R;
3129
import com.nostra13.universalimageloader.core.DisplayImageOptions;
3230
import com.nostra13.universalimageloader.core.ImageLoader;
3331
import com.nostra13.universalimageloader.core.assist.FailReason;
3432
import com.nostra13.universalimageloader.core.listener.ImageLoadingProgressListener;
3533
import com.nostra13.universalimageloader.core.listener.SimpleImageLoadingListener;
34+
import com.nostra13.universalimageloader.sample.Constants;
35+
import com.nostra13.universalimageloader.sample.R;
3636

3737
/**
3838
* @author Sergey Tarasevich (nostra13[at]gmail[dot]com)

‎sample/src/com/nostra13/example/universalimageloader/fragment/ImageListFragment.java ‎sample/src/com/nostra13/universalimageloader/sample/fragment/ImageListFragment.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*******************************************************************************
2-
* Copyright 2011-2013 Sergey Tarasevich
2+
* Copyright 2011-2014 Sergey Tarasevich
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -13,7 +13,7 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*******************************************************************************/
16-
package com.nostra13.example.universalimageloader.fragment;
16+
package com.nostra13.universalimageloader.sample.fragment;
1717

1818
import android.graphics.Bitmap;
1919
import android.os.Bundle;
@@ -26,14 +26,14 @@
2626
import android.widget.ImageView;
2727
import android.widget.ListView;
2828
import android.widget.TextView;
29-
import com.nostra13.example.universalimageloader.Constants;
30-
import com.nostra13.example.universalimageloader.R;
3129
import com.nostra13.universalimageloader.core.DisplayImageOptions;
3230
import com.nostra13.universalimageloader.core.ImageLoader;
3331
import com.nostra13.universalimageloader.core.display.FadeInBitmapDisplayer;
3432
import com.nostra13.universalimageloader.core.display.RoundedBitmapDisplayer;
3533
import com.nostra13.universalimageloader.core.listener.ImageLoadingListener;
3634
import com.nostra13.universalimageloader.core.listener.SimpleImageLoadingListener;
35+
import com.nostra13.universalimageloader.sample.Constants;
36+
import com.nostra13.universalimageloader.sample.R;
3737

3838
import java.util.Collections;
3939
import java.util.LinkedList;

‎sample/src/com/nostra13/example/universalimageloader/fragment/ImagePagerFragment.java ‎sample/src/com/nostra13/universalimageloader/sample/fragment/ImagePagerFragment.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*******************************************************************************
2-
* Copyright 2011-2013 Sergey Tarasevich
2+
* Copyright 2011-2014 Sergey Tarasevich
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -13,7 +13,7 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*******************************************************************************/
16-
package com.nostra13.example.universalimageloader.fragment;
16+
package com.nostra13.universalimageloader.sample.fragment;
1717

1818
import android.graphics.Bitmap;
1919
import android.os.Bundle;
@@ -26,14 +26,14 @@
2626
import android.widget.ImageView;
2727
import android.widget.ProgressBar;
2828
import android.widget.Toast;
29-
import com.nostra13.example.universalimageloader.Constants;
30-
import com.nostra13.example.universalimageloader.R;
3129
import com.nostra13.universalimageloader.core.DisplayImageOptions;
3230
import com.nostra13.universalimageloader.core.ImageLoader;
3331
import com.nostra13.universalimageloader.core.assist.FailReason;
3432
import com.nostra13.universalimageloader.core.assist.ImageScaleType;
3533
import com.nostra13.universalimageloader.core.display.FadeInBitmapDisplayer;
3634
import com.nostra13.universalimageloader.core.listener.SimpleImageLoadingListener;
35+
import com.nostra13.universalimageloader.sample.Constants;
36+
import com.nostra13.universalimageloader.sample.R;
3737

3838
/**
3939
* @author Sergey Tarasevich (nostra13[at]gmail[dot]com)

0 commit comments

Comments
 (0)