Merge remote-tracking branch 'upstream/master'

Author: KTMarc

.travis.yml

@@ -1,5 +1,5 @@
 language: swift
-osx_image: xcode11.4
+osx_image: xcode12
 
 env:
   global:
@@ -33,8 +33,8 @@ script:
   - pod install --project-directory=Example
   - xcodebuild build -workspace Example/SDWebImageSwiftUI.xcworkspace -scheme SDWebImageSwiftUIDemo -destination 'name=iPhone 11 Pro Max' -configuration Debug | xcpretty -c
 
-  - carthage update --configuration Debug
-  - xcodebuild build -project SDWebImageSwiftUI.xcodeproj -scheme 'SDWebImageSwiftUI' -sdk iphonesimulator -configuration Debug | xcpretty -c
+  - ./carthage.sh update --configuration Debug
+  - xcodebuild build -project SDWebImageSwiftUI.xcodeproj -scheme 'SDWebImageSwiftUI' -destination 'name=iPhone 11 Pro Max' -configuration Debug | xcpretty -c
 
   - echo Clean DerivedData
   - rm -rf ~/Library/Developer/Xcode/DerivedData/

CHANGELOG.md

@@ -6,6 +6,29 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [2.0.1] - 2021-02-25
+### Fixed
+- Fix the rare cases that WebImage will lost animation when visibility changes. #171
+
+## [2.0.0] - 2021-02-23
+### Added
+- Update with the playbackMode support for `WebImage` and `AnimatedImage` #168
+- Update watchOS demo to watchOS 7, remove the custom indicator sample and use `ProgressView` instead #166
+- Update the Example to make WebImage animatable by default #160
+
+### Fixed
+- Fix the issue sometime the `WebImage` appear/disappear logic wrong. Using UIKit/AppKit to detect the visibility #164
+- Fix the leak of WebImage with animation and NavigationLink. #163
+- Try to fix the recursive updateView when using AnimatedImage inside `ScrollView/LazyVStack`. Which cause App freeze #162
+- Remove the fix for EXIF image in WebImage, which is fixed by Apple in iOS 14 #159
+
+### Changed
+- Bump the limit to Xcode 12, because we need new iOS 14+ APIs check #167
+- Update the WebImage to defaults animatable #165
+
+### Removed
+- Remove the wrong design onSuccess API. Using the full params one instead #169
+
 ## [1.5.0] - 2020-06-01
 ### Added
 - Add the convenient API support to use SwiftUI transition with ease-in-out duration #116

Cartfile

@@ -1 +1 @@
-github "SDWebImage/SDWebImage" ~> 5.7
+github "SDWebImage/SDWebImage" ~> 5.10

Example/Podfile

@@ -23,6 +23,6 @@ target 'SDWebImageSwiftUIDemo-tvOS' do
 end
 
 target 'SDWebImageSwiftUIDemo-watchOS WatchKit Extension' do
-  platform :watchos, '6.0'
+  platform :watchos, '7.0'
   all_pods
 end

Example/SDWebImageSwiftUI.xcodeproj/project.pbxproj

@@ -14,10 +14,6 @@
 		320CDC3222FADB45007CF858 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 320CDC3122FADB45007CF858 /* Assets.xcassets */; };
 		320CDC3522FADB45007CF858 /* Preview Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 320CDC3422FADB45007CF858 /* Preview Assets.xcassets */; };
 		320CDC3822FADB45007CF858 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 320CDC3622FADB45007CF858 /* LaunchScreen.storyboard */; };
-		3243598423E05C3D006DF9C5 /* Espera.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3243598323E05C3D006DF9C5 /* Espera.swift */; };
-		3243598523E05C3D006DF9C5 /* Espera.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3243598323E05C3D006DF9C5 /* Espera.swift */; };
-		3243598623E05C3D006DF9C5 /* Espera.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3243598323E05C3D006DF9C5 /* Espera.swift */; };
-		3243598723E05C3D006DF9C5 /* Espera.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3243598323E05C3D006DF9C5 /* Espera.swift */; };
 		326B0D712345C01900D28269 /* DetailView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 326B0D702345C01900D28269 /* DetailView.swift */; };
 		32E5290C2348A0C700EA46FF /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 32E5290B2348A0C700EA46FF /* AppDelegate.swift */; };
 		32E529102348A0C900EA46FF /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 32E5290F2348A0C900EA46FF /* Assets.xcassets */; };
