Updated cache option

Author: Jake-Short

Sources/ImageViewerRemote/ImageViewerRemote.swift

@@ -15,12 +15,16 @@ public struct ImageViewerRemote: View {
     @State var dragOffset: CGSize = CGSize.zero
     @State var dragOffsetPredicted: CGSize = CGSize.zero
 
+    @ObservedObject var loader: ImageLoader
+    
     public init(imageURL: Binding<String>, viewerShown: Binding<Bool>, httpHeaders: [String: String]? = nil, 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)
     }
 
     func getURLRequest(url: String, headers: [String: String]?) -> URLRequest {
@@ -92,10 +96,30 @@ public struct ImageViewerRemote: View {
                             .zIndex(1)
                         }
                         else {
-                            AsyncImage(
-                                url: getURLRequest(url: self.imageURL, headers: self.httpHeaders),
-                                placeholder: Text("Loading ..."), aspectRatio: self.aspectRatio, dragOffset: self.$dragOffset, dragOffsetPredicted: self.$dragOffsetPredicted, viewerShown: self.$viewerShown
-                                )
+                            if loader.image != nil {
+                                Image(uiImage: loader.image!)
+                                    .resizable()
+                                    .aspectRatio(self.aspectRatio?.wrappedValue, contentMode: .fit)
+                                    .offset(x: self.dragOffset.width, y: self.dragOffset.height)
+                                    .rotationEffect(.init(degrees: Double(self.dragOffset.width / 30)))
+                                    .pinchToZoom()
+                                    .gesture(DragGesture()
+                                        .onChanged { value in
+                                            self.dragOffset = value.translation
+                                            self.dragOffsetPredicted = value.predictedEndTranslation
+                                        }
+                                        .onEnded { value in
+                                            if((abs(self.dragOffset.height) + abs(self.dragOffset.width) > 570) || ((abs(self.dragOffsetPredicted.height)) / (abs(self.dragOffset.height)) > 3) || ((abs(self.dragOffsetPredicted.width)) / (abs(self.dragOffset.width))) > 3) {
+                                                self.viewerShown = false
+                                                return
+                                            }
+                                            self.dragOffset = .zero
+                                        }
+                                    )
+                            }
+                            else {
+                                Text("Loading...")
+                            }
                         }
                     }
                 }
@@ -269,19 +293,43 @@ extension View {
 
 class ImageLoader: ObservableObject {
     @Published var image: UIImage?
-    private let url: URLRequest
+    private let url: Binding<String>
+    private let headers: [String: String]?
     private var cancellable: AnyCancellable?
+    
+    func getURLRequest(url: String, headers: [String: 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;
+        }
+    }
 
-    init(url: URLRequest) {
+    init(url: Binding<String>, httpHeaders: [String: String]?) {
         self.url = url
+        self.headers = httpHeaders
+        
+        load()
     }
 
     deinit {
         cancellable?.cancel()
     }
 
     func load() {
-        cancellable = URLSession.shared.dataTaskPublisher(for: url)
+        cancellable = URLSession.shared.dataTaskPublisher(for: getURLRequest(url: self.url.wrappedValue, headers: self.headers))
             .map { UIImage(data: $0.data) }
             .replaceError(with: nil)
             .receive(on: DispatchQueue.main)
@@ -292,57 +340,3 @@ class ImageLoader: ObservableObject {
         cancellable?.cancel()
     }
 }
-
-struct AsyncImage<Placeholder: View>: View {
-    @ObservedObject private var loader: ImageLoader
-    
-    private let placeholder: Placeholder?
-    
-    var aspectRatio: Binding<CGFloat>?
-    @Binding var dragOffset: CGSize
-    @Binding var dragOffsetPredicted: CGSize
-    @Binding var viewerShown: Bool
-    
-    init(url: URLRequest, placeholder: Placeholder? = nil, aspectRatio: Binding<CGFloat>?, dragOffset: Binding<CGSize>, dragOffsetPredicted: Binding<CGSize>, viewerShown: Binding<Bool>) {
-        loader = ImageLoader(url: url)
-        self.placeholder = placeholder
-        self.aspectRatio = aspectRatio
-        _dragOffset = dragOffset
-        _dragOffsetPredicted = dragOffsetPredicted
-        _viewerShown = viewerShown
-    }
-
-    var body: some View {
-        image
-            .onAppear(perform: loader.load)
-            .onDisappear(perform: loader.cancel)
-    }
-    
-    private var image: some View {
-        Group {
-            if loader.image != nil {
-                Image(uiImage: loader.image!)
-                    .resizable()
-                    .aspectRatio(self.aspectRatio?.wrappedValue, contentMode: .fit)
-                    .offset(x: self.dragOffset.width, y: self.dragOffset.height)
-                    .rotationEffect(.init(degrees: Double(self.dragOffset.width / 30)))
-                    .pinchToZoom()
-                    .gesture(DragGesture()
-                        .onChanged { value in
-                            self.dragOffset = value.translation
-                            self.dragOffsetPredicted = value.predictedEndTranslation
-                        }
-                        .onEnded { value in
-                            if((abs(self.dragOffset.height) + abs(self.dragOffset.width) > 570) || ((abs(self.dragOffsetPredicted.height)) / (abs(self.dragOffset.height)) > 3) || ((abs(self.dragOffsetPredicted.width)) / (abs(self.dragOffset.width))) > 3) {
-                                self.viewerShown = false
-                                return
-                            }
-                            self.dragOffset = .zero
-                        }
-                    )
-            } else {
-                placeholder
-            }
-        }
-    }
-}