Merge pull request #5 from miamib34ch/refactor_catalogsObjectMVP

Отрефакторил экран с детальной информацией под MVP

Author: miamib34ch

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

@@ -35,6 +35,8 @@
 		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 */; };
+		8BC692F62A9FDDCA0096C00B /* CatalogsObjectViewPresenter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8BC692F52A9FDDCA0096C00B /* CatalogsObjectViewPresenter.swift */; };
+		8BC692F82A9FDDE80096C00B /* CatalogsObjectViewProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8BC692F72A9FDDE80096C00B /* CatalogsObjectViewProtocol.swift */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXFileReference section */
@@ -67,6 +69,8 @@
 		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>"; };
+		8BC692F52A9FDDCA0096C00B /* CatalogsObjectViewPresenter.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CatalogsObjectViewPresenter.swift; sourceTree = "<group>"; };
+		8BC692F72A9FDDE80096C00B /* CatalogsObjectViewProtocol.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CatalogsObjectViewProtocol.swift; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -128,7 +132,9 @@
 		8B57F7662A9F960400822ADB /* CatalogsObject */ = {
 			isa = PBXGroup;
 			children = (
+				8BC692F72A9FDDE80096C00B /* CatalogsObjectViewProtocol.swift */,
 				8B57F7672A9F962C00822ADB /* CatalogsObjectViewController.swift */,
+				8BC692F52A9FDDCA0096C00B /* CatalogsObjectViewPresenter.swift */,
 			);
 			path = CatalogsObject;
 			sourceTree = "<group>";
@@ -317,6 +323,7 @@
 				8BC118B72A9CF7A000ABE6C9 /* Constants.swift in Sources */,
 				8BC118BD2A9D048000ABE6C9 /* CatalogsObjectRequest.swift in Sources */,
 				8BC118AA2A9CB71200ABE6C9 /* CatalogsObjectModel.swift in Sources */,
+				8BC692F62A9FDDCA0096C00B /* CatalogsObjectViewPresenter.swift in Sources */,
 				8B57F7682A9F962C00822ADB /* CatalogsObjectViewController.swift in Sources */,
 				8B1C9AE02A9A83E700127D1F /* Fonts.swift in Sources */,
 				8BC692F02A9FBE580096C00B /* SwipeNavigationController.swift in Sources */,
@@ -334,6 +341,7 @@
 				8BC118A82A9CB4CC00ABE6C9 /* CatalogModel.swift in Sources */,
 				8BC692EE2A9FB9990096C00B /* Images.swift in Sources */,
 				8BC692F22A9FD3850096C00B /* CatalogViewPresenter.swift in Sources */,
+				8BC692F82A9FDDE80096C00B /* CatalogsObjectViewProtocol.swift in Sources */,
 				8BC118AE2A9CC04300ABE6C9 /* NetworkClient.swift in Sources */,
 				8BC141322A9F7C72000E26F3 /* UIBlockingProgressHUD.swift in Sources */,
 			);

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

@@ -119,8 +119,12 @@ extension CatalogViewController: UICollectionViewDataSource {
     }
 
     func collectionView(_ collectionView: UICollectionView, didSelectItemAt indexPath: IndexPath) {
+        //tODO: Перенести в презентер
         guard let cell = collectionView.cellForItem(at: indexPath) as? CatalogCell,
               let id = cell.id else { return }
-        navigationController?.pushViewController(CatalogsObjectViewController(objectId: id), animated: true)
+        let catalogsObjectPresenter = CatalogsObjectViewPresenter(objectId: id)
+        let catalogsViewController = CatalogsObjectViewController(presenter: catalogsObjectPresenter)
+        catalogsObjectPresenter.injectViewController(viewController: catalogsViewController)
+        navigationController?.pushViewController(catalogsViewController, animated: true)
     }
 }

AvitoTech-TraineeAssignment/AvitoTech-TraineeAssignment/Screens/CatalogsObject/CatalogsObjectViewController.swift

@@ -7,13 +7,10 @@
 
 import UIKit
 import MapKit
-import CoreLocation
 import MessageUI
 