@@ -98,7 +94,6 @@
 		320CDC3422FADB45007CF858 /* Preview Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = "Preview Assets.xcassets"; sourceTree = "<group>"; };
 		320CDC3722FADB45007CF858 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
 		320CDC3922FADB45007CF858 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
-		3243598323E05C3D006DF9C5 /* Espera.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Espera.swift; sourceTree = "<group>"; };
 		326B0D702345C01900D28269 /* DetailView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DetailView.swift; sourceTree = "<group>"; };
 		32E529092348A0C700EA46FF /* SDWebImageSwiftUIDemo-macOS.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "SDWebImageSwiftUIDemo-macOS.app"; sourceTree = BUILT_PRODUCTS_DIR; };
 		32E5290B2348A0C700EA46FF /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
@@ -212,7 +207,6 @@
 				320CDC2D22FADB44007CF858 /* SceneDelegate.swift */,
 				320CDC2F22FADB44007CF858 /* ContentView.swift */,
 				326B0D702345C01900D28269 /* DetailView.swift */,
-				3243598323E05C3D006DF9C5 /* Espera.swift */,
 				320CDC3122FADB45007CF858 /* Assets.xcassets */,
 				320CDC3622FADB45007CF858 /* LaunchScreen.storyboard */,
 				320CDC3922FADB45007CF858 /* Info.plist */,
@@ -792,7 +786,6 @@
 				320CDC2C22FADB44007CF858 /* AppDelegate.swift in Sources */,
 				326B0D712345C01900D28269 /* DetailView.swift in Sources */,
 				320CDC2E22FADB44007CF858 /* SceneDelegate.swift in Sources */,
-				3243598423E05C3D006DF9C5 /* Espera.swift in Sources */,
 				320CDC3022FADB44007CF858 /* ContentView.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -804,7 +797,6 @@
 				32E529622348A10B00EA46FF /* ContentView.swift in Sources */,
 				32E529632348A10B00EA46FF /* DetailView.swift in Sources */,
 				32E5290C2348A0C700EA46FF /* AppDelegate.swift in Sources */,
-				3243598523E05C3D006DF9C5 /* Espera.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -815,7 +807,6 @@
 				32E529652348A10B00EA46FF /* ContentView.swift in Sources */,
 				32E529662348A10B00EA46FF /* DetailView.swift in Sources */,
 				32E529232348A0D300EA46FF /* AppDelegate.swift in Sources */,
-				3243598623E05C3D006DF9C5 /* Espera.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -826,7 +817,6 @@
 				32E5294E2348A0DE00EA46FF /* HostingController.swift in Sources */,
 				32E529692348A10C00EA46FF /* DetailView.swift in Sources */,
 				32E529502348A0DE00EA46FF /* ExtensionDelegate.swift in Sources */,
