Merge branch 'master' of https://github.com/nostra13/Android-Universal-Image-Loader

Author: nostra13

CHANGELOG.md

@@ -1,6 +1,14 @@
 Change Log
 ===
 
+v1.9.4 *(29.05.2015)*
+---
+ * **New API:**
+   * `ImageLoader.setDefaultLoadingListener(ImageLoadingListener)`
+ * "Disc -> Disk" migration (deleted DiscCacheAware, MemoryCacheAware)
+ * Video thumbnails support (`file://...`)
+ * Fixed 0-length files problem
+
 v1.9.3 *(06.09.2014)*
 ---
  * Introduced `ImageScaleType.NONE_SAFE`

README.md

@@ -5,12 +5,12 @@ UIL aims to provide a powerful, flexible and highly customizable instrument for
 
 ![Screenshot](https://github.com/nostra13/Android-Universal-Image-Loader/raw/master/UniversalImageLoader.png)
 
-## Project News
+## Project News 
  * Really have no time for development but anyway UIL is still alive :)
+ * 1.9.4 is last version deployed by Maven. Moving to Gradle deploy process...
 
-**Upcoming changes in new UIL version (1.9.4+)**
+**Upcoming changes in new UIL version (1.9.5+)**
  * Memory Cache redesign
- * Video file thumbnail support via `file:///sdcard/video.mp4`
  * **New API:** `DisplayImageOptions.targetSize(ImageSize)`
  * HTTP cache support
  * Consider `BitmapFactory.Options.inBitmap`
@@ -26,9 +26,9 @@ UIL aims to provide a powerful, flexible and highly customizable instrument for
 Android 2.0+ support
 
 ## Downloads
