Skip to content

Commit aa5d0e6

Browse files
androidqueryandroidquery
committed
Merge branch 'dev'
Conflicts: dist/build-full.jardesc dist/build.jardesc
2 parents 725fc68 + 958b342 commit aa5d0e6

33 files changed

+591
-107
lines changed

‎demo/AndroidManifest.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
33
package="com.androidquery"
4-
android:versionCode="52"
5-
android:versionName="0.29.52">
4+
android:versionCode="53"
5+
android:versionName="0.29.53">
66

77

88
<uses-permission android:name="android.permission.INTERNET" />

‎demo/res/values/arrays.xml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,8 @@
119119

120120
<item>Round Corner</item>
121121

122-
<item>Image Zoom (WebView)</item>
122+
<item>Image Zoom (WebView)</item>
123+
<item>Auto Rotate</item>
123124

124125
<item>List Items</item>
125126
<item>List Items (Aspect Ratio)</item>
@@ -182,6 +183,8 @@
182183
<item>com.androidquery.test.image.ImageLoadingActivity:image_round:new</item>
183184
<item>com.androidquery.test.image.ImageZoomActivity:image_zoom</item>
184185

186+
<item>com.androidquery.test.image.ImageLoadingActivity:image_auto_rotate:new</item>
187+
185188
<item>com.androidquery.test.image.ImageLoadingListActivity:image_list</item>
186189
<item>com.androidquery.test.image.ImageLoadingList2Activity:image_list2</item>
187190
<item>com.androidquery.test.image.ImageLoadingList3Activity:image_list3</item>
@@ -311,6 +314,7 @@
311314
<item>image_ratio_anchor</item>
312315
<item>image_round</item>
313316
<item>image_zoom</item>
317+
<item>image_auto_rotate</item>
314318

315319
<item>image_list</item>
316320
<item>image_list2</item>
@@ -429,6 +433,8 @@
429433

430434
<item>Zoom enables image with WebView</item>
431435

436+
<item>Auto rotate images taken with camera</item>
437+
432438
<item>Loading Image in List View Items</item>
433439
<item>Loading Image in List View with Aspect Ratio</item>
434440
<item>Loading Image in List View Items with ViewHolder Pattern</item>

