Merge pull request #17 from Jake-Short/fix-url-image-dependency

Fix url image dependency (2.0.0 update)

Author: Jake-Short

Package.resolved

@@ -6,8 +6,8 @@
         "repositoryURL": "https://github.com/dmytro-anokhin/url-image.git",
         "state": {
           "branch": null,
-          "revision": "22eca5ee4f317e0283da75426849ee23f0516022",
-          "version": "0.9.19"
+          "revision": "cedfdb207dcba2aec1229f3e2053bb93460a4244",
+          "version": "2.1.9"
         }
       }
     ]

Package.swift

@@ -20,7 +20,7 @@ let package = Package(
     dependencies: [
         // Dependencies declare other packages that this package depends on.
         // .package(url: /* package url */, from: "1.0.0"),
-        .package(url: "https://github.com/dmytro-anokhin/url-image.git", from: "0.9.15")
+        .package(url: "https://github.com/dmytro-anokhin/url-image.git", from: "2.0.0")
     ],
     targets: [
         // Targets are the basic building blocks of a package. A target can define a module or a test suite.

README.md

@@ -65,58 +65,59 @@ struct ContentView: View {
 
 # Customization
 
-### HTTP Headers
+### Explicit Aspect Ratio
 
-#### Availability: 1.0.15 or higher
+#### Availability: 1.0.21 or higher
 
-The remote image viewer allows HTTP headers to be included in the URL request. To use them, pass a dictonary to the httpHeaders field. The format should be [Header: Value], both strings.
+An explcit image aspect ratio can be specified, which fixes an issue of incorrect stretching that occurs in certain situations. The `aspectRatio` parameter accepts `Binding<CGFloat>`
 
 Example:
 ```Swift
-import ImageViewerRemote
+import ImageViewer
 
 struct ContentView: View {
     @State var showImageViewer: Bool = true
+    @State var image = Image("example-image")
 
     var body: some View {
         VStack {
             Text("Example!")
         }
 	.frame(maxWidth: .infinity, maxHeight: .infinity)
-        .overlay(ImageViewerRemote(imageURL: URL(string: "https://..."), viewerShown: self.$showImageViewer, httpHeaders: ["X-Powered-By": "Swift!"]))
+        .overlay(ImageViewer(image: self.$image, viewerShown: self.$showImageViewer, aspectRatio: .constant(2)))
     }
 }
 ```
 
-### Explicit Aspect Ratio
+### Disable Cache
 
-#### Availability: 1.0.21 or higher
+#### Availability: 1.0.25 or higher
 
-An explcit image aspect ratio can be specified, which fixes an issue of incorrect stretching that occurs in certain situations. The `aspectRatio` parameter accepts `Binding<CGFloat>`
+To disable cache on the remote image viewer, simply pass a `Bool` value to the `disableCache` parameter
 
 Example:
 ```Swift
-import ImageViewer
+import ImageViewerRemote
 
 struct ContentView: View {
     @State var showImageViewer: Bool = true
-    @State var image = Image("example-image")
 
     var body: some View {
         VStack {
             Text("Example!")
         }
 	.frame(maxWidth: .infinity, maxHeight: .infinity)
-        .overlay(ImageViewer(image: self.$image, viewerShown: self.$showImageViewer, aspectRatio: .constant(2)))
+        .overlay(ImageViewerRemote(imageURL: URL(string: "https://..."), viewerShown: self.$showImageViewer, disableCache: true))
     }
 }
 ```
 
-### Disable Cache
+### HTTP Headers
 
-#### Availability: 1.0.25 or higher
+#### Availability: 1.0.15 to 1.0.25
+#### *DEPRECATED*: No longer available as of 2.0.0
 
-To disable cache on the remote image viewer, simply pass a `Bool` value to the `disableCache` parameter
+The remote image viewer allows HTTP headers to be included in the URL request. To use them, pass a dictonary to the httpHeaders field. The format should be [Header: Value], both strings.
 
 Example:
 ```Swift
@@ -130,7 +131,7 @@ struct ContentView: View {
             Text("Example!")
         }
 	.frame(maxWidth: .infinity, maxHeight: .infinity)
-        .overlay(ImageViewerRemote(imageURL: URL(string: "https://..."), viewerShown: self.$showImageViewer, disableCache: true))
+        .overlay(ImageViewerRemote(imageURL: URL(string: "https://..."), viewerShown: self.$showImageViewer, httpHeaders: ["X-Powered-By": "Swift!"]))
     }
 }
 ```

Sources/ImageViewerRemote/ImageViewerRemote.swift

@@ -17,34 +17,21 @@ public struct ImageViewerRemote: View {
 
     @ObservedObject var loader: ImageLoader
 
-    public init(imageURL: Binding<String>, viewerShown: Binding<Bool>, httpHeaders: [String: String]? = nil, aspectRatio: Binding<CGFloat>? = nil, disableCache: Bool? = nil) {
+    public init(imageURL: Binding<String>, viewerShown: Binding<Bool>, aspectRatio: Binding<CGFloat>? = nil, disableCache: Bool? = nil) {
         _imageURL = imageURL
         _viewerShown = viewerShown
-        _httpHeaders = State(initialValue: httpHeaders)
         _disableCache = State(initialValue: disableCache)
         self.aspectRatio = aspectRatio
 
-        loader = ImageLoader(url: imageURL, httpHeaders: httpHeaders)
+        loader = ImageLoader(url: imageURL)
     }
 
-    func getURLRequest(url: String, headers: [String: String]?) -> URLRequest {
+    func getURLRequest(url: String) -> URLRequest {
         let url = URL(string: url)!
         var request = URLRequest(url: url)
         request.httpMethod = "GET"
 
-        if(headers != nil) {
-            for (key, value) in headers! {
-                print("adding header: \(key): \(value)")
-                request.addValue("\(value)", forHTTPHeaderField: "\(key)")
-            }
-            
-            print("headers found, requesting URL image with headers: \(request.allHTTPHeaderFields)")
-            return request;
-        }
-        else {
-            print("headers nil, requesting URL image with request: \(request)")
-            return request;
-        }
+        return request;
     }
 
     @ViewBuilder
@@ -70,8 +57,8 @@ public struct ImageViewerRemote: View {
 
                     VStack {
                         if(self.disableCache == nil || self.disableCache == false) {
-                            URLImage(getURLRequest(url: self.imageURL, headers: self.httpHeaders)) { proxy in
-                            proxy.image
+                            URLImage(url: URL(string: self.imageURL)!, content: { image in
+                            image
                                 .resizable()
                                 .aspectRatio(self.aspectRatio?.wrappedValue, contentMode: .fit)
                                 .offset(x: self.dragOffset.width, y: self.dragOffset.height)
@@ -90,7 +77,7 @@ public struct ImageViewerRemote: View {
                                         self.dragOffset = .zero
                                     }
                                 )
-                            }
+                            })
                         }
                         else {
                             if loader.image != nil {
@@ -294,32 +281,18 @@ extension View {
 class ImageLoader: ObservableObject {
     @Published var image: UIImage?
     private let url: Binding<String>
-    private let headers: [String: String]?
     private var cancellable: AnyCancellable?
 
-    func getURLRequest(url: String, headers: [String: String]?) -> URLRequest {
+    func getURLRequest(url: String) -> URLRequest {
         let url = URL(string: url)!
         var request = URLRequest(url: url)
         request.httpMethod = "GET"
 
-        if(headers != nil) {
-            for (key, value) in headers! {
-                print("adding header: \(key): \(value)")
-                request.addValue("\(value)", forHTTPHeaderField: "\(key)")
-            }
-            
-            print("headers found, requesting URL image with headers: \(request.allHTTPHeaderFields)")
-            return request;
-        }
-        else {
-            print("headers nil, requesting URL image with request: \(request)")
-            return request;
-        }
+        return request;
     }
 
-    init(url: Binding<String>, httpHeaders: [String: String]?) {
+    init(url: Binding<String>) {
         self.url = url
-        self.headers = httpHeaders
 
         load()
     }
@@ -329,7 +302,7 @@ class ImageLoader: ObservableObject {
     }
 
     func load() {
-        cancellable = URLSession.shared.dataTaskPublisher(for: getURLRequest(url: self.url.wrappedValue, headers: self.headers))
+        cancellable = URLSession.shared.dataTaskPublisher(for: getURLRequest(url: self.url.wrappedValue))
             .map { UIImage(data: $0.data) }
             .replaceError(with: nil)
             .receive(on: DispatchQueue.main)