- * **[universal-image-loader-1.9.3.jar](https://github.com/nostra13/Android-Universal-Image-Loader/raw/master/downloads/universal-image-loader-1.9.3.jar)**
- * **[universal-image-loader-1.9.3-with-sources.jar](https://github.com/nostra13/Android-Universal-Image-Loader/raw/master/downloads/universal-image-loader-1.9.3-with-sources.jar)** (for Eclipse)
- * [![Demo app](https://camo.githubusercontent.com/dc1ffe0e4d25c2c28a69423c3c78000ef7ee96bf/68747470733a2f2f646576656c6f7065722e616e64726f69642e636f6d2f696d616765732f6272616e642f656e5f6170705f7267625f776f5f34352e706e67)](https://play.google.com/store/apps/details?id=com.nostra13.universalimageloader.sample) [![QR Code](https://lh3.ggpht.com/csXEddxiLgQ6FxckefjQnP1PVugbaAYOdcuTa3vVtGV1PlWbFu2dYggoH8rI1w2RdEz1=w50)](http://chart.apis.google.com/chart?chs=300x300&cht=qr&chld=|1&chl=https%3A%2F%2Fplay.google.com%2Fstore%2Fapps%2Fdetails%3Fid%3Dcom.nostra13.universalimageloader.sample) [<img src="http://mobway.in/image/apk.png" height="45px" />](https://github.com/nostra13/Android-Universal-Image-Loader/raw/master/downloads/universal-image-loader-sample-1.9.3.apk)
+ * **[universal-image-loader-1.9.4.jar](https://github.com/nostra13/Android-Universal-Image-Loader/raw/master/downloads/universal-image-loader-1.9.4.jar)**
+ * **[universal-image-loader-1.9.4-with-sources.jar](https://github.com/nostra13/Android-Universal-Image-Loader/raw/master/downloads/universal-image-loader-1.9.4-with-sources.jar)** (for Eclipse)
+ * [![Demo app](https://camo.githubusercontent.com/dc1ffe0e4d25c2c28a69423c3c78000ef7ee96bf/68747470733a2f2f646576656c6f7065722e616e64726f69642e636f6d2f696d616765732f6272616e642f656e5f6170705f7267625f776f5f34352e706e67)](https://play.google.com/store/apps/details?id=com.nostra13.universalimageloader.sample) [![QR Code](https://lh3.ggpht.com/csXEddxiLgQ6FxckefjQnP1PVugbaAYOdcuTa3vVtGV1PlWbFu2dYggoH8rI1w2RdEz1=w50)](http://chart.apis.google.com/chart?chs=300x300&cht=qr&chld=|1&chl=https%3A%2F%2Fplay.google.com%2Fstore%2Fapps%2Fdetails%3Fid%3Dcom.nostra13.universalimageloader.sample) [<img src="http://mobway.in/image/apk.png" height="45px" />](https://github.com/nostra13/Android-Universal-Image-Loader/raw/master/downloads/universal-image-loader-sample-1.9.4.apk)
 
 ## [Documentation](https://github.com/nostra13/Android-Universal-Image-Loader/wiki)
  * **[Quick Setup](https://github.com/nostra13/Android-Universal-Image-Loader/wiki/Quick-Setup)**
@@ -55,6 +55,9 @@ Android 2.0+ support
 
 ### Simple
 ``` java
+ImageLoader imageLoader = ImageLoader.getInstance(); // Get singleton instance
+```
+``` java
 // Load image, decode it to Bitmap and display Bitmap in ImageView (or any other view 
 //	which implements ImageAware interface)
 imageLoader.displayImage(imageUri, imageView);
@@ -135,6 +138,7 @@ You can support the project and thank the author for his hard work :)
  * [AndroidQuery : ImageLoading](https://code.google.com/p/android-query/wiki/ImageLoading)
  * [DroidParts : ImageFetcher](http://droidparts.org/image_fetcher.html)
  * [Glide](https://github.com/bumptech/glide)
+ * [Fresco](https://github.com/facebook/fresco)
  * [Picasso](https://github.com/square/picasso)
  * [UrlImageViewHelper](https://github.com/koush/UrlImageViewHelper)
  * [Volley : ImageLoader](https://android.googlesource.com/platform/frameworks/volley/)

downloads/universal-image-loader-1.9.3-javadoc.jar

@@ -33,8 +33,8 @@ android {
 }
 
 dependencies {
-    testCompile 'com.squareup:fest-android:1.0.7'
-    testCompile 'org.robolectric:robolectric:2.1.1'
+    testCompile 'com.squareup.assertj:assertj-android:1.0.0'
+    testCompile 'org.robolectric:robolectric:2.4'
     testCompile 'junit:junit:4.12'
     compile 'com.android.support:support-v4:22.1.1'
 }

downloads/universal-image-loader-1.9.3-sources.jar

@@ -10,7 +10,7 @@
 	<parent>
 		<groupId>com.nostra13.universalimageloader</groupId>
 		<artifactId>parent</artifactId>
-		<version>1.9.4-SNAPSHOT</version>
+		<version>1.9.5-SNAPSHOT</version>
 	</parent>
 
 	<dependencies>

downloads/universal-image-loader-1.9.3-with-sources.jar

@@ -6,7 +6,7 @@
 	<artifactId>parent</artifactId>
 	<packaging>pom</packaging>
 	<name>Universal Image Loader Project</name>
-	<version>1.9.4-SNAPSHOT</version>
+	<version>1.9.5-SNAPSHOT</version>
 	<description>Powerful and flexible instrument for asynchronous image loading, caching and displaying on Android</description>
 	<url>https://github.com/nostra13/Android-Universal-Image-Loader</url>
 	<inceptionYear>2011</inceptionYear>
@@ -30,7 +30,7 @@
 		<developerConnection>scm:git:[email protected]:nostra13/Android-Universal-Image-Loader.git</developerConnection>
 		<url>https://github.com/nostra13/Android-Universal-Image-Loader</url>
 	    <tag>v1.9.1</tag>
-  </scm>
+	</scm>
 
 	<developers>
 		<developer>

downloads/universal-image-loader-1.9.3.jar

@@ -10,7 +10,7 @@
 	<parent>
 		<groupId>com.nostra13.universalimageloader</groupId>
 		<artifactId>parent</artifactId>
-		<version>1.9.4-SNAPSHOT</version>
+		<version>1.9.5-SNAPSHOT</version>
 	</parent>
 
 	<dependencies>