refactor: seperate network module

Author: ImaginativeShohag

.mise.toml

@@ -1,2 +1,2 @@
 [tools]
-tuist = "4.26.0"
+tuist = "4.34.3"

Package.resolved

@@ -5,8 +5,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/Alamofire/Alamofire",
       "state" : {
-        "revision" : "f455c2975872ccd2d9c81594c658af65716e9b9a",
-        "version" : "5.9.1"
+        "revision" : "e16d3481f5ed35f0472cb93350085853d754913f",
+        "version" : "5.10.1"
       }
     },
     {
@@ -50,8 +50,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/gonzalezreal/NetworkImage",
       "state" : {
-        "revision" : "7aff8d1b31148d32c5933d75557d42f6323ee3d1",
-        "version" : "6.0.0"
+        "revision" : "2849f5323265386e200484b0d0f896e73c3411b9",
+        "version" : "6.0.1"
       }
     },
     {
@@ -68,26 +68,26 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/realm/realm-core.git",
       "state" : {
-        "revision" : "c2552e1d36867cb42b28130e894a81fc17081062",
-        "version" : "14.12.0"
+        "revision" : "85eeca41654cc9070ad81a21a4b1d153ad467c33",
+        "version" : "14.13.1"
       }
     },
     {
       "identity" : "realm-swift",
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/realm/realm-swift",
       "state" : {
-        "revision" : "5221a83dc720823e3017493394d00d49ccf13446",
-        "version" : "10.52.3"
+        "revision" : "5553cfd1c789efdb3d6daf7f0cc0733cfe601846",
+        "version" : "10.54.1"
       }
     },
     {
       "identity" : "rxswift",
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/ReactiveX/RxSwift.git",
       "state" : {
-        "revision" : "b06a8c8596e4c3e8e7788e08e720e3248563ce6a",
-        "version" : "6.7.1"
+        "revision" : "c7c7d2cf50a3211fe2843f76869c698e4e417930",
+        "version" : "6.8.0"
       }
     },
     {

Project.swift

@@ -78,29 +78,38 @@ let project = Project.app(
         Module(
             name: "Core",
             hasResources: true,
-            hasUnitTest: true
+            hasUnitTest: true,
+            dependencies: ["SuperLog", "NetworkKit"]
         ),
         Module(
             name: "CommonUI",
             hasResources: true,
             hasUITest: true,
-            dependencies: ["Core"]
+            dependencies: ["Core", "SuperLog"]
+        ),
+        Module(
+            name: "NetworkKit",
+            hasUnitTest: true,
+            dependencies: ["SuperLog"]
+        ),
+        Module(
+            name: "SuperLog"
         ),
         Module(
             name: "Home",
             hasUnitTest: true,
             hasUITest: true,
-            dependencies: ["Core", "CommonUI", "Todo", "News"]
+            dependencies: ["Core", "CommonUI", "SuperLog", "Todo", "News"]
         ),
         Module(
             name: "Todo",
-            dependencies: ["Core", "CommonUI"]
+            dependencies: ["Core", "CommonUI", "SuperLog"]
         ),
         Module(
             name: "News",
             hasResources: true,
             hasUITest: true,
-            dependencies: ["Core", "CommonUI"]
+            dependencies: ["Core", "CommonUI", "SuperLog", "NetworkKit"]
         )
     ],
     externalDependencies: [
@@ -115,7 +124,7 @@ let project = Project.app(
         // We need both "RealmSwift" and "Realm" to solve the "Undefined symbol" issue.
         .external(name: "RealmSwift"),
         .external(name: "Realm"),
-        .external(name: "MarkdownUI"),
+        .external(name: "MarkdownUI")
     ],
     coreDataModels: []
 )

README.md

@@ -103,12 +103,18 @@ A collection of animation related SwiftUI features.
 
 <img src="images/animation.gif" width=250/>
 
+### UI Testing with Mock data
+
+Checkout the "News" module to get an example for how to run an UI test using mock data.
+
 ## Playground Books
 
 Check `Playgrounds` directory for the books.
 
 ### **GCD and Structured Concurrency Model:** A quick guide about the GCD (`DispatchQueue` etc.) and Structured Concurrency Model (`Task`, `actor`, `Sendable` etc.)
 
+### **Combine:** An introduction guide for the Combine framework.
+
 <img src="images/GCD and Structured Concurrency Model.png" width=300/>
 
 ## Others
@@ -299,6 +305,7 @@ let image: UIImage = CoreAsset.exampleImage.image // Access from any target :)
 - [ ] Update `Backend`
 - [ ] Update `ShimmerUI`
 - [ ] Update Tuist docs ("Access Assets" section etc.)
+- [ ] Move version to xconfig file
 
 ## Extensions
 

Targets/Core/Sources/Environment/Env.swift

@@ -2,8 +2,11 @@
 //  Copyright © 2024 Md. Mahmudul Hasan Shohag. All rights reserved.
 //
 
+import Alamofire
+import Foundation
+
 public struct Env {
-    nonisolated(unsafe) public static let shared = Env()
+    public nonisolated(unsafe) static let shared = Env()
 
     public let environment: Environment
 
@@ -27,11 +30,4 @@ public struct Env {
 
         #endif
     }
-
-    public let defaultSession = NetworkSession.getNetworkSession(
-        hostUrl: Config.HOST_URL,
-        httpAdditionalHeaders: [
-            "Accept": "application/json"
-        ]
-    )
 }

Targets/Core/Sources/Extensions/String+.swift

@@ -28,28 +28,28 @@ public extension String {
         let emailPredicate = NSPredicate(format: "SELF MATCHES %@", emailRegEx)
         return emailPredicate.evaluate(with: self)
     }
-    
+
     func addingPercentEncodingForQueryParameter() -> String {
         return addingPercentEncoding(withAllowedCharacters: .urlQueryAllowed) ?? ""
     }
-    
+
     func toMarkdown() -> AttributedString {
         do {
-          return try AttributedString(
-            markdown: self,
-            options: AttributedString.MarkdownParsingOptions(
-                allowsExtendedAttributes: true,
-                interpretedSyntax: .full
+            return try AttributedString(
+                markdown: self,
+                options: AttributedString.MarkdownParsingOptions(
+                    allowsExtendedAttributes: true,
+                    interpretedSyntax: .full
+                )
             )
-          )
         } catch {
-          print("Error parsing Markdown for string \(self): \(error)")
-          return AttributedString(self)
+            print("Error parsing Markdown for string \(self): \(error)")
+            return AttributedString(self)
         }
-      }
+    }
 }
 
