Merge pull request #75 from SDWebImage/bugfix_indicator_watchOS

Fix the issue when Indicator is hidden, which still preserve the layout on watchOS (have no issues on iOS/tvOS/macOS)

Author: dreampiggy

Example/SDWebImageSwiftUIDemo-macOS/AppDelegate.swift

@@ -36,6 +36,20 @@ class AppDelegate: NSObject, NSApplicationDelegate {
         SDImageCodersManager.shared.addCoder(SDImageWebPCoder.shared)
         SDImageCodersManager.shared.addCoder(SDImageSVGCoder.shared)
         SDImageCodersManager.shared.addCoder(SDImagePDFCoder.shared)
+        // Dynamic check to support vector format for both WebImage/AnimatedImage
+        SDWebImageManager.shared.optionsProcessor = SDWebImageOptionsProcessor { url, options, context in
+            var options = options
+            var context = context
+            if let _ = context?[.animatedImageClass] as? SDAnimatedImage.Type {
+                // AnimatedImage supports vector rendering, should not force decode
+                options.insert(.avoidDecodeImage)
+            } else {
+                // WebImage supports bitmap rendering only
+                context?[.svgPrefersBitmap] = true
+                context?[.pdfPrefersBitmap] = true
+            }
+            return SDWebImageOptionsResult(options: options, context: context)
+        }
     }
 
     func applicationWillTerminate(_ aNotification: Notification) {

Example/SDWebImageSwiftUIDemo-tvOS/AppDelegate.swift

@@ -33,6 +33,20 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
         SDImageCodersManager.shared.addCoder(SDImageWebPCoder.shared)
         SDImageCodersManager.shared.addCoder(SDImageSVGCoder.shared)
         SDImageCodersManager.shared.addCoder(SDImagePDFCoder.shared)
+        // Dynamic check to support vector format for both WebImage/AnimatedImage
+        SDWebImageManager.shared.optionsProcessor = SDWebImageOptionsProcessor { url, options, context in
+            var options = options
+            var context = context
+            if let _ = context?[.animatedImageClass] as? SDAnimatedImage.Type {
+                // AnimatedImage supports vector rendering, should not force decode
+                options.insert(.avoidDecodeImage)
+            } else {
+                // WebImage supports bitmap rendering only
+                context?[.svgPrefersBitmap] = true
+                context?[.pdfPrefersBitmap] = true
+            }
+            return SDWebImageOptionsResult(options: options, context: context)
+        }
 
         return true
     }

Example/SDWebImageSwiftUIDemo-watchOS WatchKit Extension/ExtensionDelegate.swift

@@ -20,6 +20,14 @@ class ExtensionDelegate: NSObject, WKExtensionDelegate {
         SDImageCodersManager.shared.addCoder(SDImageWebPCoder.shared)
         SDImageCodersManager.shared.addCoder(SDImageSVGCoder.shared)
         SDImageCodersManager.shared.addCoder(SDImagePDFCoder.shared)
+        // Dynamic check to support vector format for WebImage
+        SDWebImageManager.shared.optionsProcessor = SDWebImageOptionsProcessor { url, options, context in
+            var context = context
+            // WebImage supports bitmap rendering only
+            context?[.svgPrefersBitmap] = true
+            context?[.pdfPrefersBitmap] = true
+            return SDWebImageOptionsResult(options: options, context: context)
+        }
     }
 
     func applicationDidBecomeActive() {

Example/SDWebImageSwiftUIDemo/AppDelegate.swift

@@ -23,11 +23,13 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
         SDImageCodersManager.shared.addCoder(SDImageWebPCoder.shared)
         SDImageCodersManager.shared.addCoder(SDImageSVGCoder.shared)
         SDImageCodersManager.shared.addCoder(SDImagePDFCoder.shared)
-        // Dynamic check to support both WebImage/AnimatedImage
+        // Dynamic check to support vector format for both WebImage/AnimatedImage
         SDWebImageManager.shared.optionsProcessor = SDWebImageOptionsProcessor { url, options, context in
+            var options = options
             var context = context
             if let _ = context?[.animatedImageClass] as? SDAnimatedImage.Type {
-                // AnimatedImage supports vector rendering
+                // AnimatedImage supports vector rendering, should not force decode
+                options.insert(.avoidDecodeImage)
             } else {
                 // WebImage supports bitmap rendering only
                 context?[.svgPrefersBitmap] = true

SDWebImageSwiftUI/Classes/Indicator/Indicator.swift

@@ -38,8 +38,6 @@ struct IndicatorViewModifier<T> : ViewModifier where T : View {
             content
             if imageManager.isLoading {
                 indicator.content($imageManager.isLoading, $imageManager.progress)
-            } else {
-                indicator.content($imageManager.isLoading, $imageManager.progress).hidden()
             }
         }
     }