NavIcon Avatar fix (#2080)

* NavIcon Avatar fix * Added in all three methods
2021-02-16 18:45:45 +01:00 · 2021-02-16 18:45:45 +01:00 · 2fea6011fd
parent ff6bd6af3c
commit 2fea6011fd
1 changed files with 5 additions and 3 deletions
--- a/app/src/main/java/com/keylesspalace/tusky/MainActivity.kt
+++ b/app/src/main/java/com/keylesspalace/tusky/MainActivity.kt
@ -699,11 +699,13 @@ class MainActivity : BottomSheetActivity(), ActionButtonActivity, HasAndroidInje
                    }
                }
                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)
+                    }
                }
            })
    }