Properly configure glide lib with kapt

dependencies.gradle

@@ -46,7 +46,7 @@ ext {
             frescoImageViewer     : '0.5.1',
             markwon               : '1.0.6',
             aVLoadingIndicatorView: '2.1.3',
-            glide                 : '4.7.1',
+            glide                 : '4.8.0-SNAPSHOT',
 
             // For wearable
             wear                  : '2.3.0',

emoji/build.gradle

 apply plugin: 'com.android.library'
 apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-android-extensions'
+apply plugin: 'kotlin-kapt'
 
 android {
     compileSdkVersion versions.compileSdk
@@ -35,7 +36,7 @@ dependencies {
     implementation libraries.recyclerview
     implementation libraries.material
     implementation libraries.glide
-    annotationProcessor libraries.glideProcessor
+    kapt libraries.glideProcessor
 }
 
 kotlin {

emoji/src/main/java/chat/rocket/android/emoji/EmojiParser.kt

@@ -8,6 +8,7 @@ import android.text.SpannableString
 import android.text.Spanned
 import android.text.style.ImageSpan
 import android.util.Log
+import chat.rocket.android.emoji.internal.GlideApp
 import com.bumptech.glide.Glide
 import com.bumptech.glide.load.engine.DiskCacheStrategy
 import com.bumptech.glide.load.resource.gif.GifDrawable
@@ -73,7 +74,7 @@ class EmojiParser {
             val customEmojis = EmojiRepository.getCustomEmojis()
 
             val density = context.resources.displayMetrics.density
-            val px = (24 * density).toInt()
+            val px = (22 * density).toInt()
 
             return spannable.also {
                 regex.findAll(spannable).iterator().forEach { match ->
@@ -81,15 +82,13 @@ class EmojiParser {
                         it.url?.let { url ->
                             try {
                                 val glideRequest = if (url.endsWith("gif", true)) {
-                                    Glide.with(context).asGif()
+                                    GlideApp.with(context).asGif()
                                 } else {
-                                    Glide.with(context).asBitmap()
+                                    GlideApp.with(context).asBitmap()
                                 }
 
                                 val futureTarget = glideRequest
-                                    .apply(RequestOptions()
                                     .diskCacheStrategy(DiskCacheStrategy.ALL)
-                                        .onlyRetrieveFromCache(true))
                                     .load(url)
                                     .submit(px, px)
 
@@ -99,7 +98,7 @@ class EmojiParser {
                                         spannable.setSpan(ImageSpan(context, image), range.start,
                                             range.endInclusive + 1, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE)
                                     } else if (image is GifDrawable) {
-                                        image.setBounds(0, 0, px, px)
+                                        image.setBounds(0, 0, image.intrinsicWidth, image.intrinsicHeight)
                                         spannable.setSpan(ImageSpan(image), range.start,
                                             range.endInclusive + 1, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE)
                                     }

emoji/src/main/java/chat/rocket/android/emoji/internal/EmojiGlideModule.kt

+package chat.rocket.android.emoji.internal
+
+import android.content.Context
+import com.bumptech.glide.GlideBuilder
+import com.bumptech.glide.annotation.GlideModule
+import com.bumptech.glide.load.engine.cache.ExternalPreferredCacheDiskCacheFactory
+import com.bumptech.glide.module.AppGlideModule
+
+@GlideModule
+class EmojiGlideModule : AppGlideModule() {
+
+    override fun applyOptions(context: Context, builder: GlideBuilder) {
+        builder.setDiskCache(ExternalPreferredCacheDiskCacheFactory(context))
+    }
+}

emoji/src/main/java/chat/rocket/android/emoji/internal/EmojiPagerAdapter.kt

@@ -15,6 +15,8 @@ import chat.rocket.android.emoji.EmojiRepository
 import chat.rocket.android.emoji.Fitzpatrick
 import chat.rocket.android.emoji.R
 import com.bumptech.glide.Glide
+import com.bumptech.glide.load.engine.DiskCacheStrategy
+import com.bumptech.glide.load.engine.cache.ExternalPreferredCacheDiskCacheFactory
 import com.bumptech.glide.request.RequestOptions
 import kotlinx.android.synthetic.main.emoji_category_layout.view.*
 import kotlinx.android.synthetic.main.emoji_image_row_item.view.*
@@ -159,8 +161,9 @@ internal class EmojiPagerAdapter(private val listener: EmojiKeyboardListener) :
                         parsedUnicode
                     }
                 } else {
-                    Glide.with(context)
+                    GlideApp.with(context)
                         .load(emoji.url)
+                        .diskCacheStrategy(DiskCacheStrategy.ALL)
                         .into(emoji_image_view)
                 }