fix gif support

az4521 · Mar 31, 2024 · 893415f · 893415f
1 parent 9d1b1ae
commit 893415f
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 15 deletions.
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/pager/PagerPageHolder.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/pager/PagerPageHolder.kt
@@ -483,31 +483,30 @@ class PagerPageHolder(
      */
     private fun ImageView.setImage(stream: InputStream) {
         GlideApp.with(this)
+            .asGif()
             .load(stream)
             .skipMemoryCache(true)
             .diskCacheStrategy(DiskCacheStrategy.NONE)
             .transition(DrawableTransitionOptions.with(NoTransition.getFactory()))
-            .listener(object : RequestListener<Drawable> {
+            .listener(object : RequestListener<GifDrawable> {
                 override fun onLoadFailed(
                     e: GlideException?,
                     model: Any?,
-                    target: Target<Drawable>,
+                    target: Target<GifDrawable>,
                     isFirstResource: Boolean
                 ): Boolean {
                     onImageDecodeError()
                     return false
                 }
 
                 override fun onResourceReady(
-                    resource: Drawable,
+                    resource: GifDrawable,
                     model: Any,
-                    target: Target<Drawable>,
+                    target: Target<GifDrawable>,
                     dataSource: DataSource,
                     isFirstResource: Boolean
                 ): Boolean {
-                    if (resource is GifDrawable) {
-                        resource.setLoopCount(GifDrawable.LOOP_INTRINSIC)
-                    }
+                    resource.setLoopCount(GifDrawable.LOOP_INTRINSIC)
                     onImageDecoded()
                     return false
                 }

diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/webtoon/WebtoonPageHolder.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/webtoon/WebtoonPageHolder.kt
@@ -2,7 +2,6 @@ package eu.kanade.tachiyomi.ui.reader.viewer.webtoon
 
 import android.annotation.SuppressLint
 import android.content.res.Resources
-import android.graphics.drawable.Drawable
 import android.view.Gravity
 import android.view.ViewGroup
 import android.view.ViewGroup.LayoutParams.MATCH_PARENT
@@ -489,31 +488,30 @@ class WebtoonPageHolder(
      */
     private fun ImageView.setImage(stream: InputStream) {
         GlideApp.with(this)
+            .asGif()
             .load(stream)
             .skipMemoryCache(true)
             .diskCacheStrategy(DiskCacheStrategy.NONE)
             .transition(DrawableTransitionOptions.with(NoTransition.getFactory()))
-            .listener(object : RequestListener<Drawable> {
+            .listener(object : RequestListener<GifDrawable> {
                 override fun onLoadFailed(
                     e: GlideException?,
                     model: Any?,
-                    target: Target<Drawable>,
+                    target: Target<GifDrawable>,
                     isFirstResource: Boolean
                 ): Boolean {
                     onImageDecodeError()
                     return false
                 }
 
                 override fun onResourceReady(
-                    resource: Drawable,
+                    resource: GifDrawable,
                     model: Any,
-                    target: Target<Drawable>?,
+                    target: Target<GifDrawable>?,
                     dataSource: DataSource,
                     isFirstResource: Boolean
                 ): Boolean {
-                    if (resource is GifDrawable) {
-                        resource.setLoopCount(GifDrawable.LOOP_INTRINSIC)
-                    }
+                    resource.setLoopCount(GifDrawable.LOOP_INTRINSIC)
                     onImageDecoded()
                     return false
                 }