Merge pull request #4 from miamib34ch/refactor_catalogMVP

Отрефакторил экран каталога под MVP

Author: miamib34ch

AvitoTech-TraineeAssignment/AvitoTech-TraineeAssignment.xcodeproj/project.pbxproj

@@ -33,6 +33,8 @@
 		8BC141342A9F8943000E26F3 /* String+Extension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8BC141332A9F8943000E26F3 /* String+Extension.swift */; };
 		8BC692EE2A9FB9990096C00B /* Images.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8BC692ED2A9FB9990096C00B /* Images.swift */; };
 		8BC692F02A9FBE580096C00B /* SwipeNavigationController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8BC692EF2A9FBE580096C00B /* SwipeNavigationController.swift */; };
+		8BC692F22A9FD3850096C00B /* CatalogViewPresenter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8BC692F12A9FD3850096C00B /* CatalogViewPresenter.swift */; };
+		8BC692F42A9FD48D0096C00B /* CatalogViewProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8BC692F32A9FD48D0096C00B /* CatalogViewProtocol.swift */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXFileReference section */
@@ -63,6 +65,8 @@
 		8BC141332A9F8943000E26F3 /* String+Extension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "String+Extension.swift"; sourceTree = "<group>"; };
 		8BC692ED2A9FB9990096C00B /* Images.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Images.swift; sourceTree = "<group>"; };
 		8BC692EF2A9FBE580096C00B /* SwipeNavigationController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SwipeNavigationController.swift; sourceTree = "<group>"; };
+		8BC692F12A9FD3850096C00B /* CatalogViewPresenter.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CatalogViewPresenter.swift; sourceTree = "<group>"; };
+		8BC692F32A9FD48D0096C00B /* CatalogViewProtocol.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CatalogViewProtocol.swift; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -189,7 +193,9 @@
 		8BC141252A9E6AD5000E26F3 /* Catalog */ = {
 			isa = PBXGroup;
 			children = (
+				8BC692F32A9FD48D0096C00B /* CatalogViewProtocol.swift */,
 				8B1C9AC32A9A7D0B00127D1F /* CatalogViewController.swift */,
+				8BC692F12A9FD3850096C00B /* CatalogViewPresenter.swift */,
 				8BC141292A9E6F4E000E26F3 /* CatalogCell.swift */,
 			);
 			path = Catalog;
@@ -321,11 +327,13 @@
 				8BC118BF2A9D06CF00ABE6C9 /* CatalogsObjectNetworkService.swift in Sources */,
 				8BC141342A9F8943000E26F3 /* String+Extension.swift in Sources */,
 				8B1C9AC02A9A7D0B00127D1F /* AppDelegate.swift in Sources */,
+				8BC692F42A9FD48D0096C00B /* CatalogViewProtocol.swift in Sources */,
 				8B1C9AC22A9A7D0B00127D1F /* SceneDelegate.swift in Sources */,
 				8BC118B92A9CF8EA00ABE6C9 /* CatalogNetworkService.swift in Sources */,
 				8BC118B52A9CF71C00ABE6C9 /* CatalogRequest.swift in Sources */,
 				8BC118A82A9CB4CC00ABE6C9 /* CatalogModel.swift in Sources */,
 				8BC692EE2A9FB9990096C00B /* Images.swift in Sources */,
+				8BC692F22A9FD3850096C00B /* CatalogViewPresenter.swift in Sources */,
 				8BC118AE2A9CC04300ABE6C9 /* NetworkClient.swift in Sources */,
 				8BC141322A9F7C72000E26F3 /* UIBlockingProgressHUD.swift in Sources */,
 			);

AvitoTech-TraineeAssignment/AvitoTech-TraineeAssignment/SceneDelegate.swift

@@ -9,11 +9,17 @@ import UIKit
 
 class SceneDelegate: UIResponder, UIWindowSceneDelegate {
     var window: UIWindow?
+    var catalogViewController: CatalogViewController {
+        let presenter = CatalogViewPresenter()
+        let catalogViewController = CatalogViewController(presenter: presenter)
+        presenter.injectViewController(viewController: catalogViewController)
+        return catalogViewController
+    }
 
     func scene(_ scene: UIScene, willConnectTo session: UISceneSession, options connectionOptions: UIScene.ConnectionOptions) {
         guard let windowScene = (scene as? UIWindowScene) else { return }
         window = UIWindow(windowScene: windowScene)
-        window?.rootViewController = SwipeNavigationController(rootViewController: CatalogViewController())
+        window?.rootViewController = SwipeNavigationController(rootViewController: catalogViewController)
         window?.makeKeyAndVisible()
     }
 }

