Minor methods refactor

Author: kudoleh

ExampleMVVM/Presentation/MoviesScene/MoviesList/View/MoviesListTableView/MoviesListTableViewController.swift

@@ -25,8 +25,8 @@ final class MoviesListTableViewController: UITableViewController {
         tableView.reloadData()
     }
 
-    func update(for loadingType: MoviesListViewModelLoading?) {
-        switch loadingType {
+    func updateLoading(_ loading: MoviesListViewModelLoading?) {
+        switch loading {
         case .nextPage:
             nextPageLoadingSpinner?.removeFromSuperview()
             nextPageLoadingSpinner = UIActivityIndicatorView(style: .gray)

ExampleMVVM/Presentation/MoviesScene/MoviesList/View/MoviesListViewController.swift

@@ -40,22 +40,17 @@ final class MoviesListViewController: UIViewController, StoryboardInstantiable,
     }
 
     private func bind(to viewModel: MoviesListViewModel) {
-        viewModel.items.observe(on: self) { [weak self] _ in self?.moviesTableViewController?.reload() }
-        viewModel.query.observe(on: self) { [weak self] in self?.updateSearchController(query: $0) }
-        viewModel.error.observe(on: self) { [weak self] in self?.showError($0) }
-        viewModel.loadingType.observe(on: self) { [weak self] in self?.updateViewsVisibility(loadingType: $0) }
+        viewModel.items.observe(on: self) { [weak self] items in self?.updateItems(items) }
+        viewModel.query.observe(on: self) { [weak self] query in self?.updateSearchQuery(query) }
+        viewModel.loading.observe(on: self) { [weak self] loading in self?.updateLoading(loading) }
+        viewModel.error.observe(on: self) { [weak self] error in self?.showError(error) }
     }
 
     override func viewWillDisappear(_ animated: Bool) {
         super.viewWillDisappear(animated)
         searchController.isActive = false
     }
 
-    private func updateSearchController(query: String) {
-        searchController.isActive = false
-        searchController.searchBar.text = query
-    }
-
     override func prepare(for segue: UIStoryboardSegue, sender: Any?) {
         if segue.identifier == String(describing: MoviesListTableViewController.self),
             let destinationVC = segue.destination as? MoviesListTableViewController {
@@ -78,36 +73,45 @@ final class MoviesListViewController: UIViewController, StoryboardInstantiable,
                       BlackStyleNavigationBarBehavior()])
     }
 
-    private func showError(_ error: String) {
-        guard !error.isEmpty else { return }
-        showAlert(title: viewModel.errorTitle, message: error)
+    private func updateItems(_ items: [MoviesListItemViewModel]) {
+        moviesTableViewController?.reload()
+    }
+
+    private func updateSearchQuery(_ query: String) {
+        searchController.isActive = false
+        searchController.searchBar.text = query
     }
 
-    private func updateViewsVisibility(loadingType: MoviesListViewModelLoading?) {
+    private func updateLoading(_ loading: MoviesListViewModelLoading?) {
         emptyDataLabel.isHidden = true
         moviesListContainer.isHidden = true
         suggestionsListContainer.isHidden = true
         LoadingView.hide()
 
-        switch loadingType {
+        switch loading {
         case .fullScreen: LoadingView.show()
         case .nextPage: moviesListContainer.isHidden = false
         case .none:
             moviesListContainer.isHidden = viewModel.isEmpty
             emptyDataLabel.isHidden = !viewModel.isEmpty
         }
 
-        moviesTableViewController?.update(for: loadingType)
-        updateQueriesSuggestionsVisibility()
+        moviesTableViewController?.updateLoading(loading)
+        updateQueriesSuggestions()
     }
 
-    private func updateQueriesSuggestionsVisibility() {
+    private func updateQueriesSuggestions() {
         guard searchController.searchBar.isFirstResponder else {
             viewModel.closeQueriesSuggestions()
             return
         }
         viewModel.showQueriesSuggestions()
     }
+
+    private func showError(_ error: String) {
+        guard !error.isEmpty else { return }
+        showAlert(title: viewModel.errorTitle, message: error)
+    }
 }
 
 // MARK: - Search Controller
@@ -145,14 +149,14 @@ extension MoviesListViewController: UISearchBarDelegate {
 
 extension MoviesListViewController: UISearchControllerDelegate {
     public func willPresentSearchController(_ searchController: UISearchController) {
-        updateQueriesSuggestionsVisibility()
+        updateQueriesSuggestions()
     }
 
     public func willDismissSearchController(_ searchController: UISearchController) {
-        updateQueriesSuggestionsVisibility()
+        updateQueriesSuggestions()
     }
 
     public func didDismissSearchController(_ searchController: UISearchController) {
-        updateQueriesSuggestionsVisibility()
+        updateQueriesSuggestions()
     }
 }

ExampleMVVM/Presentation/MoviesScene/MoviesList/ViewModel/MoviesListViewModel.swift

@@ -32,7 +32,7 @@ protocol MoviesListViewModelInput {
 
 protocol MoviesListViewModelOutput {
     var items: Observable<[MoviesListItemViewModel]> { get }
-    var loadingType: Observable<MoviesListViewModelLoading?> { get }
+    var loading: Observable<MoviesListViewModelLoading?> { get }
     var query: Observable<String> { get }
     var error: Observable<String> { get }
     var isEmpty: Bool { get }
@@ -60,7 +60,7 @@ final class DefaultMoviesListViewModel: MoviesListViewModel {
     // MARK: - OUTPUT
 
     let items: Observable<[MoviesListItemViewModel]> = Observable([])
-    let loadingType: Observable<MoviesListViewModelLoading?> = Observable(.none)
+    let loading: Observable<MoviesListViewModelLoading?> = Observable(.none)
     let query: Observable<String> = Observable("")
     let error: Observable<String> = Observable("")
     var isEmpty: Bool { return items.value.isEmpty }
@@ -97,8 +97,8 @@ final class DefaultMoviesListViewModel: MoviesListViewModel {
         items.value.removeAll()
     }
 
-    private func load(movieQuery: MovieQuery, loadingType: MoviesListViewModelLoading) {
-        self.loadingType.value = loadingType
+    private func load(movieQuery: MovieQuery, loading: MoviesListViewModelLoading) {
+        self.loading.value = loading
         query.value = movieQuery.query
 
         moviesLoadTask = searchMoviesUseCase.execute(
@@ -111,7 +111,7 @@ final class DefaultMoviesListViewModel: MoviesListViewModel {
                 case .failure(let error):
                     self.handle(error: error)
                 }
-                self.loadingType.value = .none
+                self.loading.value = .none
         })
     }
 
@@ -123,7 +123,7 @@ final class DefaultMoviesListViewModel: MoviesListViewModel {
 
     private func update(movieQuery: MovieQuery) {
         resetPages()
-        load(movieQuery: movieQuery, loadingType: .fullScreen)
+        load(movieQuery: movieQuery, loading: .fullScreen)
     }
 }
 
@@ -134,9 +134,9 @@ extension DefaultMoviesListViewModel {
     func viewDidLoad() { }
 
     func didLoadNextPage() {
-        guard hasMorePages, loadingType.value == .none else { return }
-        load(movieQuery: MovieQuery(query: query.value),
-             loadingType: .nextPage)
+        guard hasMorePages, loading.value == .none else { return }
+        load(movieQuery: .init(query: query.value),
+             loading: .nextPage)
     }
 
     func didSearch(query: String) {