turbo-native-initializer 0.0.15 → 0.0.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d5b3658efa201b5340d0e5ecdc401395f6659c235a5177c1e7a6b908b69a2f09
-  data.tar.gz: 7327665391ec9be569354ad811f9565a6164da08aea90c3e8bfe04f65e03cf5a
+  metadata.gz: 3b5ef5d8b7a0d8f95f129356baa6f612368985f84ddec474db83057174b438ac
+  data.tar.gz: e99f39bff9585a3b391d4ab6bf6f5516355e646eb79490704b172470ed83449a
 SHA512:
-  metadata.gz: 1dcedc375f6de7437ff80b816424e599b7b266713c94417a6752bf16104e8ac719f0cbbed03b500efe891a3590f84c000a16f254d25e8fac5c6546883a4b8a30
-  data.tar.gz: b5e35c0791bf2a6b3fdc6eeaec4c45b5b14388b796c9d51f3539d2547fd93f106c01d483ec6a90d7cb6d73359cdfb2d76501226dab9fd070535f082922c6ef1c
+  metadata.gz: 12a257749999a07cfdd00f3738b383e6f608ac0433d8026ca2139a929b39ad503cf9998774765c03db9d1b9d1103f7e14933c73a9af8ad1183ad9e9b47047495
+  data.tar.gz: 176211b7e460001de9b829a30fb3eec2d5dd8f960b829dd1b422dd45a23e0d4fe164ef3e42a2d419a5ef9d5fb030d9075a50438c8ce991062f3c5c3d35f2d254

data/lib/turbo_native_initializer/generator.rb

@@ -22,6 +22,7 @@ module TurboNativeInitializer
         directory "#{project}/TurboNativeProject/Configuration", "#{name}/#{name}/Configuration"
         directory "#{project}/TurboNativeProject/Controllers", "#{name}/#{name}/Controllers"
         directory "#{project}/TurboNativeProject/Delegates", "#{name}/#{name}/Delegates"
+        directory "#{project}/TurboNativeProject/Extensions", "#{name}/#{name}/Extensions"
         directory "#{project}/TurboNativeProject/Resources", "#{name}/#{name}/Resources"
         directory "#{project}/TurboNativeProject/Strada", "#{name}/#{name}/Strada"
         directory "#{project}/TurboNativeProject.xcodeproj", "#{name}/#{name}.xcodeproj"

data/lib/turbo_native_initializer/templates/android_stack/base/app/src/main/assets/json/configuration.json

@@ -2,11 +2,11 @@
   "settings": {},
   "rules": [
     { "patterns": [".*"], "properties": { "uri": "turbo://fragment/web", "pull_to_refresh_enabled": true } },
-    { "patterns": ["/refresh_historical_location"], "properties": { "presentation": "refresh" } },
     { "patterns": ["/recede_historical_location"], "properties": { "presentation": "pop" } },
     { "patterns": ["/resume_historical_location"], "properties": { "presentation": "none" } },
-    { "patterns": ["^/$"], "properties": { "uri": "turbo://fragment/web/home", "presentation": "replace_all" } },
+    { "patterns": ["/refresh_historical_location"], "properties": { "presentation": "refresh" } },
     { "patterns": ["/new$", "/edit$", "/signin$", "/strada-form$"], "properties": { "context": "modal", "uri": "turbo://fragment/web/modal", "pull_to_refresh_enabled": false } },
+    { "patterns": ["^/$"], "properties": { "uri": "turbo://fragment/web/home", "presentation": "replace_all" } },
     { "patterns": ["/numbers$"], "properties": { "uri": "turbo://fragment/numbers", "title": "Numbers" } }
   ]
 }

data/lib/turbo_native_initializer/templates/android_tabs/base/app/src/main/assets/json/configuration.json

@@ -2,11 +2,11 @@
   "settings": {},
   "rules": [
     { "patterns": [".*"], "properties": { "uri": "turbo://fragment/web", "pull_to_refresh_enabled": true } },
-    { "patterns": ["/refresh_historical_location"], "properties": { "presentation": "refresh" } },
     { "patterns": ["/recede_historical_location"], "properties": { "presentation": "pop" } },
     { "patterns": ["/resume_historical_location"], "properties": { "presentation": "none" } },
-    { "patterns": ["^/$"], "properties": { "uri": "turbo://fragment/web/home", "presentation": "replace_all" } },
+    { "patterns": ["/refresh_historical_location"], "properties": { "presentation": "refresh" } },
     { "patterns": ["/new$", "/edit$", "/signin$", "/strada-form$"], "properties": { "context": "modal", "uri": "turbo://fragment/web/modal", "pull_to_refresh_enabled": false } },
+    { "patterns": ["^/$"], "properties": { "uri": "turbo://fragment/web/home", "presentation": "replace_all" } },
     { "patterns": ["/numbers$"], "properties": { "uri": "turbo://fragment/numbers", "title": "Numbers" } }
   ]
 }

