Skip to content

Commit 4d1b704

Browse files
authored
Merge pull request #12 from GoodRequest/coordinator-update
feat: GoodCoordinator init update
2 parents 9e8a6a5 + 28cc8f0 commit 4d1b704

3 files changed

Lines changed: 12 additions & 12 deletions

File tree

GoodReactor-Sample/GoodReactor-Sample/Coordinators/AppCoordinator.swift

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,15 @@ final class AppCoordinator: GoodCoordinator<AppStep> {
2525

2626
init(window: UIWindow?) {
2727
self.window = window
28+
29+
super.init()
2830
}
2931

30-
required init(rootViewController: UIViewController? = nil, parentCoordinator: (any Coordinator)? = nil) {
32+
required init(rootViewController: UIViewController? = nil) {
3133
fatalError("init(rootViewController:parentCoordinator:) has not been implemented")
3234
}
3335

34-
required convenience init(parentCoordinator: any Coordinator) {
36+
required init(parentCoordinator: Coordinator?) {
3537
fatalError("init(parentCoordinator:) has not been implemented")
3638
}
3739

GoodReactor-Sample/GoodReactor-Sample/Coordinators/HomeCoordinator.swift

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ class HomeCoordinator: GoodCoordinator<HomeStep> {
3232
switch step {
3333
case .goToAbout:
3434
let aboutViewController = AboutCoordinator(
35-
rootViewController: rootViewController,
3635
parentCoordinator: self
3736
).start()
3837

Sources/LegacyReactor/GoodCoordinator.swift

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ public enum StepAction {
3333

3434
// Links
3535
case safari(URL, UIModalPresentationStyle = .automatic, tintColor: UIColor? = nil)
36-
case universalLink(url: URL, onlyUniversal: Bool, completion: (@MainActor (Bool) -> ())? = nil)
36+
case universalLink(url: URL, onlyOpenWhenTargetAppIsAvailable: Bool = false, completion: (@MainActor (Bool) -> ())? = nil)
3737

3838
// Actions
3939
case call(String)
@@ -89,21 +89,20 @@ open class GoodCoordinator<Step>: NSObject, Coordinator {
8989
/// - Parameters:
9090
/// - rootViewController: The root view controller managed by this coordinator. Default value is nil.
9191
/// - parentCoordinator: The parent coordinator of this coordinator. Default value is nil.
92-
public required init(rootViewController: UIViewController? = nil, parentCoordinator: Coordinator? = nil) {
92+
public required init(rootViewController: UIViewController? = nil) {
9393
super.init()
9494

9595
self.rootViewController = rootViewController
96-
self.parentCoordinator = parentCoordinator
97-
self.parentCoordinator?.children.addObject(self)
9896
}
9997

10098
/// A convenience initializer that initializes a GoodCoordinator with a root view controller derived from the provided parent coordinator.
10199
/// - Parameter parentCoordinator: The parent coordinator to which this coordinator will belong.
102-
public required convenience init(parentCoordinator: Coordinator) {
103-
self.init(
104-
rootViewController: parentCoordinator.rootViewController,
105-
parentCoordinator: parentCoordinator
106-
)
100+
public required init(parentCoordinator: Coordinator?) {
101+
super.init()
102+
103+
self.parentCoordinator = parentCoordinator
104+
self.rootViewController = parentCoordinator?.rootViewController
105+
self.parentCoordinator?.children.addObject(self)
107106
}
108107

109108
// MARK: - Overridable

0 commit comments

Comments
 (0)