@@ -28,72 +28,11 @@ final class SearchViewController: UIViewController, SearchView {
2828 searchBar. delegate = self
2929 return searchBar
3030 } ( )
31-
32- <<<<<<< HEAD
31+
3332 fileprivate let loadingView = LoadingView . makeFromNib ( )
34-
33+
3534 var favoritePresenter : FavoritePresenter ?
36- =======
37- private var query : String = " " {
38- didSet {
39- if query != oldValue {
40- users. removeAll ( )
41- pageInfo = nil
42- totalCount = 0
43- }
44- task? . cancel ( )
45- task = nil
46- fetchUsers ( )
47- }
48- }
49- private var task : URLSessionTask ? = nil
50- private var pageInfo : PageInfo ? = nil
51- private var totalCount : Int = 0 {
52- didSet {
53- totalCountLabel. text = " \( users. count) / \( totalCount) "
54- }
55- }
56- private var users : [ User ] = [ ] {
57- didSet {
58- totalCountLabel. text = " \( users. count) / \( totalCount) "
59- tableView. reloadData ( )
60- }
61- }
62- private let debounce : ( _ action: @escaping ( ) -> ( ) ) -> ( ) = {
63- var lastFireTime : DispatchTime = . now( )
64- let delay : DispatchTimeInterval = . milliseconds( 500 )
65- return { [ delay] action in
66- let deadline : DispatchTime = . now( ) + delay
67- lastFireTime = . now( )
68- DispatchQueue . global ( ) . asyncAfter ( deadline: deadline) { [ delay] in
69- let now : DispatchTime = . now( )
70- let when : DispatchTime = lastFireTime + delay
71- if now < when { return }
72- lastFireTime = . now( )
73- DispatchQueue . main. async {
74- action ( )
75- }
76- }
77- }
78- } ( )
79- private var isFetchingUsers = false {
80- didSet {
81- tableView. reloadData ( )
82- }
83- }
84- private var pool = Notice . ObserverPool ( )
85-
86- private let loadingView = LoadingView . makeFromNib ( )
87-
88- private var isReachedBottom : Bool = false {
89- didSet {
90- if isReachedBottom && isReachedBottom != oldValue {
91- fetchUsers ( )
92- }
93- }
94- }
95- > >>>>>> mvc
96-
35+
9736 private lazy var presenter : SearchPresenter = SearchViewPresenter ( view: self )
9837 private lazy var dataSource : SearchViewDataSource = . init( presenter: self . presenter)
9938
@@ -102,32 +41,27 @@ final class SearchViewController: UIViewController, SearchView {
10241
10342 navigationItem. titleView = searchBar
10443 searchBar. placeholder = " Input user name "
105-
44+
10645 dataSource. configure ( with: tableView)
10746 }
108-
47+
10948 override func viewWillAppear( _ animated: Bool ) {
11049 super. viewWillAppear ( animated)
11150 presenter. viewWillAppear ( )
11251 }
113-
52+
11453 override func viewWillDisappear( _ animated: Bool ) {
11554 super. viewWillDisappear ( animated)
11655 if searchBar. isFirstResponder {
11756 searchBar. resignFirstResponder ( )
11857 }
119- <<<<<<< HEAD
12058 presenter. viewWillDisappear ( )
121- =======
122- pool = Notice . ObserverPool ( )
123- >>>>>>> mvc
12459 }
125-
60+
12661 func reloadData( ) {
12762 tableView. reloadData ( )
12863 }
129-
130- < <<<<<< HEAD
64+
13165 func keyboardWillShow( with keyboardInfo: UIKeyboardInfo ) {
13266 view. layoutIfNeeded ( )
13367 let extra = tabBarController? . tabBar. bounds. height ?? 0
@@ -137,29 +71,8 @@ final class SearchViewController: UIViewController, SearchView {
13771 options: keyboardInfo. animationCurve,
13872 animations: { self . view. layoutIfNeeded ( ) } ,
13973 completion: nil )
140- =======
141- private func observeKeyboard( ) {
142- NotificationCenter . default. nok. observe ( name: . keyboardWillShow) { [ weak self] in
143- self ? . view. layoutIfNeeded ( )
144- let extra = self ? . tabBarController? . tabBar. bounds. height ?? 0
145- self ? . tableViewBottomConstraint. constant = $0. frame. size. height - extra
146- UIView . animate ( withDuration: $0. animationDuration, delay: 0 , options: $0. animationCurve, animations: {
147- self ? . view. layoutIfNeeded ( )
148- } , completion: nil )
149- }
150- . invalidated ( by: pool)
151-
152- NotificationCenter . default. nok. observe ( name: . keyboardWillHide) { [ weak self] in
153- self ? . view. layoutIfNeeded ( )
154- self ? . tableViewBottomConstraint. constant = 0
155- UIView . animate ( withDuration: $0. animationDuration, delay: 0 , options: $0. animationCurve, animations: {
156- self ? . view. layoutIfNeeded ( )
157- } , completion: nil )
158- }
159- . invalidated ( by: pool)
160- >>>>>>> mvc
16174 }
162-
75+
16376 func keyboardWillHide( with keyboardInfo: UIKeyboardInfo ) {
16477 view. layoutIfNeeded ( )
16578 tableViewBottomConstraint. constant = 0
@@ -169,23 +82,17 @@ final class SearchViewController: UIViewController, SearchView {
16982 animations: { self . view. layoutIfNeeded ( ) } ,
17083 completion: nil )
17184 }
172-
173- <<<<<<< HEAD
85+
17486 func showUserRepository( with user: User ) {
17587 guard let presenter = favoritePresenter else { return }
17688 let vc = UserRepositoryViewController ( user: user, favoritePresenter: presenter)
177- =======
178- private func showUserRepository( with user: User) {
179- guard let favoriteModel = favoriteModel else { return }
180- let vc = UserRepositoryViewController ( user: user, favoriteModel: favoriteModel)
181- >>>>>>> mvc
18289 navigationController? . pushViewController ( vc, animated: true )
18390 }
184-
91+
18592 func updateTotalCountLabel( _ countText: String ) {
18693 totalCountLabel. text = countText
18794 }
188-
95+
18996 func updateLoadingView( with view: UIView , isLoading: Bool ) {
19097 loadingView. removeFromSuperview ( )
19198 loadingView. isLoading = isLoading
@@ -205,16 +112,16 @@ extension SearchViewController: UISearchBarDelegate {
205112 searchBar. resignFirstResponder ( )
206113 searchBar. showsCancelButton = false
207114 }
208-
115+
209116 func searchBarSearchButtonClicked( _ searchBar: UISearchBar ) {
210117 searchBar. resignFirstResponder ( )
211118 searchBar. showsCancelButton = false
212119 }
213-
120+
214121 func searchBarTextDidBeginEditing( _ searchBar: UISearchBar ) {
215122 searchBar. showsCancelButton = true
216123 }
217-
124+
218125 func searchBar( _ searchBar: UISearchBar , textDidChange searchText: String ) {
219126 presenter. search ( queryIfNeeded: searchText)
220127 }
0 commit comments