From 6b7d3ef613a3ef59f6052c2b71df7845b36d78ef Mon Sep 17 00:00:00 2001
From: Konrad Pozniak <connyduck@users.noreply.github.com>
Date: Sun, 5 Dec 2021 19:12:52 +0100
Subject: [PATCH] fix loading Gif avatars into the main appbar (#2268)

* fix loading Gif avatars into the main appbar

and respect the animateAvatars setting

closes #2259

* fix formatting
---
 .../com/keylesspalace/tusky/MainActivity.kt   | 81 ++++++++++++++-----
 1 file changed, 60 insertions(+), 21 deletions(-)

diff --git a/app/src/main/java/com/keylesspalace/tusky/MainActivity.kt b/app/src/main/java/com/keylesspalace/tusky/MainActivity.kt
index 39239139a..7a7620210 100644
--- a/app/src/main/java/com/keylesspalace/tusky/MainActivity.kt
+++ b/app/src/main/java/com/keylesspalace/tusky/MainActivity.kt
@@ -19,7 +19,10 @@ import android.content.Context
 import android.content.DialogInterface
 import android.content.Intent
 import android.content.res.ColorStateList
+import android.graphics.Bitmap
 import android.graphics.Color
+import android.graphics.drawable.Animatable
+import android.graphics.drawable.BitmapDrawable
 import android.graphics.drawable.Drawable
 import android.net.Uri
 import android.os.Bundle
@@ -710,34 +713,70 @@ class MainActivity : BottomSheetActivity(), ActionButtonActivity, HasAndroidInje
     private fun loadDrawerAvatar(avatarUrl: String, showPlaceholder: Boolean) {
         val navIconSize = resources.getDimensionPixelSize(R.dimen.avatar_toolbar_nav_icon_size)
 
-        glide.asDrawable()
-            .load(avatarUrl)
-            .transform(
-                RoundedCorners(resources.getDimensionPixelSize(R.dimen.avatar_radius_36dp))
-            )
-            .apply {
-                if (showPlaceholder) {
-                    placeholder(R.drawable.avatar_default)
-                }
-            }
-            .into(object : CustomTarget<Drawable>(navIconSize, navIconSize) {
+        val animateAvatars = preferences.getBoolean("animateGifAvatars", false)
 
-                override fun onLoadStarted(placeholder: Drawable?) {
-                    if (placeholder != null) {
-                        binding.mainToolbar.navigationIcon = FixedSizeDrawable(placeholder, navIconSize, navIconSize)
+        if (animateAvatars) {
+            glide.asDrawable()
+                .load(avatarUrl)
+                .transform(
+                    RoundedCorners(resources.getDimensionPixelSize(R.dimen.avatar_radius_36dp))
+                )
+                .apply {
+                    if (showPlaceholder) {
+                        placeholder(R.drawable.avatar_default)
                     }
                 }
+                .into(object : CustomTarget<Drawable>(navIconSize, navIconSize) {
 
-                override fun onResourceReady(resource: Drawable, transition: Transition<in Drawable>?) {
-                    binding.mainToolbar.navigationIcon = FixedSizeDrawable(resource, navIconSize, navIconSize)
-                }
+                    override fun onLoadStarted(placeholder: Drawable?) {
+                        if (placeholder != null) {
+                            binding.mainToolbar.navigationIcon = FixedSizeDrawable(placeholder, navIconSize, navIconSize)
+                        }
+                    }
 
-                override fun onLoadCleared(placeholder: Drawable?) {
-                    if (placeholder != null) {
-                        binding.mainToolbar.navigationIcon = FixedSizeDrawable(placeholder, navIconSize, navIconSize)
+                    override fun onResourceReady(resource: Drawable, transition: Transition<in Drawable>?) {
+                        if (resource is Animatable) {
+                            resource.start()
+                        }
+                        binding.mainToolbar.navigationIcon = FixedSizeDrawable(resource, navIconSize, navIconSize)
+                    }
+
+                    override fun onLoadCleared(placeholder: Drawable?) {
+                        if (placeholder != null) {
+                            binding.mainToolbar.navigationIcon = FixedSizeDrawable(placeholder, navIconSize, navIconSize)
+                        }
+                    }
+                })
+        } else {
+            glide.asBitmap()
+                .load(avatarUrl)
+                .transform(
+                    RoundedCorners(resources.getDimensionPixelSize(R.dimen.avatar_radius_36dp))
+                )
+                .apply {
+                    if (showPlaceholder) {
+                        placeholder(R.drawable.avatar_default)
                     }
                 }
-            })
+                .into(object : CustomTarget<Bitmap>(navIconSize, navIconSize) {
+
+                    override fun onLoadStarted(placeholder: Drawable?) {
+                        if (placeholder != null) {
+                            binding.mainToolbar.navigationIcon = FixedSizeDrawable(placeholder, navIconSize, navIconSize)
+                        }
+                    }
+
+                    override fun onResourceReady(resource: Bitmap, transition: Transition<in Bitmap>?) {
+                        binding.mainToolbar.navigationIcon = FixedSizeDrawable(BitmapDrawable(resources, resource), navIconSize, navIconSize)
+                    }
+
+                    override fun onLoadCleared(placeholder: Drawable?) {
+                        if (placeholder != null) {
+                            binding.mainToolbar.navigationIcon = FixedSizeDrawable(placeholder, navIconSize, navIconSize)
+                        }
+                    }
+                })
+        }
     }
 
     private fun fetchAnnouncements() {