Merge pull request #276 from wordpress-mobile/issue/181-update-placeholder-images

0nko · web-flow · commit dc5f7eca7049 · 2017-03-10T00:05:35.000+01:00
Issue/181 update placeholder images
diff --git a/aztec/src/main/java/org/wordpress/aztec/Html.java b/aztec/src/main/java/org/wordpress/aztec/Html.java
@@ -90,8 +90,9 @@ public interface ImageGetter {
 
         interface Callbacks {
             void onUseDefaultImage();
+            void onImageFailed();
             void onImageLoaded(Drawable drawable);
-            void onImageLoadingFailed();
+            void onImageLoading(Drawable drawable);
         }
     }
 
diff --git a/aztec/src/main/kotlin/org/wordpress/aztec/AztecTagHandler.kt b/aztec/src/main/kotlin/org/wordpress/aztec/AztecTagHandler.kt
@@ -103,7 +103,9 @@ class AztecTagHandler : Html.TagHandler {
 
     private fun createImageSpan(attributes: Attributes?, onMediaTappedListener: AztecText.OnMediaTappedListener?,
             context: Context) : AztecMediaSpan {
-        val loadingDrawable = ContextCompat.getDrawable(context, R.drawable.ic_image_loading)
+        val styles = context.obtainStyledAttributes(R.styleable.AztecText)
+        val loadingDrawable = ContextCompat.getDrawable(context, styles.getResourceId(R.styleable.AztecText_drawableLoading, R.drawable.ic_image_loading))
+        styles.recycle()
         return AztecMediaSpan(context, loadingDrawable, attributes, onMediaTappedListener)
     }
 
diff --git a/aztec/src/main/kotlin/org/wordpress/aztec/AztecText.kt b/aztec/src/main/kotlin/org/wordpress/aztec/AztecText.kt
@@ -97,6 +97,9 @@ class AztecText : EditText, TextWatcher, UnknownHtmlSpan.OnUnknownHtmlClickListe
 
     private var isNewStyleSelected = false
 
+    private var drawableFailed: Int = 0
+    private var drawableLoading: Int = 0
+
     var isMediaAdded = false
 
     lateinit var history: History
@@ -135,57 +138,60 @@ class AztecText : EditText, TextWatcher, UnknownHtmlSpan.OnUnknownHtmlClickListe
     }
 
     private fun init(attrs: AttributeSet?) {
-        val array = context.obtainStyledAttributes(attrs, R.styleable.AztecText, 0, R.style.AztecTextStyle)
+        val styles = context.obtainStyledAttributes(attrs, R.styleable.AztecText, 0, R.style.AztecTextStyle)
         setLineSpacing(
-                array.getDimension(
+                styles.getDimension(
                         R.styleable.AztecText_lineSpacingExtra,
                         resources.getDimension(R.dimen.spacing_extra)
                 ),
-                array.getFloat(
+                styles.getFloat(
                         R.styleable.AztecText_lineSpacingMultiplier,
                         resources.getString(R.dimen.spacing_multiplier).toFloat()
                 )
         )
-        setBackgroundColor(array.getColor(R.styleable.AztecText_backgroundColor, ContextCompat.getColor(context, R.color.background)))
-        setTextColor(array.getColor(R.styleable.AztecText_textColor, ContextCompat.getColor(context, R.color.text)))
-        setHintTextColor(array.getColor(R.styleable.AztecText_textColorHint, ContextCompat.getColor(context, R.color.text_hint)))
+        setBackgroundColor(styles.getColor(R.styleable.AztecText_backgroundColor, ContextCompat.getColor(context, R.color.background)))
+        setTextColor(styles.getColor(R.styleable.AztecText_textColor, ContextCompat.getColor(context, R.color.text)))
+        setHintTextColor(styles.getColor(R.styleable.AztecText_textColorHint, ContextCompat.getColor(context, R.color.text_hint)))
+
+        drawableLoading = styles.getResourceId(R.styleable.AztecText_drawableLoading, R.drawable.ic_image_loading)
+        drawableFailed = styles.getResourceId(R.styleable.AztecText_drawableFailed, R.drawable.ic_image_failed)
 
-        historyEnable = array.getBoolean(R.styleable.AztecText_historyEnable, historyEnable)
-        historySize = array.getInt(R.styleable.AztecText_historySize, historySize)
+        historyEnable = styles.getBoolean(R.styleable.AztecText_historyEnable, historyEnable)
+        historySize = styles.getInt(R.styleable.AztecText_historySize, historySize)
 
         inlineFormatter = InlineFormatter(this,
                 InlineFormatter.CodeStyle(
-                        array.getColor(R.styleable.AztecText_codeBackground, 0),
-                        array.getFraction(R.styleable.AztecText_codeBackgroundAlpha, 1, 1, 0f),
-                        array.getColor(R.styleable.AztecText_codeColor, 0)),
+                        styles.getColor(R.styleable.AztecText_codeBackground, 0),
+                        styles.getFraction(R.styleable.AztecText_codeBackgroundAlpha, 1, 1, 0f),
+                        styles.getColor(R.styleable.AztecText_codeColor, 0)),
                 LineBlockFormatter.HeaderStyle(
-                        array.getDimensionPixelSize(R.styleable.AztecText_blockVerticalPadding, 0)))
+                        styles.getDimensionPixelSize(R.styleable.AztecText_blockVerticalPadding, 0)))
 
         blockFormatter = BlockFormatter(this,
                 BlockFormatter.ListStyle(
-                        array.getColor(R.styleable.AztecText_bulletColor, 0),
-                        array.getDimensionPixelSize(R.styleable.AztecText_bulletMargin, 0),
-                        array.getDimensionPixelSize(R.styleable.AztecText_bulletPadding, 0),
-                        array.getDimensionPixelSize(R.styleable.AztecText_bulletWidth, 0),
-                        array.getDimensionPixelSize(R.styleable.AztecText_blockVerticalPadding, 0)),
+                        styles.getColor(R.styleable.AztecText_bulletColor, 0),
+                        styles.getDimensionPixelSize(R.styleable.AztecText_bulletMargin, 0),
+                        styles.getDimensionPixelSize(R.styleable.AztecText_bulletPadding, 0),
+                        styles.getDimensionPixelSize(R.styleable.AztecText_bulletWidth, 0),
+                        styles.getDimensionPixelSize(R.styleable.AztecText_blockVerticalPadding, 0)),
                 BlockFormatter.QuoteStyle(
-                        array.getColor(R.styleable.AztecText_quoteBackground, 0),
-                        array.getColor(R.styleable.AztecText_quoteColor, 0),
-                        array.getFraction(R.styleable.AztecText_quoteBackgroundAlpha, 1, 1, 0f),
-                        array.getDimensionPixelSize(R.styleable.AztecText_quoteMargin, 0),
-                        array.getDimensionPixelSize(R.styleable.AztecText_quotePadding, 0),
-                        array.getDimensionPixelSize(R.styleable.AztecText_quoteWidth, 0),
-                        array.getDimensionPixelSize(R.styleable.AztecText_blockVerticalPadding, 0)
+                        styles.getColor(R.styleable.AztecText_quoteBackground, 0),
+                        styles.getColor(R.styleable.AztecText_quoteColor, 0),
+                        styles.getFraction(R.styleable.AztecText_quoteBackgroundAlpha, 1, 1, 0f),
+                        styles.getDimensionPixelSize(R.styleable.AztecText_quoteMargin, 0),
+                        styles.getDimensionPixelSize(R.styleable.AztecText_quotePadding, 0),
+                        styles.getDimensionPixelSize(R.styleable.AztecText_quoteWidth, 0),
+                        styles.getDimensionPixelSize(R.styleable.AztecText_blockVerticalPadding, 0)
                 ))
 
