Merge pull request #2 from bullinnyc/add-macos-support

Add macOS support.

Author: bullinnyc

.github/workflows/build-and-test.yml

@@ -17,7 +17,7 @@ jobs:
         macos: ['macos-13']
         scheme: ['CachedAsyncImage']
         command: ['test']
-        platform: ['iOS']
+        platform: ['macOS', 'iOS']
     steps:
     - name: Switch xcode to ${{ matrix.xcode }}
       uses: maxim-lobanov/setup-xcode@v1.6.0

.swiftpm/CachedAsyncImage.xctestplan

@@ -1,7 +1,7 @@
 {
   "configurations" : [
     {
-      "id" : "E45F0232-EFE9-4D85-9212-2CDCA2411611",
+      "id" : "FE7FCFF0-5186-4CE4-A013-A485B56842C2",
       "name" : "Test Scheme Action",
       "options" : {
 

Examples/ContentView.swift

@@ -6,7 +6,6 @@
 //  Copyright © 2023 Dmitry Kononchuk. All rights reserved.
 //
 
-#if os(iOS)
 import SwiftUI
 import CachedAsyncImage
 
@@ -52,7 +51,7 @@ struct ContentView: View {
                                 },
                                 image: {
                                     // Customize image.
-                                    Image(uiImage: $0)
+                                    Image(cpImage: $0)
                                         .resizable()
                                         .scaledToFill()
                                 },
@@ -93,6 +92,9 @@ struct ContentView: View {
                 }
             }
         }
+        #if os(macOS)
+        .frame(width: 300, height: 450)
+        #endif
     }
 
     // MARK: - Initializers
@@ -123,4 +125,3 @@ struct ContentView_Previews: PreviewProvider {
         ContentView()
     }
 }
-#endif

Package.swift

@@ -7,7 +7,8 @@ let package = Package(
     name: "CachedAsyncImage",
     platforms: [
         // Add support for all platforms starting from a specific version.
-        .iOS(.v14)
+        .iOS(.v14),
+        .macOS(.v11)
     ],
     products: [
         // Products define the executables and libraries a package produces, making them visible to other packages.

Sources/CachedAsyncImage/Resources/ResourcesManager.swift

@@ -34,4 +34,31 @@ public final class ResourcesManager {
         UIImage(named: name, in: Bundle.module, with: nil)
     }
 }
+#elseif canImport(AppKit)
+import AppKit
+
+/// Resources manager typealias.
+public typealias RM = ResourcesManager
+
+/// Resources manager.
+public final class ResourcesManager {
+    // MARK: - Public Properties
+    
+    /// An object that stores color data.
+    public static let snow = NSColor(
+        named: NSColor.Name("snow"),
+        bundle: Bundle.module
+    ) ?? NSColor()
+    
+    // MARK: - Public Methods
+    
+    /// Get image by name.
+    ///
+    /// - Parameter name: Image name.
+    ///
+    /// - Returns: An initialized image object or `nil` if the object was not found in the resources.
+    public static func image(_ name: String) -> NSImage? {
+        Bundle.module.image(forResource: NSImage.Name(name))
+    }
+}
 #endif

Sources/CachedAsyncImage/Services/CrossPlatformImage.swift

@@ -0,0 +1,47 @@
+//
+//  CrossPlatformImage.swift
+//  CachedAsyncImage
+//
+//  Created by Dmitry Kononchuk on 01.11.2023.
+//  Copyright © 2023 Dmitry Kononchuk. All rights reserved.
+//
+
+#if os(iOS)
+import UIKit
+import SwiftUI
+
+/// Cross platform image typealias.
+public typealias CPImage = UIImage
+
+extension Image {
+    /// - Parameter cpImage: Cross platform image.
+    public init(cpImage: CPImage) {
+        self.init(uiImage: cpImage)
+    }
+}
+
+extension UIImage {
+    var data: Data? {
+        pngData()
+    }
+}
+#elseif os(macOS)
+import AppKit
+import SwiftUI
+
+/// Cross platform image typealias.
+public typealias CPImage = NSImage
+
+extension Image {
+    /// - Parameter cpImage: Cross platform image.
+    public init(cpImage: CPImage) {
+        self.init(nsImage: cpImage)
+    }
+}
+
+extension NSImage {
+    var data: Data? {
+        tiffRepresentation
+    }
+}
+#endif

Sources/CachedAsyncImage/Services/ImageLoader.swift

@@ -6,13 +6,13 @@
 //  Copyright © 2023 Dmitry Kononchuk. All rights reserved.
 //
 
+import Foundation
 import Combine
-import UIKit
 
 final class ImageLoader: ObservableObject {
     // MARK: - Property Wrappers
 
-    @Published var image: UIImage?
+    @Published var image: CPImage?
     @Published var progress: Double?
     @Published var errorMessage: String?
 
@@ -63,15 +63,15 @@ final class ImageLoader: ObservableObject {
             .store(in: &cancellables)
 
         data
-            .map { UIImage(data: $0) }
-            .catch { [weak self] error -> AnyPublisher<UIImage?, Never> in
+            .map { CPImage(data: $0) }
+            .catch { [weak self] error -> AnyPublisher<CPImage?, Never> in
                 if let error = error as? NetworkError {
                     DispatchQueue.main.async {
                         self?.errorMessage = error.rawValue
                     }
 
                     #if DEBUG
-                        print("**** CachedAsyncImage error: \(error.rawValue)")
+                    print("**** CachedAsyncImage error: \(error.rawValue)")
                     #endif
                 }
 
@@ -109,7 +109,7 @@ final class ImageLoader: ObservableObject {
         isLoading = false
     }
 
-    private func cache(url: URL?, image: UIImage?) {
+    private func cache(url: URL?, image: CPImage?) {
         guard let url = url else { return }
         image.map { imageCache[url] = $0 }
     }

Sources/CachedAsyncImage/Services/TemporaryImageCache.swift

@@ -6,7 +6,7 @@
 //  Copyright © 2023 Dmitry Kononchuk. All rights reserved.
 //
 
-import UIKit
+import Foundation
 
 /// Temporary image cache.
 public final class TemporaryImageCache {
@@ -19,19 +19,19 @@ public final class TemporaryImageCache {
 
     // MARK: - Private Properties
 
-    private lazy var cache: NSCache<NSURL, UIImage> = {
-        let cache = NSCache<NSURL, UIImage>()
+    private lazy var cache: NSCache<NSURL, CPImage> = {
+        let cache = NSCache<NSURL, CPImage>()
         return cache
     }()
 
     // MARK: - Subscripts
 
-    subscript(_ key: URL) -> UIImage? {
+    subscript(_ key: URL) -> CPImage? {
         get { cache.object(forKey: key as NSURL) }
         set {
             newValue == nil
                 ? cache.removeObject(forKey: key as NSURL)
-                : cache.setObject(newValue ?? UIImage(), forKey: key as NSURL)
+                : cache.setObject(newValue ?? CPImage(), forKey: key as NSURL)
         }
     }