AvitoTech-TraineeAssignment/AvitoTech-TraineeAssignment/Screens/Catalog/CatalogViewController.swift

@@ -7,13 +7,20 @@
 
 import UIKit
 
-class CatalogViewController: UIViewController {
+final class CatalogViewController: UIViewController, CatalogViewControllerProtocol {
+    private var presenter: CatalogViewPresenterProtocol
+
     private let collectionView = UICollectionView(frame: .zero, collectionViewLayout: UICollectionViewFlowLayout())
     private let refreshControl = UIRefreshControl()
 
-    private let catalogNetworkService = CatalogNetworkService.shared
-    private var catalogNetworkServiceObserverData: NSObjectProtocol?
-    private var catalogNetworkServiceObserverError: NSObjectProtocol?
+    init(presenter: CatalogViewPresenterProtocol) {
+        self.presenter = presenter
+        super.init(nibName: nil, bundle: nil)
+    }
+
+    required init?(coder: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
 
     override func viewDidLoad() {
         super.viewDidLoad()
@@ -22,23 +29,32 @@ class CatalogViewController: UIViewController {
         configureCollection()
         configureRefreshControl()
 
-        catalogNetworkServiceObserverData = NotificationCenter.default
-            .addObserver(
-                forName: CatalogNetworkService.dataReceivedNotification,
-                object: nil,
-                queue: .main
-            ) { [weak self] _ in
-                self?.updateCollection()
-            }
-        catalogNetworkServiceObserverError = NotificationCenter.default
-            .addObserver(
-                forName: CatalogNetworkService.errorNotification,
-                object: nil,
-                queue: .main
-            ) { [weak self] _ in
-                self?.showAlert()
-            }
-        loadData()
+        presenter.viewDidLoad()
+    }
+
+    func updateCollection() {
+        collectionView.reloadData()
+    }
+
+    func showAlert(alert: UIAlertController) {
+        present(alert, animated: true)
+    }
+
+    func showHud() {
+        UIBlockingProgressHUD.show()
+    }
+
+    func removeHud() {
+        UIBlockingProgressHUD.dismiss()
+    }
+
+    func configureCell(cell: CatalogCell, with model: Advertisement) {
+        cell.id = model.id
+        cell.setImage(link: URL(string: model.imageURL))
+        cell.setNameLabel(name: model.title)
+        cell.setCostLabel(cost: model.price)
+        cell.adressLabel(adress: model.location)
+        cell.dateLabel(date: model.createdDate)
     }
 
     private func configureCollection() {
@@ -65,31 +81,9 @@ class CatalogViewController: UIViewController {
         refreshControl.addTarget(self, action: #selector(pullToRefresh), for: .valueChanged)
     }
 
-    private func updateCollection() {
-        UIBlockingProgressHUD.dismiss()
-        collectionView.reloadData()
-    }
-
-    private func showAlert() {
-        UIBlockingProgressHUD.dismiss()
-        let alertTitle = NSLocalizedString("alert.title", comment: "Название алерта")
-        let alertMessage = NSLocalizedString("alert.message", comment: "Сообщение в алерте")
-        let alertActionTitle = NSLocalizedString("alert.action.again", comment: "Название действия повторения в алерте")
-        let alert = UIAlertController(title: alertTitle, message: alertMessage, preferredStyle: .alert)
-        alert.addAction(UIAlertAction(title: alertActionTitle, style: .default) { [weak self] _ in
-            self?.loadData()
-        })
-        present(alert, animated: true)
-    }
-
-    private func loadData() {
-        UIBlockingProgressHUD.show()
-        catalogNetworkService.fetch()
-    }
-
     @objc private func pullToRefresh() {
         refreshControl.endRefreshing()
-        loadData()
+        presenter.viewDidPullToRefresh()
     }
 }
 
@@ -115,18 +109,12 @@ extension CatalogViewController: UICollectionViewDataSource {
     }
 
     func collectionView(_ collectionView: UICollectionView, numberOfItemsInSection section: Int) -> Int {
-        catalogNetworkService.catalogModel?.advertisements.count ?? 0
+        presenter.numberOfAdvertisement
     }
 
     func collectionView(_ collectionView: UICollectionView, cellForItemAt indexPath: IndexPath) -> UICollectionViewCell {
         let cell: CatalogCell = collectionView.dequeueReusableCell(indexPath: indexPath)
-        guard let model = catalogNetworkService.catalogModel?.advertisements[indexPath.row] else { return cell }
-        cell.id = model.id
-        cell.setImage(link: URL(string: model.imageURL))
-        cell.setNameLabel(name: model.title)
-        cell.setCostLabel(cost: model.price)
-        cell.adressLabel(adress: model.location)
-        cell.dateLabel(date: model.createdDate)
+        presenter.viewWillConfigureCell(cell: cell, with: indexPath)
         return cell
     }
 

AvitoTech-TraineeAssignment/AvitoTech-TraineeAssignment/Screens/Catalog/CatalogViewPresenter.swift

@@ -0,0 +1,74 @@
+//
+//  CatalogViewPresenter.swift
+//  AvitoTech-TraineeAssignment
+//
+//  Created by Богдан Полыгалов on 31.08.2023.
+//
+
+import UIKit
+
+final class CatalogViewPresenter: CatalogViewPresenterProtocol {
+    var numberOfAdvertisement: Int {
+        catalogNetworkService.catalogModel?.advertisements.count ?? 0
+    }
+
+    weak private var viewController: CatalogViewControllerProtocol?
+    private let catalogNetworkService = CatalogNetworkService.shared
+    private var catalogNetworkServiceObserverData: NSObjectProtocol?
+    private var catalogNetworkServiceObserverError: NSObjectProtocol?
+
+    func injectViewController(viewController: CatalogViewControllerProtocol) {
+        self.viewController = viewController
+    }
+
+    func viewDidLoad() {
+        catalogNetworkServiceObserverData = NotificationCenter.default
+            .addObserver(
+                forName: CatalogNetworkService.dataReceivedNotification,
+                object: nil,
+                queue: .main
+            ) { [weak self] _ in
+                self?.updateViewCollection()
+            }
+        catalogNetworkServiceObserverError = NotificationCenter.default
+            .addObserver(
+                forName: CatalogNetworkService.errorNotification,
+                object: nil,
+                queue: .main
+            ) { [weak self] _ in
+                self?.showViewAlert()
+            }
+        loadData()
+    }
+
+    func viewDidPullToRefresh() {
+        loadData()
+    }
+
+    func viewWillConfigureCell(cell: CatalogCell, with indexPath: IndexPath) {
+        guard let model = catalogNetworkService.catalogModel?.advertisements[indexPath.row] else { return }
+        viewController?.configureCell(cell: cell, with: model)
+    }
+
+    private func updateViewCollection() {
+        viewController?.removeHud()
+        viewController?.updateCollection()
+    }
+
+    private func showViewAlert() {
+        viewController?.removeHud()
+        let alertTitle = NSLocalizedString("alert.title", comment: "Название алерта")
+        let alertMessage = NSLocalizedString("alert.message", comment: "Сообщение в алерте")
+        let alertActionTitle = NSLocalizedString("alert.action.again", comment: "Название действия повторения в алерте")
+        let alert = UIAlertController(title: alertTitle, message: alertMessage, preferredStyle: .alert)
+        alert.addAction(UIAlertAction(title: alertActionTitle, style: .default) { [weak self] _ in
+            self?.loadData()
+        })
+        viewController?.showAlert(alert: alert)
+    }
+
+    private func loadData() {
+        viewController?.showHud()
+        catalogNetworkService.fetch()
+    }
+}

AvitoTech-TraineeAssignment/AvitoTech-TraineeAssignment/Screens/Catalog/CatalogViewProtocol.swift

@@ -0,0 +1,24 @@
+//
+//  CatalogViewProtocol.swift
+//  AvitoTech-TraineeAssignment
+//
+//  Created by Богдан Полыгалов on 31.08.2023.
+//
+
+import UIKit
+
+protocol CatalogViewPresenterProtocol {
+    var numberOfAdvertisement: Int { get }
+    func injectViewController(viewController: CatalogViewControllerProtocol)
+    func viewDidLoad()
+    func viewDidPullToRefresh()
+    func viewWillConfigureCell(cell: CatalogCell, with indexPath: IndexPath)
+}
+
+protocol CatalogViewControllerProtocol: AnyObject {
+    func updateCollection()
+    func showAlert(alert: UIAlertController)
+    func showHud()
+    func removeHud()
+    func configureCell(cell: CatalogCell, with model: Advertisement)
+}