Merge pull request #486 from wordpress-mobile/feature/use-glide-loader-in-demo-app

Use GlideImageLoader in demo app

Author: 0nko

app/src/main/kotlin/org/wordpress/aztec/demo/MainActivity.kt

@@ -33,12 +33,12 @@ import org.wordpress.android.util.ImageUtils
 import org.wordpress.android.util.PermissionUtils
 import org.wordpress.android.util.ToastUtils
 import org.wordpress.aztec.*
+import org.wordpress.aztec.glideloader.GlideImageLoader
 import org.wordpress.aztec.glideloader.GlideVideoThumbnailLoader
-import org.wordpress.aztec.picassoloader.PicassoImageLoader
 import org.wordpress.aztec.plugins.shortcodes.AudioShortcodePlugin
-import org.wordpress.aztec.plugins.shortcodes.handlers.CaptionHandler
 import org.wordpress.aztec.plugins.shortcodes.CaptionShortcodePlugin
 import org.wordpress.aztec.plugins.shortcodes.VideoShortcodePlugin
+import org.wordpress.aztec.plugins.shortcodes.handlers.CaptionHandler
 import org.wordpress.aztec.plugins.wpcomments.WordPressCommentsPlugin
 import org.wordpress.aztec.plugins.wpcomments.toolbar.MoreToolbarButton
 import org.wordpress.aztec.plugins.wpcomments.toolbar.PageToolbarButton
@@ -321,7 +321,7 @@ class MainActivity : AppCompatActivity(),
 
 
         aztec = Aztec.with(visualEditor, sourceEditor, toolbar, this)
-            .setImageGetter(PicassoImageLoader(this, visualEditor))
+            .setImageGetter(GlideImageLoader(this))
             .setVideoThumbnailGetter(GlideVideoThumbnailLoader(this))
             .setOnImeBackListener(this)
             .setOnTouchListener(this)

glide-loader/src/main/java/org/wordpress/aztec/glideloader/GlideImageLoader.kt

@@ -1,22 +1,22 @@
 package org.wordpress.aztec.glideloader
 
 import android.content.Context
+import android.graphics.Bitmap
+import android.graphics.drawable.BitmapDrawable
 import android.graphics.drawable.Drawable
-
+import android.util.DisplayMetrics
 import com.bumptech.glide.Glide
-import com.bumptech.glide.load.resource.drawable.GlideDrawable
 import com.bumptech.glide.request.Request
 import com.bumptech.glide.request.animation.GlideAnimation
 import com.bumptech.glide.request.target.SizeReadyCallback
 import com.bumptech.glide.request.target.Target
-
 import org.wordpress.aztec.Html
 
 
 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> {
+        Glide.with(context).load(source).asBitmap().fitCenter().into(object : Target<Bitmap> {
             override fun onLoadStarted(placeholder: Drawable?) {
                 callbacks.onImageLoading(placeholder)
             }
@@ -25,8 +25,11 @@ class GlideImageLoader(private val context: Context) : Html.ImageGetter {
                 callbacks.onImageFailed()
             }
 
-            override fun onResourceReady(resource: GlideDrawable?, glideAnimation: GlideAnimation<in GlideDrawable>?) {
-                callbacks.onImageLoaded(resource)
+            override fun onResourceReady(resource: Bitmap?, glideAnimation: GlideAnimation<in Bitmap>?) {
+                // By default, BitmapFactory.decodeFile sets the bitmap's density to the device default so, we need
+                // to correctly set the input density to 160 ourselves.
+                resource?.density = DisplayMetrics.DENSITY_DEFAULT
+                callbacks.onImageLoaded(BitmapDrawable(context.resources, resource))
             }
 
             override fun onLoadCleared(placeholder: Drawable?) {}