Change NetworkManager.

bullinnyc · Jan 2, 2024 · e39d82a · e39d82a
1 parent ef6cb40
commit e39d82a
Show file tree

Hide file tree

Showing 6 changed files with 36 additions and 25 deletions.
diff --git a/Sources/CachedAsyncImage/EnvironmentValues/EnvironmentValues + NetworkManager.swift b/Sources/CachedAsyncImage/EnvironmentValues/EnvironmentValues + NetworkManager.swift
@@ -0,0 +1,24 @@
+//
+//  EnvironmentValues + NetworkManager.swift
+//  CachedAsyncImage
+//
+//  Created by Dmitry Kononchuk on 02.01.2024.
+//  Copyright © 2024 Dmitry Kononchuk. All rights reserved.
+//
+
+import SwiftUI
+
+struct NetworkManagerKey: EnvironmentKey {
+    // MARK: - Public Properties
+
+    static let defaultValue: NetworkManagerProtocol = NetworkManager()
+}
+
+extension EnvironmentValues {
+    // MARK: - Public Properties
+
+    var networkManager: NetworkManagerProtocol {
+        get { self[NetworkManagerKey.self] }
+        set { self[NetworkManagerKey.self] = newValue }
+    }
+}
diff --git a/Sources/CachedAsyncImage/Services/NetworkManager.swift b/Sources/CachedAsyncImage/Services/NetworkManager.swift
@@ -39,15 +39,7 @@ protocol NetworkManagerProtocol {
     )
 }
 
-final class NetworkManager: NetworkManagerProtocol {
-    // MARK: - Public Properties
-
-    static let shared = NetworkManager()
-
-    // MARK: - Private Initializers
-
-    private init() {}
-
+struct NetworkManager: NetworkManagerProtocol {
     // MARK: - Public Methods
 
     func fetchImage(from url: URL?) -> (

diff --git a/Sources/CachedAsyncImage/Services/TempImageCache.swift b/Sources/CachedAsyncImage/Services/TempImageCache.swift
@@ -3,7 +3,7 @@
 //  CachedAsyncImage
 //
 //  Created by Dmitry Kononchuk on 02.01.2024.
-//  Copyright © 2023 Dmitry Kononchuk. All rights reserved.
+//  Copyright © 2024 Dmitry Kononchuk. All rights reserved.
 //
 
 import Foundation

diff --git a/Sources/CachedAsyncImage/Views/CachedAsyncImage.swift b/Sources/CachedAsyncImage/Views/CachedAsyncImage.swift
@@ -53,7 +53,7 @@ public struct CachedAsyncImage: View {
     ) {
         _imageLoader = StateObject(
             wrappedValue: ImageLoader(
-                networkManager: NetworkManager.shared,
+                networkManager: Environment(\.networkManager).wrappedValue,
                 imageCache: CachedAsyncImage.getImageCache()
             )
         )
@@ -79,7 +79,7 @@ public struct CachedAsyncImage: View {
     ) {
         _imageLoader = StateObject(
             wrappedValue: ImageLoader(
-                networkManager: NetworkManager.shared,
+                networkManager: Environment(\.networkManager).wrappedValue,
                 imageCache: CachedAsyncImage.getImageCache()
             )
         )
@@ -105,7 +105,7 @@ public struct CachedAsyncImage: View {
     ) {
         _imageLoader = StateObject(
             wrappedValue: ImageLoader(
-                networkManager: NetworkManager.shared,
+                networkManager: Environment(\.networkManager).wrappedValue,
                 imageCache: CachedAsyncImage.getImageCache()
             )
         )

diff --git a/Tests/CachedAsyncImageTests/ImageLoaderTests.swift b/Tests/CachedAsyncImageTests/ImageLoaderTests.swift
@@ -29,10 +29,11 @@ final class ImageLoaderTests: XCTestCase {
         // Given
         let url = "https://example.com/image.jpg"
         let cachedImage = RM.image("backToTheFuture")
+        let networkManager = sut.networkManager
         var imageCache = sut.imageCache
 
         let imageLoader = ImageLoader(
-            networkManager: sut.networkManager,
+            networkManager: networkManager,
             imageCache: imageCache
         )
 
@@ -59,11 +60,13 @@ final class ImageLoaderTests: XCTestCase {
     func testFetchImage_WithoutCachedImage() {
         // Given
         let url = "https://example.com/image.jpg"
+        let networkManager = sut.networkManager
+
         let imageCache = sut.imageCache
         imageCache.removeCache()
 
         let imageLoader = ImageLoader(
-            networkManager: sut.networkManager,
+            networkManager: networkManager,
             imageCache: imageCache
         )
 
@@ -125,7 +128,7 @@ extension ImageLoaderTests {
     )
 
     private func makeSUT() -> Sut {
-        let networkManager = NetworkManagerMock.shared
+        let networkManager = NetworkManagerMock()
         let imageCache = TempImageCache()
 
         return (networkManager, imageCache)

diff --git a/Tests/CachedAsyncImageTests/Mocks/NetworkManagerMock.swift b/Tests/CachedAsyncImageTests/Mocks/NetworkManagerMock.swift
@@ -10,15 +10,7 @@ import Foundation
 import Combine
 @testable import CachedAsyncImage
 
-final class NetworkManagerMock: NetworkManagerProtocol {
-    // MARK: - Public Properties
-
-    static let shared = NetworkManagerMock()
-
-    // MARK: - Private Initializers
-
-    private init() {}
-
+struct NetworkManagerMock: NetworkManagerProtocol {
     // MARK: - Public Methods
 
     func fetchImage(from url: URL?) -> (