turbo-native-initializer 0.0.16 → 0.0.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a6841be700aef23b3f08578ca5600a2b04f749b0759b78524b9eeee25b401761
-  data.tar.gz: 150fcb0fdb292a111db55d614684162201e46fef74df2dd0d5e3bb07d1e631eb
+  metadata.gz: 46eebca0f11beac2c27299db10976cf4b04357f916ebf9c37937b3e507e71bf3
+  data.tar.gz: 44102e1778c14329bb09a79049896af94ef1004f42ec8c4a9b226a65d713f790
 SHA512:
-  metadata.gz: 94495c27a497d66a322a394b5d0892d38ffd4b6db121dff707598864283efe3afd48ed50ab4f31ff08e60f64171ec2e7c2803131939e4aea202a1499e9d3bf31
-  data.tar.gz: dc44d0613e6e02f30de088a3f329297c8fd38e310e56c921a55d913c199862f6d44dfe468ff206bd0381dfedde8daf1def0acb41eef353b1dd93643421850b01
+  metadata.gz: 6f3989992aa8b01214daf9843df3a850af00b534e38e499acd01492ecbb5af7dabdba75e683af38e4cfddcd911696f96677879b887290110d1b57e9acca56cef
+  data.tar.gz: 4c0323cb1d7b990fdcbe3ca6baf9230363f9310b11c0a652fc482b9eef32e2699c1a9f80591cc3db3c512284c551a45d7e70f8f7b592843c883f7d8e00efff62

data/lib/turbo_native_initializer/generator.rb

@@ -19,11 +19,12 @@ module TurboNativeInitializer
     def copy_template_files
       case options.platform
       when "ios"
-        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/Views", "#{name}/#{name}/Views"
         directory "#{project}/TurboNativeProject.xcodeproj", "#{name}/#{name}.xcodeproj"
         template  "#{project}/TurboNativeProject/TurboNativeProject.swift", "#{name}/#{name}/#{name}.swift"
       when "android"

data/lib/turbo_native_initializer/templates/android_stack/app/src/main/java/dev/hotwire/turbo/turbonativeproject/features/web/WebBottomSheetFragment.kt.tt

@@ -0,0 +1,8 @@
+package <%= package_name %>.features.web
+
+import <%= package_name %>.base.NavDestination
+import dev.hotwire.turbo.fragments.TurboWebBottomSheetDialogFragment
+import dev.hotwire.turbo.nav.TurboNavGraphDestination
+
+@TurboNavGraphDestination(uri = "turbo://fragment/web/modal/sheet")
+class WebBottomSheetFragment : TurboWebBottomSheetDialogFragment(), NavDestination

data/lib/turbo_native_initializer/templates/android_stack/app/src/main/java/dev/hotwire/turbo/turbonativeproject/main/MainSessionNavHostFragment.kt.tt

@@ -5,6 +5,7 @@ import androidx.fragment.app.Fragment
 import dev.hotwire.strada.Bridge
 import dev.hotwire.turbo.config.TurboPathConfiguration
 import <%= package_name %>.features.native.NumbersFragment
+import <%= package_name %>.features.web.WebBottomSheetFragment
 import <%= package_name %>.features.web.WebFragment
 import <%= package_name %>.features.web.WebHomeFragment
 import <%= package_name %>.features.web.WebModalFragment
