Добавил блоки-комментарии для структуры

Author: miamib34ch

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

@@ -9,8 +9,12 @@ import UIKit
 import Kingfisher
 
 final class CatalogCell: UICollectionViewCell, ReuseIdentifying {
+    // MARK: - iternal properties
     var id: String?
-    
+
+
+    // MARK: - private ui properties
+
     private let imageView: UIImageView = {
         let imageView = UIImageView()
         imageView.contentMode = .scaleAspectFill
@@ -60,6 +64,9 @@ final class CatalogCell: UICollectionViewCell, ReuseIdentifying {
         return label
     }()
 
+
+    // MARK: - class methods
+
     override func prepareForReuse() {
         super.prepareForReuse()
         id = nil
@@ -79,6 +86,9 @@ final class CatalogCell: UICollectionViewCell, ReuseIdentifying {
         fatalError("init(coder:) has not been implemented")
     }
 
+
+    // MARK: - iternal methods
+
     func setImage(link: URL?) {
         imageView.kf.indicatorType = .activity
         imageView.kf.setImage(with: link)
@@ -100,6 +110,9 @@ final class CatalogCell: UICollectionViewCell, ReuseIdentifying {
         dateLabel.text = date.formattedDate
     }
 
+
+    // MARK: - private methods
+
     private func setView() {
         contentView.backgroundColor = .clear
         contentView.addSubview(imageView)

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

@@ -8,11 +8,14 @@
 import UIKit
 
 final class CatalogViewController: UIViewController, CatalogViewControllerProtocol {
+    // MARK: - private properties
     private var presenter: CatalogViewPresenterProtocol
-
     private let collectionView = UICollectionView(frame: .zero, collectionViewLayout: UICollectionViewFlowLayout())
     private let refreshControl = UIRefreshControl()
 
+
+    // MARK: - class methods
+
     init(presenter: CatalogViewPresenterProtocol) {
         self.presenter = presenter
         super.init(nibName: nil, bundle: nil)
@@ -32,6 +35,9 @@ final class CatalogViewController: UIViewController, CatalogViewControllerProtoc
         presenter.viewDidLoad()
     }
 
+
+    // MARK: - protocol's methods
+
     func updateCollection() {
         collectionView.reloadData()
     }
@@ -61,6 +67,9 @@ final class CatalogViewController: UIViewController, CatalogViewControllerProtoc
         navigationController?.pushViewController(viewController, animated: true)
     }
 
+
+    // MARK: - private methods
+
     private func configureCollection() {
         collectionView.backgroundColor = .clear
         collectionView.refreshControl = refreshControl
@@ -85,12 +94,18 @@ final class CatalogViewController: UIViewController, CatalogViewControllerProtoc
         refreshControl.addTarget(self, action: #selector(pullToRefresh), for: .valueChanged)
     }
 
+
+    // MARK: - @objc methods
+
     @objc private func pullToRefresh() {
         refreshControl.endRefreshing()
         presenter.viewDidPullToRefresh()
     }
 }
 
+
+// MARK: - extension CatalogViewController + UICollectionViewDelegateFlowLayout
+
 extension CatalogViewController: UICollectionViewDelegateFlowLayout {
     func collectionView(_ collectionView: UICollectionView, layout collectionViewLayout: UICollectionViewLayout, sizeForItemAt indexPath: IndexPath) -> CGSize {
         let width = (collectionView.frame.width - 32) / 2 - 10  // MARK: из ширины экрана вычитаем констрейнты (16+16=32) и получаем ширину коллекции, делим её на 2, так как по 2 ячейки, а также вычитаем расстояние между ячейками (10)
@@ -107,6 +122,9 @@ extension CatalogViewController: UICollectionViewDelegateFlowLayout {
     }
 }
 
+
+// MARK: - extension CatalogViewController + UICollectionViewDataSource
+
 extension CatalogViewController: UICollectionViewDataSource {
     func numberOfSections(in collectionView: UICollectionView) -> Int {
         1

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

@@ -8,15 +8,22 @@
 import UIKit
 
 final class CatalogViewPresenter: CatalogViewPresenterProtocol {
+    // MARK: - protocol's properties
     var numberOfAdvertisement: Int {
         catalogNetworkService.catalogModel?.advertisements.count ?? 0
     }
 
+
+    // MARK: - private properties
+
     weak private var viewController: CatalogViewControllerProtocol?
     private let catalogNetworkService = CatalogNetworkService.shared
     private var catalogNetworkServiceObserverData: NSObjectProtocol?
     private var catalogNetworkServiceObserverError: NSObjectProtocol?
 
+
+    // MARK: - protocol's methods
+
     func injectViewController(viewController: CatalogViewControllerProtocol) {
         self.viewController = viewController
     }
@@ -57,6 +64,9 @@ final class CatalogViewPresenter: CatalogViewPresenterProtocol {
         viewController?.showCatalogsObjectView(viewController: catalogsObjectViewController)
     }
 
+
+    // MARK: - private methods
+
     private func updateViewCollection() {
         viewController?.removeHud()
         viewController?.updateCollection()

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

@@ -12,6 +12,9 @@ import MessageUI
 final class CatalogsObjectViewController: UIViewController, CatalogsObjectViewControllerProtocol {
     private var presenter: CatalogsObjectViewPresenterProtocol
 
+
+    // MARK: - ui properties
+
     private let scrollView: UIScrollView = {
         let scrollView = UIScrollView()
         scrollView.translatesAutoresizingMaskIntoConstraints = false
@@ -117,6 +120,9 @@ final class CatalogsObjectViewController: UIViewController, CatalogsObjectViewCo
         return map
     }()
 
+
+    // MARK: - class methods
+
     init(presenter: CatalogsObjectViewPresenterProtocol) {
         self.presenter = presenter
         super.init(nibName: nil, bundle: nil)
@@ -135,6 +141,9 @@ final class CatalogsObjectViewController: UIViewController, CatalogsObjectViewCo
         presenter.viewDidLoad()
     }
 
+
+    // MARK: - protocol's methods
+
     func showHud() {
         UIBlockingProgressHUD.show()
     }
@@ -171,6 +180,9 @@ final class CatalogsObjectViewController: UIViewController, CatalogsObjectViewCo
         mapView.setRegion(region, animated: true)
     }
 
+
+    // MARK: - private methods
+
     private func configureNavigationBar() {
         navigationItem.leftBarButtonItem = UIBarButtonItem(image: .backArrow, style: .plain, target: self, action: #selector(backButtonTap))
     }
@@ -242,6 +254,9 @@ final class CatalogsObjectViewController: UIViewController, CatalogsObjectViewCo
         adressLabel.text = adress
     }
 
+
+    // MARK: - @objc methods
+
     @objc func backButtonTap() {
         navigationController?.popViewController(animated: true)
     }
@@ -255,6 +270,9 @@ final class CatalogsObjectViewController: UIViewController, CatalogsObjectViewCo
     }
 }
 
+
+// MARK: - extension CatalogsObjectViewController + MFMailComposeViewControllerDelegate
+
 extension CatalogsObjectViewController: MFMailComposeViewControllerDelegate {
     func mailComposeController(_ controller: MFMailComposeViewController, didFinishWith result: MFMailComposeResult, error: Error?) {
         controller.dismiss(animated: true, completion: nil)

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

@@ -11,11 +11,16 @@ import MessageUI
 import CoreLocation
 
 final class CatalogsObjectViewPresenter: CatalogsObjectViewPresenterProtocol {
+    // MARK: - protocol's properties
+
     var adress: String {
         guard let model = catalogsObjectNetworkService.catalogsObjectModel else { return "" }
         return "г. " + model.location + ", " + model.address
     }
 
+
+    // MARK: - private properties
+
     weak private var viewController: CatalogsObjectViewControllerProtocol?
 
     private var objectId: String?
@@ -26,10 +31,16 @@ final class CatalogsObjectViewPresenter: CatalogsObjectViewPresenterProtocol {
     private var catalogsObjectNetworkServiceObserverData: NSObjectProtocol?
     private var catalogsObjectNetworkServiceObserverError: NSObjectProtocol?
 
+
+    // MARK: - class methods
+
     init(objectId: String) {
         self.objectId = objectId
     }
 
+
+    // MARK: - protocol's methods
+
     func injectViewController(viewController: CatalogsObjectViewControllerProtocol) {
         self.viewController = viewController
     }
@@ -79,6 +90,9 @@ final class CatalogsObjectViewPresenter: CatalogsObjectViewPresenterProtocol {
         }
     }
 
+
+    // MARK: - private methods
+
     private func loadData() {
         guard let objectId = objectId else { return }
         viewController?.showHud()