Fixes #536 - Android fade animation doesn't work when loading from ca…

…che and no placeholder is set
luberda-molinet · Sep 30, 2017 · f90b5da · f90b5da
1 parent ad60783
commit f90b5da
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 1 deletion.
diff --git a/source/FFImageLoading.Droid/Extensions/DrawableExtensions.cs b/source/FFImageLoading.Droid/Extensions/DrawableExtensions.cs
@@ -20,5 +20,10 @@ public static bool IsValidAndHasValidBitmap(this ISelfDisposingBitmapDrawable dr
         {
             return drawable != null && drawable.Handle != IntPtr.Zero && drawable.HasValidBitmap;
         }
+
+        public static bool IsValidAndHasValidBitmap(this SelfDisposingBitmapDrawable drawable)
+        {
+            return drawable != null && drawable.Handle != IntPtr.Zero && drawable.HasValidBitmap;
+        }
     }
 }
diff --git a/source/FFImageLoading.Droid/Work/PlatformImageLoadingTask.cs b/source/FFImageLoading.Droid/Work/PlatformImageLoadingTask.cs
@@ -11,6 +11,7 @@
 using FFImageLoading.Extensions;
 using FFImageLoading.Helpers;
 using FFImageLoading.Work;
+using FFImageLoading.Views;
 
 namespace FFImageLoading
 {
@@ -51,7 +52,16 @@ protected async override Task SetTargetAsync(SelfDisposingBitmapDrawable image,
                 if (animated)
                 {
                     SelfDisposingBitmapDrawable placeholderDrawable = null;
-                    if (PlaceholderWeakReference != null && PlaceholderWeakReference.TryGetTarget(out placeholderDrawable) && placeholderDrawable != null)
+                    PlaceholderWeakReference?.TryGetTarget(out placeholderDrawable);
+
+                    if (placeholderDrawable == null)
+                    {
+                        // Enable fade animation when no placeholder is set and the previous image is not null
+                        var imageView = PlatformTarget.Control as ImageViewAsync;
+                        placeholderDrawable = imageView?.Drawable as SelfDisposingBitmapDrawable;
+                    }
+
+                    if (placeholderDrawable.IsValidAndHasValidBitmap())
                     {
                         int fadeDuration = Parameters.FadeAnimationDuration.HasValue ?
                             Parameters.FadeAnimationDuration.Value : Configuration.FadeAnimationDuration;