From 2fea6011fde90ab18cbba5b7cad5e9bba4058fbb Mon Sep 17 00:00:00 2001
From: David <info@thedaviddelta.com>
Date: Tue, 16 Feb 2021 18:45:45 +0100
Subject: [PATCH] NavIcon Avatar fix (#2080)

* NavIcon Avatar fix

* Added in all three methods
---
 app/src/main/java/com/keylesspalace/tusky/MainActivity.kt | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/com/keylesspalace/tusky/MainActivity.kt b/app/src/main/java/com/keylesspalace/tusky/MainActivity.kt
index 3fefe4bf8..3b3af8ae3 100644
--- a/app/src/main/java/com/keylesspalace/tusky/MainActivity.kt
+++ b/app/src/main/java/com/keylesspalace/tusky/MainActivity.kt
@@ -694,16 +694,18 @@ class MainActivity : BottomSheetActivity(), ActionButtonActivity, HasAndroidInje
             .into(object : CustomTarget<Drawable>(navIconSize, navIconSize) {
 
                 override fun onLoadStarted(placeholder: Drawable?) {
-                    if(placeholder != null) {
+                    if (placeholder != null) {
                         mainToolbar.navigationIcon = FixedSizeDrawable(placeholder, navIconSize, navIconSize)
                     }
                 }
                 override fun onResourceReady(resource: Drawable, transition: Transition<in Drawable>?) {
-                    mainToolbar.navigationIcon = resource
+                    mainToolbar.navigationIcon = FixedSizeDrawable(resource, navIconSize, navIconSize)
                 }
 
                 override fun onLoadCleared(placeholder: Drawable?) {
-                    mainToolbar.navigationIcon = placeholder
+                    if (placeholder != null) {
+                        mainToolbar.navigationIcon = FixedSizeDrawable(placeholder, navIconSize, navIconSize)
+                    }
                 }
             })
     }