@@ -23,7 +24,13 @@ class MainSessionNavHostFragment : TurboSessionNavHostFragment() {
         get() = listOf()
 
     override val registeredFragments: List<KClass<out Fragment>>
-        get() = listOf(WebFragment::class, WebHomeFragment::class, WebModalFragment::class, NumbersFragment::class)
+        get() = listOf(
+            WebFragment::class,
+            WebHomeFragment::class,
+            WebModalFragment::class,
+            WebBottomSheetFragment::class,
+            NumbersFragment::class
+        )
 
     override val pathConfigurationLocation: TurboPathConfiguration.Location
         get() = TurboPathConfiguration.Location(assetFilePath = "json/configuration.json")

data/lib/turbo_native_initializer/templates/android_tabs/app/src/main/java/dev/hotwire/turbo/turbonativeproject/features/web/WebBottomSheetFragment.kt.tt

@@ -0,0 +1,8 @@
+package <%= package_name %>.features.web
+
+import <%= package_name %>.base.NavDestination
+import dev.hotwire.turbo.fragments.TurboWebBottomSheetDialogFragment
+import dev.hotwire.turbo.nav.TurboNavGraphDestination
+
+@TurboNavGraphDestination(uri = "turbo://fragment/web/modal/sheet")
+class WebBottomSheetFragment : TurboWebBottomSheetDialogFragment(), NavDestination

data/lib/turbo_native_initializer/templates/android_tabs/app/src/main/java/dev/hotwire/turbo/turbonativeproject/main/BaseSessionNavHostFragment.kt.tt

@@ -5,6 +5,7 @@ import androidx.fragment.app.Fragment
 import dev.hotwire.strada.Bridge
 import dev.hotwire.turbo.config.TurboPathConfiguration
 import <%= package_name %>.features.native.NumbersFragment
+import <%= package_name %>.features.web.WebBottomSheetFragment
 import <%= package_name %>.features.web.WebFragment
 import <%= package_name %>.features.web.WebHomeFragment
 import <%= package_name %>.features.web.WebModalFragment
@@ -17,7 +18,13 @@ abstract class BaseSessionNavHostFragment : TurboSessionNavHostFragment() {
         get() = listOf()
 
     override val registeredFragments: List<KClass<out Fragment>>
-        get() = listOf(WebFragment::class, WebHomeFragment::class, WebModalFragment::class, NumbersFragment::class)
+        get() = listOf(
+            WebFragment::class,
+            WebHomeFragment::class,
+            WebModalFragment::class,
+            WebBottomSheetFragment::class,
+            NumbersFragment::class
+        )
 
     override val pathConfigurationLocation: TurboPathConfiguration.Location
         get() = TurboPathConfiguration.Location(assetFilePath = "json/configuration.json")

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

@@ -122,7 +122,9 @@ extension TurboNavigationController {
             popToRootViewController(animated: true)
         } else if isReplaceAll(properties) {
             setViewControllers([viewController], animated: false)
-        } else if isReplace(properties) || action == .replace {
+        } else if isReplace(properties) {
+            setViewControllers(Array(viewControllers.dropLast()) + [viewController], animated: false)
+        } else if action == .replace {
             setViewControllers(Array(viewControllers.dropLast()) + [viewController], animated: false)
         } else {
             pushViewController(viewController, animated: true)

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

@@ -19,6 +19,7 @@ final class TurboWebViewController: VisitableViewController, ErrorPresenter, Bri
 
     override func viewDidLoad() {
         super.viewDidLoad()
+        bridgeDelegate.onViewDidLoad()
 
         navigationItem.backButtonTitle = "Back"
 
@@ -27,8 +28,6 @@ final class TurboWebViewController: VisitableViewController, ErrorPresenter, Bri
         if presentingViewController != nil {
             navigationItem.leftBarButtonItem = dismissModalButton
         }
-
-        bridgeDelegate.onViewDidLoad()
     }
 
     override func viewWillAppear(_ animated: Bool) {

data/lib/turbo_native_initializer/templates/ios_stack/TurboNativeProject/Delegates/AppDelegate.swift

@@ -1,4 +1,23 @@
 import UIKit
 
 @main
-class AppDelegate: UIResponder, UIApplicationDelegate {}
+class AppDelegate: UIResponder, UIApplicationDelegate {
+    func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {
+        // Override point for customization after application launch.
+        return true
+    }
+
+    // MARK: UISceneSession Lifecycle
+
+    func application(_ application: UIApplication, configurationForConnecting connectingSceneSession: UISceneSession, options: UIScene.ConnectionOptions) -> UISceneConfiguration {
+        // Called when a new scene session is being created.
+        // Use this method to select a configuration to create the new scene with.
+        return UISceneConfiguration(name: "Default Configuration", sessionRole: connectingSceneSession.role)
+    }
+
+    func application(_ application: UIApplication, didDiscardSceneSessions sceneSessions: Set<UISceneSession>) {
+        // Called when the user discards a scene session.
+        // If any sessions were discarded while the application was not running, this will be called shortly after application:didFinishLaunchingWithOptions.
+        // Use this method to release any resources that were specific to the discarded scenes, as they will not return.
+    }
+}

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
     }
 
@@ -54,8 +55,7 @@ final class SceneDelegate: UIResponder {
 
 extension SceneDelegate: UIWindowSceneDelegate {
     func scene(_ scene: UIScene, willConnectTo session: UISceneSession, options connectionOptions: UIScene.ConnectionOptions) {
-        guard let _ = scene as? UIWindowScene else { return }
-
+        guard let _ = (scene as? UIWindowScene) else { return }
         configureRootViewController()
         navigationController.route(url: rootURL, options: VisitOptions(action: .replace), properties: [:])
     }

data/lib/turbo_native_initializer/templates/{ios_tabs/TurboNativeProject/Controllers → ios_stack/TurboNativeProject/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

@@ -69,21 +69,21 @@
 			isa = PBXGroup;
 			children = (
 				5D281BB32ABC0CB0001CE599 /* BridgeComponent+App.swift */,
-				5D281BB52ABC0CB9001CE599 /* FormComponent.swift */,
-				5D1F2EC02ABEB12300B2819A /* NavButtonComponent.swift */,
 				5D91C53F2AC538960046D872 /* FlashMessageComponent.swift */,
+				5D281BB52ABC0CB9001CE599 /* FormComponent.swift */,
 				5DA9C92E2AC7E38100FEA7E6 /* MenuComponent.swift */,
+				5D1F2EC02ABEB12300B2819A /* NavButtonComponent.swift */,
 			);
 			path = Strada;
 			sourceTree = "<group>";
 		};
-		5D2FA5CD2A9DB1AB001AF2F1 /* Configuration */ = {
+		5DAD248F2AD6533E0082D23D /* Extensions */ = {
 			isa = PBXGroup;
 			children = (
-				5DCC50E12A959DFA00B529A0 /* Info.plist */,
-				5DCC50E92A95A19600B529A0 /* path-configuration.json */,
+				5DAF71B62AC3FB53002D04FE /* UIViewController+Toast.swift */,
+				5D281BB02ABC0C3D001CE599 /* WKWebViewConfiguration+App.swift */,
 			);
-			path = Configuration;
+			path = Extensions;
 			sourceTree = "<group>";
 		};
 		5DCC50C72A959DF800B529A0 = {
@@ -105,11 +105,12 @@
 		5DCC50D22A959DF900B529A0 /* <%= name %> */ = {
 			isa = PBXGroup;
 			children = (
-				5D281BB22ABC0C8F001CE599 /* Strada */,
-				5D2FA5CD2A9DB1AB001AF2F1 /* Configuration */,
 				5DCC50F42A95AC4E00B529A0 /* Controllers */,
 				5DCC50FB2A95B55200B529A0 /* Delegates */,
+				5DAD248F2AD6533E0082D23D /* Extensions */,
 				5DCC51072A95CCEE00B529A0 /* Resources */,
+				5D281BB22ABC0C8F001CE599 /* Strada */,
+				5DF25B382ADA0DF40046C704 /* Views */,
 				5DCC50F22A95A7E600B529A0 /* <%= name %>.swift */,
 			);
 			path = <%= name %>;
@@ -119,11 +120,9 @@
 			isa = PBXGroup;
 			children = (
 				5DCC50ED2A95A27600B529A0 /* ErrorPresenter.swift */,
-				5DAF71B62AC3FB53002D04FE /* UIViewController+Toast.swift */,
-				5D281BB02ABC0C3D001CE599 /* WKWebViewConfiguration+App.swift */,
+				5DDD58802AA9A8BE00FAC961 /* NumbersViewController.swift */,
 				5DCC50E72A95A0D900B529A0 /* TurboNavigationController.swift */,
 				5DCC50D72A959DF900B529A0 /* TurboWebViewController.swift */,
-				5DDD58802AA9A8BE00FAC961 /* NumbersViewController.swift */,
 			);
 			path = Controllers;
 			sourceTree = "<group>";
@@ -141,10 +140,19 @@
 			isa = PBXGroup;
 			children = (
 				5DCC50DC2A959DFA00B529A0 /* Assets.xcassets */,
+				5DCC50E12A959DFA00B529A0 /* Info.plist */,
+				5DCC50E92A95A19600B529A0 /* path-configuration.json */,
+			);
+			path = Resources;
+			sourceTree = "<group>";
+		};
+		5DF25B382ADA0DF40046C704 /* Views */ = {
+			isa = PBXGroup;
+			children = (
 				5DCC50DE2A959DFA00B529A0 /* LaunchScreen.storyboard */,
 				5D0D86212A9AA70500A525E9 /* Main.storyboard */,
 			);
-			path = Resources;
+			path = Views;
 			sourceTree = "<group>";
 		};
 /* End PBXGroup section */
@@ -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;
@@ -388,7 +398,7 @@
 				CODE_SIGN_STYLE = Automatic;
 				CURRENT_PROJECT_VERSION = 1;
 				GENERATE_INFOPLIST_FILE = YES;
-				INFOPLIST_FILE = <%= name %>/Configuration/Info.plist;
+				INFOPLIST_FILE = <%= name %>/Resources/Info.plist;
 				INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES;
 				INFOPLIST_KEY_UILaunchStoryboardName = LaunchScreen;
 				INFOPLIST_KEY_UIMainStoryboardFile = Main;
@@ -415,7 +425,7 @@
 				CODE_SIGN_STYLE = Automatic;
 				CURRENT_PROJECT_VERSION = 1;
 				GENERATE_INFOPLIST_FILE = YES;
-				INFOPLIST_FILE = <%= name %>/Configuration/Info.plist;
+				INFOPLIST_FILE = <%= name %>/Resources/Info.plist;
 				INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES;
 				INFOPLIST_KEY_UILaunchStoryboardName = LaunchScreen;
 				INFOPLIST_KEY_UIMainStoryboardFile = Main;
@@ -471,7 +481,7 @@
 			repositoryURL = "https://github.com/hotwired/turbo-ios";
 			requirement = {
 				kind = exactVersion;
-				version = 7.0.0;
+				version = 7.0.1;
 			};
 		};
 /* End XCRemoteSwiftPackageReference section */

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

@@ -122,7 +122,9 @@ extension TurboNavigationController {
             popToRootViewController(animated: true)
         } else if isReplaceAll(properties) {
             setViewControllers([viewController], animated: false)
-        } else if isReplace(properties) || action == .replace {
+        } else if isReplace(properties) {
+            setViewControllers(Array(viewControllers.dropLast()) + [viewController], animated: false)
+        } else if action == .replace {
             setViewControllers(Array(viewControllers.dropLast()) + [viewController], animated: false)
         } else {
             pushViewController(viewController, animated: true)

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

@@ -19,6 +19,7 @@ final class TurboWebViewController: VisitableViewController, ErrorPresenter, Bri
 
     override func viewDidLoad() {
         super.viewDidLoad()
+        bridgeDelegate.onViewDidLoad()
 
         navigationItem.backButtonTitle = "Back"
 
@@ -27,8 +28,6 @@ final class TurboWebViewController: VisitableViewController, ErrorPresenter, Bri
         if presentingViewController != nil {
             navigationItem.leftBarButtonItem = dismissModalButton
         }
-
-        bridgeDelegate.onViewDidLoad()
     }
 
     override func viewWillAppear(_ animated: Bool) {

data/lib/turbo_native_initializer/templates/ios_tabs/TurboNativeProject/Delegates/AppDelegate.swift

@@ -1,4 +1,23 @@
 import UIKit
 
 @main
-class AppDelegate: UIResponder, UIApplicationDelegate {}
+class AppDelegate: UIResponder, UIApplicationDelegate {
+    func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {
+        // Override point for customization after application launch.
+        return true
+    }
+
+    // MARK: UISceneSession Lifecycle
+
+    func application(_ application: UIApplication, configurationForConnecting connectingSceneSession: UISceneSession, options: UIScene.ConnectionOptions) -> UISceneConfiguration {
+        // Called when a new scene session is being created.
+        // Use this method to select a configuration to create the new scene with.
+        return UISceneConfiguration(name: "Default Configuration", sessionRole: connectingSceneSession.role)
+    }
+
+    func application(_ application: UIApplication, didDiscardSceneSessions sceneSessions: Set<UISceneSession>) {
+        // Called when the user discards a scene session.
+        // If any sessions were discarded while the application was not running, this will be called shortly after application:didFinishLaunchingWithOptions.
+        // Use this method to release any resources that were specific to the discarded scenes, as they will not return.
+    }
+}

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_stack/TurboNativeProject/Controllers → ios_tabs/TurboNativeProject/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

@@ -65,27 +65,27 @@
 /* End PBXFrameworksBuildPhase section */
 
 /* Begin PBXGroup section */
-		5D2FA5CD2A9DB1AB001AF2F1 /* Configuration */ = {
-			isa = PBXGroup;
-			children = (
-				5DCC50E12A959DFA00B529A0 /* Info.plist */,
-				5DCC50E92A95A19600B529A0 /* path-configuration.json */,
-			);
-			path = Configuration;
-			sourceTree = "<group>";
-		};
 		5D8AB2F82ABC117400C6A82F /* Strada */ = {
 			isa = PBXGroup;
 			children = (
 				5D8AB2FA2ABC117F00C6A82F /* BridgeComponent+App.swift */,
-				5D8AB2F92ABC117F00C6A82F /* FormComponent.swift */,
-				5D1F2EC02ABEB12300B2819A /* NavButtonComponent.swift */,
 				5D2381402AC53D8900FABA1F /* FlashMessageComponent.swift */,
+				5D8AB2F92ABC117F00C6A82F /* FormComponent.swift */,
 				5DA9C9342AC874D200FEA7E6 /* MenuComponent.swift */,
+				5D1F2EC02ABEB12300B2819A /* NavButtonComponent.swift */,
 			);
 			path = Strada;
 			sourceTree = "<group>";
 		};
+		5DB1DBA12ADA1BF1008B0141 /* Views */ = {
+			isa = PBXGroup;
+			children = (
+				5DCC50DE2A959DFA00B529A0 /* LaunchScreen.storyboard */,
+				5D0D86212A9AA70500A525E9 /* Main.storyboard */,
+			);
+			path = Views;
+			sourceTree = "<group>";
+		};
 		5DCC50C72A959DF800B529A0 = {
 			isa = PBXGroup;
 			children = (
@@ -105,11 +105,12 @@
 		5DCC50D22A959DF900B529A0 /* <%= name %> */ = {
 			isa = PBXGroup;
 			children = (
-				5D8AB2F82ABC117400C6A82F /* Strada */,
-				5D2FA5CD2A9DB1AB001AF2F1 /* Configuration */,
 				5DCC50F42A95AC4E00B529A0 /* Controllers */,
 				5DCC50FB2A95B55200B529A0 /* Delegates */,
+				5DD38FFC2AD659BC00EA0059 /* Extensions */,
 				5DCC51072A95CCEE00B529A0 /* Resources */,
+				5D8AB2F82ABC117400C6A82F /* Strada */,
+				5DB1DBA12ADA1BF1008B0141 /* Views */,
 				5DCC50F22A95A7E600B529A0 /* <%= name %>.swift */,
 			);
 			path = <%= name %>;
@@ -118,12 +119,10 @@
 		5DCC50F42A95AC4E00B529A0 /* Controllers */ = {
 			isa = PBXGroup;
 			children = (
-				5D8AB2FD2ABC119900C6A82F /* WKWebViewConfiguration+App.swift */,
-				5D0735D32AC514F800AC547A /* UIViewController+Toast.swift */,
 				5DCC50ED2A95A27600B529A0 /* ErrorPresenter.swift */,
+				5DDD58802AA9A8BE00FAC961 /* NumbersViewController.swift */,
 				5DCC50E72A95A0D900B529A0 /* TurboNavigationController.swift */,
 				5DCC50D72A959DF900B529A0 /* TurboWebViewController.swift */,
-				5DDD58802AA9A8BE00FAC961 /* NumbersViewController.swift */,
 			);
 			path = Controllers;
 			sourceTree = "<group>";
@@ -141,12 +140,21 @@
 			isa = PBXGroup;
 			children = (
 				5DCC50DC2A959DFA00B529A0 /* Assets.xcassets */,
-				5DCC50DE2A959DFA00B529A0 /* LaunchScreen.storyboard */,
-				5D0D86212A9AA70500A525E9 /* Main.storyboard */,
+				5DCC50E12A959DFA00B529A0 /* Info.plist */,
+				5DCC50E92A95A19600B529A0 /* path-configuration.json */,
 			);
 			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 */
@@ -388,7 +396,7 @@
 				CODE_SIGN_STYLE = Automatic;
 				CURRENT_PROJECT_VERSION = 1;
 				GENERATE_INFOPLIST_FILE = YES;
-				INFOPLIST_FILE = <%= name %>/Configuration/Info.plist;
+				INFOPLIST_FILE = <%= name %>/Resources/Info.plist;
 				INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES;
 				INFOPLIST_KEY_UILaunchStoryboardName = LaunchScreen;
 				INFOPLIST_KEY_UIMainStoryboardFile = Main;
@@ -415,7 +423,7 @@
 				CODE_SIGN_STYLE = Automatic;
 				CURRENT_PROJECT_VERSION = 1;
 				GENERATE_INFOPLIST_FILE = YES;
-				INFOPLIST_FILE = <%= name %>/Configuration/Info.plist;
+				INFOPLIST_FILE = <%= name %>/Resources/Info.plist;
 				INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES;
 				INFOPLIST_KEY_UILaunchStoryboardName = LaunchScreen;
 				INFOPLIST_KEY_UIMainStoryboardFile = Main;
@@ -471,7 +479,7 @@
 			repositoryURL = "https://github.com/hotwired/turbo-ios";
 			requirement = {
 				kind = exactVersion;
-				version = 7.0.0;
+				version = 7.0.1;
 			};
 		};
 /* End XCRemoteSwiftPackageReference section */

data/lib/turbo_native_initializer/version.rb

@@ -1,3 +1,3 @@
 module TurboNativeInitializer
-  VERSION = "0.0.16"
+  VERSION = "0.0.18"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: turbo-native-initializer
 version: !ruby/object:Gem::Version
-  version: 0.0.16
+  version: 0.0.18
 platform: ruby
 authors:
 - Nixon
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-10-08 00:00:00.000000000 Z
+date: 2023-10-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -44,6 +44,7 @@ files:
 - lib/turbo_native_initializer/templates/android_stack/app/src/main/java/dev/hotwire/turbo/turbonativeproject/base/NavDestination.kt.tt
 - lib/turbo_native_initializer/templates/android_stack/app/src/main/java/dev/hotwire/turbo/turbonativeproject/features/native/NativeFragment.kt.tt
 - lib/turbo_native_initializer/templates/android_stack/app/src/main/java/dev/hotwire/turbo/turbonativeproject/features/native/NumbersFragment.kt.tt
+- lib/turbo_native_initializer/templates/android_stack/app/src/main/java/dev/hotwire/turbo/turbonativeproject/features/web/WebBottomSheetFragment.kt.tt
 - lib/turbo_native_initializer/templates/android_stack/app/src/main/java/dev/hotwire/turbo/turbonativeproject/features/web/WebFragment.kt.tt
 - lib/turbo_native_initializer/templates/android_stack/app/src/main/java/dev/hotwire/turbo/turbonativeproject/features/web/WebHomeFragment.kt.tt
 - lib/turbo_native_initializer/templates/android_stack/app/src/main/java/dev/hotwire/turbo/turbonativeproject/features/web/WebModalFragment.kt.tt
@@ -99,6 +100,7 @@ files:
 - lib/turbo_native_initializer/templates/android_tabs/app/src/main/java/dev/hotwire/turbo/turbonativeproject/base/NavDestination.kt.tt
 - lib/turbo_native_initializer/templates/android_tabs/app/src/main/java/dev/hotwire/turbo/turbonativeproject/features/native/NativeFragment.kt.tt
 - lib/turbo_native_initializer/templates/android_tabs/app/src/main/java/dev/hotwire/turbo/turbonativeproject/features/native/NumbersFragment.kt.tt
+- lib/turbo_native_initializer/templates/android_tabs/app/src/main/java/dev/hotwire/turbo/turbonativeproject/features/web/WebBottomSheetFragment.kt.tt
 - lib/turbo_native_initializer/templates/android_tabs/app/src/main/java/dev/hotwire/turbo/turbonativeproject/features/web/WebFragment.kt.tt
 - lib/turbo_native_initializer/templates/android_tabs/app/src/main/java/dev/hotwire/turbo/turbonativeproject/features/web/WebHomeFragment.kt.tt
 - lib/turbo_native_initializer/templates/android_tabs/app/src/main/java/dev/hotwire/turbo/turbonativeproject/features/web/WebModalFragment.kt.tt
@@ -160,58 +162,58 @@ files:
 - lib/turbo_native_initializer/templates/ios_stack/TurboNativeProject.xcodeproj/project.xcworkspace/contents.xcworkspacedata
 - lib/turbo_native_initializer/templates/ios_stack/TurboNativeProject.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
 - lib/turbo_native_initializer/templates/ios_stack/TurboNativeProject.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
-- lib/turbo_native_initializer/templates/ios_stack/TurboNativeProject/Configuration/Info.plist
-- lib/turbo_native_initializer/templates/ios_stack/TurboNativeProject/Configuration/path-configuration.json
 - lib/turbo_native_initializer/templates/ios_stack/TurboNativeProject/Controllers/ErrorPresenter.swift
 - 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
 - lib/turbo_native_initializer/templates/ios_stack/TurboNativeProject/Resources/Assets.xcassets/Contents.json
 - lib/turbo_native_initializer/templates/ios_stack/TurboNativeProject/Resources/Assets.xcassets/SplashIcon.imageset/Contents.json
 - lib/turbo_native_initializer/templates/ios_stack/TurboNativeProject/Resources/Assets.xcassets/SplashIcon.imageset/turbo.png
-- lib/turbo_native_initializer/templates/ios_stack/TurboNativeProject/Resources/Base.lproj/LaunchScreen.storyboard
-- lib/turbo_native_initializer/templates/ios_stack/TurboNativeProject/Resources/Base.lproj/Main.storyboard
+- lib/turbo_native_initializer/templates/ios_stack/TurboNativeProject/Resources/Info.plist
+- lib/turbo_native_initializer/templates/ios_stack/TurboNativeProject/Resources/path-configuration.json
 - lib/turbo_native_initializer/templates/ios_stack/TurboNativeProject/Strada/BridgeComponent+App.swift
 - lib/turbo_native_initializer/templates/ios_stack/TurboNativeProject/Strada/FlashMessageComponent.swift
 - 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_stack/TurboNativeProject/Views/Base.lproj/LaunchScreen.storyboard
+- lib/turbo_native_initializer/templates/ios_stack/TurboNativeProject/Views/Base.lproj/Main.storyboard
 - 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
 - lib/turbo_native_initializer/templates/ios_tabs/TurboNativeProject.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
-- lib/turbo_native_initializer/templates/ios_tabs/TurboNativeProject/Configuration/Info.plist
-- lib/turbo_native_initializer/templates/ios_tabs/TurboNativeProject/Configuration/path-configuration.json
 - lib/turbo_native_initializer/templates/ios_tabs/TurboNativeProject/Controllers/ErrorPresenter.swift
 - 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
 - lib/turbo_native_initializer/templates/ios_tabs/TurboNativeProject/Resources/Assets.xcassets/Contents.json
 - lib/turbo_native_initializer/templates/ios_tabs/TurboNativeProject/Resources/Assets.xcassets/SplashIcon.imageset/Contents.json
 - lib/turbo_native_initializer/templates/ios_tabs/TurboNativeProject/Resources/Assets.xcassets/SplashIcon.imageset/turbo.png
-- lib/turbo_native_initializer/templates/ios_tabs/TurboNativeProject/Resources/Base.lproj/LaunchScreen.storyboard
-- lib/turbo_native_initializer/templates/ios_tabs/TurboNativeProject/Resources/Base.lproj/Main.storyboard
+- lib/turbo_native_initializer/templates/ios_tabs/TurboNativeProject/Resources/Info.plist
+- lib/turbo_native_initializer/templates/ios_tabs/TurboNativeProject/Resources/path-configuration.json
 - lib/turbo_native_initializer/templates/ios_tabs/TurboNativeProject/Strada/BridgeComponent+App.swift
 - lib/turbo_native_initializer/templates/ios_tabs/TurboNativeProject/Strada/FlashMessageComponent.swift
 - 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/templates/ios_tabs/TurboNativeProject/Views/Base.lproj/LaunchScreen.storyboard
+- lib/turbo_native_initializer/templates/ios_tabs/TurboNativeProject/Views/Base.lproj/Main.storyboard
 - lib/turbo_native_initializer/version.rb
 homepage: https://github.com/lazaronixon/turbo-native-initializer
 licenses:
@@ -235,7 +237,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