turbo-native-initializer 0.0.5 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b53ab2cde5fe6c5047f4cc6cfa2c8a21e217c2b226a245ba117cc110019b80ec
-  data.tar.gz: 7b510f82816f0ed55f4e41fc272715f14f2cc25eb44577cf9db36d0c77056504
+  metadata.gz: e673a3e9e9ff4dcab50c3e68a188dc5b71e4660065f87b6dd45006c3e99a43b1
+  data.tar.gz: c8a1d14e548b6a3fcea40b78329dc5a6721081b56fd45337c669b2a5611ec6e7
 SHA512:
-  metadata.gz: e1360efb27d8f42574fab4dcb862367a8d236f4f4c9ab9ffb452024d8a9abc8d97f99a6a5b8813e5124056828bdfed21ce9140868ac1ecb41465e78c7346a949
-  data.tar.gz: 62c9cfa365fcdff7053d0c7b09c148fd2d6b098113f7655801d01ee8ef39d3df4a94613fc4150ad9f875905b250a32d9770e4c205678b7b5229e19d8633e4e7c
+  metadata.gz: d06d7f520ae5c86136456042c46ef38b4c73961a47dee135b16c9d2232022545c8bb6b3a9fd197d98191a8d9745dcfda46d30a1eb076dc1c512f26d997fda0de
+  data.tar.gz: 3c63e69becdc8853f775cbd947714f0cb3822cbcbe35a7205afe7dfb00063665fb77791ad778215287aea5005b8e7308dee98f8ee83ff7ee1297cd45d2b0da4e

data/CHANGELOG.md

@@ -1,6 +1,14 @@
 ## [Unreleased]
 
-## [0.0.5] - 2023-09-10
+## [0.0.7] - 2023-09-09
+
+- Small refactor in the NumbersViewController (iOS)
+
+## [0.0.6] - 2023-09-09
+
+- Fix android template imports
+
+## [0.0.5] - 2023-09-09
 
 - Added android custom error screen
 

data/README.md

