PicassoSupport & GlideSupport: Fix crash when no placeholder

Signed-off-by: Fung <fython@163.com>

Author: fython

gradle.properties

@@ -1,6 +1,6 @@
 BUILD_TOOLS_VERSION=25.0.3
 org.gradle.jvmargs=-Xmx1536m
-VERSION_NAME=0.1.4.1
+VERSION_NAME=0.1.4.2
 TARGET_SDK_VERSION=25
 VERSION_CODE=2
 MIN_SDK_VERSION=19

kotlinyan-glide-support/src/main/kotlin/moe/feng/kotlinyan/common/GlideExtensions.kt

@@ -11,8 +11,8 @@ import java.io.File
 
 interface GlideExtensions {
 
-	var ImageView.placeholderResource : Int
-		get() { return this.getTag(R.id.tag_glide_placeholder_res) as Int }
+	var ImageView.placeholderResource : Int?
+		get() { return this.getTag(R.id.tag_glide_placeholder_res) as? Int }
 		set(value) {
 			this.setTag(R.id.tag_glide_placeholder_drawable, null)
 			this.setTag(R.id.tag_glide_placeholder_res, value)
@@ -58,7 +58,7 @@ interface GlideExtensions {
 	}
 
 	private fun <A, B, C, D> ImageView.makeGlideRequest(request: GenericRequestBuilder<A, B, C, D>) {
-		if (placeholderResource != 0) request.placeholder(placeholderResource)
+		if (placeholderResource != null && placeholderResource != 0) request.placeholder(placeholderResource!!)
 		if (placeholder != null) request.placeholder(placeholder)
 		if (glideListener != null) request.listener(glideListener as RequestListener<A, D>)
 		val transformer = getTag(R.id.tag_glide_builder_transformer) as? GenericRequestBuilder<A, B, C, D>.() -> Unit

kotlinyan-picasso-support/src/main/kotlin/moe/feng/kotlinyan/common/PicassoExtensions.kt

@@ -15,8 +15,8 @@ interface PicassoExtensions {
 		private val ANIMATION_DURATION : Int = 1000
 	}
 
-	var ImageView.placeholderResource : Int
-		get() { return this.getTag(R.id.tag_picasso_placeholder_res) as Int }
+	var ImageView.placeholderResource : Int?
+		get() { return this.getTag(R.id.tag_picasso_placeholder_res) as? Int }
 		set(value) {
 			this.setTag(R.id.tag_picasso_placeholder_drawable, null)
 			this.setTag(R.id.tag_picasso_placeholder_res, value)
@@ -60,7 +60,7 @@ interface PicassoExtensions {
 	}
 
 	private fun ImageView.makePicassoRequest(request: RequestCreator) {
-		if (placeholderResource != 0) request.placeholder(placeholderResource)
+		if (placeholderResource != null && placeholderResource != 0) request.placeholder(placeholderResource!!)
 		if (placeholder != null) request.placeholder(placeholder)
 		val transformer = getTag(R.id.tag_picasso_request_transfomer) as? RequestCreator.() -> Unit
 		transformer?.let { it(request) }