data/lib/turbo_native_initializer/templates/ios_stack/TurboNativeProject/Configuration/path-configuration.json

@@ -1,11 +1,11 @@
 {
   "settings": {},
   "rules": [
-    { "patterns": ["/refresh_historical_location"], "properties": { "presentation": "refresh", "visitable": false } },
-    { "patterns": ["/recede_historical_location"], "properties": { "presentation": "pop", "visitable": false } },
+    { "patterns": ["/recede_historical_location"], "properties": { "presentation": "back", "visitable": false } },
     { "patterns": ["/resume_historical_location"], "properties": { "presentation": "none", "visitable": false } },
+    { "patterns": ["/refresh_historical_location"], "properties": { "presentation": "refresh", "visitable": false } },
+    { "patterns": ["/new$", "/edit$", "/signin$", "/strada-form$"], "properties": { "presentation": "modal", "pull-to-refresh-enabled": false } },
     { "patterns": ["^/$"], "properties": { "presentation": "replace-all" } },
-    { "patterns": ["/new$", "/edit$", "/signin$", "/strada-form$"], "properties": { "presentation": "modal" } },
     { "patterns": ["/numbers$"], "properties": { "view-controller": "numbers" } }
   ]
 }

data/lib/turbo_native_initializer/templates/ios_stack/TurboNativeProject/Controllers/TurboNavigationController.swift

@@ -22,9 +22,14 @@ class TurboNavigationController : UINavigationController {
         }
 
         // - Create view controller appropriate for url/properties
-        // - Navigate to that with the correct presentation
         let viewController = makeViewController(for: url, properties: properties)