-extension Optional where Wrapped == String {
+public extension Optional where Wrapped == String {
     /// Return `true` only if it is not `nil` or empty.
     var isBlank: Bool {
         return self?.isEmpty ?? true

Targets/Core/Sources/Extensions/URL+.swift

@@ -4,6 +4,7 @@
 
 import Foundation
 import AVFoundation
+import SuperLog
 
 public extension URL {
     /// - Returns: The file size in KB.

Targets/Core/Sources/Navigation/Demo/NavigationDemoScreen.swift

@@ -2,6 +2,7 @@
 //  Copyright © 2023 Md. Mahmudul Hasan Shohag. All rights reserved.
 //
 
+import SuperLog
 import SwiftUI
 
 #if DEBUG

Targets/Core/Sources/Navigation/NavController.swift

@@ -4,6 +4,7 @@
 
 import Foundation
 import SwiftUI
+import SuperLog
 
 /// # Decision Documentation:
 ///

Targets/Core/Sources/Network/Extensions/Backend+.swift

@@ -4,6 +4,7 @@
 
 import Foundation
 import Moya
+import NetworkKit
 
 public extension Backend {
     convenience init(
@@ -13,7 +14,7 @@ public extension Backend {
         self.init(
             isStubbed: isUITestEnvironment ? true : isStubbed,
             stubBehavior: stubBehavior,
-            session: Env.shared.defaultSession
+            session: NetworkSession.default
         )
     }
 }

Targets/Core/Sources/Network/Extensions/CertificateManager+default.swift

@@ -0,0 +1,14 @@
+//
+//  Copyright © 2024 Md. Mahmudul Hasan Shohag. All rights reserved.
+//
+
+import NetworkKit
+
+public extension CertificateManager {
+    static var `default`: CertificateManager {
+        return CertificateManager(keys: [
+            // [0x11, 0x22, 0xAA, 0xBB, ...],
+            // [0x33, 0x44, 0xCC, 0xDD, ...]
+        ])
+    }
+}

Targets/Core/Sources/Network/Extensions/NetworkSession+default.swift

@@ -0,0 +1,16 @@
+//
+//  Copyright © 2024 Md. Mahmudul Hasan Shohag. All rights reserved.
+//
+
+import Alamofire
+import NetworkKit
+
+public extension NetworkSession {
+    static let `default` = NetworkSession.getNetworkSession(
+        // Note: To do certificate pinning use the following commented code.
+        // serverTrustManager: ServerTrustManager.default,
+        httpAdditionalHeaders: [
+            "Accept": "application/json",
+        ]
+    )
+}

Targets/Core/Sources/Network/Extensions/ServerTrustManager+default.swift

@@ -0,0 +1,18 @@
+//
+//  Copyright © 2024 Md. Mahmudul Hasan Shohag. All rights reserved.
+//
+
+import Alamofire
+import Foundation
+import NetworkKit
+
+public extension ServerTrustManager {
+    static var `default`: ServerTrustManager {
+        let domainName = URL(string: Env.shared.hostUrl)?.host ?? ""
+        let evaluators: [String: ServerTrustEvaluating] = [
+            domainName: PublicKeysTrustEvaluator(keys: CertificateManager.default.publicKeys),
+        ]
+
+        return ServerTrustManager(evaluators: evaluators)
+    }
+}