turbo-native-initializer 0.0.17 → 0.0.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3b5ef5d8b7a0d8f95f129356baa6f612368985f84ddec474db83057174b438ac
-  data.tar.gz: e99f39bff9585a3b391d4ab6bf6f5516355e646eb79490704b172470ed83449a
+  metadata.gz: 6833f8bad7eb840005b6b4112a54ba0fc0356eff5fef5549b20e80f207beabd1
+  data.tar.gz: 120c51e582c425132d8be00d420b3fb73127adff18ec73e428909d6ebc6e42f4
 SHA512:
-  metadata.gz: 12a257749999a07cfdd00f3738b383e6f608ac0433d8026ca2139a929b39ad503cf9998774765c03db9d1b9d1103f7e14933c73a9af8ad1183ad9e9b47047495
-  data.tar.gz: 176211b7e460001de9b829a30fb3eec2d5dd8f960b829dd1b422dd45a23e0d4fe164ef3e42a2d419a5ef9d5fb030d9075a50438c8ce991062f3c5c3d35f2d254
+  metadata.gz: 12c27f3b351fb8785ed41661f4e69a1499d3a34e4d8b0acbc501319e317104f19adb359c15de56c680340698f9a4e83070e41699b3bb2cf308f365a534d8de10
+  data.tar.gz: ad5de54e453e5c61ff58ba4498017592ed18d1665c97aa972d2345db22d539d1233b026d9e4b6b2df79c25a569567f59cb0a159eeeb8515aea0b44fa0bbd338f

data/README.md

@@ -8,7 +8,7 @@ A turbo native project generator for iOS and Android.
 - Added SwiftUI numbers example screen. (iOS)
 - Added Jetpack Compose numbers example screen. (Android)
 - Added UIAlertController to handle `data-turbo-confirm`. (iOS)
-- Added presentations `pop`, `refresh`, `none`, `replace`, `clear-all`, and `replace-all`. (iOS)
+- Added presentations `back`, `refresh`, `none`, `replace`, `clear-all`, and `replace-all`. (iOS)
 - Added `visitable` property in order to avoid visits. (iOS)
 - Added support for tab navigation. (iOS/Android)
 - Added support for flash messages. (iOS/Android)

data/lib/turbo_native_initializer/generator.rb

@@ -19,12 +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

@@ -9,7 +9,7 @@ class TurboNavigationController : UINavigationController {
 
     func push(url: URL) {
         let properties = session.pathConfiguration?.properties(for: url) ?? [:]
-        route(url: url, options: VisitOptions(action: .advance), properties: properties)
+        route(url: url, options: .init(action: .advance), properties: properties)
     }
 
     func route(url: URL, options: VisitOptions, properties: PathProperties) {
@@ -122,8 +122,10 @@ extension TurboNavigationController {
             popToRootViewController(animated: true)
         } else if isReplaceAll(properties) {
             setViewControllers([viewController], animated: false)
-        } else if isReplace(properties) || action == .replace {
-            setViewControllers(Array(viewControllers.dropLast()) + [viewController], animated: false)
+        } else if isReplace(properties) {
+            setViewControllers(viewControllers.dropLast() + [viewController], animated: false)
+        } else if action == .replace {
+            setViewControllers(viewControllers.dropLast() + [viewController], animated: false)
         } else {
             pushViewController(viewController, animated: true)
         }

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

@@ -13,10 +13,12 @@ final class SceneDelegate: UIResponder {
     // MARK: - Setup
 
     private func configureRootViewController() {
-        navigationController = window!.rootViewController as? TurboNavigationController
-        navigationController.navigationBar.scrollEdgeAppearance = .init()
+        UINavigationBar.appearance().scrollEdgeAppearance = .init()
+
+        navigationController = TurboNavigationController()
         navigationController.session = session
         navigationController.modalSession = modalSession
+        window!.rootViewController = navigationController
     }
 
     // MARK: - Authentication
@@ -55,8 +57,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: [:])
     }
@@ -99,8 +100,8 @@ extension SceneDelegate: SessionDelegate {
 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(.init(title: "Cancel", style: .cancel) { _ in completionHandler(false) })
+        confirm.addAction(.init(title: "OK", style: .default) { _ in completionHandler(true) })
         navigationController.present(confirm, animated: true)
     }
 }

