Merge pull request #28 from SDWebImage/feature_indicator_convenience

Supports indicator with style and convenience methods
SDWebImage · Oct 26, 2019 · 3d41a65 · 3d41a65
2 parents d89ccbb + 82fa9ba
commit 3d41a65
Show file tree

Hide file tree

Showing 4 changed files with 64 additions and 5 deletions.
diff --git a/SDWebImageSwiftUI/Classes/Indicator/ActivityIndicator.swift b/SDWebImageSwiftUI/Classes/Indicator/ActivityIndicator.swift
@@ -12,9 +12,11 @@ import SwiftUI
 /// An activity indicator (system style)
 public struct ActivityIndicator: PlatformViewRepresentable {
     @Binding var isAnimating: Bool
+    var style: Style
 
-    public init(_ isAnimating: Binding<Bool>) {
+    public init(_ isAnimating: Binding<Bool>, style: Style = .medium) {
         self._isAnimating = isAnimating
+        self.style = style
     }
 
     #if os(macOS)
@@ -25,7 +27,14 @@ public struct ActivityIndicator: PlatformViewRepresentable {
 
     #if os(iOS) || os(tvOS)
     public func makeUIView(context: UIViewRepresentableContext<ActivityIndicator>) -> UIActivityIndicatorView {
-        let indicator = UIActivityIndicatorView(style: .medium)
+        let activityStyle: UIActivityIndicatorView.Style
+        switch style {
+        case .medium:
+            activityStyle = .medium
+        case .large:
+            activityStyle = .large
+        }
+        let indicator = UIActivityIndicatorView(style: activityStyle)
         indicator.hidesWhenStopped = true
         return indicator
     }
@@ -37,8 +46,16 @@ public struct ActivityIndicator: PlatformViewRepresentable {
 
     #if os(macOS)
     public func makeNSView(context: NSViewRepresentableContext<ActivityIndicator>) -> NSProgressIndicator {
+        let controlSize: NSControl.ControlSize
+        switch style {
+        case .medium:
+            controlSize = .small
+        case .large:
+            controlSize = .regular
+        }
         let indicator = NSProgressIndicator()
         indicator.style = .spinning
+        indicator.controlSize = controlSize
         indicator.isDisplayedWhenStopped = false
         return indicator
     }
@@ -49,4 +66,11 @@ public struct ActivityIndicator: PlatformViewRepresentable {
 
     #endif
 }
+
+extension ActivityIndicator {
+    public enum Style {
+        case medium
+        case large
+    }
+}
 #endif
diff --git a/SDWebImageSwiftUI/Classes/Indicator/Indicator.swift b/SDWebImageSwiftUI/Classes/Indicator/Indicator.swift
@@ -34,11 +34,27 @@ extension Indicator {
         }
     }
 
+    /// Activity Indicator with style
+    /// - Parameter style: style
+    public static func activity(style: ActivityIndicator.Style) -> Indicator {
+        Indicator { isAnimating, _ in
+            ActivityIndicator(isAnimating, style: style)
+        }
+    }
+
     /// Progress Indicator
     public static var progress: Indicator {
         Indicator { isAnimating, progress in
             ProgressIndicator(isAnimating, progress: progress)
         }
     }
+
+    /// Progress Indicator with style
+    /// - Parameter style: style
+    public static func progress(style: ProgressIndicator.Style) -> Indicator {
+        Indicator { isAnimating, progress in
+            ProgressIndicator(isAnimating, progress: progress, style: style)
+        }
+    }
 }
 #endif
diff --git a/SDWebImageSwiftUI/Classes/Indicator/ProgressIndicator.swift b/SDWebImageSwiftUI/Classes/Indicator/ProgressIndicator.swift
@@ -13,10 +13,12 @@ import SwiftUI
 public struct ProgressIndicator: PlatformViewRepresentable {
     @Binding var isAnimating: Bool
     @Binding var progress: CGFloat
+    var style: Style
 
-    public init(_ isAnimating: Binding<Bool>, progress: Binding<CGFloat>) {
+    public init(_ isAnimating: Binding<Bool>, progress: Binding<CGFloat>, style: Style = .default) {
         self._isAnimating = isAnimating
         self._progress = progress
+        self.style = style
     }
 
     #if os(macOS)
@@ -27,9 +29,18 @@ public struct ProgressIndicator: PlatformViewRepresentable {
 
     #if os(iOS) || os(tvOS)
     public func makeUIView(context: UIViewRepresentableContext<ProgressIndicator>) -> ProgressIndicatorWrapper {
+        let progressStyle: UIProgressView.Style
+        switch style {
+        #if os(iOS)
+        case .bar:
+            progressStyle = .bar
+        #endif
+        default:
+            progressStyle = .default
+        }
         let uiView = ProgressIndicatorWrapper()
         let view = uiView.wrapped
-        view.progressViewStyle = .default
+        view.progressViewStyle = progressStyle
         return uiView
     }
 
@@ -81,4 +92,11 @@ public struct ProgressIndicator: PlatformViewRepresentable {
     }
     #endif
 }
+
+extension ProgressIndicator {
+    public enum Style {
+        case `default`
+        case bar
+    }
+}
 #endif
diff --git a/SDWebImageSwiftUI/Classes/WebImage.swift b/SDWebImageSwiftUI/Classes/WebImage.swift
@@ -169,11 +169,12 @@ extension WebImage {
     }
 }
 
+// Indicator
 extension WebImage {
 
     /// Associate a indicator when loading image with url
     /// - Parameter indicator: The indicator type, see `Indicator`
-    public func indicator(_ indicator: Indicator) -> WebImage {
+    public func indicator(_ indicator: Indicator?) -> WebImage {
         var result = self
         result.indicator = indicator
         return result