Merge pull request #15 from crelies/dev

feat(): implemented support for macOS

Author: Chris

Sources/RemoteImage/private/Models/RemoteImageState.swift

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

Sources/RemoteImage/private/Protocols/RemoteImageServiceProtocol.swift

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

Sources/RemoteImage/private/Services/DefaultRemoteImageCache.swift

@@ -1,24 +1,22 @@
 //
 //  DefaultRemoteImageCache.swift
-//  
+//  RemoteImage
 //
 //  Created by Christian Elies on 14.12.19.
 //
 
-#if canImport(UIKit)
-import UIKit
+import Foundation
 
 struct DefaultRemoteImageCache {
-    let cache = NSCache<AnyObject, UIImage>()
+    let cache = NSCache<AnyObject, UniversalImage>()
 }
 
 extension DefaultRemoteImageCache: RemoteImageCache {
-    func object(forKey key: AnyObject) -> UIImage? { cache.object(forKey: key) }
+    func object(forKey key: AnyObject) -> UniversalImage? { cache.object(forKey: key) }
 
-    func setObject(_ object: UIImage, forKey key: AnyObject) { cache.setObject(object, forKey: key) }
+    func setObject(_ object: UniversalImage, 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/PhotoKitService.swift

@@ -1,3 +1,10 @@
+//
+//  PhotoKitService.swift
+//  RemoteImage
+//
+//  Created by Christian Elies.
+//
+
 import Photos
 
 protocol PhotoKitServiceProvider {

Sources/RemoteImage/private/Services/RemoteImageServiceDependencies.swift

@@ -1,6 +1,6 @@
 //
 //  RemoteImageServiceDependencies.swift
-//  
+//  RemoteImage
 //
 //  Created by Christian Elies on 29.10.19.
 //

Sources/RemoteImage/public/Models/PhotoKitServiceError.swift

@@ -1,3 +1,10 @@
+//
+//  PhotoKitServiceError.swift
+//  RemoteImage
+//
+//  Created by Christian Elies.
+//
+
 import Foundation
 
 public enum PhotoKitServiceError: Error {

Sources/RemoteImage/public/Models/RemoteImageType.swift

@@ -1,6 +1,6 @@
 //
 //  RemoteImageType.swift
-//  
+//  RemoteImage
 //
 //  Created by Christian Elies on 29.10.19.
 //

Sources/RemoteImage/public/Models/UniversalImage.swift

@@ -0,0 +1,19 @@
+//
+//  UniversalImage.swift
+//  RemoteImage
+//
+//  Created by Christian Elies on 01.11.20.
+//
+
+#if os(iOS)
+import UIKit
+
+public typealias UniversalImage = UIImage
+
+#elseif os(macOS)
+
+import AppKit
+
+public typealias UniversalImage = NSImage
+
+#endif

Sources/RemoteImage/public/Protocols/RemoteImageCache.swift

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

Sources/RemoteImage/public/Services/RemoteImageService.swift

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