data/lib/turbo_native_initializer/templates/ios_stack/TurboNativeProject/{Resources → Views}/Base.lproj/Main.storyboard

@@ -5,10 +5,10 @@
         <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="21679"/>
     </dependencies>
     <scenes>
-        <!--Turbo Navigation Controller-->
+        <!--View Controller-->
         <scene sceneID="s0d-6b-0kx">
             <objects>
-                <viewController id="Y6W-OH-hqX" customClass="TurboNavigationController" customModuleProvider="target" sceneMemberID="viewController"/>
+                <viewController id="Y6W-OH-hqX" customClass="ViewController" customModuleProvider="target" sceneMemberID="viewController"/>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="Ief-a0-LHa" userLabel="First Responder" customClass="UIResponder" sceneMemberID="firstResponder"/>
             </objects>
             <point key="canvasLocation" x="130" y="-2"/>

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

@@ -69,23 +69,14 @@
 			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 */ = {
-			isa = PBXGroup;
-			children = (
-				5DCC50E12A959DFA00B529A0 /* Info.plist */,
-				5DCC50E92A95A19600B529A0 /* path-configuration.json */,
-			);
-			path = Configuration;
-			sourceTree = "<group>";
-		};
 		5DAD248F2AD6533E0082D23D /* Extensions */ = {
 			isa = PBXGroup;
 			children = (
@@ -114,12 +105,12 @@
 		5DCC50D22A959DF900B529A0 /* <%= name %> */ = {
 			isa = PBXGroup;
 			children = (
-				5DAD248F2AD6533E0082D23D /* Extensions */,
-				5D281BB22ABC0C8F001CE599 /* Strada */,
 				5DCC50F42A95AC4E00B529A0 /* Controllers */,
 				5DCC50FB2A95B55200B529A0 /* Delegates */,
+				5DAD248F2AD6533E0082D23D /* Extensions */,
 				5DCC51072A95CCEE00B529A0 /* Resources */,
-				5D2FA5CD2A9DB1AB001AF2F1 /* Configuration */,
+				5D281BB22ABC0C8F001CE599 /* Strada */,
+				5DF25B382ADA0DF40046C704 /* Views */,
 				5DCC50F22A95A7E600B529A0 /* <%= name %>.swift */,
 			);
 			path = <%= name %>;
@@ -128,10 +119,10 @@
 		5DCC50F42A95AC4E00B529A0 /* Controllers */ = {
 			isa = PBXGroup;
 			children = (
-				5DCC50E72A95A0D900B529A0 /* TurboNavigationController.swift */,
 				5DCC50ED2A95A27600B529A0 /* ErrorPresenter.swift */,
-				5DCC50D72A959DF900B529A0 /* TurboWebViewController.swift */,
 				5DDD58802AA9A8BE00FAC961 /* NumbersViewController.swift */,
+				5DCC50E72A95A0D900B529A0 /* TurboNavigationController.swift */,
+				5DCC50D72A959DF900B529A0 /* TurboWebViewController.swift */,
 			);
 			path = Controllers;
 			sourceTree = "<group>";
@@ -149,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 */
@@ -398,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;
@@ -425,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;
@@ -481,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

@@ -9,7 +9,7 @@ class TurboNavigationController : UINavigationController {
 
     func push(url: URL) {
         let properties = session.pathConfiguration?.properties(for: url) ?? [:]
-        route(url: url, options: VisitOptions(action: .advance), properties: properties)
+        route(url: url, options: .init(action: .advance), properties: properties)
     }
 
     func route(url: URL, options: VisitOptions, properties: PathProperties) {
@@ -122,8 +122,10 @@ extension TurboNavigationController {
             popToRootViewController(animated: true)
         } else if isReplaceAll(properties) {
             setViewControllers([viewController], animated: false)
-        } else if isReplace(properties) || action == .replace {
-            setViewControllers(Array(viewControllers.dropLast()) + [viewController], animated: false)
+        } else if isReplace(properties) {
+            setViewControllers(viewControllers.dropLast() + [viewController], animated: false)
+        } else if action == .replace {
+            setViewControllers(viewControllers.dropLast() + [viewController], animated: false)
         } else {
             pushViewController(viewController, animated: true)
         }

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

@@ -22,18 +22,24 @@ final class SceneDelegate: UIResponder {
     // MARK: - Setup
 
     private func configureRootViewController() {
-        tabBarController = window!.rootViewController as? UITabBarController
-        tabBarController.tabBar.scrollEdgeAppearance = .init()
+        UINavigationBar.appearance().scrollEdgeAppearance = .init()
 
-        navigationController1 = tabBarController.viewControllers![0] as? TurboNavigationController
-        navigationController1.navigationBar.scrollEdgeAppearance = .init()
+        navigationController1 = TurboNavigationController()
+        navigationController1.tabBarItem = .init(title: nil, image: .init(systemName: "house"), tag: 0)
         navigationController1.session = session1
         navigationController1.modalSession = modalSession
 
-        navigationController2 = tabBarController.viewControllers![1] as? TurboNavigationController
-        navigationController2.navigationBar.scrollEdgeAppearance = .init()
+        navigationController2 = TurboNavigationController()
+        navigationController2.tabBarItem = .init(title: nil, image: .init(systemName: "house"), tag: 1)
         navigationController2.session = session2
         navigationController2.modalSession = modalSession
+
+        UITabBar.appearance().scrollEdgeAppearance = .init()
+
+        tabBarController = UITabBarController()
+        tabBarController.viewControllers = [navigationController1, navigationController2]
+
+        window!.rootViewController = tabBarController
     }
 
     // MARK: - Sessions
@@ -113,8 +119,8 @@ extension SceneDelegate: SessionDelegate {
 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(.init(title: "Cancel", style: .cancel) { _ in completionHandler(false) })
+        confirm.addAction(.init(title: "OK", style: .default) { _ in completionHandler(true) })
         navigationController().present(confirm, animated: true)
     }
 }

data/lib/turbo_native_initializer/templates/ios_tabs/TurboNativeProject/Views/Base.lproj/Main.storyboard

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="21701" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="Y6W-OH-hqX">
+    <device id="retina6_12" orientation="portrait" appearance="light"/>
+    <dependencies>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="21679"/>
+    </dependencies>
+    <scenes>
+        <!--View Controller-->
+        <scene sceneID="s0d-6b-0kx">
+            <objects>
+                <viewController id="Y6W-OH-hqX" customClass="ViewController" customModuleProvider="target" sceneMemberID="viewController"/>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="Ief-a0-LHa" userLabel="First Responder" customClass="UIResponder" sceneMemberID="firstResponder"/>
+            </objects>
+            <point key="canvasLocation" x="130" y="-2"/>
+        </scene>
+    </scenes>
+</document>

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,12 +105,12 @@
 		5DCC50D22A959DF900B529A0 /* <%= name %> */ = {
 			isa = PBXGroup;
 			children = (
-				5DD38FFC2AD659BC00EA0059 /* Extensions */,
-				5D8AB2F82ABC117400C6A82F /* Strada */,
 				5DCC50F42A95AC4E00B529A0 /* Controllers */,
 				5DCC50FB2A95B55200B529A0 /* Delegates */,
+				5DD38FFC2AD659BC00EA0059 /* Extensions */,
 				5DCC51072A95CCEE00B529A0 /* Resources */,
-				5D2FA5CD2A9DB1AB001AF2F1 /* Configuration */,
+				5D8AB2F82ABC117400C6A82F /* Strada */,
+				5DB1DBA12ADA1BF1008B0141 /* Views */,
 				5DCC50F22A95A7E600B529A0 /* <%= name %>.swift */,
 			);
 			path = <%= name %>;
@@ -119,10 +119,10 @@
 		5DCC50F42A95AC4E00B529A0 /* Controllers */ = {
 			isa = PBXGroup;
 			children = (
-				5DCC50E72A95A0D900B529A0 /* TurboNavigationController.swift */,
 				5DCC50ED2A95A27600B529A0 /* ErrorPresenter.swift */,
-				5DCC50D72A959DF900B529A0 /* TurboWebViewController.swift */,
 				5DDD58802AA9A8BE00FAC961 /* NumbersViewController.swift */,
+				5DCC50E72A95A0D900B529A0 /* TurboNavigationController.swift */,
+				5DCC50D72A959DF900B529A0 /* TurboWebViewController.swift */,
 			);
 			path = Controllers;
 			sourceTree = "<group>";
@@ -140,8 +140,8 @@
 			isa = PBXGroup;
 			children = (
 				5DCC50DC2A959DFA00B529A0 /* Assets.xcassets */,
-				5DCC50DE2A959DFA00B529A0 /* LaunchScreen.storyboard */,
-				5D0D86212A9AA70500A525E9 /* Main.storyboard */,
+				5DCC50E12A959DFA00B529A0 /* Info.plist */,
+				5DCC50E92A95A19600B529A0 /* path-configuration.json */,
 			);
 			path = Resources;
 			sourceTree = "<group>";
@@ -396,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;
@@ -423,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;
@@ -479,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.17"
+  VERSION = "0.0.19"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: turbo-native-initializer
 version: !ruby/object:Gem::Version
-  version: 0.0.17
+  version: 0.0.19
 platform: ruby
 authors:
 - Nixon
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-10-11 00:00:00.000000000 Z
+date: 2023-11-01 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,8 +162,6 @@ 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
@@ -176,20 +176,20 @@ files:
 - 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
+- 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
@@ -204,14 +204,16 @@ files:
 - 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
+- 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:

data/lib/turbo_native_initializer/templates/ios_tabs/TurboNativeProject/Resources/Base.lproj/Main.storyboard

@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="21701" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="33v-ad-2dz">
-    <device id="retina6_12" orientation="portrait" appearance="light"/>
-    <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="21679"/>
-        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
-    </dependencies>
-    <scenes>
-        <!--Turbo Navigation Controller-->
-        <scene sceneID="GwE-Ch-DRP">
-            <objects>
-                <viewController id="cXb-wA-NUs" customClass="TurboNavigationController" customModuleProvider="target" sceneMemberID="viewController">
-                    <tabBarItem key="tabBarItem" title="" image="gear" catalog="system" id="rhZ-zi-yeq"/>
-                </viewController>
-                <placeholder placeholderIdentifier="IBFirstResponder" id="ife-PY-okT" userLabel="First Responder" customClass="UIResponder" sceneMemberID="firstResponder"/>
-            </objects>
-            <point key="canvasLocation" x="1271" y="-647"/>
-        </scene>
-        <!--Turbo Navigation Controller-->
-        <scene sceneID="pAD-IL-Hdw">
-            <objects>
-                <viewController id="0en-nE-vJA" customClass="TurboNavigationController" customModuleProvider="target" sceneMemberID="viewController">
-                    <tabBarItem key="tabBarItem" title="" image="house" catalog="system" id="ZWo-HO-m4a"/>
-                </viewController>
-                <placeholder placeholderIdentifier="IBFirstResponder" id="GRr-XE-fAM" userLabel="First Responder" customClass="UIResponder" sceneMemberID="firstResponder"/>
-            </objects>
-            <point key="canvasLocation" x="1270" y="-1254"/>
-        </scene>
-        <!--Tab Bar Controller-->
-        <scene sceneID="So3-hc-mhH">
-            <objects>
-                <tabBarController id="33v-ad-2dz" sceneMemberID="viewController">
-                    <tabBar key="tabBar" contentMode="scaleToFill" insetsLayoutMarginsFromSafeArea="NO" id="fR1-GM-qEi">
-                        <rect key="frame" x="0.0" y="0.0" width="393" height="49"/>
-                        <autoresizingMask key="autoresizingMask"/>
-                        <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
-                    </tabBar>
-                    <connections>
-                        <segue destination="0en-nE-vJA" kind="relationship" relationship="viewControllers" id="z0u-hS-Voh"/>
-                        <segue destination="cXb-wA-NUs" kind="relationship" relationship="viewControllers" id="eJZ-00-JTF"/>
-                    </connections>
-                </tabBarController>
-                <placeholder placeholderIdentifier="IBFirstResponder" id="KRh-ez-iFz" userLabel="First Responder" customClass="UIResponder" sceneMemberID="firstResponder"/>
-            </objects>
-            <point key="canvasLocation" x="364" y="-951"/>
-        </scene>
-    </scenes>
-    <resources>
-        <image name="gear" catalog="system" width="128" height="122"/>
-        <image name="house" catalog="system" width="128" height="104"/>
-    </resources>
-</document>