Merge pull request #6 from crelies/dev

Improvements

Author: Chris

Package.resolved

@@ -15,12 +15,15 @@ let package = Package(
             name: "RemoteImage",
             targets: ["RemoteImage"]),
     ],
+    dependencies: [
+        .package(url: "https://github.com/nalexn/ViewInspector.git", from: "0.3.8")
+    ],
     targets: [
         .target(
             name: "RemoteImage",
             dependencies: []),
         .testTarget(
             name: "RemoteImageTests",
-            dependencies: ["RemoteImage"]),
+            dependencies: ["RemoteImage", "ViewInspector"]),
     ]
 )

Package.swift

@@ -6,10 +6,28 @@
 //  Copyright © 2019 Christian Elies. All rights reserved.
 //
 
-import Foundation
+#if canImport(UIKit)
+import UIKit
 
 enum RemoteImageState: Hashable {
     case error(_ error: NSError)
-    case image(_ image: PlatformSpecificImageType)
+    case image(_ image: UIImage)
     case loading
 }
+
+extension RemoteImageState {
+    var error: NSError? {
+        guard case let RemoteImageState.error(error) = self else {
+            return nil
+        }
+        return error
+    }
+
+    var image: UIImage? {
+        guard case let RemoteImageState.image(uiImage) = self else {
+            return nil
+        }
+        return uiImage
+    }
+}
+#endif

Sources/RemoteImage/private/Models/RemoteImageState.swift

@@ -5,6 +5,7 @@
 //  Created by Christian Elies on 15.12.19.
 //
 
+#if canImport(UIKit)
 import Combine
 
 protocol RemoteImageServiceProtocol where Self: ObservableObject {
@@ -14,3 +15,4 @@ protocol RemoteImageServiceProtocol where Self: ObservableObject {
     var state: RemoteImageState { get set }
     func fetchImage(ofType type: RemoteImageType)
 }
+#endif

Sources/RemoteImage/private/Protocols/RemoteImageServiceProtocol.swift

@@ -5,18 +5,20 @@
 //  Created by Christian Elies on 14.12.19.
 //
 
-import Foundation
+#if canImport(UIKit)
+import UIKit
 
 struct DefaultRemoteImageCache {
-    let cache = NSCache<AnyObject, PlatformSpecificImageType>()
+    let cache = NSCache<AnyObject, UIImage>()
 }
 
 extension DefaultRemoteImageCache: RemoteImageCache {
-    func object(forKey key: AnyObject) -> PlatformSpecificImageType? { cache.object(forKey: key) }
+    func object(forKey key: AnyObject) -> UIImage? { cache.object(forKey: key) }
 
-    func setObject(_ object: PlatformSpecificImageType, forKey key: AnyObject) { cache.setObject(object, forKey: key) }
+    func setObject(_ object: UIImage, forKey key: AnyObject) { cache.setObject(object, forKey: key) }
 
     func removeObject(forKey key: AnyObject) { cache.removeObject(forKey: key) }
 
     func removeAllObjects() { cache.removeAllObjects() }
 }
+#endif

Sources/RemoteImage/private/Services/DefaultRemoteImageCache.swift

@@ -5,11 +5,13 @@
 //  Created by Christian Elies on 14.12.19.
 //
 
-import Foundation
+#if canImport(UIKit)
+import UIKit
 
 public protocol RemoteImageCache {
-    func object(forKey key: AnyObject) -> PlatformSpecificImageType?
-    func setObject(_ object: PlatformSpecificImageType, forKey key: AnyObject)
+    func object(forKey key: AnyObject) -> UIImage?
+    func setObject(_ object: UIImage, forKey key: AnyObject)
     func removeObject(forKey key: AnyObject)
     func removeAllObjects()
 }
+#endif

Sources/RemoteImage/public/Models/PlatformSpecificImageType.swift

@@ -6,8 +6,9 @@
 //  Copyright © 2019 Christian Elies. All rights reserved.
 //
 
+#if canImport(UIKit)
 import Combine
-import Foundation
+import UIKit
 
 public typealias RemoteImageCacheKeyProvider = (RemoteImageType) -> AnyObject
 
@@ -52,7 +53,7 @@ extension RemoteImageService {
         let urlRequest = URLRequest(url: url)
 
         cancellable = dependencies.remoteImageURLDataPublisher.dataPublisher(for: urlRequest)
-            .map { PlatformSpecificImageType(data: $0.data) }
+            .map { UIImage(data: $0.data) }
             .receive(on: RunLoop.main)
             .sink(receiveCompletion: { completion in
                 switch completion {
@@ -80,7 +81,7 @@ extension RemoteImageService {
         dependencies.photoKitService.getPhotoData(localIdentifier: localIdentifier) { result in
             switch result {
             case .success(let data):
-                if let image = PlatformSpecificImageType(data: data) {
+                if let image = UIImage(data: data) {
                     Self.cache.setObject(image, forKey: cacheKey)
                     self.state = .image(image)
                 } else {
@@ -92,3 +93,4 @@ extension RemoteImageService {
         }
     }
 }
+#endif

Sources/RemoteImage/public/Protocols/RemoteImageCache.swift

@@ -5,6 +5,7 @@
 //  Created by Christian Elies on 29.10.19.
 //
 
+#if canImport(UIKit)
 import Foundation
 
 public final class RemoteImageServiceFactory {
@@ -13,3 +14,4 @@ public final class RemoteImageServiceFactory {
         return RemoteImageService(dependencies: dependencies)
     }
 }
+#endif

Sources/RemoteImage/public/Services/RemoteImageService.swift

@@ -6,6 +6,7 @@
 //  Copyright © 2019 Christian Elies. All rights reserved.
 //
 
+#if canImport(SwiftUI) && canImport(UIKit)
 import Combine
 import SwiftUI
 
@@ -17,33 +18,18 @@ public struct RemoteImage<ErrorView: View, ImageView: View, LoadingView: View>:
 
     @ObservedObject private var service = RemoteImageServiceFactory.makeRemoteImageService()
 
-    public var body: AnyView {
-        switch service.state {
-            case .error(let error):
-                return AnyView(
-                    errorView(error)
-                )
-            case .image(let image):
-                #if canImport(UIKit)
-                    return AnyView(
-                        self.imageView(Image(uiImage: image))
-                    )
-                #elseif os(macOS)
-                    return AnyView(
-                        self.imageView(Image(nsImage: image))
-                    )
-                #else
-                    return AnyView(
-                        Text("Cannot render image: unsupported platform")
-                    )
-                #endif
-            case .loading:
-                return AnyView(
-                    loadingView()
+    public var body: some View {
+        Group {
+            if service.state == .loading {
+                loadingView()
                     .onAppear {
                         self.service.fetchImage(ofType: self.type)
                     }
-                )
+            } else {
+                service.state.error.map { errorView($0) }
+
+                service.state.image.map { self.imageView(Image(uiImage: $0)) }
+            }
         }
     }
 
@@ -69,3 +55,5 @@ struct RemoteImage_Previews: PreviewProvider {
     }
 }
 #endif
+
+#endif