‎demo/src/com/androidquery/test/AdhocActivity.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,13 @@ protected void onCreate(Bundle savedInstanceState) {
5252

5353
private void work() throws IOException{
5454

55+
String url = "";
5556

57+
BitmapAjaxCallback cb = new BitmapAjaxCallback();
58+
59+
cb.url(url).ratio(AQuery.RATIO_PRESERVE).expire(3600*1000);
60+
61+
aq.id(R.id.image).image(cb);
5662

5763
}
5864

‎demo/src/com/androidquery/test/ListenerTestActivity.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ public void onClick(View v) {
7979
public void asyncPost(){
8080

8181
//String url = "http://www.google.com/uds/GnewsSearch";
82-
String url = "http://www.vikispot.com/api/likes";
82+
String url = "http://www.androidquery.com/api/likes";
8383

8484
Map<String, Object> params = new HashMap<String, Object>();
8585
params.put("spotId", "1677246");
@@ -94,7 +94,7 @@ public void asyncBytes(){
9494

9595
//fetch a remote resource in raw bytes
9696

97-
String url = "http://www.vikispot.com/z/images/vikispot/android-w.png";
97+
String url = "http://www.androidquery.com/z/images/vikispot/android-w.png";
9898

9999
/*
100100
aq.ajax(url, byte[].class, new AjaxCallback<byte[]>() {
@@ -118,7 +118,7 @@ public void asyncBitmap(){
118118

119119
//fetch a image over the network
120120

121-
String url = "http://www.vikispot.com/z/images/vikispot/android-w.png";
121+
String url = "http://www.androidquery.com/z/images/vikispot/android-w.png";
122122

123123
aq.ajax(url, Bitmap.class, new AjaxCallback<Bitmap>() {
124124

@@ -266,11 +266,11 @@ public void reloadImage(View view){
266266

267267

268268
/*
269-
aq.id(R.id.image1).image("http://www.vikispot.com/z/images/vikispot/android-w.png");
269+
aq.id(R.id.image1).image("http://www.androidquery.com/z/images/vikispot/android-w.png");
270270
271271
boolean memCache = false;
272272
boolean fileCache = true;
273-
aq.id(R.id.image1).image("http://www.vikispot.com/z/images/vikispot/android-w.png", memCache, fileCache);
273+
aq.id(R.id.image1).image("http://www.androidquery.com/z/images/vikispot/android-w.png", memCache, fileCache);
274274
*/
275275

276276
/*
@@ -294,7 +294,7 @@ public void callback(String url, ImageView iv, Bitmap bm, AjaxStatus status){
294294
};
295295
*/
296296

297-
//String imageUrl = "http://www.vikispot.com/z/images/vikispot/android-w.png";
297+
//String imageUrl = "http://www.androidquery.com/z/images/vikispot/android-w.png";
298298
//String imageUrl = "http://lh6.ggpht.com/hgQVg7upCNxcSqJ9T2XabDm9d6IsRjI2lXDKJ03vHSlg5nXDV-2Actla3H8kCVCKdAu5-8-xDAXpxl_9";
299299
//String imageUrl = "http://farm6.static.flickr.com/5035/5802797131_a729dac808_b.jpg";
300300
String imageUrl = "http://a.b.com/invalid.jpg";

‎demo/src/com/androidquery/test/async/AjaxAuthActivity.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ public void auth_twitter_update(){
143143

144144
}
145145

146-
private String UPLOAD_IMAGE = "http://www.vikispot.com/z/images/vikispot/android-w.png";
146+
private String UPLOAD_IMAGE = "http://www.androidquery.com/z/images/vikispot/android-w.png";
147147
public void auth_twitter_upload(){
148148

149149
File file = aq.getCachedFile(UPLOAD_IMAGE);

‎demo/src/com/androidquery/test/async/AjaxLoadingActivity.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ public void callback(String url, String html, AjaxStatus status) {
112112

113113
public void async_bytes(){
114114

115-
String url = "http://www.vikispot.com/z/images/vikispot/android-w.png";
115+
String url = "http://www.androidquery.com/z/images/vikispot/android-w.png";
116116

117117
aq.progress(R.id.progress).ajax(url, byte[].class, new AjaxCallback<byte[]>() {
118118

‎demo/src/com/androidquery/test/image/ImageGridFragment.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ public View getView(int position, View convertView, ViewGroup parent) {
112112

113113
}else{
114114

115-
aq.id(R.id.tb).image(tbUrl, true, true, 200, 0, null, 0, 0);
115+
aq.id(R.id.tb).image(tbUrl, true, true, 200, R.drawable.image_missing, null, 0, 0);
116116
}
117117

118118
return convertView;

‎demo/src/com/androidquery/test/image/ImageLoadingActivity.java

Lines changed: 28 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,10 @@
1111
import android.app.ProgressDialog;
1212
import android.content.Intent;
1313
import android.graphics.Bitmap;
14+
import android.graphics.BitmapFactory;
15+
import android.graphics.Matrix;
1416
import android.graphics.PorterDuff;
17+
import android.media.ExifInterface;
1518
import android.net.Uri;
1619
import android.os.Bundle;
1720
import android.os.Environment;
@@ -20,6 +23,7 @@
2023

2124
import com.androidquery.AQuery;
2225
import com.androidquery.R;
26+
import com.androidquery.callback.AjaxCallback;
2327
import com.androidquery.callback.AjaxStatus;
2428
import com.androidquery.callback.BitmapAjaxCallback;
2529
import com.androidquery.callback.ImageOptions;
@@ -68,7 +72,7 @@ protected void onCreate(Bundle savedInstanceState) {
6872
aq.id(R.id.go_run).gone();
6973
image_button();
7074
}else if("image_send".equals(type)){
71-
aq.cache("http://www.vikispot.com/z/images/vikispot/android-w.png", 0);
75+
aq.cache("http://www.androidquery.com/z/images/vikispot/android-w.png", 0);
7276
}
7377

7478

@@ -88,7 +92,7 @@ protected void runSource(){
8892

8993
public void image_simple(){
9094

91-
String url = "http://www.vikispot.com/z/images/vikispot/android-w.png";
95+
String url = "http://www.androidquery.com/z/images/vikispot/android-w.png";
9296
aq.id(R.id.image).progress(R.id.progress).image(url);
9397

9498
}
@@ -98,7 +102,7 @@ public void image_cache(){
98102
boolean memCache = false;
99103
boolean fileCache = true;
100104

101-
String url = "http://www.vikispot.com/z/images/vikispot/android-w.png";
105+
String url = "http://www.androidquery.com/z/images/vikispot/android-w.png";
102106
aq.id(R.id.image).progress(R.id.progress).image(url, memCache, fileCache);
103107
}
104108

@@ -113,7 +117,7 @@ public void image_down(){
113117

114118
public void image_fallback(){
115119

116-
String imageUrl = "http://www.vikispot.com/z/images/vikispot/xyz.png";
120+
String imageUrl = "http://www.androidquery.com/z/images/vikispot/xyz.png";
117121
aq.id(R.id.image).progress(R.id.progress).image(imageUrl, true, true, 0, R.drawable.image_missing);
118122

119123
}
@@ -175,15 +179,15 @@ public void image_progress_bar(){
175179

176180
public void image_animation(){
177181

178-
String imageUrl = "http://www.vikispot.com/z/images/vikispot/android-w.png";
182+
String imageUrl = "http://www.androidquery.com/z/images/vikispot/android-w.png";
179183
aq.id(R.id.image).progress(R.id.progress).image(imageUrl, true, true, 0, 0, null, AQuery.FADE_IN);
180184

181185
}
182186

183187

184188
public void image_animation2(){
185189

186-
String imageUrl = "http://www.vikispot.com/z/images/vikispot/android-w.png";
190+
String imageUrl = "http://www.androidquery.com/z/images/vikispot/android-w.png";
187191
aq.id(R.id.image).progress(R.id.progress).image(imageUrl, true, true, 0, 0, null, R.anim.slide_in_left);
188192

189193
}
@@ -197,10 +201,11 @@ public void image_ratio(){
197201

198202
public void image_round(){
199203

200-
String url = "http://www.vikispot.com/z/images/vikispot/android-w.png";
204+
String url = "http://www.androidquery.com/z/images/vikispot/android-w.png";
201205

202206
ImageOptions options = new ImageOptions();
203207
options.round = 15;
208+
options.fallback = R.drawable.image_missing;
204209

205210
aq.id(R.id.image).image(url, options);
206211

@@ -219,7 +224,7 @@ public void image_file(){
219224

220225
public void image_custom(){
221226

222-
String imageUrl = "http://www.vikispot.com/z/images/vikispot/android-w.png";
227+
String imageUrl = "http://www.androidquery.com/z/images/vikispot/android-w.png";
223228
final int tint = 0x77AA0000;
224229

225230
aq.id(R.id.image).progress(R.id.progress).visible().image(imageUrl, true, true, 0, 0, new BitmapAjaxCallback(){
@@ -265,7 +270,7 @@ public void callback(String url, ImageView iv, Bitmap bm, AjaxStatus status){
265270

266271
public void image_dup(){
267272

268-
String imageUrl = "http://www.vikispot.com/z/images/vikispot/android-w.png";
273+
String imageUrl = "http://www.androidquery.com/z/images/vikispot/android-w.png";
269274
aq.id(R.id.image).image(imageUrl, false, false);
270275

271276
//no network fetch for 2nd request, image will be shown when first request is completed
@@ -295,7 +300,7 @@ public void image_advance(){
295300

296301
public void image_access_file(){
297302

298-
String imageUrl = "http://www.vikispot.com/z/images/vikispot/android-w.png";
303+
String imageUrl = "http://www.androidquery.com/z/images/vikispot/android-w.png";
299304
File file = aq.getCachedFile(imageUrl);
300305

301306
if(file != null){
@@ -306,7 +311,7 @@ public void image_access_file(){
306311

307312
public void image_access_memory(){
308313

309-
String imageUrl = "http://www.vikispot.com/z/images/vikispot/android-w.png";
314+
String imageUrl = "http://www.androidquery.com/z/images/vikispot/android-w.png";
310315
Bitmap bm = aq.getCachedImage(imageUrl);
311316

312317
if(bm != null){
@@ -332,7 +337,7 @@ public void image_pre_cache(){
332337

333338
public void image_nocache(){
334339

335-
String url = "http://www.vikispot.com/z/images/vikispot/android-w.png";
340+
String url = "http://www.androidquery.com/z/images/vikispot/android-w.png";
336341

337342
//force a network refetch without any caching
338343
aq.id(R.id.image).image(url, false, false);
@@ -363,7 +368,7 @@ public void image_cache_dir(){
363368

364369
AQUtility.debug("cache dir exist", cacheDir.exists());
365370

366-
String url = "http://www.vikispot.com/z/images/vikispot/android-w.png";
371+
String url = "http://www.androidquery.com/z/images/vikispot/android-w.png";
367372
aq.cache(url, 0);
368373

369374
File file = AQUtility.getCacheFile(AQUtility.getCacheDir(this, AQuery.CACHE_DEFAULT), url);
@@ -375,7 +380,7 @@ public void image_cache_dir(){
375380

376381
public void image_send(){
377382

378-
String url = "http://www.vikispot.com/z/images/vikispot/android-w.png";
383+
String url = "http://www.androidquery.com/z/images/vikispot/android-w.png";
379384
File file = aq.makeSharedFile(url, "android.png");
380385

381386
if(file != null){
@@ -455,20 +460,18 @@ public void image_chart(){
455460

456461
}
457462

458-
/*
459-
private static String patchUrl(String url){
463+
public void image_auto_rotate(){
460464

461-
String result = url;
465+
String imageUrl = "http://res.dbkon.co.kr/resource/201302091360376386575001.jpg";
462466

463-
if(url.indexOf('%') == -1){
467+
//imageUrl = "http://www.androidquery.com/z/images/vikispot/android-w.png";
464468

465-
Uri uri = Uri.parse(url);
466-
result = uri.getScheme() + "://" + uri.getAuthority() + uri.getPath() + "?" + Uri.encode(uri.getQuery(), "&=");
467-
String fragment = uri.getFragment();
468-
if(fragment != null) result += "#" + fragment;
469-
}
469+
BitmapAjaxCallback cb = new BitmapAjaxCallback();
470+
cb.url(imageUrl).targetWidth(300).rotate(true);
471+
472+
aq.id(R.id.image).image(cb);
470473

471-
return result;
472474
}
473-
*/
475+
476+
474477
}

‎demo/src/com/androidquery/test/source/async_bytes

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
public void asyncBytes(){
22

3-
String url = "http://www.vikispot.com/z/images/vikispot/android-w.png";
3+
String url = "http://www.androidquery.com/z/images/vikispot/android-w.png";
44

55
aq.ajax(url, byte[].class, new AjaxCallback<byte[]>() {
66

‎demo/src/com/androidquery/test/source/image_access_file

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
public void image_access(){
22

3-
String imageUrl = "http://www.vikispot.com/z/images/vikispot/android-w.png";
3+
String imageUrl = "http://www.androidquery.com/z/images/vikispot/android-w.png";
44
File file = aq.getCachedFile(imageUrl);
55

66
if(file != null){

‎demo/src/com/androidquery/test/source/image_access_memory

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
public void image_access_memory(){
22

3-
String imageUrl = "http://www.vikispot.com/z/images/vikispot/android-w.png";
3+
String imageUrl = "http://www.androidquery.com/z/images/vikispot/android-w.png";
44
Bitmap bm = aq.getCachedImage(imageUrl);
55

66
if(bm != null){

‎demo/src/com/androidquery/test/source/image_animation

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
public void image_animation(){
22

3-
String imageUrl = "http://www.vikispot.com/z/images/vikispot/android-w.png";
3+
String imageUrl = "http://www.androidquery.com/z/images/vikispot/android-w.png";
44
aq.id(R.id.image).image(imageUrl, true, true, 0, null, 0, AQuery.FADE_IN);
55

66
}

‎demo/src/com/androidquery/test/source/image_animation2

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
public void image_animation2(){
22

3-
String imageUrl = "http://www.vikispot.com/z/images/vikispot/android-w.png";
3+
String imageUrl = "http://www.androidquery.com/z/images/vikispot/android-w.png";
44
aq.id(R.id.image).image(imageUrl, true, true, 0, null, 0, R.anim.slide_in_left);
55

66
}

‎demo/src/com/androidquery/test/source/image_button

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
public void image_button(){
22

3-
String tb = "http://www.vikispot.com/z/images/vikispot/android-w.png";
3+
String tb = "http://www.androidquery.com/z/images/vikispot/android-w.png";
44
aq.id(R.id.button).image(tb);
55

66
}

‎demo/src/com/androidquery/test/source/image_cache

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,5 @@
33
boolean memCache = false;
44
boolean fileCache = true;
55

6-
aq.id(R.id.image).image("http://www.vikispot.com/z/images/vikispot/android-w.png", memCache, fileCache);
6+
aq.id(R.id.image).image("http://www.androidquery.com/z/images/vikispot/android-w.png", memCache, fileCache);
77
}

‎demo/src/com/androidquery/test/source/image_custom

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
public void image_custom(){
22

3-
String imageUrl = "http://www.vikispot.com/z/images/vikispot/android-w.png";
3+
String imageUrl = "http://www.androidquery.com/z/images/vikispot/android-w.png";
44
final int tint = 0x77AA0000;
55

66
aq.id(R.id.image).image(imageUrl, true, true, 0, 0, new BitmapAjaxCallback(){

‎demo/src/com/androidquery/test/source/image_dup

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
public void image_dup(){
22

3-
String imageUrl = "http://www.vikispot.com/z/images/vikispot/android-w.png";
3+
String imageUrl = "http://www.androidquery.com/z/images/vikispot/android-w.png";
44
aq.id(R.id.image).image(imageUrl, false, false);
55

66
//no network fetch for 2nd request, image will be shown when first request is completed

0 commit comments

Comments
 (0)