-final class CatalogsObjectViewController: UIViewController {
-    private var objectId: String?
-    private var email: String?
-    private var phoneNumber: String?
+final class CatalogsObjectViewController: UIViewController, CatalogsObjectViewControllerProtocol {
+    private var presenter: CatalogsObjectViewPresenterProtocol
 
     private let scrollView: UIScrollView = {
         let scrollView = UIScrollView()
@@ -120,12 +117,8 @@ final class CatalogsObjectViewController: UIViewController {
         return map
     }()
 
-    private let catalogsObjectNetworkService = CatalogsObjectNetworkService.shared
-    private var catalogsObjectNetworkServiceObserverData: NSObjectProtocol?
-    private var catalogsObjectNetworkServiceObserverError: NSObjectProtocol?
-
-    init(objectId: String) {
-        self.objectId = objectId
+    init(presenter: CatalogsObjectViewPresenterProtocol) {
+        self.presenter = presenter
         super.init(nibName: nil, bundle: nil)
     }
 
@@ -139,44 +132,47 @@ final class CatalogsObjectViewController: UIViewController {
         view.backgroundColor = .systemBackground
         configureNavigationBar()
 
-        catalogsObjectNetworkServiceObserverData = NotificationCenter.default
-            .addObserver(
-                forName: CatalogsObjectNetworkService.dataReceivedNotification,
-                object: nil,
-                queue: .main
-            ) { [weak self] _ in
-                self?.configureView()
-            }
-        catalogsObjectNetworkServiceObserverError = NotificationCenter.default
-            .addObserver(
-                forName: CatalogsObjectNetworkService.errorNotification,
-                object: nil,
-                queue: .main
-            ) { [weak self] _ in
-                self?.showAlert()
-            }
-        loadData()
+        presenter.viewDidLoad()
     }
 
-    private func configureNavigationBar() {
-        navigationItem.leftBarButtonItem = UIBarButtonItem(image: .backArrow, style: .plain, target: self, action: #selector(backButtonTap))
+    func showHud() {
+        UIBlockingProgressHUD.show()
     }
 
-    private func configureView() {
-        guard let model = catalogsObjectNetworkService.catalogsObjectModel else { showAlert(); return }
+    func removeHud() {
         UIBlockingProgressHUD.dismiss()
+    }
+
+    func configureView(model: CatalogsObjectModel) {
         configureConstraints()
         configureImage(link: URL(string: model.imageURL))
-        let adress = "г. " + model.location + ", " + model.address
         configureLabels(
             name: model.title,
             cost: model.price,
             date: model.createdDate,
             description: model.description,
-            adress: adress)
-        geocodeCity(cityName: adress)
-        email = model.email
-        phoneNumber = model.phoneNumber
+            adress: presenter.adress)
+    }
+
+    func showAlert(alert: UIAlertController) {
+        present(alert, animated: true)
+    }
+
+    func showMailComposer(mailComposer: MFMailComposeViewController) {
+        present(mailComposer, animated: true, completion: nil)
+    }
+
+    func showCallAction(phoneURL: URL) {
+        UIApplication.shared.open(phoneURL, options: [:], completionHandler: nil)
+    }
+
+    func setupMap(annotation: MKPointAnnotation, region: MKCoordinateRegion) {
+        mapView.addAnnotation(annotation)
+        mapView.setRegion(region, animated: true)
+    }
+
+    private func configureNavigationBar() {
+        navigationItem.leftBarButtonItem = UIBarButtonItem(image: .backArrow, style: .plain, target: self, action: #selector(backButtonTap))
     }
 
     private func configureConstraints() {
@@ -246,90 +242,16 @@ final class CatalogsObjectViewController: UIViewController {
         adressLabel.text = adress
     }
 
-    private func showAlert() {
-        UIBlockingProgressHUD.dismiss()
-        let alertTitle = NSLocalizedString("alert.title", comment: "Название алерта")
-        let alertMessage = NSLocalizedString("alert.message", comment: "Сообщение в алерте")
-        let alertActionRetryTitle = NSLocalizedString("alert.action.again", comment: "Название действия повторения в алерте")
-        let alertActionLeaveTitle = NSLocalizedString("alert.action.leave", comment: "Название действия выхода в алерте")
-
-        let actionRetry = UIAlertAction(title: alertActionRetryTitle, style: .default) { [weak self] _ in
-            self?.loadData()
-        }
-        let actionLeave = UIAlertAction(title: alertActionLeaveTitle, style: .default) { [weak self] _ in
-            self?.dismiss(animated: true)
-            self?.backButtonTap()
-        }
-
-        let alert = UIAlertController(title: alertTitle, message: alertMessage, preferredStyle: .alert)
-        alert.addAction(actionRetry)
-        alert.addAction(actionLeave)
-        present(alert, animated: true)
-    }
-
-    private func loadData() {
-        guard let objectId = objectId else { return }
-        UIBlockingProgressHUD.show()
-        catalogsObjectNetworkService.fetch(id: objectId)
+    @objc func backButtonTap() {
+        navigationController?.popViewController(animated: true)
     }
 
     @objc private func callButtonTap() {
-        guard let phoneNumber = phoneNumber else { return }
-        if let phoneURL = URL(string: "tel://\(phoneNumber.replacingOccurrences(of: " ", with: ""))") {
-            if UIApplication.shared.canOpenURL(phoneURL) {
-                UIApplication.shared.open(phoneURL, options: [:], completionHandler: nil)
-            } else {
-                // На симуляторе этот вариант будет срабатывать
-                print("Невозможно совершить звонок")
-            }
-        }
+        presenter.viewDidTapCallButton()
     }
 
     @objc private func mailButtonTap() {
-        guard let email = email else { return }
-        if MFMailComposeViewController.canSendMail() {
-            let mailComposer = MFMailComposeViewController()
-            mailComposer.mailComposeDelegate = self
-            mailComposer.setToRecipients([email])
-            present(mailComposer, animated: true, completion: nil)
-        } else {
-            // На симуляторе этот вариант будет срабатывать
-            print("Почтовый клиент недоступен")
-        }
-    }
-
-    @objc private func backButtonTap() {
-        navigationController?.popViewController(animated: true)
-    }
-}
-
-extension CatalogsObjectViewController {
-    func geocodeCity(cityName: String) {
-        guard !cityName.isEmpty else { return }
-        let geocoder = CLGeocoder()
-        geocoder.geocodeAddressString(cityName) { placemarks, error in
-            if let error = error {
-                print("Координаты не найдены: \(error.localizedDescription)")
-                self.geocodeCity(cityName: cityName.split(separator: ",").first?.description ?? "" )
-                return
-            }
-
-            if let location = placemarks?.first?.location?.coordinate {
-                self.setupMapWithCoordinate(coordinate: location, title: cityName)
-            } else {
-                print("Координаты не найдены.")
-            }
-        }
-    }
-
-    func setupMapWithCoordinate(coordinate: CLLocationCoordinate2D, title: String) {
-        let annotation = MKPointAnnotation()
-        annotation.coordinate = coordinate
-        annotation.title = title
-
-        mapView.addAnnotation(annotation)
-        let region = MKCoordinateRegion(center: coordinate, latitudinalMeters: 10000, longitudinalMeters: 10000)
-        mapView.setRegion(region, animated: true)
+        presenter.viewDidTapMailButton()
     }
 }
 

AvitoTech-TraineeAssignment/AvitoTech-TraineeAssignment/Screens/CatalogsObject/CatalogsObjectViewPresenter.swift

@@ -0,0 +1,141 @@
+//
+//  CatalogsObjectViewPresenter.swift
+//  AvitoTech-TraineeAssignment
+//
+//  Created by Богдан Полыгалов on 31.08.2023.
+//
+
+import UIKit
+import MapKit
+import MessageUI
+import CoreLocation
+
+final class CatalogsObjectViewPresenter: CatalogsObjectViewPresenterProtocol {
+    var adress: String {
+        guard let model = catalogsObjectNetworkService.catalogsObjectModel else { return "" }
+        return "г. " + model.location + ", " + model.address
+    }
+
+    weak private var viewController: CatalogsObjectViewControllerProtocol?
+
+    private var objectId: String?
+    private var email: String?
+    private var phoneNumber: String?
+
+    private let catalogsObjectNetworkService = CatalogsObjectNetworkService.shared
+    private var catalogsObjectNetworkServiceObserverData: NSObjectProtocol?
+    private var catalogsObjectNetworkServiceObserverError: NSObjectProtocol?
+
+    init(objectId: String) {
+        self.objectId = objectId
+    }
+
+    func injectViewController(viewController: CatalogsObjectViewControllerProtocol) {
+        self.viewController = viewController
+    }
+
+    func viewDidLoad() {
+        catalogsObjectNetworkServiceObserverData = NotificationCenter.default
+            .addObserver(
+                forName: CatalogsObjectNetworkService.dataReceivedNotification,
+                object: nil,
+                queue: .main
+            ) { [weak self] _ in
+                self?.configureView()
+            }
+        catalogsObjectNetworkServiceObserverError = NotificationCenter.default
+            .addObserver(
+                forName: CatalogsObjectNetworkService.errorNotification,
+                object: nil,
+                queue: .main
+            ) { [weak self] _ in
+                self?.showViewAlert()
+            }
+        loadData()
+    }
+
+    func viewDidTapMailButton() {
+        guard let email = email else { return }
+        if MFMailComposeViewController.canSendMail() {
+            let mailComposer = MFMailComposeViewController()
+            mailComposer.mailComposeDelegate = viewController as? CatalogsObjectViewController
+            mailComposer.setToRecipients([email])
+            viewController?.showMailComposer(mailComposer: mailComposer)
+        } else {
+            // На симуляторе этот вариант будет срабатывать
+            print("Почтовый клиент недоступен")
+        }
+    }
+
+    func viewDidTapCallButton() {
+        guard let phoneNumber = phoneNumber else { return }
+        if let phoneURL = URL(string: "tel://\(phoneNumber.replacingOccurrences(of: " ", with: ""))") {
+            if UIApplication.shared.canOpenURL(phoneURL) {
+                viewController?.showCallAction(phoneURL: phoneURL)
+            } else {
+                // На симуляторе этот вариант будет срабатывать
+                print("Невозможно совершить звонок")
+            }
+        }
+    }
+
+    private func loadData() {
+        guard let objectId = objectId else { return }
+        viewController?.showHud()
+        catalogsObjectNetworkService.fetch(id: objectId)
+    }
+
+    private func configureView() {
+        guard let model = catalogsObjectNetworkService.catalogsObjectModel else { showViewAlert(); return }
+        viewController?.removeHud()
+        viewController?.configureView(model: model)
+        email = model.email
+        phoneNumber = model.phoneNumber
+        geocodeCity(cityName: adress)
+    }
+
+    private func showViewAlert() {
+        viewController?.removeHud()
+        let alertTitle = NSLocalizedString("alert.title", comment: "Название алерта")
+        let alertMessage = NSLocalizedString("alert.message", comment: "Сообщение в алерте")
+        let alertActionRetryTitle = NSLocalizedString("alert.action.again", comment: "Название действия повторения в алерте")
+        let alertActionLeaveTitle = NSLocalizedString("alert.action.leave", comment: "Название действия выхода в алерте")
+        let alert = UIAlertController(title: alertTitle, message: alertMessage, preferredStyle: .alert)
+        let actionRetry = UIAlertAction(title: alertActionRetryTitle, style: .default) { [weak self] _ in
+            self?.loadData()
+        }
+        let actionLeave = UIAlertAction(title: alertActionLeaveTitle, style: .default) { [weak self] _ in
+            alert.dismiss(animated: true)
+            self?.viewController?.backButtonTap()
+        }
+        alert.addAction(actionRetry)
+        alert.addAction(actionLeave)
+        viewController?.showAlert(alert: alert)
+    }
+
+    private func geocodeCity(cityName: String) {
+        guard !cityName.isEmpty else { return }
+        let geocoder = CLGeocoder()
+        geocoder.geocodeAddressString(cityName) { placemarks, error in
+            if let error = error {
+                print("Координаты не найдены: \(error.localizedDescription)")
+                self.geocodeCity(cityName: cityName.split(separator: ",").first?.description ?? "" )
+                return
+            }
+
+            if let location = placemarks?.first?.location?.coordinate {
+                self.setupMapWithCoordinate(coordinate: location, title: cityName)
+            } else {
+                print("Координаты не найдены.")
+            }
+        }
+    }
+
+    private func setupMapWithCoordinate(coordinate: CLLocationCoordinate2D, title: String) {
+        let annotation = MKPointAnnotation()
+        annotation.coordinate = coordinate
+        annotation.title = title
+        let region = MKCoordinateRegion(center: coordinate, latitudinalMeters: 10000, longitudinalMeters: 10000)
+        viewController?.setupMap(annotation: annotation, region: region)
+    }
+}