-        navigate(to: viewController, action: options.action, properties: properties)
+
+        // - Navigate to that with the correct presentation
+        if session.topmostVisitable?.visitableURL == url {
+            navigate(to: viewController, action: .replace, properties: properties)
+        } else {
+            navigate(to: viewController, action: options.action, properties: properties)
+        }
 
         // Initiate the visit with Turbo
         if isVisitable(properties) {
@@ -43,8 +48,8 @@ extension TurboNavigationController {
         return properties["presentation"] as? String == "modal"
     }
 
-    private func isPop(_ properties: PathProperties) -> Bool {
-        return properties["presentation"] as? String == "pop"
+    private func isBack(_ properties: PathProperties) -> Bool {
+        return properties["presentation"] as? String == "back"
     }
 
     private func isRefresh(_ properties: PathProperties) -> Bool {
@@ -71,6 +76,14 @@ extension TurboNavigationController {
         return properties["visitable"] as? Bool ?? true
     }
 
+    private func isPullToRefreshEnabled(_ properties: PathProperties) -> Bool {
+        return properties["pull-to-refresh-enabled"] as? Bool ?? true
+    }
+
+    private func title(from properties: PathProperties) -> String? {
+        return properties["title"] as? String
+    }
+
     private func noticeMessage(from url: URL) -> String? {
         URLComponents(url: url, resolvingAgainstBaseURL: false)?.queryItems?.first(where: { $0.name == "notice" })?.value
     }
@@ -90,13 +103,16 @@ extension TurboNavigationController {
             }
         }
 
-        return TurboWebViewController(url: url)
+        let viewController = TurboWebViewController(url: url)
+        viewController.pullToRefreshEnabled = isPullToRefreshEnabled(properties)
+        viewController.title = title(from: properties)
+        return viewController
     }
 
     private func navigate(to viewController: UIViewController, action: VisitAction, properties: PathProperties = [:]) {
         if isModal(properties) {
             present(UINavigationController(rootViewController: viewController), animated: true)
-        } else if isPop(properties) {
+        } else if isBack(properties) {
             popViewController(animated: true)
         } else if isRefresh(properties) {
             session.reload()

data/lib/turbo_native_initializer/templates/ios_stack/TurboNativeProject/Controllers/TurboWebViewController.swift

@@ -5,6 +5,8 @@ import WebKit
 
 final class TurboWebViewController: VisitableViewController, ErrorPresenter, BridgeDestination {
 
+    var pullToRefreshEnabled = true
+
     private lazy var bridgeDelegate: BridgeDelegate = {
         BridgeDelegate(location: visitableURL.absoluteString, destination: self, componentTypes: BridgeComponent.allTypes)
     }()
@@ -17,14 +19,15 @@ final class TurboWebViewController: VisitableViewController, ErrorPresenter, Bri
 
     override func viewDidLoad() {
         super.viewDidLoad()
+        bridgeDelegate.onViewDidLoad()
 
         navigationItem.backButtonTitle = "Back"
 
+        visitableView.allowsPullToRefresh = pullToRefreshEnabled
+
         if presentingViewController != nil {
             navigationItem.leftBarButtonItem = dismissModalButton
         }
-
-        bridgeDelegate.onViewDidLoad()
     }
 
     override func viewWillAppear(_ animated: Bool) {
@@ -49,6 +52,10 @@ final class TurboWebViewController: VisitableViewController, ErrorPresenter, Bri
 
     // MARK: Visitable
 
+    override func visitableDidRender() {
+        title = title ?? visitableView.webView?.title
+    }
+
     override func visitableDidActivateWebView(_ webView: WKWebView) {
         bridgeDelegate.webViewDidBecomeActive(webView)
     }

data/lib/turbo_native_initializer/templates/ios_stack/TurboNativeProject/Delegates/{SceneDelegate.swift.tt → SceneDelegate.swift}

@@ -5,16 +5,16 @@ import Turbo
 import Strada
 
 final class SceneDelegate: UIResponder {
-    private static var sharedProcessPool = WKProcessPool()
 
     var window: UIWindow?
-    private let rootURL = <%= name %>.homeURL
+    private let rootURL = TurboNativeProject.homeURL
     private var navigationController: TurboNavigationController!
 
     // MARK: - Setup
 
     private func configureRootViewController() {
         navigationController = window!.rootViewController as? TurboNavigationController
+        navigationController.navigationBar.scrollEdgeAppearance = .init()
         navigationController.session = session
         navigationController.modalSession = modalSession
     }
@@ -22,7 +22,7 @@ final class SceneDelegate: UIResponder {
     // MARK: - Authentication
 
     private func promptForAuthentication() {
-        let authURL = <%= name %>.signInURL
+        let authURL = TurboNativeProject.signInURL
         let properties = pathConfiguration.properties(for: authURL)
         navigationController.route(url: authURL, options: VisitOptions(), properties: properties)
     }
@@ -42,6 +42,7 @@ final class SceneDelegate: UIResponder {
         let session = Session(webView: webView)
         session.delegate = self
         session.pathConfiguration = pathConfiguration
+
         return session
     }
 

data/lib/turbo_native_initializer/templates/ios_stack/TurboNativeProject/{Controllers → Extensions}/UIViewController+Toast.swift

@@ -2,33 +2,24 @@ import SwiftUI
 
 public extension UIViewController {
     func presentToast(_ message: String) {
-        guard let root = view.window?.rootViewController else { return }
+        guard let window = view.window else { return }
 
-        removeToastViews(from: root)
+        removeToastViews(from: window)
 
         let toastView = ToastView(message: message)
         toastView.translatesAutoresizingMaskIntoConstraints = false
 
-        root.view.addSubview(toastView)
+        window.addSubview(toastView)
 
         NSLayoutConstraint.activate([
-            toastView.topAnchor.constraint(equalTo: root.view.safeAreaLayoutGuide.topAnchor),
-            toastView.centerXAnchor.constraint(equalTo: root.view.centerXAnchor)
-        ])
-
-        let widthConstraint = toastView.widthAnchor.constraint(equalTo: view.widthAnchor, constant: -10)
-        widthConstraint.priority = .defaultHigh
-
-        let maxWidthConstraint = toastView.widthAnchor.constraint(lessThanOrEqualToConstant: 600)
-        maxWidthConstraint.priority = .required
-
-        NSLayoutConstraint.activate([
-            widthConstraint, maxWidthConstraint
+            toastView.centerXAnchor.constraint(equalTo: window.centerXAnchor),
+            toastView.topAnchor.constraint(equalTo: window.safeAreaLayoutGuide.topAnchor, constant: 2),
+            toastView.widthAnchor.constraint(equalTo: window.safeAreaLayoutGuide.widthAnchor, constant: -10)
         ])
     }
 
-    fileprivate func removeToastViews(from root: UIViewController) {
-        root.view.subviews.filter({ $0 is ToastView }).forEach({ toast in
+    fileprivate func removeToastViews(from window: UIWindow) {
+        window.subviews.filter({ $0 is ToastView }).forEach({ toast in
             toast.removeFromSuperview()
         })
     }
@@ -36,7 +27,7 @@ public extension UIViewController {
 
 public class ToastView: UIView {
 
-    private var duration = 2.5
+    private var duration = 2.0
 
     convenience init(message: String) {
         self.init(frame: .zero)

data/lib/turbo_native_initializer/templates/ios_stack/TurboNativeProject/{TurboNativeProject.swift.tt → TurboNativeProject.swift}

@@ -1,6 +1,6 @@
 import Foundation
 
-struct <%= name %> {
+struct TurboNativeProject {
     private static let developmentURL = URL(string: "http://localhost:3000")!
     private static let productionURL  = URL(string: "https://turbo-native-demo.glitch.me")!
 

data/lib/turbo_native_initializer/templates/ios_stack/TurboNativeProject.xcodeproj/project.pbxproj.tt

@@ -86,6 +86,15 @@
 			path = Configuration;
 			sourceTree = "<group>";
 		};
+		5DAD248F2AD6533E0082D23D /* Extensions */ = {
+			isa = PBXGroup;
+			children = (
+				5DAF71B62AC3FB53002D04FE /* UIViewController+Toast.swift */,
+				5D281BB02ABC0C3D001CE599 /* WKWebViewConfiguration+App.swift */,
+			);
+			path = Extensions;
+			sourceTree = "<group>";
+		};
 		5DCC50C72A959DF800B529A0 = {
 			isa = PBXGroup;
 			children = (
@@ -105,11 +114,12 @@
 		5DCC50D22A959DF900B529A0 /* <%= name %> */ = {
 			isa = PBXGroup;
 			children = (
+				5DAD248F2AD6533E0082D23D /* Extensions */,
 				5D281BB22ABC0C8F001CE599 /* Strada */,
-				5D2FA5CD2A9DB1AB001AF2F1 /* Configuration */,
 				5DCC50F42A95AC4E00B529A0 /* Controllers */,
 				5DCC50FB2A95B55200B529A0 /* Delegates */,
 				5DCC51072A95CCEE00B529A0 /* Resources */,
+				5D2FA5CD2A9DB1AB001AF2F1 /* Configuration */,
 				5DCC50F22A95A7E600B529A0 /* <%= name %>.swift */,
 			);
 			path = <%= name %>;
@@ -118,10 +128,8 @@
 		5DCC50F42A95AC4E00B529A0 /* Controllers */ = {
 			isa = PBXGroup;
 			children = (
-				5DCC50ED2A95A27600B529A0 /* ErrorPresenter.swift */,
-				5DAF71B62AC3FB53002D04FE /* UIViewController+Toast.swift */,
-				5D281BB02ABC0C3D001CE599 /* WKWebViewConfiguration+App.swift */,
 				5DCC50E72A95A0D900B529A0 /* TurboNavigationController.swift */,
+				5DCC50ED2A95A27600B529A0 /* ErrorPresenter.swift */,
 				5DCC50D72A959DF900B529A0 /* TurboWebViewController.swift */,
 				5DDD58802AA9A8BE00FAC961 /* NumbersViewController.swift */,
 			);
@@ -179,7 +187,7 @@
 			attributes = {
 				BuildIndependentTargetsInParallel = 1;
 				LastSwiftUpdateCheck = 1430;
-				LastUpgradeCheck = 1430;
+				LastUpgradeCheck = 1500;
 				TargetAttributes = {
 					5DCC50CF2A959DF900B529A0 = {
 						CreatedOnToolsVersion = 14.3.1;
@@ -302,6 +310,7 @@
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				ENABLE_TESTABILITY = YES;
+				ENABLE_USER_SCRIPT_SANDBOXING = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu11;
 				GCC_DYNAMIC_NO_PIC = NO;
 				GCC_NO_COMMON_BLOCKS = YES;
@@ -362,6 +371,7 @@
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				ENABLE_NS_ASSERTIONS = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
+				ENABLE_USER_SCRIPT_SANDBOXING = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu11;
 				GCC_NO_COMMON_BLOCKS = YES;
 				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;

data/lib/turbo_native_initializer/templates/ios_tabs/TurboNativeProject/Configuration/path-configuration.json

@@ -1,11 +1,11 @@
 {
   "settings": {},
   "rules": [
-    { "patterns": ["/refresh_historical_location"], "properties": { "presentation": "refresh", "visitable": false } },
-    { "patterns": ["/recede_historical_location"], "properties": { "presentation": "pop", "visitable": false } },
+    { "patterns": ["/recede_historical_location"], "properties": { "presentation": "back", "visitable": false } },
     { "patterns": ["/resume_historical_location"], "properties": { "presentation": "none", "visitable": false } },
+    { "patterns": ["/refresh_historical_location"], "properties": { "presentation": "refresh", "visitable": false } },
+    { "patterns": ["/new$", "/edit$", "/signin$", "/strada-form$"], "properties": { "presentation": "modal", "pull-to-refresh-enabled": false } },
     { "patterns": ["^/$"], "properties": { "presentation": "replace-all" } },
-    { "patterns": ["/new$", "/edit$", "/signin$", "/strada-form$"], "properties": { "presentation": "modal" } },
     { "patterns": ["/numbers$"], "properties": { "view-controller": "numbers" } }
   ]
 }

data/lib/turbo_native_initializer/templates/ios_tabs/TurboNativeProject/Controllers/TurboNavigationController.swift

@@ -22,9 +22,14 @@ class TurboNavigationController : UINavigationController {
         }
 
         // - Create view controller appropriate for url/properties
-        // - Navigate to that with the correct presentation
         let viewController = makeViewController(for: url, properties: properties)
-        navigate(to: viewController, action: options.action, properties: properties)
+
+        // - Navigate to that with the correct presentation
+        if session.topmostVisitable?.visitableURL == url {
+            navigate(to: viewController, action: .replace, properties: properties)
+        } else {
+            navigate(to: viewController, action: options.action, properties: properties)
+        }
 
         // Initiate the visit with Turbo
         if isVisitable(properties) {
@@ -43,8 +48,8 @@ extension TurboNavigationController {
         return properties["presentation"] as? String == "modal"
     }
 
-    private func isPop(_ properties: PathProperties) -> Bool {
-        return properties["presentation"] as? String == "pop"
+    private func isBack(_ properties: PathProperties) -> Bool {
+        return properties["presentation"] as? String == "back"
     }
 
     private func isRefresh(_ properties: PathProperties) -> Bool {
@@ -71,6 +76,14 @@ extension TurboNavigationController {
         return properties["visitable"] as? Bool ?? true
     }
 
+    private func isPullToRefreshEnabled(_ properties: PathProperties) -> Bool {
+        return properties["pull-to-refresh-enabled"] as? Bool ?? true
+    }
+
+    private func title(from properties: PathProperties) -> String? {
+        return properties["title"] as? String
+    }
+
     private func noticeMessage(from url: URL) -> String? {
         URLComponents(url: url, resolvingAgainstBaseURL: false)?.queryItems?.first(where: { $0.name == "notice" })?.value
     }
@@ -90,13 +103,16 @@ extension TurboNavigationController {
             }
         }
 
-        return TurboWebViewController(url: url)
+        let viewController = TurboWebViewController(url: url)
+        viewController.pullToRefreshEnabled = isPullToRefreshEnabled(properties)
+        viewController.title = title(from: properties)
+        return viewController
     }
 
     private func navigate(to viewController: UIViewController, action: VisitAction, properties: PathProperties = [:]) {
         if isModal(properties) {
             present(UINavigationController(rootViewController: viewController), animated: true)
-        } else if isPop(properties) {
+        } else if isBack(properties) {
             popViewController(animated: true)
         } else if isRefresh(properties) {
             session.reload()

data/lib/turbo_native_initializer/templates/ios_tabs/TurboNativeProject/Controllers/TurboWebViewController.swift

@@ -5,6 +5,8 @@ import WebKit
 
 final class TurboWebViewController: VisitableViewController, ErrorPresenter, BridgeDestination {
 
+    var pullToRefreshEnabled = true
+
     private lazy var bridgeDelegate: BridgeDelegate = {
         BridgeDelegate(location: visitableURL.absoluteString, destination: self, componentTypes: BridgeComponent.allTypes)
     }()
@@ -17,14 +19,15 @@ final class TurboWebViewController: VisitableViewController, ErrorPresenter, Bri
 
     override func viewDidLoad() {
         super.viewDidLoad()
+        bridgeDelegate.onViewDidLoad()
 
         navigationItem.backButtonTitle = "Back"
 
+        visitableView.allowsPullToRefresh = pullToRefreshEnabled
+
         if presentingViewController != nil {
             navigationItem.leftBarButtonItem = dismissModalButton
         }
-
-        bridgeDelegate.onViewDidLoad()
     }
 
     override func viewWillAppear(_ animated: Bool) {
@@ -49,6 +52,10 @@ final class TurboWebViewController: VisitableViewController, ErrorPresenter, Bri
 
     // MARK: Visitable
 
+    override func visitableDidRender() {
+        title = title ?? visitableView.webView?.title
+    }
+
     override func visitableDidActivateWebView(_ webView: WKWebView) {
         bridgeDelegate.webViewDidBecomeActive(webView)
     }

data/lib/turbo_native_initializer/templates/ios_tabs/TurboNativeProject/Delegates/{SceneDelegate.swift.tt → SceneDelegate.swift}

@@ -5,13 +5,11 @@ import Turbo
 import Strada
 
 final class SceneDelegate: UIResponder {
-    private static var sharedProcessPool = WKProcessPool()
-
     var window: UIWindow?
 
-    private let baseURL  = <%= name %>.baseURL
-    private let rootURL1 = <%= name %>.homeURL1
-    private let rootURL2 = <%= name %>.homeURL2
+    private let baseURL  = TurboNativeProject.baseURL
+    private let rootURL1 = TurboNativeProject.homeURL1
+    private let rootURL2 = TurboNativeProject.homeURL2
 
     private var tabBarController: UITabBarController!
     private var navigationController1: TurboNavigationController!
@@ -25,12 +23,15 @@ final class SceneDelegate: UIResponder {
 
     private func configureRootViewController() {
         tabBarController = window!.rootViewController as? UITabBarController
+        tabBarController.tabBar.scrollEdgeAppearance = .init()
 
         navigationController1 = tabBarController.viewControllers![0] as? TurboNavigationController
+        navigationController1.navigationBar.scrollEdgeAppearance = .init()
         navigationController1.session = session1
         navigationController1.modalSession = modalSession
 
         navigationController2 = tabBarController.viewControllers![1] as? TurboNavigationController
+        navigationController2.navigationBar.scrollEdgeAppearance = .init()
         navigationController2.session = session2
         navigationController2.modalSession = modalSession
     }
@@ -113,7 +114,7 @@ extension SceneDelegate: WKUIDelegate {
     func webView(_ webView: WKWebView, runJavaScriptConfirmPanelWithMessage message: String, initiatedByFrame frame: WKFrameInfo, completionHandler: @escaping (Bool) -> Void) {
         let confirm = UIAlertController(title: nil, message: message, preferredStyle: .alert)
         confirm.addAction(UIAlertAction(title: "Cancel", style: .cancel) { _ in completionHandler(false) })
-        confirm.addAction(UIAlertAction(title: "OK", style: .default) { _ in completionHandler(true) })        
+        confirm.addAction(UIAlertAction(title: "OK", style: .default) { _ in completionHandler(true) })
         navigationController().present(confirm, animated: true)
     }
 }

data/lib/turbo_native_initializer/templates/ios_tabs/TurboNativeProject/{Controllers → Extensions}/UIViewController+Toast.swift

@@ -2,33 +2,24 @@ import SwiftUI
 
 public extension UIViewController {
     func presentToast(_ message: String) {
-        guard let root = view.window?.rootViewController else { return }
+        guard let window = view.window else { return }
 
-        removeToastViews(from: root)
+        removeToastViews(from: window)
 
         let toastView = ToastView(message: message)
         toastView.translatesAutoresizingMaskIntoConstraints = false
 
-        root.view.addSubview(toastView)
+        window.addSubview(toastView)
 
         NSLayoutConstraint.activate([
-            toastView.topAnchor.constraint(equalTo: root.view.safeAreaLayoutGuide.topAnchor),
-            toastView.centerXAnchor.constraint(equalTo: root.view.centerXAnchor)
-        ])
-
-        let widthConstraint = toastView.widthAnchor.constraint(equalTo: view.widthAnchor, constant: -10)
-        widthConstraint.priority = .defaultHigh
-
-        let maxWidthConstraint = toastView.widthAnchor.constraint(lessThanOrEqualToConstant: 600)
-        maxWidthConstraint.priority = .required
-
-        NSLayoutConstraint.activate([
-            widthConstraint, maxWidthConstraint
+            toastView.centerXAnchor.constraint(equalTo: window.centerXAnchor),
+            toastView.topAnchor.constraint(equalTo: window.safeAreaLayoutGuide.topAnchor, constant: 2),
+            toastView.widthAnchor.constraint(equalTo: window.safeAreaLayoutGuide.widthAnchor, constant: -10)
         ])
     }
 
-    fileprivate func removeToastViews(from root: UIViewController) {
-        root.view.subviews.filter({ $0 is ToastView }).forEach({ toast in
+    fileprivate func removeToastViews(from window: UIWindow) {
+        window.subviews.filter({ $0 is ToastView }).forEach({ toast in
             toast.removeFromSuperview()
         })
     }
@@ -36,7 +27,7 @@ public extension UIViewController {
 
 public class ToastView: UIView {
 
-    private var duration = 2.5
+    private var duration = 2.0
 
     convenience init(message: String) {
         self.init(frame: .zero)

data/lib/turbo_native_initializer/templates/ios_tabs/TurboNativeProject/{TurboNativeProject.swift.tt → TurboNativeProject.swift}

@@ -1,6 +1,6 @@
 import Foundation
 
-struct <%= name %> {
+struct TurboNativeProject {
     private static let developmentURL = URL(string: "http://localhost:3000")!
     private static let productionURL  = URL(string: "https://turbo-native-demo.glitch.me")!
 

data/lib/turbo_native_initializer/templates/ios_tabs/TurboNativeProject.xcodeproj/project.pbxproj.tt

@@ -105,11 +105,12 @@
 		5DCC50D22A959DF900B529A0 /* <%= name %> */ = {
 			isa = PBXGroup;
 			children = (
+				5DD38FFC2AD659BC00EA0059 /* Extensions */,
 				5D8AB2F82ABC117400C6A82F /* Strada */,
-				5D2FA5CD2A9DB1AB001AF2F1 /* Configuration */,
 				5DCC50F42A95AC4E00B529A0 /* Controllers */,
 				5DCC50FB2A95B55200B529A0 /* Delegates */,
 				5DCC51072A95CCEE00B529A0 /* Resources */,
+				5D2FA5CD2A9DB1AB001AF2F1 /* Configuration */,
 				5DCC50F22A95A7E600B529A0 /* <%= name %>.swift */,
 			);
 			path = <%= name %>;
@@ -118,10 +119,8 @@
 		5DCC50F42A95AC4E00B529A0 /* Controllers */ = {
 			isa = PBXGroup;
 			children = (
-				5D8AB2FD2ABC119900C6A82F /* WKWebViewConfiguration+App.swift */,
-				5D0735D32AC514F800AC547A /* UIViewController+Toast.swift */,
-				5DCC50ED2A95A27600B529A0 /* ErrorPresenter.swift */,
 				5DCC50E72A95A0D900B529A0 /* TurboNavigationController.swift */,
+				5DCC50ED2A95A27600B529A0 /* ErrorPresenter.swift */,
 				5DCC50D72A959DF900B529A0 /* TurboWebViewController.swift */,
 				5DDD58802AA9A8BE00FAC961 /* NumbersViewController.swift */,
 			);
@@ -147,6 +146,15 @@
 			path = Resources;
 			sourceTree = "<group>";
 		};
+		5DD38FFC2AD659BC00EA0059 /* Extensions */ = {
+			isa = PBXGroup;
+			children = (
+				5D0735D32AC514F800AC547A /* UIViewController+Toast.swift */,
+				5D8AB2FD2ABC119900C6A82F /* WKWebViewConfiguration+App.swift */,
+			);
+			path = Extensions;
+			sourceTree = "<group>";
+		};
 /* End PBXGroup section */
 
 /* Begin PBXNativeTarget section */

data/lib/turbo_native_initializer/version.rb

@@ -1,3 +1,3 @@
 module TurboNativeInitializer
-  VERSION = "0.0.15"
+  VERSION = "0.0.17"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: turbo-native-initializer
 version: !ruby/object:Gem::Version
-  version: 0.0.15
+  version: 0.0.17
 platform: ruby
 authors:
 - Nixon
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-10-04 00:00:00.000000000 Z
+date: 2023-10-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -166,10 +166,10 @@ files:
 - lib/turbo_native_initializer/templates/ios_stack/TurboNativeProject/Controllers/NumbersViewController.swift
 - lib/turbo_native_initializer/templates/ios_stack/TurboNativeProject/Controllers/TurboNavigationController.swift
 - lib/turbo_native_initializer/templates/ios_stack/TurboNativeProject/Controllers/TurboWebViewController.swift
-- lib/turbo_native_initializer/templates/ios_stack/TurboNativeProject/Controllers/UIViewController+Toast.swift
-- lib/turbo_native_initializer/templates/ios_stack/TurboNativeProject/Controllers/WKWebViewConfiguration+App.swift
 - lib/turbo_native_initializer/templates/ios_stack/TurboNativeProject/Delegates/AppDelegate.swift
-- lib/turbo_native_initializer/templates/ios_stack/TurboNativeProject/Delegates/SceneDelegate.swift.tt
+- lib/turbo_native_initializer/templates/ios_stack/TurboNativeProject/Delegates/SceneDelegate.swift
+- lib/turbo_native_initializer/templates/ios_stack/TurboNativeProject/Extensions/UIViewController+Toast.swift
+- lib/turbo_native_initializer/templates/ios_stack/TurboNativeProject/Extensions/WKWebViewConfiguration+App.swift
 - lib/turbo_native_initializer/templates/ios_stack/TurboNativeProject/Resources/Assets.xcassets/AccentColor.colorset/Contents.json
 - lib/turbo_native_initializer/templates/ios_stack/TurboNativeProject/Resources/Assets.xcassets/AppIcon.appiconset/Contents.json
 - lib/turbo_native_initializer/templates/ios_stack/TurboNativeProject/Resources/Assets.xcassets/AppIcon.appiconset/turbo.png
@@ -183,7 +183,7 @@ files:
 - lib/turbo_native_initializer/templates/ios_stack/TurboNativeProject/Strada/FormComponent.swift
 - lib/turbo_native_initializer/templates/ios_stack/TurboNativeProject/Strada/MenuComponent.swift
 - lib/turbo_native_initializer/templates/ios_stack/TurboNativeProject/Strada/NavButtonComponent.swift
-- lib/turbo_native_initializer/templates/ios_stack/TurboNativeProject/TurboNativeProject.swift.tt
+- lib/turbo_native_initializer/templates/ios_stack/TurboNativeProject/TurboNativeProject.swift
 - lib/turbo_native_initializer/templates/ios_tabs/TurboNativeProject.xcodeproj/project.pbxproj.tt
 - lib/turbo_native_initializer/templates/ios_tabs/TurboNativeProject.xcodeproj/project.xcworkspace/contents.xcworkspacedata
 - lib/turbo_native_initializer/templates/ios_tabs/TurboNativeProject.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
@@ -194,10 +194,10 @@ files:
 - lib/turbo_native_initializer/templates/ios_tabs/TurboNativeProject/Controllers/NumbersViewController.swift
 - lib/turbo_native_initializer/templates/ios_tabs/TurboNativeProject/Controllers/TurboNavigationController.swift
 - lib/turbo_native_initializer/templates/ios_tabs/TurboNativeProject/Controllers/TurboWebViewController.swift
-- lib/turbo_native_initializer/templates/ios_tabs/TurboNativeProject/Controllers/UIViewController+Toast.swift
-- lib/turbo_native_initializer/templates/ios_tabs/TurboNativeProject/Controllers/WKWebViewConfiguration+App.swift
 - lib/turbo_native_initializer/templates/ios_tabs/TurboNativeProject/Delegates/AppDelegate.swift
-- lib/turbo_native_initializer/templates/ios_tabs/TurboNativeProject/Delegates/SceneDelegate.swift.tt
+- lib/turbo_native_initializer/templates/ios_tabs/TurboNativeProject/Delegates/SceneDelegate.swift
+- lib/turbo_native_initializer/templates/ios_tabs/TurboNativeProject/Extensions/UIViewController+Toast.swift
+- lib/turbo_native_initializer/templates/ios_tabs/TurboNativeProject/Extensions/WKWebViewConfiguration+App.swift
 - lib/turbo_native_initializer/templates/ios_tabs/TurboNativeProject/Resources/Assets.xcassets/AccentColor.colorset/Contents.json
 - lib/turbo_native_initializer/templates/ios_tabs/TurboNativeProject/Resources/Assets.xcassets/AppIcon.appiconset/Contents.json
 - lib/turbo_native_initializer/templates/ios_tabs/TurboNativeProject/Resources/Assets.xcassets/AppIcon.appiconset/turbo.png
@@ -211,7 +211,7 @@ files:
 - lib/turbo_native_initializer/templates/ios_tabs/TurboNativeProject/Strada/FormComponent.swift
 - lib/turbo_native_initializer/templates/ios_tabs/TurboNativeProject/Strada/MenuComponent.swift
 - lib/turbo_native_initializer/templates/ios_tabs/TurboNativeProject/Strada/NavButtonComponent.swift
-- lib/turbo_native_initializer/templates/ios_tabs/TurboNativeProject/TurboNativeProject.swift.tt
+- lib/turbo_native_initializer/templates/ios_tabs/TurboNativeProject/TurboNativeProject.swift
 - lib/turbo_native_initializer/version.rb
 homepage: https://github.com/lazaronixon/turbo-native-initializer
 licenses:
@@ -235,7 +235,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.19
+rubygems_version: 3.4.20
 signing_key:
 specification_version: 4
 summary: A turbo native project generator