@@ -8,8 +8,8 @@ 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 `clear-all`, `replace-all`, `replace`, `pop`, `refresh`, and `none`. (iOS)
-- Added visitable property in order to avoid visits. (iOS)
+- Added presentations `pop`, `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)
 
 ## Installation

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

@@ -1,9 +1,11 @@
 package <%= package_name %>.features.web
 
+import android.view.View
 import <%= package_name %>.base.NavDestination
 import <%= package_name %>.util.SIGN_IN_URL
 import dev.hotwire.turbo.fragments.TurboWebFragment
 import dev.hotwire.turbo.nav.TurboNavGraphDestination
+import <%= package_name %>.R
 import dev.hotwire.turbo.visit.TurboVisitAction.REPLACE
 import dev.hotwire.turbo.visit.TurboVisitOptions
 
@@ -18,5 +20,5 @@ open class WebFragment : TurboWebFragment(), NavDestination {
 
     override fun createErrorView(statusCode: Int): View {
         return layoutInflater.inflate(R.layout.error_web, null)
-    }    
+    }
 }

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

@@ -5,8 +5,8 @@
     { "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": ["/new$", "/edit$", "/signin$"], "properties": { "context": "modal", "uri": "turbo://fragment/web/modal" } },
+    { "patterns": ["^/$", "/signin$"], "properties": { "uri": "turbo://fragment/web/home", "presentation": "replace_all" } },
+    { "patterns": ["/new$", "/edit$"], "properties": { "context": "modal", "uri": "turbo://fragment/web/modal" } },
     { "patterns": ["/numbers$"], "properties": { "uri": "turbo://fragment/numbers", "title": "Numbers" } }
   ]
 }

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

@@ -1,8 +1,10 @@
 package <%= package_name %>.features.web
 
+import android.view.View
 import <%= package_name %>.base.NavDestination
 import dev.hotwire.turbo.fragments.TurboWebFragment
 import dev.hotwire.turbo.nav.TurboNavGraphDestination
+import <%= package_name %>.R
 
 @TurboNavGraphDestination(uri = "turbo://fragment/web")
 open class WebFragment : TurboWebFragment(), NavDestination {

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

@@ -4,8 +4,8 @@
     { "patterns": ["/refresh_historical_location"], "properties": { "presentation": "refresh", "visitable": false } },
     { "patterns": ["/recede_historical_location"], "properties": { "presentation": "pop", "visitable": false } },
     { "patterns": ["/resume_historical_location"], "properties": { "presentation": "none", "visitable": false } },
-    { "patterns": ["^/$"], "properties": { "presentation": "replace-all" } },
-    { "patterns": ["/new$", "/edit$", "/signin$"], "properties": { "presentation": "modal" } },
+    { "patterns": ["^/$", "/signin$"], "properties": { "presentation": "replace-all" } },
+    { "patterns": ["/new$", "/edit$"], "properties": { "presentation": "modal" } },
     { "patterns": ["/numbers$"], "properties": { "view-controller": "numbers" } }
   ]
 }

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

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

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

@@ -38,10 +38,6 @@ extension TurboNavigationController {
         return properties["presentation"] as? String == "modal"
     }
 
-    private func isClearAll(_ properties: PathProperties) -> Bool {
-        return properties["presentation"] as? String == "clear-all"
-    }
-
     private func isPop(_ properties: PathProperties) -> Bool {
         return properties["presentation"] as? String == "pop"
     }
@@ -54,6 +50,10 @@ extension TurboNavigationController {
         return properties["presentation"] as? String == "none"
     }
 
+    private func isClearAll(_ properties: PathProperties) -> Bool {
+        return properties["presentation"] as? String == "clear-all"
+    }
+
     private func isReplaceAll(_ properties: PathProperties) -> Bool {
         return properties["presentation"] as? String == "replace-all"
     }
@@ -75,13 +75,13 @@ extension TurboNavigationController {
         if let viewController = properties["view-controller"] as? String {
             switch viewController {
             case "numbers":
-                return NumbersViewController()
+                return NumbersViewController(title: "Numbers")
             default:
-                return ViewController(url: url)
+                assertionFailure("Invalid view controller, defaulting to WebView")
             }
-        } else {
-            return ViewController(url: url)
         }
+
+        return ViewController(url: url)
     }
 
     private func navigate(to viewController: UIViewController, action: VisitAction, properties: PathProperties = [:]) {

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

@@ -5,16 +5,18 @@ final class ViewController: VisitableViewController, ErrorPresenter {
     override func viewDidLoad() {
         super.viewDidLoad()
 
-        view.backgroundColor = .systemBackground
-
-        navigationItem.backButtonDisplayMode = .minimal
+        navigationItem.backButtonTitle = "Back"
 
         if presentingViewController != nil {
-            navigationItem.leftBarButtonItem = UIBarButtonItem(barButtonSystemItem: .cancel, target: self, action: #selector(dismissModal))
+            navigationItem.leftBarButtonItem = dismissModalButton
         }
     }
 
-    @objc func dismissModal() {
+    private lazy var dismissModalButton = {
+        UIBarButtonItem(barButtonSystemItem: .cancel, target: self, action: #selector(dismissModal))
+    }()
+
+    @objc private func dismissModal() {
         dismiss(animated: true)
     }
 }

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

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

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

@@ -38,10 +38,6 @@ extension TurboNavigationController {
         return properties["presentation"] as? String == "modal"
     }
 
-    private func isClearAll(_ properties: PathProperties) -> Bool {
-        return properties["presentation"] as? String == "clear-all"
-    }
-
     private func isPop(_ properties: PathProperties) -> Bool {
         return properties["presentation"] as? String == "pop"
     }
@@ -54,6 +50,10 @@ extension TurboNavigationController {
         return properties["presentation"] as? String == "none"
     }
 
+    private func isClearAll(_ properties: PathProperties) -> Bool {
+        return properties["presentation"] as? String == "clear-all"
+    }
+
     private func isReplaceAll(_ properties: PathProperties) -> Bool {
         return properties["presentation"] as? String == "replace-all"
     }
@@ -75,13 +75,13 @@ extension TurboNavigationController {
         if let viewController = properties["view-controller"] as? String {
             switch viewController {
             case "numbers":
-                return NumbersViewController()
+                return NumbersViewController(title: "Numbers")
             default:
-                return ViewController(url: url)
+                assertionFailure("Invalid view controller, defaulting to WebView")
             }
-        } else {
-            return ViewController(url: url)
         }
+
+        return ViewController(url: url)
     }
 
     private func navigate(to viewController: UIViewController, action: VisitAction, properties: PathProperties = [:]) {

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

@@ -5,16 +5,18 @@ final class ViewController: VisitableViewController, ErrorPresenter {
     override func viewDidLoad() {
         super.viewDidLoad()
 
-        view.backgroundColor = .systemBackground
-
-        navigationItem.backButtonDisplayMode = .minimal
+        navigationItem.backButtonTitle = "Back"
 
         if presentingViewController != nil {
-            navigationItem.leftBarButtonItem = UIBarButtonItem(barButtonSystemItem: .cancel, target: self, action: #selector(dismissModal))
+            navigationItem.leftBarButtonItem = dismissModalButton
         }
     }
 
-    @objc func dismissModal() {
+    private lazy var dismissModalButton = {
+        UIBarButtonItem(barButtonSystemItem: .cancel, target: self, action: #selector(dismissModal))
+    }()
+
+    @objc private func dismissModal() {
         dismiss(animated: true)
     }
 }

data/lib/turbo_native_initializer/version.rb

@@ -1,3 +1,3 @@
 module TurboNativeInitializer
-  VERSION = "0.0.5"
+  VERSION = "0.0.7"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: turbo-native-initializer
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.7
 platform: ruby
 authors:
 - Nixon
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-09-09 00:00:00.000000000 Z
+date: 2023-09-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor