Clean code and add marks

Author: Artmukho

QRScanner/Source/Assembly/Assembler.swift

@@ -10,22 +10,15 @@ import UIKit
 class Assembler {
     func createCaptureModule(router: Router) -> UIViewController {
         let view = CaptureViewController()
-        let presenter = CapturePresenter()
-        
+        let presenter = CapturePresenter(view: view, router: router)
         view.presenter = presenter
-        presenter.view = view
-        presenter.router = router
 
         return view
     }
 
     func createWebViewModule(path: String, router: Router) -> UIViewController {
         let view = WebViewController()
-        let presenter = WebViewPresenter()
-        
-        presenter.view = view
-        presenter.path = path
-        presenter.router = router
+        let presenter = WebViewPresenter(path: path, view: view, router: router)
         view.presenter = presenter
 
         return view

QRScanner/Source/CaptureModule/Presenter/CapturePresenter.swift

@@ -12,10 +12,21 @@ protocol CapturePresenterProtocol {
 }
 
 class CapturePresenter: CapturePresenterProtocol {
+    
+    //MARK: - Properties
 
-    var view: CaptureViewProtocol?
+    weak var view: CaptureViewController?
     var router: Router?
 
+    //MARK: - Initializer
+    
+    init(view: CaptureViewController, router: Router) {
+        self.view = view
+        self.router = router
+    }
+    
+    //MARK: - Methods
+    
     func catchCode(_ string: String) {
         router?.showWebView(path: string)
     }

QRScanner/Source/CaptureModule/View/CaptureViewController.swift

@@ -8,11 +8,9 @@
 import UIKit
 import AVFoundation
 
-protocol CaptureViewProtocol {
+class CaptureViewController: UIViewController {
 
-}
-
-class CaptureViewController: UIViewController, CaptureViewProtocol {
+    //MARK: - Properties
 
     var presenter: CapturePresenterProtocol?
     private var session = AVCaptureSession()
@@ -24,6 +22,8 @@ class CaptureViewController: UIViewController, CaptureViewProtocol {
         view.layer.cornerRadius = 6
         return view
     }()
+    
+    //MARK: - Lifecycle
 
     override func viewDidLoad() {
         super.viewDidLoad()
@@ -39,6 +39,8 @@ class CaptureViewController: UIViewController, CaptureViewProtocol {
         session.startRunning()
     }
 
+    //MARK: - Private methods
+    
     private func setupHierarchy() {
         view.addSubview(borderView)
     }
@@ -69,6 +71,8 @@ class CaptureViewController: UIViewController, CaptureViewProtocol {
     }
 }
 
+//MARK: - Delegate methods
+
 extension CaptureViewController: AVCaptureMetadataOutputObjectsDelegate {
     func metadataOutput(_ output: AVCaptureMetadataOutput, didOutput metadataObjects: [AVMetadataObject], from connection: AVCaptureConnection) {
         borderView.frame = .zero

QRScanner/Source/Router/Router.swift

@@ -7,7 +7,7 @@
 
 import UIKit
 
-protocol Router {
+protocol Router: AnyObject {
     func initialMainViewController()
     func showWebView(path: String)
     func popToRoot()

QRScanner/Source/WebViewModule/Presenter/WebViewPresenter.swift

@@ -7,25 +7,38 @@
 
 import Foundation
 
-protocol WebViewPresenterProtocol {
+protocol WebViewPresenterProtocol: AnyObject {
     func getRequest()
     func showShared()
     func popTo()
 }
 
 class WebViewPresenter: WebViewPresenterProtocol {
-    var view: WebViewProtocol?
+    
+    //MARK: - Properties
+    
+    weak var view: WebViewProtocol?
     var router: Router?
-    var path: String?
+    var path: String
+    
+    //MARK: - Initializer
+    
+    init(path: String, view: WebViewProtocol, router: Router) {
+        self.view = view
+        self.router = router
+        self.path = path
+    }
+    
+    //MARK: - Methods
 
     func getRequest() {
-        guard let url = URL(string: path ?? "") else { return }
+        guard let url = URL(string: path) else { return }
         let request = URLRequest(url: url)
         view?.loadRequest(request: request)
     }
 
     func showShared() {
-        guard let url = URL(string: path ?? "") else { return }
+        guard let url = URL(string: path) else { return }
         view?.presentShared(path: url)
     }
 

QRScanner/Source/WebViewModule/View/WebViewController.swift

@@ -8,7 +8,7 @@
 import UIKit
 import WebKit
 
-protocol WebViewProtocol {
+protocol WebViewProtocol: AnyObject {
     func loadRequest(request: URLRequest)
     func presentShared(path: URL)
 }