Fix injection

iOSDesignPatternSamples/Sources/Common/AppDelegate.swift

@@ -14,19 +14,51 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
 
     var window: UIWindow?
 
-    let favoritePresenter = FavoriteViewPresenter()
+    let favoriteModel = FavoriteModel()
 
     func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {
 
         if let viewControllers = (window?.rootViewController as? UITabBarController)?.viewControllers {
             for value in viewControllers.enumerated() {
                 switch value {
                 case let (0, nc as UINavigationController):
-                    let searchVC = SearchViewController(searchPresenter: SearchViewPresenter(), favoritePresenter: favoritePresenter)
+                    let searchVC = SearchViewController(
+                        searchPresenter: SearchViewPresenter(
+                            model: SearchModel(
+                                sendRequest: ApiSession.shared.send,
+                                asyncAfter: { DispatchQueue.global().asyncAfter(deadline: $0, execute: $1) }
+                            ),
+                            mainAsync: { work in DispatchQueue.main.async { work() } },
+                            notificationCenter: .default
+                        ),
+                        makeRepositoryPresenter: { [favoriteModel] in
+                            RepositoryViewPresenter(
+                                repository: $0,
+                                favoriteModel: favoriteModel
+                            )
+                        },
+                        makeUserRepositoryPresenter: {
+                            UserRepositoryViewPresenter(
+                                model: RepositoryModel(
+                                    user: $0,
+                                    sendRequest: ApiSession.shared.send
+                                ),
+                                mainAsync: { work in DispatchQueue.main.async { work() } }
+                            )
+                        }
+                    )
                     nc.setViewControllers([searchVC], animated: false)
 
                 case let (1, nc as UINavigationController):
-                    let favoriteVC = FavoriteViewController(presenter: favoritePresenter)
+                    let favoriteVC = FavoriteViewController(
+                        presenter: FavoriteViewPresenter(model: favoriteModel),
+                        makeRepositoryPresenter: { [favoriteModel] in
+                            RepositoryViewPresenter(
+                                repository: $0,
+                                favoriteModel: favoriteModel
+                            )
+                        }
+                    )
                     nc.setViewControllers([favoriteVC], animated: false)
 
                 default:

iOSDesignPatternSamples/Sources/UI/Favorite/FavoriteViewController.swift

@@ -20,9 +20,15 @@ final class FavoriteViewController: UIViewController, FavoriteView {
     let presenter: FavoritePresenter
     let dataSource: FavoriteViewDataSource
 
-    init(presenter: FavoritePresenter) {
+    private let makeRepositoryPresenter: (Repository) -> RepositoryPresenter
+
+    init(
+        presenter: FavoritePresenter,
+        makeRepositoryPresenter: @escaping (Repository) -> RepositoryPresenter
+    ) {
         self.presenter = presenter
         self.dataSource = FavoriteViewDataSource(presenter: presenter)
+        self.makeRepositoryPresenter = makeRepositoryPresenter
         super.init(nibName: FavoriteViewController.className, bundle: nil)
     }
 
@@ -40,7 +46,7 @@ final class FavoriteViewController: UIViewController, FavoriteView {
     }
 
     func showRepository(with repository: Repository) {
-        let repositoryPresenter = RepositoryViewPresenter(repository: repository, favoritePresenter: presenter)
+        let repositoryPresenter = makeRepositoryPresenter(repository)
         let vc = RepositoryViewController(presenter: repositoryPresenter)
         navigationController?.pushViewController(vc, animated: true)
     }

iOSDesignPatternSamples/Sources/UI/Search/SearchViewController.swift

@@ -29,14 +29,21 @@ final class SearchViewController: UIViewController, SearchView {
     let searchBar = UISearchBar(frame: .zero)
     let loadingView = LoadingView()
 
-    let favoritePresenter: FavoritePresenter
     let searchPresenter: SearchPresenter
     let dataSource: SearchViewDataSource
 
-    init(searchPresenter: SearchPresenter, favoritePresenter: FavoritePresenter) {
+    private let makeRepositoryPresenter: (Repository) -> RepositoryPresenter
+    private let makeUserRepositoryPresenter: (User) -> UserRepositoryPresenter
+
+    init(
+        searchPresenter: SearchPresenter,
+        makeRepositoryPresenter: @escaping (Repository) -> RepositoryPresenter,
+        makeUserRepositoryPresenter: @escaping (User) -> UserRepositoryPresenter
+    ) {
         self.searchPresenter = searchPresenter
-        self.favoritePresenter = favoritePresenter
         self.dataSource = SearchViewDataSource(presenter: searchPresenter)
+        self.makeRepositoryPresenter = makeRepositoryPresenter
+        self.makeUserRepositoryPresenter = makeUserRepositoryPresenter
         super.init(nibName: SearchViewController.className, bundle: nil)
     }
 
@@ -95,8 +102,11 @@ final class SearchViewController: UIViewController, SearchView {
     }
 
     func showUserRepository(with user: User) {
-        let presenter = UserRepositoryViewPresenter(user: user)
-        let vc = UserRepositoryViewController(userRepositoryPresenter: presenter, favoritePresenter: favoritePresenter)
+        let presenter = makeUserRepositoryPresenter(user)
+        let vc = UserRepositoryViewController(
+            userRepositoryPresenter: presenter,
+            makeRepositoryPresenter: makeRepositoryPresenter
+        )
         navigationController?.pushViewController(vc, animated: true)
     }
 

iOSDesignPatternSamples/Sources/UI/UserRepository/UserRepositoryViewController.swift

@@ -6,8 +6,8 @@
 //  Copyright © 2017年 marty-suzuki. All rights reserved.
 //
 
-import UIKit
 import GithubKit
+import UIKit
 
 protocol UserRepositoryView: class {
     func reloadData()
@@ -23,15 +23,18 @@ final class UserRepositoryViewController: UIViewController, UserRepositoryView {
 
     let loadingView = LoadingView()
 
-    let favoritePresenter: FavoritePresenter
     let userRepositoryPresenter: UserRepositoryPresenter
     let dataSource: UserRepositoryViewDataSource
+
+    private let makeRepositoryPresenter: (Repository) -> RepositoryPresenter
 
-    init(userRepositoryPresenter: UserRepositoryPresenter, favoritePresenter: FavoritePresenter) {
-        self.favoritePresenter = favoritePresenter
+    init(
+        userRepositoryPresenter: UserRepositoryPresenter,
+        makeRepositoryPresenter: @escaping (Repository) -> RepositoryPresenter
+    ) {
         self.userRepositoryPresenter = userRepositoryPresenter
         self.dataSource = UserRepositoryViewDataSource(presenter: userRepositoryPresenter)
-
+        self.makeRepositoryPresenter = makeRepositoryPresenter
         super.init(nibName: UserRepositoryViewController.className, bundle: nil)
         hidesBottomBarWhenPushed = true
     }
@@ -52,7 +55,7 @@ final class UserRepositoryViewController: UIViewController, UserRepositoryView {
     }
 
     func showRepository(with repository: Repository) {
-        let repositoryPresenter = RepositoryViewPresenter(repository: repository, favoritePresenter: favoritePresenter)
+        let repositoryPresenter = makeRepositoryPresenter(repository)
         let vc = RepositoryViewController(presenter: repositoryPresenter)
         navigationController?.pushViewController(vc, animated: true)
     }