-        linkFormatter = LinkFormatter(this, LinkFormatter.LinkStyle(array.getColor(
+        linkFormatter = LinkFormatter(this, LinkFormatter.LinkStyle(styles.getColor(
                 R.styleable.AztecText_linkColor, 0),
-                array.getBoolean(R.styleable.AztecText_linkUnderline, true)))
+                styles.getBoolean(R.styleable.AztecText_linkUnderline, true)))
 
         lineBlockFormatter = LineBlockFormatter(this, LineBlockFormatter.HeaderStyle(
-                array.getDimensionPixelSize(R.styleable.AztecText_blockVerticalPadding, 0)))
+                styles.getDimensionPixelSize(R.styleable.AztecText_blockVerticalPadding, 0)))
 
-        array.recycle()
+        styles.recycle()
 
         if (historyEnable && historySize <= 0) {
             throw IllegalArgumentException("historySize must > 0")
@@ -674,17 +680,20 @@ class AztecText : EditText, TextWatcher, UnknownHtmlSpan.OnUnknownHtmlClickListe
         spans.forEach {
             val callbacks = object : Html.ImageGetter.Callbacks {
 
-                override fun onUseDefaultImage() {
-                    // we already have a default image loaded so, noop
+                override fun onImageFailed() {
+                    replaceImage(ContextCompat.getDrawable(context, drawableFailed))
                 }
 
                 override fun onImageLoaded(drawable: Drawable?) {
                     replaceImage(drawable)
                 }
 
-                override fun onImageLoadingFailed() {
-                    val drawable = ContextCompat.getDrawable(context, R.drawable.ic_image_failed)
-                    replaceImage(drawable)
+                override fun onImageLoading(drawable: Drawable?) {
+                    replaceImage(ContextCompat.getDrawable(context, drawableLoading))
+                }
+
+                override fun onUseDefaultImage() {
+                    // we already have a default image loaded so, noop
                 }
 
                 private fun replaceImage(drawable: Drawable?) {
diff --git a/aztec/src/main/res/drawable/ic_image_failed.xml b/aztec/src/main/res/drawable/ic_image_failed.xml
@@ -2,27 +2,27 @@
 
 <vector
     xmlns:android="http://schemas.android.com/apk/res/android"
-    android:height="96dp"
-    android:width="96dp"
-    android:viewportHeight="96"
-    android:viewportWidth="96" >
+    android:height="48dp"
+    android:width="48dp"
+    android:viewportHeight="48"
+    android:viewportWidth="48" >
 
     <!-- @color/grey_8_40 -->
     <path
         android:fillColor="#66888888"
-        android:pathData="M0,0h96v96H0V0" >
+        android:pathData="M48,48H0V0h48V48z" >
     </path>
 
     <!-- @color/grey_a_40 -->
     <path
         android:fillColor="#66aaaaaa"
-        android:pathData="M57.6,36.8h7.5v7.5h-7.5V36.8z M31.1,36.8h7.5v7.5h-7.5V36.8z M57.6,48h15v7.5h-15V48z M23.6,48h15v7.5h-15V48z M57.4,59.2h22.5v7.5H57.4V59.2z M16.1,59.2h22.5v7.5H16.1V59.2z" >
+        android:pathData="M26.8,27.8l-5.6,0V11.6h5.6V27.8z M26.8,29.6l-5.6,0l0,4.7l0,0h5.6h0L26.8,29.6z" >
     </path>
 
     <!-- @color/grey_a_40 -->
     <path
         android:fillColor="#66aaaaaa"
-        android:pathData="M42.4,23.2h11.2v32.2H42.4V23.2z M53.6,68.6H42.4v-9.4h11.2V68.6z" >
+        android:pathData="M32.5,22.1l-3.7,0l0-3.7l3.7,0L32.5,22.1z M19.3,18.4l-3.7,0l0,3.7l3.7,0L19.3,18.4z M36.3,24l-7.5,0l0,3.7 l7.5,0L36.3,24z M19.3,24l-7.5,0l0,3.7l7.5,0L19.3,24z M39.9,29.6l-11.2,0l0,3.7l11.2,0L39.9,29.6z M19.3,29.6l-11.2,0l0,3.7l11.2,0 L19.3,29.6z" >
     </path>
 
 </vector>
diff --git a/aztec/src/main/res/drawable/ic_image_loading.xml b/aztec/src/main/res/drawable/ic_image_loading.xml
@@ -2,27 +2,27 @@
 
 <vector
     xmlns:android="http://schemas.android.com/apk/res/android"
-    android:height="96dp"
-    android:width="96dp"
-    android:viewportHeight="96"
-    android:viewportWidth="96" >
+    android:height="48dp"
+    android:width="48dp"
+    android:viewportHeight="48"
+    android:viewportWidth="48" >
 
     <!-- @color/grey_8_40 -->
     <path
         android:fillColor="#66888888"
-        android:pathData="M0,0h96v96H0V0z" >
+        android:pathData="M48,48H0V0h48V48z" >
     </path>
 
     <!-- @color/grey_a_40 -->
     <path
         android:fillColor="#66aaaaaa"
-        android:pathData="M57.6,36.8h7.5v7.5h-7.5V36.8z M31.1,36.8h7.5v7.5h-7.5V36.8z M57.6,48h15v7.5h-15V48z M23.6,48h15v7.5h-15V48z M57.4,59.2h22.5v7.5H57.4V59.2z M16.1,59.2h22.5v7.5H16.1V59.2z" >
+        android:pathData="M21.2,18.4h5.6v15l-2.8,3l-2.8-3V18.4z M24.9,11.6h-1.8c0,0-1.9,0-1.9,1.9v2.8h5.6v-2.8 C26.8,11.6,24.9,11.6,24.9,11.6z" >
     </path>
 
     <!-- @color/grey_a_40 -->
     <path
         android:fillColor="#66aaaaaa"
-        android:pathData="M48,72.7l5.6-5.9H42.4L48,72.7z M42.4,36.8h11.2v30H42.4V36.8z M53.6,32.6H42.4V27c0-3.8,3.8-3.8,3.8-3.8h3.7 c0,0,3.8,0,3.8,3.8V32.6z" >
+        android:pathData="M32.5,22.1l-3.7,0l0-3.7l3.7,0L32.5,22.1z M19.3,18.4l-3.7,0l0,3.7l3.7,0L19.3,18.4z M36.3,24l-7.5,0l0,3.7 l7.5,0L36.3,24z M19.3,24l-7.5,0l0,3.7l7.5,0L19.3,24z M39.9,29.6l-11.2,0l0,3.7l11.2,0L39.9,29.6z M19.3,29.6l-11.2,0l0,3.7l11.2,0 L19.3,29.6z" >
     </path>
 
 </vector>
diff --git a/aztec/src/main/res/values/attrs.xml b/aztec/src/main/res/values/attrs.xml
@@ -12,6 +12,8 @@
         <attr name="codeBackground" format="reference|color" />
         <attr name="codeBackgroundAlpha" format="reference|fraction" />
         <attr name="codeColor" format="reference|color" />
+        <attr name="drawableFailed" format="reference" />
+        <attr name="drawableLoading" format="reference" />
         <attr name="historyEnable" format="reference|boolean" />
         <attr name="historySize" format="reference|integer" />
         <attr name="lineSpacingExtra" format="reference|dimension" />
diff --git a/glide-loader/src/main/java/org/wordpress/aztec/glideloader/GlideImageLoader.kt b/glide-loader/src/main/java/org/wordpress/aztec/glideloader/GlideImageLoader.kt
@@ -17,11 +17,11 @@ class GlideImageLoader(private val context: Context) : Html.ImageGetter {
     override fun loadImage(source: String, callbacks: Html.ImageGetter.Callbacks, maxWidth: Int) {
         Glide.with(context).load(source).fitCenter().into(object : Target<GlideDrawable> {
             override fun onLoadStarted(placeholder: Drawable?) {
-                val r = context.resources
+                callbacks.onImageLoading(placeholder)
             }
 
             override fun onLoadFailed(e: Exception?, errorDrawable: Drawable?) {
-                callbacks.onImageLoadingFailed()
+                callbacks.onImageFailed()
             }
 
             override fun onResourceReady(resource: GlideDrawable?, glideAnimation: GlideAnimation<in GlideDrawable>?) {
diff --git a/picasso-loader/src/main/java/org/wordpress/aztec/picassoloader/PicassoImageLoader.kt b/picasso-loader/src/main/java/org/wordpress/aztec/picassoloader/PicassoImageLoader.kt
@@ -35,11 +35,13 @@ class PicassoImageLoader(private val context: Context, aztec: AztecText) : Html.
             }
 
             override fun onBitmapFailed(errorDrawable: Drawable?) {
-                callbacks.onImageLoadingFailed()
+                callbacks.onImageFailed()
                 targets.remove(source)
             }
 
-            override fun onPrepareLoad(placeHolderDrawable: Drawable?) {}
+            override fun onPrepareLoad(placeHolderDrawable: Drawable?) {
+                callbacks.onImageLoading(placeHolderDrawable)
+            }
         }
 
         // add a strong reference to the target until it's called or the view gets destroyed

Original file line number	Diff line number	Diff line change
`@@ -90,8 +90,9 @@ public interface ImageGetter {`
`90`	`90`
`91`	`91`	`interface Callbacks {`
`92`	`92`	`void onUseDefaultImage();`
	`93`	`+ void onImageFailed();`
`93`	`94`	`void onImageLoaded(Drawable drawable);`
`94`		`- void onImageLoadingFailed();`
	`95`	`+ void onImageLoading(Drawable drawable);`
`95`	`96`	`}`
`96`	`97`	`}`
`97`	`98`
Original file line number	Diff line number	Diff line change
`@@ -103,7 +103,9 @@ class AztecTagHandler : Html.TagHandler {`
`103`	`103`
`104`	`104`	`private fun createImageSpan(attributes: Attributes?, onMediaTappedListener: AztecText.OnMediaTappedListener?,`
`105`	`105`	`context: Context) : AztecMediaSpan {`
`106`		`- val loadingDrawable = ContextCompat.getDrawable(context, R.drawable.ic_image_loading)`
	`106`	`+ val styles = context.obtainStyledAttributes(R.styleable.AztecText)`
	`107`	`+ val loadingDrawable = ContextCompat.getDrawable(context, styles.getResourceId(R.styleable.AztecText_drawableLoading, R.drawable.ic_image_loading))`
	`108`	`+ styles.recycle()`
`107`	`109`	`return AztecMediaSpan(context, loadingDrawable, attributes, onMediaTappedListener)`
`108`	`110`	`}`
`109`	`111`
Original file line number	Diff line number	Diff line change
`@@ -17,11 +17,11 @@ class GlideImageLoader(private val context: Context) : Html.ImageGetter {`
`17`	`17`	`override fun loadImage(source: String, callbacks: Html.ImageGetter.Callbacks, maxWidth: Int) {`
`18`	`18`	`Glide.with(context).load(source).fitCenter().into(object : Target<GlideDrawable> {`
`19`	`19`	`override fun onLoadStarted(placeholder: Drawable?) {`
`20`		`- val r = context.resources`
	`20`	`+ callbacks.onImageLoading(placeholder)`
`21`	`21`	`}`
`22`	`22`
`23`	`23`	`override fun onLoadFailed(e: Exception?, errorDrawable: Drawable?) {`
`24`		`- callbacks.onImageLoadingFailed()`
	`24`	`+ callbacks.onImageFailed()`
`25`	`25`	`}`
`26`	`26`
`27`	`27`	`override fun onResourceReady(resource: GlideDrawable?, glideAnimation: GlideAnimation<in GlideDrawable>?) {`
Original file line number	Diff line number	Diff line change
`@@ -35,11 +35,13 @@ class PicassoImageLoader(private val context: Context, aztec: AztecText) : Html.`
`35`	`35`	`}`
`36`	`36`
`37`	`37`	`override fun onBitmapFailed(errorDrawable: Drawable?) {`
`38`		`- callbacks.onImageLoadingFailed()`
	`38`	`+ callbacks.onImageFailed()`
`39`	`39`	`targets.remove(source)`
`40`	`40`	`}`
`41`	`41`
`42`		`- override fun onPrepareLoad(placeHolderDrawable: Drawable?) {}`
	`42`	`+ override fun onPrepareLoad(placeHolderDrawable: Drawable?) {`
	`43`	`+ callbacks.onImageLoading(placeHolderDrawable)`
	`44`	`+ }`
`43`	`45`	`}`
`44`	`46`
`45`	`47`	`// add a strong reference to the target until it's called or the view gets destroyed`