Minor improvements.

bullinnyc · Jan 21, 2024 · 4cce940 · 4cce940
1 parent 2161583
commit 4cce940
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 22 deletions.
diff --git a/Examples/ContentView.swift b/Examples/ContentView.swift
@@ -59,7 +59,7 @@ struct ContentView: View {
                                 },
                                 error: { error, retry in
                                     // Create any view for error (optional).
-                                    self.error(error, action: retry.refresh)
+                                    self.error(error, action: retry)
                                 }
                             )
                             .frame(

diff --git a/README.md b/README.md
@@ -96,7 +96,7 @@ CachedAsyncImage(
                 .foregroundStyle(.red)
 
                 Button(
-                    action: retry.refresh,
+                    action: retry,
                     label: {
                         // ...
                     }
@@ -134,6 +134,7 @@ struct MyView: View {
 
 ## Requirements
 - iOS 14.0 +
+- macOS 11.0 +
 - [SwiftUI](https://developer.apple.com/xcode/swiftui/)
 
 ## License

diff --git a/Sources/CachedAsyncImage/Views/CachedAsyncImage.swift b/Sources/CachedAsyncImage/Views/CachedAsyncImage.swift
@@ -8,12 +8,6 @@
 
 import SwiftUI
 
-/// Refreshable protocol.
-public protocol Refreshable {
-    /// Retry load the image.
-    func refresh()
-}
-
 /// CachedAsyncImage view.
 public struct CachedAsyncImage: View {
     // MARK: - Property Wrappers
@@ -25,20 +19,20 @@ public struct CachedAsyncImage: View {
     private let url: String
     private let placeholder: ((String) -> any View)?
     private let image: (CPImage) -> any View
-    private let error: ((String, Refreshable) -> any View)?
+    private let error: ((String, @escaping () -> Void) -> any View)?
 
     // MARK: - Initializers
 
     /// - Parameters:
     ///   - url: The URL for which to create a image.
     ///   - placeholder: Placeholder with progress to be displayed.
     ///   - image: Image to be displayed.
-    ///   - error: Error with retry action to be displayed.
+    ///   - error: Error with retry handler to be displayed.
     public init(
         url: String,
         placeholder: ((String) -> any View)? = nil,
         image: @escaping (CPImage) -> any View,
-        error: ((String, Refreshable) -> any View)? = nil
+        error: ((String, @escaping () -> Void) -> any View)? = nil
     ) {
         _imageLoader = StateObject(
             wrappedValue: ImageLoader(
@@ -61,7 +55,7 @@ public struct CachedAsyncImage: View {
             case .idle:
                 Color.clear
                     .onAppear {
-                        imageLoader.fetchImage(from: url)
+                        fetchImage(from: url)
                     }
             case .loading(let progress):
                 if let placeholder = placeholder {
@@ -72,22 +66,20 @@ public struct CachedAsyncImage: View {
                 }
             case .failed(let errorMessage):
                 if let error = error {
-                    AnyView(error(errorMessage, self))
+                    AnyView(error(errorMessage, { fetchImage(from: url) }))
                 }
             case .loaded(let image):
                 AnyView(self.image(image))
             }
         }
         .onChange(of: url) { newValue in
-            imageLoader.fetchImage(from: newValue)
+            fetchImage(from: newValue)
         }
     }
-}
-
-// MARK: - Ext. Refreshable
-
-extension CachedAsyncImage: Refreshable {
-    public func refresh() {
+
+    // MARK: - Private Methods
+
+    private func fetchImage(from url: String) {
         imageLoader.fetchImage(from: url)
     }
 }
@@ -188,7 +180,7 @@ struct CachedAsyncImage_Previews: PreviewProvider {
                     image($0)
                 },
                 error: { error, retry in
-                    self.error(error, action: retry.refresh)
+                    self.error(error, action: retry)
                 }
             )
 
@@ -201,7 +193,7 @@ struct CachedAsyncImage_Previews: PreviewProvider {
                     image($0)
                 },
                 error: { error, retry in
-                    self.error(error, action: retry.refresh)
+                    self.error(error, action: retry)
                 }
             )
         }