Merge branch 'mvc' into mvp

iOSDesignPatternSamples/Sources/UI/Favorite/FavoriteViewController.swift

@@ -16,7 +16,7 @@ protocol FavoriteView: class {
 
 final class FavoriteViewController: UIViewController, FavoriteView {
     @IBOutlet private(set) weak var tableView: UITableView!
-    
+
     let presenter: FavoritePresenter
     let dataSource: FavoriteViewDataSource
 

iOSDesignPatternSamples/Sources/UI/Search/SearchViewController.swift

@@ -8,6 +8,7 @@
 
 import Combine
 import GithubKit
+import UIKit
 
 protocol SearchView: class {
     func reloadData()
@@ -71,7 +72,7 @@ final class SearchViewController: UIViewController, SearchView {
     func reloadData() {
         tableView.reloadData()
     }
-    
+
     func keyboardWillShow(with keyboardInfo: UIKeyboardInfo) {
         view.layoutIfNeeded()
         let extra = tabBarController?.tabBar.bounds.height ?? 0

iOSDesignPatternSamples/Sources/UI/Search/SearchViewPresenter.swift

@@ -6,9 +6,10 @@
 //  Copyright © 2017年 marty-suzuki. All rights reserved.
 //
 
+import Combine
 import Foundation
 import GithubKit
-import NoticeObserveKit
+import UIKit
 
 protocol SearchPresenter: class {
     var view: SearchView? { get set }
@@ -34,9 +35,12 @@ final class SearchViewPresenter: SearchPresenter {
         return model.isFetchingUsers
     }
 
-    private let model = SearchModel()
+    private let model = SearchModel(
+        sendRequest: ApiSession.shared.send,
+        asyncAfter: { DispatchQueue.global().asyncAfter(deadline: $0, execute: $1) }
+    )
     private var isReachedBottom: Bool = false
-    private var pool = Notice.ObserverPool()
+    private var cancellables = Set<AnyCancellable>()
 
     init() {
         self.model.delegate = self
@@ -68,19 +72,27 @@ final class SearchViewPresenter: SearchPresenter {
     }
 
     func viewWillAppear() {
-        NotificationCenter.default.nok.observe(name: .keyboardWillShow) { [weak self] in
-            self?.view?.keyboardWillShow(with: $0)
-        }
-        .invalidated(by: pool)
+        NotificationCenter.default.publisher(for: UIResponder.keyboardWillShowNotification)
+            .sink { [weak self] notification in
+                guard let info = UIKeyboardInfo(notification: notification) else {
+                    return
+                }
+                self?.view?.keyboardWillShow(with: info)
+            }
+            .store(in: &cancellables)
 
-        NotificationCenter.default.nok.observe(name: .keyboardWillHide) { [weak self] in
-            self?.view?.keyboardWillHide(with: $0)
-        }
-        .invalidated(by: pool)
+        NotificationCenter.default.publisher(for: UIResponder.keyboardWillHideNotification)
+            .sink { [weak self] notification in
+                guard let info = UIKeyboardInfo(notification: notification) else {
+                    return
+                }
+                self?.view?.keyboardWillHide(with: info)
+            }
+            .store(in: &cancellables)
     }
 
     func viewWillDisappear() {
-        pool = Notice.ObserverPool()
+        cancellables.removeAll()
     }
 
     func showLoadingView(on view: UIView) {

iOSDesignPatternSamples/Sources/UI/UserRepository/UserRepositoryViewController.swift

@@ -21,7 +21,7 @@ final class UserRepositoryViewController: UIViewController, UserRepositoryView {
     @IBOutlet private(set) weak var tableView: UITableView!
     @IBOutlet private(set) weak var totalCountLabel: UILabel!
 
-    let loadingView = LoadingView.makeFromNib()
+    let loadingView = LoadingView()
 
     let favoritePresenter: FavoritePresenter
     let userRepositoryPresenter: UserRepositoryPresenter
@@ -31,7 +31,7 @@ final class UserRepositoryViewController: UIViewController, UserRepositoryView {
         self.favoritePresenter = favoritePresenter
         self.userRepositoryPresenter = userRepositoryPresenter
         self.dataSource = UserRepositoryViewDataSource(presenter: userRepositoryPresenter)
-        
+
         super.init(nibName: UserRepositoryViewController.className, bundle: nil)
         hidesBottomBarWhenPushed = true
     }

iOSDesignPatternSamples/Sources/UI/UserRepository/UserRepositoryViewPresenter.swift

@@ -8,6 +8,7 @@
 
 import Foundation
 import GithubKit
+import UIKit
 
 protocol UserRepositoryPresenter: class {
     var view: UserRepositoryView? { get set }
@@ -40,7 +41,7 @@ final class UserRepositoryViewPresenter: UserRepositoryPresenter {
     private var isReachedBottom: Bool = false
 
     init(user: User) {
-        self.model = RepositoryModel(user: user)
+        self.model = RepositoryModel(user: user, sendRequest: ApiSession.shared.send)
         self.model.delegate = self
     }