-				3243598723E05C3D006DF9C5 /* Espera.swift in Sources */,
 				32E529682348A10C00EA46FF /* ContentView.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -1102,7 +1092,7 @@
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
 				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = 4;
-				WATCHOS_DEPLOYMENT_TARGET = 6.0;
+				WATCHOS_DEPLOYMENT_TARGET = 7.0;
 			};
 			name = Debug;
 		};
@@ -1132,7 +1122,7 @@
 				SKIP_INSTALL = YES;
 				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = 4;
-				WATCHOS_DEPLOYMENT_TARGET = 6.0;
+				WATCHOS_DEPLOYMENT_TARGET = 7.0;
 			};
 			name = Release;
 		};
@@ -1163,7 +1153,7 @@
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
 				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = 4;
-				WATCHOS_DEPLOYMENT_TARGET = 6.0;
+				WATCHOS_DEPLOYMENT_TARGET = 7.0;
 			};
 			name = Debug;
 		};
@@ -1191,7 +1181,7 @@
 				SKIP_INSTALL = YES;
 				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = 4;
-				WATCHOS_DEPLOYMENT_TARGET = 6.0;
+				WATCHOS_DEPLOYMENT_TARGET = 7.0;
 			};
 			name = Release;
 		};
@@ -1217,6 +1207,7 @@
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
 				SWIFT_VERSION = 5.0;
+				WATCHOS_DEPLOYMENT_TARGET = 7.0;
 			};
 			name = Debug;
 		};
@@ -1239,6 +1230,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = "com.dreampiggy.SDWebImageSwiftUIDemo-watchOS";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_VERSION = 5.0;
+				WATCHOS_DEPLOYMENT_TARGET = 7.0;
 			};
 			name = Release;
 		};
@@ -1287,7 +1279,6 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 9.3;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
@@ -1333,7 +1324,6 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 9.3;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";

Example/SDWebImageSwiftUIDemo/ContentView.swift

@@ -18,48 +18,17 @@ class UserSettings: ObservableObject {
 }
 
 #if os(watchOS)
-// watchOS does not provide built-in indicator, use Espera's custom indicator
-struct ActivityIndicator : View {
-    @Binding var isAnimating: Bool
-    var body: some View {
-        if isAnimating {
-            return AnyView(LoadingFlowerView()
-                .frame(width: 30, height: 30))
-        } else {
-            return AnyView(EmptyView()
-                .frame(width: 30, height: 30))
-        }
-    }
-}
-
-struct ProgressIndicator : View {
-    @Binding var isAnimating: Bool
-    @Binding var progress: Double
-    var body: some View {
-        if isAnimating {
-            return AnyView(StretchProgressView(progress: $progress)
-                .frame(width: 140, height: 10))
-        } else {
-            return AnyView(EmptyView()
-                .frame(width: 140, height: 10))
-        }
-    }
-}
-
-extension Indicator where T == ActivityIndicator {
-    /// Activity Indicator
+@available(iOS 14.0, OSX 11.0, tvOS 14.0, watchOS 7.0, *)
+extension Indicator where T == ProgressView<EmptyView, EmptyView> {
     static var activity: Indicator {
-        Indicator { isAnimating, _ in
-            ActivityIndicator(isAnimating: isAnimating)
+        Indicator { isAnimating, progress in
+            ProgressView()
         }
     }
-}
-
-extension Indicator where T == ProgressIndicator {
-    /// Progress Indicator
+    
     static var progress: Indicator {
         Indicator { isAnimating, progress in
-            ProgressIndicator(isAnimating: isAnimating, progress: progress)
+            ProgressView(value: progress.wrappedValue)
         }
     }
 }
@@ -155,7 +124,7 @@ struct ContentView: View {
                     HStack {
                         if self.animated {
                             #if os(macOS) || os(iOS) || os(tvOS)
-                            AnimatedImage(url: URL(string:url))
+                            AnimatedImage(url: URL(string:url), isAnimating: .constant(true))
                             .onViewUpdate { view, context in
                             #if os(macOS)
                                 view.toolTip = url
@@ -178,7 +147,7 @@ struct ContentView: View {
                             .frame(width: CGFloat(100), height: CGFloat(100), alignment: .center)
                             #endif
                         } else {
-                            WebImage(url: URL(string:url))
+                            WebImage(url: URL(string:url), isAnimating: .constant(true))
                             .resizable()
                             /**
                              .placeholder {

Example/SDWebImageSwiftUIDemo/DetailView.swift

@@ -36,7 +36,7 @@ extension Image {
 
 struct DetailView: View {
     let url: String
-    let animated: Bool
+    @State var animated: Bool = true // You can change between WebImage/AnimatedImage
     @State var isAnimating: Bool = true
     @State var lastScale: CGFloat = 1.0
     @State var scale: CGFloat = 1.0
@@ -45,25 +45,17 @@ struct DetailView: View {
     var body: some View {
         VStack {
             #if os(iOS) || os(tvOS)
-            if animated {
-                zoomView()
-                .navigationBarItems(trailing: Button(isAnimating ? "Stop" : "Start") {
-                    self.isAnimating.toggle()
-                })
-            } else {
-                zoomView()
-            }
+            zoomView()
+            .navigationBarItems(trailing: Button(isAnimating ? "Stop" : "Start") {
+                self.isAnimating.toggle()
+            })
             #endif
             #if os(macOS) || os(watchOS)
-            if animated {
-                zoomView()
-                .contextMenu {
-                    Button(isAnimating ? "Stop" : "Start") {
-                        self.isAnimating.toggle()
-                    }
+            zoomView()
+            .contextMenu {
+                Button(isAnimating ? "Stop" : "Start") {
+                    self.isAnimating.toggle()
                 }
-            } else {
-                zoomView()
             }
             #endif
         }
@@ -116,7 +108,7 @@ struct DetailView: View {
                 .scaledToFit()
                 #endif
             } else {
-                WebImage(url: URL(string:url), options: [.progressiveLoad, .delayPlaceholder])
+                WebImage(url: URL(string:url), options: [.progressiveLoad, .delayPlaceholder], isAnimating: $isAnimating)
                 .resizable()
                 .placeholder(.wifiExclamationmark)
                 .indicator(.progress)