Merge pull request #180 from uber/tutorials-view_less_rib_inheritance-master

Fix tutorials view-less RIB inheritance
This commit is contained in:
Yi Wang
2017-12-05 13:27:46 -08:00
committed by GitHub
8 changed files with 16 additions and 12 deletions
@@ -35,7 +35,6 @@ protocol LoggedInListener: class {
final class LoggedInInteractor: Interactor, LoggedInInteractable {
weak var router: LoggedInRouting?
weak var listener: LoggedInListener?
// TODO: Add additional dependencies to constructor. Do not perform any logic
@@ -26,15 +26,16 @@ protocol LoggedInViewControllable: ViewControllable {
func dismiss(viewController: ViewControllable)
}
final class LoggedInRouter: ViewableRouter<LoggedInInteractable, LoggedInViewControllable>, LoggedInRouting {
final class LoggedInRouter: Router<LoggedInInteractable>, LoggedInRouting {
init(interactor: LoggedInInteractable,
viewController: LoggedInViewControllable,
offGameBuilder: OffGameBuildable,
ticTacToeBuilder: TicTacToeBuildable) {
self.viewController = viewController
self.offGameBuilder = offGameBuilder
self.ticTacToeBuilder = ticTacToeBuilder
super.init(interactor: interactor, viewController: viewController)
super.init(interactor: interactor)
interactor.router = self
}
@@ -67,6 +68,7 @@ final class LoggedInRouter: ViewableRouter<LoggedInInteractable, LoggedInViewCon
// MARK: - Private
private let viewController: LoggedInViewControllable
private let offGameBuilder: OffGameBuildable
private let ticTacToeBuilder: TicTacToeBuildable
@@ -35,7 +35,6 @@ protocol LoggedInListener: class {
final class LoggedInInteractor: Interactor, LoggedInInteractable {
weak var router: LoggedInRouting?
weak var listener: LoggedInListener?
// TODO: Add additional dependencies to constructor. Do not perform any logic
@@ -26,15 +26,16 @@ protocol LoggedInViewControllable: ViewControllable {
func dismiss(viewController: ViewControllable)
}
final class LoggedInRouter: ViewableRouter<LoggedInInteractable, LoggedInViewControllable>, LoggedInRouting {
final class LoggedInRouter: Router<LoggedInInteractable>, LoggedInRouting {
init(interactor: LoggedInInteractable,
viewController: LoggedInViewControllable,
offGameBuilder: OffGameBuildable,
ticTacToeBuilder: TicTacToeBuildable) {
self.viewController = viewController
self.offGameBuilder = offGameBuilder
self.ticTacToeBuilder = ticTacToeBuilder
super.init(interactor: interactor, viewController: viewController)
super.init(interactor: interactor)
interactor.router = self
}
@@ -67,6 +68,7 @@ final class LoggedInRouter: ViewableRouter<LoggedInInteractable, LoggedInViewCon
// MARK: - Private
private let viewController: LoggedInViewControllable
private let offGameBuilder: OffGameBuildable
private let ticTacToeBuilder: TicTacToeBuildable
@@ -30,7 +30,6 @@ protocol LoggedInListener: class {
final class LoggedInInteractor: Interactor, LoggedInInteractable, LoggedInActionableItem {
weak var router: LoggedInRouting?
weak var listener: LoggedInListener?
// TODO: Add additional dependencies to constructor. Do not perform any logic
@@ -25,13 +25,14 @@ protocol LoggedInViewControllable: ViewControllable {
func replaceModal(viewController: ViewControllable?)
}
final class LoggedInRouter: ViewableRouter<LoggedInInteractable, LoggedInViewControllable>, LoggedInRouting {
final class LoggedInRouter: Router<LoggedInInteractable>, LoggedInRouting {
init(interactor: LoggedInInteractable,
viewController: LoggedInViewControllable,
offGameBuilder: OffGameBuildable) {
self.viewController = viewController
self.offGameBuilder = offGameBuilder
super.init(interactor: interactor, viewController: viewController)
super.init(interactor: interactor)
interactor.router = self
}
@@ -59,6 +60,7 @@ final class LoggedInRouter: ViewableRouter<LoggedInInteractable, LoggedInViewCon
// MARK: - Private
private let viewController: LoggedInViewControllable
private let offGameBuilder: OffGameBuildable
private var currentChild: ViewableRouting?
@@ -30,7 +30,6 @@ protocol LoggedInListener: class {
final class LoggedInInteractor: Interactor, LoggedInInteractable {
weak var router: LoggedInRouting?
weak var listener: LoggedInListener?
// TODO: Add additional dependencies to constructor. Do not perform any logic
@@ -25,13 +25,14 @@ protocol LoggedInViewControllable: ViewControllable {
func replaceModal(viewController: ViewControllable?)
}
final class LoggedInRouter: ViewableRouter<LoggedInInteractable, LoggedInViewControllable>, LoggedInRouting {
final class LoggedInRouter: Router<LoggedInInteractable>, LoggedInRouting {
init(interactor: LoggedInInteractable,
viewController: LoggedInViewControllable,
offGameBuilder: OffGameBuildable) {
self.viewController = viewController
self.offGameBuilder = offGameBuilder
super.init(interactor: interactor, viewController: viewController)
super.init(interactor: interactor)
interactor.router = self
}
@@ -59,6 +60,7 @@ final class LoggedInRouter: ViewableRouter<LoggedInInteractable, LoggedInViewCon
// MARK: - Private
private let viewController: LoggedInViewControllable
private let offGameBuilder: OffGameBuildable
private var currentChild: ViewableRouting?