feat: Support Custom UIVIewController

interactord · interactord · commit eb1fddb82c65 · 2023-01-09T12:20:04.000+09:00
diff --git a/Examples/MVI-Example/MVI-Example/Feature/Home/HomeRouteBuilder.swift b/Examples/MVI-Example/MVI-Example/Feature/Home/HomeRouteBuilder.swift
@@ -4,7 +4,7 @@ import SwiftUI
 struct HomeRouteBuilder: RouteBuilder {
   var matchPath: String { "home" }
 
-  var build: (LinkNavigatorType, [String: String], DependencyType) -> UIViewController? {
+  var build: (LinkNavigatorType, [String: String], DependencyType) -> MatchingViewController? {
     { navigator, items, dep in
       WrappingController(matchingKey: matchPath) {
         HomeView.build(
diff --git a/Examples/MVI-Example/MVI-Example/Feature/Page1/Page1RouteBuilder.swift b/Examples/MVI-Example/MVI-Example/Feature/Page1/Page1RouteBuilder.swift
@@ -4,7 +4,7 @@ import SwiftUI
 struct Page1RouteBuilder: RouteBuilder {
   var matchPath: String { "page1" }
 
-  var build: (LinkNavigatorType, [String: String], DependencyType) -> UIViewController? {
+  var build: (LinkNavigatorType, [String: String], DependencyType) -> MatchingViewController? {
     { navigator, items, dep in
       WrappingController(matchingKey: matchPath) {
         Page1View.build(
diff --git a/Examples/MVI-Example/MVI-Example/Feature/Page2/Page2RouteBuilder.swift b/Examples/MVI-Example/MVI-Example/Feature/Page2/Page2RouteBuilder.swift
@@ -4,7 +4,7 @@ import SwiftUI
 struct Page2RouteBuilder: RouteBuilder {
   var matchPath: String { "page2" }
 
-  var build: (LinkNavigatorType, [String: String], DependencyType) -> UIViewController? {
+  var build: (LinkNavigatorType, [String: String], DependencyType) -> MatchingViewController? {
     { navigator, items, dep in
       WrappingController(matchingKey: matchPath) {
         Page2View.build(
diff --git a/Examples/MVI-Example/MVI-Example/Feature/Page3/Page3RouteBuilder.swift b/Examples/MVI-Example/MVI-Example/Feature/Page3/Page3RouteBuilder.swift
@@ -4,7 +4,7 @@ import SwiftUI
 struct Page3RouteBuilder: RouteBuilder {
   var matchPath: String { "page3" }
 
-  var build: (LinkNavigatorType, [String: String], DependencyType) -> UIViewController? {
+  var build: (LinkNavigatorType, [String: String], DependencyType) -> MatchingViewController? {
     { navigator, items, dep in
       WrappingController(matchingKey: matchPath) {
         Page3View.build(
diff --git a/Examples/MVI-Example/MVI-Example/Feature/Page4/Page4RouteBuilder.swift b/Examples/MVI-Example/MVI-Example/Feature/Page4/Page4RouteBuilder.swift
@@ -4,7 +4,7 @@ import SwiftUI
 struct Page4RouteBuilder: RouteBuilder {
   var matchPath: String { "page4" }
 
-  var build: (LinkNavigatorType, [String: String], DependencyType) -> UIViewController? {
+  var build: (LinkNavigatorType, [String: String], DependencyType) -> MatchingViewController? {
     { navigator, items, dep in
       WrappingController(matchingKey: matchPath) {
         Page4View.build(
@@ -16,7 +16,7 @@ struct Page4RouteBuilder: RouteBuilder {
   }
 }
 
-extension Dictionary where Key == String, Value == String {
+extension [String: String] {
   fileprivate func getValue(key: String) -> String? {
     first(where: { $0.key == key })?.value as? String
   }
diff --git a/Examples/TCA-Example/TCA-Example/Feature/Home/HomeRouteBuilder.swift b/Examples/TCA-Example/TCA-Example/Feature/Home/HomeRouteBuilder.swift
@@ -4,7 +4,7 @@ import SwiftUI
 struct HomeRouteBuilder: RouteBuilder {
   var matchPath: String { "home" }
 
-  var build: (LinkNavigatorType, [String: String], DependencyType) -> UIViewController? {
+  var build: (LinkNavigatorType, [String : String], DependencyType) -> MatchingViewController? {
     { navigator, items, dep in
       WrappingController(matchingKey: matchPath) {
         HomeView(
diff --git a/Examples/TCA-Example/TCA-Example/Feature/Page1/Page1RouteBuilder.swift b/Examples/TCA-Example/TCA-Example/Feature/Page1/Page1RouteBuilder.swift
@@ -4,7 +4,7 @@ import SwiftUI
 struct Page1RouteBuilder: RouteBuilder {
   var matchPath: String { "page1" }
 
-  var build: (LinkNavigatorType, [String: String], DependencyType) -> UIViewController? {
+  var build: (LinkNavigatorType, [String: String], DependencyType) -> MatchingViewController? {
     { navigator, items, dep in
       WrappingController(matchingKey: matchPath) {
         Page1View(
diff --git a/Examples/TCA-Example/TCA-Example/Feature/Page2/Page2RouteBuilder.swift b/Examples/TCA-Example/TCA-Example/Feature/Page2/Page2RouteBuilder.swift
@@ -4,7 +4,7 @@ import SwiftUI
 struct Page2RouteBuilder: RouteBuilder {
   var matchPath: String { "page2" }
 
-  var build: (LinkNavigatorType, [String: String], DependencyType) -> UIViewController? {
+  var build: (LinkNavigatorType, [String: String], DependencyType) -> MatchingViewController? {
     { navigator, items, dep in
       WrappingController(matchingKey: matchPath) {
         Page2View(
diff --git a/Examples/TCA-Example/TCA-Example/Feature/Page3/Page3RouteBuilder.swift b/Examples/TCA-Example/TCA-Example/Feature/Page3/Page3RouteBuilder.swift
@@ -4,7 +4,7 @@ import SwiftUI
 struct Page3RouteBuilder: RouteBuilder {
   var matchPath: String { "page3" }
 
-  var build: (LinkNavigatorType, [String: String], DependencyType) -> UIViewController? {
+  var build: (LinkNavigatorType, [String: String], DependencyType) -> MatchingViewController? {
     { navigator, items, dep in
       WrappingController(matchingKey: matchPath) {
         Page3View(
@@ -16,7 +16,7 @@ struct Page3RouteBuilder: RouteBuilder {
   }
 }
 
-extension Dictionary where Key == String, Value == String {
+extension [String: String] {
   fileprivate func getValue(key: String) -> String? {
     first(where: { $0.key == key })?.value as? String
   }
diff --git a/Examples/TCA-Example/TCA-Example/Feature/Page4/Page4RouteBuilder.swift b/Examples/TCA-Example/TCA-Example/Feature/Page4/Page4RouteBuilder.swift
@@ -4,7 +4,7 @@ import SwiftUI
 struct Page4RouteBuilder: RouteBuilder {
   var matchPath: String { "page4" }
 
-  var build: (LinkNavigatorType, [String: String], DependencyType) -> UIViewController? {
+  var build: (LinkNavigatorType, [String: String], DependencyType) -> MatchingViewController? {
     { navigator, items, dep in
       WrappingController(matchingKey: matchPath) {
         Page4View(
@@ -16,7 +16,7 @@ struct Page4RouteBuilder: RouteBuilder {
   }
 }
 
-extension Dictionary where Key == String, Value == String {
+extension [String: String] {
   fileprivate func getValue(key: String) -> String? {
     first(where: { $0.key == key })?.value as? String
   }
diff --git a/README.md b/README.md
@@ -250,7 +250,7 @@ For example, you can put it in `ViewModel` or `Environment`.
   struct HomeRouteBuilder: RouteBuilder {
     var matchPath: String { "home" }
 
-    var build: (LinkNavigatorType, [String: String], DependencyType) -> UIViewController? {
+    var build: (LinkNavigatorType, [String: String], DependencyType) -> MatchingViewController? {
       { navigator, items, dependency in
         return WrappingController(matchingKey: matchPath) {
           HomePage(navigator: navigator)
diff --git a/Sources/LinkNavigator/Builder/RouteBuilderType.swift b/Sources/LinkNavigator/Builder/RouteBuilderType.swift
@@ -1,7 +1,9 @@
 import UIKit
 
+public typealias MatchingViewController = MatchingKeyUsable & UIViewController
+
 public protocol RouteBuilder {
 	var matchPath: String { get }
 
-  var build: (LinkNavigatorType, [String: String], DependencyType) -> UIViewController? { get }
+  var build: (LinkNavigatorType, [String: String], DependencyType) -> MatchingViewController? { get }
 }
diff --git a/Sources/LinkNavigator/Components/WrappingController.swift b/Sources/LinkNavigator/Components/WrappingController.swift
@@ -1,12 +1,12 @@
 import SwiftUI
 
-protocol MatchingKeyUsable {
+public protocol MatchingKeyUsable {
   var matchingKey: String { get }
 }
 
 public final class WrappingController<Content: View>: UIHostingController<Content>, MatchingKeyUsable {
 
-  let matchingKey: String
+  public let matchingKey: String
 
   public init(
     matchingKey: String,

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@ import SwiftUI`
`4`	`4`	`struct Page4RouteBuilder: RouteBuilder {`
`5`	`5`	`var matchPath: String { "page4" }`
`6`	`6`
`7`		`- var build: (LinkNavigatorType, [String: String], DependencyType) -> UIViewController? {`
	`7`	`+ var build: (LinkNavigatorType, [String: String], DependencyType) -> MatchingViewController? {`
`8`	`8`	`{ navigator, items, dep in`
`9`	`9`	`WrappingController(matchingKey: matchPath) {`
`10`	`10`	`Page4View.build(`
`@@ -16,7 +16,7 @@ struct Page4RouteBuilder: RouteBuilder {`
`16`	`16`	`}`
`17`	`17`	`}`
`18`	`18`
`19`		`-extension Dictionary where Key == String, Value == String {`
	`19`	`+extension [String: String] {`
`20`	`20`	`fileprivate func getValue(key: String) -> String? {`
`21`	`21`	`first(where: { $0.key == key })?.value as? String`
`22`	`22`	`}`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@ import SwiftUI`
`4`	`4`	`struct Page3RouteBuilder: RouteBuilder {`
`5`	`5`	`var matchPath: String { "page3" }`
`6`	`6`
`7`		`- var build: (LinkNavigatorType, [String: String], DependencyType) -> UIViewController? {`
	`7`	`+ var build: (LinkNavigatorType, [String: String], DependencyType) -> MatchingViewController? {`
`8`	`8`	`{ navigator, items, dep in`
`9`	`9`	`WrappingController(matchingKey: matchPath) {`
`10`	`10`	`Page3View(`
`@@ -16,7 +16,7 @@ struct Page3RouteBuilder: RouteBuilder {`
`16`	`16`	`}`
`17`	`17`	`}`
`18`	`18`
`19`		`-extension Dictionary where Key == String, Value == String {`
	`19`	`+extension [String: String] {`
`20`	`20`	`fileprivate func getValue(key: String) -> String? {`
`21`	`21`	`first(where: { $0.key == key })?.value as? String`
`22`	`22`	`}`