Merge pull request #24 from surfstudio/SPT-1241-clear-coordinator-after-vc-closed

SPT-1241 DebugScreen coordinato call completionHandler after controller is closed from outside

Author: chausovSurfStudio

DebugScreen/Common/Base Classes/BaseCoordinator.swift

@@ -12,7 +12,19 @@ class BaseCoordinator: Coordinator {
 
     var childCoordinators: [Coordinator] = []
 
-    // MARK: - Internal Methods
+    // MARK: - Initialization
+
+    init() {
+        debugPrint("🎂 \(self) created")
+    }
+
+    // MARK: - Deinitialization
+
+    deinit {
+        debugPrint("❗️\(self) deinitialized")
+    }
+
+    // MARK: - Methods
 
     func start() {
         start(with: nil)
@@ -26,13 +38,16 @@ class BaseCoordinator: Coordinator {
             return
         }
         childCoordinators.append(coordinator)
+        debugPrint("✅ \(coordinator) added into \(self)")
     }
 
     func removeDependency(_ coordinator: Coordinator?) {
         guard
             !childCoordinators.isEmpty,
             let coordinator = coordinator
-        else { return }
+        else {
+            return
+        }
 
         for (index, element) in childCoordinators.enumerated() {
             if element === coordinator {
@@ -54,15 +69,14 @@ class BaseCoordinator: Coordinator {
         childCoordinators.removeAll()
     }
 
-    // MARK: - Private Methods
+}
 
-    private func haveDependency(_ coordinator: Coordinator) -> Bool {
-        for element in childCoordinators {
-            if element === coordinator {
-                return true
-            }
-        }
-        return false
+// MARK: - Private Methods
+
+private extension BaseCoordinator {
+
+    func haveDependency(_ coordinator: Coordinator) -> Bool {
+        childCoordinators.contains { $0 === coordinator }
     }
 
 }

DebugScreen/Flows/DebugScreenCoordinator.swift

@@ -13,7 +13,6 @@ final class DebugScreenCoordinator: BaseCoordinator {
     // MARK: - Private properties
 
     private let router = MainRouter()
-    private let navigationController = UINavigationController()
 
     // MARK: - Properties
 
@@ -22,49 +21,48 @@ final class DebugScreenCoordinator: BaseCoordinator {
     // MARK: - Methods
 
     override func start() {
-        var components: MainModuleComponents = MainModuleConfigurator().configure()
-        navigationController.setViewControllers([components.view], animated: false)
-        navigationController.modalPresentationStyle = .overFullScreen
-
-        components.output.didModuleClosed = { [weak self] in
-            self?.navigationController.dismiss(animated: true,
-                                               completion: self?.completionHandler)
-        }
-
-        components.output.didActionOptionsShowed = { [weak self] model in
-            self?.showCacheCleaningActions(model: model)
-        }
-
-        router.present(navigationController)
+        showMainScreen()
     }
+
 }
 
 // MARK: - Private methods
 
 private extension DebugScreenCoordinator {
 
+    func showMainScreen() {
+        let (view, output) = MainModuleConfigurator().configure()
+        output.didModuleClosed = { [weak self] in
+            self?.router.dismissModule()
+        }
+        output.didActionOptionsShowed = { [weak self] model in
+            self?.showCacheCleaningActions(model: model)
+        }
+        output.didModuleDismissed = { [weak self] in
+            self?.completionHandler?()
+        }
+        router.present(view)
+    }
+
     func showCacheCleaningActions(model: ActionsProviderModel) {
         let actionsSheet = UIAlertController(
             title: nil,
             message: model.message,
             preferredStyle: .actionSheet
         )
-
         model.actions.forEach { action in
             actionsSheet.addAction(UIAlertAction(
                 title: action.title,
                 style: .destructive) { _ in
                     action.block()
             })
         }
-
         actionsSheet.addAction(UIAlertAction(
             title: L10n.DebugScreenCoordinator.cancelAction,
             style: .cancel,
             handler: nil
         ))
-
-        self.navigationController.present(actionsSheet, animated: true, completion: nil)
+        router.present(actionsSheet)
     }
 
 }

DebugScreen/Flows/MainScreen/Configurator/MainModuleConfigurator.swift

@@ -15,14 +15,15 @@ final class MainModuleConfigurator {
 
     func configure() -> MainModuleComponents {
         let viewController = UIViewController.instantiate(ofType: MainViewController.self)
-        viewController.modalPresentationStyle = .overFullScreen
-
         let presenter = MainModulePresenter()
 
         presenter.view = viewController
         viewController.output = presenter
 
-        return (viewController, presenter)
+        let navController = UINavigationController(rootViewController: viewController)
+        navController.modalPresentationStyle = .overFullScreen
+
+        return (navController, presenter)
     }
 
 }

DebugScreen/Flows/MainScreen/Presenter/MainModuleInput.swift

@@ -7,4 +7,4 @@
 
 import Foundation
 
-protocol MainModuleInput { }
+protocol MainModuleInput: AnyObject { }

DebugScreen/Flows/MainScreen/Presenter/MainModuleOutput.swift

@@ -7,9 +7,11 @@
 
 import Foundation
 
-protocol MainModuleOutput {
-    /// Call then clouse module
+protocol MainModuleOutput: AnyObject {
+    /// Call then close module
     var didModuleClosed: (() -> Void)? { get set }
     /// Call then press clear cache button
     var didActionOptionsShowed: ((ActionsProviderModel) -> Void)? { get set }
+    /// Call after module deinit from memory
+    var didModuleDismissed: (() -> Void)? { get set }
 }

DebugScreen/Flows/MainScreen/Presenter/MainModulePresenter.swift

@@ -13,11 +13,18 @@ final class MainModulePresenter: MainModuleOutput {
 
     var didModuleClosed: (() -> Void)?
     var didActionOptionsShowed: ((ActionsProviderModel) -> Void)?
+    var didModuleDismissed: (() -> Void)?
 
     // MARK: - Properties
 
     weak var view: MainViewInput?
 
+    // MARK: - Deinitialization
+
+    deinit {
+        didModuleDismissed?()
+    }
+
 }
 
 // MARK: - MainModuleInput