From e10b8a42afad82b9597e6508efdca2ad76351d14 Mon Sep 17 00:00:00 2001 From: SBiOSoftWhare Date: Mon, 6 Sep 2021 18:21:21 +0200 Subject: [PATCH] Templates: Use `Protocol` suffix instead of `Type` for protocols. --- .../FlowCoordinatorTemplate/FlowTemplateCoordinator.swift | 6 +++--- .../FlowTemplateCoordinatorBridgePresenter.swift | 2 +- ...orType.swift => FlowTemplateCoordinatorProtocol.swift} | 6 +++--- .../ScreenTemplate/TemplateScreenCoordinator.swift | 8 ++++---- ...Type.swift => TemplateScreenCoordinatorProtocol.swift} | 8 ++++---- .../ScreenTemplate/TemplateScreenViewController.swift | 6 +++--- .../ScreenTemplate/TemplateScreenViewModel.swift | 2 +- ...elType.swift => TemplateScreenViewModelProtocol.swift} | 8 ++++---- 8 files changed, 23 insertions(+), 23 deletions(-) rename Tools/Templates/buildable/FlowCoordinatorTemplate/{FlowTemplateCoordinatorType.swift => FlowTemplateCoordinatorProtocol.swift} (78%) rename Tools/Templates/buildable/ScreenTemplate/{TemplateScreenCoordinatorType.swift => TemplateScreenCoordinatorProtocol.swift} (73%) rename Tools/Templates/buildable/ScreenTemplate/{TemplateScreenViewModelType.swift => TemplateScreenViewModelProtocol.swift} (85%) diff --git a/Tools/Templates/buildable/FlowCoordinatorTemplate/FlowTemplateCoordinator.swift b/Tools/Templates/buildable/FlowCoordinatorTemplate/FlowTemplateCoordinator.swift index 899027f23..773c7cf6e 100644 --- a/Tools/Templates/buildable/FlowCoordinatorTemplate/FlowTemplateCoordinator.swift +++ b/Tools/Templates/buildable/FlowCoordinatorTemplate/FlowTemplateCoordinator.swift @@ -17,7 +17,7 @@ import UIKit @objcMembers -final class FlowTemplateCoordinator: FlowTemplateCoordinatorType { +final class FlowTemplateCoordinator: FlowTemplateCoordinatorProtocol { // MARK: - Properties @@ -79,11 +79,11 @@ final class FlowTemplateCoordinator: FlowTemplateCoordinatorType { // MARK: - TemplateScreenCoordinatorDelegate extension FlowTemplateCoordinator: TemplateScreenCoordinatorDelegate { - func templateScreenCoordinator(_ coordinator: TemplateScreenCoordinatorType, didCompleteWithUserDisplayName userDisplayName: String?) { + func templateScreenCoordinator(_ coordinator: TemplateScreenCoordinatorProtocol, didCompleteWithUserDisplayName userDisplayName: String?) { self.delegate?.flowTemplateCoordinatorDidComplete(self) } - func templateScreenCoordinatorDidCancel(_ coordinator: TemplateScreenCoordinatorType) { + func templateScreenCoordinatorDidCancel(_ coordinator: TemplateScreenCoordinatorProtocol) { self.delegate?.flowTemplateCoordinatorDidComplete(self) } } diff --git a/Tools/Templates/buildable/FlowCoordinatorTemplate/FlowTemplateCoordinatorBridgePresenter.swift b/Tools/Templates/buildable/FlowCoordinatorTemplate/FlowTemplateCoordinatorBridgePresenter.swift index 9dea16f00..a97ef7258 100644 --- a/Tools/Templates/buildable/FlowCoordinatorTemplate/FlowTemplateCoordinatorBridgePresenter.swift +++ b/Tools/Templates/buildable/FlowCoordinatorTemplate/FlowTemplateCoordinatorBridgePresenter.swift @@ -120,7 +120,7 @@ final class FlowTemplateCoordinatorBridgePresenter: NSObject { // MARK: - FlowTemplateCoordinatorDelegate extension FlowTemplateCoordinatorBridgePresenter: FlowTemplateCoordinatorDelegate { - func flowTemplateCoordinatorDidComplete(_ coordinator: FlowTemplateCoordinatorType) { + func flowTemplateCoordinatorDidComplete(_ coordinator: FlowTemplateCoordinatorProtocol) { self.delegate?.flowTemplateCoordinatorBridgePresenterDelegateDidComplete(self) } } diff --git a/Tools/Templates/buildable/FlowCoordinatorTemplate/FlowTemplateCoordinatorType.swift b/Tools/Templates/buildable/FlowCoordinatorTemplate/FlowTemplateCoordinatorProtocol.swift similarity index 78% rename from Tools/Templates/buildable/FlowCoordinatorTemplate/FlowTemplateCoordinatorType.swift rename to Tools/Templates/buildable/FlowCoordinatorTemplate/FlowTemplateCoordinatorProtocol.swift index 8caa44cf8..eba9e522c 100644 --- a/Tools/Templates/buildable/FlowCoordinatorTemplate/FlowTemplateCoordinatorType.swift +++ b/Tools/Templates/buildable/FlowCoordinatorTemplate/FlowTemplateCoordinatorProtocol.swift @@ -17,10 +17,10 @@ import Foundation protocol FlowTemplateCoordinatorDelegate: AnyObject { - func flowTemplateCoordinatorDidComplete(_ coordinator: FlowTemplateCoordinatorType) + func flowTemplateCoordinatorDidComplete(_ coordinator: FlowTemplateCoordinatorProtocol) } -/// `FlowTemplateCoordinatorType` is a protocol describing a Coordinator that handle keybackup setup navigation flow. -protocol FlowTemplateCoordinatorType: Coordinator, Presentable { +/// `FlowTemplateCoordinatorProtocol` is a protocol describing a Coordinator that handle xxxxxxx navigation flow. +protocol FlowTemplateCoordinatorProtocol: Coordinator, Presentable { var delegate: FlowTemplateCoordinatorDelegate? { get } } diff --git a/Tools/Templates/buildable/ScreenTemplate/TemplateScreenCoordinator.swift b/Tools/Templates/buildable/ScreenTemplate/TemplateScreenCoordinator.swift index 4e9af01b3..742fad0c3 100644 --- a/Tools/Templates/buildable/ScreenTemplate/TemplateScreenCoordinator.swift +++ b/Tools/Templates/buildable/ScreenTemplate/TemplateScreenCoordinator.swift @@ -17,14 +17,14 @@ import Foundation import UIKit -final class TemplateScreenCoordinator: TemplateScreenCoordinatorType { +final class TemplateScreenCoordinator: TemplateScreenCoordinatorProtocol { // MARK: - Properties // MARK: Private private let parameters: TemplateScreenCoordinatorParameters - private var templateScreenViewModel: TemplateScreenViewModelType + private var templateScreenViewModel: TemplateScreenViewModelProtocol private let templateScreenViewController: TemplateScreenViewController // MARK: Public @@ -58,11 +58,11 @@ final class TemplateScreenCoordinator: TemplateScreenCoordinatorType { // MARK: - TemplateScreenViewModelCoordinatorDelegate extension TemplateScreenCoordinator: TemplateScreenViewModelCoordinatorDelegate { - func templateScreenViewModel(_ viewModel: TemplateScreenViewModelType, didCompleteWithUserDisplayName userDisplayName: String?) { + func templateScreenViewModel(_ viewModel: TemplateScreenViewModelProtocol, didCompleteWithUserDisplayName userDisplayName: String?) { self.delegate?.templateScreenCoordinator(self, didCompleteWithUserDisplayName: userDisplayName) } - func templateScreenViewModelDidCancel(_ viewModel: TemplateScreenViewModelType) { + func templateScreenViewModelDidCancel(_ viewModel: TemplateScreenViewModelProtocol) { self.delegate?.templateScreenCoordinatorDidCancel(self) } } diff --git a/Tools/Templates/buildable/ScreenTemplate/TemplateScreenCoordinatorType.swift b/Tools/Templates/buildable/ScreenTemplate/TemplateScreenCoordinatorProtocol.swift similarity index 73% rename from Tools/Templates/buildable/ScreenTemplate/TemplateScreenCoordinatorType.swift rename to Tools/Templates/buildable/ScreenTemplate/TemplateScreenCoordinatorProtocol.swift index 191a4198b..d6942941f 100644 --- a/Tools/Templates/buildable/ScreenTemplate/TemplateScreenCoordinatorType.swift +++ b/Tools/Templates/buildable/ScreenTemplate/TemplateScreenCoordinatorProtocol.swift @@ -17,11 +17,11 @@ import Foundation protocol TemplateScreenCoordinatorDelegate: AnyObject { - func templateScreenCoordinator(_ coordinator: TemplateScreenCoordinatorType, didCompleteWithUserDisplayName userDisplayName: String?) - func templateScreenCoordinatorDidCancel(_ coordinator: TemplateScreenCoordinatorType) + func templateScreenCoordinator(_ coordinator: TemplateScreenCoordinatorProtocol, didCompleteWithUserDisplayName userDisplayName: String?) + func templateScreenCoordinatorDidCancel(_ coordinator: TemplateScreenCoordinatorProtocol) } -/// `TemplateScreenCoordinatorType` is a protocol describing a Coordinator that handle key backup setup passphrase navigation flow. -protocol TemplateScreenCoordinatorType: Coordinator, Presentable { +/// `TemplateScreenCoordinatorProtocol` is a protocol describing a Coordinator that handle xxxxxxx navigation flow. +protocol TemplateScreenCoordinatorProtocol: Coordinator, Presentable { var delegate: TemplateScreenCoordinatorDelegate? { get } } diff --git a/Tools/Templates/buildable/ScreenTemplate/TemplateScreenViewController.swift b/Tools/Templates/buildable/ScreenTemplate/TemplateScreenViewController.swift index 031894d6f..dafd2dbcf 100644 --- a/Tools/Templates/buildable/ScreenTemplate/TemplateScreenViewController.swift +++ b/Tools/Templates/buildable/ScreenTemplate/TemplateScreenViewController.swift @@ -35,7 +35,7 @@ final class TemplateScreenViewController: UIViewController { // MARK: Private - private var viewModel: TemplateScreenViewModelType! + private var viewModel: TemplateScreenViewModelProtocol! private var theme: Theme! private var keyboardAvoider: KeyboardAvoider? private var errorPresenter: MXKErrorPresentation! @@ -43,7 +43,7 @@ final class TemplateScreenViewController: UIViewController { // MARK: - Setup - class func instantiate(with viewModel: TemplateScreenViewModelType) -> TemplateScreenViewController { + class func instantiate(with viewModel: TemplateScreenViewModelProtocol) -> TemplateScreenViewController { let viewController = StoryboardScene.TemplateScreenViewController.initialScene.instantiate() viewController.viewModel = viewModel viewController.theme = ThemeService.shared().theme @@ -172,7 +172,7 @@ final class TemplateScreenViewController: UIViewController { // MARK: - TemplateScreenViewModelViewDelegate extension TemplateScreenViewController: TemplateScreenViewModelViewDelegate { - func templateScreenViewModel(_ viewModel: TemplateScreenViewModelType, didUpdateViewState viewSate: TemplateScreenViewState) { + func templateScreenViewModel(_ viewModel: TemplateScreenViewModelProtocol, didUpdateViewState viewSate: TemplateScreenViewState) { self.render(viewState: viewSate) } } diff --git a/Tools/Templates/buildable/ScreenTemplate/TemplateScreenViewModel.swift b/Tools/Templates/buildable/ScreenTemplate/TemplateScreenViewModel.swift index b41eb27da..3dd2645b3 100644 --- a/Tools/Templates/buildable/ScreenTemplate/TemplateScreenViewModel.swift +++ b/Tools/Templates/buildable/ScreenTemplate/TemplateScreenViewModel.swift @@ -16,7 +16,7 @@ import Foundation -final class TemplateScreenViewModel: TemplateScreenViewModelType { +final class TemplateScreenViewModel: TemplateScreenViewModelProtocol { // MARK: - Properties diff --git a/Tools/Templates/buildable/ScreenTemplate/TemplateScreenViewModelType.swift b/Tools/Templates/buildable/ScreenTemplate/TemplateScreenViewModelProtocol.swift similarity index 85% rename from Tools/Templates/buildable/ScreenTemplate/TemplateScreenViewModelType.swift rename to Tools/Templates/buildable/ScreenTemplate/TemplateScreenViewModelProtocol.swift index aaf74f0a2..375187c39 100644 --- a/Tools/Templates/buildable/ScreenTemplate/TemplateScreenViewModelType.swift +++ b/Tools/Templates/buildable/ScreenTemplate/TemplateScreenViewModelProtocol.swift @@ -17,16 +17,16 @@ import Foundation protocol TemplateScreenViewModelViewDelegate: AnyObject { - func templateScreenViewModel(_ viewModel: TemplateScreenViewModelType, didUpdateViewState viewSate: TemplateScreenViewState) + func templateScreenViewModel(_ viewModel: TemplateScreenViewModelProtocol, didUpdateViewState viewSate: TemplateScreenViewState) } protocol TemplateScreenViewModelCoordinatorDelegate: AnyObject { - func templateScreenViewModel(_ viewModel: TemplateScreenViewModelType, didCompleteWithUserDisplayName userDisplayName: String?) - func templateScreenViewModelDidCancel(_ viewModel: TemplateScreenViewModelType) + func templateScreenViewModel(_ viewModel: TemplateScreenViewModelProtocol, didCompleteWithUserDisplayName userDisplayName: String?) + func templateScreenViewModelDidCancel(_ viewModel: TemplateScreenViewModelProtocol) } /// Protocol describing the view model used by `TemplateScreenViewController` -protocol TemplateScreenViewModelType { +protocol TemplateScreenViewModelProtocol { var viewDelegate: TemplateScreenViewModelViewDelegate? { get set } var coordinatorDelegate: TemplateScreenViewModelCoordinatorDelegate? { get set }