Minor iOS changes

Author: tib

Chapter 14/MyProjectClient/iOS/Sources/AppDelegate.swift

@@ -9,23 +9,22 @@
 import UIKit
 
 @UIApplicationMain
-class AppDelegate: UIResponder, UIApplicationDelegate {
+class AppDelegate: UIResponder {
+    
+}
 
-    func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {
-        
+extension AppDelegate: UIApplicationDelegate {
+    
+    func application(_ application: UIApplication,
+                     didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {
         return true
     }
-
-    // MARK: UISceneSession Lifecycle
-
-    func application(_ application: UIApplication, configurationForConnecting connectingSceneSession: UISceneSession, options: UIScene.ConnectionOptions) -> UISceneConfiguration {
-        return UISceneConfiguration(name: "Default Configuration", sessionRole: connectingSceneSession.role)
+    
+    func application(_ application: UIApplication,
+                     configurationForConnecting connectingSceneSession: UISceneSession,
+                     options: UIScene.ConnectionOptions) -> UISceneConfiguration {
+        return .init(name: "Default Configuration",
+                     sessionRole: connectingSceneSession.role)
     }
-
-    func application(_ application: UIApplication, didDiscardSceneSessions sceneSessions: Set<UISceneSession>) {
-        
-    }
-
-
 }
 

Chapter 14/MyProjectClient/iOS/Sources/Modules/App.swift

@@ -14,21 +14,14 @@ final class App {
     let services: ServiceBuilderInterface
     let modules: ModuleBuilderInterface
 
-    // MARK: - singleton
-
     static let shared = App()
 
     private init() {
-        // do nothing...
-        
         self.services = ServiceBuilder()
         self.modules = ModuleBuilder()
     }
 
-    // MARK: - api
-
     func setup() {
         self.services.setup()
     }
-    
 }

Chapter 14/MyProjectClient/iOS/Sources/Modules/Root/RootInteractor.swift

@@ -20,10 +20,13 @@ extension RootInteractor: RootInteractorPresenterInterface {
         self.services.api.getBlogPosts()
         .map { page -> RootEntity in
             let domain = "http://localhost:8080"
-            return .init(items: page.items.map { .init(id: $0.id,
-                                                       title: $0.title,
-                                                       imageUrl: URL(string: domain + $0.image)!,
-                                                       url: URL(string: domain + "/" + $0.slug)!) })
+            return .init(items: page.items.map {
+                .init(id: $0.id,
+                      title: $0.title,
+                      imageUrl: URL(string: domain + $0.image)!,
+                      url: URL(string: domain + "/" + $0.slug)!)
+                
+            })
         }
         .mapError { $0 as Error }
         .eraseToAnyPublisher()

Chapter 14/MyProjectClient/iOS/Sources/SceneDelegate.swift

@@ -8,23 +8,26 @@
 
 import UIKit
 
-class SceneDelegate: UIResponder, UIWindowSceneDelegate {
-
+class SceneDelegate: UIResponder {
+    
     var window: UIWindow?
+}
 
+extension SceneDelegate: UIWindowSceneDelegate {
+    
     func scene(_ scene: UIScene,
                willConnectTo session: UISceneSession,
                options connectionOptions: UIScene.ConnectionOptions)
     {
-         if let windowScene = scene as? UIWindowScene {
-            let window = UIWindow(windowScene: windowScene)
-            let rootView = App.shared.modules.root()
-            let rootVC = UINavigationController(rootViewController: rootView)
-            window.rootViewController = rootVC
-            self.window = window
-            window.makeKeyAndVisible()
+        guard let windowScene = scene as? UIWindowScene else {
+            return
         }
+        let window = UIWindow(windowScene: windowScene)
+        let rootView = App.shared.modules.root()
+        let rootVC = UINavigationController(rootViewController: rootView)
+        window.rootViewController = rootVC
+        self.window = window
+        window.makeKeyAndVisible()
     }
-
 }
 

Chapter 14/MyProjectClient/iOS/Sources/ServiceInterface.swift renamed to Chapter 14/MyProjectClient/iOS/Sources/Services/ServiceInterface.swift

@@ -15,6 +15,6 @@ protocol ServiceInterface: class {
 extension ServiceInterface {
 
     func setup() {
-        // do nothing...
+        
     }
 }