refactor native controller example

lazaronixon · Sep 10, 2023 · a4ab45e · a4ab45e
1 parent f0db486
commit a4ab45e
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 30 deletions.
diff --git a/...nitializer/templates/ios_stack/TurboNativeProject/Controllers/NumbersViewController.swift b/...nitializer/templates/ios_stack/TurboNativeProject/Controllers/NumbersViewController.swift
@@ -1,16 +1,9 @@
 import SwiftUI
 
 class NumbersViewController: UIHostingController<NumbersView> {
-    init() {
-        super.init(rootView: NumbersView())
-    }
-
-    required init(coder aDecoder: NSCoder) {
-        fatalError("init(coder:) has not been implemented")
-    }
-
-    override func viewDidLoad() {
-        super.viewDidLoad(); title = "Numbers"
+    convenience init(title: String) {
+        self.init(rootView: NumbersView())
+        self.title = title
     }
 }
 

diff --git a/...alizer/templates/ios_stack/TurboNativeProject/Controllers/TurboNavigationController.swift b/...alizer/templates/ios_stack/TurboNativeProject/Controllers/TurboNavigationController.swift
@@ -52,7 +52,7 @@ extension TurboNavigationController {
 
     private func isClearAll(_ properties: PathProperties) -> Bool {
         return properties["presentation"] as? String == "clear-all"
-    }    
+    }
 
     private func isReplaceAll(_ properties: PathProperties) -> Bool {
         return properties["presentation"] as? String == "replace-all"
@@ -75,13 +75,13 @@ extension TurboNavigationController {
         if let viewController = properties["view-controller"] as? String {
             switch viewController {
             case "numbers":
-                return NumbersViewController()
+                return NumbersViewController(title: "Numbers")
             default:
-                return ViewController(url: url)
+                assertionFailure("Invalid view controller, defaulting to WebView")
             }
-        } else {
-            return ViewController(url: url)
         }
+
+        return ViewController(url: url)
     }
 
     private func navigate(to viewController: UIViewController, action: VisitAction, properties: PathProperties = [:]) {

diff --git a/...initializer/templates/ios_tabs/TurboNativeProject/Controllers/NumbersViewController.swift b/...initializer/templates/ios_tabs/TurboNativeProject/Controllers/NumbersViewController.swift
@@ -1,16 +1,9 @@
 import SwiftUI
 
 class NumbersViewController: UIHostingController<NumbersView> {
-    init() {
-        super.init(rootView: NumbersView())
-    }
-
-    required init(coder aDecoder: NSCoder) {
-        fatalError("init(coder:) has not been implemented")
-    }
-
-    override func viewDidLoad() {
-        super.viewDidLoad(); title = "Numbers"
+    convenience init(title: String) {
+        self.init(rootView: NumbersView())
+        self.title = title
     }
 }
 

diff --git a/...ializer/templates/ios_tabs/TurboNativeProject/Controllers/TurboNavigationController.swift b/...ializer/templates/ios_tabs/TurboNativeProject/Controllers/TurboNavigationController.swift
@@ -52,7 +52,7 @@ extension TurboNavigationController {
 
     private func isClearAll(_ properties: PathProperties) -> Bool {
         return properties["presentation"] as? String == "clear-all"
-    }    
+    }
 
     private func isReplaceAll(_ properties: PathProperties) -> Bool {
         return properties["presentation"] as? String == "replace-all"
@@ -75,13 +75,13 @@ extension TurboNavigationController {
         if let viewController = properties["view-controller"] as? String {
             switch viewController {
             case "numbers":
-                return NumbersViewController()
+                return NumbersViewController(title: "Numbers")
             default:
-                return ViewController(url: url)
+                assertionFailure("Invalid view controller, defaulting to WebView")
             }
-        } else {
-            return ViewController(url: url)
         }
+
+        return ViewController(url: url)
     }
 
     private func navigate(to viewController: UIViewController, action: VisitAction, properties: PathProperties = [:]) {